From fc41dbd0b6048fea62fa7251134fac350a59276f Mon Sep 17 00:00:00 2001 From: Graham Percival Date: Sat, 21 Nov 2009 15:26:56 +0000 Subject: [PATCH] Doc build: rename general -> web. Hopefully the last major change until a new build system. :( --- Documentation/GNUmakefile | 20 +++++------ Documentation/contributor/website-work.itexi | 4 +-- Documentation/de/learning/introduction.itely | 8 ++--- Documentation/de/macros.itexi | 24 ++++++------- Documentation/fr/GNUmakefile | 4 +-- Documentation/fr/{general.texi => web.texi} | 12 +++---- Documentation/fr/{general => web}/GNUmakefile | 0 .../fr/{general => web}/community.itexi | 4 +-- .../fr/{general => web}/download.itexi | 2 +- .../fr/{general => web}/introduction.itexi | 2 +- .../fr/{general => web}/manuals.itexi | 2 +- .../{nl/general => fr/web}/news-front.itexi | 2 +- Documentation/fr/{general => web}/news.itexi | 0 Documentation/index.html.in | 2 +- Documentation/learning/tutorial.itely | 8 ++--- Documentation/lilypond-texi2html.init | 2 +- Documentation/macros.itexi | 36 +++++++++---------- Documentation/music-glossary.tely | 2 +- Documentation/nl/GNUmakefile | 4 +-- Documentation/nl/{general.texi => web.texi} | 12 +++---- Documentation/nl/{general => web}/GNUmakefile | 0 .../nl/{general => web}/community.itexi | 2 +- .../nl/{general => web}/download.itexi | 2 +- .../nl/{general => web}/introduction.itexi | 2 +- .../nl/{general => web}/manuals.itexi | 2 +- .../{fr/general => nl/web}/news-front.itexi | 2 +- Documentation/topdocs/AUTHORS.texi | 2 +- Documentation/usage/converters.itely | 4 +-- Documentation/usage/lilypond-book.itely | 2 +- Documentation/usage/running.itely | 4 +-- Documentation/usage/suggestions.itely | 2 +- Documentation/{general.texi => web.texi} | 12 +++---- Documentation/{general => web}/GNUmakefile | 0 .../{general => web}/basic-authors.itexi | 0 .../{general => web}/community.itexi | 4 +-- Documentation/{general => web}/download.itexi | 0 .../{general => web}/examples/GNUmakefile | 0 .../examples/ancient-headword.ly | 0 .../examples/aucun-snippet.ly | 0 .../{general => web}/examples/bach-bwv610.ly | 0 .../examples/bach-schenker.ly | 0 .../{general => web}/examples/cary-layout.ily | 0 .../{general => web}/examples/cary.ly | 0 .../{general => web}/examples/chart.ly | 0 .../examples/example-header.ily | 0 .../{general => web}/examples/granados.ly | 0 .../{general => web}/examples/orchestra.ly | 0 .../{general => web}/examples/sesto-full.ly | 0 .../{general => web}/examples/sesto-piano.ly | 0 .../{general => web}/examples/sesto-violin.ly | 0 .../{general => web}/examples/sesto.ily | 0 .../{general => web}/examples/tab-example.ly | 0 .../{general => web}/examples/theory.ly | 0 .../{general => web}/introduction.itexi | 0 Documentation/{general => web}/manuals.itexi | 0 .../{general => web}/news-front.itexi | 2 +- Documentation/{general => web}/news.itexi | 0 GNUmakefile.in | 4 +-- make/doc-i18n-root-rules.make | 2 +- make/doc-i18n-root-vars.make | 6 ++-- python/auxiliar/buildlib.py | 2 +- python/auxiliar/postprocess_html.py | 4 +-- 62 files changed, 105 insertions(+), 105 deletions(-) rename Documentation/fr/{general.texi => web.texi} (89%) rename Documentation/fr/{general => web}/GNUmakefile (100%) rename Documentation/fr/{general => web}/community.itexi (98%) rename Documentation/fr/{general => web}/download.itexi (99%) rename Documentation/fr/{general => web}/introduction.itexi (99%) rename Documentation/fr/{general => web}/manuals.itexi (98%) rename Documentation/{nl/general => fr/web}/news-front.itexi (96%) rename Documentation/fr/{general => web}/news.itexi (100%) rename Documentation/nl/{general.texi => web.texi} (91%) rename Documentation/nl/{general => web}/GNUmakefile (100%) rename Documentation/nl/{general => web}/community.itexi (98%) rename Documentation/nl/{general => web}/download.itexi (99%) rename Documentation/nl/{general => web}/introduction.itexi (99%) rename Documentation/nl/{general => web}/manuals.itexi (98%) rename Documentation/{fr/general => nl/web}/news-front.itexi (96%) rename Documentation/{general.texi => web.texi} (93%) rename Documentation/{general => web}/GNUmakefile (100%) rename Documentation/{general => web}/basic-authors.itexi (100%) rename Documentation/{general => web}/community.itexi (99%) rename Documentation/{general => web}/download.itexi (100%) rename Documentation/{general => web}/examples/GNUmakefile (100%) rename Documentation/{general => web}/examples/ancient-headword.ly (100%) rename Documentation/{general => web}/examples/aucun-snippet.ly (100%) rename Documentation/{general => web}/examples/bach-bwv610.ly (100%) rename Documentation/{general => web}/examples/bach-schenker.ly (100%) rename Documentation/{general => web}/examples/cary-layout.ily (100%) rename Documentation/{general => web}/examples/cary.ly (100%) rename Documentation/{general => web}/examples/chart.ly (100%) rename Documentation/{general => web}/examples/example-header.ily (100%) rename Documentation/{general => web}/examples/granados.ly (100%) rename Documentation/{general => web}/examples/orchestra.ly (100%) rename Documentation/{general => web}/examples/sesto-full.ly (100%) rename Documentation/{general => web}/examples/sesto-piano.ly (100%) rename Documentation/{general => web}/examples/sesto-violin.ly (100%) rename Documentation/{general => web}/examples/sesto.ily (100%) rename Documentation/{general => web}/examples/tab-example.ly (100%) rename Documentation/{general => web}/examples/theory.ly (100%) rename Documentation/{general => web}/introduction.itexi (100%) rename Documentation/{general => web}/manuals.itexi (100%) rename Documentation/{general => web}/news-front.itexi (90%) rename Documentation/{general => web}/news.itexi (100%) diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile index f91b178e8f..2dcf751ce4 100644 --- a/Documentation/GNUmakefile +++ b/Documentation/GNUmakefile @@ -10,7 +10,7 @@ depth = .. NAME = documentation LANGS = $(shell $(PYTHON) $(top-src-dir)/python/langdefs.py) MANUALS_SUBDIRS = usage automated-engraving contributor essay \ - general learning notation extending + web learning notation extending SUBDIRS = $(MANUALS_SUBDIRS) snippets logo pictures misc po css topdocs \ included $(LANGS) STEPMAKE_TEMPLATES = documentation texinfo tex omf @@ -79,7 +79,7 @@ OUT_HTML_FILES += $(HTML_PAGE_NAMES:%=$(outdir)/%.html) MAIN_INFO_DOC = lilypond-notation INFO_DOCS = lilypond-usage lilypond-changes lilypond-contributor lilypond-internals \ lilypond-essay lilypond-learning lilypond-notation music-glossary \ - lilypond-general lilypond-extending + lilypond-web lilypond-extending ifeq ($(out),www) INFO_DOCS += lilypond-snippets endif @@ -96,11 +96,11 @@ OUT_TXT_FILES = $(addprefix $(outdir)/, $(addsuffix .txt, $(README_TOP_FILES))) ### Web site idiosyncrases -$(outdir)/general/index.html: TEXI2HTML_INIT = $(WEB_TEXI2HTML_INIT) -$(outdir)/general/index.html: TEXI2HTML_SPLIT = $(WEB_TEXI2HTML_SPLIT) +$(outdir)/web/index.html: TEXI2HTML_INIT = $(WEB_TEXI2HTML_INIT) +$(outdir)/web/index.html: TEXI2HTML_SPLIT = $(WEB_TEXI2HTML_SPLIT) -#$(outdir)/general/index.html: -# $(TEXI2HTML) $(TEXI2HTML_SPLIT) $(TEXI2HTML_FLAGS) --output $(outdir)/ $(outdir)/general.texi +#$(outdir)/web/index.html: +# $(TEXI2HTML) $(TEXI2HTML_SPLIT) $(TEXI2HTML_FLAGS) --output $(outdir)/ $(outdir)/web.texi ########### ### Targets @@ -166,11 +166,11 @@ $(outdir)/pictures: $(MAKE) -C pictures WWW-1 ln -sf ../pictures/$(outdir) $@ -$(outdir)/general.texi: $(outdir)/examples +$(outdir)/web.texi: $(outdir)/examples $(outdir)/examples: - $(MAKE) -C general/examples - ln -sf ../general/examples/$(outdir) $@ + $(MAKE) -C web/examples + ln -sf ../web/examples/$(outdir) $@ endif # Ugh, using '%' twice not possible @@ -266,7 +266,7 @@ new-lang: test -e po/$(ISOLANG).po || cp po/lilypond-doc.pot po/$(ISOLANG).po @echo "*** Please add a language definition for $(ISOLANG) in python/langdefs.py ***" -TRANSLATION_DIRS = general texidocs +TRANSLATION_DIRS = web texidocs TRANSLATION_FILES = $(shell git ls-files $(ISOLANG) | grep -v GNUmakefile) TELY_FILES = $(call src-wildcard,$(ISOLANG)/*.tely) diff --git a/Documentation/contributor/website-work.itexi b/Documentation/contributor/website-work.itexi index bd16a4c163..6dbdd2ebab 100644 --- a/Documentation/contributor/website-work.itexi +++ b/Documentation/contributor/website-work.itexi @@ -16,8 +16,8 @@ instead, the source is texinfo, which is then generated into HTML, pdf, and info formats. The sources are @verbatim -Documentation/general.texi -Documentation/general/*.texi +Documentation/web.texi +Documentation/web/*.texi @end verbatim Unless otherwise specified, follow the instructions and policies diff --git a/Documentation/de/learning/introduction.itely b/Documentation/de/learning/introduction.itely index 3789cd67be..c1417273ae 100644 --- a/Documentation/de/learning/introduction.itely +++ b/Documentation/de/learning/introduction.itely @@ -137,7 +137,7 @@ und welche Programme Sie benutzen. Beachten Sie, dass es eine Reihe an Texteditoren mit besserer Unterstützung für LilyPond gibt. Mehr dazu im Abschnitt @rprogram{Unterstützung von Texteditoren}. -@c FIXME: link to @rgeneral{Alternate input} +@c FIXME: link to @rweb{Alternate input} @warning{Das erste Mal, wenn Sie LilyPond benutzen, kann es eine Minute oder länger dauern, weil das Programm zuerst alle Schriftarten, @@ -149,7 +149,7 @@ diesem ersten Mal läuft LilyPond sehr viel schneller.} @translationof MacOS X @warning{Diese Anweisungen gehen davon aus, dass Sie den installierten -LilyPad-Editor benutzen. Wenn Sie eins der Programme benutzen, die in @rgeneral{Alternate input} beschrieben sind, schauen +LilyPad-Editor benutzen. Wenn Sie eins der Programme benutzen, die in @rweb{Alternate input} beschrieben sind, schauen Sie bitte in der Dokumentation nach, wenn Sie Probleme damit haben, eine Datei zu kompilieren.} @@ -171,7 +171,7 @@ lesen Sie die Meldungen im Log-Fenster. @translationof Windows @warning{Diese Anweisungen gehen davon aus, dass Sie den installierten -LilyPad-Editor benutzen. Wenn Sie eins der Programme benutzen, die in @rgeneral{Alternate input} beschrieben sind, schauen +LilyPad-Editor benutzen. Wenn Sie eins der Programme benutzen, die in @rweb{Alternate input} beschrieben sind, schauen Sie bitte in der Dokumentation nach, wenn Sie Probleme damit haben, eine Datei zu kompilieren.} @@ -206,7 +206,7 @@ Blick in diese Datei. @translationof Command-line @warning{Diese Anweisungen gehen davon aus, dass Sie den installierten -LilyPad-Editor benutzen. Wenn Sie eins der Programme benutzen, die in @rgeneral{Alternate input} beschrieben sind, schauen +LilyPad-Editor benutzen. Wenn Sie eins der Programme benutzen, die in @rweb{Alternate input} beschrieben sind, schauen Sie bitte in der Dokumentation nach, wenn Sie Probleme damit haben, eine Datei zu kompilieren.} diff --git a/Documentation/de/macros.itexi b/Documentation/de/macros.itexi index a8be205b1d..87a9d68c91 100644 --- a/Documentation/de/macros.itexi +++ b/Documentation/de/macros.itexi @@ -169,14 +169,14 @@ @ref{\TEXT\,,\DISPLAY\,changes-big-page,Changes} @end macro -@macro rgeneral{TEXT} +@macro rweb{TEXT} @vindex \TEXT\ -@ref{\TEXT\,,,general-big-page,General Information} +@ref{\TEXT\,,,web-big-page,General Information} @end macro -@macro rgeneralnamed{TEXT,DISPLAY} +@macro rwebnamed{TEXT,DISPLAY} @vindex \TEXT\ -@ref{\TEXT\,,\DISPLAY\,general-big-page,General Information} +@ref{\TEXT\,,\DISPLAY\,web-big-page,General Information} @end macro @macro ressay{TEXT} @@ -264,14 +264,14 @@ @ref{\TEXT\,,\DISPLAY\,lilypond-changes,Changes} @end macro -@macro rgeneral{TEXT} +@macro rweb{TEXT} @vindex \TEXT\ -@ref{\TEXT\,,,lilypond-general,General Information} +@ref{\TEXT\,,,lilypond-web,General Information} @end macro -@macro rgeneralnamed{TEXT,DISPLAY} +@macro rwebnamed{TEXT,DISPLAY} @vindex \TEXT\ -@ref{\TEXT\,,\DISPLAY\,lilypond-general, General Information} +@ref{\TEXT\,,\DISPLAY\,lilypond-web, General Information} @end macro @macro ressay{TEXT} @@ -371,14 +371,14 @@ @ref{\TEXT\,,\DISPLAY\,changes,Changes} @end macro -@macro rgeneral{TEXT} +@macro rweb{TEXT} @lilyvindex{\TEXT\} -@ref{\TEXT\,,,general,General Information} +@ref{\TEXT\,,,web,General Information} @end macro -@macro rgeneralnamed{TEXT,DISPLAY} +@macro rwebnamed{TEXT,DISPLAY} @lilyvindex{\TEXT\} -@ref{\TEXT\,,\DISPLAY\,general,General Information} +@ref{\TEXT\,,\DISPLAY\,web,General Information} @end macro @macro ressay{TEXT} diff --git a/Documentation/fr/GNUmakefile b/Documentation/fr/GNUmakefile index 770a2871d6..03246fbf8b 100644 --- a/Documentation/fr/GNUmakefile +++ b/Documentation/fr/GNUmakefile @@ -1,9 +1,9 @@ ISOLANG = fr depth = ../.. -SUBDIRS = general learning notation texidocs usage +SUBDIRS = web learning notation texidocs usage STEPMAKE_TEMPLATES = documentation LOCALSTEPMAKE_TEMPLATES = lilypond ly doc-i18n-root -EXTRA_DIST_FILES = general.texi +EXTRA_DIST_FILES = web.texi include $(depth)/make/stepmake.make diff --git a/Documentation/fr/general.texi b/Documentation/fr/web.texi similarity index 89% rename from Documentation/fr/general.texi rename to Documentation/fr/web.texi index 4cab8b42d2..db04813f2a 100644 --- a/Documentation/fr/general.texi +++ b/Documentation/fr/web.texi @@ -1,5 +1,5 @@ \input texinfo @c -*- coding: utf-8; mode: texinfo; documentlanguage: nl -*- -@c This file is part of general.texi +@c This file is part of web.texi @ignore Translation of GIT committish: 1b3da70d81938d19a2b107382bbe25a267cf130b @@ -8,7 +8,7 @@ @end ignore -@setfilename general.info +@setfilename web.info @settitle LilyPond -- la notation musicale pour tous @documentencoding UTF-8 @documentlanguage fr @@ -78,9 +78,9 @@ TODO FIXME FRENCH @divEnd @contents -@include general/introduction.itexi -@include general/download.itexi -@include general/manuals.itexi -@include general/community.itexi +@include web/introduction.itexi +@include web/download.itexi +@include web/manuals.itexi +@include web/community.itexi @bye diff --git a/Documentation/fr/general/GNUmakefile b/Documentation/fr/web/GNUmakefile similarity index 100% rename from Documentation/fr/general/GNUmakefile rename to Documentation/fr/web/GNUmakefile diff --git a/Documentation/fr/general/community.itexi b/Documentation/fr/web/community.itexi similarity index 98% rename from Documentation/fr/general/community.itexi rename to Documentation/fr/web/community.itexi index b4b9cb15a7..d0a6386307 100644 --- a/Documentation/fr/general/community.itexi +++ b/Documentation/fr/web/community.itexi @@ -1,5 +1,5 @@ \input texinfo @c -*- coding: utf-8; mode: texinfo; documentlanguage: nl -*- -@c This file is part of general.texi +@c This file is part of web.texi @ignore Translation of GIT committish: 1b3da70d81938d19a2b107382bbe25a267cf130b @@ -165,6 +165,6 @@ @untranslated -@include general/news.itexi +@include web/news.itexi @c -- SKELETON FILE -- diff --git a/Documentation/fr/general/download.itexi b/Documentation/fr/web/download.itexi similarity index 99% rename from Documentation/fr/general/download.itexi rename to Documentation/fr/web/download.itexi index 4742070398..8f42e2b373 100644 --- a/Documentation/fr/general/download.itexi +++ b/Documentation/fr/web/download.itexi @@ -1,5 +1,5 @@ \input texinfo @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*- -@c This file is part of general.texi +@c This file is part of web.texi @ignore Translation of GIT committish: dab17828471057f4e12c0d80777ff9bb4c5b2309 diff --git a/Documentation/fr/general/introduction.itexi b/Documentation/fr/web/introduction.itexi similarity index 99% rename from Documentation/fr/general/introduction.itexi rename to Documentation/fr/web/introduction.itexi index e75b9f5fa2..07ba383a3f 100644 --- a/Documentation/fr/general/introduction.itexi +++ b/Documentation/fr/web/introduction.itexi @@ -1,5 +1,5 @@ \input texinfo @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*- -@c This file is part of general.texi +@c This file is part of web.texi @ignore Translation of GIT committish: dab17828471057f4e12c0d80777ff9bb4c5b2309 diff --git a/Documentation/fr/general/manuals.itexi b/Documentation/fr/web/manuals.itexi similarity index 98% rename from Documentation/fr/general/manuals.itexi rename to Documentation/fr/web/manuals.itexi index fd59b2298d..8a3d546ae8 100644 --- a/Documentation/fr/general/manuals.itexi +++ b/Documentation/fr/web/manuals.itexi @@ -1,5 +1,5 @@ \input texinfo @c -*- coding: utf-8; mode: texinfo; documentlanguage: nl -*- -@c This file is part of general.texi +@c This file is part of web.texi @ignore Translation of GIT committish: 1b3da70d81938d19a2b107382bbe25a267cf130b diff --git a/Documentation/nl/general/news-front.itexi b/Documentation/fr/web/news-front.itexi similarity index 96% rename from Documentation/nl/general/news-front.itexi rename to Documentation/fr/web/news-front.itexi index b857b25958..dd152c20bc 100644 --- a/Documentation/nl/general/news-front.itexi +++ b/Documentation/fr/web/news-front.itexi @@ -1,5 +1,5 @@ @c -*- coding: utf-8; mode: texinfo; -*- -@c This file is part of lilypond-general.texi and community.itexi +@c This file is part of lilypond-web.texi and community.itexi @c when you add a new item, consider moving the lowest item(s) @c into news-old.itexi. diff --git a/Documentation/fr/general/news.itexi b/Documentation/fr/web/news.itexi similarity index 100% rename from Documentation/fr/general/news.itexi rename to Documentation/fr/web/news.itexi diff --git a/Documentation/index.html.in b/Documentation/index.html.in index 2a50e9e27e..27d4cddb85 100644 --- a/Documentation/index.html.in +++ b/Documentation/index.html.in @@ -1,6 +1,6 @@ - + Redirecting to the documentation index... diff --git a/Documentation/learning/tutorial.itely b/Documentation/learning/tutorial.itely index 31993eb0b3..61a27a404f 100644 --- a/Documentation/learning/tutorial.itely +++ b/Documentation/learning/tutorial.itely @@ -118,7 +118,7 @@ program(s) you use. There are several other text editors available with better support for LilyPond. For more information, see -@rgeneral{Alternate input}. +@rweb{Alternate input}. @warning{The first time you ever run LilyPond, it may take a minute or two because all of the system fonts have to be analyzed @@ -130,7 +130,7 @@ first. After this, LilyPond will be much faster!} @warning{These instructions assume that you are using the built-in LilyPad editor. If you are using any of the programs described in -@rgeneral{Alternate input}, please consult the documentation for +@rweb{Alternate input}, please consult the documentation for those programs if you have any problems compiling a file.} @@ -151,7 +151,7 @@ any errors occur in processing, please see the log window. @warning{These instructions assume that you are using the built-in LilyPad editor. If you are using any of the programs described in -@rgeneral{Alternate input}, please consult the documentation for +@rweb{Alternate input}, please consult the documentation for those programs if you have any problems compiling a file.} On Windows, if you double-click in the LilyPond icon on the @@ -185,7 +185,7 @@ examine this file. @warning{These instructions assume that you are using commond unix command-line programs. If you are using any of the programs -described in @rgeneral{Alternate input}, please consult the +described in @rweb{Alternate input}, please consult the documentation for those programs if you have any problems compiling a file.} diff --git a/Documentation/lilypond-texi2html.init b/Documentation/lilypond-texi2html.init index 6a91142a3d..90a10d0234 100644 --- a/Documentation/lilypond-texi2html.init +++ b/Documentation/lilypond-texi2html.init @@ -688,7 +688,7 @@ sub lilypond_print_toc_div ($$) } my $reldir = ""; $reldir = "../" if ($Texi2HTML::Config::SPLIT eq 'section'); - my $uplink = $reldir."general/manuals.${lang}html"; + my $uplink = $reldir."web/manuals.${lang}html"; print $fh "

<< " . diff --git a/Documentation/macros.itexi b/Documentation/macros.itexi index 4daa26bfdf..35fde5912b 100644 --- a/Documentation/macros.itexi +++ b/Documentation/macros.itexi @@ -59,7 +59,7 @@ @cartouche For more information about how this manual fits with the other documentation, or to read this manual in other formats, see -@rgeneral{manuals}. +@rweb{manuals}. If you are missing any manuals, the complete documentation can be found at @w{@uref{http://@/www@/.lilypond@/.org/}}. @@ -184,7 +184,7 @@ For LilyPond version @version{} @c Definitions for references: @c -@c @rgeneral +@c @rweb @c @ressay @c @rglos @c @rinternals @@ -271,14 +271,14 @@ For LilyPond version @version{} @ref{\TEXT\,,\DISPLAY\,contributor-big-page,Contributor's Guide} @end macro -@macro rgeneral{TEXT} +@macro rweb{TEXT} @vindex \TEXT\ -@ref{\TEXT\,,,general-big-page,General Information} +@ref{\TEXT\,,,web-big-page,General Information} @end macro -@macro rgeneralnamed{TEXT,DISPLAY} +@macro rwebnamed{TEXT,DISPLAY} @vindex \TEXT\ -@ref{\TEXT\,,\DISPLAY\,general-big-page,General Information} +@ref{\TEXT\,,\DISPLAY\,web-big-page,General Information} @end macro @macro ressay{TEXT} @@ -388,14 +388,14 @@ For LilyPond version @version{} @ref{\TEXT\,,\DISPLAY\,contributor,Contributor's Guide} @end macro -@macro rgeneral{TEXT} +@macro rweb{TEXT} @vindex \TEXT\ -@ref{\TEXT\,,,general,General Information} +@ref{\TEXT\,,,web,General Information} @end macro -@macro rgeneralnamed{TEXT,DISPLAY} +@macro rwebnamed{TEXT,DISPLAY} @vindex \TEXT\ -@ref{\TEXT\,,\DISPLAY\,general,General Information} +@ref{\TEXT\,,\DISPLAY\,web,General Information} @end macro @macro ressay{TEXT} @@ -500,14 +500,14 @@ For LilyPond version @version{} @ref{\TEXT\,,\DISPLAY\,lilypond-contributor,Contributor's Guide} @end macro -@macro rgeneral{TEXT} +@macro rweb{TEXT} @vindex \TEXT\ -@ref{\TEXT\,,,lilypond-general,General Information} +@ref{\TEXT\,,,lilypond-web,General Information} @end macro -@macro rgeneralnamed{TEXT,DISPLAY} +@macro rwebnamed{TEXT,DISPLAY} @vindex \TEXT\ -@ref{\TEXT\,,\DISPLAY\,lilypond-general, General Information} +@ref{\TEXT\,,\DISPLAY\,lilypond-web, General Information} @end macro @macro ressay{TEXT} @@ -629,14 +629,14 @@ For LilyPond version @version{} @ref{\TEXT\,,\DISPLAY\,contributor,Contributor's Guide} @end macro -@macro rgeneral{TEXT} +@macro rweb{TEXT} @lilyvindex{\TEXT\} -@ref{\TEXT\,,,general,General Information} +@ref{\TEXT\,,,web,General Information} @end macro -@macro rgeneralnamed{TEXT,DISPLAY} +@macro rwebnamed{TEXT,DISPLAY} @lilyvindex{\TEXT\} -@ref{\TEXT\,,\DISPLAY\,general,General Information} +@ref{\TEXT\,,\DISPLAY\,web,General Information} @end macro @macro ressay{TEXT} diff --git a/Documentation/music-glossary.tely b/Documentation/music-glossary.tely index d40020ad21..a5a06630e6 100644 --- a/Documentation/music-glossary.tely +++ b/Documentation/music-glossary.tely @@ -179,7 +179,7 @@ Copyright 1999--2009 by the authors This is the Music Glossary (MG) for LilyPond version @version{}. For more information about how this fits with the other -documentation, see @rgeneral{Manuals}. +documentation, see @rweb{Manuals}. @c arrowref @macro aref{word} diff --git a/Documentation/nl/GNUmakefile b/Documentation/nl/GNUmakefile index c945160c35..8ab270f5e7 100644 --- a/Documentation/nl/GNUmakefile +++ b/Documentation/nl/GNUmakefile @@ -1,10 +1,10 @@ ISOLANG = nl depth = ../.. -SUBDIRS = general learning notation texidocs usage +SUBDIRS = web learning notation texidocs usage STEPMAKE_TEMPLATES = documentation LOCALSTEPMAKE_TEMPLATES = lilypond ly doc-i18n-root NO_PDF_FILES = 1 -EXTRA_DIST_FILES = general.texi +EXTRA_DIST_FILES = web.texi include $(depth)/make/stepmake.make diff --git a/Documentation/nl/general.texi b/Documentation/nl/web.texi similarity index 91% rename from Documentation/nl/general.texi rename to Documentation/nl/web.texi index 21d47a7512..216f22e1aa 100644 --- a/Documentation/nl/general.texi +++ b/Documentation/nl/web.texi @@ -1,5 +1,5 @@ \input texinfo @c -*- coding: utf-8; mode: texinfo; documentlanguage: nl -*- -@c This file is part of general.texi +@c This file is part of web.texi @ignore Translation of GIT committish: 1b3da70d81938d19a2b107382bbe25a267cf130b @@ -8,7 +8,7 @@ @end ignore -@setfilename general.info +@setfilename web.info @settitle LilyPond -- Muzieknotatie voor iedereen @documentencoding UTF-8 @documentlanguage nl @@ -94,9 +94,9 @@ Dat en meer in ons @ref{automated-engraving,,Essay,essay,Essay}. @divEnd @contents -@include general/introduction.itexi -@include general/download.itexi -@include general/manuals.itexi -@include general/community.itexi +@include web/introduction.itexi +@include web/download.itexi +@include web/manuals.itexi +@include web/community.itexi @bye diff --git a/Documentation/nl/general/GNUmakefile b/Documentation/nl/web/GNUmakefile similarity index 100% rename from Documentation/nl/general/GNUmakefile rename to Documentation/nl/web/GNUmakefile diff --git a/Documentation/nl/general/community.itexi b/Documentation/nl/web/community.itexi similarity index 98% rename from Documentation/nl/general/community.itexi rename to Documentation/nl/web/community.itexi index 213291b20a..6f70830081 100644 --- a/Documentation/nl/general/community.itexi +++ b/Documentation/nl/web/community.itexi @@ -1,5 +1,5 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: nl -*- -@c This file is part of general.texi +@c This file is part of web.texi @ignore Translation of GIT committish: 1b3da70d81938d19a2b107382bbe25a267cf130b diff --git a/Documentation/nl/general/download.itexi b/Documentation/nl/web/download.itexi similarity index 99% rename from Documentation/nl/general/download.itexi rename to Documentation/nl/web/download.itexi index 5aae90122a..cc1b35fb2d 100644 --- a/Documentation/nl/general/download.itexi +++ b/Documentation/nl/web/download.itexi @@ -1,5 +1,5 @@ \input texinfo @c -*- coding: utf-8; mode: texinfo; documentlanguage: nl -*- -@c This file is part of general.texi +@c This file is part of web.texi @ignore Translation of GIT committish: dab17828471057f4e12c0d80777ff9bb4c5b2309 diff --git a/Documentation/nl/general/introduction.itexi b/Documentation/nl/web/introduction.itexi similarity index 99% rename from Documentation/nl/general/introduction.itexi rename to Documentation/nl/web/introduction.itexi index 3cf2670e72..d998d57499 100644 --- a/Documentation/nl/general/introduction.itexi +++ b/Documentation/nl/web/introduction.itexi @@ -1,5 +1,5 @@ \input texinfo @c -*- coding: utf-8; mode: texinfo; documentlanguage: nl -*- -@c This file is part of general.texi +@c This file is part of web.texi @ignore Translation of GIT committish: dab17828471057f4e12c0d80777ff9bb4c5b2309 diff --git a/Documentation/nl/general/manuals.itexi b/Documentation/nl/web/manuals.itexi similarity index 98% rename from Documentation/nl/general/manuals.itexi rename to Documentation/nl/web/manuals.itexi index 7cd03f1b52..168cbb1641 100644 --- a/Documentation/nl/general/manuals.itexi +++ b/Documentation/nl/web/manuals.itexi @@ -1,5 +1,5 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: nl -*- -@c This file is part of general.texi +@c This file is part of web.texi @ignore Translation of GIT committish: dab17828471057f4e12c0d80777ff9bb4c5b2309 diff --git a/Documentation/fr/general/news-front.itexi b/Documentation/nl/web/news-front.itexi similarity index 96% rename from Documentation/fr/general/news-front.itexi rename to Documentation/nl/web/news-front.itexi index b857b25958..dd152c20bc 100644 --- a/Documentation/fr/general/news-front.itexi +++ b/Documentation/nl/web/news-front.itexi @@ -1,5 +1,5 @@ @c -*- coding: utf-8; mode: texinfo; -*- -@c This file is part of lilypond-general.texi and community.itexi +@c This file is part of lilypond-web.texi and community.itexi @c when you add a new item, consider moving the lowest item(s) @c into news-old.itexi. diff --git a/Documentation/topdocs/AUTHORS.texi b/Documentation/topdocs/AUTHORS.texi index acc6e0f806..d4c9c36fd2 100644 --- a/Documentation/topdocs/AUTHORS.texi +++ b/Documentation/topdocs/AUTHORS.texi @@ -12,7 +12,7 @@ @ignore @include macros.itexi -@include general/basic-authors.itexi +@include web/basic-authors.itexi @developersCurrent diff --git a/Documentation/usage/converters.itely b/Documentation/usage/converters.itely index 9efee75e0c..8dab496eb4 100644 --- a/Documentation/usage/converters.itely +++ b/Documentation/usage/converters.itely @@ -22,7 +22,7 @@ These are separate programs from @command{lilypond} itself, and are run on the command line; see @ref{Command-line usage} for more information. If you have MacOS 10.3 or 10.4 and you have trouble running some of these scripts, e.g. @code{convert-ly}, see -@rgeneral{MacOS X}. +@rweb{MacOS X}. @knownissues @@ -313,5 +313,5 @@ confuse @command{etf2ly}. Sequences of grace notes are ended improperly. LilyPond itself does not come with support for any other formats, but some external tools can also generate LilyPond files. These -are listed in @rgeneral{Alternate editors}. +are listed in @rweb{Alternate editors}. diff --git a/Documentation/usage/lilypond-book.itely b/Documentation/usage/lilypond-book.itely index 097219a020..b36d23d348 100644 --- a/Documentation/usage/lilypond-book.itely +++ b/Documentation/usage/lilypond-book.itely @@ -27,7 +27,7 @@ the music are adjusted to match the layout of your document. This is a separate program from @command{lilypond} itself, and is run on the command line; for more information, see @ref{Command-line usage}. If you have MacOS 10.3 or 10.4 and you have trouble running -@code{lilypond-book}, see @rgeneral{MacOS X}. +@code{lilypond-book}, see @rweb{MacOS X}. This procedure may be applied to @LaTeX{}, HTML, Texinfo or DocBook documents. diff --git a/Documentation/usage/running.itely b/Documentation/usage/running.itely index bf9728ab56..56cebbde55 100644 --- a/Documentation/usage/running.itely +++ b/Documentation/usage/running.itely @@ -46,7 +46,7 @@ By @q{command-line}, we mean the command line in the operating system. Windows users might be more familiar with the terms @q{DOS shell} or @q{command shell}. MacOS@tie{}X users might be more familiar with the terms @q{terminal} or @q{console}. Some additional setup is required -for MacOS@tie{}X users; please see @rgeneral{MacOS X}. +for MacOS@tie{}X users; please see @rweb{MacOS X}. Describing how to use this part of an operating system is outside the scope of this manual; please consult other documentation on this topic @@ -808,5 +808,5 @@ installed in @file{/usr/local/}, then change this path accordingly. Other editors (both text and graphical) support LilyPond, but their special configuration files are not distributed with LilyPond. Consult their documentation for more information. Such -editors are listed in @rgeneral{Alternate editors}. +editors are listed in @rweb{Alternate editors}. diff --git a/Documentation/usage/suggestions.itely b/Documentation/usage/suggestions.itely index e3df2fd7f1..d101821c02 100644 --- a/Documentation/usage/suggestions.itely +++ b/Documentation/usage/suggestions.itely @@ -246,7 +246,7 @@ Now start slowly uncommenting more and more of the @code{bass} part until you find the problem line. Another very useful debugging technique is constructing -@rgeneral{Tiny examples}. +@rweb{Tiny examples}. @node Make and Makefiles diff --git a/Documentation/general.texi b/Documentation/web.texi similarity index 93% rename from Documentation/general.texi rename to Documentation/web.texi index e2457fa257..89d3ec44d9 100644 --- a/Documentation/general.texi +++ b/Documentation/web.texi @@ -6,7 +6,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@setfilename general.info +@setfilename web.info @settitle LilyPond -- Music notation for everyone @documentencoding UTF-8 @documentlanguage en @@ -105,7 +105,7 @@ Read more in our @ref{introduction}! @divId{news} @c TODO: generate this automatically, including RSS feed. -@include general/news-front.itexi +@include web/news-front.itexi @divClass{float-right} (@ref{old news}) @@ -150,9 +150,9 @@ Read more in our @ref{introduction}! @contents -@include general/introduction.itexi -@include general/download.itexi -@include general/manuals.itexi -@include general/community.itexi +@include web/introduction.itexi +@include web/download.itexi +@include web/manuals.itexi +@include web/community.itexi @bye diff --git a/Documentation/general/GNUmakefile b/Documentation/web/GNUmakefile similarity index 100% rename from Documentation/general/GNUmakefile rename to Documentation/web/GNUmakefile diff --git a/Documentation/general/basic-authors.itexi b/Documentation/web/basic-authors.itexi similarity index 100% rename from Documentation/general/basic-authors.itexi rename to Documentation/web/basic-authors.itexi diff --git a/Documentation/general/community.itexi b/Documentation/web/community.itexi similarity index 99% rename from Documentation/general/community.itexi rename to Documentation/web/community.itexi index 8bc3e825c4..0ad421ab02 100644 --- a/Documentation/general/community.itexi +++ b/Documentation/web/community.itexi @@ -6,7 +6,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@include general/basic-authors.itexi +@include web/basic-authors.itexi @node community @unnumbered Community @@ -760,4 +760,4 @@ issue CMS06. @node old news @unnumberedsec Old news -@include general/news.itexi +@include web/news.itexi diff --git a/Documentation/general/download.itexi b/Documentation/web/download.itexi similarity index 100% rename from Documentation/general/download.itexi rename to Documentation/web/download.itexi diff --git a/Documentation/general/examples/GNUmakefile b/Documentation/web/examples/GNUmakefile similarity index 100% rename from Documentation/general/examples/GNUmakefile rename to Documentation/web/examples/GNUmakefile diff --git a/Documentation/general/examples/ancient-headword.ly b/Documentation/web/examples/ancient-headword.ly similarity index 100% rename from Documentation/general/examples/ancient-headword.ly rename to Documentation/web/examples/ancient-headword.ly diff --git a/Documentation/general/examples/aucun-snippet.ly b/Documentation/web/examples/aucun-snippet.ly similarity index 100% rename from Documentation/general/examples/aucun-snippet.ly rename to Documentation/web/examples/aucun-snippet.ly diff --git a/Documentation/general/examples/bach-bwv610.ly b/Documentation/web/examples/bach-bwv610.ly similarity index 100% rename from Documentation/general/examples/bach-bwv610.ly rename to Documentation/web/examples/bach-bwv610.ly diff --git a/Documentation/general/examples/bach-schenker.ly b/Documentation/web/examples/bach-schenker.ly similarity index 100% rename from Documentation/general/examples/bach-schenker.ly rename to Documentation/web/examples/bach-schenker.ly diff --git a/Documentation/general/examples/cary-layout.ily b/Documentation/web/examples/cary-layout.ily similarity index 100% rename from Documentation/general/examples/cary-layout.ily rename to Documentation/web/examples/cary-layout.ily diff --git a/Documentation/general/examples/cary.ly b/Documentation/web/examples/cary.ly similarity index 100% rename from Documentation/general/examples/cary.ly rename to Documentation/web/examples/cary.ly diff --git a/Documentation/general/examples/chart.ly b/Documentation/web/examples/chart.ly similarity index 100% rename from Documentation/general/examples/chart.ly rename to Documentation/web/examples/chart.ly diff --git a/Documentation/general/examples/example-header.ily b/Documentation/web/examples/example-header.ily similarity index 100% rename from Documentation/general/examples/example-header.ily rename to Documentation/web/examples/example-header.ily diff --git a/Documentation/general/examples/granados.ly b/Documentation/web/examples/granados.ly similarity index 100% rename from Documentation/general/examples/granados.ly rename to Documentation/web/examples/granados.ly diff --git a/Documentation/general/examples/orchestra.ly b/Documentation/web/examples/orchestra.ly similarity index 100% rename from Documentation/general/examples/orchestra.ly rename to Documentation/web/examples/orchestra.ly diff --git a/Documentation/general/examples/sesto-full.ly b/Documentation/web/examples/sesto-full.ly similarity index 100% rename from Documentation/general/examples/sesto-full.ly rename to Documentation/web/examples/sesto-full.ly diff --git a/Documentation/general/examples/sesto-piano.ly b/Documentation/web/examples/sesto-piano.ly similarity index 100% rename from Documentation/general/examples/sesto-piano.ly rename to Documentation/web/examples/sesto-piano.ly diff --git a/Documentation/general/examples/sesto-violin.ly b/Documentation/web/examples/sesto-violin.ly similarity index 100% rename from Documentation/general/examples/sesto-violin.ly rename to Documentation/web/examples/sesto-violin.ly diff --git a/Documentation/general/examples/sesto.ily b/Documentation/web/examples/sesto.ily similarity index 100% rename from Documentation/general/examples/sesto.ily rename to Documentation/web/examples/sesto.ily diff --git a/Documentation/general/examples/tab-example.ly b/Documentation/web/examples/tab-example.ly similarity index 100% rename from Documentation/general/examples/tab-example.ly rename to Documentation/web/examples/tab-example.ly diff --git a/Documentation/general/examples/theory.ly b/Documentation/web/examples/theory.ly similarity index 100% rename from Documentation/general/examples/theory.ly rename to Documentation/web/examples/theory.ly diff --git a/Documentation/general/introduction.itexi b/Documentation/web/introduction.itexi similarity index 100% rename from Documentation/general/introduction.itexi rename to Documentation/web/introduction.itexi diff --git a/Documentation/general/manuals.itexi b/Documentation/web/manuals.itexi similarity index 100% rename from Documentation/general/manuals.itexi rename to Documentation/web/manuals.itexi diff --git a/Documentation/general/news-front.itexi b/Documentation/web/news-front.itexi similarity index 90% rename from Documentation/general/news-front.itexi rename to Documentation/web/news-front.itexi index a539b37364..4c927f8367 100644 --- a/Documentation/general/news-front.itexi +++ b/Documentation/web/news-front.itexi @@ -1,5 +1,5 @@ @c -*- coding: utf-8; mode: texinfo; -*- -@c This file is part of lilypond-general.texi and community.itexi +@c This file is part of lilypond-web.texi and community.itexi @c when you add a new item, consider moving the lowest item(s) @c into news-old.itexi. diff --git a/Documentation/general/news.itexi b/Documentation/web/news.itexi similarity index 100% rename from Documentation/general/news.itexi rename to Documentation/web/news.itexi diff --git a/GNUmakefile.in b/GNUmakefile.in index 1c99d74888..663e8556a9 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -243,8 +243,8 @@ grand-replace: ################################################################ # website (without the rest of the docs) web-gop: - touch Documentation/general.texi - cd Documentation && make out=www out-www/general/index.html + touch Documentation/web.texi + cd Documentation && make out=www out-www/web/index.html ################################################################ diff --git a/make/doc-i18n-root-rules.make b/make/doc-i18n-root-rules.make index 88f0c4f109..0a368ef12b 100644 --- a/make/doc-i18n-root-rules.make +++ b/make/doc-i18n-root-rules.make @@ -47,7 +47,7 @@ $(outdir)/index.$(ISOLANG).html: TEXI2HTML_INIT = $(WEB_TEXI2HTML_INIT) $(outdir)/index.$(ISOLANG).html: TEXI2HTML_SPLIT = $(WEB_TEXI2HTML_SPLIT) $(outdir)/index.$(ISOLANG).html: - $(TEXI2HTML) $(TEXI2HTML_FLAGS) $(TEXI2HTML_SPLIT) --output=$(outdir)/ general.texi + $(TEXI2HTML) $(TEXI2HTML_FLAGS) $(TEXI2HTML_SPLIT) --output=$(outdir)/ web.texi find $(outdir)/ -name '*.html' | xargs grep -L --label="" 'UNTRANSLATED NODE: IGNORE ME' | sed 's!$(outdir)/!!g' | xargs $(buildscript-dir)/mass-link --prepend-suffix .$(ISOLANG) hard $(outdir) $(top-build-dir)/Documentation/$(outdir) .SECONDARY: diff --git a/make/doc-i18n-root-vars.make b/make/doc-i18n-root-vars.make index 55e7c349a2..fed399b8ae 100644 --- a/make/doc-i18n-root-vars.make +++ b/make/doc-i18n-root-vars.make @@ -45,7 +45,7 @@ XREF_MAPS_DIR=$(top-build-dir)/$(outdir)/xref-maps XREF_MAPS_FILES=$(TEXINFO_MANUALS:%=$(XREF_MAPS_DIR)/%.$(ISOLANG).xref-map) XREF_MAP_FLAGS += -I $(outdir) -WEB_MANUALS=general +WEB_MANUALS=web ########### ifneq ($(ISOLANG),) @@ -60,9 +60,9 @@ DOC_TEXI2HTML_SPLIT = --prefix=index --split=section WEB_TEXI2HTML_SPLIT = --prefix=index --split=node --node-files TEXI2HTML_SPLIT = $(DOC_TEXI2HTML_SPLIT) -$(top-build-dir)/Documentation/$(outdir)/general/index.$(ISOLANG).html:\ +$(top-build-dir)/Documentation/$(outdir)/web/index.$(ISOLANG).html:\ TEXI2HTML_INIT = $(WEB_TEXI2HTML_INIT) -$(top-build-dir)/Documentation/$(outdir)/general/index.$(ISOLANG).html:\ +$(top-build-dir)/Documentation/$(outdir)/web/index.$(ISOLANG).html:\ TEXI2HTML_SPLIT := $(WEB_TEXI2HTML_SPLIT) TEXI2HTML_INCLUDES += --I=. --I=$(src-dir) --I=$(outdir) $(DOCUMENTATION_INCLUDES) --I=$(XREF_MAPS_DIR) diff --git a/python/auxiliar/buildlib.py b/python/auxiliar/buildlib.py index 7ab2269576..411007e5ce 100644 --- a/python/auxiliar/buildlib.py +++ b/python/auxiliar/buildlib.py @@ -30,7 +30,7 @@ renames_map = { # FIXME: Hardcoded file names!? manuals_subdirectories_re = \ - re.compile ('(usage|automated-engraving|changes|essay|extending|general|learning|notation)/') + re.compile ('(usage|automated-engraving|changes|essay|extending|web|learning|notation)/') def add_old_name (file_path): for new_path in renames_map: diff --git a/python/auxiliar/postprocess_html.py b/python/auxiliar/postprocess_html.py index 8dce6024a0..c649b87345 100644 --- a/python/auxiliar/postprocess_html.py +++ b/python/auxiliar/postprocess_html.py @@ -100,7 +100,7 @@ def source_links_replace (m, source_val): return 'href="' + os.path.join (source_val, m.group (1)) + '"' # More hardcoding, yay! -splitted_docs_re = re.compile('(Documentation/out-www/(automated-engraving|essay|notation|changes|music-glossary|usage|general|learning|snippets))/') +splitted_docs_re = re.compile('(Documentation/out-www/(automated-engraving|essay|notation|changes|music-glossary|usage|web|learning|snippets))/') lily_snippets_re = re.compile ('(href|src)="([0-9a-f]{2}/lily-.*?)"') pictures_re = re.compile ('src="(pictures/.*?)"') @@ -346,7 +346,7 @@ def process_html_files (package_name = '', ### add footer if footer_tag_re.search (s) == None: - if 'general' in file_name: + if 'web' in file_name: s = add_footer (s, footer_tag + web_footer) else: s = add_footer (s, footer_tag + footer) -- 2.39.2