From 05d401e1fb559da409f657fb3a8d279452bc418b Mon Sep 17 00:00:00 2001 From: Graham Percival Date: Thu, 30 Jul 2009 19:38:06 -0700 Subject: [PATCH] Doc: give essay its own directory. --- Documentation/GNUmakefile | 2 +- Documentation/essay.tely | 5 ++- Documentation/essay/GNUmakefile | 5 +++ Documentation/essay/engraving.itely | 18 ++++++++ .../{notation => essay}/literature.itely | 2 +- Documentation/macros.itexi | 41 +++++++++++++++++++ Documentation/notation.tely | 4 +- Documentation/notation/chords.itely | 2 +- 8 files changed, 73 insertions(+), 6 deletions(-) create mode 100644 Documentation/essay/GNUmakefile create mode 100644 Documentation/essay/engraving.itely rename Documentation/{notation => essay}/literature.itely (98%) diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile index e09529f596..338da7123b 100644 --- a/Documentation/GNUmakefile +++ b/Documentation/GNUmakefile @@ -9,7 +9,7 @@ depth = .. NAME = documentation LANGS = $(shell $(PYTHON) $(top-src-dir)/python/langdefs.py) -MANUALS_SUBDIRS = application contributor learning notation +MANUALS_SUBDIRS = application contributor essay learning notation SUBDIRS = $(MANUALS_SUBDIRS) snippets bibliography pictures misc po $(LANGS) STEPMAKE_TEMPLATES = documentation texinfo tex omf LOCALSTEPMAKE_TEMPLATES = lilypond ly diff --git a/Documentation/essay.tely b/Documentation/essay.tely index a75c407065..946086ca76 100644 --- a/Documentation/essay.tely +++ b/Documentation/essay.tely @@ -88,13 +88,16 @@ Free Documentation License''. @end ifnottex @menu +* Music engraving:: +* Literature list:: * GNU Free Documentation License:: License of this document. * LilyPond index:: @end menu @contents -@c Insert the essay text here +@include essay/engraving.itely +@include essay/literature.itely @include fdl.itexi diff --git a/Documentation/essay/GNUmakefile b/Documentation/essay/GNUmakefile new file mode 100644 index 0000000000..c93c9e0624 --- /dev/null +++ b/Documentation/essay/GNUmakefile @@ -0,0 +1,5 @@ +depth = ../.. + +LOCALSTEPMAKE_TEMPLATES = ly + +include $(depth)/make/stepmake.make diff --git a/Documentation/essay/engraving.itely b/Documentation/essay/engraving.itely new file mode 100644 index 0000000000..0b22182290 --- /dev/null +++ b/Documentation/essay/engraving.itely @@ -0,0 +1,18 @@ +@c -*- coding: utf-8; mode: texinfo; -*- + +@ignore + Translation of GIT committish: FILL-IN-HEAD-COMMITTISH + + When revising a translation, copy the HEAD committish of the + version that you are working on. See TRANSLATION for details. +@end ignore + +@c \version "2.12.0" + +@node Music engraving +@chapter Music engraving + +insert essay here. + +TODO: add extra chapter for computer aesthetics? + diff --git a/Documentation/notation/literature.itely b/Documentation/essay/literature.itely similarity index 98% rename from Documentation/notation/literature.itely rename to Documentation/essay/literature.itely index 68cc70cc7c..41bf3e6970 100644 --- a/Documentation/notation/literature.itely +++ b/Documentation/essay/literature.itely @@ -10,7 +10,7 @@ @c \version "2.12.0" @node Literature list -@appendix Literature list +@chapter Literature list If you need to know more about music notation, here are some interesting titles to read. diff --git a/Documentation/macros.itexi b/Documentation/macros.itexi index 821977dd1b..7a4828dd6a 100644 --- a/Documentation/macros.itexi +++ b/Documentation/macros.itexi @@ -102,6 +102,7 @@ @c @rglos @c @rlearning @c @ruser +@c @ressay @c @rprogram @c @rlsr @c @rinternals @@ -151,6 +152,16 @@ @ref{\TEXT\,,\DISPLAY\,notation-big-page,Notation Reference} @end macro +@macro ressay{TEXT} +@vindex \TEXT\ +@ref{\TEXT\,,,essay-big-page,Essay} +@end macro + +@macro ressaynamed{TEXT,DISPLAY} +@vindex \TEXT\ +@ref{\TEXT\,,\DISPLAY\,essay-big-page,Essay} +@end macro + @macro rprogram{TEXT} @vindex \TEXT\ @ref{\TEXT\,,,application-big-page,Application Usage} @@ -218,6 +229,16 @@ @ref{\TEXT\,,\DISPLAY\,notation,Notation Reference} @end macro +@macro ressay{TEXT} +@vindex \TEXT\ +@ref{\TEXT\,,,essay,Essay} +@end macro + +@macro ressaynamed{TEXT,DISPLAY} +@vindex \TEXT\ +@ref{\TEXT\,,\DISPLAY\,essay,Essay} +@end macro + @macro rprogram{TEXT} @vindex \TEXT\ @ref{\TEXT\,,,application,Application Usage} @@ -280,6 +301,16 @@ @ref{\TEXT\,,\DISPLAY\,lilypond-notation,Notation Reference} @end macro +@macro ressay{TEXT} +@vindex \TEXT\ +@ref{\TEXT\,,,lilypond-essay,Essay} +@end macro + +@macro ressaynamed{TEXT,DISPLAY} +@vindex \TEXT\ +@ref{\TEXT\,,\DISPLAY\,lilypond-essay,Essay} +@end macro + @macro rprogram{TEXT} @vindex \TEXT\ @ref{\TEXT\,,,lilypond-application,Application Usage} @@ -359,6 +390,16 @@ @ref{\TEXT\,,\DISPLAY\,notation,Notation Reference} @end macro +@macro ressay{TEXT} +@lilyvindex{\TEXT\} +@ref{\TEXT\,,,essay,Essay} +@end macro + +@macro ressaynamed{TEXT,DISPLAY} +@lilyvindex{\TEXT\} +@ref{\TEXT\,,\DISPLAY\,essay,Essay} +@end macro + @macro rprogram{TEXT} @lilyvindex{\TEXT\} @ref{\TEXT\,,,application,Application Usage} diff --git a/Documentation/notation.tely b/Documentation/notation.tely index 6eebd84676..ff1d35e253 100644 --- a/Documentation/notation.tely +++ b/Documentation/notation.tely @@ -167,7 +167,6 @@ of this and other documentation. Appendices -* Literature list:: Reference works about music notation. * Notation manual tables:: Tables and charts. * Cheat sheet:: Summary of LilyPond syntax. * LilyPond grammar:: Syntax diagram for LilyPond parser. @@ -176,6 +175,7 @@ Appendices * LilyPond index:: @end menu @end ifnottex +@c * Literature list:: Reference works about music notation. @contents @@ -190,7 +190,7 @@ Appendices @include notation/programming-interface.itely -@include notation/literature.itely +@c @include notation/literature.itely @include notation/notation-appendices.itely @include notation/cheatsheet.itely diff --git a/Documentation/notation/chords.itely b/Documentation/notation/chords.itely index c1b6c03d75..0619f02b24 100644 --- a/Documentation/notation/chords.itely +++ b/Documentation/notation/chords.itely @@ -550,7 +550,7 @@ names and symbols displayed for chord names are customizable. @cindex chords, jazz The basic chord name layout is a system for Jazz music, proposed -by Klaus Ignatzek (see @ref{Literature list}). The chord naming +by Klaus Ignatzek (see @ressay{Literature list}). The chord naming system can be modified as described below. An alternate jazz chord system has been developed using these modifications. The Ignatzek and alternate -- 2.39.2