From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Sat, 17 Jul 2004 10:52:59 +0000 (+0000)
Subject: (web_kluts): Have make web build in out-www.  Not.
X-Git-Tag: release/2.3.7~26
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=29d0c4b33b7bc6434d32d735358b8768e965c117;p=lilypond.git

(web_kluts): Have make web build in out-www.  Not.
---

diff --git a/ChangeLog b/ChangeLog
index 092e4da480..a0f4a5a4b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-07-17  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+	* SConstruct (web_kluts): Have make web build in out-www.  Not.
+
 2004-07-17  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
 	* Documentation/user/music-glossary.tely (Top): add fragment to
diff --git a/SConstruct b/SConstruct
index ce0c124439..d40237410e 100644
--- a/SConstruct
+++ b/SConstruct
@@ -184,6 +184,14 @@ if env['checksums']:
 	SetOption ('max_drift', 0)
 	TargetSignatures ("content")
 
+# build web in out-www, so that scons is a drop-in replacement for make
+# we can revise the entire web building when web is built with scons.
+web_kluts = ''
+# Hmm:  scons: *** maximum recursion limit exceeded
+if 0 and 'web' in COMMAND_LINE_TARGETS:
+	web_kluts = 'out-scons' #env['out']
+	env['out'] = 'out-www'
+
 absbuild = Dir (env['build']).abspath
 outdir = os.path.join (Dir (env['build']).abspath, env['out'])
 run_prefix = os.path.join (absbuild, os.path.join (env['out'], 'usr'))
@@ -771,5 +779,9 @@ for d in subdirs:
 		# and ./out build.
 		if os.path.abspath (b) != os.path.abspath (d):
 			env.BuildDir (b, d, duplicate = 0)
+		if web_kluts:
+			# look in out-scons 
+			env.Repository (os.path.join (env['build'], d,
+						      web_kluts))
        		SConscript (os.path.join (b, 'SConscript'))
 
diff --git a/input/regression/new-slur.ly b/input/regression/new-slur.ly
index b822ba30f4..a840a56f0e 100644
--- a/input/regression/new-slur.ly
+++ b/input/regression/new-slur.ly
@@ -9,6 +9,9 @@
 
 % #(ly:set-option 'debug-beam #t)
 
+%% help lilypond-book
+%% \score
+
 \relative {
     \override Slur #'after-line-breaking-callback = #New_slur::after_line_breaking
     \override Slur #'print-function = #New_slur::print     
diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 42991681ad..75fe418591 100644
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -351,7 +351,9 @@ def compose_ly (code, options):
 	if QUOTE in options and LINEWIDTH in options:
 		options.remove (LINEWIDTH)
 
-	if FRAGMENT in options:
+	m = re.search (r'''\\(header|score)''', code)
+	if not m and (not options \
+		      or not NOFRAGMENT in options or FRAGMENT in options):
 		if RAGGEDRIGHT not in options:
 			options.append (RAGGEDRIGHT)
 		body = FRAGMENT_LY