From: Han-Wen Nienhuys Date: Sat, 19 Jul 2003 09:12:57 +0000 (+0000) Subject: * Documentation/user/introduction.itely (Introduction): historical X-Git-Tag: release/1.7.26~4 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=3a2a9683feb41125cb3f53ecfe8ca8264fb15761;p=lilypond.git * Documentation/user/introduction.itely (Introduction): historical elucidations * Documentation/user/music-glossary.tely (Top): linewidth fix. * Documentation/user/introduction.itely (Introduction): rewrite introduction, (Music notation and engraving): about notation. Add flat-picture --- diff --git a/ChangeLog b/ChangeLog index baf13fab97..3a7ac46cac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2003-07-19 Han-Wen Nienhuys + * Documentation/user/introduction.itely (Introduction): historical + elucidations + + * Documentation/user/music-glossary.tely (Top): linewidth fix. + * Documentation/topdocs/AUTHORS.texi (AUTHORS): cleanup. * Documentation/index.texi (Top): cleanup. diff --git a/Documentation/bibliography/engraving.bib b/Documentation/bibliography/engraving.bib index 991204dba1..d058058b0e 100644 --- a/Documentation/bibliography/engraving.bib +++ b/Documentation/bibliography/engraving.bib @@ -222,12 +222,13 @@ year={1989} address={New York}, publisher={The G. Schirmer Publications Department}, year={2001} -note={(This book can be ordered from the rental department.) - -This is the style guide for Schirmer publications. This manual +note={This is the style guide for Schirmer publications. This manual specifically focuses on preparing print for publication by -Schirmer. As such it gives an idea of what is necessary to bring +Schirmer. It discusses many details that are not in other, normal +notation books. It als gives a good idea of what is necessary to bring printouts to publication quality. +It can be ordered from the rental department. + } } diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely index a22c77b95a..164ab5c005 100644 --- a/Documentation/user/introduction.itely +++ b/Documentation/user/introduction.itely @@ -38,19 +38,32 @@ knowing which symbols to use when what. Second, one has to master music engraving: the art of placing symbols such that they look elegant. -Music notation was first started in the medieval centuries. In this +Common music notation has its roots in the medieval centuries. In this time, monks started to write down hints that indicated how their sacred music was sung. These hints (neumes), gradually evolved, and at some point became the note heads. Lines were added to the neumes, to indicate a reference pitch, which later became the staff. Over many -centuries, improvements and extensions were added. For example, the -first notation did not have an explicit notion of rhythm, and -polyphonic music only came into existence in the XXX. The graphic -language of notation is still under development; the innovations of -contemporary music require still newer and more complex notations. A -system of notation encompasses such a wide scope of music inherently -is complex: there are many rules, and for every rule there are -exceptional situations where they do not apply. +centuries, improvements and extensions were added, while other +concepts disappeared. For example, the neumes notation did not have an +explicit notion of rhythm, but it did have @emph{custodes}, symbols at +the end of the line to indicate the starting pitch of the next line. +Mensural notation, a notation where each note head takes a fixed +amount of time, came into being together with the rise of counterpoint +in the early renaissance. The graphic language of notation is still +under development; the innovations of contemporary music require still +newer and more complex notations. A system of notation encompasses +such a wide scope of music inherently is complex: there are many +rules, and for every rule there are exceptional situations where they +do not apply. + +The result is that LilyPond cannot support each and every form of +notation in existence. Rather, we focus on a specific style and idiom: +we take inspiration from late-romantic music printed at the beginning +of the 20th century. Most of the contemporary music after that, and +most of the music going back to 17th century can be written in this +system. That is not a fundamental limit, though. There is support for +some modern notation like clusters, and older notation, such as white +mensural and gregorian notation, is being worked on. The term music engraving derives from the traditional process of music printing. Only a few decades ago, sheet music was made by @@ -86,7 +99,7 @@ below shows the flat symbol. On the left, a scan from a Henle edition, which was made by a computer, and in the center is the flat from a B@"{a}renreiter edition of the same music. The symbols have noticeable differences: the left image is much lighter, the staff lines are -thinner, and the glyph has straight layout with sharp corners. By +thinner, and the glyph has a straight layout with sharp corners. By contrast, the B@"{a}renreiter has a bold and almost voluptuous rounded look. Our flat symbol is designed after, among others, this one. It is tuned it to harmonize with the thickness of our staff lines, which @@ -98,11 +111,7 @@ are also much thicker than Henle's lines. @image{henle-flat-bw,4cm} @end iftex @html -

