Regression test changes:

- new file part-combine-markup.ly
- typo in spacing-packed.ly
- fix spacing-ragged-last.ly
- add texidoc to warn-conflicting-key-signatures.ly

diff --git a/input/regression/part-combine-markup.ly b/input/regression/part-combine-markup.ly
new file mode 100644 (file)
index 0000000..3185b37
--- /dev/null
+++ b/input/regression/part-combine-markup.ly
@@ -0,0 +1,14 @@
+\version "2.11.47"
+
+\header {
+  texidoc = "Part combine texts accept markup."
+}
+
+\new Staff <<
+  \set Score.soloText = \markup { \concat { I \super o } }
+  \set Score.soloIIText = \markup { \huge \italic II }
+  \set Score.aDueText = \markup { \normal-text \rounded-box { "a 2" } }
+  \partcombine
+    \relative g' { g4 g r r a2 g }
+    \relative g' { r4 r a( b) a2 g }
+>>

diff --git a/input/regression/spacing-packed.ly b/input/regression/spacing-packed.ly
index 010370930b1972db3dbe4715ebcf623dafbfc84d..fac631e03810689b226d2e332527479dd9923ca7 100644 (file)
--- a/input/regression/spacing-packed.ly
+++ b/input/regression/spacing-packed.ly
@@ -4,7 +4,7 @@
        sense mostly in combination with ragged-right mode: the notes
        are then printed at minimum distance.  This is mostly useful
        for ancient notation, but may also be useful for some flavours
-       of contemporary music.  If not in raggedright mode, lily will
+       of contemporary music.  If not in ragged-right mode, lily will
        pack as many bars of music as possible into a line, but the
        line will then be stretched to fill the whole linewidth.
 "
@@ -12,11 +12,6 @@
 
 \version "2.11.40"
 
-\layout {
-  ragged-right = ##t
-}
-
-
 \relative {
   \override Score.SpacingSpanner #'packed-spacing = ##t
   c2 d4 f8[ g]

diff --git a/input/regression/spacing-ragged-last.ly b/input/regression/spacing-ragged-last.ly
index a1d9d74cf85f2089dc4ce657c702197a35bd7d39..829ae3228b4821ee9a176ad92da682b0647d1e65 100644 (file)
--- a/input/regression/spacing-ragged-last.ly
+++ b/input/regression/spacing-ragged-last.ly
@@ -2,14 +2,14 @@
 
 \header {
 
-  texidoc = "If @code{raggedlast} is set, the systems are broken
+  texidoc = "If @code{ragged-last} is set, the systems are broken
     similar to paragraph formatting in text: the last line is
     unjustified. "
 
 }
 
 \layout{
-  raggedlast = ##t
+  ragged-last = ##t
 }
 
 \relative c'' \new Staff { \repeat unfold 20 { c1 } }

diff --git a/input/regression/warn-conflicting-key-signatures.ly b/input/regression/warn-conflicting-key-signatures.ly
index 4b9756ee9f15ead6eddd9115a4b35023bdd177b1..39ca9cf867b9918541ad5b208f8b496c7964e15c 100644 (file)
--- a/input/regression/warn-conflicting-key-signatures.ly
+++ b/input/regression/warn-conflicting-key-signatures.ly
@@ -1,11 +1,14 @@
 \version "2.10.0"
-%If you specify two different key sigs at one point, a
-%warning is printed.
+
+\header {
+  texidoc = "If you specify two different key signatures at one point, a
+warning is printed."
+
+}
 
 \score { 
 \context Voice <<
  { \key cis \major cis4 \key bes \major bes4 }
- { \key cis \major fis4 \key es \major g4 }  
+ { \key cis \major fis4 \key es \major g4 }
 >>
 }
-