*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 753f605cd251aba4b22be605507ab85cb22e204b..9e5bd9701615da62ed558a9c0e5b108cf9769251 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2004-08-01  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+       * input/test/lyrics-skip-notes.ly: remove
+
        * input/test/stem-cross-staff.ly (noFlag): fold into manual
 
        * input/test/{spacing-2,staff-space,tablature,textscript}.ly:

diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely
index ec51cda02df33de2c8ef30d61f9c13ce31abb478..48f26b0a42d799812d69f5f7e03762fffcced428 100644 (file)
--- a/Documentation/user/notation.itely
+++ b/Documentation/user/notation.itely
@@ -3206,6 +3206,7 @@ handle this cross-staffing behavior.  In this section we discuss the
 * Pedals::                      
 * Arpeggio::                    
 * Staff switch lines::          
+* Cross staff stems::           
 @end menu 
 
 @refbugs
@@ -7043,6 +7044,7 @@ support for contemporary notation in LilyPond is limited.
 * Polymetric notation::         
 * Clusters::                    
 * Fermatas::                    
+* Feathered beams::             
 @end menu
 
 @node Polymetric notation

diff --git a/input/template/bagpipe.ly b/input/template/bagpipe.ly
new file mode 100644 (file)
index 0000000..bc42df2
--- /dev/null
+++ b/input/template/bagpipe.ly
@@ -0,0 +1,171 @@
+\version "2.3.8"
+
+\header {
+    texidoc = "@cindex Bagpipe Music
+Here's an example of bagpipe music.
+"
+}
+
+\paper {
+    linewidth = 14.0 \cm
+    indent = 0.0 \cm
+    \context {
+       \Staff
+       \override TimeSignature #'style = #'C
+       \override TimeSignature #'break-visibility = #begin-of-line-visible
+    }  
+}
+
+taor =  { \grace {
+    g32[ d' g e']
+}
+           }
+grip =   {
+    \grace {
+       g32[ b g ]
+    }
+}
+thrd =   {
+    \grace {
+       g32[ d' c'] 
+    }
+}
+birl =   {
+    \grace {
+       g32[ a g] 
+    }
+}
+gstd =   {
+    \grace {
+       g'32[ d' g] 
+    }
+}
+lgg =  {
+    \grace {
+       g32 
+    }
+}
+lag =  {
+    \grace {
+       a32 
+    }
+}
+fgg =  {
+    \grace {
+       f32[ g'32] 
+    }
+}
+dblb =   {
+    \grace {
+       g'32[ b d'] 
+    }
+}
+dblc =   {
+    \grace {
+       g'32[ c' d'] 
+    }
+}
+dble =   {
+    \grace {
+       g'32[ e' f'] 
+    }
+}
+dblf =   {
+    \grace {
+       g'32[ f' g'] 
+    }
+}
+dblg =   {
+    \grace {
+       g'32[ f'] 
+    }
+}
+dbla =   {
+    \grace {
+       a'32[ g'] 
+    }
+}
+cg   =  {
+    \grace {
+       c'32 
+    }
+}
+eg   =  {
+    \grace {
+       e'32 
+    }
+}
+gg   =  {
+    \grace {
+       g'32 
+    }
+}
+dg   =  {
+    \grace {
+       d'32 
+    }
+}
+hag  =  {
+    \grace {
+       a'32 
+    }
+}
+gefg =   {
+    \grace {
+       g'32[ e' f'] 
+    }
+}
+efg  =  {
+    \grace {
+       e'32[ f'] 
+    }
+}
+gdcg =   {
+    \grace {
+       g'32[ d' c']
+    }
+}
+gcdg =   {
+    \grace {
+       g'32[ c' d']
+    }
+}
+       
+\transpose a a' {
+    #(add-grace-property 'Voice 'Stem 'length 6)
+    \time 6/8 \partial 4
+    \tieUp
+    \slurUp
+    
+    f'4 |
+    \gg f'4 e'8 \thrd d'4. |
+    \eg a4.(a4) d'8 |
+    \gg d'4 f'8 \dble e'4. ( | \noBreak
+    e'8) d'4 \gg d'4 e'8 |
+
+%{
+    
+    \break
+    \time 9/8
+    \dblf f'2.( f'4) d'8 |
+    \time 6/8
+    \dblg g'4 a'8 \gg a'4. |
+    \thrd d'4.( d'4) \eg a8 |
+    \time 9/8
+    \dble e'4 \lag e'8 \gg  e'16[ d'8. e'8] \gg f'4 g'8 |
+
+    \break
+    \time 6/8
+    \gg f'4 e'8 \thrd d'4. |
+    \eg a4.( a4) d'8 |
+    \dblg g'4 a'8 \gg a'4. |
+    \thrd d'4.( d'4) f'8 |
+
+    \break
+    \dblg g'4 e'8( e'8) \dblf  f'8.[ e'16] |
+    \thrd d'4.( d'4) \cg d'8 |
+    \gg c'4 e'8 \thrd d'4.( |
+    d'4.) \gdcg d'4.
+    
+%}
+}

