lilypond-1.5.21

diff --git a/Documentation/topdocs/README.texi b/Documentation/topdocs/README.texi
index dbd1ffa5115048b0278a73a47818ddce2b1998bb..5ac05c33429915cca71544c790a25f8af0d6612b 100644 (file)
--- a/Documentation/topdocs/README.texi
+++ b/Documentation/topdocs/README.texi
@@ -108,7 +108,7 @@ files, eg.,
 rm `find /var/lib/texmf/fonts -name 'feta*'` 
 @end example 
 
-a script to do this for you is in @file{buildscripts/clean-fonts.sh}
+a script to do this for you is in @file{buildscripts/out/clean-fonts}
 
 @section Bugs
 

diff --git a/Documentation/user/latex-example.latex b/Documentation/user/latex-example.latex
index 68a861072a96014963980897cec15552226966cf..fa675e55e8af0fa46d62e0450aaa5b96e045def4 100644 (file)
--- a/Documentation/user/latex-example.latex
+++ b/Documentation/user/latex-example.latex
@@ -6,40 +6,25 @@
 %\def\postLilypondExample{}
 
 
+\usepackage{graphics}
+\def\postLilypondExample{}
+\def\preLilypondExample{}
 \begin{document}
 
-\begin{lilypond}
-\score {
- \notes\relative c' { c d e f g a b c }
-}
-\end{lilypond}
+\preLilypondExample \input lily-464146743.tex \postLilypondExample
 
 
-\begin[fragment]{lilypond}
-c d e
-\end{lilypond}
+
+\preLilypondExample \input lily-940223662.tex \postLilypondExample
+
 
 
 % generate standard lilypond titles
 \input titledefs.tex
 \def\preLilypondExample{\def\mustmakelilypondtitle{}}
 
-\begin{lilypond}
-\header {
-  title =      "Title"
-  subtitle =   "Subtitle"
-  subsubtitle =        "Subsubtitle"
-  opus =  "Opus 1"
-  piece = "Piece"
-  composer =    "Composer"
-  enteredby =   "JCN"
-  instrument = "instrument"
-}
-\paper { linewidth = -1. }
-\score {
-  \notes \relative c'' { a b c d }
-}
-\end{lilypond}
+\preLilypondExample \input lily-615430739.tex \postLilypondExample
+
 
 \begin{enumerate}
 \item Vers one.  aaa aaa aaa aaa aaa aaa aaa aaa aaa aaa 

diff --git a/aclocal.m4 b/aclocal.m4
index 3003cbd938eec27cd4eb075798847334cab0a441..082312d7413a30eea1b2f3ff52f1c1552f7260fd 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,3 +1,5 @@
+dnl WARNING WARNING WARNING WARNING
+dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4
 dnl aclocal.m4   -*-shell-script-*-
 dnl StepMake subroutines for configure.in
 

diff --git a/scripts/abc2ly.py b/scripts/abc2ly.py
index 6428e0f1054aa4fb6ff2cbc6062da1b4a01c10fd..23aa46d3977c9df9c39fd87349449dac56bfbaab 100644 (file)
--- a/scripts/abc2ly.py
+++ b/scripts/abc2ly.py
@@ -32,7 +32,8 @@
 # the default placement for text in abc is above the staff.
 # %%LY now supported.
 # \breve and \longa supported.
-                       
+# M:none doesn't crash lily.
+
 # Limitations
 #
 # Multiple tunes in single file not supported
@@ -163,6 +164,7 @@ def dump_header (outf,hdr):
        ks = hdr.keys ()
        ks.sort ()
        for k in ks:
+               hdr[k] = re.sub('"', '\\"', hdr[k])             
                outf.write ('\t%s = "%s"\n'% (k,hdr[k]))
        outf.write ('}')
 
@@ -225,7 +227,7 @@ def try_parse_q(a):
                array2=string.split(array[1],'=')
                denominator=array2[0]
                perminute=array2[1]
-               duration=str(string.atof(denominator)/string.atoi(numerator))
+               duration=str(string.atoi(denominator)/string.atoi(numerator))
                midi_specs=string.join(["\\tempo", duration, "=", perminute])
        else:
                sys.stderr.write("abc2ly: Warning, unable to parse Q specification: %s\n" % a)
@@ -489,8 +491,10 @@ def try_parse_tuplet_begin (str, state):
        if re.match ('\([2-9]', str):
                dig = str[1]
                str = str[2:]
-               state.parsing_tuplet = string.atoi (dig[0])
-               
+               prev_tuplet_state = state.parsing_tuplet
+               state.parsing_tuplet = string.atoi (dig[0])
+               if prev_tuplet_state:
+                       voices_append ("}")             
                voices_append ("\\times %s {" % tup_lookup[dig])
        return str
 
@@ -585,7 +589,10 @@ def try_parse_header_line (ln, state):
                        a = re.sub('[ \t]*$','', a)     #strip trailing blanks
                        if header.has_key('title'):
                                if a:
-                                       header['title'] = header['title'] + '\\\\\\\\' + a
+                                       if len(header['title']):
+                                               header['title'] = header['title'] + '\\\\\\\\' + a
+                                       else:
+                                               header['subtitle'] = a
                        else:
                                header['title'] =  a
                if g == 'M':    # Meter
@@ -603,7 +610,8 @@ def try_parse_header_line (ln, state):
                                set_default_len_from_time_sig (a)
                        else:
                                length_specified = 0
-                       voices_append ('\\time %s' % a)
+                       if not a == 'none':
+                               voices_append ('\\time %s' % a)
                        state.next_bar = ''
                if g == 'K': # KEY
                        a = check_clef(a)
@@ -712,6 +720,9 @@ def duration_to_lilypond_duration  (multiply_tup, defaultlen, dots):
        if base == 1:
                if (multiply_tup[0] / multiply_tup[1])  == 2:
                        base = '\\breve'
+               if (multiply_tup[0] / multiply_tup[1]) == 3:
+                       base = '\\breve'
+                       dots = 1
                if (multiply_tup[0] / multiply_tup[1]) == 4:
                        base = '\longa'
        return '%s%s' % ( base, '.'* dots)