* scm/fret-diagrams.scm (label-fret): use cond instead of case for

symbols.

* Documentation/user/notation.itely (Easy Notation note heads):
revise notation Chapter.

diff --git a/ChangeLog b/ChangeLog
index e6817a6bcb6efb3078823b09522f7eec58bd216f..bcbb7addf5b943891c17a2e0208021e7f1f73309 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-08-22  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+       * scm/fret-diagrams.scm (label-fret): use cond instead of case for
+       symbols.
+
        * Documentation/user/notation.itely (Easy Notation note heads):
        revise notation Chapter.
 

diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely
index 0c0e0ce072f1e8ba5fb5ec34dc619130a04ded4d..4804a9b6c4a6f304f9409326b73fe24456dd3c3e 100644 (file)
--- a/Documentation/user/notation.itely
+++ b/Documentation/user/notation.itely
@@ -5206,7 +5206,7 @@ first part (with context called @code{one}) always gets up stems, and
 `Solo II'.
 
 If you just want the merging parts, and not the textual markings, you
-may set the property @code{soloADue} to false
+may set the property @code{printPartCombineTexts} to false
 
 @lilypond[quote,verbatim,raggedright,fragment,relative=2]
 \new Staff <<
@@ -6044,7 +6044,7 @@ be made by hand, by setting
 @example
   breveTP = #(ly:make-duration -1 0 3 2)
   @dots{}
-  { c\breveTP f1 }
+  @{ c\breveTP f1 @}
 @end example
 
 @noindent
@@ -7259,7 +7259,7 @@ support for contemporary notation in LilyPond is limited.
 @menu
 * Polymetric notation::         
 * Clusters::                    
-* Fermatas::                    
+* Special fermatas::            
 * Feathered beams::             
 @end menu
 

diff --git a/cygwin/bug-lilypond-cygwin.sh b/cygwin/bug-lilypond-cygwin.sh
index cd46270fdc53096cccf504f46ade3cdca07c772b..e3e0925d1baff6e9f0ffad256ff74b8f9b11bc7f 100644 (file)
--- a/cygwin/bug-lilypond-cygwin.sh
+++ b/cygwin/bug-lilypond-cygwin.sh
@@ -20,7 +20,7 @@ Please source this script, ie do:
 EOF
 fi
 
-docdir=@prefix@/share/doc/lilypond-@TOPLEVEL_VERSION@-1
+docdir=@prefix@/share/doc/lilypond-@TOPLEVEL_VERSION@
 [ ! -d $docdir ] && docdir=@prefix@/doc/lilypond-@TOPLEVEL_VERSION@-1
 [ ! -d $docdir ] && docdir=$(echo @prefix@/share/doc/lilypond-[.-0-9]*)
 [ ! -d $docdir ] && docdir=$(echo @prefix@/doc/lilypond-[.-0-9]*)

diff --git a/cygwin/lilypond.hint b/cygwin/lilypond.hint
index 7878a9ce0a756071036fe104e9ed349fdda41466..4103d1ce10d38ab55649a1b9808af081efe25052 100644 (file)
--- a/cygwin/lilypond.hint
+++ b/cygwin/lilypond.hint
@@ -1,8 +1,8 @@
 sdesc: "A program for printing sheet music"
-test: 1.9.8-1
-curr: 1.8.2-1
+#test: 1.9.8-1
+#curr: 1.8.2-1
 category: Publishing
-requires: bash cygwin fileutils findutils ghostscript libguile12abi13 libguile12 libiconv2 libintl2 libkpathsea3 libkpathsea3abi13 python tetex-bin tetex-tiny
+requires: bash cygwin fileutils findutils ghostscript libguile12abi13 libguile12 libiconv2 libintl2 libkpathsea3 libkpathsea3abi13 python tetex-bin tetex-tiny _update-info-dir
 #requires: tetex-bin, tetex-tiny | tetex-base
 #suggests: emacs gsview lilypond-doc rxvt tetex-x11 XFree86-serv
 ldesc: "A program for printing sheet music.

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 79cf5490e65320e32673275617ac5d211d5bfc31..8639d0f57230d99d5a25708d443576471af3274e 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -436,7 +436,7 @@ AncientRemoveEmptyStaffContext = \context {
     soloText = #"Solo"
     soloIIText = #"Solo II"
     aDueText = #"a2"
-    soloADue = ##t
+    printPartCombineTexts = ##t
     systemStartDelimiter =#'SystemStartBar
 
     drumStyleTable = #drums-style

diff --git a/scm/fret-diagrams.scm b/scm/fret-diagrams.scm
index da9504aa9506f448a5a14662be483dbcae103e65..6b9a7ad3e4f3eaabf9b56f64c813ca95ed906d0f 100644 (file)
--- a/scm/fret-diagrams.scm
+++ b/scm/fret-diagrams.scm
@@ -290,11 +290,11 @@ with magnification @varr{mag} of the string @var{text}."
          (number-type (chain-assoc-get 'number-type props 'roman-lower))
           (fret-count (+ (- (cadr fret-range) (car fret-range)) 1))
            (label-text 
-              (case number-type 
-                  ('roman-lower (format #f "~(~:@r~)" base-fret))
-                  ('roman-upper (format #f "~:@r" base-fret))
-                  ('arabic  (format #f "~d" base-fret))
-                  (else (format #f  "~(~:@r~)" base-fret)))))
+              (cond
+              ((equal?   number-type  'roman-lower) (format #f "~(~:@r~)" base-fret))
+              ((equal?  number-type 'roman-upper) (format #f "~:@r" base-fret))
+              ((equal? 'arabic number-type)  (format #f "~d" base-fret))
+              (else (format #f  "~(~:@r~)" base-fret)))))
        (ly:stencil-translate-axis 
            (sans-serif-stencil paper props (* size label-font-mag) label-text) 
                        (* size (+ fret-count label-vertical-offset)) Y)))