patch::: 1.3.144.jcn3

1.3.144.jcn3
============

* Bugfixes: refman, changed Ascii to ASCII.

diff --git a/CHANGES b/CHANGES
index 219088d16d4feef224055784a86e12a3caf01829..9d4124216f5e0c6861b372fe3743bf082f6d2c48 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+1.3.144.jcn3
+============
+
+* Bugfixes: refman, changed Ascii to ASCII.
+
 1.3.144.jcn2
 ============
 

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index 68c9169da7d1717166b565951d1d2a2094cc2895..f55767c73e5c92c0bba2c0e045e7c5f2efbe18ed 100644 (file)
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -39,6 +39,7 @@ revision of this document was for LilyPond 1.3.141.
 * Custodes::                    
 * Tuning output::               
 * Page layout::                 
+* Output formats::              
 * Sound::                       
 * Music entry::                 
 * Skipping corrected music::    
@@ -2594,8 +2595,9 @@ grob property.
 * Tuning per grob ::            
 * What to tune?::               
 * Font selection::              
-* Text markup::
-* Embedded @TeX{}::             
+* Text markup::                 
+* Invisible grobs::             
+* Embedded TeX::                
 @end menu
 
 @node Tuning groups of grobs 
@@ -2984,7 +2986,12 @@ marking:
 @subsection Invisible grobs
 @cindex invisible grobs
 
-A grob can be made invisible in a number of ways:
+You can imagine a number of situtations where you would want to make
+certain grobs not show up in the output.  There may be aesthetic
+reasons, to make the output resemble an (old) manuscript as close as
+possible, or to make lessons or exercises for students.
+
+Grobs can be made invisible in a number of ways:
 
 @ignore
 FIXME
@@ -2997,16 +3004,34 @@ Show molecule-callback override
 
 Show visibility-lambda and explain why it doesn't work for eg
 StaffSymbol
-
 @end ignore
 
