From e2acba32831e6d352c6e2cccac579c930ad6efb2 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 14 Aug 2009 10:38:04 +0200 Subject: [PATCH] Doc: Merge automated-engraving into essay. --- Documentation/GNUmakefile | 6 +-- ...graving.texi => automated-engraving.itexi} | 39 +++++++++---------- Documentation/essay.tely | 4 ++ Documentation/general.texi | 2 +- Documentation/nl/general.texi | 2 +- Documentation/web-texi2html.init | 12 +++--- 6 files changed, 33 insertions(+), 32 deletions(-) rename Documentation/{automated-engraving.texi => automated-engraving.itexi} (83%) diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile index e7e7f08e79..4f18f08e39 100644 --- a/Documentation/GNUmakefile +++ b/Documentation/GNUmakefile @@ -93,12 +93,12 @@ OUT_TXT_FILES = $(addprefix $(outdir)/, $(addsuffix .txt, $(README_TOP_FILES))) ## No big page OUT_HTML_FILES := $(subst $(outdir)/general-big-page.html,,$(OUT_HTML_FILES)) +$(outdir)/essay/index.html: TEXI2HTML_INIT = $(WEB_TEXI2HTML_INIT) -D=shallow_toc +$(outdir)/essay/index.html: TEXI2HTML_SPLIT = $(WEB_TEXI2HTML_SPLIT) + $(outdir)/general/index.html: TEXI2HTML_INIT = $(WEB_TEXI2HTML_INIT) $(outdir)/general/index.html: TEXI2HTML_SPLIT = $(WEB_TEXI2HTML_SPLIT) -$(outdir)/automated-engraving/index.html: TEXI2HTML_INIT = $(WEB_TEXI2HTML_INIT) -$(outdir)/automated-engraving/index.html: TEXI2HTML_SPLIT = $(WEB_TEXI2HTML_SPLIT) - ########### ### Targets diff --git a/Documentation/automated-engraving.texi b/Documentation/automated-engraving.itexi similarity index 83% rename from Documentation/automated-engraving.texi rename to Documentation/automated-engraving.itexi index c80f40cfbf..192268ec0c 100644 --- a/Documentation/automated-engraving.texi +++ b/Documentation/automated-engraving.itexi @@ -1,4 +1,4 @@ -\input texinfo @c -*- coding: utf-8; mode: texinfo; -*- +@c -*- coding: utf-8; mode: texinfo; -*- @ignore Translation of GIT committish: FILL-IN-HEAD-COMMITTISH @@ -12,23 +12,25 @@ hmm, the one big page is too big, but it was really inviting to to index? @end ignore -@setfilename automated-engraving.info -@settitle Obsessed with putting ink on paper -@documentencoding UTF-8 -@documentlanguage en +@c @setfilename automated-engraving.info +@c @settitle Obsessed with putting ink on paper +@c @documentencoding UTF-8 +@c @documentlanguage en -@set web -@include macros.itexi +@c @set web +@c @include macros.itexi -@afourpaper +@c @afourpaper -@ifnottex -@node Top -@top -@chapheading -@end ifnottex +@c @ifnottex +@c @node Top +@c @top +@c @chapheading +@c @end ifnottex -@finalout +@node automated-engraving +@unnumbered Obsessed with putting ink on paper +@c @finalout @heading What is behind LilyPond? @@ -41,9 +43,9 @@ ask any musician that plays classical music: new scores do not look as nice as old ones. What is the difference between hand-work and machine work, and what - has caused it? How can we improve the situation? This essay explains - problems in music notation (software), and our approach to solving - them. +has caused it? How can we improve the situation? This essay explains +problems in music notation (software), and our approach to solving +them. @menu * introduction:: Introduction -- what is wrong with computer music notation. @@ -80,6 +82,3 @@ What is the difference between hand-work and machine work, and what @include automated-engraving/typography-features.itexi @include automated-engraving/input-format.itexi @include automated-engraving/conclusion.itexi - -@bye - diff --git a/Documentation/essay.tely b/Documentation/essay.tely index 946086ca76..f77504bafe 100644 --- a/Documentation/essay.tely +++ b/Documentation/essay.tely @@ -10,6 +10,7 @@ @documentencoding UTF-8 @documentlanguage en +@set web @include macros.itexi @afourpaper @@ -89,6 +90,7 @@ Free Documentation License''. @menu * Music engraving:: +* automated-engraving:: Essay on Automated engraving. * Literature list:: * GNU Free Documentation License:: License of this document. * LilyPond index:: @@ -97,8 +99,10 @@ Free Documentation License''. @contents @include essay/engraving.itely +@include automated-engraving.itexi @include essay/literature.itely +@clear web @include fdl.itexi @node LilyPond index diff --git a/Documentation/general.texi b/Documentation/general.texi index d4737d4ed9..9cf1e2508f 100644 --- a/Documentation/general.texi +++ b/Documentation/general.texi @@ -88,7 +88,7 @@ Read more in our @ref{Introduction}! @c This and more in our @ressaynamed{Engraving, essay}. @c Possibly, node Top always works? @c This and more in our @ressaynamed{Top, essay}. -This and more in our @ref{Top,,Essay,automated-engraving,Essay}. +This and more in our @ref{automated-engraving,,Essay,essay,Essay}. @divEnd @divEnd diff --git a/Documentation/nl/general.texi b/Documentation/nl/general.texi index bb1f4c784e..d6afdc8504 100644 --- a/Documentation/nl/general.texi +++ b/Documentation/nl/general.texi @@ -65,7 +65,7 @@ Lees de @ref{Inleiding}! @c Dat en meer in ons @ressaynamed{Engraving, essay}. @c Possibly, node Top always works? @c Dat en meer in ons @ressaynamed{Top, essay}. -Dat en meer in ons @ref{Top,,Essay,automated-engraving,Essay}. +Dat en meer in ons @ref{automated-engraving,,Essay,essay,Essay}. @divEnd @divEnd diff --git a/Documentation/web-texi2html.init b/Documentation/web-texi2html.init index e3307dd9c1..822f5beaa4 100644 --- a/Documentation/web-texi2html.init +++ b/Documentation/web-texi2html.init @@ -596,6 +596,9 @@ sub lilypond_generate_page_toc_body($) $parentelements{$current_element->{'sectionup'}->{'id'}} = 1 if ($current_element->{'sectionup'}->{'id'} ne ''); $current_element = $current_element->{'sectionup'}; + if (exists($main::value{'shallow_toc'})) { + last; + } } return () if not defined($current_element); # Create the toc entries recursively @@ -610,15 +613,15 @@ sub lilypond_generate_page_toc_body($) } else { push (@toc_entries, "
  • Main
    • \n"); } - my $children = $current_element->{'section_childs'}; # FIXME: generate toc foreach ( @$children ) { push (@toc_entries, generate_ly_toc_entries($_, \%parentelements, $page_toc_depth)); } + if (!exists($main::value{'shallow_toc'})) { # FIXME: add search entry box push (@toc_entries, "
    • \n"); - + } push (@toc_entries, "\n"); #FIXME # push (@toc_entries, "\n"); @@ -737,11 +740,6 @@ sub print_lilypond_page_foot($) print $fh "\"Valid

    \n"; - print $fh "

    Web pages created with"; - print $fh " "; - print $fh " GNU Texinfo\n"; - print $fh " and "; - print $fh " texi2html.

    \n"; print $fh ""; print $fh ""; -- 2.39.2