* scm/clef.scm (c0-pitch-alist): replace - with .

* scripts/lilypond-book.py (process_snippets): add texstr support.

diff --git a/input/paddy.abc b/input/paddy.abc
index 7650c417689c7bff15399db15ce3ac37416be5c2..0aadebc63c1e9f3144087a46af9fbd5448ef8905 100644 (file)
--- a/input/paddy.abc
+++ b/input/paddy.abc
@@ -1,49 +1,16 @@
-\version "2.3.25"
-\header {
-       composer = "Trad."
-       crossRefNumber = "1"
-       footnotes = ""
-       tagline = "Lily was here (unknown version) -- automatically converted from ABC"
-       title = "Paddy O'Rafferty"
-}
-voicedefault =  {
-\set Score.defaultBarType = "empty"
+%
+%  This is NOT a lilypond input file. It is an ABC file, see
+%  http://www.gre.ac.uk/~c.walshaw/abc/
+%  
+%  LilyPond includes import tools for Finale, Musedata, ABC, MIDI and PMX
+%
+X:1
+T:Paddy O'Rafferty
+C:Trad.
+M:6/8
+K:D
+dff cee|def gfe|dff cee|dfe dBA|dff cee|def gfe|faf gfe|1 dfe dBA:|2 dfe dcB||
+~A3 B3|gfe fdB|AFA B2c|dfe dcB|~A3 ~B3|efe efg|faf gfe|1 dfe dcB:|2 dfe dBA||
+fAA eAA|def gfe|fAA eAA|dfe dBA|fAA eAA|def gfe|faf gfe|dfe dBA:|
 
-%   This is NOT a lilypond input file. It is an ABC file, see
- %   http://www.gre.ac.uk/~c.walshaw/abc/
- %   
- %   LilyPond includes import tools for Finale, Musedata, ABC, MIDI and PMX
- \time 6/8   d''8    f''8    f''8    c''8    e''8    e''8  \bar "|"   d''8    
-e''8    f''8    g''8    f''8    e''8  \bar "|"   d''8    f''8    f''8    c''8   
- e''8    e''8  \bar "|"   d''8    f''8    e''8    d''8    b'8    a'8  \bar "|"  
- d''8    f''8    f''8    c''8    e''8    e''8  \bar "|"   d''8    e''8    f''8  
-  g''8    f''8    e''8  \bar "|"   f''8    a''8    f''8    g''8    f''8    e''8 
- \bar "|"   d''8    f''8    e''8    d''8    b'8    a'8  \bar ":|"   d''8    
-f''8    e''8    d''8    c''8    b'8  \bar "||"     a'4. ^"~"    b'4.  \bar "|"  
- g''8    f''8    e''8    f''8    d''8    b'8  \bar "|"   a'8    f'8    a'8    
-b'4    c''8  \bar "|"   d''8    f''8    e''8    d''8    c''8    b'8  \bar "|"   
-a'4. ^"~"    b'4. ^"~"  \bar "|"   e''8    f''8    e''8    e''8    f''8    g''8 
- \bar "|"   f''8    a''8    f''8    g''8    f''8    e''8  \bar "|"   d''8    
-f''8    e''8    d''8    c''8    b'8  \bar ":|"   d''8    f''8    e''8    d''8   
- b'8    a'8  \bar "||"     f''8    a'8    a'8    e''8    a'8    a'8  \bar "|"   
-d''8    e''8    f''8    g''8    f''8    e''8  \bar "|"   f''8    a'8    a'8    
-e''8    a'8    a'8  \bar "|"   d''8    f''8    e''8    d''8    b'8    a'8  
-\bar "|"   f''8    a'8    a'8    e''8    a'8    a'8  \bar "|"   d''8    e''8    
-f''8    g''8    f''8    e''8  \bar "|"   f''8    a''8    f''8    g''8    f''8   
- e''8  \bar "|"   d''8    f''8    e''8    d''8    b'8    a'8  \bar ":|"         
-  
-}
 
-\score{
-         <<
-
-       \context Staff="default"
-       {
-           \voicedefault 
-       }
-
-    >>
-       \layout {
-       }
-       \midi {}
-}

