CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/05/18 14:55:37
Modified files:
. : ChangeLog
Documentation/topdocs: GNUmakefile
scripts : lilypond-book.py
Log message:
(invokes_lilypond): new function
(main): only run fontextract if invokes_lilypond() is true.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3633&tr2=1.3634&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/topdocs/GNUmakefile.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scripts/lilypond-book.py.diff?tr1=1.256&tr2=1.257&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3633 lilypond/ChangeLog:1.3634
--- lilypond/ChangeLog:1.3633 Wed May 18 14:46:36 2005
+++ lilypond/ChangeLog Wed May 18 14:55:36 2005
@@ -1,5 +1,8 @@
2005-05-18 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * 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 !=
Index: lilypond/Documentation/topdocs/GNUmakefile
diff -u lilypond/Documentation/topdocs/GNUmakefile:1.9
lilypond/Documentation/topdocs/GNUmakefile:1.10
--- lilypond/Documentation/topdocs/GNUmakefile:1.9 Wed Apr 13 13:18:09 2005
+++ lilypond/Documentation/topdocs/GNUmakefile Wed May 18 14:55:37 2005
@@ -7,4 +7,8 @@
include $(depth)/make/stepmake.make
+ifneq ($(out),www)
+LILYPOND='true'
+endif
+
$(outdir)/NEWS.nexi: NEWS.tely
Index: lilypond/scripts/lilypond-book.py
diff -u lilypond/scripts/lilypond-book.py:1.256
lilypond/scripts/lilypond-book.py:1.257
--- lilypond/scripts/lilypond-book.py:1.256 Tue May 3 12:17:04 2005
+++ lilypond/scripts/lilypond-book.py Wed May 18 14:55:37 2005
@@ -642,6 +642,9 @@
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 @@
# 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 @@
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),
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