- - - @end html @tab @@ -110,8 +119,7 @@ are also much thicker than Henle's lines. @image{baer-flat-bw,4cm} @end iftex @html - - + @end html @tab @@ -119,9 +127,7 @@ are also much thicker than Henle's lines. @image{lily-flat-bw,4cm} @end iftex @html - - @end html @item diff --git a/Documentation/user/literature.itely b/Documentation/user/literature.itely index 1fc9588080..035b91be1a 100644 --- a/Documentation/user/literature.itely +++ b/Documentation/user/literature.itely @@ -65,12 +65,11 @@ are also interesting. The G.Schirmer/AMP Manual of Style and Usage. G.Schirmer/AMP, NY, 2001. (This book can be ordered from the rental department.) -This is the style guide for Schirmer publications. This manual -specifically focuses on preparing print for publication by -Schirmer. As such it gives an idea of what is necessary to bring +This manual specifically focuses on preparing print for publication by +Schirmer. It discusses many details that are not in other, normal +notation books. It als 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 diff --git a/Documentation/user/music-glossary.tely b/Documentation/user/music-glossary.tely index 923d97a85a..ee641925f9 100644 --- a/Documentation/user/music-glossary.tely +++ b/Documentation/user/music-glossary.tely @@ -1065,6 +1065,7 @@ of the 20th century \StaffContext \consists Custos_engraver } +raggedright = ##t } } @end lilypond diff --git a/mf/GNUmakefile b/mf/GNUmakefile index a9ad06adcc..1391e1d3d1 100644 --- a/mf/GNUmakefile +++ b/mf/GNUmakefile @@ -28,6 +28,9 @@ ENC_FILES = $(TEXTABLES:.tex=.enc) TFM_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.tfm) +ENCODING_FILE=$(findstring $(<:.mf=.enc), $(FETA_MF_FILES:.mf=.enc)) +MFTRACE_FLAGS=$(if $(ENCODING_FILE),--encoding $(ENCODING_FILE),) + # Make tfm files first, log files last, # so that normally log files aren't made twice ALL_GEN_FILES= $(TFM_FILES) $(TEXTABLES) $(AFM_FILES) $(TFM_FILES) $(LOG_FILES) $(ENC_FILES) diff --git a/stepmake/stepmake/metafont-rules.make b/stepmake/stepmake/metafont-rules.make index d696e2bf8c..e71a9502bc 100644 --- a/stepmake/stepmake/metafont-rules.make +++ b/stepmake/stepmake/metafont-rules.make @@ -29,14 +29,12 @@ $(outdir)/%.$(XPM_RESOLUTION)pk: $(outdir)/%.$(XPM_RESOLUTION)gf gftopk $< $@ -ENCODINGFILE=$(wildcard $(outdir)/$(patsubst %.mf,%.enc,$<)) -ENCODINGOPTION=$(if $(ENCODINGFILE),--encoding=$(ENCODINGFILE),) $(outdir)/%.pfa: %.mf - $(MFTRACE) $(ENCODINGOPTION) -I $(outdir)/ --pfa --simplify --keep-trying $(basename $(@F)) + $(MFTRACE) $(MFTRACE_FLAGS) -I $(outdir)/ --pfa --simplify --keep-trying $(basename $(@F)) mv $(basename $(@F)).pfa $(outdir) $(outdir)/%.pfb: %.mf - $(MFTRACE) $(ENCODINGOPTION) -I $(outdir)/ --pfa --pfb --simplify --keep-trying $(basename $(@F)) + $(MFTRACE) $(MFTRACE_FLAGS) -I $(outdir)/ --pfa --pfb --simplify --keep-trying $(basename $(@F)) -mv $(basename $(@F)).pfa $(outdir) mv $(basename $(@F)).pfb $(outdir)