Change predefines for arpeggio, sustain, and sostenuto; convert-ly on docs

diff --git a/Documentation/topdocs/AUTHORS.texi b/Documentation/topdocs/AUTHORS.texi
index 626f0664a1ac1da44e8d9fb065d3f39ea88d6ceb..421600532668b45ec56b2b269b900d93c2999274 100644 (file)
--- 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 6aae8623d7f8f1c8ecbde6876676ba6763a12369..c6b489a8275dd31ed661210df0e0f2ea7536f09f 100644 (file)
--- 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 551c56d91ae0a9424e8e8e5b8e98010b60b95d11..f202dd768771365f39bb1c89b57ff4821cea37b1 100644 (file)
--- 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 c97f26d0fa1ad67fd5655087ddac73e6af774850..0a1492a45a7c826e857c6f0dacc86033e526d342 100644 (file)
--- 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 a6a163e0ed9f2dba31161f1767835cd59c04f1b3..f8bf98c1a1ffcde8fda4bbca2c999153f50c7b57 100644 (file)
--- 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 5201600a75a7b23436d21b42a99e021fb4e3bc92..f903d84f3e14074bd9e324f2dc090c8e45506da6 100644 (file)
--- 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 e904d38b848f47e6b79f0b15b810f8382c15e9b8..a2c259904448241ed4c7b2332988121e7d58b83a 100644 (file)
--- 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 3f04aff558f9347e5836345dc8efe680debd80d3..60a3c76e5a025b4176500f785e6186e027ebc51a 100644 (file)
--- 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 5f4f3f03963ce2c4842eeaf817979bfb2760f832..8ee73dfc5655d9606df9e7da349007f3fdc68737 100644 (file)
--- 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 73d4d4757fa8cd95dce5130f15c0e58ffcff1e12..8f8170fc6824a135e1cf22acd8cb8be9a4abc8d6 100644 (file)
--- 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 1b0be8b213252aaaffb9f1f8b143d42edbabc6e0..70a2270598610e2e97ba461fd46131d367909a4d 100644 (file)
--- 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 828991d5ecc8d275df6cd2e62dcaf1bac73e8c7e..d4e95a8a275f4aef95f34884f0e0e36b5b554ce9 100644 (file)
--- 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 e4b2ca0d2ec9e53330acc88f53540b8e380cd8fe..baf361d15b82b3565f3a435774975ab9921ac004 100644 (file)
--- 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 e70f5b31b79750445a5582134d7005de36d8d538..2d2ad554d7c416f2ca7beabde67143663239940c 100644 (file)
--- 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 d9c12777e8de58c8c5ad2072024d1403ac144217..1192d1ea194b148e878489d94004bd2f7b85647e 100644 (file)
--- 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 8abed05d52980a6eaf60dc012c514000a855ae6c..f063b6b291a443bb4776434e0f546e95c898451e 100644 (file)
--- 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 11b8026132502181a77cb3da75b7aebf2c68c7cd..b1e9c3930179011189bdb02a4133bcbe6ed8577a 100644 (file)
--- 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 9113aff48c51b72056d60e9c99c1d5832e7f1b7b..20ad0c198d5eadca60243df6e51ea6670712aabf 100644 (file)
--- 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 8e13029798b9c4a06818717de5ea97d24a75ba75..5e03600b467975e3c883d8a79a3f9403cd58a948 100644 (file)
--- 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 c2ead94a5c0fa8eb4b613652569d3a9d2e7fb22f..afed901cc94e8b9bfdfac1ab7ff0a8617cf08ef9 100644 (file)
--- 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 67b4848678956eca4f5d1f2b20fba5a8decf62ea..d01ffccdb75648299b1650585451d3a0b276eecd 100644 (file)
--- 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 54dc1232d0d3bf057c1ef947fa2e185662a00afc..496a360c35853992e2bf03d8ea8ab24d3fcc50dc 100644 (file)
--- 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 635665df5b2906789dddcc9766703c9f65f2bede..4b0c523a71ec723dc59ede0f9822ece3bc57fa5d 100644 (file)
--- 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 250bd3792e1e86742e79b9fef233b26feea7a49a..0b1580c36a9259853117df831c22265920cf5197 100644 (file)
--- 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 e201364ff91ae9fc351a95c4df3ae10becca853b..f5a60dadd640410062430772f5a87e00bb88fc72 100644 (file)
--- 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 33395322b14f347e05950c60a089588b2175d3c7..351e723c65a77d6845499b878f906e760044aef1 100644 (file)
--- 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 9a147ef44ef3366e3082982588c32817e6355007..5ced0b1a84be807fd2a5497d12f7553ba9501cd3 100644 (file)
--- 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 1912f4f66238fad89d5560eac4bf3f20e27de8ce..1daccd6b6d0c8a54f52a735ed626b9c0a28756fc 100644 (file)
--- 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 0f83d5be042490b5130858366420d0b8f0e909cf..be66dd6f597bc69eb7d4587729f24b5ef80429e2 100644 (file)
--- 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 7aa0dd62645c3822d48e8f967d812f5b06ded703..0ac21745234cd1f2f1f2472e6b7f11060b7c3298 100644 (file)
--- 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 b1bb4a452b22f43ef752ea38f87f7ea5708f7d59..74c405235f6c0a2e294e26855fe5ae8e97f5df4c 100644 (file)
--- 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 c013f4b2f34d141c5b1b91fb149086cf5da80218..59c504fbde1f0a73e3bbb5d828d5f1c6fe24b84a 100644 (file)
--- 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 77fc6ca41de34822cd362271764f7c4f115223ee..45b7f6468dad74eecd0f66d043cf7f614f26cd34 100644 (file)
--- 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 668daf84f78e818a9747b17b9827ddeefbf8c6fc..b1b4a12f038f5b1fbfc9f3b736cebd8e72a8098e 100644 (file)
--- 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 18d8bbfdd898d43aab4904c5283a468101acb580..b1683d51c2398a9fca54262c4ef88707656f203c 100644 (file)
--- 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 cc47428b3734b433e7ff3fd43bc885225f77b6ff..69fe134d5acce9a892f578fc90e26b0c9589e41e 100644 (file)
--- 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 e33cbd5c742082f0ae569f2dec547d79dd57e5b6..8f2fe2983986d2f2aab1f9fb2b5006c997dc9e1f 100644 (file)
--- 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 99717e2f8db3aeb3320aa0b88930281a6e0db35d..408e3d86ba8b044e8fb9d6f398179ac5c1ebad6f 100644 (file)
--- 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 4f9bc4ba1f76b9a54ac57542f9e871be1aaffcc7..a754aaca31e7089f183e4f9159fb5d2903cd030f 100644 (file)
--- 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 3f75561f4a32ddaeb759d353e13390ad7b3dbbe9..4c867226ff4b2702545bf529a1efbae02b44aaba 100644 (file)
--- 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 73a41fb6528e19646a70ff4639e6c6e96e8ced27..4814415cb7bb65979767ad977cf3402393856b50 100644 (file)
--- 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 b5d90bcdd8bf5b86052f00702aabcd2d558ab25e..f15dacf8de5b2eea1a1f8ac18b25a35fb5ba15d2 100644 (file)
--- 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 6e5bc48b0e6fcfa1b8e03fb67133c59255100762..b67deb117af2e80c25791a3b846804651239b89f 100644 (file)
--- 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 5a4bbe0c6b9c674ba674972cd7530045aaa95c09..9703e8c9895485ac81739f7a36a2c874ae6ff23e 100644 (file)
--- 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"""))