*** empty log message ***

diff --git a/Documentation/user/converters.itely b/Documentation/user/converters.itely
index 3a2c35526f07acfe77da0770e5c66837a913170d..233c5f4df35c9cfb8eb713d95f2ea4dea2975430 100644 (file)
--- a/Documentation/user/converters.itely
+++ b/Documentation/user/converters.itely
@@ -229,7 +229,6 @@ on PMX is available from the following site:
 @cindex PMX
 @cindex MusiXTeX
 @cindex Simons, Don
-
 pmx2ly converts from PMX to LilyPond input. The program is invoked as
 follows:
 
@@ -248,6 +247,13 @@ set output filename to FILE
 version information
 @end table
 
+@refbugs
+
+This script was updated last in September 2000, and then successfully
+converted the @file{barsant.pmx} example from the PMX
+distribution. Apparently no-one has ever bothered to use pmx2ly, since
+pmx2ly can not parse recent PMX files.
+
 
 @node Invoking musedata2ly
 @section Invoking musedata2ly

diff --git a/NEWS b/NEWS
index b66d17e70d72824d46663ecb2f282e6675304a8c..9c0cbc3ab2b50ec3e002ef8219bb487ebf6ca911 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -38,10 +38,9 @@ for a beamed slurred pair of eighth notes.
 
 * NOTATION
 
-* Completely rewritten text formatting support. It is implemented in a
+** Completely rewritten text formatting support. It is implemented in a
 completely modular way.
 
-
 ** Better chord names. 
 
 ** Texts on multimeasure rests can be set by the user.

diff --git a/input/test/beam-damp.ly b/input/test/beam-damp.ly
index 0d9f59da952c5102504b5f0846fb16fe50d786e7..f394cb0e10a1b523b3ed8ddfc5b90ecee19ab665 100644 (file)
--- a/input/test/beam-damp.ly
+++ b/input/test/beam-damp.ly
@@ -1,3 +1,7 @@
+\header {
+texidoc = "Beams are less steep than the notes they encompass. "
+}
+
 \version "1.7.6"
 \score{
        \notes\relative c''{

diff --git a/make/lilypond.redhat.spec.in b/make/lilypond.redhat.spec.in
index 77b16b94c765df3c0e8e020d5274faceaedc84d4..916ccd5c4333c36dd90d1ad06c566903fe34230c 100644 (file)
--- a/make/lilypond.redhat.spec.in
+++ b/make/lilypond.redhat.spec.in
@@ -1,6 +1,7 @@
 # -*-rpm-spec-mode-*-
 
 %define info yes
+%define docdir %{_docdir}/lilypond/
 
 Name: lilypond
 Version: @TOPLEVEL_VERSION@
@@ -27,7 +28,7 @@ Group: Applications/Publishing
 
 %description documentation
 Documentation and example files of LilyPond. An index is available at
-%{_docdir}/web/Documentation/out-www/index.html
+%{docdir}/web/Documentation/out-www/index.html
 
 %prep
 %setup
@@ -42,6 +43,7 @@ Documentation and example files of LilyPond. An index is available at
 
 ./configure --disable-checking --prefix=%{_prefix} --enable-optimising
 
+
 make MAKE_PFA_FILES=1 all
 make -C mf/ pfa
 

diff --git a/scripts/pmx2ly.py b/scripts/pmx2ly.py
index c462713be9350feef777773315d948eba58ec76d..72f1471127add24dae9e118e59d81f2b1213d059 100644 (file)
--- a/scripts/pmx2ly.py
+++ b/scripts/pmx2ly.py
@@ -162,6 +162,7 @@ class Voice:
                
        def last_chord (self):
                return self.chords[-1]
+       
        def add_chord (self, ch):
                self.chords.append (ch)
                self.entries.append (ch)
@@ -258,9 +259,11 @@ class Staff:
                        v.number = i
                        i = i+1
        def set_clef (self, letter):
-               clstr = clef_table[letter]
-               self.voices[0].add_nonchord (Clef (clstr))
-
+               if clef_table.has_key (letter):
+                       clstr = clef_table[letter]
+                       self.voices[0].add_nonchord (Clef (clstr))
+               else:
+                       sys.stderr.write ("Clef type `%c' unknown\n" % letter)
        
        def current_voice (self):
                return self.voices[self.voice_idx]
@@ -600,7 +603,7 @@ Huh? expected duration, found %d Left was `%s'""" % (durdigit, str[:20]))
                        numbers = numbers + map (atonum, opening)
 
                (no_staffs, no_instruments, timesig_num, timesig_den, ptimesig_num,
-                ptimesig_den, pickup_beats,keysig_number) = tuple (numbers[0:8])
+                esig_den, pickup_beats,keysig_number) = tuple (numbers[0:8])
                (no_pages,no_systems, musicsize, fracindent) = tuple (numbers[8:])
 
                # ignore this.
@@ -765,11 +768,13 @@ Huh? Unknown directive `%s', before `%s'""" % (c, left[:20] ))
                ls = open (fn).readlines ()
                def subst(s):
                        return re.sub ('%.*$', '', s)
+               
                ls = map (subst, ls)
+               ls = filter (lambda x: x <> '\n', ls)
                ls = self.parse_header (ls)
                left = string.join (ls, ' ')
 
-               print left
+#              print left
                self.parse_body (left)
                for c in self.staffs:
                        c.calculate ()