lilypond-1.5.3

diff --git a/CHANGES b/CHANGES
index 9aae7780b35cfa05276c48ddd35bc09d4659063b..1ed44c2eaf5ce219dd2ba38840c7081108d249fe 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,46 @@
+1.5.2.hwn1
+==========
+
+* Starting pagenumber (Mark Hindley)
+
+* Ancient font patch (Juergen Reuter) [WARNING: FONT UPDATE!]
+
+* Bugfix: don't  put grace beams on non grace notes, and vice versa.
+
+* etf2ly:
+  - miserable try at importing repeatbars and volta brackets;
+  - import articulation defs (IX tag)
+  - revamped file reading logic. Now much cleaner.
+
+* Experimental regular-spacing support: try to space regular runs of
+notes equidistantly.
+
+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.
+
+* Dvips bugs workarounds:
+  - Draw filledbox in tex for now.  Test ps code using
+
+     lilypond -e '(define ps-testing 1)'
+
+  - Extend stems only half way into beam.
+
+* Change order of includes in tex/lilyponddefs.tex so that feta font
+can be used a little easier, like:
+
+    title="TeX \fetachar\fetasharp"
+
+* Update stepmake/bin config.sub, config.guess.
+
+1.5.2
+=====
+
 1.5.1.hwn1
 ==========
 

diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi
index c9926959fc10b927d21dc6ad36974ac44857552b..75aece174161dca25d9c38f4b6cd371c85869fa8 100644 (file)
--- a/Documentation/topdocs/INSTALL.texi
+++ b/Documentation/topdocs/INSTALL.texi
@@ -286,13 +286,18 @@ and for the profiling version, I specify a different configuration.
 
 @section Emacs mode
 
-An emacs mode for LilyPond is included with the source archive as
-@file{lilypond-mode.el} and @file{lilypond-font-lock.el}.  If you have
-an RPM, it is in @file{/usr/share/doc/lilypond-X/}.  You have to install
-it yourself.
+An Emacs mode for entering music and running LilyPond is included with
+the source archive as @file{lilypond-mode.el} and
+@file{lilypond-font-lock.el}.  You should install these files somewhere
+in your @var{load-path}.  If you have installed a precompiled LilyPond
+package, these files can be found in
+@file{/usr/share/doc/lilypond-x.y.z/}.
+
+Add this to your @file{~/.emacs} or @file{~/.emacs.el}, or install this
+file in Emacs' @file{site-start.d}:
+@example
+    ;;; lilypond-init.el --- Startup code for LilyPond mode
 
