* ly/property-init: new functions: \arpeggioUp, \arpeggioDown,

	\arpeggioBoth. redefine \arpeggioBracket.

	* Documentation/user/refman.itely: document new arpeggio
	functions.

	* scripts/convert-ly.py: add a rule for \arpeggioBracket.

	* input/regression/arpeggio-bracket.ly: apply convert-ly.

diff --git a/ChangeLog b/ChangeLog
index 2488308f4f221835b4f2a8ff5cf4b254ccf347aa..22e6b57690651520dcddd2a4bf67fe5694882ee6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2004-02-29  Heikki Junes <hjunes@cc.hut.fi>
+
+       * ly/property-init: new functions: \arpeggioUp, \arpeggioDown,
+       \arpeggioBoth. redefine \arpeggioBracket.
+
+       * Documentation/user/refman.itely: document new arpeggio
+       functions.
+
+       * scripts/convert-ly.py: add a rule for \arpeggioBracket.
+
+       * input/regression/arpeggio-bracket.ly: apply convert-ly.
+
 2004-02-29  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
        * Documentation/user/introduction.itely (Automated engraving):

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index de142b5d2e9fe60147ab1dd0a7572e391561922c..d1586f0059c0e0ef761b3a385c5492ecf06a0241 100644 (file)
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -3172,36 +3172,37 @@ in both staves, and set
 @end lilypond
 
 The direction of the arpeggio is sometimes denoted by adding an
-arrowhead to the wiggly line.  This can be typeset by setting
-@code{arpeggio-direction}:
+arrowhead to the wiggly line:
 
 @lilypond[fragment,relative,verbatim]
   \context Voice {
-     \override Arpeggio   #'arpeggio-direction = #1
+     \arpeggioUp
      <c e g c>\arpeggio
-     \override Arpeggio   #'arpeggio-direction = #-1
+     \arpeggioDown
      <c e g c>\arpeggio
   }
 @end lilypond
 
 A square bracket on the left indicates that the player should not
-arpeggiate the chord. To draw these brackets, set the
-@code{print-function} property of @code{Arpeggio} or
-@code{PianoStaff.Arpeggio} objects to @code{\arpeggioBracket}, and use
-@code{\arpeggio} statements within the chords as before:
+arpeggiate the chord:
 
 @lilypond[fragment,relative,verbatim]
-    \override PianoStaff.Arpeggio  
-        #'print-function = \arpeggioBracket
-       <c' e g c>\arpeggio
+     \arpeggioBracket
+    <c' e g c>\arpeggio
 @end lilypond
 
 @refcommands
 
-@cindex @code{\arpeggioBracket}
-@code{\arpeggioBracket}, 
 @cindex @code{\arpeggio}
-@code{\arpeggio}.
+@code{\arpeggio},
+@cindex @code{\arpeggioUp}
+@code{\arpeggioUp},
+@cindex @code{\arpeggioDown}
+@code{\arpeggioUp},
+@cindex @code{\arpeggioBoth}
+@code{\arpeggioBoth},
+@cindex @code{\arpeggioBracket}
+@code{\arpeggioBracket}.
 
 @seealso
 

diff --git a/VERSION b/VERSION
index 5b012867ef176b3e765a063beeb1d856d0bcfd92..861e691d256661983a3fd0c7be99cc3b9145ade7 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,5 +2,5 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=1
 PATCH_LEVEL=27
-MY_PATCH_LEVEL=hwn1
+MY_PATCH_LEVEL=hjj1
 

diff --git a/input/regression/arpeggio-bracket.ly b/input/regression/arpeggio-bracket.ly
index 1b1e2a6fa9c2ed03eddcbb7e96ecea09ae177693..0ceb81806683183a5b1b09ccb9c7787c25980519 100644 (file)
--- a/input/regression/arpeggio-bracket.ly
+++ b/input/regression/arpeggio-bracket.ly
@@ -1,6 +1,6 @@
 
 
-\version "2.1.26"
+\version "2.1.28"
 \header{
 texidoc="
 A square bracket on the left indicates that the player should not
@@ -10,7 +10,7 @@ arpeggiate the chord.
 
 \score{
      \notes\relative c''{
-        \override Staff.Arpeggio  #'print-function = \arpeggioBracket
+        \arpeggioBracket
         
         <fis,  d a >\arpeggio
         }

diff --git a/ly/property-init.ly b/ly/property-init.ly
index 6787beabc5ce3347a00ef2748069c95e0e946394..b48865dd8cde28d4d6c14e6155401c780e8cfbc9 100644 (file)
--- a/ly/property-init.ly
+++ b/ly/property-init.ly
@@ -131,8 +131,24 @@ turnOff = #(cons '() '())
 % of either Staff.Arpeggio or PianoStaff.Arpeggio, depending whether 
 % cross-staff brackets are desired. 
 
-arpeggioBracket = #Arpeggio::brew_chord_bracket
 arpeggio = #(make-music 'ArpeggioEvent)
+
+arpeggioUp = \sequential {
+  \revert Arpeggio  #'print-function
+  \override Arpeggio  #'arpeggio-direction = #1
+}
+arpeggioDown = \sequential {
+  \revert Arpeggio  #'print-function
+  \override Arpeggio  #'arpeggio-direction = #-1
+}
+arpeggioBoth = \sequential {
+  \revert Arpeggio  #'print-function
+  \revert Arpeggio  #'arpeggio-direction
+}
+arpeggioBracket = \sequential {
+  \override Arpeggio  #'print-function = #Arpeggio::brew_chord_bracket
+}
+
 glissando = #(make-music 'GlissandoEvent)
 
 fermataMarkup = \markup { \musicglyph #"scripts-ufermata" } 

diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index ac0fcc56fb764f27ffa33d0f38917b7bfa8dd548..7f85e0867a2f6724700cf289343446240442b05f 100644 (file)
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -1970,6 +1970,13 @@ def conv (str):
        return str
 
 conversions.append (((2,1,27), conv, """property transposing -> tuning"""))
+
+def conv (str):
+       str = re.sub (r"\\override\s+.*Arpeggio\s+#.print-function\s+=\s+\\arpeggioBracket", r"\\arpeggioBracket", str)
+       return str
+
+conversions.append (((2,1,28), conv, """new syntax for setting \\arpeggioBracket"""))
+
 ################################
 #      END OF CONVERSIONS      
 ################################