($(outdir)/%.1): build man

pages unconditionally.

diff --git a/ChangeLog b/ChangeLog
index 26bb357369bfa0baf333892dccd17e17a40140ae..b9ca4b971b8290e6901d6e9a3dac1457bddb7f8b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
+2003-08-31  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+       * VERSION (PACKAGE_NAME): 1.9.3 released
+
+       * stepmake/stepmake/help2man-rules.make ($(outdir)/%.1): build man
+       pages unconditionally.
+
 2003-08-30  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * Documentation/user/music-glossary.tely (Top): small syntax
+       fixes.
+
        * scm/music-functions.scm (remove-tag): filter \tagged music
        expressions.
 

diff --git a/Documentation/topdocs/NEWS.texi b/Documentation/topdocs/NEWS.texi
index bf4aacc5c62f17e4d0dfa4c44394c8b98cfa9e7d..016a325b0722430076ade16e65b568149d9e37c0 100644 (file)
--- a/Documentation/topdocs/NEWS.texi
+++ b/Documentation/topdocs/NEWS.texi
@@ -14,6 +14,7 @@ Each music expression can now be tagged, to make different printed
 versions from the same music expression.  In the following example,
 we see two versions of a piece of music, one for the full score, and
 one with cue notes for the instrumental part:
+
 @example
 < \tag #'part <
   @{ c4 f2 g @}      % in the part, we have cue-notes  
@@ -24,10 +25,13 @@ one with cue notes for the instrumental part:
  
 The same can be applied to articulations, texts, etc.: they are
 made by prepending
+
 @example
-        -\tag #@var{your-tag(s)} 
+        -\tag #@var{your-tags} 
 @end example
+
 to an articulation, for example, 
+
 @example
         c4-\tag #'with-fingerings -4 -\tag #'with-strings \6
 @end example
@@ -35,7 +39,21 @@ to an articulation, for example,
 This defines a note, which has a fingering and a string-number
 indication. 
 
+@item
+The settings for chord-fingering are more flexible. You can specify a
+list where fingerings may be placed, eg.
+
+@example
+       \property Voice.fingeringOrientations = #'(left down)
+@end example
 
+This will put the fingering for the lowest note below the chord, and the
+rest to the left.
+
+@item
+The script previously known as @file{ly2dvi} has been renamed to
+@file{lilypond}. The binary itself is now installed as
+@file{lilypond-bin}.
 
 @item
 Markup text (ie. general text formatting) may now be used for lyrics too. 

diff --git a/Documentation/user/music-glossary.tely b/Documentation/user/music-glossary.tely
index 11c8bffe856b34c96e736b42e353da6a0ac33925..19158b3b132fe19f2fff44f50ddc8c408ee8e25a 100644 (file)
--- a/Documentation/user/music-glossary.tely
+++ b/Documentation/user/music-glossary.tely
@@ -2881,8 +2881,8 @@ half.  Another dot adds yet a fourth of the duration.
 %\property Score.TextScript \set #'font-style = #'large
 \notes\relative c'' {
   \time 4/4
-  g4._"pointed" g8 g2 | g4 () g8 g g2 \bar "||"
-  g4.._"double pointed" g16 g2 | g4 () g8 () g16 g g2 \bar "||" }
+  g4._"pointed" g8 g2 | g4 ~ g8 g g2 \bar "||"
+  g4.._"double pointed" g16 g2 | g4 ~ g8 ~ g16 g g2 \bar "||" }
 @end lilypond
 
 Alternatively note values may be subdivided by other ratios.  Most common is
@@ -2972,9 +2972,9 @@ Other frequently used ornaments are the @emph{turn}, the @emph{mordent} and the
     }
   }
   \notes\relative c'' {
-    a4 [c16 b a b] c2
-    g4 a [b16 a b8] a4
-    e'4 [e32 d e d ~ d8] c2
+    a4 c16[ b a b] c2
+    g4 a  b16-[ a b8] a4
+    e'4 e32[ d e d ~ d8] c2
   }
 >
 @end lilypond
@@ -4255,7 +4255,7 @@ line.  @aref{measure}, @aref{meter}.
 \time 4/4
 \notes\relative c' {
   \partial 4 f4 | bes4. a8 bes4 c |
-  bes () a g f | bes4. a8 bes4 c | f,2. \bar "||" }
+  bes( a) g f | bes4. a8 bes4 c | f,2. \bar "||" }
 @end lilypond
 
 @aitem{voice}

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index 94bb40d6c314a214384deb67c136ab8fd51020a8..7df47a991a5ca26cab04959151cab2d13c303a92 100644 (file)
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -4018,6 +4018,7 @@ some common problems in orchestral music.
 * Multi measure rests::         
 * Automatic part combining::    
 * Hiding staves::               
+* Different editions from one source::  
 * Sound output for transposing instruments::  
 @end menu
 
@@ -4392,7 +4393,8 @@ measure:
   >
 @end lilypond
 
-The part combiner is slated to be rewritten [TODO: explain why].
+The part combiner is rather buggy, and it will be replaced by a better
+mechanism in the near future.
 
 @cindex @code{Thread_devnull_engraver}
 @cindex @code{Voice_engraver}
@@ -4443,16 +4445,17 @@ In the following example, we see two versions of a piece of music, one
 for the full score, and one with cue notes for the instrumental part:
 
 @example
- c1
+    c1
     \relative c' <
        \tag #'part <
          R1 \\
-         {
+         @{
              \property Voice.fontSize = #-1
-             c4_"cue" f2 g4 } 
+             c4_"cue" f2 g4 @} 
         >
        \tag #'score R1
      >
+     c1
 @end example
 
 The same can be applied to articulations, texts, etc.: they are
