X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fuser%2FSConscript;h=5ef1efdd3d0ff17f2b797768f224a7d9e14d56e9;hb=543171165412bc915d8ea1f308d070c74924b2f1;hp=bbdf7aec771157c230d3a1d79bc4ad11bc647223;hpb=9f3572d98bb948c9689cd1f75401a029451fa001;p=lilypond.git

diff --git a/Documentation/user/SConscript b/Documentation/user/SConscript
index bbdf7aec77..5ef1efdd3d 100644
--- a/Documentation/user/SConscript
+++ b/Documentation/user/SConscript
@@ -3,9 +3,9 @@
 import os
 import string
 
-Import ('env', 'base_glob')
+Import ('env', 'base_glob', 'src_glob')
 tely = base_glob ('*.tely')
-png = base_glob ('*.png')
+png = src_glob ('*.png') + map (env.EPS2PNG, base_glob ('*.eps'))
 
 # We need lily and mf to build these.
 env.Depends ('lilypond.texi', ['#/lily', '#/mf', '#/python'])
@@ -13,13 +13,16 @@ env.Depends ('music-glossary.texi', ['#/lily', '#/mf', '#/python'])
 
 env.Depends ('lilypond.texi', 'lilypond-internals.texi')
 
-eps = map (env.PNG2EPS, png)
-env.Depends ('lilypond.texi', eps)
+eps = src_glob ('*.eps') + map (env.PNG2EPS, base_glob ('*.png'))
+env.Depends ('lilypond.texi', eps + png)
 
+lilypond_book_flags = '''--format=$LILYPOND_BOOK_FORMAT --process="lilypond -I$srcdir/input/manual/ $__verbose --backend=eps --formats=ps,png --header=texidoc -dcheck-internal-types -ddump-signatures -danti-alias-factor=2 -dgs-load-fonts" '''
 e = env.Copy (
-	LILYPOND_BOOK_FLAGS = '''--process="lilypond --backend=eps --formats=ps,png --header=texidoc -I#/input/test -e '(ly:set-option (quote internal-type-checking) \#t)'"''',
+#	LILYPOND_BOOK_FLAGS = '''--process="lilypond --backend=eps --formats=ps,png --header=texidoc -I#/input/manual -e '(ly:set-option (quote internal-type-checking) \#t)'"''',
+	LILYPOND_BOOK_FLAGS = lilypond_book_flags,
 	__verbose = ' --verbose',
 	GENERATE_DOCUMENTATION = '$srcdir/ly/generate-documentation',
+	## TEXI2DVI_FLAGS = ['-I#Documentation/user'],
 	)
 
 e.Command ('lilypond-internals.texi', ['#/lily', '#/mf', '#/python'],