diff --git a/scm/clef.scm b/scm/clef.scm
index e8304b06225cf33a0ba60198e22c10deca7161f4..60dc39708323d81523b0036b4df279e1ff456c9b 100644 (file)
--- a/scm/clef.scm
+++ b/scm/clef.scm
@@ -29,39 +29,39 @@
     ("tab" . ("clefs.tab" 0 0))
 
     ;; should move mensural stuff to separate file?
-    ("vaticana-do1" . ("clefs.vaticana-do" -1 0))
-    ("vaticana-do2" . ("clefs.vaticana-do" 1 0))
-    ("vaticana-do3" . ("clefs.vaticana-do" 3 0))
-    ("vaticana-fa1" . ("clefs.vaticana-fa" -1 0))
-    ("vaticana-fa2" . ("clefs.vaticana-fa" 1 0))
-    ("medicaea-do1" . ("clefs.medicaea-do" -1 0))
-    ("medicaea-do2" . ("clefs.medicaea-do" 1 0))
-    ("medicaea-do3" . ("clefs.medicaea-do" 3 0))
-    ("medicaea-fa1" . ("clefs.medicaea-fa" -1 0))
-    ("medicaea-fa2" . ("clefs.medicaea-fa" 1 0))
-    ("hufnagel-do1" . ("clefs.hufnagel-do" -1 0))
-    ("hufnagel-do2" . ("clefs.hufnagel-do" 1 0))
-    ("hufnagel-do3" . ("clefs.hufnagel-do" 3 0))
-    ("hufnagel-fa1" . ("clefs.hufnagel-fa" -1 0))
-    ("hufnagel-fa2" . ("clefs.hufnagel-fa" 1 0))
-    ("hufnagel-do-fa" . ("clefs.hufnagel-do-fa" 4 0))
-    ("mensural-c1" . ("clefs.mensural-c" -2 0))
-    ("mensural-c2" . ("clefs.mensural-c" 0 0))
-    ("mensural-c3" . ("clefs.mensural-c" 2 0))
-    ("mensural-c4" . ("clefs.mensural-c" 4 0))
-    ("mensural-f" . ("clefs.mensural-f" 2 0))
-    ("mensural-g" . ("clefs.mensural-g" -2 0))
-    ("neomensural-c1" . ("clefs.neomensural-c" -4 0))
-    ("neomensural-c2" . ("clefs.neomensural-c" -2 0))
-    ("neomensural-c3" . ("clefs.neomensural-c" 0 0))
-    ("neomensural-c4" . ("clefs.neomensural-c" 2 0))
-    ("petrucci-c1" . ("clefs.petrucci-c1" -4 0))
-    ("petrucci-c2" . ("clefs.petrucci-c2" -2 0))
-    ("petrucci-c3" . ("clefs.petrucci-c3" 0 0))
-    ("petrucci-c4" . ("clefs.petrucci-c4" 2 0))
-    ("petrucci-c5" . ("clefs.petrucci-c5" 4 0))
-    ("petrucci-f" . ("clefs.petrucci-f" 2 0))
-    ("petrucci-g" . ("clefs.petrucci-g" -2 0))))
+    ("vaticana-do1" . ("clefs.vaticana.do" -1 0))
+    ("vaticana-do2" . ("clefs.vaticana.do" 1 0))
+    ("vaticana-do3" . ("clefs.vaticana.do" 3 0))
+    ("vaticana-fa1" . ("clefs.vaticana.fa" -1 0))
+    ("vaticana-fa2" . ("clefs.vaticana.fa" 1 0))
+    ("medicaea-do1" . ("clefs.medicaea.do" -1 0))
+    ("medicaea-do2" . ("clefs.medicaea.do" 1 0))
+    ("medicaea-do3" . ("clefs.medicaea.do" 3 0))
+    ("medicaea-fa1" . ("clefs.medicaea.fa" -1 0))
+    ("medicaea-fa2" . ("clefs.medicaea.fa" 1 0))
+    ("hufnagel-do1" . ("clefs.hufnagel.do" -1 0))
+    ("hufnagel-do2" . ("clefs.hufnagel.do" 1 0))
+    ("hufnagel-do3" . ("clefs.hufnagel.do" 3 0))
+    ("hufnagel-fa1" . ("clefs.hufnagel.fa" -1 0))
+    ("hufnagel-fa2" . ("clefs.hufnagel.fa" 1 0))
+    ("hufnagel-do-fa" . ("clefs.hufnagel.do.fa" 4 0))
+    ("mensural-c1" . ("clefs.mensural.c" -2 0))
+    ("mensural-c2" . ("clefs.mensural.c" 0 0))
+    ("mensural-c3" . ("clefs.mensural.c" 2 0))
+    ("mensural-c4" . ("clefs.mensural.c" 4 0))
+    ("mensural-f" . ("clefs.mensural.f" 2 0))
+    ("mensural-g" . ("clefs.mensural.g" -2 0))
+    ("neomensural-c1" . ("clefs.neomensural.c" -4 0))
+    ("neomensural-c2" . ("clefs.neomensural.c" -2 0))
+    ("neomensural-c3" . ("clefs.neomensural.c" 0 0))
+    ("neomensural-c4" . ("clefs.neomensural.c" 2 0))
+    ("petrucci-c1" . ("clefs.petrucci.c1" -4 0))
+    ("petrucci-c2" . ("clefs.petrucci.c2" -2 0))
+    ("petrucci-c3" . ("clefs.petrucci.c3" 0 0))
+    ("petrucci-c4" . ("clefs.petrucci.c4" 2 0))
+    ("petrucci-c5" . ("clefs.petrucci.c5" 4 0))
+    ("petrucci-f" . ("clefs.petrucci.f" 2 0))
+    ("petrucci-g" . ("clefs.petrucci.g" -2 0))))
 
 ;; "an alist mapping GLYPHNAME to the position of the middle C for
 ;; that symbol"