@@ -4470,11 +4473,11 @@ This defines a note with a conditional fingering indication.
 By applying the @code{remove-tag} function, tagged expressions can be
 filtered. For example,
 @example
-\simultaneous {
+\simultaneous @{
         @var{the music}
        \apply #(remove-tag 'score) @var{the music}
        \apply #(remove-tag 'part) @var{the music}
-}
+@}
 @end example
 would yield
 

diff --git a/debian/changelog b/debian/changelog
index f3a894564e9644ceed12b685d264c5ea8c13c4e3..c318fa081a960ce76c14120ce9fba9ec99502037 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -765,6 +765,7 @@ lilypond (0.1.42-1) unstable; urgency=low
 
   * New upstream release.
   * Now places ly2dvi in /usr/bin.
+       
 
  -- Anthony Fok <foka@debian.org>  Thu, 29 Jan 1998 02:50:36 -0700
 

diff --git a/input/regression/finger-chords.ly b/input/regression/finger-chords.ly
index c803ff9fdb4c739927aefb4bb2b0231dc5ab2f1a..40e3f6a819f7cabe7fd86ba13d2830a6b2f06a48 100644 (file)
--- a/input/regression/finger-chords.ly
+++ b/input/regression/finger-chords.ly
@@ -12,7 +12,9 @@ easier to process."
 
 \score {
     \notes \relative c'{
-       <<c-1 e-2 g-3 b-4 d-5 f-6 a-7 c-8 >> 4  
+
+       %% input order is not 1 2 3 , output is.
+       <<c-1 g'-3 e-2  b'-4 d-5 f-6 a-7 c-8 >> 4       
 
        \property Voice.fingeringOrientations = #'(left)
        << c-1  e-2 g-3 b-5 >> 4

diff --git a/lily/GNUmakefile b/lily/GNUmakefile
index 6b7b293bb07422b18f38d6288a8c48912b8c8828..44f2cc07182743a106354c90af0c66ce2bfb6cd9 100644 (file)
--- a/lily/GNUmakefile
+++ b/lily/GNUmakefile
@@ -9,7 +9,7 @@ MODULE_INCLUDES= $(depth)/flower/include
 MODULE_CXXFLAGS= 
 
 
-HELP2MAN_EXECS = lilypond
+HELP2MAN_EXECS = lilypond-bin
 STEPMAKE_TEMPLATES= c++ executable po help2man
 
 include $(depth)/make/stepmake.make 

diff --git a/lily/new-fingering-engraver.cc b/lily/new-fingering-engraver.cc
index b58b6c962f8c14c3fe74d46dbff637bfd6280176..10f5a7d6b22b14ccd37603e3dad36c02cca481de 100644 (file)
--- a/lily/new-fingering-engraver.cc
+++ b/lily/new-fingering-engraver.cc
@@ -316,5 +316,5 @@ ENTER_DESCRIPTION(New_fingering_engraver,
 /* creats*/       "Fingering",
 /* accepts */     "",
 /* acks  */       "rhythmic-head-interface stem-interface",
-/* reads */       "fingerHorizontalDirection",
+/* reads */       "fingeringOrientations",
 /* write */       "");

diff --git a/scripts/GNUmakefile b/scripts/GNUmakefile
index 1039423e473191240232209a9a8d2c571e707a51..bb8376f835938c1e5284ff84b800036a4c6a71e4 100644 (file)
--- a/scripts/GNUmakefile
+++ b/scripts/GNUmakefile
@@ -1,6 +1,6 @@
 depth = ..
 
-SEXECUTABLES=convert-ly lilypond-book ly2dvi abc2ly as2text etf2ly musedata2ly pmx2ly mup2ly midi2ly
+SEXECUTABLES=convert-ly lilypond-book lilypond abc2ly as2text etf2ly musedata2ly pmx2ly mup2ly midi2ly
 STEPMAKE_TEMPLATES=script help2man po
 LOCALSTEPMAKE_TEMPLATES = lilypond
 HELP2MAN_EXECS = $(SEXECUTABLES)

diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index 646f042ece4f73da2ce68d0734d5d78ec6ff433d..d95c10955ebfb6ef8aa1d29dd320330079a0c306 100644 (file)
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -1446,9 +1446,10 @@ if 1:
                              'acciaccatura', str)
 
                if re.search ("context-spec-music"):
-                       sys.stderr.write ("context-spec-music takes a symbol for the context now. Update by hand."
+                       sys.stderr.write ("context-spec-music takes a symbol for the context now. Update by hand.")
+                                         
                        raise FatalConversionError()
-
+               
                str = re.sub ('fingerHorizontalDirection *= *#(LEFT|-1)',
                              "fingeringOrientations = #'(up down left)", str)
                str = re.sub ('fingerHorizontalDirection *= *#(RIGHT|1)',

diff --git a/stepmake/stepmake/help2man-rules.make b/stepmake/stepmake/help2man-rules.make
index bf059e4a682f0208063a1d729f97f7c016b91bd6..10b668d36a5e820685341b6efa7a0f024b7e10a7 100644 (file)
--- a/stepmake/stepmake/help2man-rules.make
+++ b/stepmake/stepmake/help2man-rules.make
@@ -23,9 +23,4 @@ endif
 HELP2MAN_COMMAND = $(PERL) $(builddir)/buildscripts/$(outbase)/help2man $< > $@
 
 $(outdir)/%.1: $(outdir)/%
-       @echo "generating man page from $< --help"
-       @echo "$(HELP2MAN_COMMAND)"
-       @$(HELP2MAN_COMMAND) || \
-       (echo ""; echo "Apparently the man pages failed to build. This is";\
-       echo "no problem, since they don't contain any information anyway.";\
-       echo "Please run make again, and be prepared for NO manual pages.")
+       $(HELP2MAN_COMMAND)