lilypond-1.3.145

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/input/ascii-art/as-email.ly b/input/ascii-art/as-email.ly
new file mode 100644 (file)
index 0000000..86c4906
--- /dev/null
+++ b/input/ascii-art/as-email.ly
@@ -0,0 +1,26 @@
+% ASCII Art output
+%
+% Process as:
+%
+%     lilypond -fas foo.ly
+%     as2text foo.as
+
+\include "paper-as5.ly"
+
+\score {
+  \notes\relative c'' {
+    \time 3/8;
+    a8 a a 
+    \time 5/8;
+    a a a a a
+    %a16 a  a a a a a a a a 
+  }
+  \paper {
+    linewidth = -1.;
+    \translator {
+      \StaffContext
+      StaffSymbol \override #'molecule-callback = #(lambda (x) '())
+    }
+  }
+}
+

diff --git a/input/ascii-art/asciiscript5.ly b/input/ascii-art/asciiscript5.ly
new file mode 100644 (file)
index 0000000..1bb50e2
--- /dev/null
+++ b/input/ascii-art/asciiscript5.ly
@@ -0,0 +1,24 @@
+% ASCII Art output
+%
+% Process as:
+%
+%     lilypond -fas foo.ly
+%     as2text foo.as
+
+\include "paper-as5.ly"
+
+\score {
+  \notes\relative c'' {
+    \time 4/4;
+    g1 a b c 
+    g2 a b c
+    g4 a b c
+  }
+  \paper {
+    \translator {
+      \StaffContext
+      BarLine \override #'bar-size = #5
+    }
+  }
+}
+

diff --git a/input/ascii-art/asciiscript9.ly b/input/ascii-art/asciiscript9.ly
new file mode 100644 (file)
index 0000000..c46e761
--- /dev/null
+++ b/input/ascii-art/asciiscript9.ly
@@ -0,0 +1,18 @@
+% ASCII Art output
+%
+% Process as:
+%
+%     lilypond -fas foo.ly
+%     as2text foo.as
+
+\include "paper-as9.ly"
+
+\score {
+  \notes\relative c'' {
+    \time 4/4;
+    g1 a b c 
+    g2 a b c
+    g4 a b c
+  }
+}
+

diff --git a/input/ascii-art/r-as.ly b/input/ascii-art/r-as.ly
index 09ab543a35966dcebc349515d021c150b736af43..6acf102ddb75420f6815e95b3e373a3e38633ae4 100644 (file)
--- a/input/ascii-art/r-as.ly
+++ b/input/ascii-art/r-as.ly
@@ -1,19 +1,27 @@
+% ASCII Art output
+%
+% Process as:
+%
+%     lilypond -fas foo.ly
+%     as2text foo.as
+
+\include "paper-as5.ly"
 
 \score{
-       <
-                 \context Staff \notes\relative c'{ 
-                         c d e f
-                         \repeat "volta" 2 { g a b c }
-                         \alternative { { c b a g } { f e d c } }
-                 }
-                 \context Lyrics \lyrics {
-                         De eer- ste < { maat } { moet } >
-                         \repeat fold 2 { }
-                         \alternative {
-                                 { en dan twee keer } 
-                                 { een koe- plet _ } 
-                         }
-                         en dan nog dit er ach- ter aan
-                 }
-       >
+  <
+      \context Staff \notes\relative c'{ 
+        c d e f
+        \repeat "volta" 2 { g a b c }
+        \alternative { { c b a g } { f e d c } }
+      }
+      \context Lyrics \lyrics {
+        De eer- ste < { maat } { moet } >
+        \repeat fold 2 { }
+        \alternative {
+          { en dan twee keer } 
+          { een koe- plet _ } 
+        }
+        en dan nog dit er ach- ter aan
+      }
+  >
 }

