From c3579a86d9a0bfccb51ff1f23c4f4125f57685e2 Mon Sep 17 00:00:00 2001
From: hanwen <hanwen>
Date: Thu, 5 Feb 2004 11:23:44 +0000
Subject: [PATCH] * 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
---
 ChangeLog             |  3 +++
 ly/engraver-init.ly   | 17 +----------------
 scm/output-lib.scm    | 14 +++++++++-----
 scripts/convert-ly.py |  8 +++++++-
 4 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 40547e3a51..b54a708a34 100644
--- 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 41bb81cf5d..a1de8962d3 100644
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -366,22 +366,6 @@ printing of a single line of lyrics.  "
 
 \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
     \description "Typesets chord names."
     
@@ -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 a305b10eb8..ef38cc2dc4 100644
--- 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 d70efaf4de..3691da1395 100644
--- 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	
-- 
2.11.4.GIT