+Here's an example with blanked-out notes and stems:
+@lilypond[singleline,verbatim]
+blanknotes = {
+  \property Voice.NoteHead \override
+    #'molecule-callback = #(lambda (x) '())
+  \property Voice.Stem \override
+    #'molecule-callback = #(lambda (x) '()) }
+  
+unblanknotes = {
+  \property Voice.NoteHead \revert #'molecule-callback
+  \property Voice.Stem \revert #'molecule-callback }
+
+\score {
+  \notes\relative c'' {
+    \time 6/4;
+    a b c b \blanknotes c \unblanknotes d
+  }
+}
+@end lilypond                
 
 Some grobs require a special treatment.
 
-Make staff invisible:
-@lilypond[singleline,verbatim}
+Rhythm exercise: make staff invisible and squash pitches:
+@lilypond[singleline,verbatim]
 \score {
-  \notes { c4 c4 c8 c8 }
+  \notes { \time 3/4; c4 c c8 c | c4 c c8 c }
   \paper {
     \translator {
       \StaffContext
@@ -3018,8 +3043,8 @@ Make staff invisible:
 }
 @end lilypond
 
-Make bar lines invisible:
-@lilypond[singleline,verbatim}
+Some modern music does not show bar lines:
+@lilypond[singleline,verbatim]
 \score {
   \notes \relative c'' {
     a b c d
@@ -3033,12 +3058,11 @@ Make bar lines invisible:
     }
   }
 }
-
-
 @end lilypond
 
-@node Embedded @TeX{}
-@subsection Embeded @TeX{}
+
+@node Embedded TeX
+@subsection Embeded TeX
 @cindex embedded tex
 @cindex embedded tex
 
@@ -3298,9 +3322,16 @@ details, see the example file @file{input/test/between-systems.ly}
 
 LilyPond can output processed music in different output formats.  
 
-@node @TeX{} output
-@section @TeX{} output
-@cindex @TeX{} output
+@menu
+* TeX output::                  
+* PostScript output::           
+* Scheme output::               
+* ASCIIScript output::          
+@end menu
+
+@node TeX output
+@subsection TeX output
+@cindex TeX output
 
 LilyPond will use @TeX{} by default.  Even if you want to produce
 PostScript output for viewing or printing, you should normally have
@@ -3311,12 +3342,13 @@ used to generate the .dvi for you.
 
 
 @node PostScript output
-@section PostScript output
+@subsection PostScript output
 @cindex PostScript output
 @cindex direct PostScript output
 
 LilyPond can produce PostScript directly, without going through @TeX{}.
-Direct PostScript output has some problems, though.
+Currently, this is mainly useful if you cannot use TeX, because direct
+PostScript output has some problems; see Bugs below.
 
 @example
 $ lilypond -fps foo.ly
@@ -3327,6 +3359,7 @@ Interpreting music...[3]
 Preprocessing elements... 
 Calculating column positions... 
 paper output to foo.ps...
+
 $ cat /usr/share/lilypond/pfa/feta20.pfa foo.ps | lpr
 @end example
 
@@ -3345,7 +3378,7 @@ difficult.
 
 
 @node Scheme output
-@section Scheme output
+@subsection Scheme output
 @cindex Scheme output
 
 [TODO]
@@ -3370,27 +3403,27 @@ $ guile -s foo.scm > foo.tex
 @end example
 
 
-@node AsciiScript output
-@section AsciiScript output
-@cindex AsciiScript output
+@node ASCIIScript output
+@subsection ASCIIScript output
+@cindex ASCIIScript output
 @cindex ascii script
 @cindex ascii art
 
-LilyPond can output Ascii Art.  This is a two step process, LilyPond
-produces an ascii description file, dubbed AsciiScript (extension
-@file{.as}).  AsciiScript has a small and simple command set that
+LilyPond can output ASCII Art.  This is a two step process, LilyPond
+produces an ASCII description file, dubbed ASCIIScript (extension
+@file{.as}).  ASCIIScript has a small and simple command set that
 includes font selection, character and string printing and line drawing
 commands.  The program @file{as2text} is used to translate an .as file
 to text.
 
-To produce ascii art, you must include an ascii art paper definition
+To produce ASCII Art, you must include an ASCII Art paper definition
 file in your .ly, one of:
 @example
 \include "paper-as5.ly"
 \include "paper-as9.ly"
 @end example
 
-Here's an example use for Ascii Art output (the example file
+Here's an example use for ASCII Art output (the example file
 @file{as-email.ly} is included in the LilyPond distribution), the staff
 symbol has been made invisible:
 
@@ -3427,9 +3460,15 @@ $ as2text as-email.as 2>/dev/null
 
 @refbugs
 
-The ascii art fonts are far from complete and not very well designed.
+The ASCII Art fonts are far from complete and not very well designed.
+It's easy to change the glyphs, though; if you think you can do better,
+have a look at @file{mf/*.af}.
+
 Lots of resizable symbols such as slurs, ties, tuplets are missing.
 
+The poor looks of most ASCII Art output and its limited general
+usefulness make that ASCII Art output has a low priority; it may be
+dropped in future versions.
 
 @c . {Sound}
 @node Sound

diff --git a/NEWS b/NEWS
index a402dff00804254aa7e168718b568bfc2971a182..c80c4bc83e156e683a11528ec5859ffed0441dfc 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -48,7 +48,7 @@ internals: LilyPond is smaller, cleaner, more flexible, etc.
 
 * Mutopia ports collection: easy accessible music archive.
 
-* AsciiScript: ASCII-art output 
+* ASCIIScript: ASCII-art output 
 
 * Translations into Japanese, French and Russian
 

diff --git a/VERSION b/VERSION
index fe1e5261742c0547a5a818f1f4a1efcdc1e4d2b0..453fa3bb849e76fc8ffd79cbd60f48a3d2df5f0a 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=144
-MY_PATCH_LEVEL=jcn2
+MY_PATCH_LEVEL=jcn3
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/input/ascii-art/as-email.ly b/input/ascii-art/as-email.ly
index 3c22b30e16ae0563514a574dff57e6db8865a94d..86c4906d5edc8974e58c156af992b8b0d5315e57 100644 (file)
--- a/input/ascii-art/as-email.ly
+++ b/input/ascii-art/as-email.ly
@@ -1,5 +1,9 @@
-
-% ascii art
+% ASCII Art output
+%
+% Process as:
+%
+%     lilypond -fas foo.ly
+%     as2text foo.as
 
 \include "paper-as5.ly"
 

diff --git a/input/ascii-art/asciiscript5.ly b/input/ascii-art/asciiscript5.ly
index 617bcdde2ed5412ce61579d479028af7c4e473fb..1bb50e2bef91701e808361ebd2d4de6b5755116c 100644 (file)
--- a/input/ascii-art/asciiscript5.ly
+++ b/input/ascii-art/asciiscript5.ly
@@ -1,4 +1,4 @@
-% ascii art output
+% ASCII Art output
 %
 % Process as:
 %

diff --git a/input/ascii-art/asciiscript9.ly b/input/ascii-art/asciiscript9.ly
index 5bab55b1e3a7ef47a5c0ba08158b786eea289136..c46e76115db4bcb9f559a557868fbe641e7bd8a2 100644 (file)
--- a/input/ascii-art/asciiscript9.ly
+++ b/input/ascii-art/asciiscript9.ly
@@ -1,4 +1,4 @@
-% ascii art output
+% ASCII Art output
 %
 % Process as:
 %

diff --git a/input/ascii-art/r-as.ly b/input/ascii-art/r-as.ly
index dcb15e326fcddcfde3f0536e92528b54f418440d..6acf102ddb75420f6815e95b3e373a3e38633ae4 100644 (file)
--- a/input/ascii-art/r-as.ly
+++ b/input/ascii-art/r-as.ly
@@ -1,4 +1,4 @@
-% ascii art output
+% ASCII Art output
 %
 % Process as:
 %

diff --git a/input/ascii-art/standchen-as5.ly b/input/ascii-art/standchen-as5.ly
index 053b96280bf61fdb7450918aa4b475e918d6a6d8..a5e04b27e6b2cc689d92416703059d2ddcb2ed12 100644 (file)
--- a/input/ascii-art/standchen-as5.ly
+++ b/input/ascii-art/standchen-as5.ly
@@ -1,4 +1,4 @@
-% ascii art output
+% ASCII Art output
 %
 % Process as:
 %

diff --git a/input/ascii-art/standchen-as9.ly b/input/ascii-art/standchen-as9.ly
index 153899c449db080926f0dc2593081df5b2a95bf8..9e7aabfe852d6e835b8568c0e3b51b7b7e11dcbb 100644 (file)
--- a/input/ascii-art/standchen-as9.ly
+++ b/input/ascii-art/standchen-as9.ly
@@ -1,5 +1,5 @@
-% ascii art output
-%
+% ASCII Art output
+
 % Process as:
 %
 %     lilypond -fas foo.ly

diff --git a/input/ascii-art/twinkle-as5.ly b/input/ascii-art/twinkle-as5.ly
index 5e42a80a079a10faa626ad8c8b570715a755daae..ecfbeee0b8754f99f1d6041c1ec3d554755681ae 100644 (file)
--- a/input/ascii-art/twinkle-as5.ly
+++ b/input/ascii-art/twinkle-as5.ly
@@ -1,4 +1,4 @@
-% ascii art output
+% ASCII Art output
 %
 % Process as:
 %

diff --git a/scripts/update-lily.py b/scripts/update-lily.py
index f022ec3fd54d2fd67e88913b4565eedd6f4f4038..647a9babe4980fd5d437add59b2699f19549647c 100644 (file)
--- a/scripts/update-lily.py
+++ b/scripts/update-lily.py
@@ -47,6 +47,7 @@ help_summary = _("Fetch and rebuild from latest source package")
 obuild_command = '(./configure --prefix=$HOME/usr && make all web) >> log.txt 2>&1'
 build_command = '''
 cd $HOME/usr/src &&
+[ -d %n-%v ] && exit 1;
 (
 tar xzf %t &&
 rm -f building &&