patch::: 1.5.2.jcn2

1.5.2.jcn2

diff --git a/CHANGES b/CHANGES
index d8b1698acc448e333c36d1b2beee6ea526f7a2f7..22fd53ad4bfc5c933dfd05031dc95b47977f9f20 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
-1.5.2.jcn1
+1.5.2.jcn2
 ==========
 
+* Flex is fixed in Debian/unstable.  Update documentation accordingly.
+
 * Guile 1.3.4 compile fix.
 
 * Add trill line type, see input/test/trill.ly.

diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi
index d94beaab8eb69bfe32e19d91ba677fa64492411a..75aece174161dca25d9c38f4b6cd371c85869fa8 100644 (file)
--- a/Documentation/topdocs/INSTALL.texi
+++ b/Documentation/topdocs/INSTALL.texi
@@ -501,10 +501,10 @@ send bug reports to @email{bug-lilypond@@gnu.org}.
 
 Bugs that are not fault of LilyPond are documented here.
 
-@unnumberedsubsec Debian GNU/Linux unstable gcc-3.0
+@unnumberedsubsec FLex-2.5.4a and gcc-3.0
 
-Flex (2.5.4a-11) in unstable does not produce g++-3.0 compliant C++
-code.  To compile LilyPond with gcc-3.0 you may do:
+Flex 2.5.4a does not produce g++-3.0 compliant C++ code.  To compile
+LilyPond with gcc-3.0 you may do:
 
 @example
         CC=gcc-3.0 CXX=g++-3.0 ./configure --enable-config=gcc-3.0
@@ -513,6 +513,8 @@ code.  To compile LilyPond with gcc-3.0 you may do:
         make conf=gcc-3.0 -C lily
 @end example
 
+Note that this is fixed in Debian/unstable for flex >= 2.5.4a-13.
+
 @unnumberedsubsec NetBSD
 
 @itemize @bullet

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index 7ca511494d236711cdac3e7ec09aaf4de4a48a05..809565998e4493e27fff3e96855c78b98fd9e0e5 100644 (file)
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -1,14 +1,11 @@
 
 @c Note:
 @c
-@c A menu is needed before every deeper *section nesting of @nodes
-@c Run M-x texinfo-all-menus-update
-@c to automagically fill in these menus
-@c before saving changes
+@c A menu is needed before every deeper *section nesting of @node's; run
+@c     M-x texinfo-all-menus-update
+@c to automagically fill in these menus before saving changes
 
 
-@
-
 @macro refbugs
 @strong{BUGS}
 

diff --git a/VERSION b/VERSION
index fc42bc2b01277b2ee49b2f558f0c9fbeef716447..61251ac53280dd7eeaf40f263de494255b5a06fd 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=5
 PATCH_LEVEL=2
-MY_PATCH_LEVEL=jcn1
+MY_PATCH_LEVEL=jcn2
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/input/bugs/ancient-font.ly b/input/bugs/ancient-font.ly
new file mode 100644 (file)
index 0000000..13287d5
--- /dev/null
+++ b/input/bugs/ancient-font.ly
@@ -0,0 +1,132 @@
+\version "1.3.146"
+\header {
+texidoc="setting staff symbol properties the normal way is broken"
+    title      = "ancient font test"
+    date       = "2000"
+}
+
+
+
+\include "paper26.ly"
+
+global =  \notes {
+    \property Score.timing = ##f
+%   \property Staff.TimeSignature \override #'style = #'old
+}
+
+upperVoice =  \context Staff = upperVoice <
+    \global
+    \property Staff.StaffSymbol \override #'line-count = #4
+    \notes \transpose c' {
+       \property Voice.NoteHead \override #'style = #'mensural
+       \property Voice.Stem \override #'stem-centered = ##t
+       \property Staff.Custos \override #'style = #'vaticana
+       \clef "vaticana_fa2"
+       c2 d e f g
+
+%      \property Staff.clefGlyph = #"clefs-vaticana_do"
+%      \property Staff.clefPosition = #1
+%      \property Staff.clefOctavation = #0 
+       \clef "vaticana_do2"
+
+       a b c'
+       b a g f
+       \clef "vaticana_fa1"
+       e d c1 \bar "|"
+
+       \property Staff.Custos \override #'style = #'medicaea
+       \clef "medicaea_fa2"
+       c2 d e f g
+       \clef "medicaea_do2"
+       a b c'
+       b a g f
+       \clef "medicaea_fa1"
+       e d c1 \bar "|"
+
+       \property Staff.Custos \override #'style = #'hufnagel
+       \clef "hufnagel_fa2"
+       c2 d e f g
+       \clef "hufnagel_do2"
+       a b c'
+       b a g f
+       \clef "hufnagel_fa1"
+       e d c1 \bar "||"
+    }
+>
+
+lowerVoice =  \context Staff = lowerNotes <
+    \global
+    \property Staff.StaffSymbol \override #'line-count = #5
+    \notes \transpose c' {
+        \property Voice.NoteHead \override #'style = #'mensural
+       \property Voice.Stem \override #'stem-centered = ##t
+       \property Staff.Custos \override #'style = #'mensural
+       \clef "mensural1_c2"
+       c2 d e f g
+        \property Staff.forceClef = ##t
+       \clef "mensural1_c2"
+       a b c'
+       b a g f
+       \clef "mensural2_c2"
+       e d c1 \bar "|"
+
+       \clef "mensural2_c2"
+       c2 d e f g
+        \property Staff.forceClef = ##t
+       \clef "mensural3_c2"
+       a b c'
+       b a g f
+       \clef "mensural3_c2"
+       e d c1 \bar "|"
+
+       \clef "mensural1_f"
+       c2 d e f g
+        \property Staff.forceClef = ##t
+       \clef "mensural1_f"
+       a b c'
+       b a g f
+       \clef "mensural2_f"
+       e d c1 \bar "|"
+
+        \property Staff.forceClef = ##t
+       \clef "mensural2_f"
+       c2 d e f g
+       \clef "mensural_g"
+       a' b' c''
+       b' a' g' f'
+        \property Staff.forceClef = ##t
+       \clef "mensural_g"
+       e' d' c'1 \bar "|"
+
+        \property Staff.forceClef = ##t
+       \clef "mensural_g"
+       c'2 d' e' f' g'
+       \clef "hufnagel_do_fa"
+       a b c'
+       b a g f
+        \property Staff.forceClef = ##t
+       \clef "hufnagel_do_fa"
+       e d c1 \bar "||"
+    }
+>
+
+\score {
+    \context ChoirStaff <
+       \upperVoice
+       \lowerVoice
+    >
+    \paper {
+%      \paperTwentysix
+       linewidth = 17.25\cm
+       textheight = 26.0\cm
+       indent = 0.0
+       \translator {
+           \StaffContext
+           \consists Custos_engraver
+%          Custos \override #'style = #'mensural
+           \remove Time_signature_engraver
+%          StaffSymbol \override #'line-count = #4
+       }
+    }
+}
+

