From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Wed, 22 Feb 2006 02:16:38 +0000 (+0000)
Subject: (main): scrap invokes_lilypond().
X-Git-Tag: release/2.7.36~11
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=71695adc55217c4825ba94fb1fc9b473c416ca1a;p=lilypond.git

(main): scrap invokes_lilypond().
---

diff --git a/ChangeLog b/ChangeLog
index e36ae258fa..7657b34558 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2006-02-22  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+	* scripts/lilypond-book.py (main): scrap invokes_lilypond(). 
+
 	* Documentation/user/basic-notation.itely (Ties): document \repeatTie.
 
 	* Documentation/topdocs/NEWS.tely (Top): document \repeatTie.
diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index c6fdb3ab00..9a4df3c6da 100644
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -675,9 +675,6 @@ def split_options (option_string):
 					 option_string)
 	return []
 
-def invokes_lilypond ():
-	return re.search ('^[\'\"0-9A-Za-z/.]*lilypond', process_cmd)
-
 def set_default_options (source):
 	global default_ly_options
 	if not default_ly_options.has_key (LINE_WIDTH):
@@ -1303,7 +1300,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 invokes_lilypond ():
+	if texstr_names:
 		my_system (string.join ([cmd, '--backend texstr',
 					 'snippet-map.ly'] + texstr_names))
 		for l in texstr_names:
@@ -1658,7 +1655,7 @@ def main ():
 
 	try:
 		chunks = do_file (file)
-		if psfonts_p and invokes_lilypond ():
+		if psfonts_p:
 			fontextract.verbose = verbose_p
 			snippet_chunks = filter (lambda x: is_derived_class (x.__class__,
 									      Lilypond_snippet),