]> git.donarmstrong.com Git - lilypond.git/commitdiff
Doc: automated-engraving: build fixes and images.
authorJan Nieuwenhuizen <janneke@gnu.org>
Wed, 12 Aug 2009 22:32:36 +0000 (00:32 +0200)
committerJan Nieuwenhuizen <janneke@gnu.org>
Wed, 12 Aug 2009 23:30:27 +0000 (01:30 +0200)
73 files changed:
Documentation/GNUmakefile
Documentation/automated-engraving.texi [new file with mode: 0644]
Documentation/automated-engraving/GNUmakefile [new file with mode: 0644]
Documentation/automated-engraving/benchmarking.itexi
Documentation/automated-engraving/conclusion.itexi
Documentation/automated-engraving/divide-and-conquer.itexi
Documentation/automated-engraving/engraving.itexi
Documentation/automated-engraving/formatting-architecture.itexi
Documentation/automated-engraving/implementing-notation.itexi
Documentation/automated-engraving/implementing-typography.itexi
Documentation/automated-engraving/index.itexi [deleted file]
Documentation/automated-engraving/input-format.itexi
Documentation/automated-engraving/introduction.itexi
Documentation/automated-engraving/introduction.texi [deleted file]
Documentation/automated-engraving/problem-statement.itexi
Documentation/automated-engraving/schubert.itexi
Documentation/automated-engraving/scoring-esthetics.itexi
Documentation/automated-engraving/software.itexi
Documentation/automated-engraving/typography-features.itexi
Documentation/pictures/baer-flat-gray.png
Documentation/pictures/baer-ledger.png [new file with mode: 0644]
Documentation/pictures/baer-sarabande.png [new file with mode: 0644]
Documentation/pictures/baer-suite1-fullpage.png [new file with mode: 0644]
Documentation/pictures/baer-suite1-line.png [new file with mode: 0644]
Documentation/pictures/beam-scoring-example.png [new file with mode: 0644]
Documentation/pictures/bench-morgenlied.png [new file with mode: 0644]
Documentation/pictures/directions-updown.png [new file with mode: 0644]
Documentation/pictures/engraver-acc.png [new file with mode: 0644]
Documentation/pictures/engraver-clef.png [new file with mode: 0644]
Documentation/pictures/engraver-final.png [new file with mode: 0644]
Documentation/pictures/engraver-noteheads.png [new file with mode: 0644]
Documentation/pictures/engraver-score.png [new file with mode: 0644]
Documentation/pictures/engraver-slur.png [new file with mode: 0644]
Documentation/pictures/engraver-staff.png [new file with mode: 0644]
Documentation/pictures/engraver-stem.png [new file with mode: 0644]
Documentation/pictures/finale-beam-detail.png [new file with mode: 0644]
Documentation/pictures/finale-flat-correct.png [new file with mode: 0644]
Documentation/pictures/finale-flat-detail.png [new file with mode: 0644]
Documentation/pictures/finale-sarabande-full.png [new file with mode: 0644]
Documentation/pictures/hader-collage.jpeg [new file with mode: 0644]
Documentation/pictures/hader-slaan.jpeg [new file with mode: 0644]
Documentation/pictures/henle-flat-gray.png
Documentation/pictures/henle-ledger.png [new file with mode: 0644]
Documentation/pictures/henle-suite1-fullpage.png [new file with mode: 0644]
Documentation/pictures/henle-suite1-line.png [new file with mode: 0644]
Documentation/pictures/lily-flat-bw.png
Documentation/pictures/lily-ledger.png [new file with mode: 0644]
Documentation/pictures/lily14-sarabande-correct.png [new file with mode: 0644]
Documentation/pictures/lily14-sarabande.png [new file with mode: 0644]
Documentation/pictures/lily17-sarabande.png [new file with mode: 0644]
Documentation/pictures/mc-squared.png [new file with mode: 0644]
Documentation/pictures/morgenlied-crop-2.jpeg [new file with mode: 0644]
Documentation/pictures/morgenlied-ly-crop2.png [new file with mode: 0644]
Documentation/pictures/naive-notation-uml.png [new file with mode: 0644]
Documentation/pictures/naive-notation.png [new file with mode: 0644]
Documentation/pictures/nonnaive-notation.png [new file with mode: 0644]
Documentation/pictures/ross-beam-scan.jpeg [new file with mode: 0644]
Documentation/pictures/simple-notation.png [new file with mode: 0644]
Documentation/pictures/simultaneous-0.png [new file with mode: 0644]
Documentation/pictures/simultaneous-1.png [new file with mode: 0644]
Documentation/pictures/simultaneous-2.png [new file with mode: 0644]
Documentation/pictures/simultaneous-3.png [new file with mode: 0644]
Documentation/pictures/slur-esthetics-annotate-1.png [new file with mode: 0644]
Documentation/pictures/slur-esthetics-annotate-2.png [new file with mode: 0644]
Documentation/pictures/slur-esthetics-annotate-3.png [new file with mode: 0644]
Documentation/pictures/slur-esthetics.png [new file with mode: 0644]
Documentation/pictures/spacing-no-corr.png [new file with mode: 0644]
Documentation/pictures/spacing-with-corr.png [new file with mode: 0644]
Documentation/pictures/stone-distance.png [new file with mode: 0644]
Documentation/pictures/thickness-tweaks.png [new file with mode: 0644]
Documentation/pictures/ties-scoring-example.png [new file with mode: 0644]
python/auxiliar/buildlib.py
python/auxiliar/postprocess_html.py

index 640a49ca98d5bca1c768dd4518298a55635fb73b..2f0fb20a11cb4a2f17256a6015007c0cc0647dce 100644 (file)
@@ -9,7 +9,7 @@ depth = ..
 
 NAME = documentation
 LANGS = $(shell $(PYTHON) $(top-src-dir)/python/langdefs.py)
-MANUALS_SUBDIRS = application contributor essay general learning notation
+MANUALS_SUBDIRS = application automated-engraving contributor essay general learning notation
 SUBDIRS = $(MANUALS_SUBDIRS) snippets logo pictures misc po css $(LANGS)
 STEPMAKE_TEMPLATES = documentation texinfo tex omf
 LOCALSTEPMAKE_TEMPLATES = lilypond ly
