From: John Mandereau Date: Sun, 10 Feb 2008 10:41:06 +0000 (+0100) Subject: Change Info docs setup and clean up Documentation/user/GNUmakefile X-Git-Tag: release/2.11.40-1~3^2~20^2~4 X-Git-Url: https://git.donarmstrong.com/?p=lilypond.git;a=commitdiff_plain;h=ece2e45d587f63565e81af44e1937ebe1f5e47a8 Change Info docs setup and clean up Documentation/user/GNUmakefile * install Info files in $(infodir) iso. $(package_infodir) * put Info images in lilypond/ subdirectory (actually symlink $(webdir)/Documentation/user/ to lilypond), which required - adding lilypond-book option --info-images-dir and makefile variable INFO_IMAGES_DIR, - adding @sourceimage macro in macros.itexi to include images from the source directory, - making a symlink lilypond -> out-www so that 'makeinfo --info' can find images. * clean up Documentation/user/GNUmakefile and : use generic rules, use --tidy for texi2pdf, symlink PNGs only for Info docs, ... * update Info directory entry: fix convert-ly entry, add entries for all manuals. Also fix nitpicks in www_post.py: * don't link lily-*.txt (which only contain "image of music") to out-www/*-root * add redirection page from input/lsr to documentation index. The makefile clean up was also made necessary because the Music Glossary wasn't generated in Info format with images in out-www/ with the previous revision, and I couldn't figure out why. --- diff --git a/.gitignore b/.gitignore index 346f815f15..78ddd2aade 100644 --- a/.gitignore +++ b/.gitignore @@ -70,3 +70,4 @@ out-test pats tags test-output-distance +Documentation/user/lilypond diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile index dfa4342c9e..a5b0b864b5 100644 --- a/Documentation/user/GNUmakefile +++ b/Documentation/user/GNUmakefile @@ -21,12 +21,17 @@ HTML_FILES = $(TELY_FILES:%.tely=$(outdir)/%-big-page.html)\ # todo: add latex. PDF_FILES = $(TELY_FILES:%.tely=$(outdir)/%.pdf) +# this prevents aux files from being reused for translated docs +TEXI2PDF_FLAGS = --tidy INFO_DOCS = lilypond lilypond-internals music-glossary lilypond-program lilypond-learning INFO_FILES = $(INFO_DOCS:%=$(outdir)/%.info) +ifeq ($(out),www) +INFO_IMAGES_DIR = lilypond +endif + STEPMAKE_TEMPLATES=tex texinfo omf documentation -#TEXI2DVI_FLAGS = -E OMF_FILES += $(outdir)/lilypond-internals.html.omf LOCALSTEPMAKE_TEMPLATES=lilypond ly @@ -48,13 +53,27 @@ xml: $(outdir)/lilypond/lilypond.xml $(outdir)/lilypond-internals/lilypond-inter ifeq ($(out),www) # This builds all .info targets with images, in out-www. -# Viewawble with a recent Emacs, doing: M-x info out-www/lilypond.info +# Viewable with a recent Emacs, doing: C-u C-h i out-www/lilypond.info # Cancel the special, non-image info generation rule that skips images: $(outdir)/%.info: $(outdir)/%.nexi +# "makeinfo --info" MUST be able to read PNGs from CWD for info images +# to work, hence lilypond/ -> $(outdir)/ symlink. +# $(outdir)/lilypond/*.png symlinks are only needed to view +# out-www/*.info with Emacs -- HTML docs no longer need these +# symlinks, see replace_symlinks_urls in +# buildscripts/add_html_footer.py. +$(outdir)/%.info: lilypond +lilypond: $(OUT_PNG_IMAGES) + rm -f lilypond + ln -s $(outdir) lilypond + mkdir -p $(outdir)/lilypond + find $(outdir)/lilypond/ -name '*'.png | xargs rm -f + (cd $(outdir)/lilypond/ ; ln -sf ../*.png . ) + local-install-info: info - -$(INSTALL) -d $(DESTDIR)$(package_infodir) + -$(INSTALL) -d $(DESTDIR)$(infodir) ifneq ($(patsubst %/local,%,$(DESTDIR)$(prefix)),/usr) ## Can not have absolute symlinks because some binary packages build schemes ## install files in nonstandard root. Best we can do is to notify the @@ -67,25 +86,27 @@ ifneq ($(patsubst %/local,%,$(DESTDIR)$(prefix)),/usr) @echo @echo "For images in the INFO docs to work, do: " @echo - @echo " (cd $(package_infodir) && ln -sf ../../doc/lilypond/Documentation/user/*png .)" + @echo " (cd $(infodir) && ln -sfT ../doc/lilypond/html/Documentation/user lilypond)" @echo "or add something like that to the postinstall script." @echo else # installing directly into standard /usr/... - -$(INSTALL) -d $(DESTDIR)$(package_infodir) + -$(INSTALL) -d $(DESTDIR)$(infodir) -install-info --remove --info-dir=$(infodir) $(outdir)/lilypond.info -install-info --remove --info-dir=$(infodir) $(outdir)/lilypond-program.info -install-info --remove --info-dir=$(infodir) $(outdir)/lilypond-learning.info + -install-info --remove --info-dir=$(infodir) $(outdir)/lilypond-internals.info + -install-info --remove --info-dir=$(infodir) $(outdir)/music-glossary.info install-info --info-dir=$(infodir) $(outdir)/lilypond.info - (cd $(package_infodir) && ln -sf $(webdir)/Documentation/user/*png .) + cd $(infodir) && ln -sfT $(webdir)/Documentation/user lilypond endif # installing directly into standard /usr/... local-uninstall-WWW: - rm -f $(package_infodir)/*.png + rm -f $(infodir)/lilypond else # out!=www # Cancel the default info generation rule that generates images: -$(outdir)/%.info: # $(outdir)/%.texi +$(outdir)/%.info: $(outdir)/%.texi local-install-info: info -$(INSTALL) -d $(DESTDIR)$(package_infodir) @@ -106,10 +127,12 @@ ifneq ($(patsubst %/local,%,$(DESTDIR)$(prefix)),/usr) @echo "and read the extra instructions." @echo else # installing directly into standard /usr/... - -$(INSTALL) -d $(DESTDIR)$(package_infodir) + -$(INSTALL) -d $(DESTDIR)$(infodir) -install-info --remove --info-dir=$(infodir) $(outdir)/lilypond.info -install-info --remove --info-dir=$(infodir) $(outdir)/lilypond-program.info -install-info --remove --info-dir=$(infodir) $(outdir)/lilypond-learning.info + -install-info --remove --info-dir=$(infodir) $(outdir)/lilypond-internals.info + -install-info --remove --info-dir=$(infodir) $(outdir)/music-glossary.info install-info --info-dir=$(infodir) $(outdir)/lilypond.info @echo @echo "***************************************************************" @@ -128,12 +151,13 @@ local-uninstall-WWW: local-uninstall-info default: +local-clean: + rm -f lilypond local-help: extra-local-help extra-local-help: @echo -e "\ - dvi update dvi documents\n\ info update info pages\n\ ps update PostScript documents\n\ xml update Docbook xml documentation\n\ @@ -145,82 +169,20 @@ $(outdir)/lilypond.texi: $(outdir)/lilypond-internals.texi $(outdir)/lilypond.nexi: $(outdir)/lilypond-internals.texi # -# The split user manual +# Split manuals in HTML # -$(outdir)/lilypond/index.html: $(outdir)/lilypond.texi $(OUT_PNG_IMAGES) $(OUT_EPS_IMAGES) - mkdir -p $(dir $@) - $(MAKEINFO) -I$(outdir) --output=$(outdir)/lilypond --css-include=$(top-src-dir)/Documentation/texinfo.css --html $< -# we /might/ switch to texi2html if it can be fixed: -# echo "*************************************" -# echo $< -# cd $(outdir) -# texi2html --output=$(outdir)/lilypond --css-include=$(top-src-dir)/Documentation/texinfo.css $< - find $(outdir)/lilypond/ -name '*'.png -o -name '*'.ly | xargs rm -f -# symbolic links to save space - (cd $(outdir)/lilypond/ ; ln -sf ../*.png ../*.ly . ) +$(outdir)/lilypond/index.html: $(OUT_PNG_IMAGES) $(OUT_EPS_IMAGES) +$(outdir)/lilypond-program/index.html: $(OUT_PNG_IMAGES) $(OUT_EPS_IMAGES) +$(outdir)/lilypond-learning/index.html: $(OUT_PNG_IMAGES) $(OUT_EPS_IMAGES) +$(outdir)/music-glossary/index.html: $(OUT_PNG_IMAGES) $(OUT_EPS_IMAGES) -# -# One big page user manual -# -$(outdir)/lilypond-big-page.html: $(outdir)/lilypond.texi $(OUT_PNG_IMAGES) - $(MAKEINFO) -I$(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split -D bigpage --no-headers $< # -# The split program usage +# Manuals in one big HTML page # -$(outdir)/lilypond-program/index.html: $(outdir)/lilypond-program.texi $(OUT_PNG_IMAGES) $(OUT_EPS_IMAGES) - mkdir -p $(dir $@) - $(MAKEINFO) -I$(outdir) --output=$(outdir)/lilypond-program --css-include=$(top-src-dir)/Documentation/texinfo.css --html $< - find $(outdir)/lilypond-program/ -name '*'.png -o -name '*'.ly | xargs rm -f -# symbolic links to save space - (cd $(outdir)/lilypond-program/ ; ln -sf ../*.png ../*.ly . ) - -# -# The Learning Manual -# -$(outdir)/lilypond-learning/index.html: $(outdir)/lilypond-learning.texi $(OUT_PNG_IMAGES) $(OUT_EPS_IMAGES) - mkdir -p $(dir $@) - $(MAKEINFO) -I$(outdir) --output=$(outdir)/lilypond-learning --css-include=$(top-src-dir)/Documentation/texinfo.css --html $< - find $(outdir)/lilypond-learning/ -name '*'.png -o -name '*'.ly | xargs rm -f -# symbolic links to save space - (cd $(outdir)/lilypond-learning/ ; ln -sf ../*.png ../*.ly . ) - - -# -# One big page program usage -# -$(outdir)/lilypond-program-big-page.html: $(outdir)/lilypond-program.texi $(OUT_PNG_IMAGES) - $(MAKEINFO) -I$(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split -D bigpage --no-headers $< - -# -# One big page learning manual -# -$(outdir)/lilypond-learning-big-page.html: $(outdir)/lilypond-learning.texi $(OUT_PNG_IMAGES) - $(MAKEINFO) -I$(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split -D bigpage --no-headers $< - - -# -# The split internals reference -# -$(outdir)/lilypond-internals/index.html: $(outdir)/lilypond-internals.texi - mkdir -p $(dir $@) - $(MAKEINFO) --output=$(outdir)/lilypond-internals --css-include=$(top-src-dir)/Documentation/texinfo.css --html $< - -# -# One big page internals reference -# -$(outdir)/lilypond-internals-big-page.html: $(outdir)/lilypond-internals.texi - $(MAKEINFO) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split -D bigpage --no-headers $< - -# -# The split glossary -# -$(outdir)/music-glossary/index.html: $(outdir)/music-glossary.texi - mkdir -p $(dir $@) - $(MAKEINFO) --output=$(outdir)/music-glossary --css-include=$(top-src-dir)/Documentation/texinfo.css --html $< - find $(outdir)/music-glossary/ -name '*'.png -o -name '*'.ly | xargs rm -f -# symbolic links to save space - (cd $(outdir)/music-glossary/ ; ln -sf ../*.png ../*.ly . ) +$(outdir)/lilypond-big-page.html: $(OUT_PNG_IMAGES) +$(outdir)/lilypond-program-big-page.html: $(OUT_PNG_IMAGES) +$(outdir)/lilypond-learning-big-page.html: $(OUT_PNG_IMAGES) $(outdir)/lilypond.xml: $(outdir)/lilypond.texi mkdir -p $(dir $@) @@ -230,11 +192,8 @@ $(outdir)/lilypond-internals/lilypond-internals.xml: $(outdir)/lilypond-internal mkdir -p $(dir $@) $(MAKEINFO) --output=$(outdir)/lilypond-internals --docbook $< -$(outdir)/lilypond.pdf: $(OUT_PDF_IMAGES) $(OUT_PNG_IMAGES) - -$(outdir)/lilypond-program.pdf: $(OUT_PDF_IMAGES) $(OUT_PNG_IMAGES) - -$(outdir)/lilypond-learning.pdf: $(OUT_PDF_IMAGES) $(OUT_PNG_IMAGES) +$(outdir)/lilypond.pdf $(outdir)/lilypond-program.pdf: $(OUT_PDF_IMAGES) $(OUT_PNG_IMAGES) +$(outdir)/lilypond-learning.pdf $(outdir)/music-glossary.pdf: $(OUT_PDF_IMAGES) $(OUT_PNG_IMAGES) $(outdir)/%.png: %.png convert -depth 8 -geometry 50x50% $< $@ @@ -263,32 +222,13 @@ $(outdir)/source: @rm -f $(@) ln -sf ../../ $(@) -$(outdir)/lilypond/source: - @rm -f $(@) - mkdir -p $(outdir)/lilypond - ln -sf ../../../ $(@) - -$(outdir)/music-glossary/source: - @rm -f $(@) - mkdir -p $(outdir)/music-glossary - ln -sf ../../../ $(@) - -$(outdir)/lilypond-program/source: +$(outdir)/%/source: @rm -f $(@) - mkdir -p $(outdir)/lilypond-program - ln -sf ../../../ $(@) - -$(outdir)/lilypond-learning/source: - @rm -f $(@) - mkdir -p $(outdir)/lilypond-learning + mkdir -p $(dir $@) ln -sf ../../../ $(@) local-WWW: $(HTML_FILES) $(DEEP_HTML_FILES)\ - $(datafiles) $(PDF_FILES) $(source-links) info info-dir - -info-dir: - $(SHELL) $(buildscript-dir)/install-info-html.sh --dir=$(outdir) lilypond lilypond-internals music-glossary lilypond-program lilypond-learning - + $(datafiles) $(PDF_FILES) $(source-links) info $(outdir)/%.bib: %.bib ln -f $< $@ @@ -298,11 +238,9 @@ $(outdir)/%.bib: %.bib $(top-build-dir)/mf/$(outconfbase)/feta16list.ly: $(MAKE) -C $(top-src-dir)/mf -$(outdir)/lilypond.texi: $(ITELY_FILES) $(ITEXI_FILES) -$(outdir)/lilypond.nexi: $(ITELY_FILES) $(ITEXI_FILES) +$(outdir)/lilypond.texi $(outdir)/lilypond-program.texi $(outdir)/lilypond-learning.texi: $(ITELY_FILES) $(ITEXI_FILES) +$(outdir)/lilypond.nexi $(outdir)/lilypond-program.nexi $(outdir)/lilypond-learning.nexi: $(ITELY_FILES) $(ITEXI_FILES) -# Prevent building music-glossary.texi from default target -$(outdir)/music-glossary.nexi: # Rules for the automatically generated documentation diff --git a/Documentation/user/changing-defaults.itely b/Documentation/user/changing-defaults.itely index 9e379f688a..d69c86d1c7 100644 --- a/Documentation/user/changing-defaults.itely +++ b/Documentation/user/changing-defaults.itely @@ -118,7 +118,7 @@ example: a @code{Staff} can contain many @code{Voice}s, and a @code{Score} can contain many @code{Staff} contexts. @quotation -@image{context-example,5cm,,} +@sourceimage{context-example,5cm,,} @end quotation Each context has the responsibility for enforcing some notation rules, diff --git a/Documentation/user/fundamental.itely b/Documentation/user/fundamental.itely index d25e7ffe4e..1e56b0e4f2 100644 --- a/Documentation/user/fundamental.itely +++ b/Documentation/user/fundamental.itely @@ -1195,7 +1195,7 @@ For example: a @code{Staff} context can contain many contain many @code{Staff} contexts. @quotation -@image{context-example,5cm,,} +@sourceimage{context-example,5cm,,} @end quotation Each context has the responsibility for enforcing some notation rules, diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely index bf0dcb70b7..c676108903 100644 --- a/Documentation/user/introduction.itely +++ b/Documentation/user/introduction.itely @@ -87,9 +87,8 @@ computer edition. @end ifnottex @end ifnotinfo @ifinfo -@c workaround for makeinfo-4.6: line breaks and multi-column cookies -@image{henle-flat-bw,,,png} @image{baer-flat-bw,,,png} -@image{lily-flat-bw,,,png} +@image{lilypond/henle-flat-bw,,,png} @image{lilypond/baer-flat-bw,,,png} +@image{lilypond/lily-flat-bw,,,png} @end ifinfo @item @tab diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely index dc8a529833..62045348ba 100644 --- a/Documentation/user/lilypond.tely +++ b/Documentation/user/lilypond.tely @@ -23,7 +23,7 @@ @ignore Distributions will want to install lilypond.info in postinstall, doing: - install-info --info-dir=/usr/share/info out/lilypond.info + install-info --info-dir=/usr/share/info out[-www]/lilypond.info * Prepend GNU for dir, must be unique. @@ -38,16 +38,21 @@ Distributions will want to install lilypond.info in postinstall, doing: @c -@c Info files are installed in subdirectories to allow images to be present. -@c -@dircategory LilyPond +@c Info files are no longer installed in a subdirectory, images are +@c expected to be found in lilypond/ subdirectory. +@dircategory GNU LilyPond --- the music typesetter @direntry -* LilyPond: (lilypond/lilypond). The GNU music typesetter. -* abc2ly: (lilypond/lilypond-program)Invoking abc2ly. Importing ABC. -* convert-ly: (lilypond/lilypond-program)Invoking convert-ly. Older LilyPond versions. -* etf2ly: (lilypond/lilypond-program)Invoking etf2ly. Importing Finale. -* lilypond-book: (lilypond/lilypond-program)LilyPond-book. Integrating text and music. -* midi2ly: (lilypond/lilypond-program)Invoking midi2ly. Importing MIDI. +* LilyPond Learning Manual: (lilypond-learning). Start here. +* Music Glossary: (music-glossary). For non-English users. +* LilyPond: (lilypond). LilyPond Notation Reference. +* LilyPond Internals Reference: (lilypond-internals). Definitions for tweaking. +* LilyPond Application Usage: (lilypond-program). Installing and running applications. +* abc2ly: (lilypond-program)Invoking abc2ly. Importing ABC. +* convert-ly: (lilypond-program)Updating files with convert-ly. Older LilyPond versions. +* etf2ly: (lilypond-program)Invoking etf2ly. Importing Finale. +* lilypond-book: (lilypond-program)LilyPond-book. Integrating text and music. +* midi2ly: (lilypond-program)Invoking midi2ly. Importing MIDI. +* musicxml2ly: (lilypond-program)Invoking musicxml2ly. Importing MusicXML. @end direntry @c don't remove this comment. diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi index c29ba57026..aff1155e74 100644 --- a/Documentation/user/macros.itexi +++ b/Documentation/user/macros.itexi @@ -31,20 +31,45 @@ @end quotation @end macro -@c TODO: define different output for info +@ifnotinfo @macro notation{TEXT} @var{\TEXT\} @end macro +@end ifnotinfo +@ifinfo +@macro notation{TEXT} +\TEXT\ +@end macro +@end ifinfo - -@c **** Headings in a doc subsection **** - -@c not really a heading, but... @macro smallspace @sp 1 @end macro + +@c **** Displaying images not generated by lilypond-book + +@c current installation setup of Info docs requires that all images are +@c expected to be found in lilypond/ subdirectory. lilypond-book already +@c generates proper @image commands for images of music; these macros +@c definitions do the same for other images. + +@ifnotinfo +@macro sourceimage{FILENAME,WIDTH,HEIGHT,ALTTEXT} +@image{\FILENAME\,\WIDTH\,\HEIGHT\,\ALTTEXT\} +@end macro +@end ifnotinfo + +@ifinfo +@macro sourceimage{FILENAME,WIDTH,HEIGHT,ALTTEXT} +@image{lilypond/\FILENAME\,\WIDTH\,\HEIGHT\,\ALTTEXT\} +@end macro +@end ifinfo + + +@c **** Headings in a doc subsection **** + @c obsolete; being removed. @macro refcommands @noindent @@ -113,14 +138,6 @@ @ifhtml @c ***** HTML ***** -@c makeinfo-4.7 encodes html names, which means that nodes that -@c contain nonalphanum characters will be broken links on the website. -@c @uref{../lilypond-internals/\TEXT\.html,\TEXT\}@c -@c @inforef{} adds ``See'' to the sentence, which is annoying, but -@c better than a broken link. -@c @inforef{\TEXT\,,lilypond-internals}@c -@c using @ref without punctuation is OK without for formats other than info - @ifset bigpage @macro internalsref{TEXT} diff --git a/buildscripts/www_post.py b/buildscripts/www_post.py index 8d7899ef0e..26cd613e4c 100644 --- a/buildscripts/www_post.py +++ b/buildscripts/www_post.py @@ -17,19 +17,23 @@ outdir = os.path.normpath (outdir) doc_dirs = ['input', 'Documentation', outdir] target_pattern = os.path.join (outdir, '%s-root') +# these redirection pages allow to go back to the documentation index +# from HTML manuals/snippets page static_files = { os.path.join (outdir, 'index.html'): - ''' + ''' Redirecting to the documentation index...\n''', os.path.join (outdir, 'VERSION'): - package_version + '\n' } + package_version + '\n', + os.path.join ('input', 'lsr', outdir, 'index.html'): + ''' +Redirecting to the documentation index...\n''' + } import langdefs -# ugly hack: the following overwrites HTML Info dir with a link to -# the (more useful) documentation index for l in langdefs.LANGUAGES: - static_files[os.path.join ('Documentation/user', outdir, l.file_name ('index', '.html'))] = \ + static_files[os.path.join ('Documentation', 'user', outdir, l.file_name ('index', '.html'))] = \ '\nRedirecting to the documentation index...\n' @@ -45,9 +49,9 @@ sys.stderr.write ("Mirrorring...\n") dirs, symlinks, files = mirrortree.walk_tree ( tree_roots = doc_dirs, process_dirs = outdir, - exclude_dirs = '(^|/)(' + '|'.join ([l.code for l in langdefs.LANGUAGES]) + r'|po|out|\w*?-root)(/|$)', + exclude_dirs = '(^|/)(' + '|'.join ([l.code for l in langdefs.LANGUAGES]) + r'|po|out|.*?[.]t2d|\w*?-root)(/|$)', find_files = r'.*?\.(?:midi|html|pdf|png|txt|ly|signature)$|VERSION', - exclude_files = r'lily-[0-9a-f]+.*\.pdf') + exclude_files = r'lily-[0-9a-f]+.*\.(pdf|txt)') # actual mirrorring stuff html_files = [] diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make index b9f509dc86..e7abca9b7c 100644 --- a/make/lilypond-vars.make +++ b/make/lilypond-vars.make @@ -31,7 +31,8 @@ ANTI_ALIAS_FACTOR=2 LILYPOND_JOBS=$(if $(CPU_COUNT),-djob-count=$(CPU_COUNT),) LILYPOND_BOOK_LILYPOND_FLAGS=-dbackend=eps --formats=ps,png,pdf $(LILYPOND_JOBS) -dinclude-eps-fonts -dgs-load-fonts --header=texidoc -I $(top-src-dir)/input/manual -dcheck-internal-types -ddump-signatures -danti-alias-factor=$(ANTI_ALIAS_FACTOR) LILYPOND_BOOK_VERBOSE = --verbose -LILYPOND_BOOK_FLAGS = --process="$(LILYPOND_BINARY) $(LILYPOND_BOOK_LILYPOND_FLAGS)" $(LILYPOND_BOOK_VERBOSE) +LILYPOND_BOOK_INFO_IMAGES_DIR = $(if $(INFO_IMAGES_DIR),--info-images-dir=$(INFO_IMAGES_DIR),) +LILYPOND_BOOK_FLAGS = --process="$(LILYPOND_BINARY) $(LILYPOND_BOOK_LILYPOND_FLAGS)" $(LILYPOND_BOOK_VERBOSE) $(LILYPOND_BOOK_INFO_IMAGES_DIR) TEXINPUTS=$(top-src-dir)/tex/:: export TEXINPUTS diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py index 46db9fad3a..bdb0637d17 100644 --- a/scripts/lilypond-book.py +++ b/scripts/lilypond-book.py @@ -124,6 +124,12 @@ def get_option_parser (): action='append', dest='include_path', default=[os.path.abspath (os.getcwd ())]) + p.add_option ('--info-images-dir', help=_ ("format Texinfo output so that Info will " + "look for images of music in DIR"), + metavar=_ ("DIR"), + action='store', dest='info_images_dir', + default='') + p.add_option ('--left-padding', metavar=_ ("PAD"), dest="padding_mm", @@ -627,7 +633,7 @@ output = { OUTPUTIMAGE: r'''@noindent @ifinfo -@image{%(base)s,,,%(alt)s,%(ext)s} +@image{%(info_image_path)s,,,%(alt)s,%(ext)s} @end ifinfo @html

@@ -1203,6 +1209,7 @@ class Lilypond_snippet (Snippet): # Specifying no extension is most robust. ext = '' alt = self.option_dict[ALT] + info_image_path = os.path.join (global_options.info_images_dir, base) str += output[TEXINFO][OUTPUTIMAGE] % vars () base = self.basename () diff --git a/stepmake/stepmake/texinfo-rules.make b/stepmake/stepmake/texinfo-rules.make index 48a6f7e900..c373562079 100644 --- a/stepmake/stepmake/texinfo-rules.make +++ b/stepmake/stepmake/texinfo-rules.make @@ -3,7 +3,7 @@ $(outdir)/%.info: $(outdir)/%.texi # makeinfo MUST have PNGs in cwd for info images to work - cd $(outdir) && $(MAKEINFO) -I$(srcdir) --output=$(@F) $(