X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2FSConscript;fp=Documentation%2FSConscript;h=b9e26349c66544233147c0a7ef2e0123f08bd6a9;hb=a64d4fac22ad2ceb1fb64933a35c060d6e71c222;hp=57f8db9787c0c44b21a3b44a862a61e248f474e0;hpb=193755c65f0edd15ef0264e9fa30166705d8103e;p=lilypond.git

diff --git a/Documentation/SConscript b/Documentation/SConscript
index 57f8db9787..b9e26349c6 100644
--- a/Documentation/SConscript
+++ b/Documentation/SConscript
@@ -8,6 +8,7 @@ reldir = str (Dir ('.').srcnode ())
 os.chdir (reldir)
 ###sources = glob.glob ('*.tely') + glob.glob ('user/*.tely')
 sources = ['user/lilypond.tely', 'user/music-glossary.tely']
+pngs = glob.glob ('user/*.png')
 os.chdir (here)
 
 Import ('env')
@@ -34,10 +35,13 @@ lilybuild = os.path.join (env['absbuild'], 'lily', env['out'])
 userbuild = os.path.join (env['absbuild'], 'Documentation/user', env['out'])
 e.Depends ('user/lilypond.texi', os.path.join (mfbuild, 'feta16list.ly'))
 e.Depends ('user/lilypond.texi', os.path.join (mfbuild, 'parmesan16list.ly'))
-##e.Depends ('lilypond.texi', os.path.join (userbuild, 'music-glossary.texi'))
 e.Depends ('lilypond.texi', 'lilypond-internals.texi')
 e.Depends ('lilypond.texi', os.path.join (lilybuild, 'lilypond-bin'))
 
+png_stems = map (lambda x: os.path.splitext (x)[0], pngs)
+epss = map (e.Png2eps, png_stems)
+e.Depends ('lilypond.texi', epss)
+
 e.Command ('lilypond-internals.texi', LILYPOND_BIN,
 	   ('(cd $$(dirname $TARGET) && \
 	   LILYPONDPREFIX=%(LILYPONDPREFIX)s %(LILYPOND_BIN)s ' \
@@ -48,14 +52,59 @@ e.Command ('lilypond-internals.texi', LILYPOND_BIN,
 doc_stems = map (lambda x: os.path.splitext (x)[0], sources)
 texis = map (e.Tely2texi, doc_stems)
 dvis = map (e.Texi2dvi, doc_stems)
-pss = map (e.PostScript, doc_stems)
+pss = map (e.PostScript, map (lambda x: x + '.dvi', doc_stems))
 pdfs = map (e.Dvi2pdf, doc_stems)
 
+docdir = os.path.join (env['srcdir'], 'Documentation')
+out = env['out']
+# TODO: purl (ugh?), symlinks
+a = ('makeinfo -I$$(dirname $SOURCE) \
+--output=%(out)s/lilypond \
+--css-include=%(docdir)s/texinfo.css \
+--html' \
+     + verbose_opt (env, ' --verbose') \
+     + ' $SOURCE && \
+     makeinfo -I$$(dirname $SOURCE) \
+     --output=$TARGET \
+     --css-include=%(docdir)s/texinfo.css \
+     --html --no-split --no-headers' \
+     + verbose_opt (env, ' --verbose') \
+     + ' $SOURCE') % vars ()
+#e.Command ('lilypond/lilypond.html',
+#	   'lilypond.texi',
+e.Command ('user/lilypond/lilypond.html',
+	   'user/lilypond.texi',
+#	   os.path.join (userbuild, 'lilypond.texi'),
+	   a)
+
+# TODO: purl (ugh?), symlinks
+a = ('makeinfo -I$$(dirname $SOURCE) \
+--output=%(out)s/lilypond-internals \
+--css-include=%(docdir)s/texinfo.css \
+--html' \
+     + verbose_opt (env, ' --verbose') \
+     + ' $SOURCE && \
+     makeinfo -I$$(dirname $SOURCE) \
+     --output=$TARGET \
+     --css-include=%(docdir)s/texinfo.css \
+     --html --no-split --no-headers' \
+     + verbose_opt (env, ' --verbose') \
+     + ' $SOURCE') % vars ()
+#e.Command ('lilypond-internals/lilypond-internals.html',
+#	   'lilypond-internals.texi',
+e.Command ('user/lilypond-internals/lilypond-internals.html',
+	   'user/lilypond-internals.texi',
+#	   os.path.join (userbuild, 'lilypond-internals.texi'),
+	   a)
+
 e.Alias ('doc', texis)
 e.Alias ('doc', dvis)
 e.Alias ('doc', pss)
 e.Alias ('doc', pdfs)
 
+#e.Alias ('doc', 'user/lilypond-internals/lilypond.html')
+#e.Alias ('doc', 'user/lilypond-internals/lilypond-internals.html')
+
 #testing
 all_sources = ['SConscript',] + sources
 x = env.Tar (env['tarball'], all_sources)