diff --git a/Documentation/automated-engraving.texi b/Documentation/automated-engraving.texi
new file mode 100644 (file)
index 0000000..eba5459
--- /dev/null
@@ -0,0 +1,83 @@
+\input texinfo @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
+
+@ignore
+hmm, the one big page is too big, but it was really inviting to
+     read.  this is not.  maybe just scrap this menu and introduction
+     to index?
+@end ignore
+
+@setfilename automated-engraving.info
+@settitle Obsessed with putting ink on paper
+@documentencoding UTF-8
+@documentlanguage en
+
+@set web
+@include macros.itexi
+
+@afourpaper
+
+@ifnottex
+@node Top
+@top
+@chapheading
+@end ifnottex
+
+@unnumberedsec What is behind LilyPond?
+
+@sourceimage{hader-collage,,,.jpeg}
+
+LilyPond is not unique in making music notation: there are a lot of
+programs that print music, and nowadays most of the newly printed
+music is made with computers.  Unfortunately, that also shows: just
+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.
+
+@menu
+* introduction:: Introduction -- what's wrong with computer music notation.
+* software:: What's wrong with software -- or how Finale is not the end-all of music software.
+* problem-statement:: How not to design software -- or modeling music notation.
+* divide-and-conquer:: Divide and conqueror -- a blue print for automated notation.
+* implementing-notation:: Impressive, but does it also work in theory -- a practical approach to capturing notation.
+* engraving:: Music engraving -- the art of printing music.
+* implementing-typography:: Implementing typography -- hackers attack the engraving problem.
+* formatting-architecture:: A flexible program architecture -- lets us write engraving software 
+* scoring-esthetics:: Beautiful numbers -- how LilyPond participates in the Miss World contests.
+* benchmarking:: Notation benchmarking -- is a flexible architecture enough?
+* schubert:: Notation benchmarking -- project too?
+* typography-features:: Typographical features -- unique to LilyPond.
+* input-format:: Input format -- how to enter music. 
+* conclusion:: Conclusion.
+@end menu
+
+@contents
+
+@c This essay is also available in @ref{big-page.html,one big page}.
+
+@include automated-engraving/introduction.itexi
+@include automated-engraving/software.itexi
+@include automated-engraving/problem-statement.itexi
+@include automated-engraving/divide-and-conquer.itexi
+@include automated-engraving/implementing-notation.itexi
+@include automated-engraving/engraving.itexi
+@include automated-engraving/implementing-typography.itexi
+@include automated-engraving/formatting-architecture.itexi
+@include automated-engraving/scoring-esthetics.itexi
+@include automated-engraving/benchmarking.itexi
+@include automated-engraving/schubert.itexi
+@include automated-engraving/typography-features.itexi
+@include automated-engraving/input-format.itexi
+@include automated-engraving/conclusion.itexi
+
+@bye
+
diff --git a/Documentation/automated-engraving/GNUmakefile b/Documentation/automated-engraving/GNUmakefile
new file mode 100644 (file)
index 0000000..c93c9e0
--- /dev/null
@@ -0,0 +1,5 @@
+depth = ../..
+
+LOCALSTEPMAKE_TEMPLATES = ly
+
+include $(depth)/make/stepmake.make
index 31aec4319c81d232435f1d94b920ddbf248cc22c..e4a239579eb2a0fa02fb4127a27d9cc9852ff863 100644 (file)
@@ -27,8 +27,9 @@ LilyPond 1.4:
 
 @divClass{float-center}
 @divEnd
-@ref{pictures/baer-sarabande-hires.jpeg,
-@image{pictures/baer-sarabande,,,.png}}
+@c @ref{baer-sarabande-hires.jpeg,
+@sourceimage{baer-sarabande,,,.png}
+@c }
 
 @divClass{float-center}
 @divEnd
@@ -36,7 +37,7 @@ B@"arenreiter (click to enlarge)
 
 @divClass{float-center}
 @divEnd
-@image{pictures/lily14-sarabande,,,.png}
+@sourceimage{lily14-sarabande,,,.png}
 
 @divClass{float-center}
 @divEnd
@@ -48,7 +49,7 @@ score showed a lot of errors in the formatting details:
 
 @divClass{float-center}
 @divEnd
-@image{pictures/lily14-sarabande-correct,,,.png}
+@sourceimage{lily14-sarabande-correct,,,.png}
 
 @divClass{float-center}
 @divEnd
@@ -79,7 +80,7 @@ output is very close to publication quality.
 
 @divClass{float-center}
 @divEnd
-@image{pictures/lily17-sarabande,,,.png}
+@sourceimage{lily17-sarabande,,,.png}
 
 @divClass{float-center}
 @divEnd
@@ -87,7 +88,7 @@ LilyPond 1.8
 
 @divClass{float-center}
 @divEnd
-@image{pictures/baer-sarabande,,,.png}
+@sourceimage{baer-sarabande,,,.png}
 
 @divClass{float-center}
 @divEnd
@@ -98,7 +99,7 @@ Another example of benchmarking is our project for the 2.1 series, a
 
 @divClass{float-right}
 @divEnd
-Next: @ref{typography-features.html,Cool features},
+Next: @ref{typography-features,Cool features},
 typographical hoops that we made LilyPond jump through.
 
 @bye
index 880e8be60ff3a63d8f1a65b4a4b0f03507eba9d5..3cba5549af364822ef86b4c740178dffad731298 100644 (file)
 
 We have shown you what engraved music should look like, and how we built
 our software to emulate that look.  We have put a lot of effort into
-building it.  Thanks to all that hard work, you can @ref{@DEPTH@switch/tour.html,use the program to print nice music
-too}.
+building it.  Thanks to all that hard work, you can
+
+FIXME
+
+@c @ref{@DEPTH@switch/tour.html,use the program to print nice music too}.
 
 To complete the reading of this essay, you may want to have a look at
