From: hanwen <hanwen>
Date: Fri, 16 Jul 2004 21:05:41 +0000 (+0000)
Subject: (compose_ly): make fragment mandatory
X-Git-Tag: release/2.3.9~89
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=78d36ced706650e78e217940301aeffb7ec7f4bd;p=lilypond.git

(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 4f40e93de5..0db1579b0e 100644
--- 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 adeeb4494a..11cd1b4253 100644
--- 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 b2312517a9..01b893b9b7 100644
--- 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 d6bd119e0b..e31234002a 100644
--- 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 75fe418591..42991681ad 100644
--- 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