New from master

diff --git a/input/lsr/broken-crescendo-hairpin.ly b/input/lsr/broken-crescendo-hairpin.ly
index 44027924e8ffaa32748129d28eae64a2cdc11bf5..5a08ab6c5c96dfcbc000f42adabc677839239d7d 100644 (file)
--- a/input/lsr/broken-crescendo-hairpin.ly
+++ b/input/lsr/broken-crescendo-hairpin.ly
@@ -1,43 +1,43 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.38"\r
-\r
-\header {\r
-  doctitle = "Broken crescendo hairpin"\r
-  lsrtags = "expressive-marks"\r
-  texidoc = "\r
-In order to make parts of a crescendo hairpin invisible, the following\r
-method is used: A white rectangle is drawn on top of the respective\r
-part of the crescendo hairpin, making it invisible. The rectangle is\r
-defined as postscript code within a text markup.\r
-\r
-To fine-tune the position and size of the markup, the number\r
-preceding @code{setgray} in the postscript definition can be set to a\r
-value <1 making it grey. The two numbers before @code{scale} in the\r
-postscript code are responsible for the width and height of the\r
-rectangle, the two numbers before @code{translate} change the x- and\r
-y-origin of the rectangle. \r
-\r
-Make sure to put the hairpin in a lower layer than the text markup to\r
-actually draw the rectangle above the hairpin. \r
-" }\r
-\r
-\score {\r
-  \relative c' {\r
-    << {\r
-      \dynamicUp\r
-      \override DynamicLineSpanner #'staff-padding = #4\r
-      r2 r16 c'8.\pp r4\r
-    } \\ {\r
-      \override DynamicLineSpanner #'layer = #0\r
-      des,2\mf\< ~\r
-      \override TextScript #'layer = #2\r
-      des16_\markup {\r
-        \postscript #"1.9 -8 translate 5 4 scale 1 setgray 0 0 moveto 0 1\r
-        lineto 1 1 lineto 1 0 lineto 0 0 lineto fill"\r
-      }\r
-      r8. des4 ~ des16->\sff\r
-    } >>\r
-  }\r
-  \layout { ragged-right = ##t }\r
-}\r
+\version "2.11.38"
+
+\header {
+  doctitle = "Broken crescendo hairpin"
+  lsrtags = "expressive-marks"
+  texidoc = "
+In order to make parts of a crescendo hairpin invisible, the following
+method is used: A white rectangle is drawn on top of the respective
+part of the crescendo hairpin, making it invisible. The rectangle is
+defined as postscript code within a text markup.
+
+To fine-tune the position and size of the markup, the number
+preceding @code{setgray} in the postscript definition can be set to a
+value <1 making it grey. The two numbers before @code{scale} in the
+postscript code are responsible for the width and height of the
+rectangle, the two numbers before @code{translate} change the x- and
+y-origin of the rectangle. 
+
+Make sure to put the hairpin in a lower layer than the text markup to
+actually draw the rectangle above the hairpin. 
+" }
+
+\score {
+  \relative c' {
+    << {
+      \dynamicUp
+      \override DynamicLineSpanner #'staff-padding = #4
+      r2 r16 c'8.\pp r4
+    } \\ {
+      \override DynamicLineSpanner #'layer = #0
+      des,2\mf\< ~
+      \override TextScript #'layer = #2
+      des16_\markup {
+        \postscript #"1.9 -8 translate 5 4 scale 1 setgray 0 0 moveto 0 1
+        lineto 1 1 lineto 1 0 lineto 0 0 lineto fill"
+      }
+      r8. des4 ~ des16->\sff
+    } >>
+  }
+  \layout { ragged-right = ##t }
+}

diff --git a/input/lsr/making-an-object-invisible-with-the-transparent-property.ly b/input/lsr/making-an-object-invisible-with-the-transparent-property.ly
index 037ccbddb2ed43eea38bc7e0001ebf04656c70fd..5a1f443443ca7237f8ed2b019d883d4b9b56b35d 100644 (file)
--- a/input/lsr/making-an-object-invisible-with-the-transparent-property.ly
+++ b/input/lsr/making-an-object-invisible-with-the-transparent-property.ly
@@ -1,34 +1,34 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.38"\r
-\layout { ragged-right = ##t }\r
-\header {\r
-  doctitle = "Making an object invisible with the transparent property"\r
-  lsrtags = "rhythms,tweaks-and-overrides"\r
-  texidoc = "\r
-Setting the @code{transparent} property will cause an object to be\r
-printed in \"invisible ink\": the object is not printed, but all its\r
-other behavior is retained.  The object still takes up space, it takes\r
-part in collisions, and slurs, ties and beams can be attached to it.\r
-\r
-\r
-The snippet demonstrates how to connect different voices using ties. \r
-Normally, ties only connect two notes in the same voice.  By\r
-introducing a tie in a different voice, and blanking the first up-stem\r
-in that voice, the tie appears to cross voices.  To prevent the blanked stem's\r
-flag from interfering with tie positioning, the stem is extended.\r
-" }\r
-\r
-\relative c'' {\r
-  \time 2/4\r
-  << {\r
-    \once \override Stem #'transparent = ##t\r
-    \once \override Stem #'length = #8\r
-    b8 ~ b\noBeam\r
-    \once \override Stem #'transparent = ##t\r
-    \once \override Stem #'length = #8\r
-    g ~ g\noBeam\r
-  } \\ {\r
-    b g g e\r
-  } >>\r
-}\r
+\version "2.11.38"
+\layout { ragged-right = ##t }
+\header {
+  doctitle = "Making an object invisible with the transparent property"
+  lsrtags = "rhythms,tweaks-and-overrides"
+  texidoc = "
+Setting the @code{transparent} property will cause an object to be
+printed in \"invisible ink\": the object is not printed, but all its
+other behavior is retained.  The object still takes up space, it takes
+part in collisions, and slurs, ties and beams can be attached to it.
+
+
+The snippet demonstrates how to connect different voices using ties. 
+Normally, ties only connect two notes in the same voice.  By
+introducing a tie in a different voice, and blanking the first up-stem
+in that voice, the tie appears to cross voices.  To prevent the blanked stem's
+flag from interfering with tie positioning, the stem is extended.
+" }
+
+\relative c'' {
+  \time 2/4
+  << {
+    \once \override Stem #'transparent = ##t
+    \once \override Stem #'length = #8
+    b8 ~ b\noBeam
+    \once \override Stem #'transparent = ##t
+    \once \override Stem #'length = #8
+    g ~ g\noBeam
+  } \\ {
+    b g g e
+  } >>
+}

diff --git a/input/new/broken-crescendo-hairpin.ly b/input/new/broken-crescendo-hairpin.ly
index 3bd097c800a264d604dc1ac5063beacd5d187a4f..14ac6b04ebcc9d9d6eecb22b79be5b53e17275a9 100644 (file)
--- a/input/new/broken-crescendo-hairpin.ly
+++ b/input/new/broken-crescendo-hairpin.ly
@@ -1,41 +1,41 @@
-\version "2.11.38"\r
-\r
-\header {\r
-  doctitle = "Broken crescendo hairpin"\r
-  lsrtags = "expressive-marks"\r
-  texidoc = "\r
-In order to make parts of a crescendo hairpin invisible, the following\r
-method is used: A white rectangle is drawn on top of the respective\r
-part of the crescendo hairpin, making it invisible. The rectangle is\r
-defined as postscript code within a text markup.\r
-\r
-To fine-tune the position and size of the markup, the number\r
-preceding @code{setgray} in the postscript definition can be set to a\r
-value <1 making it grey. The two numbers before @code{scale} in the\r
-postscript code are responsible for the width and height of the\r
-rectangle, the two numbers before @code{translate} change the x- and\r
-y-origin of the rectangle. \r
-\r
-Make sure to put the hairpin in a lower layer than the text markup to\r
-actually draw the rectangle above the hairpin. \r
-" }\r
-\r
-\score {\r
-  \relative c' {\r
-    << {\r
-      \dynamicUp\r
-      \override DynamicLineSpanner #'staff-padding = #4\r
-      r2 r16 c'8.\pp r4\r
-    } \\ {\r
-      \override DynamicLineSpanner #'layer = #0\r
-      des,2\mf\< ~\r
-      \override TextScript #'layer = #2\r
-      des16_\markup {\r
-        \postscript #"1.9 -8 translate 5 4 scale 1 setgray 0 0 moveto 0 1\r
-        lineto 1 1 lineto 1 0 lineto 0 0 lineto fill"\r
-      }\r
-      r8. des4 ~ des16->\sff\r
-    } >>\r
-  }\r
-  \layout { ragged-right = ##t }\r
-}\r
+\version "2.11.38"
+
+\header {
+  doctitle = "Broken crescendo hairpin"
+  lsrtags = "expressive-marks"
+  texidoc = "
+In order to make parts of a crescendo hairpin invisible, the following
+method is used: A white rectangle is drawn on top of the respective
+part of the crescendo hairpin, making it invisible. The rectangle is
+defined as postscript code within a text markup.
+
+To fine-tune the position and size of the markup, the number
+preceding @code{setgray} in the postscript definition can be set to a
+value <1 making it grey. The two numbers before @code{scale} in the
+postscript code are responsible for the width and height of the
+rectangle, the two numbers before @code{translate} change the x- and
+y-origin of the rectangle. 
+
+Make sure to put the hairpin in a lower layer than the text markup to
+actually draw the rectangle above the hairpin. 
+" }
+
+\score {
+  \relative c' {
+    << {
+      \dynamicUp
+      \override DynamicLineSpanner #'staff-padding = #4
+      r2 r16 c'8.\pp r4
+    } \\ {
+      \override DynamicLineSpanner #'layer = #0
+      des,2\mf\< ~
+      \override TextScript #'layer = #2
+      des16_\markup {
+        \postscript #"1.9 -8 translate 5 4 scale 1 setgray 0 0 moveto 0 1
+        lineto 1 1 lineto 1 0 lineto 0 0 lineto fill"
+      }
+      r8. des4 ~ des16->\sff
+    } >>
+  }
+  \layout { ragged-right = ##t }
+}

diff --git a/input/new/making-an-object-invisible-with-the-transparent-property.ly b/input/new/making-an-object-invisible-with-the-transparent-property.ly
index 403b8babd702514c3376ba5d2f13887d1f6f2b69..46975c1ec6337bc00958f35e661601e998bd2d31 100644 (file)
--- a/input/new/making-an-object-invisible-with-the-transparent-property.ly
+++ b/input/new/making-an-object-invisible-with-the-transparent-property.ly
@@ -1,32 +1,32 @@
-\version "2.11.23"\r
-\layout { ragged-right = ##t }\r
-\header {\r
-  doctitle = "Making an object invisible with the transparent property"\r
-  lsrtags = "rhythms,tweaks-and-overrides"\r
-  texidoc = "\r
-Setting the @code{transparent} property will cause an object to be\r
-printed in \"invisible ink\": the object is not printed, but all its\r
-other behavior is retained.  The object still takes up space, it takes\r
-part in collisions, and slurs, ties and beams can be attached to it.\r
-\r
-\r
-The snippet demonstrates how to connect different voices using ties. \r
-Normally, ties only connect two notes in the same voice.  By\r
-introducing a tie in a different voice, and blanking the first up-stem\r
-in that voice, the tie appears to cross voices.  To prevent the blanked stem's\r
-flag from interfering with tie positioning, the stem is extended.\r
-" }\r
-\r
-\relative c'' {\r
-  \time 2/4\r
-  << {\r
-    \once \override Stem #'transparent = ##t\r
-    \once \override Stem #'length = #8\r
-    b8 ~ b\noBeam\r
-    \once \override Stem #'transparent = ##t\r
-    \once \override Stem #'length = #8\r
-    g ~ g\noBeam\r
-  } \\ {\r
-    b g g e\r
-  } >>\r
-}\r
+\version "2.11.23"
+\layout { ragged-right = ##t }
+\header {
+  doctitle = "Making an object invisible with the transparent property"
+  lsrtags = "rhythms,tweaks-and-overrides"
+  texidoc = "
+Setting the @code{transparent} property will cause an object to be
+printed in \"invisible ink\": the object is not printed, but all its
+other behavior is retained.  The object still takes up space, it takes
+part in collisions, and slurs, ties and beams can be attached to it.
+
+
+The snippet demonstrates how to connect different voices using ties. 
+Normally, ties only connect two notes in the same voice.  By
+introducing a tie in a different voice, and blanking the first up-stem
+in that voice, the tie appears to cross voices.  To prevent the blanked stem's
+flag from interfering with tie positioning, the stem is extended.
+" }
+
+\relative c'' {
+  \time 2/4
+  << {
+    \once \override Stem #'transparent = ##t
+    \once \override Stem #'length = #8
+    b8 ~ b\noBeam
+    \once \override Stem #'transparent = ##t
+    \once \override Stem #'length = #8
+    g ~ g\noBeam
+  } \\ {
+    b g g e
+  } >>
+}

diff --git a/input/regression/musicxml/19a-PageLayout-PrintMusic.xml b/input/regression/musicxml/19a-PageLayout-PrintMusic.xml
index 95e2e0073bb8721b830b56a3495c8ae0c41f1089..ac51b7fff1c2f5e7cbd4d8115cc6733597c38e43 100644 (file)
--- a/input/regression/musicxml/19a-PageLayout-PrintMusic.xml
+++ b/input/regression/musicxml/19a-PageLayout-PrintMusic.xml
@@ -1,102 +1,102 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"\r
-                                "http://www.musicxml.org/dtds/partwise.dtd">\r
-<score-partwise version="1.1">\r
-  <movement-title>Layout options</movement-title>\r
-  <identification>\r
-    <encoding>\r
-      <software>PrintMusic 2008 for Windows</software>\r
-      <software>Dolet Light for PrintMusic 2008</software>\r
-      <encoding-date>2007-11-04</encoding-date>\r
-    </encoding>\r
-  </identification>\r
-  <defaults>\r
-    <scaling>\r
-      <millimeters>3.7703</millimeters>\r
-      <tenths>40</tenths>\r
-    </scaling>\r
-    <page-layout>\r
-      <page-height>954</page-height>\r
-      <page-width>1804</page-width>\r
-      <page-margins type="both">\r
-        <left-margin>318</left-margin>\r
-        <right-margin>212</right-margin>\r
-        <top-margin>53</top-margin>\r
-        <bottom-margin>74</bottom-margin>\r
-      </page-margins>\r
-    </page-layout>\r
-    <system-layout>\r
-      <system-margins>\r
-        <left-margin>248</left-margin>\r
-        <right-margin>206</right-margin>\r
-      </system-margins>\r
-      <system-distance>561</system-distance>\r
-      <top-system-distance>436</top-system-distance>\r
-    </system-layout>\r
-    <music-font font-family="Maestro" font-size="10.7"/>\r
-    <word-font font-family="Times New Roman" font-size="5.3"/>\r
-  </defaults>\r
-  <credit>\r
-    <credit-words default-x="955" default-y="876" font-size="18" font-weight="bold" justify="center" valign="top">Layout options</credit-words>\r
-  </credit>\r
-  <part-list>\r
-    <score-part id="P1">\r
-      <part-name print-object="no">MusicXML Part</part-name>\r
-      <score-instrument id="P1-I1">\r
-        <instrument-name>Grand Piano</instrument-name>\r
-      </score-instrument>\r
-      <midi-instrument id="P1-I1">\r
-        <midi-channel>1</midi-channel>\r
-        <midi-program>1</midi-program>\r
-      </midi-instrument>\r
-    </score-part>\r
-  </part-list>\r
-  <!--=========================================================-->\r
-  <part id="P1">\r
-    <measure number="1" width="441">\r
-      <print page-number="8"/>\r
-      <attributes>\r
-        <divisions>1</divisions>\r
-        <key>\r
-          <fifths>0</fifths>\r
-          <mode>major</mode>\r
-        </key>\r
-        <time symbol="common">\r
-          <beats>4</beats>\r
-          <beat-type>4</beat-type>\r
-        </time>\r
-        <clef>\r
-          <sign>G</sign>\r
-          <line>2</line>\r
-        </clef>\r
-      </attributes>\r
-      <sound tempo="120"/>\r
-      <note>\r
-        <rest/>\r
-        <duration>4</duration>\r
-        <voice>1</voice>\r
-      </note>\r
-    </measure>\r
-    <!--=======================================================-->\r
-    <measure number="2" width="378">\r
-      <note>\r
-        <rest/>\r
-        <duration>4</duration>\r
-        <voice>1</voice>\r
-      </note>\r
-    </measure>\r
-    <!--=======================================================-->\r
-    <measure number="3" width="819">\r
-      <print new-page="yes" page-number="9"/>\r
-      <note>\r
-        <rest/>\r
-        <duration>4</duration>\r
-        <voice>1</voice>\r
-      </note>\r
-      <barline location="right">\r
-        <bar-style>light-heavy</bar-style>\r
-      </barline>\r
-    </measure>\r
-  </part>\r
-  <!--=========================================================-->\r
-</score-partwise>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"
+                                "http://www.musicxml.org/dtds/partwise.dtd">
+<score-partwise version="1.1">
+  <movement-title>Layout options</movement-title>
+  <identification>
+    <encoding>
+      <software>PrintMusic 2008 for Windows</software>
+      <software>Dolet Light for PrintMusic 2008</software>
+      <encoding-date>2007-11-04</encoding-date>
+    </encoding>
+  </identification>
+  <defaults>
+    <scaling>
+      <millimeters>3.7703</millimeters>
+      <tenths>40</tenths>
+    </scaling>
+    <page-layout>
+      <page-height>954</page-height>
+      <page-width>1804</page-width>
+      <page-margins type="both">
+        <left-margin>318</left-margin>
+        <right-margin>212</right-margin>
+        <top-margin>53</top-margin>
+        <bottom-margin>74</bottom-margin>
+      </page-margins>
+    </page-layout>
+    <system-layout>
+      <system-margins>
+        <left-margin>248</left-margin>
+        <right-margin>206</right-margin>
+      </system-margins>
+      <system-distance>561</system-distance>
+      <top-system-distance>436</top-system-distance>
+    </system-layout>
+    <music-font font-family="Maestro" font-size="10.7"/>
+    <word-font font-family="Times New Roman" font-size="5.3"/>
+  </defaults>
+  <credit>
+    <credit-words default-x="955" default-y="876" font-size="18" font-weight="bold" justify="center" valign="top">Layout options</credit-words>
+  </credit>
+  <part-list>
+    <score-part id="P1">
+      <part-name print-object="no">MusicXML Part</part-name>
+      <score-instrument id="P1-I1">
+        <instrument-name>Grand Piano</instrument-name>
+      </score-instrument>
+      <midi-instrument id="P1-I1">
+        <midi-channel>1</midi-channel>
+        <midi-program>1</midi-program>
+      </midi-instrument>
+    </score-part>
+  </part-list>
+  <!--=========================================================-->
+  <part id="P1">
+    <measure number="1" width="441">
+      <print page-number="8"/>
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>0</fifths>
+          <mode>major</mode>
+        </key>
+        <time symbol="common">
+          <beats>4</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+      </attributes>
+      <sound tempo="120"/>
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2" width="378">
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="3" width="819">
+      <print new-page="yes" page-number="9"/>
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+</score-partwise>