* ly/engraver-init.ly: remove Lyrics context.

(TabVoice): add noteheads engraver

* ly/engraver-init.ly: remove Thread

* scripts/convert-ly.py (conv): \harmonic rule

* ly/engraver-init.ly: add DrumStaff and DrumVoice contexts

diff --git a/ChangeLog b/ChangeLog
index 40547e3a51ec9b63cc888f7de975fb067c35f081..b54a708a34ba3135308bb62077a0f17f4cec28a8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-02-05  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+       * ly/engraver-init.ly: remove Lyrics context.
+       (TabVoice): add noteheads engraver
+
        * input/test/improv.ly: update: do not use Thread switching. 
 
        * lily/pitch-squash-engraver.cc (acknowledge_grob): only squash if

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 41bb81cf5dda3cee45dc0bceb8b0dab63ba07fad..a1de8962d3721a148e8cd62be953ba9479a730f9 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -364,22 +364,6 @@ printing of a single line of lyrics.  "
     \consists "Separating_line_group_engraver"
 }
 
-\translator {
-    \type "Engraver_group_engraver"
-    \name Lyrics
-    \description  "Typesets lyrics."
-    
-    %% To get folded repeats right.
-    \consists Vertical_align_engraver 
-
-    minimumVerticalExtent = ##f
-    extraVerticalExtent = ##f
-    verticalExtent = ##f 
-    
-    \accepts "LyricsVoice"
-}
-
-
 \translator {
     \type "Engraver_group_engraver"
     \name ChordNames
@@ -633,6 +617,7 @@ EasyNotation = \translator {
       \VoiceContext
       \name "TabVoice"
       \consists "Tab_note_heads_engraver"
+      \remove "Note_heads_engraver"
       \remove "Fingering_engraver"
       \remove "New_fingering_engraver"
 

diff --git a/scm/output-lib.scm b/scm/output-lib.scm
index a305b10eb89b9912623db2d1e478468932512782..ef38cc2dc4f777e4e54fb183d3ff8f4954b95dde 100644 (file)
--- a/scm/output-lib.scm
+++ b/scm/output-lib.scm
@@ -37,11 +37,15 @@
          (note-column2 (car  note-collums))
          (note1        (car (ly:get-grob-property note-column1 'note-heads)))
          (note2        (car (ly:get-grob-property note-column2 'note-heads)))
-         (fret1        (string->number (ly:get-grob-property note1 'text)))
-         (fret2        (string->number (ly:get-grob-property note2 'text)))
-         (letter       (if (< fret1 fret2) "H"
-                       (if (> fret1 fret2) "P"
-                                           "")))
+        (text1  (ly:get-grob-property note1 'text))
+        (text2  (ly:get-grob-property note2 'text))
+         (fret1        (if (string? text1) (string->number text1) 0))
+         (fret2        (if (string? text2) (string->number text2) 0))
+         (letter       (cond
+                       ((< fret1 fret2) "H")
+                       ((> fret1 fret2) "P")
+                       (else "")))
+                                   
          )
     (let ((slur (Slur::brew_molecule grob))
           (text (fontify-text (ly:get-default-font grob) letter)))

diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index d70efaf4de0ea712e0a0b6a8bdb7f0d66662aa99..3691da139506192c72568dd391e98e5d0103bc2e 100644 (file)
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -1797,11 +1797,17 @@ def conv (str):
 
        str = re.sub (r"""\\new Thread""", """\context Voice""", str)
        str = re.sub (r"""Thread""", """Voice""", str)
+
+       str = re.sub (r"""LyricsVoice""", r"""L@ricsVoice""", str)
+       str = re.sub (r"""\bLyrics\b""", r"""\1 LyricsVoice""", str)
+       str = re.sub (r"""LyricsContext""", r"""LyricsVoiceContext""", str)
+       str = re.sub (r"""L@ricsVoice""", r"""LyricsVoice""",str)
+       
        
        return str
 
 conversions.append (((2,1,19), conv, """Drum notation changes, Removing \chordmodifiers, \notenames.
-Harmonic notes. Thread context removed."""))
+Harmonic notes. Thread context removed. Lyrics context removed."""))
 
 ################################
 #      END OF CONVERSIONS