@@ -71,24 +71,24 @@
     ("clefs.F" . 4)
     ("clefs.percussion" . 0)
     ("clefs.tab" . 0 )
-    ("clefs.vaticana-do" . 0)
-    ("clefs.vaticana-fa" . 4)
-    ("clefs.medicaea-do" . 0)
-    ("clefs.medicaea-fa" . 4)
-    ("clefs.hufnagel-do" . 0)
-    ("clefs.hufnagel-fa" . 4)
-    ("clefs.hufnagel-do-fa" . 0)
-    ("clefs.mensural-c" . 0)
-    ("clefs.mensural-f" . 4)
-    ("clefs.mensural-g" . -4)
-    ("clefs.neomensural-c" . 0)
-    ("clefs.petrucci-c1" . 0)
-    ("clefs.petrucci-c2" . 0)
-    ("clefs.petrucci-c3" . 0)
-    ("clefs.petrucci-c4" . 0)
-    ("clefs.petrucci-c5" . 0)
-    ("clefs.petrucci-f" . 4)
-    ("clefs.petrucci-g" . -4)))
+    ("clefs.vaticana.do" . 0)
+    ("clefs.vaticana.fa" . 4)
+    ("clefs.medicaea.do" . 0)
+    ("clefs.medicaea.fa" . 4)
+    ("clefs.hufnagel.do" . 0)
+    ("clefs.hufnagel.fa" . 4)
+    ("clefs.hufnagel.do.fa" . 0)
+    ("clefs.mensural.c" . 0)
+    ("clefs.mensural.f" . 4)
+    ("clefs.mensural.g" . -4)
+    ("clefs.neomensural.c" . 0)
+    ("clefs.petrucci.c1" . 0)
+    ("clefs.petrucci.c2" . 0)
+    ("clefs.petrucci.c3" . 0)
+    ("clefs.petrucci.c4" . 0)
+    ("clefs.petrucci.c5" . 0)
+    ("clefs.petrucci.f" . 4)
+    ("clefs.petrucci.g" . -4)))
 
 (define-public (make-clef-set clef-name)
   "Generate the clef setting commands for a clef with name CLEF-NAME."

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index dc5a24cc1cabcaa23f4bb6588319b7a1fcfbe337..48184377028e984a326e016a50418e84b66a9695 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -1146,7 +1146,11 @@ def process_snippets (cmd, ly_snippets, texstr_snippets, png_snippets):
                        ly.error ('Process %s exited unsuccessfully.' % cmd)
                        raise Compile_error
 
-       if texstr_names:
+       # UGH
+       # the --process=CMD switch is a bad idea
+       # it is too generic for lilypond-book.
+       if texstr_names and re.search ('^[0-9A-Za-z/]*lilypond', cmd):
+               
                my_system (string.join ([cmd + ' -f texstr ' ] + texstr_names))
                for l in texstr_names:
                        my_system ('latex %s.texstr' % l)