diff --git a/input/test/bagpipe.ly b/input/test/bagpipe.ly
deleted file mode 100644 (file)
index bc42df2..0000000
--- a/input/test/bagpipe.ly
+++ /dev/null
@@ -1,171 +0,0 @@
-\version "2.3.8"
-
-\header {
-    texidoc = "@cindex Bagpipe Music
-Here's an example of bagpipe music.
-"
-}
-
-\paper {
-    linewidth = 14.0 \cm
-    indent = 0.0 \cm
-    \context {
-       \Staff
-       \override TimeSignature #'style = #'C
-       \override TimeSignature #'break-visibility = #begin-of-line-visible
-    }  
-}
-
-taor =  { \grace {
-    g32[ d' g e']
-}
-           }
-grip =   {
-    \grace {
-       g32[ b g ]
-    }
-}
-thrd =   {
-    \grace {
-       g32[ d' c'] 
-    }
-}
-birl =   {
-    \grace {
-       g32[ a g] 
-    }
-}
-gstd =   {
-    \grace {
-       g'32[ d' g] 
-    }
-}
-lgg =  {
-    \grace {
-       g32 
-    }
-}
-lag =  {
-    \grace {
-       a32 
-    }
-}
-fgg =  {
-    \grace {
-       f32[ g'32] 
-    }
-}
-dblb =   {
-    \grace {
-       g'32[ b d'] 
-    }
-}
-dblc =   {
-    \grace {
-       g'32[ c' d'] 
-    }
-}
-dble =   {
-    \grace {
-       g'32[ e' f'] 
-    }
-}
-dblf =   {
-    \grace {
-       g'32[ f' g'] 
-    }
-}
-dblg =   {
-    \grace {
-       g'32[ f'] 
-    }
-}
-dbla =   {
-    \grace {
-       a'32[ g'] 
-    }
-}
-cg   =  {
-    \grace {
-       c'32 
-    }
-}
-eg   =  {
-    \grace {
-       e'32 
-    }
-}
-gg   =  {
-    \grace {
-       g'32 
-    }
-}
-dg   =  {
-    \grace {
-       d'32 
-    }
-}
-hag  =  {
-    \grace {
-       a'32 
-    }
-}
-gefg =   {
-    \grace {
-       g'32[ e' f'] 
-    }
-}
-efg  =  {
-    \grace {
-       e'32[ f'] 
-    }
-}
-gdcg =   {
-    \grace {
-       g'32[ d' c']
-    }
-}
-gcdg =   {
-    \grace {
-       g'32[ c' d']
-    }
-}
-       
-\transpose a a' {
-    #(add-grace-property 'Voice 'Stem 'length 6)
-    \time 6/8 \partial 4
-    \tieUp
-    \slurUp
-    
-    f'4 |
-    \gg f'4 e'8 \thrd d'4. |
-    \eg a4.(a4) d'8 |
-    \gg d'4 f'8 \dble e'4. ( | \noBreak
-    e'8) d'4 \gg d'4 e'8 |
-
-%{
-    
-    \break
-    \time 9/8
-    \dblf f'2.( f'4) d'8 |
-    \time 6/8
-    \dblg g'4 a'8 \gg a'4. |
-    \thrd d'4.( d'4) \eg a8 |
-    \time 9/8
-    \dble e'4 \lag e'8 \gg  e'16[ d'8. e'8] \gg f'4 g'8 |
-
-    \break
-    \time 6/8
-    \gg f'4 e'8 \thrd d'4. |
-    \eg a4.( a4) d'8 |
-    \dblg g'4 a'8 \gg a'4. |
-    \thrd d'4.( d'4) f'8 |
-
-    \break
-    \dblg g'4 e'8( e'8) \dblf  f'8.[ e'16] |
-    \thrd d'4.( d'4) \cg d'8 |
-    \gg c'4 e'8 \thrd d'4.( |
-    d'4.) \gdcg d'4.
-    
-%}
-}

diff --git a/lily/time-signature.cc b/lily/time-signature.cc
index d79f96735a164eb93df06591320b4b472adc1358..56f191d887422181d500309c9f3964178d9cde64 100644 (file)
--- a/lily/time-signature.cc
+++ b/lily/time-signature.cc
@@ -147,7 +147,7 @@ ADD_INTERFACE (Time_signature, "time-signature-interface",
 "        typeset with mensural style mensuration marks.  All other time\n"
 "        signatures are written with two digits.\n"
 "\n"
-"      @item @code{single-digit"
+"      @item @code{single-digit}\n"
 "        All time signatures are typeset with a single\n"
 "        digit, e.g. 3/2 is written as 3.\n"
 "    @end table\n"

diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm
index e3777d7d9a36c9b9b2dab3e68ac134775d6fd560..e54fa745ea6d2e8e09b603ec94090f1f6f03db02 100644 (file)
--- a/scm/define-markup-commands.scm
+++ b/scm/define-markup-commands.scm
@@ -52,7 +52,13 @@
 
 (def-markup-command (postscript paper props str) (string?)
 
-  "This inserts @var{str} directly into the output as a PostScript command string."
+  "This inserts @var{str} directly into the output as a PostScript command string. For example,
+
+@cindex rotated text
+@lilypond[verbatim]
+{ c^\\markup { \\postscript #\" /ecrm10 findfont 10 output-scale div scalefont 90 rotate (hello) show \" } } 
+@end lilypond"
+
   (ly:make-stencil
    (list 'embedded-ps str)
    '(0 . 0) '(0 . 0)  ))