diff --git a/input/test/ancient-font.ly b/input/test/ancient-font.ly
index faa6ce1b702fe5025971ada3822efac53d189ccf..5c31587b15cff5623e8676f49110d7fa2a65906e 100644 (file)
--- a/input/test/ancient-font.ly
+++ b/input/test/ancient-font.ly
@@ -15,7 +15,12 @@ global =  \notes {
 
 upperVoice =  \context Staff = upperVoice <
     \global
-    \property Staff.StaffSymbol \override #'line-count = #4
+    
+    % this is broken until further notice -- see refman
+    % \property Staff.StaffSymbol \override #'line-count = #4
+    \context Staff \outputproperty #(make-type-checker 'staff-symbol-interface)
+      #'line-count = #4
+
     \notes \transpose c' {
        \property Voice.NoteHead \override #'style = #'mensural
        \property Voice.Stem \override #'stem-centered = ##t
@@ -55,7 +60,12 @@ upperVoice =  \context Staff = upperVoice <
 
 lowerVoice =  \context Staff = lowerNotes <
     \global
-    \property Staff.StaffSymbol \override #'line-count = #5
+    
+    % this is broken until further notice -- see refman
+    % \property Staff.StaffSymbol \override #'line-count = #5
+    \context Staff \outputproperty #(make-type-checker 'staff-symbol-interface)
+      #'line-count = #5
+    
     \notes \transpose c' {
         \property Voice.NoteHead \override #'style = #'mensural
        \property Voice.Stem \override #'stem-centered = ##t

diff --git a/input/test/staff-lines.ly b/input/test/staff-lines.ly
new file mode 100644 (file)
index 0000000..ef7dcc8
--- /dev/null
+++ b/input/test/staff-lines.ly
@@ -0,0 +1,32 @@
+\version "1.5.1"
+\header {
+texidoc="staff symbol property set workaround"
+}
+
+
+upper = \notes\relative c'' {
+  c1-"x" d-"x" e-"x" f-"x"
+}
+
+lower = \notes\relative c {
+  c1-"x" b-"x" a-"x" g-"x"
+}
+
+\score {
+  \context PianoStaff <
+    %\time 4/4
+    \context Staff = upper <
+      \upper
+      \outputproperty #(make-type-checker 'staff-symbol-interface)
+        #'line-count = #5
+    >  
+    \context Staff = lower <
+      \clef bass
+      \lower
+      \outputproperty #(make-type-checker 'staff-symbol-interface)
+        #'line-count = #4
+    >  
+  >
+  \paper { }  
+  \midi { }  
+}
\ No newline at end of file

diff --git a/scm/foo.scm b/scm/foo.scm
index 8b137891791fe96927ad78e64b0aad7bded08bdc..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/scm/foo.scm
+++ b/scm/foo.scm
@@ -1 +0,0 @@
-