Issue 4119: Avoid using `markup' as local binding

I suspected this to be a case of GUILEv2 porting problems, but that does
not appear to be the case.  Nevertheless, using the `markup' macro's
name as a local identifier may well confuse humans even if it does
manage to convince GUILE.

diff --git a/Documentation/music-glossary.tely b/Documentation/music-glossary.tely
index f772b3df2317bbef9e95de3b5eefafbed3ae94be..46f04f513a2b6ad6dc162948284903f967e1b239 100644 (file)
--- a/Documentation/music-glossary.tely
+++ b/Documentation/music-glossary.tely
@@ -3893,17 +3893,17 @@ the parallel minor scale, or the incomplete dominant seventh chord.
    ((thick (* (magstep font-size)
       (ly:output-def-lookup layout 'line-thickness)))
     (underline-thick (* thickness thick))
-    (markup (interpret-markup layout props arg))
-    (x1 (car (ly:stencil-extent markup X)))
-    (x2 (cdr (ly:stencil-extent markup X)))
-    (y1 (car (ly:stencil-extent markup Y)))
-    (y2 (cdr (ly:stencil-extent markup Y)))
+    (m (interpret-markup layout props arg))
+    (x1 (car (ly:stencil-extent m X)))
+    (x2 (cdr (ly:stencil-extent m X)))
+    (y1 (car (ly:stencil-extent m Y)))
+    (y2 (cdr (ly:stencil-extent m Y)))
     (dx (* extension (- x2 x1)))
     (dy (* extension (- y2 y1)))
     (line (make-line-stencil underline-thick
       (- x1 dx) (- y1 dy)
       (+ x2 dx) (+ y2 dy))))
-   (ly:stencil-add markup line)))
+   (ly:stencil-add m line)))
 <<
   {
     <g e c>1 <a f d> <b g e>

diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm
index b4756257ff0c1d63006a866c5f49ba48f1c72e71..467ccba7e13ed19399a98c58530b638bf070742b 100644 (file)
--- a/scm/define-markup-commands.scm
+++ b/scm/define-markup-commands.scm
@@ -593,12 +593,12 @@ thickness, and @code{offset} to determine line y-offset.
 @end lilypond"
   (let* ((thick (ly:output-def-lookup layout 'line-thickness))
          (underline-thick (* thickness thick))
-         (markup (interpret-markup layout props arg))
-         (x1 (car (ly:stencil-extent markup X)))
-         (x2 (cdr (ly:stencil-extent markup X)))
+         (m (interpret-markup layout props arg))
+         (x1 (car (ly:stencil-extent m X)))
+         (x2 (cdr (ly:stencil-extent m X)))
          (y (* thick (- offset)))
          (line (make-line-stencil underline-thick x1 y x2 y)))
-    (ly:stencil-add markup line)))
+    (ly:stencil-add m line)))
 
 (define-markup-command (box layout props arg)
   (markup?)
@@ -4205,7 +4205,7 @@ a column containing several lines of text.
   }
 }
 @end lilypond"
-  (let* ((markup (interpret-markup layout props arg))
+  (let* ((m (interpret-markup layout props arg))
          (scaled-width (* size width))
          (scaled-thickness
           (* (chain-assoc-get 'line-thickness props 0.1)
@@ -4215,7 +4215,7 @@ a column containing several lines of text.
                (* (/ 4 3.0) scaled-width)))
          (padding (chain-assoc-get 'padding props half-thickness)))
     (parenthesize-stencil
-     markup half-thickness scaled-width angularity padding)))
+     m half-thickness scaled-width angularity padding)))
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;