*** empty log message ***

diff --git a/lily/simple-spacer.cc b/lily/simple-spacer.cc
index e7f22978dd97c84a2ebdbfab861021898e3d21ed..5f21a62a3b040186ae30dfbcb7de86cbf623e4b6 100644 (file)
--- a/lily/simple-spacer.cc
+++ b/lily/simple-spacer.cc
@@ -418,7 +418,7 @@ Simple_spacer_wrapper::add_columns (Link_array<Grob> const &icols)
 
   for (int i = 0; i < cols.size () - 1; i++)
     {
-g      for (SCM s = Spaceable_grob::get_minimum_distances (cols[i]);
+      for (SCM s = Spaceable_grob::get_minimum_distances (cols[i]);
           scm_is_pair (s); s = scm_cdr (s))
        {
          Grob *other = unsmob_grob (scm_caar (s));

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index f6a82e8ea35b98c53892f41a22b85532b5032956..55f93476b403997425072885684aa6c9ef6d0435 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -19,7 +19,8 @@
        (print-function . ,Accidental_interface::print)
        (inside-slur . #t)
        (cautionary-style . parentheses)
-       (after-line-breaking-callback . ,Accidental_interface::after_line_breaking)             (meta . ((interfaces . (item-interface accidental-interface
+       (after-line-breaking-callback . ,Accidental_interface::after_line_breaking)
+       (meta . ((interfaces . (item-interface accidental-interface
                                                                                                                                       font-interface))))
        ))
 
@@ -643,7 +644,10 @@
        (word-space . 0.6)
        (font-series . bold-narrow)
        (font-size . 1.0)
-       (meta . ((interfaces . (rhythmic-grob-interface lyric-syllable-interface self-alignment-interface text-interface font-interface item-interface ))))
+       (meta . ((interfaces . (rhythmic-grob-interface
+                               lyric-syllable-interface
+                               self-alignment-interface text-interface
+                               font-interface item-interface ))))
        ))
 
     (MensuralLigature
@@ -691,7 +695,8 @@
        (thickness . 1)
        (height . 2.0)
        (staff-padding . 3)
-       (meta . ((interfaces . (spanner-interface side-position-interface measure-grouping-interface))))
+       (meta . ((interfaces . (spanner-interface side-position-interface
+                                                 measure-grouping-interface))))
        ))
     (MultiMeasureRest
      . (
@@ -703,7 +708,9 @@
        (thick-thickness . 6.6)
        (hair-thickness . 2.0)
        (padding . 1)
-       (meta . ((interfaces . (multi-measure-rest-interface multi-measure-interface rest-interface font-interface staff-symbol-referencer-interface))))
+       (meta . ((interfaces . (multi-measure-rest-interface
+                               multi-measure-interface rest-interface
+                               font-interface staff-symbol-referencer-interface))))
        ))
 
     (MultiMeasureRestNumber
@@ -717,7 +724,9 @@
        (padding . 0.4)
        (staff-padding . 0.4)
        (font-encoding . fetaNumber)
-       (meta . ((interfaces . (side-position-interface multi-measure-interface self-alignment-interface font-interface spanner-interface text-interface))))
+       (meta . ((interfaces . (side-position-interface
+                               multi-measure-interface self-alignment-interface
+                               font-interface spanner-interface text-interface))))
        ))
     (MultiMeasureRestText
      . (
@@ -729,7 +738,9 @@
        (direction . 1)
        (padding . 0.2)
        (staff-padding . 0.25)
-       (meta . ((interfaces . (side-position-interface multi-measure-interface self-alignment-interface font-interface spanner-interface text-interface))))
+       (meta . ((interfaces . (side-position-interface
+                               multi-measure-interface self-alignment-interface font-interface
+                               spanner-interface text-interface))))
        ))
 
     (NoteCollision

diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index 870310f6a234ddfa5a407ae55890287aa6a5b514..7226d9daff1e047c0642ae44c2a48f2b2c5bb30e 100644 (file)
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -2137,7 +2137,7 @@ conversions.append (((2, 3, 1), conv,
 def conv (str):
        if re.search ('textheight', str):
                sys.stderr.write ('\n')
-               sys.stderr.write (NOT_SMART % "tuning of page layout")
+               sys.stderr.write (NOT_SMART % "tuning of textheight")
                sys.stderr.write ('\n')
                sys.stderr.write (UPDATE_MANUALLY)
                sys.stderr.write ('\n')
@@ -2153,7 +2153,6 @@ def conv (str):
 
 
        str = re.sub (r'\\([a-zA-Z]+)Context\b', func, str)
-
        str = re.sub ('ly:paper-lookup', 'ly:output-def-lookup', str)
        return str