(compose_ly): make fragment mandatory

for fragment snippets. This fixes inclusion of toplevel-music
examples (such as new-slur.ly)

diff --git a/ChangeLog b/ChangeLog
index 4f40e93de52d9857aa24cac32c7303bfb0767a2d..0db1579b0e437d9196999315b24b93ccd5520628 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-07-16  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+       * scripts/lilypond-book.py (compose_ly): make fragment mandatory
+       for fragment snippets. This fixes inclusion of toplevel-music
+       examples (such as new-slur.ly)
+ 
 2004-07-16  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * scripts/lilypond-book.py: Remove second import of stat.

diff --git a/Documentation/bibliography/computer-notation.bib b/Documentation/bibliography/computer-notation.bib
index adeeb4494abd27027cc05fb2701e3239616419c2..11cd1b42531b0604e10c0886231551f4760fda70 100644 (file)
--- a/Documentation/bibliography/computer-notation.bib
+++ b/Documentation/bibliography/computer-notation.bib
@@ -656,10 +656,6 @@ users in mind) (sic) HWN},
   year={1996}
 }
 
-
-
-
-
 @Article {tablature-web,
   note = {FAQ (with answers) about TAB, the ASCII variant of Tablature. HWN},
   title = {how to read and write tab: a guide to tab notation},

diff --git a/buildscripts/bib2html.py b/buildscripts/bib2html.py
index b2312517a98dba98c31775d4eb0053b0a117073e..01b893b9b7b82427398c2eae1afedf597038ec5f 100644 (file)
--- a/buildscripts/bib2html.py
+++ b/buildscripts/bib2html.py
@@ -9,7 +9,7 @@ import string
 def usage ():
     print 'usage: %s [-s style] [-o <outfile>] BIBFILES...';
 
-print os.environ['BSTINPUTS']
+#print os.environ['BSTINPUTS']
 
 (options, files) = getopt.getopt(sys.argv[1:], 's:o:', [])
 

diff --git a/input/test/new-slur.ly b/input/test/new-slur.ly
index d6bd119e0bf50e3536617de9bcd1aeddaf84b9dc..e31234002a0cda066704eb85572088dacc739dde 100644 (file)
--- a/input/test/new-slur.ly
+++ b/input/test/new-slur.ly
@@ -1,21 +1,16 @@
 
-%{
-
-breaks web
+% breaks web
 \paper {
     raggedright = ##t
 }
-%}
+
 
 \relative {
 
-%{  broken
 
     \override Slur #'after-line-breaking-callback = #New_slur::after_line_breaking
     \override Slur #'print-function = #New_slur::print     
     \override Slur #'height = ##f
-
-%}
     f'=''16( e)    d( c)
     c'=''2(~c8 d16 c b8 a)
     f='4

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 75fe418591e457ca349a2248123269d3fbdb6621..42991681ad02a611121aa3fe0d7e8cadeeb6b6a1 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -351,9 +351,7 @@ def compose_ly (code, options):
        if QUOTE in options and LINEWIDTH in options:
                options.remove (LINEWIDTH)
 
-       m = re.search (r'''\\(header|score)''', code)
-       if not m and (not options \
-                     or not NOFRAGMENT in options or FRAGMENT in options):
+       if FRAGMENT in options:
                if RAGGEDRIGHT not in options:
                        options.append (RAGGEDRIGHT)
                body = FRAGMENT_LY