patch::: 1.3.67.mb1: Re: Broken features

1.3.67.mb1
===========

* ly2dvi: changed back to original semantics of latexheaders.

diff --git a/CHANGES b/CHANGES
index f14c1d313c772d4ca595b6e24beace9e4b4118e8..fb39f85323a84307fdff679f2ca60363d2f6821b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+1.3.67.mb1
+===========
+
+* ly2dvi: changed back to original semantics of latexheaders.
+
 1.3.66.hwn1
 ===========
 

diff --git a/VERSION b/VERSION
index 7f7efbb39e5111c25dbabb1e85fec6e9e70dd5dd..8ffd3296d36600b8535bc2d2c438838f622a90f8 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=67
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=mb1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/input/test/orchestscore.ly b/input/test/orchestscore.ly
index c9b7da53168ab64b8f0aa3e838d22a7740310154..4f3fc240b2cb35bc1feed972399beca48b14720c 100644 (file)
--- a/input/test/orchestscore.ly
+++ b/input/test/orchestscore.ly
@@ -5,6 +5,11 @@ m = \notes \relative c''{
 c1 | c2 c | c c | c c | \break c c | c c | c c | c c | 
 }
 
+M = \notes \relative c''{
+
+c1 | c2 c | c c | R1*5 
+}
+
 \score{ < 
   \context StaffGroup = wood <
     \context Staff = flauto <
@@ -37,14 +42,14 @@ c1 | c2 c | c c | c c | \break c c | c c | c c | c c |
     \context Staff = cor <
       \property Staff.instrument = "2 Corni in F"
       \property Staff.instr = "Cor."
-      \context Voice = corI { \stemup \m }
-      \context Voice = corII { \stemdown \m }
+      \context Voice = corI { \stemup \M }
+      \context Voice = corII { \stemdown \M }
     >
     \context Staff = trp <
       \property Staff.instrument = "2 Trp. in B\\textflat  "
       \property Staff.instr = "Trp."
-      \context Voice = trpI { \stemup \m }
-      \context Voice = trpII { \stemdown \m }
+      \context Voice = trpI { \stemup \M }
+      \context Voice = trpII { \stemdown \M }
     >
   >
     \context StaffGroup = percussion <\context Staff = timpani <
@@ -90,12 +95,10 @@ c1 | c2 c | c c | c c | \break c c | c c | c c | c c |
     \translator {
        \OrchestralScoreContext
        barNumberScriptPadding = 10;
-        minVerticalAlign = 2.2*\staffheight;
-
     }
     \translator { \HaraKiriStaffContext
-       \consists "Instrument_name_engraver";
         marginScriptPadding = 15.0;
+%        StaffMinimumVerticalExtent = #(cons -0.0 0.0)
     }
   }
 }

diff --git a/scripts/convert-mudela.py b/scripts/convert-mudela.py
index d144bcc4f2753dce251362725b1f631024a4bd0d..5434a4c151e001a78efe5008e68ec67fd44bf4b9 100644 (file)
--- a/scripts/convert-mudela.py
+++ b/scripts/convert-mudela.py
@@ -480,6 +480,17 @@ if 1:
        conversions.append ((1,3,59), conv,
                            '\key X ; -> \key X major; ') 
 
+if 1:
+       def conv (str):
+#              if re.search ('latexheaders *= *"\\\\input ',str):
+#                      sys.stderr.write ('\nHello???')
+               str = re.sub (r'latexheaders *= *"\\\\input ',
+                             'latexheaders = "',
+                             str)
+               return str
+       conversions.append ((1,3,68), conv, 'latexheaders = "\\input global" -> latexheaders = "global"')
+
+
 ############################
        
 

diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py
index e17b41b1f11c35fc5b21d13e39f808d09722b636..34ce7efd3cc032aeeb8afea7ac285c36a36696db 100644 (file)
--- a/scripts/ly2dvi.py
+++ b/scripts/ly2dvi.py
@@ -264,8 +264,8 @@ class TeXOutput:
 %%\headsep0pt
 %% Maybe this is too drastic, but let us give it a try.
 \geometry{width=%spt, height=%spt,headheight=2mm,headsep=0pt,footskip=2mm} 
-\input lilyponddefs 
-\input titledefs 
+\input{lilyponddefs}
+\input{titledefs}
 %s
 \makeatletter
 \renewcommand{\@oddhead}{\parbox{\textwidth}%%
@@ -817,7 +817,7 @@ class Properties:
     # Set latex header name
     #
     def setHeader(this,head, requester):
-       this.__set('header',head,requester)
+       this.__set('header','\\input{' + head + '}',requester)
 
     #
     # Set or Clear Dependencies flag to generate makefile dependencies