From f69bd6761b3b3c077b0b994bd65b5a5bd79b5582 Mon Sep 17 00:00:00 2001 From: John Mandereau Date: Sun, 12 Jul 2009 22:33:42 +0200 Subject: [PATCH] Docs: move common files and factorize Texinfo macros - move macros.itexi to Documentation/ to anticipate the possible move of all Texinfo documentation to the same directory, - move Texinfo init file from top of the source tree, - factorize macros common to all languages into common-macros.itexi. Signed-off-by: Patrick McCarty --- Documentation/GNUmakefile | 1 + Documentation/common-macros.itexi | 125 +++++++ Documentation/de/user/macros.itexi | 120 +------ Documentation/devel/GNUmakefile | 2 + Documentation/es/user/macros.itexi | 120 +------ Documentation/fr/user/macros.itexi | 121 +------ Documentation/ja/user/macros.itexi | 323 ++++++++++++++++++ .../lilypond-texi2html.init | 0 Documentation/{user => }/macros.itexi | 78 +---- GNUmakefile.in | 2 +- make/doc-i18n-user-vars.make | 2 +- make/lilypond-vars.make | 3 +- stepmake/stepmake/texinfo-vars.make | 6 +- stepmake/stepmake/topdocs-vars.make | 2 +- 14 files changed, 463 insertions(+), 442 deletions(-) create mode 100644 Documentation/common-macros.itexi create mode 100644 Documentation/ja/user/macros.itexi rename lilypond-texi2html.init => Documentation/lilypond-texi2html.init (100%) rename Documentation/{user => }/macros.itexi (83%) diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile index 03a6a8a909..12f25fefc9 100644 --- a/Documentation/GNUmakefile +++ b/Documentation/GNUmakefile @@ -7,6 +7,7 @@ STEPMAKE_TEMPLATES=documentation texinfo tex LOCALSTEPMAKE_TEMPLATES=lilypond ly LILYPOND_BOOK_FLAGS=--extra-options '-e "(ly:set-option (quote internal-type-checking) \#t)"' README_TOP_FILES= DEDICATION THANKS +EXTRA_DIST_FILES = lilypond-texi2html.init include $(depth)/make/stepmake.make diff --git a/Documentation/common-macros.itexi b/Documentation/common-macros.itexi new file mode 100644 index 0000000000..a971723ab7 --- /dev/null +++ b/Documentation/common-macros.itexi @@ -0,0 +1,125 @@ +@c -*- coding: utf-8; mode: texinfo; -*- + + + +@c Don't replace quotes with directed quotes. + +@set txicodequoteundirected +@set txicodequotebacktick + + +@c ***** Displaying text ***** + +@c We need this since @q{\} doesn't work with makeinfo 4.11 -- +@c say @q{@bs{}} instead. + +@macro bs +\\ +@end macro + + +@ifnotinfo + +@macro notation{TEXT} +@var{\TEXT\} +@end macro + +@end ifnotinfo + +@ifinfo + +@macro notation{TEXT} +\TEXT\ +@end macro + +@end ifinfo + + +@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 the `lilypond/' subdirectory. `lilypond-book' +@c already generates proper @image commands for images of music; these +@c macro 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 ***** Headers ***** + +@macro lydoctitle {TEXT} +@emph{\TEXT\} +@end macro + + +@c ***** Indexing ***** + +@c Don't remove the `@c' within the macro definition! See section 19.3, +@c `Macro Details and Caveats', in the texinfo info file for explanation. + +@macro funindex {TEXT} +@findex \TEXT\ +@kindex \TEXT\ +@c +@end macro + + +@c ***** Macros specific to translated docs ***** + +@c ugh, cannot set/define global variable 'translationof' in any way :-( + +@iftex + +@macro translationof{TEXT} +@end macro + +@end iftex + +@ifinfo + +@macro translationof{TEXT} +@set translationof \TEXT\ +@end macro + +@end ifinfo + +@ifhtml + +@ifset bigpage +@macro untranslated +@end macro +@end ifset + +@ifclear bigpage +@macro untranslated +UNTRANSLATED NODE: IGNORE ME +@end macro +@end ifclear + +@end ifhtml + +@ifnothtml + +@macro untranslated +@end macro + +@end ifnothtml diff --git a/Documentation/de/user/macros.itexi b/Documentation/de/user/macros.itexi index aff2f6ab45..9d47c007b1 100644 --- a/Documentation/de/user/macros.itexi +++ b/Documentation/de/user/macros.itexi @@ -8,25 +8,11 @@ @include version.itexi - - -@c Don't replace quotes with directed quotes. - -@set txicodequoteundirected -@set txicodequotebacktick - +@include common-macros.itexi @c ***** Displaying text ***** -@c We need this since @q{\} doesn't work with makeinfo 4.11 -- -@c say @q{@bs{}} instead. - -@macro bs -\\ -@end macro - - @c To get decent quotes in ,foo' and ,,foo''. @c These need to be split up so that "@qq{foo}." looks nice. :( @@ -64,54 +50,6 @@ @end ifnothtml -@ifnotinfo - -@macro notation{TEXT} -@var{\TEXT\} -@end macro - -@end ifnotinfo - -@ifinfo - -@macro notation{TEXT} -\TEXT\ -@end macro - -@end ifinfo - - -@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 the `lilypond/' subdirectory. `lilypond-book' -@c already generates proper @image commands for images of music; these -@c macro 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 Don't insert an empty line after @predefined! Right now @@ -163,21 +101,6 @@ @end macro -@macro lydoctitle {TEXT} -@emph{\TEXT\} -@end macro - - -@c Don't remove the `@c' within the macro definition! See section 19.3, -@c `Macro Details and Caveats', in the texinfo info file for explanation. - -@macro funindex {TEXT} -@findex \TEXT\ -@kindex \TEXT\ -@c -@end macro - - @c ***** Links and references ***** @@ -435,50 +358,9 @@ @c ***** Macros specific to translated docs ***** -@c ugh, cannot set/define global variable 'translationof' in some way? - -@iftex - -@macro translationof{TEXT} -@end macro - -@end iftex - -@ifinfo - -@macro -@macro translationof{TEXT} -@set translationof \TEXT\ -@end macro - -@end ifinfo - - -@c TODO: If @translationof is used in translated docs -@c see whether it is feasible to say @value{translationof}. @macro englishref Dieser Abschnitt wurde noch nicht übersetzt. Bitte lesen Sie den Abschnitt im englischen Benutzerhandbuch. @end macro - -@ifhtml - -@ifset bigpage -@macro untranslated -@end macro -@end ifset - -@ifclear bigpage -@macro untranslated -UNTRANSLATED NODE: IGNORE ME -@end macro -@end ifclear - -@end ifhtml - -@ifnothtml -@macro untranslated -@end macro -@end ifnothtml diff --git a/Documentation/devel/GNUmakefile b/Documentation/devel/GNUmakefile index 1096add366..dd4b822e25 100644 --- a/Documentation/devel/GNUmakefile +++ b/Documentation/devel/GNUmakefile @@ -5,6 +5,8 @@ XREF_MAP_FLAGS = --split section -I $(abs-src-dir) STEPMAKE_TEMPLATES = documentation tex texinfo topdocs LOCALSTEPMAKE_TEMPLATES = ly +# DOCUMENTATION_INCLUDES = -I $(top-src-dir)/Documentation/user + include $(depth)/make/stepmake.make HTML_PAGE_NAMES = index diff --git a/Documentation/es/user/macros.itexi b/Documentation/es/user/macros.itexi index 8f577a5292..3c40e02653 100644 --- a/Documentation/es/user/macros.itexi +++ b/Documentation/es/user/macros.itexi @@ -8,25 +8,11 @@ @include version.itexi - - -@c Don't replace quotes with directed quotes. - -@set txicodequoteundirected -@set txicodequotebacktick - +@include common-macros.itexi @c ***** Displaying text ***** -@c We need this since @q{\} doesn't work with makeinfo 4.11 -- -@c say @q{@bs{}} instead. - -@macro bs -\\ -@end macro - - @c To get decent quotes in `foo' and ``foo''. @macro q{TEXT} @@ -63,53 +49,9 @@ @end ifnothtml -@ifnotinfo - -@macro notation{TEXT} -@var{\TEXT\} -@end macro - -@end ifnotinfo - -@ifinfo - -@macro notation{TEXT} -\TEXT\ -@end macro - -@end ifinfo - - -@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 the `lilypond/' subdirectory. `lilypond-book' -@c already generates proper @image commands for images of music; these -@c macro 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 ***** @@ -162,22 +104,6 @@ @end macro -@macro lydoctitle {TEXT} -@emph{\TEXT\} -@end macro - - -@c Don't remove the `@c' within the macro definition! See section 19.3, -@c `Macro Details and Caveats', in the texinfo info file for explanation. - -@macro funindex {TEXT} -@findex \TEXT\ -@kindex \TEXT\ -@c -@end macro - - - @c ***** Links and references ***** @c Definitions for references: @@ -412,51 +338,7 @@ @c ***** Macros specific to translated docs ***** -@c ugh, cannot set/define global variable 'translationof' in some way? - -@iftex - -@macro translationof{TEXT} -@end macro - -@end iftex - -@ifinfo - -@macro -@macro translationof{TEXT} -@set translationof \TEXT\ -@end macro - -@end ifinfo - - -@c TODO: If @translationof is used in translated docs -@c see whether it is feasible to say @value{translationof}. @macro englishref Esta sección aún no está traducida; consulte el manual en inglés. @end macro - - -@ifhtml - -@ifset bigpage -@macro untranslated -@end macro -@end ifset - -@ifclear bigpage -@macro untranslated -UNTRANSLATED NODE: IGNORE ME -@end macro -@end ifclear - -@end ifhtml - -@ifnothtml - -@macro untranslated -@end macro - -@end ifnothtml diff --git a/Documentation/fr/user/macros.itexi b/Documentation/fr/user/macros.itexi index 4612a52b0b..1e4e7c7408 100644 --- a/Documentation/fr/user/macros.itexi +++ b/Documentation/fr/user/macros.itexi @@ -8,24 +8,11 @@ @include version.itexi - - -@c Don't replace quotes with directed quotes. - -@set txicodequoteundirected -@set txicodequotebacktick - +@include common-macros.itexi @c ***** Displaying text ***** -@c We need this since @q{\} doesn't work with makeinfo 4.11 -- -@c say @q{@bs{}} instead. - -@macro bs -\\ -@end macro - @c To get decent quotes in `foo' and ``foo''. @c FIXME: Use thin spaces for @qq. @@ -79,53 +66,6 @@ @end ifnothtml -@ifnotinfo - -@macro notation{TEXT} -@var{\TEXT\} -@end macro - -@end ifnotinfo - -@ifinfo - -@macro notation{TEXT} -\TEXT\ -@end macro - -@end ifinfo - - -@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 the `lilypond/' subdirectory. `lilypond-book' -@c already generates proper @image commands for images of music; these -@c macro 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 ***** @@ -178,20 +118,6 @@ @end macro -@macro lydoctitle {TEXT} -@emph{\TEXT\} -@end macro - - -@c Don't remove the `@c' within the macro definition! See section 19.3, -@c `Macro Details and Caveats', in the texinfo info file for explanation. - -@macro funindex {TEXT} -@findex \TEXT\ -@kindex \TEXT\ -@c -@end macro - @c ***** Links and references ***** @@ -427,54 +353,9 @@ @end iftex - @c ***** Macros specific to translated docs ***** -@c ugh, cannot set/define global variable 'translationof' in some way? - -@iftex - -@macro translationof{TEXT} -@end macro - -@end iftex - -@ifinfo - -@macro translationof{TEXT} -@set translationof \TEXT\ -@end macro - -@end ifinfo - - -@c TODO: If @translationof is used in translated docs -@c see whether it is feasible to say @value{translationof}. - @macro englishref Cette section n'est pas encore encore traduite, veuillez vous reporter à la documentation correspondante en anglais. @end macro - - -@ifhtml - -@ifset bigpage -@macro untranslated -@end macro -@end ifset - -@ifclear bigpage -@macro untranslated -UNTRANSLATED NODE: IGNORE ME -@end macro -@end ifclear - -@end ifhtml - -@ifnothtml - -@macro untranslated -@end macro - -@end ifnothtml diff --git a/Documentation/ja/user/macros.itexi b/Documentation/ja/user/macros.itexi new file mode 100644 index 0000000000..f755bafe6e --- /dev/null +++ b/Documentation/ja/user/macros.itexi @@ -0,0 +1,323 @@ +@c -*- coding: utf-8; mode: texinfo; -*- +@ignore + Translation of GIT committish: 499a511d4166feaada31114e097f86b5e0c56421 + + When revising a translation, copy the HEAD committish of the + version that you are working on. See TRANSLATION for details. +@end ignore + + +@include version.itexi +@include common-macros.itexi + + +@c ***** Displaying text ***** + +@macro hash +\# +@end macro + +@c To get decent quotes in `foo' and ``foo''. +@c FIXME: Use thin spaces for @qq. + +@ifnotinfo + +@macro q{TEXT} +@quoteleft{}\TEXT\@quoteright{} +@end macro + +@macro qq{TEXT} +@quotedblleft{}\TEXT\@quotedblright{} +@end macro + +@end ifnotinfo + +@ifinfo + +@macro q{TEXT} +`\TEXT\' +@end macro + +@macro qq{TEXT} +« \TEXT\ » +@end macro + +@end ifinfo + + +@ifhtml + +@macro warning{TEXT} +@cartouche +@b{Note:} \TEXT\ +@end cartouche +@end macro + +@end ifhtml + +@ifnothtml + +@macro warning{TEXT} +@quotation +@quotation +@cartouche +@b{Note:} \TEXT\ +@end cartouche +@end quotation +@end quotation +@end macro + +@end ifnothtml + + + +@c ***** Headings in a doc subsection ***** + +@c Don't insert an empty line after @predefined! Right now +@c it doesn't matter, but a future implementation will probably +@c add some code which needs this restriction. + +@macro predefined +@noindent +@subsubheading Predefined commands +@end macro + +@macro snippets +@noindent +@subsubheading Selected Snippets +@end macro + + +@c Don't insert an empty line after @seealso! Otherwise we get +@c unwanted extra vertical space in the PDF output. + +@macro seealso +@noindent +@subsubheading See also +@indent +@end macro + + +@macro knownissues +@noindent +@subsubheading Known issues and warnings +@end macro + + + +@c ***** Links and references ***** + +@c Definitions for references: +@c +@c @rglos +@c @rlearning +@c @ruser +@c @rprogram +@c @rlsr +@c @rinternals +@c +@c All these also have a @...named version which allows to specify the +@c displayed text for the reference as second argument. +@c +@c ***** HTML + bigpage is a special case (other manual names); all other +@c formats are treated similarly. + + +@c *** not TeX *** + +@ifnottex + +@c ** bigpage ** + +@ifset bigpage + +@macro rglos{TEXT} +@vindex \TEXT\ +@ref{\TEXT\,,,music-glossary-big-page,Music Glossary} +@end macro + +@macro rglosnamed{TEXT,DISPLAY} +@vindex \TEXT\ +@ref{\TEXT\,,\DISPLAY\,music-glossary-big-page,Music Glossary} +@end macro + +@macro rlearning{TEXT} +@vindex \TEXT\ +@ref{\TEXT\,,,lilypond-learning-big-page,Learning Manual} +@end macro + +@macro rlearningnamed{TEXT,DISPLAY} +@vindex \TEXT\ +@ref{\TEXT\,,\DISPLAY\,lilypond-learning-big-page,Learning Manual} +@end macro + +@macro ruser{TEXT} +@vindex \TEXT\ +@ref{\TEXT\,,,lilypond-big-page,Notation Reference} +@end macro + +@macro rusernamed{TEXT,DISPLAY} +@vindex \TEXT\ +@ref{\TEXT\,,\DISPLAY\,lilypond-big-page,Notation Reference} +@end macro + +@macro rprogram{TEXT} +@vindex \TEXT\ +@ref{\TEXT\,,,lilypond-program-big-page,Application Usage} +@end macro + +@macro rprogramnamed{TEXT,DISPLAY} +@vindex \TEXT\ +@ref{\TEXT\,,\DISPLAY\,lilypond-program-big-page,Application Usage} +@end macro + +@macro rlsr{TEXT} +@ref{\TEXT\,,,lilypond-snippets-big-page,Snippets} +@end macro + +@macro rlsrnamed{TEXT,DISPLAY} +@ref{\TEXT\,,\DISPLAY\,lilypond-snippets-big-page,Snippets} +@end macro + +@macro rinternals{TEXT} +@vindex \TEXT\ +@ref{\TEXT\,,,lilypond-internals-big-page,Internals Reference} +@end macro + +@macro rinternalsnamed{TEXT,DISPLAY} +@vindex \TEXT\ +@ref{\TEXT\,,\DISPLAY\,lilypond-internals-big-page,Internals Reference} +@end macro + +@end ifset + + +@c ** not bigpage ** + +@ifclear bigpage + +@macro rglos{TEXT} +@vindex \TEXT\ +@ref{\TEXT\,,,music-glossary,Music Glossary} +@end macro + +@macro rglosnamed{TEXT,DISPLAY} +@vindex \TEXT\ +@ref{\TEXT\,,\DISPLAY\,music-glossary,Music Glossary} +@end macro + +@macro rlearning{TEXT} +@vindex \TEXT\ +@ref{\TEXT\,,,lilypond-learning,Learning Manual} +@end macro + +@macro rlearningnamed{TEXT,DISPLAY} +@vindex \TEXT\ +@ref{\TEXT\,,,lilypond-learning,Learning Manual} +@end macro + +@macro ruser{TEXT} +@vindex \TEXT\ +@ref{\TEXT\,,,lilypond,Notation Reference} +@end macro + +@macro rusernamed{TEXT,DISPLAY} +@vindex \TEXT\ +@ref{\TEXT\,,\DISPLAY\,lilypond,Notation Reference} +@end macro + +@macro rprogram{TEXT} +@vindex \TEXT\ +@ref{\TEXT\,,,lilypond-program,Application Usage} +@end macro + +@macro rprogramnamed{TEXT,DISPLAY} +@vindex \TEXT\ +@ref{\TEXT\,,\DISPLAY\,lilypond-program,Application Usage} +@end macro + +@macro rlsr{TEXT} +@ref{\TEXT\,,,lilypond-snippets,Snippets} +@end macro + +@macro rlsrnamed{TEXT,DISPLAY} +@ref{\TEXT\,,\DISPLAY\,lilypond-snippets,Snippets} +@end macro + +@macro rinternals{TEXT} +@vindex \TEXT\ +@ref{\TEXT\,,,lilypond-internals,Internals Reference} +@end macro + +@macro rinternalsnamed{TEXT,DISPLAY} +@vindex \TEXT\ +@ref{\TEXT\,,\DISPLAY\,lilypond-internals,Internals Reference} +@end macro + +@end ifclear + +@end ifnottex + + +@c *** TeX *** + +@iftex + +@macro rglos{TEXT} +@vindex \TEXT\ +@ref{\TEXT\,,,music-glossary,Music Glossary} +@end macro + +@macro rglosnamed{TEXT,DISPLAY} +@vindex \TEXT\ +@ref{\TEXT\,,\DISPLAY\,music-glossary,Music Glossary} +@end macro + +@macro rlearning{TEXT} +@ref{\TEXT\,,,lilypond-learning,Learning Manual} +@end macro + +@macro rlearningnamed{TEXT,DISPLAY} +@ref{\TEXT\,,\DISPLAY\,lilypond-learning,Learning Manual} +@end macro + +@macro ruser{TEXT} +@ref{\TEXT\,,,lilypond,Notation Reference} +@end macro + +@macro rusernamed{TEXT,DISPLAY} +@ref{\TEXT\,,\DISPLAY\,lilypond,Notation Reference} +@end macro + +@macro rprogram{TEXT} +@ref{\TEXT\,,,lilypond-program,Application Usage} +@end macro + +@macro rprogramnamed{TEXT,DISPLAY} +@ref{\TEXT\,,\DISPLAY\,lilypond-program,Application Usage} +@end macro + +@macro rlsr{TEXT} +@ref{\TEXT\,,,lilypond-snippets,Snippets} +@end macro + +@macro rlsrnamed{TEXT,DISPLAY} +@ref{\TEXT\,,\DISPLAY\,lilypond-snippets,Snippets} +@end macro + +@macro rinternals{TEXT} +@vindex \TEXT\ +@ref{\TEXT\,,,lilypond-internals,Internals Reference} +@end macro + +@macro rinternalsnamed{TEXT,DISPLAY} +@vindex \TEXT\ +@ref{\TEXT\,,\DISPLAY\,lilypond-internals,Internals Reference} +@end macro + +@end iftex + + +@c ***** Macros specific to translated docs ***** + +@c None currently defined diff --git a/lilypond-texi2html.init b/Documentation/lilypond-texi2html.init similarity index 100% rename from lilypond-texi2html.init rename to Documentation/lilypond-texi2html.init diff --git a/Documentation/user/macros.itexi b/Documentation/macros.itexi similarity index 83% rename from Documentation/user/macros.itexi rename to Documentation/macros.itexi index 9dbf8a8ff3..86f549bc81 100644 --- a/Documentation/user/macros.itexi +++ b/Documentation/macros.itexi @@ -8,25 +8,11 @@ @include version.itexi - - -@c Don't replace quotes with directed quotes. - -@set txicodequoteundirected -@set txicodequotebacktick - +@include common-macros.itexi @c ***** Displaying text ***** -@c We need this since @q{\} doesn't work with makeinfo 4.11 -- -@c say @q{@bs{}} instead. - -@macro bs -\\ -@end macro - - @c To get decent quotes in `foo' and ``foo''. @macro q{TEXT} @@ -63,53 +49,6 @@ @end ifnothtml -@ifnotinfo - -@macro notation{TEXT} -@var{\TEXT\} -@end macro - -@end ifnotinfo - -@ifinfo - -@macro notation{TEXT} -\TEXT\ -@end macro - -@end ifinfo - - -@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 the `lilypond/' subdirectory. `lilypond-book' -@c already generates proper @image commands for images of music; these -@c macro 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 ***** @@ -155,21 +94,6 @@ @end macro -@macro lydoctitle {TEXT} -@emph{\TEXT\} -@end macro - - -@c Don't remove the `@c' within the macro definition! See section 19.3, -@c `Macro Details and Caveats', in the texinfo info file for explanation. - -@macro funindex {TEXT} -@findex \TEXT\ -@kindex \TEXT\ -@c -@end macro - - @c ***** Links and references ***** diff --git a/GNUmakefile.in b/GNUmakefile.in index 8e379eb6cd..0684e47b31 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -25,7 +25,7 @@ IN_FILES := $(call src-wildcard,*.in) RELEASE_FILES = ChangeLog RELEASE-COMMIT RELEASE_OUT_FILES = $(RELEASE_FILES:%=$(outdir)/%) OUT_DIST_FILES += $(RELEASE_OUT_FILES) -EXTRA_DIST_FILES = VERSION .gitignore lilypond-texi2html.init \ +EXTRA_DIST_FILES = VERSION .gitignore \ $(README_FILES) $(SCRIPTS) $(IN_FILES) INSTALLATION_DIR=$(local_lilypond_datadir) INSTALLATION_FILES=$(config_make) VERSION diff --git a/make/doc-i18n-user-vars.make b/make/doc-i18n-user-vars.make index 8281b30d09..85075c27fb 100644 --- a/make/doc-i18n-user-vars.make +++ b/make/doc-i18n-user-vars.make @@ -30,7 +30,7 @@ XREF_MAPS_DIR=$(top-build-dir)/out/xref-maps XREF_MAPS_FILES=$(TELY_FILES:%.tely=$(XREF_MAPS_DIR)/%.$(ISOLANG).xref-map) # texi2html flags -TEXI2HTML_INIT= --init-file=$(top-src-dir)/lilypond-texi2html.init +TEXI2HTML_INIT= --init-file=$(top-src-dir)/Documentation/lilypond-texi2html.init TEXI2HTML_LANG=--lang=$(ISOLANG) TEXI2HTML_FLAGS += $(TEXI2HTML_LANG) $(DOCUMENTATION_INCLUDES) \ -I $(XREF_MAPS_DIR) diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make index 4faeb8fcd5..ac5dae67ad 100644 --- a/make/lilypond-vars.make +++ b/make/lilypond-vars.make @@ -29,7 +29,8 @@ LILYPOND_BOOK = $(script-dir)/lilypond-book.py LILYPOND_BOOK_INCLUDES = -I $(src-dir)/ -I $(outdir) -I $(input-dir) \ -I $(input-dir)/lsr/ -I $(input-dir)/regression/ -I $(input-dir)/manual/ \ -I $(input-dir)/tutorial/ -I $(top-build-dir)/mf/$(outconfbase)/ \ - -I $(top-build-dir)/mf/out/ -I $(top-src-dir)/input/manual + -I $(top-build-dir)/mf/out/ -I $(top-src-dir)/input/manual \ + -I $(top-src-dir)/Documentation ## override from cmd line to speed up. ANTI_ALIAS_FACTOR=2 diff --git a/stepmake/stepmake/texinfo-vars.make b/stepmake/stepmake/texinfo-vars.make index d3d237843c..b203240a3f 100644 --- a/stepmake/stepmake/texinfo-vars.make +++ b/stepmake/stepmake/texinfo-vars.make @@ -1,7 +1,5 @@ TEXI_FILES = $(call src-wildcard,*.texi) - ALL_SOURCES += $(TEXI_FILES) - TEXINFO_SOURCES = $(TEXI_FILES) OUTTXT_FILES += $(addprefix $(outdir)/,$(TEXI_FILES:.texi=.txt)) @@ -10,6 +8,8 @@ GENERATE_OMF = $(buildscript-dir)/texi2omf --format $(1) --location $(webdir)/$( TEXINFO_PAPERSIZE_OPTION= $(if $(findstring $(PAPERSIZE),a4),,-t @afourpaper) +DOCUMENTATION_INCLUDES += -I $(top-src-dir)/Documentation + MAKEINFO_FLAGS += --enable-encoding $(DOCUMENTATION_INCLUDES) MAKEINFO = LANG= $(MAKEINFO_PROGRAM) $(MAKEINFO_FLAGS) @@ -22,7 +22,7 @@ ifneq ($(ISOLANG),) TEXI2HTML_LANG = --lang=$(ISOLANG) endif TEXI2HTML_FLAGS += $(DOCUMENTATION_INCLUDES) --I=$(XREF_MAPS_DIR) -TEXI2HTML_INIT = --init-file=$(top-src-dir)/lilypond-texi2html.init +TEXI2HTML_INIT = --init-file=$(top-src-dir)/Documentation/lilypond-texi2html.init TEXI2HTML = $(TEXI2HTML_PROGRAM) $(TEXI2HTML_FLAGS) $(TEXI2HTML_LANG) TEXI2PDF_FLAGS += $(DOCUMENTATION_INCLUDES) diff --git a/stepmake/stepmake/topdocs-vars.make b/stepmake/stepmake/topdocs-vars.make index 89786ea768..b47fb8867d 100644 --- a/stepmake/stepmake/topdocs-vars.make +++ b/stepmake/stepmake/topdocs-vars.make @@ -1,3 +1,3 @@ TO_TOP_FILES=$(addprefix $(outdir)/, $(addsuffix .txt, $(README_TOP_FILES))) -DOCUMENTATION_INCLUDES = -I $(top-src-dir)/Documentation/user +DOCUMENTATION_INCLUDES += -I $(top-src-dir)/Documentation/user -- 2.39.2