From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Wed, 18 May 2005 14:55:37 +0000 (+0000)
Subject: (invokes_lilypond): new function
X-Git-Tag: release/2.5.25~11
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=0f89275068223a097cae9b5051624ddb3f3037e2;p=lilypond.git

(invokes_lilypond): new function
(main): only run fontextract if invokes_lilypond() is true.
---

diff --git a/ChangeLog b/ChangeLog
index b057127fbc..c1b268350c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-05-18  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+	* scripts/lilypond-book.py (invokes_lilypond): new function
+	(main): only run fontextract if invokes_lilypond() is true.
+
 	* lily/function-documentation.cc (ly_add_function_documentation):
 	duh, use !=
 
diff --git a/Documentation/topdocs/GNUmakefile b/Documentation/topdocs/GNUmakefile
index 43c2b26ab1..f9b4aa23e6 100644
--- a/Documentation/topdocs/GNUmakefile
+++ b/Documentation/topdocs/GNUmakefile
@@ -7,4 +7,8 @@ HTML_FILES=$(addprefix $(outdir)/, $(TEXI_FILES:.texi=.html) $(TELY_FILES:.tely=
 
 include $(depth)/make/stepmake.make 
 
+ifneq ($(out),www)
+LILYPOND='true'
+endif
+
 $(outdir)/NEWS.nexi: NEWS.tely
diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index e123e8b6b5..8038691205 100644
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -642,6 +642,9 @@ def split_options (option_string):
 					 option_string)
 	return []
 
+def invokes_lilypond ():
+	return re.search ('^[\'\"0-9A-Za-z/]*lilypond', process_cmd)
+
 class Chunk:
 	def replacement_text (self):
 		return ''
@@ -1221,8 +1224,7 @@ def process_snippets (cmd, ly_snippets, texstr_snippets, png_snippets):
 	# 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):
-
+	if texstr_names and invokes_lilypond:
 		my_system (string.join ([cmd, '--backend texstr',
 					 'snippet-map.ly'] + texstr_names))
 		for l in texstr_names:
@@ -1559,7 +1561,7 @@ def main ():
 
 	try:
 		chunks = do_file (file)
-		if psfonts_file:
+		if psfonts_file and invokes_lilypond ():
 			fontextract.verbose = verbose_p
 			snippet_chunks = filter (lambda x: is_derived_class (x.__class__,
 									      Lilypond_snippet),