diff --git a/input/ascii-art/standchen-as5.ly b/input/ascii-art/standchen-as5.ly
index 876c449dc53be8888998320be643e507c96fe516..a5e04b27e6b2cc689d92416703059d2ddcb2ed12 100644 (file)
--- a/input/ascii-art/standchen-as5.ly
+++ b/input/ascii-art/standchen-as5.ly
@@ -1,40 +1,41 @@
-
-% asci art output
-
+% ASCII Art output
+%
+% Process as:
+%
+%     lilypond -fas foo.ly
+%     as2text foo.as
 
 
 \include "paper-as5.ly"
 
 \score {
-       \context StaffGroup <
-               \context Staff=upper \notes\relative c{
-                       \key f \major;
-                       \time 3/4;
-                       r8^"Moderato" %\pp 
-                       <g'-. c-.> <c-. es-.> <g-. c-.> <c-. es-.> <g-. c-.> |
-                       r8 <as-. c-.> <c-. es-.>
-               }
-               \context Staff=lower \notes\relative c{
-                       \key f \major;
-                       \time 3/4;
-                       \clef "bass";
-                       <c,2 c'> r4 
-                       <as2 as'> r4
-               }
-       >
-       \paper {
-%              \paperAs_nine
-               indent=4.0\char;
-               linewidth=78.0\char;
-               \translator { \StaffContext barSize = #4.5 }
-               %\translator { \VoiceContext beamHeight = #0 }
-               \translator { 
-                       \VoiceContext 
-                       beamHeight = ##f 
-                       autoBeamSettings \override (begin * * * *) = #(make-moment 0 1)
-                       textNonEmpty = ##f
-               }
-       }
-
+  \context StaffGroup <
+    \context Staff=upper \notes\relative c{
+      \key f \major;
+      \time 3/4;
+      r8^"Moderato" %\pp 
+      <g'-. c-.> <c-. es-.> <g-. c-.> <c-. es-.> <g-. c-.> |
+      r8 <as-. c-.> <c-. es-.>
+    }
+    \context Staff=lower \notes\relative c{
+      \key f \major;
+      \time 3/4;
+      \clef "bass";
+      <c,2 c'> r4 
+      <as2 as'> r4
+    }
+  >
+  \paper {
+    indent=4.0\char;
+    linewidth=78.0\char;
+    \translator { \StaffContext Bar \override #'bar-size = #5 }
+    \translator { 
+      \VoiceContext 
+      % horizontal beams
+      Beam \override #'height = #0
+      autoBeamSettings \override #'(begin * * * *) = #(make-moment 0 1)
+      textNonEmpty = ##f
+    }
+  }
 }
 

diff --git a/input/ascii-art/standchen-as9.ly b/input/ascii-art/standchen-as9.ly
index 00a7b257bb56e233046176aec77e88933523a596..9e7aabfe852d6e835b8568c0e3b51b7b7e11dcbb 100644 (file)
--- a/input/ascii-art/standchen-as9.ly
+++ b/input/ascii-art/standchen-as9.ly
@@ -1,38 +1,41 @@
+% ASCII Art output
 
-% asci-art output, TODO: include how-to-use-this 
+% Process as:
+%
+%     lilypond -fas foo.ly
+%     as2text foo.as
+
+% FIXME: broken system-start-delimiter.cc:staff_brace lookup
 
 \include "paper-as9.ly"
 
 \score {
-       \context GrandStaff <
-               \context Staff=upper \notes\relative c{
-                       \key f \major;
-                       \time 3/4;
-                       r8^"Moderato" %\pp 
-                       <g'-. c-.> <c-. es-.> <g-. c-.> <c-. es-.> <g-. c-.> |
-                       r8 <as-. c-.> <c-. es-.>
-               }
-               \context Staff=lower \notes\relative c{
-                       \key f \major;
-                       \time 3/4;
-                       \clef "bass";
-                       <c,2 c'> r4 
-                       <as2 as'> r4
-               }
-       >
-       \paper {
-%              \paperAs_nine
-               indent=4.0\char;
-               linewidth=78.0\char;
-               %\translator { \StaffContext barSize = #9 }
-               %\translator { \VoiceContext beamHeight = #0 }
-               \translator { 
-                       \VoiceContext 
-                       beamHeight = ##f 
-                       autoBeamSettings \override #(begin * * * *) = #(make-moment 0 1)
-                       textNonEmpty = ##f
-               }
-       }
-
+  \context GrandStaff <
+    \context Staff=upper \notes\relative c{
+      \key f \major;
+      \time 3/4;
+      r8^"Moderato" %\pp 
+      <g'-. c-.> <c-. es-.> <g-. c-.> <c-. es-.> <g-. c-.> |
+      r8 <as-. c-.> <c-. es-.>
+    }
+    \context Staff=lower \notes\relative c{
+      \key f \major;
+      \time 3/4;
+      \clef "bass";
+      <c,2 c'> r4 
+      <as2 as'> r4
+    }
+  >
+  \paper {
+    indent=4.0\char;
+    linewidth=78.0\char;
+    \translator { 
+      \VoiceContext 
+      % horizontal beams
+      Beam \override #'height = #0
+      autoBeamSettings \override #'(begin * * * *) = #(make-moment 0 1)
+      textNonEmpty = ##f
+    }
+  }
 }
 

diff --git a/input/ascii-art/twinkle-as5.ly b/input/ascii-art/twinkle-as5.ly
index f99d5a502e3243e4af4cdcbd2bcd595e77b13c67..ecfbeee0b8754f99f1d6041c1ec3d554755681ae 100644 (file)
--- a/input/ascii-art/twinkle-as5.ly
+++ b/input/ascii-art/twinkle-as5.ly
@@ -1,5 +1,11 @@
-% ascii art output
- 
+% ASCII Art output
+%
+% Process as:
+%
+%     lilypond -fas foo.ly
+%     as2text foo.as
+
+
 \header{
 filename =     "twinkle.ly";
 title =                "Twinkle Twinkle Little Star";