From febfbdb5be097d1f594677e34ebb7c84f18883a9 Mon Sep 17 00:00:00 2001
From: Carl Sorensen <c_sorensen@byu.edu>
Date: Sat, 5 Jul 2008 10:44:26 -0600
Subject: [PATCH] Change predefines for arpeggio, sustain, and sostenuto;
convert-ly on docs
---
Documentation/topdocs/AUTHORS.texi | 2 +-
Documentation/user/ancient.itely | 2 +-
Documentation/user/changing-defaults.itely | 2 +-
Documentation/user/cheatsheet.itely | 2 +-
Documentation/user/chords.itely | 2 +-
Documentation/user/converters.itely | 2 +-
Documentation/user/dedication.itely | 2 +-
Documentation/user/editorial.itely | 2 +-
Documentation/user/expressive.itely | 70 +++++++--------
Documentation/user/fretted-strings.itely | 2 +-
Documentation/user/fundamental.itely | 2 +-
Documentation/user/input.itely | 2 +-
Documentation/user/install.itely | 2 +-
Documentation/user/introduction.itely | 2 +-
Documentation/user/keyboards.itely | 28 +++---
Documentation/user/lilypond-book.itely | 2 +-
Documentation/user/literature.itely | 2 +-
Documentation/user/notation-appendices.itely | 2 +-
Documentation/user/notation.itely | 2 +-
Documentation/user/percussion.itely | 2 +-
Documentation/user/pitches.itely | 2 +-
Documentation/user/preface.itely | 2 +-
.../user/programming-interface.itely | 2 +-
Documentation/user/repeats.itely | 2 +-
Documentation/user/rhythms.itely | 2 +-
Documentation/user/running.itely | 2 +-
Documentation/user/scheme-tutorial.itely | 2 +-
Documentation/user/setup.itely | 2 +-
Documentation/user/simultaneous.itely | 2 +-
Documentation/user/spacing.itely | 2 +-
Documentation/user/specialist.itely | 2 +-
Documentation/user/staff.itely | 2 +-
Documentation/user/templates.itely | 4 +-
Documentation/user/text.itely | 2 +-
Documentation/user/tutorial.itely | 2 +-
Documentation/user/tweaks.itely | 8 +-
Documentation/user/unfretted-strings.itely | 2 +-
Documentation/user/vocal.itely | 2 +-
Documentation/user/wind.itely | 2 +-
Documentation/user/working.itely | 2 +-
Documentation/user/world.itely | 2 +-
ly/property-init.ly | 9 +-
ly/spanners-init.ly | 20 ++---
python/convertrules.py | 90 +++++++++++++++++++
44 files changed, 198 insertions(+), 105 deletions(-)
diff --git a/Documentation/topdocs/AUTHORS.texi b/Documentation/topdocs/AUTHORS.texi
index 626f0664a1..4216005326 100644
--- a/Documentation/topdocs/AUTHORS.texi
+++ b/Documentation/topdocs/AUTHORS.texi
@@ -62,7 +62,7 @@ al-niente hairpins.
Gregorian chant notation), ambitus, clusters.
@item @email{nicolas.sceaux@@free.fr, Nicolas Sceaux},
Scheme macros, \markup syntax.
-@item @email{carldsorensen@@comcast.net, Carl Sorensen},
+@item @email{c_sorensen@@byu.edu, Carl Sorensen},
Fret diagrams.
@item @email{rune@@zedeler.dk, Rune Zedeler},
Auto-accidental code, zigzag glissandi, rest bugfixes, minimum
diff --git a/Documentation/user/ancient.itely b/Documentation/user/ancient.itely
index 6aae8623d7..c6b489a827 100644
--- a/Documentation/user/ancient.itely
+++ b/Documentation/user/ancient.itely
@@ -6,7 +6,7 @@
version that you are working on. See TRANSLATION for details.
@end ignore
-@c \version "2.11.38"
+@c \version "2.11.51"
@node Ancient notation
@section Ancient notation
diff --git a/Documentation/user/changing-defaults.itely b/Documentation/user/changing-defaults.itely
index 551c56d91a..f202dd7687 100644
--- a/Documentation/user/changing-defaults.itely
+++ b/Documentation/user/changing-defaults.itely
@@ -7,7 +7,7 @@
version that you are working on. See TRANSLATION for details.
@end ignore
-@c \version "2.11.38"
+@c \version "2.11.51"
@node Changing defaults
@chapter Changing defaults
diff --git a/Documentation/user/cheatsheet.itely b/Documentation/user/cheatsheet.itely
index c97f26d0fa..0a1492a45a 100644
--- a/Documentation/user/cheatsheet.itely
+++ b/Documentation/user/cheatsheet.itely
@@ -7,7 +7,7 @@
version that you are working on. See TRANSLATION for details.
@end ignore
-@c \version "2.11.38"
+@c \version "2.11.51"
@c TODO: add tablature.
diff --git a/Documentation/user/chords.itely b/Documentation/user/chords.itely
index a6a163e0ed..f8bf98c1a1 100644
--- a/Documentation/user/chords.itely
+++ b/Documentation/user/chords.itely
@@ -6,7 +6,7 @@
version that you are working on. See TRANSLATION for details.
@end ignore
-@c \version "2.11.38"
+@c \version "2.11.51"
@node Chord notation
diff --git a/Documentation/user/converters.itely b/Documentation/user/converters.itely
index 5201600a75..f903d84f3e 100644
--- a/Documentation/user/converters.itely
+++ b/Documentation/user/converters.itely
@@ -7,7 +7,7 @@
version that you are working on. See TRANSLATION for details.
@end ignore
-@c \version "2.11.38"
+@c \version "2.11.51"
@node Converting from other formats
@chapter Converting from other formats
diff --git a/Documentation/user/dedication.itely b/Documentation/user/dedication.itely
index e904d38b84..a2c2599044 100644
--- a/Documentation/user/dedication.itely
+++ b/Documentation/user/dedication.itely
@@ -7,7 +7,7 @@
version that you are working on. See TRANSLATION for details.
@end ignore
-@c \version "2.11.38"
+@c \version "2.11.51"
@quotation
We want to dedicate this program to all the friends that we
diff --git a/Documentation/user/editorial.itely b/Documentation/user/editorial.itely
index 3f04aff558..60a3c76e5a 100644
--- a/Documentation/user/editorial.itely
+++ b/Documentation/user/editorial.itely
@@ -6,7 +6,7 @@
version that you are working on. See TRANSLATION for details.
@end ignore
-@c \version "2.11.38"
+@c \version "2.11.51"
@node Editorial annotations
@section Editorial annotations
diff --git a/Documentation/user/expressive.itely b/Documentation/user/expressive.itely
index 5f4f3f0396..8ee73dfc56 100644
--- a/Documentation/user/expressive.itely
+++ b/Documentation/user/expressive.itely
@@ -6,7 +6,7 @@
version that you are working on. See TRANSLATION for details.
@end ignore
-@c \version "2.11.38"
+@c \version "2.11.51"
@node Expressive marks
@section Expressive marks
@@ -237,19 +237,19 @@ g1\espressivo
Crescendos and decrescendos can be engraved as textual markings
instead of hairpins. The built-in commands that enable these text
-modes are @code{\setTextCresc}, @code{\setTextDecresc},
-@code{\setTextDecr}, and @code{\setTextDim}. The corresponding
-@code{\setHairpinCresc}, @code{\setHairpinDim}, and
-@code{\setHairpinDecresc} commands will revert to hairpins again:
+modes are @code{\crescTextCresc}, @code{\dimTextDecresc},
+@code{\dimTextDecr}, and @code{\dimTextDim}. The corresponding
+@code{\crescHairpin}, @code{\setHairpinDim}, and
+@code{\dimHairpin} commands will revert to hairpins again:
@lilypond[verbatim,quote,relative=2]
c4\< d e f\!
e4\> d c b\!
-\setTextCresc
+\crescTextCresc
c4\< d e f\!
-\setTextDecresc
+\dimTextDecresc
e4\> d c b\!
-\setHairpinCresc
+\crescHairpin
c4\< d e f\!
@end lilypond
@@ -268,20 +268,20 @@ Vertical positioning of dynamics is handled by
@code{\dynamicDown},
@funindex \dynamicNeutral
@code{\dynamicNeutral},
-@funindex \setTextCresc
-@code{\setTextCresc},
-@funindex \setTextDim
-@code{\setTextDim},
-@funindex \setTextDecr
-@code{\setTextDecr},
-@funindex \setTextDecresc
-@code{\setTextDecresc},
-@funindex \setHairpinCresc
-@code{\setHairpinCresc},
+@funindex \crescTextCresc
+@code{\crescTextCresc},
+@funindex \dimTextDim
+@code{\dimTextDim},
+@funindex \dimTextDecr
+@code{\dimTextDecr},
+@funindex \dimTextDecresc
+@code{\dimTextDecresc},
+@funindex \crescHairpin
+@code{\crescHairpin},
@funindex \setHairpinDim
@code{\setHairpinDim},
-@funindex \setHairpinDecresc
-@code{\setHairpinDecresc}.
+@funindex \dimHairpin
+@code{\dimHairpin}.
@snippets
@@ -731,29 +731,29 @@ is denoted by appending @code{\arpeggio} to the chord construct:
@end lilypond
The direction of an arpeggio is indicated by adding an arrowhead
-to the wiggly line. The commands @code{\arpeggioUp} and
-@code{\arpeggioDown} are used for this task.
-@code{\arpeggioNeutral} reverts back to an arrow-less arpeggio:
+to the wiggly line. The commands @code{\arpeggioArrowUp} and
+@code{\arpeggioArrowDown} are used for this task.
+@code{\arpeggioNormal} reverts back to an arrow-less arpeggio:
@lilypond[verbatim,quote,relative=1]
-\arpeggioUp
+\arpeggioArrowUp
<c e g c>2\arpeggio
-\arpeggioDown
+\arpeggioArrowDown
<c e g c>2\arpeggio
-\arpeggioNeutral
+\arpeggioNormal
<c e g c>1\arpeggio
@end lilypond
The command @code{\arpeggioBracket} can be used to create a square
bracket on the left of a chord, indicating that the chord should
-@emph{not} be arpeggiated. @code{\arpeggioNeutral} reverts back
+@emph{not} be arpeggiated. @code{\arpeggioNormal} reverts back
to a regular arpeggio:
@lilypond[verbatim,quote,relative=1]
<c e g c>2
\arpeggioBracket
<c e g c>2\arpeggio
-\arpeggioNeutral
+\arpeggioNormal
<c e g c>1\arpeggio
@end lilypond
@@ -768,7 +768,7 @@ construct instead of a square bracket.
\override Arpeggio #'stencil = #ly:arpeggio::brew-chord-slur
\override Arpeggio #'X-extent = #ly:grob::stencil-width
<c e g c>2\arpeggio
-\arpeggioNeutral
+\arpeggioNormal
<c e g c>1\arpeggio
@end lilypond
@@ -779,12 +779,12 @@ information, see @ref{Ties}.
@funindex \arpeggio
@code{\arpeggio},
-@funindex \arpeggioUp
-@code{\arpeggioUp},
-@funindex \arpeggioDown
-@code{\arpeggioDown},
-@funindex \arpeggioNeutral
-@code{\arpeggioNeutral},
+@funindex \arpeggioArrowUp
+@code{\arpeggioArrowUp},
+@funindex \arpeggioArrowDown
+@code{\arpeggioArrowDown},
+@funindex \arpeggioNormal
+@code{\arpeggioNormal},
@funindex \arpeggioBracket
@code{\arpeggioBracket}.
diff --git a/Documentation/user/fretted-strings.itely b/Documentation/user/fretted-strings.itely
index 73d4d4757f..8f8170fc68 100644
--- a/Documentation/user/fretted-strings.itely
+++ b/Documentation/user/fretted-strings.itely
@@ -6,7 +6,7 @@
version that you are working on. See TRANSLATION for details.
@end ignore
-@c \version "2.11.38"
+@c \version "2.11.51"
@node Fretted string instruments
@section Fretted string instruments
diff --git a/Documentation/user/fundamental.itely b/Documentation/user/fundamental.itely
index 1b0be8b213..70a2270598 100644
--- a/Documentation/user/fundamental.itely
+++ b/Documentation/user/fundamental.itely
@@ -7,7 +7,7 @@
version that you are working on. See TRANSLATION for details.
@end ignore
-@c \version "2.11.38"
+@c \version "2.11.51"
@node Fundamental concepts
@chapter Fundamental concepts
diff --git a/Documentation/user/input.itely b/Documentation/user/input.itely
index 828991d5ec..d4e95a8a27 100644
--- a/Documentation/user/input.itely
+++ b/Documentation/user/input.itely
@@ -7,7 +7,7 @@
version that you are working on. See TRANSLATION for details.
@end ignore
-@c \version "2.11.38"
+@c \version "2.11.51"
@node Input syntax
@chapter Input syntax
diff --git a/Documentation/user/install.itely b/Documentation/user/install.itely
index e4b2ca0d2e..baf361d15b 100644
--- a/Documentation/user/install.itely
+++ b/Documentation/user/install.itely
@@ -7,7 +7,7 @@
version that you are working on. See TRANSLATION for details.
@end ignore
-@c \version "2.11.38"
+@c \version "2.11.51"
@ifclear INSTALL
@node Install
diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely
index e70f5b31b7..2d2ad554d7 100644
--- a/Documentation/user/introduction.itely
+++ b/Documentation/user/introduction.itely
@@ -7,7 +7,7 @@
version that you are working on. See TRANSLATION for details.
@end ignore
-@c \version "2.11.38"
+@c \version "2.11.51"
@node Introduction
@chapter Introduction
diff --git a/Documentation/user/keyboards.itely b/Documentation/user/keyboards.itely
index d9c12777e8..1192d1ea19 100644
--- a/Documentation/user/keyboards.itely
+++ b/Documentation/user/keyboards.itely
@@ -6,7 +6,7 @@
version that you are working on. See TRANSLATION for details.
@end ignore
-@c \version "2.11.38"
+@c \version "2.11.51"
@node Keyboard instruments
@section Keyboard instruments
@@ -363,10 +363,10 @@ piano.
@cindex sostenuto pedal
@cindex una corde
@cindex tre corde
-@funindex \sustainDown
-@funindex \sustainUp
-@funindex \sostenutoDown
-@funindex \sostenutoUp
+@funindex \sustainOn
+@funindex \sustainOff
+@funindex \sostenutoOn
+@funindex \sostenutoOff
@funindex \unaCorda
@funindex \treCorde
@@ -376,10 +376,10 @@ produced: @notation{sustain}, @notation{sostenuto}
Sustain pedals are also found on vibraphones and celestas.
@lilypond[quote,ragged-right,fragment,verbatim,relative=2]
-c4\sustainDown d e g
-<c, f a>1\sustainUp
-c4\sostenutoDown e g c,
-<bes d f>1\sostenutoUp
+c4\sustainOn d e g
+<c, f a>1\sustainOff
+c4\sostenutoOn e g c,
+<bes d f>1\sostenutoOff
c4\unaCorda d e g
<d fis a>1\treCorde
@end lilypond
@@ -389,13 +389,13 @@ The sustain pedal and the una corda pedal use the text style by default
while the sostenuto pedal uses mixed by default.
@lilypond[quote,ragged-right,fragment,verbatim,relative=2]
-c4\sustainDown g c2\sustainUp
+c4\sustainOn g c2\sustainOff
\set Staff.pedalSustainStyle = #'mixed
-c4\sustainDown g c d
-d\sustainUp\sustainDown g, c2\sustainUp
+c4\sustainOn g c d
+d\sustainOff\sustainOn g, c2\sustainOff
\set Staff.pedalSustainStyle = #'bracket
-c4\sustainDown g c d
-d\sustainUp\sustainDown g, c2
+c4\sustainOn g c d
+d\sustainOff\sustainOn g, c2
\bar "|."
@end lilypond
diff --git a/Documentation/user/lilypond-book.itely b/Documentation/user/lilypond-book.itely
index 8abed05d52..f063b6b291 100644
--- a/Documentation/user/lilypond-book.itely
+++ b/Documentation/user/lilypond-book.itely
@@ -7,7 +7,7 @@
version that you are working on. See TRANSLATION for details.
@end ignore
-@c \version "2.11.38"
+@c \version "2.11.51"
@c Note: keep this node named so that `info lilypond-book' brings you here.
@node LilyPond-book
diff --git a/Documentation/user/literature.itely b/Documentation/user/literature.itely
index 11b8026132..b1e9c39301 100644
--- a/Documentation/user/literature.itely
+++ b/Documentation/user/literature.itely
@@ -7,7 +7,7 @@
version that you are working on. See TRANSLATION for details.
@end ignore
-@c \version "2.11.38"
+@c \version "2.11.51"
@node Literature list
@appendix Literature list
diff --git a/Documentation/user/notation-appendices.itely b/Documentation/user/notation-appendices.itely
index 9113aff48c..20ad0c198d 100644
--- a/Documentation/user/notation-appendices.itely
+++ b/Documentation/user/notation-appendices.itely
@@ -7,7 +7,7 @@
version that you are working on. See TRANSLATION for details.
@end ignore
-@c \version "2.11.38"
+@c \version "2.11.51"
@node Notation manual tables
@appendix Notation manual tables
diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely
index 8e13029798..5e03600b46 100644
--- a/Documentation/user/notation.itely
+++ b/Documentation/user/notation.itely
@@ -6,7 +6,7 @@
version that you are working on. See TRANSLATION for details.
@end ignore
-@c \version "2.11.38"
+@c \version "2.11.51"
@node Musical notation
@chapter Musical notation
diff --git a/Documentation/user/percussion.itely b/Documentation/user/percussion.itely
index c2ead94a5c..afed901cc9 100644
--- a/Documentation/user/percussion.itely
+++ b/Documentation/user/percussion.itely
@@ -6,7 +6,7 @@
version that you are working on. See TRANSLATION for details.
@end ignore
-@c \version "2.11.38"
+@c \version "2.11.51"
@node Percussion
@section Percussion
diff --git a/Documentation/user/pitches.itely b/Documentation/user/pitches.itely
index 67b4848678..d01ffccdb7 100644
--- a/Documentation/user/pitches.itely
+++ b/Documentation/user/pitches.itely
@@ -6,7 +6,7 @@
version that you are working on. See TRANSLATION for details.
@end ignore
-@c \version "2.11.38"
+@c \version "2.11.51"
@node Pitches
diff --git a/Documentation/user/preface.itely b/Documentation/user/preface.itely
index 54dc1232d0..496a360c35 100644
--- a/Documentation/user/preface.itely
+++ b/Documentation/user/preface.itely
@@ -7,7 +7,7 @@
version that you are working on. See TRANSLATION for details.
@end ignore
-@c \version "2.11.38"
+@c \version "2.11.51"
@node Preface
@unnumbered Preface
diff --git a/Documentation/user/programming-interface.itely b/Documentation/user/programming-interface.itely
index 635665df5b..4b0c523a71 100644
--- a/Documentation/user/programming-interface.itely
+++ b/Documentation/user/programming-interface.itely
@@ -7,7 +7,7 @@
version that you are working on. See TRANSLATION for details.
@end ignore
-@c \version "2.11.38"
+@c \version "2.11.51"
@node Interfaces for programmers
@chapter Interfaces for programmers
diff --git a/Documentation/user/repeats.itely b/Documentation/user/repeats.itely
index 250bd3792e..0b1580c36a 100644
--- a/Documentation/user/repeats.itely
+++ b/Documentation/user/repeats.itely
@@ -6,7 +6,7 @@
version that you are working on. See TRANSLATION for details.
@end ignore
-@c \version "2.11.38"
+@c \version "2.11.51"
@node Repeats
@section Repeats
diff --git a/Documentation/user/rhythms.itely b/Documentation/user/rhythms.itely
index e201364ff9..f5a60dadd6 100644
--- a/Documentation/user/rhythms.itely
+++ b/Documentation/user/rhythms.itely
@@ -6,7 +6,7 @@
version that you are working on. See TRANSLATION for details.
@end ignore
-@c \version "2.11.38"
+@c \version "2.11.51"
@ignore
GDP TODO list
diff --git a/Documentation/user/running.itely b/Documentation/user/running.itely
index 33395322b1..351e723c65 100644
--- a/Documentation/user/running.itely
+++ b/Documentation/user/running.itely
@@ -7,7 +7,7 @@
version that you are working on. See TRANSLATION for details.
@end ignore
-@c \version "2.11.38"
+@c \version "2.11.51"
@node Running LilyPond
diff --git a/Documentation/user/scheme-tutorial.itely b/Documentation/user/scheme-tutorial.itely
index 9a147ef44e..5ced0b1a84 100644
--- a/Documentation/user/scheme-tutorial.itely
+++ b/Documentation/user/scheme-tutorial.itely
@@ -7,7 +7,7 @@
version that you are working on. See TRANSLATION for details.
@end ignore
-@c \version "2.11.38"
+@c \version "2.11.51"
@node Scheme tutorial
@appendix Scheme tutorial
diff --git a/Documentation/user/setup.itely b/Documentation/user/setup.itely
index 1912f4f662..1daccd6b6d 100644
--- a/Documentation/user/setup.itely
+++ b/Documentation/user/setup.itely
@@ -7,7 +7,7 @@
version that you are working on. See TRANSLATION for details.
@end ignore
-@c \version "2.11.38"
+@c \version "2.11.51"
@node Setup
@chapter Setup
diff --git a/Documentation/user/simultaneous.itely b/Documentation/user/simultaneous.itely
index 0f83d5be04..be66dd6f59 100644
--- a/Documentation/user/simultaneous.itely
+++ b/Documentation/user/simultaneous.itely
@@ -6,7 +6,7 @@
version that you are working on. See TRANSLATION for details.
@end ignore
-@c \version "2.11.38"
+@c \version "2.11.51"
@node Simultaneous notes
@section Simultaneous notes
diff --git a/Documentation/user/spacing.itely b/Documentation/user/spacing.itely
index 7aa0dd6264..0ac2174523 100644
--- a/Documentation/user/spacing.itely
+++ b/Documentation/user/spacing.itely
@@ -7,7 +7,7 @@
version that you are working on. See TRANSLATION for details.
@end ignore
-@c \version "2.11.38"
+@c \version "2.11.51"
@ignore
GDP TODO list
diff --git a/Documentation/user/specialist.itely b/Documentation/user/specialist.itely
index b1bb4a452b..74c405235f 100644
--- a/Documentation/user/specialist.itely
+++ b/Documentation/user/specialist.itely
@@ -6,7 +6,7 @@
version that you are working on. See TRANSLATION for details.
@end ignore
-@c \version "2.11.38"
+@c \version "2.11.51"
@node Specialist notation
@chapter Specialist notation
diff --git a/Documentation/user/staff.itely b/Documentation/user/staff.itely
index c013f4b2f3..59c504fbde 100644
--- a/Documentation/user/staff.itely
+++ b/Documentation/user/staff.itely
@@ -6,7 +6,7 @@
version that you are working on. See TRANSLATION for details.
@end ignore
-@c \version "2.11.38"
+@c \version "2.11.51"
@node Staff notation
@section Staff notation
diff --git a/Documentation/user/templates.itely b/Documentation/user/templates.itely
index 77fc6ca41d..45b7f6468d 100644
--- a/Documentation/user/templates.itely
+++ b/Documentation/user/templates.itely
@@ -7,7 +7,7 @@
version that you are working on. See TRANSLATION for details.
@end ignore
-@c \version "2.11.38"
+@c \version "2.11.51"
@node Templates
@appendix Templates
@@ -152,7 +152,7 @@ violin concerto as TchaikovskyPI, whereas perhaps you wish to print
@ The `line-width' is for \header.
@li lypond[quote,verbatim,ragged-right,line-width]
-\version "2.11.38"
+\version "2.11.51"
\header {
dedication = "dedication"
title = "Title"
diff --git a/Documentation/user/text.itely b/Documentation/user/text.itely
index 668daf84f7..b1b4a12f03 100644
--- a/Documentation/user/text.itely
+++ b/Documentation/user/text.itely
@@ -6,7 +6,7 @@
version that you are working on. See TRANSLATION for details.
@end ignore
-@c \version "2.11.38"
+@c \version "2.11.51"
@node Text
@section Text
diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely
index 18d8bbfdd8..b1683d51c2 100644
--- a/Documentation/user/tutorial.itely
+++ b/Documentation/user/tutorial.itely
@@ -7,7 +7,7 @@
version that you are working on. See TRANSLATION for details.
@end ignore
-@c \version "2.11.38"
+@c \version "2.11.51"
@ignore
Tutorial guidelines: (different from policy.txt!)
diff --git a/Documentation/user/tweaks.itely b/Documentation/user/tweaks.itely
index cc47428b37..69fe134d5a 100644
--- a/Documentation/user/tweaks.itely
+++ b/Documentation/user/tweaks.itely
@@ -7,7 +7,7 @@
version that you are working on. See TRANSLATION for details.
@end ignore
-@c \version "2.11.38"
+@c \version "2.11.51"
@node Tweaking output
@chapter Tweaking output
@@ -1543,9 +1543,9 @@ where it is not obvious.
@tab Up/Right
@tab Revert
@tab Effect
-@item @code{\arpeggioDown}
- @tab @code{\arpeggioUp}
- @tab @code{\arpeggioNeutral}
+@item @code{\arpeggioArrowDown}
+ @tab @code{\arpeggioArrowUp}
+ @tab @code{\arpeggioNormal}
@tab Arrow is at bottom, at top, or no arrow
@item @code{\dotsDown}
@tab @code{\dotsUp}
diff --git a/Documentation/user/unfretted-strings.itely b/Documentation/user/unfretted-strings.itely
index e33cbd5c74..8f2fe29839 100644
--- a/Documentation/user/unfretted-strings.itely
+++ b/Documentation/user/unfretted-strings.itely
@@ -6,7 +6,7 @@
version that you are working on. See TRANSLATION for details.
@end ignore
-@c \version "2.11.38"
+@c \version "2.11.51"
@node Unfretted string instruments
@section Unfretted string instruments
diff --git a/Documentation/user/vocal.itely b/Documentation/user/vocal.itely
index 99717e2f8d..408e3d86ba 100644
--- a/Documentation/user/vocal.itely
+++ b/Documentation/user/vocal.itely
@@ -6,7 +6,7 @@
version that you are working on. See TRANSLATION for details.
@end ignore
-@c \version "2.11.38"
+@c \version "2.11.51"
@node Vocal music
@section Vocal music
diff --git a/Documentation/user/wind.itely b/Documentation/user/wind.itely
index 4f9bc4ba1f..a754aaca31 100644
--- a/Documentation/user/wind.itely
+++ b/Documentation/user/wind.itely
@@ -6,7 +6,7 @@
version that you are working on. See TRANSLATION for details.
@end ignore
-@c \version "2.11.38"
+@c \version "2.11.51"
@node Wind instruments
@section Wind instruments
diff --git a/Documentation/user/working.itely b/Documentation/user/working.itely
index 3f75561f4a..4c867226ff 100644
--- a/Documentation/user/working.itely
+++ b/Documentation/user/working.itely
@@ -7,7 +7,7 @@
version that you are working on. See TRANSLATION for details.
@end ignore
-@c \version "2.11.38"
+@c \version "2.11.51"
@node Working on LilyPond projects
@chapter Working on LilyPond projects
diff --git a/Documentation/user/world.itely b/Documentation/user/world.itely
index 73a41fb652..4814415cb7 100644
--- a/Documentation/user/world.itely
+++ b/Documentation/user/world.itely
@@ -6,7 +6,7 @@
version that you are working on. See TRANSLATION for details.
@end ignore
-@c \version "2.11.38"
+@c \version "2.11.51"
@node World music
@section World music
diff --git a/ly/property-init.ly b/ly/property-init.ly
index b5d90bcdd8..f15dacf8de 100644
--- a/ly/property-init.ly
+++ b/ly/property-init.ly
@@ -235,21 +235,24 @@ defaultTimeSignature = {
arpeggio = #(make-music 'ArpeggioEvent)
-arpeggioUp = \sequential {
+arpeggioArrowUp = \sequential {
\revert Arpeggio #'stencil
\override Arpeggio #'arpeggio-direction = #UP
}
-arpeggioDown = \sequential {
+arpeggioArrowDown = \sequential {
\revert Arpeggio #'stencil
\override Arpeggio #'arpeggio-direction = #DOWN
}
-arpeggioNeutral = \sequential {
+arpeggioNormal = \sequential {
\revert Arpeggio #'stencil
\revert Arpeggio #'arpeggio-direction
}
arpeggioBracket = \sequential {
\override Arpeggio #'stencil = #ly:arpeggio::brew-chord-bracket
}
+arpeggioParenthesis = \sequential {
+ \override Arpeggio #'stencil = #ly:arpeggio::brew-chord-slur
+}
glissando = #(make-music 'GlissandoEvent)
diff --git a/ly/spanners-init.ly b/ly/spanners-init.ly
index 6e5bc48b0e..b67deb117a 100644
--- a/ly/spanners-init.ly
+++ b/ly/spanners-init.ly
@@ -49,36 +49,36 @@ endcresc = {
%%%%%%%%%%%%%%%%
-setTextCresc = {
+crescTextCresc = {
\set crescendoText = \markup { \italic "cresc." }
\set crescendoSpanner = #'text
\override DynamicTextSpanner #'style = #'dashed-line
}
-setTextDecresc = {
+dimTextDecresc = {
\set decrescendoText = \markup { \italic "decresc." }
\set decrescendoSpanner = #'text
\override DynamicTextSpanner #'style = #'dashed-line
}
-setTextDecr = {
+dimTextDecr = {
\set decrescendoText = \markup { \italic "decr." }
\set decrescendoSpanner = #'text
\override DynamicTextSpanner #'style = #'dashed-line
}
-setTextDim = {
+dimTextDim = {
\set decrescendoText = \markup { \italic "dim." }
\set decrescendoSpanner = #'text
\override DynamicTextSpanner #'style = #'dashed-line
}
-setHairpinCresc = {
+crescHairpin = {
\unset crescendoText
\unset crescendoSpanner
}
-setHairpinDecresc = {
+dimHairpin = {
\unset decrescendoText
\unset decrescendoSpanner
}
@@ -91,14 +91,14 @@ setHairpinDim = {
% better name sustainstart/stop?
-sustainUp = #(make-span-event 'SustainEvent STOP)
-sustainDown = #(make-span-event 'SustainEvent START)
+sustainOff = #(make-span-event 'SustainEvent STOP)
+sustainOn = #(make-span-event 'SustainEvent START)
unaCorda = #(make-span-event 'UnaCordaEvent START)
treCorde = #(make-span-event 'UnaCordaEvent STOP)
-sostenutoDown = #(make-span-event 'SostenutoEvent START)
-sostenutoUp = #(make-span-event 'SostenutoEvent STOP)
+sostenutoOn = #(make-span-event 'SostenutoEvent START)
+sostenutoOff = #(make-span-event 'SostenutoEvent STOP)
%crescpoco = \set crescendoText = "cresc. poco a poco"
%decresc = \set crescendoText = "decr."
diff --git a/python/convertrules.py b/python/convertrules.py
index 5a4bbe0c6b..9703e8c989 100644
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -3090,3 +3090,93 @@ def conv (str):
conversions.append (((2, 11, 50), conv, """Fret diagram properties moved to fret-diagram-details"""))
+
+def conv (str):
+ str = re.sub (r"arpeggioUp", r"arpeggioArrowUp", str)
+ return str
+
+conversions.append (((2, 11, 51), conv, """\\arpeggioUp -> \\arpeggioArrowUp"""))
+
+
+def conv (str):
+ str = re.sub (r"arpeggioDown", r"arpeggioArrowDown", str)
+ return str
+
+conversions.append (((2, 11, 51), conv, """\\arpeggioDown -> \\arpeggioArrowDown"""))
+
+
+def conv (str):
+ str = re.sub (r"arpeggioNeutral", r"arpeggioNormal", str)
+ return str
+
+conversions.append (((2, 11, 51), conv, """\\arpeggioNeutral -> \\arpeggioNormal"""))
+
+
+def conv (str):
+ str = re.sub (r"setTextCresc", r"crescTextCresc", str)
+ return str
+
+conversions.append (((2, 11, 51), conv, """\\setTextCresc -> \\crescTextCresc"""))
+
+
+def conv (str):
+ str = re.sub (r"setTextDecresc", r"dimTextDecresc", str)
+ return str
+
+conversions.append (((2, 11, 51), conv, """\\setTextDecresc -> \\dimTextDecresc"""))
+
+
+def conv (str):
+ str = re.sub (r"setTextDecr", r"dimTextDecr", str)
+ return str
+
+conversions.append (((2, 11, 51), conv, """\\setTextDecr -> \\dimTextDecr"""))
+
+
+def conv (str):
+ str = re.sub (r"setTextDim", r"dimTextDim", str)
+ return str
+
+conversions.append (((2, 11, 51), conv, """\\setTextDim -> \\dimTextDim"""))
+
+
+def conv (str):
+ str = re.sub (r"setHairpinCresc", r"crescHairpin", str)
+ return str
+
+conversions.append (((2, 11, 51), conv, """\\setHairpinCresc -> \\crescHairpin"""))
+
+
+def conv (str):
+ str = re.sub (r"setHairpinDecresc", r"dimHairpin", str)
+ return str
+
+conversions.append (((2, 11, 51), conv, """\\setHairpinDecresc -> \\dimHairpin"""))
+
+
+def conv (str):
+ str = re.sub (r"sustainUp", r"sustainOff", str)
+ return str
+
+conversions.append (((2, 11, 51), conv, """\\sustainUp -> \\sustainOff"""))
+
+
+def conv (str):
+ str = re.sub (r"sustainDown", r"sustainOn", str)
+ return str
+
+conversions.append (((2, 11, 51), conv, """\\sustainDown -> \\sustainOn"""))
+
+
+def conv (str):
+ str = re.sub (r"sostenutoDown", r"sostenutoOn", str)
+ return str
+
+conversions.append (((2, 11, 51), conv, """\\sostenutoDown -> \\sostenutoOn"""))
+
+
+def conv (str):
+ str = re.sub (r"sostenutoUp", r"sostenutoOff", str)
+ return str
+
+conversions.append (((2, 11, 51), conv, """\\sostenutoUp -> \\sostenutoOff"""))
--
2.39.5