-Add this to your @file{~/.emacs} or @file{~/.emacs.el}:
-@example 
     (load-library "lilypond-mode.el")
     (setq auto-mode-alist
       (cons '("\\.ly$" . LilyPond-mode) auto-mode-alist))
@@ -300,7 +305,8 @@ Add this to your @file{~/.emacs} or @file{~/.emacs.el}:
 @end example
 
 If you have the latest LilyPond-1.4.x Debian package, LilyPond-mode is
-automatically loaded, so you need not modify your @code{~/.emacs} file.
+automatically loaded, you not even need to modify your @code{~/.emacs}
+file.
 
 @section Compiling for distributions 
 
@@ -495,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
@@ -507,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 3bda81d233a4780bae44153373fbfe441b668c59..a522ff62608a9f0398fffe4b19f176d0a7b8d4fd 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,7 +1,7 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=5
-PATCH_LEVEL=2
+PATCH_LEVEL=3
 MY_PATCH_LEVEL=
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a

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..703d5b2f04d8361d1686f2e3dca864fea70ac2f0 100644 (file)
--- a/input/test/ancient-font.ly
+++ b/input/test/ancient-font.ly
@@ -10,18 +10,26 @@
 
 global =  \notes {
     \property Score.timing = ##f
+%   \property Score.forceAccidental = ##t
 %   \property Staff.TimeSignature \override #'style = #'old
 }
 
 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
+       \property Staff.KeySignature \override #'style = #'vaticana
+       \property Staff.Accidentals \override #'style = #'vaticana
        \property Staff.Custos \override #'style = #'vaticana
+       \property Voice.NoteHead \override #'style = #'mensural
+       \key es \major
        \clef "vaticana_fa2"
-       c2 d e f g
+       cis!2 des! e! fis! ges!
 
 %      \property Staff.clefGlyph = #"clefs-vaticana_do"
 %      \property Staff.clefPosition = #1
@@ -29,83 +37,96 @@ upperVoice =  \context Staff = upperVoice <
        \clef "vaticana_do2"
 
        a b c'
-       b a g f
+       b as gis fes
        \clef "vaticana_fa1"
-       e d c1 \bar "|"
+       es dis ces1 \bar "|"
 
+       \property Staff.KeySignature \override #'style = #'medicaea
+       \property Staff.Accidentals \override #'style = #'medicaea
        \property Staff.Custos \override #'style = #'medicaea
+       \property Voice.NoteHead \override #'style = #'mensural
        \clef "medicaea_fa2"
-       c2 d e f g
+       ces2 des es fes ges
        \clef "medicaea_do2"
-       a b c'
-       b a g f
+       as bes ces'
+       bes as ges fes
        \clef "medicaea_fa1"
-       e d c1 \bar "|"
+       es des ces1 \bar "|"
 
+       \property Staff.KeySignature \override #'style = #'hufnagel
+       \property Staff.Accidentals \override #'style = #'hufnagel
        \property Staff.Custos \override #'style = #'hufnagel
+       \property Voice.NoteHead \override #'style = #'mensural
        \clef "hufnagel_fa2"
-       c2 d e f g
+       ces!2 des! es! fes! ges!
        \clef "hufnagel_do2"
-       a b c'
-       b a g f
-       \clef "hufnagel_fa1"
-       e d c1 \bar "||"
+       as! bes! ces'!
+       bes! as! ges! fes!
+       \clef "hufnagel_do_fa"
+       es! des! ces!1 \bar "||"
     }
 >
 
 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
+       \property Staff.KeySignature \override #'style = #'mensural
+       \property Staff.Accidentals \override #'style = #'mensural
        \property Staff.Custos \override #'style = #'mensural
-       \clef "mensural1_c2"
-       c2 d e f g
+        \property Voice.NoteHead \override #'style = #'mensural
+       \key a \major
+       \clef "neo_mensural_c2"
+       c2 dis es fis ges
         \property Staff.forceClef = ##t
-       \clef "mensural1_c2"
-       a b c'
-       b a g f
-       \clef "mensural2_c2"
+       \clef "neo_mensural_c2"
+       ais bes cis'
+       bis as gis fes
+       \clef "petrucci_c2"
        e d c1 \bar "|"
 
-       \clef "mensural2_c2"
+       \clef "petrucci_c2"
        c2 d e f g
         \property Staff.forceClef = ##t
-       \clef "mensural3_c2"
+       \clef "mensural_c2"
        a b c'
        b a g f
-       \clef "mensural3_c2"
+       \clef "mensural_g"
        e d c1 \bar "|"
 
-       \clef "mensural1_f"
+       \clef "petrucci_f"
        c2 d e f g
         \property Staff.forceClef = ##t
-       \clef "mensural1_f"
+       \clef "petrucci_f"
        a b c'
        b a g f
-       \clef "mensural2_f"
+       \clef "mensural_f"
        e d c1 \bar "|"
 
         \property Staff.forceClef = ##t
-       \clef "mensural2_f"
+       \clef "mensural_f"
        c2 d e f g
        \clef "mensural_g"
-       a' b' c''
-       b' a' g' f'
+       as'! bes'! cis''!
+       bes'! as'! gis'! fis'!
         \property Staff.forceClef = ##t
        \clef "mensural_g"
        e' d' c'1 \bar "|"
 
         \property Staff.forceClef = ##t
-       \clef "mensural_g"
+       \clef "petrucci_g"
        c'2 d' e' f' g'
-       \clef "hufnagel_do_fa"
-       a b c'
-       b a g f
+       \clef "petrucci_g"
+       as'! bes'! cis''!
+       bes'! as'! gis'! fis'!
         \property Staff.forceClef = ##t
-       \clef "hufnagel_do_fa"
-       e d c1 \bar "||"
+       \clef "mensural_g"
+       es'! des'! cis'!1 \bar "||"
     }
 >
 
@@ -118,6 +139,7 @@ lowerVoice =  \context Staff = lowerNotes <
 %      \paperTwentysix
        linewidth = 17.25\cm
        textheight = 26.0\cm
+       stafflinethickness = \staffspace / 5.0
        indent = 0.0
        \translator {
            \StaffContext

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