From b3feb3aa6de00a17a0b2696c4849b78c7e5684f5 Mon Sep 17 00:00:00 2001 From: Christoph Wagner Date: Sun, 22 Feb 2026 20:33:18 +0100 Subject: [PATCH] padding for stop tags and refactoring --- .../base/basic_format_and_style_settings.ily | 2 +- private_includes/base/verses_with_chords.ily | 20 +++---------------- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/private_includes/base/basic_format_and_style_settings.ily b/private_includes/base/basic_format_and_style_settings.ily index e195866..8794edf 100644 --- a/private_includes/base/basic_format_and_style_settings.ily +++ b/private_includes/base/basic_format_and_style_settings.ily @@ -222,7 +222,7 @@ repStopWithTag = \lyricmode { \tag #'repeats { \once \override StanzaNumber.font-series = #'normal \once \override StanzaNumber.direction = 1 - \set stanza = \markup { \repStop } + \set stanza = \markup { \pad-x-right #1 \repStop } } } diff --git a/private_includes/base/verses_with_chords.ily b/private_includes/base/verses_with_chords.ily index ccd77f9..b1eb43c 100644 --- a/private_includes/base/verses_with_chords.ily +++ b/private_includes/base/verses_with_chords.ily @@ -203,23 +203,9 @@ #(define-markup-command (pad-left layout props amount arg) (number? markup?) - (let* ((m (interpret-markup layout props arg)) - (x (ly:stencil-extent m X)) - (y (ly:stencil-extent m Y))) (ly:stencil-translate - (ly:make-stencil (ly:stencil-expr m) - (cons (- (car x) amount) (cdr x)) - y) - `(,amount . 0)))) - -#(define-markup-command (pad-right layout props amount arg) - (number? markup?) - (let* ((m (interpret-markup layout props arg)) - (x (ly:stencil-extent m X)) - (y (ly:stencil-extent m Y))) - (ly:make-stencil (ly:stencil-expr m) - (cons (car x) (+ (cdr x) amount)) - y))) + (interpret-markup layout props (make-pad-x-left-markup amount arg)) + `(,amount . 0))) #(define-markup-command (score-equal-height-with-indents layout props lines) (markup-list?) @@ -250,7 +236,7 @@ (let ((text (ly:grob-property grob 'text))) (grob-interpret-markup grob (if (string? text) - (make-pad-right-markup -0.1 (make-tied-lyric-markup text)) + (make-pad-x-right-markup -0.1 (make-tied-lyric-markup text)) text)))) Chord_lyrics_spacing_engraver =