-@ref{@DEPTH@about/pubs.html,publications and articles},
-especially @ref{http://www.musicbyandrew.ca/finale-lilypond-1.html,Andrew
+
+FIXME
+
+@c @ref{@DEPTH@about/pubs.html,publications and articles},
+especially @uref{http://www.musicbyandrew.ca/finale-lilypond-1.html,Andrew
 Hawryluk's writings}, which include Finale and LilyPond notation
 benchmarking.
 
 @divClass{float-right}
 @divEnd
-Go @ref{index,back} to the index.
+@c Go @ref{Top,back} to the top.
 
 @bye
 
index 6f28836bf6f33512eba7dfe4e86ecb330768c712..566af1a4ce6cd91f6536348d0187850b3227a97c 100644 (file)
@@ -7,19 +7,17 @@
 @end ignore
 
 
-
+@node divide-and-conquer
 @unnumberedsec Plan de campagne
 
 Since content and form of a score are separate, we have to match that
 in the design of software. Hence, the basic blueprint  of our program
 should follow this scheme
 
-@table asis
+@multitable @columnfractions .3 .3 .3
 @item
 
-@tab
-
-@image{pictures/simple-notation,,,.png}
+@sourceimage{simple-notation,,,.png}
 
 
 @tab
@@ -29,15 +27,13 @@ should follow this scheme
 
 @tab
 
-@code{{ c'4 d'8 }}
+@code{@{ c'4 d'8 @}}
 
 
 
 
 @item
 
-@tab
-
 1. form
 
 
@@ -53,7 +49,7 @@ should follow this scheme
 
 
 
-@end table
+@end multitable
 
 In effect, we are conquering the problem by dividing it into
 subproblems
@@ -79,7 +75,7 @@ Finally, whenever you subdivide a problem, a new problem is created,
 
 @divClass{float-right}
 @divEnd
-Next: @ref{implementing-notation.html,Impressive, but does it also
+Next: @ref{implementing-notation,Impressive, but does it also
 work in theory}? A practical approach to capturing notation.
 
 @bye
index edc422615a7261c376ee5dff8bb8dd833ad21f4b..444a06075734a76a267fa9b4f18c4b8f52741a35 100644 (file)
@@ -6,16 +6,11 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-
-
-
 @node engraving 
-
-
-@image{pictures/hader-slaan,,,.jpeg}
-
 @unnumberedsec Music engraving
 
+@sourceimage{hader-slaan,,,.jpeg}
+
 
 When we know what symbols to print, we have to decide where to put
 them so the the result looks pleasing. This art is called @emph{music
@@ -44,16 +39,16 @@ about the rules of elegant engraving.
 
 @item
  Finally, engraving is about selecting proper distance and
-blackness for scores. @image{pictures/stone-distance,,,.png} The
+blackness for scores. @sourceimage{stone-distance,,,.png} The
 quality of the end result must be judged visually. This is virtually
 impossible to capture in formal rules.
 
 
-@end itemize@*
+@end itemize
 
 @divClass{float-right}
 @divEnd
-Next: @ref{implementing-typography.html,Stamping computer
+Next: @ref{implementing-typography,Stamping computer
 screens?}. Computer hackers take over the engraving business.
 
 
index 4e551e9d1595841ce9c5052557b8e2c8ac860b11..11c94e7c2d95f5b129516c6775ac0c851b4faa4c 100644 (file)
@@ -26,7 +26,7 @@ and arpeggio. In the first chord, the objects have all directions down
 
 @divClass{float-center}
 @divEnd
-@image{pictures/directions-updown,,,.png}
+@sourceimage{directions-updown,,,.png}
 
 The process of formatting a score consists of reading and writing
 object variables.
@@ -40,7 +40,7 @@ Some variables have a preset value. For example, the thickness of
 
 @divClass{float-center}
 @divEnd
-@image{pictures/thickness-tweaks,,,.png}
+@sourceimage{thickness-tweaks,,,.png}
 
 @item
 Formatting rules are also preset variables: each object has
@@ -51,14 +51,14 @@ use to draw their symbol is changed during the music fragment:
 
 @divClass{float-center}
 @divEnd
-@image{pictures/mc-squared,,,.png}
+@sourceimage{mc-squared,,,.png}
 
 @end itemize
 
 @divClass{float-right}
 @divEnd
 Next:
- @ref{scoring-esthetics.html,Beautiful numbers}: how
+ @ref{scoring-esthetics,Beautiful numbers}: how
 LilyPond participates in the Miss World contests.
 
 @bye
index ee9711c963a2c3c116934dd5f8dd5fc71cfa4fcf..4b16dbb8d71f20fa7c7aad06ae157d9815ae24f5 100644 (file)
@@ -29,7 +29,7 @@ The most basic plug-in creates Note-heads:
 
 @divClass{float-center}
 @divEnd
-@image{pictures/engraver-noteheads,,,.png}
+@sourceimage{engraver-noteheads,,,.png}
 
 This plug-in creates graphical objects from musical events.  People
 that put graphics to musical ideas are called copyists or engravers,
@@ -42,7 +42,7 @@ representing the staff lines.
 
 @divClass{float-center}
 @divEnd
-@image{pictures/engraver-staff,,,.png}
+@sourceimage{engraver-staff,,,.png}
 
 @item
 
@@ -51,7 +51,7 @@ each head should be placed.
 
 @divClass{float-center}
 @divEnd
-@image{pictures/engraver-clef,,,.png}
+@sourceimage{engraver-clef,,,.png}
 
 
 
@@ -61,7 +61,7 @@ For the flags and stems we add  a @code{Stem_engraver}:
 
 @divClass{float-center}
 @divEnd
-@image{pictures/engraver-stem,,,.png}
+@sourceimage{engraver-stem,,,.png}
 
 This engraver is notified of any note head coming along.  Every time
 one (or more, for a chord) note head is seen, a stem object is
@@ -75,7 +75,7 @@ note heads, etc.:
 
 @divClass{float-center}
 @divEnd
-@image{pictures/engraver-slur,,,.png}
+@sourceimage{engraver-slur,,,.png}
 
 
 
@@ -87,7 +87,7 @@ engraver.
 
 @divClass{float-center}
 @divEnd
-@image{pictures/engraver-acc,,,.png}
+@sourceimage{engraver-acc,,,.png}
 
 The @code{Accidental_engraver} is the most complex plug-in: it has
 to look at the key signature, note pitches, ties, and bar lines to
@@ -97,7 +97,8 @@ decide when to print accidentals.
 @end itemize
 
 
-@unnumberedsec  Polyphonic notation
+@c @unnumberedsec  Polyphonic notation
+@heading  Polyphonic notation
 
 The system shown in the last section works well for monophonic music,
 but what about polyphony?  In polyphonic notation, many voices can
@@ -105,7 +106,7 @@ share a staff:
 
 @divClass{float-center}
 @divEnd
-@image{pictures/engraver-final,,,.png}
+@sourceimage{engraver-final,,,.png}
 
 In this situation, the accidentals and staff are shared, but the
 stems, slurs, beams, etc. are private to each voice. Hence, engravers
@@ -118,11 +119,11 @@ Score context:
 
 @divClass{float-center}
 @divEnd
-@image{pictures/engraver-score,,,.png}
+@sourceimage{engraver-score,,,.png}
 
 @divClass{float-right}
 @divEnd
-Next: @ref{engraving.html,The art of stamping}:
+Next: @ref{engraving,The art of stamping}:
 how @emph{did} they make hand-made music? 
 
 @bye
index 074695f62043d8eccaaa79542a32b288e4a33962..2bf029e4a3e1e64c5f52a8aac2141c634e4f19de 100644 (file)
@@ -63,7 +63,7 @@ formatting decisions.
 
 @divClass{float-right}
 @divEnd
-Next: @ref{formatting-architecture.html,Program architecture,
+Next: @ref{formatting-architecture,Program architecture,
 your flexible friend}: tuning, tweaking and developing  typography
 rules.
 
diff --git a/Documentation/automated-engraving/index.itexi b/Documentation/automated-engraving/index.itexi
deleted file mode 100644 (file)
index 4377f0b..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-\input texinfo @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
-
-@ignore
-hmm, the one big page is too big, but it was really inviting to
-     read.  this is not.  maybe just scrap this menu and introduction
-     to index?
-@end ignore
-
-@chapheading @qq{Obsessed with putting ink on paper}
-@node index 
-
-@unnumberedsec What is behind LilyPond?
-
-
-@image{pictures/hader-collage,,,.jpeg}
-
-
-
-LilyPond is not unique in making music notation: there are a lot of
-programs that print music, and nowadays most of the newly printed
-music is made with computers.  Unfortunately, that also shows: just
-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.
-
-@menu
-
-@itemize
-  @item
-
-    @ref{introduction.html,Introduction}: what's wrong with
-    computer music notation.
-  
-
-  @item
-
-    @ref{software.html,What's wrong with software}, or how
-    Finale is not the end-all of music software.
-  
-
-  @item
-
-    @ref{problem-statement.html,How not to design software},
-    or: modeling music notation.
-  
-
-  @item
-
-    @ref{divide-and-conquer.html,Divide and conqueror},
-    A blue print for automated notation.
-  
-
-  @item
-
-    @ref{implementing-notation.html,Impressive, but does it also
-      work in theory}? A practical approach to capturing notation.
-
-  @item
-
-    @ref{engraving.html,Music engraving}, the art of printing
-    music.
-  
-
-
-  @item
-
-    @ref{implementing-typography.html,Implementing typography}:
-    hackers attack the engraving problem.
-  
-
-  @item
-
-    @ref{formatting-architecture.html,A flexible program
-      architecture} lets us write engraving software 
-  
-
-  @item
-
-    @ref{scoring-esthetics.html,Beautiful numbers}: how
-    LilyPond participates in the Miss World contests.
-  
-
-  @item
-
-    @ref{benchmarking.html,Notation benchmarking}: is a flexible
-    architecture enough?
-  
-
-  @item
-
-    @ref{typography-features.html,Typographical features} unique
-    to LilyPond.
-  
-
-  @item
-
-    @ref{input-format.html,Input format}: how to enter music. 
-  
-
-  @item
-
-    @ref{conclusion.html,Conclusion}
-  
-
-@end itemize
-
-This essay is also available in @ref{big-page.html,one big
-  page}.
-
-@bye
-
index 8c39eeaafa978ac74c2944df63d14d49779ec0db..5cf8d4c3db42a175902a0f0327bf42a914aa1460 100644 (file)
@@ -33,7 +33,7 @@ Are a quarter note C1 and eighth note D1, as in this example:
 
 @divClass{float-center}
 @divEnd
-@image{pictures/simple-notation,,,.png}
+@sourceimage{simple-notation,,,.png}
 
 On a microscopic scale, such syntax is easy to use. On a larger scale,
 syntax also  needs structure.  How else can  you enter  complex pieces
@@ -41,85 +41,79 @@ like symphonies and operas? The  structure is formed by the concept of
 music expressions:  by combining small fragments of  music into larger
 ones, more complex music can be expressed.  For example,
 
-@table asis
+@multitable @columnfractions .5 .5
 @item
 
-@tab
-
 c4
 
 @tab
 
-@image{pictures/simultaneous-0,,,.png}
+@sourceimage{simultaneous-0,,,.png}
 
 
-@end table
+@end multitable
 
-Combine this simultaneously with two other notes by enclosing in &lt;&lt
-and &gt;&gt;.
+Combine this simultaneously with two other notes by enclosing in <&lt
+and >>.
 
-@table asis
-@item
+@multitable @columnfractions .5 .5
 
-@tab
+@item
 
 @verbatim
 
-  &lt&lt;c4 d4 e4&gt;&gt;
+  &lt<c4 d4 e4>>
 
 @end verbatim
 
 
 @tab
 
-@image{pictures/simultaneous-1,,,.png}
+@sourceimage{simultaneous-1,,,.png}
 
 
 
-@end table
+@end multitable
 
 This expression is put in sequence by enclosing it in braces, i.e.,
-@table asis
+@multitable @columnfractions .5 .5
 @item
 
-@tab
 @verbatim
 
-   { &lt;&lt;c4 d4 e4&gt;&gt f4  }
+   { <<c4 d4 e4>&gt f4  }
 @end verbatim
 
 
 @tab
 
-@image{pictures/simultaneous-2,,,.png}
+@sourceimage{simultaneous-2,,,.png}
 
 
 
-@end table
+@end multitable
 
 The above is another expression, and therefore, it may be combined 
 again with a simultaneous expression (in this case, a half note). 
 
-@table asis
+@multitable @columnfractions .5 .5
 @item
 
-@tab
-
 @verbatim
 
-&lt;&lt; { &lt;&lt;c4 d4 e4&gt;&gt; f4 } g2 &gt;&gt; 
+<< { <<c4 d4 e4>> f4 } g2 >> 
 
 @end verbatim
 
 
 @tab
 
-@image{pictures/simultaneous-3,,,.png}
+@sourceimage{simultaneous-3,,,.png}
 
 
 
 
-@end table
+@end multitable
 
 Such recursive structures can be specified neatly and formally in a
 @emph{context-free grammar}.  The parsing code is also generated
@@ -135,35 +129,30 @@ writing decent formatting code is much harder.  This is also
 illustrated by the line-counts for the respective components: parsing
 and representation take up less than 10% of the code.
 
-@table asis
-@item
+@multitable @columnfractions .5 .5
 @item
 Parsing + representation
+@tab
 @item
 total
-
-
-@item
-
 @tab
+@item
 6000 lines C++
-
 @tab
 61500 lines C++
+@end multitable
 
-
-@end table
-
-<! todo :
+@ignore
+  TODO :
 
   blurbs about lilypond today
 
   future?
-  >
+@end ignore
 
 @divClass{float-right}
 @divEnd
-Next: @ref{conclusion.html,wrapping it up}, the conclusion.
+Next: @ref{conclusion,wrapping it up}, the conclusion.
 
 @bye
 
index 97bd6c59c9c434ac65ca364d501bc412d57d7259..29d824649b7948e6c4bc2c000fcbed7222882748 100644 (file)
@@ -30,28 +30,26 @@ is a typical contemporary computer product. Take a few seconds to let
 the looks of both pages sink in. Which one do you like better, and
 why?
 
-@table asis
+@ifnottex
+@multitable @columnfractions .5 .5
 @item
-@tab
 
-@image{pictures/baer-suite1-fullpage,,,.png}
+@sourceimage{baer-suite1-fullpage,,,.png}
 
 @tab
 
-@image{pictures/henle-suite1-fullpage,,,.png}
+@sourceimage{henle-suite1-fullpage,,,.png}
 
 
 
 @item
-@tab
 B@"arenreiter (BA 320, (c) 1950)
 
 @tab
 Henle (nr. 666 (c) 2000)
 
-
-@end table
+@end multitable
+@end ifnottex
 
 The left picture looks nice: it has flowing lines and movement. It's
 music, and it's alive.  Now, the picture on the right shows the same
@@ -62,7 +60,7 @@ a fragment of both pieces:
 
 @divClass{float-center}
 @divEnd
-@image{pictures/baer-suite1-line,,,.png}
+@sourceimage{baer-suite1-line,,,.png}
 
 @divClass{float-center}
 @divEnd
@@ -72,7 +70,7 @@ Hand-made
 
 @divClass{float-center}
 @divEnd
-@image{pictures/henle-suite1-line,,,.png}
+@sourceimage{henle-suite1-line,,,.png}
 
 @divClass{float-center}
 @divEnd
@@ -107,7 +105,7 @@ to better performances.
 
 @divClass{float-right}
 @divEnd
-Next: @ref{software.html,What's wrong with software}, or how
+Next: @ref{software,What's wrong with software}, or how
 Finale is not the end-all of music software.
 
 
diff --git a/Documentation/automated-engraving/introduction.texi b/Documentation/automated-engraving/introduction.texi
deleted file mode 100644 (file)
index 42f2e6e..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-\input texinfo   @c -*-texinfo-*-
-@c %**start of header
-@setfilename introduction
-@settitle What's wrong with computer music notation?
-@c %**end of header
-
-@node Top
-
- We like to call LilyPond an "automated engraving system." It will format music notation beautifully without requiring typographical expertise of its users. 
-
- LilyPond is not unique in making music notation: there are a lot of programs that print music, and nowadays most of the newly printed music is made with computers. Unfortunately, that also shows: just ask any musician that plays classical music: new scores do not look as nice as old (from before, say, 1970) scores: the new ones have a bland, mechanical look. They are not at all pleasurable to play from. 
-
- To illustrate this, take a look at the following examples. Both are editions of the 1st Cello Suite by J.S.Bach. The one on the left is a very beautifully hand-engraved edition from 1950, the one on the right is a typical contemporary computer product. Take a few seconds to let the looks of both pages sink in. Which one do you like better, and why? 
-
-
-@table @asis
-
-@item 
-
-
-@item Bärenreiter (BA 320, (c) 1950)
-Henle (nr. 666 (c) 2000)
-
-@end table
-
-
- The left picture looks nice: it has flowing lines and movement. It's music, and it's alive. Now, the picture on the right shows the same music, and it was written by Bach. His music surely has liveliness and flowing lines.... Except, the score doesn't show it: it looks rigid and mechanical. To understand better why that is, let's blow up a fragment of both pieces: 
-
-
-
- Hand-made 
-
-@
-
-
-
-
-Computer-made 
-
- The location of the bar lines is a giveaway. In the new edition, both barlines are on exactly the same horizontal location. Also, the note heads are on the exact same horizontal location. When you look back at the whole page, you can easily verify that almost all barlines are in the same location, as are most of the note heads. The entire thing is spaced as if it were put to a big grid, which is what causes the mechanical impression. 
-
- This is not the only error on this example, and more importantly, this piece is not the only one with typographical errors. Sadly, almost all music printed nowadays is full of basic typographical mistakes. 
-
- Musicians are usually more absorbed with performing the music than with studying its looks, so this nitpicking about typographical details may seem academical. That is not justified. This piece here has a monotonous rhythm. If all lines look the same, they become like a labyrinth. If the musician looks away once or has a lapse in his concentration, he will be lost on the page. 
-
- In general, this is a common characteristic of typography. Layout should be pretty, not only for its own sake, but especially because it helps the reader in his task. For performance material like sheet music, this is doubly important: musicians have a limited amount of attention. The less attention they need for reading, the more they can focus on playing itself. In other words, better typography translates to better performances. 
-
- Next: What's wrong with software, or how Finale is not the end-all of music software. 
-@contents
-@bye
index d4219dbe77cd12c54ccf70c4c983391819bdbc64..8d00b54cdd6fe2f2a346974b38fdb00358beb76a 100644 (file)
@@ -22,14 +22,14 @@ At first sight, music notation follows a straightforward hierarchical
 pattern.  Consider the example below, with two staves containing two
 measures.
 
-@image{pictures/naive-notation,,,.png}
+@sourceimage{naive-notation,,,.png}
 
 Isn't writing software all about finding hierarchies and modeling the
 real world in terms of trees? In the view of a naive programmer, the
 above fragment of notation is easily abstracted to a nested set of
 boxes
 
-@image{pictures/naive-notation-uml,,,.png}
+@sourceimage{naive-notation-uml,,,.png}
 
 It's easy to follow this model when writing software.  It's obvious
 how to store this data in memory, and writing on disk can be easily
@@ -37,18 +37,18 @@ mirrored. In an XML-file you could write something like
 
 @verbatim
 
-  &lt;score&gt;
-    &lt;staff&gt;
-      &lt;measure id="1"&gt;
-         &lt;chord length="1/2"&gt;
-          &lt;pitch name="c"&gt;
-         &lt;/chord&gt;
-         &lt;chord&gt;
+  <score>
+    <staff>
+      <measure id="1">
+         <chord length="1/2">
+          <pitch name="c">
+         </chord>
+         <chord>
         
         ....
-      &lt;/measure&gt;
-    &lt;/staff&gt;
-  &lt;/score&gt;
+      </measure>
+    </staff>
+  </score>
 
 @end verbatim
 
@@ -57,7 +57,7 @@ used by a lot software. Unfortunately, it's also wrong.  The
 hierarchical representation works for a lot of simpler music, but it
 falls apart for advanced use. Consider the following example:
 
-@image{pictures/nonnaive-notation,,,.png}
+@sourceimage{nonnaive-notation,,,.png}
 
 In this example, several assumptions of the previous model are
 violated: staves start and stop at will, voices jump around between
@@ -69,7 +69,7 @@ simpler musical concept. Hence, software should reflect that separation.
 
 @divClass{float-right}
 @divEnd
-Next: @ref{divide-and-conquer.html,Divide and conqueror},
+Next: @ref{divide-and-conquer,Divide and conqueror},
 a blue print for automated notation
 
 @bye
index 5f4c4a2d07f970687efcc4bb1287196713d979f5..66f3f13de8ed8164b2f626b250f11f941183f78d 100644 (file)
@@ -7,7 +7,7 @@
 @end ignore
 
 
-
+@node schubert
 @unnumberedsec S@"angers Morgenlied, by Franz Schubert
 
 The benchmarking project for the LilyPond 2.1.x series, was the
@@ -15,15 +15,15 @@ Ed. Peters version of a Schubert song.
 
 The result of 2.1.5 was nice, but certainly not perfect,
 
-@image{pictures/bench-morgenlied,,,.png}
+@sourceimage{bench-morgenlied,,,.png}
 
 Here is the original,
 
-@image{pictures/morgenlied-crop-2,,,.jpeg}
+@sourceimage{morgenlied-crop-2,,,.jpeg}
 
 and the result of LilyPond 2.1.35.
 
-@image{pictures/morgenlied-ly-crop2,,,.png}
+@sourceimage{morgenlied-ly-crop2,,,.png}
 
 This is a page from a song-book, which is printed in a smaller format.
 Normal print uses 20 pt staff height, this uses 17 pt. In smaller
@@ -33,16 +33,11 @@ been implemented in LilyPond 2.1.  The difference is hard to see here,
 due to the limited resolution of computer screens. For a more detailed
 view, see the LilyPond PDF, available
 
-@ref{@@DOC@@v2.2/input/mutopia/F.Schubert/out-www/morgenlied.pdf,here}.
+@uref{http://lilypond.org/documentation/v2.2/input/mutopia/F.Schubert/out-www/morgenlied.pdf,here}.
 
 @divClass{float-right}
 @divEnd
-@ref{benchmarking.html,Back to the essay}
-
-
-
+@ref{benchmarking,Back to the essay}
 
 @bye
 
index de7cc8abf868004d1f2a6305a4af937a265ddf99..90a324092ea03961b46a9b780c7d87f545f27f64 100644 (file)
@@ -7,13 +7,13 @@
 @end ignore
 
 
-
+@node scoring-esthetics
 @unnumberedsec Beautiful numbers 
        
 How do we actually make formatting decisions?  In other words, which
 of the three configurations should we choose for the following slur?
 
-@image{pictures/slur-esthetics,,,.png}
+@sourceimage{slur-esthetics,,,.png}
 
 There are a few books on the art of music engraving
 available. Unfortunately, they contain rules of simple thumbs and some
@@ -25,7 +25,7 @@ and often not all cases are covered completely.
 
 @divClass{float-center}
 @divEnd
-@image{pictures/ross-beam-scan,,,.jpeg}
+@sourceimage{ross-beam-scan,,,.jpeg}
 
 @divClass{float-center}
 @divEnd
@@ -37,7 +37,7 @@ best formatting solution: score based formatting. The principle is the
 same as a beauty contest: for each possible configuration, we compute an
 ugliness score. Then we choose the least ugly configuration.
 
-@image{pictures/slur-esthetics-annotate-1,,,.png}
+@sourceimage{slur-esthetics-annotate-1,,,.png}
 
 For example, in the above configuration, the slur nicely connects the
 starting and ending note of the figure, a desirable trait. However, it
@@ -45,7 +45,7 @@ also grazes one note head closely, while staying away from the others.
 Therefore, for this configuration, we deduct a `variance' score of
 15.39.
 
-@image{pictures/slur-esthetics-annotate-2,,,.png}
+@sourceimage{slur-esthetics-annotate-2,,,.png}
 
 In this configuration, the slur keeps a uniform distance from the
 heads, but we have to deduct some points because the slur doesn't
@@ -56,7 +56,7 @@ points.
 Furthermore, the slur goes up, while the melody goes down. This incurs
 a penalty of 2.00 points
 
-@image{pictures/slur-esthetics-annotate-3,,,.png}
+@sourceimage{slur-esthetics-annotate-3,,,.png}
 
 Finally, in this configuration, only the ending the slur is far away
 from the ending note head, at a score of 10.04 ugliness points.
@@ -71,12 +71,12 @@ situations, for example
 @item
  determining beam slopes
 
-@image{pictures/beam-scoring-example,,,.png}
+@sourceimage{beam-scoring-example,,,.png}
 
 @item
  formatting tied chords
 
-@image{pictures/ties-scoring-example,,,.png}
+@sourceimage{ties-scoring-example,,,.png}
 @item
  formatting dotted chords
 
@@ -95,7 +95,7 @@ result is much better, and because it makes our lives easy.
 
 @divClass{float-right}
 @divEnd
-Next: @ref{benchmarking.html,Man is the measure of things}: is a
+Next: @ref{benchmarking,Man is the measure of things}: is a
 flexible architecture enough?
 
 @bye
index 250299eec3b55ec751dbc13abd223a21ffafe262..3cb64e8847c92170e0927017f65aafab1cd38958 100644 (file)
@@ -25,7 +25,7 @@ the Sarabande of the 2nd Cello Suite by J. S. Bach.
 
 @divClass{float-center}
 @divEnd
-@image{pictures/finale-sarabande-full,,,.png}
+@sourceimage{finale-sarabande-full,,,.png}
 
 This example far surpasses the previous one when it comes to
 formatting errors: there are serious errors in literally
@@ -36,7 +36,7 @@ magnification of that measure:
 
 @divClass{float-center}
 @divEnd
-@image{pictures/finale-flat-detail,,,.png}
+@sourceimage{finale-flat-detail,,,.png}
 
 The errors go down to the teensy details: below is a blowup of the
 beam in that measure. Of course, in proper typography the beam should
@@ -46,7 +46,7 @@ lack thereof) with the underlying PostScript technology.
 
 @divClass{float-center}
 @divEnd
-@image{pictures/finale-beam-detail,,,.png}
+@sourceimage{finale-beam-detail,,,.png}
 
 Now, one could refute that Finale has a graphical interface, and it
 lets you easily move about elements to correct errors, or use plug-ins
@@ -65,7 +65,7 @@ Did it occur to you that the stem of the last eighth note is too long?
 
 @divClass{float-center}
 @divEnd
-@image{pictures/finale-flat-correct,,,.png}
+@sourceimage{finale-flat-correct,,,.png}
 
 Unless you are an expert, typographical errors will irk you without
 being obvious. Many of them will go uncorrected and will still be in the
@@ -105,7 +105,7 @@ doubt, measure the difference with a magnifying glass.
 
 @divClass{float-right}
 @divEnd
-Next: @ref{problem-statement.html,How not to design software},
+Next: @ref{problem-statement,How not to design software},
 or: modeling music notation.
 
 
index 3e57bae77f99f935f293c09473f5b4b073ba3c1e..dd748576e8f55ed06d17404b0dd8ea91f3fedf12 100644 (file)
@@ -17,23 +17,21 @@ blackness of the page. By using heavy stafflines, and a font design to
 match that, the overall impression is much stronger. This is also very
 clear from the following blowups:
 
-@table asis@item
-@tab
+@multitable @columnfractions .3 .3 .3
+@item
 
-@image{pictures/henle-flat-gray,,,.png}
+@sourceimage{henle-flat-gray,,,.png}
 
 @tab
 
-@image{pictures/baer-flat-gray,,,.png}
+@sourceimage{baer-flat-gray,,,.png}
 
 @tab
 
-@image{pictures/lily-flat-bw,,,.png}
+@sourceimage{lily-flat-bw,,,.png}
 
 
 @item
-
-@tab
 Henle (2000)
 
 @tab
@@ -44,7 +42,7 @@ LilyPond (2003)
 
 
 
-@end table
+@end multitable
 
 Another typical aspect of hand-engraved scores is the general look of
 the symbols. They almost never have sharp corners. This is because
@@ -55,7 +53,8 @@ also present in all glyphs of our "Feta" font.
 
 
  
-@unnumberedsec Spacing
+@c @unnumberedsec Spacing
+@heading Spacing
 
 One of the problems that the Bach piece above inspired us to attack
 is the spacing engine. One of its features is optical spacing.
@@ -63,11 +62,11 @@ It is demonstrated in the fragment below.
 
 @divClass{float-center}
 @divEnd
-@image{pictures/spacing-with-corr,,,.png}
+@sourceimage{spacing-with-corr,,,.png}
 
 @divClass{float-center}
 @divEnd
-@image{pictures/spacing-no-corr,,,.png}
+@sourceimage{spacing-no-corr,,,.png}
 
 This fragment only uses quarter notes: notes that are played in a
 constant rhythm. The spacing should reflect that. Unfortunately, the
@@ -81,7 +80,8 @@ with this correction, the bottom one without.  In the last case, the
 down-stem/up-stems combinations form clumps of notes.
 
 
-@unnumberedsec Ledger lines
+@c @unnumberedsec Ledger lines
+@heading Ledger lines
 
 Ledger lines are typographically difficult. They can easily blot
 together with other signs, such as ledger lines or
@@ -89,27 +89,25 @@ accidentals. Other software prevents these collisions by spacing the
 lines wider (thus taking up more space), or shortening ledger lines
 (which hampers readability.)  
 
-@table asis@item
-@tab
+@multitable @columnfractions .3 .3 .3
+@item
 
-@image{pictures/henle-ledger,,,.png}
+@sourceimage{henle-ledger,,,.png}
 &nbsp;
 
 
 @tab
 
-@image{pictures/baer-ledger,,,.png}&nbsp;
+@sourceimage{baer-ledger,,,.png}&nbsp;
 
 
 
 @tab
 
-@image{pictures/lily-ledger,,,.png}
+@sourceimage{lily-ledger,,,.png}
 
 
 @item
-
-@tab
 Henle (2000)
 
 @tab
@@ -120,7 +118,7 @@ LilyPond (2004)
 
 
 
-@end table
+@end multitable
 
 Traditional engravers would adjust the size of a ledger line,
 depending on what symbols were in the neighborhood. LilyPond does the
@@ -129,7 +127,7 @@ lines, and they are shortened when there is an accidental.
 
 @divClass{float-right}
 @divEnd
-Next: @ref{input-format.html,Use the Source, Luke}, or: what
+Next: @ref{input-format,Use the Source, Luke}, or: what
 goes into LilyPond.
 
 @bye
index 08cd33838016594b0c7e133d5437ab753bac7394..47e97d42e9c34296be0043760b63a0777cc7736a 100644 (file)
Binary files a/Documentation/pictures/baer-flat-gray.png and b/Documentation/pictures/baer-flat-gray.png differ
diff --git a/Documentation/pictures/baer-ledger.png b/Documentation/pictures/baer-ledger.png
new file mode 100644 (file)
index 0000000..ccf8196
Binary files /dev/null and b/Documentation/pictures/baer-ledger.png differ
diff --git a/Documentation/pictures/baer-sarabande.png b/Documentation/pictures/baer-sarabande.png
new file mode 100644 (file)
index 0000000..ae65e6e
Binary files /dev/null and b/Documentation/pictures/baer-sarabande.png differ
diff --git a/Documentation/pictures/baer-suite1-fullpage.png b/Documentation/pictures/baer-suite1-fullpage.png
new file mode 100644 (file)
index 0000000..72504df
Binary files /dev/null and b/Documentation/pictures/baer-suite1-fullpage.png differ
diff --git a/Documentation/pictures/baer-suite1-line.png b/Documentation/pictures/baer-suite1-line.png
new file mode 100644 (file)
index 0000000..d94ac32
Binary files /dev/null and b/Documentation/pictures/baer-suite1-line.png differ
diff --git a/Documentation/pictures/beam-scoring-example.png b/Documentation/pictures/beam-scoring-example.png
new file mode 100644 (file)
index 0000000..2f450f4
Binary files /dev/null and b/Documentation/pictures/beam-scoring-example.png differ
diff --git a/Documentation/pictures/bench-morgenlied.png b/Documentation/pictures/bench-morgenlied.png
new file mode 100644 (file)
index 0000000..cfe0bcf
Binary files /dev/null and b/Documentation/pictures/bench-morgenlied.png differ
diff --git a/Documentation/pictures/directions-updown.png b/Documentation/pictures/directions-updown.png
new file mode 100644 (file)
index 0000000..a08280d
Binary files /dev/null and b/Documentation/pictures/directions-updown.png differ
diff --git a/Documentation/pictures/engraver-acc.png b/Documentation/pictures/engraver-acc.png
new file mode 100644 (file)
index 0000000..2b96c62
Binary files /dev/null and b/Documentation/pictures/engraver-acc.png differ
diff --git a/Documentation/pictures/engraver-clef.png b/Documentation/pictures/engraver-clef.png
new file mode 100644 (file)
index 0000000..b8869b4
Binary files /dev/null and b/Documentation/pictures/engraver-clef.png differ
diff --git a/Documentation/pictures/engraver-final.png b/Documentation/pictures/engraver-final.png
new file mode 100644 (file)
index 0000000..92884a7
Binary files /dev/null and b/Documentation/pictures/engraver-final.png differ
diff --git a/Documentation/pictures/engraver-noteheads.png b/Documentation/pictures/engraver-noteheads.png
new file mode 100644 (file)
index 0000000..449d7ed
Binary files /dev/null and b/Documentation/pictures/engraver-noteheads.png differ
diff --git a/Documentation/pictures/engraver-score.png b/Documentation/pictures/engraver-score.png
new file mode 100644 (file)
index 0000000..dc2b2e6
Binary files /dev/null and b/Documentation/pictures/engraver-score.png differ
diff --git a/Documentation/pictures/engraver-slur.png b/Documentation/pictures/engraver-slur.png
new file mode 100644 (file)
index 0000000..9247ab2
Binary files /dev/null and b/Documentation/pictures/engraver-slur.png differ
diff --git a/Documentation/pictures/engraver-staff.png b/Documentation/pictures/engraver-staff.png
new file mode 100644 (file)
index 0000000..f59d362
Binary files /dev/null and b/Documentation/pictures/engraver-staff.png differ
diff --git a/Documentation/pictures/engraver-stem.png b/Documentation/pictures/engraver-stem.png
new file mode 100644 (file)
index 0000000..2934268
Binary files /dev/null and b/Documentation/pictures/engraver-stem.png differ
diff --git a/Documentation/pictures/finale-beam-detail.png b/Documentation/pictures/finale-beam-detail.png
new file mode 100644 (file)
index 0000000..32fae42
Binary files /dev/null and b/Documentation/pictures/finale-beam-detail.png differ
diff --git a/Documentation/pictures/finale-flat-correct.png b/Documentation/pictures/finale-flat-correct.png
new file mode 100644 (file)
index 0000000..de40a26
Binary files /dev/null and b/Documentation/pictures/finale-flat-correct.png differ
diff --git a/Documentation/pictures/finale-flat-detail.png b/Documentation/pictures/finale-flat-detail.png
new file mode 100644 (file)
index 0000000..2ee5b2d
Binary files /dev/null and b/Documentation/pictures/finale-flat-detail.png differ
diff --git a/Documentation/pictures/finale-sarabande-full.png b/Documentation/pictures/finale-sarabande-full.png
new file mode 100644 (file)
index 0000000..36707dd
Binary files /dev/null and b/Documentation/pictures/finale-sarabande-full.png differ
diff --git a/Documentation/pictures/hader-collage.jpeg b/Documentation/pictures/hader-collage.jpeg
new file mode 100644 (file)
index 0000000..44702d2
Binary files /dev/null and b/Documentation/pictures/hader-collage.jpeg differ
diff --git a/Documentation/pictures/hader-slaan.jpeg b/Documentation/pictures/hader-slaan.jpeg
new file mode 100644 (file)
index 0000000..893d6eb
Binary files /dev/null and b/Documentation/pictures/hader-slaan.jpeg differ
index 20326b958a591ca62d8e46820713e5a6bf472cb9..f257c86a18d31b8a222aeea2e2996fd336ad671f 100644 (file)
Binary files a/Documentation/pictures/henle-flat-gray.png and b/Documentation/pictures/henle-flat-gray.png differ
diff --git a/Documentation/pictures/henle-ledger.png b/Documentation/pictures/henle-ledger.png
new file mode 100644 (file)
index 0000000..184b2f0
Binary files /dev/null and b/Documentation/pictures/henle-ledger.png differ
diff --git a/Documentation/pictures/henle-suite1-fullpage.png b/Documentation/pictures/henle-suite1-fullpage.png
new file mode 100644 (file)
index 0000000..aa57b99
Binary files /dev/null and b/Documentation/pictures/henle-suite1-fullpage.png differ
diff --git a/Documentation/pictures/henle-suite1-line.png b/Documentation/pictures/henle-suite1-line.png
new file mode 100644 (file)
index 0000000..fc6a264
Binary files /dev/null and b/Documentation/pictures/henle-suite1-line.png differ
index 09ce34e7c5fc7448c2e6f767f7d4ab1620c6cb78..45cf450c897b33ff5f50bebfd9c9ea13ae92367f 100644 (file)
Binary files a/Documentation/pictures/lily-flat-bw.png and b/Documentation/pictures/lily-flat-bw.png differ
diff --git a/Documentation/pictures/lily-ledger.png b/Documentation/pictures/lily-ledger.png
new file mode 100644 (file)
index 0000000..ce4dcc4
Binary files /dev/null and b/Documentation/pictures/lily-ledger.png differ
diff --git a/Documentation/pictures/lily14-sarabande-correct.png b/Documentation/pictures/lily14-sarabande-correct.png
new file mode 100644 (file)
index 0000000..f114f12
Binary files /dev/null and b/Documentation/pictures/lily14-sarabande-correct.png differ
diff --git a/Documentation/pictures/lily14-sarabande.png b/Documentation/pictures/lily14-sarabande.png
new file mode 100644 (file)
index 0000000..36aaf56
Binary files /dev/null and b/Documentation/pictures/lily14-sarabande.png differ
diff --git a/Documentation/pictures/lily17-sarabande.png b/Documentation/pictures/lily17-sarabande.png
new file mode 100644 (file)
index 0000000..6481373
Binary files /dev/null and b/Documentation/pictures/lily17-sarabande.png differ
diff --git a/Documentation/pictures/mc-squared.png b/Documentation/pictures/mc-squared.png
new file mode 100644 (file)
index 0000000..84324bd
Binary files /dev/null and b/Documentation/pictures/mc-squared.png differ
diff --git a/Documentation/pictures/morgenlied-crop-2.jpeg b/Documentation/pictures/morgenlied-crop-2.jpeg
new file mode 100644 (file)
index 0000000..dad0394
Binary files /dev/null and b/Documentation/pictures/morgenlied-crop-2.jpeg differ
diff --git a/Documentation/pictures/morgenlied-ly-crop2.png b/Documentation/pictures/morgenlied-ly-crop2.png
new file mode 100644 (file)
index 0000000..7c51ebf
Binary files /dev/null and b/Documentation/pictures/morgenlied-ly-crop2.png differ
diff --git a/Documentation/pictures/naive-notation-uml.png b/Documentation/pictures/naive-notation-uml.png
new file mode 100644 (file)
index 0000000..a030d8e
Binary files /dev/null and b/Documentation/pictures/naive-notation-uml.png differ
diff --git a/Documentation/pictures/naive-notation.png b/Documentation/pictures/naive-notation.png
new file mode 100644 (file)
index 0000000..112c406
Binary files /dev/null and b/Documentation/pictures/naive-notation.png differ
diff --git a/Documentation/pictures/nonnaive-notation.png b/Documentation/pictures/nonnaive-notation.png
new file mode 100644 (file)
index 0000000..1026928
Binary files /dev/null and b/Documentation/pictures/nonnaive-notation.png differ
diff --git a/Documentation/pictures/ross-beam-scan.jpeg b/Documentation/pictures/ross-beam-scan.jpeg
new file mode 100644 (file)
index 0000000..e727780
Binary files /dev/null and b/Documentation/pictures/ross-beam-scan.jpeg differ
diff --git a/Documentation/pictures/simple-notation.png b/Documentation/pictures/simple-notation.png
new file mode 100644 (file)
index 0000000..f711094
Binary files /dev/null and b/Documentation/pictures/simple-notation.png differ
diff --git a/Documentation/pictures/simultaneous-0.png b/Documentation/pictures/simultaneous-0.png
new file mode 100644 (file)
index 0000000..731b22a
Binary files /dev/null and b/Documentation/pictures/simultaneous-0.png differ
diff --git a/Documentation/pictures/simultaneous-1.png b/Documentation/pictures/simultaneous-1.png
new file mode 100644 (file)
index 0000000..edecbe7
Binary files /dev/null and b/Documentation/pictures/simultaneous-1.png differ
diff --git a/Documentation/pictures/simultaneous-2.png b/Documentation/pictures/simultaneous-2.png
new file mode 100644 (file)
index 0000000..7099046
Binary files /dev/null and b/Documentation/pictures/simultaneous-2.png differ
diff --git a/Documentation/pictures/simultaneous-3.png b/Documentation/pictures/simultaneous-3.png
new file mode 100644 (file)
index 0000000..df0811c
Binary files /dev/null and b/Documentation/pictures/simultaneous-3.png differ
diff --git a/Documentation/pictures/slur-esthetics-annotate-1.png b/Documentation/pictures/slur-esthetics-annotate-1.png
new file mode 100644 (file)
index 0000000..91f27d5
Binary files /dev/null and b/Documentation/pictures/slur-esthetics-annotate-1.png differ
diff --git a/Documentation/pictures/slur-esthetics-annotate-2.png b/Documentation/pictures/slur-esthetics-annotate-2.png
new file mode 100644 (file)
index 0000000..e8901cc
Binary files /dev/null and b/Documentation/pictures/slur-esthetics-annotate-2.png differ
diff --git a/Documentation/pictures/slur-esthetics-annotate-3.png b/Documentation/pictures/slur-esthetics-annotate-3.png
new file mode 100644 (file)
index 0000000..7f06186
Binary files /dev/null and b/Documentation/pictures/slur-esthetics-annotate-3.png differ
diff --git a/Documentation/pictures/slur-esthetics.png b/Documentation/pictures/slur-esthetics.png
new file mode 100644 (file)
index 0000000..4146798
Binary files /dev/null and b/Documentation/pictures/slur-esthetics.png differ
diff --git a/Documentation/pictures/spacing-no-corr.png b/Documentation/pictures/spacing-no-corr.png
new file mode 100644 (file)
index 0000000..39fd5c0
Binary files /dev/null and b/Documentation/pictures/spacing-no-corr.png differ
diff --git a/Documentation/pictures/spacing-with-corr.png b/Documentation/pictures/spacing-with-corr.png
new file mode 100644 (file)
index 0000000..b62ed8a
Binary files /dev/null and b/Documentation/pictures/spacing-with-corr.png differ
diff --git a/Documentation/pictures/stone-distance.png b/Documentation/pictures/stone-distance.png
new file mode 100644 (file)
index 0000000..9c7fa54
Binary files /dev/null and b/Documentation/pictures/stone-distance.png differ
diff --git a/Documentation/pictures/thickness-tweaks.png b/Documentation/pictures/thickness-tweaks.png
new file mode 100644 (file)
index 0000000..4495a6c
Binary files /dev/null and b/Documentation/pictures/thickness-tweaks.png differ
diff --git a/Documentation/pictures/ties-scoring-example.png b/Documentation/pictures/ties-scoring-example.png
new file mode 100644 (file)
index 0000000..6cd43de
Binary files /dev/null and b/Documentation/pictures/ties-scoring-example.png differ
index b0bf9cfcc579b1bff27a5cb4472f5a50abf1a67e..783c808642831c5d564be6613b76492ab260cb1c 100644 (file)
@@ -30,7 +30,7 @@ renames_map = {
 
 # FIXME: Hardcoded file names!?
 manuals_subdirectories_re = \
-    re.compile ('(application|essay|general|learning|notation)/')
+    re.compile ('(application|automated-engraving|essay|general|learning|notation)/')
 
 def add_old_name (file_path):
     for new_path in renames_map:
index 68b0536a77812c1cbd4cde54f05141e6d51f635e..a8f6c78ae12965268f0dd87fc6c39c7d67c9ed97 100644 (file)
@@ -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/(essay|notation|music-glossary|application|general|learning|snippets))/')
+splitted_docs_re = re.compile ('(Documentation/out-www/(automated-engraving|essay|notation|music-glossary|application|general|learning|snippets))/')
 lily_snippets_re = re.compile ('(href|src)="(../lily-.*?|.*?[.]png)"')
 pictures_re = re.compile ('src="(pictures/.*?)"')