Hi John, The attached patch makes essay a directory-based book like application, learning, etc. We want at least two separate chapters (music engraving essay, literature list), as well as including the bibliography stuff (i.e. mv bibliography/* essay/), so I think it makes sense.
I haven't touched the bibliography yet. I did move the literature list. The patch works for me; please push if you think it's ok. Cheers, - Graham
>From 93a7d4fb052973ae9ed6621f9ab433ddbaccb5f9 Mon Sep 17 00:00:00 2001 From: Graham Percival <[email protected]> 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 +++++++ Documentation/essay/literature.itely | 84 +++++++++++++++++++++++++++++++ Documentation/macros.itexi | 41 +++++++++++++++ Documentation/notation.tely | 4 +- Documentation/notation/chords.itely | 2 +- Documentation/notation/literature.itely | 84 ------------------------------- 9 files changed, 156 insertions(+), 89 deletions(-) create mode 100644 Documentation/essay/GNUmakefile create mode 100644 Documentation/essay/engraving.itely create mode 100644 Documentation/essay/literature.itely delete mode 100644 Documentation/notation/literature.itely diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile index e09529f..338da71 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 a75c407..946086c 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 0000000..c93c9e0 --- /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 0000000..0b22182 --- /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/essay/literature.itely b/Documentation/essay/literature.itely new file mode 100644 index 0000000..41bf3e6 --- /dev/null +++ b/Documentation/essay/literature.itely @@ -0,0 +1,84 @@ +...@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 Literature list +...@chapter Literature list + +If you need to know more about music notation, here are some +interesting titles to read. + + + +...@table @cite +...@item Ignatzek 1995 +Klaus Ignatzek, Die Jazzmethode für Klavier. Schott's Söhne +1995. Mainz, Germany ISBN 3-7957-5140-3. + +A tutorial introduction to playing Jazz on the piano. One of the first +chapters contains an overview of chords in common use for Jazz music. + +...@item Gerou 1996 + +Tom Gerou and Linda Lusk, Essential Dictionary of Music +Notation. Alfred Publishing, Van Nuys CA ISBN 0-88284-768-6. + +A concise, alphabetically ordered list of typesetting and music +(notation) issues, covering most of the normal cases. + +...@item Read 1968 +Gardner Read, Music Notation: A Manual of Modern Practice. +Taplinger Publishing, New York (2nd edition). + +A standard work on music notation. + +...@item Ross 1987 +Ted Ross, Teach yourself the art of music engraving and processing. +Hansen House, Miami, Florida 1987. + +This book is about music engraving, i.e., professional typesetting. +It contains directions on stamping, use of pens and notational +conventions. The sections on reproduction technicalities and history +are also interesting. + +...@item Schirmer 2001 +The G.Schirmer/AMP Manual of Style and Usage. G.Schirmer/AMP, NY, 2001. +(This book can be ordered from the rental department.) + +This manual specifically focuses on preparing print for publication by +Schirmer. It discusses many details that are not in other, normal +notation books. It also gives a good idea of what is necessary to bring +printouts to publication quality. + +...@item Stone 1980 + +Kurt Stone, Music Notation in the Twentieth Century. +Norton, New York 1980. + +This book describes music notation for modern serious music, but +starts out with a thorough overview of existing traditional notation +practices. + +...@end table + +The source archive includes a more elaborate b...@tex{} bibliography of +over 100 entries in +...@ifhtml +...@ifset bigpage +...@uref{../bibliography/index.html, the bibliography}. +...@end ifset +...@ifclear bigpage +...@uref{../../bibliography/index.html, the bibliography}. +...@end ifclear +...@end ifhtml +...@ifnothtml +...@file{documentation/@/bibliography/}. +...@end ifnothtml + diff --git a/Documentation/macros.itexi b/Documentation/macros.itexi index 821977d..7a4828d 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 6eebd84..ff1d35e 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 c1b6c03..0619f02 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 diff --git a/Documentation/notation/literature.itely b/Documentation/notation/literature.itely deleted file mode 100644 index 68cc70c..0000000 --- a/Documentation/notation/literature.itely +++ /dev/null @@ -1,84 +0,0 @@ -...@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 Literature list -...@appendix Literature list - -If you need to know more about music notation, here are some -interesting titles to read. - - - -...@table @cite -...@item Ignatzek 1995 -Klaus Ignatzek, Die Jazzmethode für Klavier. Schott's Söhne -1995. Mainz, Germany ISBN 3-7957-5140-3. - -A tutorial introduction to playing Jazz on the piano. One of the first -chapters contains an overview of chords in common use for Jazz music. - -...@item Gerou 1996 - -Tom Gerou and Linda Lusk, Essential Dictionary of Music -Notation. Alfred Publishing, Van Nuys CA ISBN 0-88284-768-6. - -A concise, alphabetically ordered list of typesetting and music -(notation) issues, covering most of the normal cases. - -...@item Read 1968 -Gardner Read, Music Notation: A Manual of Modern Practice. -Taplinger Publishing, New York (2nd edition). - -A standard work on music notation. - -...@item Ross 1987 -Ted Ross, Teach yourself the art of music engraving and processing. -Hansen House, Miami, Florida 1987. - -This book is about music engraving, i.e., professional typesetting. -It contains directions on stamping, use of pens and notational -conventions. The sections on reproduction technicalities and history -are also interesting. - -...@item Schirmer 2001 -The G.Schirmer/AMP Manual of Style and Usage. G.Schirmer/AMP, NY, 2001. -(This book can be ordered from the rental department.) - -This manual specifically focuses on preparing print for publication by -Schirmer. It discusses many details that are not in other, normal -notation books. It also gives a good idea of what is necessary to bring -printouts to publication quality. - -...@item Stone 1980 - -Kurt Stone, Music Notation in the Twentieth Century. -Norton, New York 1980. - -This book describes music notation for modern serious music, but -starts out with a thorough overview of existing traditional notation -practices. - -...@end table - -The source archive includes a more elaborate b...@tex{} bibliography of -over 100 entries in -...@ifhtml -...@ifset bigpage -...@uref{../bibliography/index.html, the bibliography}. -...@end ifset -...@ifclear bigpage -...@uref{../../bibliography/index.html, the bibliography}. -...@end ifclear -...@end ifhtml -...@ifnothtml -...@file{documentation/@/bibliography/}. -...@end ifnothtml - -- 1.5.6.5
_______________________________________________ lilypond-devel mailing list [email protected] http://lists.gnu.org/mailman/listinfo/lilypond-devel
