*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 209b404fc0d047057be7c19c7ca148b95af135a3..68878d03a9663cfc79e41a4207ce1d770c899a16 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,8 @@
 
 2003-08-04  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * input/* : postfix syntax fixes.
+
        * Documentation/user/refman.itely (Text markup): add note about
        raise/lower with ^ or _ .
        

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index 3c3b7271a61b8ee6801a9d37cc0e2287873a7bc8..37ad72e96223cabb831e5e5b8e5ff7291e5cfce9 100644 (file)
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -1,4 +1,4 @@
-q@c Note: -*-texinfo-*-
+@c Note: -*-texinfo-*-
 @c
 @c A menu is needed before every deeper *section nesting of @node's; run
 @c     M-x texinfo-all-menus-update

diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely
index 0070b0031969cda4e0f474cd47167314d3684c2d..4fe492a4f54544a0d88a0e5be4373596431dbb26 100644 (file)
--- a/Documentation/user/tutorial.itely
+++ b/Documentation/user/tutorial.itely
@@ -52,7 +52,6 @@ should then be able to create and print your first sheets of music.
 * Running LilyPond::            Printing music.
 * More about pitches and accidentals::  
 * Octave entry::                
-* Relative octave entry::       
 * Combining music into compound expressions::  
 * Adding articulation marks to notes::  
 * Combining notes into chords::  
@@ -481,6 +480,22 @@ typing, but the advantage is that transposing is easier. It also makes
 it possible to use different conventions for when to print
 accidentals.
 
+@cindex beams, by hand 
+Beams are drawn automatically, but if you do not like where they are
+put, they can be entered by hand. Mark the first note to be beamed
+with @code{[} and the last one with @code{]}:
+@quotation
+@lilypond[fragment,relative 1, verbatim]
+a8-[ ais-] d-[ es r d-]
+@end lilypond
+@end quotation
+@separate
+
+Rests are described in full detail in @ref{Rests}. 
+
+The notation manual discusses ties in @ref{Ties}.
+
+
 @node  Octave entry
 @section Octave entry
 
@@ -627,38 +642,7 @@ Here is an example of the difference between relative mode and
 
 
 
-@node  Relative octave entry
-@section Relative octave entry
 
-@c lousy example
-@c ? --hwn
-@c fragment of 1st hrn in Adams' The Chairman Dances, with creative
-@c chromatic thing pasted in front.  (admittedly the original does not
-@c have a phrasing slur. The problem is that we do not want the slur
-@c and the Phrasing slur to collide. We are trying to make a good
-@c impression here.
-
-@quotation
-@lilypond[fragment,relative 1, verbatim]
-a8-(-\( ais b  c-) cis2 b'2 a4 cis,  c-\)
-@end lilypond
-@end quotation
-@separate
-
-@cindex beams, by hand 
-Beams are drawn automatically, but if you do not like where they are
-put, they can be entered by hand. Mark the first note to be beamed
-with @code{[} and the last one with @code{]}:
-@quotation
-@lilypond[fragment,relative 1, verbatim]
-a8-[ ais-] d-[ es r d-]
-@end lilypond
-@end quotation
-@separate
-
-Rests are described in full detail in @ref{Rests}. 
-
-The notation manual discusses ties in @ref{Ties}.
 
 
 
@@ -867,6 +851,13 @@ If you need two slurs at the same time (one for articulation, one for
 phrasing), you can also make a phrasing slur with @code{\(} and
 @code{\)}.
 
+@quotation
+@lilypond[fragment,relative 1, verbatim]
+a8-(-\( ais b  c-) cis2 b'2 a4 cis,  c-\)
+@end lilypond
+@end quotation
+
+
 More information on fingering, articulation, slurs, phrasing slurs,
 and dynamics can be found in @ref{Fingering instructions},
 @ref{Articulations}, @ref{Slurs}, @ref{Phrasing slurs}, and @ref{Dynamics},

diff --git a/buildscripts/lilypond-profile.sh b/buildscripts/lilypond-profile.sh
index da6873afa91b74ae3f8e96402ba46a3d47ed21d9..ccfe245675bab41b9c749e0bc265459cb9091525 100644 (file)
--- a/buildscripts/lilypond-profile.sh
+++ b/buildscripts/lilypond-profile.sh
@@ -50,31 +50,38 @@ EXAMPLE 3: Global installation
 
 
 EOF
-    exit 2 
-fi
 
-if [ -z "$LILYPONDPREFIX" ]; then
-    datadir=`echo "@local_lilypond_datadir@" | sed 's!//!/!g'`
+
+## If the message above is printed erroneously,
+## the following commands  kills the current terminal/shell.
+## hence the ZSH  test above.
+
+    exit 2 
 else
-    if [ -d "$LILYPONDPREFIX/share" ]; then
-       datadir=$LILYPONDPREFIX/share/lilypond/
-    fi
-    echo "Setting tree to $datadir"
-fi
 
-# Add the installation directory to the teTeX system tree, 
-# see Documentation/misc/fontinstallation
-TEXMF="{$datadir,"`kpsexpand  \\$TEXMF`"}"
-export TEXMF
+       if [ -z "$LILYPONDPREFIX" ]; then
+           datadir=`echo "@local_lilypond_datadir@" | sed 's!//!/!g'`
+       else
+           if [ -d "$LILYPONDPREFIX/share" ]; then
+               datadir=$LILYPONDPREFIX/share/lilypond/
+           fi
+           echo "Setting tree to $datadir"
+       fi
 
-# For direct ps output: ps/lilyponddefs.ps
-## GS_LIB="$datadir/ps:"${GS_LIB:=""}
-## export GS_LIB
+       # Add the installation directory to the teTeX system tree, 
+       # see Documentation/misc/fontinstallation
+       TEXMF="{$datadir,"`kpsexpand  \\$TEXMF`"}"
+       export TEXMF
 
-# For direct ps output fonts. Add all available TeX Type1 fonts
-## GS_FONTPATH=`kpsewhich -expand-path=\\$T1FONTS`:${GS_FONTPATH:=""}
-## export GS_FONTPATH
+       # For direct ps output: ps/lilyponddefs.ps
+       ## GS_LIB="$datadir/ps:"${GS_LIB:=""}
+       ## export GS_LIB
 
+       # For direct ps output fonts. Add all available TeX Type1 fonts
+       ## GS_FONTPATH=`kpsewhich -expand-path=\\$T1FONTS`:${GS_FONTPATH:=""}
+       ## export GS_FONTPATH
+
+fi
        
 
 

diff --git a/input/mutopia/F.Schubert/standchen.ly b/input/mutopia/F.Schubert/standchen.ly
index 9aeeec55e46bd95f696c44ffbde38addf17d9e2e..6f8343515528be74eab9bcfedd2b791cc0932556 100644 (file)
--- a/input/mutopia/F.Schubert/standchen.ly
+++ b/input/mutopia/F.Schubert/standchen.ly
@@ -203,7 +203,7 @@ trebleThrough =  \notes \relative c'{
        [<<g, g'>>8.-\< <<g g'>>16 <<b b'>>8. <<b b'>>16-\>-\! <<d d'>>8. <<d d'>>16] |
 
        %% score has double slur on chord.
-       <<c c'>>4-( <<b c'>>-) \! r  
+       <<c c'>>4-( <<b c'>>-) r-\!
 
        <<g g'>>4. <<b b'>>8 [<<d' d, >>8.-> c16] |
        %65

diff --git a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly
index 59b583a1d2dad39114a1ce923cd3bfef6b96662e..23ef8f62b0abf5c8cd020b39b728455b771b6692 100644 (file)
--- a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly
+++ b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly
@@ -1,4 +1,4 @@
-#(ly:set-point-and-click 'line-column)
+% #(ly:set-point-and-click 'line-column)
 
 opus = "BWV 924"
 piece = "1"

diff --git a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly
index f05b0c01a5ac42b941899c26df0140b3be00dd61..221859bab247e208287635c1641e1843f71bb466 100644 (file)
--- a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly
+++ b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly
@@ -1,4 +1,4 @@
-#(ly:set-point-and-click 'line-column)
+% #(ly:set-point-and-click 'line-column)
 
 opus= "BWV 939"
 piece = "2"

diff --git a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly
index a3f0baf298e6650812151a23980984199744a900..c5f2d7924b69fc946378d230902abc88b8f529d8 100644 (file)
--- a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly
+++ b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly
@@ -1,4 +1,4 @@
-#(ly:set-point-and-click 'line-column)
+%#(ly:set-point-and-click 'line-column)
 
 opus= "BWV 999"
 piece = "3"

diff --git a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly
index 3b1e3eee9422dc49a8439937d8346545ea68c4d7..db4b1f57298a173e4fe11b85da744aec91f783d8 100644 (file)
--- a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly
+++ b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly
@@ -1,4 +1,4 @@
-#(ly:set-point-and-click 'line-column)
+%#(ly:set-point-and-click 'line-column)
 
 opus = "BWV 925"
 piece = "4"

diff --git a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly
index 0d9df3412818d49813e3ac16906812f177ec308d..a9caa3b00acbb8d38556d5c7d56b6dddc3c71885 100644 (file)
--- a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly
+++ b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly
@@ -1,4 +1,4 @@
-#(ly:set-point-and-click 'line-column)
+%#(ly:set-point-and-click 'line-column)
 
 piece = "5"
 opus = "BWV 926"

diff --git a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly
index e213f615136dd0074a55a0d221e68b74dec1aa28..ef03afda739bd1fb919f70a6f865c91c357ea110 100644 (file)
--- a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly
+++ b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly
@@ -1,4 +1,4 @@
-#(ly:set-point-and-click 'line-column)
+%#(ly:set-point-and-click 'line-column)
 
 opus = "BWV 940"
 piece = "6"

diff --git a/input/mutopia/R.Schumann/romanze-op28-2.ly b/input/mutopia/R.Schumann/romanze-op28-2.ly
index bad26f4374f179f8a3d4298eeebf2bceac617d7e..aa775b96dc02baba91da9cbc5583edc8e185ee90 100644 (file)
--- a/input/mutopia/R.Schumann/romanze-op28-2.ly
+++ b/input/mutopia/R.Schumann/romanze-op28-2.ly
@@ -41,7 +41,7 @@ righta = \notes \transpose c cis' {
       \large "Einfach ("
       \note #3 #0 #1
       \large " = 100)" }
-  a c -] \m  g,-[ \u c^3 -] \m  b,-[ \u c^2 b c-] \m  a,-[ \u )c^3-] | 
+  a c -] \m  g,-[ \u c^3 -] \m  b,-[ \u c^2 b c-] \m  a,-[ \u c^3-]-) | 
   \property Voice.TextScript \revert #'extra-offset
   \m  f,-[( \u c f c-] \m  g,-[ \u c^4-] \m  a,-[ \u c^2 a c8  c16-)-] | 
   \m  c16-[( \u f c' f-] \m  b,-[ \u f-] \m  d-[ \u f^3 d' f^2-] \m  c-[ \u  f-)^4-] |
@@ -110,9 +110,9 @@ rightb = \notes \transpose c cis' {
  e des b,\< des g e_3 ces_4 d_2 f^3 d cis d |
  \property Voice.PhrasingSlur \override #'extra-offset =  #'(0 . 3)
  \property Voice.PhrasingSlur \override #'beautiful = #42
- g\( fes des fes b g_3 \! es_1 ges_2 a^3 ges f_1 ges_2 |
+ g\( fes des fes b g_3 es_1-\! ges_2 a^3 ges f_1 ges_2 |
  r ges_2 b des_1 ges b,_2 des ges,^1 b, \d des,^1 \stemDown \transpose c' c { b,-[_1 as,] |
- g,8  b,16-[ g, e, cis,]  d,-\)_4 \< f, h, d_3 f_2 \! r16 }
+ g,8  b,16-[ g, e, cis,]  d,-\)_4 \< f, h, d_3 f_2  r16-\! }
  \property Voice.PhrasingSlur \revert #'extra-offset
  \property Voice.PhrasingSlur \revert #'beautiful
 
@@ -132,13 +132,13 @@ rightb = \notes \transpose c cis' {
   s2. s
  \u s4. \grace {f8(}  f4-) e8 |
  f g16_2 b_1 a_2 gis_1 c_2 h, c cis_1 d_2 b,_1 |
- \tieDown c4.~<<f, c  >>16-\< \tieBoth <<f h>>~ << f^3 h >>8-[-\> -\! << e b^2>> -\!] |
+ \tieDown c4.~<<f, c  >>16-\< \tieBoth <<f h>>~ << f^3 h >>8-[-\>-\! << e b^2>> -\!] |
  \translator Staff=mid
  \transpose c' c {
   a4^1( g8^1 b4 a8^2 |
   f8..^1 f32^1 g8^2  a8..-)   \slurUp <<f f'^3>>32-( <<g g'^4>>8 |
   <<a a'^5>>8..-) <<f f'^3>>32-( <<g g'^4>>8 <<a a'^5 >>4.-\>-) ~ |
-  a~ \! a^\fermata \bar "|."
+  a~ a-\!^\fermata \bar "|."
  }
 }
 

diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ly b/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ly
index 7ffe6dac44a9fffb84fe8b587e03c6bcc77ab331..0c08620e5bca7a545532a2182ad14183182abe4c 100644 (file)
--- a/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ly
+++ b/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ly
@@ -46,7 +46,7 @@ allegro =
        r2 r4  d8-[-(_\markup { \italic \bold "con espressione" } b-) ]
         a-[(  g-) d'(  b-)]  a-[(  g-) e'(  c-) ]
         b8-[(  a-)] a4 r4  a8-[ a]
-        a-[( \< b c \!cis\> ]  d4 \!  c-)
+        a-[( \< b c cis-\!-\> ]  d4  c-\!-)
         ais8-[( b-)] r8 \cresc b  b-[( c-)] r c
         cis-[ ( d-)] r4 r2
        \endcresc g,1-\f ~ g2 ~  g8-[ a16 b]  c-[( d-) e c]

diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ly b/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ly
index 9c947cd6d395fdb4b193870b5ab613d424918a5b..56849923f525971145df1695938591aace1accd0 100644 (file)
--- a/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ly
+++ b/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ly
@@ -29,7 +29,7 @@ romanze = \notes \relative c' {
        % 25
         c16-[ ( d c  d-)]  e-[ ( f e  f-)]  g-[( e-) c-. c-.]  f-[( d-) b-. b-.]
         c16-[-\p ( d c  d-)]  e-[ ( f e  f-)]  g-[( e-) c-. c-.]  f-[( d-) b-. b-.]
-        c8-[ \< c, c c]  c-[ c c \! c ]
+        c8-[ \< c, c c]  c-[ c c c-\!-]
        \mark "B"
        c1-\f
        R1*9
@@ -44,22 +44,22 @@ romanze = \notes \relative c' {
         c-[ ( e-) g g]  g-[( f e  d-)]
        c4(
        \grace { \longgrace e16 \endlonggrace }
-        d8.-[  c16-) \< ]  c8-[ c-.( c-. \!  c-)-.]
+        d8.-[  c16-) \< ]  c8-[ c-.( c-. c-)-.-]-\!
        \mark "C"
 
        %% this is a trick to get the sfp-s to align. 
        \property Voice.Hairpin \override #'transparent = ##t
-       des1\sfp \> \!
-       g,1\sfp  \> \!
-       c\sfp    \> \!
-       c,\sfp
+       des1\sfp \> 
+       g,1\sfp-\!  \> 
+       c\sfp -\!   \> 
+       c,\sfp-\!
        \property Voice.Hairpin \revert #'transparent 
        R1*3
        r8  c-[-\p c c] c2~
         c8-[ c' c c] c2~
-        c8-[ \< e( g f]  e-[ \! d \> c bes]
+        c8-[ \< e( g f]  e-[  d-\!-\> c bes]
        \mark "D"
-       \!  a4-) r r2
+       a4-\!-) r r2
        R1*3
        c4.-\p ( f8-) a,4 a |
         bes8-[ (c d bes-)] g4 r8 c,

diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly b/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly
index 4d3bcd6227487786fa7755ced7d306d638fd664d..d0bccea6efe692bf3e66f33f5fe7123076343d54 100644 (file)
--- a/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly
+++ b/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly
@@ -85,7 +85,7 @@ rondo = \notes        \relative c'
        g2.~
         g8-[ \> a g]  f-[ e d]
        < \rondotheme
-         { \! s8-\p } >
+         { s8-\!-\p } >
          
        R2.*12
        r4 r8 r4 c8
@@ -135,7 +135,7 @@ rondo = \notes      \relative c'
        
        % Edition breitkopf says a-flat (silly!)
         fis-[  g gis] 
-                 a-[ bes \! b]
+                 a-[ bes b-]-\!
 
        %% EB does the slur in the Rondo differently from the 1st adn 2nd time.
        %% why. Should check with MS.

diff --git a/input/regression/beam-cross-staff-slope.ly b/input/regression/beam-cross-staff-slope.ly
index 9af23bc953029983b180360418ef3e8dd18f7b01..a1d23f2ed3a86840292b18f0b9257a2f8af02822 100644 (file)
--- a/input/regression/beam-cross-staff-slope.ly
+++ b/input/regression/beam-cross-staff-slope.ly
@@ -9,7 +9,7 @@
     \relative c'' <
         {
            \stemDown
-            f16( \> d \! b \translator Staff = down \stemUp
+            f16( \> d b-\! \translator Staff = down \stemUp
             \clef treble g ~ << g e>>8-)
            
             e-[ \translator Staff = up

diff --git a/input/regression/beamed-chord.ly b/input/regression/beamed-chord.ly
index b441c08052b8e0952c3fb0ba1ebb1254e255f885..7d9bd54bee8c6cbb665f37d59e21d948968af7fa 100644 (file)
--- a/input/regression/beamed-chord.ly
+++ b/input/regression/beamed-chord.ly
@@ -15,6 +15,6 @@ texidoc = "Hairy case for beam, chord, and automatic knees."
     %\stemUp
     \clef alto
     \time 3/4
-    r8 <<d  bes >>-( ) bes' d <<e g, c, c,>>-> r |
+    r8 <<d  bes >>-( bes'-) d <<e g, c, c,>>-> r |
   }
 }

diff --git a/input/regression/dynamics-broken-hairpin.ly b/input/regression/dynamics-broken-hairpin.ly
index c8528989740271fa1ab5bbe8fadc9f1ec09601ae..fc30b64dc2cd86980d09b824946a699b8171075d 100644 (file)
--- a/input/regression/dynamics-broken-hairpin.ly
+++ b/input/regression/dynamics-broken-hairpin.ly
@@ -4,7 +4,7 @@ texidoc = "Broken crescendi should be open on one side."
 }
 
 \score { \notes \relative c'' { 
-    c1 \< \break \! c1  \> \break \! c1 
+    c1 \< \break c1-\!  \> \break c1-\!
   }
   \paper {
     linewidth = 4.\cm

diff --git a/input/regression/dynamics-glyphs.ly b/input/regression/dynamics-glyphs.ly
index 449b9c877ccc80a1701a139f9d670bdd468f28fb..396a1479fea02b56bff33122f98f35e2c3540e3d 100644 (file)
--- a/input/regression/dynamics-glyphs.ly
+++ b/input/regression/dynamics-glyphs.ly
@@ -12,9 +12,9 @@ closer to the note head (staccato, accent) are reckoned with.
                      e,-.-> -\f
                      e \rfz                  
                      c' -\mf
-                     c -\mp \> \!
-                     c \ppppp \< \!
-                     c \sfp
+                     c -\mp \> 
+                     c-\!-\ppppp \< 
+                     c-\sfp-\!
                      
 }
 }

diff --git a/input/regression/dynamics-line.ly b/input/regression/dynamics-line.ly
index 76141e4161545d7da51dfdc827fb3f192577fba4..937d321adc49f43ddef7a0d58d24125535a3b5aa 100644 (file)
--- a/input/regression/dynamics-line.ly
+++ b/input/regression/dynamics-line.ly
@@ -11,7 +11,7 @@ line. Isolated dynamics may be forced up or down.
 \score{
 \notes\relative c''{
 a1^\sfz
-a1-\fff\> \!c,,-\pp a'' a-\p
+a1-\fff\> c,,-\!-\pp a'' a-\p
 
 % We need this to test if we get two Dynamic line spanners
 a

diff --git a/input/regression/dynamics-unbound-hairpin.ly b/input/regression/dynamics-unbound-hairpin.ly
index ce6db9ec408fbfa4ca03d9ab46bfcd9daad6a0c8..6711927c620c861a709fcc39d90e2d1905d54f68 100644 (file)
--- a/input/regression/dynamics-unbound-hairpin.ly
+++ b/input/regression/dynamics-unbound-hairpin.ly
@@ -5,7 +5,7 @@ texidoc = "Crescendi may start off-notes. In that case, they should  not collaps
 }
 
 \score { \notes { \context  Voice { 
-  < f''1 { s4 s4 \< \! s4 \> \! s4 } >
+  < f''1 { s4 s4 \< s4-\! \> s4-\! } >
 }}
 
 \paper { raggedright = ##t}

diff --git a/input/regression/hairpin-ending.ly b/input/regression/hairpin-ending.ly
index 04312ce95addc8fd1e98298021eaafb0d2c3a15b..76a38860769998baf5675e432e85c042d43c0695 100644 (file)
--- a/input/regression/hairpin-ending.ly
+++ b/input/regression/hairpin-ending.ly
@@ -10,7 +10,7 @@ into them."
 
 
 \score {
-\notes \relative c'' { c4 \> c4 \! c4 c4_\ff \> c4 \! c4 -\p }
+\notes \relative c'' { c4 \> c4 c4-\! c4_\ff \> c4 c4-\!-\p }
 \paper { raggedright = ##t} 
 }
 

diff --git a/input/regression/lyrics-extender.ly b/input/regression/lyrics-extender.ly
index e00bcc7d4a370a909c1491135fc16d1f86fc0b5a..0c752769273a8b0b835ead86a87f6b305c414da9 100644 (file)
--- a/input/regression/lyrics-extender.ly
+++ b/input/regression/lyrics-extender.ly
@@ -10,7 +10,7 @@ Also shown: a trick to get an extender at the end of the staff.
 
 sopran = \notes \relative c'' {
 \time 3/4 a2.( | \break
-)g2 < g4 { s8 s8 } > |
+ g2-) < g4 { s8 s8 } > |
 }
 
 text = \lyrics {

diff --git a/input/regression/pc-mmrest.ly b/input/regression/pc-mmrest.ly
index 8350094b7f85bddf4d0e7030d24d4e82b9d2beec..7ee8857d622cb498fcb52c02eb64f179bac9c5a7 100644 (file)
--- a/input/regression/pc-mmrest.ly
+++ b/input/regression/pc-mmrest.ly
@@ -7,14 +7,14 @@ texidoc="Multi measure rests of second voice should not disappear."
 #(ly:set-point-and-click 'line-column)
 one = \notes\relative c'' {
 
-       f4 \!e-.-\f r2|
+       f4 e-\!-.-\f r2|
        R1|
        f2-\p-(es -)|
        d1\<|
        d1|
        d2 d2|
        d2 d2|
-       \!f1-\ff  |
+       f1-\!-\ff  |
        f1
 }
 

diff --git a/input/regression/text-spanner.ly b/input/regression/text-spanner.ly
index 9f1fafc13072f3ad474b315579f66d6ce10622a7..a8b14705af91c4a32a8d8941493bb4f3ae03cb45 100644 (file)
--- a/input/regression/text-spanner.ly
+++ b/input/regression/text-spanner.ly
@@ -8,7 +8,7 @@ texidoc= "Text spanners should not repeat start text when broken."
     \property Voice.crescendoText = #"cresc."
     \property Voice.crescendoSpanner = #'dashed-line
     c1\< c \break
-    c1 \!c \break
+    c1 c-\! \break
     }
   \paper {
     linewidth = 40*\staffspace

diff --git a/input/test/ac-extra-voice.ly b/input/test/ac-extra-voice.ly
index 221c609094353b09f1355afa6a8801a723f0025c..57fb8b01ee08253be1e06c511e1a27b0d3e2a2e8 100644 (file)
--- a/input/test/ac-extra-voice.ly
+++ b/input/test/ac-extra-voice.ly
@@ -18,7 +18,7 @@ global = \notes{
 melody = \notes\relative c''{
     r2 r r 
     r2 r r
-    r4 a'8-- \< a-- a-- a-- c-- \!b-- a--\> gis f \!e 
+    r4 a'8-- \< a-- a-- a-- c-- b-\!-- a--\> gis f e-\!
     es8 \grace b c r4 r2 r
 }
 

diff --git a/input/test/crescendi.ly b/input/test/crescendi.ly
index 0ade8db63353a7e71d87a824ce7a516c221747b1..26043b0d9390878e8fef6703e887461d0556acd5 100644 (file)
--- a/input/test/crescendi.ly
+++ b/input/test/crescendi.ly
@@ -5,12 +5,12 @@ LilyPond can print crescendi in a number of different ways.
 " }
 \score{
 \notes\relative c''{
-a1\fff\> \!a-\pp
-a\< \!a
+a1\fff\> a-\pp-\!
+a\< a-\!
 \property Voice.crescendoText = \markup { \italic \bold "cresc." }
 \property Voice.crescendoSpanner = #'dashed-line
-a-\mf\< a \!a 
-a\< \!a
+a-\mf\< a a-\! 
+a\< a-\!
 }
 \paper{
 raggedright = ##t

diff --git a/input/test/dynamic-extra.ly b/input/test/dynamic-extra.ly
index f108ed63d40462b0c1a8468d5b206b1b2a49e9e2..f5a7b5d78674c202ae4b20daac8f4c6dbb245209 100644 (file)
--- a/input/test/dynamic-extra.ly
+++ b/input/test/dynamic-extra.ly
@@ -10,9 +10,9 @@ piuf =        \markup {  \italic "pi\\`u" \dynamic "f" }
     \notes\relative c''{
        c-\piuf
        c
-       c2\< \! c2
+       c2\< c2-\!
        
-       c2\< \! c2
+       c2\< c2-\!
        }
 \paper{raggedright = ##t}
     }

diff --git a/lily/parser.yy b/lily/parser.yy
index e6ff2efba00e87bd036aa65d88dde6b0037a54bc..adfef0e213a6e785937dac96fb967ff097fd2dad 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -1670,12 +1670,6 @@ open_event:
                $$ = $1;
                dynamic_cast<Music *> ($$)->set_mus_property ("span-direction", gh_int2scm (STOP))
 ;
-               static int warn_count ;
-               if (warn_count < 10)
-                       {
-                       $$->origin ()->warning (_("Prefix articulations are deprecated. Use postfix notation instead."));
-                       warn_count ++;
-                       }
        }
        ;
 
@@ -1763,6 +1757,13 @@ pre_events:
                $$ = SCM_EOL;
        }
        | pre_events open_event {
+               static int warn_count ;
+               if (warn_count < 10)
+                       {
+                       $2->origin ()->warning (_("Prefix articulations are deprecated. Use postfix notation instead."));
+                       warn_count ++;
+                       }
+
                $$ = gh_cons ($2->self_scm(), $$);
                scm_gc_unprotect_object ($2->self_scm());
        }