From: Joe Neeman Date: Wed, 31 Dec 2008 21:54:14 +0000 (+1100) Subject: Merge commit 'origin' into includes X-Git-Tag: release/2.12.2-1~32^2~17^2~12 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=bb91de5b7f8c4f753452730101c2422946067cc3;hp=17e898abae3983e28021b0988d2fdf88365261f8;p=lilypond.git Merge commit 'origin' into includes --- diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile index 2f99e82fd7..0e5fc0a5e2 100644 --- a/Documentation/GNUmakefile +++ b/Documentation/GNUmakefile @@ -42,6 +42,10 @@ po-update: all-translations-update: po-update translation-status $(foreach lang, $(LANGS), make ISOLANG=$(lang) skeleton-update snippet-update &&) true +ifneq ($(NO_COLOR),) +CHECK_TRANSLATION_FLAGS = --no-color +endif + ifneq ($(ISOLANG),) new-lang: @if (( $$(file -b $(ISOLANG)) == directory )) 2>/dev/null; \ @@ -60,10 +64,6 @@ new-lang: CHECKED_FILES = $(ISOLANG)/index.html.in $(shell find $(ISOLANG)/user/ -maxdepth 1 -name '*.*te??') -ifneq ($(NO_COLOR),) -CHECK_TRANSLATION_FLAGS = --no-color -endif - TELY_FILES = $(call src-wildcard,$(ISOLANG)/user/*.tely) skeleton-update: $(PYTHON) $(buildscript-dir)/texi-langutils.py -d $(outdir) -l $(ISOLANG) --skeleton $(TELY_FILES:$(ISOLANG)/user/%.tely=../user/%.tely) diff --git a/Documentation/TRANSLATION b/Documentation/TRANSLATION index 107c361ac1..4651e05d6d 100644 --- a/Documentation/TRANSLATION +++ b/Documentation/TRANSLATION @@ -47,6 +47,10 @@ The reader is supposed to be familiar with Git, for example by having experience from lilypond.org translation; see http://git.sv.gnu.org/gitweb/?p=lilypond.git;a=blob_plain;f=README;hb=web/master +If you do not have this experience, you may want to read the first two +chapters of Git User's Manual at +http://www.kernel.org/pub/software/scm/git/docs/user-manual.html + REQUIREMENTS @@ -116,9 +120,9 @@ Word counts (excluding lilypond snippets) are given for each file. 23 user/dedication.itely 423 user/macros.itexi 171 index.html.in -6420 po/lilypond-doc.pot (translate to po/.po) +6346 po/lilypond-doc.pot (translate to po/.po) --- ../lilypond-texi2html.init (section TRANSLATIONS) -13831 total +13757 total -2- Introduction and beginning of Application Usage 411 user/preface.itely @@ -131,44 +135,44 @@ Word counts (excluding lilypond snippets) are given for each file. -3- Learning manual 10318 user/fundamental.itely -- Fundamental concepts -14581 user/tweaks.itely -- Tweaking output +14647 user/tweaks.itely -- Tweaking output 3007 user/working.itely -- Working on LilyPond files 483 user/templates.itely -- Templates -28389 total +28455 total -4- Notation reference 695 user/lilypond.tely 91 user/notation.itely -- Musical notation -3086 user/pitches.itely +3123 user/pitches.itely 5013 user/rhythms.itely 1146 user/expressive.itely 555 user/repeats.itely 1455 user/simultaneous.itely -1635 user/staff.itely -906 user/editorial.itely +1701 user/staff.itely +895 user/editorial.itely 2286 user/text.itely 76 user/specialist.itely -- Specialist notation 2670 user/vocal.itely -1333 user/chords.itely +1464 user/chords.itely 702 user/piano.itely 810 user/percussion.itely 826 user/guitar.itely 66 user/strings.itely 242 user/bagpipes.itely -4486 user/ancient.itely +4487 user/ancient.itely 5805 user/input.itely -- Input syntax 2164 user/non-music.itely -- Non-musical notation -8444 user/spacing.itely -- Spacing issues -11291 user/changing-defaults.itely -- Changing defaults +8451 user/spacing.itely -- Spacing issues +11391 user/changing-defaults.itely -- Changing defaults 5202 user/programming-interface.itely -- Interfaces for programmers -1155 user/notation-appendices.itely -- Notation manual tables +1190 user/notation-appendices.itely -- Notation manual tables 250 user/cheatsheet.itely -- Cheat sheet -62390 total +62756 total -5- Application usage -3185 user/lilypond-book.itely -- LilyPond-book +3248 user/lilypond-book.itely -- LilyPond-book 1171 user/converters.itely -- Converting from other formats -4356 total +4419 total -6- Appendices whose translation is optional 310 user/literature.itely diff --git a/Documentation/de/translations.html.in b/Documentation/de/translations.html.in index c0576a308c..2425793235 100644 --- a/Documentation/de/translations.html.in +++ b/Documentation/de/translations.html.in @@ -1,4 +1,4 @@ -·

Zuletzt aktualisiert am·Tue Dec 9 09:40:49 UTC 2008 +·

Zuletzt aktualisiert am·Wed Dec 31 01:23:25 UTC 2008

Reinhold Kainhofer ja - teilweise + ja vor-GDP @@ -100,7 +100,7 @@ translations.template.html.in; DO NOT EDIT !--> vor-GDP - 4 Die Ausgabe verändern
(14581) + 4 Die Ausgabe verändern
(14647) Till Rettig ja @@ -174,11 +174,11 @@ translations.template.html.in; DO NOT EDIT !--> Till Rettig ja - teilweise + ja vor-GDP - 4 @command{lilypond-book}: Noten in den Text integrieren
(3185) + 4 @command{lilypond-book}: Noten in den Text integrieren
(3248) Reinhold Kainhofer Till Rettig ja @@ -217,11 +217,11 @@ translations.template.html.in; DO NOT EDIT !--> Till Rettig ja - ja + teilweise vor-GDP - 1.1 Tonhöhen
(3086) + 1.1 Tonhöhen
(3123) Till Rettig ja @@ -261,15 +261,15 @@ translations.template.html.in; DO NOT EDIT !--> vor-GDP - 1.6 Notation auf Systemen
(1635) + 1.6 Notation auf Systemen
(1701) Till Rettig ja - ja + teilweise vor-GDP - 1.7 Anmerkungen
(906) + 1.7 Anmerkungen
(895) Till Rettig ja @@ -281,7 +281,7 @@ translations.template.html.in; DO NOT EDIT !--> Till Rettig ja - teilweise + ja vor-GDP @@ -289,7 +289,7 @@ translations.template.html.in; DO NOT EDIT !--> Till Rettig ja - ja + teilweise vor-GDP @@ -301,7 +301,7 @@ translations.template.html.in; DO NOT EDIT !--> vor-GDP - 2.2 Tasteninstrumente und andere Instrumente mit mehreren Systemen
(725) + 2.2 Tasteninstrumente und andere Instrumente mit mehreren Systemen
(744) Till Rettig ja @@ -313,11 +313,11 @@ translations.template.html.in; DO NOT EDIT !--> Till Rettig ja - teilweise + ja vor-GDP - 2.4 Saiteninstrumente mit Bünden
(1759) + 2.4 Saiteninstrumente mit Bünden
(1850) Till Rettig ja @@ -341,47 +341,47 @@ translations.template.html.in; DO NOT EDIT !--> vor-GDP - 2.7 Notation von Akkorden
(1333) + 2.7 Notation von Akkorden
(1464) Till Rettig - teilweise (64 %) - teilweise + ja + ja vor-GDP - 2.8 Notation von alter Musik
(4486) + 2.8 Notation von alter Musik
(4487) Till Rettig teilweise (79 %) - teilweise + ja vor-GDP 2.9 Weltmusik
(1115) + Till Rettig - - nein - + ja + ja vor-GDP 3 Allgemeine Eingabe und Ausgabe
(5805) Till Rettig - teilweise (5 %) - teilweise + ja + ja vor-GDP - 4 Abstände
(8444) + 4 Abstände
(8451) Till Rettig teilweise (3 %) - teilweise + ja vor-GDP - 5 Standardeinstellungen verändern
(11291) + 5 Standardeinstellungen verändern
(11391) nein @@ -405,7 +405,7 @@ translations.template.html.in; DO NOT EDIT !--> vor-GDP - B Notationsübersicht
(1155) + B Notationsübersicht
(1190) Till Rettig ja @@ -417,7 +417,7 @@ translations.template.html.in; DO NOT EDIT !--> Till Rettig ja - teilweise + ja vor-GDP diff --git a/Documentation/de/user/ancient.itely b/Documentation/de/user/ancient.itely index bd0eca8b92..2192ad0467 100644 --- a/Documentation/de/user/ancient.itely +++ b/Documentation/de/user/ancient.itely @@ -1,13 +1,13 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*- @c This file is part of lilypond.tely @ignore - Translation of GIT committish: d0614c27e88dc7bd3993f3744a388749ba93b267 + Translation of GIT committish: 4770e4e71ebff6104cad46bd2d889c3ff6ba3875 When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @node Ancient notation diff --git a/Documentation/de/user/changing-defaults.itely b/Documentation/de/user/changing-defaults.itely index c2b6057d63..49a1315f70 100644 --- a/Documentation/de/user/changing-defaults.itely +++ b/Documentation/de/user/changing-defaults.itely @@ -1,7 +1,7 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*- @c This file is part of lilypond.tely @ignore - Translation of GIT committish: 4a527608c5ff2ce31e596495d00dce181dc1b9ea + Translation of GIT committish: 8405b88e6c1aac6c44e6064dd7b8b1674d6e7abd When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @@ -15,13 +15,11 @@ @menu -* Interpretation contexts:: -* Explaining the Internals Reference:: -* Modifying properties:: -* Useful concepts and properties:: -* Common properties:: -* Advanced tweaks:: -* Discussion of specific tweaks:: +* Interpretation contexts:: +* Explaining the Internals Reference:: +* Modifying properties:: +* Useful concepts and properties:: +* Advanced tweaks:: @end menu @node Interpretation contexts @@ -31,12 +29,12 @@ @menu -* Contexts explained:: -* Creating contexts:: -* Modifying context plug-ins:: -* Changing context default settings:: -* Defining new contexts:: -* Aligning contexts:: +* Contexts explained:: +* Creating contexts:: +* Modifying context plug-ins:: +* Changing context default settings:: +* Defining new contexts:: +* Aligning contexts:: @end menu @node Contexts explained @@ -46,10 +44,10 @@ @menu -* Score - the master of all contexts:: -* Top-level contexts - staff containers:: -* Intermediate-level contexts - staves:: -* Bottom-level contexts - voices:: +* Score - the master of all contexts:: +* Top-level contexts - staff containers:: +* Intermediate-level contexts - staves:: +* Bottom-level contexts - voices:: @end menu @node Score - the master of all contexts @@ -113,10 +111,10 @@ @menu -* Navigating the program reference:: -* Layout interfaces:: -* Determining the grob property:: -* Naming conventions:: +* Navigating the program reference:: +* Layout interfaces:: +* Determining the grob property:: +* Naming conventions:: @end menu @node Navigating the program reference @@ -150,11 +148,11 @@ @menu -* Overview of modifying properties:: -* The set command:: -* The override command:: -* set versus override:: -* The tweak command:: +* Overview of modifying properties:: +* The set command:: +* The override command:: +* The tweak command:: +* set versus override:: @end menu @node Overview of modifying properties @@ -175,14 +173,14 @@ @untranslated -@node set versus override -@subsection @code{\set} vs. @code{\override} +@node The tweak command +@subsection The @code{\tweak} command @untranslated -@node The tweak command -@subsection The @code{\tweak} command +@node set versus override +@subsection @code{\set} vs. @code{\override} @untranslated @@ -194,10 +192,14 @@ @menu -* Input modes:: -* Direction and placement:: -* Distances and measurements:: -* Spanners:: +* Input modes:: +* Direction and placement:: +* Distances and measurements:: +* Staff symbol properties:: +* Spanners:: +* Visibility of objects:: +* Line styles:: +* Rotating objects:: @end menu @node Input modes @@ -218,37 +220,32 @@ @untranslated -@node Spanners -@subsection Spanners +@node Staff symbol properties +@subsection Staff symbol properties @untranslated -@node Common properties -@section Common properties +@node Spanners +@subsection Spanners @untranslated -@menu -* Controlling visibility of objects:: -* Line styles:: -* Rotating objects:: -* Aligning objects:: -@end menu - -@node Controlling visibility of objects -@subsection Controlling visibility of objects +@unnumberedsubsubsec Using the @code{spanner-interface} +@unnumberedsubsubsec Using the @code{line-spanner-interface} +@node Visibility of objects +@subsection Visibility of objects @untranslated @menu -* Removing the stencil:: -* Making objects transparent:: -* Painting objects white:: -* Using break-visibility:: -* Special considerations:: +* Removing the stencil:: +* Making objects transparent:: +* Painting objects white:: +* Using break-visibility:: +* Special considerations:: @end menu @node Removing the stencil @@ -293,8 +290,19 @@ @untranslated -@node Aligning objects -@subsection Aligning objects +@menu +* Rotating layout objects:: +* Rotating markup:: +@end menu + +@node Rotating layout objects +@unnumberedsubsubsec Rotating layout objects + +@untranslated + + +@node Rotating markup +@unnumberedsubsubsec Rotating markup @untranslated @@ -306,48 +314,75 @@ @menu -* Vertical grouping of grobs:: -* Modifying ends of spanners:: -* Modifying stencils:: -* Modifying shapes:: +* Aligning objects:: +* Vertical grouping of grobs:: +* Modifying stencils:: +* Modifying shapes:: @end menu -@node Vertical grouping of grobs -@subsection Vertical grouping of grobs +@node Aligning objects +@subsection Aligning objects @untranslated -@node Modifying ends of spanners -@subsection Modifying ends of spanners +@menu +* Setting @code{X-offset} and @code{Y-offset} directly:: +* Using the @code{side-position-interface}:: +* Using the @code{self-alignment-interface}:: +* Using the @code{break-aligned-interface}:: +@end menu + +@node Setting @code{X-offset} and @code{Y-offset} directly +@unnumberedsubsubsec Setting @code{X-offset} and @code{Y-offset} directly @untranslated -@node Modifying stencils -@subsection Modifying stencils +@node Using the @code{side-position-interface} +@unnumberedsubsubsec Using the @code{side-position-interface} @untranslated -@node Modifying shapes -@subsection Modifying shapes +@node Using the @code{self-alignment-interface} +@unnumberedsubsubsec Using the @code{self-alignment-interface} + +@untranslated + + +@unnumberedsubsubsec Using the @code{aligned-on-parent} procedures +@unnumberedsubsubsec Using the @code{centered-on-parent} procedures +@node Using the @code{break-aligned-interface} +@unnumberedsubsubsec Using the @code{break-aligned-interface} + +@untranslated + + +@node Vertical grouping of grobs +@subsection Vertical grouping of grobs @untranslated -@node Discussion of specific tweaks -@section Discussion of specific tweaks +@node Modifying stencils +@subsection Modifying stencils + +@untranslated + + +@node Modifying shapes +@subsection Modifying shapes @untranslated @menu -* old Contexts explained:: +* Modifying ties and slurs:: @end menu -@node old Contexts explained -@subsection old Contexts explained +@node Modifying ties and slurs +@unnumberedsubsubsec Modifying ties and slurs @untranslated diff --git a/Documentation/de/user/cheatsheet.itely b/Documentation/de/user/cheatsheet.itely index 97a3453a93..0e16382a3c 100644 --- a/Documentation/de/user/cheatsheet.itely +++ b/Documentation/de/user/cheatsheet.itely @@ -1,13 +1,13 @@ @c -*- coding: utf-8; mode: texinfo; -*- @c This file is part of lilypond.tely @ignore - Translation of GIT committish: b54fc6953a8d70a3c51e8c3d0cbf9b3fe9652d78 + Translation of GIT committish: 2c00bdbfaf62dd90863331c4713e6b29e32c9322 When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @c TODO: add tablature. @@ -249,14 +249,14 @@ twinkle @item @code{\new Lyrics} -@tab Textausgabe +@tab Gesangtext @tab @lilypond[fragment] \new Lyrics \lyricmode { twinkle } @end lilypond @item @code{twin -- kle} -@tab Text-Trennstrich +@tab Gesangtext-Trennstrich @tab @lilypond[fragment,relative=2] \set Staff.implicitTimeSignatureVisibility = #all-invisible diff --git a/Documentation/de/user/chords.itely b/Documentation/de/user/chords.itely index ed3b6dc5c3..3b206bb7a4 100644 --- a/Documentation/de/user/chords.itely +++ b/Documentation/de/user/chords.itely @@ -1,18 +1,23 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*- @c This file is part of lilypond.tely @ignore - Translation of GIT committish: 19fc0f930f921ca2609e0e60aa26f9d980771b97 + Translation of GIT committish: 23342b5b9f69f3a82751052f79f3fede0bb40ded When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @node Chord notation @section Chord notation -@untranslated +@lilypondfile[quote]{chords-headword.ly} + +Akkorde können entweder als normale Noten oder im Akkordmodus +notiert werden; bei letztere Eingabemethode können unterschiedliche +europäische Akkordbezeichnungsstile eingesetzt werden. Akkordbzeichnungen +und Generalbass können auch angezeigt werden. @menu * Chord mode:: @@ -23,7 +28,12 @@ @node Chord mode @subsection Chord mode -@untranslated +@cindex Akkorde +@cindex chord-Akkorde + +Im Akkordmodus (engl. @qq{chord}) werden Akkorde anhand von einem +Symbol der erwünschten Akkordstruktur notiert, anstatt dass die +einzelnen Tonhöhen ausgeschrieben werden. @menu * Chord mode overview:: @@ -31,81 +41,257 @@ * Extended and altered chords:: @end menu -@c This material comes from 'Entering chord names' --FV + @node Chord mode overview @unnumberedsubsubsec Chord mode overview @cindex Akkordbezeichnungen +@cindex Akkordmodus -LilyPond bringt Unterstützung zur Ausgabe von Akkordsymbolen -mit. Akkorde können entweder mithilfe der musikalischen -Akkordeingabe (also @code{< ... >}) notiert werden, aber sie -können auch mit ihren Bezeichnungen direkt eingegeben werden. -Programmintern werden die Akkorde als eine Gruppe von Tonhöhen -dargestellt und können somit transponiert werden. +Akkorde können als simultane Noten eingegeben werden, wie gezeigt +in @ref{Chorded notes}. -@lilypond[quote,ragged-right,verbatim,ragged-right] -twoWays = \transpose c c' { - \chordmode { - c1 f:sus4 bes/f - } - - - -} +Akkorde können aber auch im Akkordmodus notiert werden. Das ist +ein Eingabemodus, der sich an Akkordstrukturen traditioneller +europäischer Musik und nicht an bestimmten einzelnen Tonhöhen +orientiert. Er bietet sich an, wenn man es gewohnt ist, Akkordsymbole +zur Beschreibung von Akkorden zu benutzen. Mehr Information zu +unterschiedlichen Eingabemethoden findet sich in @ref{Input modes}. + +@lilypond[verbatim,quote,ragged-right,relative=1] +\chordmode { c1 g a g c } +@end lilypond + +Akkorde, die im Akkordmodus eingegeben werden, sind musikalische +Elemente und können genauso wie Akkorde im Notenmodus +transponiert werden. + +Akkordmodus und Notenmodus können gemischt verwendet werden: -<< \new ChordNames \twoWays - \new Voice \twoWays >> +@lilypond[verbatim,quote,ragged-right,relative=1] +2 +\chordmode { c2 f } +2 +\chordmode { f2 g } @end lilypond -Dieses Beispiel zeigt auch, dass die Ausgaberoutinen für die -Akkordsymbole nicht besonders klug sind. Der letzte Akkord -(@code{f bes d}) wird nicht als Umkehrung erkannt. +@seealso +Glossar: +@rglos{chord}. + +Notationsreferenz: +@ref{Chorded notes}, +@ref{Input modes}. + +Schnipsel: +@rlsr{Chords} -Achtung: Die Dauer eines Akkordes muss außerhalb der -spitzen Klammern @code{<>} notiert werden. -@example -2 -@end example +@knownissues + +Wenn Akkord- und Notenmodus in linearer Musik abwechseln eingesetzt +werden und der Akkordmodus am Anfang steht, erstellt der +Notenmodus ein neues Notensyste: + +@lilypond[verbatim,quote,ragged-right,relative=1] +\chordmode { c2 f } +2 +@end lilypond + +@noindent +Um dieses Verhalten zu verhindert, muss der @code{Staff}-Kontext +explizit aufgerufen werden: + +@lilypond[verbatim,quote,ragged-right,relative=1] +\new Staff { + \chordmode { c2 f } + 2 +} +@end lilypond + -@c This material comes from 'Chords mode' --FV @node Common chords @unnumberedsubsubsec Common chords -@cindex Akkord-Modus +@cindex Dreiklänge +@cindex Septakkorde +@cindex Grundton eines Akkords +@cindex Akkordeigenschaften +@cindex Umkehrungen +@cindex Modifikatoren, Akkorde +@cindex Modi, in Akkorden +@cindex Akkordmodi -Im Akkord-Modus wird eine Anzahl von Tonhöhen (ein Akkord) -durch eine normale Notenbezeichnung notiert. Ein Akkord wird -mit seinem Grundton notiert, der einfach wie eine normale -Note geschrieben wird: +Ein Dreiklang wird +mit seinem Grundton mit einer möglichen Dauer dahinter notiert: -@lilypond[quote,ragged-right,fragment,verbatim] -\chordmode { es4. d8 c2 } +@lilypond[verbatim,quote,relative=1,ragged-right] +\chordmode { c2 f4 g } @end lilypond @noindent -Dieser Modus wird mit dem @code{\chordmode}-Befehl aktiviert. +Moll- übermäßige und verminderte Dreiklänge werden notiert, indem +@code{:} und ein Modifikator hinter der Dauer angegeben wird: -@cindex Akkord-Notation -@cindex Eingabe von Akkorden +@lilypond[verbatim,quote,ragged-right,relative=1] +\chordmode { c2:m f4:aug g:dim } +@end lilypond -Andere als die Grundakkorde können notiert werden, indem an -die Notenbezeichnung ein Doppelpunkt und eine Spezifizierung -(die auch aus einer Zahl bestehen kann) angefügt wird. +Septakkorde können erstellt werden: -@lilypond[quote,fragment,verbatim] -\chordmode { e1:m e1:7 e1:m7 } +@lilypond[quote,ragged-right,fragment,verbatim,relative=1] +\chordmode { c1:7 c:m7 c:maj7 c:dim7 c:aug7 } @end lilypond -@noindent -Die erste Zahl, die auf den Grundton folgt, wird als @qq{Art} +@funindex aug +@funindex dim +@funindex maj +@funindex m + +Diese Tabelle zeigt die Funktion der Modifikatoren von Dreiklängen +und Septakkorden. Die siebte Stufe wird standardmäßig als kleine +Septime realisiert, sodass der Dominantseptakkord die Grundform +des Septakkordes darstellt. Alle Alterationen sind relativ zur +Dominantsept. Eine vollständigere Tabelle findet sich in +@ref{Common chord modifiers}. + +@c @table @code +@multitable @columnfractions .2 .4 .3 + +@item +@b{Modifikator} +@tab +@b{Funktion} +@tab +@b{Beispiel} + +@item +Kein +@tab +Standard: erzeugt einen Durdreiklang. +@tab +@lilypond[line-width=4\cm, noragged-right] +\chordmode { + \override Staff.TimeSignature #'stencil = ##f + c1 +} +@end lilypond + +@item +m, m7 +@tab +Mollakkord: Dieser Modifikator erniedrigt die dritte Stufe. +@tab +@lilypond[line-width=4\cm, noragged-right] +\chordmode { + \override Staff.TimeSignature #'stencil = ##f + c1:m c:m7 +} +@end lilypond + + +@item +dim, dim7 +@tab +Verminderter Akkord: Dieser Modifikator erniedrigt die dritte, fünfte +und (wenn vorhanden) die siebte Stufe. +@tab +@lilypond[line-width=4\cm, noragged-right] +\chordmode { + \override Staff.TimeSignature #'stencil = ##f + c1:dim c:dim7 +} +@end lilypond + +@item +aug +@tab +Übermäßiger Akkord: Dieser Modifikator erhöht die fünfte Stufe. +@tab +@lilypond[line-width=4\cm, noragged-right] +\chordmode { + \override Staff.TimeSignature #'stencil = ##f + c1:aug +} +@end lilypond + +@item +maj, maj7 +@tab +Großer Septakkord: Dieser Modifikator fügt eine erhöhte siebe +Stufe hinzu. @code{7} nach dem @code{maj} ist optional. NICHT +benutzen, um einen Durdreiklang zu notieren. +@tab +@lilypond[line-width=4\cm, noragged-right] +\chordmode { + \override Staff.TimeSignature #'stencil = ##f + c1:maj c:maj7 +} +@end lilypond + +@end multitable + +@seealso +Notationsreferenz: +@ref{Common chord modifiers}, +@ref{Extended and altered chords}. + +Schnipsel: +@rlsr{Chords}. + +@knownissues + +Nur ein Qualitätsmodifikator sollte pro Akkord benutzt werden, meistens +für die höchste Stufe des Akkordes. Akkorde mit weiteren Qualitätsmodifikatoren +werden ohne Warnung oder Fehlermeldung gelesen, aber das Ergebnis ist +nicht vorhersagbar. Akkorde, die nicht mit einem einzigen +Qualitätsmodifikator erreicht werden können, sollten mit einzelnen +Tonhöhen alteriert werden, wie beschrieben in +@ref{Extended and altered chords}. + + +@node Extended and altered chords +@unnumberedsubsubsec Extended and altered chords + +@cindex erweiterte Akkorde +@cindex veränderte Akkorde + +Akkordstrukturen können im Akkordmodus beliebig komplex konstruiert +werden. Die Modifikatoren können benutzt werden, um den Akkord zu +erweitern, bestimmte Stufen hinzuzufügen oder zu entfernen, Stufen +zu erhöhen oder zu erniedrigen und Bassnoten hinzuzufügen bzw. +Umgkehrungen zu erzeugen. + +Die erste Zahl, die auf den Doppelpunkt folgt, wird als @qq{Bereich} des Akkordes interpretiert: Terzen werden auf dem Grundton -gestapelt, bis die angegebene Zahl (=Tonhöhe) erreicht ist. -Eine Ausnahme ist @code{c:13}, weil hier die 11 ausgelassen wird. +gestapelt, bis die angegebene Zahl (=Tonstufe) erreicht ist. +Die siebte Stufe, die zu einem Akkord hinzugefügt wird, ist die +kleine Septime, nicht die große. Wenn +der Bereich keine Terz ist (also etwa 6), dann werden Terzen bis +zur höchst möglichen Terz unter dem Bereich gestapelt, und der +Endton des Bereichs wird hinzugefügt. Der größtmögliche Wert ist +13. Jeder größere Werte wird als 13 interpretiert. + +@lilypond[quote,ragged-right,fragment,verbatim,relative=1] +\chordmode { + c1:2 c:3 c:4 c:5 + c1:6 c:7 c:8 c:9 + c1:10 c:11 c:12 c:13 + c1:14 +} +@end lilypond + +@noindent +Sowhohl @code{c:5} als auch @code{c} erzeugen einen D-Dur-Dreiklang. + +Da eine unveränderte 11 nicht gut klingt, wenn sie mit einer +unveränderten 13 zusammenklingt, wird die 11 von einem @code{:13}-Akkord +entfernt (es sei denn sie wird explizit verlangt). -@lilypond[quote,fragment,verbatim] -\chordmode { c:3 c:5 c:6 c:7 c:8 c:9 c:10 c:11 c:13 } +@lilypond[quote,ragged-right,fragment,verbatim,relative=1] +\chordmode { + c1:13 c:13.11 c:m13 +} @end lilypond @cindex Grundton eines Akkordes @@ -116,124 +302,138 @@ Eine Ausnahme ist @code{c:13}, weil hier die 11 ausgelassen wird. Kompliziertere Akkorde können auch konstruiert werden, indem einzelne Intervalle zu dem Grundton addiert werden. -Diese Additionen werden nach der ersten Zahl notiert und mit -Punkten voneinander getrennt. - -@lilypond[quote,verbatim,fragment] -\chordmode { c:5.6 c:3.7.8 c:3.6.13 } +Diese Additionen werden nach dem Bereich notiert und mit +Punkten voneinander getrennt. Die normale Septime, die zu +einem Akkord hinzugefügt wird, ist die kleine Septime, nicht +die große. + +@lilypond[quote,verbatim,fragment,relative=1] +\chordmode { + c1:5.6 c:3.7.8 c:3.6.13 +} @end lilypond @noindent -Einzelne Intervalle können mit @code{-} oder @code{+} vergrößert -oder verkleinert werden. +Hinzugefügte Stufen können beliebig groß sein: -@lilypond[quote,verbatim,fragment] -\chordmode { c:7+ c:5+.3- c:3-.5-.7- } +@lilypond[quote,verbatim,fragment,relative=1] +\chordmode { + c4:5.15 c:5.20 c:5.25 c:5.30 +} @end lilypond -@noindent -Zu entfernende Töne werden mit der gleichen Methode notiert, -allerdings mit einem Dach (@code{^}) vor der Sequenz, die -nicht erscheinen soll. Sie müssen nach den zu addierenden -Tönen notiert werden. +@cindex Akkordstufen, Veränderung +@cindex Akkordstufen, Alteration + +Einzelne Stufen können mit @code{-} oder @code{+} vergrößert +oder verkleinert werden. Um eine Stufe zu verändert, die automatisch +in den Akkord aufgenommen wurde, kann sie in veränderter Form +nach dem Bereich hinzugefügt werden. -@lilypond[quote,verbatim,fragment] -\chordmode { c^3 c:7^5 c:9^3.5 } +@lilypond[quote,verbatim,fragment,relative=1] +\chordmode { + c1:7+ c:5+.3- c:3-.5-.7- +} @end lilypond -Mit weiteren Endungen können Tonhöhen der Akkorde beeinflusst werden. -Folgende Endungen sind unterstützt: +@cindex Entfernen von Stufen in Akkorden +@cindex Akkorde, Entfernen von Tönen -@table @code -@item m -Der Moll-Akkord. Diese Endung erniedrigt die Terz (3) und die Septime (7), -wenn vorhanden. - -@item dim -Der verminderte Akkord. Diese Endung erniedrigt die Terz (3), Quinte (5) -und Septime (7), wenn vorhanden. - -@item aug -Der übermäßige Akkord. Diese Endung erhöht die Quinte (5). - -@item maj -Der große Sept-Akkord. Diese Endung erhöht die Septime (7), -wenn vorhanden. - -@item sus -Der Sekundakkord. Diese Endung entfernt die Terz (3) aus dem -Akkord. Schreiben Sie @code{2} oder @code{4} hinter die Endung, -um entweder die Sekunde (2) oder die Quarte (4) zum Akkord -hinzuzufügen. -@end table +@funindex ^ -Die Endungen können mit weiteren hinzugefügten Tönen kombiniert -werden. -@lilypond[quote,verbatim,fragment] - \chordmode { c:sus4 c:7sus4 c:dim7 c:m6 } +Zu entfernende Töne werden mit der gleichen Methode notiert, +allerdings mit einem Dach (@code{^}) vor der Sequenz, die +nicht erscheinen soll. Sie müssen nach den zu addierenden +Tönen notiert werden. Die einzelnen zu entfernenden Töne werden +mit Punkten getrennt. + +@lilypond[quote,verbatim,fragment,relative=1] +\chordmode { + c1^3 c:7^5 c:9^3 c:9^3.5 c:13.11^3.7 +} @end lilypond -@cindex Modi, in Akkorden -@cindex Akkordmodi -@funindex aug -@funindex dim -@funindex maj @funindex sus -@funindex m -Da der unveränderte elfte Ton in Verbindung mit einem unveränderten -13. Ton nicht gut klingt, wird die 11 in diesem Fall automatisch -entfernt (es sei denn, sie wird explizit gefordert). +Sekund- und Quartakkorde können mit dem Modifikator @code{sus} +notiert werden. Hiermit wird die dritte Stufe aus dem Akkord +entfernt. Mit einer anschließenden @code{2} wird die zweite, mit +einer @code{4} die vierte Stufe hinzugefügt. @code{sus} entspricht +@code{^3} und @code{sus4} ist gleich @code{.4^3}. @lilypond[quote,ragged-right,fragment,verbatim] -\chordmode { c:13 c:13.11 c:m13 } +\chordmode { + c1:sus c:sus2 c:sus4 c:5.4^3 +} @end lilypond +@cindex Umgekehrungen +@cindex Bassnote in Akkorden + @funindex / Eine Umkehrung (ein Ton des Akkordes wird unter den Grundton gesetzt) -sowie auch Bassnoten können mit dem Schrägstrich (@code{/}) markiert +sowie auch zusätzliche Bassnoten können mit dem Schrägstrich (@code{/}) markiert werden: -@lilypond[quote,ragged-right,fragment,verbatim] -\chordmode { c1 c/g c/f } +@lilypond[quote,ragged-right,fragment,verbatim, relative=2] +\chordmode { + c1 c/g c/f +} @end lilypond + @funindex /+ -Eine Bassnote kann hinzugefügt werden, anstatt dass sie aus dem Akkord -entnommen wird, indem noch ein Plus zwischen den Schrägstrich und -die Tonhöhe gesetzt wird: +Eine Bassnote, die zum Akkord hinzugehört, kann hinzugefügt werden, +anstatt dass sie aus dem Akkord entnommen wird, indem noch ein +Plus zwischen den Schrägstrich und die Tonhöhe gesetzt wird: @lilypond[quote,ragged-right,fragment,verbatim] -\chordmode { c1 c/+g c/+f } +\chordmode { + c1 c/g c/+g +} @end lilypond -Der Akkord-Modus funktioniert ähnlich wie der Liedtext-Modus -(@code{\lyricmode}) usw. Die meisten Befehle funktionieren weiter, -so können etwa @code{r} und @code{\skip} benutzt werden, -um Pausen und Zwischenräume einzufügen. Mit Eigenschaftsbefehlen -können verschiedene Einstellungen verändert werden. +Akkordmodifikatoren, die benutzt werden können, um eine große +Anzahl an Standardakkorden zu erzeugen, werden gezeigt in +@ref{Common chord modifiers}. + +@seealso +Notationsreferenz: +@ref{Common chord modifiers}. + +Schnipsel: +@rlsr{Chords} @knownissues -Jedes Intervall kann nur einmal in einem Akkord vorkommen. -Im folgenden Beispiel wird nur der erweiterte Akkord erstellt, -weil @code{5+} als letztes kommt. +Jede Stufe kann nur einmal in einem Akkord vorkommen. +Im folgenden Beispiel wird ein erweiterter Akkord erstellt, +weil @code{5+} zuletzt gelesen wird. @cindex Cluster @lilypond[quote,ragged-right,verbatim,fragment] -\chordmode { c:5.5-.5+ } +\chordmode { + c:5.5-.5+ +} @end lilypond -@node Extended and altered chords -@unnumberedsubsubsec Extended and altered chords +Nur die zweite Umkehrung kann erstellt werden, indem eine +Bassnote hinzugefügt wird. Die erste Umkehrung erfordert, dass +der Grundton des Akkordes geändert wird. + +@lilypond[quote,ragged-right,verbatim,fragment] +\chordmode { + c'1: c':/g e:6-3-^5 e:m6-^5 +} +@end lilypond -@untranslated @node Displaying chords @subsection Displaying chords -@untranslated +Akkorde können zusätzlich zur üblichen Notation als Töne auf +einem Notensystem auch mit einem Akkordsymbol gesetzt werden. @menu * Printing chord names:: @@ -243,151 +443,198 @@ weil @code{5+} als letztes kommt. @node Printing chord names @unnumberedsubsubsec Printing chord names +@funindex ChordNames + @cindex Akkordsymbole +@cindex Akkordbezeichnungen @cindex Ausgabe von Akkordbezeichnungen -@cindex Akkorde @cindex Symbole, Akkord- -Um Akkordsymbole anstelle der Noten zu setzen, muss der -@rinternals{ChordNames}-Kontext. Die Akkorde können entweder -mit der Notation aus dem vorigen Abschnitt oder direkt -mit der Akkordeingabe für Noten (@code{<} und @code{>}) -notiert werden. +Akkordsymbole anstelle der Noten werde im @code{ChordNames}-Kontext +notiert. -@lilypond[quote,verbatim,ragged-right] -harmonies = { - \chordmode {a1 b c} +@lilypond[verbatim,quote,relative=1,ragged-right] +\new ChordNames { + \chordmode { + c2 f4. g8 + } } -<< - \new ChordNames \harmonies - \new Staff \harmonies ->> @end lilypond -Sie können Akkordwiederholungen unterdrücken, so dass nur -bei einer Änderung des Akkordes ein Symbol ausgegeben wird. -Das aktuelle Symbol wird auch am Zeilenanfang wiederholt. -Das geschieht mit dem Befehl @code{\set chordChanges = ##t}. +Die Akkorde können entweder als simultane Noten oder unter Einsatz +des Akkordmodus (@code{chordmode}) notiert werden. Der angezeigte +Akkord ist der gleiche, es sei denn, Umgkehrungen oder zusätzliche +Basstöne werden notiert: -@lilypond[quote,verbatim,ragged-right] -harmonies = \chordmode { - c1:m c:m \break c:m c:m d -} +@lilypond[verbatim,quote,relative=1] << \new ChordNames { - \set chordChanges = ##t - \harmonies } - \new Staff \transpose c c' \harmonies + 2 + 1 + \chordmode { + c2 f:sus4 c1:/f + } + } + { + 2 + 1 + \chordmode { + c2 f:sus4 c1:/f + } + } >> @end lilypond -In den vorangegangenen Beispielen wurden alle Akkorde über dem -Notensystem mit den entsprechenden Noten ausgegeben. Das ist aber -nicht erforderlich. Akkorde können auch alleine gedruckt werden. -Dabei kann es nötig sein, @rinternals{Volta_engraver} und -@rinternals{Bar_engraver} einzufügen, damit Wiederholungen -angezeigt werden. +@funindex{\chords} -@lilypond[ragged-right,verbatim] -\new ChordNames \with { - \override BarLine #'bar-size = #4 - \consists Bar_engraver - \consists "Volta_engraver" -} -\chordmode { \repeat volta 2 { - f1:maj7 f:7 bes:7 - c:maj7 -} \alternative { - es e +@code{\chords @{ ... @}} ist eine Kurznotation für die Bezeichnung +@code{\new ChordNames @{ \chordmode @{ ... @} @}}. + +@lilypond[verbatim,quote,ragged-right, relative=1] +\chords { + c2 f4.:m g8:maj7 } +@end lilypond + +@lilypond[verbatim,quote,ragged-right, relative=1] +\new ChordNames { + \chordmode { + c2 f4.:m g8:maj7 + } } @end lilypond +@snippets + +@lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle] +{showing-chords-at-changes.ly} + +@c @lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle] +@c {adding-bar-lines-to-chordnames-context.ly} + +@lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle] +{simple-lead-sheet.ly} + + +@seealso +Glossar: +@rglos{chord}. + +Notationsreferenz: +@ref{Writing music in parallel}. + +Schnipsel: +@rlsr{Chords}. + +Referenz der Interna: +@rinternals{ChordNames}, +@rinternals{ChordName}, +@rinternals{Chord_name_engraver}, +@rinternals{Volta_engraver}, +@rinternals{Bar_engraver}. + +@knownissues + +Akkorde, die Umkehrungen oder zusätzliche Basstöne beinhalten, +werden nicht richtig bezeichnet, wenn sie im Notenmodus notiert +werden. + + + +@node Customizing chord names +@unnumberedsubsubsec Customizing chord names + +@cindex Anpassen von Akkordsymbolen +@cindex Akkordsymbole, anpassen + +Es gibt kein allein gültiges System zur Benennung von Akkorden. +Unterschiedliche Musiktraditionen benutzen unterschiedliche Bezeichnungen +für die gleichen Akkorde. Es gibt zusätzlich auch unterschiedliche +Symbole, die für den gleichen Akkord angezeigt werden können. Die +Bezeichnungen und dargestellten Symbole können angepasst werden. + Die Standardeinstellungen für die Symbole entsprechen den Konventionen im Jazz, wie sie von Klaus Ignatzek (siehe @ref{Literature list}). -vorgeschlagen wurden. Mit den folgenden Befehlen könne aber -Anpassungen vorgenommen werden: +vorgeschlagen wurden. Das Benennungssystem für die Akkorde kann +verändert werden, wie weiter unten gezeigt wird. Ein alternatives +Notationssystem für Jazzakkorde ist auch erhältlich. Die +Ignatzek und die alternative Jazznotation finden sich in der Tabelle in +@ref{Chord name chart}. + +@c TODO -- Change this so we don't have a non-verbatim example. +@c Make short example in docs, then move longer example to +@c appendix, where the length of the snippet won't matter. + +Zusätzlich zu den unterschiedlichen Bezeichnungssystemen werden +unterschiedliche Notenbezeichnungen für die Grundtöne. +Die vordefinierten Befehle @code{\germanChords}, +@code{\semiGermanChords}, @code{\italianChords} und @code{\frenchChords} +setzen diese Variablen. Die Auswirkungen werden im nächsten Beispiel +gezeigt. + +@lilypondfile[ragged-right]{chord-names-languages.ly} + +Wenn keine der definierten Einstellungen zum gewünschten Ergebnis +führt, kann die Anzeige des Akkordsymbols durch die folgenden +Eigenschaften verändert werden: @table @code -@funindex chordNameExceptions -@item chordNameExceptions -Das ist eine Liste, die alle Akkorde aufführt, die ungewöhnliche -Form haben. -Die Liste muss nach dem Schema -@example -@{ 1 \markup @{ \super "7" "wahh" @} @} -@end example -@noindent -gesetzt werden. - -Diese Liste in die @code{chordNameExceptions}-Funktion einzulesen -ist allerdings etwas kompliziert. Mit dem folgenden Code-Abschnitt -wird @code{chExceptionMusic} (aufeinander folgende -Noten) in eine Ausnahmeliste umgewandelt: -@example -(sequential-music-to-chord-exceptions chExceptionMusic #t) -@end example -Dann werden mit dem Code -@example -(append - (sequential-music-to-chord-exceptions chExceptionMusic #t) - ignatzekExceptions) -@end example -die neuen Ausnahmen zu den schon vorhandenen hinzugefügt, die in -der Datei @file{ly/@/chord@/-modifier@/-init@/.ly} definiert sind. - -@c Ein Beispiel für die Benutzung dieser Eigenschaft findet sich -@c auch in der Datei @lsr{chords,chord@/-name@/-exceptions@/.ly}. -@lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle] -{chord-name-exceptions.ly} +@funindex chordRootNamer -@cindex Ausnahmen, Akkordsymbole +@item chordRootNamer + +Das Akkordsymbol wird normalerweise als Buchstabe des Grundtons mit +optionaler Alteration dargestellt. Die Interpretation +einer Tonhöhe als Buchstabe wird von der @code{chordRootNamer}-Funktion +übernommen. Besondere Bezeichnungen, wie etwa im Deutschen H für +einen H-Dur-Akkord (und nicht @qq{B} wie im Englischen), können +durch Hinzufügen einer neuen Funktion zu dieser Eigenschaft +erstellt werden. @funindex majorSevenSymbol + @item majorSevenSymbol + Mit dieser Eigenschaft wird das Aussehen der Notation für die -große Septime (7) bestimmt. Vordefiniert sind die Optionen +große Septime (7) bestimmt. Vordefiniert sind die Optionen @code{whiteTriangleMarkup} und @code{blackTriangleMarkup}. -@c Siehe auch -@c @lsr{chords,chord@/-name@/-major7@/.ly} für ein Beispiel. + +@funindex chordNoteNamer + +@item chordNoteNamer + +Wenn das Akkordsymbol zusätzliche Tonhöhen enthält, die nicht den +Grundton darstellen (etwa eine zusätzliche Bassnote), wird diese +Funktion eingesetzt, um die zusätzliche Tonhöhe auszugeben. +In den Standardeinstellungen wird die Tonhöhe mit der +@code{chordRootNamer}-Funktion gesetzt. Die +@code{chordNoteNamer}-Eigenschaft hingegen kann dieses Verhalten +verändern und etwa den Basston etwa als Kleinbuchstaben darstellen. @funindex chordNameSeparator + @item chordNameSeparator + Verschiedene Teile eines Akkordsymboles werden normalerweise durch einen Schrägstrich markiert. Indem @code{chordNameSeparator} -ein anderer Wert zugewiesen wird, kann das Aussehen des Trenners -verändert werden, z. B.: -@lilypond[quote,ragged-right,fragment,verbatim] -\new ChordNames \chordmode { - c:7sus4 - \set chordNameSeparator - = \markup { \typewriter "|" } - c:7sus4 -} -@end lilypond +ein anderer Wert zugewiesen wird, kann ein beliebiges Zeichen für +den Trenner benutzt werden. -@funindex chordRootNamer -@item chordRootNamer -Der Grundton eines Akkordes wird normalerweise als Buchstabe mit -optionaler Erhöhung oder Erniedrigung dargestellt. Die Interpretation -einer Tonhöhe als Buchstabe wird von der @code{chordRootNamer}-Eigenschaft -übernommen. Besondere Bezeichnungen, wie etwa im Deutschen H für -einen H-Dur-Akkord (und nicht @qq{B} wie im Englischen), können -durch Hinzufügen einer neuen Funktion zu dieser Eigenschaft -erstellt werden. +@funindex chordNameExceptions -@funindex chordNoteNamer -@item chordNoteNamer -In den Standardeinstellungen wird ein einziger Buchstabe für einen -Akkord ausgegeben, nämlich sein Grundton, der von der -@code{chordRootNamer}-Eigenschaft bestimmt wird. Die -@code{chordNoteNamer}-Eigenschaft hingegen kann das Aussehen dieses -Buchstaben ändern, ihn etwa als Klein- und nicht als Großbuchstabe -darstellen. +@item chordNameExceptions + +Diese Funktion ist eine Liste mit Paaren. Das erste Objekt eines +Paares ist eine Anzahl von Tonhöhen, die die Stufen eines Akkordes +definieren. Das zweite Objekt ist eine Beschriftung, die nach +@code{chordRootNamer} ausgegeben wird, um das Akkordsymbol zu +erstellen. @funindex chordPrefixSpacer + @item chordPrefixSpacer + Das @qq{m} für Moll-Akkorde wird normalerweise direkt hinter dem Akkordbuchstaben gesetzt. Mit der Eigenschaft @code{chordPrefixSpacer} kann ein Abstand(halter) zwischen den Buchstaben und das @qq{m} @@ -396,63 +643,85 @@ Grundton erhöht oder erniedrigt ist. @end table -Die vordefinierten Befehle @code{\germanChords}, -@code{\semiGermanChords}, @code{\italianChords} und @code{\frenchChords} -benutzen diese Variablen. Die Auswirkungen werden im nächsten Beispiel -gezeigt. - -@lilypondfile[ragged-right]{chord-names-languages.ly} - -Zusätzlich sind zwei weitere Vorlagen: eine alternative Jazz-Notation -und eine systematische Notation, genannt Banter-Akkorde. Die -alternative Jazz-Notation findet sich auch in der Liste im -Abschnitt @ref{Chord name chart}. - -@c Wie diese Stile verwendet werden, -@c wird in der Datei -@c @lsr{chords,chord-names-jazz.ly} gezeigt. - -@cindex Banter -@cindex Jazz-Akkorde -@cindex Akkorde, Jazz - - @predefined +@funindex major seven symbols +@code{\whiteTriangleMarkup}, +@code{\blackTriangleMarkup}, @funindex \germanChords @code{\germanChords}, @funindex \semiGermanChords -@code{\semiGermanChords}. +@code{\semiGermanChords}, @funindex \italianChords -@code{\italianChords}. +@code{\italianChords}, @funindex \frenchChords @code{\frenchChords}. @endpredefined +@snippets + +@cindex Ausnahmen, Akkordsymbole +@lilypondfile[verbatim,lilyquote,texidoc,doctitle] +{chord-name-exceptions.ly} + +@c TODO - tweak snippet to use \blackTriangleMarkup as well +@lilypondfile[verbatim,lilyquote,texidoc,doctitle] +{chord-name-major7.ly} + +@lilypondfile[verbatim,lilyquote,texidoc,doctitle] +{adding-bar-lines-to-chordnames-context.ly} + +@lilypondfile[verbatim,lilyquote,texidoc,doctitle] +{volta-below-chords.ly} + +@lilypondfile[verbatim,lilyquote,texidoc,doctitle] +{changing-chord-separator.ly} + @seealso -Beispiele: -@rlsr{Chords}. +Notationsreferenz: +@ref{Chord name chart}, +@ref{Common chord modifiers}. + +Installierte Dateien: +@file{scm/@/chords@/-ignatzek@/.scm}, +@file{scm/@/chord@/-entry@/.scm}, +@file{ly/@/chord@/-modifier@/-init@/.ly}. -Init-Dateien: @file{scm/@/chords@/-ignatzek@/.scm} und -@file{scm/@/chord@/-entry@/.scm}. +Schnipsel: +@rlsr{Chords}. +@c Internals Reference: +@c @r internals{}. @knownissues -Akkordsymbole werden nur von den Tonhöhenbezeichnungen bestimmt. -Akkordumkehrungen sind nicht definiert, noch werden Bassnoten -hinzugefügt. Deshalb kann es zu seltsamen Akkord-Symbolen kommen, -wenn die Akkorde mit der @code{< ... >} Syntax notiert werden. +Akkordsymbole werden von den Tonhöhenbezeichnungen innerhalb des +Akkordes und der Information über die Akkordstruktur, die innerhalb +von @code{\chordmode} notiert wurde, bestimmt. Wenn der direkte +Notenmodus benutzt wird, stammen unerwünschte Bezeichnungen daher, +dass Umgkehrungen und zustätzliche Bassnoten nicht richtig +interpretiert werden. + +@lilypond[quote,ragged-right,verbatim] +myChords = \relative c' { + \chordmode { c1 c/g c/f } + 1 +} +<< + \new ChordNames { \myChords } + \new Staff { \myChords } +>> +@end lilypond + -@node Customizing chord names -@unnumberedsubsubsec Customizing chord names -@untranslated @node Figured bass @subsection Figured bass -@untranslated +@lilypondfile[quote]{figured-bass-headword.ly} + +Generalbassnotation kann dargestellt werden. @menu * Introduction to figured bass:: @@ -460,211 +729,383 @@ wenn die Akkorde mit der @code{< ... >} Syntax notiert werden. * Displaying figured bass:: @end menu -@c This material comes from 'Figured bass', needs redistribution by translator --FV + @node Introduction to figured bass @unnumberedsubsubsec Introduction to figured bass @cindex Basso continuo @cindex Generalbass @cindex Bezifferter Bass +@cindex Continuo, Generalbass @c TODO: musicological blurb about FB -LilyPond stellt Unterstützung für Generalbassnotation zur Verfügung. +LilyPond stellt Unterstützung für Generalbassnotation, auch als +Basso Continuo bezeichnet, zur Verfügung. @lilypond[quote,ragged-right,verbatim,fragment] << \new Voice { \clef bass dis4 c d ais g fis} - \new FiguredBass \figuremode { - < 6 >4 < 7\+ >8 < 6+ [_!] > - < 6 >4 <6 5 [3+] > - < _ >4 < 6 5/>4 + \new FiguredBass { + \figuremode { + < 6 >4 < 7\+ >8 < 6+ [_!] > + < 6 >4 <6 5 [3+] > + < _ >4 < 6 5/>4 + } } >> @end lilypond -Die Unterstützung besteht aus zwei Teilen: Es gibt einen Eingabe-Modus, -aktiviert durch den Befehl @code{\figuremode}, in dem Ziffern für den Bass -als Nummern eingegeben werden können, und einen Kontext - @rinternals{FiguredBass}, der dafür sorgt, dass die entsprechenden - @rinternals{BassFigure}-Objekte auch erstellt werden. +Die Unterstützung für Generalbass besteht aus zwei Teilen: Es gibt +einen Eingabe-Modus, aktiviert durch den Befehl @code{\figuremode}, +in dem Ziffern für den Bass als Nummern eingegeben werden können, +und einen Kontext @code{FiguredBass}, der dafür sorgt, dass die +entsprechenden @code{BassFigure}-Objekte auch erstellt werden. +Generalbass kann auch in einem @code{Staff}-Kontext dargestellt +werden. + +@code{\figures@{ ... @}} ist eine Kurznotation für +@code{\new FiguredBass @{ \figuremode @{ ... @} @}}. -Im Eingabemodus wird eine Gruppe von Bassziffern mit den Zeichen +Auch wenn die Unterstützung für Generalbass auf den ersten Blick +wie die Akkordunterstützung ausschauen mag, ist sie sehr viel +einfacher. @code{\figuremode} speichert einfach die Zahlen und der +@code{FiguredBass}-Kontext setzt sie in der Form, wie sie notiert +wurden. Sie werden nicht in Tonhöhen umgewandelt. + +@seealso +Glossar: +@rglos{figured bass}. + +Schnipsel: +@rlsr{Chords} + + +@node Entering figured bass +@unnumberedsubsubsec Entering figured bass + +@code{\figuremode} (Zahlenmodus) wird benutzt, um den Eingabemodus +auf den Zahlenmodus umzustellen. Mehr Information zu unterschiedlichen +Eingabemodi findet sich in @ref{Input modes}. + +Im Zahlenmodus wird eine Gruppe von Bassziffern mit den Zeichen @code{<} and @code{>} begrenzt. Die Dauer wird nach dem @code{>}-Zeichen eingegeben. -@example -<4 6> -@end example -@lilypond[quote,ragged-right,fragment] -\new FiguredBass -\figuremode { <4 6> } +@lilypond[verbatim,quote,ragged-right,fragment] +\new FiguredBass { + \figuremode { + <6 4>2 + } +} +@end lilypond + +Versetzungszeichen (inklusive Auflösungszeichen) können hinzugefügt +werden: + +@lilypond[verbatim,quote,ragged-right,fragment] +\figures { + <7! 6+ 4-> <5++> <3--> +} @end lilypond -Versetzungszeichen werden durch Anhängen von @code{-}, @code{!} und @code{+} -hinter die Nummern erreicht. Ein Pluszeichen wird mit dem Befehl @code{\+} -gesetzt, verminderte Quinten und Septimen mit @code{5/} und @code{7/}. +Übermäßige und verminderte Stufen können dargestellt werden: -@example -<4- 6+ 7!> <5++> <3--> <7/> r <6\+ 5/> -@end example -@lilypond[quote,ragged-right,fragment] -\figures { <4- 6+ 7!> <5++> <3--> <7/> r <6\+ 5/> } +@lilypond[verbatim,quote,ragged-right,fragment] +\figures { + <6\+ 5/> <7/> +} @end lilypond -Pausen können mit @code{_} notiert werden. Klammern werden mit @code{[} -und @code{]} gesetzt. Text kann auch eingefügt werden nach den Regeln im -Abschnitt @ref{Text markup commands}. +Ein Schrägstrich von links nach rechts (üblicherweise für erhöhte +Sexten benutzt) kann erstellt werden: -@example -< [4 6] 8 [_! 12] > < 5 \markup @{ \number 6 \super (1) @} > -@end example -@lilypond[quote,ragged-right,fragment] -\new FiguredBass -\figuremode { < [4 6] 8 [_! 12] > < 5 \markup{ \tiny \number 6 \super (1)} > } +@lilypond[verbatim,quote,ragged-right,fragment] +\figures { + <6> <6\\> +} @end lilypond -Es ist auch möglich, Vortsetzungslinien für wiederholte Ziffern zu benutzen. +Vertikaler Platz und Klammern können zu den Zahlen hinzugefügt +werden: + +@lilypond[verbatim,quote,ragged-right,fragment] +\figures { + <[12 _!] 8 [6 4]> +} +@end lilypond -@lilypond[verbatim,relative=1] +Beliebiger Text kann als Zahl notiert werden: + +@lilypond[verbatim,quote,ragged-right,fragment] +\figures { + <\markup { \tiny \number 6 \super (1) } 5> +} +@end lilypond + +Es ist auch möglich, Fortsetzungslinien für wiederholte Ziffern zu benutzen. + +@lilypond[verbatim,quote,ragged-right,fragment] << - \new Staff { + { \clef bass - c4 c c + e4 d c b, + e4 d c b, } \figures { - \set useBassFigureExtenders = ##t - <4 6> <3 6> <3 7> + \bassFigureExtendersOn + <6 4>4 <6 3> <7 3> <7 3> + \bassFigureExtendersOff + <6 4>4 <6 3> <7 3> <7 3> } >> @end lilypond @noindent -In diesem Fall werden wiederholte Ziffern immer durch eine Linie ersetzt. - -Der @code{FiguredBass}-Kontext kümmert sich nicht um die aktuelle Basslinie. -Als Konsequenz müssen eventuell zusätzliche Ziffern eingefügt werden, um -Linien unter alle Noten zu erhalten, und die Verwendung von @code{\!} -kann nötig werden, um zu lange Linien zu stoppen. +In diesem Fall werden wiederholte Ziffern immer durch eine Linie ersetzt, es sei denn, die Linie wird explizit beendet. -@lilypond[relative=1] +@lilypond[verbatim,quote,ragged-right,fragment] << - \new Voice \figures { - \set useBassFigureExtenders = ##t - <6 4->4. <6 4->16. <6 4->32 <5>8. r16 <6>8 <6\! 5-> + \bassFigureExtendersOn + <6 4>4 <6 4> <6\! 4\!> <6 4> } { \clef bass - f16. g32 f16. g32 f16. g32 f16. g32 f8. es16 d8 es + d4 d c c } >> @end lilypond -Bei der Benutzung von Linien werden gemeinsame Ziffern immer in die -gleiche vertikale Position gesetzt. Wenn dies nicht gewünscht ist, -können Pausen (@code{r}) eingefügt werden. Dadurch wird die vorangegangene -Positionierung aufgehoben. So kann man etwa - -@example - <4 6>8 r8 -@end example -@noindent -anstelle von -@example - <4 6>4 -@end example +Die folgende Tabelle zeigt die vorhandenen Zahlenmodifikatoren: + +@multitable @columnfractions .1 .5 .4 + +@item +@b{Modifier} +@tab +@b{Purpose} +@tab +@b{Example} + +@item ++, -, ! +@tab +Accidentals +@tab +@lilypond[line-width=4\cm] +\figures { + <7! 6+ 4-> <5++> <3--> +} +@end lilypond -@noindent -schreiben. +@item +\+, / +@tab +Augmented and diminished steps +@tab +@lilypond[line-width=4\cm] +\figures { + <6\+ 5/> <7/> +} +@end lilypond -Versetzungszeichen und Pluszeichen können vor oder nach den Ziffern stehen, -abhängig von den @code{figuredBassAlterationDirection}- und -@code{figuredBassPlusDirection}-Eigenschaften. +@item +\\ +@tab +Raised sixth step +@tab +@lilypond[line-width=4\cm] +\figures { + <6\\> +} +@end lilypond -@lilypond +@item +\! +@tab +End of continuation line +@tab +@lilypond[line-width=4\cm] +<< \figures { - <6\+> <5+> <6 4-> r - \set figuredBassAlterationDirection = #1 - <6\+> <5+> <6 4-> r - \set figuredBassPlusDirection = #1 - <6\+> <5+> <6 4-> r - \set figuredBassAlterationDirection = #-1 - <6\+> <5+> <6 4-> r + \bassFigureExtendersOn + <6 4> <6 4> <6\! 4\!> <6 4> } + { + \clef bass + d d c c + } +>> @end lilypond -Auch wenn die Unterstützung für bezifferten Bass anscheinend an die -Akkord-Notation erinnert, ist sie doch sehr viel einfacher. Der Modus -@code{\figuremode} speichert einfach die Ziffern und der -@rinternals{FiguredBass}-Kontext gibt sie so aus, wie sie notiert -werden. Es gibt also keine Umrechnung von Tonhöhen und die Notation -wird in der MIDI-Datei nicht umgesetzt. +@end multitable -Programmintern erstellt die Funktion einfache Textbeschriftung. Somit -sind alle Textbeschriftungsbefehle verfügbar, um die Formatierungen zu -verändern. So kann zum Beispiel die vertikale Position der Ziffern mit -@code{baseline-skip} gesetzt werden. +@predefined +@cindex Generalbass Fortsetzungslinie +@code{\bassFigureExtendersOn}, +@code{\bassFigureExtendersOff}. +@endpredefined -Bassziffern können auch direkt einem Notensystemkontext (@code{Staff}) -hinzugefügt werden. In diesem Fall wird ihre vertikale Position automatisch -bestimmt. -@lilypond[ragged-right,fragment,quote] +@snippets +@lilypondfile[verbatim,lilyquote,texidoc,doctitle] +{changing-the-positions-of-figured-bass-alterations.ly} + + +@seealso +Schnipsel: +@rlsr{Chords}. + +Referenz der Interna: +@rinternals{BassFigure}, +@rinternals{BassFigureAlignment}, +@rinternals{BassFigureLine}, +@rinternals{BassFigureBracket}, +@rinternals{BassFigureContinuation}, +@rinternals{FiguredBass}. + + + +@node Displaying figured bass +@unnumberedsubsubsec Displaying figured bass + +Generalbass kann mit dem @code{FiguredBass}-Kontext, aber auch in +den meisten anderen @code{Staff}-Kontexten dargestellt werden. + +Wenn die Ziffern im @code{FiguredBass}-Kontext dargestellt werden, +ist die vertikale Position der Ziffern unabhängig von den Noten +des paralellen Systems. + +@lilypond[verbatim,ragged-right,fragment,quote] << - \new Staff = someUniqueName \relative c'' { c4 c'8 r8 c,4 c' } + \new FiguredBass { + \figuremode { + <4>4 <10 6>8 s8 + <6 4>4 <6 4> + } + } +>> +@end lilypond - %% send to existing Staff. - \context Staff = someUniqueName - \figuremode { - <4>4 <6 10>8 s8 +In diesem Beispiel muss der @code{FiguredBass}-Kontext explizit +erstellt werden, damit kein zusätzliches (leeres) Notensystem +erstellt wird. + +Bassziffern können auch direkt einem Notensystemkontext (@code{Staff}) +hinzugefügt werden. In diesem Fall wird ihre vertikale Position automatisch +bestimmt. - \set Staff.useBassFigureExtenders = ##t - <4 6>4 <4 6> +@lilypond[verbatim,ragged-right,fragment,quote] +<< + \new Staff = myStaff + \figuremode { + <4>4 <10 6>8 s8 + <6 4>4 <6 4> + } + %% Put notes on same Staff as figures + \context Staff = myStaff + { + \clef bass + c4 c'8 r8 c4 c' } >> @end lilypond -@commonprop +Wenn Generalbass zu einem vorhandenen System hinzugefügt wird, ist +es möglich, die Ziffern über oder unter dem System anzuzeigen: -In der Standardeinstellung werden die Bassziffern über den Noten -ausgegeben. Um Ziffern unter den Noten zu erhalten, kann der -Befehl +@lilypond[verbatim,ragged-right,fragment,quote] +<< + \new Staff = myStaff + \figuremode { + <4>4 <10 6>8 s8 + \bassFigureStaffAlignmentDown + <6 4>4 <6 4> + } + %% Put notes on same Staff as figures + \context Staff = myStaff + { + \clef bass + c4 c'8 r8 c4 c' + } +>> +@end lilypond -@example -\override Staff.BassFigureAlignmentPositioning #'direction = #DOWN -@end example +Schnipsel: +@rlsr{Chords}. -@noindent -benutzt werden. +Referenz der Interna: +@rinternals{BassFigure}, +@rinternals{BassFigureAlignment}, +@rinternals{BassFigureLine}, +@rinternals{BassFigureBracket}, +@rinternals{BassFigureContinuation}, +@rinternals{FiguredBass}. @knownissues -Wenn Bassziffern über dem Notensystem mit Ergänzungslinien und -@code{implicitBassFigures} benutzt werden, kann es vorkommen, dass -die Linien vertauscht werden. Besonders kritisch wird es, wenn -mehrere Bassziffern sich überschneidende Linien haben. Um dieses -Problem zu vermeiden, sollte @code{stacking-dir} -im @code{BassFigureAlignment} benutzt werden. - - -@seealso -Programmreferenz: @rinternals{BassFigure}-, -@rinternals{BassFigureAlignment}-, @rinternals{BassFigureLine}-, -@rinternals{BassFigureBracket}- und -@rinternals{BassFigureContinuation}-Objekte und der -@rinternals{FiguredBass}-Kontext. +Um sicherzugehen, dass die Fortsetzungslinien funktionieren, sollte +der gleiche Rhythmus für die Bassfiguren und die eigentlichen +Noten der Bassstimme benutzt werden. +@lilypond[verbatim,ragged-right,fragment,quote] +<< + { + \clef bass + \repeat unfold 4 { f16. g32 } f8. es16 d8 es + } + \figures { + \bassFigureExtendersOn + % The extenders are correct here, with the same rhythm as the bass + \repeat unfold 4 { <6 4->16. <6 4->32 } + <5>8. r16 <6>8 <6\! 5-> + } +>> +<< + { + \clef bass + \repeat unfold 4 { f16. g32 } f8. es16 d8 es + } + \figures { + \bassFigureExtendersOn + % The extenders are incorrect here, even though the timing is the same + <6 4->4 <6 4->4 + <5>8. r16 <6>8 <6\! 5-> + } +>> +@end lilypond -@node Entering figured bass -@unnumberedsubsubsec Entering figured bass +Wenn Fortsetzungslinien eingesetzt werden, können aufeinander +folgende Bezifferungen mit der selben Zahl in einer anderen +Position dazu führen, dass sich die Reihenfolge der Zahlen +umkehrt. -@untranslated +@lilypond[verbatim,ragged-right,fragment,quote,relative=1] +<< + { fis4 g g, e' } + \figures { + \bassFigureExtendersOn + <6 5>4 <5\! 4> < 5 _!> <6> + } +>> +@end lilypond -@node Displaying figured bass -@unnumberedsubsubsec Displaying figured bass +Um dieses Problem zu umgehen, kann die Fortsetzungslinie nach der +Bezifferung, mit der die Linie beginnen soll, angeschaltet und +am Ende der Linie wieder ausgeschaltet werden. -@untranslated +@lilypond[verbatim,ragged-right,fragment,quote,relative=1] +<< + { fis4 g g, e' } + \figures { + <6 5>4 <5 4> + \bassFigureExtendersOn + < 5 _!>4 <6> + \bassFigureExtendersOff + } +>> +@end lilypond diff --git a/Documentation/de/user/converters.itely b/Documentation/de/user/converters.itely index c0d5f80e13..412a857026 100644 --- a/Documentation/de/user/converters.itely +++ b/Documentation/de/user/converters.itely @@ -7,7 +7,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @c Translators: Reinhold Kainhofer @c Translation checkers: Till Rettig diff --git a/Documentation/de/user/dedication.itely b/Documentation/de/user/dedication.itely index 7c2195613a..ce1f095de1 100644 --- a/Documentation/de/user/dedication.itely +++ b/Documentation/de/user/dedication.itely @@ -7,7 +7,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @quotation Wir wollen dieses Programm allen Freunden widmen, die wir diff --git a/Documentation/de/user/editorial.itely b/Documentation/de/user/editorial.itely index 2104437479..70ab0a586a 100644 --- a/Documentation/de/user/editorial.itely +++ b/Documentation/de/user/editorial.itely @@ -1,12 +1,12 @@ @c -*- coding: utf-8; mode: texinfo; -*- @ignore - Translation of GIT committish: 2c00bdbfaf62dd90863331c4713e6b29e32c9322 + Translation of GIT committish: 4770e4e71ebff6104cad46bd2d889c3ff6ba3875 When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @node Editorial annotations @section Editorial annotations @@ -120,12 +120,6 @@ Die @code{font-size}-Eigenschaft kann nur für die Layoutobjekte gesetzt werden, die Schrift-Dateien benutzen. Das sind die, welche die @code{font-interface}-Layoutschnittstelle unterstützen. -@funindex \huge -@funindex \teeny -@funindex \small -@funindex \tiny -@funindex \normalsize -@funindex \large @predefined @code{\teeny}, @@ -440,6 +434,9 @@ gemacht. @funindex \stemNeutral @funindex \stemUp @funindex \stemDown +@funindex stemNeutral +@funindex stemUp +@funindex stemDown @predefined @code{\stemUp} (Hälse nach oben), @@ -500,6 +497,11 @@ außerhalb des Systems hervorhebt. @funindex Balloon_engraver @funindex balloonGrobText @funindex balloonText +@funindex balloonLengthOn +@funindex balloonLengthOff +@funindex \balloonLengthOn +@funindex \balloonLengthOff + Notationselemente können bezeichnet und markiert werden, indem um sie eine rechteckige Blase gezeichnet wird. Dies ist vor allem dazu da, Notation @@ -539,10 +541,6 @@ aber das kann geändert werden. } @end lilypond -@funindex balloonLengthOn -@funindex balloonLengthOff -@funindex \balloonLengthOn -@funindex \balloonLengthOff @predefined @code{\balloonLengthOn}, diff --git a/Documentation/de/user/expressive.itely b/Documentation/de/user/expressive.itely index c1fe74d2c8..d23147517c 100644 --- a/Documentation/de/user/expressive.itely +++ b/Documentation/de/user/expressive.itely @@ -6,7 +6,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @node Expressive marks @section Expressive marks diff --git a/Documentation/de/user/fretted-strings.itely b/Documentation/de/user/fretted-strings.itely index 03311ea9b5..7e5f6b464b 100644 --- a/Documentation/de/user/fretted-strings.itely +++ b/Documentation/de/user/fretted-strings.itely @@ -1,13 +1,13 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*- @c This file is part of lilypond.tely @ignore - Translation of GIT committish: 2c00bdbfaf62dd90863331c4713e6b29e32c9322 + Translation of GIT committish: 23342b5b9f69f3a82751052f79f3fede0bb40ded When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.65" +@c \version "2.12.0" @node Fretted string instruments @section Fretted string instruments @@ -614,13 +614,17 @@ dass im Bunddiagramm gesetzt werden soll. @end lilypond Fingersatz und Barre kann im ausführlichen Modus notiert werden. +Nur im ausführlichen Modus kann ein Capo angezeigt werden, das auf +dem Bunddiagramm plaziert wird. Die Capo-Anzeige ist ein dicker +Strich, der alle Saiten bedeckt. Der Bund mit dem Capo ist der +unterste Bund im Diagramm. @c \override is necessary to make fingering visible @lilypond[quote, verbatim] << \context ChordNames { \chordmode { - f1 g + f1 g c } } \context Staff { @@ -647,7 +651,15 @@ Fingersatz und Barre kann im ausführlichen Modus notiert werden. (open 2) (place-fret 1 3 3) ) - } + < c e g c' e'> ^\markup + \fret-diagram-verbose #'( + (capo 3) + (mute 6) + (place-fret 4 5 1) + (place-fret 3 5 2) + (place-fret 2 5 3) + ) + } >> @end lilypond @@ -853,8 +865,9 @@ mychords = \chordmode{ Bunddiagramme können zu der Tabelle hinzugefügt werden. Um ein Diagramm hinzuzufügen, muss der Akkord des Diagramms, die Stimmung -und die Diagramm-Definition im @code{fret-diagram-terse}-Modus -definiert werden. +und die Diagramm-Definition angegeben werden. Die Diagramm-Definition +kann entweder eine @code{fret-diagram-terse}-Definition oder eine +@code{fret-diagram-verbose}-Liste sein. @lilypond[verbatim, ragged-right, quote] \include "predefined-guitar-fretboards.ly" @@ -886,7 +899,7 @@ Tonhöhe benutzt werden. \storePredefinedDiagram \chordmode {c'} #guitar-tuning - #(offset-fret 2 (chord-shape 'bes)) + #(offset-fret 2 (chord-shape 'bes guitar-tuning)) mychords = \chordmode{ c1 c' @@ -915,23 +928,27 @@ Liste an Akkordformen. Die Akkordformen sind Bunddiagramme, die am Hals entlang verschoben werden können und dabei unterschiedliche Akkorde ergeben. Akkordformen können zu der internen Liste hinzugefügt werden und dann benutzt werden, um vordefinierte -Bunddiagramme zu definieren. +Bunddiagramme zu definieren. Weil sie auf verschiedenen Positionen +auf dem Steg gelegt werden können, beinhalten vordefinierte +Akkord üblicherweise keine leeren Saiten. Wie Bunddiagramme können auch +Akkordformen entweder als @code{fret-diagram-terse}-Definition +oder als @code{fret-diagram-verbose}-Liste erstellt werden. @lilypond[verbatim, ragged-right, quote] \include "predefined-guitar-fretboards.ly" % add a new chord shape -\addChordShape #'powerf #"1-1;3-3;3-4;x;x;x;" +\addChordShape #'powerf #guitar-tuning #"1-1;3-3;3-4;x;x;x;" % add some new chords based on the power chord shape \storePredefinedDiagram \chordmode {f'} #guitar-tuning - #(chord-shape 'powerf) + #(chord-shape 'powerf guitar-tuning) \storePredefinedDiagram \chordmode {g'} #guitar-tuning - #(offset-fret 2 (chord-shape 'powerf)) + #(offset-fret 2 (chord-shape 'powerf guitar-tuning)) mychords = \chordmode{ f1 f' g g' diff --git a/Documentation/de/user/fundamental.itely b/Documentation/de/user/fundamental.itely index ba00836e93..dd15fc0bdf 100644 --- a/Documentation/de/user/fundamental.itely +++ b/Documentation/de/user/fundamental.itely @@ -1,13 +1,13 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*- @c This file is part of lilypond-learning.tely @ignore - Translation of GIT committish: 2c00bdbfaf62dd90863331c4713e6b29e32c9322 + Translation of GIT committish: 23342b5b9f69f3a82751052f79f3fede0bb40ded When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @c Translators: Till Rettig, Reinhold Kainhofer @node Fundamental concepts @@ -518,7 +518,7 @@ gesetzt werden: << { f c c } \new Staff \with { - alignAboveContext = "Hauptzeile" } + alignAboveContext = #"Hauptzeile" } { f8 f c } >> r4 | @@ -2716,29 +2716,29 @@ lower = \relative c, { << % combine ChoirStaff and PianoStaff in parallel \new ChoirStaff << \new Staff = "sopranos" << - \set Staff.instrumentName = "Soprano" + \set Staff.instrumentName = #"Soprano" \new Voice = "sopranos" { \global \sopranoMusic } >> \new Lyrics \lyricsto "sopranos" { \sopranoWords } \new Staff = "altos" << - \set Staff.instrumentName = "Alto" + \set Staff.instrumentName = #"Alto" \new Voice = "altos" { \global \altoMusic } >> \new Lyrics \lyricsto "altos" { \altoWords } \new Staff = "tenors" << - \set Staff.instrumentName = "Tenor" + \set Staff.instrumentName = #"Tenor" \new Voice = "tenors" { \global \tenorMusic } >> \new Lyrics \lyricsto "tenors" { \tenorWords } \new Staff = "basses" << - \set Staff.instrumentName = "Bass" + \set Staff.instrumentName = #"Bass" \new Voice = "basses" { \global \bassMusic } >> \new Lyrics \lyricsto "basses" { \bassWords } >> % end ChoirStaff \new PianoStaff << - \set PianoStaff.instrumentName = "Piano" + \set PianoStaff.instrumentName = #"Piano" \new Staff = "upper" \upper \new Staff = "lower" \lower >> @@ -2772,22 +2772,22 @@ Damit erhalten wir folgenden @code{ChoirStaff}: @example \new ChoirStaff << \new Staff = "sopranos" << - \set Staff.instrumentName = "Soprano" + \set Staff.instrumentName = #"Soprano" \new Voice = "sopranos" @{ \global \SopranNoten @} >> \new Lyrics \lyricsto "sopranos" @{ \SopranText @} \new Staff = "altos" << - \set Staff.instrumentName = "Alto" + \set Staff.instrumentName = #"Alto" \new Voice = "altos" @{ \global \AltNoten @} >> \new Lyrics \lyricsto "altos" @{ \AltText @} \new Staff = "tenors" << - \set Staff.instrumentName = "Tenor" + \set Staff.instrumentName = #"Tenor" \new Voice = "tenors" @{ \global \TenorNoten @} >> \new Lyrics \lyricsto "tenors" @{ \TenorText @} \new Staff = "basses" << - \set Staff.instrumentName = "Bass" + \set Staff.instrumentName = #"Bass" \new Voice = "basses" @{ \global \BassNoten @} >> \new Lyrics \lyricsto "basses" @{ \BassText @} @@ -2800,7 +2800,7 @@ aus der @qq{Piano solo}-Vorlage: @example \new PianoStaff << - \set PianoStaff.instrumentName = "Piano " + \set PianoStaff.instrumentName = #"Piano " \new Staff = "oben" \oben \new Staff = "unten" \unten >> @@ -2838,7 +2838,7 @@ spitzen Klammern kombiniert werden, damit beide >> % Ende ChoirStaff \new PianoStaff << - \set PianoStaff.instrumentName = "Piano" + \set PianoStaff.instrumentName = #"Piano" \new Staff = "oben" \oben \new Staff = "unten" \unten >> @@ -2891,29 +2891,29 @@ lower = \relative c, { << % combine ChoirStaff and PianoStaff in parallel \new ChoirStaff << \new Staff = "sopranos" << - \set Staff.instrumentName = "Soprano" + \set Staff.instrumentName = #"Soprano" \new Voice = "sopranos" { \global \sopranoMusic } >> \new Lyrics \lyricsto "sopranos" { \sopranoWords } \new Staff = "altos" << - \set Staff.instrumentName = "Alto" + \set Staff.instrumentName = #"Alto" \new Voice = "altos" { \global \altoMusic } >> \new Lyrics \lyricsto "altos" { \altoWords } \new Staff = "tenors" << - \set Staff.instrumentName = "Tenor" + \set Staff.instrumentName = #"Tenor" \new Voice = "tenors" { \global \tenorMusic } >> \new Lyrics \lyricsto "tenors" { \tenorWords } \new Staff = "basses" << - \set Staff.instrumentName = "Bass" + \set Staff.instrumentName = #"Bass" \new Voice = "basses" { \global \bassMusic } >> \new Lyrics \lyricsto "basses" { \bassWords } >> % end ChoirStaff \new PianoStaff << - \set PianoStaff.instrumentName = "Piano " + \set PianoStaff.instrumentName = #"Piano " \new Staff = "upper" \upper \new Staff = "lower" \lower >> diff --git a/Documentation/de/user/input.itely b/Documentation/de/user/input.itely index f17d3f2b6e..179e4623cb 100644 --- a/Documentation/de/user/input.itely +++ b/Documentation/de/user/input.itely @@ -1,263 +1,2017 @@ -@c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*- +@c -*- coding: utf-8; mode: texinfo; -*- @c This file is part of lilypond.tely @ignore - Translation of GIT committish: 02cb8b672238eeb53bffa2240c87f23dd8ca9e60 + Translation of GIT committish: 23342b5b9f69f3a82751052f79f3fede0bb40ded When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @node General input and output @chapter General input and output -@untranslated - +Dieses Kapitel erklärt allgemeine Fragen zur Eingabe und Ausgabe von +Notation mit LilyPond und weniger direkte Fragen der Notation. @menu -* Input structure:: -* Titles and headers:: -* Working with input files:: -* Controlling output:: -* MIDI output:: +* Input structure:: +* Titles and headers:: +* Working with input files:: +* Controlling output:: +* MIDI output:: @end menu + @node Input structure @section Input structure -@untranslated - +Das hauptsächliche Eingabeformat von LilyPond sind Textdateien. +Üblicherweise werden diese Dateien mit der Endung @code{.ly} +versehen. @menu -* Structure of a score:: -* Multiple scores in a book:: -* File structure:: +* Structure of a score:: +* Multiple scores in a book:: +* File structure:: @end menu + @node Structure of a score @subsection Structure of a score -@untranslated +@funindex \score + +Eine @code{\score}-Umgebung muss einen einzelnen musikalischen +Ausdruck beinhalten, der durch geschweifte Klammern begrenzt wird: + +@example +\score @{ +... +@} +@end example + +@warning{Es darf @strong{nur ein} äußerer musikalischer Ausdruck +in der @code{\score}-Umgebung geschrieben werden, und er @strong{muss} +von geschweiften Klammern umgeben sein.} + +Dieser einzelne musikalische Ausdruck kann beliebige Größe annehmen und +andere musikalische Ausdrücke von beliebiger Komplexität beinhalten. +Alle diese Beispielse sind musikalische Ausdrücke: + +@example +@{ c'4 c' c' c' @} +@end example + +@lilypond[verbatim,quote] +{ + { c'4 c' c' c'} + { d'4 d' d' d'} +} +@end lilypond + +@lilypond[verbatim,quote] +<< + \new Staff { c'4 c' c' c' } + \new Staff { d'4 d' d' d' } +>> +@end lilypond + +@example +@{ + \new GrandStaff << + \new StaffGroup << + \new Staff @{ \Flöte @} + \new Staff @{ \Oboe @} + >> + \new StaffGroup << + \new Staff @{ \GeigeI @} + \new Staff @{ \GeigeII @} + >> + >> +@} +@end example + +Kommentare bilden eine Ausnahme dieser Regel. (Andere Ausnahmen +siehe @ref{File structure}.) Sowohl einzeilige als auch +Blockkommentare (eingegrenzt durch @code{%@{ .. %@}}) können +an beliebiger Stelle einer Eingabedatei geschrieben werden. Sie +können innerhalb oder außerhalb der @code{\score}-Umgebung vorkommen, +und innerhalb oder außerhalb des einzelnen musikalischen Ausdrucks +innerhalb der @code{\score}-Umgebung. + + +@seealso +Handbuch zum Lernen: +@rlearning{Working on input files}, +@rlearning{Music expressions explained}, +@rlearning{Score is a (single) compound musical expression}. @node Multiple scores in a book @subsection Multiple scores in a book -@untranslated +@funindex \book +@cindex Sätze, mehrere + +Eine Partitur kann mehrere musikalische Stücke und verschiedene +Texte beinhalten. Beispiele hierzu sind etwa eine Etüdensammlung +oder ein Orchesterstück mit mehreren Sätzen. Jeder Satz wird +in einer eigenen @code{\score}-Umgebung notiert: + +@example +\score @{ + @var{..Noten..} +@} +@end example + +@noindent +und Texte werden mit einer @code{\markup}-Umgebung geschrieben: + +@example +\markup @{ + @var{..Text..} +@} +@end example + +@funindex \book + +Alle Sätze und Texte, die in derselben @code{.ly}-Datei vorkommen, +werden normalerweise in eine einzige Ausgabedatei gesetzt. + +@example +\score @{ + @var{..} +@} +\markup @{ + @var{..} +@} +\score @{ + @var{..} +@} +@end example + +Wenn Sie aber mehrere Ausgabedateien aus einer einzigen @code{.ly}-Datei +erstellen wollen, können Sie mehrere @code{\book}-Umgebungen notieren. +Wenn Sie keine @code{\book}-Umgebung in Ihrer Datei angeben, interpretiert +LilyPond die gesamte Datei als eine große @code{\book}-Umgebung (siehe +auch @ref{File structure}. Eine wichtige Ausnahme stellen Dokumente dar, +die mit lilypond-book erstellt werden, für die Sie explizit +@code{\book}-Umgebungen notieren müssen, weil sonst nur die erste +@code{\score}- bzw. @code{\markup}-Umgebung angezeigt wird. + +Der Kopfbereich für jedes Musikstück kann innerhalb der @code{\score}-Umgebung +definiert werden. Die @code{piece}-(Stück)-Bezeichnung aus dieser +@code{\header}-Umgebung wird vor jedem Satz ausgegeben. Die Überschrift für +ein ganzes Buch kann innerhalb von @code{\book} notiert werden, aber wenn +diese Umgebung fehlt, wird die @code{\header}-Umgebung genommen, die auf +erster Ebene der Datei notiert ist. + +@example +\header @{ + title = "Acht Miniaturen" + composer = "Igor Stravinsky" +@} +\score @{ + @dots{} + \header @{ piece = "Romanze" @} +@} +\markup @{ + ..Text der zweiten Strophe.. +@} +\markup @{ + ..Text der dritten Strophe.. +@} +\score @{ + @dots{} + \header @{ piece = "Menuetto" @} +@} +@end example + +@funindex \bookpart + +Stücke können innerhalb eines Buches mit @code{\bookpart} gruppiert +werden. Derartige Buchabschnitte werden durch einen Seitenumbruch +voneinander getrennt und können wie auch das ganze Buch selber mit +einem Titel innerhalb einer @code{\header}-Umgebung beginnen. +@example +\bookpart @{ + \header @{ + title = "Buchtitel" + subtitle = "Erster Teil" + @} + \score @{ @dots{} @} + @dots{} +@} +\bookpart @{ + \header @{ + subtitle = "Zweiter Teil" + @} + \score @{ @dots{} @} + @dots{} +@} +@end example @node File structure @subsection File structure -@untranslated +@funindex \paper +@funindex \midi +@funindex \layout +@funindex \header +@funindex \score +@funindex \book +@funindex \bookpart + +@cindex Dateistruktur +@cindex Struktur, Datei +@cindex Eingabedatei, Struktur +@cindex Quelldatei, Struktur + +Eine @code{.ly}-Datei kann eine belibige Anzahl an Ausdrücken +auf der obersten Ebene beinhalten, wobei ein Ausdrück der obersten +Ebene einer der folgenden sein kann: + +@itemize @bullet +@item +Eine Ausgabedefinition, wie @code{\paper}, @code{\midi} und +@code{\layout}. Derartige Definitionen auf oberster Ebene verändern +die globalen Einstellungen für das ganze @qq{Buch}. Wenn mehr +als eine derarte Definition desselben Typs angegeben wird, hat +die spätere Vorrang. + +@item +Ein direkter Scheme-Ausdruck, wie etwa +@code{#(set-default-paper-size "a7" 'landscape)} oder +@code{#(ly:set-option 'point-and-click #f)}. + +@item +Eine @code{\header}-Umgebung. Damit wird die globale Titelei +eingestellt. Das ist die Umgebung, in der sich Definition für +das ganze Buch befinden, wie Komponist, Titel usw. + +@item +Eine @code{\score}-Umgebung. Die in ihr enthaltene Partitur wird +zusammen mit anderen vorkommenden @code{\score}-Umgebungen gesammelt +und in ein @code{\book} zusammengefasst. Dieses Verhalten kann +verändert werden, indem die Variable @code{toplevel-score-handler} +auf höchster Ebene gesetzt wird. Die Definition des Standards findet sich +in der Datei @file{../scm/@/lily@/.scm}. + +@item +Eine @code{\book}-Umgebung fasst mehrere Sätze (d. h. mehrere +@code{\score}-Umgebungen) logisch in ein Dokument zusammen. +Wenn mehrere @code{\score}-Partituren vorkommen, wird für jede +@code{\book}-Umgebung eine eigene Ausgabedatei erstellt, in der +alle in der Umgebung enthaltenen Partituren zusammengefasst sind. +Der einzige Grund, explizit eine @code{\book}-Umgebung zu setzen, +ist, wenn mehrere Ausgabedateien aus einer einzigen Quelldatei +erstellt werden sollen. Eine Ausnahme sind lilypond-book-Dokumente, +in denen eine @code{\book}-Umgebung explizit hinzugefügt werden +muss, wenn mehr als eine @code{\score}- oder @code{\markup}-Umgebung +im gleichen Beispiel angezeigt werden soll. Dieses Verhalten +kann verändert werden, indem die Variable @code{toplevel-book-handler} +auf höchster Ebene gesetzt wird. Die Definition des Standards +findet sich in der Datei @file{../scm/@/lily@/.scm}. + +@item +Eine @code{\bookpart}-Umgebung. Ein Buch (@code{\book}) kann in +mehrere Teile untergliedert sein, indem @code{\bookpart}-Umgebungen +eingesetzt werden. Jeder Buchabschnitt beginnt auf einer neuen +Seite und kann eigene Papierdefinitionen in einer @code{\paper}-Umgebung +haben. + +@item +Ein zusammengesetzter musikalischer Ausdruck wie etwa +@example +@{ c'4 d' e'2 @} +@end example + +Dieses Beispiel wird von LilyPond automatisch in einer +@code{\score}-Umgebung in einem Buch interpretiert und +mit anderen @code{\score}-Umgebungen und musikalischen +Ausdrücken auf der höchsten Ebene zusammen ausgegeben. +Anders gesagt: eine Datei, die nur das obige Beispiel +beinhaltet, wird übersetzt zu + +@example +\book @{ + \score @{ + \new Staff @{ + \new Voice @{ + @{ c'4 d' e'2 @} + @} + @} + @} + \layout @{ @} + \header @{ @} +@} +@end example + +Dieses Verhalten kann verändert werden, indem die Variable +@code{toplevel-music-handler} auf der oberseten Ebene gesetzt +wird. Die Definition des Standards findet sich in der Datei +@file{../scm/@/lily@/.scm}. + +@item +Eine Textbeschriftung, eine Strophe etwa: +@example +\markup @{ + 2. Die erste Zeile der zweiten Strophe. +@} +@end example + +Textbeschriftungen werden über, zwischen oder unter musikalischen +Ausdrücken gesetzt, so wie sie notiert werde. + +@cindex Variablen + +@item +Eine Variable, wie +@example +foo = @{ c4 d e d @} +@end example + +Sie kann dann später in der Datei eingesetzt werden, indem @code{\foo} +geschrieben wird. Die Beizeichnung der Variable darf nur aus +alphabetischen Zeichen bestehen, keine Zahlen, Unter- oder Bindestriche. + +@end itemize + +Das folgende Beispiel zeigt drei Dinge, die auf der obersten Ebene +notiert werden können: + +@example +\layout @{ + % Zeilen rechtsbündig setzen + ragged-right = ##t +@} + +\header @{ + title = "Do-re-mi" +@} + +@{ c'4 d' e2 @} +@end example + +An einer beliebigen Stelle der Datei kann jede der folgenden lexikalen +Anweisungen notiert werden: + +@itemize +@item @code{\version} +@item @code{\include} +@item @code{\sourcefilename} +@item @code{\sourcefileline} +@item +Ein einzeiliger Kommentar, beginnend mit @code{%}. + +@item +Ein mehrzeiliger Kommentar, umgeben von @code{%@{ .. %@}}. + +@end itemize + +@seealso +Hanbuch zum Lernen: +@rlearning{How LilyPond input files work}. @node Titles and headers @section Titles and headers -@untranslated - +Fast alle gedruckten Noten beinhalten einen Titel und den Namen +des Komponisten, teilweise wird auch noch sehr viel mehr Information +zur Verfügung gestellt. @menu -* Creating titles:: -* Custom titles:: -* Reference to page numbers:: -* Table of contents:: +* Creating titles:: +* Custom titles:: +* Reference to page numbers:: +* Table of contents:: @end menu + @node Creating titles @subsection Creating titles -@untranslated +Überschriften können für jede @code{\score}-Umgebung erstellt werden, sowohl +für die gesamte Datei (oder eine @code{\book}-Umgebung) als auch für +einzelne Buchabschnitte (innerhalb einer @code{\bookpart}-Umgebung). + +Der Inhalt der Titelei wird aus der @code{\header}-Umgebung übernommen. Die +@code{\header}-Umgebung eines Buches unterstützt folgende Felder: + +@table @code +@funindex dedication +@item dedication +Die Widmung der Noten, wird auf oben auf der ersten Seite gesetzt. + +@funindex title +@item title +Die Überschrift der Noten, wird unter der Widmung zentriert gesetzt. + +@funindex subtitle +@item subtitle +Untertitel, zentriert unter der Überschrift. + +@funindex subsubtitle +@item subsubtitle +Unteruntertitel, zentriert unter dem Untertitel. + +@funindex poet +@item poet +Name des Dichters, linksbündig unter dem Unteruntertitel. + +@funindex instrument +@item instrument +Bezeichnung des Instruments, zentriert unter dem Unteruntertitel. +Auch oben auf der Seite zentriert (andere als erste Seite). + +@funindex composer +@item composer +Name des Komponisten, rechtsbüngig unter dem Unteruntertitel. + +@funindex meter +@item meter +Metrum, linksbündig unter dem Dichter. + +@funindex arranger +@item arranger +Name des Bearbeiters/Arrangeurs, rechtsbündig unter dem Komponisten. + +@funindex piece +@item piece +Bezeichnung des Stückes, linksbündig unter dem Metrum. + +@funindex opus +@item opus +Bezeichnung des Opus, rechtsbündig unter dem Bearbeiter. + +@cindex Seitenumbruch, erzwingen +@funindex breakbefore + +@item breakbefore +Hiermit beginnt der Titel auf einer neuen Steite. (Kann die Werte +##t (wahr) oder ##f (falsch) haben.) + +@funindex copyright +@item copyright +Anzeige eines Copyright, zentriert unten auf der ersten Seite. Um das +Copyright-Symbol zu notieren, siehe @ref{Text encoding}. + +@funindex tagline +@item tagline +Zentriert unten auf der letzten Seite. Enthält standardmäßig: @qq{Music +engraving by LilyPond (@var{version})---www.lilypond.org} + +@end table + +Hier eine Demonstration der möglichen Felder. Beliebige +Formatierungsbefehle für Textbeschriftung können in der Titelei +eingesetzt werden. Siehe hierzu auch @ref{Formatting text}. + +@c KEEP LY +@lilypond[quote,verbatim,line-width=11.0\cm] +\paper { + line-width = 9.0\cm + paper-height = 10.0\cm +} + +\book { + \header { + dedication = "mir gewidmet" + title = \markup \center-column { "Titel erste Zeile" "Titel zweite Zeile, länger" } + subtitle = "Untertitel" + subsubtitle = #(string-append "Unteruntertitel LilyPond-Version " +(lilypond-version)) + poet = "Dichter" + composer = \markup \center-column { "Komponist" \small "(1847-1973)" } + texttranslator = "Übersetzer" + meter = \markup { \teeny "m" \tiny "e" \normalsize "t" \large "r" \huge +"um" } + arranger = \markup { \fontsize #8.5 "Be" \fontsize #2.5 "ar" \fontsize +#-2.5 "be" \fontsize #-5.3 "i" \fontsize #7.5 "ter" } + instrument = \markup \bold \italic "Instrument" + piece = "Stück" + } + + \score { + { c'1 } + \header { + piece = "Stück zwei" + opus = "Opus1" + } + } + \markup { + und jetzt... + } + \score { + { c'1 } + \header { + piece = "Stück2" + opus = "Opus2" + } + } +} +@end lilypond + +Wie schon oben gezeigt, können mehrfache @code{\header}-Umgebungen +eingesetzt werden. Wenn das gleiche Feld in mehreren +Umgebungen, wird die letzte vorkommende +Version benutzt. Hier ein kurzes Beispiel: + +@example +\header @{ + composer = "Komponist" +@} +\header @{ + piece = "Stück" +@} +\score @{ + \new Staff @{ c'4 @} + \header @{ + piece = "Neues Stück" % überschreibt die die vorige Definition + @} +@} +@end example + +Wenn @code{\header} innerhalb der @code{\score}-Umgebung definiert wird, +wird normalerweise nur die Information von @code{piece} und @code{opus} +ausgegeben. Musikalische Ausdrücke innerhalb von @code{\score} müssen +vor @code{\header} gesetzt werden. + +@lilypond[quote,verbatim,line-width=11.0\cm] +\score { + { c'4 } + \header { + title = "title" % not printed + piece = "piece" + opus = "opus" + } +} +@end lilypond + +@funindex print-all-headers + +@noindent +Dieses Verhalten kann verändert werden (sodass alle Angaben aus der +überschrift gesetzt werden, wenn sich @code{\header} innerhalb von +@code{\score} befindet), indem man schreibt: + +@example +\paper@{ + print-all-headers = ##t +@} +@end example + +@cindex Copyright +@cindex Tagline + +Die Standardfußzeile ist leer mit Ausnahme der ersten Seite, auf der +das @code{copyright}-Feld aus der @code{\header}-Umgebung eingefügt wird, +und die letzte Seite, auf der das @code{tagline}-Feld eingefügt wird. +Der Standardinhalt von @code{tagline} ist @qq{Music engraving by +LilyPond (@var{version})---www.lilypond.org}. Gut gesetzte Noten werben sehr effektiv +für LilyPond, darum bitten wir darum, diese Zeile stehen zu lassen, +wenn es möglich ist. + +Ein Titelfeld kann vollständig entfernt werden, indem es auf +falsch gesetzt wird: + +@example +\header @{ + tagline = ##f + composer = ##f +@} +@end example @node Custom titles @subsection Custom titles -@untranslated +Kompliziertere Anpassungen können vorgenommen werden, indem die +folgenden Variablen innerhalb der @code{\paper}-Umgebung geändert +werden. Die Init-Datei @file{../ly/titling-init.ly} enthält das +Standardverhalten. + +@table @code + +@funindex bookTitleMarkup + +@item bookTitleMarkup +Das ist die Überschrift, die für das gesamte Dokument gilt. Üblicherweise +wird hier der Komponist und die Überschrift des Werkes genannt. + +@funindex scoreTitleMarkup + +@item scoreTitleMarkup +Das ist die Überschrift, die vor jede @code{\score}-Umgebung gesetzt wird. +Überlicherweise wird hier etwa die Bezeichnung eines Satzes notiert +(im @code{piece}-Feld). + +@funindex oddHeaderMarkup + +@item oddHeaderMarkup +Das ist der Seitenkopf für ungerade Seiten. + +@funindex evenHeaderMarkup + +@item evenHeaderMarkup +Das ist der Seitenkopf für gerade Seiten. Wenn undefiniert, wird der +ungerade Seitenkopf eingesetzt. + +Standardmäßig werden die Kopfzeilen so definiert, dass die Seitennummer +sich außen befindet und das Instrument zentriert gesetzt wird. + +@funindex oddFooterMarkup + +@item oddFooterMarkup +Das ist die Fußzeile für ungerade Seiten. + +@funindex evenFooterMarkup + +@item evenFooterMarkup +Das ist die Fußzeile für gerade Seiten. Wenn undefiniert, wird die +ungerade Fußzeile eingesetzt. + +Standardmäßig wird in der Fußzeile auf der ersten Seite das Copyright +und auf der letzten Seite die Tag-Zeile gesetzt. + +@end table + + +@funindex \paper +@cindex Kopfzeile +@cindex Fußzeile +@cindex Seitenlayout +@cindex Layout der Seite +@cindex Titel +@cindex Überschriften + +Die folgende Definition setzt die Überschrift linksbündig und +den Komponisten rechtsbündig auf einer einzelnen Zeile: + +@verbatim +\paper { + bookTitleMarkup = \markup { + \fill-line { + \fromproperty #'header:title + \fromproperty #'header:composer + } + } +} +@end verbatim @node Reference to page numbers @subsection Reference to page numbers -@untranslated +Eine bestimmte Stelle der Partitur kann mit einem @code{\label}-Befehl +markiert werden, sowohl auf oberster Ebene als auch innerhalb eines +musikalischen Ausdrucks. Auf diese Marke kann dann verwiesen werden, +um die Seitenzahl zu erhalten, auf der die Marke vorkommt. Der +Verweis wird mit dem Befehl @code{\page-ref} gefordert (innerhalb +von @code{\markup}). + +@c KEEP LY +@lilypond[verbatim,line-width=11.0\cm] +\header { tagline = ##f } +\book { + \label #'ErstePartitur + \score { + { + c'1 + \pageBreak \mark A \label #'ZeichenA + c' + } + } + + \markup { Die erste Partitur fäng auf Seite \page-ref #'ErstePartitur "0" "?" an.} + \markup { Zeichen A befindet sich auf Seite \page-ref #'ZeichenA "0" "?". } +} +@end lilypond + +Der @code{\page-ref}-Textbeschriftungsbefehl braucht drei Argumente: + +@enumerate + +@item die Marke, ein Scheme-Symbol, etwa @code{#'ErstePartitur}, +@item eine Beschriftung, die als Platzhalter benutzt wird, um die Breite des Verweisen zu schätzen, +@item eine Beschriftung, die anstelle der Seitenzahl gesetzt wird, wenn die Marke unbekann ist. +@end enumerate + +Der Grund, warum ein Platzhalter benötigt wird, ist dass zu dem Zeitpunkt, +an dem die Textbeschriftungen ausgewertet werden, noch keine Seitenumbrüche +vorgenommen wurden und die Seitenzahlen deshalb noch nicht bekannt sind. +Um hier ein Problem zu vermeiden, wird die eigentliche Auswertung der +Textbeschriftung erst später ausgeführt, die Größe des Textes muss aber +schon vorher bekannt sein. Die Größe wird mithilfe des Platzhalters +bestimmt. Wenn eine Partitur zwischen 10 und 99 Seiten hat, kann man +"00" schreiben, also eine zweistellige Zahl. + +@code{\label} +@code{\page-ref} + +@predefined +@funindex \label, +@funindex \page-ref. +@endpredefined @node Table of contents @subsection Table of contents -@untranslated +Ein Inhaltsverzeichnis kann eingefügt werden mit dem Befehl +@code{\markuplines \table-of-contents}. Die Elemente, die im +Inhaltsverzeichnis aufgelistet werden sollen, werden mit dem +@code{\tocItem}-Befehl markiert, welches sowohl auf höchster +Ebene als auch in einem musikalischen Ausdruck verwendet werden +kann. + +@verbatim +\markuplines \table-of-contents +\pageBreak + +\tocItem \markup "Erste Partitur" +\score { + { + c' % ... + \tocItem \markup "Ein bestimmter Punkt innerhalb der ersten Partitur" + d' % ... + } +} +\tocItem \markup "zweite Partitur" +\score { + { + e' % ... + } +} +@end verbatim + +Die Beschriftungen, die benutzt werden um das Inhaltsverzeichnis +zu formatieren, sind in der @code{\paper}-Umgebung definiert. +Die Standardformatierungselemente sind @code{tocTitleMarkup} +um die Überschrift zu formatieren und @code{tocItemMarkup} um +die einzelnen Inhaltselemente zu formatieren, bestehend aus +dem Titelelement und einer Seitenzahl. Die Variablen können +durch den Benutzer geändert werden: + +@verbatim +\paper { + %% Übersetzung der Inhaltsverzeichnisüberschrift nach französisch: + tocTitleMarkup = \markup \huge \column { + \fill-line { \null "Table des matières" \null } + \hspace #1 + } + %% hier größere Schriftarten + tocItemMarkup = \markup \large \fill-line { + \fromproperty #'toc:text \fromproperty #'toc:page + } +} +@end verbatim -@node Working with input files -@section Working with input files +Die Inhaltsverzeichniselemente Text und Seitenzahl werden +in der Definition von @code{tocItemMarkup} aufgerufen mit +@code{#'toc:text} und @code{#'toc:page}. + +Neue Befehle und Beschriftungen können auch definiert werden, +um eigene Inhaltsverzeichnisse zu gestalten: + +@itemize + +@item zuerst muss eine neue Beschriftungsvariable in der +@code{\paper}-Umgebung definiert werden + +@item dann muss die musikalische Funktion definiert werden, die +ein Element zum Inhaltsverzeichnis hinzufügt, indem die neue +Variable benutzt wird. + +@end itemize + +Das folgende Beispiel definiert einen neuen Stil um Akt-Bezeichnungen +einer Oper in das Inhaltsverzeichnis aufzunehmen: + +@verbatim +\paper { + tocActMarkup = \markup \large \column { + \hspace #1 + \fill-line { \null \italic \fromproperty #'toc:text \null } + \hspace #1 + } +} + +tocAct = +#(define-music-function (parser location text) (markup?) + (add-toc-item! 'tocActMarkup text)) +@end verbatim + +@lilypond[line-width=11.0\cm] +\header { tagline = ##f } +\paper { + tocActMarkup = \markup \large \column { + \hspace #1 + \fill-line { \null \italic \fromproperty #'toc:text \null } + \hspace #1 + } +} + +tocAct = +#(define-music-function (parser location text) (markup?) + (add-toc-item! 'tocActMarkup text)) + +\book { + \markuplines \table-of-contents + \tocAct \markup { Atto Primo } + \tocItem \markup { Coro. Viva il nostro Alcide } + \tocItem \markup { Cesare. Presti omai l'Egizzia terra } + \tocAct \markup { Atto Secondo } + \tocItem \markup { Sinfonia } + \tocItem \markup { Cleopatra. V'adoro, pupille, saette d'Amore } + \markup \null +} +@end lilypond + + +@seealso +Installierte Dateien: @file{../ly/@/toc@/-init@/.ly}. -@untranslated +@funindex \table-of-contents +@funindex \tocItem +@predefined +@code{\table-of-contents}, +@code{\tocItem}. +@endpredefined + + +@node Working with input files +@section Working with input files @menu -* Including LilyPond files:: -* Different editions from one source:: -* Text encoding:: -* Displaying LilyPond notation:: +* Including LilyPond files:: +* Different editions from one source:: +* Text encoding:: +* Displaying LilyPond notation:: @end menu + @node Including LilyPond files @subsection Including LilyPond files -@untranslated +@funindex \include +@cindex einfügen von Dateien +@cindex Dateien einfügen + +Ein größeres Projekt kann in einzelne Dateien aufteteilt werden. +Um eine andere Datei einzubinden, kann der Befehl + +@example +\include "andereDatei.ly" +@end example + +@noindent +benutzt werden. + +Die Zeile @code{\include "andereDatei.ly"} benimmt sich genauso, +also ob der Inhalt der Datei @code{andereDatei.ly} komplett in die +Hauptdatei eingefügt werden würde. So kann man für ein größeres +Projekt die einzelnen Stimmen der Instrumente getrennt notieren +und sie dann in einer Partitur-Datei benutzen. Meistens werden +in den eingefügten Dateien einige Variablen definiert, die dann +auch in der Hauptdatei eingesetzt werden können. Mit Marken (Tags) +gekennzeichnete Abschnitte können eingesetzt werden, um die +entsprechenden Noten etc. an verschiedenen Stellen in der Datei +zur Verfügung zu stellen. Siehe auch @ref{Different editions from +one source}. + +Auf Dateien im aktuellen Verzeichnis kann einfach mit dem Dateinamen +nach dem @code{\include}-Befehl verwiesen werden. Dateien an anderen +Stellen können eingebunden werden, indem entweder ein vollständiger +Pfad oder ein relativer Pfad zu der Datei angegeben wird. Hierbei +sollten die für UNIX typischen Schrägstriche (/) und nicht die +rückwärtsgeneigten von Windows (\) verwendet werden, um die Verzeichnisse +zu trennen. Wenn etwa die Datei @file{kram.ly} ein Verzeichnis +höher liegt als das aktuelle Verzeichnis, sollte der Befehl so +aussehen: + +@example +\include "../kram.ly" +@end example + +@noindent +Wenn die Orchesterstimmen andererseits in einem Unterordner mit +der Bezeichnung @code{stimmen} liegen, sieht er folgendermaßen +aus: + +@example +\include "stimmen/VI.ly" +\include "stimmen/VII.ly" +... etc +@end example + +Dateien, die eingebunden werden sollen, können selber auch wiederum +ein @code{\include} enthalten. Diese Einbindung zweiter Ebene +werden erst interpretiert, wenn sie sich in der Hauptdatei befinden, +sodass die Pfadangaben hier nicht relativ zur eingebundenen Datei, +sondern relativ zur Hauptdatei gesetzt werden müssen. + +Dateien können auch aus einem Verzeichnis eingebunden werden, +dass im Suchpfad von LilyPond liegt. Hierzu muss auf der +Kommandozeile das entsprechende Verzeichnis angegeben werden +und die Dateien, die eingebunden werden, müssen nur mit ihrem Namen +notiert sein. Wenn etwa die Datei @file{Haupt.ly} kompiliert +werden soll, die Dateien aus dem Unterverzeichnis @file{stimmen} +einbindet, müssen sie sich im Verzeichnis von @file{Haupt.ly} +befinden und dann LilyPond folgendermaßen aufrufen: + +@example +lilypond --include=stimmen Haupt.ly +@end example + +@noindent +In @file{Haupt.ly} steht: + +@example +\include "VI.ly" +\include "VII.ly" +... usw. +@end example + +Dateien, die in vielen Partituren verwendet werden sollen, können +im LilyPond-Verzeichnis @file{../ly} gespeichert werden. (Die +Stelle, an der dieses Verzeichnis sich befindet, hängt vom Betriebssystem +ab, siehe hierzu @rlearning{Other sources of information}). Dateien +in diesem Verzeichnis können einfach mit ihrem Namen eingefügt werden. +So werden auch die Sprachdateien wie etwa @file{deutsch.ly} eingefügt. + +LilyPond lädt eine Anzahl an Dateien, wenn das Programm aufgerufen wird. +Diese Dateien sind für den Benutzer nicht ersichtlich, aber die Dateien +können identifiziert werden, indem LilyPond auf der Komandozeile mit +Option aufgerufen wird: @code{lilypond --verbose}. Hiermit wird +neben anderer Information auch eine Liste and Pfaden und Dateien +aufgeführt, die LilyPond benutzt. Die wichtigeren Dateien werden +im Abschnitt @rlearning{Other sources of information} besprochen. +Diese Dateien können verändert werden, aber Änderungen gehen verloren, +wenn eine neue LilyPond-Version installiert wird. + +Eine einfache Beispiele, die die Benutzung von @code{\include} demonstrieren, +sind dargestellt in +@rlearning{Scores and parts}. + +@seealso +Handbuch zum Lernen: +@rlearning{Other sources of information}, +@rlearning{Scores and parts}. + +@knownissues + +Wenn eine Datei eingebunden wird, deren Name einer Datei aus +dem Installationsverzeichnis von LilyPond entspricht, wird die +installierte Datei anstelle der eigenen verwendet. @node Different editions from one source @subsection Different editions from one source -@untranslated - +Es gibt verschiedene Funktionen, die es möglich machen, unterschiedliche +Versionen einer Partitur aus der gleichen Quelldatei zu produzieren. +Variablen werden am besten eingesetzt, wenn es darum geht, längere +Notenpassagen und/oder Anmerkungen/Textmarken miteinander auf +verschiedene Weise zu kombinieren. Tag-Marken dagegen werden am +besten eingesetzt, wenn eine von mehreren kurzen alternativen +Notenabschnitten ausgewählt werden soll. Egal welche Methode am +Ende eingesetzt wird: Es erleichtert die Arbeit in jedem Fall, wenn +die eigentlichen Noten und die Struktur der Paritur voneinander +getrennt notiert werden -- so kann die Struktur geändert werden, +ohne dass man Änderungen an den Noten vornehmen muss. @menu -* Using variables:: -* Using tags:: +* Using variables:: +* Using tags:: @end menu @node Using variables @unnumberedsubsubsec Using variables -@untranslated +@cindex Variablen, Benutzung + +Wenn Notenabschnitt in Variablen definiert werden, können sie +an unterschiedlichen Stellen in der Partitur eingesetzt werden, +siehe auch @rlearning{Organizing pieces with variables}. Zum +Beispiel enthält eine Vokalpartitur für ein @notation{a cappella} +Stück oft einen Klavierauszug, der das Einüben einfacher macht. +Der Klavierauszug enthält die gleichen Noten, sodass man sie nur +einmal notieren muss. Noten aus zwei Variablen können auf einem +System kombiniert werden, siehe @ref{Automatic part combining}. +Hier ein Beispiel: + +@lilypond[verbatim,quote] +sopranoMusic = \relative c'' { a4 b c b8( a)} +altoMusic = \relative g' { e4 e e f } +tenorMusic = \relative c' { c4 b e d8( c) } +bassMusic = \relative c' { a4 gis a d, } +allLyrics = \lyricmode {King of glo -- ry } +<< + \new Staff = "Soprano" \sopranoMusic + \new Lyrics \allLyrics + \new Staff = "Alto" \altoMusic + \new Lyrics \allLyrics + \new Staff = "Tenor" { + \clef "treble_8" + \tenorMusic + } + \new Lyrics \allLyrics + \new Staff = "Bass" { + \clef "bass" + \bassMusic + } + \new Lyrics \allLyrics + \new PianoStaff << + \new Staff = "RH" { + \set Staff.printPartCombineTexts = ##f + \partcombine + \sopranoMusic + \altoMusic + } + \new Staff = "LH" { + \set Staff.printPartCombineTexts = ##f + \clef "bass" + \partcombine + \tenorMusic + \bassMusic + } + >> +>> +@end lilypond + +Unterschiedliche Partituren, die entweder nur den Chor oder das +Klavier zeigen, können produziert werden, indem die Struktur +verändert wird; die Noten müssen dazu nicht verändert werden. + +Für längere Partituren können Variablen in eigene Dateien notiert +werden, die dann eingebunden werden, siehe @ref{Including +LilyPond files}. @node Using tags @unnumberedsubsubsec Using tags -@cindex Erweiterung von Wiederholungen -@funindex \unfoldRepeats - -Mit ein bisschen Anpassung können alle Wiederholungstypen -auch in der MIDI-Datei wiedergegeben werden. Das wird erreicht -durch die @code{\unfoldRepeats}-Funktion. Hiermit werden alle -Wiederholungen, welcher Art auch immer, in notengetreue Wiederholungen -umgewandelt, die Noten werden also wiederholt ausgegeben. +@cindex Tag +@cindex Marke +@cindex markierte Noten entfernen +@cindex markierte Noten behalten + +@funindex \tag +@funindex \keepWithTag +@funindex \removeWithTag +@funindex tag +@funindex keepWithTag +@funindex removeWithTag + +Der @code{\tag #'@var{TeilA}}-Befehl markiert einen musikalischen +Ausdruck mit der Bezeichnung @var{TeilA}. Ausdrücke, die auf diese +Weise markiert werden, können mit ihrer Bezeichnung später ausgewählt +bzw. ausgefiltert werden. Das geschieht mit den Befehlen +@code{\keepWithTag #'@var{Bezeichnung}} bzw. @code{\removeWithTag #'@var{Bezeichnung}}. +Die Wirkung dieser Filter auf die markierten Notenabschnitte ist +wie folgt: + +@multitable @columnfractions .5 .5 + +@headitem Filter + @tab Resultat + +@item +Markierte Noten mit vorgesetztem @code{\keepWithTag #'@var{Bezeichnung}} + @tab Unmarkierte Noten und Noten mit der Marke @var{Bezeichnung} werden + gesetzt, Noten mit einer anderen Marke werden nicht angezeigt. + +@item +Markierte Noten mit vorgesetztem @code{\removeWithTag #'@var{Bezeichnung}} + @tab Unmarkierte Noten und Noten mit einer anderen Marke als + @var{Bezeichnung} wird angezeigt, Noten markiert mit @var{Bezeichnung} + werden nicht angezeigt. + +@item +Markierte Noten, weder mit vorgesetztem @code{\keepWithTag} noch +@code{\removeWithTag} + @tab Alle markierten und unmarkierten Noten werden angezeigt. + +@end multitable + +Die Argumente der Befehle @code{\tag}, @code{\keepWithTag} und +@code{\removeWithTag} sollten ein Symbol sein (wie etwa +@code{#'score} oder @code{#'part}), gefolgt von einem musikalischen +Ausdruck. + +Im folgenden Beispiel erscheinen zwei Versionen der Noten, eine +zeigt Triller in normaler Notation, die andere zeigt sie ausgeschrieben: + +@lilypond[verbatim,quote] +music = \relative g' { + g8. c32 d + \tag #'trills {d8.\trill } + \tag #'expand {\repeat unfold 3 {e32 d} } + c32 d + } + +\score { + \keepWithTag #'trills \music +} +\score { + \keepWithTag #'expand \music +} +@end lilypond -@lilypond[quote,verbatim,fragment,line-width=8.0\cm] -\unfoldRepeats { - \repeat tremolo 8 {c'32 e' } - \repeat percent 2 { c''8 d'' } - \repeat volta 2 {c'4 d' e' f'} - \alternative { - { g' a' a' g' } - {f' e' d' c' } - } +@noindent +Entsprechend können auch Abschnitte ausgeschlossen werden; das +erfordert manchmal weniger Schreibarbeit: + +@lilypond[verbatim,quote] +music = \relative g' { + g8. c32 d + \tag #'trills {d8.\trill } + \tag #'expand {\repeat unfold 3 {e32 d} } + c32 d + } + +\score { + \removeWithTag #'expand + \music +} +\score { + \removeWithTag #'trills + \music } -\bar "|." @end lilypond -Wenn man eine Partitur schreibt, die diesen @code{\unfoldRepeats}-Befehl -für die MIDI-Ausgabe benutzt, muss man zwei @code{\score}-Umgebungen -schreiben: eine für die MIDI-Ausgabe, wo die Wiederholungen ausgeschrieben -werden, und eine für die gedruckte Notation, in der Klammern, Tremolo und -Prozent-Wiederholungen benutzt werden. Zum Beispiel: +Marken können auch auf Artikulationen, Text usw angewendet werden, +indem man ihnen @example -\score @{ - @var{..music..} - \layout @{ .. @} -@} -\score @{ - \unfoldRepeats @var{..music..} - \midi @{ .. @} -@} +-\tag #'@var{your-tag} @end example +@noindent +voranstellt (jedoch nach der Note, an die sie gebunden sind). Mit +diesem Code etwa könnte man entweder Fingersatz oder aber einen +Text ausgeben: + +@example +c1-\tag #'finger ^4 +c1-\tag #'warn ^"Achtung!" +@end example + +Mehrfache Marken können mithilfe von mehreren @code{\tag}-Befehlen +notiert werden: + +@lilypond[quote,verbatim] +music = \relative c'' { + \tag #'a \tag #'both { a a a a } + \tag #'b \tag #'both { b b b b } +} +<< +\keepWithTag #'a \music +\keepWithTag #'b \music +\keepWithTag #'both \music +>> +@end lilypond + +Mehrfache @code{\removeWithTag}-Filter können auf einen +musikalischen Ausdruck angewendet werden, um mehrere unterschiedliche +markierte Abschnitte aus dem Druckbild zu entfernen. + +@lilypond[verbatim,quote] +music = \relative c'' { +\tag #'A { a a a a } +\tag #'B { b b b b } +\tag #'C { c c c c } +\tag #'D { d d d d } +} +{ +\removeWithTag #'B +\removeWithTag #'C +\music +} +@end lilypond + +Zwei oder mehr @code{\keepWithTag}-Filter in einem musikalischen +Ausdruck bewirken, dass @emph{alle} markierten Abschnitte entfernt +werden, weil der erste Befehl alle markierten Abschnitt außer dem +im Befehl genannten wegfiltert und der zweite Befehl dann auch diesen +eben genannten zusätzlich entfernt. + + +@seealso +Handbuch zum Lernen: +@rlearning{Organizing pieces with variables}. + +Notationsreferenz: +@ref{Automatic part combining}, +@ref{Including LilyPond files}. + + +@ignore +@c This warning is more general than this placement implies. +@c Rests are not merged whether or not they come from tagged sections. +@c Should be deleted? -td + +@knownissues + +Multiple rests are not merged if you create a score with more +than one tagged section at the same place. + +@end ignore + @node Text encoding @subsection Text encoding -@untranslated +LilyPond benutzt alle Zeichen, die durch das Unicode-Konsortium +und ISO/IEC 10646 definiert sind. Hiermit wird den Zeichen +fast aller Schriftsysteme der Welt ein eindeutiger Name und ein +Code-Punkt zugewiesen, mit dem sie identifizierbar sind. Unicode +kann mit mehreren Zeichenkodierungen verwirklicht werden. LilyPond +benutzt die UTF-8-Kodierung (UTF = Unicode Transformation Format), +in der die normalen Zeichen des lateinischen Alphabets mit einem +Byte dargestellt werden, während alle anderen Zeichen zwischen +zwei und vier Byte Länge haben. + +Das Aussehen des Zeichens wird bestimmt durch die gerade benutzte +Schriftart (engl. font). In einer Schriftartdatei werden die +Nummern der Unicode-Zeichen einem bestimmten Glyphen zugeordnet. +LilyPond verwendet die Pango-Bibliothek um mehrsprachige Texte +und komplexe Skripte korrekt zu setzen. + +LilyPond verändert die Kodierung der Eingabedatei nicht. Das heißt, +dass jeder Text -- Überschriften, Gesangstext, Spielanweisungen etc. -- +der nicht nur aus ASCII-Zeichen besteht, in UTF-8 kodiert sein +musst. Am einfachsten geht das, indem man einen Texteditor +einsetzt, der mit Unicode-Zeichen umgehen kann. Die meisten +modernen weit verbreiteten Editoren besitzen heute UTF-8-Unterstützung, +wie etwa vim, Emacs, jEdit oder GEdit. Alle MS Windows-Systeme +nach NT benutzen Unicode intern, sodass sogar Notepad Dateien +in UTF-8 lesen und speichern kann. Ein Editor mit mehr +Funktionen unter Windows ist BabelPad oder Notepad++. + +Wenn eine LilyPond-Eingabedatei nicht-ASCII-Zeichen enthält +und nicht in UTF-8 gespeichert ist, gibt es folgende Fehlermeldung: + +@example +FT_Get_Glyph_Name () error: invalid argument +@end example + +Heir ein Beispiel mit Kyrilliza, hebräischem und portugiesischem Text: + +@lilypond[quote] +%c No verbatim here as the code does not display correctly in PDF +% Cyrillic +bulgarian = \lyricmode { + Жълтата дюля беше щастлива, че пухът, който цъфна, замръзна като гьон. +} + +% Hebrew +hebrew = \lyricmode { + זה כיף סתם לשמוע איך תנצח קרפד עץ טוב בגן. +} + +% Portuguese +portuguese = \lyricmode { + à vo -- cê uma can -- ção legal +} + +\relative { + c2 d e f g f e +} +\addlyrics { \bulgarian } +\addlyrics { \hebrew } +\addlyrics { \portuguese } +@end lilypond + +Um einen einzelnen Buchstaben zu notieren, für den die Unicode-Buchstabenfolge +bekannt ist, der aber nicht auf der Tastatur zu finden ist, kann +der Befehl @code{\char ##xhhhh} innerhalb einer @code{\markup}-Umgebung +benutzt werden. Hierbei bedeutet @code{hhhh} die hexadezimale Zahl +für das erforderliche Zeichen. Mit @code{\char ##x03BE} wird +beispielsweise das Unicode-Zeichen U+03BE notiert, welches die +Unicode-Bezeichnung @qq{Greek Small Letter Xi} hat. Alle existierenden +Unicode-Zeichen können auf diese Weise notiert werden, und wenn für alle +Zeichen dieses Format angewandt wird, muss die Datei nicht im utf-8-Format +gespeichert werden. Es muss natürlich auch noch eine Schriftart auf +dem System installiert sein, die die notierten Zeichen darstellen kann. + +Das nächste Beispiel zeigt Unicode-Zeichen an vier Stellen mit dem +Zahlencode notiert: in einem Übungszeichen, als Artikulationszeichen, +im Gesangstext und als normaler Text außerhalb der Partitur. + +@lilypond[quote,verbatim] +\score { + \relative c'' { + c1 \mark \markup { \char ##x03EE } + c1_\markup { \tiny { \char ##x03B1 " to " \char ##x03C9 } } + } + \addlyrics { O \markup { \concat{ Ph \char ##x0153 be! } } } +} +\markup { "Copyright 2008" \char ##x00A9 } +@end lilypond + +Um das Copyright-Zeichen zu notieren, kann folgender Code eingesetzt werden: + +@example +\header @{ + copyright = \markup @{ \char ##x00A9 "2008" @} +@} +@end example @node Displaying LilyPond notation @subsection Displaying LilyPond notation -@untranslated +@funindex \displayLilyMusic +Ein musikalischer Ausdruck in LilyPond-Notation kann mit der Funktion +@code{\displayMusic} angezeigt werden. Der Code -@node Controlling output -@section Controlling output +@example +@{ + \displayLilyMusic \transpose c a, @{ c e g a bes @} +@} +@end example -@untranslated +@noindent +etwa wird ausgeben: + +@example +@{ a, cis e fis g @} +@end example +Normalerweise werden diese Zeilen zusammen mit allen anderen +Nachrichten auf der Kommandozeile ausgegeben. Um sie separat zu +speichern und das Ergebnis von @code{\displayMusic} weiterzubenutzen, +kann die Ausgabe mit folgendem Befehl in eine Datei umgeleitet werden: + +@c TODO What happens under Windows? + +@example +lilypond file.ly >display.txt +@end example + + + +@node Controlling output +@section Controlling output @menu -* Extracting fragments of music:: -* Skipping corrected music:: +* Extracting fragments of music:: +* Skipping corrected music:: @end menu + @node Extracting fragments of music @subsection Extracting fragments of music -@untranslated +Es ist möglich, kleine Abschnitte einer großen Partitur direkt aus der +Quelldatei zu erzeugen. Das kann damit verglichen werden, dass man +mit der Schere bestimmte Regionen ausschneidet. + +Es wird erreicht, indem man die Takte, die ausgeschnitten werden sollen +(engl. to clip = ausschneiden), extra definiert. Mit folgender +Defintion beispielsweise + +@verbatim +\layout { + clip-regions + = #(list + (cons + (make-rhythmic-location 5 1 2) + (make-rhythmic-location 7 3 4))) +} +@end verbatim + +@noindent +wird ein Fragment ausgeschnitten, dass auf der Mitte des fünften Taktes +beginnt und im siebten Takt endet. Die Bedeutung von @code{5 1 2} ist: +nach einer Halben in Takt fünf, @code{7 3 4} heißt: nach drei Vierteln +in Takt 7. + +Weitere Bereiche, die ausgeschnitten werden sollen, können definiert +werden, indem mehrere derartige Paare definiert werden. + +Um diese Funktion auch nutzen zu können, muss LilyPond mit dem +Parameter @code{-dclip-systems} aufgerufen werden. Die Schnipsel +werden als EPS ausgegeben und dann zu PDF und PNG konvertiert, wenn +diese Formate auch als Parameter angegeben werden. + +Zu mehr Information über Ausgabeformate siehe @rprogram{Invoking lilypond}. @node Skipping corrected music @subsection Skipping corrected music -@untranslated + +@funindex skipTypesetting +@funindex showFirstLength +@funindex showLastLength + +Wenn man Noten eingibt oder kopiert, sind meistens nur die Noten nahe dem +Ende (wo gerade neue Noten notiert wurden) wichtig für Kontrolle und +Korrektur. Um die Korrektur zu beschleunigen, kann eingestellt werden, +dass nur die letzten paar Takte angezeigt werden. Das erreicht man +mit dem Befehl + +@verbatim +showLastLength = R1*5 +\score { ... } +@end verbatim + +@noindent +in der Quelldatei. Damit werden nur die letzten fünf Takte (in einem +4/4-Takt) eines jeden @code{\score}-Abschnitts übersetzt. Besonders +bei längeren Stücken ist es meistens sehr viel schneller, nur einen +kleinen Teil des Stückes zu setzen als die gesamte Länge. Wenn man +am Anfang eines Stückes arbeitet (weil etwa ein neuer Teil hinzugefügt +werden soll), kann auch die @code{showFirstLength}-Eigenschaft +nützlich sein. + +Nur bestimmte Teile einer Partitur zu überspringen, kann mit der +Eigenschaft @code{Score.skipTypesetting} sehr genau kontrolliert +werden. Für den Bereich, für den sie auf @qq{wahr} gesetzt wird, +wird kein Notensatz ausgegeben. + +Diese Eigenschaft kann auch benutzt werden, um die MIDI-Ausgabe zu +kontrollieren. Hiermit werden alle Ereignisse, auch Tempo- und +Instrumentenwechsel ausgelassen. Man muss also sehr genau darauf +achten, dass nichts unerwartetes geschieht. + +@lilypond[quote,fragment,ragged-right,verbatim] +\relative c'' { + c8 d + \set Score.skipTypesetting = ##t + e e e e e e e e + \set Score.skipTypesetting = ##f + c d b bes a g c2 } +@end lilypond + +In polyphoner Notation wirkt sich @code{Score.skipTypesetting} auf +alle Stimmen und Systeme aus, sodass noch mehr Zeit bei der +Übersetzung der Datei gespart wird. @node MIDI output @section MIDI output -@untranslated +@cindex Klang +@cindex MIDI + +MIDI (Musical Instrument Digital Interface) ist ein Standard zur +Kontrolle und Interaktion mit digitalen Instrumenten. Eine +MIDI-Datei ist eine Anzahl von Noten auf einer Anzahl von +Bändern/Stimmen. Es ist keine eigentliche Klangdatei, denn man +benötigt spezielle Programme die die Notenereignisse in Klang +umwandeln können. + +Der Notensatz von LilyPond kann in MIDI umgewandelt werden, so dass +man sich anhören kann, was man notiert hat. Das hilft oft sehr gut +bei der Überprüfung: falsche Oktaven oder falsche Versetzungszeichen +lassen sich meist sehr gut hören. + +Die MIDI-Ausgabe benötigt einen Kanal für jedes System und einen für +globale Einstellungen. Darum sollte die Quelldatei für eine MIDI-Datei +nicht mehr als 15 Systeme (oder 14 wenn kein Schlagzeug benützt wird) +besitzen. Jedes weitere System bleibt stumm. @menu -* Creating MIDI files:: -* MIDI block:: -* What goes into the MIDI output?:: -* Repeats in MIDI:: -* Controlling MIDI dynamics:: -* Percussion in MIDI:: +* Creating MIDI files:: +* MIDI block:: +* What goes into the MIDI output?:: +* Repeats in MIDI:: +* Controlling MIDI dynamics:: +* Percussion in MIDI:: @end menu + @node Creating MIDI files @subsection Creating MIDI files -@untranslated +Um eine MIDI-Datei aus einer LilyPond-Quelldatei zu erstellen, muss +eine @code{\midi}-Umgebung zu der @code{\score}-Umgebung hinzugefügt +werden, etwa so: + +@example +\score @{ + @var{...Noten...} + \midi @{ @} +@} +@end example + +Wenn in einer @code{\score}-Umgebung nur eine @code{\midi}-Umgebung, +aber keine @code{\layout}-Umgebung vorkommt, wird nur MIDI produziert. +Wenn auch die Notation gewünscht ist, muss zusätzlich die +@code{\layout}-Umgebung vorhanden sein: + +@example +\score @{ + @var{...music...} + \midi @{ @} + \layout @{ @} +@} +@end example + +Tonhöhen, Rhythmen, Überbindungen, Dynamik und Tempoänderungen werden +korrekt in das MIDI-Format übersetzt. Dynamikzeichen, Crescendo und +Decrescendo werden in den MIDI-Lautstärkekanal übertragen. Dynamikzeichen +werden in einen bestimmten Lautstärkenwert übersetzt, Crescendo und +Decrescendo erreichen einen Übergang zwischen Lautstärkewerten. +Die Wirkung von Dynamikzeichen kann auch aus der MIDI-Datei entfernt +werden. Siehe hierzu @ref{MIDI block}. + +Das Anfangstempo und spätere Tempoänderungen können mit dem +@code{\tempo}-Befehl innerhalb der Notation notiert werden. Er +bewirkt Tempoänderungen auch in der MIDI-Datei. Der Befehl setzt +gleichzeitig auch eine Tempobezeichnung in die Noten, welches aber +auch unterdrückt werden kann, siehe @ref{Metronome marks}. Eine +andere möglichkeit, ein eigenes MIDI-Tempo anzugeben, wird weiter +unten gezeigt, siehe @ref{MIDI block}. @unnumberedsubsubsec Instrument names + +@cindex Instrumentbezeichnungen + +@funindex Staff.midiInstrument + +Das MIDI-Instrument, mit dem ein bestimmtes System wiedergegeben +werden soll, wird durch die @code{Staff.midiInstrument}-Eigenschaft +bestimmt, die auf eine Instrumentenbezeichnung gesetzt werden muss. +Die Bezeichnungen sind aufgelistet in @ref{MIDI instruments} und müssen +in der dort definierten Schreibweise notiert werden. + +@example +\new Staff @{ + \set Staff.midiInstrument = #"glockenspiel" + @var{...Noten...} +@} +@end example + +@example +\new Staff \with @{midiInstrument = #"cello"@} @{ + @var{...Noten...} +@} +@end example + +Wenn die Schreibweise nicht genau einem definierten Instrument aus +der Liste entpsricht, wird ein Piano-Klang benutzt (@code{"acoustic grand"}). + +@snippets + +@lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle] +{changing-midi-output-to-one-channel-per-voice.ly} + +@knownissues + +Veränderungen der MIDI-Lautstärke sind nur effektiv, wenn sie zu Beginn +einer Note angefordert werden, sodass die Lautstärke während einer Notendauer +nicht geändert werden kann. + +Nicht alle MIDI-Spieler können Tempoänderungen richtig wiedergeben. +Spieler, die hierzu in der Lage sind, sind unter Anderen MS Windows Media +Player und @uref{http://@/timidity@/.sourceforge@/.net/,timidity}. + + @node MIDI block @subsection MIDI block -@untranslated +@cindex MIDI-Umgebung + +Eine @code{\midi}-Umgebung muss innerhalb von einer @code{\score}-Umgebung +vorkommen, wenn MIDI-Ausgabe gewünscht ist. Sie entspricht der +@code{\layout}-Umgebung, aber ist etwas einfacher aufgebaut. Oft wird +die MIDI-Umgebung einfach leer gelassen, aber hier können auch +Kontexte umgeändert werden, neue Kontexte definiert werden oder +neue Werte definiert werden. Das folgende Beispiel etwa definiert +das MIDI-Tempo, ohne dass in der Partitur eine Metronombezeichnung +gesetzt wird: + +@example +\score @{ + @var{...Noten...} + \midi @{ + \context @{ + \Score + tempoWholesPerMinute = #(ly:make-moment 72 4) + @} + @} +@} +@end example + +Hier wird das Tempo auf 72 Viertelnoten pro Minute definiert. Wenn +das Tempo auf diese Weise definiert wird, kann keine punktierte +Note als Einheit angegeben werden. Wenn sie benötigt wird, muss +man sie in kleinere Einheiten auflösen. Ein Tempo von 90 punktierten +Viertelnoten pro Minute kann beispielsweise dargestellt werden +als 270 Achtelnoten pro Minute: + +@example +tempoWholesPerMinute = #(ly:make-moment 270 8) +@end example + +@cindex MIDI-Kontextdefinitionen + +Kontextdefinitionen des @code{\midi}-Kontextes entsprechen +der Syntax, wie sie in der @code{\layout}-Umgebung benutzt +wird. Klangübersetzungsmodule werden @code{performer} +genannt. Die Kontexte für die MIDI-Ausgabe sind in der +Datei @file{../ly/@/performer@/-init@/.ly} definiert, siehe +@rlearning{Other sources of information}. Um beispielsweise +die Auswirkung von Dynamikzeichen aus der MIDI-Ausgabe zu +entfernen, müssen folgende Zeilen eingefügt werden: + +@example +\midi @{ + ... + \context @{ + \Voice + \remove "Dynamic_performer" + @} +@} +@end example + +Eine MIDI-Ausgabe wird nur erstellt, wenn die @code{\midi}-Umgebung +in eine Partiturumgebung eingefügt wird, die mit dem Befehl +@code{\score} beginnt. Wenn eine Partitur explizit etwa mit +@code{\new Score} begonnen wird, und sich die MIDI-Umgebung hierin +befindet, wird keine Ausgabe produziert. Eine Lösung ist es, sowohl +die @code{\new Score}- als auch die @code{\midi}-Umgebungen in eine +@code{\score}-Umgebung einzuschließen. + +@example +\score @{ + \new Score @{ @dots{}Noten@dots{} @} + \midi @{ @} +@} +@end example @node What goes into the MIDI output? @subsection What goes into the MIDI output? -@untranslated - @unnumberedsubsubsec Supported in MIDI + +@cindex Tonhöhen in MIDI +@cindex MIDI, Tonhöhen +@cindex Vierteltöne in MIDI +@cindex MIDI, Vierteltöne +@cindex Mikrotöne in MIDI +@cindex MIDI, Mikrotöne +@cindex Akkordsymbole in MIDI +@cindex MIDI, Akkordsymbole +@cindex Rhythmen in MIDI +@cindex MIDI, Rhythmen + +Die folgenden Notationselemente werden in die MIDI-Ausgabe aufgenommen: + +@itemize +@item Tonhöhen +@item Vierteltöne (siehe @ref{Accidentals}. Für die Ausgabe wird ein +Spieler benötigt, der Tonhöhen verändern kann.) +@item Akkorde, die als Symbole notiert werden +@item Rhythmen, die als Dauern notiert sind, inklusive N-tolen +@item Tremolo, das ohne @q{@code{:}[@var{Zahl}]} notiert ist +@item Überbindungen +@item Dynamikzeichen +@item Crescendi, decrescendi zu mehreren Noten +@item Tempoänderungen, die mit einer Tempo-Bezeichnung eingegeben werden +@item Gesangstext +@end itemize + + @unnumberedsubsubsec Unsupported in MIDI + +Folgende Notationselemente werden nicht in die MIDI-Ausgabe einbeozogen: + +@itemize +@item Rhythmus, der als Anmerkung notiert wird, bspw. Swing +@item Tempoveränderungen, die als Anmerkung ohne Tempobezeichnung notiert werden +@item Staccato und andere Artikultationen und Ornamente +@item Legato- und Phrasierungsbögen +@item Crescendi, decrescendi zu einer einzelnen Note +@item Tremolo, notiert mit @q{@code{:}[@var{number}]} +@item Bezifferter Bass +@end itemize + + @node Repeats in MIDI @subsection Repeats in MIDI -@untranslated +@cindex Wiederholungen in MIDI +@cindex MIDI und Wiederholungen + +@funindex \unfoldRepeats + +Mit einigen Veränderungungen im Notentext können alle Wiederholungstypen +auch in der MIDI-Ausgabe wiedergegeben werden. Das wird erreicht, indem +die @code{\unfoldRepeats}-Funktion eingesetzt wird. Diese Funktion +verändert alle Wiederholungen in ausgeschriebene Noten. + +@lilypond[quote,verbatim] +\unfoldRepeats { + \repeat tremolo 8 {c'32 e' } + \repeat percent 2 { c''8 d'' } + \repeat volta 2 {c'4 d' e' f'} + \alternative { + { g' a' a' g' } + {f' e' d' c' } + } +} +\bar "|." +@end lilypond + +Wenn eine Partitur mit diesem Befehl erstellt wird, ist er notwendig, +zwei @code{\score}-Umgebungen einzurichten: in der einen werden die +Wiederholungen ausgeschrieben und nur eine MIDI-Ausgabe produziert, +in der anderen werden die Wiederholungen notiert und als Partitur +gesetzt. Das Beispiel gibt einen Hinweis, wie eine derartige Datei +aussehen kann: + +@example +\score @{ + @var{..music..} + \layout @{ .. @} +@} +\score @{ + \unfoldRepeats @var{..music..} + \midi @{ .. @} +@} +@end example @node Controlling MIDI dynamics @subsection Controlling MIDI dynamics -@untranslated +Dynamik in der MIDI-Ausgabe wird durch den Dynamic_performer +erstellt, welcher sich in einem @code{Voice}-Kontext befindet. +Es ist möglich, sowohl die generelle Lautstärke einer MIDI-Datei +als auch relative Lautstärken von Dynamikanweisungen und auch +relative Lautstärke von einzelnen Instrumenten einzustellen. @unnumberedsubsubsec Dynamic marks + + +Dynamikanweisungen werden als ein bestimmter Bruch der insgesamt +zur Verfügung stehenden MIDI-Lautstärke notiert. Die Standardbrüche +reichen von 0,25 für @notation{ppppp} bis hin zu 0,95 für +@notation{fffff}. Diese Anweisung befinden sich in der Datei +@file{../scm/midi.scm}, siehe auch @rlearning{Other sources of information}. +Diese Brüche können nach Belieben geändert oder erweitert werden, indem +eine Funktion erstellt wird, die ein Dynamikzeichen als Argument +nimmt und den erforderlichen Bruch ausgibt; schließlich muss noch +@code{Score.dynamicAbsoluteVolumeFunction} auf diese Funktion +gesetzt werden. + +Beispielhaft soll gezeigt werden, wie man eine @notation{Rinforzando}-Dynamik, +@code{\rfz}, auch in die MIDI-Ausgabe übernehmen kann. Gleiches gilt +für neue, selbstdefinierte Dynamikzeichen, die in den Standarddefinitionen +nicht enthalten sind. Die Scheme-Funktion, die hier definiert wird, +setzt den Bruch von 0,9 für eine rfz-Anweisung und ruft andernfalls die +Standardanweisungen auf: + +@lilypond[verbatim,quote] +#(define (myDynamics dynamic) + (if (equal? dynamic "rfz") + 0.9 + (default-dynamic-absolute-volume dynamic))) + +\score { + \new Staff { + \set Staff.midiInstrument = #"cello" + \set Score.dynamicAbsoluteVolumeFunction = #myDynamics + \new Voice { + \relative c'' { + a\pp b c-\rfz + } + } + } + \layout {} + \midi {} +} +@end lilypond + +Alternativ, insbesondere wenn die gesamte Tabelle der MIDI-Lautstärken +umdefiniert werden soll, ist es besser, die +@notation{default-dynamic-absolute-volume}-Prozedur in der Datei +@file{../scm/midi.scm} und die hiermit verknüpfte Tabelle als Modell +zu benutzen. Das letzte Beispiel dieses Abschnittes zeigt, wie das +gemacht werden kann. + + @unnumberedsubsubsec Overall MIDI volume + +Die generellen Mindest- und Höchstwerte für die Lautstärke der MIDI-Datei +wird kontrolliert, indem die Eigenschaften @code{midiMinimumVolume} +unde @code{midiMaximumVolume} auf der @code{Score}-Ebene gesetzt +werden. Diese Eigenschaften haben nur Einfluss auf Dynamikzeichen, sodass +ein Dynamikzeichen direkt an den Anfang der Partitur gestellt werden muss, +wenn diese Einstellung von Anfang an Wirkung zeigen soll. Der Bruch, +der dann den einzelnen Dynamikzeichen entspricht, wird mit der +Formel + +@example +midiMinimumVolume + (midiMaximumVolume - midiMinimumVolume) * Bruch +@end example + +@noindent +errechnet. Im folgenden Beispiel wird die generelle MIDI-Lautstärke +auf den Bereich zwischen 0.2 und 0.5 eingeschränkt. + +@lilypond[verbatim,quote] +\score { + << + \new Staff { + \key g \major + \time 2/2 + \set Staff.midiInstrument = #"flute" + \new Voice \relative c''' { + r2 g\mp g fis ~ + fis4 g8 fis e2 ~ + e4 d8 cis d2 + } + } + \new Staff { + \key g \major + \set Staff.midiInstrument = #"clarinet" + \new Voice \relative c'' { + b1\p a2. b8 a + g2. fis8 e + fis2 r + } + } + >> + \layout { } + \midi { + \context { + \Score + tempoWholesPerMinute = #(ly:make-moment 72 2) + midiMinimumVolume = #0.2 + midiMaximumVolume = #0.5 + } + } +} +@end lilypond + + @unnumberedsubsubsec Equalizing different instruments (i) + +Wenn die Mindest- und Höchstwerte für die MIDI-Lautstärke +innerhalb eines @code{Staff}-Kontextes gesetzt werden, +kann damit die relative Lautstärke einzelner Instrumente kontrolliert +werden. Damit kann man die Qualität der MIDI-Datei +merklich verbessern. + +In diesem Beispiel wird die Lautstärke der Klarinette relativ +zur Lautstärke der Flöte verringert. In jeder Stimme muss +eine Dynamikanweisung für die erste Note gesetzt werden, damit +diese Einstellung korrekt funktioniert. + +@lilypond[verbatim,quote] +\score { + << + \new Staff { + \key g \major + \time 2/2 + \set Staff.midiInstrument = #"flute" + \set Staff.midiMinimumVolume = #0.7 + \set Staff.midiMaximumVolume = #0.9 + \new Voice \relative c''' { + r2 g\mp g fis ~ + fis4 g8 fis e2 ~ + e4 d8 cis d2 + } + } + \new Staff { + \key g \major + \set Staff.midiInstrument = #"clarinet" + \set Staff.midiMinimumVolume = #0.3 + \set Staff.midiMaximumVolume = #0.6 + \new Voice \relative c'' { + b1\p a2. b8 a + g2. fis8 e + fis2 r + } + } + >> + \layout { } + \midi { + \context { + \Score + tempoWholesPerMinute = #(ly:make-moment 72 2) + } + } +} +@end lilypond + + @unnumberedsubsubsec Equalizing different instruments (ii) +Wenn Mindest- und Höchstwerte für die Lautstärke der MIDI-Datei +nicht vorgegeben werden, nimmt LilyPond standardmäßig einige +Anpassungen für die Lautstärken bestimmter Instrumente vor. +Diese Instrumente und ihre entsprechende Veränderung lassen +sich aus der Tabelle @notation{instrument-equalizer-alist} +in der Datei @file{../scm/midi.scm} entnehmen. + +Dieser grundlegende Equalizer kann ersetzt werden, indem die +Funktion @code{instrumentEqualizer} im @code{Score}-Kontext auf +eine neue Scheme-Funktion gesetzt wird, die MIDI-Instrumentbezeichnungen +als einziges Argument akzeptiert und ein Zahlenpaar ausgibt, das +den Höchst- und Mindestwert für die Lautstärke des entpsrechenden +Instruments darstellt. Die Ersetzung der Standardfunktion wird +auf gleiche Weise vorgenommen, wie es schon für die +@code{dynamicAbsoluteVolumeFunction} zu Beginn dieses Abschnittes +gezeigt wurde. Der Standard-Equalizer, +@notation{default-instrument-equalizer} in der Datei +@file{../scm/midi.scm} zeigt, wie solche eine Funktion erstellt werden +kann. + +Das folgende Beispiel definiert für die Flöte und Klarinette relative +Lautstärkewerte, die denen des vorigen Beispiels entsprechen. + +@lilypond[verbatim,quote] +#(define my-instrument-equalizer-alist '()) + +#(set! my-instrument-equalizer-alist + (append + '( + ("flute" . (0.7 . 0.9)) + ("clarinet" . (0.3 . 0.6))) + my-instrument-equalizer-alist)) + +#(define (my-instrument-equalizer s) + (let ((entry (assoc s my-instrument-equalizer-alist))) + (if entry + (cdr entry)))) + +\score { + << + \new Staff { + \key g \major + \time 2/2 + \set Score.instrumentEqualizer = #my-instrument-equalizer + \set Staff.midiInstrument = #"flute" + \new Voice \relative c''' { + r2 g\mp g fis ~ + fis4 g8 fis e2 ~ + e4 d8 cis d2 + } + } + \new Staff { + \key g \major + \set Staff.midiInstrument = #"clarinet" + \new Voice \relative c'' { + b1\p a2. b8 a + g2. fis8 e + fis2 r + } + } + >> + \layout { } + \midi { + \context { + \Score + tempoWholesPerMinute = #(ly:make-moment 72 2) + } + } +} +@end lilypond + + + @node Percussion in MIDI @subsection Percussion in MIDI -@untranslated +Schlagzeuginstrumente werden üblicherweise in einem @code{DrumStaff}-Kontext +notiert. Aus diese Weise werden sie korrekt in den MIDI-Kanal@tie{}10 +ausgegeben. Eine Schlagzeuge mit diskreten Tonhöhen, wie Xylophon, +Marima, Vibraphone, Pauken usw. werden wie @qq{normale} Instrumente +in einem @code{Staff}-Kontext notiert. Nur so lässt sich auch hier +eine richtige MIDI-Ausgabe erreichen. + +Einige Instrumente, die keine diskreten Tonhöhen haben, können nicht +über den MIDI-Kanal@tie{}10 erreicht werden und müssen deshalb in +einem normalen @code{Staff}-Kontext notiert werden. Es handelt sich +um @code{melodic tom, taiko drum, synth drum} usw. + +Viele Schlagzeuginstrumnete sind nicht in den MIDI-Standard aufgenommen, +z. B. Kastagnetten. Die einfachste Methode, derartige Instrumente +zu ersetzen, ist, einen Klang auszuwählen, der ihnen halbwegs ähnlich +kommt. + + +@knownissues + +Weil der MIDI-Standard keine Peitschenschläge kennt, wird ein +Schlagstock (sidestick) für diesen Zweck eingesetzt. diff --git a/Documentation/de/user/install.itely b/Documentation/de/user/install.itely index 9cb6b7fac7..9e89826b30 100644 --- a/Documentation/de/user/install.itely +++ b/Documentation/de/user/install.itely @@ -7,7 +7,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @c Translators: Till Rettig, Reinhold Kainhofer diff --git a/Documentation/de/user/introduction.itely b/Documentation/de/user/introduction.itely index 19b385d9f0..eddb09755a 100644 --- a/Documentation/de/user/introduction.itely +++ b/Documentation/de/user/introduction.itely @@ -1,13 +1,13 @@ @c -*- coding: utf-8; mode: texinfo; -*- @c This file is part of lilypond.tely @ignore - Translation of GIT committish: 2c00bdbfaf62dd90863331c4713e6b29e32c9322 + Translation of GIT committish: 4770e4e71ebff6104cad46bd2d889c3ff6ba3875 When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @c Translators: Till Rettig, Reinhold Kainhofer @node Introduction diff --git a/Documentation/de/user/keyboards.itely b/Documentation/de/user/keyboards.itely index fd76cbb8f6..d470b87bff 100644 --- a/Documentation/de/user/keyboards.itely +++ b/Documentation/de/user/keyboards.itely @@ -1,13 +1,13 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*- @c This file is part of lilypond.tely @ignore - Translation of GIT committish: 2c00bdbfaf62dd90863331c4713e6b29e32c9322 + Translation of GIT committish: 23342b5b9f69f3a82751052f79f3fede0bb40ded When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @node Keyboard and other multi-staff instruments @section Keyboard and other multi-staff instruments @@ -112,6 +112,13 @@ können, sind demonstriert in @end itemize + +@c @snippets +@c @lilypondfile[verbatim,lilyquote,texidoc,doctitle] +@c {forcing-visibility-of-systems-with-multi-bar-rests-when-using-\RemoveEmptyStaffContext.ly} +@c http://lsr.dsi.unimi.it/LSR/Item?u=1&id=312 + + @seealso Handbuch zum Lernen: @rlearning{Real music example}, @@ -270,14 +277,22 @@ Notenhöhen. Wenn individuelle Kontrolle über die einzelen Systeme benötigt wird, können sie manuell mit den Bezeichnungen @code{"up"} und @code{"down"} erstellt werden. Der @code{\autochange}-Befehl -wechselt dann die Stimme zwischen den Systemen. Das ist etwa -nötig, damit ein Tonart für das untere System definiert werden -kann. +wechselt dann die Stimme zwischen den Systemen. -@lilypond[quote,verbatim] +@warning{Wenn Systeme manuell erstellt werden, @strong{müssen} sie genau +die Bezeichnungen @code{"up"} und @code{"down"} bekommen, damit die +automatische Wechselfunktion sie erkennen kann.} + +Systeme müssen etwa manuell erstellt werden, damit die Tonart im unteren +System gesetzt werden kann: + +@c Keep Ly needed, otherwise 'up' and 'down' get +@c incorrectly translated in verbatim output +@c KEEP LY +@lilypond[quote,verbatim,nogettext] \new PianoStaff << \new Staff = "up" { - \new Voice = "melOne" { + \new Voice = "melodieEins" { \key g \major \autochange \relative c' { g8 b a c b d c e @@ -561,33 +576,47 @@ Anzahl an Symbolen wird benutzt um die Wechsel anzuzeigen. Schnipsel: @rlsr{Keyboards}. + + +@node Harp +@subsection Harp + +Dieser Abschnitt zeigt Eigenheiten der Notation für Harfe. + @menu -* Harp notation:: +* References for harps:: * Harp pedals:: @end menu -@node Harp -@subsection Harp +@node References for harps +@unnumberedsubsubsec References for harps -TBC +@cindex Harfe -@ignore -Some possibilities: -- glissandi -- tremolo (for bisbigliando) -- natural harmonics -- directional arpeggio and non-arpeggio -- workaroung for keeping both staves visible in an orchestral - score, -http://lists.gnu.org/archive/html/lilypond-user/2007-08/msg00386.html -and http://lsr.dsi.unimi.it/LSR/Item?u=1&id=312 - -An LSR snippet could be used to demonstrate the main items; in the -case of glissandi, it would be desirable to have a demonstration -of different styles. +Einige übliche Notationseigenheiten für Harfe sind woanders behandelt: + +@itemize + +@item Glissando ist die üblichste Harfentechnik, siehe +@ref{Glissando}. + +@item Ein @notation{Bisbigliando} wird als ein Tremolo notiert, siehe @ref{Tremolo +repeats} + +@item Flageolettöne werden hier beschrieben: @ref{Harmonics}. + +@item Für Arpeggio und non-arpeggio, siehe @ref{Arpeggio}. + +@end itemize + +@seealso +Notationsreferenz: +@ref{Tremolo repeats} +@ref{Glissando} +@ref{Arpeggio} +@ref{Harmonics} -@end ignore @node Harp pedals @@ -628,4 +657,5 @@ Trenner. Ein @code{o} vor der Definition umrandet das Symbol. @seealso Notationsreferenz: -@ruser{Text scripts} +@ref{Text scripts} +@ref{Instrument Specific Markup}. diff --git a/Documentation/de/user/lilypond-book.itely b/Documentation/de/user/lilypond-book.itely index 60338da0b8..e0e0820209 100644 --- a/Documentation/de/user/lilypond-book.itely +++ b/Documentation/de/user/lilypond-book.itely @@ -1,13 +1,13 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*- @c This file is part of lilypond-program.tely @ignore - Translation of GIT committish: 2c00bdbfaf62dd90863331c4713e6b29e32c9322 + Translation of GIT committish: 4770e4e71ebff6104cad46bd2d889c3ff6ba3875 When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @c Translators: Reinhold Kainhofer @c Translation checkers: Till Rettig @@ -705,6 +705,13 @@ erzeugt ein Zitat der Form f2 e @end example +@noindent +Wenn Kommentare und Variablen im Zitat, aber nicht im Quelltext +übersetzt werden sollen, kann die Umgebungsvariable @code{LYDOC_LOCALEDIR} +auf einen Verzeichnispfad gesetzt werden. Das Verzeichnis sollte +einen Baum an @file{.mo}-Nachrichtenkatalogen beinhalten mit +@code{lilypond-doc} als Domain. + @item addversion (Nur innerhalb von Texinfo-Dateien.) Stellt @code{\version @@w@{"@@version@{@}"@}} an den Beginn des Fragments der Ausgabe mit @@ -741,8 +748,8 @@ so liefert der folgende Aufruf von @code{lilypond-book} das gewünschte Ergebnis: @example -lilypond-book --process="lilypond --format=tex --tex \ - --header=texidoc test.texinfo +lilypond-book --pdf --process="lilypond \ + -dbackend=eps --header=texidoc" test.texinfo @end example Die meisten Test-Dateien (im @file{input/} Verzeichnis von LilyPond) @@ -771,6 +778,10 @@ als @code{@@lydoctitle @var{Text}} eingefügt. @code{@@lydoctitle} muss allerdings in Ihrem Texinfo-Dokument als Makro selbst definiert werden. Die Übersetzung funktioniert völlig analog zu @code{texidoc}. +@item nogettext +Nur für Texinfo-Ausgabe: Kommentare und Variablenbezeichnungen im +zitierten Quelltext des Schnipsel werden nicht übersetzt. + @item printfilename Wenn eine LilyPond-Datei mittels @code{\lilypondfile} und dieser Option eingebunden wird, wird der Dateiname (ohne die Pfadangabe) unmittelbar vor diff --git a/Documentation/de/user/literature.itely b/Documentation/de/user/literature.itely index 329497311c..fd1f6edaeb 100644 --- a/Documentation/de/user/literature.itely +++ b/Documentation/de/user/literature.itely @@ -1,13 +1,13 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*- @c This file is part of lilypond.tely @ignore - Translation of GIT committish: b54fc6953a8d70a3c51e8c3d0cbf9b3fe9652d78 + Translation of GIT committish: 2c00bdbfaf62dd90863331c4713e6b29e32c9322 When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @node Literature list @@ -18,6 +18,7 @@ hier einige interessante Titel gesammelt. @table @cite + @item Ignatzek 1995 Klaus Ignatzek, Die Jazzmethode für Klavier. Schott's Söhne 1995. Mainz, Germany ISBN 3-7957-5140-3. diff --git a/Documentation/de/user/macros.itexi b/Documentation/de/user/macros.itexi index 261ae0561b..8ef9d79167 100644 --- a/Documentation/de/user/macros.itexi +++ b/Documentation/de/user/macros.itexi @@ -1,6 +1,6 @@ @c -*- coding: utf-8; mode: texinfo; -*- @ignore - Translation of GIT committish: 2881ea603b63e4e335dc1104b0c22c71f373b20d + Translation of GIT committish: 4770e4e71ebff6104cad46bd2d889c3ff6ba3875 When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. diff --git a/Documentation/de/user/notation-appendices.itely b/Documentation/de/user/notation-appendices.itely index 38219d460e..0108aac334 100644 --- a/Documentation/de/user/notation-appendices.itely +++ b/Documentation/de/user/notation-appendices.itely @@ -1,13 +1,13 @@ @c -*- coding: utf-8; mode: texinfo; -*- @c This file is part of lilypond.tely @ignore - Translation of GIT committish: 2c00bdbfaf62dd90863331c4713e6b29e32c9322 + Translation of GIT committish: 23342b5b9f69f3a82751052f79f3fede0bb40ded When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @node Notation manual tables @appendix Notation manual tables @@ -197,11 +197,11 @@ halbverminderte Septime @tab Verminderter Dreklang, kleine Sept @tab -@code{dim5m7} +@code{m7.5-} @tab @lilypond[line-width=3\cm,noragged-right, notime] \chordmode { - c1:dim5m7 + c1:m7.5- } @end lilypond @@ -210,11 +210,11 @@ Kleine MollSept @tab Molldreiklang, Durseptime @tab -@code{7m5} +@code{maj7.5-} @tab @lilypond[line-width=3\cm,noragged-right, notime] \chordmode { - c1:7m5 + c1:maj7.5- } @end lilypond @@ -245,7 +245,7 @@ Molldreiklang, Sexte @end lilypond @item -Dominantnon +Dominantnone @tab Dominantsept, große None @tab @@ -260,7 +260,7 @@ Dominantsept, große None @item Dur None @tab -TODO +Große None, große Septime @tab @code{maj9} @tab @@ -273,7 +273,7 @@ TODO @item Moll None @tab -TODO +Große None, kleine Septime @tab @code{m9} @tab @@ -284,9 +284,9 @@ TODO @end lilypond @item -Dominantundecime +Dominantundezime @tab -Dominant ninth, perfect eleventh +Dominantnone, perfekte Undezime @tab @code{11} @tab @@ -297,9 +297,9 @@ Dominant ninth, perfect eleventh @end lilypond @item -Durundecime +Durundezime @tab -TODO +Große None, perfekte Unidezime @tab @code{maj11} @tab @@ -310,9 +310,9 @@ TODO @end lilypond @item -Mollundecime +Mollundezime @tab -TODO +Kleine None, perfekte Undezime @tab @code{m11} @tab @@ -325,7 +325,18 @@ TODO @item Dominant-13 @tab -Dominant eleventh, major thirteenth +Dominantnone, große 13 +@tab +@code{13} +@tab +@lilypond[line-width=3\cm,noragged-right, notime] +\chordmode { + c1:13 +} +@end lilypond + +@item +Dominant-13 @tab @code{13.11} @tab @@ -338,7 +349,7 @@ Dominant eleventh, major thirteenth @item Dur-13 @tab -TODO +Große Undezime, große 13 @tab @code{maj13.11} @tab @@ -351,7 +362,7 @@ TODO @item Moll-13 @tab -TODO +Kleine Undezime, große 13 @tab @code{m13.11} @tab @@ -362,9 +373,9 @@ TODO @end lilypond @item -erniedrigte Sekunde +Sekundakkord @tab -TODO +große Sekunde, perfekte Quinte @tab @code{sus2} @tab @@ -375,9 +386,9 @@ TODO @end lilypond @item -erniedrigte Quarte +Quartakkord @tab -TODO +perfekte Quarte, perfekte Quinte @tab @code{sus4} @tab diff --git a/Documentation/de/user/notation.itely b/Documentation/de/user/notation.itely index eb64524f8c..2a47870a7a 100644 --- a/Documentation/de/user/notation.itely +++ b/Documentation/de/user/notation.itely @@ -6,7 +6,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @node Musical notation @chapter Musical notation diff --git a/Documentation/de/user/percussion.itely b/Documentation/de/user/percussion.itely index 6421de8038..b61d75e741 100644 --- a/Documentation/de/user/percussion.itely +++ b/Documentation/de/user/percussion.itely @@ -1,13 +1,13 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*- @c This file is part of lilypond.tely @ignore - Translation of GIT committish: 2c00bdbfaf62dd90863331c4713e6b29e32c9322 + Translation of GIT committish: 23342b5b9f69f3a82751052f79f3fede0bb40ded When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.62" +@c \version "2.12.0" @node Percussion @section Percussion @@ -388,8 +388,6 @@ down = \drummode { bd4 sn bd toml8 toml } @snippets -FIXME: MOVE ALL THESE TO LSR! -gp - Hier einige Beispiele: Zwei Holzblöcke, notiert mit wbh (hoch) und wbl (tief) @@ -437,7 +435,7 @@ Tamburin, notiert mit @code{tamb}: tambustaff = { \override Staff.StaffSymbol #'line-positions = #'( 0 ) \override Staff.BarLine #'bar-size = #3 - \set DrumStaff.instrumentName = "Tambourine" + \set DrumStaff.instrumentName = #"Tambourine" } \new DrumStaff { @@ -463,7 +461,7 @@ Noten für Tam-Tam (notiert mit @code{tt}): tamtamstaff = { \override Staff.StaffSymbol #'line-positions = #'( 0 ) \override Staff.BarLine #'bar-size = #3 - \set DrumStaff.instrumentName = "Tamtam" + \set DrumStaff.instrumentName = #"Tamtam" } \new DrumStaff { @@ -487,7 +485,7 @@ bellstaff = { \override DrumStaff.StaffSymbol #'line-positions = #'(-2 3) \set DrumStaff.drumStyleTable = #(alist->hash-table mydrums) \override Staff.BarLine #'bar-size = #3 - \set DrumStaff.instrumentName = "Different Bells" + \set DrumStaff.instrumentName = #"Different Bells" } \new DrumStaff { @@ -554,7 +552,7 @@ drumsB = { } \new DrumStaff { - \set DrumStaff.instrumentName = "Grosse Caisse" + \set DrumStaff.instrumentName = #"Grosse Caisse" \set DrumStaff.drumStyleTable = #(alist->hash-table mydrums) \drumsB } >> diff --git a/Documentation/de/user/pitches.itely b/Documentation/de/user/pitches.itely index 6e1c37077c..7bc3039b21 100644 --- a/Documentation/de/user/pitches.itely +++ b/Documentation/de/user/pitches.itely @@ -1,12 +1,12 @@ @c -*- coding: utf-8; mode: texinfo; -*- @ignore - Translation of GIT committish: 2c00bdbfaf62dd90863331c4713e6b29e32c9322 + Translation of GIT committish: 23342b5b9f69f3a82751052f79f3fede0bb40ded When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @node Pitches @section Pitches @@ -47,6 +47,7 @@ Modus besser. @cindex Tonhöhenbezeichnungen @cindex Absoluter Modus: Tonhöhen @cindex Absolute Spezifikation von Oktaven +@cindex Angabe der Oktave: absolut Tonhöhenbezeichnungen werden durch Kleinbuchstaben von@tie{}@code{a} bis@tie{}@code{g} angegeben. Dabei @@ -70,6 +71,7 @@ d e f g @cindex Oktavwechsel: Tonhöhe @cindex Wechsel der Oktave @cindex Tonhöhe: Wechsel der Oktave + @funindex ' @funindex , @@ -101,8 +103,11 @@ Schnipsel: @cindex Relativ @cindex Relative Oktavbestimmung +@cindex Oktavbestimmung, relativ @cindex Noteneingabe: relative Oktavbestimmung + @funindex \relative +@funindex relative Wenn Oktaven im absoluten Modus notiert, passiert es schnell, eine Note auf der falschen Oktave zu notieren. Mit @@ -178,6 +183,10 @@ aber trotzdem weite Intervalle umfassen: } @end lilypond +@cindex Akkorde und relativer Modus +@cindex relativer Modus und Akkorde +@cindex Oktavenmodus (relativ) und Akkorde + Wenn der vorherige Ausdruck ein Akkord ist, wird die erste Note des Akkordes benutzt, um die erste Note des nächsten Akkordes zu bestimmen. Innerhalb von Akkorden ist die nächste Note immer @@ -230,9 +239,13 @@ Referenz der Interna: @cindex Relativer Oktavenmodus und Transposition @cindex Transposition und relativer Modus + @funindex \transpose @funindex \chordmode @funindex \relative +@funindex transpose +@funindex chordmode +@funindex relative @knownissues @@ -270,8 +283,10 @@ Mehr Information dazu in @rlearning{Accidentals and key signatures}.} @cindex Notenbezeichnungen, Deutsch +@cindex Notenbezeichnungen, Holländisch @cindex Notenbezeichnungen, Standard @cindex Versetzungszeichen, Deutsch +@cindex Standardnotenbezeichnungen @cindex Kreuz @cindex B @cindex Doppelkreuz @@ -319,6 +334,8 @@ a4 aes a2 @cindex Vorzeichen, Vierteltöne @cindex Versetzungszeichen, Vierteltöne @cindex Mikrotöne +@cindex Halbkreuz +@cindex Halb-B Versetzungszeichen für Vierteltöne werden durch Anhängen der Endungen @code{-eh} (Erniedrigung) und @code{-ih} (Erhöhung) an den @@ -336,8 +353,9 @@ ceseh1 ces ceh c cih cis cisih @cindex Vorzeichen in Klammern @cindex Erinnerungsvorzeichen @cindex Warnungsvorzeichen -@funindex ? @cindex Klammern um Vorzeichen + +@funindex ? @funindex ! Normalerweise werden Versetzungszeichen automatisch gesetzt, aber @@ -560,8 +578,10 @@ Dieser Abschnitt zeigt, wie man Tonhöhen beeinflusst. @cindex Oktavenüberprüfung @cindex Oktavierungskorrektur @cindex Kontroll-Tonhöhe + @funindex = @funindex \octaveCheck +@funindex octaveCheck @funindex controlpitch Im relativen Modus geschieht es recht häufig, dass ein @@ -637,7 +657,9 @@ Referenz der Interna: @cindex Transponieren @cindex Noten, transponieren @cindex Tonhöhen, transponieren + @funindex \transpose +@funindex transpose Ein musikalischer Ausdruck kann mit dem Befehl @code{\transpose} transponiert werden. Die Syntax lautet: @@ -666,9 +688,6 @@ werden auch die Vorzeichen entsprechend angepasst: } @end lilypond -@cindex Transponierende Instrumente -@cindex Instrumente, transponierende - Wenn eine Stimme, die in C notiert ist, von einer A-Klarinette gespielt werden soll (für die A als C notiert wird, aber eine kleine Terz tiefer erklingt als es notiert @@ -754,6 +773,9 @@ Referenz der Interna: @funindex \transpose @funindex \chordmode @funindex \relative +@funindex transpose +@funindex chordmode +@funindex relative @knownissues @@ -782,7 +804,6 @@ verändern werden kann. @node Clef @unnumberedsubsubsec Clef -@funindex \clef @cindex G-Schlüssel @cindex C-Schlüssel @cindex F-Schlüssel @@ -805,6 +826,9 @@ verändern werden kann. @cindex Schlüssel, G @cindex Schlüssel, F +@funindex \clef +@funindex clef + Der Schlüssel kann verändert werden. Das eingestrichene C wird in jedem Beispiel gezeigt: @@ -845,10 +869,11 @@ c2 c Weitere unterstützte Schlüssel sind beschrieben in @ref{Ancient clefs}. -@cindex transposing clefs -@cindex clef, transposing -@cindex octave transposition -@cindex choral tenor clef +@cindex transponierende Schlüssel +@cindex Schlüssel, transponierend +@cindex Oktavtransposition +@cindex Chor-Tenorschlüssel +@cindex Tenorschlüssel, Chor Indem @code{_8} oder @code{^8} an die jeweilige Schlüsselbezeichnung angehängt wird, wird der Schlüssel um eine Oktave nach oben oder unten @@ -889,7 +914,9 @@ Referenz der Interna: @cindex Tonart @cindex Vorzeichen + @funindex \key +@funindex key @c duplicated in Key signature and Accidentals @warning{Neue Benutzer sind manchmal verwirrt, wie @@ -923,6 +950,17 @@ Die Tonart kann geändert werden: @funindex \lydian @funindex \phrygian @funindex \dorian +@funindex minor +@funindex major +@funindex minor +@funindex ionian +@funindex locrian +@funindex aeolian +@funindex mixolydian +@funindex lydian +@funindex phrygian +@funindex dorian + @cindex Kirchentonarten @cindex Modus @cindex Dur @@ -988,7 +1026,10 @@ Referenz der Interna: @cindex 8va @cindex 8ve @cindex Oktavierung + @funindex set-octavation +@funindex \ottava +@funindex ottava @notation{Oktavierungsklammern} zeigen eine zusätzliche Transposition von einer Oktave an: @@ -1034,7 +1075,9 @@ Referenz der Interna: @cindex Transponierendes Instrument @cindex MIDI @cindex MIDI-Transposition + @funindex \transposition +@funindex transposition Wenn man Noten setzt, die von transponierenden Instrumenten gespielt werden, sind oft einige Stimmen auf einer @@ -1069,8 +1112,8 @@ spielen unisono. \new GrandStaff << \new Staff = "violin" { \relative c'' { - \set Staff.instrumentName = "Vln" - \set Staff.midiInstrument = "violin" + \set Staff.instrumentName = #"Vln" + \set Staff.midiInstrument = #"violin" % not strictly necessary, but a good reminder \transposition c' @@ -1081,7 +1124,7 @@ spielen unisono. \new Staff = "clarinet" { \relative c'' { \set Staff.instrumentName = \markup { Cl (B\flat) } - \set Staff.midiInstrument = "clarinet" + \set Staff.midiInstrument = #"clarinet" \transposition bes \key d \major @@ -1096,7 +1139,7 @@ geändert werden. Ein Klarinetist zum Beispiel kann zwischen B- und A-Klarinette wechseln. @lilypond[verbatim,quote,relative=2] -\set Staff.instrumentName = "Cl (A)" +\set Staff.instrumentName = #"Cl (A)" \key a \major \transposition a c d e f @@ -1131,8 +1174,10 @@ Schnipsel: @cindex Automatische Versetzungszeichen @cindex Versetzungszeichen, automatisch @cindex Standard-Versetzungszeichenstil + @funindex set-accidental-style @funindex voice +@funindex default Es gibt viele unterschiedliche Regeln, wie Versetzungszeichen notiert werden. LilyPond hat eine Funktion, mit der @@ -1163,8 +1208,6 @@ Folgende Versetzungszeichenstile sind unterstützt. Um jeden Stil zu erklären, wird folgendes Beispiel benützt: -@funindex default - @lilypond[verbatim,quote] musicA = { << @@ -1237,7 +1280,6 @@ in beiden Systemen benutzt werden soll: @cindex Standard-Versetzungszeichenstil @cindex Versetzungszeichenstil, Standard -@funindex default Das ist das Standardverhalten. Es entspricht der Konvention für Notation von Musik des 18. Jahrhunderts: @@ -1302,6 +1344,7 @@ musicB = { @cindex Versetzungszeichenstil modern @cindex Versetzungszeichenstil, modern-cautionary @cindex modern-Warnung-Versetzungszeichenstil + @funindex voice Das normale Verhalten ist es, die Versetzungszeichen @@ -1372,6 +1415,7 @@ musicB = { @cindex Versetzungszeichen, moderne Stile @cindex Moderner Stil, Versetzungszeichen + @funindex modern Dieser Stil orientiert sich an den üblichen Regeln für @@ -1435,6 +1479,7 @@ musicB = { @cindex Versetzungszeichen, moderner Stil mit Warnungen @cindex moderner Versetzungszeichenstil @cindex moderner Verseztungszeichenstil mit Warnungen + @funindex modern-cautionary Dieser Stil ähnelt @code{modern}, aber die @qq{zusätzlichen} @@ -1497,6 +1542,7 @@ musicB = { @cindex moderner Versetzungszeichenstil @cindex moderne Versetzungszeichen @cindex Stimmen, Versetzungszeichen für + @funindex modern-voice Diese Regel wird für vielstimmige Noten benutzt, die sowohl von @@ -1558,6 +1604,7 @@ musicB = { @cindex Versetzungszeichenstil, modern mit Warnung für Stimmen @cindex Stimmen, Versetzungszeichenstil mit Warnung für Stimmen @cindex moderner Versetzungszeichensitl mit Warnungen für Stimmen + @funindex modern-voice-cautionary @item modern-voice-cautionary (modern mit Warnungen für einzelne Stimmen) @@ -1620,6 +1667,7 @@ musicB = { @cindex Versetzungszeichen für Klavier @cindex Klavier-Versetzungszeichenstil @cindex Piano-Versetzungszeichenstil + @funindex piano Dieser Stil orientiert sich an den Regeln im 20. Jahrhundert für die @@ -1678,6 +1726,7 @@ musicB = { @item piano-cautionary (Klavier mit Warnungen) @funindex piano-cautionary + @cindex Versetzungszeichen, piano cautionary @cindex Warnungsversetzungszeichen für Klavier @cindex Klavier: Warnungsversetzungszeichen @@ -1735,6 +1784,7 @@ musicB = { @item neo-modern @funindex neo-modern + @cindex neo-moderner Versetzungszeichenstil @cindex Versetzungszeichenstil, neo-modern @@ -1792,6 +1842,7 @@ musicB = { @item neo-modern-cautionary (neo-modern mit Warnungen) @funindex neo-modern-cautionary + @cindex neo-modern-cautionary-Versetzungszeichenstil @cindex Versetzungszeichenstil neo-modern mit Warnungen @cindex Warnungsversetzungszeichen, neo-modern @@ -1849,6 +1900,7 @@ musicB = { @item dodecaphonic (Zwölftonmusik) @funindex dodecaphonic + @cindex dodekaphoner Versetzungszeichenstil @cindex Zwölftonmusik, Versetzungszeichenstil @cindex Versetzungszeichenstil, Zwölftonmusik @@ -1908,6 +1960,7 @@ musicB = { @item teaching (didaktisch) @funindex teaching + @cindex teaching-Versetzungszeichenstil @cindex Versetzungszeichenstil teaching @cindex didaktischer Versetzungszeichenstil @@ -1970,6 +2023,7 @@ musicB = { @item no-reset (nicht zurücksetzen) @funindex no-reset + @cindex Versetzungszeichenstil, no reset @cindex Versetzungszeichenstil: nicht zurücksetzen @@ -2025,6 +2079,7 @@ musicB = { @item forget (vergessen) @funindex forget + @cindex forget-Versetzungszeichenstil @cindex Versetzungszeichenstil forget @cindex Versetzungszeichenstil Vergessen @@ -2214,6 +2269,7 @@ Dieser Abschnitt zeigt, wie man Notenköpfe ändern kann. @cindex Gitarrennotenköpfe @cindex Flageolett-Notenköpfe @cindex Stile, Notenköpfe + @funindex cross Notenköpfe können verändert werden: @@ -2267,6 +2323,11 @@ Referenz der Interna: @cindex Anfänger, Notenlernen @cindex Notenköpfe für Anfänger +@funindex \easyHeadsOn +@funindex easyHeadsOn +@funindex \easyHeadsOff +@funindex easyHeadsOff + Die @qq{einfachen Notenköpfe} haben die Bezeichnung der Note im Kopf gedruckt. Das wird eingesetzt, um die Notation beizubringen. Damit die Buchstaben noch lesbar sind, müssen sie sehr groß @@ -2315,9 +2376,13 @@ Referenz der Interna: @cindex Form-Notenköpfe @cindex Aiken-Notenköpfe @cindex sacred harp-Notenköpfe + @funindex \key @funindex \aikenHeads @funindex \sacredHarpHeads +@funindex key +@funindex aikenHeads +@funindex sacredHarpHeads In dieser Notation haben die Notenköpfe eine Form, die ihrer harmonischen Funktion innherhalb der Tonleiter entspricht. Die @@ -2336,9 +2401,6 @@ Die unterschiedlichen Formen richten sich nach der Stufe in der Skala, wobei der Grundton der Skala aus dem @code{\key}-Befehl entnommen wird. -@funindex \aikenHeads -@funindex \sacredHarpHeads - @predefined @code{\aikenHeads}, @code{\sacredHarpHeads}. @@ -2375,6 +2437,11 @@ Referenz der Interna: @cindex Strichnotenköpfe @cindex Striche: Notenköpfe +@funindex \improvisationOn +@funindex improvisationOn +@funindex \improvisationOff +@funindex improvisationOff + Improvisation wird manchmal angezeigt, indem schräge Notenköpfe gesetzt werden, wenn der Spieler eine beliebige Tonhöhe wählen kann aber den vorgegebenen Rhythmus spielen soll. Sie können wie folgt @@ -2394,9 +2461,6 @@ benutzt werden: } @end lilypond -@funindex \improvisationOn -@funindex \improvisationOff - @predefined @code{\improvisationOn}, @code{\improvisationOff}. diff --git a/Documentation/de/user/preface.itely b/Documentation/de/user/preface.itely index 74f370d158..90557d6310 100644 --- a/Documentation/de/user/preface.itely +++ b/Documentation/de/user/preface.itely @@ -7,7 +7,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @node Preface @unnumbered Preface diff --git a/Documentation/de/user/programming-interface.itely b/Documentation/de/user/programming-interface.itely index ff9bf97237..f3c546adbb 100644 --- a/Documentation/de/user/programming-interface.itely +++ b/Documentation/de/user/programming-interface.itely @@ -1,7 +1,7 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*- @c This file is part of lilypond.tely @ignore - Translation of GIT committish: 4a527608c5ff2ce31e596495d00dce181dc1b9ea + Translation of GIT committish: 8405b88e6c1aac6c44e6064dd7b8b1674d6e7abd When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @@ -21,7 +21,8 @@ * Markup programmer interface:: * Contexts for programmers:: * Scheme procedures as properties:: -* TODO moved into scheme:: +* Using Scheme code instead of \tweak:: +* Difficult tweaks:: @end menu @node Music functions @@ -209,25 +210,14 @@ @untranslated -@node TODO moved into scheme -@section TODO moved into scheme - -@untranslated - - -@menu -* Using Scheme code instead of \tweak:: -* Difficult tweaks:: -@end menu - @node Using Scheme code instead of \tweak -@subsection Using Scheme code instead of @code{\tweak} +@section Using Scheme code instead of @code{\tweak} @untranslated @node Difficult tweaks -@subsection Difficult tweaks +@section Difficult tweaks @untranslated diff --git a/Documentation/de/user/repeats.itely b/Documentation/de/user/repeats.itely index 8951358c89..5a22d40bed 100644 --- a/Documentation/de/user/repeats.itely +++ b/Documentation/de/user/repeats.itely @@ -6,7 +6,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @node Repeats @section Repeats diff --git a/Documentation/de/user/rhythms.itely b/Documentation/de/user/rhythms.itely index 765928d5ab..5839692232 100644 --- a/Documentation/de/user/rhythms.itely +++ b/Documentation/de/user/rhythms.itely @@ -6,7 +6,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @node Rhythms @section Rhythms @@ -890,8 +890,8 @@ Taktangaben könne wie folgt erstellt werden. Taktangaben werden zu Beginn eines Stückes gesetzt und immer dann, wenn sich die Taktart ändert. Wenn eine Änderung am Ende einer Zeile geschieht, wird eine warnende Taktangabe am Ende der Zeile -ausgegeben. Dieses Verhalten kann verändert werdenm, siehe -@ref{Controlling visibility of objects}. +ausgegeben. Dieses Verhalten kann verändert werden, siehe +@ref{Visibility of objects}. @lilypond[quote,verbatim,relative=2] \time 2/4 diff --git a/Documentation/de/user/running.itely b/Documentation/de/user/running.itely index 8ad8c6bf3d..684be21e97 100644 --- a/Documentation/de/user/running.itely +++ b/Documentation/de/user/running.itely @@ -1,13 +1,13 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*- @c This file is part of lilypond-program.tely @ignore - Translation of GIT committish: 2c00bdbfaf62dd90863331c4713e6b29e32c9322 + Translation of GIT committish: 4770e4e71ebff6104cad46bd2d889c3ff6ba3875 When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @c Translators: Reinhold Kainhofer, Till Rettig @@ -222,6 +222,7 @@ Einrichtung. @item backend Gibt an, welches Ausgabeformat das LilyPond Backend benutzt. Mögliche Werte für diese Option sind: + @table @code @item ps PostScript-Ausgabeformat. @@ -256,6 +257,10 @@ gibt die rohen Scheme-basierenden Zeichenbefehle aus, wie sie intern von LilyPond benutzt werden. @cindex Scheme dump + +@item null +Keine Partitur wird ausgegeben, hat gleichen Effekt wie @code{-dno-print-pages}. + @end table Beispiel: @code{lilypond -dbackend=svg @var{Dateiname}.ly} @@ -309,8 +314,6 @@ werden durch @item --pdf Erzeugt PDF-Dateien. Dies impliziert @code{--ps}. - - @item -j,--jail=@var{Benutzer},@var{Gruppe},@var{Jail-Verzeichnis},@var{Arbeitsverzeichnis} Führt @command{lilypond} in einem chroot-Jail aus. diff --git a/Documentation/de/user/scheme-tutorial.itely b/Documentation/de/user/scheme-tutorial.itely index 16fda96da8..111aa796be 100644 --- a/Documentation/de/user/scheme-tutorial.itely +++ b/Documentation/de/user/scheme-tutorial.itely @@ -7,7 +7,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @node Scheme tutorial @appendix Scheme tutorial diff --git a/Documentation/de/user/setup.itely b/Documentation/de/user/setup.itely index 5dbc8a1b33..603b685cd9 100644 --- a/Documentation/de/user/setup.itely +++ b/Documentation/de/user/setup.itely @@ -7,7 +7,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @c Translators: Till Rettig, Reinhold Kainhofer diff --git a/Documentation/de/user/simultaneous.itely b/Documentation/de/user/simultaneous.itely index 6eac7df68a..4666d5e71e 100644 --- a/Documentation/de/user/simultaneous.itely +++ b/Documentation/de/user/simultaneous.itely @@ -6,7 +6,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @node Simultaneous notes @section Simultaneous notes diff --git a/Documentation/de/user/spacing.itely b/Documentation/de/user/spacing.itely index 7aee0c8f09..89a94a75d8 100644 --- a/Documentation/de/user/spacing.itely +++ b/Documentation/de/user/spacing.itely @@ -1,12 +1,13 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*- @c This file is part of lilypond.tely @ignore - Translation of GIT committish: 3121682025660b6c85fbf3f22bb9cd8396699ad1 + Translation of GIT committish: 23342b5b9f69f3a82751052f79f3fede0bb40ded When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @end ignore +@c \version "2.12.0" @node Spacing issues @chapter Spacing issues diff --git a/Documentation/de/user/specialist.itely b/Documentation/de/user/specialist.itely index dc2324652e..d4f258d1b4 100644 --- a/Documentation/de/user/specialist.itely +++ b/Documentation/de/user/specialist.itely @@ -6,7 +6,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.65" +@c \version "2.12.0" @node Specialist notation @chapter Specialist notation diff --git a/Documentation/de/user/staff.itely b/Documentation/de/user/staff.itely index 8edb6c378a..9a9ec4a60b 100644 --- a/Documentation/de/user/staff.itely +++ b/Documentation/de/user/staff.itely @@ -1,12 +1,12 @@ @c -*- coding: utf-8; mode: texinfo; -*- @ignore - Translation of GIT committish: 2c00bdbfaf62dd90863331c4713e6b29e32c9322 + Translation of GIT committish: 23342b5b9f69f3a82751052f79f3fede0bb40ded When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.64" +@c \version "2.12.0" @node Staff notation @section Staff notation @@ -213,7 +213,7 @@ die Angabe einer Instrumentbezeichnung. Zu Einzelheiten siehe @lilypond[verbatim,quote,relative=2] \new PianoStaff << - \set PianoStaff.instrumentName = "Piano" + \set PianoStaff.instrumentName = #"Piano" \new Staff { c1 c } \new Staff { c1 c } >> @@ -904,8 +904,8 @@ System eingesetzt, der Wert von @code{shortInstrumentName} für alle weiteren Systeme. @lilypond[verbatim,quote,ragged-right,relative=1] -\set Staff.instrumentName = "Violin " -\set Staff.shortInstrumentName = "Vln " +\set Staff.instrumentName = #"Violin " +\set Staff.shortInstrumentName = #"Vln " c4.. g'16 c4.. g'16 \break c1 @@ -931,7 +931,7 @@ mehrzeilige Instrumentenbezeichnungen zentriert zu setzen, muss @lilypond[verbatim,quote,indent=1.5\cm,relative=2] << \new Staff { - \set Staff.instrumentName = "Flute" + \set Staff.instrumentName = #"Flute" f2 g4 f } \new Staff { @@ -962,14 +962,14 @@ Zu Einzelheiten siehe @ref{Horizontal dimensions}. \relative c'' << \new Staff { - \set Staff.instrumentName = "Alto Flute in G" - \set Staff.shortInstrumentName = "Fl." + \set Staff.instrumentName = #"Alto Flute in G" + \set Staff.shortInstrumentName = #"Fl." f2 g4 f \break g4 f g2 } \new Staff { - \set Staff.instrumentName = "Clarinet" - \set Staff.shortInstrumentName = "Clar." + \set Staff.instrumentName = #"Clarinet" + \set Staff.shortInstrumentName = #"Clar." c,4 b c2 \break c2 b4 c } @@ -990,12 +990,12 @@ Instrumentenbezeichnungen können mitten in einer Partitur geändert werden: @lilypond[verbatim,quote,ragged-right,relative=1] -\set Staff.instrumentName = "First" -\set Staff.shortInstrumentName = "one" +\set Staff.instrumentName = #"First" +\set Staff.shortInstrumentName = #"one" c1 c c c \break c1 c c c \break -\set Staff.instrumentName = "Second" -\set Staff.shortInstrumentName = "two" +\set Staff.instrumentName = #"Second" +\set Staff.shortInstrumentName = #"two" c1 c c c \break c1 c c c \break @end lilypond @@ -1025,7 +1025,7 @@ wird dann benutzt, um den Wechsel vorzunhemen: (midiInstrument . "bassoon")) \new Staff \with { - instrumentName = "Bassoon" + instrumentName = #"Bassoon" } \relative c' { \clef tenor diff --git a/Documentation/de/user/templates.itely b/Documentation/de/user/templates.itely index c31168ed1b..15a7c01e6d 100644 --- a/Documentation/de/user/templates.itely +++ b/Documentation/de/user/templates.itely @@ -7,7 +7,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @node Templates @appendix Templates @@ -162,7 +162,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.61" +\version "2.12.0" \header { dedication = "dedication" title = "Title" diff --git a/Documentation/de/user/text.itely b/Documentation/de/user/text.itely index 2aa3644fc7..3ab6da3bfd 100644 --- a/Documentation/de/user/text.itely +++ b/Documentation/de/user/text.itely @@ -1,13 +1,13 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*- @c This file is part of lilypond.tely @ignore - Translation of GIT committish: 2c00bdbfaf62dd90863331c4713e6b29e32c9322 + Translation of GIT committish: 4770e4e71ebff6104cad46bd2d889c3ff6ba3875 When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.65" +@c \version "2.12.0" @node Text @section Text @@ -335,40 +335,8 @@ sich in @ref{Multi-page markup}. @snippets -@ignore -@c TODO Replace following example with this snippet when available -@c Submitted to LSR 30 Nov 08 @lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle] -{stand--alone-two--column-markup.ly} -@end ignore - -Text alleine kann auch in mehreren Spalten angeordnet werden. - -@lilypond[verbatim,quote] -\markup { - \fill-line { - \hspace #1.0 - \column { - \line {"O sacrum convivium" } - \line {"in quo Christus sumitur," } - \line {"recolitur memoria passionis ejus," } - \line {"mens impletur gratia," } - \line {"futurae gloriae nobis pignus datur." } - \line {"Amen."} - } - \hspace #2 - \column { - \line { \italic {"O sacred feast"} } - \line { \italic {"in which Christ is received,"} } - \line { \italic {"the memory of His Passion is renewed,"} } - \line { \italic {"the mind is filled with grace," } } - \line { \italic {"and a pledge of future glory is given to us." }} - \line { \italic {"Amen."}} - } - \hspace #1.0 - } -} -@end lilypond +{stand-alone-two-column-markup.ly} @seealso Notationsreferenz: diff --git a/Documentation/de/user/tutorial.itely b/Documentation/de/user/tutorial.itely index 671b6103f1..21b9c6b513 100644 --- a/Documentation/de/user/tutorial.itely +++ b/Documentation/de/user/tutorial.itely @@ -7,7 +7,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @ignore Tutorial guidelines: diff --git a/Documentation/de/user/tweaks.itely b/Documentation/de/user/tweaks.itely index b176852c84..f862bdb3c5 100644 --- a/Documentation/de/user/tweaks.itely +++ b/Documentation/de/user/tweaks.itely @@ -1,13 +1,13 @@ @c -*- coding: utf-8; mode: texinfo; -*- @c This file is part of lilypond-learning.tely @ignore - Translation of GIT committish: 2c00bdbfaf62dd90863331c4713e6b29e32c9322 + Translation of GIT committish: 23342b5b9f69f3a82751052f79f3fede0bb40ded When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.65" +@c \version "2.12.0" @node Tweaking output @chapter Tweaking output @@ -404,11 +404,12 @@ Beachten Sie, dass die Syntax des @code{\tweak}-Befehls sich von der des @code{\override}-Befehls unterscheidet. Weder Kontext noch Layout-Objekt konnen angegeben werden, denn das würde zu einem Fehler führen. Beide Angaben sind -durch das folgende Element impliziert. Die verallgemeinerte +durch das folgende Element impliziert. Hier sollte auch +kein Gleichheitzeichen vorhanden sein. Die verallgemeinerte Syntax des @code{\tweak}-Befehls ist also einfach @example -\tweak #'@var{layout-eigenschaft} = #@var{Wert} +\tweak #'@var{layout-eigenschaft} #@var{Wert} @end example Ein @code{\tweak}-Befehl kann auch benutzt werden, um nur @@ -1441,7 +1442,7 @@ braucht. << { f c c } \new Staff \with { - alignAboveContext = "main" } + alignAboveContext = #"main" } { f8 f c } >> r4 | @@ -1469,7 +1470,7 @@ wir setzen den Stencil von beiden auf @code{#f}: << { f c c } \new Staff \with { - alignAboveContext = "main" + alignAboveContext = #"main" } { \override Staff.Clef #'stencil = ##f @@ -1538,7 +1539,7 @@ Das obige Beispiel könnte also auch so aussehen: << { f c c } \new Staff \with { - alignAboveContext = "main" + alignAboveContext = #"main" % Don't print clefs in this staff \override Clef #'stencil = ##f % Don't print time signatures in this staff @@ -1609,7 +1610,7 @@ Setzen wir das also in unserem Ossia-Beispiel ein: << { f c c } \new Staff \with { - alignAboveContext = "main" + alignAboveContext = #"main" \override Clef #'stencil = ##f \override TimeSignature #'stencil = ##f % Reduce all font sizes by ~24% @@ -1681,7 +1682,7 @@ sie benutzt: << { f c c } \new Staff \with { - alignAboveContext = "main" + alignAboveContext = #"main" \override Clef #'stencil = ##f \override TimeSignature #'stencil = ##f fontSize = #-2 @@ -3749,12 +3750,16 @@ wurde, nicht passiert. tippen, und sie müssen immer absolut richtig sein. Wenn derselbe Befehl mehrere Male benutzt werden muss, lohnt es sich oft schon, eine Variable zu definieren, in der er -sich befindet. Als Beispiel sollen einige Worte im +sich befindet. + +Als Beispiel sollen einige Worte im Gesangstext fett und kursiv hervorgehoben werden. Die Befehle @code{\italic} und @code{\bold} funktionieren -im Gesangstext-Kontext nur, wenn sie gleichzeitig -noch in eine @code{\markup}-Umgebung eingeschlossen -werden, was es mühsam macht, sie zu tippen. Als +im Gesangstext-Kontext nur, wenn sie gleichzeitig mit den Wörtern, +auf die sie angewendet werden sollen, zusätzlich +in eine @code{\markup}-Umgebung eingeschlossen +werden. Durch diese Einbettung können einzelne Wörter nicht +einfach zu einer Variable umgeformt werden. Als Alternative versuchen wir, einen Befehl mit @code{\override} und @code{\revert} zu konstruieren. @@ -3766,11 +3771,15 @@ Alternative versuchen wir, einen Befehl mit @code{\revert Lyrics . LyricText #'font-series} @end example -Das wäre natürlich noch viel mühsamer. Also setzen wir -anstatt dessen zwei Variablen, die diese Befehlsketten -enthalten. Die Namen können natürlich auch kürzer sein, -um noch weniger schreiben zu müssen. Die Benutzung der Befehle -ist im Notenbeispiel gezeigt. +Das wäre natürlich noch viel mühsamer, wenn viele Wörter eine +Hervorhebung benötigen. Anstelle dieser Befehlsketten @emph{können} +wir jedoch zwei Variablen definieren. Mit ihnen und dem entsprechenden +Wort in geschweiften Klammern erreichen wir den gewünschten Effekt. +Ein weiterer Vorteil ist, dass in diesem Fall die Leerzeichn um die +Punkte herum nicht benötigt werden, weil sie nicht innerhalb des +@code{lyricmode}-Kontextes interpretiert werden. Hier ein Beispiel; +die Bezeichnungen können natürlich auch kürzer sein, +um noch weniger schreiben zu müssen: @cindex LyricText, Beispiel zur Veränderung @cindex Gesangstext, Beispiel zur Veränderung @@ -3779,12 +3788,12 @@ ist im Notenbeispiel gezeigt. @lilypond[quote,verbatim] emphasize = { - \override Lyrics . LyricText #'font-shape = #'italic - \override Lyrics . LyricText #'font-series = #'bold + \override Lyrics.LyricText #'font-shape = #'italic + \override Lyrics.LyricText #'font-series = #'bold } normal = { - \revert Lyrics . LyricText #'font-shape - \revert Lyrics . LyricText #'font-series + \revert Lyrics.LyricText #'font-shape + \revert Lyrics.LyricText #'font-series } global = { \time 4/4 \partial 4 \key c \major} diff --git a/Documentation/de/user/unfretted-strings.itely b/Documentation/de/user/unfretted-strings.itely index 625bbb3970..5ee018ec7e 100644 --- a/Documentation/de/user/unfretted-strings.itely +++ b/Documentation/de/user/unfretted-strings.itely @@ -1,13 +1,13 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*- @c This file is part of lilypond.tely @ignore - Translation of GIT committish: 2c00bdbfaf62dd90863331c4713e6b29e32c9322 + Translation of GIT committish: 4770e4e71ebff6104cad46bd2d889c3ff6ba3875 When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @node Unfretted string instruments @section Unfretted string instruments diff --git a/Documentation/de/user/vocal.itely b/Documentation/de/user/vocal.itely index 12435f19e8..5154b59929 100644 --- a/Documentation/de/user/vocal.itely +++ b/Documentation/de/user/vocal.itely @@ -1,12 +1,12 @@ @c -*- coding: utf-8; mode: texinfo; -*- @ignore - Translation of GIT committish: 2c00bdbfaf62dd90863331c4713e6b29e32c9322 + Translation of GIT committish: 23342b5b9f69f3a82751052f79f3fede0bb40ded When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @node Vocal music @section Vocal music @@ -1016,10 +1016,10 @@ Strophennummerierung kann hinzugefügt werden: \new Voice { \time 3/4 g2 e4 a2 f4 g2. } \addlyrics { - \set stanza = "1. " + \set stanza = #"1. " Hi, my name is Bert. } \addlyrics { - \set stanza = "2. " + \set stanza = #"2. " Oh, ché -- ri, je t'aime } @end lilypond @@ -1102,10 +1102,10 @@ kann mit @code{shortVocalName} definiert werden. \new Voice { \time 3/4 g2 e4 a2 f4 g2. } \addlyrics { - \set vocalName = "Bert " + \set vocalName = #"Bert " Hi, my name is Bert. } \addlyrics { - \set vocalName = "Ernie " + \set vocalName = #"Ernie " Oh, ché -- ri, je t'aime } @end lilypond @@ -1123,8 +1123,6 @@ Melisma ignoriert. Das wird mit der @code{ignoreMelismata}-Eigenschaft im @code{Lyrics}-Kontext vorgenommen. -@c TODO: breaks compile -@c seems to be fixed, does not break compile anymore --FV @lilypond[verbatim,ragged-right,quote] << \relative c' \new Voice = "lahlah" { @@ -1147,6 +1145,13 @@ vorgenommen. >> @end lilypond +@knownissues +Anders als die meisten @code{\set}-Befehle funktioniert +@code{\set ignoreMelismata} nicht zusammen mit @code{\once}. +Es ist notwendig, explizit @code{\set} und @code{\unset} zu +verwenden, um den Text einzugrenzen, für den Melismen ignoriert +werden sollen. + @subsubheading Switching to an alternative melody @@ -1250,7 +1255,7 @@ d d e d | c1 | } text = \lyricmode { -\set stanza = "1." Ma- ry had a lit- tle lamb, +\set stanza = #"1." Ma- ry had a lit- tle lamb, its fleece was white as snow. } @@ -1291,7 +1296,7 @@ melody = \relative c' { } text = \lyricmode { - \set stanza = "1." This is verse one. + \set stanza = #"1." This is verse one. It has two lines. } diff --git a/Documentation/de/user/wind.itely b/Documentation/de/user/wind.itely index 9e66b1c83e..4c9dc0fef7 100644 --- a/Documentation/de/user/wind.itely +++ b/Documentation/de/user/wind.itely @@ -7,7 +7,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @node Wind instruments diff --git a/Documentation/de/user/working.itely b/Documentation/de/user/working.itely index d0def4f9e5..fef131bffa 100644 --- a/Documentation/de/user/working.itely +++ b/Documentation/de/user/working.itely @@ -7,7 +7,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @node Working on LilyPond projects @chapter Working on LilyPond projects @@ -74,7 +74,7 @@ Hier einige Vorschläge, wie Sie Probleme vermeiden oder lösen können: @item @strong{Schreiben Sie immer mit @code{\version} die Versionsnummer in jede Datei}. Beachten Sie, dass in allen Vorlagen die Versionsnummer -@code{\version "2.11.61"} eingetragen ist. Es empfiehlt sich, in alle +@code{\version "2.12.0"} eingetragen ist. Es empfiehlt sich, in alle Dateien, unabhängig von ihrer Größe, den @code{\version}-Befehl einzufügen. Persönliche Erfahrung hat gezeigt, dass es ziemlich frustrierend sein kann zu erinnern, welche Programmversion man etwa @@ -559,7 +559,7 @@ für meine Projekte. Jede Notationsdatei fängt an mit @example %%% global.ly -\version "2.11.61" +\version "2.12.0" #(ly:set-option 'point-and-click #f) \include "../init/init-defs.ly" \include "../init/init-layout.ly" diff --git a/Documentation/de/user/world.itely b/Documentation/de/user/world.itely index 6c125343dc..538595d422 100644 --- a/Documentation/de/user/world.itely +++ b/Documentation/de/user/world.itely @@ -1,17 +1,22 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*- @c This file is part of lilypond.tely @ignore - Translation of GIT committish: 4a527608c5ff2ce31e596495d00dce181dc1b9ea + Translation of GIT committish: 2c00bdbfaf62dd90863331c4713e6b29e32c9322 When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @end ignore +@c Translators: Till Rettig + +@c \version "2.12.0" @node World music @section World music -@untranslated +Dieser Abschnitt soll Besonderheiten der Notation aufzeigen, die +insbesondere relevant sind, um Musik nicht-westlicher Tradition +zu notieren. @menu @@ -21,7 +26,8 @@ @node Arabic music @subsection Arabic music -@untranslated +Dieser Abschnitt zeigt Möglichkeiten, wie arabische Musik notiert +werden kann. @menu @@ -36,38 +42,350 @@ @node References for Arabic music @unnumberedsubsubsec References for Arabic music -@untranslated +@cindex arabische Musik +@cindex Maqam + +Arabische Musik wurde bisher vor allem mündlich tradiert. Wenn +Musik transkribiert wird, handelt es sich meistens um ein Gerüst, +auf dem der Musiker eigene Improvisationen ausführt. Mehr und mehr +wird die westliche Notation mit einigen Veränderungen benutzt, um +die arabische Musiktradition weiterzugeben und zu konservieren. + +Einige Elemente der westlichen Notation wie etwa die Transkription +von Akkorden oder eigenständige Stimmen werden für die traditionelleren +arabischen Noten nicht benötigt. Es gibt allerdings einige andere +Probleme, wie etwa die Notwendigkeit, Zwischenintervalle zu +notieren, die sich irgendwo zwischen einem Halbton und einem +Ganzton befinden. Daneben werden auch die westlichen Halb- und +Ganztöne eingesetzt. Es muss auch möglich sein, eine große +Anzahl an maqam (Modi) der arabischen Musik zu bezeichnen und zu +gruppieren. + +Üblicherweise müssen Mikrotöne in der arabischen Musik nicht +präzise notiert werden. + +Einige Bereiche, die für die arabische Notation wichtig sind, sind +an anderer Stelle behandelt: + +@itemize +@item Notenbezeichnungen und Versetzungszeichen (inklusive Vierteltöne) +können angepasst werden, wie behandelt in +@ref{Note names in other languages}. + +@item Zusätzliche Taktarten können erstellt werden, siehe +@ref{Key signature}. + +@item Komplexe Taktarten erfordern evtl., dass Noten manual gruppiert +werden, wie gezeigt in +@ref{Manual beams}. + +@item @notation{Takasim}, rhythmisch freie Improvisationen, +können ohne Taktlinien notiert werden, siehe hierzu +@ref{Unmetered music}. + +@end itemize + + +@seealso +Notationsreferenz: +@ref{Note names in other languages}, +@ref{Key signature}, +@ref{Manual beams}. + +Schnipsel: +@rlsr{World music}. @node Arabic note names @unnumberedsubsubsec Arabic note names -@untranslated +@cindex arabische Notenbezeichnungen +@cindex Notenbezeichnungen, arabisch + +An der arabischen Tradition orientierte Notenbezeichnungen können sehr +land sein und eignen sich daher nicht gut für die Notation von Musik. +Sie werden nicht benutzt. Englische Notenbezeichnungen hingegen sind +in der arabischen Musikerziehung recht unbekannt, weshalb italienische +Notenbezeichnungen (@code{do, re, mi, fa, sol, la, si}) eingesetzt +werden. Modifikatoren (Versetzungszeichen) können auch benutzt werden, +wie gezeigt in @ref{Note names in other languages}. + +Hier ein Beispiel der arabischen @notation{rast}-Tonleiter: + +@lilypond[quote,verbatim] +\include "arabic.ly" +\relative do' { + do re misb fa sol la sisb do sisb la sol fa misb re do +} +@end lilypond + +@cindex arabisches Halb-B Versetzungszeichen +@cindex Halb-B-Versetzungszeichen, arabische Musik + +Das Symbol für das Halb-B sieht anders aus als das Symbol, was +üblicherweise in arabischer Notation benutzt wird. Das +@code{\dwn}-Symbol, das in der Datei @code{arabic.ly} definiert +ist, kann als ein Workaround eingesetzt werden, wenn es notwendig +ist, das arabische Symbol zu benutzen. Das Aussehen des +Halb-Bs in den Vorzeichen kann mit dieser methode nicht verändert +werden. + +@lilypond[quote,verbatim] +\include "arabic.ly" +\relative do' { + \set Staff.extraNatural = ##f + dod dob dosd \dwn dob dobsb dodsd do do +} +@end lilypond + +@seealso +Notationsreferenz: +@ref{Note names in other languages}. + +Schnipsel: +@rlsr{World music}. + @node Arabic key signatures @unnumberedsubsubsec Arabic key signatures -@untranslated +@cindex arabische Tonarten +@cindex arabische Vorzeichen + +Neben den westlichen Dur- und Moll-Tonarten sind folgende +Tonarten in @code{arabic.ly} definiert: @notation{bayati}, +@notation{rast}, @notation{sikah}, @notation{iraq} und +@notation{kurd}. Diese Tonarten definieren eine kleine +Gruppe von Maqams, die weitverbreitet sind. + +Ein Maqam kann die Tonart der Gruppe benutzen, zu der er gehört, +oder die einer benachbarten Gruppe. Zusätzlich können verschiedene +Versetzungszeichen in den Noten markiert werden. + +Um also etwa die Tonart des Maqams @qq{muhayer} folgendermaßen +notiert: + +@example +\key re \bayati +@end example + +@var{re} ist die Tonhöhe für den @qq{muhayer}-Maqam und @var{bayati} +ist die Bezeichnung des Basismaqams der Gruppe. + +Während die Vorzeichen eine Gruppe anzeigen, wird meistens der +eigentliche Maqam im Titel definiert. In diesem Beispiel müsste +also der @qq{muhayer}-Maqam im Titel erscheinen. + +Andere Maqams derselben Bayati-Gruppe, wie in der Tabelle unten +gezeigt ((bayati, hussaini, saba und ushaq) können auf die gleiche +Weise notiert werden. Sie sind alle Variationen des +Grundmaqams Bayati. Sie unterscheiden sich üblicherweise vom +grundlegenden Maqam in ihrem oberen Tetrachord oder in bestimmten +Einzelheiten, die aber nicht ihre eigentliche Qualität verändern. + +Der andere Maqam der gleichen Gruppe (Nawa) ist mit bayati durch +eine Modulation verwandt, deren Grundton in der Tabelle angezeigt +wird, wenn es sich um einen Maqam handelt, der eine Modulation +eines anderen Maqams darstellt. Nawa kann folgenderweise +notiert werden: + +@example +\key sol \bayati +@end example + +In der arabischen Musik ist ein Begriff wie bayati, der eine +Maqam-Gruppe bezeichnet, gleichzeitig auch selber ein Maqam, +meistens der häufigste dieser Gruppe. + +Hier ist eine Möglichkeit, Maqams zu gruppieren, womit die +häufigsten Maqams bestimmten Vorzeichen zugeordnet werden: + +@multitable @columnfractions 0.1 0.1 0.1 0.6 +@headitem Maqam-Gruppe + @tab Vorzeichen (@code{\key}) + @tab Finalis + @tab Andere Maqams der Gruppe (Finalis) +@item ajam + @tab major + @tab sib + @tab jaharka (fa) +@item bayati + @tab bayati + @tab re + @tab hussaini, muhayer, saba, ushaq, nawa (sol) +@item hijaz + @tab kurd + @tab re + @tab shahnaz, shad arban (sol), hijazkar (do) +@item iraq + @tab iraq + @tab sisb + @tab - +@item kurd + @tab kurd + @tab re + @tab hijazkar kurd (do) +@item nahawand + @tab minor + @tab do + @tab busalik (re), farah faza (sol) +@item nakriz + @tab minor + @tab do + @tab nawa athar, hisar (re) +@item rast + @tab rast + @tab do + @tab mahur, yakah (sol) +@item sikah + @tab sikah + @tab misb + @tab huzam +@end multitable + +@snippets + +@lilypondfile[verbatim,lilyquote,texidoc,doctitle] +{non-traditional-key-signatures.ly} + +@seealso +Notationsreferenz: +@ref{Key signature}. + +Handbuch zum Lernen: +@rlearning{Accidentals and key signatures}. + +Referenz der Interna: +@rinternals{KeySignature}. + +Schnipsel: +@rlsr{World music}, +@rlsr{Pitches}. @node Arabic time signatures @unnumberedsubsubsec Arabic time signatures -@untranslated +@cindex Arabische Taktarten +@cindex Taktarten, arabisch +@cindex Semai-Form +@cindex taqasim + +Einige klassische Formen der arabischen und türkischen Musik +wie etwa @notation{Semai} haben ungewöhnliche Taktarten wie +etwa 10/8. Das kann dazu führen, dass die automatische +Bebalkung der Noten nicht zu dem Ergebnis kommt, welches in +der üblichen Notation dieser Musik eingesetzt wird. Die Noten +werden nicht anhand einer Taktzeit, sondern anhand von Kriterien +gruppiert, die man schwer mit einer automatischen Balkenfunktion +erfassen kann. Das kann umgangen werden, indem die automatische +Bebalkung ausgeschaltet wird und die Balken explizit gesetzt werden. +Auch wenn es nicht darauf ankommen sollte, eine schon notierte +Musik nachzuahmen, ist es in vielen Fällen dennoch erforderlich, +die Bebalkung anzupassen und/oder zusammengesetzte Taktarten +zu benutzen. + +@snippets + +@lilypondfile[verbatim,lilyquote,texidoc,doctitle] +{compound-time-signatures.ly} + +@lilypondfile[verbatim,lilyquote,texidoc,doctitle] +{arabic-improvisation.ly} + + +@seealso +Notationsreferenz: +@ref{Manual beams}, +@ref{Automatic beams}, +@ref{Unmetered music}, +@ref{Automatic accidentals}, +@ref{Setting automatic beam behavior}, +@ref{Time signature}. + +Schnipsel: +@rlsr{World music}. @node Arabic music example @unnumberedsubsubsec Arabic music example -@untranslated +@cindex Beispiel der arabischen Musik +@cindex arabische Musik, Beispiel +@cindex Vorlage, arabische Musik + +Hier eine Vorlage, welche den Beginn eines türkischen Semai +benutzt, der in der arabischen Musikerziehung oft herangezogen +wird, um Besonderheiten der arabischen Musiknotation, wie +etwa Zwischenintervalle und ungewöhnliche Modi, zu illustrieren. + +@lilypond[quote,verbatim] +\include "arabic.ly" +\score { + \relative re' { + \set Staff.extraNatural = ##f + \set Staff.autoBeaming = ##f + \key re \bayati + \time 10/8 + + re4 re'8 re16 [misb re do] sisb [la sisb do] re4 r8 + re16 [misb do re] sisb [do] la [sisb sol8] la [sisb] do [re] misb + fa4 fa16 [misb] misb8. [re16] re8 [misb] re [do] sisb + do4 sisb8 misb16 [re do sisb] la [do sisb la] la4 r8 + } + \header { + title = "Semai Muhayer" + composer = "Jamil Bek" + } +} +@end lilypond + + +@seealso +Schnipsel: +@rlsr{World music} @node Further reading @unnumberedsubsubsec Further reading -@untranslated +@enumerate + +@item +The Music of the Arabs von Habib Hassan Touma (Amadeus Press, 1996) +enthält eine Beschreibung von Maqams und Methoden zu ihrer +Gruppierung. + +Es gibt auch einige Internetseiten, die Maqams erklären und +teilweise auch Klangdateien zur Verfügung stellen: + +@itemize @bullet +@item +@uref{http://www.maqamworld.com/} +@item +@uref{http://www.turath.org/} +@end itemize + +Die Maqam-Gruppierungen unterscheiden sich in einigen Details, auch +wenn die allgemeinen Kriterien weithin anerkannt sind: +gemeinsame untere Tetrachorde sowie Modulation. +@item +Es gibt keine Übereinstimmung darüber, wie die Vorzeichen für +bestimmte Maqams angegeben werden sollen. Oft wird eine +Vorzeichenart für eine ganze Maqam-Gruppe verwendet, anstatt +dass jeder Maqam eigene Vorzeichen hätte. +Oud-Lehrbücher folgender Autoren enthalten Beispiele vor +allem türkischer und arabischer Kompositionen: -@c -- SKELETON FILE -- +@itemize @bullet +@item +Charbel Rouhana +@item +George Farah +@item +Ibrahim Ali Darwish Al-masri +@end itemize +@end enumerate diff --git a/Documentation/es/translations.html.in b/Documentation/es/translations.html.in index 8d7606b3e7..17c4496e6a 100644 --- a/Documentation/es/translations.html.in +++ b/Documentation/es/translations.html.in @@ -1,4 +1,4 @@ -

Actualizado en Tue Dec 9 09:40:49 UTC 2008 +

Actualizado en Wed Dec 31 01:23:25 UTC 2008

pre-GDP - 4 Trucar la salida
(14581) + 4 Trucar la salida
(14647) Francisco Vila sí @@ -169,7 +169,7 @@ translations.template.html.in; DO NOT EDIT !--> pre-GDP - 4 @command{lilypond-book}: integrar texto y música
(3185) + 4 @command{lilypond-book}: integrar texto y música
(3248) Francisco Vila sí @@ -208,11 +208,11 @@ translations.template.html.in; DO NOT EDIT !--> Francisco Vila sí - sí + parcialmente pre-GDP - 1.1 Alturas
(3086) + 1.1 Alturas
(3123) Francisco Vila sí @@ -252,15 +252,15 @@ translations.template.html.in; DO NOT EDIT !--> post-GDP - 1.6 Notación de los pentagramas
(1635) + 1.6 Notación de los pentagramas
(1701) Francisco Vila sí - sí + parcialmente pre-GDP - 1.7 Anotaciones editoriales
(906) + 1.7 Anotaciones editoriales
(895) Francisco Vila sí @@ -280,7 +280,7 @@ translations.template.html.in; DO NOT EDIT !--> Francisco Vila sí - sí + parcialmente pre-GDP @@ -292,7 +292,7 @@ translations.template.html.in; DO NOT EDIT !--> pre-GDP - 2.2 Teclados y otros instrumentos de varios pentagramas
(725) + 2.2 Teclados y otros instrumentos de varios pentagramas
(744) Francisco Vila sí @@ -308,7 +308,7 @@ translations.template.html.in; DO NOT EDIT !--> pre-GDP - 2.4 Instrumentos de cuerda con trastes
(1759) + 2.4 Instrumentos de cuerda con trastes
(1850) Francisco Vila sí @@ -332,7 +332,7 @@ translations.template.html.in; DO NOT EDIT !--> pre-GDP - 2.7 Notación de acordes
(1333) + 2.7 Notación de acordes
(1464) Francisco Vila sí @@ -340,7 +340,7 @@ translations.template.html.in; DO NOT EDIT !--> pre-GDP - 2.8 Notación antigua
(4486) + 2.8 Notación antigua
(4487) Francisco Vila sí @@ -364,7 +364,7 @@ translations.template.html.in; DO NOT EDIT !--> pre-GDP - 4 Problemas de espaciado
(8444) + 4 Problemas de espaciado
(8451) Francisco Vila sí @@ -372,7 +372,7 @@ translations.template.html.in; DO NOT EDIT !--> pre-GDP - 5 Cambiar los valores por omisión
(11291) + 5 Cambiar los valores por omisión
(11391) Francisco Vila sí @@ -396,7 +396,7 @@ translations.template.html.in; DO NOT EDIT !--> pre-GDP - B Tablas del manual sobre notación
(1155) + B Tablas del manual sobre notación
(1190) Francisco Vila sí diff --git a/Documentation/es/user/ancient.itely b/Documentation/es/user/ancient.itely index 1ac8c137d9..1bad496612 100644 --- a/Documentation/es/user/ancient.itely +++ b/Documentation/es/user/ancient.itely @@ -1,13 +1,13 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*- @c This file is part of lilypond.tely @ignore - Translation of GIT committish: d5bd12a5775832e81000fb901ad65283a152eaa4 + Translation of GIT committish: 0f749d4980bcd5d633037336f1a91472ab710a8d When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @node Ancient notation @section Ancient notation @@ -723,7 +723,7 @@ No existen silencios de fusa y semifusa específicos para los estilos mensural ni neo-mensural. En su lugar se tomarán los silencios del estilo predeterminado. -Consulte @rlsr{Pitches,rests} para ver un cuadro de todos los +Consulte @rlsr{Ancient notation} para ver un cuadro de todos los silencios. diff --git a/Documentation/es/user/changing-defaults.itely b/Documentation/es/user/changing-defaults.itely index 1f4006cd05..1983e8192f 100644 --- a/Documentation/es/user/changing-defaults.itely +++ b/Documentation/es/user/changing-defaults.itely @@ -1,13 +1,13 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*- @c This file is part of lilypond.tely @ignore -Translation of GIT committish: 17d84cfa9ddb152b05d1e17ab72109fb4eefa684 +Translation of GIT committish: 366fb60554c8b9b448bd67d27b1f2c4546819d2f When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.65" +@c \version "2.12.0" @node Changing defaults @chapter Changing defaults @@ -718,7 +718,7 @@ ossia = { f4 f f f } \relative c' \new Staff = "main" { c4 c c c << - \new Staff \with {alignAboveContext=main} \ossia + \new Staff \with { alignAboveContext = #"main" } \ossia { d8 f d f d f d f } >> } @@ -2730,7 +2730,7 @@ de ensayo sobre dichos objetos. * Setting @code{X-offset} and @code{Y-offset} directly:: * Using the @code{side-position-interface}:: * Using the @code{self-alignment-interface}:: -* Using the @code{break-aligned-interface}:: +* Using the @code{break-alignable-interface}:: @end menu @node Setting @code{X-offset} and @code{Y-offset} directly @@ -2898,8 +2898,11 @@ example shows the difference: @c TODO The align-interface, BassFigureAlignment and VerticalAlignment -@node Using the @code{break-aligned-interface} -@unnumberedsubsubsec Using the @code{break-aligned-interface} +@node Using the @code{break-alignable-interface} +@unnumberedsubsubsec Using the @code{break-alignable-interface} + +@cindex alineación a objetos +@cindex break-align-symbols Las letras de ensayo se pueden alinear con objetos de notación distintos a las barras de compás. Estos objetos son @code{ambitus}, @@ -2907,8 +2910,8 @@ distintos a las barras de compás. Estos objetos son @code{ambitus}, @code{left-edge}, @code{key-cancellation}, @code{key-signature} y @code{time-signature}. -De forma predeterminada, las letras de ensayo se centran -horizontalmente sobre el objeto: +De forma predeterminada, las letras de ensayo y los números de compás +se centran horizontalmente sobre el objeto: @lilypond[verbatim,quote,relative=1] e1 @@ -2927,7 +2930,33 @@ e e2. @end lilypond -La alineación de la letra de enzayo con relación al objeto de notación +Se puede especificar una lista de posibles objetos para la alineación. +Si algunos de los objetos son invisibles en ese punto debido al valor +de @code{break-visibility} o a valores de visibilidad explícitos para +las armaduras y las claves, la letra de ensayo o número de compás se +alinean con el primer objeto de la lista que sea visible. Si ningún +objeto de la lista es visible, el objeto se alinea con la línea +divisoria. Si la línea divisoria es invisible, el objeto se alinea +con el punto en el que se encontraría la línea divisoria. + +@lilypond[verbatim,quote,relative=1] +e1 +% the RehearsalMark will be centered above the Key Signature +\override Score.RehearsalMark #'break-align-symbols = #'(key-signature clef) +\key a \major +\clef treble +\mark "↓" +e +% the RehearsalMark will be centered above the Clef +\set Staff.explicitKeySignatureVisibility = #all-invisible +\override Score.RehearsalMark #'break-align-symbols = #'(key-signature clef) +\key a \minor +\clef bass +\mark "↓" +e, +@end lilypond + +La alineación de la letra de ensayo con relación al objeto de notación se puede cambiar, como se ve en el ejemplo siguiente. En una partitura con varios pentagramas, este ajuste se debe hacer para todos los pentagramas. diff --git a/Documentation/es/user/cheatsheet.itely b/Documentation/es/user/cheatsheet.itely index a26c20eecf..a2c24448cc 100644 --- a/Documentation/es/user/cheatsheet.itely +++ b/Documentation/es/user/cheatsheet.itely @@ -7,7 +7,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @c TODO: add tablature. diff --git a/Documentation/es/user/chords.itely b/Documentation/es/user/chords.itely index 8e5286191e..0a7c0ccf79 100644 --- a/Documentation/es/user/chords.itely +++ b/Documentation/es/user/chords.itely @@ -1,13 +1,13 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*- @c This file is part of lilypond.tely @ignore - Translation of GIT committish: 17d84cfa9ddb152b05d1e17ab72109fb4eefa684 + Translation of GIT committish: 4f8c7b381812949e6f765f641fba9108b52af56b When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @node Chord notation @section Chord notation @@ -147,7 +147,12 @@ Se pueden crear acordes de séptima: @funindex m La tabla que aparece más abajo muestra el efecto de los modificadores -de variante sobre los acordes de tríada y de séptima. +de variante sobre los acordes de tríada y de séptima. La séptima +añadida de forma predeterminada a los acordes es menor, lo que hace +del acorde de séptima dominante el acorde básico de séptima. Todas +las alteraciones se consideran en relación con la séptima dominante. +Hay una tabla más completa donde aparecen los usos de los +modificadores en @ref{Common chord modifiers}. @c @table @code @multitable @columnfractions .2 .4 .3 @@ -174,8 +179,7 @@ Acción predeterminada; produce una tríada mayor. @item m, m7 @tab -Acorde menor. Este modificador baja la tercera y, si existe, la -séptima. +Acorde menor. Este modificador baja la tercera. @tab @lilypond[line-width=4\cm, noragged-right] \chordmode { @@ -229,11 +233,19 @@ modificador para crear una tríada mayor. @seealso Referencia de la notación: -@ref{Common chord modifiers}. +@ref{Common chord modifiers}, +@ref{Extended and altered chords}. Fragmentos de código: @rlsr{Chords}. +@knownissues +Sólo se puede usar un modificador por cada acorde, normalmente sobre +la nota más aguda del mismo. Los acordes con maś de un modificador se +analizan sin producir errores ni advertencias, pero el resultado es +impredecible. Los acordes que no se pueden conseguir con un solo +modificador se deben alterar en sus notas individuales como se +describe en @ref{Extended and altered chords}. @node Extended and altered chords @unnumberedsubsubsec Extended and altered chords @@ -248,11 +260,12 @@ acorde y añadir un bajo distinto o crear una inversión. El primer número que sigue al @code{:} se considera que es el ámbito del acorde. El acorde se construye secuencialmente añadiendo terceras -a la fundamental hasta que se alcanza el número especificado. Si el -ámbito no es una tercera (p.ej. 6), se añaden terceras hasta la -tercera más alta inferior al ámbito, y después se añade la nota del -ámbito. El mayor valor posible para el ámbito es 13. Cualquier valor -mayor se interpreta como 13. +a la fundamental hasta que se alcanza el número especificado. Observe +que la séptima añadida como parte de un acorde extendido es la séptima +menor, no mayor. Si el ámbito no es una tercera (p.ej. 6), se añaden +terceras hasta la tercera más alta inferior al ámbito, y después se +añade la nota del ámbito. El mayor valor posible para el ámbito es +13. Cualquier valor mayor se interpreta como 13. @lilypond[quote,ragged-right,fragment,verbatim,relative=1] \chordmode { @@ -280,7 +293,8 @@ con una trecena sin alteración, se elimina la oncena de los acordes de @cindex adiciones en acordes Se pueden añadir notas individuales a un acorde. Las adiciones siguen -el ámbito y van prefijadas por un punto (@code{.}). +el ámbito y van prefijadas por un punto (@code{.}). La séptima normal +que se añade a un acorde es la séptima menor, no mayor. @lilypond[quote,verbatim,fragment,relative=1] \chordmode { diff --git a/Documentation/es/user/converters.itely b/Documentation/es/user/converters.itely index b38c7d5b6e..758645421d 100644 --- a/Documentation/es/user/converters.itely +++ b/Documentation/es/user/converters.itely @@ -7,7 +7,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @node Converting from other formats @chapter Converting from other formats diff --git a/Documentation/es/user/dedication.itely b/Documentation/es/user/dedication.itely index 837c28be78..9926f7cc51 100644 --- a/Documentation/es/user/dedication.itely +++ b/Documentation/es/user/dedication.itely @@ -7,7 +7,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @quotation Queremos dedicar este programa a todos los amigos que hemos diff --git a/Documentation/es/user/editorial.itely b/Documentation/es/user/editorial.itely index 89c70e9ebe..5daefd4b89 100644 --- a/Documentation/es/user/editorial.itely +++ b/Documentation/es/user/editorial.itely @@ -1,13 +1,13 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*- @c This file is included from notation.itely @ignore - Translation of GIT committish: 17d84cfa9ddb152b05d1e17ab72109fb4eefa684 + Translation of GIT committish: 289a8244cb39275e313ddad57fe394da7a21c113 When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @node Editorial annotations @section Editorial annotations @@ -45,6 +45,7 @@ dentro del pentagrama. @cindex selección del tamaño de la fuente tipográfica (de notación) @cindex notación, tamaño de la fuente @cindex notas, cabezas de + @funindex fontSize @funindex font-size @funindex magstep @@ -108,6 +109,7 @@ c4.-> d8---3 @cindex estándar, tamaño de la tipografía (de notación) @cindex fuente tipográfica (de notación), tamaño estándar de + @funindex font-interface @funindex font-size @@ -118,22 +120,16 @@ deseado. El tamaño estándar para la tipografía (para @code{font-size pentagrama de 20 puntos, se selecciona una fuente de 10 puntos. La propiedad @code{font-size} sólo se puede establecer en objetos -gráficos que utilicesn fuentes tipográficas. Éstos son los que +gráficos que utilicen fuentes tipográficas. Éstos son los que contemplan el interfaz de presentación @code{font-interface}. @predefined -@funindex \teeny @code{\teeny} (enano), -@funindex \tiny @code{\tiny} (muy pequeño), -@funindex \small @code{\small} (pequeño), -@funindex \normalsize @code{\normalsize} (normal), -@funindex \large @code{\large} (grande), -@funindex \huge @code{\huge} (enorme). @endpredefined @@ -151,8 +147,9 @@ Referencia de funcionamiento interno: @cindex digitación @cindex cambio de dedo -@funindex font-interface -@funindex font-size + +@funindex \finger +@funindex finger Las instrucciones de digitación se pueden introducir usando @var{nota}-@var{dígito}: @@ -168,6 +165,7 @@ c4-1 d-2 f-4 c^\markup { \finger "2 - 3" } @end lilypond @cindex thumb-script + @funindex \thumb @funindex thumb @@ -229,6 +227,7 @@ Referencia de funcionamiento interno: @cindex notas ocultas @cindex notas invisibles @cindex notas transparentes + @funindex \hideNotes @funindex hideNotes @funindex \unHideNotes @@ -279,7 +278,8 @@ Referencia de funcionamiento interno: @cindex coloreados, objetos @cindex colores -@cindex colorear objects +@cindex colorear objetos +@cindex objetos, colorear @cindex coloreadas, notas @cindex colorear notas @cindex notas coloreadas @@ -287,6 +287,7 @@ Referencia de funcionamiento interno: @cindex x11-color @cindex colores de x11 @cindex with-color + @funindex color @funindex \with-color @funindex with-color @@ -336,6 +337,7 @@ b2 cis @cindex rgb-color @cindex color rgb @cindex rgb, color + @funindex rgb-color Se pueden especificar colores RGB exactos utilizando la función de @@ -369,6 +371,7 @@ Fragmentos de código: @cindex coloreadas, notas de acorde @cindex notas coloreadas en acordes @cindex color en acordes + @funindex x11-color @knownissues @@ -393,6 +396,7 @@ ver más detalles. @cindex notas fantasma @cindex notas entre paréntesis @cindex paréntesis + @funindex \parenthesize @funindex parenthesize @@ -424,13 +428,13 @@ Referencia de funciionamiento interno: @rinternals{ParenthesesItem}, @rinternals{parentheses-interface}. - @knownissues Al poner un acorde entre paréntesis, se encierra cada una de las notas individuales entre paréntesis, en vez de un solo paréntesis grande rodeando al acorde completo. + @node Stems @unnumberedsubsubsec Stems @@ -438,21 +442,23 @@ rodeando al acorde completo. @cindex plica invisible @cindex invisible, plica +@funindex \stemUp +@funindex stemUp +@funindex \stemDown +@funindex stemDown +@funindex \stemNeutral +@funindex stemNeutral + Cuando se encuentra con una nota, se crea automáticamente un objeto @code{Stem} (plica). Para las redondas y los silencios, también se crean pero se hacen invisibles. - @predefined -@funindex \stemUp @code{\stemUp}, -@funindex \stemDown @code{\stemDown}, -@funindex \stemNeutral @code{\stemNeutral}. @endpredefined - @snippets @cindex stem, direction @@ -496,11 +502,16 @@ pentagrama, desde fuera del pentagrama. @cindex notación, explicación de @cindex globo de ayuda @cindex ayuda, globos de + @funindex \balloonGrobText @funindex \balloonText @funindex Balloon_engraver @funindex balloonGrobText @funindex balloonText +@funindex \balloonLengthOn +@funindex balloonLengthOn +@funindex \balloonLengthOff +@funindex balloonLengthOff Los elementos de notación se pueden marcar y nombrar con la ayuda de un cartel o globo de ayuda rectangular. El propósito principal de @@ -543,11 +554,7 @@ pero esto puede cambiarse: @predefined -@funindex balloonLengthOn -@funindex \balloonLengthOn @code{\balloonLengthOn}, -@funindex \balloonLengthOff -@funindex balloonLengthOff @code{\balloonLengthOff}. @endpredefined @@ -569,6 +576,7 @@ Referencia de funcionamiento interno: @cindex líneas de rejilla @cindex vertical, línea, entre pentagramas @cindex línea vertical entre pentagramas + @funindex Grid_point_engraver @funindex Grid_line_span_engraver @funindex gridInterval @@ -639,9 +647,11 @@ Referencia de funcionamiento interno: @cindex fraseo, corchetes de @cindex corchetes de fraseo @cindex musicológico, análisis +@cindex análisis musicológico @cindex notas, corchetes de agrupación de @cindex horizontal, corchete @cindex corchete horizontal + @funindex Horizontal_bracket_engraver @funindex \startGroup @funindex startGroup diff --git a/Documentation/es/user/expressive.itely b/Documentation/es/user/expressive.itely index 6d8dbe739f..bb29bc78fb 100644 --- a/Documentation/es/user/expressive.itely +++ b/Documentation/es/user/expressive.itely @@ -6,7 +6,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @node Expressive marks @section Expressive marks diff --git a/Documentation/es/user/fretted-strings.itely b/Documentation/es/user/fretted-strings.itely index 128f5c221e..5c3ce76483 100644 --- a/Documentation/es/user/fretted-strings.itely +++ b/Documentation/es/user/fretted-strings.itely @@ -1,13 +1,13 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*- @c This file is part of lilypond.tely @ignore - Translation of GIT committish: 17d84cfa9ddb152b05d1e17ab72109fb4eefa684 + Translation of GIT committish: 4f8c7b381812949e6f765f641fba9108b52af56b When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.65" +@c \version "2.12.0" @node Fretted string instruments @section Fretted string instruments @@ -618,14 +618,18 @@ colocación un elemento sobre el diagrama de trastes. @end lilypond Se pueden incluir digitaciones y cejillas en una cadena de marcado -prolija @code{fret-diagram-verbose}. +prolija @code{fret-diagram-verbose}. Es exclusiva del interfaz de +fret-diagram-verbose la indicación @q{capo} que se puede colocar sobre +el diagrama de posición. La indicación de capo es una barra gruesa +que cubre todas las cuerdas. El traste que tiene el capo es el más +bajo del diagrama de posición. @c \override is necessary to make fingering visible @lilypond[quote, verbatim] << \context ChordNames { \chordmode { - f1 g + f1 g c } } \context Staff { @@ -652,7 +656,15 @@ prolija @code{fret-diagram-verbose}. (open 2) (place-fret 1 3 3) ) - } + < c e g c' e'> ^\markup + \fret-diagram-verbose #'( + (capo 3) + (mute 6) + (place-fret 4 5 1) + (place-fret 3 5 2) + (place-fret 2 5 3) + ) + } >> @end lilypond @@ -857,11 +869,12 @@ mychords = \chordmode{ @cindex personalizados, añadir diagramas de traste @cindex diagramas de trastes personalizados, añadir -Se pueden añadir diagramas de traste a la tabla de diagramas sFret -diagrams can be added to the fret diagram table. Para añadir un -diagrama debemos especificar el acorde del diagrama, la afinación -utilizadathe tuning to be used y la cadena de definición escueta -fret-diagram-terse del diagrama. +Se pueden añadir diagramas de posiciones a la tabla de diagramas de +posiciones. Para añadir un diagrama debemos especificar el acorde del +diagrama, la afinación utilizada y una definición del diagrama. La +definición del diagrama puede ser una cadena de definición escueta +fret-diagram-terse o una lista de marcados prolija +fret-diagram-verbose. @lilypond[verbatim, ragged-right, quote] \include "predefined-guitar-fretboards.ly" @@ -892,7 +905,7 @@ usando distinas octavas para las notas. \storePredefinedDiagram \chordmode {c'} #guitar-tuning - #(offset-fret 2 (chord-shape 'bes)) + #(offset-fret 2 (chord-shape 'bes guitar-tuning)) mychords = \chordmode{ c1 c' @@ -920,23 +933,28 @@ Además de los diagramas de traste, LilyPond almacena una lista interna de formas de acorde. Las formas de acorde son diagramas de traste que se pueden desplazar por el mástil para dar acordes distintos. Se pueden añadir formas de acorde a la lista interna y luego usarlas para -definir diagramas de traste predefinidos. +definir diagramas de posición predefinidos. Dado que se pueden mover +a distintas posiciones dentro del mástil, las formas de acorde +normalmente no contienen cuerdas al aire. Como los diagramas de +posiciones, las formas de acorde se pueden introducir como cadenas +escuetas fret-diagram-terse o como listas de marcado prolijas +fret-diagram-verbose. @lilypond[verbatim, ragged-right, quote] \include "predefined-guitar-fretboards.ly" % add a new chord shape -\addChordShape #'powerf #"1-1;3-3;3-4;x;x;x;" +\addChordShape #'powerf #guitar-tuning #"1-1;3-3;3-4;x;x;x;" % add some new chords based on the power chord shape \storePredefinedDiagram \chordmode {f'} #guitar-tuning - #(chord-shape 'powerf) + #(chord-shape 'powerf guitar-tuning) \storePredefinedDiagram \chordmode {g'} #guitar-tuning - #(offset-fret 2 (chord-shape 'powerf)) + #(offset-fret 2 (chord-shape 'powerf guitar-tuning)) mychords = \chordmode{ f1 f' g g' diff --git a/Documentation/es/user/fundamental.itely b/Documentation/es/user/fundamental.itely index 4d7448755e..c2667861f6 100644 --- a/Documentation/es/user/fundamental.itely +++ b/Documentation/es/user/fundamental.itely @@ -1,13 +1,13 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*- @c This file is part of lilypond-learning.tely @ignore - Translation of GIT committish: e2fedc46142bc323d48e696848327c6c0e4c9ede + Translation of GIT committish: bc4543c30c67f02dadc392880f27d4581e2d7681 When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @node Fundamental concepts @@ -471,7 +471,7 @@ siguiente: << { f c c } \new Staff \with { - alignAboveContext = "main" } + alignAboveContext = #"main" } { f8 f c } >> r4 | @@ -2604,29 +2604,29 @@ lower = \relative c, { << % combine ChoirStaff and PianoStaff in parallel \new ChoirStaff << \new Staff = "sopranos" << - \set Staff.instrumentName = "Soprano" + \set Staff.instrumentName = #"Soprano" \new Voice = "sopranos" { \global \sopranoMusic } >> \new Lyrics \lyricsto "sopranos" { \sopranoWords } \new Staff = "altos" << - \set Staff.instrumentName = "Alto" + \set Staff.instrumentName = #"Alto" \new Voice = "altos" { \global \altoMusic } >> \new Lyrics \lyricsto "altos" { \altoWords } \new Staff = "tenors" << - \set Staff.instrumentName = "Tenor" + \set Staff.instrumentName = #"Tenor" \new Voice = "tenors" { \global \tenorMusic } >> \new Lyrics \lyricsto "tenors" { \tenorWords } \new Staff = "basses" << - \set Staff.instrumentName = "Bass" + \set Staff.instrumentName = #"Bass" \new Voice = "basses" { \global \bassMusic } >> \new Lyrics \lyricsto "basses" { \bassWords } >> % end ChoirStaff \new PianoStaff << - \set PianoStaff.instrumentName = "Piano" + \set PianoStaff.instrumentName = #"Piano" \new Staff = "upper" \upper \new Staff = "lower" \lower >> @@ -2659,22 +2659,22 @@ Al hacerlo así obtenemos el ChoirStaff siguiente: @example \new ChoirStaff << \new Staff = "sopranos" << - \set Staff.instrumentName = "Soprano" + \set Staff.instrumentName = #"Soprano" \new Voice = "sopranos" @{ \global \musicaSoprano @} >> \new Lyrics \lyricsto "sopranos" @{ \latraSoprano @} \new Staff = "altos" << - \set Staff.instrumentName = "Alto" + \set Staff.instrumentName = #"Alto" \new Voice = "altos" @{ \global \musicaAlto @} >> \new Lyrics \lyricsto "altos" @{ \letraAlto @} \new Staff = "tenores" << - \set Staff.instrumentName = "Tenor" + \set Staff.instrumentName = #"Tenor" \new Voice = "tenores" @{ \global \musicaTenor @} >> \new Lyrics \lyricsto "tenores" @{ \letraTenor @} \new Staff = "bajos" << - \set Staff.instrumentName = "Bass" + \set Staff.instrumentName = #"Bass" \new Voice = "bajos" @{ \global \musicaBajo @} >> \new Lyrics \lyricsto "bajos" @{ \letraBajo @} @@ -2687,7 +2687,7 @@ solista}: @example \new PianoStaff << - \set PianoStaff.instrumentName = "Piano" + \set PianoStaff.instrumentName = #"Piano" \new Staff = "superior" \superior \new Staff = "inferior" \inferior >> @@ -2723,7 +2723,7 @@ Los grupos ChoirStaff y PianoStaff se deben combinar utilizando >> % fin del ChoirStaff \new PianoStaff << - \set PianoStaff.instrumentName = "Piano" + \set PianoStaff.instrumentName = #"Piano" \new Staff = "upper" \upper \new Staff = "lower" \lower >> @@ -2776,29 +2776,29 @@ lower = \relative c, { << % combine ChoirStaff and PianoStaff in parallel \new ChoirStaff << \new Staff = "sopranos" << - \set Staff.instrumentName = "Soprano" + \set Staff.instrumentName = #"Soprano" \new Voice = "sopranos" { \global \sopranoMusic } >> \new Lyrics \lyricsto "sopranos" { \sopranoWords } \new Staff = "altos" << - \set Staff.instrumentName = "Alto" + \set Staff.instrumentName = #"Alto" \new Voice = "altos" { \global \altoMusic } >> \new Lyrics \lyricsto "altos" { \altoWords } \new Staff = "tenors" << - \set Staff.instrumentName = "Tenor" + \set Staff.instrumentName = #"Tenor" \new Voice = "tenors" { \global \tenorMusic } >> \new Lyrics \lyricsto "tenors" { \tenorWords } \new Staff = "basses" << - \set Staff.instrumentName = "Bass" + \set Staff.instrumentName = #"Bass" \new Voice = "basses" { \global \bassMusic } >> \new Lyrics \lyricsto "basses" { \bassWords } >> % end ChoirStaff \new PianoStaff << - \set PianoStaff.instrumentName = "Piano " + \set PianoStaff.instrumentName = #"Piano " \new Staff = "upper" \upper \new Staff = "lower" \lower >> diff --git a/Documentation/es/user/input.itely b/Documentation/es/user/input.itely index c7b88be300..5e17569b34 100644 --- a/Documentation/es/user/input.itely +++ b/Documentation/es/user/input.itely @@ -1,13 +1,13 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*- @c This file is part of lilypond.tely @ignore - Translation of GIT committish: 17d84cfa9ddb152b05d1e17ab72109fb4eefa684 + Translation of GIT committish: bc4543c30c67f02dadc392880f27d4581e2d7681 When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @node General input and output @chapter General input and output @@ -1511,13 +1511,13 @@ instruments}. @example \new Staff @{ - \set Staff.midiInstrument = "glockenspiel" + \set Staff.midiInstrument = #"glockenspiel" @var{...notes...} @} @end example @example -\new Staff \with @{midiInstrument = "cello"@} @{ +\new Staff \with @{midiInstrument = #"cello"@} @{ @var{...notes...} @} @end example @@ -1769,7 +1769,7 @@ predeterminada. \score { \new Staff { - \set Staff.midiInstrument = "cello" + \set Staff.midiInstrument = #"cello" \set Score.dynamicAbsoluteVolumeFunction = #myDynamics \new Voice { \relative c'' { diff --git a/Documentation/es/user/install.itely b/Documentation/es/user/install.itely index 040ffa2c2e..63cc25712c 100644 --- a/Documentation/es/user/install.itely +++ b/Documentation/es/user/install.itely @@ -8,7 +8,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @c Translators: Francisco Vila diff --git a/Documentation/es/user/introduction.itely b/Documentation/es/user/introduction.itely index 6e7ca87b5a..4773b1d0ca 100644 --- a/Documentation/es/user/introduction.itely +++ b/Documentation/es/user/introduction.itely @@ -7,7 +7,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @c Translation status: post-GDP diff --git a/Documentation/es/user/keyboards.itely b/Documentation/es/user/keyboards.itely index de300a7380..1dbebbdea6 100644 --- a/Documentation/es/user/keyboards.itely +++ b/Documentation/es/user/keyboards.itely @@ -1,13 +1,13 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*- @c This file is part of lilypond.tely @ignore - Translation of GIT committish: d5bd12a5775832e81000fb901ad65283a152eaa4 + Translation of GIT committish: 4f8c7b381812949e6f765f641fba9108b52af56b When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @node Keyboard and other multi-staff instruments @section Keyboard and other multi-staff instruments @@ -34,7 +34,7 @@ teclado. @subsection Common notation for keyboards Esta sección trata aspectos de notación que pueden aparecer en casi -todos los instrumentos que tengan muchas cuerdas. +todos los instrumentos de teclado. @menu * References for keyboards:: @@ -104,6 +104,10 @@ tweaks}. @end itemize +@c @snippets +@c @lilypondfile[verbatim,lilyquote,texidoc,doctitle] +@c {forcing-visibility-of-systems-with-multi-bar-rests-when-using-\RemoveEmptyStaffContext.ly} +@c http://lsr.dsi.unimi.it/LSR/Item?u=1&id=312 @seealso Manual de aprendizaje: @@ -267,13 +271,20 @@ tanto, en caso necesario escriba @code{\relative} dentro de Si se necesita más control sobre los pentagramas individuales, se pueden crear manualmente con los nombres @code{"up"} y @code{"down"}. Entonces, la instrucción @code{\autochange} alternará su voz entre los -pentagramas existentes. Por ejemplo, esto es necesario para colocar -una armadura de tonalidad en el pentagrama inferior: +pentagramas existentes. -@lilypond[quote,verbatim] +@warning{Si se crean los pentagramas manualmente, @emph{se deben} +llamar @code{"up"} y @code{"down"} (en inglés).} + +Por ejemplo, esto es necesario para colocar una armadura de tonalidad +en el pentagrama inferior: + +@c Keep Ly needed, otherwise 'up' and 'down' get incorrectly translated in verbatim output +@c KEEP LY +@lilypond[quote,verbatim,nogettext] \new PianoStaff << \new Staff = "up" { - \new Voice = "melOne" { + \new Voice = "melodiaUno" { \key g \major \autochange \relative c' { g8 b a c b d c e @@ -583,31 +594,41 @@ Fragmentos de código: @node Harp @subsection Harp +Esta sección trata sobre asuntos de notación específicos del arpa. + @menu -* Harp notation:: +* References for harps:: * Harp pedals:: @end menu -@node Harp notation -@unnumberedsubsubsec Harp notation +@node References for harps +@unnumberedsubsubsec References for harps +@cindex harps +@cindex bisbiglando -Continuará... +Ciertas características comunes de la música de arpa se estudian en +otras partes de la documentación: -@ignore -Some possibilities: -- glissandi -- tremolo (for bisbigliando) -- natural harmonics -- directional arpeggio and non-arpeggio -- workaroung for keeping both staves visible in an orchestral - score, -http://lists.gnu.org/archive/html/lilypond-user/2007-08/msg00386.html -and http://lsr.dsi.unimi.it/LSR/Item?u=1&id=312 - -An LSR snippet could be used to demonstrate the main items; in the -case of glissandi, it would be desirable to have a demonstration -of different styles. -@end ignore +@itemize + +@item El glissando es la técnica más característica del arpa, +@ref{Glissando}. + +@item El @notation{bisbigliando} se escribe como un trémolo, @ref{Tremolo +repeats} + +@item Los armónicos naturales se estudian bajo el epígrafe @ref{Harmonics}. + +@item Para los arpegios dirigidos y los no arpegios, véase @ref{Arpeggio}. + +@end itemize + +@seealso +Referencia de la notación: +@ref{Tremolo repeats}, +@ref{Glissando}, +@ref{Arpeggio}, +@ref{Harmonics}. @node Harp pedals @unnumberedsubsubsec Harp pedals @@ -649,4 +670,5 @@ una elipse. @seealso Referencia de la notación: -@ruser{Text scripts}. +@ref{Text scripts}, +@ref{Instrument Specific Markup}. diff --git a/Documentation/es/user/lilypond-book.itely b/Documentation/es/user/lilypond-book.itely index 81df2d2669..439d65d747 100644 --- a/Documentation/es/user/lilypond-book.itely +++ b/Documentation/es/user/lilypond-book.itely @@ -1,13 +1,13 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*- @c This file is part of lilypond-program.tely @ignore - Translation of GIT committish: e2fedc46142bc323d48e696848327c6c0e4c9ede + Translation of GIT committish: 03baa9b14ef082fc7d651649a4081f326be304e1 When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @c Note: keep this node named so that `info lilypond-book' brings you here. @@ -704,6 +704,13 @@ se imprimirá como un bloque preformateado como f2 e @end example +@noindent +Si queremos traducir los comentarios y los nombres de variable en la +salida literal pero no en el código fuente, podemos establecer el +valor de la variable de entorno @code{LYDOC_LOCALEDIR} a la ruta de un +directorio; este directorio debe contener un árbol de catálogos de +mensajes @file{.mo} con @code{lilypond-doc} como dominio. + @item addversion (Sólo para la salida de Texinfo.) Anteponer la línea @code{\version @@w@{"@@version@{@}"@}} a la salida de @code{verbatim}. @@ -777,6 +784,10 @@ macro definido en el documento de Texinfo. La misma indicación referida al procesado de @code{texidoc} con idiomas localizados se aplica a @code{doctitle}. +@item nogettext +(Sólo para la salida de Texinfo.) No traducir los comentarios y +nombres de variable en el fragmento de código literal citado. + @item printfilename Si un archivo de entrada de LilyPond se incluye con @code{\lilypondfile}, imprimir el nombre del archivo inmediatamente diff --git a/Documentation/es/user/lilypond-program.tely b/Documentation/es/user/lilypond-program.tely index f6601089a6..d4608eca6a 100644 --- a/Documentation/es/user/lilypond-program.tely +++ b/Documentation/es/user/lilypond-program.tely @@ -172,7 +172,7 @@ en línea de la presente documentación y de otras. @menu * Install:: Cómo instalarlo o compilarlo. -* Setup:: Utilizar LilyPond con notros programas. +* Setup:: Utilizar LilyPond con otros programas. * Running LilyPond:: Funcionamiento. * LilyPond-book:: Integrar texto y música. * Converting from other formats:: Convertir al formato del código de entrada de lilypond. diff --git a/Documentation/es/user/literature.itely b/Documentation/es/user/literature.itely index f6cd507138..bdaed400ee 100644 --- a/Documentation/es/user/literature.itely +++ b/Documentation/es/user/literature.itely @@ -7,7 +7,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @node Literature list @appendix Literature list diff --git a/Documentation/es/user/notation-appendices.itely b/Documentation/es/user/notation-appendices.itely index 212c32d0ab..3a5a626dc9 100644 --- a/Documentation/es/user/notation-appendices.itely +++ b/Documentation/es/user/notation-appendices.itely @@ -1,13 +1,13 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*- @c This file is part of lilypond.tely @ignore - Translation of GIT committish: 0646758d26f727fc27fc13a87df2362388909e5d + Translation of GIT committish: bc4543c30c67f02dadc392880f27d4581e2d7681 When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @node Notation manual tables @appendix Notation manual tables @@ -199,7 +199,7 @@ Séptima semi-disminuido @tab Tríada disminuida y séptima menor @tab -@code{dim5m7} +@code{m7.5-} @tab @lilypond[line-width=3\cm,noragged-right, notime] \chordmode { @@ -212,11 +212,11 @@ Menor con séptima mayor @tab Tríada menor con séptima mayor @tab -@code{7m5} +@code{maj7.5-} @tab @lilypond[line-width=3\cm,noragged-right, notime] \chordmode { - c1:7m5 + c1:maj7.5- } @end lilypond @@ -260,9 +260,9 @@ Séptima dominante con novena mayor @end lilypond @item -Novena mayor +Mayor con novena @tab -HACER +Séptima mayor y novena mayor @tab @code{maj9} @tab @@ -275,7 +275,7 @@ HACER @item Menor con novena @tab -HACER +Séptima menor y novena mayor @tab @code{m9} @tab @@ -301,7 +301,7 @@ Novena dominante con oncena justa @item Oncena mayor @tab -HACER +Novena mayor y oncena justa @tab @code{maj11} @tab @@ -314,7 +314,7 @@ HACER @item Menor con oncena @tab -HACER +Novena menor y oncena justa @tab @code{m11} @tab @@ -324,6 +324,19 @@ HACER } @end lilypond +@item +Trecena dominante +@tab +Novena dominante y trecena mayor +@tab +@code{13} +@tab +@lilypond[line-width=3\cm,noragged-right, notime] +\chordmode { + c1:13 +} +@end lilypond + @item Trecena dominante @tab @@ -340,7 +353,7 @@ Oncena dominante y trecena mayor @item Mayor con trecena @tab -HACER +Oncena mayor y trecena mayor @tab @code{maj13.11} @tab @@ -353,7 +366,7 @@ HACER @item Menor con trecena @tab -HACER +Oncena menor y trecena mayor @tab @code{m13.11} @tab @@ -366,7 +379,7 @@ HACER @item Segunda suspendida @tab -HACER +Segunda mayor y quinta justa @tab @code{sus2} @tab @@ -379,7 +392,7 @@ HACER @item Cuarta suspendida @tab -HACER +Cuarta justa y quinta justa @tab @code{sus4} @tab diff --git a/Documentation/es/user/notation.itely b/Documentation/es/user/notation.itely index 3bca32e59d..a9d7c62d66 100644 --- a/Documentation/es/user/notation.itely +++ b/Documentation/es/user/notation.itely @@ -6,7 +6,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @node Musical notation @chapter Musical notation diff --git a/Documentation/es/user/percussion.itely b/Documentation/es/user/percussion.itely index bd04dc8cf8..ecdd84148e 100644 --- a/Documentation/es/user/percussion.itely +++ b/Documentation/es/user/percussion.itely @@ -1,13 +1,13 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*- @c This file is part of lilypond.tely @ignore - Translation of GIT committish: 17d84cfa9ddb152b05d1e17ab72109fb4eefa684 + Translation of GIT committish: bc4543c30c67f02dadc392880f27d4581e2d7681 When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.62" +@c \version "2.12.0" @node Percussion @section Percussion @@ -443,7 +443,7 @@ Una pandereta, escrita mediante @q{tamb} (@emph{tambourine}: tambustaff = { \override Staff.StaffSymbol #'line-positions = #'( 0 ) \override Staff.BarLine #'bar-size = #3 - \set DrumStaff.instrumentName = "Tambourine" + \set DrumStaff.instrumentName = #"Tambourine" } \new DrumStaff { @@ -470,7 +470,7 @@ Música para gong, introducida con @q{tt} (tam-tam): tamtamstaff = { \override Staff.StaffSymbol #'line-positions = #'( 0 ) \override Staff.BarLine #'bar-size = #3 - \set DrumStaff.instrumentName = "Tamtam" + \set DrumStaff.instrumentName = #"Tamtam" } \new DrumStaff { @@ -494,7 +494,7 @@ bellstaff = { \override DrumStaff.StaffSymbol #'line-positions = #'(-2 3) \set DrumStaff.drumStyleTable = #(alist->hash-table mydrums) \override Staff.BarLine #'bar-size = #3 - \set DrumStaff.instrumentName = "Different Bells" + \set DrumStaff.instrumentName = #"Different Bells" } \new DrumStaff { @@ -562,7 +562,7 @@ drumsB = { } \new DrumStaff { - \set DrumStaff.instrumentName = "Grosse Caisse" + \set DrumStaff.instrumentName = #"Grosse Caisse" \set DrumStaff.drumStyleTable = #(alist->hash-table mydrums) \drumsB } >> diff --git a/Documentation/es/user/pitches.itely b/Documentation/es/user/pitches.itely index f1ff680374..5085e51759 100644 --- a/Documentation/es/user/pitches.itely +++ b/Documentation/es/user/pitches.itely @@ -1,12 +1,12 @@ -@c -*- coding: utf-8; mode: texinfo; -*- +@c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*- @ignore - Translation of GIT committish: 17d84cfa9ddb152b05d1e17ab72109fb4eefa684 + Translation of GIT committish: bc4543c30c67f02dadc392880f27d4581e2d7681 When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @node Pitches @@ -48,7 +48,9 @@ ocasiones, será más práctico el modo relativo. @cindex alturas @cindex absoluta @cindex absoluta, especificación, de la octava +@cindex octava, especificación absoluta @cindex absoluta, introducción, de la octava +@cindex octava, introducción absoluta El nombre de una nota se especifica usando las letras minúsculas de la @code{a} a la @code{g}. Las notas cuyos nombres van desde @code{c} @@ -63,6 +65,7 @@ d e f g @end lilypond @cindex octava, marca de cambio de + @funindex ' @funindex , @@ -94,6 +97,11 @@ Fragmentos de código: @cindex relativo @cindex relativas, especificación de octavas +@cindex octava, introducción relativa +@cindex relativa, especificación de la octava +@cindex ocatva, especificación relativa + +@funindex relative @funindex \relative Cuando las octavas se especifican en modo absoluto, es fácil poner por @@ -169,6 +177,8 @@ abarcar intervalos muy grandes: } @end lilypond +@cindex acordes e introducción relativa de la octava +@cindex relativa, introducción de la octava, y acordes Si el elemento anterior es un acorde, la primera nota del acorde se utiliza para determinar la primera nota del siguiente acorde. Dentro @@ -201,7 +211,6 @@ independientemente del número de semitonos de cada uno de ellos. } @end lilypond - @seealso Glosario musical: @rglos{fifth}, @@ -217,16 +226,18 @@ Fragmentos de código: Referencia de funcionamiento interno: @rinternals{RelativeOctaveMusic}. - @cindex relativo, modo, transposición y @cindex transposición y modo relativo + @funindex \transpose +@funindex transpose @funindex \chordmode +@funindex chordmode @funindex \relative +@funindex relative @knownissues - La conversión relativa no afecta a las secciones @code{\transpose}, @code{\chordmode} o @code{\relative} en su argumento. Para usar el modo relativo dentro de música transportada, se debe escribir un @@ -257,6 +268,7 @@ información, consulte @rlearning{Accidentals and key signatures}.} @cindex notas, nombres holandeses de @cindex notas, nombres predeterminados +@cindex predeterminados, nombres de nota @cindex sostenido @cindex bemol @cindex doble sostenido @@ -287,7 +299,8 @@ a4 aes a2 @end lilypond @cindex cuartos de tono -@cindex semi-bemoles, semi-sostenidos +@cindex semi-bemoles +@cindex semi-sostenidos Se pueden escribir medios bemoles y los medios sostenidos; a continuación presentamos una serie de DOs cada vez más agudos: @@ -302,9 +315,10 @@ ceseh1 ces ceh c cih cis cisih @cindex alteración de precaución @cindex alteración con paréntesis @cindex recordatoria, alteración -@funindex ? @cindex precaución, alteración de @cindex paréntesis, alteración con + +@funindex ? @funindex ! Normalmente las alteraciones accidentales se imprimen automáticamente, @@ -537,8 +551,10 @@ Esta sección trata de la manera de modificar las alturas. @cindex octava, comprobación de @cindex octava, corrección de @cindex control, alturas de + @funindex = @funindex \octaveCheck +@funindex octaveCheck @funindex controlpitch En el modo relativo, es fácil olvidar una marca de cambio de octava. @@ -613,7 +629,9 @@ Referencia de funcionamiento interno: @cindex transposición de notas @cindex alturas, transporte de @cindex notas, transporte de + @funindex \transpose +@funindex transpose Una expresión musical se puede transportar mediante @code{\transpose}. La sintaxis es @@ -640,9 +658,6 @@ armadura de la tonalidad se transporta automáticamente. } @end lilypond -@cindex transpositores, instrumentos -@cindex instrumentos transpositores - Si una particella escrita en Do (@notation{afinación de concierto} normal) se debe tocar con un clarinete en La (para el que un La se escribe como un Do, y que suena una tercera menor por debajo de lo que @@ -724,10 +739,12 @@ Fragmentos de código: Referencia de funcionamiento interno: @rinternals{TransposedMusic}. - @funindex \transpose +@funindex transpose @funindex \chordmode +@funindex chordmode @funindex \relative +@funindex relative @knownissues @@ -756,7 +773,7 @@ notas. @node Clef @unnumberedsubsubsec Clef -@funindex \clef + @cindex Sol, clave de @cindex Do, clave de @cindex Fa, clave de @@ -785,6 +802,9 @@ notas. @cindex clave de barítono @cindex clave de contrabajo +@funindex \clef +@funindex clef + La clave se establece con la instrucción @code{\clef} @var{nombre_de_clave}. En todos los ejemplos se muestra el Do central. @@ -831,6 +851,7 @@ Están contempladas claves adicionales que se describen bajo @cindex clave transpositora @cindex octava, transposición de @cindex coral, clave de tenor +@cindex tenor coral, clave Al añadir @code{_8} o @code{^8} al nombre de la clave, la clave se transpone una octava hacia abajo o hacia arriba, respectivamente, y @@ -873,7 +894,9 @@ Referencia de funcionamiento interno: @unnumberedsubsubsec Key signature @cindex Armadura de la tonalidad + @funindex \key +@funindex key Las alteraciones accidentales y las armaduras son una frecuente causa de confusión para los nuevos usuarios, porque las notas sin alteración pueden llevar signos de becuadro en función de la armadura. @@ -898,25 +921,26 @@ armadura se hace con la instrucción @code{\key}: @end example @funindex \major +@funindex major @funindex \minor +@funindex minor @funindex \ionian +@funindex ionian @funindex \locrian +@funindex locrian @funindex \aeolian +@funindex aeolian @funindex \mixolydian +@funindex mixolydian @funindex \lydian +@funindex lydian @funindex \phrygian +@funindex phrygian @funindex \dorian +@funindex dorian + @cindex modos eclesiásticos @cindex modos -@cindex major -@cindex minor -@cindex ionian -@cindex locrian -@cindex aeolian -@cindex mixolydian -@cindex lydian -@cindex phrygian -@cindex dorian @cindex mayor, modo @cindex menor, modo @cindex eonio, modo @@ -981,7 +1005,10 @@ Referencia de funcionamiento interno: @cindex 15ma @cindex 8va @cindex octavación + @funindex set-octavation +@funindex \ottava +@funindex ottava Los @notation{corchetes de Ottava} introducen un trasporte adicional de una octava para el pentagrama. @@ -1024,7 +1051,9 @@ Referencia de funcionamiento interno: @cindex transpositor, instrumento @cindex MIDI @cindex MIDI, transposición + @funindex \transposition +@funindex transposition Al tipografiar partituras donde participan instrumentos transpositores, ciertas partes se pueden tipografiar en un tono @@ -1056,8 +1085,8 @@ tocan los dos instrumentos está sonando al unísono. \new GrandStaff << \new Staff = "violin" { \relative c'' { - \set Staff.instrumentName = "Vln" - \set Staff.midiInstrument = "violin" + \set Staff.instrumentName = #"Vln" + \set Staff.midiInstrument = #"violin" % not strictly necessary, but a good reminder \transposition c' @@ -1068,7 +1097,7 @@ tocan los dos instrumentos está sonando al unísono. \new Staff = "clarinet" { \relative c'' { \set Staff.instrumentName = \markup { Cl (B\flat) } - \set Staff.midiInstrument = "clarinet" + \set Staff.midiInstrument = #"clarinet" \transposition bes \key d \major @@ -1083,7 +1112,7 @@ ejemplo, un clarinetista puede cambiar del clarinete en La al clarinete en Si bemol. @lilypond[verbatim,quote,relative=2] -\set Staff.instrumentName = "Cl (A)" +\set Staff.instrumentName = #"Cl (A)" \key a \major \transposition a c d e f @@ -1118,8 +1147,10 @@ Fragmentos de código: @cindex alteraciones, estilo de las @cindex predeterminado, estilo de las alteraciones @cindex alteraciones, estilo predeterminado de las + @funindex set-accidental-style @funindex voice +@funindex default Existen muchas convenciones distintas sobre la forma de tipografiar las alteraciones. LilyPond proporciona una función para especificar @@ -1147,8 +1178,6 @@ curso, use Están contemplados los siguientes estilos de alteración. Para dar una muestra de cada uno de los estilos, utilizamos el ejemplo siguiente: -@funindex default - @lilypond[verbatim,quote] musicA = { << @@ -1219,6 +1248,7 @@ dos pentagramas. @item default (predeterminado) @cindex alteraciones, estilo predeterminado + @funindex default Es el comportamiento de composición tipográfica predeterminado. @@ -1282,6 +1312,7 @@ musicB = { @cindex moderno, estilo de alteraciones @cindex alteraciones, estilo, moderno-precaución @cindex moderno-precaución, estilo de alteraciones + @funindex voice El comportamiento normal es recordar las alteraciones accidentales al @@ -1350,6 +1381,7 @@ musicB = { @cindex alteraciones, estilo moderno @cindex moderno, alteraciones de estilo + @funindex modern Esta regla corresponde a la práctica común del s. XX. Imprime las @@ -1411,6 +1443,7 @@ musicB = { @cindex alteraciones, estilo moderno de precaución @cindex moderno, alteraciones de estilo @cindex moderno de precaución, alteraciones de estilo + @funindex modern-cautionary Esta regla es similar a @code{modern}, pero las alteraciones @@ -1474,6 +1507,7 @@ musicB = { @cindex moderno, alteraciones de estilo @cindex voces, alteraciones en varias @cindex alteración, estilo moderno de + @funindex modern-voice Esta regla se usa para que puedan leer las alteraciones en varias @@ -1535,6 +1569,7 @@ musicB = { @cindex alteración, estilo de voz de precaución moderno @cindex alteración de voz de precaución moderno, estilo de @cindex alteración, moderno de precaución, voz, estilo de + @funindex modern-voice-cautionary Esta regla es la misma que @code{modern-voice}, pero con las @@ -1594,6 +1629,7 @@ musicB = { @cindex piano, alteraciones de @cindex alteraciones de piano @cindex piano, estilo de alteraciones de + @funindex piano Esta regla refleja la práctica del s.XX para la notación de piano. Su @@ -1652,7 +1688,6 @@ musicB = { @item piano-cautionary (piano, de precaución) -@funindex piano-cautionary @cindex alteraciones, piano de precaución, estilo de @cindex alteraciones, piano de precaución @cindex precaución, estilo de alteraciones, piano @@ -1660,6 +1695,8 @@ musicB = { @cindex piano de precaución, estilo de alteraciones @cindex piano de precaución, alteraciones +@funindex piano-cautionary + Igual que @code{#(set-accidental-style 'piano)} pero con las alteraciones añadidas compuestas como de precaución. @@ -1709,10 +1746,11 @@ musicB = { @end lilypond @item neo-modern -@funindex neo-modern @cindex neo-moderno, estilo de alteraciones @cindex alteraciones, estilo de, neo-moderno +@funindex neo-modern + Esta regla reproduce una práctica común en la música contemporánea: las alteraciones accidentales se imprimen como en @code{modern}, pero se vuelven a imprimir si aparece la misma nota otra vez en el mismo @@ -1766,10 +1804,11 @@ musicB = { @item neo-modern-cautionary -@funindex neo-modern-cautionary @cindex neo-moderno de precaución, estilo de alteraciones @cindex alteraciones, estilo, neo-moderno de precaución +@funindex neo-modern-cautionary + Esta regla es similar a @code{neo-modern}, pero las alteraciones adicionales se imprimen como alteraciones de precaución. @@ -1822,10 +1861,11 @@ musicB = { @item dodecaphonic -@funindex dodecaphonic @cindex dodecafónico, estilo de alteraciones @cindex alteraciones, estilo, dodecafónico +@funindex dodecaphonic + Esta regla refleja una práctica introducida por los compositores de principios del s.XX, en un intento de abolir la jerarquía entre notas naturales y alteradas. Con este estilo, @emph{todas} las notas llevan @@ -1879,10 +1919,11 @@ musicB = { @item teaching (enseñanza) -@funindex teaching @cindex teaching (enzeñanza), estilo de alteraciones @cindex alteraciones, estilo teaching (enseñanza) +@funindex teaching + Esta regla está pensada para estudiantes, y hace más sencillo crear hojas de escalas con alteraciones de precaución creadas automáticamente. Las alteraciones se imprimen como en el estilo @@ -1941,10 +1982,11 @@ musicB = { @item no-reset (no restablecer) -@funindex no-reset @cindex alteraciones no restablecer, estilo de @cindex no restablecer, estilo de alteraciones +@funindex no-reset + Es el mismo que @code{default} pero con alteraciones que duran @q{para siempre} y no sólo dentro del mismo compás: @@ -1996,10 +2038,11 @@ musicB = { @item forget (olvidar) -@funindex forget @cindex olvidar, estilo de alteraciones @cindex alteración, estilo de, olvidar +@funindex forget + Es lo opuesto a @code{no-reset}: Las alteraciones no se recuerdan en absoluto: de aquí que todas las alteraciones se compongan tipográficamente en relación a la armadura de la tonalidad, sin que @@ -2186,6 +2229,7 @@ Esta sección propone formas de alterar las cabezas de las figuras. @cindex guitarra, cabezas de nota @cindex nota, cabeza de, estilos @cindex estilos de cabeza de nota + @funindex cross Se puede modificar la cabeza de las notas: @@ -2238,6 +2282,11 @@ Referencia de funcionamiento interno: @cindex nots, cabezas de, para precticar @cindex simplificada, notación +@funindex \easyHeadsOn +@funindex easyHeadsOn +@funindex \easyHeadsOff +@funindex easyHeadsOff + Las cabezas @q{easy play} (fáciles de tocar) tienen el nombre de la nota (en inglés) dentro de la cabeza. Se usa en la música para principiantes. @@ -2262,9 +2311,7 @@ staff size}. @predefined -@funindex \easyHeadsOn @code{\easyHeadsOn}, -@funindex \easyHeadsOff @code{\easyHeadsOff}. @endpredefined @@ -2292,9 +2339,13 @@ Referencia de funcionamiento interno: @cindex formas, notas con @cindex Aiken, cabezas de nota con forma de @cindex arpa sacra, cabezas de nota de + @funindex \key +@funindex key @funindex \aikenHeads +@funindex aikenHeads @funindex \sacredHarpHeads +@funindex sacredHarpHeads En la notación de cabezas con forma, la forma de la cabeza corresponde a la función armónica de una nota dentro de la escala. Esta notación @@ -2313,9 +2364,7 @@ tónica está determinada por la instrucción @code{\key} @predefined -@funindex \aikenHeads @code{\aikenHeads}, -@funindex \sacredHarpHeads @code{\sacredHarpHeads}. @endpredefined @@ -2352,6 +2401,11 @@ Referencia de funcionamiento interno: @cindex notas, cabezas de, improvisación @cindex notas, cabezas de, barradas +@funindex \improvisationOn +@funindex improvisationOn +@funindex \improvisationOff +@funindex improvisationOff + La improvisación se denota a veces mediante cabezas de nota en forma de barra inclinada, donde el ejecutante puede elegir cualquier nota pero con el ritmo especificado. Estas cabezas de nota se crean así: @@ -2372,9 +2426,7 @@ pero con el ritmo especificado. Estas cabezas de nota se crean así: @predefined -@funindex \improvisationOn @code{\improvisationOn}, -@funindex \improvisationOff @code{\improvisationOff}. @endpredefined @@ -2387,4 +2439,3 @@ Referencia de funcionamiento interno: @rinternals{Pitch_squash_engraver}, @rinternals{Voice}, @rinternals{RhythmicStaff}. - diff --git a/Documentation/es/user/preface.itely b/Documentation/es/user/preface.itely index 1da322e38c..1520cef4e8 100644 --- a/Documentation/es/user/preface.itely +++ b/Documentation/es/user/preface.itely @@ -7,7 +7,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @node Preface @unnumbered Preface diff --git a/Documentation/es/user/programming-interface.itely b/Documentation/es/user/programming-interface.itely index f9ee790124..bf28088778 100644 --- a/Documentation/es/user/programming-interface.itely +++ b/Documentation/es/user/programming-interface.itely @@ -7,7 +7,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @node Interfaces for programmers @chapter Interfaces for programmers diff --git a/Documentation/es/user/repeats.itely b/Documentation/es/user/repeats.itely index b12dc1ba3a..89edd15e5e 100644 --- a/Documentation/es/user/repeats.itely +++ b/Documentation/es/user/repeats.itely @@ -6,7 +6,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @node Repeats @section Repeats @@ -30,7 +30,7 @@ repeticiones con finales alternativos. @item unfold (desplegada) Las música repetida se escribe y se interpreta completamente tantas veces como especifique el valor @var{número_de_repeticiones}. Es útil -cuando se estáescribiendo música repetitiva. +cuando se está escribiendo música repetitiva. @item percent (porcentaje) Hacer repeticiones de compases o parte de ellos. Tienen un aspecto diff --git a/Documentation/es/user/rhythms.itely b/Documentation/es/user/rhythms.itely index f0a6a16cba..0ea3d861a4 100644 --- a/Documentation/es/user/rhythms.itely +++ b/Documentation/es/user/rhythms.itely @@ -1,12 +1,12 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*- @ignore - Translation of GIT committish: 17d84cfa9ddb152b05d1e17ab72109fb4eefa684 + Translation of GIT committish: d12be863e1a7243f95d327002906c497f4741e33 When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @node Rhythms @section Rhythms @@ -52,8 +52,8 @@ ejemplo, una negra se escribe usando un @code{4} (puesto que es 1/4 de redonda), mientras que una blanca se escribe con un @code{2} (por ser 1/2 de redonda). Para notas mayores de la redonda se deben usar los comandos @code{\longa} (que es una breve doble) y @code{\breve}. Se -pueden especificar duraciones tan cortas como la semifusa (con el -número 64). Son posibles valores más cortos, pero sólo como notas +pueden especificar duraciones tan cortas como la garrapatea (con el +número 128). Son posibles valores más cortos, pero sólo como notas unidas por una barra. @c Two 64th notes are needed to obtain beams @@ -875,7 +875,7 @@ La indicación de compás se imprime al comienzo de una pieza y siempre que hay un cambio de compás. Si se produce un cambio al final de una línea, se imprime una indicación de advertencia en dicho lugar. Se puede modificar este comportamiento predeterminado, véase -@ref{Controlling visibility of objects}. +@ref{Visibility of objects}. @lilypond[quote,verbatim,relative=2] \time 2/4 @@ -1491,6 +1491,9 @@ se controla mediante tres propiedades de contexto: @code{measureLength}, @code{beatLength} y @code{beatGrouping}. Estas propiedades se deben establecer en los contextos @code{Score}, @code{Staff} o @code{Voice} para delimitar el ámbito de su efecto. +Los valores predeterminados se establecen al procesarse las +instrucciones @code{\time}, por ello las instrucciones @code{\set} se +deben escribir después de todas las instrucciones @code{\time}. Dichas propiedades determinan el barrado de la siguiente forma: diff --git a/Documentation/es/user/running.itely b/Documentation/es/user/running.itely index 855f8e5091..4de1e0f767 100644 --- a/Documentation/es/user/running.itely +++ b/Documentation/es/user/running.itely @@ -7,7 +7,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @node Running LilyPond diff --git a/Documentation/es/user/scheme-tutorial.itely b/Documentation/es/user/scheme-tutorial.itely index 1897c124cb..017773ee6f 100644 --- a/Documentation/es/user/scheme-tutorial.itely +++ b/Documentation/es/user/scheme-tutorial.itely @@ -7,7 +7,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @node Scheme tutorial diff --git a/Documentation/es/user/setup.itely b/Documentation/es/user/setup.itely index be51820723..41a4d9a909 100644 --- a/Documentation/es/user/setup.itely +++ b/Documentation/es/user/setup.itely @@ -7,7 +7,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @node Setup @chapter Setup diff --git a/Documentation/es/user/simultaneous.itely b/Documentation/es/user/simultaneous.itely index de4f072550..d0be14c73e 100644 --- a/Documentation/es/user/simultaneous.itely +++ b/Documentation/es/user/simultaneous.itely @@ -6,7 +6,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @c Translation status: post-GDP diff --git a/Documentation/es/user/spacing.itely b/Documentation/es/user/spacing.itely index 8252db3a63..6875915460 100644 --- a/Documentation/es/user/spacing.itely +++ b/Documentation/es/user/spacing.itely @@ -1,13 +1,13 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*- @c This file is part of lilypond.tely @ignore - Translation of GIT committish: d5bd12a5775832e81000fb901ad65283a152eaa4 + Translation of GIT committish: a665ef1bf16700359aa81ec649d3a500bfa72213 When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.64" +@c \version "2.12.0" @node Spacing issues @chapter Spacing issues @@ -113,13 +113,13 @@ aunque se sobreescribirán en la siguiente reinstalación del programa. Si se añade el símbolo @code{'landscape} (apaisado) como argumento a @code{set-default-paper-size}, las páginas se giran 90 grados y se -establecen en consonancia un longitud mayor de las líneas. +establece en consonancia una mayor longitud de las líneas. @example #(set-default-paper-size "a6" 'landscape) @end example -al establecer el tamaño del papel se ajustan un cierto número de +Al establecer el tamaño del papel se ajustan un cierto número de variables del @code{\paper}, tales como los márgenes. Para utilizar un tamaño de página determinado con variables de @code{\paper} alteradas, establezca el tamaño de página antes de dar valores a las @@ -219,7 +219,7 @@ la página. Predeterminado: @code{4\mm}. @item page-top-space @funindex page-top-space -Distancia desde la parte alte del área imprimible hasta el centro del +Distancia desde la parte alta del área imprimible hasta el centro del primer pentagrama. Esto sólo funciona para pentagramas con una anchura vertical pequeña. Los pentagramas grandes se establecen con la parte alta de su caja circundante alineada a la parte alta del área @@ -384,7 +384,7 @@ general. @item auto-first-page-number @funindex auto-first-page-number -EL algoritmo de división de páginas está afectado por el hecho de que +El algoritmo de división de páginas está afectado por el hecho de que el número de la primera página sea par o impar. Si está establecido al valor verdadero, el algoritmo de división de páginas decide si comenzar con un número par o impar. Esto hace que el número de la @@ -494,7 +494,7 @@ orquestales. @funindex ragged-last Si está establecido a un valor verdadero, el último sistema de la -partitura no llenará la anchura de la línea. En su lugar, el últim +partitura no llenará la anchura de la línea. En su lugar, el último sistema termina en su longitud horizontal natural. Predeterminado: @code{##f}. @@ -596,8 +596,7 @@ exactos), utilice @code{set-global-staff-size}. @noindent Esto establece el tamaño global predeterminado a una altura de -pentagrama de 14pt y escala todas las tipografías de manera -correspondiente. +pentagrama de 14pt y escala todas las tipografías según corresponda. Para establecer el tamaño del pentagrama de forma individual para cada partitura, use @@ -695,7 +694,7 @@ del pentagrama. @funindex \layout -Mientras que @code{\paper} conteine ajustes relativos al formato de +Mientras que @code{\paper} contiene ajustes relativos al formato de página del documento completo, @code{\layout} contiene ajustes para la disposición específica de cada partitura. @@ -839,8 +838,7 @@ c4 c2 c4 Esto se puede evitar eliminando el grabador @code{Forbid_line_break_engraver}. Observe que los saltos de línea -forzados manualmente breaks se tienen que añadir en paralelo con la -música. +forzados manualmente se tienen que añadir en paralelo con la música. @lilypond[quote,ragged-right,verbatim] \new Voice \with { @@ -1257,7 +1255,7 @@ pentagramas dentro de un sistema. @cindex espacio entre pentagramas @cindex espacio dentro de los sistemas -La altura de cad sistema se determina automáticamente. Para evitar +La altura de cada sistema se determina automáticamente. Para evitar que los pentagramas se superpongan unos encima de otros, se establecen algunas distancias mínimas. Al modificarlas, podemos poner los pentagramas más cerca unos de otros. Esto reduce el espacio que @@ -1286,7 +1284,7 @@ que coincidir; por ejemplo, el pentagrama se puede hacer mayor por debajo dándole el valor @code{(-6 . 4)}. Después de que se han determinado los saltos de página, se reevalúa el -espaciado vertical dentrod e cada sistema para llenar la página de +espaciado vertical dentro de cada sistema para llenar la página de forma más regular; si una página tiene más espacio de sobra, se amplían los sistemas para poder llenar este espacio. La magnitud de esta ampliación se puede configurar a través de la propiedad @@ -1392,7 +1390,7 @@ mediante el establecimiento al valor @code{#t} de la variable @code{page-limit-inter-system-space} en el bloque @code{\paper}. La variable del papel @code{page-limit-inter-system-space-factor} determina en qué cantidad se puede incrementar el espacio: por -ejemplo, el valor @code{1.3} sisgnifica que el espacio puede ser un +ejemplo, el valor @code{1.3} significa que el espacio puede ser un 30% mayor que lo que sería en una página no justificada hasta abajo. En el ejemplo siguiente, si el espacio entre los sistemas no estuviese @@ -1604,7 +1602,7 @@ usando la subpropiedad @code{alignment-offsets} de } @end lilypond -Aobserve que aquí asignamos dos valores distintos al atributo +Observe que aquí asignamos dos valores distintos al atributo @code{line-break-system-details} del grob @code{NonMusicalPaperColumn}. Aunque el atributo alist de @code{line-break-system-details} acepta muchos parámetros de espaciado @@ -1765,7 +1763,7 @@ exterior del pentagrama. Después ordena los objetos fuera del pentagrama de acuerdo a su prioridad @code{outside-staff-priority} (en orden creciente). LilyPond toma los objetos fuera del pentagrama uno a uno y los coloca de forma que no choquen con ningún objeto que ya -haya sido colocado. Eesto es, si dos grobs fuera del pentagrama +haya sido colocado. Esto es, si dos grobs fuera del pentagrama compiten por el mismo espacio, el que tiene la prioridad @code{outside-staff-priority} más baja se colocará más próximo al pentagrama. @@ -1795,24 +1793,26 @@ c^"This text is padded away from the previous text" c^"This text is placed close to the previous text" @end lilypond -HACER: ¿este ejemplo ya no funciona? - -De forma predeterminada, los objetos fuera del pentagrama se sitúan -sin tener en cuenta su distancia horizontal a partir de los grobs -posicionados previamente. Esto puede llevar a situiaciones en las que -los objetos se colocan muy próximos entre sí en el sentido horizontal. -El establecimiento del relleno horizontal +De forma predeterminada, los objetos fuera del pentagrama se colocan +sólo para evitar una colisión horizontal con los grobs posicionados +previamente. Esto puede llevar a situaciones en las que los objetos +se colocan muy próximos entre sí en el sentido horizontal. El espacio +vertical entre pentagramas se puede fijar también de manera que los +objetos fuera del pentagrama se sitúen de forma intercalada. El +establecimiento del relleno horizontal @code{outside-staff-horizontal-padding} ocasiona que un objeto se -desplace verticalmente para que tal situiación no ocurra. +desplace verticalmente para que tal situación no ocurra. @lilypond[quote,ragged-right,relative=2,fragment,verbatim] % the markup is too close to the following note -c2^"Text" +c4^"Text" +c4 c''2 % setting outside-staff-horizontal-padding fixes this R1 \once \override TextScript #'outside-staff-horizontal-padding = #1 -c,,2^"Text" +c,,4^"Text" +c4 c''2 @end lilypond @@ -1870,7 +1870,7 @@ por un espacio de 1 ACB. Si siguiésemos el procedimiento anterior exactamente, entonces la adición de una sola fusa a una partitura que usa corcheas y -semicorcheas, aumentaría enormemente la anchuta de la partitura +semicorcheas, aumentaría enormemente la anchura de la partitura completa. La nota más breve ya no es la semicorchea, sino la fusa, añadiendo así 1 ACB a cada una de las notas. Para evitarlo, la duración más breve a efectos de espaciado no es la nota más breve de @@ -1886,7 +1886,7 @@ una corchea. La duración más breve se imprime cuando se ejecuta Estas duraciones también se pueden personalizar. Si establecemos la @code{common-shortest-duration} en @rinternals{SpacingSpanner}, entonces éste establece la duración base para el espaciado. La -duración máxima para esta base (normalmente un a corchea), se fija a +duración máxima para esta base (normalmente una corchea), se fija a través de @code{base-shortest-duration}. @funindex common-shortest-duration @@ -2195,7 +2195,7 @@ ajuste @code{proportionalNotationDuration}. @end lilypond La blanca al princpio del compás y las notas rápidas de la segunda -mitad del compás ocupan ahora igual cantidades iguales de espacio +mitad del compás ocupan ahora cantidades iguales de espacio horizontal. Podríamos colocar una línea de tiempo graduada o un gráfico encima o debajo de este ejemplo. @@ -2424,8 +2424,8 @@ partituras proporcionales abordan este problema de distinta manera. Sería posible evitar los problemas de espaciado con las armaduras, simplemente evitando tenerlas. Esta es una opción válida pues casi todas las partituras proporcionales son música contemporánea. Lo -mismo puede valer para las indicaciones de compás, espacialmente para -las partituras que incluyen ula línea de tiempo graduada u otro +mismo puede valer para las indicaciones de compás, especialmente para +las partituras que incluyen una línea de tiempo graduada u otro gráfico. Pero estas partituras son excepcionales y casi todas las partituras proporcionales incluyen al menos unas pocas indicaciones de compás. Las claves y las alteraciones son aún más esenciales. @@ -2459,7 +2459,7 @@ Compare las dos partituras siguientes: @end lilypond Las dos poartituras son proporcionales, pero el espaciado de la -primera es muy suelto a causa del cmabio de clave. Sin embargo, el +primera es muy suelto a causa del cambio de clave. Sin embargo, el espaciado de la segunda partitura se mantiene estricto, porque @code{strict-note-spacing} está activado. La activación de @code{strict-note-spacing} hace que el ancho de las indicaciones de @@ -2534,7 +2534,7 @@ página, establezca @code{annotate-spacing} en el bloque @code{\paper}: @noindent Todas las dimensiones de disposición se muestran en espacios de pentagrama, independientemenre de las unidades especificadas en los -bloques @code{\paper} o @code{\layout}. Por ejemmplo, +bloques @code{\paper} o @code{\layout}. Por ejemplo, @code{paper-height} tiene un valor de 59.75 espacios de pentagrama, usando el tamaño predeterminado de pentagrama de 20 puntos, que equivale a 148 milímetros, la altura de una hoja de papel @code{a6} en @@ -2589,7 +2589,7 @@ disposición con 10 sistemas. Evitar (o reducir en número) los objetos que aumentan el tamaño vertical de un sistema. Por ejemplo, las repeticiones de primera y segunda vez (o repeticiones con finales alternativos) necesitan -espacio adicional. Si estas repeticiones se reparten a lo lardo de +espacio adicional. Si estas repeticiones se reparten a lo largo de dos sistemas, ocupan más espacio que un sistema con las casillas de repetición y otro sistema sin ellas. Por ejemplo, las indicaciones dinámicas que se @q{salen} de un sistema se pueden acercar al diff --git a/Documentation/es/user/specialist.itely b/Documentation/es/user/specialist.itely index 772edd6ea2..679b8b29b4 100644 --- a/Documentation/es/user/specialist.itely +++ b/Documentation/es/user/specialist.itely @@ -6,7 +6,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @node Specialist notation @chapter Specialist notation diff --git a/Documentation/es/user/staff.itely b/Documentation/es/user/staff.itely index b9897e77d6..5a97a1ce02 100644 --- a/Documentation/es/user/staff.itely +++ b/Documentation/es/user/staff.itely @@ -1,12 +1,12 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*- @ignore - Translation of GIT committish: 17d84cfa9ddb152b05d1e17ab72109fb4eefa684 + Translation of GIT committish: bc4543c30c67f02dadc392880f27d4581e2d7681 When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.64" +@c \version "2.12.0" @node Staff notation @section Staff notation @@ -207,7 +207,7 @@ nombre del instrumento. Para ver más detalles, consulte @lilypond[verbatim,quote,relative=2] \new PianoStaff << - \set PianoStaff.instrumentName = "Piano" + \set PianoStaff.instrumentName = #"Piano" \new Staff { c1 c } \new Staff { c1 c } >> @@ -406,7 +406,7 @@ ajuste afecta también al espaciado de las líneas adicionales. { a4 b c d } @end lilypond -Hay más detalles sobre las proopiedades de @code{StaffSymbol} en +Hay más detalles sobre las propiedades de @code{StaffSymbol} en @rinternals{staff-symbol-interface}. @funindex \startStaff @@ -877,8 +877,8 @@ primer pentagrama, y el valor de @code{shortInstrumentName} se usa para todos los pentagramas siguientes. @lilypond[verbatim,quote,ragged-right,relative=1] -\set Staff.instrumentName = "Violin " -\set Staff.shortInstrumentName = "Vln " +\set Staff.instrumentName = #"Violin " +\set Staff.shortInstrumentName = #"Vln " c4.. g'16 c4.. g'16 \break c1 @@ -904,7 +904,7 @@ se debe utilizar @code{\center-column}: @lilypond[verbatim,quote,indent=1.5\cm,relative=2] << \new Staff { - \set Staff.instrumentName = "Flute" + \set Staff.instrumentName = #"Flute" f2 g4 f } \new Staff { @@ -934,14 +934,14 @@ consulte @ref{Horizontal dimensions}. \relative c'' << \new Staff { - \set Staff.instrumentName = "Alto Flute in G" - \set Staff.shortInstrumentName = "Fl." + \set Staff.instrumentName = #"Alto Flute in G" + \set Staff.shortInstrumentName = #"Fl." f2 g4 f \break g4 f g2 } \new Staff { - \set Staff.instrumentName = "Clarinet" - \set Staff.shortInstrumentName = "Clar." + \set Staff.instrumentName = #"Clarinet" + \set Staff.shortInstrumentName = #"Clar." c,4 b c2 \break c2 b4 c } @@ -959,12 +959,12 @@ plug-ins}. Los nombres de instrumento se pueden cambiar en mitad de una pieza: @lilypond[verbatim,quote,ragged-right,relative=1] -\set Staff.instrumentName = "First" -\set Staff.shortInstrumentName = "one" +\set Staff.instrumentName = #"First" +\set Staff.shortInstrumentName = #"one" c1 c c c \break c1 c c c \break -\set Staff.instrumentName = "Second" -\set Staff.shortInstrumentName = "two" +\set Staff.instrumentName = #"Second" +\set Staff.shortInstrumentName = #"two" c1 c c c \break c1 c c c \break @end lilypond @@ -993,7 +993,7 @@ musical para declarar el cambio de instrumento: (midiInstrument . "bassoon")) \new Staff \with { - instrumentName = "Bassoon" + instrumentName = #"Bassoon" } \relative c' { \clef tenor diff --git a/Documentation/es/user/templates.itely b/Documentation/es/user/templates.itely index 2fc71e9092..43f26c177a 100644 --- a/Documentation/es/user/templates.itely +++ b/Documentation/es/user/templates.itely @@ -7,7 +7,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @node Templates @appendix Templates diff --git a/Documentation/es/user/text.itely b/Documentation/es/user/text.itely index 242e1bf228..1c29920d56 100644 --- a/Documentation/es/user/text.itely +++ b/Documentation/es/user/text.itely @@ -6,7 +6,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.65" +@c \version "2.12.0" @node Text @section Text diff --git a/Documentation/es/user/tutorial.itely b/Documentation/es/user/tutorial.itely index 7d236f31a3..8e9608c53e 100644 --- a/Documentation/es/user/tutorial.itely +++ b/Documentation/es/user/tutorial.itely @@ -7,7 +7,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @ignore Tutorial guidelines: (different from policy.txt!) diff --git a/Documentation/es/user/tweaks.itely b/Documentation/es/user/tweaks.itely index 363f66c31d..f9d5b0e796 100644 --- a/Documentation/es/user/tweaks.itely +++ b/Documentation/es/user/tweaks.itely @@ -1,13 +1,13 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*- @c This file is part of lilypond.tely @ignore - Translation of GIT committish: 17d84cfa9ddb152b05d1e17ab72109fb4eefa684 + Translation of GIT committish: bc4543c30c67f02dadc392880f27d4581e2d7681 When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.65" +@c \version "2.12.0" @node Tweaking output @chapter Tweaking output @@ -371,14 +371,14 @@ se cambiaría de la siguiente forma: @end lilypond Observe que la sintaxis de @code{\tweak} no es igual que la de -@code{\override}. Ni el contexto ni el objeto de -presentación se deben especificar; de hecho, generaría un error -hacerlo. Los dos están implícitos por el siguiente elemento del flujo -de entrada. Así que la sintaxis genérica de la instrucción -@code{\tweak} es, simplemente, +@code{\override}. Ni el contexto ni el objeto de presentación se +deben especificar; de hecho, generaría un error hacerlo. Los dos +están implícitos por el siguiente elemento del flujo de entrada. +Observe también que no debe haber un signo igual. Así que la sintaxis +genérica de la instrucción @code{\tweak} es, simplemente, @example -\tweak #'@var{propiedad-de-presentación} = #@var{valor} +\tweak #'@var{propiedad-de-presentación} #@var{valor} @end example Una instrucción @code{\tweak} también se puede usar para modificar @@ -1343,7 +1343,7 @@ pentagrama temporal, como en un @rglos{ossia}. << { f c c } \new Staff \with { - alignAboveContext = "main" } + alignAboveContext = #"main" } { f8 f c } >> r4 | @@ -1370,7 +1370,7 @@ el sello de cada uno de ellos a @code{#f}, como sigue: << { f c c } \new Staff \with { - alignAboveContext = "main" + alignAboveContext = #"main" } { \override Staff.Clef #'stencil = ##f @@ -1433,7 +1433,7 @@ Así pues, podemos reemplazar el ejemplo anterior con << { f c c } \new Staff \with { - alignAboveContext = "main" + alignAboveContext = #"main" % Don't print clefs in this staff \override Clef #'stencil = ##f % Don't print time signatures in this staff @@ -1503,7 +1503,7 @@ Vamos a probarlo en nuestro ejemplo del ossia: << { f c c } \new Staff \with { - alignAboveContext = "main" + alignAboveContext = #"main" \override Clef #'stencil = ##f \override TimeSignature #'stencil = ##f % Reduce all font sizes by ~24% @@ -1570,7 +1570,7 @@ siguiente forma: << { f c c } \new Staff \with { - alignAboveContext = "main" + alignAboveContext = #"main" \override Clef #'stencil = ##f \override TimeSignature #'stencil = ##f fontSize = #-2 @@ -3550,12 +3550,16 @@ Las instrucciones de sobreescritura son con frecuencia largas y tediosas de escribir, y se tienen que escribir de forma absolutamente correcta. Si las mismas sobreescrituras se van a utilizar muchas veces, podría merecer la pena definir variables para guardarlas. -Suponga que queremos realzar ciertas palabras de la letra de una + +Supongamos que queremos realzar ciertas palabras de la letra de una canción imprimiéndolas en cursiva y negrita. Las instrucciones @code{\italic} y @code{\bold} sólo funcionan dentro de la letra de las -canciones si están incluidas dentro de un @code{\markup}, lo que las -hace tediosas de escribir. ¿Podríamos, como alternativa, utilizar las -instrucciones @code{\override} y @code{\revert}? +canciones si están incluidas, junto con la palabra o palabras que se +pretenden modificar, dentro de un @code{\markup}, lo que las hace +tediosas de escribir. La necesidad de incluir las propias palabras +impide que se puedan usar en variables simples. ¿Podríamos, como +alternativa, utilizar las instrucciones @code{\override} y +@code{\revert}? @example @code{\override Lyrics . LyricText #'font-shape = #'italic} @@ -3566,9 +3570,13 @@ instrucciones @code{\override} y @code{\revert}? @end example Estas instrucciones también serían extremadamente tediosas de escribir -si hubiera muchas palabras que quisiéramos subrayar. Entonces, en vez -de esto las definimos como dos variables, y las usamos de la siguiente -forma, aunque normalmente quizá elegiríamos unos nombres de variable +si hubiera muchas palabras que quisiéramos subrayar. Pero sí +@emph{podemos} definirlas como dos variables y usarlas para delimitar +las palabras que destacar. Otra ventaja de la utilización de +variables para estas sobreescrituras es que ya no son necesarios los +espacios que rodean al punto, puesto que no se interpretan +directamente en el modo @code{\lyricmode}. He aquí un ejemplo de +esto, aunque en la práctica quizá elegiríamos unos nombres de variable más cortos para que fueran más rápidos de teclear: @cindex LyricText, ejemplo de sobreescritura @@ -3577,12 +3585,12 @@ más cortos para que fueran más rápidos de teclear: @lilypond[quote,verbatim] emphasize = { - \override Lyrics . LyricText #'font-shape = #'italic - \override Lyrics . LyricText #'font-series = #'bold + \override Lyrics.LyricText #'font-shape = #'italic + \override Lyrics.LyricText #'font-series = #'bold } normal = { - \revert Lyrics . LyricText #'font-shape - \revert Lyrics . LyricText #'font-series + \revert Lyrics.LyricText #'font-shape + \revert Lyrics.LyricText #'font-series } global = { \time 4/4 \partial 4 \key c \major} diff --git a/Documentation/es/user/unfretted-strings.itely b/Documentation/es/user/unfretted-strings.itely index 38386a3a8b..8f82f1fb4a 100644 --- a/Documentation/es/user/unfretted-strings.itely +++ b/Documentation/es/user/unfretted-strings.itely @@ -7,7 +7,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @node Unfretted string instruments @section Unfretted string instruments diff --git a/Documentation/es/user/vocal.itely b/Documentation/es/user/vocal.itely index c362f1d0cf..ecbc107d5d 100644 --- a/Documentation/es/user/vocal.itely +++ b/Documentation/es/user/vocal.itely @@ -1,13 +1,13 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*- @c This file is part of lilypond.tely @ignore - Translation of GIT committish: d5bd12a5775832e81000fb901ad65283a152eaa4 + Translation of GIT committish: bc4543c30c67f02dadc392880f27d4581e2d7681 When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @node Vocal music @@ -988,10 +988,10 @@ Los números de los versos se pueden añadir estableciendo \new Voice { \time 3/4 g2 e4 a2 f4 g2. } \addlyrics { - \set stanza = "1. " + \set stanza = #"1. " Hi, my name is Bert. } \addlyrics { - \set stanza = "2. " + \set stanza = #"2. " Oh, ché -- ri, je t'aime } @end lilypond @@ -1074,10 +1074,10 @@ versión abreviada como @code{shortVocalName}. \new Voice { \time 3/4 g2 e4 a2 f4 g2. } \addlyrics { - \set vocalName = "Bert " + \set vocalName = #"Bert " Hi, my name is Bert. } \addlyrics { - \set vocalName = "Ernie " + \set vocalName = #"Ernie " Oh, ché -- ri, je t'aime } @end lilypond @@ -1225,7 +1225,7 @@ d d e d | c1 | } text = \lyricmode { -\set stanza = "1." Ma- ry had a lit- tle lamb, +\set stanza = #"1." Ma- ry had a lit- tle lamb, its fleece was white as snow. } @@ -1266,7 +1266,7 @@ melody = \relative c' { } text = \lyricmode { - \set stanza = "1." This is verse one. + \set stanza = #"1." This is verse one. It has two lines. } diff --git a/Documentation/es/user/wind.itely b/Documentation/es/user/wind.itely index a09577a15c..df9f8b956c 100644 --- a/Documentation/es/user/wind.itely +++ b/Documentation/es/user/wind.itely @@ -7,7 +7,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @node Wind instruments diff --git a/Documentation/es/user/working.itely b/Documentation/es/user/working.itely index a260cf1f7d..40bbcb9e72 100644 --- a/Documentation/es/user/working.itely +++ b/Documentation/es/user/working.itely @@ -7,7 +7,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @node Working on LilyPond projects @chapter Working on LilyPond projects diff --git a/Documentation/es/user/world.itely b/Documentation/es/user/world.itely index d7579c0869..64c9c2801a 100644 --- a/Documentation/es/user/world.itely +++ b/Documentation/es/user/world.itely @@ -7,6 +7,7 @@ version that you are working on. See TRANSLATION for details. @end ignore +@c \version "2.12.0" @node World music @section World music diff --git a/Documentation/fr/translations.html.in b/Documentation/fr/translations.html.in index 470216aec8..39ff4b86d9 100644 --- a/Documentation/fr/translations.html.in +++ b/Documentation/fr/translations.html.in @@ -1,4 +1,4 @@ -

Dernière mise à jour Tue Dec 9 09:40:49 UTC 2008 +

Dernière mise à jour Wed Dec 31 01:23:25 UTC 2008

oui partiellement - pré-GDP + post-GDP Préface
(411) Valentin Villenave - Ludovic Sardain + Ludovic Sardain
+ Damien Heurtebise oui oui pré-GDP @@ -74,7 +75,8 @@ translations.template.html.in; DO NOT EDIT !--> Ludovic Sardain
John Mandereau Jean-Charles Malahieude
- Jean-Yves Baudais + Jean-Yves Baudais
+ Damien Heurtebise oui partiellement post-GDP @@ -97,11 +99,11 @@ translations.template.html.in; DO NOT EDIT !--> Jean-Charles Malahieude John Mandereau oui - partiellement - pré-GDP + partiellement + post-GDP - 4 Retouche de partition
(14581) + 4 Retouche de partition
(14647) Valentin Villenave
Nicolas Klutchnikoff
Damien Heurtebise @@ -109,7 +111,7 @@ translations.template.html.in; DO NOT EDIT !--> John Mandereau oui oui - pré-GDP + post-GDP 5 Travail sur des projets LilyPond
(3007) @@ -143,7 +145,7 @@ translations.template.html.in; DO NOT EDIT !--> - + @@ -168,10 +170,10 @@ translations.template.html.in; DO NOT EDIT !--> + - - - + + @@ -183,7 +185,7 @@ translations.template.html.in; DO NOT EDIT !--> - + @@ -195,7 +197,7 @@ translations.template.html.in; DO NOT EDIT !--> - +
GNU LilyPond --- Utilisation des programmes TraducteursGNU LilyPond --- Utilisation du programme Traducteurs Relecteurs Traduit À jour
2 Environnement de travail
(1149)		Jean-Charles Malahieude nonouioui pré-GDP
pré-GDP
4 @command{lilypond-book} : association musique-texte
(3185)		4 @command{lilypond-book} : association musique-texte
(3248)		 nonJean-Charles Malahieude ouipartiellementoui pré-GDP
@@ -203,7 +205,7 @@ translations.template.html.in; DO NOT EDIT !--> - + @@ -224,11 +226,11 @@ translations.template.html.in; DO NOT EDIT !--> Jean-Charles Malahieude - + - + @@ -274,16 +276,16 @@ translations.template.html.in; DO NOT EDIT !--> - + - + - + @@ -305,7 +307,7 @@ translations.template.html.in; DO NOT EDIT !--> Jean-Charles Malahieude - + @@ -317,12 +319,12 @@ translations.template.html.in; DO NOT EDIT !--> - + - - + + @@ -335,7 +337,7 @@ translations.template.html.in; DO NOT EDIT !--> - + @@ -362,20 +364,20 @@ translations.template.html.in; DO NOT EDIT !--> - + - + - + - + @@ -397,28 +399,28 @@ translations.template.html.in; DO NOT EDIT !--> - + - + - + - - + + - - - - + + + + @@ -430,12 +432,12 @@ translations.template.html.in; DO NOT EDIT !--> - + - + diff --git a/Documentation/fr/user/ancient.itely b/Documentation/fr/user/ancient.itely index b7c2fb7479..bb89e3dfdb 100644 --- a/Documentation/fr/user/ancient.itely +++ b/Documentation/fr/user/ancient.itely @@ -8,12 +8,11 @@ @end ignore +@c \version "2.12.0" + @node Ancient notation @section Ancient notation -@untranslated - - @menu * Introduction to ancient notation:: * Alternative note signs:: diff --git a/Documentation/fr/user/changing-defaults.itely b/Documentation/fr/user/changing-defaults.itely index 523593d5fb..918c22ff96 100644 --- a/Documentation/fr/user/changing-defaults.itely +++ b/Documentation/fr/user/changing-defaults.itely @@ -1,5 +1,5 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*- -@c This file is part of ../user/lilypond.tely +@c This file is part of lilypond.tely @ignore Translation of GIT committish: 76de7e168dbc9ffc7671d99663c5ce50dae42abb @@ -7,11 +7,12 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.65" +@c \version "2.12.0" @c Translators: Valentin Villenave @c Translation checkers: Gilles Thibault + @node Changing defaults @chapter Changing defaults @@ -34,7 +35,7 @@ référence du programme @ref{Top,Référence du programme,,lilypond-internals}. @end ifnottex Ce guide répertorie toutes les variables, fonctions et autres options que -LilyPond met à votre disposition. Il est consultable +LilyPond met à votre disposition. Il est consultable @c leave the @uref as one long line. @uref{http://@/lilypond@/.org/@/doc/@/stable/@/Documentation/@/user/@/lilypond@/-internals/,en@tie{}ligne}, au format HTML, mais est également inclus dans la documentation @@ -48,7 +49,7 @@ La notation automatique, ce qui revient à modifier la manière dont les éléme de notation sont automatiquement créés -- par exemple, les règles de ligatures. @item -L'apparence, qui se rapporte aux objets pris individuellement -- ainsi de la direction +L'apparence, qui se rapporte aux objets pris individuellement -- ainsi de la direction des hampes, du placement des indications textuelles. @item @@ -64,164 +65,98 @@ En sous-main, LilyPond se sert du langage Scheme (un dérivé du LISP) comme infrastructure. Modifier les choix de mise en page revient à pénétrer dans les entrailles du programme, et de ce fait requiert l'emploi du Scheme. Les fragments de Scheme, dans un fichier @code{.ly}, sont introduits par le -caractère @q{hash}, (@code{#}, improprement surnommé @q{dièse}).@footnote{Le +caractère @q{hash}, (@code{#}, improprement surnommé @q{dièse}).@footnote{Le @rlearning{Scheme tutorial} fournit quelques notions de base pour saisir des nombres, des listes, des chaînes de caractères ou des symboles, en Scheme.} @menu -* Interpretation contexts:: -* The override command:: +* Interpretation contexts:: +* Explaining the Internals Reference:: +* Modifying properties:: +* Useful concepts and properties:: +* Advanced tweaks:: @end menu - @node Interpretation contexts @section Interpretation contexts Cette section traite des contextes. @menu -* Contexts explained:: -* The set command:: -* Modifying context plug-ins:: -* Layout tunings within contexts:: -* Changing context default settings:: -* Defining new contexts:: -* Aligning contexts:: -* Vertical grouping of grobs:: +* Contexts explained:: +* Creating contexts:: +* Modifying context plug-ins:: +* Layout tunings within contexts:: +* Changing context default settings:: +* Defining new contexts:: +* Aligning contexts:: @end menu - @node Contexts explained @subsection Contexts explained -@untranslated - - -@node The set command -@subsection The @code{\set} command - -@cindex propriétés -@funindex \set -@cindex modifier des propriétés - -Chaque contexte peut avoir plusieurs @emph{propriétés}, c'est-à-dire -des variables qu'il inclut. Ces dernières peuvent être modifiées @qq{à la volée}, -c'est-à-dire pendant que la compilation s'accomplit. C'est là le rôle de la -commande @code{\set}. - -@example -\set @var{contexte}.@var{propriété} = #@var{valeur} -@end example - -Ainsi : -@lilypond[quote,verbatim,relative=2,fragment] -R1*2 -\set Score.skipBars = ##t -R1*2 -@end lilypond - -Cette commande permet de condenser les mesures vides de notes, en des silences -multi-mesures. Il s'agit d'un objet Scheme, auquel on attribue la valeur booléenne -@q{vrai}, c'est-à-dire la lettre @code{#t} pour @q{True} en anglais. - -Ce changement étant appliqué @q{à la volée}, il n'affecte que le second groupe de notes. - -Si l'argument @var{contexte} n'est pas spécifié, alors la propriété cherchera à s'appliquer -dans le contexte le plus restreint où elle est employée : le plus souvent - @code{ChordNames}, @code{Voice}, ou @code{Lyrics}. Dans l'exemple suivant, - -@lilypond[quote,verbatim,relative=2,fragment] -c8 c c c -\set autoBeaming = ##f -c8 c c c -@end lilypond +@ignore +@c TODO Rethink and rewrite + +>> > > - list of contexts: my *danger unmaintainable* +>> > > alarm just went off. I'm + +I knew it would... And leaving out some of them is perfectly fine +with me. +I do think that a list like this, with the main contexts and a +brief +description of what they do (perhaps also with a note about what +default +behavior is associated with each of them, but this may be +unmanageable), +should be there, and then we could simply list the remaining ones +without +further explanation and with links to the IR. +@end ignore -@noindent -aucun argument @var{contexte} n'a été donné à la commande @code{\set}. -De ce fait, les ligatures automatiques sont désactivées dans le -contexte actuel, c'est-à-dire @rinternals{Voice}. Notez que le -contexte le plus restreint n'est pas toujours le bon, -et peut ne pas contenir la propriété qui vous intéresse : ainsi, la propriété -@code{skipBars}, évoquée plus haut, ne relève pas du contexte @code{Voice}, -et le code suivant ne fonctionnera pas. +@c TODO Improve layout, order and consistency of wording -td -@lilypond[quote,verbatim,relative=2,fragment] -R1*2 -\set skipBars = ##t -R1*2 -@end lilypond +@c TODO Add introduction which explains contexts in generality -td -Les contextes s'organisent de façon hiérarchique : aussi, lorsqu'un contexte de niveau -supérieur est spécifié (par exemple @code{Staff}), la propriété sera modifée dans -tous les contextes inférieurs (tous les contextes @code{Voice}, par exemple) -qu'il contient. +@c TODO Describe propagation of property values -td -@funindex \unset -La commande @code{\unset} permet d'annuler la définition d'une propriété : +@menu +* Score - the master of all contexts:: +* Top-level contexts - staff containers:: +* Intermediate-level contexts - staves:: +* Bottom-level contexts - voices:: +@end menu -@example -\unset @var{contexte}.@var{propriété} -@end example +@node Score - the master of all contexts +@unnumberedsubsubsec Score - the master of all contexts -@noindent -si et seulement si cette propriété à été définie dans ce @var{contexte} -précis ; ainsi, +@untranslated -@example -\set Staff.autoBeaming = ##f -@end example -@noindent -même s'il s'applique à tous les contextes @code{Voice} contenus dans le -contexte @code{Staff}, ne peut être annulé au niveau @code{Voice}. Le code -suivant sera sans effet. +@node Top-level contexts - staff containers +@unnumberedsubsubsec Top-level contexts - staff containers -@example -\unset Voice.autoBeaming -@end example +@untranslated -@noindent -En d'autres termes, la commande @code{\unset} doit impérativement être -accompagnée du même contexte que la commande @code{\set} d'origine. -Pour annuler l'effet, dans notre exemple, de @code{Staff.autoBeaming = ##f}, -il faut donc entrer : -@example -\unset Staff.autoBeaming -@end example -Si l'on se trouve dans le contexte le plus restreint, il n'est pas obligatoire, -là encore, de spécifier le @var{contexte}. Ainsi, les deux lignes suivantes sont équivalentes. +@node Intermediate-level contexts - staves +@unnumberedsubsubsec Intermediate-level contexts - staves +@untranslated -@example -\set Voice.autoBeaming = ##t -\set autoBeaming = ##t -@end example +@node Bottom-level contexts - voices +@unnumberedsubsubsec Bottom-level contexts - voices -@cindex \once -Pour modifier une propriété de façon à ce qu'elle ne s'applique qu'une seule fois, -il convient d'employer la commande @code{\once} : +@untranslated -@lilypond[quote,verbatim,relative=2,fragment] -c4 -\once \set fontSize = #4.7 -c4 -c4 -@end lilypond -Ici le changement de taille est annulé aussitôt après la note concernée. +@node Creating contexts +@subsection Creating contexts -La référence du programme contient une description exhaustive de toutes les -propriétés contexte par contexte : voir -@ifhtml -@rinternals{Tunable context properties}. -@end ifhtml -@ifnothtml -Translation @expansion{} Tunable context properties. -@end ifnothtml +@untranslated @node Modifying context plug-ins @@ -301,7 +236,7 @@ La clé et le chiffre de mesure ont disparu de la deuxième portée. C'est une quelque peu radicale, puisqu'elle affectera toute la portée jusqu'à la fin de la partition. L'espacement s'en trouve également affecté, ce qui peut être ou non l'effet recherché. Une méthode plus sophistiquée aurait été de rendre ces objets -transparents (voir @rlearning{Common tweaks}). +transparents (voir @rlearning{Visibility and color of objects}). Dans l'exemple suivant, voici une mise en pratique plus utile. En temps normal, les barres de mesure et la métrique sont synchronisées verticalement @@ -336,6 +271,7 @@ En les enlevant du contexte @code{Score} pour les attribuer au contexte @end lilypond +@c deprecated node: delete. --fv @node Layout tunings within contexts @subsection Layout tunings within contexts @@ -363,7 +299,7 @@ La commande suivante : @end verbatim @noindent -rend les hampes plus épaisses (la valeur par défaut est 1.3, ce qui signifie qu'elles +rend les hampes plus épaisses (la valeur par défaut est 1.3, ce qui signifie qu'elles sont 1,3 fois plus épaisses que les lignes de la portée). Dans la mesure où nous avons indiqué @code{Staff} comme contexte, ce réglage ne s'appliquera qu'à la portée courante ; les autres portées demeureront intactes. @@ -594,7 +530,7 @@ squashedPosition = #0 @end example @noindent -Le graveur @rinternals{Pitch_squash_engraver} intercepte les notes créées par +Le graveur @rinternals{Pitch_squash_engraver} intercepte les notes créées par @rinternals{Note_heads_engraver}, et les @q{écrase} pour qu'elles aient toutes la même position verticale, définie par @code{squashedPosition} : ici il s'agit de la valeur@tie{}@code{0}, c'est-à-dire la ligne du milieu. @@ -685,6 +621,7 @@ On peut alors saisir la musique, comme dans l'exemple plus haut : @node Aligning contexts @subsection Aligning contexts + Il est possible d'aligner verticalement chaque nouveau contexte, en-dessous ou au-dessus, par exemple dans le cas de musique vocale (@rlearning{Vocal ensembles}) ou d'@qq{ossias}. @@ -699,7 +636,7 @@ ossia = { f4 f f f } \relative c' \new Staff = "main" { c4 c c c << - \new Staff \with {alignAboveContext=main} \ossia + \new Staff \with { alignAboveContext = #"main" } \ossia { d8 f d f d f d f } >> } @@ -707,93 +644,17 @@ ossia = { f4 f f f } @end lilypond -@node Vertical grouping of grobs -@subsection Vertical grouping of grobs - -Les objets @code{VerticalAlignment} et @code{VerticalAxisGroup} -travaillent de concert. Comme leurs noms anglais l'indiquent, -@code{VerticalAxisGroup} regroupe différents objets tels que les portées -(@code{Staff}), les paroles (@code{Lyrics}) et ainsi de suite ; puis -@code{VerticalAlignment} synchronise verticalement ces différents groupes. -En général, il n'y a qu'un seul @code{VerticalAlignment} pour l'ensemble -de la partition, mais chaque contexte @code{Staff}, @code{Lyrics}, etc. -possède son propre @code{VerticalAxisGroup}. - - -@node The override command -@section The @code{\override} command - -La commande @code{\override} permet de modifier la mise en page -en détail. Examinons son utilisation concrètementet dans les détails. -La syntaxe de cette commande ressemble généralement à : - -@example -\override @var{contexte}.@var{objet} #'@var{propriété} = #@var{valeur} -@end example +@node Explaining the Internals Reference +@section Explaining the Internals Reference -La propriété @var{propriété} de l'objet @var{objet}, appartenant au contexte -@var{contexte}, se voit ainsi attribuer la valeur @var{valeur}. @menu -* Constructing a tweak:: -* Navigating the program reference:: -* Layout interfaces:: -* Determining the grob property:: -* The tweak command:: -* Using Scheme code instead of tweak:: -* set versus override:: -* Difficult tweaks:: +* Navigating the program reference:: +* Layout interfaces:: +* Determining the grob property:: +* Naming conventions:: @end menu - - -@node Constructing a tweak -@subsection Constructing a tweak - -Les commandes permettant de modifier l'apparence de la partition -ressemblent en général à - -@example -\override Voice.Stem #'thickness = #3.0 -@end example - -@noindent -Pour élaborer un réglage de ce type, on a besoin de connaître précisément : - -@itemize -@item le contexte : ici @code{Voice} (la voix). -@item l'objet à affecter : ici @code{Stem} (les hampes). -@item la propriété à modifier : ici @code{thickness} (l'épaisseur du trait). -@item la valeur désirée : ici @code{3.0} (par défaut, elle est de 1.3). -@end itemize - -Certaines @q{sous-propriétés} sont parfois contenues dans une propriété. -La commande devient alors : - -@example -\override Stem #'(details beamed-lengths) = #'(4 4 3) -@end example - -@cindex documentation exhaustive -@cindex trouver des objets graphiques -@cindex objets graphiques, description -@cindex régler -@funindex \override - -Pour bien des propriétés, quel que soit le type de valeur requise, -attribuer la valeur @q{faux} (@code{##f} en Scheme) reviendra à désactiver -complètement l'action de la propriété qui se trouve ainsi purement -ignorée par LilyPond. Cela peut s'avérer fort utile pour des propriétés -causant des désagréments. - -@c such announcements are to be avoided -vv -@ignore -We demonstrate how to glean this information from the notation manual -and the program reference. -@end ignore - - - @node Navigating the program reference @subsection Navigating the program reference @@ -865,7 +726,7 @@ Fingering objects are created by: @rinternals{Fingering_engraver} and @rinternals{New_fingering_engraver}. @end quotation -En d'autres termes, @emph{Les indications de doigtés} +En d'autres termes, @emph{Les indications de doigtés} (@code{Fingering} en anglais) @emph{sont créées par les graveurs @rinternals{Fingering_engraver} et @rinternals{New_fingering_engraver}.} @@ -889,7 +750,7 @@ Music event type @code{fingering-event} is in Music expressions named Ce cheminement se produit, bien sûr, en sens inverse : nous sommes ici partis du résultat, et avons abouti aux évènements (en anglais @q{Events}) engendrés par le fichier d'entrée. L'inverse est également possible : on peut partir d'un -évènement, et suivre le cheminement de LilyPond qui aboutit à la création d'un +évènement, et suivre le cheminement de LilyPond qui aboutit à la création d'un ou plusieurs objets graphiques. La référence du programme peut également se parcourir comme un document normal. @@ -901,7 +762,7 @@ On y trouve des chapitres tels que @code{Music definitions} @end ifnothtml @rinternals{Translation}, ou encore @rinternals{Backend}. Chaque chapitre -recense toutes les définitions employées, et les propriétés sujettes à +recense toutes les définitions employées, et les propriétés sujettes à ajustements. @c -- what about adding a link to the glossary here ? -vv @@ -988,7 +849,7 @@ Cet objet admet les interfaces suivantes : Suit la liste des interfaces en question, présentées comme autant de liens, qui conduisent sur les pages dédiées à chacune d'entre elles. Chaque interface est dotée d'un certain nombre de propriétés, dont certaines -peuvent être modifiées, et d'autres non (les @q{Internal properties}, ou +peuvent être modifiées, et d'autres non (les @q{Internal properties}, ou propriétés internes). Pour aller encore plus loin, plutôt que de simplement parler de l'objet @@ -1025,9 +886,11 @@ son âme même, dans les fichiers source de LilyPond (voir amas de variables et de réglages. La page de la Référence du programme est en fait directement engendrée par cette définition. + @node Determining the grob property @subsection Determining the grob property + Nous voulions changer la position du chiffre @b{2} dans le fragment suivant : @lilypond[quote,fragment,relative=2,verbatim] @@ -1074,7 +937,7 @@ Add this much extra space between objects that are next to each other. @noindent Ce qui signifie -@quotation +@quotation Ajouter tel espace supplémentaire entre des objets proches les uns des autres. @end quotation @@ -1113,105 +976,279 @@ Le graveur Fingering_engraver fait partie des contextes : @dots{} @rinternals{Vo @end quotation -@node The tweak command -@subsection The @code{\tweak} command +@node Naming conventions +@subsection Naming conventions -@funindex \tweak +@untranslated -Dans certains cas, on peut passer par un raccourci pour arranger les -objets graphiques. Lorsqu'un objet est directement engendré par un élément distinct -du fichier source, on peut utiliser la commande @code{\tweak}. -Dans l'accord suivant, les notes sont modifiées une par une : +@node Modifying properties +@section Modifying properties -@lilypond[relative=2,fragment,verbatim,ragged-right] -< - c - \tweak #'color #red d - g - \tweak #'duration-log #1 a ->4-\tweak #'padding #10 -. -@end lilypond +@c TODO change the menu and subsection node names to use +@c backslash once the new macro to handle the refs +@c is available. Need to find and change all refs at +@c the same time. -td -Comme on peut le voir, les propriétés sont ici modifiées directement -en même temps que les objets sont saisis. Il n'est plus besoin de spécifier ni -le nom de l'objet (@emph{grob}), ni le contexte dans lequel cela doit s'appliquer. +@menu +* Overview of modifying properties:: +* The set command:: +* The override command:: +* Constructing a tweak:: +* The tweak command:: +* set versus override:: +@end menu -Ce procédé ne marche que pour des objets directement liés aux évènements -(@rinternals{Event}) du fichier source. Par exemple : +@node Overview of modifying properties +@subsection Overview of modifying properties -@itemize @bullet -@item Les têtes de notes au sein d'un accord, qui sont directement engendrées par -les hauteurs indiquées -@item Les signes d'articulation, engendrés par les indications de ponctuation. -@end itemize +@untranslated -En revanche, les hampes ou les altérations sont engendrées par les têtes de notes, -et non par des évènements dans le fichier source. De même pour les clés, qui ne -sont pas directement engendrées par le fichier source, mais plutôt par le -changement d'une propriété interne. -En fait, très peu d'objets passent @emph{directement} du code source à la partition. -Une note toute simple, par exemple @code{c4}, fait l'objet d'un traitement et n'est donc -pas directement rendue ; c'est pourquoi le code suivant ne sera d'aucun effet : +@node The set command +@subsection The @code{\set} command + +@cindex propriétés +@funindex \set +@cindex modifier des propriétés + +Chaque contexte peut avoir plusieurs @emph{propriétés}, c'est-à-dire +des variables qu'il inclut. Ces dernières peuvent être modifiées @qq{à la volée}, +c'est-à-dire pendant que la compilation s'accomplit. C'est là le rôle de la +commande @code{\set}. @example -\tweak #'color #red c4 +\set @var{contexte}.@var{propriété} = #@var{valeur} @end example -@noindent -Voir pour plus de détails @ref{Displaying music expressions}. +Ainsi : +@lilypond[quote,verbatim,relative=2,fragment] +R1*2 +\set Score.skipBars = ##t +R1*2 +@end lilypond +Cette commande permet de condenser les mesures vides de notes, en des silences +multi-mesures. Il s'agit d'un objet Scheme, auquel on attribue la valeur booléenne +@q{vrai}, c'est-à-dire la lettre @code{#t} pour @q{True} en anglais. -@node Using Scheme code instead of tweak -@subsection Using Scheme code instead of @code{\tweak} +Ce changement étant appliqué @q{à la volée}, il n'affecte que le second groupe de notes. -L'inconvénient principal de la commande @code{\tweak} est la rigidité de sa -syntaxe. Par exemple, le code suivant produit une erreur. +Si l'argument @var{contexte} n'est pas spécifié, alors la propriété cherchera à s'appliquer +dans le contexte le plus restreint où elle est employée : le plus souvent + @code{ChordNames}, @code{Voice}, ou @code{Lyrics}. Dans l'exemple suivant, + +@lilypond[quote,verbatim,relative=2,fragment] +c8 c c c +\set autoBeaming = ##f +c8 c c c +@end lilypond + +@noindent +aucun argument @var{contexte} n'a été donné à la commande @code{\set}. +De ce fait, les ligatures automatiques sont désactivées dans le +contexte actuel, c'est-à-dire @rinternals{Voice}. Notez que le +contexte le plus restreint n'est pas toujours le bon, +et peut ne pas contenir la propriété qui vous intéresse : ainsi, la propriété +@code{skipBars}, évoquée plus haut, ne relève pas du contexte @code{Voice}, +et le code suivant ne fonctionnera pas. + +@lilypond[quote,verbatim,relative=2,fragment] +R1*2 +\set skipBars = ##t +R1*2 +@end lilypond + +Les contextes s'organisent de façon hiérarchique : aussi, lorsqu'un contexte de niveau +supérieur est spécifié (par exemple @code{Staff}), la propriété sera modifée dans +tous les contextes inférieurs (tous les contextes @code{Voice}, par exemple) +qu'il contient. + +@funindex \unset + +La commande @code{\unset} permet d'annuler la définition d'une propriété : @example -F = \tweak #'font-size #-3 -\flageolet +\unset @var{contexte}.@var{propriété} +@end example -\relative c'' @{ - c4^\F c4_\F -@} +@noindent +si et seulement si cette propriété à été définie dans ce @var{contexte} +précis ; ainsi, + +@example +\set Staff.autoBeaming = ##f @end example @noindent -En d'autres termes, @code{\tweak} ne se comporte pas comme une articulation : -il ne peut notamment pas être accolé avec les symboles @samp{^} ou @samp{_}. +même s'il s'applique à tous les contextes @code{Voice} contenus dans le +contexte @code{Staff}, ne peut être annulé au niveau @code{Voice}. Le code +suivant sera sans effet. -C'est en se servant du langage Scheme que l'on peut résoudre ce problème. -Dans cet exemple, on a recours aux méthodes décrites dans @ref{Adding -articulation to notes (example)}, en particulier quant à l'emploi de -@code{\displayMusic}. +@example +\unset Voice.autoBeaming +@end example +@noindent +En d'autres termes, la commande @code{\unset} doit impérativement être +accompagnée du même contexte que la commande @code{\set} d'origine. +Pour annuler l'effet, dans notre exemple, de @code{Staff.autoBeaming = ##f}, +il faut donc entrer : @example -F = #(let ((m (make-music 'ArticulationEvent - 'articulation-type "flageolet"))) - (set! (ly:music-property m 'tweaks) - (acons 'font-size -3 - (ly:music-property m 'tweaks))) - m) - -\relative c'' @{ - c4^\F c4_\F -@} +\unset Staff.autoBeaming +@end example + +Si l'on se trouve dans le contexte le plus restreint, il n'est pas obligatoire, +là encore, de spécifier le @var{contexte}. Ainsi, les deux lignes suivantes sont équivalentes. + + +@example +\set Voice.autoBeaming = ##t +\set autoBeaming = ##t +@end example + + +@cindex \once +Pour modifier une propriété de façon à ce qu'elle ne s'applique qu'une seule fois, +il convient d'employer la commande @code{\once} : + +@lilypond[quote,verbatim,relative=2,fragment] +c4 +\once \set fontSize = #4.7 +c4 +c4 +@end lilypond + +Ici le changement de taille est annulé aussitôt après la note concernée. + +La référence du programme contient une description exhaustive de toutes les +propriétés contexte par contexte : voir +@ifhtml +@rinternals{Tunable context properties}. +@end ifhtml +@ifnothtml +Translation @expansion{} Tunable context properties. +@end ifnothtml + + +@node The override command +@subsection The @code{\override} command + + +La commande @code{\override} permet de modifier la mise en page +en détail. Examinons son utilisation concrètementet dans les détails. +La syntaxe de cette commande ressemble généralement à : + +@example +\override @var{contexte}.@var{objet} #'@var{propriété} = #@var{valeur} +@end example + +La propriété @var{propriété} de l'objet @var{objet}, appartenant au contexte +@var{contexte}, se voit ainsi attribuer la valeur @var{valeur}. + + +@c deprecated node. Delete. --fv +@node Constructing a tweak +@subsection Constructing a tweak + +Les commandes permettant de modifier l'apparence de la partition +ressemblent en général à + +@example +\override Voice.Stem #'thickness = #3.0 @end example @noindent -Ici les propriétés @code{tweak} de l'objet flageolet nommé -@samp{m} (créé au moyen de @code{make-music}) sont extraites par -@code{ly:music-property}, une nouvelle valeur de la taille de fonte -est ajoutée à la liste de ses propriétés (grâce à la fonction Scheme -@code{acons}), et le résultat de cette opération est renvoyé par @code{set!}. -Le dernier élément, dans ce bloc @code{let}, est la valeur finale de -@samp{m} lui-même. +Pour élaborer un réglage de ce type, on a besoin de connaître précisément : + +@itemize +@item le contexte : ici @code{Voice} (la voix). +@item l'objet à affecter : ici @code{Stem} (les hampes). +@item la propriété à modifier : ici @code{thickness} (l'épaisseur du trait). +@item la valeur désirée : ici @code{3.0} (par défaut, elle est de 1.3). +@end itemize + +Certaines @q{sous-propriétés} sont parfois contenues dans une propriété. +La commande devient alors : + +@example +\override Stem #'(details beamed-lengths) = #'(4 4 3) +@end example + +@cindex documentation exhaustive +@cindex trouver des objets graphiques +@cindex objets graphiques, description +@cindex régler +@funindex \override + +Pour bien des propriétés, quel que soit le type de valeur requise, +attribuer la valeur @q{faux} (@code{##f} en Scheme) reviendra à désactiver +complètement l'action de la propriété qui se trouve ainsi purement +ignorée par LilyPond. Cela peut s'avérer fort utile pour des propriétés +causant des désagréments. + +@c such announcements are to be avoided -vv +@ignore +We demonstrate how to glean this information from the notation manual +and the program reference. +@end ignore + + +@node The tweak command +@subsection The @code{\tweak} command + + +@funindex \tweak + +Dans certains cas, on peut passer par un raccourci pour arranger les +objets graphiques. Lorsqu'un objet est directement engendré par un élément distinct +du fichier source, on peut utiliser la commande @code{\tweak}. + +Dans l'accord suivant, les notes sont modifiées une par une : + +@lilypond[relative=2,fragment,verbatim,ragged-right] +< + c + \tweak #'color #red d + g + \tweak #'duration-log #1 a +>4-\tweak #'padding #10 -. +@end lilypond + +Comme on peut le voir, les propriétés sont ici modifiées directement +en même temps que les objets sont saisis. Il n'est plus besoin de spécifier ni +le nom de l'objet (@emph{grob}), ni le contexte dans lequel cela doit s'appliquer. + +Ce procédé ne marche que pour des objets directement liés aux évènements +(@rinternals{Event}) du fichier source. Par exemple : + +@itemize @bullet +@item Les têtes de notes au sein d'un accord, qui sont directement engendrées par +les hauteurs indiquées +@item Les signes d'articulation, engendrés par les indications de ponctuation. +@end itemize + +En revanche, les hampes ou les altérations sont engendrées par les têtes de notes, +et non par des évènements dans le fichier source. De même pour les clés, qui ne +sont pas directement engendrées par le fichier source, mais plutôt par le +changement d'une propriété interne. + +En fait, très peu d'objets passent @emph{directement} du code source à la partition. +Une note toute simple, par exemple @code{c4}, fait l'objet d'un traitement et n'est donc +pas directement rendue ; c'est pourquoi le code suivant ne sera d'aucun effet : + +@example +\tweak #'color #red c4 +@end example + +@noindent +Voir pour plus de détails @ref{Displaying music expressions}. @node set versus override @subsection @code{\set} vs. @code{\override} + Si les propriétés peuvent être modifiées de deux façons, par les commandes @code{\set} et @code{\override}, c'est qu'il y a deux types de propriétés. @@ -1260,90 +1297,207 @@ courante, une propriété spéciale a été créée. Elle doit être modifiée avec la commande @code{\set}. -@node Difficult tweaks -@subsection Difficult tweaks -Certains réglages sont plus délicats que d'autres. +@node Useful concepts and properties +@section Useful concepts and properties -@itemize @bullet +@menu +* Input modes:: +* Direction and placement:: +* Distances and measurements:: +* Staff symbol properties:: +* Spanners:: +* Visibility of objects:: +* Line styles:: +* Rotating objects:: +@end menu -@item -L'un d'entre eux est l'apparence des objets dits @q{spanner}, qui s'étendent -horizontalement, tels que les liaisons. Si, en principe, un seul de ces objets -est créé à la fois et peut donc être modifié de façon habituelle, lorsque ces -objets doivent enjamber un changement de ligne, ils sont dupliqués au début -du ou des systèmes suivants. Comme ces objets sont des clones de l'objet d'origine, -ils en héritent toutes les propriétés, y compris les éventuelles commandes @code{\override}. +@node Input modes +@subsection Input modes +@untranslated -En d'autres termes, une commande @code{\override} affecte toujours les deux extrémités -d'un objet @q{spanner}. Pour ne modifier que la partie précédant ou suivant le changement -de ligne, il faut intervenir directement dans le processus de mise en page. -La fonction de rappel @code{after-line-breaking} contient toute l'opération Scheme -effectuée lorsque les sauts de lignes ont été déterminés, et que des objets graphiques -ont été divisés sur des systèmes différents. -Dans l'exemple suivant, on définit une nouvelle opération nommée -@code{my-callback}. Cette opération +@node Direction and placement +@subsection Direction and placement -@itemize @bullet -@item -détermine si l'objet a été divisé à l'occasion d'un changement de ligne -@item -si oui, recherche les différents morceaux de l'objet -@item -vérifie si l'objet considéré est bien la deuxième moitié d'un objet divisé -@item -si oui, applique un espacement supplémentaire (@code{extra-offset}). -@end itemize +@untranslated -On ajoute cette procédure à l'objet @rinternals{Tie} (liaison de tenue), -de façon à ce que le deuxième morceau d'une liaison divisée soit rehaussé. -@c KEEP LY -@lilypond[quote,verbatim,ragged-right] -#(define (my-callback grob) - (let* ( - ; l'objet a-t-il été divisé ? - (orig (ly:grob-original grob)) +@node Distances and measurements +@subsection Distances and measurements - ; si oui, rechercher les morceaux frères (siblings) - (siblings (if (ly:grob? orig) - (ly:spanner-broken-into orig) '() ))) +@untranslated - (if (and (>= (length siblings) 2) - (eq? (car (last-pair siblings)) grob)) - (ly:grob-set-property! grob 'extra-offset '(-2 . 5))))) -\relative c'' { - \override Tie #'after-line-breaking = - #my-callback - c1 ~ \break c2 ~ c -} -@end lilypond +@node Staff symbol properties +@subsection Staff symbol properties -@noindent -Lorsque cette astuce va être appliquée, notre nouvelle fonction de rappel -@code{after-line-breaking} devra également appeler celle d'origine -(@code{after-line-breaking}), si elle existe. -Ainsi, pour l'utiliser dans le cas d'un crescendo (objet @code{Hairpin}), -il faudra appeler également @code{ly:hairpin::after-line-breaking}. +@untranslated -@item Pour des raisons d'ordre technique, certains objets ne peuvent être modifiés par -@code{\override}. Parmi ceux-là, les objets @code{NonMusicalPaperColumn} -et @code{PaperColumn}. La commande @code{\overrideProperty} sert à les modifier, de -façon similaire à @code{\once \override}, mais avec une syntaxe différente : +@node Spanners +@subsection Spanners -@example -\overrideProperty -#"Score.NonMusicalPaperColumn" % Nom de l'objet -#'line-break-system-details % Nom de la propriété -#'((next-padding . 20)) % valeur -@end example +@untranslated -Notez cependant que la commande @code{\override} peut tout de même être appliquée -à @code{NoteMusicalPaperColumn} et @code{PaperColumn} dans un bloc @code{\context}. -@end itemize +@unnumberedsubsubsec Using the @code{spanner-interface} +@unnumberedsubsubsec Using the @code{line-spanner-interface} +@node Visibility of objects +@subsection Visibility of objects + +@untranslated + + +@menu +* Removing the stencil:: +* Making objects transparent:: +* Painting objects white:: +* Using break-visibility:: +* Special considerations:: +@end menu + +@node Removing the stencil +@unnumberedsubsubsec Removing the stencil + +@untranslated + + +@node Making objects transparent +@unnumberedsubsubsec Making objects transparent + +@untranslated + + +@node Painting objects white +@unnumberedsubsubsec Painting objects white + +@untranslated + + +@node Using break-visibility +@unnumberedsubsubsec Using break-visibility + +@untranslated + + +@node Special considerations +@unnumberedsubsubsec Special considerations + +@untranslated + + +@node Line styles +@subsection Line styles + +@untranslated + + +@node Rotating objects +@subsection Rotating objects + +@untranslated + + +@menu +* Rotating layout objects:: +* Rotating markup:: +@end menu + +@node Rotating layout objects +@unnumberedsubsubsec Rotating layout objects + +@untranslated + + +@node Rotating markup +@unnumberedsubsubsec Rotating markup + +@untranslated + + +@node Advanced tweaks +@section Advanced tweaks + +@untranslated + + +@menu +* Aligning objects:: +* Vertical grouping of grobs:: +* Modifying stencils:: +* Modifying shapes:: +@end menu + +@node Aligning objects +@subsection Aligning objects + +@untranslated + + +@menu +* Setting @code{X-offset} and @code{Y-offset} directly:: +* Using the @code{side-position-interface}:: +* Using the @code{self-alignment-interface}:: +* Using the @code{break-alignable-interface}:: +@end menu + +@node Setting @code{X-offset} and @code{Y-offset} directly +@unnumberedsubsubsec Setting @code{X-offset} and @code{Y-offset} directly + +@untranslated + + +@node Using the @code{side-position-interface} +@unnumberedsubsubsec Using the @code{side-position-interface} + +@untranslated + + +@node Using the @code{self-alignment-interface} +@unnumberedsubsubsec Using the @code{self-alignment-interface} + +@untranslated + + +@unnumberedsubsubsec Using the @code{aligned-on-parent} procedures +@unnumberedsubsubsec Using the @code{centered-on-parent} procedures +@node Using the @code{break-alignable-interface} +@unnumberedsubsubsec Using the @code{break-alignable-interface} + +@untranslated + + +@node Vertical grouping of grobs +@subsection Vertical grouping of grobs + +Les objets @code{VerticalAlignment} et @code{VerticalAxisGroup} +travaillent de concert. Comme leurs noms anglais l'indiquent, +@code{VerticalAxisGroup} regroupe différents objets tels que les portées +(@code{Staff}), les paroles (@code{Lyrics}) et ainsi de suite ; puis +@code{VerticalAlignment} synchronise verticalement ces différents groupes. +En général, il n'y a qu'un seul @code{VerticalAlignment} pour l'ensemble +de la partition, mais chaque contexte @code{Staff}, @code{Lyrics}, etc. +possède son propre @code{VerticalAxisGroup}. + + +@node Modifying stencils +@subsection Modifying stencils + +@untranslated + + +@node Modifying shapes +@subsection Modifying shapes + +@menu +* Modifying ties and slurs:: +@end menu + +@node Modifying ties and slurs +@unnumberedsubsubsec Modifying ties and slurs + +@untranslated + diff --git a/Documentation/fr/user/cheatsheet.itely b/Documentation/fr/user/cheatsheet.itely index 9b2e8ed27b..15ab67b2a2 100644 --- a/Documentation/fr/user/cheatsheet.itely +++ b/Documentation/fr/user/cheatsheet.itely @@ -7,7 +7,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @c Translators: Valentin Villenave diff --git a/Documentation/fr/user/chords.itely b/Documentation/fr/user/chords.itely index c7025edf56..9033a3a785 100644 --- a/Documentation/fr/user/chords.itely +++ b/Documentation/fr/user/chords.itely @@ -7,7 +7,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @c Translators: Valentin Villenave @c Translation checkers: Jean-Charles Malahieude, John Mandereau diff --git a/Documentation/fr/user/converters.itely b/Documentation/fr/user/converters.itely index c0bbeb6741..58fa6f00fd 100644 --- a/Documentation/fr/user/converters.itely +++ b/Documentation/fr/user/converters.itely @@ -1,13 +1,13 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*- @c This file is part of lilypond-program.tely @ignore - Translation of GIT committish: 27af34a245b02a6b89c9af3becefcfe676b2e19d + Translation of GIT committish: e2070eadd7d3d7a87450aab195a48945ee0b144a When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @c Translators: Jean-Charles Malahieude @@ -21,9 +21,11 @@ permettent de générer du code LilyPond, comme par exemple des séquenceurs en mode graphique ou des convertisseurs XML. Pour plus de détails, rendez-vous sur le @uref{http://@/lilypond@/.org,site}. -Il s'agit de programmes distincts de lilypond qui se lancent en ligne -de commande. Pour plus de précisions, reportez-vous à @ref{Command-line -usage}. +Il s'agit de programmes distincts de @command{lilypond} qui se lancent +en ligne de commande. Pour plus de précisions, reportez-vous au +chapitre @ref{Command-line usage}. Si vous utilisez MacOS 10.3 ou 10.4 +et recontrez quelque problème avec l'un de ces scripts, comme +@code{convert-ly}, reportez-vous au chapitre @ref{Setup for MacOS X}. @knownissues @@ -64,7 +66,7 @@ convertisseur capable d'importer directement un fichier. (@rinternals{Voice}). Les hauteurs sont rendues en mode relatif, et les durées spécifiées lorsque nécessaire. -Vous pouvez enregistrer un fichier MIDI grace à un clavier +Vous pouvez enregistrer un fichier MIDI grâce à un clavier électronique et ensuite le convertir en fichier @file{.ly}. Néanmoins le rythme humain n'a pas une précision suffisante pour qu'une conversion MIDI à ly ne se fasse sans surprise. En le couplant à une @@ -77,12 +79,12 @@ manuellement. Pour le lancer en ligne de commande, procédez ainsi : @example -midi2ly [@var{option}]@dots{} @var{midi-file} +midi2ly [@var{option}]@dots{} @var{fichier-midi} @end example Notez bien que, par @qq{ligne de commande}, nous parlons de la ligne de -commande du système. Pour plus de détails, voir -@ref{Converting from other formats}. +commande du système. Pour plus de précisions, reportez-vous à +@ref{Command-line usage}. @command{midi2ly} accepte les options suivantes : @@ -101,14 +103,14 @@ Afficher un résumé des utilisations. @item -k, --key=@var{acc}[:@var{minor}] Déterminer la tonalité par défaut. @math{@var{acc} > 0} fixe le -nombre de dièses ; @math{@var{acc} < 0} le nombre de bémols. Un ton -mineur est spécifié par l'emploi de @samp{:1}. +nombre de dièses ; @math{@var{acc} < 0} le nombre de bémols. Une +tonalité mineure est spécifiée par l'emploi de @code{:1}. @item -o, --output=@var{file} Générer le résultat dans le fichier @var{file}. @item -s, --start-quant=@var{DUR} -Quantiser le début des notes sur DUR. +Quantiser le début des notes sur @var{DUR}. @item -t, --allow-tuplet=@var{DUR}*@var{NUM}/@var{DEN} Accepter des n-olets de valeur @var{DUR}*@var{NUM}/@var{DEN}. @@ -137,56 +139,102 @@ ajoutez une indication de phrasé ou de pédale. @node Invoking musicxml2ly @section Invoking @code{musicxml2ly} -@uref{http://@/www.@/recordare@/.com/xml@/.html,MusicXML} est un +@cindex MusicXML + +@uref{http://@/www.@/musicxml@/.org/,MusicXML} est un dialecte XML pour représenter la notation musicale. -@command{musicxml2ly} extrait des notes à partir de fichiers MusicXML, +@command{musicxml2ly} extrait, à partir d'un fichier MusicXML, les +notes, articulations, structure de la partition, paroles, etc. et les écrit dans un fichier @var{.ly}. Il se lance en ligne de commande. +Pour le lancer en ligne de commande, procédez ainsi : +@example +musicxml2ly [@var{option}]@dots{} @var{fichier-xml} +@end example + Notez bien que, par @qq{ligne de commande}, nous parlons de la ligne de -commande du système. Pour plus de détails, voir -@ref{Converting from other formats}. +commande du système. Pour plus de précisions, reportez-vous à +@ref{Command-line usage}. + +Si le nom du fichier est @file{-}, @command{musicxml2ly} lira +directement à partir de la ligne de commande. @command{musicxml2ly} accepte les options suivantes : @table @code +@item -a, --absolute +Rendu en hauteurs absolues. + @item -h,--help Afficher un résumé des utilisations. -@item -o,--output=@var{file} -Générer le résultat dans le fichier @var{file}. (par défaut : -affichage écran) -@item -v,--version + +@item -l, --language=LANG +Utiliser un autre fichier de définition liguistique @file{LANG.ly} +et les noms de notes correspondants, comme par exemple +@var{deutsch} pour @file{deutsch.ly} et noms de notes en allemand. + +@item --lxml +Utiliser le paquetage Python lxml.etree, moins gourmand en mémoire et +temps de calcul, pour effectuer l'annalyse XML. + +@item --nd --no-articulation-directions +Ne pas convertir la direction (@code{^}, @code{_} ou @code{-}) des +articulations, nuances, etc. + +@item --no-beaming +Ne pas convertir les informations de ligature ; laisser LilyPond gérer +les ligatures automatiquement. + +@item -o,--output=@var{fichier} +Générer le résultat dans le fichier @var{fichier}. S'il n'est pas +déterminé, ce sera @var{fichier-xml}@file{.ly} ; @file{-} produira le +résultat sur la sortie standard (@var{stdout}). + +@item -r,--relative +Rendu en hauteurs relatives (mode par défaut). + +@item -v,--verbose +Mode verbeux. + +@item --version Afficher le numéro de version. + +@item -z,--compressed +Le fichier d'entrée est un fichier MusicXML zippé. @end table + @node Invoking abc2ly @section Invoking @code{abc2ly} @cindex ABC ABC est un format relativement simple basé sur l'ASCII. Sa -description est disponible sur le site d'ABC à l'adresse : - -@quotation -@uref{http://@/www@/.walshaw@/.plus@/.com/@/abc/@/abc2mtex/@/abc@/.txt}. -@end quotation +description est disponible sur le +@uref{http://@/www@/.walshaw@/.plus@/.com/@/abc/@/learn@/.html,site +d'ABC}. -@command{abc2ly} traduit du formt ABC au format LilyPond. +@command{abc2ly} traduit du format ABC au format LilyPond. Pour le lancer en ligne de commande, procédez ainsi : @example -abc2ly [@var{option}]@dots{} @var{abc-file} +abc2ly [@var{option}]@dots{} @var{fichier-abc} @end example @command{abc2ly} accepte les options suivantes : @table @code +@item -b,--beams=None +Préserver la notion de lien de croches propre à ABC. @item -h,--help Afficher un résumé des utilisations. @item -o,--output=@var{file} Générer le résultat dans le fichier @var{file}. -@item -v,--version +@item -s,--strict +Être strict sur la réussite. +@item --version Afficher le numéro de version. @end table @@ -197,7 +245,7 @@ source ABC. Ainsi, l'assertion %%LY voices \set autoBeaming = ##f @end example -aura pour conséquence d'insérer le texte qui suit le mot-clé @q{voices} +aura pour conséquence d'insérer le texte qui suit le mot-clé @qq{voices} dans la voix correspondante du fichier LilyPond. De la même manière, @@ -206,12 +254,12 @@ De la même manière, %%LY slyrics more words @end example -placera le texte suivant le mot-clé @q{slyrics} dans une ligne de paroles. +placera le texte suivant le mot-clé @qq{slyrics} dans une ligne de paroles. @knownissues -Le standard ABC n'est pas si @q{standard} que cela. Pour des +Le standard ABC n'est pas si @qq{standard} que cela. Pour des fonctionnalités étendues, comme la polyphonie, existent différentes conventions. @@ -223,7 +271,6 @@ ABC synchronise paroles et musique en début de ligne ; @command{abc2ly} ignore les ligatures ABC. - @node Invoking etf2ly @section Invoking @command{etf2ly} @@ -239,23 +286,21 @@ convertit partiellement les fichiers ETF en fichiers source LilyPond. Pour le lancer en ligne de commande, procédez ainsi : @example -midi2ly [@var{option}]@dots{} @var{midi-file} +etf2ly [@var{option}]@dots{} @var{fichier-etf} @end example Notez bien que, par @qq{ligne de commande}, nous parlons de la ligne de -commande du système. Pour plus de détails, voir -@ref{Converting from other formats}. +commande du système. Pour plus de précisions, reportez-vous à +@ref{Command-line usage}. -@command{midi2ly} accepte les options suivantes : +@command{etf2ly} accepte les options suivantes : @table @code @item -h,--help Afficher cette aide. - @item -o, --output=@var{file} Générer le résultat dans le fichier @var{file}. - -@item -v, --version +@item --version Afficher le numéro de version. @end table @@ -263,7 +308,7 @@ Afficher le numéro de version. @knownissues La liste des scripts d'articulation est incomplète. Les mesures vides -perturbent @command{etf2ly}. Les séquences ne notes d'ornement ne se +perturbent @command{etf2ly}. Les séquences de notes d'ornement ne se terminent pas de manière satisfaisante. @@ -278,9 +323,9 @@ outils indépendants permettent de générer des fichiers LilyPond. Nous citerons entre autres -@itemize @bullet +@itemize @item -@uref{http://@/denemo@/.sourceforge@/.net/,Denemo}, une interface +@uref{http://@/denemo@/.org,Denemo}, une interface graphique pour l'édition de partition. @item @uref{http://www@/.volny@/.cz/smilauer/rumor/rumor@/.html,Rumor}, un @@ -289,16 +334,24 @@ convertisseur temps-réel de MIDI monophonique à LilyPond. @uref{http://nicolas@/.sceaux@/.free@/.fr/lilypond/lyqi@/.html,lyqi}, un mode majeur pour Emacs. @item -@uref{http://@/www@/.nongnu@/.org/@/xml2ly/, xml2ly}, qui importe -@uref{http://@/www@/.musicxml@/.com/xml@/.html,MusicXML} +@uref{http://@/www@/.nongnu@/.org/@/xml2ly/, xml2ly}, qui importe du +@uref{http://@/www@/.musicxml@/.com/xml@/.html,MusicXML}. @item @uref{http://@/noteedit@/.berlios@/.de,NoteEdit} -qui importe @uref{http://@/www@/.musicxml@/.com/xml@/.html,MusicXML} +qui importe du @uref{http://@/www@/.musicxml@/.com/xml@/.html,MusicXML}. @item @uref{http://@/www@/.rosegardenmusic@/.com,Rosegarden}, -qui importe MIDI +qui importe du MIDI. @item @uref{http://@/common-lisp@/.net/project/fomus/,FOMUS}, une bibliothèque LISP pour générer de la notation musicale. +@item +@uref{http://@/vsr@/.informatik@/.tu-chemnitz@/.de/staff/jan/nted/nted.xhtml,NtEd} +assure, de manière expérimentale, un export vers LilyPond. +@item +@uref{http://@/www@/.tuxguitar@/.com@/.ar/,TuxGuitar} peut exporter au +format LilyPond. +@item +@uref{http://@/musescore@/.org,MuseScore} peut exporter au format LilyPond. @end itemize diff --git a/Documentation/fr/user/dedication.itely b/Documentation/fr/user/dedication.itely index d58182a643..d1bda51268 100644 --- a/Documentation/fr/user/dedication.itely +++ b/Documentation/fr/user/dedication.itely @@ -8,7 +8,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @quotation Nous souhaitons dédier ce programme à tous les amis que nous avons diff --git a/Documentation/fr/user/editorial.itely b/Documentation/fr/user/editorial.itely index bdf9bd5f46..85c32f5ef5 100644 --- a/Documentation/fr/user/editorial.itely +++ b/Documentation/fr/user/editorial.itely @@ -6,7 +6,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @c Translators: Jean-Charles Malahieude diff --git a/Documentation/fr/user/expressive.itely b/Documentation/fr/user/expressive.itely index c5ed82798a..385b61aca5 100644 --- a/Documentation/fr/user/expressive.itely +++ b/Documentation/fr/user/expressive.itely @@ -6,7 +6,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @c Translators: Valentin Villenave @c Translation checkers: Jean-Charles Malahieude, John Mandereau diff --git a/Documentation/fr/user/fretted-strings.itely b/Documentation/fr/user/fretted-strings.itely index 8d56c7f849..662a7c5b64 100644 --- a/Documentation/fr/user/fretted-strings.itely +++ b/Documentation/fr/user/fretted-strings.itely @@ -7,7 +7,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @c Translators: Valentin Villenave @c Translation checkers: Jean-Charles Malahieude, John Mandereau diff --git a/Documentation/fr/user/fundamental.itely b/Documentation/fr/user/fundamental.itely index 0c115e07bb..816891211d 100644 --- a/Documentation/fr/user/fundamental.itely +++ b/Documentation/fr/user/fundamental.itely @@ -7,10 +7,11 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @c Translators: Valentin Villenave, Jean-Charles Malahieude @c Translation checkers: John Mandereau +@c Translation status: post-GDP @node Fundamental concepts @chapter Fundamental concepts @@ -445,7 +446,7 @@ Une section ossia se placera au dessus de la portée en procédant ainsi : << { f c c } \new Staff \with { - alignAboveContext = "main" } + alignAboveContext = #"main" } { f8 f c } >> r4 | @@ -2465,29 +2466,29 @@ lower = \relative c, { << % combine ChoirStaff and PianoStaff in parallel \new ChoirStaff << \new Staff = "sopranos" << - \set Staff.instrumentName = "Soprano" + \set Staff.instrumentName = #"Soprano" \new Voice = "sopranos" { \global \sopranoMusic } >> \new Lyrics \lyricsto "sopranos" { \sopranoWords } \new Staff = "altos" << - \set Staff.instrumentName = "Alto" + \set Staff.instrumentName = #"Alto" \new Voice = "altos" { \global \altoMusic } >> \new Lyrics \lyricsto "altos" { \altoWords } \new Staff = "tenors" << - \set Staff.instrumentName = "Tenor" + \set Staff.instrumentName = #"Tenor" \new Voice = "tenors" { \global \tenorMusic } >> \new Lyrics \lyricsto "tenors" { \tenorWords } \new Staff = "basses" << - \set Staff.instrumentName = "Bass" + \set Staff.instrumentName = #"Bass" \new Voice = "basses" { \global \bassMusic } >> \new Lyrics \lyricsto "basses" { \bassWords } >> % end ChoirStaff \new PianoStaff << - \set PianoStaff.instrumentName = "Piano" + \set PianoStaff.instrumentName = #"Piano" \new Staff = "upper" \upper \new Staff = "lower" \lower >> @@ -2519,22 +2520,22 @@ Une fois tout ceci accompli, voici notre @code{ChoirStaff} : @example \new ChoirStaff << \new Staff = "sopranos" << - \set Staff.instrumentName = "Soprano" + \set Staff.instrumentName = #"Soprano" \new Voice = "sopranos" @{ \global \sopranoMusique @} >> \new Lyrics \lyricsto "sopranos" @{ \sopranoParoles @} \new Staff = "altos" << - \set Staff.instrumentName = "Alto" + \set Staff.instrumentName = #"Alto" \new Voice = "altos" @{ \global \altoMusique @} >> \new Lyrics \lyricsto "altos" @{ \altoParoles @} \new Staff = "tenors" << - \set Staff.instrumentName = "Tenor" + \set Staff.instrumentName = #"Tenor" \new Voice = "tenors" @{ \global \tenorMusique @} >> \new Lyrics \lyricsto "tenors" @{ \tenorParoless @} \new Staff = "basses" << - \set Staff.instrumentName = "Bass" + \set Staff.instrumentName = #"Bass" \new Voice = "basses" @{ \global \basseMusique @} >> \new Lyrics \lyricsto "basses" @{ \basseParoles @} @@ -2547,7 +2548,7 @@ nous contenter de récupérer la partie de piano du modèle @example \new PianoStaff << - \set PianoStaff.instrumentName = "Piano " + \set PianoStaff.instrumentName = #"Piano " \new Staff = "upper" \superieur \new Staff = "lower" \inferieur >> @@ -2583,7 +2584,7 @@ doubles chevrons gauche/droite puisqu'ils doivent s'empiler : >> % end ChoirStaff \new PianoStaff << - \set PianoStaff.instrumentName = "Piano" + \set PianoStaff.instrumentName = #"Piano" \new Staff = "upper" \superieur \new Staff = "lower" \inferieur >> @@ -2636,29 +2637,29 @@ lower = \relative c, { << % combine ChoirStaff and PianoStaff in parallel \new ChoirStaff << \new Staff = "sopranos" << - \set Staff.instrumentName = "Soprano" + \set Staff.instrumentName = #"Soprano" \new Voice = "sopranos" { \global \sopranoMusic } >> \new Lyrics \lyricsto "sopranos" { \sopranoWords } \new Staff = "altos" << - \set Staff.instrumentName = "Alto" + \set Staff.instrumentName = #"Alto" \new Voice = "altos" { \global \altoMusic } >> \new Lyrics \lyricsto "altos" { \altoWords } \new Staff = "tenors" << - \set Staff.instrumentName = "Tenor" + \set Staff.instrumentName = #"Tenor" \new Voice = "tenors" { \global \tenorMusic } >> \new Lyrics \lyricsto "tenors" { \tenorWords } \new Staff = "basses" << - \set Staff.instrumentName = "Bass" + \set Staff.instrumentName = #"Bass" \new Voice = "basses" { \global \bassMusic } >> \new Lyrics \lyricsto "basses" { \bassWords } >> % end ChoirStaff \new PianoStaff << - \set PianoStaff.instrumentName = "Piano " + \set PianoStaff.instrumentName = #"Piano " \new Staff = "upper" \upper \new Staff = "lower" \lower >> diff --git a/Documentation/fr/user/input.itely b/Documentation/fr/user/input.itely index 43eca6d5e2..cd57700c3d 100644 --- a/Documentation/fr/user/input.itely +++ b/Documentation/fr/user/input.itely @@ -7,7 +7,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @c Translators: Jean-Charles Malahieude, Valentin Villenave diff --git a/Documentation/fr/user/install.itely b/Documentation/fr/user/install.itely index ef9901516b..134361b2aa 100644 --- a/Documentation/fr/user/install.itely +++ b/Documentation/fr/user/install.itely @@ -7,7 +7,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @c Translators: John Mandereau diff --git a/Documentation/fr/user/introduction.itely b/Documentation/fr/user/introduction.itely index a884a833df..5d49a6f9de 100644 --- a/Documentation/fr/user/introduction.itely +++ b/Documentation/fr/user/introduction.itely @@ -7,10 +7,10 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @c Translators: Ludovic Sardain, John Mandereau -@c Translation checkers: Jean-Charles Malahieude, Jean-Yves Baudais +@c Translation checkers: Jean-Charles Malahieude, Jean-Yves Baudais, Damien Heurtebise @c Translation status: post-GDP @@ -44,6 +44,7 @@ architecture. @node Engraving @unnumberedsubsec Engraving + @cindex gravure @cindex typographie musicale @cindex musique et typographie @@ -56,7 +57,7 @@ Cette plaque était ensuite encrée, les dépressions créées par les creux et les bosses retenant l'encre. Une image était formée en pressant du papier sur la plaque. La découpe et l'embossage étaient entièrement faits à la main. Il était pénible d'appliquer une -correction, quand celle-ci n'était pas impossible, la gravure devait +correction, quand celle-ci n'était pas impossible ; la gravure devait donc être parfaite du premier coup. La gravure demandait une qualification hautement spécialisée : un artisan devait accomplir environ cinq ans de formation avant de mériter le titre de maître @@ -65,7 +66,7 @@ pour devenir vraiment habile. De nos jours, toutes les partitions récentes sont produites avec des ordinateurs. Ceci a des avantages évidents : le coût des impressions -a diminué, et le travail d'éditeur peut être envoyé par courriel. +a diminué, et le travail d'édition peut être envoyé par courriel. Malheureusement, l'utilisation dominante des ordinateurs a également diminué la qualité graphique des partitions. L'impression informatisée leur donne un aspect fade et mécanique qui les rend @@ -249,13 +250,12 @@ meilleure interprétation. Ces exemples démontrent que la typographie musicale est un art subtil et complexe, et que la produire demande une expertise considérable, -que les musiciens n'ont généralement pas. LilyPond représente notre -effort pour apporter l'excellence graphique de la gravure à la main à -l'ère de l'ordinateur, et la rendre accessible à tous les musiciens. -Nous avons conçu nos algorithmes, fontes et paramètres de programme -pour retrouver la qualité d'édition des anciennes partitions que nous -aimons tant lire et jouer. - +que les musiciens ne possèdent généralement pas. LilyPond est le +fruit de nos efforts pour restaurer l'excellence graphique de la +gravure à la main à l'ère de l'ordinateur, et la rendre accessible à +tous les musiciens. Nous avons conçu nos algorithmes, fontes et +paramètres de programme pour retrouver la qualité d'édition des +anciennes partitions que nous aimons tant lire et jouer. @node Automated engraving @@ -271,9 +271,9 @@ faire leur travail ? La réponse est : nous ne le pouvons pas. La typographie se base sur le jugement visuel humain, donc les humains ne peuvent pas être -complètement remplacés. Si LilyPond arrive à résoudre la plupart des +complètement remplacés. Si LilyPond arrive à traiter la plupart des situations correctement, ce sera déjà une grande avancée sur les -logiciels existants. Les autres situations peuvent être résolues à la +logiciels existants. Les problèmes restants peuvent être résolus à la main. Au fil des ans, le logiciel peut être affiné pour faire de plus en plus de choses automatiquement, pour que les ajustements manuels soient de moins en moins nécessaires. @@ -299,16 +299,16 @@ définitions du modèle typographique doivent également être accessibles à l'utilisateur. @item Enfin, nous affinons continuellement les algorithmes de formatage, -donc nous avons besoin d'une approche souple des règles. Le language +donc nous avons besoin d'une approche souple des règles. Le langage C++ oblige à une certaine méthode de groupage des règles qui ne convient pas bien au fonctionnement de la notation musicale. - + @end itemize @cindex langage de programmation Scheme Ces problèmes ont été résolus en intégrant un interpréteur pour le -language de programmation Scheme, et en réécrivant des parties de +langage de programmation Scheme, et en réécrivant des parties de LilyPond en Scheme. L'architecture actuelle de formatage est construite autour de la notion d'objets graphiques, décrits par des fonctions et des variables Scheme. Cette architecture comprend les @@ -430,7 +430,7 @@ notation utiliser. La notation musicale usuelle est un système d'écriture qui a évolué à travers les dix derniers siècles. La forme qui est aujourd'hui communément utilisée date du début de la Renaissance. Bien que la forme -basique --- les têtes de notes sur une portée de cinq lignes --- n'a pas +basique --- les têtes de notes sur une portée de cinq lignes --- n'ait pas changé, les détails continuent d'évoluer pour exprimer les innovations de la notation contemporaine. Par conséquent, elle comprend quelque 500 ans de musique, avec des applications allant des mélodies monodiques à @@ -572,7 +572,7 @@ et le graveur de hampes (@code{Stem_engraver}) ajoute les hampes : @end lilypond @noindent -Le graveur de hampe est notifié de chaque tête de note qui survient. +Le graveur de hampe est informé de chaque tête de note qui survient. Chaque fois qu'une tête de note --- plusieurs pour un accord --- est rencontrée, un objet hampe est créé et connecté à la tête de note. En ajoutant des graveurs pour les barres de ligature, les liaisons, les @@ -635,7 +635,7 @@ Référence du programme: @rinternals{Contexts}. Idéalement, le format d'entrée pour n'importe quel système de formatage est une description abstraite du contenu. Dans ce cas-ci, ce serait la musique elle-même. Cela pose un formidable problème : -comment pouvons-nous définir ce que la musique est réellement ? Plutôt +comment pouvons-nous définir ce qu'est réellement la musique ? Plutôt que d'essayer de trouver une réponse, nous avons renversé la question. Nous écrivons un logiciel capable de produire de la musique écrite, et adaptons le format pour atteindre la plus grande concision possible. @@ -643,7 +643,7 @@ Quand le format ne peut plus être simplifé, il nous reste par définition le contenu lui-même. Notre logiciel sert de définition formelle d'un document de musique. -La syntaxe est également l'interface utilisateur pour LilyPond, par +Pour LilyPond, la syntaxe est également l'interface utilisateur ; par conséquent il est facile de saisir @example @@ -653,7 +653,7 @@ c'4 d'8 @end example @noindent -c'est-à-dire un do central noire et, juste au-dessus un ré croche +c'est-à-dire un do central noire et, juste au-dessus, un ré croche @lilypond[quote] { @@ -662,7 +662,7 @@ c'est-à-dire un do central noire et, juste au-dessus un ré croche @end lilypond Sur une échelle microscopique, une telle syntaxe est facile à -utiliser. A plus grande échelle, la syntaxe a besoin aussi de +utiliser. À plus grande échelle, la syntaxe a besoin aussi de structure. Comment serait-il possible autrement de rentrer des pièces complexes comme des symphonies ou des opéras ? La structure est formée par le concept d'expression musicale : en combinant @@ -686,7 +686,7 @@ des notes. @end lilypond @noindent -Cette expression est mise dans une séquence grace à l'encadrement par +On met cette expression dans une séquence en l'encadrant par des accolades @code{@{@tie{}@dots{}@tie{}@}} @example @@ -699,7 +699,7 @@ des accolades @code{@{@tie{}@dots{}@tie{}@}} @noindent Ceci est également une expression, et peut donc encore une fois -être combinée avec d'autres expressions simultanées (une blanche) +être combiné avec d'autres expressions simultanées (une blanche) en utilisant <<, @code{\\}, et >> @example @@ -712,7 +712,7 @@ en utilisant <<, @code{\\}, et >> De telles structures récursives peuvent être spécifiées formellement et de manière ordonnée dans une grammaire indépendante de tout -contexte. Le code d'analyse est aussi générée à partir de cette +contexte. Le code d'analyse est aussi généré à partir de cette grammaire. Autrement dit, la syntaxe de LilyPond est définie clairement et sans ambiguité. @@ -930,7 +930,7 @@ un fichier, ajoutez les notes, et c'est prêt ! @ref{Scheme tutorial} : courte introduction à Scheme, le langage de programmation utilisé dans les fonctions de musique. Ces quelques lignes vous aideront à construire des retouches avancées ; nombre -d'utilisateurs n'ont jamais touché à Scheme. +d'utilisateurs ne touchent jamais à Scheme. @end itemize @@ -944,7 +944,7 @@ d'utilisateurs n'ont jamais touché à Scheme. @cindex langues étrangères @cindex langue @cindex langage - + @rglosnamed{Top,Glossaire musical} : ce document explique en anglais des termes musicaux, et donne leur traduction dans diverses langues. Si vous n'êtes pas familier avec la notation et la terminologie @@ -996,7 +996,7 @@ différentes formes de retouches, qui permettent d'obtenir de Lilypond (presque) tout ce que vous désirez. @item -@ruser{Interfaces for programmers} :.création de fonctions de musique +@ruser{Interfaces for programmers} : création de fonctions de musique à l'aide de Scheme. @end itemize diff --git a/Documentation/fr/user/keyboards.itely b/Documentation/fr/user/keyboards.itely index d43a78b775..6af9d30e40 100644 --- a/Documentation/fr/user/keyboards.itely +++ b/Documentation/fr/user/keyboards.itely @@ -1,13 +1,13 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*- @c This file is part of lilypond.tely @ignore - Translation of GIT committish: bdf8540b74167817eab96ed3d13b35477217f9fe + Translation of GIT committish: 89af568420c7a794cc29980b4f8fabe10764c152 When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @c Translators: Valentin Villenave @c Translation checkers: Jean-Charles Malahieude, John Mandereau @@ -15,6 +15,15 @@ @node Keyboard and other multi-staff instruments @section Keyboard and other multi-staff instruments +@lilypondfile[quote]{keyboard-headword.ly} + +Ce chapitre traite des différents aspects de la notation que l'on +rencontre particulièrement avec les instruments qui ont recours à +plusieurs portées, tels que ceux disposant de claviers, la harpe ou +le vibraphone. Pour les besoins du discours, et pour simplifier, nous +parlerons ici de @qq{clavier} bien que le recours à des portées multiples +concerne aussi des instruments qui en sont dépourvus. + @menu * Common notation for keyboards:: * Piano:: @@ -25,6 +34,9 @@ @node Common notation for keyboards @subsection Common notation for keyboards +Nous allons examiner ici les problèmes qui peuvent survenir en matière +de notation pour la plupart des instrument à cordes multiples. + @menu * References for keyboards:: * Changing staff manually:: @@ -36,121 +48,283 @@ @node References for keyboards @unnumberedsubsubsec References for keyboards -@untranslated -@ifnothtml -@englishref -@end ifnothtml +@c untranslated +@c ifnothtml +@c englishref +@c end ifnothtml +@cindex piano, système pour +@cindex portées pour piano +@cindex portées pour instrument à clavier +@cindex portées pour instrument à clés +@cindex clavier, portées pour instrument à +@cindex clés, portées pour instrument à + +@funindex PianoStaff + +La notation pour instrument à clavier est en règle générale présentée +sous la forme d'un système pour piano, autrement dit deux portées +normales ou plus réunies par une accolade. Cette notation sert également +à la harpe ou à d'autres instruments à clés. L'organiste, quant à lui, +lira une partition composée de deux portées au sein d'un système +pianistique auquel vient s'adjoindre une portée normale pour le pédalier. + +Les portées sont largement autonomes, mais il arrive que des voix +passent de l'une à l'autre. Le contexte @code{PianoStaff} est +précisément conçu pour gérer la notation spécifique au piano et autres +instruments à clavier, notamment ces croisements. + +Certaines particularités de la notation pour claviers sont abordées dans +d'autres chapitres : + +@itemize + +@item Les claviers ont régulièrement recours à plusieurs voix dont le +nombre peut varier. voir à ce sujet @ref{Collision resolution}. + +@item On peut écrire la musique pour claviers de façon parallèle, comme +l'explique @ref{Writing music in parallel}. + +@item Les indications de doigté sont abrodées dans +@ref{Fingering instructions}. + +@item Les indications en matière de pédalier d'orgue sont traitées comme +des articulations. Voir à ce sujet @ref{List of articulations}. + +@item Pour générer des repères verticaux, voir @ref{Grid lines}. + +@item En plus des @notation{Laissez vibrer}, les liaisons en matière de +clavier peuvent intervenir sur des accords arpégés ou des trémolos. +Reportez-vous au chapitre @ref{Ties}. + +@item Le traitement des arpèges couvrant plusieurs voix ou portées est +abordé au chapitre @ref{Arpeggio}. + +@item Une description des indications de tremolo est disponible au +chapitre @ref{Tremolo repeats}. + +@item Certaines retouches particulières au monde des claviers sont +abordées au chapitre @rlearning{Real music example}. + +@item Des notes fantômes permettent d'introduire des liaisons de tenue +qui passent d'une voix à l'autre, comme le montre +@rlearning{Other uses for tweaks}. + +@end itemize + + +@seealso +Manuel d'initiation : +@rlearning{Real music example}, +@rlearning{Other uses for tweaks}. + +Manuel de notation : +@ref{Grouping staves}, +@ref{Instrument names}, +@ref{Collision resolution}, +@ref{Writing music in parallel}, +@ref{Fingering instructions}, +@ref{List of articulations}, +@ref{Grid lines}, +@ref{Ties}, +@ref{Arpeggio}, +@ref{Tremolo repeats}. + +Référence des propriétés internes : +@rinternals{PianoStaff}. + +Exemples de code : +@rlsr{Keyboards}. + -Les systèmes de piano comprennent deux portées réunies par une accolade. -Les portées sont largement autonomes, mais il arrive que des voix passent -de l'une à l'autre. Cette notation sert également à la harpe ou à d'autres -instruments à clavier. Le contexte @code{PianoStaff} est précisément -conçu pour gérer la notation spécifique au piano, notamment ces croisements. @knownissues -Les nuances ne sont pas centrées verticalement, mais il existe -des astuces. Voir à ce sujet le modèle @q{alignement des nuances au -piano} au chapitre @rlearning{Piano templates}. +@cindex claviers, centrage des nuances +@cindex nuances entre les portées d'un système pianistique +@cindex piano, nuances entre les portées +@cindex centrage des nuances entre deux portées de piano +@funindex staff-padding + +Les nuances ne sont pas automatiquement centrées verticalement, mais il +existe des astuces. Voir à ce sujet le modèle @qq{alignement des +nuances au piano} au chapitre @rlearning{Piano templates} ; une autre +solution consiste à augmenter le décalage des nuances par rapport à la +portée (@code{staff-pagging}) comme l'indique +@rlearning{Moving objects}. @node Changing staff manually @unnumberedsubsubsec Changing staff manually -@cindex changements de portées manuels -@cindex changement de portée, manuel +@cindex changements de portée manuels +@cindex changement de portée forcé +@cindex inter-portée, notes +@cindex notes inter-portée +@cindex inter-portée, ligatures +@cindex ligature inter-portée + +@funindex \change +@funindex change Il est possible de passer d'une portée à l'autre de façon manuelle, au moyen de la commande @example -\change Staff = @var{nomDeLaPortee} @var{musique} +\change Staff = @var{nomDeLaPortee} @end example @noindent La valeur @var{nomDeLaPortee} est le nom de la portée sur laquelle va se déplacer la voix courante. Pour des raisons pratiques, on nomme la portée supérieure @code{"haut"} et la portée inférieure @code{"bas"}, donc -@var{nomDeLaPortee} désigne habituellement @code{"haut"} ou -@code{"bas"}. Dans tous les cas, le contexte de portée ainsi utilisé -doit exister au préalable. C'est pourquoi il est d'usage de commencer -par définir les portées +@var{nomDeLaPortee} désigne habituellement @code{"haut"}, @code{"bas"}, +@code{"MD"} ou @code{"MG"}. Dans tous les cas, le contexte de +portée ainsi utilisé doit exister au préalable. -@example -<< - \new Staff = "haut" @{ - \skip 1 * 10 % @emph{de façon à prolonger la portée} - @} - \new Staff = "bas" @{ - \skip 1 * 10 % @emph{idem} - @} +Pour ligaturer automatiquement des notes entre deux portées, procédez +ainsi : + +@lilypond[verbatim,quote] +\new PianoStaff << + \new Staff = "up" { + 8 + \change Staff = "down" + g8 fis g + \change Staff = "up" + 8 + \change Staff = "down" + e8 dis e + \change Staff = "up" + } + \new Staff = "down" { + \clef bass + % keep staff alive + s1 + } >> -@end example +@end lilypond +Si les ligatures demandaient à être retouchées, commencez par +modifier la direction des hampes. L'emplacement des ligatures sera +alors calculé à partir du centre de la portée la plus proche -- voir +@rlearning{Fixing overlapping notation} pour un exemple de retouche sur +des ligatures. -avant d'insérer une mélodie au moyen d'un contexte @code{Voice} : -@example -\context Staff = bas - \new Voice @{ @dots{} \change Staff = haut @dots{} @} -@end example +@seealso +Manuel d'initiation : +@rlearning{Fixing overlapping notation}. + +Manuel de notation : +@ref{Stems}, +@ref{Automatic beams}. + +Exemples de code : +@rlsr{Keyboards}. + +Référence des propriétés internes : +@rinternals{Beam}, +@rinternals{ContextChange}. @node Changing staff automatically @unnumberedsubsubsec Changing staff automatically + @cindex Changement de portée automatique @cindex Automatique, changement de portée +@funindex \autochange +@funindex autochange +@funindex PianoStaff + Les voix peuvent passer automatiquement d'une portée à l'autre, au moyen de la syntaxe suivante : -@quotation @example \autochange @dots{}@var{musique}@dots{} @end example -@end quotation @noindent Deux portées seront alors créées au sein du contexte @code{PianoStaff}, -nommées respectivement @code{up} et @code{down}. La portée du bas, par -défaut, sera en clé de fa. - -Une section en mode @code{\relative} se situant en dehors de la commande -@code{\autochange} n'aura pas d'effet sur les hauteurs de l'expression -@var{musique} ; si on utilise @code{\relative}, il est donc préférable -de mettre @code{\relative} @emph{après} @code{\autochange} et non avant : +nommées respectivement @code{"up"} et @code{"down"}. La portée du bas +sera par défaut en clé de fa. La commande @code{\autochange} bascule +les notes d'une portée à l'autre en fonction de leur hauteur (le do du +milieu servant de pivot), et place les silences en fonction des notes +qui les suivront. Ainsi : + +@lilypond[quote,verbatim] +\new PianoStaff { + \autochange { + g4 a b c' + d'4 r a g + } +} +@end lilypond -@quotation -@example -\autochange \relative @dots{} @dots{} -@end example -@end quotation +@cindex mode relatif et autochange +@cindex autochange et mode relatif -La commande @code{\autochange} bascule les notes d'une portée à l'autre -en fonction de leur hauteur (le do du milieu servant de charnière), et -place les silences en fonction des notes qui les suivront. Ainsi : +@funindex \relative +@funindex relative -@lilypond[quote,verbatim,ragged-right] -\new PianoStaff - \autochange \relative c' - { - g4 a b c d r4 a g +Une section en mode @code{\relative} se situant en dehors de la commande +@code{\autochange} n'aura pas d'effet sur les hauteurs de l'expression +@var{musique}. Il est donc préférable d'introduire la directive +@code{\relative} @strong{après} @code{\autochange}. + +Lorsque des contrôles particuliers doivent s'appliquer aux portées, +mieux vaut les nommer explicitement -- attention : sous peine +d'effet indésirable quant au résultat, la portée supérieure doit +s'appeler @code{"up"} et l'inférieure @code{"down"} ; @emph{ceci est à +notre connaissance le seul cas où ces noms de variable sont figés}. +Cette procédure sert, entre autres, à indiquer l'armure sur la portée +inférieure : + +@c Keep Ly needed, otherwise 'up' and 'down' get +@c incorrectly translated in verbatim output +@c KEEP LY +@lilypond[quote,verbatim,nogettext] +\new PianoStaff << + \new Staff = "up" { + \new Voice = "melodieUn" { + \key g \major + \autochange \relative c' { + g8 b a c b d c e + d8 r fis, g a2 + } + } + } + \new Staff = "down" { + \key g \major + \clef bass } +>> @end lilypond @seealso -Dans ce même manuel : @ref{Changing staff manually}. +Dans ce même manuel : +@ref{Changing staff manually}. + +Exemples de code : +@rlsr{Keyboards}. -Référence du programme : @rinternals{AutoChangeMusic}. +Référence des propriétés internes : +@rinternals{AutoChangeMusic}. @knownissues +@cindex accords, répartition sur plusieurs portées avec \autochange + Les changements de portée automatiques n'interviennent pas toujours à l'endroit le plus opportun. Pour un résultat de meilleure qualité, il vaut mieux indiquer soi-même ces changements. +Un accord ne peut se répartir sur plusieurs portées ; sa portée +d'affectation sera déterminée par la première hauteur mentionnée dans la +construction de cet accord. + @code{\autochange} ne peut intervenir à l'intérieur d'une commande @code{\times}. @@ -163,141 +337,210 @@ vaut mieux indiquer soi-même ces changements. @cindex mélodie d'une portée à une autre @funindex followVoice +@funindex \showStaffSwitch +@funindex showStaffSwitch +@funindex \hideStaffSwitch +@funindex hideStaffSwitch Lorsqu'une voix change de portée, il est possible d'imprimer -automatiquement une ligne reliant les notes, en attribuant à la variable -@code{followVoice} la valeur @emph{vrai} : +automatiquement une ligne reliant les notes, en faisant appel à la +commande @code{\showStaffSwitch} : -@lilypond[quote,ragged-right,fragment,relative=1,verbatim] +@lilypond[quote,verbatim,relative=1] \new PianoStaff << - \new Staff="one" { - \set followVoice = ##t + \new Staff = "one" { + \showStaffSwitch c1 - \change Staff=two + \change Staff = "two" b2 a } - \new Staff="two" { \clef bass \skip 1*2 } + \new Staff = "two" { + \clef bass + s1*2 + } >> @end lilypond -@seealso -Référence du programme : @rinternals{VoiceFollower}. - - @predefined -@funindex \showStaffSwitch @code{\showStaffSwitch}, -@funindex \hideStaffSwitch @code{\hideStaffSwitch}. @endpredefined +@seealso +Extraits de code : +@rlsr{Keyboards}. + +Référence des propriétés internes : +@rinternals{Note_head_line_engraver}, +@rinternals{VoiceFollower}. + + @node Cross-staff stems @unnumberedsubsubsec Cross-staff stems @cindex hampe, enjambement portées @cindex distance entre deux portées de piano +@funindex Stem +@funindex cross-staff +@funindex length +@funindex flag-style + Pour écrire des accords qui enjambent deux portées, on allonge la hampe de l'accord de l'une des deux portées de façon à ce qu'elle rejoigne celle de l'autre portée. -@lilypond[ragged-right,verbatim,quote] -stemExtend = { - \once \override Stem #'length = #10 - \once \override Stem #'cross-staff = ##t -} -noFlag = \once \override Stem #'flag-style = #'no-flag +@lilypond[verbatim,quote] \new PianoStaff << \new Staff { - \stemDown \stemExtend - f'4 - \stemExtend \noFlag - f'8 + \relative c' { + f8 e4 d8 d f e4 + } } \new Staff { - \clef bass - a4 a8 + \relative c' { + << { + \clef bass + % stems may overlap the other staff + \override Stem #'cross-staff = ##t + % extend the stems to reach other other staff + \override Stem #'length = #12 + % do not print extra flags + \override Stem #'flag-style = #'no-flag + % prevent beaming as needed + a8 g4 f8 f bes\noBeam g4 + } + \\ + { + f,2 bes4 c + } >> + } } >> @end lilypond +@snippets +@lilypondfile[verbatim,lilyquote,texidoc,doctitle] +{indicating-cross-staff-chords-with-arpeggio-bracket.ly} + + +@seealso +Extraits de code : +@rlsr{Keyboards}. + +Référence des propriétés internes : +@rinternals{Stem}. + @node Piano @subsection Piano +Ce chapitre traîte des aspects de la notation directement liés au piano. + @menu * Piano pedals:: @end menu @node Piano pedals @unnumberedsubsubsec Piano pedals -@cindex Pédales -Le piano possède deux pédales, parfois trois, permettant de modifier -l'émission du son. Il est possible d'indiquer précisément chacune -d'entre elles, en ajoutant à une note ou un accord les commandes -suivantes : -@multitable {enfoncerr} {pédale de tenuee} {pédale una cordaa} {\sostenutoOnnnn} -@item @tab pédale de tenue @tab pédale @emph{una corda} @tab pédale tonale -@item enfoncer @tab @code{\sustainOn} @tab @code{\unaCorda} @tab @code{\sostenutoOn} -@item relâcher @tab @code{\sustainOff} @tab @code{\treCorde} @tab @code{\sostenutoOff} -@end multitable - -@lilypond[quote,ragged-right,fragment,verbatim] -c'4\sustainOn c'4\sustainOff -@end lilypond - -Les modalités d'impression de ces indications sont définies par la -propriété @code{pedal@var{X}Strings}, @var{X} étant l'une des trois -pédales @code{Sustain}, @code{Sostenuto} ou @code{UnaCorda}. Voyez -la référence du programme, section @rinternals{SustainPedal}, pour en -savoir plus. +@cindex piano et pédales +@cindex pédales de piano +@cindex sustain, pédale +@cindex pédale sustain +@cindex sostenuto, pédale +@cindex pédale sostenuto +@cindex una corda +@cindex tre corde +@cindex sos. +@cindex U.C. + +@funindex \sustainOn +@funindex sustainOn +@funindex \sustainOff +@funindex sustainOff +@funindex \sostenutoOn +@funindex sostenutoOn +@funindex \sostenutoOff +@funindex sostenutoOff +@funindex \unaCorda +@funindex unaCorda +@funindex \treCorde +@funindex treCorde -La propriété @code{pedalSustainStyle} permet différentes notations de -pédale, en utilisant des crochets -@lilypond[quote,ragged-right,fragment,verbatim,relative=2] -\set Staff.pedalSustainStyle = #'bracket -c\sustainOn d e -b\sustainOff\sustainOn -b g \sustainOff a \sustainOn \bar "|." +Le piano possède deux pédales, parfois trois, permettant de modifier +l'émission du son : une pédale de @notation{tenue} (@emph{sustain}), +une pédale de @notation{sourdine} (@emph{una corda} ou @emph{U.C.}) et +une pédale @notation{tonale} (@emph{sostenuto} ou @emph{sos.}). La +pédale @emph{sustain} se rencontre aussi sur les vibraphones et +celestas. + +@lilypond[quote,verbatim,relative=2] +c4\sustainOn d e g +1\sustainOff +c4\sostenutoOn e g c, +1\sostenutoOff +c4\unaCorda d e g +1\treCorde @end lilypond -@noindent -ou en mélangeant indications textuelles et crochets - -@lilypond[quote,ragged-right,fragment,verbatim,relative=2] +@cindex pédale, styles d'indications de +@cindex pédale, indication textuelle de +@cindex pédale, indication graphique de +@cindex pédale, indication combinée de +@cindex pédale sustain, style +@cindex sustain, style de pédale + +@funindex pedalSustainStyle +@funindex mixed +@funindex bracket +@funindex text + +Trois styles sont à votre disposition pour imprimer les indications de +pédale : sous forme de texte, de crochet, ou une combinaison des deux. +@code{text} est le style de notation par défaut pour les pédales de +tenue ou de sourdine --- le traditionnel @q{*Ped.}. La pédale tonale, +en revanche, utilise @code{mixed} par défaut. + +@lilypond[quote,verbatim,relative=2] +c4\sustainOn g c2\sustainOff \set Staff.pedalSustainStyle = #'mixed -c\sustainOn d e -b\sustainOff\sustainOn -b g \sustainOff a \sustainOn \bar "|." -@end lilypond - -@code{text} est le style de notation par défaut pour la pédale de -tenue --- le traditionnel @q{*Ped.}. La pédale tonale, en revanche, -utilise @code{mixed} par défaut. - -@lilypond[quote,ragged-right,fragment,verbatim,relative=2] -c\sostenutoOn d e c, f g a\sostenutoOff +c4\sustainOn g c d +d\sustainOff\sustainOn g, c2\sustainOff +\set Staff.pedalSustainStyle = #'bracket +c4\sustainOn g c d +d\sustainOff\sustainOn g, c2 +\bar "|." @end lilypond -Il est possible de d'affiner l'apparence d'un crochet de pédale, au -moyen des propriétés @code{edge-width}, @code{edge-height}, et -@code{shorten-pair}, appliquées aux objets @code{PianoPedalBracket} --- -voir la référence du programme, section -@rinternals{PianoPedalBracket}. Par exemple, on peut étirer le crochet -jusqu'à l'extrémité droite de la dernière note : - -@lilypond[quote,ragged-right,fragment,verbatim,relative=2] -\override Staff.PianoPedalBracket #'shorten-pair = #'(0 . -1.0) -c\sostenutoOn d e c, f g a\sostenutoOff -@end lilypond +Le placement des commandes de pédale correspond au mouvement de la +pédale de tenue pendant le jeu. Garder une pédale enclanchée jusqu'à la +barre finale s'obtient tout simplement en omettant la commande de +relacher. @seealso -Dans ce manuel : @ref{Ties} @qq{laissez vibrer}. +Manuel de notation : +@ref{Ties}. + +Extraits de code : +@rlsr{Keyboards}. + +Référence des propriétés internes : +@rinternals{SustainPedal}, +@rinternals{SustainPedalLineSpanner}, +@rinternals{SustainEvent}, +@rinternals{SostenutoPedal}, +@rinternals{SostenutoPedalLineSpanner}, +@rinternals{SostenutoEvent}, +@rinternals{UnaCordaPedal}, +@rinternals{UnaCordaPedalLineSpanner}, +@rinternals{UnaCordaEvent}, +@rinternals{PianoPedalBracket}, +@rinternals{Piano_pedal_engraver}. @node Accordion diff --git a/Documentation/fr/user/lilypond-learning.tely b/Documentation/fr/user/lilypond-learning.tely index d885376b46..8b30c5f83e 100644 --- a/Documentation/fr/user/lilypond-learning.tely +++ b/Documentation/fr/user/lilypond-learning.tely @@ -24,6 +24,7 @@ @end ignore @c Translators: John Mandereau, Jean-Charles Malahieude +@c Translation status: post-GDP @ifnottex @node Top diff --git a/Documentation/fr/user/notation-appendices.itely b/Documentation/fr/user/notation-appendices.itely index e1a0aec499..9b8b598054 100644 --- a/Documentation/fr/user/notation-appendices.itely +++ b/Documentation/fr/user/notation-appendices.itely @@ -7,7 +7,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @c Translators: Frédéric Chiasson, Jean-Charles Malahieude diff --git a/Documentation/fr/user/notation.itely b/Documentation/fr/user/notation.itely index 3cfcc209f2..6cb983e447 100644 --- a/Documentation/fr/user/notation.itely +++ b/Documentation/fr/user/notation.itely @@ -6,7 +6,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @node Musical notation @chapter Musical notation diff --git a/Documentation/fr/user/percussion.itely b/Documentation/fr/user/percussion.itely index 24a858accb..4e3d1220ae 100644 --- a/Documentation/fr/user/percussion.itely +++ b/Documentation/fr/user/percussion.itely @@ -7,7 +7,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.62" +@c \version "2.12.0" @c Translators: Valentin Villenave @c Translation checkers: Jean-Charles Malahieude, John Mandereau diff --git a/Documentation/fr/user/pitches.itely b/Documentation/fr/user/pitches.itely index 32b45cc19d..9c59994574 100644 --- a/Documentation/fr/user/pitches.itely +++ b/Documentation/fr/user/pitches.itely @@ -6,7 +6,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @c Translators: Frédéric Chiasson @c Translation checkers: Valentin Villenave, Jean-Charles Malahieude diff --git a/Documentation/fr/user/preface.itely b/Documentation/fr/user/preface.itely index 6d971b81f5..fa3c3e5d73 100644 --- a/Documentation/fr/user/preface.itely +++ b/Documentation/fr/user/preface.itely @@ -7,10 +7,10 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @c Translators: Valentin Villenave -@c Translation checkers: Ludovic Sardain +@c Translation checkers: Ludovic Sardain, Damien Heurtebise @node Preface @unnumbered Preface @@ -36,18 +36,17 @@ gammes, les études deviennent vite ennuyeuses, et peuvent, si l'on n'est pas encouragé par d'autres --- professeurs, chefs ou public --- en décourager plus d'un. Pourtant, pour peu que l'on persévère, l'instrument devient progressivement une partie de notre vie. Si -certains jours en jouer semble naturel, c'est un vrai bonheur. Et si -d'autres jours on ne peut tout simplement rien en tirer, on continue -quand même à travailler, jour après jour. +certains jours il semble naturel d'en jouer, c'est un vrai bonheur. +Et si d'autres jours on ne peut tout simplement rien en tirer, on +continue quand même à travailler, coûte que coûte. De même, développer LilyPond peut être une tâche harassante. Certains jours, c'est un monceau de bugs duquel il faut se dépêtrer. Pourtant, -il fait maintenant partie de notre vie, et nous nous accrochons. -Notre principale motivation est sans doute que notre logiciel est -véritablement utile aux gens. En flânant sur Internet, nous trouvons -beaucoup de gens qui se servent de LilyPond, et réalisent des -partitions très impressionnantes : c'est incroyable, mais en même -temps très flatteur. +il fait maintenant partie de notre vie, et nous nous accrochons. +Notre principale motivation vient sans doute de l'utilité réelle de +notre logiciel. En flânant sur Internet, nous trouvons beaucoup de +gens qui utilisent LilyPond pour réaliser d'impressionnantes +partitions : c'est incroyable, mais en même temps très flatteur. Les utilisateurs ne se contentent pas de nous encourager en utilisant notre logiciel ; nombre d'entre eux nous aident aussi en faisant des diff --git a/Documentation/fr/user/programming-interface.itely b/Documentation/fr/user/programming-interface.itely index 32b672bdd2..c11bfb4244 100644 --- a/Documentation/fr/user/programming-interface.itely +++ b/Documentation/fr/user/programming-interface.itely @@ -1,12 +1,17 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*- @c This file is part of lilypond.tely @ignore - Translation of GIT committish: 4a527608c5ff2ce31e596495d00dce181dc1b9ea + Translation of GIT committish: 76de7e168dbc9ffc7671d99663c5ce50dae42abb When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @end ignore +@c \version "2.12.0" + +@c Translators: Valentin Villenave +@c Translation checkers: Gilles Thibault + @node Interfaces for programmers @chapter Interfaces for programmers @@ -15,12 +20,14 @@ @menu -* Music functions:: -* Programmer interfaces:: -* Building complicated functions:: -* Markup programmer interface:: -* Contexts for programmers:: -* Scheme procedures as properties:: +* Music functions:: +* Programmer interfaces:: +* Building complicated functions:: +* Markup programmer interface:: +* Contexts for programmers:: +* Scheme procedures as properties:: +* Using Scheme code instead of tweak:: +* Difficult tweaks:: @end menu @node Music functions @@ -30,13 +37,13 @@ @menu -* Overview of music functions:: -* Simple substitution functions:: -* Paired substitution functions:: -* Mathematics in functions:: -* Void functions:: -* Functions without arguments:: -* Overview of available music functions:: +* Overview of music functions:: +* Simple substitution functions:: +* Paired substitution functions:: +* Mathematics in functions:: +* Void functions:: +* Functions without arguments:: +* Overview of available music functions:: @end menu @node Overview of music functions @@ -89,8 +96,8 @@ @menu -* Input variables and Scheme:: -* Internal music representation:: +* Input variables and Scheme:: +* Internal music representation:: @end menu @node Input variables and Scheme @@ -112,10 +119,10 @@ @menu -* Displaying music expressions:: -* Music properties:: -* Doubling a note with slurs (example):: -* Adding articulation to notes (example):: +* Displaying music expressions:: +* Music properties:: +* Doubling a note with slurs (example):: +* Adding articulation to notes (example):: @end menu @node Displaying music expressions @@ -149,10 +156,10 @@ @menu -* Markup construction in Scheme:: -* How markups work internally:: -* New markup command definition:: -* New markup list command definition:: +* Markup construction in Scheme:: +* How markups work internally:: +* New markup command definition:: +* New markup list command definition:: @end menu @node Markup construction in Scheme @@ -186,8 +193,8 @@ @menu -* Context evaluation:: -* Running a function on all layout objects:: +* Context evaluation:: +* Running a function on all layout objects:: @end menu @node Context evaluation @@ -207,4 +214,142 @@ @untranslated -@c -- SKELETON FILE -- + +@menu +* Using Scheme code instead of tweak:: +* Difficult tweaks:: +@end menu + +@node Using Scheme code instead of tweak +@section Using Scheme code instead of @code{\tweak} + +L'inconvénient principal de la commande @code{\tweak} est la rigidité de sa +syntaxe. Par exemple, le code suivant produit une erreur. + +@example +F = \tweak #'font-size #-3 -\flageolet + +\relative c'' @{ + c4^\F c4_\F +@} +@end example + +@noindent +En d'autres termes, @code{\tweak} ne se comporte pas comme une articulation : +il ne peut notamment pas être accolé avec les symboles @samp{^} ou @samp{_}. + +C'est en se servant du langage Scheme que l'on peut résoudre ce problème. +Dans cet exemple, on a recours aux méthodes décrites dans @ref{Adding +articulation to notes (example)}, en particulier quant à l'emploi de +@code{\displayMusic}. + +@example +F = #(let ((m (make-music 'ArticulationEvent + 'articulation-type "flageolet"))) + (set! (ly:music-property m 'tweaks) + (acons 'font-size -3 + (ly:music-property m 'tweaks))) + m) + +\relative c'' @{ + c4^\F c4_\F +@} +@end example + +@noindent +Ici les propriétés @code{tweak} de l'objet flageolet nommé +@samp{m} (créé au moyen de @code{make-music}) sont extraites par +@code{ly:music-property}, une nouvelle valeur de la taille de fonte +est ajoutée à la liste de ses propriétés (grâce à la fonction Scheme +@code{acons}), et le résultat de cette opération est renvoyé par @code{set!}. +Le dernier élément, dans ce bloc @code{let}, est la valeur finale de +@samp{m} lui-même. + + +@node Difficult tweaks +@section Difficult tweaks + +Certains réglages sont plus délicats que d'autres. + +@itemize @bullet + + +@item +L'un d'entre eux est l'apparence des objets dits @q{spanner}, qui s'étendent +horizontalement, tels que les liaisons. Si, en principe, un seul de ces objets +est créé à la fois et peut donc être modifié de façon habituelle, lorsque ces +objets doivent enjamber un changement de ligne, ils sont dupliqués au début +du ou des systèmes suivants. Comme ces objets sont des clones de l'objet d'origine, +ils en héritent toutes les propriétés, y compris les éventuelles commandes @code{\override}. + + +En d'autres termes, une commande @code{\override} affecte toujours les deux extrémités +d'un objet @q{spanner}. Pour ne modifier que la partie précédant ou suivant le changement +de ligne, il faut intervenir directement dans le processus de mise en page. +La fonction de rappel @code{after-line-breaking} contient toute l'opération Scheme +effectuée lorsque les sauts de lignes ont été déterminés, et que des objets graphiques +ont été divisés sur des systèmes différents. + +Dans l'exemple suivant, on définit une nouvelle opération nommée +@code{my-callback}. Cette opération + +@itemize @bullet +@item +détermine si l'objet a été divisé à l'occasion d'un changement de ligne +@item +si oui, recherche les différents morceaux de l'objet +@item +vérifie si l'objet considéré est bien la deuxième moitié d'un objet divisé +@item +si oui, applique un espacement supplémentaire (@code{extra-offset}). +@end itemize + +On ajoute cette procédure à l'objet @rinternals{Tie} (liaison de tenue), +de façon à ce que le deuxième morceau d'une liaison divisée soit rehaussé. + +@c KEEP LY +@lilypond[quote,verbatim,ragged-right] +#(define (my-callback grob) + (let* ( + ; l'objet a-t-il été divisé ? + (orig (ly:grob-original grob)) + + ; si oui, rechercher les morceaux frères (siblings) + (siblings (if (ly:grob? orig) + (ly:spanner-broken-into orig) '() ))) + + (if (and (>= (length siblings) 2) + (eq? (car (last-pair siblings)) grob)) + (ly:grob-set-property! grob 'extra-offset '(-2 . 5))))) + +\relative c'' { + \override Tie #'after-line-breaking = + #my-callback + c1 ~ \break c2 ~ c +} +@end lilypond + +@noindent +Lorsque cette astuce va être appliquée, notre nouvelle fonction de rappel +@code{after-line-breaking} devra également appeler celle d'origine +(@code{after-line-breaking}), si elle existe. +Ainsi, pour l'utiliser dans le cas d'un crescendo (objet @code{Hairpin}), +il faudra appeler également @code{ly:hairpin::after-line-breaking}. + + +@item Pour des raisons d'ordre technique, certains objets ne peuvent être modifiés par +@code{\override}. Parmi ceux-là, les objets @code{NonMusicalPaperColumn} +et @code{PaperColumn}. La commande @code{\overrideProperty} sert à les modifier, de +façon similaire à @code{\once \override}, mais avec une syntaxe différente : + +@example +\overrideProperty +#"Score.NonMusicalPaperColumn" % Nom de l'objet +#'line-break-system-details % Nom de la propriété +#'((next-padding . 20)) % valeur +@end example + +Notez cependant que la commande @code{\override} peut tout de même être appliquée +à @code{NoteMusicalPaperColumn} et @code{PaperColumn} dans un bloc @code{\context}. + +@end itemize diff --git a/Documentation/fr/user/repeats.itely b/Documentation/fr/user/repeats.itely index 0ac017e0b6..db5b8853a2 100644 --- a/Documentation/fr/user/repeats.itely +++ b/Documentation/fr/user/repeats.itely @@ -6,7 +6,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @c Translators: Valentin Villenave @c Translation checkers: Jean-Charles Malahieude, John Mandereau diff --git a/Documentation/fr/user/rhythms.itely b/Documentation/fr/user/rhythms.itely index 69fca08fbd..b38507feb4 100644 --- a/Documentation/fr/user/rhythms.itely +++ b/Documentation/fr/user/rhythms.itely @@ -6,7 +6,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @c Translators: Frédéric Chiasson @c Translation checkers: Valentin Villenave, Jean-Charles Malahieude diff --git a/Documentation/fr/user/setup.itely b/Documentation/fr/user/setup.itely index c0e9ea2e81..3927176944 100644 --- a/Documentation/fr/user/setup.itely +++ b/Documentation/fr/user/setup.itely @@ -1,18 +1,23 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*- @c This file is part of lilypond-program.tely @ignore - Translation of GIT committish: 4a527608c5ff2ce31e596495d00dce181dc1b9ea + Translation of GIT committish: e2070eadd7d3d7a87450aab195a48945ee0b144a When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @end ignore +@c \version "2.12.0" + +@c Translators: Jean-Charles Malahieude @node Setup @chapter Setup -@untranslated - +Ce chapitre traite des options de configuration à effectuer après +l'installation de LilyPond et de ses dépendances. Il tient lieu de +référence en la matière : ne vous intéressez qu'à la rubrique qui vous +concerne directement. @menu * Setup for specific Operating Systems:: @@ -23,24 +28,106 @@ @node Setup for specific Operating Systems @section Setup for specific Operating Systems -@untranslated - +Cette partie explique comment optimiser l'installation propres à +certains systèmes. @menu -* MacOS X on the command-line:: +* Setup for MacOS X:: @end menu -@node MacOS X on the command-line -@subsection MacOS X on the command-line +@node Setup for MacOS X +@subsection Setup for MacOS X + +@subsubheading Using Python scripts on MacOS 10.3 or 10.4 + +Les exécutables de LilyPond pour MacOS X ne fournissent pas Python, bien +qu'une version au moins de niveau 2.4 soit requise par +@command{convert-ly}. Ainsi, et si vous utilisez MacOS 10.3 ou 10.4, +devrez-vous installer une version plus récente de Python à partir de +@uref{http://python.org/download/}, puis éditer la première ligne de +@command{convert-ly} et @command{lilypond-book}. Si les exécutables du +Python que vous venez d'installer sont dans votre @var{PATH}, cette ligne +doit être : + +@example +#!/usr/bin/env python +@end example + +@noindent +et dans le cas contraire + +@example +#!@var{/chemin/vers/nouvelle_installation/python} +@end example + + +@subsubheading MacOS X on the command line + +Les scripts tels que @command{lilypond-book}, @command{convert-ly}, +@command{abc2ly}, et même @command{lilypond}, sont insclus dans un +fichier @code{.app} pour MacOS@tie{}X. Vous pourrez les lancer +directement en ligne de commande de la manière suivante : + +@example +@var{chemin/vers}/LilyPond.app/Contents/Resources/bin/lilypond +@end example + +@noindent +Il en va de même pour les autres scripts de ce répertoire, y compris +@command{lilypond-book}, @command{convert-ly}, @command{abc2ly}, etc. + +Une autre façon de procéder consiste à créer des scripts qui ajoutent +automatiquement le chemin. À cette intention, créez un répertoire qui +contiendra ces scripts : + +@example +mkdir -p ~/bin +cd ~/bin +@end example + +Créez un fichier appelé @code{lilypond} et qui contiendra : + +@example +exec @var{chemin/vers}/LilyPond.app/Contents/Resources/bin/lilypond "$@@" +@end example + +Créez autant de fichiers -- @code{lilypond-book}, @code{convert-ly}, et +autres programmes annexes que vous utilisez (@code{abc2ly}, +@code{midi2ly}, etc) -- que de besoin. Remplacez simplement +@code{bin/lilypond} par @code{bin/convert-ly} ou tout autre nom de +programme dans le fichier que vous créez. -@untranslated +Rendez ces fichiers exécutables : + +@example +chmod u+x lilypond +@end example + +Ajoutez alors ce répertoire à votre @var{PATH}. Modifiez le fichier +@code{.profile} -- créez-le si besoin -- de votre répertoire personnel, +de telle sorte qu'il contienne + +@example +export PATH=$PATH:~/bin +@end example + +@noindent +Ce fichier doit se terminer par une ligne vide. + +Notez que @var{chemin/vers} devrait correspondre à @code{/Applications/}. @node Text editor support @section Text editor support -@untranslated +@cindex editors +@cindex vim +@cindex emacs +@cindex modes, editor +@cindex syntax coloring +@cindex coloring, syntax +Certains éditeurs de texte prennent en charge LilyPond. @menu * Emacs mode:: @@ -54,44 +141,210 @@ @node Emacs mode @subsection Emacs mode -@untranslated +Emacs dispose d'un @file{lilypond-mode} qui fournit l'autocomplétion des +mots-clés, l'indentation, les appariements spécifiques à LilyPond, la +coloration synthaxique, ainsi que des raccourcis pour compiler et +consulter les manuels de LilyPond en mode info. Si le +@file{lilypond-mode} n'était pas installé sur votre système, procédez +comme ci-dessous. + +Le répertoire @file{elisp} inclus dans les sources contient aussi un +mode pour saisir la musique et lancer LilyPond. Faites @command{make +install} pour l'installer dans votre @var{elispdir}. Le fichier +@file{lilypond-init.el} devrait trouver sa place dans +@var{load-path}@file{/site-start.d/} ou bien ajouté à votre +@file{~/.emacs} ou @file{~/.emacs.el}. + +En tant que simple utilisateur, vous pouvez toujours ajouter votre +propre répertoire (par exemple @file{~/site-lisp/}) à votre +@var{load-path} en ajoutant la ligne suivante -- modifiée en conséquence +-- à votre @file{~/.emacs} : + +@c any reason we do not advise: (push "~/site-lisp" load-path) +@example +(setq load-path (append (list (expand-file-name "~/site-lisp")) load-path)) +@end example @node Vim mode @subsection Vim mode -@untranslated +En ce qui concerne @uref{http://@/www@/.vim@/.org,VIM}, LilyPond fournit +un fichier @file{vimrc} qui gère la coloration synthaxique. Le +répertoire @code{$VIM} inclus dans les sources contient aussi un +mode pour saisir la musique et lancer LilyPond. + +Le type de fichier LilyPond sera reconnu si votre +@file{~/.vim/filetype.vim} contient + +@example +if exists("did_load_filetypes") + finish +endif +augroup filetypedetect + au! BufNewFile,BufRead *.ly setf lilypond +augroup END +@end example + +N'oubliez pas d'inclure ce chemin en ajoutant à votre @file{~/.vimrc} la +ligne suivante : + +@example +set runtimepath+=/usr/local/share/lilypond/$@{LILYPOND_VERSION@}/vim/ +@end example + +@noindent +où $@{LILYPOND_VERSION@} correspond à votre version de LilyPond. Si +LilyPond n'est pas installé dans @file{/usr/local/}, modifiez ce chemin +en conséquence. @node jEdit @subsection jEdit -@untranslated +Créé en tant que greffon pour l'éditeur de texte +@uref{http://@/www@/.jedit@/.org@/,jEdit}, LilyPondTool est l'outil le +plus riche en fonctionnalités pour éditer des partitions écrites avec +LilyPond. Cela inclue un assistant à la création de document qui prend +en charge les paroles, un visionneur de PDF avec gestion du +pointer-cliquer. Captures d'écran, démonstrations et instructions +d'installation sont disponibles sur le site de +@uref{http://lilypondtool@/.organum@/.hu,LilyPondTool}. @node TexShop @subsection TexShop -@untranslated +L'éditeur +@uref{http://@/www@/.uoregon@/.edu/~koch/texshop/index@/.html,TexShop} +pour MacOS@tie{}X peut prendre en charge LilyPond, lilypond-book et +convert-ly, en lui adjoignant les extensions disponibles +@uref{http://@/www@/.dimi@/.uniud@/.it/vitacolo/freesoftware@/.html,ici}. @node TextMate @subsection TextMate -@untranslated +TextMate dispose d'un greffon pour LilyPond. Vous pouvez l'installer en +lançant : + +@example +mkdir -p /Library/Application\ Support/TextMate/Bundles +cd /Library/Application\ Support/TextMate/Bundles +svn co http://macromates.com/svn/Bundles/trunk/Bundles/Lilypond.tmbundle/ +@end example @node LilyKDE @subsection LilyKDE -@untranslated +@uref{http://lilykde.googlecode.com/,LilyKDE} est un greffon pour +@uref{http://kate-editor.org/,Kate}, l'éditeur de texte de +l'environnement de bureau KDE. Il dispose d'un assistant à la création +de document LilyPond et un visionneur de PDF. +LilyKDE peut s'interfacer avec +@uref{http://www.volny.cz/smilauer/rumor/,Rumor}, afin de pouvoir entrer +la musique à l'aide d'un clavier MIDI. -@node Point and click -@section Point and click +LilyKDE gère l'hyphénation des paroles, et le gestionnaire de fichiers +de KDE permet de lancer LilyPond sur plusierus fichiers simultanément. -@untranslated +@node Point and click +@section Point and click +Le pointer-cliquer (@emph{point and click}) permet de se retrouver +directement dans le fichier source, à la note que l'on pointe dans le +visionneur de PDF. Ceci facilite grandement le repérage des erreurs à +partir du fichier imprimable. + +Lorsque cette fonctionnalité est active, LilyPond ajoute des hyperliens +au fichier PDF. Ces liens sont transmis au navigateur internet qui se +charge d'ouvrir un éditeur de texte à l'enfroit même où le curseur +pointe. + +Afin que cette chaîne de traitement soit pleinement opérationnelle, il +faut configurer votre visionneur de PDF de façon à ce qu'il suive les +liens grâce au script @file{lilypond-invoke-editor} fourni avec +LilyPond. + + +Pour Xpdf, sous UNIX, vous devrez insérer la ligne suivante dans +le fichier @file{xpdfrc} -- soit @file{/etc/xpdfrc}, soit dans votre +répertoire personnel @file{.xpdfrc}. + +@example +urlCommand "lilypond-invoke-editor %s" +@end example + +@file{lilypond-invoke-editor} est un petit programme assistant. Il se +charge d'appeler un éditeur pour les identifants de ressource +(@emph{URI}) de type @code{textedit}, et un navigateur pour les autres. +Il teste en outre la variable d'environnement @code{EDITOR} pour les cas +suivant : + +@table @code +@item emacs + sera alors lancée la commande +@example +emacsclient --no-wait +@var{line}:@var{column} @var{file} +@end example +@item vim + sera alors lancée la commande +@example +gvim --remote +:@var{line}:norm@var{char} @var{file} +@end example + +@item nedit + sera alors lancée la commande +@example +nc -noask +@var{line} @var{file}' +@end example +@end table + +La variable d'environnement @code{LYEDITOR} permet d'anticiper cette +affectation, puisqu'elle contient la commande qui permet de lancer +l'éditeur en tenant compte des valeurs respectives de @code{%(file)}, +@code{%(column)} , et@code{%(line)}. Par exemple, + +@example +emacsclient --no-wait +%(line)s:%(column)s %(file)s +@end example + +@noindent +en variable d'environnement @code{LYEDITOR} revient au lancement d'un +client emacs standard. + + +@cindex ficher de sortie, taille +@cindex taille du ficher de sortie + +L'option pointer-cliquer accroît la taille des fichiers de manière +significative. Afin de réduire la taille des fichiers PDF et PS, il est +toujours possible de désactiver le pointer-cliquer en ajoutant + +@example +\pointAndClickOff +@end example + +@noindent +dans le fichier @file{.ly}. Il peut alors être activé de manière +explicite grâce à + +@example +\pointAndClickOn +@end example + +Le pointer-cliquer peut aussi être désactivé au moment de la compilation +en ligne de commande : + +@example +lilypond -dno-point-and-click fichier.ly +@end example + +@warning{Lorsqu'un fichier LilyPond est destiné à être redistribué, +pensez à désactiver le pointer-cliquer, de telle sorte que les chemins +d'accès et autres informations propres à votre système ne se retrouvent +pas inclus dans le fichier @file{.pdf}.} -@c -- SKELETON FILE -- diff --git a/Documentation/fr/user/simultaneous.itely b/Documentation/fr/user/simultaneous.itely index 6c90dd26f9..f3664a9719 100644 --- a/Documentation/fr/user/simultaneous.itely +++ b/Documentation/fr/user/simultaneous.itely @@ -6,7 +6,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @c Translators: Frédéric Chiasson, Valentin Villenave @c Translation checkers: Jean-Charles Malahieude, John Mandereau diff --git a/Documentation/fr/user/spacing.itely b/Documentation/fr/user/spacing.itely index a2f1c83956..23a85a5e8a 100644 --- a/Documentation/fr/user/spacing.itely +++ b/Documentation/fr/user/spacing.itely @@ -7,7 +7,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @c Translators: Frédéric Chiasson, Jean-Charles Malahieude diff --git a/Documentation/fr/user/specialist.itely b/Documentation/fr/user/specialist.itely index 52d43c1465..d4e7647283 100644 --- a/Documentation/fr/user/specialist.itely +++ b/Documentation/fr/user/specialist.itely @@ -6,7 +6,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @node Specialist notation @chapter Specialist notation diff --git a/Documentation/fr/user/staff.itely b/Documentation/fr/user/staff.itely index 6fe3e2f4ad..a27ab1a12f 100644 --- a/Documentation/fr/user/staff.itely +++ b/Documentation/fr/user/staff.itely @@ -6,7 +6,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @c Translators: Valentin Villenave, Jean-Charles Malahieude @c Translation checkers: John Mandereau @@ -354,8 +354,8 @@ affichera @code{instrumentName}, et les suivantes @code{shortInstrumentName}. @lilypond[quote,verbatim,ragged-right,relative=1,fragment] -\set Staff.instrumentName = "Ploink " -\set Staff.shortInstrumentName = "Plk " +\set Staff.instrumentName = #"Ploink " +\set Staff.shortInstrumentName = #"Plk " c1 \break c'' @@ -427,12 +427,12 @@ désactiver un graveur, voir @ref{Modifying context plug-ins}. Vous pouvez changer d'instrument en cours de morceau : @lilypond[quote,fragment,verbatim,ragged-right] -\set Staff.instrumentName = "First" -\set Staff.shortInstrumentName = "one" +\set Staff.instrumentName = #"First" +\set Staff.shortInstrumentName = #"one" c1 c c c \break c1 c c c \break -\set Staff.instrumentName = "Second" -\set Staff.shortInstrumentName = "two" +\set Staff.instrumentName = #"Second" +\set Staff.shortInstrumentName = #"two" c1 c c c \break c1 c c c \break @end lilypond diff --git a/Documentation/fr/user/text.itely b/Documentation/fr/user/text.itely index 81121be778..be7b015717 100644 --- a/Documentation/fr/user/text.itely +++ b/Documentation/fr/user/text.itely @@ -6,7 +6,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.65" +@c \version "2.12.0" @c Translators: Jean-Charles Malahieude @c Translation checkers: Valentin Villenave, John Mandereau diff --git a/Documentation/fr/user/tutorial.itely b/Documentation/fr/user/tutorial.itely index d4a962b200..52c6a0b606 100644 --- a/Documentation/fr/user/tutorial.itely +++ b/Documentation/fr/user/tutorial.itely @@ -7,7 +7,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @ignore Tutorial guidelines: (different from policy.txt!) diff --git a/Documentation/fr/user/tweaks.itely b/Documentation/fr/user/tweaks.itely index e961ff0146..2f4df59bc6 100644 --- a/Documentation/fr/user/tweaks.itely +++ b/Documentation/fr/user/tweaks.itely @@ -7,10 +7,11 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @c Translators: Valentin Villenave, Nicolas Klutchnikoff, Damien Heurtebise @c Translation checkers: Jean-Charles Malahieude, John Mandereau +@c Translation status: post-GDP @node Tweaking output @chapter Tweaking output @@ -1330,7 +1331,7 @@ portée temporaire, du type @rglos{ossia}. << { f c c } \new Staff \with { - alignAboveContext = "main" } + alignAboveContext = #"main" } { f8 f c } >> r4 | @@ -1357,7 +1358,7 @@ régler le stencil de chacun sur @code{#f}, comme ceci : << { f c c } \new Staff \with { - alignAboveContext = "main" + alignAboveContext = #"main" } { \override Staff.Clef #'stencil = ##f @@ -1419,7 +1420,7 @@ Remplaçons donc l'exemple ci-dessus par celui-ci : << { f c c } \new Staff \with { - alignAboveContext = "main" + alignAboveContext = #"main" % Don't print clefs in this staff \override Clef #'stencil = ##f % Don't print time signatures in this staff @@ -1485,7 +1486,7 @@ Essayons sur l'exemple d'ossia : << { f c c } \new Staff \with { - alignAboveContext = "main" + alignAboveContext = #"main" \override Clef #'stencil = ##f \override TimeSignature #'stencil = ##f % Reduce all font sizes by ~24% @@ -1553,7 +1554,7 @@ objets en proportion. Voici comment elle s'utilise : << { f c c } \new Staff \with { - alignAboveContext = "main" + alignAboveContext = #"main" \override Clef #'stencil = ##f \override TimeSignature #'stencil = ##f fontSize = #-2 diff --git a/Documentation/fr/user/unfretted-strings.itely b/Documentation/fr/user/unfretted-strings.itely index 21b77f346f..29d473ba2b 100644 --- a/Documentation/fr/user/unfretted-strings.itely +++ b/Documentation/fr/user/unfretted-strings.itely @@ -7,7 +7,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @c Translators: Valentin Villenave @c Translation checkers: Jean-Charles Malahieude, John Mandereau diff --git a/Documentation/fr/user/vocal.itely b/Documentation/fr/user/vocal.itely index 9fbf8e4dc3..1e843d60d3 100644 --- a/Documentation/fr/user/vocal.itely +++ b/Documentation/fr/user/vocal.itely @@ -7,7 +7,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @c Translators: Valentin Villenave @c Translation checkers: Jean-Charles Malahieude @@ -823,10 +823,10 @@ On peut ajouter un numéro aux couplets en définissant la variable \new Voice { \time 3/4 g2 e4 a2 f4 g2. } \addlyrics { - \set stanza = "1. " + \set stanza = #"1. " Hi, my name is Bert. } \addlyrics { - \set stanza = "2. " + \set stanza = #"2. " Oh, ché -- ri, je t'aime } @end lilypond @@ -875,10 +875,10 @@ abrégée. \new Voice { \time 3/4 g2 e4 a2 f4 g2. } \addlyrics { - \set vocalName = "Bert " + \set vocalName = #"Bert " Hi, my name is Bert. } \addlyrics { - \set vocalName = "Ernie " + \set vocalName = #"Ernie " Oh, ché -- ri, je t'aime } @end lilypond @@ -1042,7 +1042,7 @@ d d e d | c1 | } text = \lyricmode { -\set stanza = "1." Ma- ry had a lit- tle lamb, +\set stanza = #"1." Ma- ry had a lit- tle lamb, its fleece was white as snow. } @@ -1083,7 +1083,7 @@ melody = \relative c' { } text = \lyricmode { - \set stanza = "1." This is verse one. + \set stanza = #"1." This is verse one. It has two lines. } diff --git a/Documentation/fr/user/wind.itely b/Documentation/fr/user/wind.itely index 1eab710882..4dfd5708b0 100644 --- a/Documentation/fr/user/wind.itely +++ b/Documentation/fr/user/wind.itely @@ -7,7 +7,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @c Translators: Valentin Villenave @c Translation checkers: Jean-Charles Malahieude, John Mandereau diff --git a/Documentation/fr/user/working.itely b/Documentation/fr/user/working.itely index 9fd28c2e24..5db8ddacdf 100644 --- a/Documentation/fr/user/working.itely +++ b/Documentation/fr/user/working.itely @@ -7,7 +7,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @c Translators: Ludovic Sardain @c Translation checkers: Jean-Yves Baudais, Valentin Villenave, John Mandereau, Jean-Charles Malahieude diff --git a/Documentation/lilypond-ie-fixes.css b/Documentation/lilypond-ie-fixes.css index 9bdc69ac8f..274f7fdc0d 100644 --- a/Documentation/lilypond-ie-fixes.css +++ b/Documentation/lilypond-ie-fixes.css @@ -33,6 +33,11 @@ blockquote { margin: 1em 1%; } +table.cartouche { + width: 85%; + margin: 1em 7.5%; +} + /***********************************************************/ /* TOC SIDEBAR */ /***********************************************************/ @@ -56,11 +61,11 @@ table#navigation { /***********************************************************/ table#navigation, div#tocframe, div#main, -p, .footer, #languages { +p, h1, h2, ul, .footer, #languages { text-align: left; } -div.subheader p { +div.header h1, div.subheader p { text-align: center; } diff --git a/Documentation/lilypond-mccarty.css b/Documentation/lilypond-mccarty.css index c758db6dab..3e3c1d797f 100644 --- a/Documentation/lilypond-mccarty.css +++ b/Documentation/lilypond-mccarty.css @@ -12,8 +12,8 @@ body { height: 100%; font-size: 100%; line-height: 1.125; - color: black; - background-color: white; + color: #000; + background-color: #fff; } /***********************************************************/ @@ -35,10 +35,10 @@ body { background: #b1d281; font-size: 2em; text-align: center; - margin: 0; padding: 0.4em 0.5em; - border: 1px solid #7b925a; - border-width: 0 0 1px 0; + border: solid #7b925a; + border-width: 1px 0; + margin: 0; } .chapter, .appendix, .unnumbered { @@ -63,10 +63,10 @@ body { } .chapheading { - text-indent: -999em; + position: absolute; height: 0; - padding: 0; - margin: 0; + overflow: hidden; + text-indent: -999em; } /***********************************************************/ @@ -74,19 +74,19 @@ body { /***********************************************************/ a:link { - color: #3465a4; + color: #0c51ab; } a:visited { - color: #8f5902; + color: #804f01; } a:active { - color: #73d216; + color: #278800; } a:hover { - color: #ce5c00; + color: #0105ad; } /***********************************************************/ @@ -96,8 +96,8 @@ a:hover { blockquote { width: 96%; padding: 0; - border: 1px solid #708a4b; - border-left: 5px solid #a3ca6d; + border: solid #b1d281; + border-width: 1px 1px 1px 5px; margin: 1em auto; } @@ -130,7 +130,7 @@ blockquote blockquote { } table.cartouche { - background: #f5f5dc; /* beige */ + background: #f5f5dc; width: 85%; border-collapse: collapse; padding: 0 0.5em; @@ -181,9 +181,7 @@ p { } #languages { - background-color: #f5f5dc; /* beige */ padding: 0.5em 1em; - border-top: 1px solid #8fa77f; margin: 0; } @@ -215,11 +213,11 @@ div#tocframe { padding: 0; margin: 0; overflow: auto; - background-color: #f5f5dc; /* beige */ + background: #f5f5dc; z-index: 100; list-style-type: none; font-size: 0.83em; - line-height: 1.4; + line-height: 1.3; } @media screen { @@ -228,24 +226,40 @@ div#tocframe { } } +div#tocframe a:link, div#tocframe a:visited { + color: #454532; + text-decoration: none; +} + +div#tocframe a:hover { + color: #232b16; + text-decoration: underline; +} + div#tocframe p.toc_uplink { font-size: 1em; line-height: 1.125; background: #c9ccc4; - padding: 0.25em 1em; - border-bottom: 1px solid #8a8c87; + padding: 0.25em 1em 0.25em 0.5em; + border-bottom: 1px solid #a0a087; margin: 0; } +div#tocframe p.toc_uplink a:link, +div#tocframe p.toc_uplink a:visited { + color: #1c1c1b; +} + +div#tocframe p.toc_uplink a:hover { + color: #000; +} + div#tocframe h4 { font-size: 1em; line-height: 1.125; font-weight: bold; font-style: italic; - /* background: #c9ccc4; */ - /* padding: 0.25em 1em; */ padding: 0.75em 0.5em 0 0.5em; - /* border-bottom: 1px solid #8a8c87; */ margin: 0; } @@ -300,14 +314,22 @@ li.toc_current ul { width: 100%; background: #c9ccc4; font-size: 0.83em; - line-height: 1.125; border-collapse: collapse; padding: 0; - border: 0; - border-bottom: 1px solid #8a8c87; + border: none; margin: 0; } +.nav_table a:link, .nav_table a:visited { + color: #1c1c1b; + text-decoration: none; +} + +.nav_table a:hover { + color: #000; + text-decoration: underline; +} + .nav_table tr, .nav_table a { padding: 0; margin: 0; @@ -334,7 +356,7 @@ div.header h1 { } div.subheader { - background-color: #ddd; + background: #ddd; padding: 0; margin: 0; text-align: center; @@ -365,13 +387,18 @@ table .title { } .footer { - background: #c6e7b0; + background: #e5f5ce; font-size: 0.8em; - border: 0; padding: 0.2em 0; + border: solid #b1d281; + border-width: 0 0 5px 0; margin: 0; } +.footer a:link { + color: #0308fc; +} + .footer p { padding: 0 1.25em; margin: 0.4em 0; diff --git a/Documentation/po/de.po b/Documentation/po/de.po index bdfdc725a3..cb35178749 100644 --- a/Documentation/po/de.po +++ b/Documentation/po/de.po @@ -1,17 +1,18 @@ +# translation of de.po to German # translation of LilyPond documentation # Copyright (C) 2006 Han-Wen Nienhuys, Jan Nieuwenhuizen # This file is distributed under the same license as the lilypond package. -# Till Rettig , 2007,2008 -# -# +# +# +# Till Rettig , 2007,2008. msgid "" msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-07 23:30+0100\n" -"PO-Revision-Date: 2008-12-08 21:36+0200\n" +"POT-Creation-Date: 2008-12-25 12:33+0100\n" +"PO-Revision-Date: 2008-12-27 17:09+0200\n" "Last-Translator: Till Rettig \n" -"Language-Team: de\n" +"Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -420,7 +421,7 @@ msgstr "f ist 4 aufwärts oder 3 runter, also f unter dem b" #. Documentation/user/tutorial.itely:1791 (variable) #. Documentation/user/working.itely:214 (variable) #. Documentation/user/working.itely:229 (variable) -#. Documentation/user/pitches.itely:1035 (context id) +#. Documentation/user/pitches.itely:1078 (context id) msgid "violin" msgstr "Geige" @@ -1278,6 +1279,7 @@ msgstr "Noten zu Akkorden verbinden" #. @rglos in Documentation/es/user/chords.itely #. @rglos in Documentation/de/user/tutorial.itely #. @rglos in Documentation/de/user/simultaneous.itely +#. @rglos in Documentation/de/user/chords.itely msgid "chord" msgstr "Akkord" @@ -1656,7 +1658,7 @@ msgstr "Erste Stimme einrichten" #. Documentation/user/vocal.itely:506 (context id) #. Documentation/user/vocal.itely:1235 (context id) #. Documentation/user/vocal.itely:1276 (context id) -#. Documentation/user/keyboards.itely:329 (context id) +#. Documentation/user/keyboards.itely:338 (context id) #. Documentation/user/fretted-strings.itely:243 (context id) #. input/lsr/adding-fingerings-to-tablatures.ly:16 (variable) #. input/lsr/jazz-combo-template.ly:204 (context id) @@ -1668,7 +1670,7 @@ msgstr "eins" #. Documentation/user/fundamental.itely:1242 (variable) #. Documentation/user/fundamental.itely:2646 (variable) -#. Documentation/user/tweaks.itely:3469 (variable) +#. Documentation/user/tweaks.itely:3475 (variable) #. Documentation/user/simultaneous.itely:788 (variable) #. Documentation/user/percussion.itely:497 (variable) #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:46 (variable) @@ -1720,37 +1722,37 @@ msgid "SopMusic" msgstr "SoprNoten" #. Documentation/user/fundamental.itely:1298 (variable) -#. Documentation/user/tweaks.itely:3471 (variable) +#. Documentation/user/tweaks.itely:3477 (variable) msgid "AltoMusic" msgstr "AltNoten" #. Documentation/user/fundamental.itely:1299 (variable) -#. Documentation/user/tweaks.itely:3472 (variable) +#. Documentation/user/tweaks.itely:3478 (variable) msgid "TenorMusic" msgstr "TenorNoten" #. Documentation/user/fundamental.itely:1300 (variable) -#. Documentation/user/tweaks.itely:3473 (variable) +#. Documentation/user/tweaks.itely:3479 (variable) msgid "BassMusic" msgstr "BassNoten" #. Documentation/user/fundamental.itely:1301 (variable) -#. Documentation/user/tweaks.itely:3474 (variable) +#. Documentation/user/tweaks.itely:3480 (variable) msgid "VerseOne" msgstr "StropheEins" #. Documentation/user/fundamental.itely:1303 (variable) -#. Documentation/user/tweaks.itely:3475 (variable) +#. Documentation/user/tweaks.itely:3481 (variable) msgid "VerseTwo" msgstr "StropheZwei" #. Documentation/user/fundamental.itely:1305 (variable) -#. Documentation/user/tweaks.itely:3476 (variable) +#. Documentation/user/tweaks.itely:3482 (variable) msgid "VerseThree" msgstr "StropheDrei" #. Documentation/user/fundamental.itely:1307 (variable) -#. Documentation/user/tweaks.itely:3477 (variable) +#. Documentation/user/tweaks.itely:3483 (variable) msgid "VerseFour" msgstr "StropheVier" @@ -1759,19 +1761,19 @@ msgid "Sop" msgstr "Sopr" #. Documentation/user/fundamental.itely:1315 (context id) -#. Documentation/user/tweaks.itely:3484 (context id) +#. Documentation/user/tweaks.itely:3490 (context id) #. Documentation/user/input.itely:951 (context id) msgid "Alto" msgstr "Alt" #. Documentation/user/fundamental.itely:1323 (context id) -#. Documentation/user/tweaks.itely:3492 (context id) +#. Documentation/user/tweaks.itely:3498 (context id) #. Documentation/user/input.itely:953 (context id) msgid "Tenor" msgstr "Tenor" #. Documentation/user/fundamental.itely:1324 (context id) -#. Documentation/user/tweaks.itely:3493 (context id) +#. Documentation/user/tweaks.itely:3499 (context id) #. Documentation/user/input.itely:958 (context id) #. input/lsr/jazz-combo-template.ly:227 (variable) msgid "Bass" @@ -2379,223 +2381,223 @@ msgstr "Vierstimmige SATB-Partitur" msgid "Building a score from scratch" msgstr "Eine Partitur von Grund auf erstellen" -#. Documentation/user/tweaks.itely:596 (comment) -#. Documentation/user/tweaks.itely:731 (comment) +#. Documentation/user/tweaks.itely:597 (comment) +#. Documentation/user/tweaks.itely:732 (comment) msgid "Increase thickness of all following slurs from 1.2 to 5.0" msgstr "Dicke aller folgenden Bögen von 1.2 zu 5.0 vergrößern" -#. Documentation/user/tweaks.itely:665 (comment) -#. Documentation/user/tweaks.itely:704 (comment) -#. Documentation/user/tweaks.itely:707 (comment) +#. Documentation/user/tweaks.itely:666 (comment) +#. Documentation/user/tweaks.itely:705 (comment) +#. Documentation/user/tweaks.itely:708 (comment) msgid "Increase thickness of immediately following slur only" msgstr "Nur die Dicke des direkt folgenden Bogens vergrößern" -#. Documentation/user/tweaks.itely:735 (comment) +#. Documentation/user/tweaks.itely:736 (comment) msgid "Revert thickness of all following slurs to default of 1.2" msgstr "Die Dicke aller folgenden Bögen zurücksezten auf 1.2" -#. Documentation/user/tweaks.itely:1395 (comment) +#. Documentation/user/tweaks.itely:1396 (comment) msgid "Don't print clefs in this staff" msgstr "Keine Schlüssel in diesem System" -#. Documentation/user/tweaks.itely:1397 (comment) +#. Documentation/user/tweaks.itely:1398 (comment) msgid "Don't print time signatures in this staff" msgstr "Keine Taktangabe in diesem System" -#. Documentation/user/tweaks.itely:1461 (comment) +#. Documentation/user/tweaks.itely:1462 (comment) msgid "Reduce all font sizes by ~24%" msgstr "Alle Schriftgrößen um ~24% verkleinern" -#. Documentation/user/tweaks.itely:1527 (comment) +#. Documentation/user/tweaks.itely:1528 (comment) msgid "Reduce stem length and line spacing to match" msgstr "Die Halslänge und Linienabstand anpassen" -#. Documentation/user/tweaks.itely:1957 (comment) -#. Documentation/user/tweaks.itely:2027 (comment) +#. Documentation/user/tweaks.itely:1958 (comment) +#. Documentation/user/tweaks.itely:2028 (comment) msgid "Set details for later Text Spanner" msgstr "Details für späteren Text-Spanner setzen" -#. Documentation/user/tweaks.itely:1960 (comment) -#. Documentation/user/tweaks.itely:2030 (comment) +#. Documentation/user/tweaks.itely:1961 (comment) +#. Documentation/user/tweaks.itely:2031 (comment) msgid "Place dynamics above staff" msgstr "Dynamik-Zeichen über System setzen" -#. Documentation/user/tweaks.itely:1962 (comment) -#. Documentation/user/tweaks.itely:2034 (comment) +#. Documentation/user/tweaks.itely:1963 (comment) +#. Documentation/user/tweaks.itely:2035 (comment) msgid "Start Ottava Bracket" msgstr "Beginn der Oktavierungsklammer" -#. Documentation/user/tweaks.itely:1965 (comment) -#. Documentation/user/tweaks.itely:1972 (comment) -#. Documentation/user/tweaks.itely:2037 (comment) -#. Documentation/user/tweaks.itely:2044 (comment) +#. Documentation/user/tweaks.itely:1966 (comment) +#. Documentation/user/tweaks.itely:1973 (comment) +#. Documentation/user/tweaks.itely:2038 (comment) +#. Documentation/user/tweaks.itely:2045 (comment) msgid "Add Dynamic Text" msgstr "Dynamik-Text hinzufügen" -#. Documentation/user/tweaks.itely:1967 (comment) -#. Documentation/user/tweaks.itely:2039 (comment) +#. Documentation/user/tweaks.itely:1968 (comment) +#. Documentation/user/tweaks.itely:2040 (comment) msgid "Add Dynamic Line Spanner" msgstr "Dynamic Line Spanner hinzufügen" -#. Documentation/user/tweaks.itely:1969 (comment) -#. Documentation/user/tweaks.itely:2041 (comment) +#. Documentation/user/tweaks.itely:1970 (comment) +#. Documentation/user/tweaks.itely:2042 (comment) msgid "Add Text Script" msgstr "Textbeschriftung hinzufügen" -#. Documentation/user/tweaks.itely:1974 (comment) -#. Documentation/user/tweaks.itely:2046 (comment) +#. Documentation/user/tweaks.itely:1975 (comment) +#. Documentation/user/tweaks.itely:2047 (comment) msgid "Stop Ottava Bracket" msgstr "Ende der Oktavierungsklammer" -#. Documentation/user/tweaks.itely:2032 (comment) +#. Documentation/user/tweaks.itely:2033 (comment) msgid "Place following Ottava Bracket below Text Spanners" msgstr "Nächste Ottava-Klammer unter Text-Spanner setzen" -#. Documentation/user/tweaks.itely:2094 (comment) +#. Documentation/user/tweaks.itely:2095 (comment) msgid "Cause notes to space out to accommodate text" msgstr "Noten spreizen um dem Text Platz zu machen" -#. Documentation/user/tweaks.itely:2117 (comment) +#. Documentation/user/tweaks.itely:2118 (comment) msgid "This markup is short enough to fit without collision" msgstr "Dieser Text ist kurz genug um ohne Kollision zu passen" -#. Documentation/user/tweaks.itely:2121 (comment) +#. Documentation/user/tweaks.itely:2122 (comment) msgid "This is too long to fit, so it is displaced upwards" msgstr "Dieser ist zu lang, darum wird der nach oben verschoben" -#. Documentation/user/tweaks.itely:2125 (comment) -#. Documentation/user/tweaks.itely:2130 (comment) +#. Documentation/user/tweaks.itely:2126 (comment) +#. Documentation/user/tweaks.itely:2131 (comment) msgid "Turn off collision avoidance" msgstr "Abschalten der automatischen Vermeidung von Zusammenstößen" -#. Documentation/user/tweaks.itely:2132 (comment) +#. Documentation/user/tweaks.itely:2133 (comment) msgid "and turn on textLengthOn" msgstr "und Textlänge berücksichtigen" -#. Documentation/user/tweaks.itely:2133 (comment) +#. Documentation/user/tweaks.itely:2134 (comment) msgid "Spaces at end are honored" msgstr "Leerzeichen am Ende werden beachtet" -#. Documentation/user/tweaks.itely:2240 (comment) +#. Documentation/user/tweaks.itely:2241 (comment) msgid "Extend width by 1 staff space" msgstr "Breite um einen Linienabstand vergrößern" -#. Documentation/user/tweaks.itely:2523 (comment) +#. Documentation/user/tweaks.itely:2524 (comment) msgid "This will not work, see below:" msgstr "Das funktioniert nicht, siehe unten" -#. Documentation/user/tweaks.itely:2527 (comment) +#. Documentation/user/tweaks.itely:2528 (comment) msgid "This works:" msgstr "Das funktioniert:" -#. Documentation/user/tweaks.itely:2578 (variable) +#. Documentation/user/tweaks.itely:2579 (variable) msgid "naturalplusflat" msgstr "AuflösungB" -#. Documentation/user/tweaks.itely:2619 (comment) +#. Documentation/user/tweaks.itely:2620 (comment) msgid "Extend width by 1 unit" msgstr "Breite um eine Einheit vergrößern" -#. Documentation/user/tweaks.itely:2621 (comment) +#. Documentation/user/tweaks.itely:2622 (comment) msgid "Align dynamics to a base line 2 units above staff" msgstr "" "Dynamik-Zeichen an einer Linie ausrichten, die 2 Einheiten über dem System " "ist" -#. Documentation/user/tweaks.itely:2925 (variable) -#. Documentation/user/tweaks.itely:2974 (variable) -#. Documentation/user/tweaks.itely:3035 (variable) -#. Documentation/user/tweaks.itely:3105 (variable) -#. Documentation/user/tweaks.itely:3170 (variable) -#. Documentation/user/tweaks.itely:3230 (variable) +#. Documentation/user/tweaks.itely:2926 (variable) +#. Documentation/user/tweaks.itely:2975 (variable) +#. Documentation/user/tweaks.itely:3036 (variable) +#. Documentation/user/tweaks.itely:3106 (variable) +#. Documentation/user/tweaks.itely:3171 (variable) +#. Documentation/user/tweaks.itely:3231 (variable) msgid "rhMusic" msgstr "rhNoten" -#. Documentation/user/tweaks.itely:2930 (comment) -#. Documentation/user/tweaks.itely:2979 (comment) -#. Documentation/user/tweaks.itely:3042 (comment) -#. Documentation/user/tweaks.itely:3114 (comment) -#. Documentation/user/tweaks.itely:3179 (comment) +#. Documentation/user/tweaks.itely:2931 (comment) +#. Documentation/user/tweaks.itely:2980 (comment) +#. Documentation/user/tweaks.itely:3043 (comment) +#. Documentation/user/tweaks.itely:3115 (comment) +#. Documentation/user/tweaks.itely:3180 (comment) msgid "Start polyphonic section of four voices" msgstr "Beginn des polyphonen Abschnitts mit vier Stimmen" -#. Documentation/user/tweaks.itely:2943 (variable) -#. Documentation/user/tweaks.itely:2992 (variable) -#. Documentation/user/tweaks.itely:3055 (variable) -#. Documentation/user/tweaks.itely:3129 (variable) -#. Documentation/user/tweaks.itely:3196 (variable) -#. Documentation/user/tweaks.itely:3258 (variable) +#. Documentation/user/tweaks.itely:2944 (variable) +#. Documentation/user/tweaks.itely:2993 (variable) +#. Documentation/user/tweaks.itely:3056 (variable) +#. Documentation/user/tweaks.itely:3130 (variable) +#. Documentation/user/tweaks.itely:3197 (variable) +#. Documentation/user/tweaks.itely:3259 (variable) msgid "lhMusic" msgstr "lhNoten" -#. Documentation/user/tweaks.itely:2952 (context id) -#. Documentation/user/tweaks.itely:3001 (context id) -#. Documentation/user/tweaks.itely:3064 (context id) -#. Documentation/user/tweaks.itely:3138 (context id) -#. Documentation/user/tweaks.itely:3205 (context id) -#. Documentation/user/tweaks.itely:3267 (context id) +#. Documentation/user/tweaks.itely:2953 (context id) +#. Documentation/user/tweaks.itely:3002 (context id) +#. Documentation/user/tweaks.itely:3065 (context id) +#. Documentation/user/tweaks.itely:3139 (context id) +#. Documentation/user/tweaks.itely:3206 (context id) +#. Documentation/user/tweaks.itely:3268 (context id) #. Documentation/user/input.itely:964 (context id) msgid "RH" msgstr "RH" -#. Documentation/user/tweaks.itely:2956 (context id) -#. Documentation/user/tweaks.itely:3005 (context id) -#. Documentation/user/tweaks.itely:3068 (context id) -#. Documentation/user/tweaks.itely:3142 (context id) -#. Documentation/user/tweaks.itely:3209 (context id) -#. Documentation/user/tweaks.itely:3271 (context id) +#. Documentation/user/tweaks.itely:2957 (context id) +#. Documentation/user/tweaks.itely:3006 (context id) +#. Documentation/user/tweaks.itely:3069 (context id) +#. Documentation/user/tweaks.itely:3143 (context id) +#. Documentation/user/tweaks.itely:3210 (context id) +#. Documentation/user/tweaks.itely:3272 (context id) #. Documentation/user/input.itely:970 (context id) msgid "LH" msgstr "LH" -#. Documentation/user/tweaks.itely:3183 (comment) -#. Documentation/user/tweaks.itely:3245 (comment) +#. Documentation/user/tweaks.itely:3184 (comment) +#. Documentation/user/tweaks.itely:3246 (comment) msgid "Move the c2 out of the main note column so the merge will work" msgstr "" "Verschiebe das c2 aus der Hauptnotenkolumne, damit Verschmelzung funktioniert" -#. Documentation/user/tweaks.itely:3186 (comment) -#. Documentation/user/tweaks.itely:3248 (comment) +#. Documentation/user/tweaks.itely:3187 (comment) +#. Documentation/user/tweaks.itely:3249 (comment) msgid "Stem on the d2 must be down to permit merging" msgstr "Hals vom d2 muss nach unten, damit Verschmelzung gelingt" -#. Documentation/user/tweaks.itely:3243 (comment) +#. Documentation/user/tweaks.itely:3244 (comment) msgid "Reposition the c2 to the right of the merged note" msgstr "c2 neu positionieren rechts von der verschmolzenen Note" -#. Documentation/user/tweaks.itely:3379 (comment) -#. Documentation/user/tweaks.itely:3401 (comment) +#. Documentation/user/tweaks.itely:3380 (comment) +#. Documentation/user/tweaks.itely:3402 (comment) msgid "Visible tempo marking" msgstr "Sichtbare Tempo-Bezeichnung" -#. Documentation/user/tweaks.itely:3383 (comment) -#. Documentation/user/tweaks.itely:3405 (comment) +#. Documentation/user/tweaks.itely:3384 (comment) +#. Documentation/user/tweaks.itely:3406 (comment) msgid "Invisible tempo marking to lengthen fermata in MIDI" msgstr "Unsichtbare Tempo-Bezeichnung um Fermate im MIDI zu verlängern" -#. Documentation/user/tweaks.itely:3386 (comment) -#. Documentation/user/tweaks.itely:3408 (comment) +#. Documentation/user/tweaks.itely:3387 (comment) +#. Documentation/user/tweaks.itely:3409 (comment) msgid "New tempo for next section" msgstr "Neues Tempo im nächsten Abschnitt" -#. Documentation/user/tweaks.itely:3460 (variable) +#. Documentation/user/tweaks.itely:3466 (variable) msgid "emphasize" msgstr "emphasize" -#. Documentation/user/tweaks.itely:3464 (variable) +#. Documentation/user/tweaks.itely:3470 (variable) msgid "normal" msgstr "normal" -#. Documentation/user/tweaks.itely:3470 (variable) +#. Documentation/user/tweaks.itely:3476 (variable) msgid "SopranoMusic" msgstr "SopranNoten" -#. Documentation/user/tweaks.itely:3483 (context id) +#. Documentation/user/tweaks.itely:3489 (context id) #. Documentation/user/input.itely:949 (context id) msgid "Soprano" msgstr "Sopran" -#. Documentation/user/tweaks.itely:3692 (comment) +#. Documentation/user/tweaks.itely:3698 (comment) msgid "Arrange to obtain color from color-notehead procedure" msgstr "Anordnungen um Farbe von der color-notehead-Prozedur zu erhalten" @@ -3629,6 +3631,8 @@ msgstr "Setup für bestimmte Betriebssysteme" #. @node in Documentation/user/setup.itely #. @subsection in Documentation/user/setup.itely +#. @node in Documentation/fr/user/setup.itely +#. @subsection in Documentation/fr/user/setup.itely #. @node in Documentation/es/user/setup.itely #. @subsection in Documentation/es/user/setup.itely #. @node in Documentation/de/user/setup.itely @@ -3637,12 +3641,14 @@ msgid "Setup for MacOS X" msgstr "Einrichtung für MacOS X" #. @subsubheading in Documentation/user/setup.itely +#. @subsubheading in Documentation/fr/user/setup.itely #. @subsubheading in Documentation/es/user/setup.itely #. @subsubheading in Documentation/de/user/setup.itely msgid "Using Python scripts on MacOS 10.3 or 10.4" msgstr "Benutzung von Python-Skripten unter MacOS 10.3 oder 10.4" #. @subsubheading in Documentation/user/setup.itely +#. @subsubheading in Documentation/fr/user/setup.itely #. @subsubheading in Documentation/es/user/setup.itely #. @subsubheading in Documentation/de/user/setup.itely msgid "MacOS X on the command line" @@ -4163,6 +4169,7 @@ msgid "Generating LilyPond files" msgstr "LilyPond-Dateien erstellen" #. @top in Documentation/user/lilypond.tely +#. @top in Documentation/de/user/lilypond.tely msgid "GNU LilyPond --- Notation Reference" msgstr "GNU LilyPond -- Notationsreferenz" @@ -4192,7 +4199,7 @@ msgstr "Index der LilyPond-Befehle" msgid "Musical notation" msgstr "Musikalische Notation" -#. Documentation/user/pitches.itely:666 (variable) +#. Documentation/user/pitches.itely:688 (variable) #. Documentation/user/input.itely:1033 (variable) #. Documentation/user/input.itely:1052 (variable) #. Documentation/user/input.itely:1089 (variable) @@ -4206,35 +4213,35 @@ msgstr "Musikalische Notation" msgid "music" msgstr "Noten" -#. Documentation/user/pitches.itely:1039 (comment) +#. Documentation/user/pitches.itely:1082 (comment) msgid "not strictly necessary, but a good reminder" msgstr "nicht unbdingt nötig, aber gut zu erinnern" -#. Documentation/user/pitches.itely:1046 (context id) +#. Documentation/user/pitches.itely:1089 (context id) #. Documentation/user/staff.itely:1076 (variable) msgid "clarinet" msgstr "Klarinette" -#. Documentation/user/pitches.itely:1130 (variable) +#. Documentation/user/pitches.itely:1174 (variable) msgid "musicA" msgstr "NotenA" -#. Documentation/user/pitches.itely:1144 (variable) +#. Documentation/user/pitches.itely:1188 (variable) msgid "musicB" msgstr "NotenB" -#. Documentation/user/pitches.itely:1163 (context id) -#. Documentation/user/keyboards.itely:171 (context id) -#. Documentation/user/keyboards.itely:265 (context id) +#. Documentation/user/pitches.itely:1207 (context id) +#. Documentation/user/keyboards.itely:175 (context id) +#. Documentation/user/keyboards.itely:274 (context id) #. Documentation/user/percussion.itely:175 (variable) #. Documentation/user/percussion.itely:365 (variable) #. input/lsr/jazz-combo-template.ly:241 (variable) msgid "up" msgstr "oben" -#. Documentation/user/pitches.itely:1167 (context id) -#. Documentation/user/keyboards.itely:181 (context id) -#. Documentation/user/keyboards.itely:274 (context id) +#. Documentation/user/pitches.itely:1211 (context id) +#. Documentation/user/keyboards.itely:185 (context id) +#. Documentation/user/keyboards.itely:283 (context id) #. Documentation/user/percussion.itely:178 (variable) #. Documentation/user/percussion.itely:366 (variable) #. input/lsr/jazz-combo-template.ly:247 (variable) @@ -5742,7 +5749,7 @@ msgstr "Stichnoten" msgid "Formatting cue notes" msgstr "Stichnoten formatieren" -#. Documentation/user/editorial.itely:325 (comment) +#. Documentation/user/editorial.itely:326 (comment) msgid "this is deliberate nonsense; note that the stems remain black" msgstr "Das ist Unsinn, die Hälsen bleiben schwarz" @@ -6473,15 +6480,15 @@ msgstr "Die Strophen am Ende ausdrucken" msgid "Printing stanzas at the end in multiple columns" msgstr "Die Strophen am Ende in mehreren Spalten drucken" -#. Documentation/user/keyboards.itely:183 (comment) +#. Documentation/user/keyboards.itely:187 (comment) msgid "keep staff alive" msgstr "System aufrecht erhalten" -#. Documentation/user/keyboards.itely:266 (context id) +#. Documentation/user/keyboards.itely:275 (context id) msgid "melOne" msgstr "melEins" -#. Documentation/user/keyboards.itely:335 (context id) +#. Documentation/user/keyboards.itely:344 (context id) #. Documentation/user/fretted-strings.itely:244 (context id) #. input/lsr/adding-fingerings-to-tablatures.ly:17 (variable) #. input/lsr/jazz-combo-template.ly:205 (context id) @@ -6489,19 +6496,19 @@ msgstr "melEins" msgid "two" msgstr "zwei" -#. Documentation/user/keyboards.itely:389 (comment) +#. Documentation/user/keyboards.itely:398 (comment) msgid "stems may overlap the other staff" msgstr "Hals kann das andere System überschneiden" -#. Documentation/user/keyboards.itely:391 (comment) +#. Documentation/user/keyboards.itely:400 (comment) msgid "extend the stems to reach other other staff" msgstr "Hälse verlängern um anderes System zu erreichen" -#. Documentation/user/keyboards.itely:393 (comment) +#. Documentation/user/keyboards.itely:402 (comment) msgid "do not print extra flags" msgstr "keine doppelten Fähnchen" -#. Documentation/user/keyboards.itely:395 (comment) +#. Documentation/user/keyboards.itely:404 (comment) msgid "prevent beaming as needed" msgstr "Balken verhindern" @@ -6639,11 +6646,17 @@ msgstr "Harfe" #. @node in Documentation/user/keyboards.itely #. @unnumberedsubsubsec in Documentation/user/keyboards.itely -msgid "Harp notation" -msgstr "Harfennotation" +#. @node in Documentation/es/user/keyboards.itely +#. @unnumberedsubsubsec in Documentation/es/user/keyboards.itely +#. @node in Documentation/de/user/keyboards.itely +#. @unnumberedsubsubsec in Documentation/de/user/keyboards.itely +msgid "References for harps" +msgstr "Referenzen für Harfe" #. @node in Documentation/user/keyboards.itely #. @unnumberedsubsubsec in Documentation/user/keyboards.itely +#. @node in Documentation/es/user/keyboards.itely +#. @unnumberedsubsubsec in Documentation/es/user/keyboards.itely #. @node in Documentation/de/user/keyboards.itely #. @unnumberedsubsubsec in Documentation/de/user/keyboards.itely msgid "Harp pedals" @@ -6745,24 +6758,24 @@ msgstr "meineNoten" msgid "A chord for ukelele" msgstr "Akkord für Ukulele" -#. Documentation/user/fretted-strings.itely:770 (variable) -#. Documentation/user/fretted-strings.itely:793 (variable) -#. Documentation/user/fretted-strings.itely:822 (variable) -#. Documentation/user/fretted-strings.itely:851 (variable) -#. Documentation/user/fretted-strings.itely:875 (variable) -#. Documentation/user/fretted-strings.itely:919 (variable) +#. Documentation/user/fretted-strings.itely:782 (variable) +#. Documentation/user/fretted-strings.itely:805 (variable) +#. Documentation/user/fretted-strings.itely:834 (variable) +#. Documentation/user/fretted-strings.itely:865 (variable) +#. Documentation/user/fretted-strings.itely:889 (variable) +#. Documentation/user/fretted-strings.itely:937 (variable) msgid "mychords" msgstr "meineAkkorde" -#. Documentation/user/fretted-strings.itely:797 (variable) +#. Documentation/user/fretted-strings.itely:809 (variable) msgid "mychordlist" msgstr "meineAkkordliste" -#. Documentation/user/fretted-strings.itely:906 (comment) +#. Documentation/user/fretted-strings.itely:924 (comment) msgid "add a new chord shape" msgstr "Neues Akkordmuster hinzufügen" -#. Documentation/user/fretted-strings.itely:910 (comment) +#. Documentation/user/fretted-strings.itely:928 (comment) msgid "add some new chords based on the power chord shape" msgstr "neue Akkorde basierend auf dem power-chord-Muster hinzufügen" @@ -6934,7 +6947,7 @@ msgstr "Diese Zeilen definieren die Position der Holzblöcke auf dem System" #. Documentation/user/percussion.itely:386 (comment) msgid "if you like, you can change it or you can use special note heads" msgstr "" -"Wenn Sie wollen, können Sie das ändern oder besondere Notenkönpfe benutzen" +"Wenn Sie wollen, können Sie das ändern oder besondere Notenköpfe benutzen" #. Documentation/user/percussion.itely:387 (comment) msgid "for the woodblocks." @@ -7147,20 +7160,20 @@ msgstr "Dudelsack-Defintionen" msgid "Bagpipe example" msgstr "Dudelsack-Beispiele" -#. Documentation/user/chords.itely:654 (variable) +#. Documentation/user/chords.itely:669 (variable) msgid "myChords" msgstr "meineAkkorde" -#. Documentation/user/chords.itely:984 (comment) -#. Documentation/user/chords.itely:1005 (comment) +#. Documentation/user/chords.itely:999 (comment) +#. Documentation/user/chords.itely:1020 (comment) msgid "Put notes on same Staff as figures" msgstr "Noten auf dem gleichen System wie die Symbole" -#. Documentation/user/chords.itely:1068 (comment) +#. Documentation/user/chords.itely:1083 (comment) msgid "The extenders are correct here, with the same rhythm as the bass" msgstr "Linien stimmen hier, mit dem gleichen Rhythmus wie im Bass" -#. Documentation/user/chords.itely:1080 (comment) +#. Documentation/user/chords.itely:1095 (comment) msgid "The extenders are incorrect here, even though the timing is the same" msgstr "Linien stimmen nicht, obwohl der Rhythmus der gleiche ist" @@ -7276,6 +7289,7 @@ msgstr "Grundlagen des Bezifferten Basses" #. @rglos in Documentation/user/chords.itely #. @rglos in Documentation/es/user/chords.itely +#. @rglos in Documentation/de/user/chords.itely msgid "figured bass" msgstr "Generalbass" @@ -8071,11 +8085,11 @@ msgstr " werden vertikale Zusammenstöße vermieden" msgid "now they will collide" msgstr "jetzt kollidieren sie" -#. Documentation/user/spacing.itely:1788 (comment) +#. Documentation/user/spacing.itely:1789 (comment) msgid "the markup is too close to the following note" msgstr "Beschriftung zu nah an der folgenden Note" -#. Documentation/user/spacing.itely:1791 (comment) +#. Documentation/user/spacing.itely:1793 (comment) msgid "setting outside-staff-horizontal-padding fixes this" msgstr "Setzen von outside-staff-horizontal-padding hilft" @@ -8480,41 +8494,46 @@ msgstr "vertikal hochschieben" msgid "third finger" msgstr "dritter Finger" -#. Documentation/user/changing-defaults.itely:2945 (comment) +#. Documentation/user/changing-defaults.itely:2948 (comment) +#. Documentation/user/changing-defaults.itely:2980 (comment) #. input/lsr/aligning-marks-with-various-notation-objects.ly:39 (comment) msgid "the RehearsalMark will be centered above the Clef" msgstr "RehearsalMark zentrieren über dem Schlüssel" -#. Documentation/user/changing-defaults.itely:2951 (comment) +#. Documentation/user/changing-defaults.itely:2954 (comment) #. input/lsr/aligning-marks-with-various-notation-objects.ly:46 (comment) msgid "the RehearsalMark will be centered above the TimeSignature" msgstr "RehearsalMark zentrieren über der Taktart (TimeSignature)" -#. Documentation/user/changing-defaults.itely:2965 (comment) +#. Documentation/user/changing-defaults.itely:2974 (comment) +msgid "the RehearsalMark will be centered above the Key Signature" +msgstr "RehearsalMark wird über der Tonart (KeySignature) zentriert" + +#. Documentation/user/changing-defaults.itely:2994 (comment) msgid "The RehearsalMark will be centered above the KeySignature" msgstr "RehearsalMark zentrieren über der Tonart (KeySignature)" -#. Documentation/user/changing-defaults.itely:2972 (comment) -#. Documentation/user/changing-defaults.itely:2988 (comment) -#. Documentation/user/changing-defaults.itely:2995 (comment) +#. Documentation/user/changing-defaults.itely:3001 (comment) +#. Documentation/user/changing-defaults.itely:3017 (comment) +#. Documentation/user/changing-defaults.itely:3024 (comment) msgid "" "The RehearsalMark will be aligned with the left edge of the KeySignature" msgstr "RehearsalMark mit der linken Ecke von KeySignature ausrichten" -#. Documentation/user/changing-defaults.itely:2977 (comment) +#. Documentation/user/changing-defaults.itely:3006 (comment) msgid "" "The RehearsalMark will be aligned with the right edge of the KeySignature" msgstr "RehearsalMark mit der rechten Ecke von KeySignature ausrichten" -#. Documentation/user/changing-defaults.itely:2989 (comment) +#. Documentation/user/changing-defaults.itely:3018 (comment) msgid "and then shifted right by 3.5 staff-spaces" msgstr "nach rechts um 3,5 Linienabstände verschieben" -#. Documentation/user/changing-defaults.itely:2996 (comment) +#. Documentation/user/changing-defaults.itely:3025 (comment) msgid "and then shifted left by 2 staff-spaces" msgstr "nach links um 2 Linienabstände verschieben" -#. Documentation/user/changing-defaults.itely:3045 (variable) +#. Documentation/user/changing-defaults.itely:3073 (variable) msgid "XinO" msgstr "XinO" @@ -8785,6 +8804,8 @@ msgstr "Abstände und Maße" #. @subsection in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @subsection in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely msgid "Staff symbol properties" msgstr "Eigenschaften von Staff (Notensystem)-Symbol" @@ -8799,11 +8820,13 @@ msgstr "Strecker" #. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely #. @unnumberedsubsubsec in Documentation/es/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely msgid "Using the @code{spanner-interface}" msgstr "Das @code{spanner-interface} benutzen" #. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely #. @unnumberedsubsubsec in Documentation/es/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely msgid "Using the @code{line-spanner-interface}" msgstr "Das @code{line-spanner-interface} benutzen" @@ -8811,6 +8834,8 @@ msgstr "Das @code{line-spanner-interface} benutzen" #. @subsection in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @subsection in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely msgid "Visibility of objects" msgstr "Sichtbarkeit von Objekten" @@ -8881,6 +8906,8 @@ msgstr "Drehen von Objekten" #. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @unnumberedsubsubsec in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely msgid "Rotating layout objects" msgstr "Drehen von Objekten" @@ -8888,6 +8915,8 @@ msgstr "Drehen von Objekten" #. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @unnumberedsubsubsec in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely msgid "Rotating markup" msgstr "Textbeschriftung drehen" @@ -8913,6 +8942,8 @@ msgstr "Umgebungen ausrichten" #. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @unnumberedsubsubsec in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely msgid "Setting @code{X-offset} and @code{Y-offset} directly" msgstr "@code{X-offset} und @code{Y-offset} direkt setzen" @@ -8920,6 +8951,8 @@ msgstr "@code{X-offset} und @code{Y-offset} direkt setzen" #. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @unnumberedsubsubsec in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely msgid "Using the @code{side-position-interface}" msgstr "Das @code{side-position-interface} benutzen" @@ -8927,16 +8960,20 @@ msgstr "Das @code{side-position-interface} benutzen" #. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @unnumberedsubsubsec in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely msgid "Using the @code{self-alignment-interface}" msgstr "Das @code{self-alignment-interface} benutzen" #. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely #. @unnumberedsubsubsec in Documentation/es/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely msgid "Using the @code{aligned-on-parent} procedures" msgstr "Die @code{aligned-on-parent}-Prozeduren benutzen" #. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely #. @unnumberedsubsubsec in Documentation/es/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely msgid "Using the @code{centered-on-parent} procedures" msgstr "Die @code{centered-on-parent}-Prozeduren benutzen" @@ -8944,8 +8981,8 @@ msgstr "Die @code{centered-on-parent}-Prozeduren benutzen" #. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @unnumberedsubsubsec in Documentation/es/user/changing-defaults.itely -msgid "Using the @code{break-aligned-interface}" -msgstr "Das @{break-aligned-interface} benutzen" +msgid "Using the @code{break-alignable-interface}" +msgstr "Benutzung des @code{break-aligned-interface}" #. @node in Documentation/user/changing-defaults.itely #. @subsection in Documentation/user/changing-defaults.itely @@ -8980,6 +9017,8 @@ msgstr "Formen verändern" #. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @unnumberedsubsubsec in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely msgid "Modifying ties and slurs" msgstr "Bögen verändern" @@ -9306,7 +9345,7 @@ msgstr "Scheme-Code anstelle von \\tweak verwenden" #. @section in Documentation/user/programming-interface.itely #. @subsection in Documentation/fr/user/changing-defaults.itely #. @section in Documentation/es/user/programming-interface.itely -#. @subsection in Documentation/de/user/programming-interface.itely +#. @section in Documentation/de/user/programming-interface.itely msgid "Using Scheme code instead of @code{\\tweak}" msgstr "Scheme-Code anstelle von @code{\tweak} verwenden" @@ -9317,7 +9356,7 @@ msgstr "Scheme-Code anstelle von @code{\tweak} verwenden" #. @node in Documentation/es/user/programming-interface.itely #. @section in Documentation/es/user/programming-interface.itely #. @node in Documentation/de/user/programming-interface.itely -#. @subsection in Documentation/de/user/programming-interface.itely +#. @section in Documentation/de/user/programming-interface.itely msgid "Difficult tweaks" msgstr "Schwierige Korrekturen" @@ -9577,11 +9616,6 @@ msgstr "Alte Dateien aktualisieren" msgid "GNU LilyPond --- Utilisation des programmes" msgstr "GNU LilyPond -- Die Programmbenutzung" -#. @node in Documentation/fr/user/setup.itely -#. @subsection in Documentation/fr/user/setup.itely -msgid "MacOS X on the command-line" -msgstr "MacOS X auf der Kommandozeile" - #. @section in Documentation/fr/user/running.itely msgid "Updating with @command{convert-ly}" msgstr "Dateien mit @command{convert-ly} aktualisieren" @@ -9849,10 +9883,6 @@ msgstr "Lilypond-book-Vorlagen" msgid "GNU LilyPond -- Programmbenutzung" msgstr "GNU LilyPond -- Programmbenutzung" -#. @top in Documentation/de/user/lilypond.tely -msgid "GNU LilyPond -- Notationsreferenz" -msgstr "GNU LilyPond -- Notationsreferenz" - #. @chapheading in Documentation/de/user/lilypond.tely msgid "Das Notensatzprogramm" msgstr "Das Notensatzprogramm" @@ -9862,34 +9892,9 @@ msgid "Ignorieren von Melismen" msgstr "Melismen ignorieren" #. @node in Documentation/de/user/changing-defaults.itely -#. @section in Documentation/de/user/changing-defaults.itely -msgid "Common properties" -msgstr "Übliche Eigenschaften" - -#. @node in Documentation/de/user/changing-defaults.itely -#. @subsection in Documentation/de/user/changing-defaults.itely -msgid "Controlling visibility of objects" -msgstr "Die Sichtbarkeit von Objekten kontrollieren" - -#. @node in Documentation/de/user/changing-defaults.itely -#. @subsection in Documentation/de/user/changing-defaults.itely -msgid "Modifying ends of spanners" -msgstr "Enden von Streckern verändern" - -#. @node in Documentation/de/user/changing-defaults.itely -#. @section in Documentation/de/user/changing-defaults.itely -msgid "Discussion of specific tweaks" -msgstr "Erklärung von speziellen Optimierungen" - -#. @node in Documentation/de/user/changing-defaults.itely -#. @subsection in Documentation/de/user/changing-defaults.itely -msgid "old Contexts explained" -msgstr "Alte Kontexte" - -#. @node in Documentation/de/user/programming-interface.itely -#. @section in Documentation/de/user/programming-interface.itely -msgid "TODO moved into scheme" -msgstr "TODO nach Scheme verschoben" +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely +msgid "Using the @code{break-aligned-interface}" +msgstr "Das @code{break-aligned-interface} benutzen" #. input/lsr/accordion-discant-symbols.ly:34 (variable) msgid "discant" @@ -11868,7 +11873,7 @@ msgstr "Zug-Linie schnell schreiben:" msgid "" "1. write repeatedly 'c c c c c c c c |' for the whole length of the song " msgstr "" -"1. wiederholgt 'c·c·c·c·c·c·c·c·|' über die gesamte Länge des Stückes " +"1. wiederholt 'c·c·c·c·c·c·c·c·|' über die gesamte Länge des Stückes " "schreiben" #. input/lsr/score-for-diatonic-accordion.ly:90 (comment) @@ -12222,8 +12227,8 @@ msgid "" "\\include \\\"piece.ly\\\" %%% uncomment this line when using a " "separate file" msgstr "" -"\\include·\\\"piece.ly\\\"·············%%%·Zeile einkommentierten, wenn eine " -"extraDatei benutzt wird" +"\\include \\\"piece.ly\\\" %%% Zeile einkommentieren, wenn eine " +"extra Datei benutzt wird" #. input/lsr/string-quartet-template-with-separate-parts.ly:122 (comment) msgid "{ Uncomment this block when using separate files" @@ -12302,38 +12307,6 @@ msgstr "in scm/define-markup-commands.scm" msgid "Test it:" msgstr "testen:" -#. input/lsr/tick-bar-lines.ly:21 (comment) -msgid "Use 'bar-size to control the height of the tick," -msgstr "'bar-size benutzen um die Höhe des Häkchens zu bestimmen," - -#. input/lsr/tick-bar-lines.ly:22 (comment) -msgid "and 'extra-offset to determine its position." -msgstr "'extra-offset, umd seine Position zu bestimmen." - -#. input/lsr/tick-bar-lines.ly:24 (comment) -msgid "With 'extra-offset set to zero, the tick will be" -msgstr "Mit 'extra-offset auf Null gesetzt, wird das Häkchen" - -#. input/lsr/tick-bar-lines.ly:25 (comment) -msgid "centered around the middle line of the staff." -msgstr "um die Mittellinie des Systems zentriert" - -#. input/lsr/tick-bar-lines.ly:27 (comment) -msgid "Replace Staff.BarLine with Score.BarLine to" -msgstr "Staff.BarLine mit Score.BarLine ersetzen" - -#. input/lsr/tick-bar-lines.ly:28 (comment) -msgid "apply the method to the whole score." -msgstr "um die Methode auf die gesamte Partitur anzuwenden" - -#. input/lsr/tick-bar-lines.ly:38 (comment) -msgid "Revert the overrides to get back a normal" -msgstr "alles rückgängig machen und eine normale" - -#. input/lsr/tick-bar-lines.ly:39 (comment) -msgid "bar line at the end." -msgstr "Taktlinie am Ende setzen" - #. input/lsr/transcription-of-ancient-music-with-incipit.ly:127 (variable) msgid "incipitDiscantus" msgstr "incipitDiscantus" @@ -12610,6 +12583,57 @@ msgstr "Fußnoten" msgid "Table of Contents" msgstr "Inhaltsverzeichnis" +#~ msgid "MacOS X on the command-line" +#~ msgstr "MacOS X auf der Kommandozeile" + +#~ msgid "Harp notation" +#~ msgstr "Harfennotation" + +#~ msgid "GNU LilyPond -- Notationsreferenz" +#~ msgstr "GNU LilyPond -- Notationsreferenz" + +#~ msgid "Common properties" +#~ msgstr "Übliche Eigenschaften" + +#~ msgid "Controlling visibility of objects" +#~ msgstr "Die Sichtbarkeit von Objekten kontrollieren" + +#~ msgid "Modifying ends of spanners" +#~ msgstr "Enden von Streckern verändern" + +#~ msgid "Discussion of specific tweaks" +#~ msgstr "Erklärung von speziellen Optimierungen" + +#~ msgid "old Contexts explained" +#~ msgstr "Alte Kontexte" + +#~ msgid "TODO moved into scheme" +#~ msgstr "TODO nach Scheme verschoben" + +#~ msgid "Use 'bar-size to control the height of the tick," +#~ msgstr "'bar-size benutzen um die Höhe des Häkchens zu bestimmen," + +#~ msgid "and 'extra-offset to determine its position." +#~ msgstr "'extra-offset, umd seine Position zu bestimmen." + +#~ msgid "With 'extra-offset set to zero, the tick will be" +#~ msgstr "Mit 'extra-offset auf Null gesetzt, wird das Häkchen" + +#~ msgid "centered around the middle line of the staff." +#~ msgstr "um die Mittellinie des Systems zentriert" + +#~ msgid "Replace Staff.BarLine with Score.BarLine to" +#~ msgstr "Staff.BarLine mit Score.BarLine ersetzen" + +#~ msgid "apply the method to the whole score." +#~ msgstr "um die Methode auf die gesamte Partitur anzuwenden" + +#~ msgid "Revert the overrides to get back a normal" +#~ msgstr "alles rückgängig machen und eine normale" + +#~ msgid "bar line at the end." +#~ msgstr "Taktlinie am Ende setzen" + #~ msgid "applies to \\\"fas\\\"" #~ msgstr "gehört zu \\\"fas\\\"" diff --git a/Documentation/po/es.po b/Documentation/po/es.po index efb8bac7c7..2926432272 100644 --- a/Documentation/po/es.po +++ b/Documentation/po/es.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-07 23:30+0100\n" -"PO-Revision-Date: 2008-12-03 11:45+0100\n" +"POT-Creation-Date: 2008-12-25 12:33+0100\n" +"PO-Revision-Date: 2008-12-20 17:45+0100\n" "Last-Translator: Francisco Vila \n" "Language-Team: Español\n" "MIME-Version: 1.0\n" @@ -423,7 +423,7 @@ msgstr "el Fa está 4 por encima ó 3 por debajo, es el Fa grave" #. Documentation/user/tutorial.itely:1791 (variable) #. Documentation/user/working.itely:214 (variable) #. Documentation/user/working.itely:229 (variable) -#. Documentation/user/pitches.itely:1035 (context id) +#. Documentation/user/pitches.itely:1078 (context id) msgid "violin" msgstr "violin" @@ -1281,6 +1281,7 @@ msgstr "Combinar notas para formar acordes" #. @rglos in Documentation/es/user/chords.itely #. @rglos in Documentation/de/user/tutorial.itely #. @rglos in Documentation/de/user/simultaneous.itely +#. @rglos in Documentation/de/user/chords.itely msgid "chord" msgstr "acorde" @@ -1659,7 +1660,7 @@ msgstr "Iniciar la primera voz" #. Documentation/user/vocal.itely:506 (context id) #. Documentation/user/vocal.itely:1235 (context id) #. Documentation/user/vocal.itely:1276 (context id) -#. Documentation/user/keyboards.itely:329 (context id) +#. Documentation/user/keyboards.itely:338 (context id) #. Documentation/user/fretted-strings.itely:243 (context id) #. input/lsr/adding-fingerings-to-tablatures.ly:16 (variable) #. input/lsr/jazz-combo-template.ly:204 (context id) @@ -1671,7 +1672,7 @@ msgstr "uno" #. Documentation/user/fundamental.itely:1242 (variable) #. Documentation/user/fundamental.itely:2646 (variable) -#. Documentation/user/tweaks.itely:3469 (variable) +#. Documentation/user/tweaks.itely:3475 (variable) #. Documentation/user/simultaneous.itely:788 (variable) #. Documentation/user/percussion.itely:497 (variable) #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:46 (variable) @@ -1723,37 +1724,37 @@ msgid "SopMusic" msgstr "MusicaSoprano" #. Documentation/user/fundamental.itely:1298 (variable) -#. Documentation/user/tweaks.itely:3471 (variable) +#. Documentation/user/tweaks.itely:3477 (variable) msgid "AltoMusic" msgstr "MusicaAlto" #. Documentation/user/fundamental.itely:1299 (variable) -#. Documentation/user/tweaks.itely:3472 (variable) +#. Documentation/user/tweaks.itely:3478 (variable) msgid "TenorMusic" msgstr "MusicaTenor" #. Documentation/user/fundamental.itely:1300 (variable) -#. Documentation/user/tweaks.itely:3473 (variable) +#. Documentation/user/tweaks.itely:3479 (variable) msgid "BassMusic" msgstr "MusicaBajo" #. Documentation/user/fundamental.itely:1301 (variable) -#. Documentation/user/tweaks.itely:3474 (variable) +#. Documentation/user/tweaks.itely:3480 (variable) msgid "VerseOne" msgstr "EstrofaUno" #. Documentation/user/fundamental.itely:1303 (variable) -#. Documentation/user/tweaks.itely:3475 (variable) +#. Documentation/user/tweaks.itely:3481 (variable) msgid "VerseTwo" msgstr "EstrofaDos" #. Documentation/user/fundamental.itely:1305 (variable) -#. Documentation/user/tweaks.itely:3476 (variable) +#. Documentation/user/tweaks.itely:3482 (variable) msgid "VerseThree" msgstr "EstrofaTres" #. Documentation/user/fundamental.itely:1307 (variable) -#. Documentation/user/tweaks.itely:3477 (variable) +#. Documentation/user/tweaks.itely:3483 (variable) msgid "VerseFour" msgstr "EstrofaCuatro" @@ -1762,20 +1763,20 @@ msgid "Sop" msgstr "Soprano" #. Documentation/user/fundamental.itely:1315 (context id) -#. Documentation/user/tweaks.itely:3484 (context id) +#. Documentation/user/tweaks.itely:3490 (context id) #. Documentation/user/input.itely:951 (context id) msgid "Alto" msgstr "Alto" #. Documentation/user/fundamental.itely:1323 (context id) -#. Documentation/user/tweaks.itely:3492 (context id) +#. Documentation/user/tweaks.itely:3498 (context id) #. Documentation/user/input.itely:953 (context id) msgid "Tenor" msgstr "Tenor" # También Líneas divisorias. FVD #. Documentation/user/fundamental.itely:1324 (context id) -#. Documentation/user/tweaks.itely:3493 (context id) +#. Documentation/user/tweaks.itely:3499 (context id) #. Documentation/user/input.itely:958 (context id) #. input/lsr/jazz-combo-template.ly:227 (variable) msgid "Bass" @@ -2385,226 +2386,226 @@ msgstr "Partitura vocal a cuatro voces SATB" msgid "Building a score from scratch" msgstr "Crear una partitura partiendo de cero" -#. Documentation/user/tweaks.itely:596 (comment) -#. Documentation/user/tweaks.itely:731 (comment) +#. Documentation/user/tweaks.itely:597 (comment) +#. Documentation/user/tweaks.itely:732 (comment) msgid "Increase thickness of all following slurs from 1.2 to 5.0" msgstr "Aumentar el grosor de todas las ligaduras siguientes de 1.2 a 5.0" -#. Documentation/user/tweaks.itely:665 (comment) -#. Documentation/user/tweaks.itely:704 (comment) -#. Documentation/user/tweaks.itely:707 (comment) +#. Documentation/user/tweaks.itely:666 (comment) +#. Documentation/user/tweaks.itely:705 (comment) +#. Documentation/user/tweaks.itely:708 (comment) msgid "Increase thickness of immediately following slur only" msgstr "Aumentar solamente el grosor de la ligadura siguiente" -#. Documentation/user/tweaks.itely:735 (comment) +#. Documentation/user/tweaks.itely:736 (comment) msgid "Revert thickness of all following slurs to default of 1.2" msgstr "" "Devolver el grosor de las ligaduras siguientes al valor predeterminado 1.2" -#. Documentation/user/tweaks.itely:1395 (comment) +#. Documentation/user/tweaks.itely:1396 (comment) msgid "Don't print clefs in this staff" msgstr "No imprimir la clave en este pentagrama" -#. Documentation/user/tweaks.itely:1397 (comment) +#. Documentation/user/tweaks.itely:1398 (comment) msgid "Don't print time signatures in this staff" msgstr "No imprimir el compás en este pentagrama" -#. Documentation/user/tweaks.itely:1461 (comment) +#. Documentation/user/tweaks.itely:1462 (comment) msgid "Reduce all font sizes by ~24%" msgstr "Reducir el tamaño de la fuente en un 24% aprox." -#. Documentation/user/tweaks.itely:1527 (comment) +#. Documentation/user/tweaks.itely:1528 (comment) msgid "Reduce stem length and line spacing to match" msgstr "" "Reducir la longitud de la plica y el espaciado de la línea en coincidencia" -#. Documentation/user/tweaks.itely:1957 (comment) -#. Documentation/user/tweaks.itely:2027 (comment) +#. Documentation/user/tweaks.itely:1958 (comment) +#. Documentation/user/tweaks.itely:2028 (comment) msgid "Set details for later Text Spanner" msgstr "Establecer ajustes para el extensor de texto ulterior" -#. Documentation/user/tweaks.itely:1960 (comment) -#. Documentation/user/tweaks.itely:2030 (comment) +#. Documentation/user/tweaks.itely:1961 (comment) +#. Documentation/user/tweaks.itely:2031 (comment) msgid "Place dynamics above staff" msgstr "Situar la dinámica por encima" # fuzzy. FVD -#. Documentation/user/tweaks.itely:1962 (comment) -#. Documentation/user/tweaks.itely:2034 (comment) +#. Documentation/user/tweaks.itely:1963 (comment) +#. Documentation/user/tweaks.itely:2035 (comment) msgid "Start Ottava Bracket" msgstr "Inicio del corchete de octava" -#. Documentation/user/tweaks.itely:1965 (comment) -#. Documentation/user/tweaks.itely:1972 (comment) -#. Documentation/user/tweaks.itely:2037 (comment) -#. Documentation/user/tweaks.itely:2044 (comment) +#. Documentation/user/tweaks.itely:1966 (comment) +#. Documentation/user/tweaks.itely:1973 (comment) +#. Documentation/user/tweaks.itely:2038 (comment) +#. Documentation/user/tweaks.itely:2045 (comment) msgid "Add Dynamic Text" msgstr "Añadir indicación dinámica textual" -#. Documentation/user/tweaks.itely:1967 (comment) -#. Documentation/user/tweaks.itely:2039 (comment) +#. Documentation/user/tweaks.itely:1968 (comment) +#. Documentation/user/tweaks.itely:2040 (comment) msgid "Add Dynamic Line Spanner" msgstr "Añadir indicación dinámica de extensión de línea" -#. Documentation/user/tweaks.itely:1969 (comment) -#. Documentation/user/tweaks.itely:2041 (comment) +#. Documentation/user/tweaks.itely:1970 (comment) +#. Documentation/user/tweaks.itely:2042 (comment) msgid "Add Text Script" msgstr "Guiones de texto" -#. Documentation/user/tweaks.itely:1974 (comment) -#. Documentation/user/tweaks.itely:2046 (comment) +#. Documentation/user/tweaks.itely:1975 (comment) +#. Documentation/user/tweaks.itely:2047 (comment) msgid "Stop Ottava Bracket" msgstr "Detener el corchete de octava" -#. Documentation/user/tweaks.itely:2032 (comment) +#. Documentation/user/tweaks.itely:2033 (comment) msgid "Place following Ottava Bracket below Text Spanners" msgstr "" "Situar el corchete de octava ulterior por debajo de los extensores de texto" -#. Documentation/user/tweaks.itely:2094 (comment) +#. Documentation/user/tweaks.itely:2095 (comment) msgid "Cause notes to space out to accommodate text" msgstr "Ocasionar que las notas se espacíen para adecuarse al texto" -#. Documentation/user/tweaks.itely:2117 (comment) +#. Documentation/user/tweaks.itely:2118 (comment) msgid "This markup is short enough to fit without collision" msgstr "Este marcado es corto y cabe sin colisionar" -#. Documentation/user/tweaks.itely:2121 (comment) +#. Documentation/user/tweaks.itely:2122 (comment) msgid "This is too long to fit, so it is displaced upwards" msgstr "Este es muy largo y se desplaza hacia arriba" -#. Documentation/user/tweaks.itely:2125 (comment) -#. Documentation/user/tweaks.itely:2130 (comment) +#. Documentation/user/tweaks.itely:2126 (comment) +#. Documentation/user/tweaks.itely:2131 (comment) msgid "Turn off collision avoidance" msgstr "Desactivar el detector de colisiones" -#. Documentation/user/tweaks.itely:2132 (comment) +#. Documentation/user/tweaks.itely:2133 (comment) msgid "and turn on textLengthOn" msgstr "y activar textLengthOn" -#. Documentation/user/tweaks.itely:2133 (comment) +#. Documentation/user/tweaks.itely:2134 (comment) msgid "Spaces at end are honored" msgstr "Los espacios al final se respetan" -#. Documentation/user/tweaks.itely:2240 (comment) +#. Documentation/user/tweaks.itely:2241 (comment) msgid "Extend width by 1 staff space" msgstr "Aumentar la anchura en un espacio de pentagrama" -#. Documentation/user/tweaks.itely:2523 (comment) +#. Documentation/user/tweaks.itely:2524 (comment) msgid "This will not work, see below:" msgstr "Esto no va a funcionar, véase más abajo:" -#. Documentation/user/tweaks.itely:2527 (comment) +#. Documentation/user/tweaks.itely:2528 (comment) msgid "This works:" msgstr "Esto sí funciona:" -#. Documentation/user/tweaks.itely:2578 (variable) +#. Documentation/user/tweaks.itely:2579 (variable) msgid "naturalplusflat" msgstr "becuadro_y_bemol" -#. Documentation/user/tweaks.itely:2619 (comment) +#. Documentation/user/tweaks.itely:2620 (comment) msgid "Extend width by 1 unit" msgstr "Aumentar la anchura en una unidad" -#. Documentation/user/tweaks.itely:2621 (comment) +#. Documentation/user/tweaks.itely:2622 (comment) msgid "Align dynamics to a base line 2 units above staff" msgstr "Alinear los matices a dos unidades por encima del pentagrama" -#. Documentation/user/tweaks.itely:2925 (variable) -#. Documentation/user/tweaks.itely:2974 (variable) -#. Documentation/user/tweaks.itely:3035 (variable) -#. Documentation/user/tweaks.itely:3105 (variable) -#. Documentation/user/tweaks.itely:3170 (variable) -#. Documentation/user/tweaks.itely:3230 (variable) +#. Documentation/user/tweaks.itely:2926 (variable) +#. Documentation/user/tweaks.itely:2975 (variable) +#. Documentation/user/tweaks.itely:3036 (variable) +#. Documentation/user/tweaks.itely:3106 (variable) +#. Documentation/user/tweaks.itely:3171 (variable) +#. Documentation/user/tweaks.itely:3231 (variable) msgid "rhMusic" msgstr "Musica_m_der" -#. Documentation/user/tweaks.itely:2930 (comment) -#. Documentation/user/tweaks.itely:2979 (comment) -#. Documentation/user/tweaks.itely:3042 (comment) -#. Documentation/user/tweaks.itely:3114 (comment) -#. Documentation/user/tweaks.itely:3179 (comment) +#. Documentation/user/tweaks.itely:2931 (comment) +#. Documentation/user/tweaks.itely:2980 (comment) +#. Documentation/user/tweaks.itely:3043 (comment) +#. Documentation/user/tweaks.itely:3115 (comment) +#. Documentation/user/tweaks.itely:3180 (comment) msgid "Start polyphonic section of four voices" msgstr "Inicio de la sección polifónica de cuatro voces" -#. Documentation/user/tweaks.itely:2943 (variable) -#. Documentation/user/tweaks.itely:2992 (variable) -#. Documentation/user/tweaks.itely:3055 (variable) -#. Documentation/user/tweaks.itely:3129 (variable) -#. Documentation/user/tweaks.itely:3196 (variable) -#. Documentation/user/tweaks.itely:3258 (variable) +#. Documentation/user/tweaks.itely:2944 (variable) +#. Documentation/user/tweaks.itely:2993 (variable) +#. Documentation/user/tweaks.itely:3056 (variable) +#. Documentation/user/tweaks.itely:3130 (variable) +#. Documentation/user/tweaks.itely:3197 (variable) +#. Documentation/user/tweaks.itely:3259 (variable) msgid "lhMusic" msgstr "Muslca_m_izq" -#. Documentation/user/tweaks.itely:2952 (context id) -#. Documentation/user/tweaks.itely:3001 (context id) -#. Documentation/user/tweaks.itely:3064 (context id) -#. Documentation/user/tweaks.itely:3138 (context id) -#. Documentation/user/tweaks.itely:3205 (context id) -#. Documentation/user/tweaks.itely:3267 (context id) +#. Documentation/user/tweaks.itely:2953 (context id) +#. Documentation/user/tweaks.itely:3002 (context id) +#. Documentation/user/tweaks.itely:3065 (context id) +#. Documentation/user/tweaks.itely:3139 (context id) +#. Documentation/user/tweaks.itely:3206 (context id) +#. Documentation/user/tweaks.itely:3268 (context id) #. Documentation/user/input.itely:964 (context id) msgid "RH" msgstr "MD" -#. Documentation/user/tweaks.itely:2956 (context id) -#. Documentation/user/tweaks.itely:3005 (context id) -#. Documentation/user/tweaks.itely:3068 (context id) -#. Documentation/user/tweaks.itely:3142 (context id) -#. Documentation/user/tweaks.itely:3209 (context id) -#. Documentation/user/tweaks.itely:3271 (context id) +#. Documentation/user/tweaks.itely:2957 (context id) +#. Documentation/user/tweaks.itely:3006 (context id) +#. Documentation/user/tweaks.itely:3069 (context id) +#. Documentation/user/tweaks.itely:3143 (context id) +#. Documentation/user/tweaks.itely:3210 (context id) +#. Documentation/user/tweaks.itely:3272 (context id) #. Documentation/user/input.itely:970 (context id) msgid "LH" msgstr "MI" -#. Documentation/user/tweaks.itely:3183 (comment) -#. Documentation/user/tweaks.itely:3245 (comment) +#. Documentation/user/tweaks.itely:3184 (comment) +#. Documentation/user/tweaks.itely:3246 (comment) msgid "Move the c2 out of the main note column so the merge will work" msgstr "" "Sacar el Do blanca de la columna principal de notas para que la fusión " "funcione" -#. Documentation/user/tweaks.itely:3186 (comment) -#. Documentation/user/tweaks.itely:3248 (comment) +#. Documentation/user/tweaks.itely:3187 (comment) +#. Documentation/user/tweaks.itely:3249 (comment) msgid "Stem on the d2 must be down to permit merging" msgstr "La plica del Re blanca debe estar hacia abajo para permitir la fusión" -#. Documentation/user/tweaks.itely:3243 (comment) +#. Documentation/user/tweaks.itely:3244 (comment) msgid "Reposition the c2 to the right of the merged note" msgstr "Recolocar el Do blanca a la derecha de la nota fundida" -#. Documentation/user/tweaks.itely:3379 (comment) -#. Documentation/user/tweaks.itely:3401 (comment) +#. Documentation/user/tweaks.itely:3380 (comment) +#. Documentation/user/tweaks.itely:3402 (comment) msgid "Visible tempo marking" msgstr "Indicación metronómica visible" -#. Documentation/user/tweaks.itely:3383 (comment) -#. Documentation/user/tweaks.itely:3405 (comment) +#. Documentation/user/tweaks.itely:3384 (comment) +#. Documentation/user/tweaks.itely:3406 (comment) msgid "Invisible tempo marking to lengthen fermata in MIDI" msgstr "Indicación metronómica invisible para prolongar el calderón en el MIDI" -#. Documentation/user/tweaks.itely:3386 (comment) -#. Documentation/user/tweaks.itely:3408 (comment) +#. Documentation/user/tweaks.itely:3387 (comment) +#. Documentation/user/tweaks.itely:3409 (comment) msgid "New tempo for next section" msgstr "Tempo nuevo para la sección siguiente" -#. Documentation/user/tweaks.itely:3460 (variable) +#. Documentation/user/tweaks.itely:3466 (variable) msgid "emphasize" msgstr "enfatizar" -#. Documentation/user/tweaks.itely:3464 (variable) +#. Documentation/user/tweaks.itely:3470 (variable) msgid "normal" msgstr "normal" -#. Documentation/user/tweaks.itely:3470 (variable) +#. Documentation/user/tweaks.itely:3476 (variable) msgid "SopranoMusic" msgstr "musicaSoprano" -#. Documentation/user/tweaks.itely:3483 (context id) +#. Documentation/user/tweaks.itely:3489 (context id) #. Documentation/user/input.itely:949 (context id) msgid "Soprano" msgstr "Soprano" -#. Documentation/user/tweaks.itely:3692 (comment) +#. Documentation/user/tweaks.itely:3698 (comment) msgid "Arrange to obtain color from color-notehead procedure" msgstr "Truco para obtener color a partir del procedimiento color-notehead" @@ -3638,6 +3639,8 @@ msgstr "Ajustes para sistemas operativos específicos" #. @node in Documentation/user/setup.itely #. @subsection in Documentation/user/setup.itely +#. @node in Documentation/fr/user/setup.itely +#. @subsection in Documentation/fr/user/setup.itely #. @node in Documentation/es/user/setup.itely #. @subsection in Documentation/es/user/setup.itely #. @node in Documentation/de/user/setup.itely @@ -3646,12 +3649,14 @@ msgid "Setup for MacOS X" msgstr "Configuración para MacOS X" #. @subsubheading in Documentation/user/setup.itely +#. @subsubheading in Documentation/fr/user/setup.itely #. @subsubheading in Documentation/es/user/setup.itely #. @subsubheading in Documentation/de/user/setup.itely msgid "Using Python scripts on MacOS 10.3 or 10.4" msgstr "Uso de guiones Python en MacOS 10.3 o 10.4" #. @subsubheading in Documentation/user/setup.itely +#. @subsubheading in Documentation/fr/user/setup.itely #. @subsubheading in Documentation/es/user/setup.itely #. @subsubheading in Documentation/de/user/setup.itely msgid "MacOS X on the command line" @@ -4172,6 +4177,7 @@ msgid "Generating LilyPond files" msgstr "Generar archivos de LilyPond" #. @top in Documentation/user/lilypond.tely +#. @top in Documentation/de/user/lilypond.tely msgid "GNU LilyPond --- Notation Reference" msgstr "GNU LilyPond: Referencia de la notación" @@ -4201,7 +4207,7 @@ msgstr "Índice de instrucciones de LilyPond" msgid "Musical notation" msgstr "Notación musical" -#. Documentation/user/pitches.itely:666 (variable) +#. Documentation/user/pitches.itely:688 (variable) #. Documentation/user/input.itely:1033 (variable) #. Documentation/user/input.itely:1052 (variable) #. Documentation/user/input.itely:1089 (variable) @@ -4215,35 +4221,35 @@ msgstr "Notación musical" msgid "music" msgstr "musica" -#. Documentation/user/pitches.itely:1039 (comment) +#. Documentation/user/pitches.itely:1082 (comment) msgid "not strictly necessary, but a good reminder" msgstr "no es imprescindible pero es bueno recordarlo" -#. Documentation/user/pitches.itely:1046 (context id) +#. Documentation/user/pitches.itely:1089 (context id) #. Documentation/user/staff.itely:1076 (variable) msgid "clarinet" msgstr "clarinete" -#. Documentation/user/pitches.itely:1130 (variable) +#. Documentation/user/pitches.itely:1174 (variable) msgid "musicA" msgstr "musicaA" -#. Documentation/user/pitches.itely:1144 (variable) +#. Documentation/user/pitches.itely:1188 (variable) msgid "musicB" msgstr "musicaB" -#. Documentation/user/pitches.itely:1163 (context id) -#. Documentation/user/keyboards.itely:171 (context id) -#. Documentation/user/keyboards.itely:265 (context id) +#. Documentation/user/pitches.itely:1207 (context id) +#. Documentation/user/keyboards.itely:175 (context id) +#. Documentation/user/keyboards.itely:274 (context id) #. Documentation/user/percussion.itely:175 (variable) #. Documentation/user/percussion.itely:365 (variable) #. input/lsr/jazz-combo-template.ly:241 (variable) msgid "up" msgstr "arriba" -#. Documentation/user/pitches.itely:1167 (context id) -#. Documentation/user/keyboards.itely:181 (context id) -#. Documentation/user/keyboards.itely:274 (context id) +#. Documentation/user/pitches.itely:1211 (context id) +#. Documentation/user/keyboards.itely:185 (context id) +#. Documentation/user/keyboards.itely:283 (context id) #. Documentation/user/percussion.itely:178 (variable) #. Documentation/user/percussion.itely:366 (variable) #. input/lsr/jazz-combo-template.ly:247 (variable) @@ -5763,7 +5769,7 @@ msgstr "Citar otras voces" msgid "Formatting cue notes" msgstr "Formateo de las notas de aviso" -#. Documentation/user/editorial.itely:325 (comment) +#. Documentation/user/editorial.itely:326 (comment) msgid "this is deliberate nonsense; note that the stems remain black" msgstr "" "esto no tiene sentido, intencionalmente. Observe que las plicas siguen negras" @@ -6497,15 +6503,15 @@ msgstr "Imprimir los versos al final" msgid "Printing stanzas at the end in multiple columns" msgstr "Imprimir los versos al final en varias columnas" -#. Documentation/user/keyboards.itely:183 (comment) +#. Documentation/user/keyboards.itely:187 (comment) msgid "keep staff alive" msgstr "mantener vivo el pentagrama" -#. Documentation/user/keyboards.itely:266 (context id) +#. Documentation/user/keyboards.itely:275 (context id) msgid "melOne" msgstr "melodiaUno" -#. Documentation/user/keyboards.itely:335 (context id) +#. Documentation/user/keyboards.itely:344 (context id) #. Documentation/user/fretted-strings.itely:244 (context id) #. input/lsr/adding-fingerings-to-tablatures.ly:17 (variable) #. input/lsr/jazz-combo-template.ly:205 (context id) @@ -6513,19 +6519,19 @@ msgstr "melodiaUno" msgid "two" msgstr "dos" -#. Documentation/user/keyboards.itely:389 (comment) +#. Documentation/user/keyboards.itely:398 (comment) msgid "stems may overlap the other staff" msgstr "las plicas pueden superponerse al otro pentagrama" -#. Documentation/user/keyboards.itely:391 (comment) +#. Documentation/user/keyboards.itely:400 (comment) msgid "extend the stems to reach other other staff" msgstr "extender las plicas para que lleguen hasta el otro pentagrama" -#. Documentation/user/keyboards.itely:393 (comment) +#. Documentation/user/keyboards.itely:402 (comment) msgid "do not print extra flags" msgstr "no imprimir corchetes adicionales" -#. Documentation/user/keyboards.itely:395 (comment) +#. Documentation/user/keyboards.itely:404 (comment) msgid "prevent beaming as needed" msgstr "evitar el barrado según necesidades" @@ -6664,17 +6670,21 @@ msgstr "Arpa" #. @node in Documentation/user/keyboards.itely #. @unnumberedsubsubsec in Documentation/user/keyboards.itely -#, fuzzy -msgid "Harp notation" -msgstr "Notación de los pentagramas" +#. @node in Documentation/es/user/keyboards.itely +#. @unnumberedsubsubsec in Documentation/es/user/keyboards.itely +#. @node in Documentation/de/user/keyboards.itely +#. @unnumberedsubsubsec in Documentation/de/user/keyboards.itely +msgid "References for harps" +msgstr "Referencias para notación de arpa" #. @node in Documentation/user/keyboards.itely #. @unnumberedsubsubsec in Documentation/user/keyboards.itely +#. @node in Documentation/es/user/keyboards.itely +#. @unnumberedsubsubsec in Documentation/es/user/keyboards.itely #. @node in Documentation/de/user/keyboards.itely #. @unnumberedsubsubsec in Documentation/de/user/keyboards.itely -#, fuzzy msgid "Harp pedals" -msgstr "Pedales de piano" +msgstr "Pedales de arpa" #. @node in Documentation/user/unfretted-strings.itely #. @section in Documentation/user/unfretted-strings.itely @@ -6772,24 +6782,24 @@ msgstr "misNotas" msgid "A chord for ukelele" msgstr "Un acorde de ukelele" -#. Documentation/user/fretted-strings.itely:770 (variable) -#. Documentation/user/fretted-strings.itely:793 (variable) -#. Documentation/user/fretted-strings.itely:822 (variable) -#. Documentation/user/fretted-strings.itely:851 (variable) -#. Documentation/user/fretted-strings.itely:875 (variable) -#. Documentation/user/fretted-strings.itely:919 (variable) +#. Documentation/user/fretted-strings.itely:782 (variable) +#. Documentation/user/fretted-strings.itely:805 (variable) +#. Documentation/user/fretted-strings.itely:834 (variable) +#. Documentation/user/fretted-strings.itely:865 (variable) +#. Documentation/user/fretted-strings.itely:889 (variable) +#. Documentation/user/fretted-strings.itely:937 (variable) msgid "mychords" msgstr "misAcordes" -#. Documentation/user/fretted-strings.itely:797 (variable) +#. Documentation/user/fretted-strings.itely:809 (variable) msgid "mychordlist" msgstr "miListaDeAcordes" -#. Documentation/user/fretted-strings.itely:906 (comment) +#. Documentation/user/fretted-strings.itely:924 (comment) msgid "add a new chord shape" msgstr "añadir una forma de acorde nueva" -#. Documentation/user/fretted-strings.itely:910 (comment) +#. Documentation/user/fretted-strings.itely:928 (comment) msgid "add some new chords based on the power chord shape" msgstr "añadir acordes nuevos basados en la forma de acorde principal" @@ -7174,20 +7184,20 @@ msgstr "Definiciones para la gaita" msgid "Bagpipe example" msgstr "Ejemplo de música de gaita" -#. Documentation/user/chords.itely:654 (variable) +#. Documentation/user/chords.itely:669 (variable) msgid "myChords" msgstr "misAcordes" -#. Documentation/user/chords.itely:984 (comment) -#. Documentation/user/chords.itely:1005 (comment) +#. Documentation/user/chords.itely:999 (comment) +#. Documentation/user/chords.itely:1020 (comment) msgid "Put notes on same Staff as figures" msgstr "Poner las notas en el mismo pentagrama que los números" -#. Documentation/user/chords.itely:1068 (comment) +#. Documentation/user/chords.itely:1083 (comment) msgid "The extenders are correct here, with the same rhythm as the bass" msgstr "Los extensores aquí son correctos, con el mismo ritmo que el bajo" -#. Documentation/user/chords.itely:1080 (comment) +#. Documentation/user/chords.itely:1095 (comment) msgid "The extenders are incorrect here, even though the timing is the same" msgstr "Los extensores aquí son incorrectos, aunque la medida es la misma" @@ -7304,6 +7314,7 @@ msgstr "Introducción al bajo cifrado" #. @rglos in Documentation/user/chords.itely #. @rglos in Documentation/es/user/chords.itely +#. @rglos in Documentation/de/user/chords.itely msgid "figured bass" msgstr "bajo cifrado" @@ -7514,7 +7525,7 @@ msgstr "Ligaduras mensurales blancas" #. @node in Documentation/es/user/ancient.itely #. @subsection in Documentation/es/user/ancient.itely msgid "Typesetting Gregorian chant" -msgstr "Tipografiado del canto Gregoriano" +msgstr "Tipografiado del canto gregoriano" #. @node in Documentation/user/ancient.itely #. @unnumberedsubsubsec in Documentation/user/ancient.itely @@ -7525,21 +7536,21 @@ msgstr "Tipografiado del canto Gregoriano" #. @node in Documentation/de/user/ancient.itely #. @unnumberedsubsubsec in Documentation/de/user/ancient.itely msgid "Gregorian chant contexts" -msgstr "Contextos del Canto Gregoriano" +msgstr "Contextos del canto gregoriano" #. @node in Documentation/user/ancient.itely #. @unnumberedsubsubsec in Documentation/user/ancient.itely #. @node in Documentation/es/user/ancient.itely #. @unnumberedsubsubsec in Documentation/es/user/ancient.itely msgid "Gregorian clefs" -msgstr "Claves de canto Gregoriano" +msgstr "Claves de canto gregoriano" #. @node in Documentation/user/ancient.itely #. @unnumberedsubsubsec in Documentation/user/ancient.itely #. @node in Documentation/es/user/ancient.itely #. @unnumberedsubsubsec in Documentation/es/user/ancient.itely msgid "Gregorian accidentals and key signatures" -msgstr "Alteraciones y armaduras de canto Gregoriano" +msgstr "Alteraciones y armaduras de canto gregoriano" # ? FVD #. @node in Documentation/user/ancient.itely @@ -7558,7 +7569,7 @@ msgstr "Divisiones" #. @node in Documentation/es/user/ancient.itely #. @unnumberedsubsubsec in Documentation/es/user/ancient.itely msgid "Gregorian articulation signs" -msgstr "Articulaciones del canto Gregoriano" +msgstr "Articulaciones del canto gregoriano" #. @node in Documentation/user/ancient.itely #. @unnumberedsubsubsec in Documentation/user/ancient.itely @@ -7612,7 +7623,7 @@ msgstr "Disposición tipo «Mensurstriche»" #. @node in Documentation/de/user/ancient.itely #. @unnumberedsubsubsec in Documentation/de/user/ancient.itely msgid "Transcribing Gregorian chant" -msgstr "Transcripción de Canto Gregoriano" +msgstr "Transcripción de canto gregoriano" #. @node in Documentation/user/ancient.itely #. @unnumberedsubsubsec in Documentation/user/ancient.itely @@ -8103,11 +8114,11 @@ msgstr "desactivamos la evitación automática de colisiones" msgid "now they will collide" msgstr "ahora se producirá la colisión" -#. Documentation/user/spacing.itely:1788 (comment) +#. Documentation/user/spacing.itely:1789 (comment) msgid "the markup is too close to the following note" msgstr "el marcado está demasiado cerca de la nota siguiente" -#. Documentation/user/spacing.itely:1791 (comment) +#. Documentation/user/spacing.itely:1793 (comment) msgid "setting outside-staff-horizontal-padding fixes this" msgstr "ajustar outside-staff-horizontal-padding corrige esto" @@ -8512,41 +8523,46 @@ msgstr "desplazar hacia arriba" msgid "third finger" msgstr "dedo tercero" -#. Documentation/user/changing-defaults.itely:2945 (comment) +#. Documentation/user/changing-defaults.itely:2948 (comment) +#. Documentation/user/changing-defaults.itely:2980 (comment) #. input/lsr/aligning-marks-with-various-notation-objects.ly:39 (comment) msgid "the RehearsalMark will be centered above the Clef" msgstr "la RehearsalMark se centra sobre la clave" -#. Documentation/user/changing-defaults.itely:2951 (comment) +#. Documentation/user/changing-defaults.itely:2954 (comment) #. input/lsr/aligning-marks-with-various-notation-objects.ly:46 (comment) msgid "the RehearsalMark will be centered above the TimeSignature" msgstr "la RehearsalMark se centra sobre el compás" -#. Documentation/user/changing-defaults.itely:2965 (comment) +#. Documentation/user/changing-defaults.itely:2974 (comment) +msgid "the RehearsalMark will be centered above the Key Signature" +msgstr "la RehearsalMark se centra sobre la armadura" + +#. Documentation/user/changing-defaults.itely:2994 (comment) msgid "The RehearsalMark will be centered above the KeySignature" msgstr "la RehearsalMark se centra sobre la armadura" -#. Documentation/user/changing-defaults.itely:2972 (comment) -#. Documentation/user/changing-defaults.itely:2988 (comment) -#. Documentation/user/changing-defaults.itely:2995 (comment) +#. Documentation/user/changing-defaults.itely:3001 (comment) +#. Documentation/user/changing-defaults.itely:3017 (comment) +#. Documentation/user/changing-defaults.itely:3024 (comment) msgid "" "The RehearsalMark will be aligned with the left edge of the KeySignature" msgstr "la RehearsalMark se alinea por la izquierda con la armadura" -#. Documentation/user/changing-defaults.itely:2977 (comment) +#. Documentation/user/changing-defaults.itely:3006 (comment) msgid "" "The RehearsalMark will be aligned with the right edge of the KeySignature" msgstr "la RehearsalMark se alinea por la derecha con la armadura" -#. Documentation/user/changing-defaults.itely:2989 (comment) +#. Documentation/user/changing-defaults.itely:3018 (comment) msgid "and then shifted right by 3.5 staff-spaces" msgstr "y se desplaza 3.5 espacios a la derecha" -#. Documentation/user/changing-defaults.itely:2996 (comment) +#. Documentation/user/changing-defaults.itely:3025 (comment) msgid "and then shifted left by 2 staff-spaces" msgstr "y se desplaza 2 espacios a la izquierda" -#. Documentation/user/changing-defaults.itely:3045 (variable) +#. Documentation/user/changing-defaults.itely:3073 (variable) msgid "XinO" msgstr "X_O" @@ -8818,6 +8834,8 @@ msgstr "Distancias y medidas" #. @subsection in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @subsection in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely msgid "Staff symbol properties" msgstr "Propiedades del símbolo del pentagrama" @@ -8833,11 +8851,13 @@ msgstr "Objetos de extensión" #. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely #. @unnumberedsubsubsec in Documentation/es/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely msgid "Using the @code{spanner-interface}" msgstr "Uso del @code{spanner-interface}" #. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely #. @unnumberedsubsubsec in Documentation/es/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely msgid "Using the @code{line-spanner-interface}" msgstr "Uso del @code{line-spanner-interface}" @@ -8845,6 +8865,8 @@ msgstr "Uso del @code{line-spanner-interface}" #. @subsection in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @subsection in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely msgid "Visibility of objects" msgstr "Visibilidad de los objetos" @@ -8915,6 +8937,8 @@ msgstr "Rotación de objetos" #. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @unnumberedsubsubsec in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely msgid "Rotating layout objects" msgstr "Rotación de objetos de presentación" @@ -8922,6 +8946,8 @@ msgstr "Rotación de objetos de presentación" #. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @unnumberedsubsubsec in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely msgid "Rotating markup" msgstr "Rotación de elementos de marcado" @@ -8947,6 +8973,8 @@ msgstr "Alineación de objetos" #. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @unnumberedsubsubsec in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely msgid "Setting @code{X-offset} and @code{Y-offset} directly" msgstr "Establecer directamente @code{X-offset} y @code{Y-offset}" @@ -8954,6 +8982,8 @@ msgstr "Establecer directamente @code{X-offset} y @code{Y-offset}" #. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @unnumberedsubsubsec in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely msgid "Using the @code{side-position-interface}" msgstr "Uso del @code{side-position-interface}" @@ -8961,16 +8991,20 @@ msgstr "Uso del @code{side-position-interface}" #. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @unnumberedsubsubsec in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely msgid "Using the @code{self-alignment-interface}" msgstr "Uso del @code{self-alignment-interface}" #. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely #. @unnumberedsubsubsec in Documentation/es/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely msgid "Using the @code{aligned-on-parent} procedures" msgstr "Uso de los procedimientos @code{aligned-on-parent}" #. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely #. @unnumberedsubsubsec in Documentation/es/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely msgid "Using the @code{centered-on-parent} procedures" msgstr "Uso de los procedimientos @code{centered-on-parent}" @@ -8978,8 +9012,8 @@ msgstr "Uso de los procedimientos @code{centered-on-parent}" #. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @unnumberedsubsubsec in Documentation/es/user/changing-defaults.itely -msgid "Using the @code{break-aligned-interface}" -msgstr "Uso del @code{break-aligned-interface}" +msgid "Using the @code{break-alignable-interface}" +msgstr "Uso del @code{break-alignable-interface}" #. @node in Documentation/user/changing-defaults.itely #. @subsection in Documentation/user/changing-defaults.itely @@ -9014,6 +9048,8 @@ msgstr "Modificación de las formas" #. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @unnumberedsubsubsec in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely msgid "Modifying ties and slurs" msgstr "Modificación de ligaduras de unión y de expresión" @@ -9341,7 +9377,7 @@ msgstr "Usar código de Scheme en lugar de \\tweak" #. @section in Documentation/user/programming-interface.itely #. @subsection in Documentation/fr/user/changing-defaults.itely #. @section in Documentation/es/user/programming-interface.itely -#. @subsection in Documentation/de/user/programming-interface.itely +#. @section in Documentation/de/user/programming-interface.itely msgid "Using Scheme code instead of @code{\\tweak}" msgstr "Usar código de Scheme en lugar de @code{\\tweak}" @@ -9353,7 +9389,7 @@ msgstr "Usar código de Scheme en lugar de @code{\\tweak}" #. @node in Documentation/es/user/programming-interface.itely #. @section in Documentation/es/user/programming-interface.itely #. @node in Documentation/de/user/programming-interface.itely -#. @subsection in Documentation/de/user/programming-interface.itely +#. @section in Documentation/de/user/programming-interface.itely msgid "Difficult tweaks" msgstr "Trucos difíciles" @@ -9614,11 +9650,6 @@ msgstr "Actualizar archivos antiguos" msgid "GNU LilyPond --- Utilisation des programmes" msgstr "" -#. @node in Documentation/fr/user/setup.itely -#. @subsection in Documentation/fr/user/setup.itely -msgid "MacOS X on the command-line" -msgstr "MacOS X sobre línea de órdenes" - #. @section in Documentation/fr/user/running.itely msgid "Updating with @command{convert-ly}" msgstr "Actualizar ficheros con @command{convert-ly}" @@ -9889,11 +9920,6 @@ msgstr "" msgid "GNU LilyPond -- Programmbenutzung" msgstr "" -#. @top in Documentation/de/user/lilypond.tely -#, fuzzy -msgid "GNU LilyPond -- Notationsreferenz" -msgstr "GNU LilyPond: Referencia de la notación" - #. @chapheading in Documentation/de/user/lilypond.tely msgid "Das Notensatzprogramm" msgstr "" @@ -9903,34 +9929,9 @@ msgid "Ignorieren von Melismen" msgstr "" #. @node in Documentation/de/user/changing-defaults.itely -#. @section in Documentation/de/user/changing-defaults.itely -msgid "Common properties" -msgstr "Propiedades más usuales" - -#. @node in Documentation/de/user/changing-defaults.itely -#. @subsection in Documentation/de/user/changing-defaults.itely -msgid "Controlling visibility of objects" -msgstr "Control de la visibilidad de los objetos" - -#. @node in Documentation/de/user/changing-defaults.itely -#. @subsection in Documentation/de/user/changing-defaults.itely -msgid "Modifying ends of spanners" -msgstr "Modificación de los extremos de los extensores" - -#. @node in Documentation/de/user/changing-defaults.itely -#. @section in Documentation/de/user/changing-defaults.itely -msgid "Discussion of specific tweaks" -msgstr "Discusión sobre trucos específicos" - -#. @node in Documentation/de/user/changing-defaults.itely -#. @subsection in Documentation/de/user/changing-defaults.itely -msgid "old Contexts explained" -msgstr "antiguo Explicación de los contextos" - -#. @node in Documentation/de/user/programming-interface.itely -#. @section in Documentation/de/user/programming-interface.itely -msgid "TODO moved into scheme" -msgstr "HACER trasladado al apartado sobre scheme" +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely +msgid "Using the @code{break-aligned-interface}" +msgstr "Uso del @code{break-aligned-interface}" #. input/lsr/accordion-discant-symbols.ly:34 (variable) msgid "discant" @@ -12375,38 +12376,6 @@ msgstr "en scm/define-markup-commands.scm" msgid "Test it:" msgstr "Probarla:" -#. input/lsr/tick-bar-lines.ly:21 (comment) -msgid "Use 'bar-size to control the height of the tick," -msgstr "Usar 'bar-size para controlar la altura del «tick»," - -#. input/lsr/tick-bar-lines.ly:22 (comment) -msgid "and 'extra-offset to determine its position." -msgstr "y 'extra-offset para determinar su posición." - -#. input/lsr/tick-bar-lines.ly:24 (comment) -msgid "With 'extra-offset set to zero, the tick will be" -msgstr "Con 'extra-offset fijado a cero, el «tick» se centrará" - -#. input/lsr/tick-bar-lines.ly:25 (comment) -msgid "centered around the middle line of the staff." -msgstr "sobre la línea central del pentagrama." - -#. input/lsr/tick-bar-lines.ly:27 (comment) -msgid "Replace Staff.BarLine with Score.BarLine to" -msgstr "Sustituya Staff.BarLine con Score.BarLine para" - -#. input/lsr/tick-bar-lines.ly:28 (comment) -msgid "apply the method to the whole score." -msgstr "aplicar el método a toda la partitura." - -#. input/lsr/tick-bar-lines.ly:38 (comment) -msgid "Revert the overrides to get back a normal" -msgstr "Revertir las sobreescrituras para volver a tener una" - -#. input/lsr/tick-bar-lines.ly:39 (comment) -msgid "bar line at the end." -msgstr "barra normal de compás al final." - #. input/lsr/transcription-of-ancient-music-with-incipit.ly:127 (variable) msgid "incipitDiscantus" msgstr "" @@ -12692,3 +12661,6 @@ msgstr "Notas al pie" # this is the same translation that babel LaTex package uses . FVD msgid "Table of Contents" msgstr "Índice general" + +#~ msgid "MacOS X on the command-line" +#~ msgstr "MacOS X sobre línea de órdenes" diff --git a/Documentation/po/fr.po b/Documentation/po/fr.po index e6df81c03b..55d88bcb08 100644 --- a/Documentation/po/fr.po +++ b/Documentation/po/fr.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-07 23:30+0100\n" -"PO-Revision-Date: 2008-11-09 13:14+0100\n" +"POT-Creation-Date: 2008-12-25 12:33+0100\n" +"PO-Revision-Date: 2008-12-29 20:31+0100\n" "Last-Translator: Jean-Charles Malahieude \n" "Language-Team: Français \n" "MIME-Version: 1.0\n" @@ -426,7 +426,7 @@ msgstr "fa est à 4 crans de plus ou 3 de moins, il sera donc en dessous" #. Documentation/user/tutorial.itely:1791 (variable) #. Documentation/user/working.itely:214 (variable) #. Documentation/user/working.itely:229 (variable) -#. Documentation/user/pitches.itely:1035 (context id) +#. Documentation/user/pitches.itely:1078 (context id) msgid "violin" msgstr "violon" @@ -1290,6 +1290,7 @@ msgstr "Combinaison de notes en accords" #. @rglos in Documentation/es/user/chords.itely #. @rglos in Documentation/de/user/tutorial.itely #. @rglos in Documentation/de/user/simultaneous.itely +#. @rglos in Documentation/de/user/chords.itely msgid "chord" msgstr "accord" @@ -1667,7 +1668,7 @@ msgstr "Initialisation de la première voix" #. Documentation/user/vocal.itely:506 (context id) #. Documentation/user/vocal.itely:1235 (context id) #. Documentation/user/vocal.itely:1276 (context id) -#. Documentation/user/keyboards.itely:329 (context id) +#. Documentation/user/keyboards.itely:338 (context id) #. Documentation/user/fretted-strings.itely:243 (context id) #. input/lsr/adding-fingerings-to-tablatures.ly:16 (variable) #. input/lsr/jazz-combo-template.ly:204 (context id) @@ -1679,7 +1680,7 @@ msgstr "un" #. Documentation/user/fundamental.itely:1242 (variable) #. Documentation/user/fundamental.itely:2646 (variable) -#. Documentation/user/tweaks.itely:3469 (variable) +#. Documentation/user/tweaks.itely:3475 (variable) #. Documentation/user/simultaneous.itely:788 (variable) #. Documentation/user/percussion.itely:497 (variable) #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:46 (variable) @@ -1731,37 +1732,37 @@ msgid "SopMusic" msgstr "SopMusique" #. Documentation/user/fundamental.itely:1298 (variable) -#. Documentation/user/tweaks.itely:3471 (variable) +#. Documentation/user/tweaks.itely:3477 (variable) msgid "AltoMusic" msgstr "AltoMusique" #. Documentation/user/fundamental.itely:1299 (variable) -#. Documentation/user/tweaks.itely:3472 (variable) +#. Documentation/user/tweaks.itely:3478 (variable) msgid "TenorMusic" msgstr "TenorMusique" #. Documentation/user/fundamental.itely:1300 (variable) -#. Documentation/user/tweaks.itely:3473 (variable) +#. Documentation/user/tweaks.itely:3479 (variable) msgid "BassMusic" msgstr "BasseMusique" #. Documentation/user/fundamental.itely:1301 (variable) -#. Documentation/user/tweaks.itely:3474 (variable) +#. Documentation/user/tweaks.itely:3480 (variable) msgid "VerseOne" msgstr "CoupletUn" #. Documentation/user/fundamental.itely:1303 (variable) -#. Documentation/user/tweaks.itely:3475 (variable) +#. Documentation/user/tweaks.itely:3481 (variable) msgid "VerseTwo" msgstr "CoupletDeux" #. Documentation/user/fundamental.itely:1305 (variable) -#. Documentation/user/tweaks.itely:3476 (variable) +#. Documentation/user/tweaks.itely:3482 (variable) msgid "VerseThree" msgstr "CoupletTrois" #. Documentation/user/fundamental.itely:1307 (variable) -#. Documentation/user/tweaks.itely:3477 (variable) +#. Documentation/user/tweaks.itely:3483 (variable) msgid "VerseFour" msgstr "CoupletQuatre" @@ -1770,19 +1771,19 @@ msgid "Sop" msgstr "Sop" #. Documentation/user/fundamental.itely:1315 (context id) -#. Documentation/user/tweaks.itely:3484 (context id) +#. Documentation/user/tweaks.itely:3490 (context id) #. Documentation/user/input.itely:951 (context id) msgid "Alto" msgstr "Alto" #. Documentation/user/fundamental.itely:1323 (context id) -#. Documentation/user/tweaks.itely:3492 (context id) +#. Documentation/user/tweaks.itely:3498 (context id) #. Documentation/user/input.itely:953 (context id) msgid "Tenor" msgstr "Tenor" #. Documentation/user/fundamental.itely:1324 (context id) -#. Documentation/user/tweaks.itely:3493 (context id) +#. Documentation/user/tweaks.itely:3499 (context id) #. Documentation/user/input.itely:958 (context id) #. input/lsr/jazz-combo-template.ly:227 (variable) msgid "Bass" @@ -2390,223 +2391,223 @@ msgstr "Partition pour chœur à quatre voix mixtes" msgid "Building a score from scratch" msgstr "Écriture d'une partition à partir de zéro" -#. Documentation/user/tweaks.itely:596 (comment) -#. Documentation/user/tweaks.itely:731 (comment) +#. Documentation/user/tweaks.itely:597 (comment) +#. Documentation/user/tweaks.itely:732 (comment) msgid "Increase thickness of all following slurs from 1.2 to 5.0" msgstr "L'épaisseur de toutes les liaisons à venir passe de 1,2 à 5,0" -#. Documentation/user/tweaks.itely:665 (comment) -#. Documentation/user/tweaks.itely:704 (comment) -#. Documentation/user/tweaks.itely:707 (comment) +#. Documentation/user/tweaks.itely:666 (comment) +#. Documentation/user/tweaks.itely:705 (comment) +#. Documentation/user/tweaks.itely:708 (comment) msgid "Increase thickness of immediately following slur only" msgstr "Épaississement de la prochaine liaison seulement" -#. Documentation/user/tweaks.itely:735 (comment) +#. Documentation/user/tweaks.itely:736 (comment) msgid "Revert thickness of all following slurs to default of 1.2" msgstr "Retour à l'épaisseur par défaut de 1,2 pour les prochaines liaisons" -#. Documentation/user/tweaks.itely:1395 (comment) +#. Documentation/user/tweaks.itely:1396 (comment) msgid "Don't print clefs in this staff" msgstr "pas de clef pour cette portée" -#. Documentation/user/tweaks.itely:1397 (comment) +#. Documentation/user/tweaks.itely:1398 (comment) msgid "Don't print time signatures in this staff" msgstr "pas de métrique pour cette portée" -#. Documentation/user/tweaks.itely:1461 (comment) +#. Documentation/user/tweaks.itely:1462 (comment) msgid "Reduce all font sizes by ~24%" msgstr "Réduction d'environ 24 % de toutes les tailles de fonte" -#. Documentation/user/tweaks.itely:1527 (comment) +#. Documentation/user/tweaks.itely:1528 (comment) msgid "Reduce stem length and line spacing to match" msgstr "" "Réduction de la taille des hampes et de l'interligne pour ne pas déborder" -#. Documentation/user/tweaks.itely:1957 (comment) -#. Documentation/user/tweaks.itely:2027 (comment) +#. Documentation/user/tweaks.itely:1958 (comment) +#. Documentation/user/tweaks.itely:2028 (comment) msgid "Set details for later Text Spanner" msgstr "Réglage des détails du texte avec extension" -#. Documentation/user/tweaks.itely:1960 (comment) -#. Documentation/user/tweaks.itely:2030 (comment) +#. Documentation/user/tweaks.itely:1961 (comment) +#. Documentation/user/tweaks.itely:2031 (comment) msgid "Place dynamics above staff" msgstr "Positionnement des nuances au-dessus de la portée" -#. Documentation/user/tweaks.itely:1962 (comment) -#. Documentation/user/tweaks.itely:2034 (comment) +#. Documentation/user/tweaks.itely:1963 (comment) +#. Documentation/user/tweaks.itely:2035 (comment) msgid "Start Ottava Bracket" msgstr "Début du crochet d'octavation" -#. Documentation/user/tweaks.itely:1965 (comment) -#. Documentation/user/tweaks.itely:1972 (comment) -#. Documentation/user/tweaks.itely:2037 (comment) -#. Documentation/user/tweaks.itely:2044 (comment) +#. Documentation/user/tweaks.itely:1966 (comment) +#. Documentation/user/tweaks.itely:1973 (comment) +#. Documentation/user/tweaks.itely:2038 (comment) +#. Documentation/user/tweaks.itely:2045 (comment) msgid "Add Dynamic Text" msgstr "Ajout d'une nuance textuelle" -#. Documentation/user/tweaks.itely:1967 (comment) -#. Documentation/user/tweaks.itely:2039 (comment) +#. Documentation/user/tweaks.itely:1968 (comment) +#. Documentation/user/tweaks.itely:2040 (comment) msgid "Add Dynamic Line Spanner" msgstr "Ajout d'une nuance graphique" -#. Documentation/user/tweaks.itely:1969 (comment) -#. Documentation/user/tweaks.itely:2041 (comment) +#. Documentation/user/tweaks.itely:1970 (comment) +#. Documentation/user/tweaks.itely:2042 (comment) msgid "Add Text Script" msgstr "Ajout d'un commentaire textuel" -#. Documentation/user/tweaks.itely:1974 (comment) -#. Documentation/user/tweaks.itely:2046 (comment) +#. Documentation/user/tweaks.itely:1975 (comment) +#. Documentation/user/tweaks.itely:2047 (comment) msgid "Stop Ottava Bracket" msgstr "Fin du crochet d'octavation" -#. Documentation/user/tweaks.itely:2032 (comment) +#. Documentation/user/tweaks.itely:2033 (comment) msgid "Place following Ottava Bracket below Text Spanners" msgstr "Positionnement du crochet d'octavation sous le texte avec extension" -#. Documentation/user/tweaks.itely:2094 (comment) +#. Documentation/user/tweaks.itely:2095 (comment) msgid "Cause notes to space out to accommodate text" msgstr "Force les notes à s'espacer selon le texte" -#. Documentation/user/tweaks.itely:2117 (comment) +#. Documentation/user/tweaks.itely:2118 (comment) msgid "This markup is short enough to fit without collision" -msgstr "Ce morceau de texte est assez court pour ne pas faire de collision" +msgstr "Ce morceau de texte est assez court pour ne pas risquer de collision" -#. Documentation/user/tweaks.itely:2121 (comment) +#. Documentation/user/tweaks.itely:2122 (comment) msgid "This is too long to fit, so it is displaced upwards" msgstr "Celui-ci est trop long pour tenir, il est déplacé vers le haut" -#. Documentation/user/tweaks.itely:2125 (comment) -#. Documentation/user/tweaks.itely:2130 (comment) +#. Documentation/user/tweaks.itely:2126 (comment) +#. Documentation/user/tweaks.itely:2131 (comment) msgid "Turn off collision avoidance" msgstr "Désactivation du processus d'évitement de collision" -#. Documentation/user/tweaks.itely:2132 (comment) +#. Documentation/user/tweaks.itely:2133 (comment) msgid "and turn on textLengthOn" msgstr "activation de textLengthOn" -#. Documentation/user/tweaks.itely:2133 (comment) +#. Documentation/user/tweaks.itely:2134 (comment) msgid "Spaces at end are honored" msgstr "Les espaces de la fin sont pris en compte" -#. Documentation/user/tweaks.itely:2240 (comment) +#. Documentation/user/tweaks.itely:2241 (comment) msgid "Extend width by 1 staff space" msgstr "Élargissement d'un espace" -#. Documentation/user/tweaks.itely:2523 (comment) +#. Documentation/user/tweaks.itely:2524 (comment) msgid "This will not work, see below:" msgstr "La commande suivante est sans résultat ; voir plus loin." -#. Documentation/user/tweaks.itely:2527 (comment) +#. Documentation/user/tweaks.itely:2528 (comment) msgid "This works:" msgstr "Celle-ci produit le résultat escompté" -#. Documentation/user/tweaks.itely:2578 (variable) +#. Documentation/user/tweaks.itely:2579 (variable) msgid "naturalplusflat" msgstr "becarreplusbemol" -#. Documentation/user/tweaks.itely:2619 (comment) +#. Documentation/user/tweaks.itely:2620 (comment) msgid "Extend width by 1 unit" msgstr "Élargissement d'une unité" -#. Documentation/user/tweaks.itely:2621 (comment) +#. Documentation/user/tweaks.itely:2622 (comment) msgid "Align dynamics to a base line 2 units above staff" msgstr "" "Alignement des nuances sur une ligne de base à 2 unités au-dessus de la " "portée" -#. Documentation/user/tweaks.itely:2925 (variable) -#. Documentation/user/tweaks.itely:2974 (variable) -#. Documentation/user/tweaks.itely:3035 (variable) -#. Documentation/user/tweaks.itely:3105 (variable) -#. Documentation/user/tweaks.itely:3170 (variable) -#. Documentation/user/tweaks.itely:3230 (variable) +#. Documentation/user/tweaks.itely:2926 (variable) +#. Documentation/user/tweaks.itely:2975 (variable) +#. Documentation/user/tweaks.itely:3036 (variable) +#. Documentation/user/tweaks.itely:3106 (variable) +#. Documentation/user/tweaks.itely:3171 (variable) +#. Documentation/user/tweaks.itely:3231 (variable) msgid "rhMusic" msgstr "mdMusique" -#. Documentation/user/tweaks.itely:2930 (comment) -#. Documentation/user/tweaks.itely:2979 (comment) -#. Documentation/user/tweaks.itely:3042 (comment) -#. Documentation/user/tweaks.itely:3114 (comment) -#. Documentation/user/tweaks.itely:3179 (comment) +#. Documentation/user/tweaks.itely:2931 (comment) +#. Documentation/user/tweaks.itely:2980 (comment) +#. Documentation/user/tweaks.itely:3043 (comment) +#. Documentation/user/tweaks.itely:3115 (comment) +#. Documentation/user/tweaks.itely:3180 (comment) msgid "Start polyphonic section of four voices" msgstr "Début d'une section polyphonique de quatre voix" -#. Documentation/user/tweaks.itely:2943 (variable) -#. Documentation/user/tweaks.itely:2992 (variable) -#. Documentation/user/tweaks.itely:3055 (variable) -#. Documentation/user/tweaks.itely:3129 (variable) -#. Documentation/user/tweaks.itely:3196 (variable) -#. Documentation/user/tweaks.itely:3258 (variable) +#. Documentation/user/tweaks.itely:2944 (variable) +#. Documentation/user/tweaks.itely:2993 (variable) +#. Documentation/user/tweaks.itely:3056 (variable) +#. Documentation/user/tweaks.itely:3130 (variable) +#. Documentation/user/tweaks.itely:3197 (variable) +#. Documentation/user/tweaks.itely:3259 (variable) msgid "lhMusic" msgstr "mgMusique" -#. Documentation/user/tweaks.itely:2952 (context id) -#. Documentation/user/tweaks.itely:3001 (context id) -#. Documentation/user/tweaks.itely:3064 (context id) -#. Documentation/user/tweaks.itely:3138 (context id) -#. Documentation/user/tweaks.itely:3205 (context id) -#. Documentation/user/tweaks.itely:3267 (context id) +#. Documentation/user/tweaks.itely:2953 (context id) +#. Documentation/user/tweaks.itely:3002 (context id) +#. Documentation/user/tweaks.itely:3065 (context id) +#. Documentation/user/tweaks.itely:3139 (context id) +#. Documentation/user/tweaks.itely:3206 (context id) +#. Documentation/user/tweaks.itely:3268 (context id) #. Documentation/user/input.itely:964 (context id) msgid "RH" msgstr "MD" -#. Documentation/user/tweaks.itely:2956 (context id) -#. Documentation/user/tweaks.itely:3005 (context id) -#. Documentation/user/tweaks.itely:3068 (context id) -#. Documentation/user/tweaks.itely:3142 (context id) -#. Documentation/user/tweaks.itely:3209 (context id) -#. Documentation/user/tweaks.itely:3271 (context id) +#. Documentation/user/tweaks.itely:2957 (context id) +#. Documentation/user/tweaks.itely:3006 (context id) +#. Documentation/user/tweaks.itely:3069 (context id) +#. Documentation/user/tweaks.itely:3143 (context id) +#. Documentation/user/tweaks.itely:3210 (context id) +#. Documentation/user/tweaks.itely:3272 (context id) #. Documentation/user/input.itely:970 (context id) msgid "LH" msgstr "MG" -#. Documentation/user/tweaks.itely:3183 (comment) -#. Documentation/user/tweaks.itely:3245 (comment) +#. Documentation/user/tweaks.itely:3184 (comment) +#. Documentation/user/tweaks.itely:3246 (comment) msgid "Move the c2 out of the main note column so the merge will work" msgstr "Déplace le do2 pour que la fusion puisse fonctionner" -#. Documentation/user/tweaks.itely:3186 (comment) -#. Documentation/user/tweaks.itely:3248 (comment) +#. Documentation/user/tweaks.itely:3187 (comment) +#. Documentation/user/tweaks.itely:3249 (comment) msgid "Stem on the d2 must be down to permit merging" msgstr "La hampe du ré2 ira vers le bas pour permettre la fusion" -#. Documentation/user/tweaks.itely:3243 (comment) +#. Documentation/user/tweaks.itely:3244 (comment) msgid "Reposition the c2 to the right of the merged note" msgstr "Repositionnement du do2 à droite de la note fusionnée" -#. Documentation/user/tweaks.itely:3379 (comment) -#. Documentation/user/tweaks.itely:3401 (comment) +#. Documentation/user/tweaks.itely:3380 (comment) +#. Documentation/user/tweaks.itely:3402 (comment) msgid "Visible tempo marking" msgstr "Indication de tempo visible" -#. Documentation/user/tweaks.itely:3383 (comment) -#. Documentation/user/tweaks.itely:3405 (comment) +#. Documentation/user/tweaks.itely:3384 (comment) +#. Documentation/user/tweaks.itely:3406 (comment) msgid "Invisible tempo marking to lengthen fermata in MIDI" msgstr "Indication de tempo invisible ; utilisée pour le MIDI" -#. Documentation/user/tweaks.itely:3386 (comment) -#. Documentation/user/tweaks.itely:3408 (comment) +#. Documentation/user/tweaks.itely:3387 (comment) +#. Documentation/user/tweaks.itely:3409 (comment) msgid "New tempo for next section" msgstr "Nouveau tempo pour la section suivante" -#. Documentation/user/tweaks.itely:3460 (variable) +#. Documentation/user/tweaks.itely:3466 (variable) msgid "emphasize" msgstr "emphase" -#. Documentation/user/tweaks.itely:3464 (variable) +#. Documentation/user/tweaks.itely:3470 (variable) msgid "normal" msgstr "normal" -#. Documentation/user/tweaks.itely:3470 (variable) +#. Documentation/user/tweaks.itely:3476 (variable) msgid "SopranoMusic" msgstr "sopranoMusique" -#. Documentation/user/tweaks.itely:3483 (context id) +#. Documentation/user/tweaks.itely:3489 (context id) #. Documentation/user/input.itely:949 (context id) msgid "Soprano" msgstr "Soprano" -#. Documentation/user/tweaks.itely:3692 (comment) +#. Documentation/user/tweaks.itely:3698 (comment) msgid "Arrange to obtain color from color-notehead procedure" msgstr "Arranger pour obtenir une couleur par la procédure color-notehead" @@ -2654,6 +2655,8 @@ msgstr "Introduction aux retouches" msgid "Objects and interfaces" msgstr "Objets et interfaces" +# jcm - Journal officiel de la République française du 19/11/2008 +# jcm - (NOR : CTNX0825937X) traduction de naming #. @node in Documentation/user/tweaks.itely #. @subsection in Documentation/user/tweaks.itely #. @node in Documentation/fr/user/tweaks.itely @@ -2663,7 +2666,7 @@ msgstr "Objets et interfaces" #. @node in Documentation/de/user/tweaks.itely #. @subsection in Documentation/de/user/tweaks.itely msgid "Naming conventions of objects and properties" -msgstr "Conventions de nom des objets et propriétés" +msgstr "Conventions de nommage des objets et propriétés" #. @node in Documentation/user/tweaks.itely #. @subsection in Documentation/user/tweaks.itely @@ -3116,7 +3119,7 @@ msgstr "Travail sur des projets LilyPond" #. @node in Documentation/de/user/working.itely #. @section in Documentation/de/user/working.itely msgid "Suggestions for writing LilyPond input files" -msgstr "Suggestions de saisie des fichiers LilyPond" +msgstr "Suggestions pour la saisie de fichiers LilyPond" #. @node in Documentation/user/working.itely #. @subsection in Documentation/user/working.itely @@ -3198,7 +3201,7 @@ msgstr "Mise à jour d'anciens fichiers" #. @node in Documentation/de/user/working.itely #. @subsection in Documentation/de/user/working.itely msgid "Troubleshooting (taking it all apart)" -msgstr "Résolution de problèmes --- tout remettre à plat" +msgstr "Résolution de problèmes -- tout remettre à plat" #. @node in Documentation/user/working.itely #. @subsection in Documentation/user/working.itely @@ -3209,7 +3212,7 @@ msgstr "Résolution de problèmes --- tout remettre à plat" #. @node in Documentation/de/user/working.itely #. @subsection in Documentation/de/user/working.itely msgid "Minimal examples" -msgstr "Exemples minimaux" +msgstr "Exemples minimalistes" #. @node in Documentation/user/working.itely #. @section in Documentation/user/working.itely @@ -3638,6 +3641,8 @@ msgstr "Spécificités pour certains systèmes" #. @node in Documentation/user/setup.itely #. @subsection in Documentation/user/setup.itely +#. @node in Documentation/fr/user/setup.itely +#. @subsection in Documentation/fr/user/setup.itely #. @node in Documentation/es/user/setup.itely #. @subsection in Documentation/es/user/setup.itely #. @node in Documentation/de/user/setup.itely @@ -3646,12 +3651,14 @@ msgid "Setup for MacOS X" msgstr "Spécificités pour MacOS X" #. @subsubheading in Documentation/user/setup.itely +#. @subsubheading in Documentation/fr/user/setup.itely #. @subsubheading in Documentation/es/user/setup.itely #. @subsubheading in Documentation/de/user/setup.itely msgid "Using Python scripts on MacOS 10.3 or 10.4" msgstr "Utilisation de scripts Python sur MacOS 10.3 ou 10.4" #. @subsubheading in Documentation/user/setup.itely +#. @subsubheading in Documentation/fr/user/setup.itely #. @subsubheading in Documentation/es/user/setup.itely #. @subsubheading in Documentation/de/user/setup.itely msgid "MacOS X on the command line" @@ -4017,7 +4024,7 @@ msgstr "Utilisation de lilypond-book" #. @section in Documentation/es/user/lilypond-book.itely #. @section in Documentation/de/user/lilypond-book.itely msgid "Invoking @command{lilypond-book}" -msgstr "Lancement de @command{lilypond-book}" +msgstr "Utilisation de @command{lilypond-book}" #. @subheading in Documentation/user/lilypond-book.itely #. @subheading in Documentation/fr/user/lilypond-book.itely @@ -4172,6 +4179,7 @@ msgid "Generating LilyPond files" msgstr "Génération de fichiers LilyPond" #. @top in Documentation/user/lilypond.tely +#. @top in Documentation/de/user/lilypond.tely msgid "GNU LilyPond --- Notation Reference" msgstr "GNU LilyPond --- Manuel de notation" @@ -4201,7 +4209,7 @@ msgstr "Index des commandes LilyPond" msgid "Musical notation" msgstr "Notation musicale générale" -#. Documentation/user/pitches.itely:666 (variable) +#. Documentation/user/pitches.itely:688 (variable) #. Documentation/user/input.itely:1033 (variable) #. Documentation/user/input.itely:1052 (variable) #. Documentation/user/input.itely:1089 (variable) @@ -4215,35 +4223,35 @@ msgstr "Notation musicale générale" msgid "music" msgstr "musique" -#. Documentation/user/pitches.itely:1039 (comment) +#. Documentation/user/pitches.itely:1082 (comment) msgid "not strictly necessary, but a good reminder" msgstr "pas strictement nécessaire, mais en pense-bête" -#. Documentation/user/pitches.itely:1046 (context id) +#. Documentation/user/pitches.itely:1089 (context id) #. Documentation/user/staff.itely:1076 (variable) msgid "clarinet" msgstr "clarinette" -#. Documentation/user/pitches.itely:1130 (variable) +#. Documentation/user/pitches.itely:1174 (variable) msgid "musicA" msgstr "musiqueA" -#. Documentation/user/pitches.itely:1144 (variable) +#. Documentation/user/pitches.itely:1188 (variable) msgid "musicB" msgstr "musiqueB" -#. Documentation/user/pitches.itely:1163 (context id) -#. Documentation/user/keyboards.itely:171 (context id) -#. Documentation/user/keyboards.itely:265 (context id) +#. Documentation/user/pitches.itely:1207 (context id) +#. Documentation/user/keyboards.itely:175 (context id) +#. Documentation/user/keyboards.itely:274 (context id) #. Documentation/user/percussion.itely:175 (variable) #. Documentation/user/percussion.itely:365 (variable) #. input/lsr/jazz-combo-template.ly:241 (variable) msgid "up" msgstr "haut" -#. Documentation/user/pitches.itely:1167 (context id) -#. Documentation/user/keyboards.itely:181 (context id) -#. Documentation/user/keyboards.itely:274 (context id) +#. Documentation/user/pitches.itely:1211 (context id) +#. Documentation/user/keyboards.itely:185 (context id) +#. Documentation/user/keyboards.itely:283 (context id) #. Documentation/user/percussion.itely:178 (variable) #. Documentation/user/percussion.itely:366 (variable) #. input/lsr/jazz-combo-template.ly:247 (variable) @@ -4512,7 +4520,7 @@ msgstr "Échelonnement de la musique par 2/3" #. Documentation/user/rhythms.itely:320 (comment) msgid "Scale music by *2" -msgstr "Échelonnement de la musique par 2" +msgstr "Échelonnement de la musique au double" #. Documentation/user/rhythms.itely:404 (comment) msgid "First alternative: following note is tied normally" @@ -4524,7 +4532,7 @@ msgstr "Seconde alternative : la liaison est rappelée" #. Documentation/user/rhythms.itely:522 (comment) msgid "These two lines are just to prettify this example" -msgstr "Les deux lignes qui suivent ne sont là que pourillustrer le propos" +msgstr "Les deux lignes qui suivent ne sont là que pour illustrer le propos" #. Documentation/user/rhythms.itely:525 (comment) msgid "Print a maxima rest, equal to four breves" @@ -5510,7 +5518,7 @@ msgstr "partie" #. @node in Documentation/de/user/simultaneous.itely #. @unnumberedsubsubsec in Documentation/de/user/simultaneous.itely msgid "Writing music in parallel" -msgstr "Saisie la musique en parallèle" +msgstr "Saisie de musique en parallèle" #. Documentation/user/staff.itely:1045 (variable) #. Documentation/user/staff.itely:1060 (variable) @@ -5757,7 +5765,7 @@ msgstr "Citation d'autres voix" msgid "Formatting cue notes" msgstr "Mise en forme d'une citation" -#. Documentation/user/editorial.itely:325 (comment) +#. Documentation/user/editorial.itely:326 (comment) msgid "this is deliberate nonsense; note that the stems remain black" msgstr "pour cette erreur manifeste, notez que les hampes restent en noir" @@ -6078,9 +6086,8 @@ msgid "Specialist notation" msgstr "Notation spécialisée" #. Documentation/user/vocal.itely:512 (comment) -#, fuzzy msgid "not recommended: left aligns syllables" -msgstr "peu recommandable : les paroles sont alignées à gauche" +msgstr "peu recommandable : les syllabes sont alignées à gauche" #. Documentation/user/vocal.itely:515 (comment) msgid "wrong: durations needed" @@ -6116,7 +6123,6 @@ msgid "lahlah" msgstr "lala" #. Documentation/user/vocal.itely:1284 (comment) -#, fuzzy msgid "moves the column off the left margin;" msgstr "décalage par rapport à la marge de gauche" @@ -6130,12 +6136,10 @@ msgid "adds vertical spacing between verses" msgstr "ajout d'espace vertical entre les couplets" #. Documentation/user/vocal.itely:1301 (comment) -#, fuzzy msgid "adds horizontal spacing between columns;" msgstr "ajout d'espace horizontal entre les colonnes" #. Documentation/user/vocal.itely:1302 (comment) -#, fuzzy msgid "if they are still too close, add more \\\" \\\" pairs" msgstr "" "si elles sont toujours trop proches, ajouter d'autres paires de \\\" \\\"" @@ -6145,7 +6149,6 @@ msgid "until the result looks good" msgstr "jusqu'à ce que le résultat soit acceptable." #. Documentation/user/vocal.itely:1319 (comment) -#, fuzzy msgid "gives some extra space on the right margin;" msgstr "décalage par rapport à la marge de droite" @@ -6494,15 +6497,15 @@ msgstr "Paroles en fin de partition" msgid "Printing stanzas at the end in multiple columns" msgstr "Paroles sur plusieurs colonnes en fin de partition" -#. Documentation/user/keyboards.itely:183 (comment) +#. Documentation/user/keyboards.itely:187 (comment) msgid "keep staff alive" msgstr "maintient la portée active" -#. Documentation/user/keyboards.itely:266 (context id) +#. Documentation/user/keyboards.itely:275 (context id) msgid "melOne" msgstr "melodieUn" -#. Documentation/user/keyboards.itely:335 (context id) +#. Documentation/user/keyboards.itely:344 (context id) #. Documentation/user/fretted-strings.itely:244 (context id) #. input/lsr/adding-fingerings-to-tablatures.ly:17 (variable) #. input/lsr/jazz-combo-template.ly:205 (context id) @@ -6510,19 +6513,19 @@ msgstr "melodieUn" msgid "two" msgstr "deux" -#. Documentation/user/keyboards.itely:389 (comment) +#. Documentation/user/keyboards.itely:398 (comment) msgid "stems may overlap the other staff" msgstr "autorise les hampes à déborder sur l'autre portée" -#. Documentation/user/keyboards.itely:391 (comment) +#. Documentation/user/keyboards.itely:400 (comment) msgid "extend the stems to reach other other staff" msgstr "étend les hampes pour qu'elles atteignent l'autre portée" -#. Documentation/user/keyboards.itely:393 (comment) +#. Documentation/user/keyboards.itely:402 (comment) msgid "do not print extra flags" msgstr "pas de crochet superflu" -#. Documentation/user/keyboards.itely:395 (comment) +#. Documentation/user/keyboards.itely:404 (comment) msgid "prevent beaming as needed" msgstr "on empêche la formation de la ligature automatique" @@ -6660,17 +6663,21 @@ msgstr "Harpe" #. @node in Documentation/user/keyboards.itely #. @unnumberedsubsubsec in Documentation/user/keyboards.itely -#, fuzzy -msgid "Harp notation" -msgstr "Notation sur la portée" +#. @node in Documentation/es/user/keyboards.itely +#. @unnumberedsubsubsec in Documentation/es/user/keyboards.itely +#. @node in Documentation/de/user/keyboards.itely +#. @unnumberedsubsubsec in Documentation/de/user/keyboards.itely +msgid "References for harps" +msgstr "Généralités sur la harpe" #. @node in Documentation/user/keyboards.itely #. @unnumberedsubsubsec in Documentation/user/keyboards.itely +#. @node in Documentation/es/user/keyboards.itely +#. @unnumberedsubsubsec in Documentation/es/user/keyboards.itely #. @node in Documentation/de/user/keyboards.itely #. @unnumberedsubsubsec in Documentation/de/user/keyboards.itely -#, fuzzy msgid "Harp pedals" -msgstr "Pédales de piano" +msgstr "Pédales de harpe" #. @node in Documentation/user/unfretted-strings.itely #. @section in Documentation/user/unfretted-strings.itely @@ -6768,24 +6775,24 @@ msgstr "mesnotes" msgid "A chord for ukelele" msgstr "Un accord pour ukulele" -#. Documentation/user/fretted-strings.itely:770 (variable) -#. Documentation/user/fretted-strings.itely:793 (variable) -#. Documentation/user/fretted-strings.itely:822 (variable) -#. Documentation/user/fretted-strings.itely:851 (variable) -#. Documentation/user/fretted-strings.itely:875 (variable) -#. Documentation/user/fretted-strings.itely:919 (variable) +#. Documentation/user/fretted-strings.itely:782 (variable) +#. Documentation/user/fretted-strings.itely:805 (variable) +#. Documentation/user/fretted-strings.itely:834 (variable) +#. Documentation/user/fretted-strings.itely:865 (variable) +#. Documentation/user/fretted-strings.itely:889 (variable) +#. Documentation/user/fretted-strings.itely:937 (variable) msgid "mychords" msgstr "mesaccords" -#. Documentation/user/fretted-strings.itely:797 (variable) +#. Documentation/user/fretted-strings.itely:809 (variable) msgid "mychordlist" msgstr "malistedaccords" -#. Documentation/user/fretted-strings.itely:906 (comment) +#. Documentation/user/fretted-strings.itely:924 (comment) msgid "add a new chord shape" msgstr "ajout d'un nouveau canevas d'accord" -#. Documentation/user/fretted-strings.itely:910 (comment) +#. Documentation/user/fretted-strings.itely:928 (comment) msgid "add some new chords based on the power chord shape" msgstr "ajout de nouveaux accords basés sur le nouveau canevas" @@ -7084,7 +7091,7 @@ msgstr "Percussions avec hauteurs" #. @node in Documentation/de/user/percussion.itely #. @unnumberedsubsubsec in Documentation/de/user/percussion.itely msgid "Percussion staves" -msgstr "Portée de percussion" +msgstr "Portées de percussion" #. @node in Documentation/user/percussion.itely #. @unnumberedsubsubsec in Documentation/user/percussion.itely @@ -7172,21 +7179,21 @@ msgstr "Définitions pour la cornemuse" msgid "Bagpipe example" msgstr "Exemple pour la cornemuse" -#. Documentation/user/chords.itely:654 (variable) +#. Documentation/user/chords.itely:669 (variable) msgid "myChords" msgstr "mesAccords" -#. Documentation/user/chords.itely:984 (comment) -#. Documentation/user/chords.itely:1005 (comment) +#. Documentation/user/chords.itely:999 (comment) +#. Documentation/user/chords.itely:1020 (comment) msgid "Put notes on same Staff as figures" msgstr "Assemblage des notes et de la basse chiffrée sur une même portée" -#. Documentation/user/chords.itely:1068 (comment) +#. Documentation/user/chords.itely:1083 (comment) msgid "The extenders are correct here, with the same rhythm as the bass" msgstr "" "Les prolongateurs sont corrects, ils suivent bien le rythme de la basse" -#. Documentation/user/chords.itely:1080 (comment) +#. Documentation/user/chords.itely:1095 (comment) msgid "The extenders are incorrect here, even though the timing is the same" msgstr "Les prolongateurs sont erronés, bien que le rythme soit le même" @@ -7302,6 +7309,7 @@ msgstr "Introduction à la basse chiffrée" #. @rglos in Documentation/user/chords.itely #. @rglos in Documentation/es/user/chords.itely +#. @rglos in Documentation/de/user/chords.itely msgid "figured bass" msgstr "basse chiffrée" @@ -7343,25 +7351,22 @@ msgstr "cantus" #. Documentation/user/ancient.itely:2434 (variable) #. Documentation/user/ancient.itely:2502 (context id) #. input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly:37 (variable) -#, fuzzy msgid "chant" -msgstr "Chants" +msgstr "Chant" #. Documentation/user/ancient.itely:2405 (variable) #. Documentation/user/ancient.itely:2445 (variable) #. input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly:44 (variable) -#, fuzzy msgid "verba" -msgstr "couplet" +msgstr "verba" #. Documentation/user/ancient.itely:2487 (variable) msgid "spiritus" -msgstr "" +msgstr "spiritus" #. Documentation/user/ancient.itely:2495 (variable) -#, fuzzy msgid "spirLyr" -msgstr "sopranoParoles" +msgstr "spiritusParoles" #. @node in Documentation/user/ancient.itely #. @section in Documentation/user/ancient.itely @@ -8100,11 +8105,11 @@ msgstr "désactive l'évitement automatique de collision" msgid "now they will collide" msgstr "il y a maintenant chevauchement" -#. Documentation/user/spacing.itely:1788 (comment) +#. Documentation/user/spacing.itely:1789 (comment) msgid "the markup is too close to the following note" msgstr "le texte est trop proche de la note qui suit" -#. Documentation/user/spacing.itely:1791 (comment) +#. Documentation/user/spacing.itely:1793 (comment) msgid "setting outside-staff-horizontal-padding fixes this" msgstr "définir outside-staff-horizontal-padding règle le problème" @@ -8499,7 +8504,7 @@ msgstr "Tentative de suppression de toutes les armures" #. Documentation/user/changing-defaults.itely:2896 (comment) msgid "move horizontally left" -msgstr "déplacement vers la droite" +msgstr "déplacement vers la gauche" #. Documentation/user/changing-defaults.itely:2898 (comment) msgid "move vertically up" @@ -8509,41 +8514,46 @@ msgstr "déplacement vers le haut" msgid "third finger" msgstr "troisième doigt" -#. Documentation/user/changing-defaults.itely:2945 (comment) +#. Documentation/user/changing-defaults.itely:2948 (comment) +#. Documentation/user/changing-defaults.itely:2980 (comment) #. input/lsr/aligning-marks-with-various-notation-objects.ly:39 (comment) msgid "the RehearsalMark will be centered above the Clef" msgstr "Pour centrer le repère au-dessus de la clef" -#. Documentation/user/changing-defaults.itely:2951 (comment) +#. Documentation/user/changing-defaults.itely:2954 (comment) #. input/lsr/aligning-marks-with-various-notation-objects.ly:46 (comment) msgid "the RehearsalMark will be centered above the TimeSignature" msgstr "Pour centrer le repère au-dessus de la métrique" -#. Documentation/user/changing-defaults.itely:2965 (comment) +#. Documentation/user/changing-defaults.itely:2974 (comment) +msgid "the RehearsalMark will be centered above the Key Signature" +msgstr "Pour centrer le repère au-dessus de l'armure" + +#. Documentation/user/changing-defaults.itely:2994 (comment) msgid "The RehearsalMark will be centered above the KeySignature" msgstr "Pour centrer le repère au-dessus de l'armure" -#. Documentation/user/changing-defaults.itely:2972 (comment) -#. Documentation/user/changing-defaults.itely:2988 (comment) -#. Documentation/user/changing-defaults.itely:2995 (comment) +#. Documentation/user/changing-defaults.itely:3001 (comment) +#. Documentation/user/changing-defaults.itely:3017 (comment) +#. Documentation/user/changing-defaults.itely:3024 (comment) msgid "" "The RehearsalMark will be aligned with the left edge of the KeySignature" msgstr "Pour aligner le repère sur le coin gauche de l'armure" -#. Documentation/user/changing-defaults.itely:2977 (comment) +#. Documentation/user/changing-defaults.itely:3006 (comment) msgid "" "The RehearsalMark will be aligned with the right edge of the KeySignature" msgstr "Pour aligner le repère sur le coin droit de l'armure" -#. Documentation/user/changing-defaults.itely:2989 (comment) +#. Documentation/user/changing-defaults.itely:3018 (comment) msgid "and then shifted right by 3.5 staff-spaces" msgstr "puis décaler vers la droite de 3,5 espaces" -#. Documentation/user/changing-defaults.itely:2996 (comment) +#. Documentation/user/changing-defaults.itely:3025 (comment) msgid "and then shifted left by 2 staff-spaces" msgstr "puis décaler vers la gauche de 2 espaces" -#. Documentation/user/changing-defaults.itely:3045 (variable) +#. Documentation/user/changing-defaults.itely:3073 (variable) msgid "XinO" msgstr "XdansO" @@ -8698,7 +8708,7 @@ msgstr "Détermination de la propriété d'un objet graphique (grob)" #. @node in Documentation/de/user/changing-defaults.itely #. @subsection in Documentation/de/user/changing-defaults.itely msgid "Naming conventions" -msgstr "Conventions d'attribution de nom" +msgstr "Conventions de nommage" #. @node in Documentation/user/changing-defaults.itely #. @section in Documentation/user/changing-defaults.itely @@ -8814,6 +8824,8 @@ msgstr "Distances et unités de mesure" #. @subsection in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @subsection in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely msgid "Staff symbol properties" msgstr "Propriétés des lignes de portée" @@ -8828,11 +8840,13 @@ msgstr "Extenseurs et prolongateurs" #. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely #. @unnumberedsubsubsec in Documentation/es/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely msgid "Using the @code{spanner-interface}" msgstr "Utilisation de @code{spanner-interface}" #. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely #. @unnumberedsubsubsec in Documentation/es/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely msgid "Using the @code{line-spanner-interface}" msgstr "Utilisation de @code{line-spanner-interface}" @@ -8840,6 +8854,8 @@ msgstr "Utilisation de @code{line-spanner-interface}" #. @subsection in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @subsection in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely msgid "Visibility of objects" msgstr "Visibilité des objets" @@ -8910,6 +8926,8 @@ msgstr "Rotation des objets" #. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @unnumberedsubsubsec in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely msgid "Rotating layout objects" msgstr "Rotation des objets de mise en forme" @@ -8917,6 +8935,8 @@ msgstr "Rotation des objets de mise en forme" #. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @unnumberedsubsubsec in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely msgid "Rotating markup" msgstr "Rotation des étiquettes" @@ -8942,6 +8962,8 @@ msgstr "Alignement des objets" #. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @unnumberedsubsubsec in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely msgid "Setting @code{X-offset} and @code{Y-offset} directly" msgstr "Détermination directe de @code{X-offset} et @code{Y-offset}" @@ -8949,6 +8971,8 @@ msgstr "Détermination directe de @code{X-offset} et @code{Y-offset}" #. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @unnumberedsubsubsec in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely msgid "Using the @code{side-position-interface}" msgstr "Utilisation de @code{side-position-interface}" @@ -8956,16 +8980,20 @@ msgstr "Utilisation de @code{side-position-interface}" #. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @unnumberedsubsubsec in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely msgid "Using the @code{self-alignment-interface}" msgstr "Utilisation de @code{self-alignment-interface}" #. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely #. @unnumberedsubsubsec in Documentation/es/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely msgid "Using the @code{aligned-on-parent} procedures" msgstr "Utilisation des procédures @code{aligned-on-parent}" #. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely #. @unnumberedsubsubsec in Documentation/es/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely msgid "Using the @code{centered-on-parent} procedures" msgstr "Utilisation des procédures @code{centered-on-parent}" @@ -8973,7 +9001,8 @@ msgstr "Utilisation des procédures @code{centered-on-parent}" #. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @unnumberedsubsubsec in Documentation/es/user/changing-defaults.itely -msgid "Using the @code{break-aligned-interface}" +#, fuzzy +msgid "Using the @code{break-alignable-interface}" msgstr "Utilisation de @code{break-aligned-interface}" #. @node in Documentation/user/changing-defaults.itely @@ -9009,6 +9038,8 @@ msgstr "Modification de l'allure des éléments" #. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @unnumberedsubsubsec in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely msgid "Modifying ties and slurs" msgstr "Modification des liaisons" @@ -9335,7 +9366,7 @@ msgstr "Utilisation de code Scheme au lieu de \\tweak" #. @section in Documentation/user/programming-interface.itely #. @subsection in Documentation/fr/user/changing-defaults.itely #. @section in Documentation/es/user/programming-interface.itely -#. @subsection in Documentation/de/user/programming-interface.itely +#. @section in Documentation/de/user/programming-interface.itely msgid "Using Scheme code instead of @code{\\tweak}" msgstr "Utilisation de code Scheme au lieu de @code{\\tweak}" @@ -9346,7 +9377,7 @@ msgstr "Utilisation de code Scheme au lieu de @code{\\tweak}" #. @node in Documentation/es/user/programming-interface.itely #. @section in Documentation/es/user/programming-interface.itely #. @node in Documentation/de/user/programming-interface.itely -#. @subsection in Documentation/de/user/programming-interface.itely +#. @section in Documentation/de/user/programming-interface.itely msgid "Difficult tweaks" msgstr "Retouches complexes" @@ -9556,9 +9587,8 @@ msgid "Cheat sheet" msgstr "Aide-mémoire" #. @top in Documentation/fr/user/lilypond-learning.tely -#, fuzzy msgid "GNU LilyPond --- Manuel d'initiation" -msgstr "GNU LilyPond --- manuel d'initiation" +msgstr "GNU LilyPond --- Manuel d'initiation" #. @subsubheading in Documentation/fr/user/macros.itexi #. @subsubheading in Documentation/de/user/macros.itexi @@ -9567,11 +9597,11 @@ msgstr "Propriétés couramment modifiées" #. @subheading in Documentation/fr/user/tutorial.itely msgid "Hauteurs" -msgstr "" +msgstr "Hauteurs" #. @subheading in Documentation/fr/user/tutorial.itely msgid "Durées et rythme" -msgstr "" +msgstr "Durées et rythme" #. @subheading in Documentation/fr/user/tutorial.itely msgid "Silences" @@ -9604,23 +9634,16 @@ msgid "Updating old files" msgstr "Mise à jour d'anciens fichiers" #. @top in Documentation/fr/user/lilypond-program.tely -#, fuzzy msgid "GNU LilyPond --- Utilisation des programmes" msgstr "GNU LilyPond --- Utilisation du programme" -#. @node in Documentation/fr/user/setup.itely -#. @subsection in Documentation/fr/user/setup.itely -msgid "MacOS X on the command-line" -msgstr "MacOS X et la ligne de commande" - #. @section in Documentation/fr/user/running.itely msgid "Updating with @command{convert-ly}" msgstr "Mise à jour avec @command{convert-ly}" #. @top in Documentation/fr/user/lilypond.tely -#, fuzzy msgid "GNU LilyPond --- Manuel de notation" -msgstr "GNU LilyPond --- manuel d'initiation" +msgstr "GNU LilyPond --- Manuel d'initiation" #. @node in Documentation/fr/user/repeats.itely #. @unnumberedsubsubsec in Documentation/fr/user/repeats.itely @@ -9881,68 +9904,34 @@ msgstr "Squelettes pour lilypond-book" msgid "GNU LilyPond -- Programmbenutzung" msgstr "GNU LilyPond --- utilisation du programme" -#. @top in Documentation/de/user/lilypond.tely -#, fuzzy -msgid "GNU LilyPond -- Notationsreferenz" -msgstr "GNU LilyPond --- Manuel de notation" - #. @chapheading in Documentation/de/user/lilypond.tely msgid "Das Notensatzprogramm" msgstr "" #. @subsubheading in Documentation/de/user/vocal.itely -#, fuzzy msgid "Ignorieren von Melismen" msgstr "Désactivation du traitement des mélismes" #. @node in Documentation/de/user/changing-defaults.itely -#. @section in Documentation/de/user/changing-defaults.itely -msgid "Common properties" -msgstr "Propriétés couramment utilisées" - -#. @node in Documentation/de/user/changing-defaults.itely -#. @subsection in Documentation/de/user/changing-defaults.itely -msgid "Controlling visibility of objects" -msgstr "Contrôle de la visibilité des objets" - -#. @node in Documentation/de/user/changing-defaults.itely -#. @subsection in Documentation/de/user/changing-defaults.itely -msgid "Modifying ends of spanners" -msgstr "Modification de la terminaison des extenseurs" - -#. @node in Documentation/de/user/changing-defaults.itely -#. @section in Documentation/de/user/changing-defaults.itely -msgid "Discussion of specific tweaks" -msgstr "Considération de certaines retouches spécifiques" - -#. @node in Documentation/de/user/changing-defaults.itely -#. @subsection in Documentation/de/user/changing-defaults.itely -msgid "old Contexts explained" -msgstr "ex Tout savoir sur les contextes" - -#. @node in Documentation/de/user/programming-interface.itely -#. @section in Documentation/de/user/programming-interface.itely -msgid "TODO moved into scheme" -msgstr "" +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely +msgid "Using the @code{break-aligned-interface}" +msgstr "Utilisation de @code{break-aligned-interface}" #. input/lsr/accordion-discant-symbols.ly:34 (variable) -#, fuzzy msgid "discant" msgstr "discantus" #. input/lsr/accordion-discant-symbols.ly:37 (variable) -#, fuzzy msgid "dot" -msgstr "saut" +msgstr "point" #. input/lsr/accordion-discant-symbols.ly:43 (comment) msgid "16 voets register" -msgstr "" +msgstr "registre de 16 pieds" #. input/lsr/accordion-discant-symbols.ly:44 (variable) -#, fuzzy msgid "accBasson" -msgstr "cbasson" +msgstr "accBasson" #. input/lsr/accordion-discant-symbols.ly:50 (comment) msgid "een korig 8 en 16 voets register" @@ -9950,96 +9939,82 @@ msgstr "" #. input/lsr/accordion-discant-symbols.ly:51 (variable) msgid "accBandon" -msgstr "" +msgstr "accBandon" #. input/lsr/accordion-discant-symbols.ly:59 (variable) -#, fuzzy msgid "accVCello" -msgstr "cello" +msgstr "accVCelle" #. input/lsr/accordion-discant-symbols.ly:69 (comment) msgid "4-8-16 voets register" -msgstr "" +msgstr "ergistre 4-8-16 pieds" #. input/lsr/accordion-discant-symbols.ly:70 (variable) -#, fuzzy msgid "accHarmon" -msgstr "Harmoniques" +msgstr "accHarmonica" #. input/lsr/accordion-discant-symbols.ly:80 (variable) -#, fuzzy msgid "accTrombon" -msgstr "Symboles de jazz" +msgstr "accTrombonne" #. input/lsr/accordion-discant-symbols.ly:92 (comment) msgid "eenkorig 4 en 16 voets register" msgstr "" #. input/lsr/accordion-discant-symbols.ly:93 (variable) -#, fuzzy msgid "accOrgan" -msgstr "PedalierOrgue" +msgstr "accOrgue" #. input/lsr/accordion-discant-symbols.ly:101 (variable) -#, fuzzy msgid "accMaster" -msgstr "cluster" +msgstr "accMaitre" #. input/lsr/accordion-discant-symbols.ly:115 (variable) -#, fuzzy msgid "accAccord" -msgstr "Accordéon" +msgstr "accAccordeon" #. input/lsr/accordion-discant-symbols.ly:127 (variable) -#, fuzzy msgid "accMusette" -msgstr "accent" +msgstr "accMusette" #. input/lsr/accordion-discant-symbols.ly:137 (variable) -#, fuzzy msgid "accCeleste" -msgstr "accent" +msgstr "accCeleste" #. input/lsr/accordion-discant-symbols.ly:145 (variable) -#, fuzzy msgid "accOboe" -msgstr "accent" +msgstr "accHautbois" #. input/lsr/accordion-discant-symbols.ly:153 (variable) -#, fuzzy msgid "accClarin" -msgstr "clarinette" +msgstr "accClarinette" #. input/lsr/accordion-discant-symbols.ly:159 (variable) -#, fuzzy msgid "accPiccolo" -msgstr "piccolo" +msgstr "accPiccolo" #. input/lsr/accordion-discant-symbols.ly:165 (variable) -#, fuzzy msgid "accViolin" -msgstr "violon" +msgstr "accViolon" #. input/lsr/adding-a-figured-bass-above-or-below-the-notes.ly:39 (variable) #. input/lsr/jazz-combo-template.ly:231 (variable) #. input/lsr/jazz-combo-template.ly:279 (context id) -#, fuzzy msgid "bass" -msgstr "basses" +msgstr "basse" #. input/lsr/adding-a-figured-bass-above-or-below-the-notes.ly:40 (variable) msgid "continuo" -msgstr "" +msgstr "continuo" #. input/lsr/adding-a-figured-bass-above-or-below-the-notes.ly:51 (context id) #. input/lsr/adding-a-figured-bass-above-or-below-the-notes.ly:52 (context id) -#, fuzzy msgid "bassStaff" -msgstr "portée" +msgstr "bassePortee" #. input/lsr/adding-an-extra-staff-at-a-line-break.ly:52 (comment) msgid "The next line is not needed in 2.11.x or later:" -msgstr "" +msgstr "la ligne suivante n'est plus nécessaire à partir de la version 2.11.x" #. input/lsr/adding-drum-parts.ly:32 (variable) msgid "drh" @@ -10051,47 +10026,43 @@ msgstr "" #. input/lsr/adding-drum-parts.ly:34 (variable) msgid "timb" -msgstr "" +msgstr "timb" #. input/lsr/adding-fingerings-to-tablatures.ly:18 (variable) -#, fuzzy msgid "threeTwo" -msgstr "CoupletDeux" +msgstr "troisDeux" #. input/lsr/adding-fingerings-to-tablatures.ly:25 (variable) -#, fuzzy msgid "threeFour" -msgstr "CoupletQuatre" +msgstr "troisQuatre" #. input/lsr/adding-the-current-date-to-a-score.ly:23 (comment) msgid "first, define a variable to hold the formatted date:" -msgstr "" +msgstr "tout d'abord, définir une variable qui contiendra la date formattée" #. input/lsr/adding-the-current-date-to-a-score.ly:24 (variable) msgid "date" -msgstr "" +msgstr "date" #. input/lsr/adding-the-current-date-to-a-score.ly:24 (comment) msgid "d-%m-%Y\\\" (localtime (current-time)))" -msgstr "" +msgstr "d-%m-%Y\\\" (localtime (current-time)))" #. input/lsr/adding-the-current-date-to-a-score.ly:26 (comment) msgid "use it in the title block:" -msgstr "" +msgstr "utilisation dans le bloc de titre :" #. input/lsr/adding-the-current-date-to-a-score.ly:37 (comment) msgid "and use it in a \\markup block:" -msgstr "" +msgstr "et utilisation dans un bloc \\markup :" #. input/lsr/additional-voices-to-avoid-collisions.ly:27 (variable) -#, fuzzy msgid "voiceFive" -msgstr "voix" +msgstr "voixCinq" #. input/lsr/adjusting-lyrics-vertical-spacing.ly:22 (comment) -#, fuzzy msgid "Default layout:" -msgstr "Tablatures par défaut" +msgstr "Mise en forme par défaut :" #. input/lsr/adjusting-lyrics-vertical-spacing.ly:31 (comment) msgid "Reducing the minimum space below the staff and above the lyrics:" @@ -10104,27 +10075,23 @@ msgstr "Pour centrer le repère au-dessus de l'armure" #. input/lsr/aligning-marks-with-various-notation-objects.ly:65 (comment) #. input/lsr/aligning-marks-with-various-notation-objects.ly:77 (comment) -#, fuzzy msgid "" "the RehearsalMark will be aligned with the left edge of the KeySignature" msgstr "Pour aligner le repère sur le coin gauche de l'armure" #. input/lsr/aligning-marks-with-various-notation-objects.ly:71 (comment) -#, fuzzy msgid "" "the RehearsalMark will be aligned with the right edge of the KeySignature" msgstr "Pour aligner le repère sur le coin droit de l'armure" #. input/lsr/aligning-marks-with-various-notation-objects.ly:78 (comment) -#, fuzzy msgid "and then shifted right by one unit." -msgstr "puis décaler vers la droite de 3,5 espaces" +msgstr "puis décaler vers la droite d'une unité." #. input/lsr/ancient-fonts.ly:26 (variable) #. input/lsr/ancient-fonts.ly:26 (context id) -#, fuzzy msgid "upperStaff" -msgstr "superieur" +msgstr "porteeSuperieure" #. input/lsr/ancient-fonts.ly:38 (comment) msgid "\\break % 1 (8*1)" @@ -10169,7 +10136,7 @@ msgstr "" #. input/lsr/ancient-fonts.ly:123 (context id) #, fuzzy msgid "lowerStaff" -msgstr "inferieur" +msgstr "porteeInferieure" #. input/lsr/ancient-fonts.ly:133 (comment) msgid "\\break % 2 (16*1)" @@ -10185,7 +10152,7 @@ msgstr "" #. input/lsr/ancient-fonts.ly:179 (comment) msgid "lig" -msgstr "" +msgstr "lig" #. input/lsr/ancient-fonts.ly:183 (comment) msgid "\\break % 11 (16*1)" @@ -10207,27 +10174,24 @@ msgstr "" #. input/lsr/incipit.ly:19 (variable) #. input/lsr/incipit.ly:191 (comment) #. input/lsr/transcription-of-ancient-music-with-incipit.ly:212 (comment) -#, fuzzy msgid "incipit" -msgstr "Des incipits" +msgstr "incipit" #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:51 (comment) -#, fuzzy msgid "tight spacing" -msgstr "Espacement vertical" +msgstr "espacement resserré" #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:58 (comment) msgid "turn off bar lines" -msgstr "" +msgstr "désactivation des barres de mesure" #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:62 (comment) msgid "need this extra \\skip such that clef change comes" msgstr "" #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:63 (comment) -#, fuzzy msgid "after bar line" -msgstr "Barres de mesure" +msgstr "" #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:67 (comment) msgid "CHECK: no effect?" @@ -10252,16 +10216,14 @@ msgstr "" #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:83 (comment) #. input/lsr/incipit.ly:64 (comment) #. input/lsr/transcription-of-ancient-music-with-incipit.ly:37 (comment) -#, fuzzy msgid "the actual music" -msgstr "Musique vocale" +msgstr "" #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:85 (comment) #. input/lsr/incipit.ly:67 (comment) #. input/lsr/transcription-of-ancient-music-with-incipit.ly:39 (comment) -#, fuzzy msgid "let finis bar go through all staves" -msgstr "définition des règles de ligature pour toutes les portées" +msgstr "" #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:88 (comment) #. input/lsr/incipit.ly:70 (comment) @@ -10273,9 +10235,8 @@ msgstr "" #. input/lsr/incipit.ly:87 (variable) #. input/lsr/incipit.ly:222 (context id) #. input/lsr/transcription-of-ancient-music-with-incipit.ly:47 (variable) -#, fuzzy msgid "discantusNotes" -msgstr "discantus" +msgstr "discantusNotes" #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:98 (comment) #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:135 (comment) @@ -10302,9 +10263,8 @@ msgstr "" #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:202 (comment) #. input/lsr/transcription-of-ancient-music-with-incipit.ly:139 (comment) #. input/lsr/transcription-of-ancient-music-with-incipit.ly:213 (comment) -#, fuzzy msgid "eight bars" -msgstr "Indications textuelles" +msgstr "huit mesures" #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:100 (comment) #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:134 (comment) @@ -10316,85 +10276,74 @@ msgstr "Indications textuelles" #. input/lsr/transcription-of-ancient-music-with-incipit.ly:162 (comment) #. input/lsr/transcription-of-ancient-music-with-incipit.ly:188 (comment) #. input/lsr/transcription-of-ancient-music-with-incipit.ly:190 (comment) -#, fuzzy msgid "one bar" -msgstr "un" +msgstr "une mesure" #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:114 (variable) #. input/lsr/incipit.ly:101 (variable) #. input/lsr/transcription-of-ancient-music-with-incipit.ly:60 (variable) -#, fuzzy msgid "discantusLyrics" -msgstr "discantus" +msgstr "discantusParoles" #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:128 (variable) #. input/lsr/incipit.ly:124 (variable) #. input/lsr/incipit.ly:229 (context id) #. input/lsr/transcription-of-ancient-music-with-incipit.ly:70 (variable) -#, fuzzy msgid "altusNotes" -msgstr "alti" +msgstr "altusNotes" #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:136 (comment) #. input/lsr/transcription-of-ancient-music-with-incipit.ly:164 (comment) msgid "seven bars" -msgstr "" +msgstr "sept mesures" #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:150 (variable) #. input/lsr/incipit.ly:138 (variable) #. input/lsr/transcription-of-ancient-music-with-incipit.ly:82 (variable) -#, fuzzy msgid "altusLyrics" -msgstr "tuttiParoles" +msgstr "altusParoles" #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:162 (variable) #. input/lsr/incipit.ly:162 (variable) #. input/lsr/incipit.ly:236 (context id) #. input/lsr/transcription-of-ancient-music-with-incipit.ly:90 (variable) -#, fuzzy msgid "tenorNotes" -msgstr "tenors" +msgstr "tenorNotes" #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:168 (comment) #. input/lsr/transcription-of-ancient-music-with-incipit.ly:186 (comment) -#, fuzzy msgid "four bars" -msgstr "basse chiffrée" +msgstr "quatre mesures" #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:186 (variable) #. input/lsr/incipit.ly:177 (variable) #. input/lsr/transcription-of-ancient-music-with-incipit.ly:102 (variable) -#, fuzzy msgid "tenorLyrics" -msgstr "tenors" +msgstr "tenorParoles" #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:196 (variable) #. input/lsr/incipit.ly:199 (variable) #. input/lsr/incipit.ly:243 (context id) #. input/lsr/transcription-of-ancient-music-with-incipit.ly:108 (variable) -#, fuzzy msgid "bassusNotes" -msgstr "basses" +msgstr "bassusNotes" #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:218 (variable) #. input/lsr/incipit.ly:213 (variable) #. input/lsr/transcription-of-ancient-music-with-incipit.ly:121 (variable) -#, fuzzy msgid "bassusLyrics" -msgstr "basseMusique" +msgstr "bassusParoles" #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:229 (context id) #. input/lsr/incipit.ly:221 (context id) #. input/lsr/transcription-of-ancient-music-with-incipit.ly:229 (context id) -#, fuzzy msgid "choirStaff" -msgstr "fin du ChoirStaff (système pour chœur)" +msgstr "choirStaff" #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:251 (comment) #. input/lsr/transcription-of-ancient-music-with-incipit.ly:266 (comment) -#, fuzzy msgid "no bars in staves" -msgstr "Portée de percussion" +msgstr "pas de barre dans les portées" #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:254 (comment) msgid "incipit should not start with a start delimiter" @@ -10403,9 +10352,8 @@ msgstr "" #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:260 (comment) #. input/lsr/incipit.ly:272 (comment) #. input/lsr/transcription-of-ancient-music-with-incipit.ly:277 (comment) -#, fuzzy msgid "no slurs" -msgstr "liaison d'articulation" +msgstr "pas de liaison" #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:263 (comment) #. input/lsr/incipit.ly:274 (comment) @@ -10449,9 +10397,8 @@ msgstr "" #. input/lsr/applying-note-head-styles-depending-on-the-step-of-the-scale.ly:75 (variable) #. input/lsr/clusters.ly:27 (variable) -#, fuzzy msgid "fragment" -msgstr "fragmentA" +msgstr "fragment" #. input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly:29 (comment) msgid "Automatic beams two per two in 4/4 or 2/2 time signature" @@ -10459,7 +10406,7 @@ msgstr "" #. input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly:30 (comment) msgid "_____" -msgstr "" +msgstr "_____" #. input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly:31 (comment) msgid "Default | | | |" @@ -10478,9 +10425,8 @@ msgid "macro for beamed two per two in 2/2 and 4/4 time signature" msgstr "" #. input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly:36 (variable) -#, fuzzy msgid "qBeam" -msgstr "Barres de ligature" +msgstr "" #. input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly:49 (comment) msgid "Use the macro" @@ -10503,9 +10449,8 @@ msgid "Inherit beaming from Score context" msgstr "héritage des règles de ligature du contexte Score" #. input/lsr/beam-endings-in-score-context.ly:48 (comment) -#, fuzzy msgid "Modify beaming for this voice only" -msgstr "changement des règles de ligature seulement pour cette portée" +msgstr "changement des règles de ligature seulement pour cette voix" #. input/lsr/beam-grouping-in-7-8-time.ly:40 (comment) msgid "rhythm 2-3-2" @@ -10544,9 +10489,8 @@ msgid "this bar contains no \\breathe" msgstr "" #. input/lsr/breathing-signs.ly:21 (comment) -#, fuzzy msgid "Modern notation:" -msgstr "Notation des accords" +msgstr "Notation moderne :" #. input/lsr/breathing-signs.ly:22 (comment) msgid "by default, \\breathe uses the rcomma, just as if saying:" @@ -10567,9 +10511,8 @@ msgid "N.B.: must use Staff context here, since we start a Voice below" msgstr "" #. input/lsr/breathing-signs.ly:31 (comment) -#, fuzzy msgid "vee" -msgstr "couplet" +msgstr "" #. input/lsr/caesura-railtracks-with-fermata.ly:28 (comment) msgid "construct the symbol" @@ -10584,18 +10527,16 @@ msgid "hairpinWithCenteredText" msgstr "" #. input/lsr/center-text-below-hairpin-dynamics.ly:39 (variable) -#, fuzzy msgid "hairpinMolto" -msgstr "soufflet" +msgstr "souffletMolto" #. input/lsr/center-text-below-hairpin-dynamics.ly:40 (variable) -#, fuzzy msgid "hairpinMore" -msgstr "soufflet" +msgstr "souffletPlus" #. input/lsr/changing--flageolet-mark-size.ly:23 (variable) msgid "smallFlageolet" -msgstr "" +msgstr "petitFlageolet" #. input/lsr/changing-the-chord-names-to-german-or-semi-german-notation.ly:34 (comment) msgid "The following is only here to print the names of the" @@ -10617,7 +10558,7 @@ msgstr "" #. input/lsr/engravers-one-by-one.ly:191 (comment) #. input/lsr/score-for-diatonic-accordion.ly:110 (comment) msgid "{" -msgstr "" +msgstr "{" #. input/lsr/changing-the-default-text-font-family.ly:23 (comment) #. input/lsr/engravers-one-by-one.ly:194 (comment) @@ -10625,34 +10566,27 @@ msgstr "" #. input/lsr/score-for-diatonic-accordion.ly:233 (comment) #. input/lsr/string-quartet-template-with-separate-parts.ly:163 (comment) msgid "}" -msgstr "" +msgstr "}" #. input/lsr/changing-the-time-signature-without-affecting-the-beaming.ly:35 (comment) -#, fuzzy msgid "Change time signature symbol but keep 3/4 beaming" -msgstr "la métrique change mais on garde les règles de ligatures en 3/4" +msgstr "La métrique change mais on garde les règles de ligatures en 3/4" #. input/lsr/changing-the-time-signature-without-affecting-the-beaming.ly:36 (comment) -#, fuzzy msgid "due to unchanged underlying time signature" msgstr "car la durée de pulsation n'a pas changée" #. input/lsr/changing-the-time-signature-without-affecting-the-beaming.ly:41 (comment) -#, fuzzy msgid "Lose 3/4 beaming now \\time has been changed" -msgstr "" -"la durée de pulsation est maintenant 16, on perd les règles de ligature en " -"3/4" +msgstr "\\time a été modifié, on abandonne les règles de ligature en 3/4" #. input/lsr/chant-or-psalms-notation.ly:23 (variable) -#, fuzzy msgid "stemOn" -msgstr "stencil" +msgstr "hampeOui" #. input/lsr/chant-or-psalms-notation.ly:24 (variable) -#, fuzzy msgid "stemOff" -msgstr "portée" +msgstr "hampeNon" #. input/lsr/chord-name-exceptions.ly:24 (comment) msgid "modify maj9 and 6(add9)" @@ -10663,9 +10597,8 @@ msgid "Exception music is chords with markups" msgstr "" #. input/lsr/chord-name-exceptions.ly:26 (variable) -#, fuzzy msgid "chExceptionMusic" -msgstr "violoncelleMusique" +msgstr "" #. input/lsr/chord-name-exceptions.ly:31 (comment) msgid "Convert music to list and prepend to existing exceptions." @@ -10676,9 +10609,8 @@ msgid "chExceptions" msgstr "" #. input/lsr/chord-name-exceptions.ly:36 (variable) -#, fuzzy msgid "theMusic" -msgstr "mdMusique" +msgstr "laMusique" #. input/lsr/clip-systems.ly:37 (variable) msgid "origScore" @@ -10689,9 +10621,8 @@ msgid "Each clip-region is a (START . END) pair" msgstr "" #. input/lsr/clip-systems.ly:56 (comment) -#, fuzzy msgid "where both are rhythmic-locations." -msgstr "Notation du rythme dans la musique baroque" +msgstr "" #. input/lsr/clip-systems.ly:58 (comment) msgid "(make-rhythmic-locations BAR-NUMBER NUM DEN)" @@ -10711,28 +10642,24 @@ msgstr "" #. input/lsr/combining-dynamics-with-markup-texts.ly:24 (variable) msgid "piuF" -msgstr "" +msgstr "piuF" #. input/lsr/combining-two-parts-on-the-same-staff.ly:51 (variable) -#, fuzzy msgid "musicUp" -msgstr "musique" +msgstr "musiqueHaut" #. input/lsr/combining-two-parts-on-the-same-staff.ly:58 (variable) -#, fuzzy msgid "musicDown" -msgstr "musique" +msgstr "musiqueBas" #. input/lsr/creating-a-sequence-of-notes-on-various-pitches.ly:53 (variable) #. input/lsr/jazz-combo-template.ly:275 (context id) -#, fuzzy msgid "rhythm" -msgstr "Rythme" +msgstr "" #. input/lsr/creating-real-parenthesized-dynamics.ly:45 (variable) -#, fuzzy msgid "parenF" -msgstr "motif" +msgstr "" #. input/lsr/creating-simultaneous-rehearsal-marks.ly:40 (comment) msgid "the hidden measure and bar line" @@ -10741,15 +10668,13 @@ msgstr "" #. input/lsr/customizing-fretboard-fret-diagrams.ly:40 (comment) #. input/lsr/customizing-markup-fret-diagrams.ly:31 (comment) #. input/lsr/fret-diagrams-explained-and-developed.ly:22 (comment) -#, fuzzy msgid "Set global properties of fret diagram" -msgstr "Tablatures automatiques" +msgstr "" #. input/lsr/customizing-markup-fret-diagrams.ly:29 (context id) #. input/lsr/formatting-lyrics-syllables.ly:21 (variable) #. input/lsr/fret-diagrams-explained-and-developed.ly:20 (context id) #. input/lsr/piano-template-with-melody-and-lyrics.ly:58 (context id) -#, fuzzy msgid "mel" msgstr "melodie" @@ -10759,9 +10684,8 @@ msgstr "" #. input/lsr/customizing-markup-fret-diagrams.ly:39 (comment) #. input/lsr/customizing-markup-fret-diagrams.ly:89 (comment) -#, fuzzy msgid "terse style" -msgstr "Styles de tête de note" +msgstr "" #. input/lsr/customizing-markup-fret-diagrams.ly:42 (comment) #. input/lsr/customizing-markup-fret-diagrams.ly:64 (comment) @@ -10774,9 +10698,8 @@ msgstr "" #. input/lsr/customizing-markup-fret-diagrams.ly:65 (comment) #. input/lsr/fret-diagrams-explained-and-developed.ly:49 (comment) #. input/lsr/fret-diagrams-explained-and-developed.ly:70 (comment) -#, fuzzy msgid "verbose style" -msgstr "Styles de voix" +msgstr "" #. input/lsr/customizing-markup-fret-diagrams.ly:44 (comment) msgid "size 1.0" @@ -10788,9 +10711,8 @@ msgid "roman fret label, finger labels below string, straight barre" msgstr "" #. input/lsr/customizing-markup-fret-diagrams.ly:47 (comment) -#, fuzzy msgid "standard size" -msgstr "Format du papier" +msgstr "" #. input/lsr/customizing-markup-fret-diagrams.ly:66 (comment) msgid "landscape orientation, arabic numbers, M for mute string" @@ -10822,9 +10744,8 @@ msgid "Note: This section could be put into a separate file" msgstr "" #. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:42 (comment) -#, fuzzy msgid "predefined-cuatro-fretboards.ly" -msgstr "Tablatures prédéfinies" +msgstr "predefined-cuatro-fretboards.ly" #. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:43 (comment) msgid "and \\included into each of your compositions" @@ -10839,9 +10760,8 @@ msgid "dSix" msgstr "" #. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:48 (variable) -#, fuzzy msgid "dMajor" -msgstr "majeur" +msgstr "" #. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:49 (variable) msgid "aMajSeven" @@ -10852,9 +10772,8 @@ msgid "dMajSeven" msgstr "" #. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:51 (variable) -#, fuzzy msgid "gMajor" -msgstr "majeur" +msgstr "" #. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:69 (comment) msgid "end of potential include file /predefined-cuatro-fretboards.ly" @@ -10869,9 +10788,8 @@ msgid "primeros" msgstr "" #. input/lsr/demo-midiinstruments.ly:23 (variable) -#, fuzzy msgid "baseMelody" -msgstr "melodie" +msgstr "" #. input/lsr/display-bracket-with-only-one-staff-in-a-system.ly:37 (comment) msgid "Must be lower than the actual number of staff lines" @@ -10890,9 +10808,8 @@ msgid "new voice ( = \\voiceOne), hidden" msgstr "" #. input/lsr/double-glissando.ly:22 (comment) -#, fuzzy msgid "attach glissando to note heads" -msgstr "Indications attachées à des notes" +msgstr "rattachement du glissando aux têtes de note" #. input/lsr/double-glissando.ly:27 (comment) msgid "original voice with chords rearranged so that" @@ -10904,22 +10821,19 @@ msgstr "" #. input/lsr/embedding-native-postscript-in-a--markup-block.ly:23 (comment) msgid "PostScript is a registered trademark of Adobe Systems Inc." -msgstr "" +msgstr "PostScript est une marque déposée par Adobe Systems Inc." #. input/lsr/engravers-one-by-one.ly:75 (comment) -#, fuzzy msgid "sample music" -msgstr "Musique vocale" +msgstr "" #. input/lsr/engravers-one-by-one.ly:76 (variable) -#, fuzzy msgid "topVoice" -msgstr "voix" +msgstr "" #. input/lsr/engravers-one-by-one.ly:84 (variable) -#, fuzzy msgid "botVoice" -msgstr "voix" +msgstr "" #. input/lsr/engravers-one-by-one.ly:92 (variable) msgid "hoom" @@ -10938,9 +10852,8 @@ msgstr "" #. input/lsr/engravers-one-by-one.ly:234 (variable) #. input/lsr/engravers-one-by-one.ly:290 (variable) #. input/lsr/engravers-one-by-one.ly:304 (variable) -#, fuzzy msgid "MyStaff" -msgstr "portée" +msgstr "MaPortee" #. input/lsr/engravers-one-by-one.ly:148 (comment) msgid "explicitly set instrument, so we don't get " @@ -10951,17 +10864,15 @@ msgid "weird effects when doing instrument names for" msgstr "" #. input/lsr/engravers-one-by-one.ly:150 (comment) -#, fuzzy msgid "piano staves" -msgstr "Portées d'ossia" +msgstr "portées de piano" #. input/lsr/engravers-one-by-one.ly:159 (variable) #. input/lsr/engravers-one-by-one.ly:248 (variable) #. input/lsr/engravers-one-by-one.ly:261 (variable) #. input/lsr/engravers-one-by-one.ly:274 (variable) -#, fuzzy msgid "MyVoice" -msgstr "voix" +msgstr "MaVoix" #. input/lsr/engravers-one-by-one.ly:174 (comment) msgid "must come before all" @@ -10976,9 +10887,8 @@ msgid "Cut here ----- Start 'flamenco.ly' " msgstr "" #. input/lsr/flamenco-notation.ly:48 (comment) -#, fuzzy msgid "Text indicators" -msgstr "LilyPond et les éditeurs de texte" +msgstr "" #. input/lsr/flamenco-notation.ly:49 (variable) msgid "abanico" @@ -10993,9 +10903,8 @@ msgid "alzapua" msgstr "" #. input/lsr/flamenco-notation.ly:53 (comment) -#, fuzzy msgid "Finger stroke symbols" -msgstr "Symboles de jeux" +msgstr "" #. input/lsr/flamenco-notation.ly:54 (variable) msgid "strokeUp" @@ -11006,14 +10915,12 @@ msgid "strokeDown" msgstr "" #. input/lsr/flamenco-notation.ly:74 (comment) -#, fuzzy msgid "Golpe symbol" -msgstr "pipeSymbole" +msgstr "" #. input/lsr/flamenco-notation.ly:75 (variable) -#, fuzzy msgid "golpe" -msgstr "dolce" +msgstr "" #. input/lsr/flamenco-notation.ly:89 (variable) msgid "strokeUpGolpe" @@ -11028,81 +10935,68 @@ msgid "Strokes for all fingers" msgstr "" #. input/lsr/flamenco-notation.ly:93 (variable) -#, fuzzy msgid "pUp" -msgstr "Haut :" +msgstr "" #. input/lsr/flamenco-notation.ly:94 (variable) -#, fuzzy msgid "pDown" -msgstr "bas" +msgstr "" #. input/lsr/flamenco-notation.ly:95 (variable) -#, fuzzy msgid "iUp" -msgstr "Haut :" +msgstr "" #. input/lsr/flamenco-notation.ly:96 (variable) -#, fuzzy msgid "iDown" -msgstr "bas" +msgstr "" #. input/lsr/flamenco-notation.ly:97 (variable) -#, fuzzy msgid "mUp" -msgstr "Haut :" +msgstr "" #. input/lsr/flamenco-notation.ly:98 (variable) -#, fuzzy msgid "mDown" -msgstr "bas" +msgstr "" #. input/lsr/flamenco-notation.ly:99 (variable) -#, fuzzy msgid "aUp" -msgstr "Haut :" +msgstr "" #. input/lsr/flamenco-notation.ly:100 (variable) -#, fuzzy msgid "aDown" -msgstr "bas" +msgstr "" #. input/lsr/flamenco-notation.ly:101 (variable) -#, fuzzy msgid "xUp" -msgstr "Haut :" +msgstr "" #. input/lsr/flamenco-notation.ly:102 (variable) -#, fuzzy msgid "xDown" -msgstr "bas" +msgstr "" #. input/lsr/flamenco-notation.ly:105 (comment) msgid "Just handy :)" msgstr "" #. input/lsr/flamenco-notation.ly:106 (variable) -#, fuzzy msgid "tupletOff" -msgstr "nolet" +msgstr "noletNon" #. input/lsr/flamenco-notation.ly:111 (variable) -#, fuzzy msgid "tupletsOff" -msgstr "nolet" +msgstr "noletsNon" #. input/lsr/flamenco-notation.ly:116 (variable) -#, fuzzy msgid "tupletsOn" -msgstr "nolet" +msgstr "noletsOui" #. input/lsr/flamenco-notation.ly:121 (variable) msgid "headsOff" -msgstr "" +msgstr "tetesNon" #. input/lsr/flamenco-notation.ly:127 (variable) msgid "headsOn" -msgstr "" +msgstr "tetesOui" #. input/lsr/flamenco-notation.ly:133 (comment) msgid "Cut here ----- End 'flamenco.ly' " @@ -11110,30 +11004,29 @@ msgstr "" #. input/lsr/flat-flags-and-beam-nibs.ly:109 (comment) msgid "Example 1" -msgstr "" +msgstr "Exemple 1" #. input/lsr/flat-flags-and-beam-nibs.ly:116 (comment) msgid "Example 2" -msgstr "" +msgstr "Exemple 2" #. input/lsr/flat-flags-and-beam-nibs.ly:123 (comment) msgid "Example 3" -msgstr "" +msgstr "Exemple 3" #. input/lsr/flat-flags-and-beam-nibs.ly:137 (comment) msgid "Example 4" -msgstr "" +msgstr "Exemple 4" #. input/lsr/flute-slap-notation.ly:18 (variable) -#, fuzzy msgid "slap" -msgstr "dièse" +msgstr "" #. input/lsr/formatting-lyrics-syllables.ly:16 (comment) msgid "" "Tip taken from http://lists.gnu.org/archive/html/lilypond-user/2007-12/" "msg00215.html" -msgstr "" +msgstr "Truc extrait de http://lists.gnu.org/archive/html/lilypond-user/2007-12/msg00215.html" #. input/lsr/fret-diagrams-explained-and-developed.ly:37 (comment) msgid "A chord for ukelele, with formatting defined in definition string" @@ -11149,9 +11042,9 @@ msgstr "" #. input/lsr/fret-diagrams-explained-and-developed.ly:52 (comment) #. input/lsr/fret-diagrams-explained-and-developed.ly:72 (comment) -#, fuzzy, python-format +#, python-format msgid "110% of default size" -msgstr "retour à la taille par défaut" +msgstr "110 % de la taille par défaut" #. input/lsr/grid-lines--changing-their-appearance.ly:33 (comment) msgid "this moves them up one staff space from the default position" @@ -11194,9 +11087,8 @@ msgid "to four spaces below center line on visible staff" msgstr "" #. input/lsr/heavily-customized-polymetric-time-signatures.ly:51 (variable) -#, fuzzy msgid "drum" -msgstr "percuA" +msgstr "" #. input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly:54 (comment) msgid "Solution 1: Using a simple markup with a particular halign value" @@ -11209,9 +11101,8 @@ msgid "" msgstr "" #. input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly:56 (variable) -#, fuzzy msgid "semppMarkup" -msgstr "tempoMarque" +msgstr "semppMarque" #. input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly:58 (comment) msgid "" @@ -11302,9 +11193,8 @@ msgstr "" #. input/lsr/showing-chords-at-changes.ly:23 (variable) #. input/lsr/single-staff-template-with-notes,-lyrics,-and-chords.ly:40 (variable) #. input/lsr/single-staff-template-with-notes-and-chords.ly:38 (variable) -#, fuzzy msgid "harmonies" -msgstr "harmoniques" +msgstr "" #. input/lsr/how-to-change-fret-diagram-position.ly:31 (comment) msgid "THE FOLLOWING IS THE COMMAND TO MOVE THE CHORD NAME" @@ -11329,35 +11219,30 @@ msgstr "" #. input/lsr/incipit.ly:74 (variable) #. input/lsr/incipit.ly:75 (context id) -#, fuzzy msgid "discantusIncipit" -msgstr "discantus" +msgstr "discantusIncipit" #. input/lsr/incipit.ly:111 (variable) #. input/lsr/incipit.ly:112 (context id) -#, fuzzy msgid "altusIncipit" -msgstr "Des incipits" +msgstr "altusIncipit" #. input/lsr/incipit.ly:127 (comment) #. input/lsr/incipit.ly:139 (comment) #. input/lsr/incipit.ly:169 (comment) #. input/lsr/incipit.ly:178 (comment) -#, fuzzy msgid "two measures" -msgstr "Mesure incomplète" +msgstr "deux mesures" #. input/lsr/incipit.ly:147 (variable) #. input/lsr/incipit.ly:148 (context id) -#, fuzzy msgid "tenorIncipit" -msgstr "Des incipits" +msgstr "tenorIncipit" #. input/lsr/incipit.ly:184 (variable) #. input/lsr/incipit.ly:185 (context id) -#, fuzzy msgid "bassusIncipit" -msgstr "Des incipits" +msgstr "bassusIncipit" #. input/lsr/incipit.ly:251 (comment) #. input/lsr/transcription-of-ancient-music-with-incipit.ly:258 (comment) @@ -11386,9 +11271,8 @@ msgid "into the next measure. The command is commented out in this" msgstr "" #. input/lsr/inserting-score-fragments-above-a-staff,-as-markups.ly:16 (variable) -#, fuzzy msgid "tuning" -msgstr "melodie" +msgstr "" #. input/lsr/jazz-combo-template.ly:52 (comment) msgid "#(set-global-staff-size 16)" @@ -11399,14 +11283,12 @@ msgid "Some macros %%%%%%%%%%%%%%%%%%%" msgstr "" #. input/lsr/jazz-combo-template.ly:57 (variable) -#, fuzzy msgid "sl" -msgstr "liaison d'articulation" +msgstr "" #. input/lsr/jazz-combo-template.ly:61 (variable) -#, fuzzy msgid "nsl" -msgstr "Installation" +msgstr "" #. input/lsr/jazz-combo-template.ly:65 (variable) msgid "crOn" @@ -11421,18 +11303,16 @@ msgid "insert chord name style stuff here." msgstr "" #. input/lsr/jazz-combo-template.ly:70 (variable) -#, fuzzy msgid "jazzChords" -msgstr "mesAccords" +msgstr "jazzAccords" #. input/lsr/jazz-combo-template.ly:72 (comment) msgid "Keys'n'thangs %%%%%%%%%%%%%%%%%" msgstr "" #. input/lsr/jazz-combo-template.ly:76 (variable) -#, fuzzy msgid "Key" -msgstr "MetriqueArmure" +msgstr "" #. input/lsr/jazz-combo-template.ly:78 (comment) msgid "############ Horns ############" @@ -11443,53 +11323,45 @@ msgid "------ Trumpet ------" msgstr "" #. input/lsr/jazz-combo-template.ly:81 (variable) -#, fuzzy msgid "trpt" -msgstr "triolet" +msgstr "" #. input/lsr/jazz-combo-template.ly:85 (variable) -#, fuzzy msgid "trpHarmony" -msgstr "Harmoniques" +msgstr "" #. input/lsr/jazz-combo-template.ly:88 (variable) #. input/lsr/jazz-combo-template.ly:268 (context id) -#, fuzzy msgid "trumpet" -msgstr "nolet" +msgstr "" #. input/lsr/jazz-combo-template.ly:97 (comment) msgid "------ Alto Saxophone ------" msgstr "" #. input/lsr/jazz-combo-template.ly:98 (variable) -#, fuzzy msgid "alto" -msgstr "alti" +msgstr "" #. input/lsr/jazz-combo-template.ly:102 (variable) -#, fuzzy msgid "altoHarmony" -msgstr "Harmoniques" +msgstr "" #. input/lsr/jazz-combo-template.ly:105 (variable) -#, fuzzy msgid "altoSax" -msgstr "alti" +msgstr "" #. input/lsr/jazz-combo-template.ly:114 (comment) msgid "------ Baritone Saxophone ------" msgstr "" #. input/lsr/jazz-combo-template.ly:115 (variable) -#, fuzzy msgid "bari" -msgstr "mesureA" +msgstr "" #. input/lsr/jazz-combo-template.ly:123 (variable) -#, fuzzy msgid "bariHarmony" -msgstr "baryton" +msgstr "" #. input/lsr/jazz-combo-template.ly:126 (variable) msgid "bariSax" @@ -11500,9 +11372,8 @@ msgid "------ Trombone ------" msgstr "" #. input/lsr/jazz-combo-template.ly:136 (variable) -#, fuzzy msgid "tbone" -msgstr "un" +msgstr "" #. input/lsr/jazz-combo-template.ly:140 (variable) msgid "tboneHarmony" @@ -11510,9 +11381,8 @@ msgstr "" #. input/lsr/jazz-combo-template.ly:143 (variable) #. input/lsr/jazz-combo-template.ly:272 (context id) -#, fuzzy msgid "trombone" -msgstr "hautbois" +msgstr "" #. input/lsr/jazz-combo-template.ly:152 (comment) msgid "############ Rhythm Section #############" @@ -11527,51 +11397,43 @@ msgid "gtr" msgstr "" #. input/lsr/jazz-combo-template.ly:163 (variable) -#, fuzzy msgid "gtrHarmony" -msgstr "Harmoniques" +msgstr "" #. input/lsr/jazz-combo-template.ly:167 (variable) #. input/lsr/jazz-combo-template.ly:277 (context id) #. input/lsr/polyphony-in-tablature.ly:39 (context id) #. input/lsr/polyphony-in-tablature.ly:44 (context id) -#, fuzzy msgid "guitar" -msgstr "Guitare" +msgstr "" #. input/lsr/jazz-combo-template.ly:176 (comment) msgid "------ Piano ------" msgstr "" #. input/lsr/jazz-combo-template.ly:177 (variable) -#, fuzzy msgid "rhUpper" -msgstr "superieur" +msgstr "" #. input/lsr/jazz-combo-template.ly:182 (variable) -#, fuzzy msgid "rhLower" -msgstr "inferieur" +msgstr "" #. input/lsr/jazz-combo-template.ly:188 (variable) -#, fuzzy msgid "lhUpper" -msgstr "superieur" +msgstr "" #. input/lsr/jazz-combo-template.ly:193 (variable) -#, fuzzy msgid "lhLower" -msgstr "inferieur" +msgstr "" #. input/lsr/jazz-combo-template.ly:199 (variable) -#, fuzzy msgid "PianoRH" -msgstr "Piano" +msgstr "PianoMD" #. input/lsr/jazz-combo-template.ly:208 (variable) -#, fuzzy msgid "PianoLH" -msgstr "Piano" +msgstr "PianoMG" #. input/lsr/jazz-combo-template.ly:226 (comment) msgid "------ Bass Guitar ------" @@ -11591,38 +11453,32 @@ msgid "It All Goes Together Here %%%%%%%%%%%%%%%%%%%%%%" msgstr "" #. input/lsr/jazz-combo-template.ly:267 (context id) -#, fuzzy msgid "horns" -msgstr "corNotes" +msgstr "" #. input/lsr/jazz-combo-template.ly:269 (context id) -#, fuzzy msgid "altosax" -msgstr "alti" +msgstr "" #. input/lsr/jazz-combo-template.ly:270 (context id) -#, fuzzy msgid "barichords" -msgstr "accord" +msgstr "" #. input/lsr/jazz-combo-template.ly:271 (context id) msgid "barisax" msgstr "" #. input/lsr/jazz-combo-template.ly:276 (context id) -#, fuzzy msgid "chords" -msgstr "accord" +msgstr "" #. input/lsr/makam-example.ly:26 (comment) -#, fuzzy msgid "Initialize makam settings" -msgstr "Notation éditoriale" +msgstr "" #. input/lsr/manually-break-figured-bass-extenders-for-only-some-numbers.ly:19 (variable) -#, fuzzy msgid "bassfigures" -msgstr "basses" +msgstr "" #. input/lsr/manually-controlling-beam-positions.ly:21 (comment) msgid "from upper staffline (position 4) to center (position 0)" @@ -11637,9 +11493,8 @@ msgid "speakOn" msgstr "" #. input/lsr/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly:31 (variable) -#, fuzzy msgid "speakOff" -msgstr "portée" +msgstr "" #. input/lsr/markup-lines.ly:19 (comment) msgid "Candide, Voltaire" @@ -11650,9 +11505,8 @@ msgid "the final bar line is not interrupted" msgstr "" #. input/lsr/merging-multi-measure-rests-in-a-polyphonic-part.ly:17 (variable) -#, fuzzy msgid "normalPos" -msgstr "normal" +msgstr "" #. input/lsr/modern-tab-text-clef.ly:16 (variable) msgid "TAB" @@ -11675,9 +11529,8 @@ msgid "...or to cover just whitespace" msgstr "" #. input/lsr/percussion-beaters.ly:18 (variable) -#, fuzzy msgid "stick" -msgstr "musique" +msgstr "" #. input/lsr/permitting-line-breaks-within-beamed-tuplets.ly:39 (comment) msgid "Permit line breaks within tuplets" @@ -11692,14 +11545,12 @@ msgid "Insert a manual line break within a tuplet" msgstr "" #. input/lsr/piano-template-with-centered-dynamics.ly:51 (variable) -#, fuzzy msgid "pedal" -msgstr "Opéra" +msgstr "pedale" #. input/lsr/piano-template-with-centered-dynamics.ly:64 (comment) -#, fuzzy msgid "define Dynamics context" -msgstr "Ajout d'une nuance textuelle" +msgstr "" #. input/lsr/piano-template-with-centered-dynamics.ly:85 (comment) msgid "modify PianoStaff context to accept Dynamics context" @@ -11768,9 +11619,8 @@ msgid "Coda on new line: DON'T use \\nobreak" msgstr "" #. input/lsr/positioning-segno-and-coda-with-line-break.ly:45 (comment) -#, fuzzy msgid "\\noBreak" -msgstr "Sauts" +msgstr "" #. input/lsr/positioning-segno-and-coda-with-line-break.ly:54 (comment) msgid "Here begins the trickery! " @@ -11787,9 +11637,8 @@ msgid "Some examples of possible text-displays " msgstr "" #. input/lsr/positioning-segno-and-coda-with-line-break.ly:60 (comment) -#, fuzzy msgid "text line-aligned" -msgstr "Alignement du texte" +msgstr "" #. input/lsr/positioning-segno-and-coda-with-line-break.ly:61 (comment) msgid "==================" @@ -11809,9 +11658,8 @@ msgid "| s1*0^\\markup { D.S. al Coda } }" msgstr "" #. input/lsr/positioning-segno-and-coda-with-line-break.ly:66 (comment) -#, fuzzy msgid "text center-aligned" -msgstr "ligne de prolongation" +msgstr "" #. input/lsr/positioning-segno-and-coda-with-line-break.ly:67 (comment) msgid "====================" @@ -11890,27 +11738,22 @@ msgid "Coda on new line, use this:" msgstr "" #. input/lsr/positioning-segno-and-coda-with-line-break.ly:112 (comment) -#, fuzzy msgid "The coda" -msgstr "La commande de fixation (set)" +msgstr "La coda" #. input/lsr/printing-metronome-and-rehearsal-marks-below-the-staff.ly:31 (comment) -#, fuzzy msgid "Metronome marks below the staff " -msgstr "Indications métronomiques" +msgstr "Indications métronimiques sous la portée" #. input/lsr/printing-metronome-and-rehearsal-marks-below-the-staff.ly:36 (comment) -#, fuzzy msgid "Rehearsal marks below the staff" -msgstr "Indications de repère" +msgstr "Indications de repère sous la portée" #. input/lsr/printing-music-with-different-time-signatures.ly:49 (variable) -#, fuzzy msgid "Bassklarinette" -msgstr "clarinette" +msgstr "ClarinetteBasse" #. input/lsr/printing-music-with-different-time-signatures.ly:89 (variable) -#, fuzzy msgid "Perkussion" msgstr "Percussions" @@ -11920,16 +11763,15 @@ msgstr "" #. input/lsr/quoting-another-voice-with-transposition.ly:38 (comment) msgid "french horn" -msgstr "" +msgstr "cor anglais" #. input/lsr/quoting-another-voice.ly:27 (variable) msgid "quoteMe" msgstr "" #. input/lsr/quoting-another-voice.ly:32 (variable) -#, fuzzy msgid "original" -msgstr "Tutoriel" +msgstr "original" #. input/lsr/removing-the-first-empty-line.ly:43 (comment) msgid "To use the setting globally, uncomment the following line:" @@ -11960,14 +11802,12 @@ msgid "Set new values for beam endings" msgstr "puis on ajoute des règles de fin de ligature" #. input/lsr/rhythmic-slashes.ly:25 (comment) -#, fuzzy msgid "Macro to print single slash" -msgstr "Modification de portées individuelles" +msgstr "" #. input/lsr/rhythmic-slashes.ly:26 (variable) -#, fuzzy msgid "rs" -msgstr "silence" +msgstr "" #. input/lsr/rhythmic-slashes.ly:33 (comment) msgid "Function to print a specified number of slashes" @@ -11978,19 +11818,16 @@ msgid "comp" msgstr "" #. input/lsr/score-for-diatonic-accordion.ly:69 (variable) -#, fuzzy msgid "NoStem" -msgstr "Hampes" +msgstr "SansHampe" #. input/lsr/score-for-diatonic-accordion.ly:70 (variable) -#, fuzzy msgid "NoNoteHead" -msgstr "Têtes de note" +msgstr "SansTetedeNote" #. input/lsr/score-for-diatonic-accordion.ly:71 (variable) -#, fuzzy msgid "ZeroBeam" -msgstr "Barres de ligature" +msgstr "ZeroLigature" #. input/lsr/score-for-diatonic-accordion.ly:73 (variable) msgid "staffTabLine" @@ -12106,9 +11943,8 @@ msgstr "" #. input/lsr/score-for-diatonic-accordion.ly:118 (comment) #. input/lsr/score-for-diatonic-accordion.ly:137 (comment) -#, fuzzy msgid "Tips:" -msgstr "Liaisons de prolongation" +msgstr "Astuces :" #. input/lsr/score-for-diatonic-accordion.ly:119 (comment) #. input/lsr/score-for-diatonic-accordion.ly:138 (comment) @@ -12170,19 +12006,16 @@ msgid "The following line has to be adjusted O-F-T-E-N." msgstr "" #. input/lsr/score-for-diatonic-accordion.ly:161 (variable) -#, fuzzy msgid "staffVoice" -msgstr "portée" +msgstr "" #. input/lsr/score-for-diatonic-accordion.ly:169 (context id) -#, fuzzy msgid "melodyVoi" -msgstr "melodie" +msgstr "" #. input/lsr/score-for-diatonic-accordion.ly:175 (variable) -#, fuzzy msgid "staffAccordionMel" -msgstr "Accordéon" +msgstr "" #. input/lsr/score-for-diatonic-accordion.ly:176 (comment) msgid "Set the accidentals (Vorzeichen) for each note, " @@ -12193,9 +12026,8 @@ msgid "do not remember them for the rest of the measure. " msgstr "" #. input/lsr/score-for-diatonic-accordion.ly:196 (variable) -#, fuzzy msgid "BassRhytm" -msgstr "Rythme" +msgstr "" #. input/lsr/score-for-diatonic-accordion.ly:197 (variable) msgid "LyricBassRhythmI" @@ -12235,58 +12067,48 @@ msgid "" msgstr "" #. input/lsr/single-staff-template-with-notes,-lyrics,-chords-and-frets.ly:24 (comment) -#, fuzzy msgid "Define the fret diagrams to be used" -msgstr "Tablatures prédéfinies" +msgstr "Définition du diagramme de fret à utiliser" #. input/lsr/single-staff-template-with-notes,-lyrics,-chords-and-frets.ly:25 (variable) -#, fuzzy msgid "cFretDiagram" -msgstr "Tablatures sous forme d'étiquette" +msgstr "" #. input/lsr/single-staff-template-with-notes,-lyrics,-chords-and-frets.ly:29 (variable) -#, fuzzy msgid "gFretDiagram" -msgstr "Tablatures sous forme d'étiquette" +msgstr "" #. input/lsr/single-staff-template-with-notes,-lyrics,-chords-and-frets.ly:33 (variable) -#, fuzzy msgid "verseI" -msgstr "couplet" +msgstr "coupletI" #. input/lsr/single-staff-template-with-notes,-lyrics,-chords-and-frets.ly:38 (variable) -#, fuzzy msgid "verseII" -msgstr "couplet" +msgstr "coupletII" #. input/lsr/single-staff-template-with-notes,-lyrics,-chords-and-frets.ly:43 (variable) -#, fuzzy msgid "theChords" -msgstr "mesAccords" +msgstr "lesAccords" #. input/lsr/single-staff-template-with-notes,-lyrics,-chords-and-frets.ly:45 (comment) msgid "insert the chords for chordnames here" msgstr "" #. input/lsr/single-staff-template-with-notes,-lyrics,-chords-and-frets.ly:50 (variable) -#, fuzzy msgid "staffMelody" -msgstr "portée" +msgstr "" #. input/lsr/single-staff-template-with-notes,-lyrics,-chords-and-frets.ly:51 (context id) -#, fuzzy msgid "voiceMelody" -msgstr "voix" +msgstr "" #. input/lsr/single-staff-template-with-notes,-lyrics,-chords-and-frets.ly:55 (comment) -#, fuzzy msgid "Type notes and fret diagram markups here" -msgstr "Tablatures sous forme d'étiquette" +msgstr "" #. input/lsr/snap-pizzicato-markup-bartok-pizzicato.ly:54 (variable) -#, fuzzy msgid "snapPizzicato" -msgstr "Pizzicato Bartok" +msgstr "" #. input/lsr/snap-pizzicato-markup-bartok-pizzicato.ly:56 (comment) msgid "now it can be used as \\snappizzicato after the note/chord" @@ -12297,9 +12119,8 @@ msgid "Note that a direction (-, ^ or _) is required." msgstr "" #. input/lsr/snap-pizzicato-markup-bartok-pizzicato.ly:60 (comment) -#, fuzzy msgid "This does NOT work:" -msgstr "Celle-ci produit le résultat escompté" +msgstr "" #. input/lsr/snap-pizzicato-markup-bartok-pizzicato.ly:61 (comment) msgid "\\snapPizzicato" @@ -12310,32 +12131,28 @@ msgid "N.B. use Score.Stem to set for the whole score." msgstr "" #. input/lsr/string-quartet-template-simple.ly:34 (variable) -#, fuzzy msgid "violinOne" -msgstr "violon" +msgstr "violonUn" #. input/lsr/string-quartet-template-simple.ly:43 (variable) -#, fuzzy msgid "violinTwo" -msgstr "violon" +msgstr "violonDeux" #. input/lsr/string-quartet-template-simple.ly:52 (variable) -#, fuzzy msgid "viola" -msgstr "volta" +msgstr "viola" #. input/lsr/string-quartet-template-with-separate-parts.ly:63 (comment) msgid "piece.ly" -msgstr "" +msgstr "piece.ly" #. input/lsr/string-quartet-template-with-separate-parts.ly:64 (comment) msgid "(This is the global definitions file)" msgstr "" #. input/lsr/string-quartet-template-with-separate-parts.ly:71 (variable) -#, fuzzy msgid "Violinone" -msgstr "violon" +msgstr "Violonun" #. input/lsr/string-quartet-template-with-separate-parts.ly:76 (comment) #. input/lsr/string-quartet-template-with-separate-parts.ly:82 (comment) @@ -12344,19 +12161,16 @@ msgid "*********************************" msgstr "" #. input/lsr/string-quartet-template-with-separate-parts.ly:77 (variable) -#, fuzzy msgid "Violintwo" -msgstr "violon" +msgstr "Violondeux" #. input/lsr/string-quartet-template-with-separate-parts.ly:83 (variable) -#, fuzzy msgid "Viola" -msgstr "volta" +msgstr "Viola" #. input/lsr/string-quartet-template-with-separate-parts.ly:90 (variable) -#, fuzzy msgid "Cello" -msgstr "cello" +msgstr "Cello" #. input/lsr/string-quartet-template-with-separate-parts.ly:96 (comment) msgid "**********************************" @@ -12367,9 +12181,8 @@ msgid "These are the other files you need to save on your computer" msgstr "" #. input/lsr/string-quartet-template-with-separate-parts.ly:109 (comment) -#, fuzzy msgid "score.ly" -msgstr "Mise en forme de la partition" +msgstr "score.ly" #. input/lsr/string-quartet-template-with-separate-parts.ly:110 (comment) msgid "(This is the main file)" @@ -12388,7 +12201,7 @@ msgstr "" #. input/lsr/string-quartet-template-with-separate-parts.ly:124 (comment) msgid "vn1.ly" -msgstr "" +msgstr "vn1.ly" #. input/lsr/string-quartet-template-with-separate-parts.ly:125 (comment) msgid "(This is the Violin 1 part file)" @@ -12396,16 +12209,15 @@ msgstr "" #. input/lsr/string-quartet-template-with-separate-parts.ly:134 (comment) msgid "vn2.ly" -msgstr "" +msgstr "vn2.ly" #. input/lsr/string-quartet-template-with-separate-parts.ly:135 (comment) msgid "(This is the Violin 2 part file)" msgstr "" #. input/lsr/string-quartet-template-with-separate-parts.ly:144 (comment) -#, fuzzy msgid "vla.ly" -msgstr "global" +msgstr "vla.ly" #. input/lsr/string-quartet-template-with-separate-parts.ly:145 (comment) msgid "(This is the Viola part file)" @@ -12413,7 +12225,7 @@ msgstr "" #. input/lsr/string-quartet-template-with-separate-parts.ly:154 (comment) msgid "vlc.ly" -msgstr "" +msgstr "vcl.ly" #. input/lsr/string-quartet-template-with-separate-parts.ly:155 (comment) msgid "(This is the Cello part file)" @@ -12428,9 +12240,8 @@ msgid "Set beam sub-group length to a sixteenth note" msgstr "Subdivision des ligatures à la double-croche" #. input/lsr/suppressing-warnings-for-clashing-note-columns.ly:19 (variable) -#, fuzzy msgid "ignore" -msgstr "mineur" +msgstr "" #. input/lsr/three-sided-box.ly:16 (comment) msgid "New command to add a three sided box, with sides north, west and south" @@ -12453,61 +12264,24 @@ msgid "in scm/define-markup-commands.scm" msgstr "" #. input/lsr/three-sided-box.ly:47 (comment) -#, fuzzy msgid "Test it:" -msgstr "Commentaires textuels" - -#. input/lsr/tick-bar-lines.ly:21 (comment) -msgid "Use 'bar-size to control the height of the tick," -msgstr "" - -#. input/lsr/tick-bar-lines.ly:22 (comment) -msgid "and 'extra-offset to determine its position." -msgstr "" - -#. input/lsr/tick-bar-lines.ly:24 (comment) -msgid "With 'extra-offset set to zero, the tick will be" -msgstr "" - -#. input/lsr/tick-bar-lines.ly:25 (comment) -msgid "centered around the middle line of the staff." -msgstr "" - -#. input/lsr/tick-bar-lines.ly:27 (comment) -msgid "Replace Staff.BarLine with Score.BarLine to" -msgstr "" - -#. input/lsr/tick-bar-lines.ly:28 (comment) -msgid "apply the method to the whole score." -msgstr "" - -#. input/lsr/tick-bar-lines.ly:38 (comment) -msgid "Revert the overrides to get back a normal" -msgstr "" - -#. input/lsr/tick-bar-lines.ly:39 (comment) -msgid "bar line at the end." msgstr "" #. input/lsr/transcription-of-ancient-music-with-incipit.ly:127 (variable) -#, fuzzy msgid "incipitDiscantus" -msgstr "discantus" +msgstr "incipitDiscantus" #. input/lsr/transcription-of-ancient-music-with-incipit.ly:151 (variable) -#, fuzzy msgid "incipitAltus" -msgstr "Des incipits" +msgstr "incipitAltus" #. input/lsr/transcription-of-ancient-music-with-incipit.ly:176 (variable) -#, fuzzy msgid "incipitTenor" -msgstr "Des incipits" +msgstr "incipitTenor" #. input/lsr/transcription-of-ancient-music-with-incipit.ly:202 (variable) -#, fuzzy msgid "incipitBassus" -msgstr "Des incipits" +msgstr "incipitBassus" #. input/lsr/transcription-of-ancient-music-with-incipit.ly:226 (comment) msgid "" @@ -12519,9 +12293,8 @@ msgid "the next three instructions keep the lyrics between the barlines" msgstr "" #. input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly:131 (variable) -#, fuzzy msgid "naturalizeMusic" -msgstr "bécarre" +msgstr "" #. input/lsr/tweaking-clef-properties.ly:111 (comment) msgid "The default treble clef" @@ -12532,9 +12305,8 @@ msgid "The standard bass clef" msgstr "" #. input/lsr/tweaking-clef-properties.ly:118 (comment) -#, fuzzy msgid "The baritone clef" -msgstr "baryton" +msgstr "" #. input/lsr/tweaking-clef-properties.ly:123 (comment) msgid "The standard choral tenor clef" @@ -12545,9 +12317,8 @@ msgid "A non-standard clef" msgstr "" #. input/lsr/tweaking-clef-properties.ly:135 (comment) -#, fuzzy msgid "The following clef changes do not preserve" -msgstr "Les notes qui suivent sont monophoniques" +msgstr "" #. input/lsr/tweaking-clef-properties.ly:136 (comment) msgid "the normal relationship between notes and clefs:" @@ -12609,17 +12380,15 @@ msgstr "" #. input/lsr/using-postscript-to-generate-special-note-head-shapes.ly:17 (variable) #, fuzzy msgid "parallelogram" -msgstr "allegro" +msgstr "parallelogramme" #. input/lsr/using-postscript-to-generate-special-note-head-shapes.ly:32 (variable) -#, fuzzy msgid "myNoteHeads" -msgstr "Têtes de note" +msgstr "" #. input/lsr/using-postscript-to-generate-special-note-head-shapes.ly:33 (variable) -#, fuzzy msgid "normalNoteHeads" -msgstr "Têtes de note mensurales" +msgstr "" #. input/lsr/utf-8.ly:34 (comment) msgid "end verbatim - this comment is a hack to prevent texinfo.tex" @@ -12642,9 +12411,8 @@ msgid "hebrew" msgstr "" #. input/lsr/utf-8.ly:45 (variable) -#, fuzzy msgid "japanese" -msgstr "Extenseurs et prolongateurs" +msgstr "japonais" #. input/lsr/utf-8.ly:52 (comment) msgid "\\\"a legal song to you\\\"" @@ -12652,67 +12420,57 @@ msgstr "" #. input/lsr/utf-8.ly:53 (variable) msgid "portuguese" -msgstr "" +msgstr "portugais" #. input/lsr/vertically-centered-common-lyrics.ly:19 (variable) -#, fuzzy msgid "leftbrace" -msgstr "accolade" +msgstr "accoladegauche" #. input/lsr/vertically-centered-common-lyrics.ly:20 (variable) -#, fuzzy msgid "rightbrace" -msgstr "accolade" +msgstr "accoladedroite" #. input/lsr/vertically-centered-common-lyrics.ly:22 (variable) -#, fuzzy msgid "dropLyrics" -msgstr "SopUnParoles" +msgstr "" #. input/lsr/vertically-centered-common-lyrics.ly:29 (variable) -#, fuzzy msgid "raiseLyrics" -msgstr "tuttiParoles" +msgstr "" #. input/lsr/vertically-centered-common-lyrics.ly:36 (variable) msgid "skipFour" msgstr "" #. input/lsr/vertically-centered-common-lyrics.ly:38 (variable) -#, fuzzy msgid "lyricsA" -msgstr "paroles" +msgstr "parolesA" #. input/lsr/vertically-centered-common-lyrics.ly:40 (variable) -#, fuzzy msgid "lyricsB" -msgstr "paroles" +msgstr "parolesB" #. input/lsr/vertically-centered-common-lyrics.ly:41 (variable) -#, fuzzy msgid "lyricsC" -msgstr "paroles" +msgstr "parolesC" #. input/lsr/vertically-centered-common-lyrics.ly:42 (variable) -#, fuzzy msgid "lyricsD" -msgstr "paroles" +msgstr "parolesD" #. input/lsr/vertically-centered-common-lyrics.ly:49 (context id) msgid "m" -msgstr "" +msgstr "m" #. input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly:44 (variable) #. input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:37 (variable) #. input/lsr/vocal-ensemble-template.ly:41 (variable) -#, fuzzy msgid "sopMusic" -msgstr "SopMusique" +msgstr "sopranoMusique" #. input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly:47 (variable) #. input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:40 (variable) #. input/lsr/vocal-ensemble-template.ly:44 (variable) -#, fuzzy msgid "sopWords" msgstr "sopranoParoles" @@ -12720,14 +12478,13 @@ msgstr "sopranoParoles" #. input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:67 (context id) #. input/lsr/vocal-ensemble-template.ly:72 (context id) msgid "women" -msgstr "" +msgstr "femmes" #. input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly:82 (context id) #. input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:77 (context id) #. input/lsr/vocal-ensemble-template.ly:84 (context id) -#, fuzzy msgid "men" -msgstr "melodieUn" +msgstr "hommes" #. input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly:111 (comment) #. input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:89 (comment) @@ -12738,9 +12495,8 @@ msgstr "" #. input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly:112 (comment) #. input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:90 (comment) #. input/lsr/vocal-ensemble-template.ly:103 (comment) -#, fuzzy msgid "can be closer to the staff" -msgstr "cette fois, le texte est plus proche de la portée" +msgstr "" #. input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:73 (comment) msgid "we could remove the line about this with the line below, since we want" @@ -12763,9 +12519,8 @@ msgid "\\new Lyrics \\lyricsto basses \\bassWords" msgstr "" #. input/lsr/volta-multi-staff.ly:13 (variable) -#, fuzzy msgid "voltaMusic" -msgstr "AltoMusique" +msgstr "" msgid "Up:" msgstr "Haut :" @@ -12785,40 +12540,3 @@ msgstr "Notes de bas de page" msgid "Table of Contents" msgstr "Table des matières" -#~ msgid "applies to \\\"fas\\\"" -#~ msgstr "s'applique à \\\"fas\\\"" - -#~ msgid "Common tweaks" -#~ msgstr "Retouches courantes" - -#~ msgid "System start delimiters" -#~ msgstr "Délimitations en début de système" - -#, fuzzy -#~ msgid "lines length" -#~ msgstr "Longueur de ligne" - -#, fuzzy -#~ msgid "making sure the lines will be placed outside the Staff" -#~ msgstr "cette fois, le texte est plus proche de la portée" - -#~ msgid "auto beam on 1/4 note groups" -#~ msgstr "ligature automatique par noire" - -#~ msgid "keep 3/4 beaming" -#~ msgstr "maintien des règles de ligature pour 3/4" - -#~ msgid "due to beatLength" -#~ msgstr "en raison de la battue" - -#~ msgid "beam on 1/8 notes" -#~ msgstr "ligature basée sur la croche" - -#~ msgid "beam on 3/16, 7/16, 9/16, 12/16" -#~ msgstr "ligature sur les 3ème, 7ème, 9ème et 12ème double croche" - -#~ msgid "force-hshift-Eigenschaft" -#~ msgstr "la propriété force-hshift" - -#~ msgid "Laissez vibrer ties" -#~ msgstr "Liaisons ``laissez vibrer''" diff --git a/Documentation/po/lilypond-doc.pot b/Documentation/po/lilypond-doc.pot index 7ca2c85399..c55d3eb8a4 100644 --- a/Documentation/po/lilypond-doc.pot +++ b/Documentation/po/lilypond-doc.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-07 23:30+0100\n" +"POT-Creation-Date: 2008-12-25 12:33+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -414,7 +414,7 @@ msgstr "" #. Documentation/user/tutorial.itely:1791 (variable) #. Documentation/user/working.itely:214 (variable) #. Documentation/user/working.itely:229 (variable) -#. Documentation/user/pitches.itely:1035 (context id) +#. Documentation/user/pitches.itely:1078 (context id) msgid "violin" msgstr "" @@ -1272,6 +1272,7 @@ msgstr "" #. @rglos in Documentation/es/user/chords.itely #. @rglos in Documentation/de/user/tutorial.itely #. @rglos in Documentation/de/user/simultaneous.itely +#. @rglos in Documentation/de/user/chords.itely msgid "chord" msgstr "" @@ -1649,7 +1650,7 @@ msgstr "" #. Documentation/user/vocal.itely:506 (context id) #. Documentation/user/vocal.itely:1235 (context id) #. Documentation/user/vocal.itely:1276 (context id) -#. Documentation/user/keyboards.itely:329 (context id) +#. Documentation/user/keyboards.itely:338 (context id) #. Documentation/user/fretted-strings.itely:243 (context id) #. input/lsr/adding-fingerings-to-tablatures.ly:16 (variable) #. input/lsr/jazz-combo-template.ly:204 (context id) @@ -1661,7 +1662,7 @@ msgstr "" #. Documentation/user/fundamental.itely:1242 (variable) #. Documentation/user/fundamental.itely:2646 (variable) -#. Documentation/user/tweaks.itely:3469 (variable) +#. Documentation/user/tweaks.itely:3475 (variable) #. Documentation/user/simultaneous.itely:788 (variable) #. Documentation/user/percussion.itely:497 (variable) #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:46 (variable) @@ -1713,37 +1714,37 @@ msgid "SopMusic" msgstr "" #. Documentation/user/fundamental.itely:1298 (variable) -#. Documentation/user/tweaks.itely:3471 (variable) +#. Documentation/user/tweaks.itely:3477 (variable) msgid "AltoMusic" msgstr "" #. Documentation/user/fundamental.itely:1299 (variable) -#. Documentation/user/tweaks.itely:3472 (variable) +#. Documentation/user/tweaks.itely:3478 (variable) msgid "TenorMusic" msgstr "" #. Documentation/user/fundamental.itely:1300 (variable) -#. Documentation/user/tweaks.itely:3473 (variable) +#. Documentation/user/tweaks.itely:3479 (variable) msgid "BassMusic" msgstr "" #. Documentation/user/fundamental.itely:1301 (variable) -#. Documentation/user/tweaks.itely:3474 (variable) +#. Documentation/user/tweaks.itely:3480 (variable) msgid "VerseOne" msgstr "" #. Documentation/user/fundamental.itely:1303 (variable) -#. Documentation/user/tweaks.itely:3475 (variable) +#. Documentation/user/tweaks.itely:3481 (variable) msgid "VerseTwo" msgstr "" #. Documentation/user/fundamental.itely:1305 (variable) -#. Documentation/user/tweaks.itely:3476 (variable) +#. Documentation/user/tweaks.itely:3482 (variable) msgid "VerseThree" msgstr "" #. Documentation/user/fundamental.itely:1307 (variable) -#. Documentation/user/tweaks.itely:3477 (variable) +#. Documentation/user/tweaks.itely:3483 (variable) msgid "VerseFour" msgstr "" @@ -1752,19 +1753,19 @@ msgid "Sop" msgstr "" #. Documentation/user/fundamental.itely:1315 (context id) -#. Documentation/user/tweaks.itely:3484 (context id) +#. Documentation/user/tweaks.itely:3490 (context id) #. Documentation/user/input.itely:951 (context id) msgid "Alto" msgstr "" #. Documentation/user/fundamental.itely:1323 (context id) -#. Documentation/user/tweaks.itely:3492 (context id) +#. Documentation/user/tweaks.itely:3498 (context id) #. Documentation/user/input.itely:953 (context id) msgid "Tenor" msgstr "" #. Documentation/user/fundamental.itely:1324 (context id) -#. Documentation/user/tweaks.itely:3493 (context id) +#. Documentation/user/tweaks.itely:3499 (context id) #. Documentation/user/input.itely:958 (context id) #. input/lsr/jazz-combo-template.ly:227 (variable) msgid "Bass" @@ -2372,220 +2373,220 @@ msgstr "" msgid "Building a score from scratch" msgstr "" -#. Documentation/user/tweaks.itely:596 (comment) -#. Documentation/user/tweaks.itely:731 (comment) +#. Documentation/user/tweaks.itely:597 (comment) +#. Documentation/user/tweaks.itely:732 (comment) msgid "Increase thickness of all following slurs from 1.2 to 5.0" msgstr "" -#. Documentation/user/tweaks.itely:665 (comment) -#. Documentation/user/tweaks.itely:704 (comment) -#. Documentation/user/tweaks.itely:707 (comment) +#. Documentation/user/tweaks.itely:666 (comment) +#. Documentation/user/tweaks.itely:705 (comment) +#. Documentation/user/tweaks.itely:708 (comment) msgid "Increase thickness of immediately following slur only" msgstr "" -#. Documentation/user/tweaks.itely:735 (comment) +#. Documentation/user/tweaks.itely:736 (comment) msgid "Revert thickness of all following slurs to default of 1.2" msgstr "" -#. Documentation/user/tweaks.itely:1395 (comment) +#. Documentation/user/tweaks.itely:1396 (comment) msgid "Don't print clefs in this staff" msgstr "" -#. Documentation/user/tweaks.itely:1397 (comment) +#. Documentation/user/tweaks.itely:1398 (comment) msgid "Don't print time signatures in this staff" msgstr "" -#. Documentation/user/tweaks.itely:1461 (comment) +#. Documentation/user/tweaks.itely:1462 (comment) msgid "Reduce all font sizes by ~24%" msgstr "" -#. Documentation/user/tweaks.itely:1527 (comment) +#. Documentation/user/tweaks.itely:1528 (comment) msgid "Reduce stem length and line spacing to match" msgstr "" -#. Documentation/user/tweaks.itely:1957 (comment) -#. Documentation/user/tweaks.itely:2027 (comment) +#. Documentation/user/tweaks.itely:1958 (comment) +#. Documentation/user/tweaks.itely:2028 (comment) msgid "Set details for later Text Spanner" msgstr "" -#. Documentation/user/tweaks.itely:1960 (comment) -#. Documentation/user/tweaks.itely:2030 (comment) +#. Documentation/user/tweaks.itely:1961 (comment) +#. Documentation/user/tweaks.itely:2031 (comment) msgid "Place dynamics above staff" msgstr "" -#. Documentation/user/tweaks.itely:1962 (comment) -#. Documentation/user/tweaks.itely:2034 (comment) +#. Documentation/user/tweaks.itely:1963 (comment) +#. Documentation/user/tweaks.itely:2035 (comment) msgid "Start Ottava Bracket" msgstr "" -#. Documentation/user/tweaks.itely:1965 (comment) -#. Documentation/user/tweaks.itely:1972 (comment) -#. Documentation/user/tweaks.itely:2037 (comment) -#. Documentation/user/tweaks.itely:2044 (comment) +#. Documentation/user/tweaks.itely:1966 (comment) +#. Documentation/user/tweaks.itely:1973 (comment) +#. Documentation/user/tweaks.itely:2038 (comment) +#. Documentation/user/tweaks.itely:2045 (comment) msgid "Add Dynamic Text" msgstr "" -#. Documentation/user/tweaks.itely:1967 (comment) -#. Documentation/user/tweaks.itely:2039 (comment) +#. Documentation/user/tweaks.itely:1968 (comment) +#. Documentation/user/tweaks.itely:2040 (comment) msgid "Add Dynamic Line Spanner" msgstr "" -#. Documentation/user/tweaks.itely:1969 (comment) -#. Documentation/user/tweaks.itely:2041 (comment) +#. Documentation/user/tweaks.itely:1970 (comment) +#. Documentation/user/tweaks.itely:2042 (comment) msgid "Add Text Script" msgstr "" -#. Documentation/user/tweaks.itely:1974 (comment) -#. Documentation/user/tweaks.itely:2046 (comment) +#. Documentation/user/tweaks.itely:1975 (comment) +#. Documentation/user/tweaks.itely:2047 (comment) msgid "Stop Ottava Bracket" msgstr "" -#. Documentation/user/tweaks.itely:2032 (comment) +#. Documentation/user/tweaks.itely:2033 (comment) msgid "Place following Ottava Bracket below Text Spanners" msgstr "" -#. Documentation/user/tweaks.itely:2094 (comment) +#. Documentation/user/tweaks.itely:2095 (comment) msgid "Cause notes to space out to accommodate text" msgstr "" -#. Documentation/user/tweaks.itely:2117 (comment) +#. Documentation/user/tweaks.itely:2118 (comment) msgid "This markup is short enough to fit without collision" msgstr "" -#. Documentation/user/tweaks.itely:2121 (comment) +#. Documentation/user/tweaks.itely:2122 (comment) msgid "This is too long to fit, so it is displaced upwards" msgstr "" -#. Documentation/user/tweaks.itely:2125 (comment) -#. Documentation/user/tweaks.itely:2130 (comment) +#. Documentation/user/tweaks.itely:2126 (comment) +#. Documentation/user/tweaks.itely:2131 (comment) msgid "Turn off collision avoidance" msgstr "" -#. Documentation/user/tweaks.itely:2132 (comment) +#. Documentation/user/tweaks.itely:2133 (comment) msgid "and turn on textLengthOn" msgstr "" -#. Documentation/user/tweaks.itely:2133 (comment) +#. Documentation/user/tweaks.itely:2134 (comment) msgid "Spaces at end are honored" msgstr "" -#. Documentation/user/tweaks.itely:2240 (comment) +#. Documentation/user/tweaks.itely:2241 (comment) msgid "Extend width by 1 staff space" msgstr "" -#. Documentation/user/tweaks.itely:2523 (comment) +#. Documentation/user/tweaks.itely:2524 (comment) msgid "This will not work, see below:" msgstr "" -#. Documentation/user/tweaks.itely:2527 (comment) +#. Documentation/user/tweaks.itely:2528 (comment) msgid "This works:" msgstr "" -#. Documentation/user/tweaks.itely:2578 (variable) +#. Documentation/user/tweaks.itely:2579 (variable) msgid "naturalplusflat" msgstr "" -#. Documentation/user/tweaks.itely:2619 (comment) +#. Documentation/user/tweaks.itely:2620 (comment) msgid "Extend width by 1 unit" msgstr "" -#. Documentation/user/tweaks.itely:2621 (comment) +#. Documentation/user/tweaks.itely:2622 (comment) msgid "Align dynamics to a base line 2 units above staff" msgstr "" -#. Documentation/user/tweaks.itely:2925 (variable) -#. Documentation/user/tweaks.itely:2974 (variable) -#. Documentation/user/tweaks.itely:3035 (variable) -#. Documentation/user/tweaks.itely:3105 (variable) -#. Documentation/user/tweaks.itely:3170 (variable) -#. Documentation/user/tweaks.itely:3230 (variable) +#. Documentation/user/tweaks.itely:2926 (variable) +#. Documentation/user/tweaks.itely:2975 (variable) +#. Documentation/user/tweaks.itely:3036 (variable) +#. Documentation/user/tweaks.itely:3106 (variable) +#. Documentation/user/tweaks.itely:3171 (variable) +#. Documentation/user/tweaks.itely:3231 (variable) msgid "rhMusic" msgstr "" -#. Documentation/user/tweaks.itely:2930 (comment) -#. Documentation/user/tweaks.itely:2979 (comment) -#. Documentation/user/tweaks.itely:3042 (comment) -#. Documentation/user/tweaks.itely:3114 (comment) -#. Documentation/user/tweaks.itely:3179 (comment) +#. Documentation/user/tweaks.itely:2931 (comment) +#. Documentation/user/tweaks.itely:2980 (comment) +#. Documentation/user/tweaks.itely:3043 (comment) +#. Documentation/user/tweaks.itely:3115 (comment) +#. Documentation/user/tweaks.itely:3180 (comment) msgid "Start polyphonic section of four voices" msgstr "" -#. Documentation/user/tweaks.itely:2943 (variable) -#. Documentation/user/tweaks.itely:2992 (variable) -#. Documentation/user/tweaks.itely:3055 (variable) -#. Documentation/user/tweaks.itely:3129 (variable) -#. Documentation/user/tweaks.itely:3196 (variable) -#. Documentation/user/tweaks.itely:3258 (variable) +#. Documentation/user/tweaks.itely:2944 (variable) +#. Documentation/user/tweaks.itely:2993 (variable) +#. Documentation/user/tweaks.itely:3056 (variable) +#. Documentation/user/tweaks.itely:3130 (variable) +#. Documentation/user/tweaks.itely:3197 (variable) +#. Documentation/user/tweaks.itely:3259 (variable) msgid "lhMusic" msgstr "" -#. Documentation/user/tweaks.itely:2952 (context id) -#. Documentation/user/tweaks.itely:3001 (context id) -#. Documentation/user/tweaks.itely:3064 (context id) -#. Documentation/user/tweaks.itely:3138 (context id) -#. Documentation/user/tweaks.itely:3205 (context id) -#. Documentation/user/tweaks.itely:3267 (context id) +#. Documentation/user/tweaks.itely:2953 (context id) +#. Documentation/user/tweaks.itely:3002 (context id) +#. Documentation/user/tweaks.itely:3065 (context id) +#. Documentation/user/tweaks.itely:3139 (context id) +#. Documentation/user/tweaks.itely:3206 (context id) +#. Documentation/user/tweaks.itely:3268 (context id) #. Documentation/user/input.itely:964 (context id) msgid "RH" msgstr "" -#. Documentation/user/tweaks.itely:2956 (context id) -#. Documentation/user/tweaks.itely:3005 (context id) -#. Documentation/user/tweaks.itely:3068 (context id) -#. Documentation/user/tweaks.itely:3142 (context id) -#. Documentation/user/tweaks.itely:3209 (context id) -#. Documentation/user/tweaks.itely:3271 (context id) +#. Documentation/user/tweaks.itely:2957 (context id) +#. Documentation/user/tweaks.itely:3006 (context id) +#. Documentation/user/tweaks.itely:3069 (context id) +#. Documentation/user/tweaks.itely:3143 (context id) +#. Documentation/user/tweaks.itely:3210 (context id) +#. Documentation/user/tweaks.itely:3272 (context id) #. Documentation/user/input.itely:970 (context id) msgid "LH" msgstr "" -#. Documentation/user/tweaks.itely:3183 (comment) -#. Documentation/user/tweaks.itely:3245 (comment) +#. Documentation/user/tweaks.itely:3184 (comment) +#. Documentation/user/tweaks.itely:3246 (comment) msgid "Move the c2 out of the main note column so the merge will work" msgstr "" -#. Documentation/user/tweaks.itely:3186 (comment) -#. Documentation/user/tweaks.itely:3248 (comment) +#. Documentation/user/tweaks.itely:3187 (comment) +#. Documentation/user/tweaks.itely:3249 (comment) msgid "Stem on the d2 must be down to permit merging" msgstr "" -#. Documentation/user/tweaks.itely:3243 (comment) +#. Documentation/user/tweaks.itely:3244 (comment) msgid "Reposition the c2 to the right of the merged note" msgstr "" -#. Documentation/user/tweaks.itely:3379 (comment) -#. Documentation/user/tweaks.itely:3401 (comment) +#. Documentation/user/tweaks.itely:3380 (comment) +#. Documentation/user/tweaks.itely:3402 (comment) msgid "Visible tempo marking" msgstr "" -#. Documentation/user/tweaks.itely:3383 (comment) -#. Documentation/user/tweaks.itely:3405 (comment) +#. Documentation/user/tweaks.itely:3384 (comment) +#. Documentation/user/tweaks.itely:3406 (comment) msgid "Invisible tempo marking to lengthen fermata in MIDI" msgstr "" -#. Documentation/user/tweaks.itely:3386 (comment) -#. Documentation/user/tweaks.itely:3408 (comment) +#. Documentation/user/tweaks.itely:3387 (comment) +#. Documentation/user/tweaks.itely:3409 (comment) msgid "New tempo for next section" msgstr "" -#. Documentation/user/tweaks.itely:3460 (variable) +#. Documentation/user/tweaks.itely:3466 (variable) msgid "emphasize" msgstr "" -#. Documentation/user/tweaks.itely:3464 (variable) +#. Documentation/user/tweaks.itely:3470 (variable) msgid "normal" msgstr "" -#. Documentation/user/tweaks.itely:3470 (variable) +#. Documentation/user/tweaks.itely:3476 (variable) msgid "SopranoMusic" msgstr "" -#. Documentation/user/tweaks.itely:3483 (context id) +#. Documentation/user/tweaks.itely:3489 (context id) #. Documentation/user/input.itely:949 (context id) msgid "Soprano" msgstr "" -#. Documentation/user/tweaks.itely:3692 (comment) +#. Documentation/user/tweaks.itely:3698 (comment) msgid "Arrange to obtain color from color-notehead procedure" msgstr "" @@ -3617,6 +3618,8 @@ msgstr "" #. @node in Documentation/user/setup.itely #. @subsection in Documentation/user/setup.itely +#. @node in Documentation/fr/user/setup.itely +#. @subsection in Documentation/fr/user/setup.itely #. @node in Documentation/es/user/setup.itely #. @subsection in Documentation/es/user/setup.itely #. @node in Documentation/de/user/setup.itely @@ -3625,12 +3628,14 @@ msgid "Setup for MacOS X" msgstr "" #. @subsubheading in Documentation/user/setup.itely +#. @subsubheading in Documentation/fr/user/setup.itely #. @subsubheading in Documentation/es/user/setup.itely #. @subsubheading in Documentation/de/user/setup.itely msgid "Using Python scripts on MacOS 10.3 or 10.4" msgstr "" #. @subsubheading in Documentation/user/setup.itely +#. @subsubheading in Documentation/fr/user/setup.itely #. @subsubheading in Documentation/es/user/setup.itely #. @subsubheading in Documentation/de/user/setup.itely msgid "MacOS X on the command line" @@ -4151,6 +4156,7 @@ msgid "Generating LilyPond files" msgstr "" #. @top in Documentation/user/lilypond.tely +#. @top in Documentation/de/user/lilypond.tely msgid "GNU LilyPond --- Notation Reference" msgstr "" @@ -4180,7 +4186,7 @@ msgstr "" msgid "Musical notation" msgstr "" -#. Documentation/user/pitches.itely:666 (variable) +#. Documentation/user/pitches.itely:688 (variable) #. Documentation/user/input.itely:1033 (variable) #. Documentation/user/input.itely:1052 (variable) #. Documentation/user/input.itely:1089 (variable) @@ -4194,35 +4200,35 @@ msgstr "" msgid "music" msgstr "" -#. Documentation/user/pitches.itely:1039 (comment) +#. Documentation/user/pitches.itely:1082 (comment) msgid "not strictly necessary, but a good reminder" msgstr "" -#. Documentation/user/pitches.itely:1046 (context id) +#. Documentation/user/pitches.itely:1089 (context id) #. Documentation/user/staff.itely:1076 (variable) msgid "clarinet" msgstr "" -#. Documentation/user/pitches.itely:1130 (variable) +#. Documentation/user/pitches.itely:1174 (variable) msgid "musicA" msgstr "" -#. Documentation/user/pitches.itely:1144 (variable) +#. Documentation/user/pitches.itely:1188 (variable) msgid "musicB" msgstr "" -#. Documentation/user/pitches.itely:1163 (context id) -#. Documentation/user/keyboards.itely:171 (context id) -#. Documentation/user/keyboards.itely:265 (context id) +#. Documentation/user/pitches.itely:1207 (context id) +#. Documentation/user/keyboards.itely:175 (context id) +#. Documentation/user/keyboards.itely:274 (context id) #. Documentation/user/percussion.itely:175 (variable) #. Documentation/user/percussion.itely:365 (variable) #. input/lsr/jazz-combo-template.ly:241 (variable) msgid "up" msgstr "" -#. Documentation/user/pitches.itely:1167 (context id) -#. Documentation/user/keyboards.itely:181 (context id) -#. Documentation/user/keyboards.itely:274 (context id) +#. Documentation/user/pitches.itely:1211 (context id) +#. Documentation/user/keyboards.itely:185 (context id) +#. Documentation/user/keyboards.itely:283 (context id) #. Documentation/user/percussion.itely:178 (variable) #. Documentation/user/percussion.itely:366 (variable) #. input/lsr/jazz-combo-template.ly:247 (variable) @@ -5729,7 +5735,7 @@ msgstr "" msgid "Formatting cue notes" msgstr "" -#. Documentation/user/editorial.itely:325 (comment) +#. Documentation/user/editorial.itely:326 (comment) msgid "this is deliberate nonsense; note that the stems remain black" msgstr "" @@ -6460,15 +6466,15 @@ msgstr "" msgid "Printing stanzas at the end in multiple columns" msgstr "" -#. Documentation/user/keyboards.itely:183 (comment) +#. Documentation/user/keyboards.itely:187 (comment) msgid "keep staff alive" msgstr "" -#. Documentation/user/keyboards.itely:266 (context id) +#. Documentation/user/keyboards.itely:275 (context id) msgid "melOne" msgstr "" -#. Documentation/user/keyboards.itely:335 (context id) +#. Documentation/user/keyboards.itely:344 (context id) #. Documentation/user/fretted-strings.itely:244 (context id) #. input/lsr/adding-fingerings-to-tablatures.ly:17 (variable) #. input/lsr/jazz-combo-template.ly:205 (context id) @@ -6476,19 +6482,19 @@ msgstr "" msgid "two" msgstr "" -#. Documentation/user/keyboards.itely:389 (comment) +#. Documentation/user/keyboards.itely:398 (comment) msgid "stems may overlap the other staff" msgstr "" -#. Documentation/user/keyboards.itely:391 (comment) +#. Documentation/user/keyboards.itely:400 (comment) msgid "extend the stems to reach other other staff" msgstr "" -#. Documentation/user/keyboards.itely:393 (comment) +#. Documentation/user/keyboards.itely:402 (comment) msgid "do not print extra flags" msgstr "" -#. Documentation/user/keyboards.itely:395 (comment) +#. Documentation/user/keyboards.itely:404 (comment) msgid "prevent beaming as needed" msgstr "" @@ -6626,11 +6632,17 @@ msgstr "" #. @node in Documentation/user/keyboards.itely #. @unnumberedsubsubsec in Documentation/user/keyboards.itely -msgid "Harp notation" +#. @node in Documentation/es/user/keyboards.itely +#. @unnumberedsubsubsec in Documentation/es/user/keyboards.itely +#. @node in Documentation/de/user/keyboards.itely +#. @unnumberedsubsubsec in Documentation/de/user/keyboards.itely +msgid "References for harps" msgstr "" #. @node in Documentation/user/keyboards.itely #. @unnumberedsubsubsec in Documentation/user/keyboards.itely +#. @node in Documentation/es/user/keyboards.itely +#. @unnumberedsubsubsec in Documentation/es/user/keyboards.itely #. @node in Documentation/de/user/keyboards.itely #. @unnumberedsubsubsec in Documentation/de/user/keyboards.itely msgid "Harp pedals" @@ -6732,24 +6744,24 @@ msgstr "" msgid "A chord for ukelele" msgstr "" -#. Documentation/user/fretted-strings.itely:770 (variable) -#. Documentation/user/fretted-strings.itely:793 (variable) -#. Documentation/user/fretted-strings.itely:822 (variable) -#. Documentation/user/fretted-strings.itely:851 (variable) -#. Documentation/user/fretted-strings.itely:875 (variable) -#. Documentation/user/fretted-strings.itely:919 (variable) +#. Documentation/user/fretted-strings.itely:782 (variable) +#. Documentation/user/fretted-strings.itely:805 (variable) +#. Documentation/user/fretted-strings.itely:834 (variable) +#. Documentation/user/fretted-strings.itely:865 (variable) +#. Documentation/user/fretted-strings.itely:889 (variable) +#. Documentation/user/fretted-strings.itely:937 (variable) msgid "mychords" msgstr "" -#. Documentation/user/fretted-strings.itely:797 (variable) +#. Documentation/user/fretted-strings.itely:809 (variable) msgid "mychordlist" msgstr "" -#. Documentation/user/fretted-strings.itely:906 (comment) +#. Documentation/user/fretted-strings.itely:924 (comment) msgid "add a new chord shape" msgstr "" -#. Documentation/user/fretted-strings.itely:910 (comment) +#. Documentation/user/fretted-strings.itely:928 (comment) msgid "add some new chords based on the power chord shape" msgstr "" @@ -7133,20 +7145,20 @@ msgstr "" msgid "Bagpipe example" msgstr "" -#. Documentation/user/chords.itely:654 (variable) +#. Documentation/user/chords.itely:669 (variable) msgid "myChords" msgstr "" -#. Documentation/user/chords.itely:984 (comment) -#. Documentation/user/chords.itely:1005 (comment) +#. Documentation/user/chords.itely:999 (comment) +#. Documentation/user/chords.itely:1020 (comment) msgid "Put notes on same Staff as figures" msgstr "" -#. Documentation/user/chords.itely:1068 (comment) +#. Documentation/user/chords.itely:1083 (comment) msgid "The extenders are correct here, with the same rhythm as the bass" msgstr "" -#. Documentation/user/chords.itely:1080 (comment) +#. Documentation/user/chords.itely:1095 (comment) msgid "The extenders are incorrect here, even though the timing is the same" msgstr "" @@ -7262,6 +7274,7 @@ msgstr "" #. @rglos in Documentation/user/chords.itely #. @rglos in Documentation/es/user/chords.itely +#. @rglos in Documentation/de/user/chords.itely msgid "figured bass" msgstr "" @@ -8057,11 +8070,11 @@ msgstr "" msgid "now they will collide" msgstr "" -#. Documentation/user/spacing.itely:1788 (comment) +#. Documentation/user/spacing.itely:1789 (comment) msgid "the markup is too close to the following note" msgstr "" -#. Documentation/user/spacing.itely:1791 (comment) +#. Documentation/user/spacing.itely:1793 (comment) msgid "setting outside-staff-horizontal-padding fixes this" msgstr "" @@ -8466,41 +8479,46 @@ msgstr "" msgid "third finger" msgstr "" -#. Documentation/user/changing-defaults.itely:2945 (comment) +#. Documentation/user/changing-defaults.itely:2948 (comment) +#. Documentation/user/changing-defaults.itely:2980 (comment) #. input/lsr/aligning-marks-with-various-notation-objects.ly:39 (comment) msgid "the RehearsalMark will be centered above the Clef" msgstr "" -#. Documentation/user/changing-defaults.itely:2951 (comment) +#. Documentation/user/changing-defaults.itely:2954 (comment) #. input/lsr/aligning-marks-with-various-notation-objects.ly:46 (comment) msgid "the RehearsalMark will be centered above the TimeSignature" msgstr "" -#. Documentation/user/changing-defaults.itely:2965 (comment) +#. Documentation/user/changing-defaults.itely:2974 (comment) +msgid "the RehearsalMark will be centered above the Key Signature" +msgstr "" + +#. Documentation/user/changing-defaults.itely:2994 (comment) msgid "The RehearsalMark will be centered above the KeySignature" msgstr "" -#. Documentation/user/changing-defaults.itely:2972 (comment) -#. Documentation/user/changing-defaults.itely:2988 (comment) -#. Documentation/user/changing-defaults.itely:2995 (comment) +#. Documentation/user/changing-defaults.itely:3001 (comment) +#. Documentation/user/changing-defaults.itely:3017 (comment) +#. Documentation/user/changing-defaults.itely:3024 (comment) msgid "" "The RehearsalMark will be aligned with the left edge of the KeySignature" msgstr "" -#. Documentation/user/changing-defaults.itely:2977 (comment) +#. Documentation/user/changing-defaults.itely:3006 (comment) msgid "" "The RehearsalMark will be aligned with the right edge of the KeySignature" msgstr "" -#. Documentation/user/changing-defaults.itely:2989 (comment) +#. Documentation/user/changing-defaults.itely:3018 (comment) msgid "and then shifted right by 3.5 staff-spaces" msgstr "" -#. Documentation/user/changing-defaults.itely:2996 (comment) +#. Documentation/user/changing-defaults.itely:3025 (comment) msgid "and then shifted left by 2 staff-spaces" msgstr "" -#. Documentation/user/changing-defaults.itely:3045 (variable) +#. Documentation/user/changing-defaults.itely:3073 (variable) msgid "XinO" msgstr "" @@ -8771,6 +8789,8 @@ msgstr "" #. @subsection in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @subsection in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely msgid "Staff symbol properties" msgstr "" @@ -8785,11 +8805,13 @@ msgstr "" #. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely #. @unnumberedsubsubsec in Documentation/es/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely msgid "Using the @code{spanner-interface}" msgstr "" #. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely #. @unnumberedsubsubsec in Documentation/es/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely msgid "Using the @code{line-spanner-interface}" msgstr "" @@ -8797,6 +8819,8 @@ msgstr "" #. @subsection in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @subsection in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely msgid "Visibility of objects" msgstr "" @@ -8867,6 +8891,8 @@ msgstr "" #. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @unnumberedsubsubsec in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely msgid "Rotating layout objects" msgstr "" @@ -8874,6 +8900,8 @@ msgstr "" #. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @unnumberedsubsubsec in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely msgid "Rotating markup" msgstr "" @@ -8899,6 +8927,8 @@ msgstr "" #. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @unnumberedsubsubsec in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely msgid "Setting @code{X-offset} and @code{Y-offset} directly" msgstr "" @@ -8906,6 +8936,8 @@ msgstr "" #. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @unnumberedsubsubsec in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely msgid "Using the @code{side-position-interface}" msgstr "" @@ -8913,16 +8945,20 @@ msgstr "" #. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @unnumberedsubsubsec in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely msgid "Using the @code{self-alignment-interface}" msgstr "" #. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely #. @unnumberedsubsubsec in Documentation/es/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely msgid "Using the @code{aligned-on-parent} procedures" msgstr "" #. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely #. @unnumberedsubsubsec in Documentation/es/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely msgid "Using the @code{centered-on-parent} procedures" msgstr "" @@ -8930,7 +8966,7 @@ msgstr "" #. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @unnumberedsubsubsec in Documentation/es/user/changing-defaults.itely -msgid "Using the @code{break-aligned-interface}" +msgid "Using the @code{break-alignable-interface}" msgstr "" #. @node in Documentation/user/changing-defaults.itely @@ -8966,6 +9002,8 @@ msgstr "" #. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @unnumberedsubsubsec in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely msgid "Modifying ties and slurs" msgstr "" @@ -9292,7 +9330,7 @@ msgstr "" #. @section in Documentation/user/programming-interface.itely #. @subsection in Documentation/fr/user/changing-defaults.itely #. @section in Documentation/es/user/programming-interface.itely -#. @subsection in Documentation/de/user/programming-interface.itely +#. @section in Documentation/de/user/programming-interface.itely msgid "Using Scheme code instead of @code{\\tweak}" msgstr "" @@ -9303,7 +9341,7 @@ msgstr "" #. @node in Documentation/es/user/programming-interface.itely #. @section in Documentation/es/user/programming-interface.itely #. @node in Documentation/de/user/programming-interface.itely -#. @subsection in Documentation/de/user/programming-interface.itely +#. @section in Documentation/de/user/programming-interface.itely msgid "Difficult tweaks" msgstr "" @@ -9563,11 +9601,6 @@ msgstr "" msgid "GNU LilyPond --- Utilisation des programmes" msgstr "" -#. @node in Documentation/fr/user/setup.itely -#. @subsection in Documentation/fr/user/setup.itely -msgid "MacOS X on the command-line" -msgstr "" - #. @section in Documentation/fr/user/running.itely msgid "Updating with @command{convert-ly}" msgstr "" @@ -9835,10 +9868,6 @@ msgstr "" msgid "GNU LilyPond -- Programmbenutzung" msgstr "" -#. @top in Documentation/de/user/lilypond.tely -msgid "GNU LilyPond -- Notationsreferenz" -msgstr "" - #. @chapheading in Documentation/de/user/lilypond.tely msgid "Das Notensatzprogramm" msgstr "" @@ -9848,33 +9877,8 @@ msgid "Ignorieren von Melismen" msgstr "" #. @node in Documentation/de/user/changing-defaults.itely -#. @section in Documentation/de/user/changing-defaults.itely -msgid "Common properties" -msgstr "" - -#. @node in Documentation/de/user/changing-defaults.itely -#. @subsection in Documentation/de/user/changing-defaults.itely -msgid "Controlling visibility of objects" -msgstr "" - -#. @node in Documentation/de/user/changing-defaults.itely -#. @subsection in Documentation/de/user/changing-defaults.itely -msgid "Modifying ends of spanners" -msgstr "" - -#. @node in Documentation/de/user/changing-defaults.itely -#. @section in Documentation/de/user/changing-defaults.itely -msgid "Discussion of specific tweaks" -msgstr "" - -#. @node in Documentation/de/user/changing-defaults.itely -#. @subsection in Documentation/de/user/changing-defaults.itely -msgid "old Contexts explained" -msgstr "" - -#. @node in Documentation/de/user/programming-interface.itely -#. @section in Documentation/de/user/programming-interface.itely -msgid "TODO moved into scheme" +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely +msgid "Using the @code{break-aligned-interface}" msgstr "" #. input/lsr/accordion-discant-symbols.ly:34 (variable) @@ -12225,38 +12229,6 @@ msgstr "" msgid "Test it:" msgstr "" -#. input/lsr/tick-bar-lines.ly:21 (comment) -msgid "Use 'bar-size to control the height of the tick," -msgstr "" - -#. input/lsr/tick-bar-lines.ly:22 (comment) -msgid "and 'extra-offset to determine its position." -msgstr "" - -#. input/lsr/tick-bar-lines.ly:24 (comment) -msgid "With 'extra-offset set to zero, the tick will be" -msgstr "" - -#. input/lsr/tick-bar-lines.ly:25 (comment) -msgid "centered around the middle line of the staff." -msgstr "" - -#. input/lsr/tick-bar-lines.ly:27 (comment) -msgid "Replace Staff.BarLine with Score.BarLine to" -msgstr "" - -#. input/lsr/tick-bar-lines.ly:28 (comment) -msgid "apply the method to the whole score." -msgstr "" - -#. input/lsr/tick-bar-lines.ly:38 (comment) -msgid "Revert the overrides to get back a normal" -msgstr "" - -#. input/lsr/tick-bar-lines.ly:39 (comment) -msgid "bar line at the end." -msgstr "" - #. input/lsr/transcription-of-ancient-music-with-incipit.ly:127 (variable) msgid "incipitDiscantus" msgstr "" diff --git a/Documentation/topdocs/NEWS.tely b/Documentation/topdocs/NEWS.tely index 0632df8578..e095f2541d 100644 --- a/Documentation/topdocs/NEWS.tely +++ b/Documentation/topdocs/NEWS.tely @@ -33,7 +33,7 @@ See user manual, \NAME\ @finalout @node Top -@top New features in 2.11 since 2.10 +@top New features in 2.12 since 2.10 @ifhtml This document is also available in @uref{NEWS.pdf,PDF}. It is part of @@ -62,6 +62,56 @@ which scares away people. @end ignore +@item +Unbeamed 128th notes are now supported: +@lilypond[quote] +\relative c'' { + g128 +} +@end lilypond + +@item +Extending LilyPond's existing support for microtones, there are +now arrowed accidentals for the notation of microtonal alterations. +To use them, redefine the @code{glyph-name-alist} property of +@code{Accidental} as in the following example which uses quartertones +to typeset arrowed accidentals. Alternatively, it is possible to +define separate names for all notes with arrowed accidentals (see +@code{ly/makam.ly} for boilerplate code). + +@lilypond[quote] +microAccs = #'((0 . "accidentals.natural") + (-1/2 . "accidentals.flat") + (1/2 . "accidentals.sharp") + + (1 . "accidentals.doublesharp") + (-1 . "accidentals.flatflat") + + (3/4 . "accidentals.sharp.arrowup") + (1/4 . "accidentals.sharp.arrowdown") + (-1/4 . "accidentals.flat.arrowup") + (-3/4 . "accidentals.flat.arrowdown")) + +\relative c'' { + #(set-accidental-style 'modern) + \override Accidental #'glyph-name-alist = #microAccs + geseh geh aih aisih +} +@end lilypond + +@item +Straight flags (used in old scores of e.g. Bach, but also in different form in +modern scores of e.g. Stockhausen) are now implemented: +@lilypond[quote] +\relative c'' { + \override Stem #'flag = #modern-straight-flag + c,16 \acciaccatura {c'8} d4 d32 + \bar":" + \override Stem #'flag = #old-straight-flag + c,16 \acciaccatura {c'8} d4 d32 +} +@end lilypond + @item @code{\bookpart} blocks may be used to split a book into several parts, separated by a page break, in order to ease the page breaking, or to use @@ -88,7 +138,7 @@ different @code{\paper} settings in different parts. @item Nested contexts of the same type are now allowed. This deprecates @code{InnerStaffGroup} and @code{InnerChoirStaff}. -@lilypond[relative=1] +@lilypond[quote,relative=1] \new StaffGroup << \new Staff { c1 } \new StaffGroup << @@ -101,11 +151,11 @@ This deprecates @code{InnerStaffGroup} and @code{InnerChoirStaff}. @item Percent repeat counters can be shown at regular intervals using the context property @code{repeatCountVisibility}. -@lilypond[relative=1] +@lilypond[quote,relative=1] { \set countPercentRepeats = ##t \set repeatCountVisibility = #(every-nth-repeat-count-visible 2) - \repeat percent 8 { c4 d e f } + \repeat percent 6 { c4 d e f } } @end lilypond @@ -113,7 +163,7 @@ context property @code{repeatCountVisibility}. In addition to the already existing @code{showLastLength} property, @code{showFirstLength} can now be set as well, rendering only the first measures of a piece. Both properties may be set at the same time: -@lilypond[] +@lilypond[quote] showFirstLength = R1*2 showLastLength = R1*3 \relative c' { c1 d e f g a b c } @@ -126,7 +176,7 @@ extension has been changed to @code{.mid}. @item Two variations on the default double repeat bar line are now available. -@lilypond[] +@lilypond[quote] { \set Score.doubleRepeatType = #":|.:" \repeat volta 2 { @@ -144,7 +194,7 @@ Two variations on the default double repeat bar line are now available. Four automatic accidentals rules have been added: @code{neo-modern}, @code{neo-modern-cautionary}, @code{dodecaphonic} and @code{teaching}. The following example illustrates @code{neo-modern} rule. -@lilypond[] +@lilypond[quote] notes = { << \relative c' { @@ -168,7 +218,7 @@ notes = { @item Flags can now be generated with Scheme-code using the @code{'flag} @code{Stem} grob property. Existing scores will work without change. -@lilypond[] +@lilypond[quote] testnotes = { \autoBeamOff c'8 d'16 c''8 d''16 @@ -210,14 +260,14 @@ testnotes = { @item Harp pedalling diagrams were added: -@lilypond[] +@lilypond[quote] \markup { \harp-pedal #"^v-|vv-o^" } @end lilypond @item Predefined, user-configurable, transposable fret diagrams are now available in the @code{FretBoards} context: -@lilypond[] +@lilypond[quote] \include "predefined-guitar-fretboards.ly" << \new ChordNames { @@ -291,7 +341,7 @@ text strings. Metronome marks can now also contain a textual description. The duration and count (if given) are shown in parentheses after the text. -@lilypond[] +@lilypond[quote] { \tempo "Fast" c'4 c' c' c' @@ -312,14 +362,14 @@ duration and count (if given) are shown in parentheses after the text. In figured bass you can now also use a backslash through a number to indicate a raised 6th step. -@lilypond[] +@lilypond[quote] \new FiguredBass \figuremode { < 6\\ 5\\ > < 6/ > } @end lilypond @item Arpeggios may now use ``parenthesis'' style brackets: -@lilypond[relative=1] +@lilypond[quote,relative=1] \override Arpeggio #'stencil = #ly:arpeggio::brew-chord-slur % Note: does not work for cross-staff arpeggios. @@ -400,7 +450,7 @@ their end points. This includes glissando, voice followers, text crescendos and other text spanners. The old syntax for setting text on line spanners is no longer valid. -@lilypond[] +@lilypond[quote] \relative c'' { \override Glissando #'(bound-details right text) = \markup { \center-align \bold down } \override Glissando #'(bound-details right Y) = #-4 @@ -425,7 +475,7 @@ The environment variable @code{LILYPONDPREFIX} has been renamed Notes or rests, such as a typical end note, that fill an entire measure are preceded by some more space. -@lilypond[relative=1] +@lilypond[quote,relative=1] \time 4/4 s1 c2. c4 @@ -443,7 +493,7 @@ Alterations (such as a sharp or flat) may now be arbitrary fractions. This allows some forms of microtonal music. For example, Turkish makam music uses 1/9th tone alterations. -@lilypondfile{makam-example.ly} +@lilypondfile[quote]{makam-example.ly} @item Tie directions may be set with @code{^~} and @code{_~}. @@ -451,7 +501,7 @@ Tie directions may be set with @code{^~} and @code{_~}. @item Tablature now supports harmonics and slides: -@lilypond[relative=1] +@lilypond[quote,relative=1] \new TabVoice { 4 d\2\glissando e2\2 } @@ -463,7 +513,7 @@ This feature was sponsored by Mike Amundsen Horizontal spacing now follows object outlines more accurately. This allows tighter horizontal spacing. -@lilypond[] +@lilypond[quote] { \stemUp c''4... ceses'! s16 @@ -474,7 +524,7 @@ This allows tighter horizontal spacing. Objects that belong outside of the staff are now positioned automatically to avoid collisions. -@lilypond[relative=1] +@lilypond[quote,relative=1] c''4 \once \override TextScript #'self-alignment-X = #CENTER a,4^"this doesn't collide with the c" @@ -487,7 +537,7 @@ a8\f Staves are spaced vertically using a skyline algorithm. This helps prevent uneven vertical spacing. -@lilypond[ragged-right] +@lilypond[quote,ragged-right] %% todo: fix 'landscape PDF. #(set-default-paper-size "a6") diff --git a/Documentation/translations.html.in b/Documentation/translations.html.in index c94c4bc852..ccab36f98b 100644 --- a/Documentation/translations.html.in +++ b/Documentation/translations.html.in @@ -38,7 +38,7 @@ translations.template.html.in; DO NOT EDIT !--> is finished.

-

Last updated Tue Dec 9 09:40:49 UTC 2008 +

Last updated Wed Dec 31 01:23:25 UTC 2008

GNU LilyPond --- Manuel de notation TraducteursGNU LilyPond --- Manuel d'initiation Traducteurs Relecteurs Traduit À jour ouiouipartiellement pré-GDP
1.1 Hauteurs
(3086)		1.1 Hauteurs
(3123)		 Frédéric Chiasson Valentin Villenave
Jean-Charles Malahieude		pré-GDP
1.6 Notation sur la portée
(1635)		1.6 Notation sur la portée
(1701)		 Valentin Villenave
Jean-Charles Malahieude		 John Mandereaupartiellement (70 %)partiellement (69 %) partiellement pré-GDP
1.7 Notation éditoriale
(906)		1.7 Notation éditoriale
(895)		 Jean-Charles Malahieude oui ouiouipartiellement pré-GDP
pré-GDP
2.2 Instruments utilisant des portées multiples
(725)		2.2 Instruments utilisant des portées multiples
(744)		 Valentin Villenave Jean-Charles Malahieude
John Mandereau		partiellement (89 %)partiellementouioui pré-GDP
pré-GDP
2.4 Instruments à cordes frettées
(1759)		2.4 Instruments à cordes frettées
(1850)		 Valentin Villenave Jean-Charles Malahieude
John Mandereau		pré-GDP
2.7 Notation des accords
(1333)		2.7 Notation des accords
(1464)		 Valentin Villenave Jean-Charles Malahieude
John Mandereau		partiellement (64 %)partiellement (61 %) partiellement pré-GDP
2.8 Notations anciennes
(4486)		2.8 Notations anciennes
(4487)		 John Mandereau
Jean-Charles Malahieude		 partiellement (79 %)partiellement (82 %) partiellement pré-GDP
pré-GDP
4 Gestion de l'espace
(8444)		4 Gestion de l'espace
(8451)		 Frédéric Chiasson
Jean-Charles Malahieude		 partiellement (19 %)partiellementpartiellement pré-GDP
5 Modification des réglages prédéfinis
(11291)		5 Modification des réglages prédéfinis
(11391)		 Valentin Villenave Gilles Thibaultpartiellement (33 %)partiellementpartiellement (42 %)partiellement pré-GDP
6 Interfaces pour les programmeurs
(5202)		nonValentin VillenaveGilles Thibaultpartiellement (9 %)partiellement pré-GDP
pré-GDP
B Tables du manuel de notation
(1155)		B Tables du manuel de notation
(1190)		 Frédéric Chiasson
Jean-Charles Malahieude		 partiellement (7 %)partiellementpartiellement pré-GDP
@@ -65,7 +65,8 @@ translations.template.html.in; DO NOT EDIT !--> @@ -83,14 +84,15 @@ translations.template.html.in; DO NOT EDIT !--> - + - - + - + - + - + @@ -507,12 +511,12 @@ translations.template.html.in; DO NOT EDIT !--> - + - + - + - + - - + - + @@ -683,7 +689,10 @@ translations.template.html.in; DO NOT EDIT !--> - @@ -706,11 +715,11 @@ translations.template.html.in; DO NOT EDIT !--> - +
Preface
(411)		 Valentin Villenave
- Ludovic Sardain
+ Ludovic Sardain
+ Damien Heurtebise
translated
up to date
Ludovic Sardain
John Mandereau
Jean-Charles Malahieude
- Jean-Yves Baudais
+ Jean-Yves Baudais
+ Damien Heurtebise
translated
partially up to date
 Till Rettig
Reinhold Kainhofer
translated
- partially up to date
+ up to date
 Francisco Vila
translated
@@ -123,7 +125,7 @@ translations.template.html.in; DO NOT EDIT !--> Jean-Charles Malahieude
John Mandereau
translated
- partially up to date
+ partially up to date
 Till Rettig
Reinhold Kainhofer
@@ -136,7 +138,7 @@ translations.template.html.in; DO NOT EDIT !-->
4 Tweaking output
(14581)		4 Tweaking output
(14647)		 Valentin Villenave
Nicolas Klutchnikoff
Damien Heurtebise
@@ -242,7 +244,9 @@ translations.template.html.in; DO NOT EDIT !-->
2 Setup
(1149)		 not translated
+ 		Jean-Charles Malahieude
+ translated
+ up to date
 Till Rettig
Reinhold Kainhofer
@@ -261,7 +265,7 @@ translations.template.html.in; DO NOT EDIT !--> 		Reinhold Kainhofer
Till Rettig
translated
- partially up to date
+ up to date
 Francisco Vila
translated
@@ -269,7 +273,7 @@ translations.template.html.in; DO NOT EDIT !-->
4 @command{lilypond-book}: Integrating text and music
(3185)		4 @command{lilypond-book}: Integrating text and music
(3248)		 not translated
 Reinhold Kainhofer
@@ -286,7 +290,7 @@ translations.template.html.in; DO NOT EDIT !--> 		5 Converting from other formats
(1171)		 Jean-Charles Malahieude
translated
- partially up to date
+ up to date
 Reinhold Kainhofer
Till Rettig
@@ -328,19 +332,19 @@ translations.template.html.in; DO NOT EDIT !--> 		John Mandereau
Jean-Charles Malahieude
translated
- up to date
+ partially up to date
 Till Rettig
translated
- up to date
+ partially up to date
 Francisco Vila
translated
- up to date
+ partially up to date
1.1 Pitches
(3086)		1.1 Pitches
(3123)		 Frédéric Chiasson
Valentin Villenave
Jean-Charles Malahieude
@@ -426,24 +430,24 @@ translations.template.html.in; DO NOT EDIT !-->
1.6 Staff notation
(1635)		1.6 Staff notation
(1701)		 Valentin Villenave
Jean-Charles Malahieude
John Mandereau
- partially translated (70 %)
+ partially translated (69 %)
partially up to date
 Till Rettig
translated
- up to date
+ partially up to date
 Francisco Vila
translated
- up to date
+ partially up to date
1.7 Editorial annotations
(906)		1.7 Editorial annotations
(895)		 Jean-Charles Malahieude
translated
partially up to date
@@ -467,7 +471,7 @@ translations.template.html.in; DO NOT EDIT !--> 		Till Rettig
translated
- partially up to date
+ up to date
 Francisco Vila
translated
@@ -479,15 +483,15 @@ translations.template.html.in; DO NOT EDIT !--> 		John Mandereau
Jean-Charles Malahieude
translated
- up to date
+ partially up to date
 Till Rettig
translated
- up to date
+ partially up to date
 Francisco Vila
translated
- up to date
+ partially up to date
2.2 Keyboard and other multi-staff instruments
(725)		2.2 Keyboard and other multi-staff instruments
(744)		 Valentin Villenave
Jean-Charles Malahieude
John Mandereau
- partially translated (89 %)
- partially up to date
+ translated
+ up to date
 Till Rettig
translated
@@ -533,7 +537,7 @@ translations.template.html.in; DO NOT EDIT !--> 		Till Rettig
translated
- partially up to date
+ up to date
 Francisco Vila
translated
@@ -541,7 +545,7 @@ translations.template.html.in; DO NOT EDIT !-->
2.4 Fretted string instruments
(1759)		2.4 Fretted string instruments
(1850)		 Valentin Villenave
Jean-Charles Malahieude
John Mandereau
@@ -592,16 +596,16 @@ translations.template.html.in; DO NOT EDIT !-->
2.7 Chord notation
(1333)		2.7 Chord notation
(1464)		 Valentin Villenave
Jean-Charles Malahieude
John Mandereau
- partially translated (64 %)
+ partially translated (61 %)
partially up to date
 Till Rettig
- partially translated (64 %)
- partially up to date
+ translated
+ up to date
 Francisco Vila
translated
@@ -609,15 +613,15 @@ translations.template.html.in; DO NOT EDIT !-->
2.8 Ancient notation
(4486)		2.8 Ancient notation
(4487)		 John Mandereau
Jean-Charles Malahieude
- partially translated (79 %)
+ partially translated (82 %)
partially up to date
 Till Rettig
partially translated (79 %)
- partially up to date
+ up to date
 Francisco Vila
translated
@@ -628,7 +632,9 @@ translations.template.html.in; DO NOT EDIT !--> 		2.9 World music
(1115)		 not translated
 not translated
+ 		Till Rettig
+ translated
+ up to date
 Francisco Vila
translated
@@ -643,8 +649,8 @@ translations.template.html.in; DO NOT EDIT !--> partially up to date
 Till Rettig
- partially translated (5 %)
- partially up to date
+ translated
+ up to date
 Francisco Vila
translated
@@ -652,15 +658,15 @@ translations.template.html.in; DO NOT EDIT !-->
4 Spacing issues
(8444)		4 Spacing issues
(8451)		 Frédéric Chiasson
Jean-Charles Malahieude
partially translated (19 %)
- partially up to date
+ partially up to date
 Till Rettig
partially translated (3 %)
- partially up to date
+ up to date
 Francisco Vila
translated
@@ -668,11 +674,11 @@ translations.template.html.in; DO NOT EDIT !-->
5 Changing defaults
(11291)		5 Changing defaults
(11391)		 Valentin Villenave
Gilles Thibault
- partially translated (33 %)
- partially up to date
+ partially translated (42 %)
+ partially up to date
 not translated
6 Interfaces for programmers
(5202)		 not translated
+ 		Valentin Villenave
+ Gilles Thibault
+ partially translated (9 %)
+ partially up to date
 not translated
B Notation manual tables
(1155)		B Notation manual tables
(1190)		 Frédéric Chiasson
Jean-Charles Malahieude
partially translated (7 %)
- partially up to date
+ partially up to date
 Till Rettig
translated
@@ -729,7 +738,7 @@ translations.template.html.in; DO NOT EDIT !--> 		Till Rettig
translated
- partially up to date
+ up to date
 Francisco Vila
translated
diff --git a/Documentation/user/README.txt b/Documentation/user/README.txt index 85cae0eed8..cb344d3afa 100644 --- a/Documentation/user/README.txt +++ b/Documentation/user/README.txt @@ -10,6 +10,6 @@ General policy: policy.txt %%%%% UPDATING DOCS cd into Documentation and run -find -name '*.itely' | xargs convert-ly -e +find . -name '*.itely' | xargs convert-ly -e (This also updates translated docs.) diff --git a/Documentation/user/ancient.itely b/Documentation/user/ancient.itely index 56960581c9..493d3123fe 100644 --- a/Documentation/user/ancient.itely +++ b/Documentation/user/ancient.itely @@ -7,7 +7,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.12.0" @node Ancient notation @section Ancient notation @@ -728,7 +728,7 @@ There are no 32th and 64th rests specifically for the mensural or neo-mensural style. Instead, the rests from the default style will be taken. -See @rlsr{Pitches,rests} for a chart of all rests. +See @rlsr{Ancient notation} for a chart of all rests. @seealso Notation Reference: @ref{Rests}, gives a general introduction into the use of diff --git a/Documentation/user/changing-defaults.itely b/Documentation/user/changing-defaults.itely index f3ba95a48a..1e78fe3383 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.65" +@c \version "2.12.0" @node Changing defaults @chapter Changing defaults @@ -766,7 +766,7 @@ ossia = { f4 f f f } \relative c' \new Staff = "main" { c4 c c c << - \new Staff \with {alignAboveContext=main} \ossia + \new Staff \with { alignAboveContext = #"main" } \ossia { d8 f d f d f d f } >> } @@ -2761,7 +2761,7 @@ marks on such objects. * Setting @code{X-offset} and @code{Y-offset} directly:: * Using the @code{side-position-interface}:: * Using the @code{self-alignment-interface}:: -* Using the @code{break-aligned-interface}:: +* Using the @code{break-alignable-interface}:: @end menu @node Setting @code{X-offset} and @code{Y-offset} directly @@ -2928,17 +2928,20 @@ example shows the difference: @c TODO The align-interface, BassFigureAlignment and VerticalAlignment -@node Using the @code{break-aligned-interface} -@unnumberedsubsubsec Using the @code{break-aligned-interface} +@node Using the @code{break-alignable-interface} +@unnumberedsubsubsec Using the @code{break-alignable-interface} -Rehearsal marks may be aligned with notation objects other -than bar lines. These objects include @code{ambitus}, +@cindex align to objects +@cindex break-align-symbols + +Rehearsal marks and bar numbers may be aligned with notation +objects other than bar lines. These objects include @code{ambitus}, @code{breathing-sign}, @code{clef}, @code{custos}, @code{staff-bar}, @code{left-edge}, @code{key-cancellation}, @code{key-signature}, and @code{time-signature}. -By default, rehearsal marks will be horizontally centered above the -object: +By default, rehearsal marks and bar numbers will be horizontally +centered above the object: @lilypond[verbatim,quote,relative=1] e1 @@ -2957,6 +2960,32 @@ e e2. @end lilypond +A list of possible target alignment objects may be specified. If +some of the objects are invisible at that point due to the setting +of @code{break-visibility} or the explicit visibility settings for +keys and clefs, the rehearsal mark or bar number is aligned to the +first object in the list which is visible. If no objects in the +list are visible the object is aligned to the bar line. If the bar +line is invisible the object is aligned to the place where the bar +line would be. + +@lilypond[verbatim,quote,relative=1] +e1 +% the RehearsalMark will be centered above the Key Signature +\override Score.RehearsalMark #'break-align-symbols = #'(key-signature clef) +\key a \major +\clef treble +\mark "↓" +e +% the RehearsalMark will be centered above the Clef +\set Staff.explicitKeySignatureVisibility = #all-invisible +\override Score.RehearsalMark #'break-align-symbols = #'(key-signature clef) +\key a \minor +\clef bass +\mark "↓" +e, +@end lilypond + The alignment of the rehearsal mark relative to the notation object can be changed, as shown in the following example. In a score with multiple staves, this setting should be done for all the staves. @@ -3001,7 +3030,6 @@ e @end lilypond - @node Vertical grouping of grobs @subsection Vertical grouping of grobs diff --git a/Documentation/user/cheatsheet.itely b/Documentation/user/cheatsheet.itely index ecea91dc8b..87d48f9621 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.61" +@c \version "2.12.0" @c TODO: add tablature. diff --git a/Documentation/user/chords.itely b/Documentation/user/chords.itely index c66c74f224..5b5422b6f6 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.61" +@c \version "2.12.0" @node Chord notation @@ -139,7 +139,10 @@ Seventh chords can be created: @funindex m The table belows shows the actions of the quality modifiers on -triads and seventh chords. A more complete table of modifier usage +triads and seventh chords. The default seventh step added to +chords is a minor or flatted seventh, which makes the dominant +seventh the basic seventh chord. All alterations are relative to +the dominant seventh. A more complete table of modifier usage is found at @ref{Common chord modifiers}. @c @table @code @@ -167,8 +170,7 @@ The default action; produces a major triad. @item m, m7 @tab -The minor chord. This modifier lowers the 3rd and (if present) the -7th step. +The minor chord. This modifier lowers the 3rd. @tab @lilypond[line-width=4\cm, noragged-right] \chordmode { @@ -222,11 +224,20 @@ to create a major triad. @seealso Notation Reference: -@ref{Common chord modifiers}. +@ref{Common chord modifiers}, +@ref{Extended and altered chords}. Snippets: @rlsr{Chords}. +@knownissues +Only one quality modifier should be used per chord, typically on the +highest step present in the chord. Chords with more than quality +modifier will be parsed without an error or warning, but the results +are unpredictable. Chords that cannot be achieved with a single +quality modifier should be altered by individual pitches, as described +in @ref{Extended and altered chords}. + @node Extended and altered chords @unnumberedsubsubsec Extended and altered chords @@ -242,6 +253,8 @@ or create an inversion. The first number following the @code{:} is taken to be the extent of the chord. The chord is constructed by sequentially adding thirds to the root until the specified number has been reached. +Note that the seventh step added as part of an extended chord will be the +minor or flatted seventh, not the major seventh. If the extent is not a third (e.g., 6), thirds are added up to the highest third below the extent, and then the step of the extent is added. The largest possible value for the extent is 13. Any @@ -272,7 +285,9 @@ is added explicitly). @cindex additions, in chords Individual steps can be added to a chord. Additions follow the -extent and are prefixed by a dot (@code{.}). +extent and are prefixed by a dot (@code{.}). The basic seventh +step added to a chord is the minor or flatted seventh, rather than +the major seventh. @lilypond[quote,verbatim,fragment,relative=1] \chordmode { diff --git a/Documentation/user/converters.itely b/Documentation/user/converters.itely index a3fb1df8e7..5c7a6f6187 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.61" +@c \version "2.12.0" @node Converting from other formats @chapter Converting from other formats diff --git a/Documentation/user/dedication.itely b/Documentation/user/dedication.itely index 0199244ff1..cc0b4598e5 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.61" +@c \version "2.12.0" @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 568356bef9..1e27735536 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.61" +@c \version "2.12.0" @node Editorial annotations @section Editorial annotations diff --git a/Documentation/user/expressive.itely b/Documentation/user/expressive.itely index 17bc053ee0..86dd7e4dff 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.61" +@c \version "2.12.0" @node Expressive marks @section Expressive marks @@ -119,6 +119,8 @@ may be manually placed above or below the staff, see @lilypondfile[verbatim,lilyquote,texidoc,doctitle] {controlling-the-vertical-ordering-of-scripts.ly} +@lilypondfile[verbatim,lilyquote,texidoc,doctitle] +{creating-a-delayed-turn.ly} @seealso Music Glossary: @@ -583,6 +585,11 @@ g4( e c2) @lilypondfile[verbatim,lilyquote,texidoc,doctitle] {using-double-slurs-for-legato-chords.ly} +@c TODO remove ignores after LSR update +@ignore +@lilypondfile[verbatim,lilyquote,texidoc,doctitle] +{positioning-text-markups-inside-slurs} +@end ignore @seealso Music Glossary: diff --git a/Documentation/user/fretted-strings.itely b/Documentation/user/fretted-strings.itely index 84a68f466f..2ca609be58 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.65" +@c \version "2.12.0" @node Fretted string instruments @section Fretted string instruments @@ -59,15 +59,18 @@ Some other elements pertinent to fretted string instruments are covered elsewhere: @itemize -@item Fingerings are indicated with @ref{Fingering instructions}. +@item Fingerings are indicated as shown in @ref{Fingering instructions}. @item Instructions for @notation{Laissez vibrer} ties -as well as ties on arpeggios and tremolos is described in +as well as ties on arpeggios and tremolos can be found in @ref{Ties}. -@item Instructions on handling multiple voices is described +@item Instructions for handling multiple voices can be found in @ref{Collision resolution}. +@item Instructions for indicating harmonics can be found in +@ref{Harmonics}. + @end itemize @@ -604,14 +607,18 @@ element of the list indicates an item to be placed on the fret diagram. @end lilypond Fingering indications and barres can be included in a -fret-diagram-verbose markup string. +fret-diagram-verbose markup string. Unique to the +fret-diagram-verbose interface is a capo indication that +can be placed on the fret diagram. The capo indication is +a thick bar that covers all strings. The fret with the +capo will be the lowest fret in the fret diagram. @c \override is necessary to make fingering visible @lilypond[quote, verbatim] << \context ChordNames { \chordmode { - f1 g + f1 g c } } \context Staff { @@ -638,7 +645,15 @@ fret-diagram-verbose markup string. (open 2) (place-fret 1 3 3) ) - } + < c e g c' e'> ^\markup + \fret-diagram-verbose #'( + (capo 3) + (mute 6) + (place-fret 4 5 1) + (place-fret 3 5 2) + (place-fret 2 5 3) + ) + } >> @end lilypond @@ -838,8 +853,10 @@ mychords = \chordmode{ @cindex adding custom fret diagrams Fret diagrams can be added to the fret diagram table. To add a diagram, -you must specify the chord for the diagram, the tuning to be used, and the -fret-diagram-terse definition string for the diagram. +you must specify the chord for the diagram, the tuning to be used, and +a definition for the diagram. The diagram definition can be either a +fret-diagram-terse definition string or a fret-diagram-verbose +marking list. @lilypond[verbatim, ragged-right, quote] \include "predefined-guitar-fretboards.ly" @@ -870,7 +887,7 @@ octaves of pitches. \storePredefinedDiagram \chordmode {c'} #guitar-tuning - #(offset-fret 2 (chord-shape 'bes)) + #(offset-fret 2 (chord-shape 'bes guitar-tuning)) mychords = \chordmode{ c1 c' @@ -898,23 +915,27 @@ In addition to fret diagrams, LilyPond stores an internal list of chord shapes. The chord shapes are fret diagrams that can be shifted along the neck to different posistions to provide different chords. Chord shapes can be added to the internal list and then used to define -predefined fret diagrams. +predefined fret diagrams. Because they can be moved to various +positions on the neck, chord shapes will normally not contain +any open strings. Like fret diagrams, chord shapes can be +entered as either fret-diagram-terse strings or fret-diagram-verbose +marking lists. @lilypond[verbatim, ragged-right, quote] \include "predefined-guitar-fretboards.ly" % add a new chord shape -\addChordShape #'powerf #"1-1;3-3;3-4;x;x;x;" +\addChordShape #'powerf #guitar-tuning #"1-1;3-3;3-4;x;x;x;" % add some new chords based on the power chord shape \storePredefinedDiagram \chordmode {f'} #guitar-tuning - #(chord-shape 'powerf) + #(chord-shape 'powerf guitar-tuning) \storePredefinedDiagram \chordmode {g'} #guitar-tuning - #(offset-fret 2 (chord-shape 'powerf)) + #(offset-fret 2 (chord-shape 'powerf guitar-tuning)) mychords = \chordmode{ f1 f' g g' diff --git a/Documentation/user/fundamental.itely b/Documentation/user/fundamental.itely index 85259baea4..355a338746 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.61" +@c \version "2.12.0" @node Fundamental concepts @chapter Fundamental concepts @@ -447,7 +447,7 @@ as follows: << { f c c } \new Staff \with { - alignAboveContext = "main" } + alignAboveContext = #"main" } { f8 f c } >> r4 | @@ -2514,29 +2514,29 @@ lower = \relative c, { << % combine ChoirStaff and PianoStaff in parallel \new ChoirStaff << \new Staff = "sopranos" << - \set Staff.instrumentName = "Soprano" + \set Staff.instrumentName = #"Soprano" \new Voice = "sopranos" { \global \sopranoMusic } >> \new Lyrics \lyricsto "sopranos" { \sopranoWords } \new Staff = "altos" << - \set Staff.instrumentName = "Alto" + \set Staff.instrumentName = #"Alto" \new Voice = "altos" { \global \altoMusic } >> \new Lyrics \lyricsto "altos" { \altoWords } \new Staff = "tenors" << - \set Staff.instrumentName = "Tenor" + \set Staff.instrumentName = #"Tenor" \new Voice = "tenors" { \global \tenorMusic } >> \new Lyrics \lyricsto "tenors" { \tenorWords } \new Staff = "basses" << - \set Staff.instrumentName = "Bass" + \set Staff.instrumentName = #"Bass" \new Voice = "basses" { \global \bassMusic } >> \new Lyrics \lyricsto "basses" { \bassWords } >> % end ChoirStaff \new PianoStaff << - \set PianoStaff.instrumentName = "Piano" + \set PianoStaff.instrumentName = #"Piano" \new Staff = "upper" \upper \new Staff = "lower" \lower >> @@ -2567,22 +2567,22 @@ Doing this gives for our ChoirStaff: @example \new ChoirStaff << \new Staff = "sopranos" << - \set Staff.instrumentName = "Soprano" + \set Staff.instrumentName = #"Soprano" \new Voice = "sopranos" @{ \global \sopranoMusic @} >> \new Lyrics \lyricsto "sopranos" @{ \sopranoWords @} \new Staff = "altos" << - \set Staff.instrumentName = "Alto" + \set Staff.instrumentName = #"Alto" \new Voice = "altos" @{ \global \altoMusic @} >> \new Lyrics \lyricsto "altos" @{ \altoWords @} \new Staff = "tenors" << - \set Staff.instrumentName = "Tenor" + \set Staff.instrumentName = #"Tenor" \new Voice = "tenors" @{ \global \tenorMusic @} >> \new Lyrics \lyricsto "tenors" @{ \tenorWords @} \new Staff = "basses" << - \set Staff.instrumentName = "Bass" + \set Staff.instrumentName = #"Bass" \new Voice = "basses" @{ \global \bassMusic @} >> \new Lyrics \lyricsto "basses" @{ \bassWords @} @@ -2595,7 +2595,7 @@ easy - we just pull out the piano part from the @example \new PianoStaff << - \set PianoStaff.instrumentName = "Piano " + \set PianoStaff.instrumentName = #"Piano " \new Staff = "upper" \upper \new Staff = "lower" \lower >> @@ -2632,7 +2632,7 @@ stacked one above the other: >> % end ChoirStaff \new PianoStaff << - \set PianoStaff.instrumentName = "Piano" + \set PianoStaff.instrumentName = #"Piano" \new Staff = "upper" \upper \new Staff = "lower" \lower >> @@ -2685,29 +2685,29 @@ lower = \relative c, { << % combine ChoirStaff and PianoStaff in parallel \new ChoirStaff << \new Staff = "sopranos" << - \set Staff.instrumentName = "Soprano" + \set Staff.instrumentName = #"Soprano" \new Voice = "sopranos" { \global \sopranoMusic } >> \new Lyrics \lyricsto "sopranos" { \sopranoWords } \new Staff = "altos" << - \set Staff.instrumentName = "Alto" + \set Staff.instrumentName = #"Alto" \new Voice = "altos" { \global \altoMusic } >> \new Lyrics \lyricsto "altos" { \altoWords } \new Staff = "tenors" << - \set Staff.instrumentName = "Tenor" + \set Staff.instrumentName = #"Tenor" \new Voice = "tenors" { \global \tenorMusic } >> \new Lyrics \lyricsto "tenors" { \tenorWords } \new Staff = "basses" << - \set Staff.instrumentName = "Bass" + \set Staff.instrumentName = #"Bass" \new Voice = "basses" { \global \bassMusic } >> \new Lyrics \lyricsto "basses" { \bassWords } >> % end ChoirStaff \new PianoStaff << - \set PianoStaff.instrumentName = "Piano " + \set PianoStaff.instrumentName = #"Piano " \new Staff = "upper" \upper \new Staff = "lower" \lower >> diff --git a/Documentation/user/input.itely b/Documentation/user/input.itely index 51f50b887e..c990b3ba4e 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.61" +@c \version "2.12.0" @node General input and output @chapter General input and output @@ -1449,13 +1449,13 @@ The name should be chosen from the list in @ref{MIDI instruments}. @example \new Staff @{ - \set Staff.midiInstrument = "glockenspiel" + \set Staff.midiInstrument = #"glockenspiel" @var{...notes...} @} @end example @example -\new Staff \with @{midiInstrument = "cello"@} @{ +\new Staff \with @{midiInstrument = #"cello"@} @{ @var{...notes...} @} @end example @@ -1701,7 +1701,7 @@ found, or calls the default function otherwise. \score { \new Staff { - \set Staff.midiInstrument = "cello" + \set Staff.midiInstrument = #"cello" \set Score.dynamicAbsoluteVolumeFunction = #myDynamics \new Voice { \relative c'' { diff --git a/Documentation/user/install.itely b/Documentation/user/install.itely index 490287bc77..1b2f4df6ef 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.61" +@c \version "2.12.0" @ifclear INSTALL @node Install diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely index 97b3f09b1d..a27db04c10 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.61" +@c \version "2.12.0" @node Introduction @chapter Introduction diff --git a/Documentation/user/keyboards.itely b/Documentation/user/keyboards.itely index 50d2b8119c..846a27443a 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.61" +@c \version "2.12.0" @node Keyboard and other multi-staff instruments @section Keyboard and other multi-staff instruments @@ -600,10 +600,10 @@ repeats} @seealso Notation Reference: -@ruser{Tremolo repeats} -@ruser{Glissando} -@ruser{Arpeggio} -@ruser{Harmonics} +@ref{Tremolo repeats} +@ref{Glissando} +@ref{Arpeggio} +@ref{Harmonics} @node Harp pedals @unnumberedsubsubsec Harp pedals @@ -642,5 +642,5 @@ position (sharpened pitch), and @code{|} is the divider. A prefixed @seealso Notation Reference: -@ruser{Text scripts} -@ruser{Instrument Specific Markup} +@ref{Text scripts} +@ref{Instrument Specific Markup} diff --git a/Documentation/user/lilypond-book.itely b/Documentation/user/lilypond-book.itely index 0eaae36f64..5d9a1f8593 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.61" +@c \version "2.12.0" @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 5d7b1a4126..cf05679e64 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.61" +@c \version "2.12.0" @node Literature list @appendix Literature list diff --git a/Documentation/user/music-glossary.tely b/Documentation/user/music-glossary.tely index 9cd294fc72..6e779da344 100644 --- a/Documentation/user/music-glossary.tely +++ b/Documentation/user/music-glossary.tely @@ -688,18 +688,33 @@ An accidental alters a note by: @item Canceling the effects of the key signature or previous accidentals. @end itemize -@lilypond[fragment,notime,line-width=13.0\cm] -\set Score.automaticBars = ##f -<< - \context Staff \relative c'' { - \set Staff.extraNatural = ##f - gisis1 gis g! ges geses +@lilypond[quote,notime] +\score { + \new Staff { + \relative c'' { + \set Staff.extraNatural = ##f + gisis1 gis g! ges geses + } } - \lyrics { - \override Lyrics .LyricText #'self-alignment-X = #-1 - "db. sharp" sharp natural flat "db. flat" + \addlyrics { + \markup { + \center-column { double sharp } + } + sharp + natural + flat + \markup { + \center-column { double flat } + } } ->> + \layout { + \context { + \Score + \override SpacingSpanner + #'base-shortest-duration = #(ly:make-moment 1 32) + } + } +} @end lilypond @@ -753,25 +768,22 @@ that the sound should fade away to nothing. @notation{Al niente} is indicated by circling the tip of the hairpin: -@lilypond[fragment,ragged-right] -\relative c'' { - \override Hairpin #'circled-tip = ##t - c1\< - c2\> c\< - c1\! -} +@lilypond[quote,relative=2] +\override Hairpin #'circled-tip = ##t +c1\< +c2\> c\< +c1\! @end lilypond -or with the actual phrase @notation{al niente}. This may be easier with -text markup, rather than as part of the @notation{decrescendo} text: +or with the actual phrase @notation{al niente}: -@lilypond[fragment,ragged-right] -\relative c'' { - \dimTextDecresc - c1~\> - c~ - c\!-\markup { \italic "al niente" } -} +@lilypond[quote,relative=2] +\dimTextDecresc +\override DynamicTextSpanner #'(bound-details right text) = + \markup { \italic { al niente } } +c1\> ~ +c1 ~ +c1\! @end lilypond Since one does not crescendo @emph{to} nothing, it is not correct to use @@ -899,15 +911,17 @@ S: upptakt, FI: kohotahti. An anacrusis (also known as pickup or upbeat) is an incomplete measure -of music before a section of music. It also refers to the initial +of music before a section of music. It also refers to the initial note(s) of a melody occurring in that incomplete measure. -@lilypond[fragment,line-width=13.0\cm] +@lilypond[quote,relative=1] \key f \major \time 4/4 -\relative c' { - \partial 4 f4 | bes4. a8 bes4 c | - bes( a) g f | bes4. a8 bes4 c | f,2. \bar "||" } +\partial 4 f4 +bes4. a8 bes4 c +bes4( a) g f +bes4. a8 bes4 c +f,2. \bar "||" @end lilypond @@ -929,10 +943,8 @@ FI: luonnollinen molliasteikko. Also called @q{natural minor scale}. -@lilypond[fragment,notime,line-width=13.0\cm] -\set Score.automaticBars = ##f -\relative c'' { - a1 b c d e f g a } +@lilypond[quote,notime,relative=2] +a1 b c d e f g a @end lilypond @@ -980,45 +992,43 @@ before the beat. While the short appoggiatura is performed as a short note regardless of the duration of the main note the duration of the long appoggiatura is proportional to that of the main note. -@lilypond[line-width=13.0\cm] -\context Voice \relative c'' { - \key d \major - \time 4/4 - -%\override Score.TextScript #'font-style = #'large - 4_"notation" r - { \override Stem #'flag-style = #'() - \grace g16 - \revert Stem #'flag-style - } - fis8 e16 fis - { \override Stem #'flag-style = #'() - \grace a16 - \revert Stem #'flag-style - } - g8 fis16 g | - \cadenzaOn a4 \bar "||" \cadenzaOff - - 4_"performance" r g16 ( fis) e fis a ( g) fis g | - \cadenzaOn a4 \bar "||" \cadenzaOff -} +@lilypond[quote,relative=2] +\key d \major +\time 4/4 +4_"notation" r +\grace g16 +fis8 e16 fis +\grace a16 +g8 fis16 g | +a4 \bar "||" + +\set Score.measurePosition = #ZERO-MOMENT +4_"performance" r +g16( fis) e fis +a16 ( g) fis g | +a4 \bar "||" @end lilypond An appoggiatura may have more notes preceding the main note. -@lilypond[line-width=13.0\cm] -\relative c'' { - \key as \major - \time 2/4 -% \override Score.TextScript #'font-style = #'large - \grace { bes16 } as8_"notation" as16 bes as8 g | - \grace { as16[( bes] } < c as >4-) - \grace { as16[( bes] } < c as >4-) \bar "||" - \grace { bes16 } as8_"performance" as16 bes as8 g | - << \context Voice = va { \stemUp\tieUp as32 bes c8. as32 bes c8. } - \context Voice = vb { \stemDown\tieDown as16 ~ as8. as16 ~ as8. } >> - \bar "||" -} +@lilypond[quote,relative=2] +\key as \major +\time 2/4 +\grace bes16 as8-"notation" as16 bes as8 g | +\grace { as16[( bes] } 4) +\grace { as16[( bes] } 4) \bar "||" + +\grace bes16 as8-"performance" as16 bes as8 g | +<< + { + \voiceOne + as32 bes c8. as32 bes c8. + } + \new Voice { + \voiceTwo + as16 ~ as8. as16 ~ as8. + } +>> @end lilypond @@ -1040,22 +1050,33 @@ FI: arpeggio, murtosointu. [Italian: @q{harp-like, played like a harp}.] -@lilypond[fragment,line-width=13.0\cm] - \context PianoStaff << - \context Staff = SA \relative c'' { - \time 4/4 - \clef treble - r8 g16 c e g, c e r8 g,16 c e g, c e | - r8 a,16 d f a, d f r8 a,16 d f a, d f \bar "||" } - \context Staff = SB \relative c' { - \clef bass - << \context Voice = va { - \stemUp - r16 e8. ( e4) r16 e8. ( e4) | - r16 d8. ( d4) r16 d8. ( d4) } - \context Voice = vb { - \stemDown - c2 c | c c } >> +@lilypond[quote,line-width=13\cm] +\new PianoStaff << + \context Staff = "SA" { + \relative c'' { + \clef treble + \time 4/4 + r8 g16 c e g, c e r8 g,16 c e g, c e + r8 a,16 d f a, d f r8 a,16 d f a, d f + \bar "||" + } + } + \context Staff = "SB" { + \relative c' { + \clef bass + << + { + \voiceOne + r16 e8. ( e4) r16 e8. ( e4) + r16 d8. ( d4) r16 d8. ( d4) + } + \new Voice { + \voiceTwo + c2 c + c2 c + } + >> + } } >> @end lilypond @@ -1327,14 +1348,11 @@ FI: palkki. Line connecting a series of notes (shorter than a quarter note). The number of beams determines the note value of the connected notes. -@lilypond[fragment,notime,line-width=13.0\cm] -\set Score.automaticBars = ##f -%\override TextScript #'font-style = #'large -\relative c'' { - g8_"1/8"[ g g g] s16 - g16_"1/16"[ g g g] s16 - g32_"1/32"[ s32 g32 s32 g32 s32 g32] s16 - g64_"1/64"[ s32 g64 s32 g64 s32 g64] s32 } +@lilypond[quote,notime,relative=2,line-width=13\cm] +g8-"1/8"[ g g g] s16 +g16-"1/16"[ g g g] s +g32-"1/32"[ s g s g s g] s16 +g64-"1/64"[ s32 g64 s32 g64 s32 g64] s32 @end lilypond @@ -1358,12 +1376,12 @@ Note value used for counting, most often half-, fourth-, and eighth notes. The base counting value and the number of them in each measure is indicated at the start of the music by the @notation{time signature}. -@lilypond[fragment,line-width=13.0\cm] +@lilypond[quote,relative=2] \key g \major \time 4/4 -\relative c'' { g4 c b a | g1 \bar "||"} +g4 c b a | g1 \bar "||" \time 3/8 -\relative c'' { g8 d' c | b c a | g4. \bar "||"} +g8 d' c | b c a | g4. \bar "||" @end lilypond @@ -1405,19 +1423,42 @@ Curly braces are used for connecting piano staves, and sometimes for connecting the staves of like instruments in an orchestral score when written on different staves (e.g. first and second flutes): -@lilypond[fragment,ragged-right] -\context GrandStaff << - \relative c''\context Staff = SA { \clef treble g4 e c2 } - \relative c \context Staff = SB { \clef bass c1 \bar "|." } >> +@lilypond[quote] +\new GrandStaff << + \context Staff = "SA" { + \relative c'' { + \clef treble + g4 e c2 + } + } + \context Staff = "SB" { + \relative c { + \clef bass + c1 + \bar "|." + } + } +>> @end lilypond Angular brackets for connecting parts in an orchestral or choral score: -@lilypond[fragment,ragged-right] -\context StaffGroup << -% \set StaffGroup.minVerticalAlign = #12 - \relative c'' \context Staff = SA { \clef treble g4 e c2 } - \relative c \context Staff = SB { \clef bass c1 \bar "|." } >> +@lilypond[quote] +\new StaffGroup << + \context Staff = "SA" { + \relative c'' { + \clef treble + g4 e c2 + } + } + \context Staff = "SB" { + \relative c { + \clef bass + c1 + \bar "|." + } + } +>> @end lilypond @@ -1456,7 +1497,7 @@ FI: vaskisoitin. A family of blown musical instruments made of brass, all using a cup formed mouth piece. The brass instruments commonly used in a symphony -orchestra are trumpet, trombone, french horn, and tube. +orchestra are trumpet, trombone, french horn, and tuba. @seealso @@ -1501,9 +1542,8 @@ Note value twice as long as a whole note. Mainly used in pre-1650 music. The shortest note value generally used in white mensural notation, hence the name, which originally meant @q{of short duration}. -@lilypond[fragment,notime,ragged-right] -\set Score.automaticBars = ##f -\relative c'' { g\breve } +@lilypond[quote,notime,relative=2] +g\breve @end lilypond @@ -1545,22 +1585,19 @@ FI: C-avain. Clef symbol indicating the position of the middle C. Used on all note lines. -@lilypond[fragment,notime,line-width=13.0\cm] -\set Score.automaticBars = ##f -\override Score.Clef #'full-size-change = ##t -<< - \context Staff \relative c' { - \clef soprano c1 - \clef mezzosoprano c - \clef alto c - \clef tenor c - \clef baritone c - } - \context Lyrics \lyrics { - \override Lyrics .LyricText #'self-alignment-X = #-1 - "Soprano " "Mezzosoprano " "Alto " "Tenor " Baritone - } ->> +@lilypond[quote,notime,relative=1,line-width=13.0\cm] +\new Staff { + \override Staff.Clef #'full-size-change = ##t + \clef soprano c1 + \clef mezzosoprano c1 + \clef alto c1 + \clef tenor c1 + \clef baritone c1 +} +\addlyrics { + \override Lyrics . LyricText #'self-alignment-X = #LEFT + "Soprano " "Mezzosoprano " "Alto " "Tenor " Baritone +} @end lilypond @@ -1689,36 +1726,36 @@ S: ackord, FI: sointu. Three or more tones sounding simultaneously. In traditional European music -the base chord is a @emph{triad} consisting of two thirds. @emph{Major} +the base chord is a @emph{triad} consisting of two thirds. @emph{Major} (major + minor third) as well as @emph{minor} (minor + major third) chords -may be extended with more thirds. Four-tone @emph{seventh chords} and +may be extended with more thirds. Four-tone @emph{seventh chords} and five-tone @emph{ninth} major chords are most often used as dominants (functional harmony). Chords having no third above the lower notes to define their mood are a special case called @q{open chords}. The lack of the middle third means their quality is ambivalent -- neither major nor minor. -@lilypond[fragment,notime,line-width=13.0\cm] -\set Score.automaticBars = ##f -%\override TextScript #'font-style = #'large +@lilypond[quote,notime,line-width=13.0\cm] << -\context Staff \relative c'' { - \set Staff.extraNatural = ##f - 1 - - - - - -} -\lyrics{ - "major " - "minor " - "diminished " - "augmented " - "seventh-chord " - ninth-chord -} + \new Staff { + \relative c'' { + \set Staff.extraNatural = ##f + 1 + + + + + + } + } + \lyrics { + "major " + "minor " + "diminished " + "augmented " + "seventh-chord " + ninth-chord + } >> @end lilypond @@ -1742,9 +1779,8 @@ FI: kromaattinen asteikko. A scale consisting of all 12 semitones. -@lilypond[fragment,notime,line-width=13.0\cm] -\set Score.automaticBars = ##f -\relative c' { c1 cis d dis e f fis g gis a ais b c } +@lilypond[quote,notime,relative=1,line-width=13.0\cm] +c1 cis d dis e f fis g gis a ais b c @end lilypond @@ -2046,8 +2082,8 @@ geometrically describes the development of a range of pitches geometrical shape of a cluster covers the area in which any single pitch contained in the cluster would be notated as an ordinary note. -@lilypond[fragment,relative=2,ragged-right] -\makeClusters { } +@lilypond[quote,relative=2] +\makeClusters { 4 8 } @end lilypond @@ -2183,8 +2219,10 @@ A meter that includes a triplet subdivision within the beat: see A time signature that additively combines two or more unequal meters, e.g., "3/8 + 2/8" instead of "5/8". Sometimes called additive time signatures. -@lilypond[fragment,line-width=13.0\cm] -#(define (compound-time grob one two three num) +@end enumerate + +@lilypond[quote,line-width=13.0\cm] +#(define ((compound-time one two three num) grob) (grob-interpret-markup grob (markup #:override '(baseline-skip . 0) @@ -2199,8 +2237,8 @@ A time signature that additively combines two or more unequal meters, e.g., \relative c' { \key f \major #(set-time-signature 8 8 '(3 2 3)) - \override Staff.TimeSignature #'stencil = #(lambda (grob) - (compound-time grob "3" "2" "3" "8")) + \override Staff.TimeSignature #'stencil = + #(compound-time "3" "2" "3" "8") #(override-auto-beam-setting '(end 1 8 8 8) 3 8) #(override-auto-beam-setting '(end 1 8 8 8) 5 8) @@ -2210,8 +2248,6 @@ A time signature that additively combines two or more unequal meters, e.g., } @end lilypond -@end enumerate - @seealso @ref{compound meter}, @ref{meter}, @ref{polymetric time signature}. @@ -2258,7 +2294,7 @@ all) instruments that play in concert pitch: @itemize @item violin @item viola -@item violincello +@item violoncello @end itemize @end multitable @@ -2277,7 +2313,7 @@ are, technically speaking, @emph{transposing instruments}: @item piccolo (plays an octave higher) @item celesta (plays an octave higher) -@item double-bass (plays an octave lower) +@item double bass (plays an octave lower) @end itemize @@ -2301,9 +2337,10 @@ FI: asteittainen liike. Progressing melodically by intervals of a second, as contrasted with @emph{disjunct movement}. -@lilypond[fragment,line-width=13.0\cm] -\key g \major \time 4/4 -\relative c'' { g4 g g a | b2 a | g4 b a a | g1 \bar "||" } +@lilypond[quote,relative=2,line-width=13.0\cm] +\key g \major +\time 4/4 +g4 g g a | b2 a | g4 b a a | g1 \bar "||" @end lilypond @@ -2378,14 +2415,12 @@ combination into a single musical fabric of lines or parts which have distinct melodic significance. A frequently used polyphonic technique is imitation, in its strictest form found in the canon needing only one part to be written down while the other parts are performed with a -given displacement. Imitation is also the contrapunctal technique +given displacement. Imitation is also the contrapuntal technique used in the @emph{fugue} which, since the music of the baroque era, has been one of the most popular polyphonic composition methods. -@lilypond[fragment,staffsize=12,line-width=13.0\cm] -\set Score.implicitTimeSignatureVisibility = #all-invisible -\override Score.TimeSignature #'break-visibility = #all-invisible -\context PianoStaff << +@lilypond[quote,staffsize=12,line-width=13.0\cm] +\new PianoStaff << \context Staff = SA \relative c' { \key bes \major \time 4/4 @@ -2456,9 +2491,10 @@ FI: cresendo, voimistuen. Increasing volume. Indicated by a rightwards opening horizontal wedge (hairpin) or the abbreviation @notation{cresc.}. -@lilypond[fragment,ragged-right] -\key g \major \time 4/4 -\relative c'' { g4 \< a b c | d1\! \bar "|." } +@lilypond[quote,relative=2] +\key g \major +\time 4/4 +g4\< a b c | d1\! \bar "|." @end lilypond @@ -2509,22 +2545,19 @@ There were different appearences for different notation styles. Nowadays, they have survived only in special forms of musical notation such as the @emph{Editio Vaticana}, dating from the beginning of the 20th century -@lilypond +@lilypond[quote,ragged-right] \score { - { -% \override Staff.Custos #'neutral-position = #4 - \override Staff.Custos #'neutral-direction = #down + \new Staff { + \override Staff.Custos #'neutral-direction = #DOWN \override Staff.Custos #'style = #'hufnagel c'1 \break 1 } - \layout { \context { \Staff - \consists Custos_engraver + \consists "Custos_engraver" } - ragged-right = ##t } } @end lilypond @@ -2609,17 +2642,17 @@ Abbreviated @notation{D.S.}. Repetition, not from the beginning, but from another place frequently near the beginning marked by a sign (@notation{segno}): -@lilypond[fragment,ragged-right] -%\override TextScript #'font-style = #'large -\override TextScript #'font-shape = #'italic -\key g \major \time 4/4 -\relative c'' { - d1 | - g,4^\segno a b c | - b a g2_\markup{ - \line { "D.S. " \tiny \raise #1 \musicglyph #"scripts.segno" } } - \bar "|." +@lilypond[quote,relative=2] +\key g \major +\time 4/4 +d1 +g,4^\segno a b c +b4 a g2-\markup { + \italic "D.S. " + \tiny \raise #1 + \musicglyph #"scripts.segno" } +\bar "|." @end lilypond @@ -2641,11 +2674,10 @@ FI: decresendo, hiljentyen. Decreasing tone volume. Indicated by a leftwards opening horizontal wedge (hairpin) or the abbreviation @notation{decresc.}. -@lilypond[fragment,ragged-right] -\relative c'' { - \key g \major \time 4/4 - d4 \> c b a | g1 \! \bar "|." -} +@lilypond[quote,relative=2] +\key g \major +\time 4/4 +d4\> c b a | g1 \! \bar "|." @end lilypond @@ -2684,35 +2716,29 @@ DK: diatonisk skala, S: diatonisk skala, FI: diatoninen asteikko. -A scale consisting of 5@w{ }whole tones and 2@w{ }semitones (S). Scales +A scale consisting of 5@w{ }whole tones and 2@w{ }semitones (S). Scales played on the white keys of a piano keybord are diatonic. These scales are sometimes called, somewhat inaccurately, @q{church modes}). These @emph{modes} are used in Gregorian chant and in pre-baroque early music but also to some extent in newer jazz music. -@lilypond[fragment,notime,ragged-right] -\set Score.automaticBars = ##f -%\override Score.LyricText #'font-style = #'large -%\override Score.TextScript #'font-style = #'large +@lilypond[quote,notime,relative=1] << - \context Staff \relative c' { + { c1 d - \override TextScript #'padding = #-4 e^"~~ S" f g a b^"~~ S" c } - \context Lyrics \lyrics { + \lyrics { Ionian } >> @end lilypond -@lilypond[fragment,notime,ragged-right] -\set Score.automaticBars = ##f +@lilypond[quote,notime,relative=1] << - \context Staff \relative c' { + { d1 - \override TextScript #'padding = #-4 e^"~~ S" f g a b^"~~ S" c d } \lyrics { @@ -2721,11 +2747,9 @@ but also to some extent in newer jazz music. >> @end lilypond -@lilypond[fragment,notime,ragged-right] -\set Score.automaticBars = ##f +@lilypond[quote,notime,relative=1] << - \relative c' { - \override TextScript #'padding = #-4 + { e1^"~~ S" f g a b^"~~ S" c d e } \lyrics { @@ -2734,12 +2758,10 @@ but also to some extent in newer jazz music. >> @end lilypond -@lilypond[fragment,notime,ragged-right] -\set Score.automaticBars = ##f +@lilypond[quote,notime,relative=1] << - \relative c' { + { f1 g a - \override TextScript #'padding = #-4 b^"~~ S" c d e^"~~ S" f } \lyrics { @@ -2748,27 +2770,22 @@ but also to some extent in newer jazz music. >> @end lilypond -@lilypond[fragment,notime,ragged-right] -\set Score.automaticBars = ##f +@lilypond[quote,notime,relative=2] << - \relative c'' { + { g1 a - \override TextScript #'padding = #-4 - b^"~~ S" c d e^"~~ S" f g } + b^"~~ S" c d e^"~~ S" f g + } \lyrics { Mixolydian } >> @end lilypond -@lilypond[fragment,notime,ragged-right] -\set Score.automaticBars = ##f -%\override Score.LyricText #'font-style = #'large -%\override Score.TextScript #'font-style = #'large +@lilypond[quote,notime,relative=2] << - \relative c'' { + { a1 - \override TextScript #'padding = #-4 b^"~~ S" c d e^"~~ S" f g a } \lyrics { @@ -2777,13 +2794,9 @@ but also to some extent in newer jazz music. >> @end lilypond -@lilypond[fragment,notime,ragged-right] -\set Score.automaticBars = ##f -%\override Score.LyricText #'font-style = #'large -%\override Score.TextScript #'font-style = #'large +@lilypond[quote,notime,relative=2] << - \relative c'' { - \override TextScript #'padding = #-4 + { b1^"~~ S" c d e^"~~ S" f g a b } \lyrics { @@ -2797,75 +2810,61 @@ compositional music are primarily the major and the minor scales. In the harmonic minor scale type an augmented second (A) occurs between the 6th and 7th tone. -@lilypond[fragment,notime,ragged-right] -\set Score.automaticBars = ##f +@lilypond[quote,notime,relative=1] << - \relative c' { + { c1 d - \override TextScript #'padding = #-4 e^"~~ S" f g a b^"~~ S" c } - \lyrics { + \lyrics { Major } >> @end lilypond -@lilypond[fragment,notime,ragged-right] -\set Score.automaticBars = ##f +@lilypond[quote,notime,relative=2] << - \relative c'' { + { a1 - \override TextScript #'padding = #-4 b^"~~ S" c d e^"~~ S" f g a } - \lyrics { + \lyrics { "Ancient (or Natural) minor" } >> @end lilypond -@lilypond[fragment,notime,ragged-right] -\set Score.automaticBars = ##f +@lilypond[quote,notime,relative=2] << - \relative c'' { + { a1 - \override TextScript #'padding = #-4 b^"~~ S" c d e^"~~ S" f!^"~~ A" gis^"~~ S" a } - \context Lyrics \lyrics { + \lyrics { "Harmonic minor" } >> @end lilypond -@lilypond[fragment,notime,line-width=13.0\cm] -\set Score.automaticBars = ##f -%\override Score.LyricText #'font-style = #'large -%\override Score.TextScript #'font-style = #'large +@lilypond[quote,notime,relative=2] << - \relative c'' { + { a1 - \override TextScript #'padding = #-4 b^"~~ S" c d e fis gis^"~~ S" a } - \lyrics { + \lyrics { "Melodic minor ascending" } >> @end lilypond -@lilypond[fragment,notime,line-width=13.0\cm] -\set Score.automaticBars = ##f -%\override Score.LyricText #'font-style = #'large -%\override Score.TextScript #'font-style = #'large +@lilypond[quote,notime,relative=3] << - \relative c'' { - a'1 - \override TextScript #'padding = #-4 - a g! f!^"~~ S" e d c^"~~ S" b a + { + a1 + g! f!^"~~ S" e d c^"~~ S" b a } - \lyrics { + \lyrics { "Melodic minor descending" } >> @@ -2969,13 +2968,13 @@ FI: melodian hyppivä liike. Progressing melodically by intervals larger than a major second, as contrasted with conjunct movement. -@lilypond[fragment,ragged-right] +@lilypond[quote,relative=1] \key a \major \time 4/4 -\relative c' { - \partial 8 e8 | - a4. gis8 b a e cis | - fis2 d4. \bar "||" } +\partial 8 e8 | +a4. gis8 b a e cis | +fis2 d4. +\bar "||" @end lilypond @@ -3506,16 +3505,16 @@ FI: enharmoninen. Two notes, intervals, or scales are enharmonic if they have different names but equal pitch. -@lilypond[fragment,notime,line-width=13.0\cm] -\set Score.automaticBars = ##f +@lilypond[quote,notime,line-width=13.0\cm] << -\context Staff \relative c'' { - gis1 as -} -\context Lyrics \lyrics { - \override Lyrics .LyricText #'self-alignment-X = #-1 - "g sharp " "a flat " "dim fifth " "augm fourth" -} + \new Staff { + \relative c'' { + gis1 as + } + } + \lyrics { + "g sharp " "a flat " "dim fifth " "augm fourth" + } >> @end lilypond @@ -3666,29 +3665,28 @@ played an octave higher (for example, bass recorder) while 8@w{ }below the clef symbol indicates playing an octave lower (for example, on the Double Bass). -@lilypond[fragment,notime,line-width=13.0\cm] -\set Score.automaticBars = ##f -\override Staff.Clef #'full-size-change = ##t +@lilypond[quote,notime,line-width=13.0\cm] << -\relative c { - \clef varbaritone - f1 - \clef bass - f1 - \clef subbass - f1 - \clef "F^8" - f1 - \clef "F_8" - f1 -} - \lyrics { - "varbaritone " - "bass " - "sub-bass " - "octave up " - "octave down" -} + \relative c { + \override Staff.Clef #'full-size-change = ##t + \clef varbaritone + f1 + \clef bass + f1 + \clef subbass + f1 + \clef "F^8" + f1 + \clef "F_8" + f1 + } + \lyrics { + "varbaritone " + "bass " + "sub-bass " + "octave up " + "octave down" + } >> @end lilypond @@ -3755,11 +3753,10 @@ FI: fermaatti, pidäke. Prolonged note or rest of indefinite duration. -@lilypond[fragment,ragged-right] +@lilypond[quote,relative=2] \time 4/4 -\relative c'' { - a4 b c2^\fermata \bar "|." -} +a4 b c2^\fermata +\bar "|." @end lilypond @@ -3802,30 +3799,37 @@ A method of indicating an accompaniment part by the bass notes only, together with figures designating the chief intervals and chords to be played above the bass notes. -TODO: Make the upper clef smaller, since it's usually "realized" in performance. - -@lilypond[fragment,line-width=13.0\cm] -\context GrandStaff << - \context Staff = lh \relative c'' { - \time 4/4 - \key es \major +@lilypond[quote,line-width=13.0\cm] +\new GrandStaff << + \new Staff = "rh" \with { + fontSize = #-3 + \override StaffSymbol #'staff-space = #(magstep -3) + } \relative c'' { \clef treble - << \context Voice = rha { - \stemUp - es4 d c bes | bes } - \context Voice = rhb { - \stemDown - < bes g >8 as < as f > g < g es > f < d f > es | < g es >4 } + \key es \major + \time 4/4 + << + \context Voice = "rha" { + \voiceOne + es4 d c bes + bes4 + } + \context Voice = "rhb" { + \voiceTwo + 8 as g f es + 4 + } >> } - << - \context Staff = rh \relative c' { + \new Staff = "lh" \relative c' { \clef bass \key es \major - es8 c d bes c as bes16 as g f | es4 - } - \figures { s8 <6> s <4 2> s <6> s16 s <6> <4 2> } - >> + es8 c d bes c as bes16 as g f + es4 + } + \figures { + s8 <6> s <4 2> s <6> s16 s <6> <4 2> + } >> @end lilypond @@ -3869,15 +3873,11 @@ FI: lippu, viiri. Ornament at the end of the stem of a note used for notes with values less than a quarter note. The number of flags determines the note value. -@lilypond[fragment,notime,ragged-right] -\set Score.automaticBars = ##f -%\override Score.TextScript #'font-style = #'large -\relative c'' { - g8_"8th" s8 - g16_"16th" s8 - g32_"32nd" s8 - g64_"64th" s8 -} +@lilypond[quote,notime,relative=2] +g8-"8th" s8 +g16-"16th" s8 +g32-"32nd" s8 +g64-"64th" s8 @end lilypond @@ -4075,14 +4075,16 @@ chords. TODO: what does the @q{p} mean in Sp, Dp, Tp? -@lilypond[fragment,notime,line-width=13.0\cm] -\set Score.automaticBars = ##f +@lilypond[quote,notime,relative=2,line-width=13.0\cm] << -\context Voice \relative c'' { - 1 < a f d > < b g e > - < d b g > < e c a > < f d b > } -\context Lyrics \lyrics { - T Sp Dp S D Tp \markup{ D\translate #(cons -2 0) {"|"} } } + { + 1 + + } + \lyrics { + T Sp Dp S D Tp + \markup { D \translate #'(-2 . 0) | } + } >> @end lilypond @@ -4128,30 +4130,25 @@ must be played an octave higher while 8 below the clef symbol indicates playing or singing an octave lower (used most frequently to notate the tenor part in modern choral scores). -@lilypond[fragment,notime,ragged-right] -<< - \set Score.automaticBars = ##f +@lilypond[quote,notime] +\relative c'' { \override Staff.Clef #'full-size-change = ##t - - \relative c'' { - \set Score.proportionalNotationDuration = #(ly:make-moment 1 8) - \clef french - g1 - \clef treble - g - \clef "G^8" - g - \clef "G_8" - g - } - \context Lyrics \lyrics { - \override Lyrics . LyricText #'X-offset = #-5 - "french violin clef" - "violin clef" - "octave up" - "octave down" - } ->> + \set Score.proportionalNotationDuration = #(ly:make-moment 1 8) + \clef french + g1 + \clef treble + g1 + \clef "G^8" + g1 + \clef "G_8" + g1 +} +\addlyrics { + "french violin clef" + "violin clef" + "octave up" + "octave down" +} @end lilypond @@ -4274,12 +4271,10 @@ usage. In the standard usage of these countries, @notation{B} means Graphical version of the @notation{crescendo} and @notation{decrescendo} dynamic marks. -@lilypond[fragment,ragged-right] -\relative c'' { - c1\< - c2\> c\< - c1\! -} +@lilypond[quote,relative=2] +c1\< +c2\> c\< +c1\! @end lilypond @@ -4341,17 +4336,16 @@ FI: harmoninen kadenssi. A sequence of chords that terminates a musical phrase or section. -@lilypond[fragment,ragged-right] -\context PianoStaff << - \context Staff = SA \relative c'' { - \time 4/4 +@lilypond[quote] +\new PianoStaff << + \context Staff = "SA" \relative c'' { \clef treble - \context Voice - \partial 4 < c g e >4 | - < c a f > < b g d > < c g e >2 + \time 4/4 + \partial 4 4 | + 2 } << - \context Staff = SB \relative c { + \context Staff = "SB" \relative c { \clef bass \partial 4 c4 | f, g c2 \bar "|." @@ -4361,7 +4355,6 @@ A sequence of chords that terminates a musical phrase or section. } >> >> - @end lilypond @@ -4415,30 +4408,22 @@ categories @emph{consonances} and @emph{dissonances}. Consonances: -@lilypond[fragment,notime,line-width=13.0\cm] -\set Score.automaticBars = ##f -%\override Score.TextScript #'font-style = #'large -\context Voice \relative c'' { - 1_"unison " s - _"third " s - _"fourth " s - _"fifth " s - _"sixth " s - _"octave " s - _"tenth" s s -} +@lilypond[quote,notime,relative=2,line-width=13.0\cm] +1_"unison " s +_"third " s +_"fourth " s +_"fifth " s +_"sixth " s +_"octave " s +_"tenth" s s @end lilypond Dissonances: -@lilypond[fragment,notime,line-width=13.0\cm] -\set Score.automaticBars = ##f -%\override Score.TextScript #'font-style = #'large -\context Voice \relative c'' { - 1_"second " s s - _"seventh " s s - _"ninth" s s -} +@lilypond[quote,notime,relative=2,line-width=13.0\cm] +1_"second " s s +_"seventh " s s +_"ninth" s s @end lilypond For harmony that uses three or more notes, see @ref{chord}. @@ -4470,20 +4455,22 @@ as a special effect (or @emph{affect}) at cadences. For example, this phrase in 6/4 time -@lilypond[fragment,line-width=13.0\cm] +@lilypond[quote,relative=1,line-width=13.0\cm] \key c \major \time 6/4 -\relative c' { - c2. e | d2 c d | c1. \bar "||" } +c2. e | d2 c d | c1. \bar "||" @end lilypond may be thought of having alternating time signatures -@lilypond[fragment,line-width=13.0\cm] +@lilypond[quote,relative=1,line-width=13.0\cm] \key c \major \time 6/4 -\relative c' { - c2. e | \time 3/2 d2 c d | \time 6/4 c1. \bar "||" } +c2. e +\time 3/2 +d2 c d +\time 6/4 +c1. \bar "||" @end lilypond and is therefore a polymeter (second definition) of considerable antiquity. @@ -4572,63 +4559,60 @@ fifth are identical (or @emph{enharmonic}) and are called @emph{tritonus} because they consist of three whole tones. The addition of such two intervals forms an octave. -@lilypond[fragment,notime,line-width=13.0\cm] -\set Score.automaticBars = ##f +@lilypond[quote,notime,line-width=13.0\cm] << -\context Voice \relative c'' { - < g g >1 - < g as >^"minor" - < g a! > - < g ais >^"augm" - < gis bes >^"dimin" - < g! bes >^"minor" - < g b! >^"major" - < g bis >^"augm" -} -\context Lyrics \lyrics { - "unison " "second " "second " "second " - "third " "third " "third " "third" -} + \context Voice \relative c'' { + < g g >1 + < g as >^"minor" + < g a! > + < g ais >^"augm" + < gis bes >^"dimin" + < g! bes >^"minor" + < g b! >^"major" + < g bis >^"augm" + } + \context Lyrics \lyrics { + "unison " "second " "second " "second " + "third " "third " "third " "third" + } >> @end lilypond -@lilypond[fragment,notime,line-width=13.0\cm] -\set Score.automaticBars = ##f +@lilypond[quote,notime,line-width=13.0\cm] << -\context Staff \relative c'' { - < g c >1^"perfect" - < g cis >^"aug" - < g d' >^"perfect" - < g des' > ^"dim" - < gis es' >^"dim" - < g! es' >^"minor" - < g e'! >^"major" - < g eis' >^"aug" -} - \lyrics { - "fourth " "fourth " "fifth " "fifth " - "sixth " "sixth " "sixth " "sixth" -} + \context Staff \relative c'' { + 1^"perfect" + ^"aug" + ^"perfect" + ^"dim" + ^"dim" + ^"minor" + ^"major" + ^"aug" + } + \lyrics { + "fourth " "fourth " "fifth " "fifth " + "sixth " "sixth " "sixth " "sixth" + } >> @end lilypond -@lilypond[fragment,notime,line-width=13.0\cm] -\set Score.automaticBars = ##f +@lilypond[quote,notime,line-width=13.0\cm] << -\context Staff \relative c'' { - < gis f'! >1^"dimin" - < g! f'! >^"minor" - < g fis' >^"major" - < g g' > - < g as' >^"minor" - < g a'! >^"major" - < g bes' >^"minor" - < g b'! >^"major" -} -\context Lyrics \lyrics { - "seventh " "seventh " "seventh " "octave " - "ninth " "ninth " "tenth " "tenth" -} + \context Staff \relative c'' { + 1^"dimin" + ^"minor" + ^"major" + + ^"minor" + ^"major" + ^"minor" + ^"major" + } + \context Lyrics \lyrics { + "seventh " "seventh " "seventh " "octave " + "ninth " "ninth " "tenth " "tenth" + } >> @end lilypond @@ -4694,14 +4678,10 @@ FI: käänteisintervalli. The difference between an interval and an octave. -@lilypond[fragment,notime,line-width=13.0\cm] -\set Score.automaticBars = ##f -%\override Score.TextScript #'font-style = #'large -\context Staff \relative c'' { - < g a >1_"second " s s < g' a, >_"seventh " s s \bar "||" - < g, b >_"third " s s < g' b, >_"sixth " s s \bar "||" - < g, c >_"fourth " s s < g' c, >_"fifth " s s \bar "||" -} +@lilypond[quote,notime,relative=2,line-width=13.0\cm] +1_"second " s s _"seventh " s s \bar "||" +_"third " s s _"sixth " s s \bar "||" +_"fourth " s s _"fifth " s s \bar "||" @end lilypond @@ -4840,9 +4820,10 @@ FI: apuviiva. A ledger line is an extension of the staff. -@lilypond[fragment,notime,ragged-right] -\set Score.automaticBars = ##f -\relative c'' { a,1 s c'' } +@lilypond[quote,notime,relative=2] +a,1 +s1 +c''1 @end lilypond @@ -4866,8 +4847,7 @@ To be performed (a) without any perceptible interruption between the notes, unlike (b) @notation{leggiero} or @notation{non-legato}, (c) @notation{portato}, or (d) @notation{staccato}. -@lilypond[fragment,notime,line-width=13.0\cm] -\set Score.automaticBars = ##f +@lilypond[quote,notime,line-width=13.0\cm] << \context Staff \relative c'' { c4-( d e-) \bar "||" @@ -5024,12 +5004,9 @@ FI: pitkä appoggiatura, pitkä etuhele. Note value: double length of @notation{breve}. -@lilypond[fragment,notime,ragged-right] -\set Score.automaticBars = ##f -\relative c'' { - \override NoteHead #'style = #'mensural - g\longa g\breve -} +@lilypond[quote,notime,relative=2] +\override NoteHead #'style = #'mensural +g\longa g\breve @end lilypond @@ -5357,7 +5334,7 @@ beat on each quarter note is conventionally written with a time signature of Simple duple meter (F.J. Haydn, 1732-1809; or a Croatian folk tune): -@lilypond[fragment,line-width=13.0\cm] +@lilypond[quote,line-width=13.0\cm] \relative c'' { \time 2/4 \key g \major @@ -5366,7 +5343,7 @@ Simple duple meter (F.J. Haydn, 1732-1809; or a Croatian folk tune): Simple triple meter: -@lilypond[fragment,line-width=13.0\cm] +@lilypond[quote,line-width=13.0\cm] \relative c'' { \time 3/4 \key c \minor @@ -5375,7 +5352,7 @@ Simple triple meter: Simple quadruple meter (French folk tune, @emph{Au clair de la lune}): -@lilypond[fragment,line-width=13.0\cm] +@lilypond[quote,line-width=13.0\cm] \relative c'' { \time 4/4 \key g \major @@ -5384,7 +5361,7 @@ Simple quadruple meter (French folk tune, @emph{Au clair de la lune}): Simple quintuple meter (B. Marcello, 1686-1739): -@lilypond[fragment,line-width=13.0\cm] +@lilypond[quote,line-width=13.0\cm] \relative c'' { \time 5/4 \key c \major @@ -5399,7 +5376,7 @@ the source, with sharps in the accompaniment where the voice has flats and Compound duple meter (unknown): -@lilypond[fragment,line-width=13.0\cm] +@lilypond[quote,line-width=13.0\cm] \relative c' { \time 6/8 \key f \major @@ -5410,7 +5387,7 @@ Compound duple meter (unknown): Compound triple meter (J.S. Bach, 1685-1750): -@lilypond[fragment,line-width=13.0\cm] +@lilypond[quote,line-width=13.0\cm] \relative c' { \time 9/8 \key g \major @@ -5421,7 +5398,7 @@ Compound triple meter (J.S. Bach, 1685-1750): Compound quadruple meter (P. Yon, 1886-1943): -@lilypond[fragment,line-width=13.0\cm] +@lilypond[quote,line-width=13.0\cm] \relative c' { \time 12/8 \key e \major @@ -5565,14 +5542,11 @@ FI: keski-C. First C below the 440 Hz A. -@lilypond[fragment,notime,ragged-right] -\set Score.automaticBars = ##f +@lilypond[quote,notime,relative=1] \override Staff.Clef #'full-size-change = ##t -\relative c' { - \clef bass c1 s - \clef alto c s - \clef treble c s -} +\clef bass c1 s +\clef alto c s +\clef treble c s @end lilypond @@ -5699,7 +5673,7 @@ FI: teema, sävelaihe. The briefest intelligible and self-contained fragment of a musical theme or subject. -@lilypond[line-width=13.0\cm] +@lilypond[quote,line-width=13.0\cm] \score{ \relative c'' { \set Score.implicitTimeSignatureVisibility = #all-invisible @@ -5735,7 +5709,7 @@ S: sats, FI: osa. Greater musical works like @ref{symphony} and @ref{sonata} most often -consist of several -- more or less -- independant pieces called +consist of several -- more or less -- independent pieces called movements. @@ -5761,14 +5735,14 @@ longer spans of rest, with a number above to indicate the duration (in measures) of the rest. The former style is called @q{Kirchenpausen} in German, as a reminiscence of its use in Renaissance vocal polyphony. -@lilypond[fragment,ragged-right] -\relative c'' { - a1 - \set Score.skipBars = ##t R1*3 - a1 - \set Score.skipBars = ##t R1*122 - a1 -} +@lilypond[quote,relative=2] +a1 +\set Score.skipBars = ##t +R1*3 +a1 +\set Score.skipBars = ##t +R1*122 +a1 @end lilypond @@ -5901,9 +5875,7 @@ double-length note value @emph{longa} or the quadruple-length note value @c TODO -- add maxima to this example, in a way that doesn't break it. -@lilypond[fragment,notime,line-width=13.0\cm] -%\override Score.TextScript #'font-style = #'large -\set Score.automaticBars = ##f +@lilypond[quote,notime,line-width=13.0\cm] \relative c'' { \override NoteHead #'style = #'mensural a\longa_"longa" a\breve_"breve" @@ -5914,9 +5886,7 @@ double-length note value @emph{longa} or the quadruple-length note value @c TODO -- add maxima rest to this example -@lilypond[fragment,notime,line-width=13.0\cm] -%\override Score.TextScript #'font-style = #'large -\set Score.automaticBars = ##f +@lilypond[quote,notime,line-width=13.0\cm] \relative c'' { r\longa_"longa" r\breve_"breve" r1_"1/1" r2_"1/2" r4_"1/4" s16 r8_"1/8" s16 @@ -5926,8 +5896,7 @@ double-length note value @emph{longa} or the quadruple-length note value An augmentation dot after a note multiplies the duration by one and a half. Another dot adds yet a fourth of the duration. -@lilypond[fragment,line-width=13.0\cm] -%\override Score.TextScript #'font-style = #'large +@lilypond[quote,line-width=13.0\cm] \relative c'' { \time 4/4 g4._"pointed" g8 g2 | g4 ~ g8 g g2 \bar "||" @@ -5939,8 +5908,7 @@ subdivision by@w{ }3 (@emph{triplets}) and@w{ }5 (@emph{quintuplets}). Subdivisions by@w{ }2 (@emph{duplets}) or@w{ }4 (@emph{quadruplets}) of dotted notes are also frequently used. -@lilypond[fragment,line-width=13.0\cm] -%\override Score.TextScript #'font-style = #'large +@lilypond[quote,line-width=13.0\cm] \relative c'' { \time 4/4 \times 2/3 {g8_"triplets" g g} g4 g8 g g4 \bar "||" @@ -5948,7 +5916,7 @@ dotted notes are also frequently used. } @end lilypond -@lilypond[fragment,line-width=13.0\cm] +@lilypond[quote,line-width=13.0\cm] \relative c'' { \time 3/4 \times 3/2 {g4_"duplets" g} | @@ -6100,10 +6068,9 @@ middle of the 19th century and onwards the trill is performed with the main note first while in the music from the preceding baroque and classic periods the upper note is played first. -@lilypond[fragment,line-width=13.0\cm] +@lilypond[quote,line-width=13.0\cm] << \context Staff = sa { -% \override Score.TextScript #'font-style = #'large \relative c'' { c2._"pre-1850" b4\trill | c1 \bar "||" c2._"post-1850" b4\trill | c1 \bar "||" @@ -6120,10 +6087,9 @@ Other frequently used ornaments are the @emph{turn}, the @emph{mordent}, and the @emph{prall} (inverted mordent). -@lilypond[fragment,line-width=13.0\cm] +@lilypond[quote,line-width=13.0\cm] << \context Staff = sa { -% \override Score.TextScript #'font-style = #'large \relative c'' { a4_"turn" b\turn c2 \bar "||" g4_"mordent" a b\mordent a \bar "||" @@ -6224,13 +6190,11 @@ pattern to one or more measures. There are other names for this symbol: @end itemize -@lilypond[fragment,line-width=13.0\cm] +@lilypond[quote,relative=2,line-width=13.0\cm] \time 4/4 -\relative c' { - \repeat percent 4 { c4_"Beat (or slash) repeat" } - \repeat percent 2 { c4 e g b_"Measure repeat" } - \repeat percent 2 { c,2 es | f4 fis g c_"Multi-measure repeat" | } -} +\repeat percent 4 { c4_"Beat (or slash) repeat" } +\repeat percent 2 { c4 e g b_"Measure repeat" } +\repeat percent 2 { c,2 es | f4 fis g c_"Multi-measure repeat" | } @end lilypond @@ -6833,23 +6797,16 @@ FI: rinnakkaissävellaji. Major and minor keys that have the same key signature. -@lilypond[fragment,notime,line-width=13.0\cm] -\set Score.automaticBars = ##f -%\override Score.TextScript #'font-style = #'large -\relative c' { - \key es \major - es1_"e flat major" f g as bes c d es - \bar "||" -} +@lilypond[quote,notime,relative=1,line-width=13.0\cm] +\key es \major +es1_"e flat major" f g as bes c d es +\bar "||" @end lilypond -@lilypond[fragment,notime,line-width=13.0\cm] -\set Score.automaticBars = ##f -%\override Score.TextScript #'font-style = #'large -\relative c' { - \key c \minor - c1_"c minor" d es f g a! b! c \bar "||" -} +@lilypond[quote,notime,relative=1,line-width=13.0\cm] +\key c \minor +c1_"c minor" d es f g a! b! c +\bar "||" @end lilypond @@ -6869,11 +6826,14 @@ DK: gen@-ta@-gel@-se, S: repris, FI: toisto. -@lilypond[fragment,line-width=13.0\cm] +@lilypond[quote,relative=2,line-width=13.0\cm] \key g \major \time 4/4 -\relative c'' { - \repeat volta 2 {g4 g d' d | e e d2 | c4 c b b | a a g2 } +\repeat volta 2 { + g4 g d' d + e4 e d2 + c4 c b b + a a g2 } @end lilypond @@ -7006,10 +6966,9 @@ Names and symbols used in harmonic analysis to denote tones of the scale as roots of chords. The most important are degrees I = tonic (T), IV = sub@-do@-mi@-nant (S) and V = dominant (D). -@lilypond[fragment,notime,line-width=13.0\cm] -\set Score.automaticBars = ##f +@lilypond[quote,notime,line-width=13.0\cm] << -\context Staff \relative c' { +\new Staff \relative c' { c1 d e f g a b c } \lyrics { @@ -7098,9 +7057,9 @@ DK: sekund, S: sekund, FI: sekunti. -The @ref{interval} between two neigbouring tones of a scale. A +The @ref{interval} between two neighboring tones of a scale. A @ref{diatonic scale} consists of alternating @ref{semitone}s and -@ref{whole tone}s, hence the size of a se@-cond depends on the scale +@ref{whole tone}s, hence the size of a second depends on the scale degrees in question. @@ -7125,9 +7084,8 @@ composed music. The interval between two neighbouring tones on the piano keyboard -- including black and white keys -- is a semitone. An octave may be divided into 12@w{ }semitones. -@lilypond[fragment,notime,line-width=13.0\cm] -\set Score.automaticBars = ##f -\relative c'' { g1 gis s a bes s b! c } +@lilypond[quote,notime,relative=2,line-width=13.0\cm] +g1 gis s a bes s b! c @end lilypond @@ -7486,14 +7444,13 @@ FI: staccato, lyhyesti, terävästi. Playing the note(s) short. Staccato is indicated by a dot above or below the note head. -@lilypond[fragment,ragged-right] +@lilypond[quote,relative=2] \key d \major \time 4/4 -\relative c'' { - \partial 8 a8 | - d4-\staccato cis-\staccato b-\staccato cis-\staccato | - d2. \bar "||" -} +\partial 8 a8 | +d4-\staccato cis-\staccato b-\staccato cis-\staccato | +d2. +\bar "||" @end lilypond @@ -7504,6 +7461,7 @@ None yet. @node staff @section staff +UK: stave, ES: pentagrama, I: pentagramma, rigo (musicale), F: portée, @@ -7546,23 +7504,17 @@ FI: nuottipalkki. Vertical line above or below a @ref{note head} shorter than a whole note. -@ref{beam}. - -@lilypond[fragment,notime,line-width=13.0\cm] +@lilypond[quote,notime,relative=2] \set Score.autoBeaming = ##f -\set Score.automaticBars = ##f -%\override Score.TextScript #'font-style = #'large -\relative c'' { - g2_"1/2" g' s16 - g,4_"1/4" g' s16 - g,8_"1/8" g' s16 - g,16_"1/16" g' s16 -} +g2_"1/2" g' s16 +g,4_"1/4" g' s16 +g,8_"1/8" g' s16 +g,16_"1/16" g' s16 @end lilypond @seealso -None yet. +@ref{beam}. @node stringendo @@ -7778,13 +7730,11 @@ group. Any deviation from this scheme is felt as a disturbance or contradiction between the underlaying (normal) pulse and the actual (abnormal) rhythm. -@lilypond[fragment,ragged-right] -\time 4/4 -\relative c' { - \partial 4 - d8 dis | - e c'4 e,8 c'4 e,8 c' ( | c2) -} +@lilypond[quote,relative=1] +\time 2/4 +\partial 8 d16 dis +e16 c'8 e,16 c'8 e,16 c' ~ +c4 @end lilypond @@ -8020,9 +7970,8 @@ connects two succesive notes of the same pitch, and which has the function of uniting them into a single sound (tone) equal to the combined durations. -@lilypond[fragment,notime,ragged-right] -\set Score.automaticBars = ##f -\relative c'' { g2 ~ g4. } +@lilypond[quote,notime,relative=2] +g2 ~ g4. r8 @end lilypond @@ -8149,7 +8098,7 @@ FI: transponointi. Shifting a melody up or down in pitch, while keeping the same relative pitches. -@lilypond[fragment,line-width=13.0\cm] +@lilypond[quote,line-width=13.0\cm] \context Staff { \time 3/4 \relative c'' { @@ -8159,7 +8108,7 @@ relative pitches. } @end lilypond -@lilypond[fragment,line-width=13.0\cm] +@lilypond[quote,line-width=13.0\cm] \context Staff { \time 3/4 \transpose c bes \relative c'' { @@ -8215,14 +8164,10 @@ in the distance of a third (@ref{interval}). @end enumerate -@lilypond[fragment,notime,ragged-right] -\set Score.automaticBars = ##f -%\override Score.TextScript #'font-style = #'large -\relative c' { - e2:32_"a" - f:32 [ e8:16 f:16 g:16 a:16 ] s4 - \repeat tremolo 8 { e32_"b" g } -} +@lilypond[quote,notime,relative=1] +e2:32_"a" +f:32 [ e8:16 f:16 g:16 a:16 ] s4 +\repeat tremolo 8 { e32_"b" g } @end lilypond diff --git a/Documentation/user/notation-appendices.itely b/Documentation/user/notation-appendices.itely index 7f27e01ebb..a2b055025f 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.61" +@c \version "2.12.0" @node Notation manual tables @appendix Notation manual tables @@ -198,11 +198,11 @@ Half-diminished seventh @tab Diminished triad, minor seventh @tab -@code{dim5m7} +@code{m7.5-} @tab @lilypond[line-width=3\cm,noragged-right, notime] \chordmode { - c1:dim5m7 + c1:m7.5- } @end lilypond @@ -211,11 +211,11 @@ Minor-major seventh @tab Minor triad, major seventh @tab -@code{7m5} +@code{maj7.5-} @tab @lilypond[line-width=3\cm,noragged-right, notime] \chordmode { - c1:7m5 + c1:maj7.5- } @end lilypond @@ -261,7 +261,7 @@ Dominant seventh, major ninth @item Major ninth @tab -TODO +Major seventh, major ninth @tab @code{maj9} @tab @@ -274,7 +274,7 @@ TODO @item Minor ninth @tab -TODO +Minor seventh, major ninth @tab @code{m9} @tab @@ -300,7 +300,7 @@ Dominant ninth, perfect eleventh @item Major eleventh @tab -TODO +Major ninth, perfect eleventh @tab @code{maj11} @tab @@ -313,7 +313,7 @@ TODO @item Minor eleventh @tab -TODO +Minor ninth, perfect eleventh @tab @code{m11} @tab @@ -323,6 +323,19 @@ TODO } @end lilypond +@item +Dominant thirteenth +@tab +Dominant ninth, major thirteenth +@tab +@code{13} +@tab +@lilypond[line-width=3\cm,noragged-right, notime] +\chordmode { + c1:13 +} +@end lilypond + @item Dominant thirteenth @tab @@ -339,7 +352,7 @@ Dominant eleventh, major thirteenth @item Major thirteenth @tab -TODO +Major eleventh, major thirteenth @tab @code{maj13.11} @tab @@ -352,7 +365,7 @@ TODO @item Minor thirteenth @tab -TODO +Minor eleventh, major thirteenth @tab @code{m13.11} @tab @@ -365,7 +378,7 @@ TODO @item Suspended second @tab -TODO +Major second, perfect fifth @tab @code{sus2} @tab @@ -378,7 +391,7 @@ TODO @item Suspended fourth @tab -TODO +Perfect fourth, perfect fifth @tab @code{sus4} @tab diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely index 2e497e9acb..57afdc00fd 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.61" +@c \version "2.12.0" @node Musical notation @chapter Musical notation diff --git a/Documentation/user/percussion.itely b/Documentation/user/percussion.itely index 02c1ba68f8..f182b78a9a 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.62" +@c \version "2.12.0" @node Percussion @section Percussion @@ -425,7 +425,7 @@ A tambourine, entered with @q{tamb}: tambustaff = { \override Staff.StaffSymbol #'line-positions = #'( 0 ) \override Staff.BarLine #'bar-size = #3 - \set DrumStaff.instrumentName = "Tambourine" + \set DrumStaff.instrumentName = #"Tambourine" } \new DrumStaff { @@ -451,7 +451,7 @@ Music for Tam-Tam (entered with @q{tt}): tamtamstaff = { \override Staff.StaffSymbol #'line-positions = #'( 0 ) \override Staff.BarLine #'bar-size = #3 - \set DrumStaff.instrumentName = "Tamtam" + \set DrumStaff.instrumentName = #"Tamtam" } \new DrumStaff { @@ -474,7 +474,7 @@ bellstaff = { \override DrumStaff.StaffSymbol #'line-positions = #'(-2 3) \set DrumStaff.drumStyleTable = #(alist->hash-table mydrums) \override Staff.BarLine #'bar-size = #3 - \set DrumStaff.instrumentName = "Different Bells" + \set DrumStaff.instrumentName = #"Different Bells" } \new DrumStaff { @@ -541,7 +541,7 @@ drumsB = { } \new DrumStaff { - \set DrumStaff.instrumentName = "Grosse Caisse" + \set DrumStaff.instrumentName = #"Grosse Caisse" \set DrumStaff.drumStyleTable = #(alist->hash-table mydrums) \drumsB } >> diff --git a/Documentation/user/pitches.itely b/Documentation/user/pitches.itely index 9224f8e1bb..241f13ded7 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.61" +@c \version "2.12.0" @node Pitches @@ -1077,8 +1077,8 @@ playing in unison. \new GrandStaff << \new Staff = "violin" { \relative c'' { - \set Staff.instrumentName = "Vln" - \set Staff.midiInstrument = "violin" + \set Staff.instrumentName = #"Vln" + \set Staff.midiInstrument = #"violin" % not strictly necessary, but a good reminder \transposition c' @@ -1089,7 +1089,7 @@ playing in unison. \new Staff = "clarinet" { \relative c'' { \set Staff.instrumentName = \markup { Cl (B\flat) } - \set Staff.midiInstrument = "clarinet" + \set Staff.midiInstrument = #"clarinet" \transposition bes \key d \major @@ -1104,7 +1104,7 @@ example, a clarinetist may switch from an A clarinet to a B-flat clarinet. @lilypond[verbatim,quote,relative=2] -\set Staff.instrumentName = "Cl (A)" +\set Staff.instrumentName = #"Cl (A)" \key a \major \transposition a c d e f diff --git a/Documentation/user/preface.itely b/Documentation/user/preface.itely index 2f8414cfb0..d82632e77f 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.61" +@c \version "2.12.0" @node Preface @unnumbered Preface diff --git a/Documentation/user/programming-interface.itely b/Documentation/user/programming-interface.itely index 9cf3997473..ed8de9ffcf 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.61" +@c \version "2.12.0" @node Interfaces for programmers @chapter Interfaces for programmers diff --git a/Documentation/user/repeats.itely b/Documentation/user/repeats.itely index ed966cd1c8..689fd36009 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.61" +@c \version "2.12.0" @node Repeats @section Repeats diff --git a/Documentation/user/rhythms.itely b/Documentation/user/rhythms.itely index 435210b4a6..21e1c66f95 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.61" +@c \version "2.12.0" @node Rhythms @section Rhythms @@ -51,7 +51,7 @@ quarter note is entered using a @code{4} (since it is a 1/4 note), and a half note is entered using a @code{2} (since it is a 1/2 note). For notes longer than a whole you must use the @code{\longa} (a double breve) and @code{\breve} commands. -Durations as short as 64th notes may be specified. Shorter values +Durations as short as 128th notes may be specified. Shorter values are possible, but only as beamed notes. @c Two 64th notes are needed to obtain beams @@ -1453,7 +1453,9 @@ particular beam in the time signature in use, its beaming is controlled by three context properties: @code{measureLength}, @code{beatLength} and @code{beatGrouping}. These properties may be set in the @code{Score}, @code{Staff} or -@code{Voice} contexts to delimit their scope. +@code{Voice} contexts to delimit their scope. The default values +are set while processing @code{\time} commands, so the @code{\set} +commands must be placed after all @code{\time} commands. These determine the beaming as follows: diff --git a/Documentation/user/running.itely b/Documentation/user/running.itely index 1addc89ab8..b0b9bffad4 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.61" +@c \version "2.12.0" @node Running LilyPond diff --git a/Documentation/user/scheme-tutorial.itely b/Documentation/user/scheme-tutorial.itely index a9b6d65012..6d8f33e0f8 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.61" +@c \version "2.12.0" @node Scheme tutorial @appendix Scheme tutorial diff --git a/Documentation/user/setup.itely b/Documentation/user/setup.itely index f0d06ced3c..d91d35cbcd 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.61" +@c \version "2.12.0" @node Setup @chapter Setup diff --git a/Documentation/user/simultaneous.itely b/Documentation/user/simultaneous.itely index 387de711a2..1d35377b76 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.61" +@c \version "2.12.0" @node Simultaneous notes diff --git a/Documentation/user/spacing.itely b/Documentation/user/spacing.itely index 84902e6894..1b81a996f5 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.64" +@c \version "2.12.0" @ignore GDP TODO list @@ -1775,23 +1775,26 @@ c^"This text is padded away from the previous text" c^"This text is placed close to the previous text" @end lilypond -TODO: this example doesn't work any more ? -By default, outside-staff objects are placed without regard to -their horizontal distance from the previously-positioned grobs. This +By default, outside-staff objects are placed only to avoid +a horizontal collision with previously-positioned grobs. This can lead to situations in which objects are placed very close to each -other horizontally. Setting @code{outside-staff-horizontal-padding} +other horizontally. The vertical spacing between staffs can +also be set so that outside staff objects are interleaved. +Setting @code{outside-staff-horizontal-padding} causes an object to be offset vertically so that such a situation doesn't occur. @lilypond[quote,ragged-right,relative=2,fragment,verbatim] % the markup is too close to the following note -c2^"Text" +c4^"Text" +c4 c''2 % setting outside-staff-horizontal-padding fixes this R1 \once \override TextScript #'outside-staff-horizontal-padding = #1 -c,,2^"Text" +c,,4^"Text" +c4 c''2 @end lilypond diff --git a/Documentation/user/specialist.itely b/Documentation/user/specialist.itely index 50fc395b59..98b7595821 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.61" +@c \version "2.12.0" @node Specialist notation @chapter Specialist notation diff --git a/Documentation/user/staff.itely b/Documentation/user/staff.itely index 3791eacb71..34f90a32e7 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.64" +@c \version "2.12.0" @node Staff notation @section Staff notation @@ -45,6 +45,8 @@ grouping staves. @cindex staff instantiation @cindex staff, new @cindex staff, single +@cindex staff, drum +@cindex staff, percussion @cindex drum staff @cindex percussion staff @cindex Gregorian transcription staff @@ -52,6 +54,9 @@ grouping staves. @cindex tabstaff @cindex tablature +@funindex \drummode +@funindex drummode + @notation{Staves} (singular: @notation{staff}) are created with the @code{\new} or @code{\context} commands. For details, see @ref{Creating contexts}. @@ -149,6 +154,7 @@ Internals Reference: @cindex staff group @cindex staff, choir @cindex staff, piano +@cindex staff, grand @cindex system Various contexts exist to group single staves together in order to @@ -202,7 +208,7 @@ details, see @ref{Instrument names}. @lilypond[verbatim,quote,relative=2] \new PianoStaff << - \set PianoStaff.instrumentName = "Piano" + \set PianoStaff.instrumentName = #"Piano" \new Staff { c1 c } \new Staff { c1 c } >> @@ -341,6 +347,7 @@ sections are also described. @cindex adjusting staff symbol @cindex drawing staff symbol @cindex staff symbol, setting of +@cindex staff symbol, drawing @cindex stop staff lines @cindex start staff lines @cindex staff lines, amount of @@ -406,8 +413,15 @@ affects the spacing of ledger lines as well. Further details about the properties of @code{StaffSymbol} can be found in @rinternals{staff-symbol-interface}. +@cindex stopping a staff +@cindex starting a staff +@cindex staff, starting +@cindex staff, stopping + @funindex \startStaff +@funindex startStaff @funindex \stopStaff +@funindex stopStaff Modifications to staff properties in the middle of a score can be placed between @code{\stopStaff} and @code{\startStaff}: @@ -424,8 +438,6 @@ b2 b a2 a @end lilypond -@cindex stopping a staff - @noindent In general, @code{\startStaff} and @code{\stopStaff} can be used to stop or start a staff in the middle of a score. @@ -484,6 +496,11 @@ outermost bar lines in either direction must be equal. @cindex staff, resizing of @cindex resizing of staves +@funindex \startStaff +@funindex startStaff +@funindex \stopStaff +@funindex stopStaff + @notation{Ossia} staves can be set by creating a new simultaneous staff in the appropriate location: @@ -648,6 +665,10 @@ Internals Reference: @cindex hiding of staves @cindex empty staves +@funindex \RemoveEmptyStaffContext +@funindex RemoveEmptyStaffContext + + Staff lines can be hidden by removing the @code{Staff_symbol_engraver} from the @code{Staff} context. As an alternative, @code{\stopStaff} may be used. @@ -659,7 +680,6 @@ alternative, @code{\stopStaff} may be used. \relative c''' { a8 f e16 d c b a2 } @end lilypond -@funindex \RemoveEmptyStaffContext Empty staves can be hidden by setting the @code{\RemoveEmptyStaffContext} command in the @code{\layout} @@ -700,8 +720,13 @@ sections for a staff. For details, see @ref{Ossia staves}. @cindex hiding ancient staves @cindex hiding rhythmic staves + +@funindex \RemoveEmptyStaffContext +@funindex RemoveEmptyStaffContext @funindex \AncientRemoveEmptyStaffContext +@funindex AncientRemoveEmptyStaffContext @funindex \RemoveEmptyRhythmicStaffContext +@funindex RemoveEmptyRhythmicStaffContext The @code{\AncientRemoveEmptyStaffContext} command may be used to hide empty staves in ancient music contexts. Similarly, @@ -777,7 +802,9 @@ format cue notes are also described. @cindex beats per minute @cindex metronome marking @cindex metronome marking with text + @funindex \tempo +@funindex tempo A basic metronome mark is simple to write: @@ -866,8 +893,8 @@ Instrument names can be printed on the left side of staves in the of @code{shortInstrumentName} is used for all succeeding staves. @lilypond[verbatim,quote,ragged-right,relative=1] -\set Staff.instrumentName = "Violin " -\set Staff.shortInstrumentName = "Vln " +\set Staff.instrumentName = #"Violin " +\set Staff.shortInstrumentName = #"Vln " c4.. g'16 c4.. g'16 \break c1 @@ -893,7 +920,7 @@ default. To center multi-line instrument names, @lilypond[verbatim,quote,indent=1.5\cm,relative=2] << \new Staff { - \set Staff.instrumentName = "Flute" + \set Staff.instrumentName = #"Flute" f2 g4 f } \new Staff { @@ -906,8 +933,8 @@ default. To center multi-line instrument names, >> @end lilypond -@cindex indent -@cindex short-indent +@funindex indent +@funindex short-indent However, if the instrument names are longer, the instrument names in a staff group may not be centered unless the @code{indent} and @@ -922,14 +949,14 @@ these settings, see @ref{Horizontal dimensions}. \relative c'' << \new Staff { - \set Staff.instrumentName = "Alto Flute in G" - \set Staff.shortInstrumentName = "Fl." + \set Staff.instrumentName = #"Alto Flute in G" + \set Staff.shortInstrumentName = #"Fl." f2 g4 f \break g4 f g2 } \new Staff { - \set Staff.instrumentName = "Clarinet" - \set Staff.shortInstrumentName = "Clar." + \set Staff.instrumentName = #"Clarinet" + \set Staff.shortInstrumentName = #"Clar." c,4 b c2 \break c2 b4 c } @@ -942,16 +969,17 @@ To add instrument names to other contexts (such as For details, see @ref{Modifying context plug-ins}. @cindex instrument names, changing +@cindex changing instrument names Instrument names may be changed in the middle of a piece: @lilypond[verbatim,quote,ragged-right,relative=1] -\set Staff.instrumentName = "First" -\set Staff.shortInstrumentName = "one" +\set Staff.instrumentName = #"First" +\set Staff.shortInstrumentName = #"one" c1 c c c \break c1 c c c \break -\set Staff.instrumentName = "Second" -\set Staff.shortInstrumentName = "two" +\set Staff.instrumentName = #"Second" +\set Staff.shortInstrumentName = #"two" c1 c c c \break c1 c c c \break @end lilypond @@ -959,6 +987,11 @@ c1 c c c \break @cindex instrument switch @cindex switching instruments +@funindex \addInstrumentDefinition +@funindex addInstrumentDefinition +@funindex \instrumentSwitch +@funindex instrumentSwitch + If an instrument @emph{switch} is needed, @code{\addInstrumentDefinition} may be used in combination with @code{\instrumentSwitch} to create a detailed list of the @@ -980,7 +1013,7 @@ expression to declare the instrument switch: (midiInstrument . "bassoon")) \new Staff \with { - instrumentName = "Bassoon" + instrumentName = #"Bassoon" } \relative c' { \clef tenor @@ -1016,6 +1049,13 @@ Internals Reference: @cindex fragments @cindex cue notes +@funindex \addQuote +@funindex addQuote +@funindex \quoteDuring +@funindex quoteDuring +@funindex \transposition +@funindex transposition + It is very common for one voice to double some of the music from another voice. For example, the first and second violins may play the same notes during a passage of music. In LilyPond this is accomplished @@ -1143,6 +1183,9 @@ written entirely in lower-case letters: @code{\addquote}. @cindex quoting other voices @cindex cues, formatting +@funindex \cueDuring +@funindex cueDuring + The previous section explains how to create quotations. The @code{\cueDuring} command is a more specialized form of @code{\quoteDuring}, being particularly useful for inserting cue @@ -1198,6 +1241,15 @@ oboe = \relative c''' { >> @end lilypond +@cindex removing cues +@cindex removing cue notes +@cindex cue notes, removing + +@funindex \killCues +@funindex killCues +@funindex \transposedCueDuring +@funindex transposedCueDuring + In addition to printing the name of the cued instrument, when cue notes end, the name of the original instrument should be printed, and any other changes introduced by the cued part should be diff --git a/Documentation/user/templates.itely b/Documentation/user/templates.itely index 03b23bd8ed..4f091008f2 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.61" +@c \version "2.12.0" @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.61" +\version "2.12.0" \header { dedication = "dedication" title = "Title" diff --git a/Documentation/user/text.itely b/Documentation/user/text.itely index 70d4bcaf8e..485ef646b9 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.65" +@c \version "2.12.0" @node Text @section Text diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely index f4d39d0ccf..f51d9c1da5 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.61" +@c \version "2.12.0" @ignore Tutorial guidelines: (different from policy.txt!) diff --git a/Documentation/user/tweaks.itely b/Documentation/user/tweaks.itely index 3ed353c257..dd38806ad6 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.65" +@c \version "2.12.0" @node Tweaking output @chapter Tweaking output @@ -369,11 +369,12 @@ Note that the syntax of @code{\tweak} is different from that of the @code{\override} command. Neither the context nor the layout object should be specified; in fact, it would generate an error to do so. These are both implied by the following -item in the input stream. So the general syntax of the +item in the input stream. Note also that an equals sign should +not be present. So the general syntax of the @code{\tweak} command is simply @example -\tweak #'@var{layout-property} = #@var{value} +\tweak #'@var{layout-property} #@var{value} @end example A @code{\tweak} command can also be used to modify just one in @@ -1303,7 +1304,7 @@ how to introduce a new temporary staff, as in an @rglos{ossia}. << { f c c } \new Staff \with { - alignAboveContext = "main" } + alignAboveContext = #"main" } { f8 f c } >> r4 | @@ -1330,7 +1331,7 @@ we simply set the stencil of each to @code{#f}, as follows: << { f c c } \new Staff \with { - alignAboveContext = "main" + alignAboveContext = #"main" } { \override Staff.Clef #'stencil = ##f @@ -1391,7 +1392,7 @@ So we could replace the example above with << { f c c } \new Staff \with { - alignAboveContext = "main" + alignAboveContext = #"main" % Don't print clefs in this staff \override Clef #'stencil = ##f % Don't print time signatures in this staff @@ -1455,7 +1456,7 @@ Let's try it in our ossia example: << { f c c } \new Staff \with { - alignAboveContext = "main" + alignAboveContext = #"main" \override Clef #'stencil = ##f \override TimeSignature #'stencil = ##f % Reduce all font sizes by ~24% @@ -1520,7 +1521,7 @@ objects in proportion. It is used like this: << { f c c } \new Staff \with { - alignAboveContext = "main" + alignAboveContext = #"main" \override Clef #'stencil = ##f \override TimeSignature #'stencil = ##f fontSize = #-2 @@ -2048,6 +2049,33 @@ c\ff c \stopTextSpan c, c c c @end lilypond +@cindex slurs and outside-staff-priority +@cindex slurs and articulations +@cindex articulations and slurs + +Slurs by default are classed as within-staff objects, but +they often appear above the staff if the notes to +which they are attached are high on the staff. This can push +outside-staff objects such as articulations too high, as the slur +will be placed first. The @code{avoid-slur} property of the +articulation can be set to @code{'inside} to bring the articulation +inside the slur, but the @code{avoid-slur} property is effective +only if the @code{outside-staff-priority} is also set to @code{#f}. +Alternatively, the @code{outside-staff-priority} of the slur +can be set to a numerical value to cause it to be placed along with +other outside-staff objects according to that value. Here's an +example showing the effect of the two methods: + +@lilypond[quote,verbatim,relative=2] +c4( c^\markup\tiny\sharp d4.) c8 +c4( +\once \override TextScript #'avoid-slur = #'inside +\once \override TextScript #'outside-staff-priority = ##f +c^\markup\tiny\sharp d4.) c8 +\once \override Slur #'outside-staff-priority = #500 +c4( c^\markup\tiny\sharp d4.) c8 +@end lilypond + Changing the @code{outside-staff-priority} can also be used to control the vertical placement of individual objects, although the results may not always be desirable. Suppose we would @@ -3431,12 +3459,14 @@ second (with the stencil removed) does not. Override commands are often long and tedious to type, and they have to be absolutely correct. If the same overrides are to be used many times it may be worth defining variables to hold them. + Suppose we wish to emphasize certain words in lyrics by printing them in bold italics. The @code{\italic} and @code{\bold} -commands only work within lyrics if they are also embedded in -@code{\markup}, which makes them tedious to enter, so as an -alternative can we instead use the @code{\override} and -@code{\revert} commands? +commands only work within lyrics if they are embedded, together with +the word or words to be modified, within a @code{\markup} block, +which makes them tedious to enter. The need to embed the words +themselves prevents their use in simple variables. As an +alternative can we use @code{\override} and @code{\revert} commands? @example @code{\override Lyrics . LyricText #'font-shape = #'italic} @@ -3447,10 +3477,13 @@ alternative can we instead use the @code{\override} and @end example These would also be extremely tedious to enter if there were many -words requiring emphasis. So instead we define these as two -variables, and use them as follows, although normally we would -perhaps choose shorter names for the variables to make them -quicker to type: +words requiring emphasis. But we @emph{can} define these as two +variables and use those to bracket the words to be emphasized. +Another advantage of using variables for these overrides is that +the spaces around the dot are not necessary, since they are not +being interpreted in @code{\lyricmode} directly. Here's an example +of this, although in practice we would choose shorter names +for the variables to make them quicker to type: @cindex LyricText, example of overriding @cindex font-shape property, example @@ -3458,12 +3491,12 @@ quicker to type: @lilypond[quote,verbatim] emphasize = { - \override Lyrics . LyricText #'font-shape = #'italic - \override Lyrics . LyricText #'font-series = #'bold + \override Lyrics.LyricText #'font-shape = #'italic + \override Lyrics.LyricText #'font-series = #'bold } normal = { - \revert Lyrics . LyricText #'font-shape - \revert Lyrics . LyricText #'font-series + \revert Lyrics.LyricText #'font-shape + \revert Lyrics.LyricText #'font-series } global = { \time 4/4 \partial 4 \key c \major} diff --git a/Documentation/user/unfretted-strings.itely b/Documentation/user/unfretted-strings.itely index be92345bdc..5b1a35c9a4 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.61" +@c \version "2.12.0" @node Unfretted string instruments @section Unfretted string instruments diff --git a/Documentation/user/vocal.itely b/Documentation/user/vocal.itely index 7f68e263fe..fa5b58f2b5 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.61" +@c \version "2.12.0" @node Vocal music @section Vocal music @@ -994,10 +994,10 @@ Stanza numbers can be added by setting @code{stanza}, e.g., \new Voice { \time 3/4 g2 e4 a2 f4 g2. } \addlyrics { - \set stanza = "1. " + \set stanza = #"1. " Hi, my name is Bert. } \addlyrics { - \set stanza = "2. " + \set stanza = #"2. " Oh, ché -- ri, je t'aime } @end lilypond @@ -1078,10 +1078,10 @@ the line, just like instrument names. They are created by setting \new Voice { \time 3/4 g2 e4 a2 f4 g2. } \addlyrics { - \set vocalName = "Bert " + \set vocalName = #"Bert " Hi, my name is Bert. } \addlyrics { - \set vocalName = "Ernie " + \set vocalName = #"Ernie " Oh, ché -- ri, je t'aime } @end lilypond @@ -1227,7 +1227,7 @@ d d e d | c1 | } text = \lyricmode { -\set stanza = "1." Ma- ry had a lit- tle lamb, +\set stanza = #"1." Ma- ry had a lit- tle lamb, its fleece was white as snow. } @@ -1268,7 +1268,7 @@ melody = \relative c' { } text = \lyricmode { - \set stanza = "1." This is verse one. + \set stanza = #"1." This is verse one. It has two lines. } diff --git a/Documentation/user/wind.itely b/Documentation/user/wind.itely index 4942344f71..6507197554 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.61" +@c \version "2.12.0" @node Wind instruments @section Wind instruments diff --git a/Documentation/user/working.itely b/Documentation/user/working.itely index 77d5ce943f..2ad0f2b5af 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.61" +@c \version "2.12.0" @node Working on LilyPond projects @chapter Working on LilyPond projects diff --git a/Documentation/user/world.itely b/Documentation/user/world.itely index e5df1a7f98..8550f4b291 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.61" +@c \version "2.12.0" @node World music @section World music diff --git a/THANKS b/THANKS index e77c4780d4..8a077a16f8 100644 --- a/THANKS +++ b/THANKS @@ -40,7 +40,7 @@ Till Rettig - NR work Kurt Kroon - Glossary Updates, NR work Alard de Boer - Formatting Michael Rasmussen - Formatting -Trevor Baca - Inspirational Headwords +Trevor Bača - Inspirational Headwords Reinhold Kainhofer - Technical Aid Neil Puttock - Snippet Editor, Technical Aid @@ -48,6 +48,7 @@ Neil Puttock - Snippet Editor, Technical Aid TRANSLATORS Clytie Siddall +Damien Heurtebise Francisco Vila Heikki Junes Jean-Charles Malahieude @@ -78,7 +79,6 @@ Christian Hitz Christian Herzberg David Bobroff David Griffel -Damien Heurtebise Daniel Hulme Daniel Johnson Dominic Neumann diff --git a/VERSION b/VERSION index da4a8335c6..3940f45862 100644 --- a/VERSION +++ b/VERSION @@ -1,6 +1,6 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=2 -MINOR_VERSION=11 -PATCH_LEVEL=65 +MINOR_VERSION=12 +PATCH_LEVEL=1 MY_PATCH_LEVEL= diff --git a/buildscripts/www_post.py b/buildscripts/www_post.py index 29f80cf09f..1af5c922ec 100644 --- a/buildscripts/www_post.py +++ b/buildscripts/www_post.py @@ -47,7 +47,7 @@ dirs, symlinks, files = mirrortree.walk_tree ( tree_roots = doc_dirs, process_dirs = outdir, exclude_dirs = '(^|/)(' + r'|po|out|out-test|.*?[.]t2d|\w*?-root)(/|$)|Documentation/(' + '|'.join ([l.code for l in langdefs.LANGUAGES]) + ')', - find_files = r'.*?\.(?:midi|html|pdf|png|txt|i?ly|signature|css)$|VERSION', + find_files = r'.*?\.(?:midi|html|pdf|png|txt|i?ly|signature|css|zip|xml|mxl)$|VERSION', exclude_files = r'lily-[0-9a-f]+.*\.(pdf|txt)') # actual mirrorring stuff diff --git a/flower/file-cookie.cc b/flower/file-cookie.cc index 49b5518f36..bedb100a00 100644 --- a/flower/file-cookie.cc +++ b/flower/file-cookie.cc @@ -15,12 +15,10 @@ extern "C" { } void * - lily_fopencookie (void *cookie, char const *modes, - lily_cookie_io_functions_t io_funcs) + lily_fopencookie (void *cookie, + char const * /* modes */, + lily_cookie_io_functions_t /* io_funcs */) { - (void) cookie; - (void) modes; - (void) io_funcs; assert (is_memory_stream (cookie)); return (FILE *) cookie; } diff --git a/flower/memory-stream.cc b/flower/memory-stream.cc index 270438dcae..dbf6fd83f2 100644 --- a/flower/memory-stream.cc +++ b/flower/memory-stream.cc @@ -102,23 +102,19 @@ Memory_out_stream::writer (void *cookie, } ssize_t -Memory_out_stream::reader (void *cookie, - char *buffer, - size_t size) +Memory_out_stream::reader (void * /* cookie */, + char * /* buffer */, + size_t /* size */) { - (void) cookie; - (void) buffer; - (void) size; - assert (false); return 0; } int -Memory_out_stream::seeker (void *, off64_t *, int whence) +Memory_out_stream::seeker (void *, + off64_t *, + int) { - (void) whence; - assert (false); return 0; } diff --git a/input/bach-schenker.ly b/input/bach-schenker.ly index 9e5b9dbe4b..25c6a2ba57 100644 --- a/input/bach-schenker.ly +++ b/input/bach-schenker.ly @@ -14,7 +14,7 @@ I = \once \override NoteColumn #'ignore-collision = ##t -\version "2.11.61" +\version "2.12.0" staffPiano = \new PianoStaff { \set Score.timing = ##f diff --git a/input/cary-layout.ly b/input/cary-layout.ly index 04655ddbb3..740a025086 100644 --- a/input/cary-layout.ly +++ b/input/cary-layout.ly @@ -1,5 +1,5 @@ -\version "2.11.61" +\version "2.12.0" \layout { indent = #0 diff --git a/input/cary.ly b/input/cary.ly index 6af5fe538f..d385da139e 100644 --- a/input/cary.ly +++ b/input/cary.ly @@ -21,7 +21,7 @@ % Copyright 2006 for the entire score; % All rights reserved by the composer. -\version "2.11.65" +\version "2.12.0" \include "english.ly" \include "cary-layout.ly" diff --git a/input/example-1.ly b/input/example-1.ly index a4ea980eee..517be6e0bc 100644 --- a/input/example-1.ly +++ b/input/example-1.ly @@ -18,4 +18,4 @@ also included in the user-manual. %} %% Optional version number -\version "2.11.61" +\version "2.12.0" diff --git a/input/example-2.ly b/input/example-2.ly index 6deaa3d0a2..64282ab3c2 100644 --- a/input/example-2.ly +++ b/input/example-2.ly @@ -17,5 +17,5 @@ also included in the user-manual. %} %% Optional version number -\version "2.11.61" +\version "2.12.0" diff --git a/input/example-3.ly b/input/example-3.ly index c2827edb88..34291864c9 100644 --- a/input/example-3.ly +++ b/input/example-3.ly @@ -33,4 +33,4 @@ also included in the user-manual. %} %% Optional version number -\version "2.11.61" +\version "2.12.0" diff --git a/input/les-nereides.ly b/input/les-nereides.ly index 7a420afbd3..3d88381fc5 100644 --- a/input/les-nereides.ly +++ b/input/les-nereides.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { composer = "ARTHUR GRAY" diff --git a/input/lsr/accordion-discant-symbols.ly b/input/lsr/accordion-discant-symbols.ly index f15e8e8520..c89e78f9ea 100644 --- a/input/lsr/accordion-discant-symbols.ly +++ b/input/lsr/accordion-discant-symbols.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "keyboards" diff --git a/input/lsr/adding-a-figured-bass-above-or-below-the-notes.ly b/input/lsr/adding-a-figured-bass-above-or-below-the-notes.ly index 9646eb384c..631d4fb6fc 100644 --- a/input/lsr/adding-a-figured-bass-above-or-below-the-notes.ly +++ b/input/lsr/adding-a-figured-bass-above-or-below-the-notes.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "chords, ancient-notation, contexts-and-engravers" @@ -15,11 +15,14 @@ dentro de un contexto @code{Staff}). Se puede elegir entre centrado) y @code{#DOWN} (o @code{#-1}, abajo). Como podemos ver, esta propiedad se puede cambiar tantas veces -como queramos. Utilice @code{\\once \\override} si no quiere que el +como queramos. Utilice @code{\\once \\override} si no quiere que el truco se aplique a toda la partitura. " doctitlees = "Añadir un bajo cifrado encima o debajo de las notas" + + doctitlefr = "Ajout d'une basse chiffrée au-dessus ou au-dessous des notes" + texidoc = " When writing a figured bass, here's a way to specify if you want your diff --git a/input/lsr/adding-ambitus-per-voice.ly b/input/lsr/adding-ambitus-per-voice.ly index 40ed554714..419d857959 100644 --- a/input/lsr/adding-ambitus-per-voice.ly +++ b/input/lsr/adding-ambitus-per-voice.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "pitches, staff-notation, vocal-music" diff --git a/input/lsr/adding-an-extra-staff-at-a-line-break.ly b/input/lsr/adding-an-extra-staff-at-a-line-break.ly index e1583ddfaf..129ab0cbd5 100644 --- a/input/lsr/adding-an-extra-staff-at-a-line-break.ly +++ b/input/lsr/adding-an-extra-staff-at-a-line-break.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "staff-notation, contexts-and-engravers, breaks" diff --git a/input/lsr/adding-an-extra-staff.ly b/input/lsr/adding-an-extra-staff.ly index cbc4b82ed2..f289584576 100644 --- a/input/lsr/adding-an-extra-staff.ly +++ b/input/lsr/adding-an-extra-staff.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "staff-notation, contexts-and-engravers" diff --git a/input/lsr/adding-bar-lines-to-chordnames-context.ly b/input/lsr/adding-bar-lines-to-chordnames-context.ly index 33f6d7a913..a28ffda079 100644 --- a/input/lsr/adding-bar-lines-to-chordnames-context.ly +++ b/input/lsr/adding-bar-lines-to-chordnames-context.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "chords" diff --git a/input/lsr/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly b/input/lsr/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly index 6d785eddc9..6bdbc5fe1b 100644 --- a/input/lsr/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly +++ b/input/lsr/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms, expressive-marks" @@ -39,7 +39,7 @@ sections (enclosed within curly braces). { r16[ g16 \times 2/3 { r16 e'8] } g16( a \times 2/3 { b d e') } - g8[( a \times 2/3 { b d') e']~ } + g8[( a \times 2/3 { b d') e'] ~ } \time 2/4 \times 4/5 { e'32\( a b d' e' } a'4.\) } diff --git a/input/lsr/adding-drum-parts.ly b/input/lsr/adding-drum-parts.ly index a205be720c..41127f6e32 100644 --- a/input/lsr/adding-drum-parts.ly +++ b/input/lsr/adding-drum-parts.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms, percussion" diff --git a/input/lsr/adding-fingerings-to-a-score.ly b/input/lsr/adding-fingerings-to-a-score.ly index adf9cb98c2..5d2e7f0bbb 100644 --- a/input/lsr/adding-fingerings-to-a-score.ly +++ b/input/lsr/adding-fingerings-to-a-score.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "editorial-annotations, fretted-strings" diff --git a/input/lsr/adding-fingerings-to-tablatures.ly b/input/lsr/adding-fingerings-to-tablatures.ly index ae5c6bd067..ebb28b6979 100644 --- a/input/lsr/adding-fingerings-to-tablatures.ly +++ b/input/lsr/adding-fingerings-to-tablatures.ly @@ -1,10 +1,17 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "fretted-strings" + texidocfr = "Ajout de doigtés à des tablatures" + + doctitlefr = " +L'ajout de doigtés à des tablatures s'obtient en conjuguant des +@code{\\markup} et des @code{\\finger}. +" + texidoc = " To add fingerings to tablatures, use a combination of @code{\\markup} and @code{\\finger}. diff --git a/input/lsr/adding-parentheses-around-an-expressive-mark-or-chordal-note.ly b/input/lsr/adding-parentheses-around-an-expressive-mark-or-chordal-note.ly index e05d2f9090..baf329d475 100644 --- a/input/lsr/adding-parentheses-around-an-expressive-mark-or-chordal-note.ly +++ b/input/lsr/adding-parentheses-around-an-expressive-mark-or-chordal-note.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "expressive-marks" @@ -26,6 +26,6 @@ objects in parentheses. The associated grob is c2-\parenthesize -> \override ParenthesesItem #'padding = #0.1 \override ParenthesesItem #'font-size = #-4 - 2 + 2 } diff --git a/input/lsr/adding-the-current-date-to-a-score.ly b/input/lsr/adding-the-current-date-to-a-score.ly index c4a1393491..fed821a5b3 100644 --- a/input/lsr/adding-the-current-date-to-a-score.ly +++ b/input/lsr/adding-the-current-date-to-a-score.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "titles" @@ -8,9 +8,15 @@ texidoces = " Con algo de código de Scheme, se puede añadir fácilmente la fecha actual a una partitura. - " doctitlees = "Añadir la fecha actual a una partitura" + + texidocfr = " +Avec un peu de code Scheme, voici comment ajouter facilement +la date du jour à votre partition. +" + + doctitlefr = "Ajout de la date du jour à une partition" texidoc = " With a little Scheme code, the current date can easily be added to a diff --git a/input/lsr/adding-volta-brackets-to-additional-staves.ly b/input/lsr/adding-volta-brackets-to-additional-staves.ly index 537a2aef4b..4425c6709d 100644 --- a/input/lsr/adding-volta-brackets-to-additional-staves.ly +++ b/input/lsr/adding-volta-brackets-to-additional-staves.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "repeats" diff --git a/input/lsr/additional-voices-to-avoid-collisions.ly b/input/lsr/additional-voices-to-avoid-collisions.ly index 462f0b76b6..e406cdc4ca 100644 --- a/input/lsr/additional-voices-to-avoid-collisions.ly +++ b/input/lsr/additional-voices-to-avoid-collisions.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "simultaneous-notes" diff --git a/input/lsr/adjusting-lyrics-vertical-spacing.ly b/input/lsr/adjusting-lyrics-vertical-spacing.ly index a4006b90a0..83e15bd307 100644 --- a/input/lsr/adjusting-lyrics-vertical-spacing.ly +++ b/input/lsr/adjusting-lyrics-vertical-spacing.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "text, vocal-music, spacing" diff --git a/input/lsr/adjusting-the-shape-of-falls-and-doits.ly b/input/lsr/adjusting-the-shape-of-falls-and-doits.ly index e9e36c5c72..b82a86910f 100644 --- a/input/lsr/adjusting-the-shape-of-falls-and-doits.ly +++ b/input/lsr/adjusting-the-shape-of-falls-and-doits.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "expressive-marks" diff --git a/input/lsr/aligning-and-centering-instrument-names.ly b/input/lsr/aligning-and-centering-instrument-names.ly index 9c3a8a4d74..0a67d32d7c 100644 --- a/input/lsr/aligning-and-centering-instrument-names.ly +++ b/input/lsr/aligning-and-centering-instrument-names.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { texidoces = " diff --git a/input/lsr/aligning-marks-with-various-notation-objects.ly b/input/lsr/aligning-marks-with-various-notation-objects.ly index abacdeb058..f96a8ad0fe 100644 --- a/input/lsr/aligning-marks-with-various-notation-objects.ly +++ b/input/lsr/aligning-marks-with-various-notation-objects.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { texidoces = " diff --git a/input/lsr/allowing-fingerings-to-be-printed-inside-the-staff.ly b/input/lsr/allowing-fingerings-to-be-printed-inside-the-staff.ly index 6ed05bf779..08bfb23c84 100644 --- a/input/lsr/allowing-fingerings-to-be-printed-inside-the-staff.ly +++ b/input/lsr/allowing-fingerings-to-be-printed-inside-the-staff.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "editorial-annotations, fretted-strings, spacing" diff --git a/input/lsr/ambitus-with-multiple-voices.ly b/input/lsr/ambitus-with-multiple-voices.ly index 9d7f613114..91a3e295f5 100644 --- a/input/lsr/ambitus-with-multiple-voices.ly +++ b/input/lsr/ambitus-with-multiple-voices.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "pitches, vocal-music" diff --git a/input/lsr/ambitus.ly b/input/lsr/ambitus.ly index 3210a2c0fc..ce6457e4f1 100644 --- a/input/lsr/ambitus.ly +++ b/input/lsr/ambitus.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "pitches, vocal-music" @@ -17,22 +17,24 @@ Accidentals only show up if they are not part of the key signature. } % begin verbatim \layout { - ragged-right = ##t \context { \Voice \consists "Ambitus_engraver" } } -\relative << \new Staff { - \time 2/4 c4 f' + \relative c' { + \time 2/4 + c4 f' + } } - \new Staff \relative { - \time 2/4 - \key d \major - cis as' + \new Staff { + \relative c' { + \time 2/4 + \key d \major + cis4 as' + } } >> - diff --git a/input/lsr/analysis-brackets-above-the-staff.ly b/input/lsr/analysis-brackets-above-the-staff.ly index ab6b0672b8..283078d0a4 100644 --- a/input/lsr/analysis-brackets-above-the-staff.ly +++ b/input/lsr/analysis-brackets-above-the-staff.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "editorial-annotations, tweaks-and-overrides" diff --git a/input/lsr/ancient-fonts.ly b/input/lsr/ancient-fonts.ly index dfef3b9593..2f1f606a5b 100644 --- a/input/lsr/ancient-fonts.ly +++ b/input/lsr/ancient-fonts.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "ancient-notation" diff --git a/input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly b/input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly index ce55d5c0de..c4c313a526 100644 --- a/input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly +++ b/input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly @@ -1,19 +1,19 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "ancient-notation, template" texidoces = " -Este ejemplo muestra cómo hacer una transcripción moderna de Canto -Gregoriano. El Canto Gregoriano no tiene compás ni plicas; utiliza +Este ejemplo muestra cómo hacer una transcripción moderna de canto +gregoriano. El canto gregoriano no tiene compás ni plicas; utiliza solamente cabezas de nota de blanca y de negra, y unas marcas especiales que indican silencios de distintas longitudes. " - doctitlees = "Plantilla para notación de música antigua (transcripción moderna de Canto Gregoriano)" + doctitlees = "Plantilla para notación de música antigua (transcripción moderna de canto gregoriano)" texidocde = " Dieses Beispiel zeigt eine moderne Transkription des Gregorianischen diff --git a/input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly b/input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly index df7987c8d0..b0462e0b32 100644 --- a/input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly +++ b/input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "ancient-notation, template" diff --git a/input/lsr/ancient-time-signatures.ly b/input/lsr/ancient-time-signatures.ly index e19f4c5488..e98c716c0a 100644 --- a/input/lsr/ancient-time-signatures.ly +++ b/input/lsr/ancient-time-signatures.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "ancient-notation" diff --git a/input/lsr/applying-note-head-styles-depending-on-the-step-of-the-scale.ly b/input/lsr/applying-note-head-styles-depending-on-the-step-of-the-scale.ly index 7a56117afd..2935c977a3 100644 --- a/input/lsr/applying-note-head-styles-depending-on-the-step-of-the-scale.ly +++ b/input/lsr/applying-note-head-styles-depending-on-the-step-of-the-scale.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "pitches, editorial-annotations" @@ -70,8 +70,6 @@ correspondence between harmonic functions and note head styles. doctitle = "Applying note head styles depending on the step of the scale" } % begin verbatim -\layout { ragged-right = ##t } - fragment = { \key c \major c2 d @@ -97,4 +95,5 @@ fragment = { \fragment } } + \layout { ragged-right = ##t } } diff --git a/input/lsr/arabic-improvisation.ly b/input/lsr/arabic-improvisation.ly index 5c3883b59e..823823feda 100644 --- a/input/lsr/arabic-improvisation.ly +++ b/input/lsr/arabic-improvisation.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { texidoces = " diff --git a/input/lsr/automatic-beam-subdivisions.ly b/input/lsr/automatic-beam-subdivisions.ly index fcc24705ce..22fc8f0bf1 100644 --- a/input/lsr/automatic-beam-subdivisions.ly +++ b/input/lsr/automatic-beam-subdivisions.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms" @@ -22,22 +22,25 @@ specified in @code{beatLength}). doctitle = "Automatic beam subdivisions" } % begin verbatim -\score { - \new Staff \relative c'' { - << { - \voiceOne - \set subdivideBeams = ##t - b32[ a g f c' b a g b^"subdivide beams" a g f c' b a g] - \oneVoice - } - \new Voice { - \voiceTwo - b32_"default"[ a g f c' b a g b a g f c' b a g] - } >> +\new Staff { + \relative c'' { + << + { + \voiceOne + \set subdivideBeams = ##t + b32[ a g f c' b a g + b32^"subdivide beams" a g f c' b a g] + } + \new Voice { + \voiceTwo + b32_"default"[ a g f c' b a g + b32 a g f c' b a g] + } + >> + \oneVoice \set beatLength = #(ly:make-moment 1 8) b32^"beatLength 1 8"[ a g f c' b a g] \set beatLength = #(ly:make-moment 1 16) b32^"beatLength 1 16"[ a g f c' b a g] } } - diff --git a/input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly b/input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly index 24ac984df1..6d4cbc3a6e 100644 --- a/input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly +++ b/input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms" @@ -41,17 +41,21 @@ qBeam = { \score { << - \new Staff \relative c'' { - \time 4/4 - g8^\markup { without the macro } g g g g g g g - g8 g g g4 g8 g g + \new Staff { + \relative c'' { + \time 4/4 + g8-"without the macro" g g g g g g g + g8 g g g4 g8 g g + } } %Use the macro - \new Staff \relative c'' { - \time 4/4 - \qBeam - g8^\markup { with the macro } g g g g g g g - g8 g g g4 g8 g g + \new Staff { + \relative c'' { + \time 4/4 + \qBeam + g8-"with the macro" g g g g g g g + g8 g g g4 g8 g g + } } >> \layout { diff --git a/input/lsr/avoiding-collisions-of-chord-fingering-with-beams.ly b/input/lsr/avoiding-collisions-of-chord-fingering-with-beams.ly index 1afbc794f7..d91981e109 100644 --- a/input/lsr/avoiding-collisions-of-chord-fingering-with-beams.ly +++ b/input/lsr/avoiding-collisions-of-chord-fingering-with-beams.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms, editorial-annotations, chords, tweaks-and-overrides" diff --git a/input/lsr/beam-endings-in-score-context.ly b/input/lsr/beam-endings-in-score-context.ly index a45638027f..28aefed6fa 100644 --- a/input/lsr/beam-endings-in-score-context.ly +++ b/input/lsr/beam-endings-in-score-context.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms" diff --git a/input/lsr/beam-grouping-in-7-8-time.ly b/input/lsr/beam-grouping-in-7-8-time.ly index 49e34a00b7..d31487662e 100644 --- a/input/lsr/beam-grouping-in-7-8-time.ly +++ b/input/lsr/beam-grouping-in-7-8-time.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms" diff --git a/input/lsr/beams-across-line-breaks.ly b/input/lsr/beams-across-line-breaks.ly index 4d7444762a..72655a3c5d 100644 --- a/input/lsr/beams-across-line-breaks.ly +++ b/input/lsr/beams-across-line-breaks.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms" diff --git a/input/lsr/blanking-staff-lines-using-the--whiteout-command.ly b/input/lsr/blanking-staff-lines-using-the--whiteout-command.ly index 8a161e2784..fd7e5cea83 100644 --- a/input/lsr/blanking-staff-lines-using-the--whiteout-command.ly +++ b/input/lsr/blanking-staff-lines-using-the--whiteout-command.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "editorial-annotations, text" diff --git a/input/lsr/book-parts.ly b/input/lsr/book-parts.ly index 8cd6e3a057..ebec6023e5 100644 --- a/input/lsr/book-parts.ly +++ b/input/lsr/book-parts.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.65" +\version "2.12.0" \header { lsrtags = "paper-and-layout" diff --git a/input/lsr/breathing-signs.ly b/input/lsr/breathing-signs.ly index cd9c2a1dd2..513dbfb378 100644 --- a/input/lsr/breathing-signs.ly +++ b/input/lsr/breathing-signs.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "expressive-marks" diff --git a/input/lsr/broken-crescendo-hairpin.ly b/input/lsr/broken-crescendo-hairpin.ly index 8eb5ccaa5c..4cc3216d2d 100644 --- a/input/lsr/broken-crescendo-hairpin.ly +++ b/input/lsr/broken-crescendo-hairpin.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { texidoces = " diff --git a/input/lsr/caesura-railtracks-with-fermata.ly b/input/lsr/caesura-railtracks-with-fermata.ly index d27a559a9f..4de19c7842 100644 --- a/input/lsr/caesura-railtracks-with-fermata.ly +++ b/input/lsr/caesura-railtracks-with-fermata.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "expressive-marks, tweaks-and-overrides" diff --git a/input/lsr/center-text-below-hairpin-dynamics.ly b/input/lsr/center-text-below-hairpin-dynamics.ly index 682304df15..a88f2aa24b 100644 --- a/input/lsr/center-text-below-hairpin-dynamics.ly +++ b/input/lsr/center-text-below-hairpin-dynamics.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { texidoces = " diff --git a/input/lsr/changing--flageolet-mark-size.ly b/input/lsr/changing--flageolet-mark-size.ly index 3f554f87c9..06cc98f352 100644 --- a/input/lsr/changing--flageolet-mark-size.ly +++ b/input/lsr/changing--flageolet-mark-size.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "expressive-marks, unfretted-strings" @@ -20,12 +20,13 @@ function. doctitle = "Changing \\flageolet mark size" } % begin verbatim -smallFlageolet = #(let ((m (make-music 'ArticulationEvent - 'articulation-type "flageolet"))) - (set! (ly:music-property m 'tweaks) - (acons 'font-size -3 - (ly:music-property m 'tweaks))) - m) +smallFlageolet = +#(let ((m (make-music 'ArticulationEvent + 'articulation-type "flageolet"))) + (ly:music-set-property! m 'tweaks + (acons 'font-size -3 + (ly:music-property m 'tweaks))) + m) \layout { ragged-right = ##f } diff --git a/input/lsr/changing-a-single-notes-size-in-a-chord.ly b/input/lsr/changing-a-single-notes-size-in-a-chord.ly index eaed554efd..24ff68630b 100644 --- a/input/lsr/changing-a-single-notes-size-in-a-chord.ly +++ b/input/lsr/changing-a-single-notes-size-in-a-chord.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "simultaneous-notes, editorial-annotations, tweaks-and-overrides" diff --git a/input/lsr/changing-beam-knee-gap.ly b/input/lsr/changing-beam-knee-gap.ly index ba84235972..0ada10784b 100644 --- a/input/lsr/changing-beam-knee-gap.ly +++ b/input/lsr/changing-beam-knee-gap.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms" diff --git a/input/lsr/changing-chord-separator.ly b/input/lsr/changing-chord-separator.ly index b6ccb4c54a..8bd86dab51 100644 --- a/input/lsr/changing-chord-separator.ly +++ b/input/lsr/changing-chord-separator.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "chords" diff --git a/input/lsr/changing-form-of-multi--measure-rests.ly b/input/lsr/changing-form-of-multi--measure-rests.ly index f84b1e6045..14e8b6eee0 100644 --- a/input/lsr/changing-form-of-multi--measure-rests.ly +++ b/input/lsr/changing-form-of-multi--measure-rests.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { doctitlees = "Cambiar la forma de los silencios multicompás" texidoces = " diff --git a/input/lsr/changing-midi-output-to-one-channel-per-voice.ly b/input/lsr/changing-midi-output-to-one-channel-per-voice.ly index 6e90081273..748bf2c2e6 100644 --- a/input/lsr/changing-midi-output-to-one-channel-per-voice.ly +++ b/input/lsr/changing-midi-output-to-one-channel-per-voice.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "contexts-and-engravers, midi" diff --git a/input/lsr/changing-partcombine-texts.ly b/input/lsr/changing-partcombine-texts.ly index 369c7f3659..1963230ea0 100644 --- a/input/lsr/changing-partcombine-texts.ly +++ b/input/lsr/changing-partcombine-texts.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "simultaneous-notes" diff --git a/input/lsr/changing-properties-for-individual-grobs.ly b/input/lsr/changing-properties-for-individual-grobs.ly index 202c906c93..129c8fc9b4 100644 --- a/input/lsr/changing-properties-for-individual-grobs.ly +++ b/input/lsr/changing-properties-for-individual-grobs.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "tweaks-and-overrides" diff --git a/input/lsr/changing-stanza-fonts.ly b/input/lsr/changing-stanza-fonts.ly index 03cda1d63f..9d706bd94e 100644 --- a/input/lsr/changing-stanza-fonts.ly +++ b/input/lsr/changing-stanza-fonts.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "vocal-music" diff --git a/input/lsr/changing-text-and-spanner-styles-for-text-dynamics.ly b/input/lsr/changing-text-and-spanner-styles-for-text-dynamics.ly index c92da3b259..adb48b0850 100644 --- a/input/lsr/changing-text-and-spanner-styles-for-text-dynamics.ly +++ b/input/lsr/changing-text-and-spanner-styles-for-text-dynamics.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { texidoces = " Se puede modificar el texto empleado para los crescendos y diff --git a/input/lsr/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly b/input/lsr/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly index 6888684bba..99f64e2d33 100644 --- a/input/lsr/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly +++ b/input/lsr/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "expressive-marks, editorial-annotations" diff --git a/input/lsr/changing-the-breath-mark-symbol.ly b/input/lsr/changing-the-breath-mark-symbol.ly index b15b266cd0..c9db86ef07 100644 --- a/input/lsr/changing-the-breath-mark-symbol.ly +++ b/input/lsr/changing-the-breath-mark-symbol.ly @@ -1,13 +1,13 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "expressive-marks" texidoces = " El glifo de la marca de respiración se puede ajustar -sobreescribiendo la proopiedad de texto del objeto de presentación +sobreescribiendo la propiedad de texto del objeto de presentación @code{BreathingSign}, con cualquier otro texto de marcado. " diff --git a/input/lsr/changing-the-chord-names-to-german-or-semi-german-notation.ly b/input/lsr/changing-the-chord-names-to-german-or-semi-german-notation.ly index edaa5fc9bb..c61781337c 100644 --- a/input/lsr/changing-the-chord-names-to-german-or-semi-german-notation.ly +++ b/input/lsr/changing-the-chord-names-to-german-or-semi-german-notation.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "chords" diff --git a/input/lsr/changing-the-default-text-font-family.ly b/input/lsr/changing-the-default-text-font-family.ly index a7e15dc84c..d73371c642 100644 --- a/input/lsr/changing-the-default-text-font-family.ly +++ b/input/lsr/changing-the-default-text-font-family.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "text, tweaks-and-overrides" diff --git a/input/lsr/changing-the-number-of-lines-in-a-staff.ly b/input/lsr/changing-the-number-of-lines-in-a-staff.ly index 0425e1c69d..e2fdedc293 100644 --- a/input/lsr/changing-the-number-of-lines-in-a-staff.ly +++ b/input/lsr/changing-the-number-of-lines-in-a-staff.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "staff-notation" diff --git a/input/lsr/changing-the-positions-of-figured-bass-alterations.ly b/input/lsr/changing-the-positions-of-figured-bass-alterations.ly index b7c0748d25..79e9d2e31b 100644 --- a/input/lsr/changing-the-positions-of-figured-bass-alterations.ly +++ b/input/lsr/changing-the-positions-of-figured-bass-alterations.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "chords" diff --git a/input/lsr/changing-the-staff-size.ly b/input/lsr/changing-the-staff-size.ly index e87600a400..a699f9ee6b 100644 --- a/input/lsr/changing-the-staff-size.ly +++ b/input/lsr/changing-the-staff-size.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "staff-notation, tweaks-and-overrides, paper-and-layout" diff --git a/input/lsr/changing-the-tempo-without-a-metronome-mark.ly b/input/lsr/changing-the-tempo-without-a-metronome-mark.ly index 6522c35216..b3a1c31a63 100644 --- a/input/lsr/changing-the-tempo-without-a-metronome-mark.ly +++ b/input/lsr/changing-the-tempo-without-a-metronome-mark.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { texidoces = " diff --git a/input/lsr/changing-the-time-signature-without-affecting-the-beaming.ly b/input/lsr/changing-the-time-signature-without-affecting-the-beaming.ly index e249222420..ac62f3aa72 100644 --- a/input/lsr/changing-the-time-signature-without-affecting-the-beaming.ly +++ b/input/lsr/changing-the-time-signature-without-affecting-the-beaming.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms" diff --git a/input/lsr/changing-the-tuplet-number.ly b/input/lsr/changing-the-tuplet-number.ly index db11beae39..3e74c2921e 100644 --- a/input/lsr/changing-the-tuplet-number.ly +++ b/input/lsr/changing-the-tuplet-number.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms" @@ -37,7 +37,8 @@ be printed, or the tuplet number may be suppressed altogether. } % begin verbatim \relative c'' { - \times 2/3 { c8 c c } \times 2/3 { c8 c c } + \times 2/3 { c8 c c } + \times 2/3 { c8 c c } \override TupletNumber #'text = #tuplet-number::calc-fraction-text \times 2/3 { c8 c c } \override TupletNumber #'stencil = ##f diff --git a/input/lsr/changing-time-signatures-inside-a-polymetric-section-using-scaledurations.ly b/input/lsr/changing-time-signatures-inside-a-polymetric-section-using-scaledurations.ly index cd9459cc17..be7f455db3 100644 --- a/input/lsr/changing-time-signatures-inside-a-polymetric-section-using-scaledurations.ly +++ b/input/lsr/changing-time-signatures-inside-a-polymetric-section-using-scaledurations.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { texidoces = " La propiedad @code{measureLength}, junto con diff --git a/input/lsr/chant-or-psalms-notation.ly b/input/lsr/chant-or-psalms-notation.ly index 0469943163..52773268fd 100644 --- a/input/lsr/chant-or-psalms-notation.ly +++ b/input/lsr/chant-or-psalms-notation.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms, vocal-music, ancient-notation, contexts-and-engravers" @@ -20,7 +20,7 @@ aren't always the same length. doctitle = "Chant or psalms notation" } % begin verbatim -stemOn = { \override Staff.Stem #'transparent = ##f } +stemOn = { \revert Staff.Stem #'transparent } stemOff = { \override Staff.Stem #'transparent = ##t } \score { diff --git a/input/lsr/chord-name-exceptions.ly b/input/lsr/chord-name-exceptions.ly index 7e1101341c..b43262ade8 100644 --- a/input/lsr/chord-name-exceptions.ly +++ b/input/lsr/chord-name-exceptions.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "chords" diff --git a/input/lsr/chord-name-major7.ly b/input/lsr/chord-name-major7.ly index 5c418c4387..d071f2d1de 100644 --- a/input/lsr/chord-name-major7.ly +++ b/input/lsr/chord-name-major7.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "chords" diff --git a/input/lsr/clip-systems.ly b/input/lsr/clip-systems.ly index b6fb468e20..c9ecf938c1 100644 --- a/input/lsr/clip-systems.ly +++ b/input/lsr/clip-systems.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "paper-and-layout" % a new tag like "Mixing text and music" or % "Special output" might be more adequate -jm diff --git a/input/lsr/clusters.ly b/input/lsr/clusters.ly index 3b595949e8..5c97720fe9 100644 --- a/input/lsr/clusters.ly +++ b/input/lsr/clusters.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "simultaneous-notes, chords, keyboards" diff --git a/input/lsr/coloring-notes-depending-on-their-pitch.ly b/input/lsr/coloring-notes-depending-on-their-pitch.ly index 9b8d773b7d..2a9a5a810d 100644 --- a/input/lsr/coloring-notes-depending-on-their-pitch.ly +++ b/input/lsr/coloring-notes-depending-on-their-pitch.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "pitches,editorial-annotations,really-cool" texidoc = " diff --git a/input/lsr/combining-dynamics-with-markup-texts.ly b/input/lsr/combining-dynamics-with-markup-texts.ly index c2f4e69df6..9062d62d11 100644 --- a/input/lsr/combining-dynamics-with-markup-texts.ly +++ b/input/lsr/combining-dynamics-with-markup-texts.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "expressive-marks, text" diff --git a/input/lsr/combining-two-parts-on-the-same-staff.ly b/input/lsr/combining-two-parts-on-the-same-staff.ly index 198930cfb2..e51eb43132 100644 --- a/input/lsr/combining-two-parts-on-the-same-staff.ly +++ b/input/lsr/combining-two-parts-on-the-same-staff.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "simultaneous-notes, text" @@ -10,7 +10,7 @@ La herramienta de combinación de partes ( instrucción @code{\\partcombine}) permite la combinación de varias partes diferentes sobre el mismo pentagrama. Las indicaciones textuales tales como \"solo\" o \"a2\" se añaden de forma predeterminada; -para quitarlas, sencillamente establezca la proopiedad +para quitarlas, sencillamente establezca la propiedad @code{printPartCombineTexts} al valor \"falso\". Para partituras vocales (como himnos), no hay necesidad de añadir los textos \"solo\" o \"a2\", por lo que se deben desactivar. Sin embargo, diff --git a/input/lsr/compound-time-signatures.ly b/input/lsr/compound-time-signatures.ly index 4adb6c9dab..a75cc8eb58 100644 --- a/input/lsr/compound-time-signatures.ly +++ b/input/lsr/compound-time-signatures.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { doctitlees = "Indicaciones de compases compuestos" diff --git a/input/lsr/conducting-signs,-measure-grouping-signs.ly b/input/lsr/conducting-signs,-measure-grouping-signs.ly index 42476981d8..91dfebd58c 100644 --- a/input/lsr/conducting-signs,-measure-grouping-signs.ly +++ b/input/lsr/conducting-signs,-measure-grouping-signs.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms" diff --git a/input/lsr/contemporary-glissando.ly b/input/lsr/contemporary-glissando.ly index 06d4b1124e..20661cd9bd 100644 --- a/input/lsr/contemporary-glissando.ly +++ b/input/lsr/contemporary-glissando.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "expressive-marks" diff --git a/input/lsr/controlling-the-placement-of-chord-fingerings.ly b/input/lsr/controlling-the-placement-of-chord-fingerings.ly index fd94c6c3cf..877fd09403 100644 --- a/input/lsr/controlling-the-placement-of-chord-fingerings.ly +++ b/input/lsr/controlling-the-placement-of-chord-fingerings.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "editorial-annotations, chords, keyboards, fretted-strings" diff --git a/input/lsr/controlling-the-vertical-ordering-of-scripts.ly b/input/lsr/controlling-the-vertical-ordering-of-scripts.ly index b21337b388..425752eb54 100644 --- a/input/lsr/controlling-the-vertical-ordering-of-scripts.ly +++ b/input/lsr/controlling-the-vertical-ordering-of-scripts.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "expressive-marks, tweaks-and-overrides" diff --git a/input/lsr/controlling-tuplet-bracket-visibility.ly b/input/lsr/controlling-tuplet-bracket-visibility.ly index 9e913f1f2c..c14b672ca8 100644 --- a/input/lsr/controlling-tuplet-bracket-visibility.ly +++ b/input/lsr/controlling-tuplet-bracket-visibility.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms, tweaks-and-overrides" diff --git a/input/lsr/creating-a-delayed-turn.ly b/input/lsr/creating-a-delayed-turn.ly new file mode 100644 index 0000000000..b1a6a07f3b --- /dev/null +++ b/input/lsr/creating-a-delayed-turn.ly @@ -0,0 +1,28 @@ +%% Do not edit this file; it is auto-generated from input/new +%% This file is in the public domain. +\version "2.12.0" + +\header { + lsrtags = "expressive-marks, editorial-annotations, tweaks-and-overrides" + texidoc = "Creating a delayed turn, where the lower note of the + turn uses the accidental, requires several overrides. The + @code{outside-staff-priority} property must be set to #f, as otherwise + this would take precedence over the @code{avoid-slur property}. The + value of @code{halign} is used to position the turn horizontally." + + doctitle = "Creating a delayed turn" +} % begin verbatim + + +\relative c'' { + \once \override TextScript #'avoid-slur = #'inside + \once \override TextScript #'outside-staff-priority = ##f + c2(^\markup \tiny \override #'(baseline-skip . 1) { + \halign #-4 + \center-column { + \sharp + \musicglyph #"scripts.turn" + } + } + d4.) c8 +} diff --git a/input/lsr/creating-a-sequence-of-notes-on-various-pitches.ly b/input/lsr/creating-a-sequence-of-notes-on-various-pitches.ly index add095dc8e..acaae74b0a 100644 --- a/input/lsr/creating-a-sequence-of-notes-on-various-pitches.ly +++ b/input/lsr/creating-a-sequence-of-notes-on-various-pitches.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "pitches" @@ -50,29 +50,28 @@ throughout Mars, from Gustav Holst's The Planets. 'element elt)) -rhythm = #(define-music-function (parser location note) (ly:music?) - "Make the rhythm in Mars (the Planets) at the given note's pitch" - (let* ((p (ly:music-property - (car (ly:music-property note 'elements)) - 'pitch))) - (seq-music-list (list - (make-triplet (seq-music-list (list - (make-note p (ly:make-duration 3 0 2 3)) - (make-note p (ly:make-duration 3 0 2 3)) - (make-note p (ly:make-duration 3 0 2 3)) - ))) - (make-note p (ly:make-duration 2 0)) - (make-note p (ly:make-duration 2 0)) - (make-note p (ly:make-duration 3 0)) - (make-note p (ly:make-duration 3 0)) - (make-note p (ly:make-duration 2 0)) - )))) +rhythm = +#(define-music-function (parser location note) (ly:music?) + "Make the rhythm in Mars (the Planets) at the given note's pitch" + (let ((p (ly:music-property + (car (ly:music-property note 'elements)) + 'pitch))) + (seq-music-list (list + (make-triplet (seq-music-list (list + (make-note p (ly:make-duration 3 0 2 3)) + (make-note p (ly:make-duration 3 0 2 3)) + (make-note p (ly:make-duration 3 0 2 3)) + ))) + (make-note p (ly:make-duration 2 0)) + (make-note p (ly:make-duration 2 0)) + (make-note p (ly:make-duration 3 0)) + (make-note p (ly:make-duration 3 0)) + (make-note p (ly:make-duration 2 0)) + )))) -\score { - \new Staff { - \time 5/4 - \rhythm c' - \rhythm c'' - \rhythm g - } +\new Staff { + \time 5/4 + \rhythm c' + \rhythm c'' + \rhythm g } diff --git a/input/lsr/creating-arpeggios-across-notes-in-different-voices.ly b/input/lsr/creating-arpeggios-across-notes-in-different-voices.ly index 24e5bfa60f..d392f5b760 100644 --- a/input/lsr/creating-arpeggios-across-notes-in-different-voices.ly +++ b/input/lsr/creating-arpeggios-across-notes-in-different-voices.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "expressive-marks" diff --git a/input/lsr/creating-blank-staves.ly b/input/lsr/creating-blank-staves.ly index 11084d69c7..c26a5be090 100644 --- a/input/lsr/creating-blank-staves.ly +++ b/input/lsr/creating-blank-staves.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "staff-notation, editorial-annotations, contexts-and-engravers, paper-and-layout" diff --git a/input/lsr/creating-cross-staff-arpeggios-in-a-piano-staff.ly b/input/lsr/creating-cross-staff-arpeggios-in-a-piano-staff.ly index 8a60f3a291..e32d8cda16 100644 --- a/input/lsr/creating-cross-staff-arpeggios-in-a-piano-staff.ly +++ b/input/lsr/creating-cross-staff-arpeggios-in-a-piano-staff.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "expressive-marks" diff --git a/input/lsr/creating-cross-staff-arpeggios-in-other-contexts.ly b/input/lsr/creating-cross-staff-arpeggios-in-other-contexts.ly index cf1c9613ba..f58ff2e8a3 100644 --- a/input/lsr/creating-cross-staff-arpeggios-in-other-contexts.ly +++ b/input/lsr/creating-cross-staff-arpeggios-in-other-contexts.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "expressive-marks" diff --git a/input/lsr/creating-metronome-marks-in-markup-mode.ly b/input/lsr/creating-metronome-marks-in-markup-mode.ly index 3f74ec1d86..76a61d55a4 100644 --- a/input/lsr/creating-metronome-marks-in-markup-mode.ly +++ b/input/lsr/creating-metronome-marks-in-markup-mode.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { texidoces = " diff --git a/input/lsr/creating-real-parenthesized-dynamics.ly b/input/lsr/creating-real-parenthesized-dynamics.ly index fa4c547cad..69a523c113 100644 --- a/input/lsr/creating-real-parenthesized-dynamics.ly +++ b/input/lsr/creating-real-parenthesized-dynamics.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "expressive-marks, text" diff --git a/input/lsr/creating-simultaneous-rehearsal-marks.ly b/input/lsr/creating-simultaneous-rehearsal-marks.ly index 861ac95658..31fe61796c 100644 --- a/input/lsr/creating-simultaneous-rehearsal-marks.ly +++ b/input/lsr/creating-simultaneous-rehearsal-marks.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { texidoces = " A diferencia de las inscripciones de texto, las lestras de ensayo diff --git a/input/lsr/creating-slurs-across-voices.ly b/input/lsr/creating-slurs-across-voices.ly index 0d5b4adf14..13d67688b5 100644 --- a/input/lsr/creating-slurs-across-voices.ly +++ b/input/lsr/creating-slurs-across-voices.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "expressive-marks, keyboards, unfretted-strings" @@ -33,21 +33,23 @@ solo violin, BWV 1004. } % begin verbatim \relative c' { - << { - d16( a') s a s a[ s a] s a[ s a] - } - \\ - { - \slurUp - bes,16[ s e]( - \hideNotes a) - \unHideNotes f[( - \hideNotes a) - \unHideNotes fis]( - \hideNotes a) - \unHideNotes g[( - \hideNotes a) - \unHideNotes gis]( - \hideNotes a) - } >> + << + { + d16( a') s a s a[ s a] s a[ s a] + } + \\ + { + \slurUp + bes,16[ s e]( + \hideNotes a) + \unHideNotes f[( + \hideNotes a) + \unHideNotes fis]( + \hideNotes a) + \unHideNotes g[( + \hideNotes a) + \unHideNotes gis]( + \hideNotes a) + } + >> } diff --git a/input/lsr/creating-text-spanners.ly b/input/lsr/creating-text-spanners.ly index 05ea88ba5d..d19cbbed91 100644 --- a/input/lsr/creating-text-spanners.ly +++ b/input/lsr/creating-text-spanners.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.65" +\version "2.12.0" \header { texidoces = " diff --git a/input/lsr/custodes.ly b/input/lsr/custodes.ly index 77d749bcce..6ff5dae026 100644 --- a/input/lsr/custodes.ly +++ b/input/lsr/custodes.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "ancient-notation, tweaks-and-overrides" diff --git a/input/lsr/customizing-fretboard-fret-diagrams.ly b/input/lsr/customizing-fretboard-fret-diagrams.ly index f819c35e77..d5847b2b7b 100644 --- a/input/lsr/customizing-fretboard-fret-diagrams.ly +++ b/input/lsr/customizing-fretboard-fret-diagrams.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.65" +\version "2.12.0" \header { texidoces = " diff --git a/input/lsr/customizing-markup-fret-diagrams.ly b/input/lsr/customizing-markup-fret-diagrams.ly index 09c6baeb0c..c8cbd7468c 100644 --- a/input/lsr/customizing-markup-fret-diagrams.ly +++ b/input/lsr/customizing-markup-fret-diagrams.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.65" +\version "2.12.0" \header { texidoces = " diff --git a/input/lsr/default-direction-of-stems-on-the-center-line-of-the-staff.ly b/input/lsr/default-direction-of-stems-on-the-center-line-of-the-staff.ly index 30f0c6c982..a1459f885d 100644 --- a/input/lsr/default-direction-of-stems-on-the-center-line-of-the-staff.ly +++ b/input/lsr/default-direction-of-stems-on-the-center-line-of-the-staff.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "editorial-annotations" diff --git a/input/lsr/defining-predefined-fretboards-for-other-instruments.ly b/input/lsr/defining-predefined-fretboards-for-other-instruments.ly index b820d61c84..cbf7067e34 100644 --- a/input/lsr/defining-predefined-fretboards-for-other-instruments.ly +++ b/input/lsr/defining-predefined-fretboards-for-other-instruments.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.65" +\version "2.12.0" \header { texidoces = " diff --git a/input/lsr/demo-midiinstruments.ly b/input/lsr/demo-midiinstruments.ly index 0f179a373e..0ea3160296 100644 --- a/input/lsr/demo-midiinstruments.ly +++ b/input/lsr/demo-midiinstruments.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "midi" diff --git a/input/lsr/demonstrating-all-headers.ly b/input/lsr/demonstrating-all-headers.ly index cbba904926..804288c008 100644 --- a/input/lsr/demonstrating-all-headers.ly +++ b/input/lsr/demonstrating-all-headers.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "text, paper-and-layout, titles" diff --git a/input/lsr/display-bracket-with-only-one-staff-in-a-system.ly b/input/lsr/display-bracket-with-only-one-staff-in-a-system.ly index b5b9ab0dab..9a9e8be8ee 100644 --- a/input/lsr/display-bracket-with-only-one-staff-in-a-system.ly +++ b/input/lsr/display-bracket-with-only-one-staff-in-a-system.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { texidoces = " Si hay un solo pentagrama en un de los tipos de sistema diff --git a/input/lsr/displaying-complex-chords.ly b/input/lsr/displaying-complex-chords.ly index 0499fb8e9c..ebe77122df 100644 --- a/input/lsr/displaying-complex-chords.ly +++ b/input/lsr/displaying-complex-chords.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "simultaneous-notes, chords" diff --git a/input/lsr/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly b/input/lsr/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly index 9ac360411c..f326d4f41b 100644 --- a/input/lsr/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly +++ b/input/lsr/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { doctitlees = "Alteraciones de estilo dodecafónico para todas las notas, incluidas las naturales" @@ -54,8 +54,8 @@ This snippet shows how to achieve such notation rules. } \layout { \context { - \Staff - \remove "Key_engraver" + \Staff + \remove "Key_engraver" } } } diff --git a/input/lsr/dotted-harmonics.ly b/input/lsr/dotted-harmonics.ly index b9f7c835a9..c19604aa2b 100644 --- a/input/lsr/dotted-harmonics.ly +++ b/input/lsr/dotted-harmonics.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "unfretted-strings,tweaks-and-overrides" diff --git a/input/lsr/double-glissando.ly b/input/lsr/double-glissando.ly index 4bd91244f0..797641454f 100644 --- a/input/lsr/double-glissando.ly +++ b/input/lsr/double-glissando.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "expressive-marks, simultaneous-notes" diff --git a/input/lsr/drawing-boxes-around-grobs.ly b/input/lsr/drawing-boxes-around-grobs.ly index eb185f7e58..76da5b97f0 100644 --- a/input/lsr/drawing-boxes-around-grobs.ly +++ b/input/lsr/drawing-boxes-around-grobs.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "tweaks-and-overrides" texidoc = " diff --git a/input/lsr/drawing-circles-around-various-objects.ly b/input/lsr/drawing-circles-around-various-objects.ly index 4fb6027c5c..d3db013fa6 100644 --- a/input/lsr/drawing-circles-around-various-objects.ly +++ b/input/lsr/drawing-circles-around-various-objects.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "tweaks-and-overrides" texidoc = " diff --git a/input/lsr/editorial-annotations.snippet-list b/input/lsr/editorial-annotations.snippet-list index c3d82864aa..c60e130f8f 100644 --- a/input/lsr/editorial-annotations.snippet-list +++ b/input/lsr/editorial-annotations.snippet-list @@ -8,6 +8,7 @@ changing-a-single-notes-size-in-a-chord.ly changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly coloring-notes-depending-on-their-pitch.ly controlling-the-placement-of-chord-fingerings.ly +creating-a-delayed-turn.ly creating-blank-staves.ly default-direction-of-stems-on-the-center-line-of-the-staff.ly embedding-native-postscript-in-a--markup-block.ly @@ -16,4 +17,5 @@ grid-lines--emphasizing-rhythms-and-notes-synchronization.ly making-some-staff-lines-thicker-than-the-others.ly marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly measure-counter.ly +positioning-text-markups-inside-slurs.ly using-postscript-to-generate-special-note-head-shapes.ly diff --git a/input/lsr/embedding-native-postscript-in-a--markup-block.ly b/input/lsr/embedding-native-postscript-in-a--markup-block.ly index 3f90abc986..19ca959055 100644 --- a/input/lsr/embedding-native-postscript-in-a--markup-block.ly +++ b/input/lsr/embedding-native-postscript-in-a--markup-block.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "editorial-annotations, text" diff --git a/input/lsr/engravers-one-by-one.ly b/input/lsr/engravers-one-by-one.ly index 4dc72d65f5..190f30b821 100644 --- a/input/lsr/engravers-one-by-one.ly +++ b/input/lsr/engravers-one-by-one.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "contexts-and-engravers" diff --git a/input/lsr/engraving-ties-manually.ly b/input/lsr/engraving-ties-manually.ly index bb63c771ec..f95d8e1abb 100644 --- a/input/lsr/engraving-ties-manually.ly +++ b/input/lsr/engraving-ties-manually.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms" diff --git a/input/lsr/entering-several-tuplets-using-only-one--times-command.ly b/input/lsr/entering-several-tuplets-using-only-one--times-command.ly index 33e9ca391b..ffe26e9cc7 100644 --- a/input/lsr/entering-several-tuplets-using-only-one--times-command.ly +++ b/input/lsr/entering-several-tuplets-using-only-one--times-command.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms" diff --git a/input/lsr/expressive-marks.snippet-list b/input/lsr/expressive-marks.snippet-list index 7d9e09b246..33515ad24d 100644 --- a/input/lsr/expressive-marks.snippet-list +++ b/input/lsr/expressive-marks.snippet-list @@ -12,6 +12,7 @@ changing-the-breath-mark-symbol.ly combining-dynamics-with-markup-texts.ly contemporary-glissando.ly controlling-the-vertical-ordering-of-scripts.ly +creating-a-delayed-turn.ly creating-arpeggios-across-notes-in-different-voices.ly creating-cross-staff-arpeggios-in-a-piano-staff.ly creating-cross-staff-arpeggios-in-other-contexts.ly @@ -27,6 +28,7 @@ laissez-vibrer-ties.ly line-arrows.ly modifying-default-values-for-articulation-shorthand-notation.ly piano-template-with-centered-dynamics.ly +positioning-text-markups-inside-slurs.ly printing-hairpins-using-al-niente-notation.ly printing-metronome-and-rehearsal-marks-below-the-staff.ly setting-hairpin-behavior-at-bar-lines.ly diff --git a/input/lsr/faking-a-hammer-in-tablatures.ly b/input/lsr/faking-a-hammer-in-tablatures.ly index daf8ca74b9..e07b15f0bf 100644 --- a/input/lsr/faking-a-hammer-in-tablatures.ly +++ b/input/lsr/faking-a-hammer-in-tablatures.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "fretted-strings" diff --git a/input/lsr/fine-tuning-pedal-brackets.ly b/input/lsr/fine-tuning-pedal-brackets.ly index d7a42b6dc5..cc9d16c3d3 100644 --- a/input/lsr/fine-tuning-pedal-brackets.ly +++ b/input/lsr/fine-tuning-pedal-brackets.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "keyboards, tweaks-and-overrides" diff --git a/input/lsr/fingerings,-string-indications,-and-right-hand-fingerings.ly b/input/lsr/fingerings,-string-indications,-and-right-hand-fingerings.ly index b2b1a9fe5a..371e9e787c 100644 --- a/input/lsr/fingerings,-string-indications,-and-right-hand-fingerings.ly +++ b/input/lsr/fingerings,-string-indications,-and-right-hand-fingerings.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "fretted-strings" diff --git a/input/lsr/flamenco-notation.ly b/input/lsr/flamenco-notation.ly index 25af5c6593..90b1c42dcd 100644 --- a/input/lsr/flamenco-notation.ly +++ b/input/lsr/flamenco-notation.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "fretted-strings" diff --git a/input/lsr/flat-flags-and-beam-nibs.ly b/input/lsr/flat-flags-and-beam-nibs.ly index 8a9e270cae..e5de622711 100644 --- a/input/lsr/flat-flags-and-beam-nibs.ly +++ b/input/lsr/flat-flags-and-beam-nibs.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms" @@ -59,12 +59,12 @@ no tiene nada que ver con el @code{\\set} de dos notas por detrás.) texidoc = " Flat flags on lone notes and beam nibs at the ends of beamed figures are both possible with a combination of @code{stemLeftBeamCount}, -@code{stemRightBeamCount} and paired @code{[ ]} beam indicators. +@code{stemRightBeamCount} and paired @code{[]} beam indicators. -For right-pointing flat flags on lone notes, use paired @code{[ ]} beam +For right-pointing flat flags on lone notes, use paired @code{[]} beam indicators and set @code{stemLeftBeamCount} to zero (see Example 1). @@ -86,16 +86,16 @@ nibs at the start of a run of beamed notes, set Sometimes it may make sense for a lone note surrounded by rests to carry both a left- and right-pointing flat flag. Do this with paired -@code{[ ]} beam indicators alone (Example 4). +@code{[]} beam indicators alone (Example 4). -(Note that @code{\\set stemLeftBeamCount}is always equivalent to -@code{\\once \\set}. In other words, the beam count settings aren't -\"sticky\", so the pair of flat flags attached to the lone @code{c'16 -[ ]} in the last example have nothing to do with the @code{\\set} two -notes prior.) +(Note that @code{\\set stemLeftBeamCount} is always equivalent to +@code{\\once \\set}. In other words, the beam count settings are not +\"sticky\", so the pair of flat flags attached to the lone +@code{c'16[]} in the last example have nothing to do with the +@code{\\set} two notes prior.) @@ -105,47 +105,39 @@ notes prior.) } % begin verbatim \score { -<< -% Example 1 -\new RhythmicStaff { - \set stemLeftBeamCount = #0 - c'16 [ ] - r8. -} - -% Example 2 -\new RhythmicStaff { - r8. - \set stemRightBeamCount = #0 - c'16 [ ] -} - -% Example 3 -\new RhythmicStaff { - c'16 - c'16 - \set stemRightBeamCount = #2 - c'16 - r16 - r16 - \set stemLeftBeamCount = #2 - c'16 - c'16 - c'16 -} - -% Example 4 -\new RhythmicStaff { - c'16 - c'16 - \set stemRightBeamCount = #2 - c'16 - r16 - c'16 [ ] - r16 - \set stemLeftBeamCount = #2 - c'16 - c'16 -} ->> + << + % Example 1 + \new RhythmicStaff { + \set stemLeftBeamCount = #0 + c16[] + r8. + } + + % Example 2 + \new RhythmicStaff { + r8. + \set stemRightBeamCount = #0 + c16[] + } + + % Example 3 + \new RhythmicStaff { + c16 c + \set stemRightBeamCount = #2 + c16 r r + \set stemLeftBeamCount = #2 + c16 c c + } + + % Example 4 + \new RhythmicStaff { + c16 c + \set stemRightBeamCount = #2 + c16 r + c16[] + r16 + \set stemLeftBeamCount = #2 + c16 c + } + >> } diff --git a/input/lsr/flute-slap-notation.ly b/input/lsr/flute-slap-notation.ly index c3d9f7cb39..c835631773 100644 --- a/input/lsr/flute-slap-notation.ly +++ b/input/lsr/flute-slap-notation.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "winds" diff --git a/input/lsr/forcing-horizontal-shift-of-notes.ly b/input/lsr/forcing-horizontal-shift-of-notes.ly index 60d681d9db..a0841fcdb0 100644 --- a/input/lsr/forcing-horizontal-shift-of-notes.ly +++ b/input/lsr/forcing-horizontal-shift-of-notes.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "simultaneous-notes, tweaks-and-overrides" diff --git a/input/lsr/forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly b/input/lsr/forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly index 4b859cf495..e2f2259ffc 100644 --- a/input/lsr/forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly +++ b/input/lsr/forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly @@ -1,13 +1,13 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms" texidoc = " This snippet demonstrates how to obtain automatic ordered rehearsal -marks, but from the letter or number you want. +marks, but from the letter or number desired. " doctitle = "Forcing rehearsal marks to start from a given letter or number" diff --git a/input/lsr/formatting-lyrics-syllables.ly b/input/lsr/formatting-lyrics-syllables.ly index 9d2061c0aa..54c0a1e7f1 100644 --- a/input/lsr/formatting-lyrics-syllables.ly +++ b/input/lsr/formatting-lyrics-syllables.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "text, vocal-music" diff --git a/input/lsr/fret-diagrams-explained-and-developed.ly b/input/lsr/fret-diagrams-explained-and-developed.ly index 45fa1f39f1..ff25b711c1 100644 --- a/input/lsr/fret-diagrams-explained-and-developed.ly +++ b/input/lsr/fret-diagrams-explained-and-developed.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "fretted-strings,tweaks-and-overrides" diff --git a/input/lsr/generating-random-notes.ly b/input/lsr/generating-random-notes.ly index 1ee8d11f2c..f199ef1598 100644 --- a/input/lsr/generating-random-notes.ly +++ b/input/lsr/generating-random-notes.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "pitches" diff --git a/input/lsr/grid-lines--changing-their-appearance.ly b/input/lsr/grid-lines--changing-their-appearance.ly index 26779bdfa1..93b3064f4d 100644 --- a/input/lsr/grid-lines--changing-their-appearance.ly +++ b/input/lsr/grid-lines--changing-their-appearance.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "editorial-annotations" diff --git a/input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly b/input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly index aacb4c3f09..3917bd9f31 100644 --- a/input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly +++ b/input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "editorial-annotations" diff --git a/input/lsr/grouping-beats.ly b/input/lsr/grouping-beats.ly index ef6634f8a2..bf31bee503 100644 --- a/input/lsr/grouping-beats.ly +++ b/input/lsr/grouping-beats.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms" @@ -29,9 +29,10 @@ Beaming patterns may be altered with the @code{beatGrouping} property: \relative c'' { \time 5/16 + #(override-auto-beam-setting '(end * * 5 16) 5 16) \set beatGrouping = #'(2 3) - c8[^"(2+3)" c16 c8] + c8^"(2+3)" c16 c8 \set beatGrouping = #'(3 2) - c8[^"(3+2)" c16 c8] + c8^"(3+2)" c16 c8 } diff --git a/input/lsr/guitar-strum-rhythms.ly b/input/lsr/guitar-strum-rhythms.ly index 4759f62ebc..8a76a48097 100644 --- a/input/lsr/guitar-strum-rhythms.ly +++ b/input/lsr/guitar-strum-rhythms.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { texidoces = " @@ -34,35 +34,30 @@ with melody notes, chord names, and fret diagrams. c1 f g c } } - \new FretBoards { \chordmode { c1 f g c } } - - \new Voice \with { - \consists Pitch_squash_engraver - } \relative c'' { - \improvisationOn - c4 c8 c c4 c8 c - f4 f8 f f4 f8 f - g4 g8 g g4 g8 g - c4 c8 c c4 c8 c + \consists "Pitch_squash_engraver" + } { + \relative c'' { + \improvisationOn + c4 c8 c c4 c8 c + f4 f8 f f4 f8 f + g4 g8 g g4 g8 g + c4 c8 c c4 c8 c + } } - - \new Voice = "melody" { \relative c'' { - \improvisationOff c2 e4 e4 f2. r4 g2. a4 e4 c2. } } - \new Lyrics { \lyricsto "melody" { This is my song. diff --git a/input/lsr/heavily-customized-polymetric-time-signatures.ly b/input/lsr/heavily-customized-polymetric-time-signatures.ly index 172e71a07b..7d87617dd5 100644 --- a/input/lsr/heavily-customized-polymetric-time-signatures.ly +++ b/input/lsr/heavily-customized-polymetric-time-signatures.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms, percussion" diff --git a/input/lsr/hiding-the-extender-line-for-text-dynamics.ly b/input/lsr/hiding-the-extender-line-for-text-dynamics.ly index 8fad2ebff1..cb2c586c57 100644 --- a/input/lsr/hiding-the-extender-line-for-text-dynamics.ly +++ b/input/lsr/hiding-the-extender-line-for-text-dynamics.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "expressive-marks" diff --git a/input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly b/input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly index 016712101d..bd46cf9f7e 100644 --- a/input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly +++ b/input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "expressive-marks, tweaks-and-overrides" diff --git a/input/lsr/how-to-change-fret-diagram-position.ly b/input/lsr/how-to-change-fret-diagram-position.ly index 278ca048e4..5f9b5502b9 100644 --- a/input/lsr/how-to-change-fret-diagram-position.ly +++ b/input/lsr/how-to-change-fret-diagram-position.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "fretted-strings, tweaks-and-overrides" diff --git a/input/lsr/how-to-put-ties-between-syllables-in-lyrics.ly b/input/lsr/how-to-put-ties-between-syllables-in-lyrics.ly index c7ec53eaa6..d5a8e585ab 100644 --- a/input/lsr/how-to-put-ties-between-syllables-in-lyrics.ly +++ b/input/lsr/how-to-put-ties-between-syllables-in-lyrics.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "text, vocal-music" diff --git a/input/lsr/incipit.ly b/input/lsr/incipit.ly index 5a5f80a47f..e8295eec43 100644 --- a/input/lsr/incipit.ly +++ b/input/lsr/incipit.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { texidoces = " Los «incipit» se pueden escribir utilizando el grob del nombre del @@ -23,7 +23,7 @@ incipit = \once \override Staff.InstrumentName #'self-alignment-Y = #UP \once \override Staff.InstrumentName #'Y-offset = #4 \once \override Staff.InstrumentName #'padding = #0.3 - \once \override Staff.InstrumentName #'stencil = + \once \override Staff.InstrumentName #'stencil = #(lambda (grob) (let* ((instrument-name (ly:grob-property grob 'long-text)) (layout (ly:output-def-clone (ly:grob-layout grob))) @@ -47,7 +47,7 @@ incipit = (ly:output-def-set-variable! layout 'ragged-last #f) (ly:output-def-set-variable! layout 'system-count 1) (ly:score-add-output-def! score layout) - (set! (ly:grob-property grob 'long-text) + (ly:grob-set-property! grob 'long-text (markup #:score score)) (ly:system-start-text::print grob))) #}) @@ -58,9 +58,7 @@ global = { \set Score.skipBars = ##t \key g \major \time 4/4 - - %make the staff lines invisible on staves - \override Staff.BarLine #'transparent = ##t + % the actual music \skip 1*8 @@ -246,25 +244,19 @@ bassusLyrics = \lyricmode { \incipit \bassusIncipit \bassusNotes >> + \new Lyrics = "bassusLyrics" \lyricsto bassusNotes { \bassusLyrics } >> - \new Lyrics = "bassusLyrics" \lyricsto bassusNotes { \bassusLyrics } - %% Keep the bass lyrics outside of the staff group to avoid bar lines - %% between the lyrics. >> \layout { \context { \Score - %% no bar lines in staves + %% no bar lines in staves or lyrics \override BarLine #'transparent = ##t } - %% the next three instructions keep the lyrics between the bar lines + %% the next two instructions keep the lyrics between the bar lines \context { \Lyrics - \consists "Bar_engraver" - \override BarLine #'transparent = ##t - } - \context { - \StaffGroup + \consists "Bar_engraver" \consists "Separating_line_group_engraver" } \context { diff --git a/input/lsr/indicating-cross-staff-chords-with-arpeggio-bracket.ly b/input/lsr/indicating-cross-staff-chords-with-arpeggio-bracket.ly index 342e3ed8e0..ad2ff9d087 100644 --- a/input/lsr/indicating-cross-staff-chords-with-arpeggio-bracket.ly +++ b/input/lsr/indicating-cross-staff-chords-with-arpeggio-bracket.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "keyboards" diff --git a/input/lsr/inserting-a-caesura.ly b/input/lsr/inserting-a-caesura.ly index ffe8117fda..1cd862fd5c 100644 --- a/input/lsr/inserting-a-caesura.ly +++ b/input/lsr/inserting-a-caesura.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { texidoces = " Las marcas de cesura se pueden crear sobreescribiendo la propiedad diff --git a/input/lsr/inserting-score-fragments-above-a-staff,-as-markups.ly b/input/lsr/inserting-score-fragments-above-a-staff,-as-markups.ly index a5bb40d8f6..d20efa55f3 100644 --- a/input/lsr/inserting-score-fragments-above-a-staff,-as-markups.ly +++ b/input/lsr/inserting-score-fragments-above-a-staff,-as-markups.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "staff-notation" diff --git a/input/lsr/isolated-percent-repeats.ly b/input/lsr/isolated-percent-repeats.ly index 9c0d1d3893..77c7777dac 100644 --- a/input/lsr/isolated-percent-repeats.ly +++ b/input/lsr/isolated-percent-repeats.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "repeats" diff --git a/input/lsr/jazz-combo-template.ly b/input/lsr/jazz-combo-template.ly index 668f3ce987..de4dea159e 100644 --- a/input/lsr/jazz-combo-template.ly +++ b/input/lsr/jazz-combo-template.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "keyboards, percussion, fretted-strings, template" diff --git a/input/lsr/laissez-vibrer-ties.ly b/input/lsr/laissez-vibrer-ties.ly index aea88092b2..b606db3ee4 100644 --- a/input/lsr/laissez-vibrer-ties.ly +++ b/input/lsr/laissez-vibrer-ties.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "expressive-marks, keyboards, fretted-strings" diff --git a/input/lsr/letter-tablature-formatting.ly b/input/lsr/letter-tablature-formatting.ly index 2035c1514b..beaaa0f723 100644 --- a/input/lsr/letter-tablature-formatting.ly +++ b/input/lsr/letter-tablature-formatting.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "staff-notation,fretted-strings" diff --git a/input/lsr/line-arrows.ly b/input/lsr/line-arrows.ly index 49935ead3e..d3ef6af808 100644 --- a/input/lsr/line-arrows.ly +++ b/input/lsr/line-arrows.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.65" +\version "2.12.0" \header { texidoces = " Se pueden aplicar puntas de flecha a los elementos de extensión de diff --git a/input/lsr/lyrics-alignment.ly b/input/lsr/lyrics-alignment.ly index bddcbf68e3..8b47e276d2 100644 --- a/input/lsr/lyrics-alignment.ly +++ b/input/lsr/lyrics-alignment.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "text, vocal-music" diff --git a/input/lsr/makam-example.ly b/input/lsr/makam-example.ly index 3607a2b9cd..eea080b8a4 100644 --- a/input/lsr/makam-example.ly +++ b/input/lsr/makam-example.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { texidoces = " El «Makam» es un tipo de melodía de Turquía que diff --git a/input/lsr/making-an-object-invisible-with-the-transparent-property.ly b/input/lsr/making-an-object-invisible-with-the-transparent-property.ly index 16decdca0e..75c90e6579 100644 --- a/input/lsr/making-an-object-invisible-with-the-transparent-property.ly +++ b/input/lsr/making-an-object-invisible-with-the-transparent-property.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms,tweaks-and-overrides" texidoc = " @@ -21,16 +21,18 @@ flag from interfering with tie positioning, the stem is extended. \relative c'' { \time 2/4 - << { - \once \override Stem #'transparent = ##t - \once \override Stem #'length = #8 - b8 ~ b\noBeam - \once \override Stem #'transparent = ##t - \once \override Stem #'length = #8 - g8 ~ g\noBeam - } - \\ - { - b8 g g e - } >> + << + { + \once \override Stem #'transparent = ##t + \once \override Stem #'length = #8 + b8 ~ b\noBeam + \once \override Stem #'transparent = ##t + \once \override Stem #'length = #8 + g8 ~ g\noBeam + } + \\ + { + b8 g g e + } + >> } diff --git a/input/lsr/making-some-staff-lines-thicker-than-the-others.ly b/input/lsr/making-some-staff-lines-thicker-than-the-others.ly index f7ccb632f3..e1337cb3d5 100644 --- a/input/lsr/making-some-staff-lines-thicker-than-the-others.ly +++ b/input/lsr/making-some-staff-lines-thicker-than-the-others.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "staff-notation, editorial-annotations" diff --git a/input/lsr/manually-break-figured-bass-extenders-for-only-some-numbers.ly b/input/lsr/manually-break-figured-bass-extenders-for-only-some-numbers.ly index 572e96b655..09b41cc50b 100644 --- a/input/lsr/manually-break-figured-bass-extenders-for-only-some-numbers.ly +++ b/input/lsr/manually-break-figured-bass-extenders-for-only-some-numbers.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "chords" diff --git a/input/lsr/manually-controlling-beam-positions.ly b/input/lsr/manually-controlling-beam-positions.ly index 8944342f33..910266ba6b 100644 --- a/input/lsr/manually-controlling-beam-positions.ly +++ b/input/lsr/manually-controlling-beam-positions.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms, tweaks-and-overrides" @@ -18,10 +18,10 @@ Beam positions may be controlled manually, by overriding the \relative c' { \time 2/4 - % from upper staffline (position 4) to center (position 0) + % from upper staff-line (position 2) to center (position 0) \override Beam #'positions = #'(2 . 0) c8 c - % from center to one above center (position 2) + % from center to one above center (position 1) \override Beam #'positions = #'(0 . 1) c8 c } diff --git a/input/lsr/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly b/input/lsr/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly index 0723a77338..9c73e9cde6 100644 --- a/input/lsr/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly +++ b/input/lsr/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "editorial-annotations, vocal-music" @@ -8,9 +8,7 @@ texidoc = " This example shows how to put crosses on stems. Mark the beginning of a spoken section with the @code{\\speakOn} keyword, and end it -with the @code{\\speakOff} keyword. Remember to end cross sections -before entering any rest: this function also adds crosses to the -invisible stems of rests. +with the @code{\\speakOff} keyword. " doctitle = "Marking notes of spoken parts with a cross on the stem" } % begin verbatim @@ -18,14 +16,18 @@ invisible stems of rests. speakOn = { \override Stem #'stencil = #(lambda (grob) - (ly:stencil-combine-at-edge - (ly:stem::print grob) - Y - (- (ly:grob-property grob 'direction)) - (grob-interpret-markup grob - (markup #:hspace -1.025 #:fontsize -4 - #:musicglyph "noteheads.s2cross")) - -2.3 0)) + (let* ((x-parent (ly:grob-parent grob X)) + (is-rest? (ly:grob? (ly:grob-object x-parent 'rest)))) + (if is-rest? + empty-stencil + (ly:stencil-combine-at-edge + (ly:stem::print grob) + Y + (- (ly:grob-property grob 'direction)) + (grob-interpret-markup grob + (markup #:hspace -1.025 #:fontsize -4 + #:musicglyph "noteheads.s2cross")) + -2.3 0)))) } speakOff = { diff --git a/input/lsr/markup-lines.ly b/input/lsr/markup-lines.ly index 47a6a8d70b..48598d92c7 100644 --- a/input/lsr/markup-lines.ly +++ b/input/lsr/markup-lines.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "text" diff --git a/input/lsr/measure-counter.ly b/input/lsr/measure-counter.ly index 7fd6e33256..863bfaf0d2 100644 --- a/input/lsr/measure-counter.ly +++ b/input/lsr/measure-counter.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "repeats, staff-notation, editorial-annotations" diff --git a/input/lsr/mensurstriche-layout-bar-lines-between-the-staves.ly b/input/lsr/mensurstriche-layout-bar-lines-between-the-staves.ly index 5882d43e38..e8370c5f1f 100644 --- a/input/lsr/mensurstriche-layout-bar-lines-between-the-staves.ly +++ b/input/lsr/mensurstriche-layout-bar-lines-between-the-staves.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "staff-notation, ancient-notation, contexts-and-engravers, tweaks-and-overrides" diff --git a/input/lsr/merging-multi-measure-rests-in-a-polyphonic-part.ly b/input/lsr/merging-multi-measure-rests-in-a-polyphonic-part.ly index 64f9bca8d2..449164be3b 100644 --- a/input/lsr/merging-multi-measure-rests-in-a-polyphonic-part.ly +++ b/input/lsr/merging-multi-measure-rests-in-a-polyphonic-part.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms" @@ -14,24 +14,24 @@ can be printed on the same staff line, using the following setting. doctitle = "Merging multi-measure rests in a polyphonic part" } % begin verbatim -normalPos= \revert MultiMeasureRest #'staff-position +normalPos = \revert MultiMeasureRest #'staff-position { << { - c''1 - R1 - c''1 - \normalPos - R1 - } - \\ - { - c'1 - R1 - c'1 - \normalPos - R1 - } + c''1 + R1 + c''1 + \normalPos + R1 + } + \\ + { + c'1 + R1 + c'1 + \normalPos + R1 + } >> } diff --git a/input/lsr/modern-tab-text-clef.ly b/input/lsr/modern-tab-text-clef.ly index 725cd9a1ac..2b1d7a1d0c 100644 --- a/input/lsr/modern-tab-text-clef.ly +++ b/input/lsr/modern-tab-text-clef.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "staff-notation, fretted-strings" diff --git a/input/lsr/modifying-default-values-for-articulation-shorthand-notation.ly b/input/lsr/modifying-default-values-for-articulation-shorthand-notation.ly index e468286b67..a2e9dd9cf3 100644 --- a/input/lsr/modifying-default-values-for-articulation-shorthand-notation.ly +++ b/input/lsr/modifying-default-values-for-articulation-shorthand-notation.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "expressive-marks" @@ -13,7 +13,7 @@ Las abreviaturas se encuentran definidas dentro del archivo valores predeterminados. Se pueden modificar estos valores predeterminados para las abreviaturas. Por ejemplo, para asociar la abreviatura @code{-+} (@code{dashPlus}) con el símbolo del -semitrino en lugar del símboloo predeterminado +, asigne el valor +semitrino en lugar del símbolo predeterminado +, asigne el valor @code{trill} a la variable @code{dashPlus}: " diff --git a/input/lsr/modifying-tuplet-bracket-length.ly b/input/lsr/modifying-tuplet-bracket-length.ly index ef3d8609bc..d2ec9534be 100644 --- a/input/lsr/modifying-tuplet-bracket-length.ly +++ b/input/lsr/modifying-tuplet-bracket-length.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms" diff --git a/input/lsr/multi--measure-rest-markup.ly b/input/lsr/multi--measure-rest-markup.ly index 5b1eba3792..cbf953b6f2 100644 --- a/input/lsr/multi--measure-rest-markup.ly +++ b/input/lsr/multi--measure-rest-markup.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { texidoces = " diff --git a/input/lsr/nesting-staves.ly b/input/lsr/nesting-staves.ly index 86c56a9ea6..26aecd057e 100644 --- a/input/lsr/nesting-staves.ly +++ b/input/lsr/nesting-staves.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "staff-notation, contexts-and-engravers, tweaks-and-overrides" diff --git a/input/lsr/non-traditional-key-signatures.ly b/input/lsr/non-traditional-key-signatures.ly index 2a5f9792f6..cf3999b272 100644 --- a/input/lsr/non-traditional-key-signatures.ly +++ b/input/lsr/non-traditional-key-signatures.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "pitches, staff-notation" diff --git a/input/lsr/ottava-text.ly b/input/lsr/ottava-text.ly index 1a9b94a5a2..cfbcec87c0 100644 --- a/input/lsr/ottava-text.ly +++ b/input/lsr/ottava-text.ly @@ -1,10 +1,8 @@ -%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { - lsrtags = "pitches, text" - texidoces = " Internamente, la función @code{set-octavation} establece las propiedades @code{ottavation} (por ejemplo, a @code{\"8va\"} o a @@ -26,18 +24,17 @@ und @code{middleCPosition}. Um den Text der Oktavierungsklammer zu doctitlede = "Ottava-Text" + lsrtags = "pitches, text" texidoc = " -Internally, the @code{set-octavation} function sets the properties -@code{ottavation} (for example, to @code{\"8va\"} or @code{\"8vb\"}) -and @code{middleCPosition}. To override the text of the bracket, set -@code{ottavation} after invoking @code{set-octavation}. - - - +Internally, @code{\\ottava} sets the properties @code{ottavation} +(for example, to @code{\"8va\"} or @code{\"8vb\"}) and +@code{middleCPosition}. To override the text of the bracket, set +@code{ottavation} after invoking @code{\\ottava}. " doctitle = "Ottava text" } % begin verbatim + { \ottava #1 \set Staff.ottavation = #"8" diff --git a/input/lsr/outputting-the-version-number.ly b/input/lsr/outputting-the-version-number.ly index bf5663a4a5..43ea09d16e 100644 --- a/input/lsr/outputting-the-version-number.ly +++ b/input/lsr/outputting-the-version-number.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "text" diff --git a/input/lsr/page-label.ly b/input/lsr/page-label.ly index 17a644292a..e89c7bca33 100644 --- a/input/lsr/page-label.ly +++ b/input/lsr/page-label.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "spacing" texidoc = "Page labels may be placed inside music or at top-level, diff --git a/input/lsr/percent-repeat-count-visibility.ly b/input/lsr/percent-repeat-count-visibility.ly index 58a5d77fbd..4a044846ba 100644 --- a/input/lsr/percent-repeat-count-visibility.ly +++ b/input/lsr/percent-repeat-count-visibility.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { texidoces = " Se pueden mostrar los contadores de las repeticiones del tipo diff --git a/input/lsr/percent-repeat-counter.ly b/input/lsr/percent-repeat-counter.ly index 0a6ddc3ba0..0ffe523d76 100644 --- a/input/lsr/percent-repeat-counter.ly +++ b/input/lsr/percent-repeat-counter.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "repeats" diff --git a/input/lsr/percussion-beaters.ly b/input/lsr/percussion-beaters.ly index 350510ec7b..565bc6bf3e 100644 --- a/input/lsr/percussion-beaters.ly +++ b/input/lsr/percussion-beaters.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "percussion" diff --git a/input/lsr/permitting-line-breaks-within-beamed-tuplets.ly b/input/lsr/permitting-line-breaks-within-beamed-tuplets.ly index c2d43d501c..cb9b9727d6 100644 --- a/input/lsr/permitting-line-breaks-within-beamed-tuplets.ly +++ b/input/lsr/permitting-line-breaks-within-beamed-tuplets.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms" @@ -44,9 +44,9 @@ tuplets have to be beamed manually. } \relative c'' { a8 - \repeat unfold 8 { \times 2/3 { c[ b a] } } + \repeat unfold 5 { \times 2/3 { c[ b a] } } % Insert a manual line break within a tuplet \times 2/3 { c[ b \bar "" \break a] } - \repeat unfold 2 { \times 2/3 { c[ b a] } } + \repeat unfold 5 { \times 2/3 { c[ b a] } } c8 } diff --git a/input/lsr/piano-template-simple.ly b/input/lsr/piano-template-simple.ly index 81c870c1f3..301251cb55 100644 --- a/input/lsr/piano-template-simple.ly +++ b/input/lsr/piano-template-simple.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "keyboards, template" diff --git a/input/lsr/piano-template-with-centered-dynamics.ly b/input/lsr/piano-template-with-centered-dynamics.ly index a0fb402a06..3abe8bc938 100644 --- a/input/lsr/piano-template-with-centered-dynamics.ly +++ b/input/lsr/piano-template-with-centered-dynamics.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { texidoces = " diff --git a/input/lsr/piano-template-with-centered-lyrics.ly b/input/lsr/piano-template-with-centered-lyrics.ly index dfc38524b5..41e739639d 100644 --- a/input/lsr/piano-template-with-centered-lyrics.ly +++ b/input/lsr/piano-template-with-centered-lyrics.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "text, keyboards, template" diff --git a/input/lsr/piano-template-with-melody-and-lyrics.ly b/input/lsr/piano-template-with-melody-and-lyrics.ly index 745d62df44..44d6cd8d72 100644 --- a/input/lsr/piano-template-with-melody-and-lyrics.ly +++ b/input/lsr/piano-template-with-melody-and-lyrics.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "vocal-music, keyboards, template" diff --git a/input/lsr/placement-of-right-hand-fingerings.ly b/input/lsr/placement-of-right-hand-fingerings.ly index f93f8306ac..614a80484e 100644 --- a/input/lsr/placement-of-right-hand-fingerings.ly +++ b/input/lsr/placement-of-right-hand-fingerings.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "fretted-strings" diff --git a/input/lsr/polyphony-in-tablature.ly b/input/lsr/polyphony-in-tablature.ly index 66a6ce1b95..e3b2b63c84 100644 --- a/input/lsr/polyphony-in-tablature.ly +++ b/input/lsr/polyphony-in-tablature.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "fretted-strings" diff --git a/input/lsr/positioning-multi--measure-rests.ly b/input/lsr/positioning-multi--measure-rests.ly index e1b527a2a4..da9cb95bee 100644 --- a/input/lsr/positioning-multi--measure-rests.ly +++ b/input/lsr/positioning-multi--measure-rests.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { doctitlees = "Posicionar los silencios multicompás" texidoces = " diff --git a/input/lsr/positioning-segno-and-coda-with-line-break.ly b/input/lsr/positioning-segno-and-coda-with-line-break.ly index 9a811854fc..56b76912bc 100644 --- a/input/lsr/positioning-segno-and-coda-with-line-break.ly +++ b/input/lsr/positioning-segno-and-coda-with-line-break.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "repeats, breaks" diff --git a/input/lsr/positioning-text-markups-inside-slurs.ly b/input/lsr/positioning-text-markups-inside-slurs.ly new file mode 100644 index 0000000000..b65c7d0a07 --- /dev/null +++ b/input/lsr/positioning-text-markups-inside-slurs.ly @@ -0,0 +1,21 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +\version "2.12.0" + +\header { + lsrtags = "expressive-marks, editorial-annotations, tweaks-and-overrides" + + texidoc = " +Text markups need to have the @code{outside-staff-priority} property +set to false in order to be printed inside slurs. + +" + doctitle = "Positioning text markups inside slurs" +} % begin verbatim + +\relative c'' { + \override TextScript #'avoid-slur = #'inside + \override TextScript #'outside-staff-priority = ##f + c2(^\markup { \halign #-10 \natural } d4.) c8 +} + diff --git a/input/lsr/preventing-extra-naturals-from-being-automatically-added.ly b/input/lsr/preventing-extra-naturals-from-being-automatically-added.ly index 4fd66cf9e1..fdce5a11f8 100644 --- a/input/lsr/preventing-extra-naturals-from-being-automatically-added.ly +++ b/input/lsr/preventing-extra-naturals-from-being-automatically-added.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "pitches" diff --git a/input/lsr/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly b/input/lsr/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly index 6ade673dd8..2ad0cf190c 100644 --- a/input/lsr/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly +++ b/input/lsr/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "pitches" diff --git a/input/lsr/printing-a-repeat-sign-at-the-beginning-of-a-piece.ly b/input/lsr/printing-a-repeat-sign-at-the-beginning-of-a-piece.ly index df1222df08..f442f40c03 100644 --- a/input/lsr/printing-a-repeat-sign-at-the-beginning-of-a-piece.ly +++ b/input/lsr/printing-a-repeat-sign-at-the-beginning-of-a-piece.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "repeats, tweaks-and-overrides" diff --git a/input/lsr/printing-hairpins-using-al-niente-notation.ly b/input/lsr/printing-hairpins-using-al-niente-notation.ly index bec284d9a1..bd9f6ebcea 100644 --- a/input/lsr/printing-hairpins-using-al-niente-notation.ly +++ b/input/lsr/printing-hairpins-using-al-niente-notation.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "expressive-marks" diff --git a/input/lsr/printing-marks-at-the-end-of-a-line-or-a-score.ly b/input/lsr/printing-marks-at-the-end-of-a-line-or-a-score.ly index d39d802bee..ad787bf56f 100644 --- a/input/lsr/printing-marks-at-the-end-of-a-line-or-a-score.ly +++ b/input/lsr/printing-marks-at-the-end-of-a-line-or-a-score.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "text" diff --git a/input/lsr/printing-marks-on-every-staff.ly b/input/lsr/printing-marks-on-every-staff.ly index 33283f41ec..b5a54da703 100644 --- a/input/lsr/printing-marks-on-every-staff.ly +++ b/input/lsr/printing-marks-on-every-staff.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "text" diff --git a/input/lsr/printing-metronome-and-rehearsal-marks-below-the-staff.ly b/input/lsr/printing-metronome-and-rehearsal-marks-below-the-staff.ly index b208c5a507..2261494ebb 100644 --- a/input/lsr/printing-metronome-and-rehearsal-marks-below-the-staff.ly +++ b/input/lsr/printing-metronome-and-rehearsal-marks-below-the-staff.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms, expressive-marks, staff-notation, tweaks-and-overrides" diff --git a/input/lsr/printing-music-with-different-time-signatures.ly b/input/lsr/printing-music-with-different-time-signatures.ly index 1957dfd782..00db6fb29d 100644 --- a/input/lsr/printing-music-with-different-time-signatures.ly +++ b/input/lsr/printing-music-with-different-time-signatures.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms, percussion" @@ -9,8 +9,9 @@ In the following snippet, two parts have a completely different time signature, yet remain synchronized. The bar lines can no longer be printed at the @code{Score} level; to allow independent bar lines in -each part, the @code{Barline_engraver} is moved from the @code{Score} -context to the @code{Staff} context. +each part, the @code{Default_barline_engraver} and +@code{Timing_translator} are moved from the @code{Score} context to the +@code{Staff} context. " doctitle = "Printing music with different time signatures" @@ -136,5 +137,8 @@ Perkussion = \new StaffGroup << >> \score { - << \Bassklarinette \Perkussion >> + << + \Bassklarinette + \Perkussion + >> } diff --git a/input/lsr/proportional-strict-notespacing.ly b/input/lsr/proportional-strict-notespacing.ly index db416419a2..99da9c2b65 100644 --- a/input/lsr/proportional-strict-notespacing.ly +++ b/input/lsr/proportional-strict-notespacing.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "tweaks-and-overrides, spacing" diff --git a/input/lsr/quoting-another-voice-with-transposition.ly b/input/lsr/quoting-another-voice-with-transposition.ly index e6275fbd39..4be2a04313 100644 --- a/input/lsr/quoting-another-voice-with-transposition.ly +++ b/input/lsr/quoting-another-voice-with-transposition.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { texidoces = " Los pasajes citados tienen en cuenta la transposición de la fuente diff --git a/input/lsr/quoting-another-voice.ly b/input/lsr/quoting-another-voice.ly index d1c3834e0a..70cc428341 100644 --- a/input/lsr/quoting-another-voice.ly +++ b/input/lsr/quoting-another-voice.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { texidoces = " La propiedad @code{quotedEventTypes} determina los tipos de diff --git a/input/lsr/removing-the-first-empty-line.ly b/input/lsr/removing-the-first-empty-line.ly index 62f142aa56..0cac0dec1a 100644 --- a/input/lsr/removing-the-first-empty-line.ly +++ b/input/lsr/removing-the-first-empty-line.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "staff-notation, tweaks-and-overrides, breaks" diff --git a/input/lsr/rest-styles.ly b/input/lsr/rest-styles.ly index 5d37957d7c..9db722f727 100644 --- a/input/lsr/rest-styles.ly +++ b/input/lsr/rest-styles.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms, ancient-notation, tweaks-and-overrides" diff --git a/input/lsr/reverting-default-beam-endings.ly b/input/lsr/reverting-default-beam-endings.ly index 1e717ab08f..f9950c69fe 100644 --- a/input/lsr/reverting-default-beam-endings.ly +++ b/input/lsr/reverting-default-beam-endings.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms" diff --git a/input/lsr/rhythmic-slashes.ly b/input/lsr/rhythmic-slashes.ly index 36e5e79d66..5e64b7d79c 100644 --- a/input/lsr/rhythmic-slashes.ly +++ b/input/lsr/rhythmic-slashes.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms, tweaks-and-overrides" @@ -25,8 +25,8 @@ the appropriate duration). % Macro to print single slash rs = { \once \override Rest #'stencil = #ly:percent-repeat-item-interface::beat-slash - \once \override Rest #'thickness = #'0.48 - \once \override Rest #'slope = #'1.7 + \once \override Rest #'thickness = #0.48 + \once \override Rest #'slope = #1.7 r4 } @@ -34,16 +34,16 @@ rs = { comp = #(define-music-function (parser location count) ( integer?) #{ \override Rest #'stencil = #ly:percent-repeat-item-interface::beat-slash - \override Rest #'thickness = #'0.48 - \override Rest #'slope = #'1.7 + \override Rest #'thickness = #0.48 + \override Rest #'slope = #1.7 \repeat unfold $count { r4 } \revert Rest #'stencil #} ) -\score{ +\score { \relative c' { - c d e f | + c4 d e f | \rs \rs \rs \rs | \comp #4 | } diff --git a/input/lsr/score-for-diatonic-accordion.ly b/input/lsr/score-for-diatonic-accordion.ly index 4a583f70a1..364a273ad6 100644 --- a/input/lsr/score-for-diatonic-accordion.ly +++ b/input/lsr/score-for-diatonic-accordion.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "template" diff --git a/input/lsr/setting-hairpin-behavior-at-bar-lines.ly b/input/lsr/setting-hairpin-behavior-at-bar-lines.ly index b2d3d600f3..fea5627e64 100644 --- a/input/lsr/setting-hairpin-behavior-at-bar-lines.ly +++ b/input/lsr/setting-hairpin-behavior-at-bar-lines.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { texidoces = " Si la nota que da fin a un regulador cae sobre la primera parte de diff --git a/input/lsr/setting-the-minimum-length-of-hairpins.ly b/input/lsr/setting-the-minimum-length-of-hairpins.ly index 71d3f943c9..8def1f89cf 100644 --- a/input/lsr/setting-the-minimum-length-of-hairpins.ly +++ b/input/lsr/setting-the-minimum-length-of-hairpins.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "expressive-marks" diff --git a/input/lsr/shortening-volta-brackets.ly b/input/lsr/shortening-volta-brackets.ly index d3c3b595d3..0c61ebeedb 100644 --- a/input/lsr/shortening-volta-brackets.ly +++ b/input/lsr/shortening-volta-brackets.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "repeats" diff --git a/input/lsr/showing-chords-at-changes.ly b/input/lsr/showing-chords-at-changes.ly index 5900c44277..7146da898f 100644 --- a/input/lsr/showing-chords-at-changes.ly +++ b/input/lsr/showing-chords-at-changes.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "chords" diff --git a/input/lsr/simple-lead-sheet.ly b/input/lsr/simple-lead-sheet.ly index 89be9d4b26..a7f7df33df 100644 --- a/input/lsr/simple-lead-sheet.ly +++ b/input/lsr/simple-lead-sheet.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "chords" diff --git a/input/lsr/single-staff-template-with-notes,-lyrics,-and-chords.ly b/input/lsr/single-staff-template-with-notes,-lyrics,-and-chords.ly index ebabdb5977..de800cec78 100644 --- a/input/lsr/single-staff-template-with-notes,-lyrics,-and-chords.ly +++ b/input/lsr/single-staff-template-with-notes,-lyrics,-and-chords.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "vocal-music, chords, template" diff --git a/input/lsr/single-staff-template-with-notes,-lyrics,-chords-and-frets.ly b/input/lsr/single-staff-template-with-notes,-lyrics,-chords-and-frets.ly index b349d811fb..bff63283ea 100644 --- a/input/lsr/single-staff-template-with-notes,-lyrics,-chords-and-frets.ly +++ b/input/lsr/single-staff-template-with-notes,-lyrics,-chords-and-frets.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "vocal-music, chords, template" diff --git a/input/lsr/single-staff-template-with-notes-and-chords.ly b/input/lsr/single-staff-template-with-notes-and-chords.ly index 8e9556549a..076191ee5f 100644 --- a/input/lsr/single-staff-template-with-notes-and-chords.ly +++ b/input/lsr/single-staff-template-with-notes-and-chords.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "chords, template" diff --git a/input/lsr/single-staff-template-with-notes-and-lyrics.ly b/input/lsr/single-staff-template-with-notes-and-lyrics.ly index 4126defb6e..70c93f7ee6 100644 --- a/input/lsr/single-staff-template-with-notes-and-lyrics.ly +++ b/input/lsr/single-staff-template-with-notes-and-lyrics.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "vocal-music, template" diff --git a/input/lsr/single-staff-template-with-only-notes.ly b/input/lsr/single-staff-template-with-only-notes.ly index 25947a59cf..4bdbd0de3f 100644 --- a/input/lsr/single-staff-template-with-only-notes.ly +++ b/input/lsr/single-staff-template-with-only-notes.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "template" diff --git a/input/lsr/skips-in-lyric-mode-2.ly b/input/lsr/skips-in-lyric-mode-2.ly index 0934829308..803c57ccd1 100644 --- a/input/lsr/skips-in-lyric-mode-2.ly +++ b/input/lsr/skips-in-lyric-mode-2.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms, vocal-music" diff --git a/input/lsr/skips-in-lyric-mode.ly b/input/lsr/skips-in-lyric-mode.ly index 4b99a709b8..e5d0dc5911 100644 --- a/input/lsr/skips-in-lyric-mode.ly +++ b/input/lsr/skips-in-lyric-mode.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms, vocal-music" diff --git a/input/lsr/snap-pizzicato-markup-bartok-pizzicato.ly b/input/lsr/snap-pizzicato-markup-bartok-pizzicato.ly index ebedf4f2af..92b15d4b9a 100644 --- a/input/lsr/snap-pizzicato-markup-bartok-pizzicato.ly +++ b/input/lsr/snap-pizzicato-markup-bartok-pizzicato.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "expressive-marks, unfretted-strings" diff --git a/input/lsr/specifying-context-with-beatgrouping.ly b/input/lsr/specifying-context-with-beatgrouping.ly index 92ff6e7730..1abd1db271 100644 --- a/input/lsr/specifying-context-with-beatgrouping.ly +++ b/input/lsr/specifying-context-with-beatgrouping.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { texidoces = " @@ -16,7 +16,9 @@ altos: texidoc = " By specifying the context, the effect of @code{beatGrouping} can be limited to the context specified, and the values which may have -been set in higher-level contexts can be overridden: +been set in higher-level contexts can be overridden. The +@code{\\set} commands must be placed @emph{after} all @code{\\time} +commands: " doctitle = "Specifying context with beatGrouping" } % begin verbatim @@ -34,7 +36,7 @@ been set in higher-level contexts can be overridden: \new Voice { \relative c' { \voiceTwo - \set Voice.beatGrouping = #'(1 3 3) + \set beatGrouping = #'(1 3 3) f8 f f f f f f } } diff --git a/input/lsr/stand-alone-two-column-markup.ly b/input/lsr/stand-alone-two-column-markup.ly index c53c28a90c..ef7219f27a 100644 --- a/input/lsr/stand-alone-two-column-markup.ly +++ b/input/lsr/stand-alone-two-column-markup.ly @@ -1,10 +1,17 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "text" + texidoces = " +Los textos independientes se pueden disponer en varias columnas +utilizando instrucciones @code{\\markup}: + +" + doctitlees = "Elemento de marcado de texto independiente en dos columnas" + texidoc = " Stand-alone text may be arranged in several columns using @code{\\markup} commands: diff --git a/input/lsr/stem-and-beam-behavior-in-tablature.ly b/input/lsr/stem-and-beam-behavior-in-tablature.ly index 8706c48d0b..602dcc865f 100644 --- a/input/lsr/stem-and-beam-behavior-in-tablature.ly +++ b/input/lsr/stem-and-beam-behavior-in-tablature.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "fretted-strings" diff --git a/input/lsr/stemlets.ly b/input/lsr/stemlets.ly index 190761f05d..ebb096ac5c 100644 --- a/input/lsr/stemlets.ly +++ b/input/lsr/stemlets.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms" diff --git a/input/lsr/string-quartet-template-simple.ly b/input/lsr/string-quartet-template-simple.ly index bdc55c02b3..72ff6105f2 100644 --- a/input/lsr/string-quartet-template-simple.ly +++ b/input/lsr/string-quartet-template-simple.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "unfretted-strings, template" diff --git a/input/lsr/string-quartet-template-with-separate-parts.ly b/input/lsr/string-quartet-template-with-separate-parts.ly index 03adb6505e..c6d4613aca 100644 --- a/input/lsr/string-quartet-template-with-separate-parts.ly +++ b/input/lsr/string-quartet-template-with-separate-parts.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "unfretted-strings, template" diff --git a/input/lsr/sub-dividing-beams.ly b/input/lsr/sub-dividing-beams.ly index 429b508d7d..cdc16b747e 100644 --- a/input/lsr/sub-dividing-beams.ly +++ b/input/lsr/sub-dividing-beams.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms" diff --git a/input/lsr/suppressing-warnings-for-clashing-note-columns.ly b/input/lsr/suppressing-warnings-for-clashing-note-columns.ly index 82a2d1369f..50cfa3ccef 100644 --- a/input/lsr/suppressing-warnings-for-clashing-note-columns.ly +++ b/input/lsr/suppressing-warnings-for-clashing-note-columns.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "simultaneous-notes,tweaks-and-overrides" texidoc = " diff --git a/input/lsr/table-of-contents.ly b/input/lsr/table-of-contents.ly index bbdeb730bd..a669f51cba 100644 --- a/input/lsr/table-of-contents.ly +++ b/input/lsr/table-of-contents.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "paper-and-layout" texidoc = "A table of contents is included using diff --git a/input/lsr/three-sided-box.ly b/input/lsr/three-sided-box.ly index 0fe467cfc0..9e94044ccd 100644 --- a/input/lsr/three-sided-box.ly +++ b/input/lsr/three-sided-box.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms, text" @@ -15,17 +15,17 @@ around some text (or other markup). % New command to add a three sided box, with sides north, west and south % Based on the box-stencil command defined in scm/stencil.scm -% Note that you use ";" to comment a line in Scheme +% Note that ";" is used to comment a line in Scheme #(define-public (NWS-box-stencil stencil thickness padding) "Add a box around STENCIL, producing a new stencil." (let* ((x-ext (interval-widen (ly:stencil-extent stencil 0) padding)) - (y-ext (interval-widen (ly:stencil-extent stencil 1) padding)) - (y-rule (make-filled-box-stencil (cons 0 thickness) y-ext)) - (x-rule (make-filled-box-stencil - (interval-widen x-ext thickness) (cons 0 thickness)))) + (y-ext (interval-widen (ly:stencil-extent stencil 1) padding)) + (y-rule (make-filled-box-stencil (cons 0 thickness) y-ext)) + (x-rule (make-filled-box-stencil + (interval-widen x-ext thickness) (cons 0 thickness)))) ; (set! stencil (ly:stencil-combine-at-edge stencil X 1 y-rule padding)) (set! stencil (ly:stencil-combine-at-edge stencil X -1 y-rule padding)) - (set! stencil (ly:stencil-combine-at-edge stencil Y 1 x-rule 0.0)) + (set! stencil (ly:stencil-combine-at-edge stencil Y 1 x-rule 0.0)) (set! stencil (ly:stencil-combine-at-edge stencil Y -1 x-rule 0.0)) stencil)) @@ -34,21 +34,18 @@ around some text (or other markup). #(define-markup-command (NWS-box layout props arg) (markup?) "Draw a box round @var{arg}. Looks at @code{thickness}, @code{box-padding} and @code{font-size} properties to determine line -thickness and padding around the markup." - +thickness and padding around the markup." (let* ((th (chain-assoc-get 'thickness props 0.1)) - (size (chain-assoc-get 'font-size props 0)) - (pad (* (magstep size) - (chain-assoc-get 'box-padding props 0.2))) - (m (interpret-markup layout props arg))) + (size (chain-assoc-get 'font-size props 0)) + (pad (* (magstep size) + (chain-assoc-get 'box-padding props 0.2))) + (m (interpret-markup layout props arg))) (NWS-box-stencil m th pad))) - % Test it: \layout { ragged-right = ##f } - -\relative c' { +\relative c' { c2^\markup { \NWS-box ABCD } - c^\markup { \NWS-box \note #"4" #1.0 } + c2^\markup { \NWS-box \note #"4" #1.0 } } diff --git a/input/lsr/tick-bar-lines.ly b/input/lsr/tick-bar-lines.ly index 29d8156938..458e522b58 100644 --- a/input/lsr/tick-bar-lines.ly +++ b/input/lsr/tick-bar-lines.ly @@ -1,44 +1,20 @@ -%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" - +\version "2.12.0" \header { lsrtags = "staff-notation" - texidoc = " 'Tick' bar lines are often used in music where the bar line is used only for coordination and is not meant to imply any rhythmic stress. - -This snippet uses overrides for the @code{'bar-size} and -@code{'extra-offset} properties of @code{BarLine} to determine, -respectively, the tick size and its vertical placement. - " doctitle = "Tick bar lines" } % begin verbatim -{ - % Use 'bar-size to control the height of the tick, - % and 'extra-offset to determine its position. - % - % With 'extra-offset set to zero, the tick will be - % centered around the middle line of the staff. - % - % Replace Staff.BarLine with Score.BarLine to - % apply the method to the whole score. - - \override Staff.BarLine #'bar-size = #1 - \override Staff.BarLine #'extra-offset = #'(0 . 2) - - c'4 d' e' f' - g'4 f' e' d' - c'4 d' e' f' - g'4 f' e' d' - - % Revert the overrides to get back a normal - % bar line at the end. - - \revert Staff.BarLine #'bar-size - \revert Staff.BarLine #'extra-offset +\relative c' { + \set Score.defaultBarType = #"'" + c4 d e f + g4 f e d + c4 d e f + g4 f e d \bar "|." } diff --git a/input/lsr/time-signature-in-parentheses.ly b/input/lsr/time-signature-in-parentheses.ly index d338d860ec..054c9fb151 100644 --- a/input/lsr/time-signature-in-parentheses.ly +++ b/input/lsr/time-signature-in-parentheses.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "staff-notation, tweaks-and-overrides" diff --git a/input/lsr/transcription-of-ancient-music-with-incipit.ly b/input/lsr/transcription-of-ancient-music-with-incipit.ly index a1badd8efd..ddfaf91613 100644 --- a/input/lsr/transcription-of-ancient-music-with-incipit.ly +++ b/input/lsr/transcription-of-ancient-music-with-incipit.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "ancient-notation, tweaks-and-overrides" diff --git a/input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly b/input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly index 153567c8ad..d6b7695aa4 100644 --- a/input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly +++ b/input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { doctitlees = "Transportar música con el menor número de alteraciones" texidoces = " @@ -94,7 +94,8 @@ In this manner, the most natural enharmonic notes are chosen. #(define (naturalize-pitch p) (let* ((o (ly:pitch-octave p)) (a (* 4 (ly:pitch-alteration p))) - ; alteration, a, in quarter tone steps, for historical reasons + ; alteration, a, in quarter tone steps, + ; for historical reasons (n (ly:pitch-notename p))) (cond ((and (> a 1) (or (eq? n 6) (eq? n 2))) @@ -115,23 +116,23 @@ In this manner, the most natural enharmonic notes are chosen. (e (ly:music-property music 'element)) (p (ly:music-property music 'pitch))) (if (pair? es) - (ly:music-set-property! + (ly:music-set-property! music 'elements (map (lambda (x) (naturalize x)) es))) (if (ly:music? e) - (ly:music-set-property! + (ly:music-set-property! music 'element (naturalize e))) (if (ly:pitch? p) - (begin - (set! p (naturalize-pitch p)) - (ly:music-set-property! music 'pitch p))) + (begin + (set! p (naturalize-pitch p)) + (ly:music-set-property! music 'pitch p))) music)) naturalizeMusic = #(define-music-function (parser location m) - (ly:music?) - (naturalize m)) + (ly:music?) + (naturalize m)) music = \relative c' { c4 d e g } diff --git a/input/lsr/tweaking-clef-properties.ly b/input/lsr/tweaking-clef-properties.ly index 46a46bc935..136787c5dd 100644 --- a/input/lsr/tweaking-clef-properties.ly +++ b/input/lsr/tweaking-clef-properties.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "pitches, staff-notation, tweaks-and-overrides" @@ -148,7 +148,7 @@ line, they do not. \set Staff.clefPosition = #0 c'1 - % Here we go back to the normal clef: + % Return to the normal clef: \set Staff.middleCPosition = #0 c'1 diff --git a/input/lsr/tweaks-and-overrides.snippet-list b/input/lsr/tweaks-and-overrides.snippet-list index a40f0534ac..e8d93d9e41 100644 --- a/input/lsr/tweaks-and-overrides.snippet-list +++ b/input/lsr/tweaks-and-overrides.snippet-list @@ -9,6 +9,7 @@ changing-the-default-text-font-family.ly changing-the-staff-size.ly controlling-the-vertical-ordering-of-scripts.ly controlling-tuplet-bracket-visibility.ly +creating-a-delayed-turn.ly creating-simultaneous-rehearsal-marks.ly creating-text-spanners.ly custodes.ly @@ -30,6 +31,7 @@ mensurstriche-layout-bar-lines-between-the-staves.ly nesting-staves.ly percent-repeat-count-visibility.ly positioning-multi--measure-rests.ly +positioning-text-markups-inside-slurs.ly printing-a-repeat-sign-at-the-beginning-of-a-piece.ly printing-metronome-and-rehearsal-marks-below-the-staff.ly proportional-strict-notespacing.ly diff --git a/input/lsr/use-square-bracket-at-the-start-of-a-staff-group.ly b/input/lsr/use-square-bracket-at-the-start-of-a-staff-group.ly index e7a8dd9503..988e728318 100644 --- a/input/lsr/use-square-bracket-at-the-start-of-a-staff-group.ly +++ b/input/lsr/use-square-bracket-at-the-start-of-a-staff-group.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "staff-notation, contexts-and-engravers" diff --git a/input/lsr/using-beatlength-and-beatgrouping.ly b/input/lsr/using-beatlength-and-beatgrouping.ly index b77d4051de..616597a18a 100644 --- a/input/lsr/using-beatlength-and-beatgrouping.ly +++ b/input/lsr/using-beatlength-and-beatgrouping.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { texidoces = " diff --git a/input/lsr/using-double-slurs-for-legato-chords.ly b/input/lsr/using-double-slurs-for-legato-chords.ly index bd734bfe51..ea8a4889e3 100644 --- a/input/lsr/using-double-slurs-for-legato-chords.ly +++ b/input/lsr/using-double-slurs-for-legato-chords.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "expressive-marks" diff --git a/input/lsr/using-postscript-to-generate-special-note-head-shapes.ly b/input/lsr/using-postscript-to-generate-special-note-head-shapes.ly index 2a1c1a1718..4493628a99 100644 --- a/input/lsr/using-postscript-to-generate-special-note-head-shapes.ly +++ b/input/lsr/using-postscript-to-generate-special-note-head-shapes.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "editorial-annotations, tweaks-and-overrides" diff --git a/input/lsr/using-the--tweak-command-to-tweak-individual-grobs.ly b/input/lsr/using-the--tweak-command-to-tweak-individual-grobs.ly index e2c925e815..04b33750c0 100644 --- a/input/lsr/using-the--tweak-command-to-tweak-individual-grobs.ly +++ b/input/lsr/using-the--tweak-command-to-tweak-individual-grobs.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "tweaks-and-overrides" texidoc = " diff --git a/input/lsr/using-ties-with-arpeggios.ly b/input/lsr/using-ties-with-arpeggios.ly index 6bac1cb4b4..4ef94434c3 100644 --- a/input/lsr/using-ties-with-arpeggios.ly +++ b/input/lsr/using-ties-with-arpeggios.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms" diff --git a/input/lsr/utf-8.ly b/input/lsr/utf-8.ly index 08ad8fb1dd..3fed51ec10 100644 --- a/input/lsr/utf-8.ly +++ b/input/lsr/utf-8.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" %% Edit this file using a Unicode aware editor, such as GVIM, GEDIT, Emacs diff --git a/input/lsr/vertically-aligned-dynamics-and-textscripts.ly b/input/lsr/vertically-aligned-dynamics-and-textscripts.ly index 0cbe698333..3c07af3716 100644 --- a/input/lsr/vertically-aligned-dynamics-and-textscripts.ly +++ b/input/lsr/vertically-aligned-dynamics-and-textscripts.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "tweaks-and-overrides, spacing" diff --git a/input/lsr/vertically-aligning-dynamics-across-multiple-notes.ly b/input/lsr/vertically-aligning-dynamics-across-multiple-notes.ly index b019610295..9f6baade12 100644 --- a/input/lsr/vertically-aligning-dynamics-across-multiple-notes.ly +++ b/input/lsr/vertically-aligning-dynamics-across-multiple-notes.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "expressive-marks" diff --git a/input/lsr/vertically-aligning-ossias-and-lyrics.ly b/input/lsr/vertically-aligning-ossias-and-lyrics.ly index 654431e57f..138e0abe94 100644 --- a/input/lsr/vertically-aligning-ossias-and-lyrics.ly +++ b/input/lsr/vertically-aligning-ossias-and-lyrics.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "vocal-music, tweaks-and-overrides, spacing" diff --git a/input/lsr/vertically-centered-common-lyrics.ly b/input/lsr/vertically-centered-common-lyrics.ly index 803738bcf8..592a3700a6 100644 --- a/input/lsr/vertically-centered-common-lyrics.ly +++ b/input/lsr/vertically-centered-common-lyrics.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "vocal-music" diff --git a/input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly b/input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly index 3bcf58da89..bd4605d93c 100644 --- a/input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly +++ b/input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "vocal-music, keyboards, template" diff --git a/input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly b/input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly index 463c3fd8df..7543e89160 100644 --- a/input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly +++ b/input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "text, vocal-music, contexts-and-engravers, template" diff --git a/input/lsr/vocal-ensemble-template.ly b/input/lsr/vocal-ensemble-template.ly index 5633227431..0b529e3767 100644 --- a/input/lsr/vocal-ensemble-template.ly +++ b/input/lsr/vocal-ensemble-template.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "vocal-music, template" diff --git a/input/lsr/volta-below-chords.ly b/input/lsr/volta-below-chords.ly index 73679dcc2f..4f5934e67a 100644 --- a/input/lsr/volta-below-chords.ly +++ b/input/lsr/volta-below-chords.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { texidoces = " Mediante la adición del grabador @code{Volta_engraver} al diff --git a/input/lsr/volta-multi-staff.ly b/input/lsr/volta-multi-staff.ly index f0ff2571be..b89cca5af8 100644 --- a/input/lsr/volta-multi-staff.ly +++ b/input/lsr/volta-multi-staff.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "repeats,staff-notation" texidoc = "By adding the @code{Volta_engraver} to the relevant diff --git a/input/lsr/volta-text-markup-using-repeatcommands.ly b/input/lsr/volta-text-markup-using-repeatcommands.ly index 67fd8a1dba..4ea2d1952d 100644 --- a/input/lsr/volta-text-markup-using-repeatcommands.ly +++ b/input/lsr/volta-text-markup-using-repeatcommands.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "repeats" diff --git a/input/manual/ancient-headword.ly b/input/manual/ancient-headword.ly index 6b92df874f..3b1136e989 100644 --- a/input/manual/ancient-headword.ly +++ b/input/manual/ancient-headword.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" #(set-global-staff-size 15) \paper{ diff --git a/input/manual/chord-names-jazz.ly b/input/manual/chord-names-jazz.ly index ceb1b90134..ccd42c54b7 100644 --- a/input/manual/chord-names-jazz.ly +++ b/input/manual/chord-names-jazz.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { texidoc = " Chord names are generated from a list pitches. The diff --git a/input/manual/chord-names-languages.ly b/input/manual/chord-names-languages.ly index 1641c3f7d7..e446afa4fb 100644 --- a/input/manual/chord-names-languages.ly +++ b/input/manual/chord-names-languages.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { texidoc = "@cindex Chord Names German The english naming of chords (default) can be changed to german diff --git a/input/manual/chords-headword.ly b/input/manual/chords-headword.ly index f1c477eefd..f8a661fd71 100644 --- a/input/manual/chords-headword.ly +++ b/input/manual/chords-headword.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" #(set-global-staff-size 15) \paper{ ragged-right=##f diff --git a/input/manual/display-predefined-fretboards.ly b/input/manual/display-predefined-fretboards.ly index 7dd4ac914b..bf2283db3c 100644 --- a/input/manual/display-predefined-fretboards.ly +++ b/input/manual/display-predefined-fretboards.ly @@ -1,5 +1,5 @@ \include "predefined-guitar-fretboards.ly" -\version "2.11.61" +\version "2.12.0" mychords = \chordmode {c1 c:m c:aug c:dim c:7 c:maj7 c:m7 \break } diff --git a/input/manual/divisiones.ly b/input/manual/divisiones.ly index 97be62eddf..6307c9ac8c 100644 --- a/input/manual/divisiones.ly +++ b/input/manual/divisiones.ly @@ -9,7 +9,7 @@ Choices are @code{divisioMinima}, @code{divisioMaior}, " } -\version "2.11.61" +\version "2.12.0" \include "gregorian.ly" diff --git a/input/manual/editorial-headword.ly b/input/manual/editorial-headword.ly index f7d73eec09..b834181f48 100644 --- a/input/manual/editorial-headword.ly +++ b/input/manual/editorial-headword.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \include "english.ly" #(set-global-staff-size 15) \paper{ diff --git a/input/manual/expressive-headword.ly b/input/manual/expressive-headword.ly index 1ea60271c0..ed62f91ee1 100644 --- a/input/manual/expressive-headword.ly +++ b/input/manual/expressive-headword.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \include "english.ly" #(set-global-staff-size 15) \paper { diff --git a/input/manual/figured-bass-headword.ly b/input/manual/figured-bass-headword.ly index 14daed63a6..8f666920c0 100644 --- a/input/manual/figured-bass-headword.ly +++ b/input/manual/figured-bass-headword.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" #(set-global-staff-size 15) \paper{ ragged-right=##f diff --git a/input/manual/font-table.ly b/input/manual/font-table.ly index 7c62a4ad28..c8e0876b5d 100644 --- a/input/manual/font-table.ly +++ b/input/manual/font-table.ly @@ -9,7 +9,7 @@ evenFooterMarkup = \markup {} } -\version "2.11.61" +\version "2.12.0" #(define-markup-command (doc-char layout props name) (string?) (interpret-markup layout props diff --git a/input/manual/fretted-headword.ly b/input/manual/fretted-headword.ly index faefb12c8b..dc97841f20 100644 --- a/input/manual/fretted-headword.ly +++ b/input/manual/fretted-headword.ly @@ -3,7 +3,7 @@ % on melodies from Bellini's "Norma" % %*****************************************************************% -\version "2.11.51" +\version "2.12.0" #(set-global-staff-size 15) \paper { diff --git a/input/manual/keyboard-headword.ly b/input/manual/keyboard-headword.ly index 81ea9ec397..8793965d37 100644 --- a/input/manual/keyboard-headword.ly +++ b/input/manual/keyboard-headword.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \include "english.ly" #(set-global-staff-size 15) diff --git a/input/manual/note-head-style.ly b/input/manual/note-head-style.ly index 05be352bdf..98d33a27f5 100644 --- a/input/manual/note-head-style.ly +++ b/input/manual/note-head-style.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header{ texidoc=" Note head shapes may be set from several choices. diff --git a/input/manual/percussion-chart.ly b/input/manual/percussion-chart.ly index f30cda1b67..cdbc6d7883 100644 --- a/input/manual/percussion-chart.ly +++ b/input/manual/percussion-chart.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" % yes, I know this is a mess. But I'm not going to fuss with % it one day before I leave. -gp diff --git a/input/manual/pitches-headword.ly b/input/manual/pitches-headword.ly index 33d4006513..d69c44a97f 100644 --- a/input/manual/pitches-headword.ly +++ b/input/manual/pitches-headword.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \include "english.ly" #(set-global-staff-size 15) \paper{ diff --git a/input/manual/repeats-headword.ly b/input/manual/repeats-headword.ly index c23a20de6e..faba778a12 100644 --- a/input/manual/repeats-headword.ly +++ b/input/manual/repeats-headword.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \include "english.ly" #(set-global-staff-size 15) \paper { diff --git a/input/manual/rhythms-headword.ly b/input/manual/rhythms-headword.ly index cc9a465fe7..a48f05ca9e 100644 --- a/input/manual/rhythms-headword.ly +++ b/input/manual/rhythms-headword.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \include "english.ly" #(set-global-staff-size 15) \paper { diff --git a/input/manual/screech-boink.ly b/input/manual/screech-boink.ly index 5b72a68d3c..a49cd240db 100644 --- a/input/manual/screech-boink.ly +++ b/input/manual/screech-boink.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { title = "Screech and boink" subtitle = "Random complex notation" diff --git a/input/manual/script-chart.ly b/input/manual/script-chart.ly index c2439fe941..5dc23d0dae 100644 --- a/input/manual/script-chart.ly +++ b/input/manual/script-chart.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" % this chart is used in the manual too. diff --git a/input/manual/simultaneous-headword.ly b/input/manual/simultaneous-headword.ly index 156911d14a..a6b5ff8e47 100644 --- a/input/manual/simultaneous-headword.ly +++ b/input/manual/simultaneous-headword.ly @@ -1,4 +1,4 @@ -\version "2.11.65" +\version "2.12.0" \include "english.ly" #(set-global-staff-size 15) \paper{ diff --git a/input/manual/staff-headword.ly b/input/manual/staff-headword.ly index ba9d1cb2df..f7fa2e4145 100644 --- a/input/manual/staff-headword.ly +++ b/input/manual/staff-headword.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \include "catalan.ly" #(set-global-staff-size 15) \paper{ diff --git a/input/manual/text-headword.ly b/input/manual/text-headword.ly index dd6b11856e..40af604f84 100644 --- a/input/manual/text-headword.ly +++ b/input/manual/text-headword.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \include "english.ly" #(set-global-staff-size 15) \paper{ diff --git a/input/manual/unfretted-headword.ly b/input/manual/unfretted-headword.ly index 184ffd05bc..de75aa582c 100644 --- a/input/manual/unfretted-headword.ly +++ b/input/manual/unfretted-headword.ly @@ -21,7 +21,7 @@ %% Statement Date: Octber the 9th, 2008 -\version "2.11.61" +\version "2.12.0" #(set-global-staff-size 15) %%% diff --git a/input/manual/wind-headword.ly b/input/manual/wind-headword.ly index 69ca7d35c3..6d8fa0a27b 100644 --- a/input/manual/wind-headword.ly +++ b/input/manual/wind-headword.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" #(set-global-staff-size 15) \paper { line-width = 16\cm diff --git a/input/mutopia-header.ly b/input/mutopia-header.ly index 5e09b1424e..4f14732018 100644 --- a/input/mutopia-header.ly +++ b/input/mutopia-header.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { title = "Title" subtitle = "Subtitle" diff --git a/input/mutopia/E.Satie/petite-ouverture-a-danser.ly b/input/mutopia/E.Satie/petite-ouverture-a-danser.ly index 6d0047e469..268f413972 100644 --- a/input/mutopia/E.Satie/petite-ouverture-a-danser.ly +++ b/input/mutopia/E.Satie/petite-ouverture-a-danser.ly @@ -7,7 +7,7 @@ copyright = "Public Domain" } -\version "2.11.61" +\version "2.12.0" global = { \key a \minor diff --git a/input/mutopia/F.Schubert/morgenlied.ly b/input/mutopia/F.Schubert/morgenlied.ly index 5717727557..b7941a4f55 100644 --- a/input/mutopia/F.Schubert/morgenlied.ly +++ b/input/mutopia/F.Schubert/morgenlied.ly @@ -27,7 +27,7 @@ been lowered } -\version "2.11.61" +\version "2.12.0" manuscriptBreak = { \break } diff --git a/input/mutopia/F.Schubert/standchen.ly b/input/mutopia/F.Schubert/standchen.ly index c39c0a4ab8..10797cd6d9 100644 --- a/input/mutopia/F.Schubert/standchen.ly +++ b/input/mutopia/F.Schubert/standchen.ly @@ -40,7 +40,7 @@ instrument = "Piano" footer = "Mutopia-2001/04/27-xx" } -\version "2.11.61" +\version "2.12.0" #(set-global-staff-size 16) diff --git a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly index 731ceff949..7012fe762f 100644 --- a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly +++ b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" forcedLastBreak = { \break } diff --git a/input/mutopia/J.S.Bach/bwv940.ly b/input/mutopia/J.S.Bach/bwv940.ly index dd41132afa..8ba1bb45af 100644 --- a/input/mutopia/J.S.Bach/bwv940.ly +++ b/input/mutopia/J.S.Bach/bwv940.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "2.11.61" +\version "2.12.0" %{ Header for Petites Preludes. diff --git a/input/mutopia/J.S.Bach/wtk1-fugue2.ly b/input/mutopia/J.S.Bach/wtk1-fugue2.ly index bead2fddfc..a92188df11 100644 --- a/input/mutopia/J.S.Bach/wtk1-fugue2.ly +++ b/input/mutopia/J.S.Bach/wtk1-fugue2.ly @@ -41,7 +41,7 @@ -\version "2.11.61" +\version "2.12.0" diff --git a/input/mutopia/R.Schumann/romanze-op28-2.ly b/input/mutopia/R.Schumann/romanze-op28-2.ly index 0f37f3a1ed..a83fb3cec5 100644 --- a/input/mutopia/R.Schumann/romanze-op28-2.ly +++ b/input/mutopia/R.Schumann/romanze-op28-2.ly @@ -4,7 +4,7 @@ #(set-global-staff-size 16) -\version "2.11.61" +\version "2.12.0" \header { title = "Romanzen" diff --git a/input/mutopia/W.A.Mozart/mozart-hrn-3.ly b/input/mutopia/W.A.Mozart/mozart-hrn-3.ly index 5edd274ac3..4e983cebb5 100644 --- a/input/mutopia/W.A.Mozart/mozart-hrn-3.ly +++ b/input/mutopia/W.A.Mozart/mozart-hrn-3.ly @@ -41,7 +41,7 @@ virtuoso that taught in Geneva. %} -\version "2.11.61" +\version "2.12.0" \include "mozart-hrn3-defs.ily" \include "mozart-hrn3-allegro.ily" diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ily b/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ily index 3815801f39..d788aeecbc 100644 --- a/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ily +++ b/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ily @@ -94,6 +94,7 @@ allegro = c'2 b8[( a gis a)] gis8[ e gis b ] e4 r | r8 e,[ a c] dis4 r + r8 e,[ gis b ] e4 r r8 e,[ a c] dis4 r r8 e,[ g b] e4 r r8 fis,[ b dis] fis4 r diff --git a/input/new/aligning-and-centering-instrument-names.ly b/input/new/aligning-and-centering-instrument-names.ly index 519ddde72d..6ad24e927d 100644 --- a/input/new/aligning-and-centering-instrument-names.ly +++ b/input/new/aligning-and-centering-instrument-names.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "text, paper-and-layout, titles" diff --git a/input/new/aligning-marks-with-various-notation-objects.ly b/input/new/aligning-marks-with-various-notation-objects.ly index dc44a1aab1..79f78ef938 100644 --- a/input/new/aligning-marks-with-various-notation-objects.ly +++ b/input/new/aligning-marks-with-various-notation-objects.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "text" diff --git a/input/new/arabic-improvisation.ly b/input/new/arabic-improvisation.ly index e45e14e364..06348916f5 100644 --- a/input/new/arabic-improvisation.ly +++ b/input/new/arabic-improvisation.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "world-music" diff --git a/input/new/book-parts.ly b/input/new/book-parts.ly index abb56b8460..33a624caba 100644 --- a/input/new/book-parts.ly +++ b/input/new/book-parts.ly @@ -1,4 +1,4 @@ -\version "2.11.65" +\version "2.12.0" \header { lsrtags = "paper-and-layout" diff --git a/input/new/broken-crescendo-hairpin.ly b/input/new/broken-crescendo-hairpin.ly index 7eddf3a961..839b361065 100644 --- a/input/new/broken-crescendo-hairpin.ly +++ b/input/new/broken-crescendo-hairpin.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "expressive-marks" diff --git a/input/new/center-text-below-hairpin-dynamics.ly b/input/new/center-text-below-hairpin-dynamics.ly index eae6943619..769f735fb3 100644 --- a/input/new/center-text-below-hairpin-dynamics.ly +++ b/input/new/center-text-below-hairpin-dynamics.ly @@ -1,4 +1,4 @@ -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "expressive-marks, text" diff --git a/input/new/changing-form-of-multi--measure-rests.ly b/input/new/changing-form-of-multi--measure-rests.ly index 0ba6809bc4..2803fc5842 100644 --- a/input/new/changing-form-of-multi--measure-rests.ly +++ b/input/new/changing-form-of-multi--measure-rests.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "rhythms,tweaks-and-overrides" texidoc = " diff --git a/input/new/changing-properties-for-individual-grobs.ly b/input/new/changing-properties-for-individual-grobs.ly index 416e5520d9..714ae7e172 100644 --- a/input/new/changing-properties-for-individual-grobs.ly +++ b/input/new/changing-properties-for-individual-grobs.ly @@ -1,4 +1,4 @@ -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "tweaks-and-overrides" diff --git a/input/new/changing-text-and-spanner-styles-for-text-dynamics.ly b/input/new/changing-text-and-spanner-styles-for-text-dynamics.ly index 7d41aa87f3..956f3bdcbe 100644 --- a/input/new/changing-text-and-spanner-styles-for-text-dynamics.ly +++ b/input/new/changing-text-and-spanner-styles-for-text-dynamics.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "rhythms,tweaks-and-overrides" texidoc = " diff --git a/input/new/changing-the-tempo-without-a-metronome-mark.ly b/input/new/changing-the-tempo-without-a-metronome-mark.ly index 446a3de2c4..f64adcc61e 100644 --- a/input/new/changing-the-tempo-without-a-metronome-mark.ly +++ b/input/new/changing-the-tempo-without-a-metronome-mark.ly @@ -1,4 +1,4 @@ -\version "2.11.62" +\version "2.12.0" \header { lsrtags = "staff-notation" diff --git a/input/new/changing-time-signatures-inside-a-polymetric-section-using-scaledurations.ly b/input/new/changing-time-signatures-inside-a-polymetric-section-using-scaledurations.ly index 18a0527055..f7007eb1ce 100644 --- a/input/new/changing-time-signatures-inside-a-polymetric-section-using-scaledurations.ly +++ b/input/new/changing-time-signatures-inside-a-polymetric-section-using-scaledurations.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "rhythms,contexts-and-engravers" texidoc = "The @code{measureLength} property, together with diff --git a/input/new/clip-systems.ly b/input/new/clip-systems.ly index e37bf09df1..49532ac21e 100644 --- a/input/new/clip-systems.ly +++ b/input/new/clip-systems.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "paper-and-layout" % a new tag like "Mixing text and music" or % "Special output" might be more adequate -jm diff --git a/input/new/coloring-notes-depending-on-their-pitch.ly b/input/new/coloring-notes-depending-on-their-pitch.ly index 5b32ef424e..6359c293ae 100644 --- a/input/new/coloring-notes-depending-on-their-pitch.ly +++ b/input/new/coloring-notes-depending-on-their-pitch.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "pitches,editorial-annotations,really-cool" texidoc = " diff --git a/input/new/compound-time-signatures.ly b/input/new/compound-time-signatures.ly index 1e5442d1dd..b55a3fdc12 100644 --- a/input/new/compound-time-signatures.ly +++ b/input/new/compound-time-signatures.ly @@ -1,4 +1,4 @@ -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms" diff --git a/input/new/creating-a-delayed-turn.ly b/input/new/creating-a-delayed-turn.ly new file mode 100644 index 0000000000..38fec61933 --- /dev/null +++ b/input/new/creating-a-delayed-turn.ly @@ -0,0 +1,25 @@ +\version "2.12.0" + +\header { + lsrtags = "expressive-marks, editorial-annotations, tweaks-and-overrides" + texidoc = "Creating a delayed turn, where the lower note of the + turn uses the accidental, requires several overrides. The + @code{outside-staff-priority} property must be set to #f, as otherwise + this would take precedence over the @code{avoid-slur property}. The + value of @code{halign} is used to position the turn horizontally." + + doctitle = "Creating a delayed turn" +} + +\relative c'' { + \once \override TextScript #'avoid-slur = #'inside + \once \override TextScript #'outside-staff-priority = ##f + c2(^\markup \tiny \override #'(baseline-skip . 1) { + \halign #-4 + \center-column { + \sharp + \musicglyph #"scripts.turn" + } + } + d4.) c8 +} diff --git a/input/new/creating-metronome-marks-in-markup-mode.ly b/input/new/creating-metronome-marks-in-markup-mode.ly index f52d838298..bb1379bdfd 100644 --- a/input/new/creating-metronome-marks-in-markup-mode.ly +++ b/input/new/creating-metronome-marks-in-markup-mode.ly @@ -1,4 +1,4 @@ -\version "2.11.62" +\version "2.12.0" \header { lsrtags = "staff-notation" diff --git a/input/new/creating-simultaneous-rehearsal-marks.ly b/input/new/creating-simultaneous-rehearsal-marks.ly index a7f003d859..2f065dd3be 100644 --- a/input/new/creating-simultaneous-rehearsal-marks.ly +++ b/input/new/creating-simultaneous-rehearsal-marks.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "expressive-marks,text,tweaks-and-overrides" texidoc = " diff --git a/input/new/creating-text-spanners.ly b/input/new/creating-text-spanners.ly index 7c0770eaa6..0d89056fb5 100644 --- a/input/new/creating-text-spanners.ly +++ b/input/new/creating-text-spanners.ly @@ -1,4 +1,4 @@ -\version "2.11.65" +\version "2.12.0" \header { lsrtags = "expressive-marks, text, tweaks-and-overrides" diff --git a/input/new/customizing-fretboard-fret-diagrams.ly b/input/new/customizing-fretboard-fret-diagrams.ly index 3b6c03165f..1f4d8cb2b5 100644 --- a/input/new/customizing-fretboard-fret-diagrams.ly +++ b/input/new/customizing-fretboard-fret-diagrams.ly @@ -1,4 +1,4 @@ -\version "2.11.65" +\version "2.12.0" \header { lsrtags = "fretted-strings,tweaks-and-overrides" diff --git a/input/new/customizing-markup-fret-diagrams.ly b/input/new/customizing-markup-fret-diagrams.ly index b50ee4acdb..c3d03fd9b1 100644 --- a/input/new/customizing-markup-fret-diagrams.ly +++ b/input/new/customizing-markup-fret-diagrams.ly @@ -1,4 +1,4 @@ -\version "2.11.65" +\version "2.12.0" \header { lsrtags = "fretted-strings,tweaks-and-overrides" diff --git a/input/new/defining-predefined-fretboards-for-other-instruments.ly b/input/new/defining-predefined-fretboards-for-other-instruments.ly index b8f0568ae4..f38d4a2fbe 100644 --- a/input/new/defining-predefined-fretboards-for-other-instruments.ly +++ b/input/new/defining-predefined-fretboards-for-other-instruments.ly @@ -1,4 +1,4 @@ -\version "2.11.65" +\version "2.12.0" \header { lsrtags = "fretted-strings" texidoc = "Predefined fret diagrams can be added for new instruments diff --git a/input/new/display-bracket-with-only-one-staff-in-a-system.ly b/input/new/display-bracket-with-only-one-staff-in-a-system.ly index f38616e553..87e416b30d 100644 --- a/input/new/display-bracket-with-only-one-staff-in-a-system.ly +++ b/input/new/display-bracket-with-only-one-staff-in-a-system.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "staff-notation,tweaks-and-overrides" texidoc = "If there is only one staff in one of the staff types diff --git a/input/new/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly b/input/new/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly index 0a9729cae4..f1cd319376 100644 --- a/input/new/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly +++ b/input/new/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly @@ -1,4 +1,4 @@ -\version "2.11.62" +\version "2.12.0" \header { lsrtags = "pitches" @@ -24,8 +24,8 @@ This snippet shows how to achieve such notation rules. } \layout { \context { - \Staff - \remove "Key_engraver" + \Staff + \remove "Key_engraver" } } } diff --git a/input/new/dotted-harmonics.ly b/input/new/dotted-harmonics.ly index 83d112db3d..43cdd3b141 100644 --- a/input/new/dotted-harmonics.ly +++ b/input/new/dotted-harmonics.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "unfretted-strings,tweaks-and-overrides" diff --git a/input/new/drawing-boxes-around-grobs.ly b/input/new/drawing-boxes-around-grobs.ly index 9d615d2479..9d53c90cb3 100644 --- a/input/new/drawing-boxes-around-grobs.ly +++ b/input/new/drawing-boxes-around-grobs.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "tweaks-and-overrides" texidoc = " diff --git a/input/new/drawing-circles-around-various-objects.ly b/input/new/drawing-circles-around-various-objects.ly index 2ed0bde504..27318e7b78 100644 --- a/input/new/drawing-circles-around-various-objects.ly +++ b/input/new/drawing-circles-around-various-objects.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "tweaks-and-overrides" texidoc = " diff --git a/input/new/fine-tuning-pedal-brackets.ly b/input/new/fine-tuning-pedal-brackets.ly index 534431c064..e3a2344615 100644 --- a/input/new/fine-tuning-pedal-brackets.ly +++ b/input/new/fine-tuning-pedal-brackets.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "keyboards, tweaks-and-overrides" diff --git a/input/new/flute-slap-notation.ly b/input/new/flute-slap-notation.ly index c006238be5..35f8987060 100644 --- a/input/new/flute-slap-notation.ly +++ b/input/new/flute-slap-notation.ly @@ -1,4 +1,4 @@ -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "winds" diff --git a/input/new/fret-diagrams-explained-and-developed.ly b/input/new/fret-diagrams-explained-and-developed.ly index efe6c79c8c..a5b548e497 100644 --- a/input/new/fret-diagrams-explained-and-developed.ly +++ b/input/new/fret-diagrams-explained-and-developed.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "fretted-strings,tweaks-and-overrides" diff --git a/input/new/guitar-strum-rhythms.ly b/input/new/guitar-strum-rhythms.ly index c4aaced334..9c5c0ab1b1 100644 --- a/input/new/guitar-strum-rhythms.ly +++ b/input/new/guitar-strum-rhythms.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "rhythms,fretted-strings" @@ -16,35 +16,30 @@ with melody notes, chord names, and fret diagrams. c1 f g c } } - \new FretBoards { \chordmode { c1 f g c } } - - \new Voice \with { - \consists Pitch_squash_engraver - } \relative c'' { - \improvisationOn - c4 c8 c c4 c8 c - f4 f8 f f4 f8 f - g4 g8 g g4 g8 g - c4 c8 c c4 c8 c + \consists "Pitch_squash_engraver" + } { + \relative c'' { + \improvisationOn + c4 c8 c c4 c8 c + f4 f8 f f4 f8 f + g4 g8 g g4 g8 g + c4 c8 c c4 c8 c + } } - - \new Voice = "melody" { \relative c'' { - \improvisationOff c2 e4 e4 f2. r4 g2. a4 e4 c2. } } - \new Lyrics { \lyricsto "melody" { This is my song. diff --git a/input/new/heavily-customized-polymetric-time-signatures.ly b/input/new/heavily-customized-polymetric-time-signatures.ly index acca7f225b..8e6d38da51 100644 --- a/input/new/heavily-customized-polymetric-time-signatures.ly +++ b/input/new/heavily-customized-polymetric-time-signatures.ly @@ -1,4 +1,4 @@ -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms, percussion" diff --git a/input/new/incipit.ly b/input/new/incipit.ly index 3e3cc41edd..5664d32cb1 100644 --- a/input/new/incipit.ly +++ b/input/new/incipit.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "staff-notation,ancient-notation" texidoc = "Incipits can be added using the instrument name grob, but @@ -13,7 +13,7 @@ incipit = \once \override Staff.InstrumentName #'self-alignment-Y = #UP \once \override Staff.InstrumentName #'Y-offset = #4 \once \override Staff.InstrumentName #'padding = #0.3 - \once \override Staff.InstrumentName #'stencil = + \once \override Staff.InstrumentName #'stencil = #(lambda (grob) (let* ((instrument-name (ly:grob-property grob 'long-text)) (layout (ly:output-def-clone (ly:grob-layout grob))) @@ -37,7 +37,7 @@ incipit = (ly:output-def-set-variable! layout 'ragged-last #f) (ly:output-def-set-variable! layout 'system-count 1) (ly:score-add-output-def! score layout) - (set! (ly:grob-property grob 'long-text) + (ly:grob-set-property! grob 'long-text (markup #:score score)) (ly:system-start-text::print grob))) #}) @@ -48,9 +48,7 @@ global = { \set Score.skipBars = ##t \key g \major \time 4/4 - - %make the staff lines invisible on staves - \override Staff.BarLine #'transparent = ##t + % the actual music \skip 1*8 @@ -236,25 +234,19 @@ bassusLyrics = \lyricmode { \incipit \bassusIncipit \bassusNotes >> + \new Lyrics = "bassusLyrics" \lyricsto bassusNotes { \bassusLyrics } >> - \new Lyrics = "bassusLyrics" \lyricsto bassusNotes { \bassusLyrics } - %% Keep the bass lyrics outside of the staff group to avoid bar lines - %% between the lyrics. >> \layout { \context { \Score - %% no bar lines in staves + %% no bar lines in staves or lyrics \override BarLine #'transparent = ##t } - %% the next three instructions keep the lyrics between the bar lines + %% the next two instructions keep the lyrics between the bar lines \context { \Lyrics - \consists "Bar_engraver" - \override BarLine #'transparent = ##t - } - \context { - \StaffGroup + \consists "Bar_engraver" \consists "Separating_line_group_engraver" } \context { diff --git a/input/new/inserting-a-caesura.ly b/input/new/inserting-a-caesura.ly index 75c478070a..c143675851 100644 --- a/input/new/inserting-a-caesura.ly +++ b/input/new/inserting-a-caesura.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "expressive-marks,tweaks-and-overrides" texidoc = " diff --git a/input/new/letter-tablature-formatting.ly b/input/new/letter-tablature-formatting.ly index e357cc6ff2..79da84dff5 100644 --- a/input/new/letter-tablature-formatting.ly +++ b/input/new/letter-tablature-formatting.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "staff-notation,fretted-strings" diff --git a/input/new/line-arrows.ly b/input/new/line-arrows.ly index cba3a1d2e6..7fbc9d6017 100644 --- a/input/new/line-arrows.ly +++ b/input/new/line-arrows.ly @@ -1,4 +1,4 @@ -\version "2.11.65" +\version "2.12.0" \header { lsrtags = "expressive-marks" texidoc = "Arrows can be applied to text-spanners and line-spanners diff --git a/input/new/makam-example.ly b/input/new/makam-example.ly index d8842521f8..9e88142120 100644 --- a/input/new/makam-example.ly +++ b/input/new/makam-example.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "pitches,world-music" texidoc = "Makam is a type of melody from Turkey using 1/9th-tone diff --git a/input/new/making-an-object-invisible-with-the-transparent-property.ly b/input/new/making-an-object-invisible-with-the-transparent-property.ly index 7dcc5ebe49..47014eea84 100644 --- a/input/new/making-an-object-invisible-with-the-transparent-property.ly +++ b/input/new/making-an-object-invisible-with-the-transparent-property.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "rhythms,tweaks-and-overrides" texidoc = " @@ -18,16 +18,18 @@ flag from interfering with tie positioning, the stem is extended. \relative c'' { \time 2/4 - << { - \once \override Stem #'transparent = ##t - \once \override Stem #'length = #8 - b8 ~ b\noBeam - \once \override Stem #'transparent = ##t - \once \override Stem #'length = #8 - g8 ~ g\noBeam - } - \\ - { - b8 g g e - } >> + << + { + \once \override Stem #'transparent = ##t + \once \override Stem #'length = #8 + b8 ~ b\noBeam + \once \override Stem #'transparent = ##t + \once \override Stem #'length = #8 + g8 ~ g\noBeam + } + \\ + { + b8 g g e + } + >> } diff --git a/input/new/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly b/input/new/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly index 7d5128e091..bdf0224acf 100644 --- a/input/new/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly +++ b/input/new/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly @@ -1,4 +1,4 @@ -\version "2.11.62" +\version "2.12.0" \header { lsrtags = "editorial-annotations, vocal-music" @@ -6,23 +6,25 @@ texidoc = " This example shows how to put crosses on stems. Mark the beginning of a spoken section with the @code{\\speakOn} keyword, and end it -with the @code{\\speakOff} keyword. Remember to end cross sections -before entering any rest: this function also adds crosses to the -invisible stems of rests. +with the @code{\\speakOff} keyword. " doctitle = "Marking notes of spoken parts with a cross on the stem" } speakOn = { \override Stem #'stencil = #(lambda (grob) - (ly:stencil-combine-at-edge - (ly:stem::print grob) - Y - (- (ly:grob-property grob 'direction)) - (grob-interpret-markup grob - (markup #:hspace -1.025 #:fontsize -4 - #:musicglyph "noteheads.s2cross")) - -2.3 0)) + (let* ((x-parent (ly:grob-parent grob X)) + (is-rest? (ly:grob? (ly:grob-object x-parent 'rest)))) + (if is-rest? + empty-stencil + (ly:stencil-combine-at-edge + (ly:stem::print grob) + Y + (- (ly:grob-property grob 'direction)) + (grob-interpret-markup grob + (markup #:hspace -1.025 #:fontsize -4 + #:musicglyph "noteheads.s2cross")) + -2.3 0)))) } speakOff = { diff --git a/input/new/markup-lines.ly b/input/new/markup-lines.ly index 24346da796..bc32520f8d 100644 --- a/input/new/markup-lines.ly +++ b/input/new/markup-lines.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "text" diff --git a/input/new/modern-tab-text-clef.ly b/input/new/modern-tab-text-clef.ly index e30bda8183..fa7dadee7d 100644 --- a/input/new/modern-tab-text-clef.ly +++ b/input/new/modern-tab-text-clef.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "staff-notation, fretted-strings" diff --git a/input/new/multi--measure-rest-markup.ly b/input/new/multi--measure-rest-markup.ly index f75cf29724..ffb1b3a347 100644 --- a/input/new/multi--measure-rest-markup.ly +++ b/input/new/multi--measure-rest-markup.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "rhythms, text" diff --git a/input/new/ottava-text.ly b/input/new/ottava-text.ly new file mode 100644 index 0000000000..6110b795d5 --- /dev/null +++ b/input/new/ottava-text.ly @@ -0,0 +1,23 @@ +\version "2.12.0" + +\header { + lsrtags = "pitches, text" + texidoc = " +Internally, @code{\\ottava} sets the properties @code{ottavation} +(for example, to @code{\"8va\"} or @code{\"8vb\"}) and +@code{middleCPosition}. To override the text of the bracket, set +@code{ottavation} after invoking @code{\\ottava}. +" + doctitle = "Ottava text" +} + +{ + \ottava #1 + \set Staff.ottavation = #"8" + c''1 + \ottava #0 + c'1 + \ottava #1 + \set Staff.ottavation = #"Text" + c''1 +} diff --git a/input/new/outputting-the-version-number.ly b/input/new/outputting-the-version-number.ly index 61ce869335..e573ade326 100644 --- a/input/new/outputting-the-version-number.ly +++ b/input/new/outputting-the-version-number.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "text" diff --git a/input/new/page-label.ly b/input/new/page-label.ly index 40d4893089..657ea9efc6 100644 --- a/input/new/page-label.ly +++ b/input/new/page-label.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "spacing" texidoc = "Page labels may be placed inside music or at top-level, diff --git a/input/new/percent-repeat-count-visibility.ly b/input/new/percent-repeat-count-visibility.ly index 31c01ee1ce..3ae1e129ad 100644 --- a/input/new/percent-repeat-count-visibility.ly +++ b/input/new/percent-repeat-count-visibility.ly @@ -1,4 +1,4 @@ -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "repeats, tweaks-and-overrides" texidoc = " diff --git a/input/new/piano-template-with-centered-dynamics.ly b/input/new/piano-template-with-centered-dynamics.ly index 49c70a66c5..7bc5cd5b4e 100644 --- a/input/new/piano-template-with-centered-dynamics.ly +++ b/input/new/piano-template-with-centered-dynamics.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "expressive-marks,keyboards,template" diff --git a/input/new/positioning-multi--measure-rests.ly b/input/new/positioning-multi--measure-rests.ly index fcb8a181f5..235b8baad1 100644 --- a/input/new/positioning-multi--measure-rests.ly +++ b/input/new/positioning-multi--measure-rests.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "rhythms,tweaks-and-overrides" texidoc = " diff --git a/input/new/quoting-another-voice-with-transposition.ly b/input/new/quoting-another-voice-with-transposition.ly index 53768e2f15..7a87f41d7c 100644 --- a/input/new/quoting-another-voice-with-transposition.ly +++ b/input/new/quoting-another-voice-with-transposition.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "pitches,staff-notation" texidoc = "Quotations take into account the transposition of both diff --git a/input/new/quoting-another-voice.ly b/input/new/quoting-another-voice.ly index b0e75a9d32..13da99eacd 100644 --- a/input/new/quoting-another-voice.ly +++ b/input/new/quoting-another-voice.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "staff-notation" texidoc = "The @code{quotedEventTypes} property determines the diff --git a/input/new/setting-hairpin-behavior-at-bar-lines.ly b/input/new/setting-hairpin-behavior-at-bar-lines.ly index 46197a7933..a6dd6584b1 100644 --- a/input/new/setting-hairpin-behavior-at-bar-lines.ly +++ b/input/new/setting-hairpin-behavior-at-bar-lines.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "expressive-marks" texidoc = "If the note which ends a hairpin falls on a downbeat, diff --git a/input/new/specifying-context-with-beatgrouping.ly b/input/new/specifying-context-with-beatgrouping.ly index e3ee5126a5..5744ba37ae 100644 --- a/input/new/specifying-context-with-beatgrouping.ly +++ b/input/new/specifying-context-with-beatgrouping.ly @@ -1,11 +1,13 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "rhythms" texidoc = " By specifying the context, the effect of @code{beatGrouping} can be limited to the context specified, and the values which may have -been set in higher-level contexts can be overridden: +been set in higher-level contexts can be overridden. The +@code{\\set} commands must be placed @emph{after} all @code{\\time} +commands: " doctitle = "Specifying context with beatGrouping" } @@ -22,7 +24,7 @@ been set in higher-level contexts can be overridden: \new Voice { \relative c' { \voiceTwo - \set Voice.beatGrouping = #'(1 3 3) + \set beatGrouping = #'(1 3 3) f8 f f f f f f } } diff --git a/input/new/suppressing-warnings-for-clashing-note-columns.ly b/input/new/suppressing-warnings-for-clashing-note-columns.ly index ea6dab0a8a..5dbf28df0d 100644 --- a/input/new/suppressing-warnings-for-clashing-note-columns.ly +++ b/input/new/suppressing-warnings-for-clashing-note-columns.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "simultaneous-notes,tweaks-and-overrides" texidoc = " diff --git a/input/new/table-of-contents.ly b/input/new/table-of-contents.ly index 1094712ec2..f639c06222 100644 --- a/input/new/table-of-contents.ly +++ b/input/new/table-of-contents.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "paper-and-layout" texidoc = "A table of contents is included using diff --git a/input/new/tick-bar-lines.ly b/input/new/tick-bar-lines.ly new file mode 100644 index 0000000000..d237aa67da --- /dev/null +++ b/input/new/tick-bar-lines.ly @@ -0,0 +1,17 @@ +\version "2.12.0" +\header { + lsrtags = "staff-notation" + texidoc = " +'Tick' bar lines are often used in music where the bar line is used +only for coordination and is not meant to imply any rhythmic stress. +" + doctitle = "Tick bar lines" +} +\relative c' { + \set Score.defaultBarType = #"'" + c4 d e f + g4 f e d + c4 d e f + g4 f e d + \bar "|." +} diff --git a/input/new/transposing-pitches-with-minimum-accidentals-smart-transpose.ly b/input/new/transposing-pitches-with-minimum-accidentals-smart-transpose.ly index 070ba64fcf..1ff8444f55 100644 --- a/input/new/transposing-pitches-with-minimum-accidentals-smart-transpose.ly +++ b/input/new/transposing-pitches-with-minimum-accidentals-smart-transpose.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "pitches" texidoc = "This example uses some Scheme code to enforce enharmonic @@ -31,7 +31,8 @@ In this manner, the most natural enharmonic notes are chosen. #(define (naturalize-pitch p) (let* ((o (ly:pitch-octave p)) (a (* 4 (ly:pitch-alteration p))) - ; alteration, a, in quarter tone steps, for historical reasons + ; alteration, a, in quarter tone steps, + ; for historical reasons (n (ly:pitch-notename p))) (cond ((and (> a 1) (or (eq? n 6) (eq? n 2))) @@ -52,23 +53,23 @@ In this manner, the most natural enharmonic notes are chosen. (e (ly:music-property music 'element)) (p (ly:music-property music 'pitch))) (if (pair? es) - (ly:music-set-property! + (ly:music-set-property! music 'elements (map (lambda (x) (naturalize x)) es))) (if (ly:music? e) - (ly:music-set-property! + (ly:music-set-property! music 'element (naturalize e))) (if (ly:pitch? p) - (begin - (set! p (naturalize-pitch p)) - (ly:music-set-property! music 'pitch p))) + (begin + (set! p (naturalize-pitch p)) + (ly:music-set-property! music 'pitch p))) music)) naturalizeMusic = #(define-music-function (parser location m) - (ly:music?) - (naturalize m)) + (ly:music?) + (naturalize m)) music = \relative c' { c4 d e g } diff --git a/input/new/using-beatlength-and-beatgrouping.ly b/input/new/using-beatlength-and-beatgrouping.ly index fe01180448..fd3c776392 100644 --- a/input/new/using-beatlength-and-beatgrouping.ly +++ b/input/new/using-beatlength-and-beatgrouping.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "rhythms" diff --git a/input/new/using-the--tweak-command-to-tweak-individual-grobs.ly b/input/new/using-the--tweak-command-to-tweak-individual-grobs.ly index b6981653ac..77f574d359 100644 --- a/input/new/using-the--tweak-command-to-tweak-individual-grobs.ly +++ b/input/new/using-the--tweak-command-to-tweak-individual-grobs.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "tweaks-and-overrides" texidoc = " diff --git a/input/new/utf-8.ly b/input/new/utf-8.ly index 0917969465..e79f0c5831 100644 --- a/input/new/utf-8.ly +++ b/input/new/utf-8.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" %% Edit this file using a Unicode aware editor, such as GVIM, GEDIT, Emacs diff --git a/input/new/volta-below-chords.ly b/input/new/volta-below-chords.ly index 63394d4402..1b054a756c 100644 --- a/input/new/volta-below-chords.ly +++ b/input/new/volta-below-chords.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "repeats,staff-notation,chords" texidoc = "By adding the @code{Volta_engraver} to the relevant diff --git a/input/new/volta-multi-staff.ly b/input/new/volta-multi-staff.ly index 4b0f121a26..a45dddec74 100644 --- a/input/new/volta-multi-staff.ly +++ b/input/new/volta-multi-staff.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "repeats,staff-notation" texidoc = "By adding the @code{Volta_engraver} to the relevant diff --git a/input/new/volta-text-markup-using-repeatcommands.ly b/input/new/volta-text-markup-using-repeatcommands.ly index 73522a37d9..a12c28599c 100644 --- a/input/new/volta-text-markup-using-repeatcommands.ly +++ b/input/new/volta-text-markup-using-repeatcommands.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "repeats" diff --git a/input/proportional.ly b/input/proportional.ly index 8f3d806ee7..4ee27da27a 100644 --- a/input/proportional.ly +++ b/input/proportional.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { diff --git a/input/puer-fragment.ly b/input/puer-fragment.ly index f458fdbf95..f05fa6a0a7 100644 --- a/input/puer-fragment.ly +++ b/input/puer-fragment.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { title = "Puer natus est nobis" subtitle = "Antiphona ad introitum VII" diff --git a/input/regression/accidental-ancient.ly b/input/regression/accidental-ancient.ly index f026960faa..47fe5bd22a 100644 --- a/input/regression/accidental-ancient.ly +++ b/input/regression/accidental-ancient.ly @@ -6,7 +6,7 @@ are collected here. " } -\version "2.11.51" +\version "2.12.0" \relative c'' { \time 3/4 diff --git a/input/regression/accidental-broken-tie-spacing.ly b/input/regression/accidental-broken-tie-spacing.ly index 9a6fb0d350..6f4bc120af 100644 --- a/input/regression/accidental-broken-tie-spacing.ly +++ b/input/regression/accidental-broken-tie-spacing.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "When a tie is broken, the spacing engine must consider the diff --git a/input/regression/accidental-cautionary.ly b/input/regression/accidental-cautionary.ly index c622833bfd..87c7bda814 100644 --- a/input/regression/accidental-cautionary.ly +++ b/input/regression/accidental-cautionary.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Cautionary accidentals may be indicated using either diff --git a/input/regression/accidental-clef-change.ly b/input/regression/accidental-clef-change.ly index d1e287176b..c927e693f7 100644 --- a/input/regression/accidental-clef-change.ly +++ b/input/regression/accidental-clef-change.ly @@ -7,7 +7,7 @@ } -\version "2.11.51" +\version "2.12.0" \new Staff \relative c' { \clef treble cis dis fis diff --git a/input/regression/accidental-collision.ly b/input/regression/accidental-collision.ly index 5b3131cfa7..062e1f8cf4 100644 --- a/input/regression/accidental-collision.ly +++ b/input/regression/accidental-collision.ly @@ -2,7 +2,7 @@ texidoc = "accidentals avoid stems of other notes too." } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t diff --git a/input/regression/accidental-contemporary.ly b/input/regression/accidental-contemporary.ly index 1c021d57fe..9da5027861 100644 --- a/input/regression/accidental-contemporary.ly +++ b/input/regression/accidental-contemporary.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { texidoc = "Several automatic accidental rules diff --git a/input/regression/accidental-double.ly b/input/regression/accidental-double.ly index 6188420e9f..3d91d10f11 100644 --- a/input/regression/accidental-double.ly +++ b/input/regression/accidental-double.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "If two forced accidentals happen at the same time, only one sharp sign is printed." diff --git a/input/regression/accidental-forced-tie-barline.ly b/input/regression/accidental-forced-tie-barline.ly index e5c24ddd41..0511b85163 100644 --- a/input/regression/accidental-forced-tie-barline.ly +++ b/input/regression/accidental-forced-tie-barline.ly @@ -1,4 +1,4 @@ -\version "2.11.53" +\version "2.12.0" \header { texidoc = "Cautionary accidentals applied to tied notes after a diff --git a/input/regression/accidental-forced-tie.ly b/input/regression/accidental-forced-tie.ly index 5d553f069c..e28d873672 100644 --- a/input/regression/accidental-forced-tie.ly +++ b/input/regression/accidental-forced-tie.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Accidentals can be forced with ! and ? even if the notes are tied." diff --git a/input/regression/accidental-ledger.ly b/input/regression/accidental-ledger.ly index 9cc5807d50..51dfe52819 100644 --- a/input/regression/accidental-ledger.ly +++ b/input/regression/accidental-ledger.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/accidental-octave.ly b/input/regression/accidental-octave.ly index f95013453c..129f579599 100644 --- a/input/regression/accidental-octave.ly +++ b/input/regression/accidental-octave.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc=" diff --git a/input/regression/accidental-piano.ly b/input/regression/accidental-piano.ly index 1d09a342fe..1c85862ed7 100644 --- a/input/regression/accidental-piano.ly +++ b/input/regression/accidental-piano.ly @@ -6,7 +6,7 @@ accidental." } -\version "2.11.51" +\version "2.12.0" \layout { diff --git a/input/regression/accidental-placement.ly b/input/regression/accidental-placement.ly index 9bd279aa55..a7ed3c6420 100644 --- a/input/regression/accidental-placement.ly +++ b/input/regression/accidental-placement.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/accidental-quarter.ly b/input/regression/accidental-quarter.ly index 82857bdb0b..165e4c15a3 100644 --- a/input/regression/accidental-quarter.ly +++ b/input/regression/accidental-quarter.ly @@ -3,7 +3,7 @@ texidoc = "Quarter tone notation is supported, including threequarters flat." } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t } \relative c'' { diff --git a/input/regression/accidental-single-double.ly b/input/regression/accidental-single-double.ly index 5776a79ea8..b69bfe67dd 100644 --- a/input/regression/accidental-single-double.ly +++ b/input/regression/accidental-single-double.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" A sharp sign after a double sharp sign, as well as a flat sign diff --git a/input/regression/accidental-suggestions.ly b/input/regression/accidental-suggestions.ly index 102de5fac3..3e0ae0c72e 100644 --- a/input/regression/accidental-suggestions.ly +++ b/input/regression/accidental-suggestions.ly @@ -7,7 +7,7 @@ denoting Musica Ficta." } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } diff --git a/input/regression/accidental-tie.ly b/input/regression/accidental-tie.ly index 31c40b402e..04a4b372d1 100644 --- a/input/regression/accidental-tie.ly +++ b/input/regression/accidental-tie.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "The second and third notes should not get accidentals, diff --git a/input/regression/accidental-unbroken-tie-spacing.ly b/input/regression/accidental-unbroken-tie-spacing.ly index 831a84cc01..a9857e4026 100644 --- a/input/regression/accidental-unbroken-tie-spacing.ly +++ b/input/regression/accidental-unbroken-tie-spacing.ly @@ -4,7 +4,7 @@ texidoc = "Tied accidentaled notes (which cause reminder accidentals) do not wreak havoc in the spacing when unbroken." } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t } diff --git a/input/regression/accidental-voice.ly b/input/regression/accidental-voice.ly index 5896571607..a1be03b654 100644 --- a/input/regression/accidental-voice.ly +++ b/input/regression/accidental-voice.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t } \header{ diff --git a/input/regression/accidental.ly b/input/regression/accidental.ly index 5eb60e071b..587ef751fd 100644 --- a/input/regression/accidental.ly +++ b/input/regression/accidental.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" diff --git a/input/regression/alignment-order.ly b/input/regression/alignment-order.ly index 25d8b9a7e8..a5bec4114f 100644 --- a/input/regression/alignment-order.ly +++ b/input/regression/alignment-order.ly @@ -3,7 +3,7 @@ anywhere in the vertical alignment. " } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t diff --git a/input/regression/alignment-vertical-manual-setting.ly b/input/regression/alignment-vertical-manual-setting.ly index 0fee0e483a..b176e931ce 100644 --- a/input/regression/alignment-vertical-manual-setting.ly +++ b/input/regression/alignment-vertical-manual-setting.ly @@ -6,7 +6,7 @@ } -\version "2.11.51" +\version "2.12.0" \book { \score { diff --git a/input/regression/alignment-vertical-spacing.ly b/input/regression/alignment-vertical-spacing.ly index 542957ab3c..2140e3754e 100644 --- a/input/regression/alignment-vertical-spacing.ly +++ b/input/regression/alignment-vertical-spacing.ly @@ -16,7 +16,7 @@ setting properties on individual object. @code{\override} in a } -\version "2.11.51" +\version "2.12.0" #(set-global-staff-size 13) diff --git a/input/regression/ambitus-pitch-ordering.ly b/input/regression/ambitus-pitch-ordering.ly index e47ee60515..91b2d86d97 100644 --- a/input/regression/ambitus-pitch-ordering.ly +++ b/input/regression/ambitus-pitch-ordering.ly @@ -2,7 +2,7 @@ texidoc = "Ambituses use actual pitch not lexicographic ordering." } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right=##t diff --git a/input/regression/ambitus.ly b/input/regression/ambitus.ly index d0099af68a..f53e3e987b 100644 --- a/input/regression/ambitus.ly +++ b/input/regression/ambitus.ly @@ -6,7 +6,7 @@ signature. @code{AmbitusNoteHead} grobs also have ledger lines. " } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t diff --git a/input/regression/apply-context.ly b/input/regression/apply-context.ly index c5c3ac7f47..afa55683f3 100644 --- a/input/regression/apply-context.ly +++ b/input/regression/apply-context.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/apply-output.ly b/input/regression/apply-output.ly index 28f020e519..d107e4a42f 100644 --- a/input/regression/apply-output.ly +++ b/input/regression/apply-output.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "The @code{\applyOutput} expression is the most flexible way to diff --git a/input/regression/arpeggio-bracket.ly b/input/regression/arpeggio-bracket.ly index 7e4275c1a8..3446871a65 100644 --- a/input/regression/arpeggio-bracket.ly +++ b/input/regression/arpeggio-bracket.ly @@ -1,7 +1,7 @@ \layout { ragged-right= ##t } -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" A square bracket on the left indicates that the player should not diff --git a/input/regression/arpeggio-collision.ly b/input/regression/arpeggio-collision.ly index c95c6111f3..ba82ac1293 100644 --- a/input/regression/arpeggio-collision.ly +++ b/input/regression/arpeggio-collision.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Arpeggio stays clear of accidentals and flipped note heads." diff --git a/input/regression/arpeggio-no-overshoot.ly b/input/regression/arpeggio-no-overshoot.ly index ec47ee1181..7b10077911 100644 --- a/input/regression/arpeggio-no-overshoot.ly +++ b/input/regression/arpeggio-no-overshoot.ly @@ -1,4 +1,4 @@ -\version "2.11.62" +\version "2.12.0" \header { texidoc = "Arpeggios do not overshoot the highest note head. diff --git a/input/regression/arpeggio-parenthesis.ly b/input/regression/arpeggio-parenthesis.ly index 50b4d4d966..dd43018272 100644 --- a/input/regression/arpeggio-parenthesis.ly +++ b/input/regression/arpeggio-parenthesis.ly @@ -6,7 +6,7 @@ } -\version "2.11.51" +\version "2.12.0" \relative c' { \override Arpeggio #'stencil = #ly:arpeggio::brew-chord-slur diff --git a/input/regression/arpeggio-span-one-staff.ly b/input/regression/arpeggio-span-one-staff.ly index 5618945772..03712af013 100644 --- a/input/regression/arpeggio-span-one-staff.ly +++ b/input/regression/arpeggio-span-one-staff.ly @@ -2,7 +2,7 @@ texidoc = "Span arpeggios within one staff also work" } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t } \new PianoStaff << diff --git a/input/regression/arpeggio.ly b/input/regression/arpeggio.ly index 03064d23f1..abe2054cd5 100644 --- a/input/regression/arpeggio.ly +++ b/input/regression/arpeggio.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" Arpeggios are supported, both cross-staff and broken single staff. diff --git a/input/regression/augmentum.ly b/input/regression/augmentum.ly index 7abc308b5c..2d5d2f7423 100644 --- a/input/regression/augmentum.ly +++ b/input/regression/augmentum.ly @@ -2,7 +2,7 @@ texidoc = "Augmentum dots are accounted for in horizontal spacing." } -\version "2.11.51" +\version "2.12.0" \include "gregorian.ly" \score { diff --git a/input/regression/auto-beam-bar.ly b/input/regression/auto-beam-bar.ly index db1a655191..19ec38d721 100644 --- a/input/regression/auto-beam-bar.ly +++ b/input/regression/auto-beam-bar.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc="No auto beams will be put over (manual) repeat bars." diff --git a/input/regression/auto-beam-beaming-override.ly b/input/regression/auto-beam-beaming-override.ly index a1cd104fac..afa8b99160 100644 --- a/input/regression/auto-beam-beaming-override.ly +++ b/input/regression/auto-beam-beaming-override.ly @@ -8,7 +8,7 @@ beaming pattern related functions at the start of an autobeam." } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } { \time 2/4 diff --git a/input/regression/auto-beam-beat-grouping.ly b/input/regression/auto-beam-beat-grouping.ly index 1020d4216a..1a9761d2db 100644 --- a/input/regression/auto-beam-beat-grouping.ly +++ b/input/regression/auto-beam-beat-grouping.ly @@ -1,4 +1,4 @@ -\version "2.11.57" +\version "2.12.0" \header { texidoc = "Autobeaming will break beams according to beatGrouping diff --git a/input/regression/auto-beam-no-beam.ly b/input/regression/auto-beam-no-beam.ly index 449a751f28..e0656c40ad 100644 --- a/input/regression/auto-beam-no-beam.ly +++ b/input/regression/auto-beam-no-beam.ly @@ -6,7 +6,7 @@ } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t } diff --git a/input/regression/auto-beam-triplet.ly b/input/regression/auto-beam-triplet.ly index 1467c06dd3..01cee7f831 100644 --- a/input/regression/auto-beam-triplet.ly +++ b/input/regression/auto-beam-triplet.ly @@ -4,7 +4,7 @@ texidoc = "Automatic beaming is also done on tuplets." } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right= ##t } \relative c''{ diff --git a/input/regression/auto-beam-tuplets.ly b/input/regression/auto-beam-tuplets.ly index 178c2b6821..bf62d31599 100644 --- a/input/regression/auto-beam-tuplets.ly +++ b/input/regression/auto-beam-tuplets.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Tuplet-spanner should not put (visible) brackets on diff --git a/input/regression/auto-beam.ly b/input/regression/auto-beam.ly index a5d5c06b30..cb7f369840 100644 --- a/input/regression/auto-beam.ly +++ b/input/regression/auto-beam.ly @@ -3,7 +3,7 @@ beam." } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t diff --git a/input/regression/auto-change.ly b/input/regression/auto-change.ly index 9b294e0382..8cbaa3db20 100644 --- a/input/regression/auto-change.ly +++ b/input/regression/auto-change.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/backend-excercise.ly b/input/regression/backend-excercise.ly index fdd5567c42..3806b37c02 100644 --- a/input/regression/backend-excercise.ly +++ b/input/regression/backend-excercise.ly @@ -2,7 +2,7 @@ texidoc = "Excercise all output functions" } -\version "2.11.53" +\version "2.12.0" \paper { ragged-right = ##t } diff --git a/input/regression/backend-svg.ly b/input/regression/backend-svg.ly index 59cef068bc..69116f1b38 100644 --- a/input/regression/backend-svg.ly +++ b/input/regression/backend-svg.ly @@ -5,7 +5,7 @@ \include "typography-demo.ly" -\version "2.11.51" +\version "2.12.0" #(define outname (ly:parser-output-name parser)) diff --git a/input/regression/balloon.ly b/input/regression/balloon.ly index dadbe95d69..a60f89e57c 100644 --- a/input/regression/balloon.ly +++ b/input/regression/balloon.ly @@ -5,7 +5,7 @@ with lines and explanatory text added." } -\version "2.11.51" +\version "2.12.0" \layout{ ragged-right = ##t } diff --git a/input/regression/bar-check-redefine.ly b/input/regression/bar-check-redefine.ly index cbf52ecbe0..7a11169537 100644 --- a/input/regression/bar-check-redefine.ly +++ b/input/regression/bar-check-redefine.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "The meaning of @code{|} is stored in the identifier @code{pipeSymbol}." diff --git a/input/regression/bar-line-dashed.ly b/input/regression/bar-line-dashed.ly index a1b0ec3288..4267f02490 100644 --- a/input/regression/bar-line-dashed.ly +++ b/input/regression/bar-line-dashed.ly @@ -3,7 +3,7 @@ lines exactly. Dashed barlines between staves start and end on a half dash precisely." } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } diff --git a/input/regression/bar-line-dotted.ly b/input/regression/bar-line-dotted.ly index df599712a6..f662c3c9e4 100644 --- a/input/regression/bar-line-dotted.ly +++ b/input/regression/bar-line-dotted.ly @@ -4,7 +4,7 @@ } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } diff --git a/input/regression/bar-line-tick.ly b/input/regression/bar-line-tick.ly new file mode 100644 index 0000000000..e0f7642dbc --- /dev/null +++ b/input/regression/bar-line-tick.ly @@ -0,0 +1,16 @@ + +\header { texidoc = "A ticked bar line is a short line of the same length as a + staff space, centered on the top-most barline." } + +\version "2.12.0" + +\paper { ragged-right = ##t } + +\relative \new StaffGroup << + \new Staff { + c4 \bar "'" c } + \new Staff { + c c + } +>> + diff --git a/input/regression/bar-number.ly b/input/regression/bar-number.ly index 82bfb1581d..1711e9a9ad 100644 --- a/input/regression/bar-number.ly +++ b/input/regression/bar-number.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/bar-scripts.ly b/input/regression/bar-scripts.ly index d7b3c5d498..263cbe374d 100644 --- a/input/regression/bar-scripts.ly +++ b/input/regression/bar-scripts.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" diff --git a/input/regression/beam-auto-knee.ly b/input/regression/beam-auto-knee.ly index 5075ee6bd5..c607d4e1fd 100644 --- a/input/regression/beam-auto-knee.ly +++ b/input/regression/beam-auto-knee.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/beam-auto.ly b/input/regression/beam-auto.ly index 0bdc747c26..213031bb4d 100644 --- a/input/regression/beam-auto.ly +++ b/input/regression/beam-auto.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc = "@cindex Beaming Presets There are presets for the @code{auto-beam} engraver in the case of common diff --git a/input/regression/beam-beamlet-break.ly b/input/regression/beam-beamlet-break.ly index 0468a4e70e..fd29e25909 100644 --- a/input/regression/beam-beamlet-break.ly +++ b/input/regression/beam-beamlet-break.ly @@ -3,7 +3,7 @@ beamlets on the same height." } -\version "2.11.51" +\version "2.12.0" \paper { raggedright = ##t diff --git a/input/regression/beam-beamlet-grace.ly b/input/regression/beam-beamlet-grace.ly index 6a6e2b841b..7c899f343b 100644 --- a/input/regression/beam-beamlet-grace.ly +++ b/input/regression/beam-beamlet-grace.ly @@ -3,7 +3,7 @@ texidoc = "Beamlets in grace notes remain readable." } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t } diff --git a/input/regression/beam-beat-grouping.ly b/input/regression/beam-beat-grouping.ly index a9c22a4477..e3af9219b5 100644 --- a/input/regression/beam-beat-grouping.ly +++ b/input/regression/beam-beat-grouping.ly @@ -6,7 +6,7 @@ \layout { ragged-right = ##t } -\version "2.11.51" +\version "2.12.0" \relative c'' { diff --git a/input/regression/beam-break-no-bar.ly b/input/regression/beam-break-no-bar.ly index 80106ea96d..c249e18152 100644 --- a/input/regression/beam-break-no-bar.ly +++ b/input/regression/beam-break-no-bar.ly @@ -5,7 +5,7 @@ } -\version "2.11.51" +\version "2.12.0" \new Staff \with { \remove Bar_engraver diff --git a/input/regression/beam-break.ly b/input/regression/beam-break.ly index 5b36f57f45..fffd0c4ff9 100644 --- a/input/regression/beam-break.ly +++ b/input/regression/beam-break.ly @@ -4,7 +4,7 @@ " } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right= ##t } \relative c'' { diff --git a/input/regression/beam-center-slope.ly b/input/regression/beam-center-slope.ly index 1634751373..6d202523f4 100644 --- a/input/regression/beam-center-slope.ly +++ b/input/regression/beam-center-slope.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc="Simple beams on middle staffline are allowed to be diff --git a/input/regression/beam-concave-chord.ly b/input/regression/beam-concave-chord.ly index 3dfb402fee..14e6790832 100644 --- a/input/regression/beam-concave-chord.ly +++ b/input/regression/beam-concave-chord.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" morgenliedBeam = \relative c'' \new Voice{ diff --git a/input/regression/beam-concave-damped.ly b/input/regression/beam-concave-damped.ly index 9c59b0a7cd..135995d63f 100644 --- a/input/regression/beam-concave-damped.ly +++ b/input/regression/beam-concave-damped.ly @@ -2,7 +2,7 @@ texidoc = "Beams that are not strictly concave are damped according to their concaveness. " } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t } diff --git a/input/regression/beam-concave.ly b/input/regression/beam-concave.ly index 5d15aa480e..093f30d918 100644 --- a/input/regression/beam-concave.ly +++ b/input/regression/beam-concave.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc = "Fully concave beams should be horizontal. Informally spoken, diff --git a/input/regression/beam-cross-staff-auto-knee.ly b/input/regression/beam-cross-staff-auto-knee.ly index bab2d49ab3..3c9b1650fa 100644 --- a/input/regression/beam-cross-staff-auto-knee.ly +++ b/input/regression/beam-cross-staff-auto-knee.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ diff --git a/input/regression/beam-cross-staff-script.ly b/input/regression/beam-cross-staff-script.ly index 620448b55b..772075495b 100644 --- a/input/regression/beam-cross-staff-script.ly +++ b/input/regression/beam-cross-staff-script.ly @@ -7,7 +7,7 @@ staves." } -\version "2.11.51" +\version "2.12.0" \new PianoStaff << \new Staff = RH { diff --git a/input/regression/beam-cross-staff-slope.ly b/input/regression/beam-cross-staff-slope.ly index ee6a3c078d..61be2c5242 100644 --- a/input/regression/beam-cross-staff-slope.ly +++ b/input/regression/beam-cross-staff-slope.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Cross staff (kneed) beams do not cause extreme slopes." } diff --git a/input/regression/beam-cross-staff.ly b/input/regression/beam-cross-staff.ly index 52bb8d987d..0b711c7453 100644 --- a/input/regression/beam-cross-staff.ly +++ b/input/regression/beam-cross-staff.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" Beams can be typeset over fixed distance aligned staves, beam diff --git a/input/regression/beam-damp.ly b/input/regression/beam-damp.ly index 38568cab40..2feffff8cc 100644 --- a/input/regression/beam-damp.ly +++ b/input/regression/beam-damp.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "@cindex Beam Damp Beams are less steep than the notes they encompass. " } \layout{ diff --git a/input/regression/beam-default-lengths.ly b/input/regression/beam-default-lengths.ly index 0313246295..42a9350464 100644 --- a/input/regression/beam-default-lengths.ly +++ b/input/regression/beam-default-lengths.ly @@ -1,6 +1,6 @@ \layout{ ragged-right = ##t} -\version "2.11.51" +\version "2.12.0" \header{ texidoc="Beamed stems have standard lengths if possible. Quantization is switched off in this example." diff --git a/input/regression/beam-extreme.ly b/input/regression/beam-extreme.ly index d3a8e53bd2..61462dd7b8 100644 --- a/input/regression/beam-extreme.ly +++ b/input/regression/beam-extreme.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" Beams should behave reasonably well, even under extreme circumstances. diff --git a/input/regression/beam-feather-knee-stem-length.ly b/input/regression/beam-feather-knee-stem-length.ly index 56242f4bdc..58b602c149 100644 --- a/input/regression/beam-feather-knee-stem-length.ly +++ b/input/regression/beam-feather-knee-stem-length.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc="In feathered beams, stems in knees reach up to the feathered part correctly. diff --git a/input/regression/beam-feather.ly b/input/regression/beam-feather.ly index 18f81907c0..cf40c01aaa 100644 --- a/input/regression/beam-feather.ly +++ b/input/regression/beam-feather.ly @@ -6,7 +6,7 @@ } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t diff --git a/input/regression/beam-flat-retain-direction.ly b/input/regression/beam-flat-retain-direction.ly index 3197bdbaf5..01fcc2deda 100644 --- a/input/regression/beam-flat-retain-direction.ly +++ b/input/regression/beam-flat-retain-direction.ly @@ -3,7 +3,7 @@ texidoc = "Even very flat but slanted patterns should give slanted beams. " } -\version "2.11.51" +\version "2.12.0" \layout{ line-width = 15\cm debug-beam-scoring = ##t diff --git a/input/regression/beam-french.ly b/input/regression/beam-french.ly index 1f3c60c9c4..14d33b001d 100644 --- a/input/regression/beam-french.ly +++ b/input/regression/beam-french.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "In French style beaming, the stems do not go between beams." diff --git a/input/regression/beam-funky-beamlet.ly b/input/regression/beam-funky-beamlet.ly index ded6e257e8..356b0d0db5 100644 --- a/input/regression/beam-funky-beamlet.ly +++ b/input/regression/beam-funky-beamlet.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc=" Funky kneed beams with beamlets also work. The beamlets diff --git a/input/regression/beam-funky.ly b/input/regression/beam-funky.ly index 3f5dd26ae0..6bff9fd2cb 100644 --- a/input/regression/beam-funky.ly +++ b/input/regression/beam-funky.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "In complex configurations of knee beaming, according to diff --git a/input/regression/beam-isknee.ly b/input/regression/beam-isknee.ly index 4f858a5220..0c26f0db97 100644 --- a/input/regression/beam-isknee.ly +++ b/input/regression/beam-isknee.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc="@cindex Beam Isknee diff --git a/input/regression/beam-knee-symmetry.ly b/input/regression/beam-knee-symmetry.ly index 55e0dbf8ce..1c8048e3d9 100644 --- a/input/regression/beam-knee-symmetry.ly +++ b/input/regression/beam-knee-symmetry.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Point-symmetric beams should receive the same diff --git a/input/regression/beam-length.ly b/input/regression/beam-length.ly index 5c1f22bbda..768930adb0 100644 --- a/input/regression/beam-length.ly +++ b/input/regression/beam-length.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" diff --git a/input/regression/beam-manual-beaming.ly b/input/regression/beam-manual-beaming.ly index b606578381..744c6632b3 100644 --- a/input/regression/beam-manual-beaming.ly +++ b/input/regression/beam-manual-beaming.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/beam-multiple-cross-staff.ly b/input/regression/beam-multiple-cross-staff.ly index 1aa01eb010..861fbd0bca 100644 --- a/input/regression/beam-multiple-cross-staff.ly +++ b/input/regression/beam-multiple-cross-staff.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Kneed beams (often happens with cross-staff beams) diff --git a/input/regression/beam-multiplicity-over-rests.ly b/input/regression/beam-multiplicity-over-rests.ly index b8bda7a767..ddf2cc147a 100644 --- a/input/regression/beam-multiplicity-over-rests.ly +++ b/input/regression/beam-multiplicity-over-rests.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "When a beam goes over a rest, there should not be any diff --git a/input/regression/beam-outside-beamlets.ly b/input/regression/beam-outside-beamlets.ly index 6647baebc2..358dc18948 100644 --- a/input/regression/beam-outside-beamlets.ly +++ b/input/regression/beam-outside-beamlets.ly @@ -3,7 +3,7 @@ } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } diff --git a/input/regression/beam-over-barline.ly b/input/regression/beam-over-barline.ly index dcb6c6969c..8a01631a98 100644 --- a/input/regression/beam-over-barline.ly +++ b/input/regression/beam-over-barline.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Explicit beams may cross barlines. " } diff --git a/input/regression/beam-position.ly b/input/regression/beam-position.ly index 0b8af33de1..174a7dfe82 100644 --- a/input/regression/beam-position.ly +++ b/input/regression/beam-position.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" Beams on ledgered notes should always reach the middle staff diff --git a/input/regression/beam-quant-standard.ly b/input/regression/beam-quant-standard.ly index 9ba075dee4..33b37bd29a 100644 --- a/input/regression/beam-quant-standard.ly +++ b/input/regression/beam-quant-standard.ly @@ -6,7 +6,7 @@ } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t diff --git a/input/regression/beam-quanting-32nd.ly b/input/regression/beam-quanting-32nd.ly index ee38515efa..e0c444697c 100644 --- a/input/regression/beam-quanting-32nd.ly +++ b/input/regression/beam-quanting-32nd.ly @@ -8,7 +8,7 @@ texidoc = "Stem lengths take precedence over beam quants: `forbidden' } -\version "2.11.51" +\version "2.12.0" \relative c''{ \time 3/8 diff --git a/input/regression/beam-quanting-horizontal.ly b/input/regression/beam-quanting-horizontal.ly index 0337cc7d40..91f7d22393 100644 --- a/input/regression/beam-quanting-horizontal.ly +++ b/input/regression/beam-quanting-horizontal.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ diff --git a/input/regression/beam-quarter.ly b/input/regression/beam-quarter.ly index 807e6c0a9d..ac1d57819d 100644 --- a/input/regression/beam-quarter.ly +++ b/input/regression/beam-quarter.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc= "Quarter notes may be beamed: the beam is halted momentarily." diff --git a/input/regression/beam-rest.ly b/input/regression/beam-rest.ly index 8a5fbbc50e..e02f4bbaf0 100644 --- a/input/regression/beam-rest.ly +++ b/input/regression/beam-rest.ly @@ -3,7 +3,7 @@ texidoc = "The number of beams does not change on a rest." } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t } diff --git a/input/regression/beam-second.ly b/input/regression/beam-second.ly index 7c71959144..1971bd8fd1 100644 --- a/input/regression/beam-second.ly +++ b/input/regression/beam-second.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ diff --git a/input/regression/beam-shortened-lengths.ly b/input/regression/beam-shortened-lengths.ly index 5fee53bc38..6cd91987a3 100644 --- a/input/regression/beam-shortened-lengths.ly +++ b/input/regression/beam-shortened-lengths.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc="Beams in unnatural direction, have shortened stems, but do not look too short." diff --git a/input/regression/beam-single-stem.ly b/input/regression/beam-single-stem.ly index f4f2684f56..742e4f0e22 100644 --- a/input/regression/beam-single-stem.ly +++ b/input/regression/beam-single-stem.ly @@ -4,7 +4,7 @@ clip-edges is switched off automatically." } -\version "2.11.51" +\version "2.12.0" \relative c' { d16[] diff --git a/input/regression/beam-slope-stemlet.ly b/input/regression/beam-slope-stemlet.ly index f8dbbba021..002e3e9239 100644 --- a/input/regression/beam-slope-stemlet.ly +++ b/input/regression/beam-slope-stemlet.ly @@ -6,7 +6,7 @@ as invisible stems." } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t diff --git a/input/regression/beam-unconnected-beamlets.ly b/input/regression/beam-unconnected-beamlets.ly index 40d6a37665..f7477b4b71 100644 --- a/input/regression/beam-unconnected-beamlets.ly +++ b/input/regression/beam-unconnected-beamlets.ly @@ -6,7 +6,7 @@ \layout { ragged-right = ##t } -\version "2.11.51" +\version "2.12.0" \relative c'' { \override Stem #'max-beam-connect = #1 diff --git a/input/regression/beaming-ternary-metrum.ly b/input/regression/beaming-ternary-metrum.ly index ddc3cedf63..907edf10f4 100644 --- a/input/regression/beaming-ternary-metrum.ly +++ b/input/regression/beaming-ternary-metrum.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/beaming.ly b/input/regression/beaming.ly index 652f03db41..d982b35b9f 100644 --- a/input/regression/beaming.ly +++ b/input/regression/beaming.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" diff --git a/input/regression/beams.ly b/input/regression/beams.ly index 8b26f6a463..d49f4153b5 100644 --- a/input/regression/beams.ly +++ b/input/regression/beams.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Beaming can be also given explicitly." } diff --git a/input/regression/bend-after.ly b/input/regression/bend-after.ly index 1f3a0a12ae..c3213befe0 100644 --- a/input/regression/bend-after.ly +++ b/input/regression/bend-after.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/bend-dot.ly b/input/regression/bend-dot.ly index 202d2b7b1b..0e1b239d8d 100644 --- a/input/regression/bend-dot.ly +++ b/input/regression/bend-dot.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Bends avoid dots, but only if necessary." } diff --git a/input/regression/bookparts.ly b/input/regression/bookparts.ly index 19cd2aa258..a814fb5e07 100644 --- a/input/regression/bookparts.ly +++ b/input/regression/bookparts.ly @@ -1,4 +1,4 @@ -\version "2.11.65" +\version "2.12.0" \header { texidoc = "A book can be split into several parts with different paper settings, diff --git a/input/regression/break-alignment-anchor-alignment.ly b/input/regression/break-alignment-anchor-alignment.ly index 385838b50e..79a1237ac7 100644 --- a/input/regression/break-alignment-anchor-alignment.ly +++ b/input/regression/break-alignment-anchor-alignment.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "The default callback for break-align-anchor in clefs and time/key diff --git a/input/regression/break-alignment-anchors.ly b/input/regression/break-alignment-anchors.ly index 9e237a5f57..1161967d8d 100644 --- a/input/regression/break-alignment-anchors.ly +++ b/input/regression/break-alignment-anchors.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "The break-align-anchor property of a break-aligned grob gives diff --git a/input/regression/break.ly b/input/regression/break.ly index af83a3e134..afce0368a2 100644 --- a/input/regression/break.ly +++ b/input/regression/break.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" diff --git a/input/regression/breathing-sign-ancient.ly b/input/regression/breathing-sign-ancient.ly index e2b2892e03..3115d6a625 100644 --- a/input/regression/breathing-sign-ancient.ly +++ b/input/regression/breathing-sign-ancient.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" diff --git a/input/regression/breathing-sign.ly b/input/regression/breathing-sign.ly index a5f4f39ad5..763529a44c 100644 --- a/input/regression/breathing-sign.ly +++ b/input/regression/breathing-sign.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" Breathing signs are available in different tastes: commas (default), diff --git a/input/regression/chord-changes.ly b/input/regression/chord-changes.ly index 35c5766443..163ea98ee9 100644 --- a/input/regression/chord-changes.ly +++ b/input/regression/chord-changes.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc="Property chordChanges: display chord names only when diff --git a/input/regression/chord-name-entry-11.ly b/input/regression/chord-name-entry-11.ly index 42fc68a224..d72b975e68 100644 --- a/input/regression/chord-name-entry-11.ly +++ b/input/regression/chord-name-entry-11.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/chord-name-entry.ly b/input/regression/chord-name-entry.ly index d32b90c478..e5e6dc826a 100644 --- a/input/regression/chord-name-entry.ly +++ b/input/regression/chord-name-entry.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/chord-name-exceptions.ly b/input/regression/chord-name-exceptions.ly index 4b59dbb2c7..86dc2e5159 100644 --- a/input/regression/chord-name-exceptions.ly +++ b/input/regression/chord-name-exceptions.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "The property @code{chordNameExceptions} can used diff --git a/input/regression/chord-name-major7.ly b/input/regression/chord-name-major7.ly index dd35364dcc..ac280c4043 100644 --- a/input/regression/chord-name-major7.ly +++ b/input/regression/chord-name-major7.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "The layout of the major 7 can be tuned with @code{majorSevenSymbol}." diff --git a/input/regression/chord-names-bass.ly b/input/regression/chord-names-bass.ly index 8133c3f470..a09642746e 100644 --- a/input/regression/chord-names-bass.ly +++ b/input/regression/chord-names-bass.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/chord-names-languages.ly b/input/regression/chord-names-languages.ly index 9f2a921953..e446afa4fb 100644 --- a/input/regression/chord-names-languages.ly +++ b/input/regression/chord-names-languages.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "@cindex Chord Names German The english naming of chords (default) can be changed to german diff --git a/input/regression/chord-scripts.ly b/input/regression/chord-scripts.ly index 337d1f8a11..b95cde22f0 100644 --- a/input/regression/chord-scripts.ly +++ b/input/regression/chord-scripts.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Scripts can also be attached to chord elements." diff --git a/input/regression/chord-tremolo-short.ly b/input/regression/chord-tremolo-short.ly index 523dedb916..883dbbea20 100644 --- a/input/regression/chord-tremolo-short.ly +++ b/input/regression/chord-tremolo-short.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = " Tremolo repeats can be constructed for short tremolos (total duration smaller than 1/4) too. Only some of the beams are connected to the stems. diff --git a/input/regression/chord-tremolo-single.ly b/input/regression/chord-tremolo-single.ly index 3058ae1b00..e55106c4ec 100644 --- a/input/regression/chord-tremolo-single.ly +++ b/input/regression/chord-tremolo-single.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc="Chord tremolos on a single note." diff --git a/input/regression/chord-tremolo-stem-direction.ly b/input/regression/chord-tremolo-stem-direction.ly index b42d0882dc..d385510ca7 100644 --- a/input/regression/chord-tremolo-stem-direction.ly +++ b/input/regression/chord-tremolo-stem-direction.ly @@ -5,7 +5,7 @@ } -\version "2.11.51" +\version "2.12.0" \paper{ ragged-right = ##t } diff --git a/input/regression/chord-tremolo-whole.ly b/input/regression/chord-tremolo-whole.ly index d3c745f84f..8b2e27e182 100644 --- a/input/regression/chord-tremolo-whole.ly +++ b/input/regression/chord-tremolo-whole.ly @@ -3,7 +3,7 @@ notes." } -\version "2.11.51" +\version "2.12.0" \relative c'''{ \repeat tremolo 32{ g64 a } diff --git a/input/regression/chord-tremolo.ly b/input/regression/chord-tremolo.ly index ef3555f511..6f84eab5bd 100644 --- a/input/regression/chord-tremolo.ly +++ b/input/regression/chord-tremolo.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" diff --git a/input/regression/chords-funky-ignatzek.ly b/input/regression/chords-funky-ignatzek.ly index 076955544b..b5349a3cfc 100644 --- a/input/regression/chords-funky-ignatzek.ly +++ b/input/regression/chords-funky-ignatzek.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/chromatic-scales.ly b/input/regression/chromatic-scales.ly index ca206582e0..d0b0298731 100644 --- a/input/regression/chromatic-scales.ly +++ b/input/regression/chromatic-scales.ly @@ -1,4 +1,4 @@ -\version "2.10.0" +\version "2.12.0" \header{ texidoc="@code{staffLineLayoutFunction} is used to change the position of the notes. This sets @code{staffLineLayoutFunction} to @code{ly:pitch-semitones} to diff --git a/input/regression/clef-oct.ly b/input/regression/clef-oct.ly index e626535a72..80b43a1fea 100644 --- a/input/regression/clef-oct.ly +++ b/input/regression/clef-oct.ly @@ -1,5 +1,5 @@ -\version "2.11.51" \header { +\version "2.12.0" \header { texidoc = "Octavation signs may be added to clefs. These octavation signs may be placed below or above (meaning an octave diff --git a/input/regression/clef-ottava.ly b/input/regression/clef-ottava.ly index ac904455e1..a277e253e5 100644 --- a/input/regression/clef-ottava.ly +++ b/input/regression/clef-ottava.ly @@ -5,7 +5,7 @@ but they don't confuse one another." } -\version "2.11.53" +\version "2.12.0" \layout { ragged-right = ##t} diff --git a/input/regression/clef-warn.ly b/input/regression/clef-warn.ly index 4e4965753f..5f3b410e9d 100644 --- a/input/regression/clef-warn.ly +++ b/input/regression/clef-warn.ly @@ -3,7 +3,7 @@ } -\version "2.11.51" +\version "2.12.0" { \clef "foo" c4 diff --git a/input/regression/clefs.ly b/input/regression/clefs.ly index c00ddf5bc3..02c727d0b3 100644 --- a/input/regression/clefs.ly +++ b/input/regression/clefs.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ diff --git a/input/regression/clip-systems.ly b/input/regression/clip-systems.ly index 7b06cf77f7..1bf7c926d1 100644 --- a/input/regression/clip-systems.ly +++ b/input/regression/clip-systems.ly @@ -19,7 +19,7 @@ The result will be files named } -\version "2.11.51" +\version "2.12.0" #(ly:set-option 'clip-systems) diff --git a/input/regression/cluster-break.ly b/input/regression/cluster-break.ly index a8aa1d3392..4e0cc405e7 100644 --- a/input/regression/cluster-break.ly +++ b/input/regression/cluster-break.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Clusters behave well across line breaks." } diff --git a/input/regression/cluster-cross-staff.ly b/input/regression/cluster-cross-staff.ly index b42907dd3c..2b0d627b23 100644 --- a/input/regression/cluster-cross-staff.ly +++ b/input/regression/cluster-cross-staff.ly @@ -7,7 +7,7 @@ ragged-right= ##t } -\version "2.11.51" +\version "2.12.0" \new PianoStaff << \new Staff = "up" { diff --git a/input/regression/cluster-single-note.ly b/input/regression/cluster-single-note.ly index 3d28cb21dd..b8f91cea5f 100644 --- a/input/regression/cluster-single-note.ly +++ b/input/regression/cluster-single-note.ly @@ -4,5 +4,5 @@ } -\version "2.11.51" +\version "2.12.0" \relative c' { \makeClusters } diff --git a/input/regression/cluster-style.ly b/input/regression/cluster-style.ly index ef67a41441..37dfcbb0e4 100644 --- a/input/regression/cluster-style.ly +++ b/input/regression/cluster-style.ly @@ -1,6 +1,6 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Clusters behave well across line breaks." } diff --git a/input/regression/cluster.ly b/input/regression/cluster.ly index 9b8cc4f04c..ae74c3bc76 100644 --- a/input/regression/cluster.ly +++ b/input/regression/cluster.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Clusters are a device to denote that a complete range of notes is to be played." diff --git a/input/regression/collision-2.ly b/input/regression/collision-2.ly index 470bb61e43..e6317fa4ec 100644 --- a/input/regression/collision-2.ly +++ b/input/regression/collision-2.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Single head notes may collide. " } diff --git a/input/regression/collision-alignment.ly b/input/regression/collision-alignment.ly index 797ac91a1e..b77a116c10 100644 --- a/input/regression/collision-alignment.ly +++ b/input/regression/collision-alignment.ly @@ -7,7 +7,7 @@ \layout { ragged-right = ##t } -\version "2.11.51" +\version "2.12.0" \relative << \new Staff { diff --git a/input/regression/collision-dots-invert.ly b/input/regression/collision-dots-invert.ly index c0a0699d4b..d882cde643 100644 --- a/input/regression/collision-dots-invert.ly +++ b/input/regression/collision-dots-invert.ly @@ -6,7 +6,7 @@ } \layout { ragged-right = ##t } -\version "2.11.51" +\version "2.12.0" \relative c'' { << 2\\ { 4 4 } >> << { 2 } \\ { 4. 8 } >> diff --git a/input/regression/collision-dots-move.ly b/input/regression/collision-dots-move.ly index fb7297fdd7..e684871811 100644 --- a/input/regression/collision-dots-move.ly +++ b/input/regression/collision-dots-move.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "If dotted note heads must remain on the left side, diff --git a/input/regression/collision-dots-up-space-dotted.ly b/input/regression/collision-dots-up-space-dotted.ly index 6b0ada6cf2..272ea3578b 100644 --- a/input/regression/collision-dots-up-space-dotted.ly +++ b/input/regression/collision-dots-up-space-dotted.ly @@ -6,7 +6,7 @@ } -\version "2.11.51" +\version "2.12.0" \paper{ ragged-right=##t } diff --git a/input/regression/collision-dots.ly b/input/regression/collision-dots.ly index c603e3217f..264a3350d0 100644 --- a/input/regression/collision-dots.ly +++ b/input/regression/collision-dots.ly @@ -2,7 +2,7 @@ on the right side." } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right= ##t } % todo: b2 (up) + b8 down looks strange compared to c2up + b8. (down) diff --git a/input/regression/collision-head-chords.ly b/input/regression/collision-head-chords.ly index 79ba288240..248e674809 100644 --- a/input/regression/collision-head-chords.ly +++ b/input/regression/collision-head-chords.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Note heads in collisions should be merged if they have the same positions in the extreme note heads. diff --git a/input/regression/collision-head-solfa-fa.ly b/input/regression/collision-head-solfa-fa.ly index 143ea7e0e4..e6a3cf1b10 100644 --- a/input/regression/collision-head-solfa-fa.ly +++ b/input/regression/collision-head-solfa-fa.ly @@ -4,7 +4,7 @@ block-shaped note." } -\version "2.11.51" +\version "2.12.0" << \key c \major diff --git a/input/regression/collision-heads.ly b/input/regression/collision-heads.ly index 575280459c..11387aecf3 100644 --- a/input/regression/collision-heads.ly +++ b/input/regression/collision-heads.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Open and black note heads are not merged by default." diff --git a/input/regression/collision-manual.ly b/input/regression/collision-manual.ly index fa22c8fa69..7acb4befbc 100644 --- a/input/regression/collision-manual.ly +++ b/input/regression/collision-manual.ly @@ -2,7 +2,7 @@ texidoc = "Collision resolution may be forced manually with @code{force-hshift}. " } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t diff --git a/input/regression/collision-merge-differently-dotted.ly b/input/regression/collision-merge-differently-dotted.ly index a682b171ac..77ea8e2877 100644 --- a/input/regression/collision-merge-differently-dotted.ly +++ b/input/regression/collision-merge-differently-dotted.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "If @code{NoteCollision} has diff --git a/input/regression/collision-merge-differently-headed.ly b/input/regression/collision-merge-differently-headed.ly index 238064dda6..88ae8082c9 100644 --- a/input/regression/collision-merge-differently-headed.ly +++ b/input/regression/collision-merge-differently-headed.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = diff --git a/input/regression/collision-merge-dots.ly b/input/regression/collision-merge-dots.ly index 92c34b54ec..9b3b44697f 100644 --- a/input/regression/collision-merge-dots.ly +++ b/input/regression/collision-merge-dots.ly @@ -4,7 +4,7 @@ } \layout { ragged-right = ##t } -\version "2.11.51" +\version "2.12.0" { \relative c'' \new Staff { diff --git a/input/regression/collision-mesh.ly b/input/regression/collision-mesh.ly index 7025b09f45..53b02aa4cb 100644 --- a/input/regression/collision-mesh.ly +++ b/input/regression/collision-mesh.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Oppositely stemmed chords, meshing into each other, are resolved." diff --git a/input/regression/collision-seconds.ly b/input/regression/collision-seconds.ly index 51f46f7559..2dd97fddc0 100644 --- a/input/regression/collision-seconds.ly +++ b/input/regression/collision-seconds.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Seconds do not confuse the collision algorithm too much. The best diff --git a/input/regression/collision-whole.ly b/input/regression/collision-whole.ly index bc9d07f255..20f0d71946 100644 --- a/input/regression/collision-whole.ly +++ b/input/regression/collision-whole.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Mixed collisions with whole notes require asymmetric shifts." diff --git a/input/regression/collisions.ly b/input/regression/collisions.ly index d33d4e579b..e3e6816325 100644 --- a/input/regression/collisions.ly +++ b/input/regression/collisions.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" In addition to normal collision rules, there is support for polyphony, diff --git a/input/regression/color.ly b/input/regression/color.ly index 8160a124d5..9f4f875292 100644 --- a/input/regression/color.ly +++ b/input/regression/color.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc = "Each grob can have a color assigned to it. diff --git a/input/regression/completion-heads-lyrics.ly b/input/regression/completion-heads-lyrics.ly index 006fb0c19a..ff0801f8fe 100644 --- a/input/regression/completion-heads-lyrics.ly +++ b/input/regression/completion-heads-lyrics.ly @@ -1,7 +1,7 @@ \header { texidoc = "You can put lyrics under completion heads." } -\version "2.11.51" +\version "2.12.0" mel = \relative c'' { c1. c1. diff --git a/input/regression/completion-heads-multiple-ties.ly b/input/regression/completion-heads-multiple-ties.ly index 32b2dbc9a9..eb7948a35b 100644 --- a/input/regression/completion-heads-multiple-ties.ly +++ b/input/regression/completion-heads-multiple-ties.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" diff --git a/input/regression/completion-heads-polyphony.ly b/input/regression/completion-heads-polyphony.ly index b4c0e7c172..e275aa9e12 100644 --- a/input/regression/completion-heads-polyphony.ly +++ b/input/regression/completion-heads-polyphony.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Completion heads are broken across bar lines. This was diff --git a/input/regression/completion-heads-tie.ly b/input/regression/completion-heads-tie.ly index 38471c1e66..8bd6028aa1 100644 --- a/input/regression/completion-heads-tie.ly +++ b/input/regression/completion-heads-tie.ly @@ -5,7 +5,7 @@ } -\version "2.11.58" +\version "2.12.0" \paper{ ragged-right=##t } diff --git a/input/regression/completion-heads.ly b/input/regression/completion-heads.ly index ad2c64435e..708dc0fb4a 100644 --- a/input/regression/completion-heads.ly +++ b/input/regression/completion-heads.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" diff --git a/input/regression/context-die-staff.ly b/input/regression/context-die-staff.ly index 6ac2d8ab23..14ad542784 100644 --- a/input/regression/context-die-staff.ly +++ b/input/regression/context-die-staff.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "a staff should die if there is reference to it." diff --git a/input/regression/context-nested-staffgroup.ly b/input/regression/context-nested-staffgroup.ly index bea556e623..c22007fe51 100644 --- a/input/regression/context-nested-staffgroup.ly +++ b/input/regression/context-nested-staffgroup.ly @@ -1,4 +1,4 @@ -\version "2.11.65" +\version "2.12.0" \header { texidoc = "Contexts of the same type can be nested." } diff --git a/input/regression/custos.ly b/input/regression/custos.ly index 64b42e3021..8520260739 100644 --- a/input/regression/custos.ly +++ b/input/regression/custos.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Custodes may be engraved in various styles." } diff --git a/input/regression/display-lily-tests.ly b/input/regression/display-lily-tests.ly index 41554fa25b..f8e49a1cb3 100644 --- a/input/regression/display-lily-tests.ly +++ b/input/regression/display-lily-tests.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" #(use-modules (srfi srfi-13) (ice-9 format)) diff --git a/input/regression/dot-column-rest-collision.ly b/input/regression/dot-column-rest-collision.ly index 5a8019422e..95f0db9aeb 100644 --- a/input/regression/dot-column-rest-collision.ly +++ b/input/regression/dot-column-rest-collision.ly @@ -2,7 +2,7 @@ texidoc = "Dot columns do not trigger beam slanting too early." } -\version "2.11.51" +\version "2.12.0" \paper{ ragged-right=##t } << { e''8 e''8 g'' g''} \\ diff --git a/input/regression/dot-flag-collision.ly b/input/regression/dot-flag-collision.ly index a2c6a41606..2c51af61e5 100644 --- a/input/regression/dot-flag-collision.ly +++ b/input/regression/dot-flag-collision.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Dots move to the right when a collision with the (up)flag happens." } diff --git a/input/regression/dot-rest-beam-trigger.ly b/input/regression/dot-rest-beam-trigger.ly index 3714cf7a82..cae9b796a6 100644 --- a/input/regression/dot-rest-beam-trigger.ly +++ b/input/regression/dot-rest-beam-trigger.ly @@ -6,7 +6,7 @@ } -\version "2.11.54" +\version "2.12.0" \new Staff \relative c'' { << diff --git a/input/regression/dot-up-voice-collision.ly b/input/regression/dot-up-voice-collision.ly index 3329140260..a18dac6a32 100644 --- a/input/regression/dot-up-voice-collision.ly +++ b/input/regression/dot-up-voice-collision.ly @@ -5,7 +5,7 @@ } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t } diff --git a/input/regression/dots.ly b/input/regression/dots.ly index 774022819f..a82d7f4d1e 100644 --- a/input/regression/dots.ly +++ b/input/regression/dots.ly @@ -1,4 +1,4 @@ -\version "2.11.51" \header{ +\version "2.12.0" \header{ texidoc=" Both noteheads and rests can have dots. diff --git a/input/regression/double-repeat-default-volta.ly b/input/regression/double-repeat-default-volta.ly index b095b3c501..d1a8086c47 100644 --- a/input/regression/double-repeat-default-volta.ly +++ b/input/regression/double-repeat-default-volta.ly @@ -1,4 +1,4 @@ -\version "2.11.60" +\version "2.12.0" \header { texidoc = "For volte, the style of double repeats can be set diff --git a/input/regression/double-repeat.ly b/input/regression/double-repeat.ly index 5c2f697279..825dfd84cf 100644 --- a/input/regression/double-repeat.ly +++ b/input/regression/double-repeat.ly @@ -1,4 +1,4 @@ -\version "2.11.60" +\version "2.12.0" \header { texidoc = "Three types of double repeat bar line are supported." diff --git a/input/regression/drums.ly b/input/regression/drums.ly index 519b982367..ddc05e4d5a 100644 --- a/input/regression/drums.ly +++ b/input/regression/drums.ly @@ -7,7 +7,7 @@ } -\version "2.11.51" +\version "2.12.0" drh = \drummode { cymc4.^"crash" hhc16^"h.h." hh \repeat "unfold" 5 {hhc8 hho hhc8 hh16 hh} hhc4 r4 r2 } drl = \drummode {\repeat "unfold" 3 {bd4 sn8 bd bd4 << bd ss >> } bd8 tommh tommh bd toml toml bd tomfh16 tomfh } diff --git a/input/regression/dynamics-broken-hairpin.ly b/input/regression/dynamics-broken-hairpin.ly index 9466d255fa..d4dde92492 100644 --- a/input/regression/dynamics-broken-hairpin.ly +++ b/input/regression/dynamics-broken-hairpin.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc = "Broken crescendi should be open on one side." } diff --git a/input/regression/dynamics-glyphs.ly b/input/regression/dynamics-glyphs.ly index 56dad3dac3..6a58b087de 100644 --- a/input/regression/dynamics-glyphs.ly +++ b/input/regression/dynamics-glyphs.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header {texidoc = "Dynamic letters are kerned, and their weight matches that of the hairpin signs. The dynamic scripts should be diff --git a/input/regression/dynamics-hairpin-length.ly b/input/regression/dynamics-hairpin-length.ly index 91efabfc9d..30dd6d78f3 100644 --- a/input/regression/dynamics-hairpin-length.ly +++ b/input/regression/dynamics-hairpin-length.ly @@ -6,7 +6,7 @@ respectively." } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t } diff --git a/input/regression/dynamics-line.ly b/input/regression/dynamics-line.ly index 5a299e0fed..e263d925c5 100644 --- a/input/regression/dynamics-line.ly +++ b/input/regression/dynamics-line.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" Dynamics appear below or above the staff. If multiple dynamics are linked with (de)crescendi, they should be on the same diff --git a/input/regression/dynamics-text-spanner-abs-dynamic.ly b/input/regression/dynamics-text-spanner-abs-dynamic.ly index 0041a173d1..9136370790 100644 --- a/input/regression/dynamics-text-spanner-abs-dynamic.ly +++ b/input/regression/dynamics-text-spanner-abs-dynamic.ly @@ -7,7 +7,7 @@ } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } \relative c' { diff --git a/input/regression/dynamics-text-spanner-padding.ly b/input/regression/dynamics-text-spanner-padding.ly index 6bc3ac1467..1afe18bbc6 100644 --- a/input/regression/dynamics-text-spanner-padding.ly +++ b/input/regression/dynamics-text-spanner-padding.ly @@ -4,7 +4,7 @@ from the notes. " } -\version "2.11.51" +\version "2.12.0" \layout { indent = 0.0\mm diff --git a/input/regression/dynamics-unbound-hairpin.ly b/input/regression/dynamics-unbound-hairpin.ly index 0f8ecf6ea8..9b2eed583b 100644 --- a/input/regression/dynamics-unbound-hairpin.ly +++ b/input/regression/dynamics-unbound-hairpin.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Crescendi may start off-notes, however, they should not collapse into flat lines." diff --git a/input/regression/easy-notation.ly b/input/regression/easy-notation.ly index 381589b4bb..908e54f0e0 100644 --- a/input/regression/easy-notation.ly +++ b/input/regression/easy-notation.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = " Easy-notation (or Ez-notation) prints names in note heads. diff --git a/input/regression/fermata-rest-position.ly b/input/regression/fermata-rest-position.ly index b7a1c4738b..dd49b82a55 100644 --- a/input/regression/fermata-rest-position.ly +++ b/input/regression/fermata-rest-position.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = " Fermatas over multimeasure rests are positioned as over normal rests. diff --git a/input/regression/figured-bass-alteration.ly b/input/regression/figured-bass-alteration.ly index c6c20f76c3..c2bfb93c3f 100644 --- a/input/regression/figured-bass-alteration.ly +++ b/input/regression/figured-bass-alteration.ly @@ -3,7 +3,7 @@ texidoc = "Bass figures can carry alterations." } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right= ##t diff --git a/input/regression/figured-bass-continuation-center.ly b/input/regression/figured-bass-continuation-center.ly index 3d967fabd0..d354ff691a 100644 --- a/input/regression/figured-bass-continuation-center.ly +++ b/input/regression/figured-bass-continuation-center.ly @@ -6,7 +6,7 @@ true." } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } diff --git a/input/regression/figured-bass-continuation-forbid.ly b/input/regression/figured-bass-continuation-forbid.ly index 9bd63398f8..d369a07e83 100644 --- a/input/regression/figured-bass-continuation-forbid.ly +++ b/input/regression/figured-bass-continuation-forbid.ly @@ -4,7 +4,7 @@ may be forbidden. " } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } \figures { diff --git a/input/regression/figured-bass-continuation-modifiers.ly b/input/regression/figured-bass-continuation-modifiers.ly index fd576aa085..b58615c8d5 100644 --- a/input/regression/figured-bass-continuation-modifiers.ly +++ b/input/regression/figured-bass-continuation-modifiers.ly @@ -5,7 +5,7 @@ } -\version "2.11.64" +\version "2.12.0" << \relative \new Voice { diff --git a/input/regression/figured-bass-continuation.ly b/input/regression/figured-bass-continuation.ly index 0e0e9d1d5f..e939a6f07c 100644 --- a/input/regression/figured-bass-continuation.ly +++ b/input/regression/figured-bass-continuation.ly @@ -5,7 +5,7 @@ figures. They are switched on with @code{useBassFigureExtenders}" } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } diff --git a/input/regression/figured-bass-implicit.ly b/input/regression/figured-bass-implicit.ly index bc6bba8c83..fc4823aa17 100644 --- a/input/regression/figured-bass-implicit.ly +++ b/input/regression/figured-bass-implicit.ly @@ -6,7 +6,7 @@ } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t diff --git a/input/regression/figured-bass-slashed-numbers.ly b/input/regression/figured-bass-slashed-numbers.ly index 993b56a00e..0289c3e9a2 100644 --- a/input/regression/figured-bass-slashed-numbers.ly +++ b/input/regression/figured-bass-slashed-numbers.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" bassfigures = \figuremode { <0/ 1/ 2/> <3/ 4/ 5/> <6/ 7/ 8/> <9/ 10/ 11/> <12/ 13/ 100/> diff --git a/input/regression/figured-bass-staff.ly b/input/regression/figured-bass-staff.ly index 2c9a04e2dc..02dd09f080 100644 --- a/input/regression/figured-bass-staff.ly +++ b/input/regression/figured-bass-staff.ly @@ -3,7 +3,7 @@ ragged-right = ##t } -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/figured-bass.ly b/input/regression/figured-bass.ly index f4fd4c5340..cbcb40c96f 100644 --- a/input/regression/figured-bass.ly +++ b/input/regression/figured-bass.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/fill-line-test.ly b/input/regression/fill-line-test.ly index a083344675..beb9ce9bb7 100644 --- a/input/regression/fill-line-test.ly +++ b/input/regression/fill-line-test.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/finger-chords-accidental.ly b/input/regression/finger-chords-accidental.ly index 19ec24abd1..6d6310ec07 100644 --- a/input/regression/finger-chords-accidental.ly +++ b/input/regression/finger-chords-accidental.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Scripts left of a chord avoid accidentals." diff --git a/input/regression/finger-chords-order.ly b/input/regression/finger-chords-order.ly index cb929996e1..a216d3d9d9 100644 --- a/input/regression/finger-chords-order.ly +++ b/input/regression/finger-chords-order.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/finger-chords.ly b/input/regression/finger-chords.ly index 16c56bb67a..abb0fb2783 100644 --- a/input/regression/finger-chords.ly +++ b/input/regression/finger-chords.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "It is possible to associate diff --git a/input/regression/fingering-cross-staff.ly b/input/regression/fingering-cross-staff.ly index a6f987b490..7a2a310e41 100644 --- a/input/regression/fingering-cross-staff.ly +++ b/input/regression/fingering-cross-staff.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Fingerings work correctly with cross-staff beams." diff --git a/input/regression/fingering.ly b/input/regression/fingering.ly index ccaaff0bc7..383ebe060b 100644 --- a/input/regression/fingering.ly +++ b/input/regression/fingering.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Automatic fingering tries to put fingering instructions diff --git a/input/regression/flags-default.ly b/input/regression/flags-default.ly index e6d65bd3b7..ebcfc115af 100644 --- a/input/regression/flags-default.ly +++ b/input/regression/flags-default.ly @@ -1,4 +1,4 @@ -\version "2.11.57" +\version "2.12.0" #(set-global-staff-size 17) \header { diff --git a/input/regression/flags-in-scheme.ly b/input/regression/flags-in-scheme.ly index 637f210866..1ee3d1c3cc 100644 --- a/input/regression/flags-in-scheme.ly +++ b/input/regression/flags-in-scheme.ly @@ -1,4 +1,4 @@ -\version "2.11.57" +\version "2.12.0" \header { texidoc = "The 'flag property of the Stem grob can be set to a custom diff --git a/input/regression/flags-straight-stockhausen-boulez.ly b/input/regression/flags-straight-stockhausen-boulez.ly new file mode 100644 index 0000000000..49008ee3b1 --- /dev/null +++ b/input/regression/flags-straight-stockhausen-boulez.ly @@ -0,0 +1,30 @@ +\version "2.12.0" + +stemLength = #(define-music-function (parser location length) (number?) + "Set the length of the next stem explicitly." + #{ + \once \override Stem #'length-fraction = #$length + #} +) + +{ + \autoBeamOff + \time 3/8 + \override Stem #'flag = #modern-straight-flag + \override Stem #'length-fraction = #'1.5 + r8 + \acciaccatura { + \stemDown + \slurUp + \stemLength #1 + gis''8 + \stemNeutral + } \stemLength #1.43 d'8 r16 + \stemLength #0.95 + \acciaccatura c''8 + \stemLength #1.25 + b'32 r + \bar"|.|" + \stemLength #1.25 + 16 \stemLength #1.3 8 +} \ No newline at end of file diff --git a/input/regression/flags-straight.ly b/input/regression/flags-straight.ly new file mode 100644 index 0000000000..171902ba6a --- /dev/null +++ b/input/regression/flags-straight.ly @@ -0,0 +1,30 @@ +\version "2.12.0" + +\header { + texidoc = "Straight flag styles." +} + + +% test notes, which will be shown in different styles: +testnotes = { \autoBeamOff c'8 d'16 c'32 d'64 \acciaccatura {c'8} d'64 + c''8 d''16 c''32 d''64 \acciaccatura {\stemDown c''8 \stemNeutral} d''64 } + +{ + \override Score.RehearsalMark #'self-alignment-X = #LEFT + \time 2/4 + \mark "modern straight" + \override Stem #'flag = #modern-straight-flag + \testnotes + + \mark "old straight (large angles)" + \override Stem #'flag = #old-straight-flag + \testnotes +% +% \mark "custom slant" +% % Custom straight flag. The parameters are: +% % flag thickness and spacing +% % up-flag angle and length +% % down-flag angle and length +% \override Stem #'flag = #(straight-flag 0.35 0.8 -5 0.5 60 2.0) +% \testnotes +} diff --git a/input/regression/follow-voice-break.ly b/input/regression/follow-voice-break.ly index b7069fe85d..5c7b10a017 100644 --- a/input/regression/follow-voice-break.ly +++ b/input/regression/follow-voice-break.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc = " The line-spanners connects to the Y position of the note on the next line. diff --git a/input/regression/follow-voice-consecutive.ly b/input/regression/follow-voice-consecutive.ly index bb6e58b2d8..2a52080bbe 100644 --- a/input/regression/follow-voice-consecutive.ly +++ b/input/regression/follow-voice-consecutive.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc= "The voice follower is not confused when set for consecutive diff --git a/input/regression/font-bogus-ligature.ly b/input/regression/font-bogus-ligature.ly index 01fd584690..b5abe6ccb5 100644 --- a/input/regression/font-bogus-ligature.ly +++ b/input/regression/font-bogus-ligature.ly @@ -5,7 +5,7 @@ This may happen with incorrect font versions. " } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##T diff --git a/input/regression/font-family-override.ly b/input/regression/font-family-override.ly index bad03f75ee..39c9b6849a 100644 --- a/input/regression/font-family-override.ly +++ b/input/regression/font-family-override.ly @@ -5,7 +5,7 @@ } -\version "2.11.51" +\version "2.12.0" \paper { % change for other default global staff size. diff --git a/input/regression/font-kern.ly b/input/regression/font-kern.ly index ba1dc789b5..0e9f887721 100644 --- a/input/regression/font-kern.ly +++ b/input/regression/font-kern.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Text set in TrueType Fonts that contain kerning tables, are kerned. " diff --git a/input/regression/font-name.ly b/input/regression/font-name.ly index 1d9d988282..062f2f7549 100644 --- a/input/regression/font-name.ly +++ b/input/regression/font-name.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/font-postscript.ly b/input/regression/font-postscript.ly index d061343bfa..71517886c2 100644 --- a/input/regression/font-postscript.ly +++ b/input/regression/font-postscript.ly @@ -4,7 +4,7 @@ fonts. The file @file{font.scm} shows how to define the scheme-function @code{make-century-schoolbook-tree}." } -\version "2.11.51" +\version "2.12.0" \paper { #(define text-font-defaults diff --git a/input/regression/fret-boards.ly b/input/regression/fret-boards.ly index b61e480b27..c99f27d474 100644 --- a/input/regression/fret-boards.ly +++ b/input/regression/fret-boards.ly @@ -6,7 +6,7 @@ best when one string number is indicated in advance " } -\version "2.11.51" +\version "2.12.0" foo = \relative c { _\markup { diff --git a/input/regression/fret-diagrams.ly b/input/regression/fret-diagrams.ly index b7aa3a00d1..7e424b5d61 100644 --- a/input/regression/fret-diagrams.ly +++ b/input/regression/fret-diagrams.ly @@ -1,11 +1,11 @@ -\version "2.11.65" +\version "2.12.0" \paper { ragged-right = ##t } << - \chords {a2 a c c d} + \chords {a2 a c c c d} \new Voice =mel { \textLengthOn @@ -68,7 +68,26 @@ (place-fret 2 5 4) (place-fret 1 3 1) (barre 5 1 3)) }} - %% simple D chord + + + %% C major for guitar, with capo on third fret + % verbose style + c' ^\markup + \override #'(size . 1.1) { % 110% of default size + \override #'(fret-diagram-details . ( + (dot-label-font-mag . 0.9) + (finger-code . in-dot) + (xo-font-magnification . 0.4) + (xo-padding . 0.3))) { + \fret-diagram-verbose #'((mute 6) + (capo 3) + (open 5) + (place-fret 4 5 1) + (place-fret 3 5 2) + (place-fret 2 5 3) + (open 1)) }} + + %% simple D chord d' ^\markup \override #'(fret-diagram-details . ( diff --git a/input/regression/general-scheme-bindings.ly b/input/regression/general-scheme-bindings.ly index 1d9329c0df..27e8c874b1 100644 --- a/input/regression/general-scheme-bindings.ly +++ b/input/regression/general-scheme-bindings.ly @@ -5,7 +5,7 @@ } -\version "2.11.51" +\version "2.12.0" %% todo : use macro, to show the statement tested. #(ly:progress "~a\n" (ly:expand-environment "${HOME} $HOME $$ ")) diff --git a/input/regression/generic-output-property.ly b/input/regression/generic-output-property.ly index 10c71d7024..da8c41ff39 100644 --- a/input/regression/generic-output-property.ly +++ b/input/regression/generic-output-property.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" diff --git a/input/regression/glissando-broken.ly b/input/regression/glissando-broken.ly index fa29a4a242..4234a68bb7 100644 --- a/input/regression/glissando-broken.ly +++ b/input/regression/glissando-broken.ly @@ -2,7 +2,7 @@ texidoc = "If broken, Glissandi anticipate on the pitch of the next line." } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##T } diff --git a/input/regression/glissando-no-break.ly b/input/regression/glissando-no-break.ly index 4c0122f97a..2d22b57359 100644 --- a/input/regression/glissando-no-break.ly +++ b/input/regression/glissando-no-break.ly @@ -4,7 +4,7 @@ Use @code{breakable} grob property to override." } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t } diff --git a/input/regression/glissando.ly b/input/regression/glissando.ly index a878601a92..fb780e1d27 100644 --- a/input/regression/glissando.ly +++ b/input/regression/glissando.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ diff --git a/input/regression/grace-auto-beam.ly b/input/regression/grace-auto-beam.ly index d38e90e61c..a187226420 100644 --- a/input/regression/grace-auto-beam.ly +++ b/input/regression/grace-auto-beam.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "The autobeamer is not confused by grace notes." diff --git a/input/regression/grace-bar-line.ly b/input/regression/grace-bar-line.ly index 505ebea180..0cf52ae3c7 100644 --- a/input/regression/grace-bar-line.ly +++ b/input/regression/grace-bar-line.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Bar line should come before the grace note." } diff --git a/input/regression/grace-bar-number.ly b/input/regression/grace-bar-number.ly index d000a0303d..c1771d8739 100644 --- a/input/regression/grace-bar-number.ly +++ b/input/regression/grace-bar-number.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Grace notes do tricky things with timing. If a measure diff --git a/input/regression/grace-beam.ly b/input/regression/grace-beam.ly index 7f171b4393..9089d64dd0 100644 --- a/input/regression/grace-beam.ly +++ b/input/regression/grace-beam.ly @@ -9,7 +9,7 @@ Unbeamed grace notes are not put into normal beams. \layout { ragged-right= ##t } -\version "2.11.51" +\version "2.12.0" \relative c'' { c4 d8[ \grace { e32[ d c d] } e8] diff --git a/input/regression/grace-direction-polyphony.ly b/input/regression/grace-direction-polyphony.ly index 7717b5932c..bc364f105e 100644 --- a/input/regression/grace-direction-polyphony.ly +++ b/input/regression/grace-direction-polyphony.ly @@ -4,7 +4,7 @@ finishing the grace section." } -\version "2.11.51" +\version "2.12.0" \relative c''' { \voiceOne diff --git a/input/regression/grace-end-2.ly b/input/regression/grace-end-2.ly index 954eaec206..88ba608824 100644 --- a/input/regression/grace-end-2.ly +++ b/input/regression/grace-end-2.ly @@ -3,6 +3,6 @@ texidoc = "Grace notes at the end of an expression don't cause crashes." } -\version "2.11.51" +\version "2.12.0" { e' \acciaccatura << e'8 \\ cis' >> } diff --git a/input/regression/grace-end.ly b/input/regression/grace-end.ly index 47b2b117e4..1155d98921 100644 --- a/input/regression/grace-end.ly +++ b/input/regression/grace-end.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc="@cindex Grace End diff --git a/input/regression/grace-nest1.ly b/input/regression/grace-nest1.ly index 4d8f9e6c39..35f97d56d4 100644 --- a/input/regression/grace-nest1.ly +++ b/input/regression/grace-nest1.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Grace code should not be confused by nested sequential music containing grace notes; practically speaking, this means that the end-bar and measure bar coincide in this example." diff --git a/input/regression/grace-nest2.ly b/input/regression/grace-nest2.ly index 8229547176..3c1bba2567 100644 --- a/input/regression/grace-nest2.ly +++ b/input/regression/grace-nest2.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Grace code should not be confused by nested sequential music containing grace notes; practically speaking, this means that the end-bar and measure bar coincide in this example." diff --git a/input/regression/grace-nest3.ly b/input/regression/grace-nest3.ly index e97c054ba3..61d2e2852a 100644 --- a/input/regression/grace-nest3.ly +++ b/input/regression/grace-nest3.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "In nested syntax, graces are still properly handled." } diff --git a/input/regression/grace-nest4.ly b/input/regression/grace-nest4.ly index b8bcb3d56c..cec7d109c8 100644 --- a/input/regression/grace-nest4.ly +++ b/input/regression/grace-nest4.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Also in the nested syntax here, grace notes appear rightly." } diff --git a/input/regression/grace-nest5.ly b/input/regression/grace-nest5.ly index ca64d9c1d6..2d0baac2ca 100644 --- a/input/regression/grace-nest5.ly +++ b/input/regression/grace-nest5.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Graces notes may have the same duration as the main note." } diff --git a/input/regression/grace-part-combine.ly b/input/regression/grace-part-combine.ly index 148a2a77f5..fe04f094fa 100644 --- a/input/regression/grace-part-combine.ly +++ b/input/regression/grace-part-combine.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Grace notes may be put in a @code{partcombine}r." } diff --git a/input/regression/grace-partial.ly b/input/regression/grace-partial.ly index 6897e88f86..69b4f9ad70 100644 --- a/input/regression/grace-partial.ly +++ b/input/regression/grace-partial.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/grace-staff-length.ly b/input/regression/grace-staff-length.ly index 1b85382075..319cac2240 100644 --- a/input/regression/grace-staff-length.ly +++ b/input/regression/grace-staff-length.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc = "Stripped version of trip.ly. Staves should be of correct length." } diff --git a/input/regression/grace-start.ly b/input/regression/grace-start.ly index de069decb4..d8838b2b1b 100644 --- a/input/regression/grace-start.ly +++ b/input/regression/grace-start.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Pieces may begin with grace notes." } diff --git a/input/regression/grace-stem-length.ly b/input/regression/grace-stem-length.ly index bb3eee7821..d4c831f6cf 100644 --- a/input/regression/grace-stem-length.ly +++ b/input/regression/grace-stem-length.ly @@ -3,7 +3,7 @@ normal notes, if possible. They should never be longer, even if that would lead to beam quanting problems." } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t diff --git a/input/regression/grace-stems.ly b/input/regression/grace-stems.ly index 249230e721..43eab6278b 100644 --- a/input/regression/grace-stems.ly +++ b/input/regression/grace-stems.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc = "Here @code{startGraceMusic} should set @code{no-stem-extend} to true; the two grace beams should be the same here. diff --git a/input/regression/grace-sync.ly b/input/regression/grace-sync.ly index d7388bded5..13d96ffb79 100644 --- a/input/regression/grace-sync.ly +++ b/input/regression/grace-sync.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Grace notes in different voices/staves are synchronized." } diff --git a/input/regression/grace-types.ly b/input/regression/grace-types.ly index 59bdb4c990..0885a04fc9 100644 --- a/input/regression/grace-types.ly +++ b/input/regression/grace-types.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "There are three different kinds of grace types: the base grace switches to smaller type, the appoggiatura inserts also a slur, and the diff --git a/input/regression/grace-unfold-repeat.ly b/input/regression/grace-unfold-repeat.ly index ea9a5ae4d9..c2df025858 100644 --- a/input/regression/grace-unfold-repeat.ly +++ b/input/regression/grace-unfold-repeat.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "When grace notes are entered with unfolded repeats, line breaks take place before grace notes. diff --git a/input/regression/grace-volta-repeat-2.ly b/input/regression/grace-volta-repeat-2.ly index 098e9f79b6..1df9fec9c4 100644 --- a/input/regression/grace-volta-repeat-2.ly +++ b/input/regression/grace-volta-repeat-2.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/grace-volta-repeat.ly b/input/regression/grace-volta-repeat.ly index 4730417f9d..a24e2e1538 100644 --- a/input/regression/grace-volta-repeat.ly +++ b/input/regression/grace-volta-repeat.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/grace.ly b/input/regression/grace.ly index 408c8fdc05..36462f342c 100644 --- a/input/regression/grace.ly +++ b/input/regression/grace.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ diff --git a/input/regression/graphviz.ly b/input/regression/graphviz.ly index 850d1a324b..3687d3dc74 100644 --- a/input/regression/graphviz.ly +++ b/input/regression/graphviz.ly @@ -3,7 +3,7 @@ } -\version "2.11.51" +\version "2.12.0" \include "graphviz-init.ly" #(whitelist-grob 'NoteHead) diff --git a/input/regression/grid-lines.ly b/input/regression/grid-lines.ly index 3be4bb37bb..8a99130511 100644 --- a/input/regression/grid-lines.ly +++ b/input/regression/grid-lines.ly @@ -5,7 +5,7 @@ staves synchronized with the notes." } -\version "2.11.51" +\version "2.12.0" skips = { diff --git a/input/regression/grob-tweak.ly b/input/regression/grob-tweak.ly index 6622eb4265..ae4f1deffc 100644 --- a/input/regression/grob-tweak.ly +++ b/input/regression/grob-tweak.ly @@ -6,7 +6,7 @@ } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } diff --git a/input/regression/hairpin-barline-break.ly b/input/regression/hairpin-barline-break.ly index 139c72ac7c..88973d0bee 100644 --- a/input/regression/hairpin-barline-break.ly +++ b/input/regression/hairpin-barline-break.ly @@ -5,7 +5,7 @@ do not print that ending. But on the previous line, this hairpin should not be left open, and should end at the bar line. " } -\version "2.11.51" +\version "2.12.0" \relative c' { c1\> diff --git a/input/regression/hairpin-circled.ly b/input/regression/hairpin-circled.ly index ed75eb3a43..e01f244d75 100644 --- a/input/regression/hairpin-circled.ly +++ b/input/regression/hairpin-circled.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/hairpin-dashed.ly b/input/regression/hairpin-dashed.ly index b921d33d68..0607b291e2 100644 --- a/input/regression/hairpin-dashed.ly +++ b/input/regression/hairpin-dashed.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc ="Hairpin crescendi may be dashed. " diff --git a/input/regression/hairpin-ending.ly b/input/regression/hairpin-ending.ly index 9004508262..a5e33c426c 100644 --- a/input/regression/hairpin-ending.ly +++ b/input/regression/hairpin-ending.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/hairpin-to-barline-mark.ly b/input/regression/hairpin-to-barline-mark.ly index 1933641b2b..c6d10938e7 100644 --- a/input/regression/hairpin-to-barline-mark.ly +++ b/input/regression/hairpin-to-barline-mark.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/hairpin-to-barline.ly b/input/regression/hairpin-to-barline.ly index ea7d85298d..2a0a9db357 100644 --- a/input/regression/hairpin-to-barline.ly +++ b/input/regression/hairpin-to-barline.ly @@ -5,7 +5,7 @@ should end at that bar line. " } -\version "2.11.51" +\version "2.12.0" \relative c'' { \override Hairpin #'bound-padding = #1.0 diff --git a/input/regression/hairpin-to-rest.ly b/input/regression/hairpin-to-rest.ly index def7001b4f..1f5d4800a7 100644 --- a/input/regression/hairpin-to-rest.ly +++ b/input/regression/hairpin-to-rest.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Hairpins end at the left edge of a rest." } diff --git a/input/regression/hara-kiri-percent-repeat.ly b/input/regression/hara-kiri-percent-repeat.ly index 0beb255491..d1ce10f1cd 100644 --- a/input/regression/hara-kiri-percent-repeat.ly +++ b/input/regression/hara-kiri-percent-repeat.ly @@ -2,7 +2,7 @@ texidoc = "Staves with percent repeats are not killed." } -\version "2.11.53" +\version "2.12.0" << \new Staff { c''1 c'' \break c'' c'' } diff --git a/input/regression/hara-kiri-pianostaff.ly b/input/regression/hara-kiri-pianostaff.ly index ebc783ee24..e347ad2029 100644 --- a/input/regression/hara-kiri-pianostaff.ly +++ b/input/regression/hara-kiri-pianostaff.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = diff --git a/input/regression/hara-kiri-stanza-number.ly b/input/regression/hara-kiri-stanza-number.ly index c1187c7400..18386a8cdd 100644 --- a/input/regression/hara-kiri-stanza-number.ly +++ b/input/regression/hara-kiri-stanza-number.ly @@ -11,7 +11,7 @@ lines." ragged-right = ##T } -\version "2.11.51" +\version "2.12.0" << \new Voice = melody \relative c'{ diff --git a/input/regression/harp-pedals-sanity-checks.ly b/input/regression/harp-pedals-sanity-checks.ly index f395f0dac6..38c4f45089 100644 --- a/input/regression/harp-pedals-sanity-checks.ly +++ b/input/regression/harp-pedals-sanity-checks.ly @@ -1,4 +1,4 @@ -\version "2.11.57" +\version "2.12.0" \header { texidoc = "The harp-pedal markup function does some sanity checks. All diff --git a/input/regression/harp-pedals-tweaking.ly b/input/regression/harp-pedals-tweaking.ly index 87d0f0f4e3..ad3f95552a 100644 --- a/input/regression/harp-pedals-tweaking.ly +++ b/input/regression/harp-pedals-tweaking.ly @@ -1,4 +1,4 @@ -\version "2.11.65" +\version "2.12.0" \header { texidoc = "Harp pedals can be tweaked through the size, thickness and diff --git a/input/regression/harp-pedals.ly b/input/regression/harp-pedals.ly index 04af5a5271..7f19767e21 100644 --- a/input/regression/harp-pedals.ly +++ b/input/regression/harp-pedals.ly @@ -1,4 +1,4 @@ -\version "2.11.57" +\version "2.12.0" \header { texidoc = "Basic harp diagram functionality, including circled pedal boxes. diff --git a/input/regression/horizontal-bracket-break.ly b/input/regression/horizontal-bracket-break.ly index 6e88244b9a..c0ff49d0d5 100644 --- a/input/regression/horizontal-bracket-break.ly +++ b/input/regression/horizontal-bracket-break.ly @@ -2,7 +2,7 @@ texidoc = "Horizontal brackets connect over line breaks." } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } \new Voice \with { diff --git a/input/regression/horizontal-bracket.ly b/input/regression/horizontal-bracket.ly index bcbe3a9db3..ae9a48c66c 100644 --- a/input/regression/horizontal-bracket.ly +++ b/input/regression/horizontal-bracket.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/identifier-following-chordmode.ly b/input/regression/identifier-following-chordmode.ly index c635af1737..34dec04102 100644 --- a/input/regression/identifier-following-chordmode.ly +++ b/input/regression/identifier-following-chordmode.ly @@ -7,7 +7,7 @@ modifier." } -\version "2.11.55" +\version "2.12.0" myDisplayMusic = #(define-music-function (parser location music) diff --git a/input/regression/identifiers.ly b/input/regression/identifiers.ly index 9506769914..a201349411 100644 --- a/input/regression/identifiers.ly +++ b/input/regression/identifiers.ly @@ -2,7 +2,7 @@ \header { texidoc = "test identifiers." } -\version "2.11.51" +\version "2.12.0" num = #3 mus = { c'4 } diff --git a/input/regression/incipit.ly b/input/regression/incipit.ly index f936ba779c..31d9e6f252 100644 --- a/input/regression/incipit.ly +++ b/input/regression/incipit.ly @@ -4,7 +4,7 @@ } -\version "2.11.51" +\version "2.12.0" %% to avoid warnings: #(set-object-property! 'music 'backend-type? ly:music?) diff --git a/input/regression/instrument-name-dynamic.ly b/input/regression/instrument-name-dynamic.ly index 63c0cb5f52..f7faa7e09d 100644 --- a/input/regression/instrument-name-dynamic.ly +++ b/input/regression/instrument-name-dynamic.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = " diff --git a/input/regression/instrument-name-hara-kiri.ly b/input/regression/instrument-name-hara-kiri.ly index 2f4e98fb9a..55b209d349 100644 --- a/input/regression/instrument-name-hara-kiri.ly +++ b/input/regression/instrument-name-hara-kiri.ly @@ -9,7 +9,7 @@ as does the instrument name. " } -\version "2.11.51" +\version "2.12.0" \new PianoStaff << \new Staff { diff --git a/input/regression/instrument-name-markup.ly b/input/regression/instrument-name-markup.ly index 7d1655a518..3af4924721 100644 --- a/input/regression/instrument-name-markup.ly +++ b/input/regression/instrument-name-markup.ly @@ -9,7 +9,7 @@ including alterations. " \layout { ragged-right = ##t } -\version "2.11.51" +\version "2.12.0" textFlat = \markup {\smaller \flat} diff --git a/input/regression/instrument-name-partial.ly b/input/regression/instrument-name-partial.ly index 632842ea47..87ad6f4dfd 100644 --- a/input/regression/instrument-name-partial.ly +++ b/input/regression/instrument-name-partial.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Instrument names are also printed on partial starting measures." } diff --git a/input/regression/instrument-name-x-align.ly b/input/regression/instrument-name-x-align.ly index c44f507ab0..190807c950 100644 --- a/input/regression/instrument-name-x-align.ly +++ b/input/regression/instrument-name-x-align.ly @@ -8,7 +8,7 @@ the following systems, respectively." } -\version "2.11.57" +\version "2.12.0" \paper { left-margin = 3\cm } \score { \new StaffGroup << diff --git a/input/regression/instrument-name.ly b/input/regression/instrument-name.ly index c48478f877..121dd42087 100644 --- a/input/regression/instrument-name.ly +++ b/input/regression/instrument-name.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" Staff margins are also markings attached to barlines. They should be diff --git a/input/regression/instrument-switch.ly b/input/regression/instrument-switch.ly index d3d5d30c1a..81235e297a 100644 --- a/input/regression/instrument-switch.ly +++ b/input/regression/instrument-switch.ly @@ -5,7 +5,7 @@ properties for an in staff instrument switch. " } -\version "2.11.51" +\version "2.12.0" \addInstrumentDefinition #"bassClar" #`((instrumentTransposition . ,(ly:make-pitch -1 6 FLAT)) (instrumentName . "bla") diff --git a/input/regression/key-clefs.ly b/input/regression/key-clefs.ly index ca50f5beb6..761f062710 100644 --- a/input/regression/key-clefs.ly +++ b/input/regression/key-clefs.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Each clef has its own accidental placing rules. "} diff --git a/input/regression/key-signature-cancellation-extra-natural.ly b/input/regression/key-signature-cancellation-extra-natural.ly index 1b71b803a5..676e1dc2ef 100644 --- a/input/regression/key-signature-cancellation-extra-natural.ly +++ b/input/regression/key-signature-cancellation-extra-natural.ly @@ -6,7 +6,7 @@ signature are cancelled." } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t diff --git a/input/regression/key-signature-cancellation.ly b/input/regression/key-signature-cancellation.ly index af13a67cfc..8193110ff4 100644 --- a/input/regression/key-signature-cancellation.ly +++ b/input/regression/key-signature-cancellation.ly @@ -6,7 +6,7 @@ } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t diff --git a/input/regression/key-signature-padding.ly b/input/regression/key-signature-padding.ly index ca55f36f6a..a27bde7cff 100644 --- a/input/regression/key-signature-padding.ly +++ b/input/regression/key-signature-padding.ly @@ -5,7 +5,7 @@ } -\version "2.11.51" +\version "2.12.0" { \override Staff.KeySignature #'padding-pairs diff --git a/input/regression/key-signature-scordatura.ly b/input/regression/key-signature-scordatura.ly index ec05e54cd3..93710c2c70 100644 --- a/input/regression/key-signature-scordatura.ly +++ b/input/regression/key-signature-scordatura.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "By setting @code{Staff.keySignature} directly, key signatures can be set invidually per pitch. diff --git a/input/regression/keys.ly b/input/regression/keys.ly index 6c72aa6268..0a3fb7e8a5 100644 --- a/input/regression/keys.ly +++ b/input/regression/keys.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" Key signatures may appear on key changes, even without a barline. diff --git a/input/regression/laissez-vibrer-tie-beam.ly b/input/regression/laissez-vibrer-tie-beam.ly index 3f68a47329..840f5b28f8 100644 --- a/input/regression/laissez-vibrer-tie-beam.ly +++ b/input/regression/laissez-vibrer-tie-beam.ly @@ -5,7 +5,7 @@ premature beam slope calculation. " } -\version "2.11.51" +\version "2.12.0" \paper{ ragged-right=##t diff --git a/input/regression/laissez-vibrer-ties.ly b/input/regression/laissez-vibrer-ties.ly index f1b1ba655a..934bf27091 100644 --- a/input/regression/laissez-vibrer-ties.ly +++ b/input/regression/laissez-vibrer-ties.ly @@ -10,7 +10,7 @@ They have fixed size. Their formatting can be tuned with " } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } diff --git a/input/regression/landscape.ly b/input/regression/landscape.ly index ec339cd6e2..beea8e9dd2 100644 --- a/input/regression/landscape.ly +++ b/input/regression/landscape.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" #(set-default-paper-size "a6" 'landscape) \header { texidoc = " Scores may be printed in landcape mode."} diff --git a/input/regression/ledger-line-minimum.ly b/input/regression/ledger-line-minimum.ly index 78ce5a9a9b..471818e9d2 100644 --- a/input/regression/ledger-line-minimum.ly +++ b/input/regression/ledger-line-minimum.ly @@ -7,7 +7,7 @@ disappearing." } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t} \relative c'' { \time 2/4 diff --git a/input/regression/ledger-line-shorten.ly b/input/regression/ledger-line-shorten.ly index 822d72ad20..04ec6a9f95 100644 --- a/input/regression/ledger-line-shorten.ly +++ b/input/regression/ledger-line-shorten.ly @@ -2,7 +2,7 @@ texidoc = "Ledger lines are shortened when they are very close. This ensures that ledger lines stay separate." } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t diff --git a/input/regression/ledger-lines-varying-staves.ly b/input/regression/ledger-lines-varying-staves.ly index 26c0b4ad69..f7c78d5849 100644 --- a/input/regression/ledger-lines-varying-staves.ly +++ b/input/regression/ledger-lines-varying-staves.ly @@ -1,4 +1,4 @@ -\version "2.11.52" +\version "2.12.0" \header { texidoc = "Ledger lines should appear at every other location for a variety of staves using both @code{line-count} and diff --git a/input/regression/ligature-bracket.ly b/input/regression/ligature-bracket.ly index 49b976b66b..756559c919 100644 --- a/input/regression/ligature-bracket.ly +++ b/input/regression/ligature-bracket.ly @@ -2,7 +2,7 @@ texidoc = "The ligature bracket right-end is not affected by other voices." } -\version "2.11.51" +\version "2.12.0" << \new Staff {\[b2 b\] | \[b b\] } \new Staff {b2 b | b4 b b b } diff --git a/input/regression/lily-in-scheme.ly b/input/regression/lily-in-scheme.ly index 2a0cd8b0d3..e9b34f6ec5 100644 --- a/input/regression/lily-in-scheme.ly +++ b/input/regression/lily-in-scheme.ly @@ -12,7 +12,7 @@ the @code{TextScript} grob. } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t } withPaddingA = #(define-music-function (parser location padding music) (number? ly:music?) diff --git a/input/regression/line-arrows.ly b/input/regression/line-arrows.ly index bf1fe7ece8..fad16d4159 100644 --- a/input/regression/line-arrows.ly +++ b/input/regression/line-arrows.ly @@ -2,7 +2,7 @@ texidoc = "Arrows can be applied to text-spanners and line-spanners (such as the Glissando)" } -\version "2.11.65" +\version "2.12.0" \paper { ragged-right = ##t diff --git a/input/regression/line-dash-small-period.ly b/input/regression/line-dash-small-period.ly index e42e398c87..e55b6ec602 100644 --- a/input/regression/line-dash-small-period.ly +++ b/input/regression/line-dash-small-period.ly @@ -5,7 +5,7 @@ } -\version "2.11.53" +\version "2.12.0" \relative { \override Staff.OttavaBracket #'dash-period = #0.1 diff --git a/input/regression/line-dashed-period.ly b/input/regression/line-dashed-period.ly index 130d7fa764..c370429bd2 100644 --- a/input/regression/line-dashed-period.ly +++ b/input/regression/line-dashed-period.ly @@ -5,7 +5,7 @@ starts and ends on a full dash. " } -\version "2.11.51" +\version "2.12.0" \layout { indent = 0.0\mm diff --git a/input/regression/line-style-zigzag-spacing.ly b/input/regression/line-style-zigzag-spacing.ly index 72fd521a54..e2de30aedc 100644 --- a/input/regression/line-style-zigzag-spacing.ly +++ b/input/regression/line-style-zigzag-spacing.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { texidoc = "Setting @code{'zigzag} style for spanners does not diff --git a/input/regression/line-style.ly b/input/regression/line-style.ly index 49909e8657..e2b9c99b73 100644 --- a/input/regression/line-style.ly +++ b/input/regression/line-style.ly @@ -2,7 +2,7 @@ texidoc = "Cover all line styles available" } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##T } diff --git a/input/regression/lyric-combine-new.ly b/input/regression/lyric-combine-new.ly index f8461c12eb..35824868cc 100644 --- a/input/regression/lyric-combine-new.ly +++ b/input/regression/lyric-combine-new.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "With the @code{\\lyricsto} mechanism, individual lyric lines can be associated with one melody line. Each lyric line diff --git a/input/regression/lyric-combine-polyphonic.ly b/input/regression/lyric-combine-polyphonic.ly index cf6db89a20..1420c43521 100644 --- a/input/regression/lyric-combine-polyphonic.ly +++ b/input/regression/lyric-combine-polyphonic.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc ="Polyphonic rhythms and rests do not disturb diff --git a/input/regression/lyric-combine-switch-voice-2.ly b/input/regression/lyric-combine-switch-voice-2.ly index 88ea4064e5..ac2c7a4286 100644 --- a/input/regression/lyric-combine-switch-voice-2.ly +++ b/input/regression/lyric-combine-switch-voice-2.ly @@ -2,7 +2,7 @@ { texidoc = "switching voices in the middle of the lyrics is possible using @code{lyricsto}." } -\version "2.11.51" +\version "2.12.0" << \relative \new Voice = "lahlah" { diff --git a/input/regression/lyric-combine-switch-voice.ly b/input/regression/lyric-combine-switch-voice.ly index 02be517ebc..adc362e02b 100644 --- a/input/regression/lyric-combine-switch-voice.ly +++ b/input/regression/lyric-combine-switch-voice.ly @@ -5,7 +5,7 @@ if the switch occurs together with context instantiation." } -\version "2.11.51" +\version "2.12.0" << \relative \new Voice = "lahlah" { diff --git a/input/regression/lyric-combine.ly b/input/regression/lyric-combine.ly index 1f35e71167..424653ee48 100644 --- a/input/regression/lyric-combine.ly +++ b/input/regression/lyric-combine.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ diff --git a/input/regression/lyric-extender-broken.ly b/input/regression/lyric-extender-broken.ly index 0517f2c9da..f35111b316 100644 --- a/input/regression/lyric-extender-broken.ly +++ b/input/regression/lyric-extender-broken.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/lyric-extender-no-heads.ly b/input/regression/lyric-extender-no-heads.ly index 5e5cbcdacf..8bafe34191 100644 --- a/input/regression/lyric-extender-no-heads.ly +++ b/input/regression/lyric-extender-no-heads.ly @@ -6,7 +6,7 @@ without a lyric attached." } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t diff --git a/input/regression/lyric-extender-rest.ly b/input/regression/lyric-extender-rest.ly index 2e66259233..ccf9aff74d 100644 --- a/input/regression/lyric-extender-rest.ly +++ b/input/regression/lyric-extender-rest.ly @@ -10,7 +10,7 @@ is not terminated upon encountering a rest. " ragged-right = ##T } -\version "2.11.51" +\version "2.12.0" << \new Voice = "one" \relative c'' { diff --git a/input/regression/lyric-extender-right-margin.ly b/input/regression/lyric-extender-right-margin.ly index ca677fe0ef..0317b53493 100644 --- a/input/regression/lyric-extender-right-margin.ly +++ b/input/regression/lyric-extender-right-margin.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Extenders will not protrude into the right margin" } diff --git a/input/regression/lyric-extender.ly b/input/regression/lyric-extender.ly index 9f69704bac..07cbce7772 100644 --- a/input/regression/lyric-extender.ly +++ b/input/regression/lyric-extender.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/lyric-hyphen-break.ly b/input/regression/lyric-hyphen-break.ly index c724992f2e..4e906329ac 100644 --- a/input/regression/lyric-hyphen-break.ly +++ b/input/regression/lyric-hyphen-break.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/lyric-hyphen-retain.ly b/input/regression/lyric-hyphen-retain.ly index 787e313a9e..e567981a87 100644 --- a/input/regression/lyric-hyphen-retain.ly +++ b/input/regression/lyric-hyphen-retain.ly @@ -14,7 +14,7 @@ effect of a setting is delayed is one syllable." } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t diff --git a/input/regression/lyric-hyphen.ly b/input/regression/lyric-hyphen.ly index a0d9e7a069..ae3ea0e7eb 100644 --- a/input/regression/lyric-hyphen.ly +++ b/input/regression/lyric-hyphen.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "In lyrics, hyphens may be used." } diff --git a/input/regression/lyric-melisma-manual.ly b/input/regression/lyric-melisma-manual.ly index 3b9426d04b..4072c40d7b 100644 --- a/input/regression/lyric-melisma-manual.ly +++ b/input/regression/lyric-melisma-manual.ly @@ -5,7 +5,7 @@ } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } diff --git a/input/regression/lyric-no-association-rhythm.ly b/input/regression/lyric-no-association-rhythm.ly index a724e5db1c..4003d721f4 100644 --- a/input/regression/lyric-no-association-rhythm.ly +++ b/input/regression/lyric-no-association-rhythm.ly @@ -8,7 +8,7 @@ } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t } \score { diff --git a/input/regression/lyric-phrasing.ly b/input/regression/lyric-phrasing.ly index 8fc5495dd3..93d143c6e4 100644 --- a/input/regression/lyric-phrasing.ly +++ b/input/regression/lyric-phrasing.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = " diff --git a/input/regression/lyric-tie.ly b/input/regression/lyric-tie.ly index 1ff8271245..049bb4a47d 100644 --- a/input/regression/lyric-tie.ly +++ b/input/regression/lyric-tie.ly @@ -3,7 +3,7 @@ texidoc = "Tildes in lyric syllables are converted to tie symbols." } -\version "2.11.51" +\version "2.12.0" \lyrics { wa~o~a diff --git a/input/regression/lyrics-after-grace.ly b/input/regression/lyrics-after-grace.ly index 48beb4ac62..d168464638 100644 --- a/input/regression/lyrics-after-grace.ly +++ b/input/regression/lyrics-after-grace.ly @@ -5,7 +5,7 @@ } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } diff --git a/input/regression/lyrics-bar.ly b/input/regression/lyrics-bar.ly index 2f60761fa0..f8b7d83575 100644 --- a/input/regression/lyrics-bar.ly +++ b/input/regression/lyrics-bar.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" diff --git a/input/regression/lyrics-melisma-beam.ly b/input/regression/lyrics-melisma-beam.ly index 92f40932d8..008bb69e7b 100644 --- a/input/regression/lyrics-melisma-beam.ly +++ b/input/regression/lyrics-melisma-beam.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Melismata are triggered by manual beams." diff --git a/input/regression/lyrics-no-notes.ly b/input/regression/lyrics-no-notes.ly index f4b447f98a..3c6ef07e79 100644 --- a/input/regression/lyrics-no-notes.ly +++ b/input/regression/lyrics-no-notes.ly @@ -6,7 +6,7 @@ paper column is very wide." \layout{ ragged-right = ##t } -\version "2.11.51" +\version "2.12.0" << \new Staff \relative c' { \key aes \major diff --git a/input/regression/lyrics-tenor-clef.ly b/input/regression/lyrics-tenor-clef.ly index 8314d09d1c..bc1f016967 100644 --- a/input/regression/lyrics-tenor-clef.ly +++ b/input/regression/lyrics-tenor-clef.ly @@ -2,7 +2,7 @@ texidoc = "Lyrics are not lowered despite the presence of an octavation 8." } -\version "2.11.51" +\version "2.12.0" \layout { \context { \Staff diff --git a/input/regression/markup-arrows.ly b/input/regression/markup-arrows.ly index c95a5571ee..aaa4d0cbe2 100644 --- a/input/regression/markup-arrows.ly +++ b/input/regression/markup-arrows.ly @@ -26,4 +26,4 @@ } } -\version "2.11.51" +\version "2.12.0" diff --git a/input/regression/markup-bidi-pango.ly b/input/regression/markup-bidi-pango.ly index 5466510945..e950beaa66 100644 --- a/input/regression/markup-bidi-pango.ly +++ b/input/regression/markup-bidi-pango.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/markup-column-align.ly b/input/regression/markup-column-align.ly index a2e1e4cad7..5d5a2c56c4 100644 --- a/input/regression/markup-column-align.ly +++ b/input/regression/markup-column-align.ly @@ -1,4 +1,4 @@ -\version "2.11.57" +\version "2.12.0" \header { texidoc = "Fixed horizontal alignment of columns of text can be set using diff --git a/input/regression/markup-commands.ly b/input/regression/markup-commands.ly index d56128976e..688cd2e6a6 100644 --- a/input/regression/markup-commands.ly +++ b/input/regression/markup-commands.ly @@ -5,7 +5,7 @@ } \paper { ragged-right = ##T } -\version "2.11.51" +\version "2.12.0" { g'_\markup { diff --git a/input/regression/markup-eps.ly b/input/regression/markup-eps.ly index 87300b363b..224af32c24 100644 --- a/input/regression/markup-eps.ly +++ b/input/regression/markup-eps.ly @@ -3,7 +3,7 @@ texidoc = "The epsfile markup command reads an EPS file" } -\version "2.11.51" +\version "2.12.0" #(let* ((port (open-output-file "box.eps"))) diff --git a/input/regression/markup-line-thickness.ly b/input/regression/markup-line-thickness.ly index ca6049cf10..2738783884 100644 --- a/input/regression/markup-line-thickness.ly +++ b/input/regression/markup-line-thickness.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/markup-lines.ly b/input/regression/markup-lines.ly index 73cad276ee..03500ebfd1 100644 --- a/input/regression/markup-lines.ly +++ b/input/regression/markup-lines.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Text that can spread over pages is entered with the diff --git a/input/regression/markup-music-glyph.ly b/input/regression/markup-music-glyph.ly index 795b1a36ec..7fddd618c4 100644 --- a/input/regression/markup-music-glyph.ly +++ b/input/regression/markup-music-glyph.ly @@ -4,7 +4,7 @@ } -\version "2.11.51" +\version "2.12.0" { c'^\markup diff --git a/input/regression/markup-note-dot.ly b/input/regression/markup-note-dot.ly index b0539ead99..1c5f807765 100644 --- a/input/regression/markup-note-dot.ly +++ b/input/regression/markup-note-dot.ly @@ -1,4 +1,4 @@ -\version "2.11.65" +\version "2.12.0" \header { texidoc = " A dotted whole note displayed via the @code{\\note} diff --git a/input/regression/markup-note.ly b/input/regression/markup-note.ly index 5ea9ceb6a7..0cdc526b35 100644 --- a/input/regression/markup-note.ly +++ b/input/regression/markup-note.ly @@ -3,7 +3,7 @@ texidoc = "The note markup function may be used to make metronome markings. It works for a variety of flag, dot and duration settings." } -\version "2.11.51" +\version "2.12.0" \relative c'' { diff --git a/input/regression/markup-scheme.ly b/input/regression/markup-scheme.ly index 12a97c0ee9..1e4295c804 100644 --- a/input/regression/markup-scheme.ly +++ b/input/regression/markup-scheme.ly @@ -25,7 +25,7 @@ For maintenance reasons, we don't excercise the entire markup command set. -\version "2.11.51" +\version "2.12.0" { \textLengthOn diff --git a/input/regression/markup-score.ly b/input/regression/markup-score.ly index ba8d056382..8c686ec5ba 100644 --- a/input/regression/markup-score.ly +++ b/input/regression/markup-score.ly @@ -2,7 +2,7 @@ texidoc = "Use \\score block as markup command." } -\version "2.11.51" +\version "2.12.0" tuning = \markup { \score { diff --git a/input/regression/markup-stack.ly b/input/regression/markup-stack.ly index a318adc396..4d84c3e2c1 100644 --- a/input/regression/markup-stack.ly +++ b/input/regression/markup-stack.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header {texidoc="Markup scripts may be stacked."} \layout { ragged-right = ##t} { diff --git a/input/regression/markup-syntax.ly b/input/regression/markup-syntax.ly index 3505e989c6..8a59a454b6 100644 --- a/input/regression/markup-syntax.ly +++ b/input/regression/markup-syntax.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Demo of markup texts, using LilyPond syntax." diff --git a/input/regression/markup-user.ly b/input/regression/markup-user.ly index 2619982d28..6377347060 100644 --- a/input/regression/markup-user.ly +++ b/input/regression/markup-user.ly @@ -9,7 +9,7 @@ the @code{define-markup-command} scheme macro." -\version "2.11.51" +\version "2.12.0" #(define-markup-command (upcase paper props str) (string?) "Upcase the string characters. Syntax: \\upcase #\"string\"" diff --git a/input/regression/markup-word-wrap.ly b/input/regression/markup-word-wrap.ly index e1d1c17a90..ef9e5b065d 100644 --- a/input/regression/markup-word-wrap.ly +++ b/input/regression/markup-word-wrap.ly @@ -5,7 +5,7 @@ } -\version "2.11.51" +\version "2.12.0" \markup { this is normal text diff --git a/input/regression/measure-grouping.ly b/input/regression/measure-grouping.ly index 84caac7eb9..3ddb019925 100644 --- a/input/regression/measure-grouping.ly +++ b/input/regression/measure-grouping.ly @@ -7,7 +7,7 @@ brackets above beats when the beats of a time signature are grouped. " } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t diff --git a/input/regression/mensural-ligatures.ly b/input/regression/mensural-ligatures.ly index a9998f037b..787cde444b 100644 --- a/input/regression/mensural-ligatures.ly +++ b/input/regression/mensural-ligatures.ly @@ -1,4 +1,4 @@ -\version "2.11.65" +\version "2.12.0" \header { texidoc = "Mensural ligatures show different shapes, depending on the diff --git a/input/regression/mensural.ly b/input/regression/mensural.ly index b64d6cf726..e5b2477648 100644 --- a/input/regression/mensural.ly +++ b/input/regression/mensural.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "There is limited support for mensural notation: note head diff --git a/input/regression/metronome-marking.ly b/input/regression/metronome-marking.ly index 2e3fa860d2..409687cdfb 100644 --- a/input/regression/metronome-marking.ly +++ b/input/regression/metronome-marking.ly @@ -14,7 +14,7 @@ The marking is left aligned with the time signature, if there is one. \layout { ragged-right = ##t } -\version "2.11.51" +\version "2.12.0" \relative c'' { \tempo \breve = 100 c1 c1 \tempo 8.. = 50 c1 diff --git a/input/regression/metronome-parenthesized.ly b/input/regression/metronome-parenthesized.ly index ef32ccceb2..97a4bc7d18 100644 --- a/input/regression/metronome-parenthesized.ly +++ b/input/regression/metronome-parenthesized.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" diff --git a/input/regression/metronome-text.ly b/input/regression/metronome-text.ly index 8282dbcc3c..44d0bd23c9 100644 --- a/input/regression/metronome-text.ly +++ b/input/regression/metronome-text.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" diff --git a/input/regression/midi-drums.ly b/input/regression/midi-drums.ly index 98e2df3dbd..bd00285cf2 100644 --- a/input/regression/midi-drums.ly +++ b/input/regression/midi-drums.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Midi can create drums." } diff --git a/input/regression/midi-dynamics.ly b/input/regression/midi-dynamics.ly index cace5cf4da..ee18823a3d 100644 --- a/input/regression/midi-dynamics.ly +++ b/input/regression/midi-dynamics.ly @@ -5,7 +5,7 @@ } -\version "2.11.51" +\version "2.12.0" \score { \relative { diff --git a/input/regression/midi-grace.ly b/input/regression/midi-grace.ly index f89063e277..4f5feffc66 100644 --- a/input/regression/midi-grace.ly +++ b/input/regression/midi-grace.ly @@ -5,7 +5,7 @@ off will appear at tick 768 (2 * 384)." } -\version "2.11.51" +\version "2.12.0" \score { \relative c' { c4 diff --git a/input/regression/midi-lyric-barcheck.ly b/input/regression/midi-lyric-barcheck.ly index 6f6db96a53..42ba0fbe0d 100644 --- a/input/regression/midi-lyric-barcheck.ly +++ b/input/regression/midi-lyric-barcheck.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Lyrics in MIDI are aligned to ties and beams: diff --git a/input/regression/midi-microtone-off.ly b/input/regression/midi-microtone-off.ly index f254fb2da5..893ed44626 100644 --- a/input/regression/midi-microtone-off.ly +++ b/input/regression/midi-microtone-off.ly @@ -4,7 +4,7 @@ the next (possibly grace) note. " } -\version "2.11.51" +\version "2.12.0" \score { diff --git a/input/regression/midi-microtone.ly b/input/regression/midi-microtone.ly index 698befe248..478c925234 100644 --- a/input/regression/midi-microtone.ly +++ b/input/regression/midi-microtone.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "The pitch wheel is used for microtones." } diff --git a/input/regression/midi-partial.ly b/input/regression/midi-partial.ly index 9c52fe51e9..d5aad2d06a 100644 --- a/input/regression/midi-partial.ly +++ b/input/regression/midi-partial.ly @@ -1,7 +1,7 @@ \header { texidoc = "MIDI and partial measures work together." } -\version "2.11.51" +\version "2.12.0" \score { { \partial 4 diff --git a/input/regression/midi-pedal.ly b/input/regression/midi-pedal.ly index 36cdf2b62f..c599902164 100644 --- a/input/regression/midi-pedal.ly +++ b/input/regression/midi-pedal.ly @@ -5,7 +5,7 @@ } -\version "2.11.51" +\version "2.12.0" \score { \relative { diff --git a/input/regression/midi-scales.ly b/input/regression/midi-scales.ly index 379ed9542b..9c7ae95b06 100644 --- a/input/regression/midi-scales.ly +++ b/input/regression/midi-scales.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" % candidate for regression. -gp \header { texidoc="Converting LilyPond input to MIDI and then again back with diff --git a/input/regression/midi-transposition.ly b/input/regression/midi-transposition.ly index 06c729e13f..8c6da9a33d 100644 --- a/input/regression/midi-transposition.ly +++ b/input/regression/midi-transposition.ly @@ -2,7 +2,7 @@ { texidoc = "should deliver f' in MIDI" } -\version "2.11.51" +\version "2.12.0" \score { { diff --git a/input/regression/midi-tuplets.ly b/input/regression/midi-tuplets.ly index e0235b5245..89fbe822c2 100644 --- a/input/regression/midi-tuplets.ly +++ b/input/regression/midi-tuplets.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = " diff --git a/input/regression/midi-volume-equaliser.ly b/input/regression/midi-volume-equaliser.ly index 8f87a74078..7586ae4a35 100644 --- a/input/regression/midi-volume-equaliser.ly +++ b/input/regression/midi-volume-equaliser.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "@cindex Midi Volume Equaliser The full orchestra plays a note, where groups stop one after diff --git a/input/regression/mm-rests2.ly b/input/regression/mm-rests2.ly index e209287275..e997d55b48 100644 --- a/input/regression/mm-rests2.ly +++ b/input/regression/mm-rests2.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" diff --git a/input/regression/multi-measure-rest-center.ly b/input/regression/multi-measure-rest-center.ly index 781ed5c4a2..9189e0c6a8 100644 --- a/input/regression/multi-measure-rest-center.ly +++ b/input/regression/multi-measure-rest-center.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "The multimeasure rest is centered exactly between bar lines." diff --git a/input/regression/multi-measure-rest-center2.ly b/input/regression/multi-measure-rest-center2.ly index aca8f0b093..22eaae2cd0 100644 --- a/input/regression/multi-measure-rest-center2.ly +++ b/input/regression/multi-measure-rest-center2.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/multi-measure-rest-grace.ly b/input/regression/multi-measure-rest-grace.ly index 577b55b5d6..1e5d20359f 100644 --- a/input/regression/multi-measure-rest-grace.ly +++ b/input/regression/multi-measure-rest-grace.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/multi-measure-rest-instr-name.ly b/input/regression/multi-measure-rest-instr-name.ly index 0def9abbd2..70c01d70fa 100644 --- a/input/regression/multi-measure-rest-instr-name.ly +++ b/input/regression/multi-measure-rest-instr-name.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "There are both long and short instrument names. diff --git a/input/regression/multi-measure-rest-multi-staff-center.ly b/input/regression/multi-measure-rest-multi-staff-center.ly index a6cbd86151..14ddd436cf 100644 --- a/input/regression/multi-measure-rest-multi-staff-center.ly +++ b/input/regression/multi-measure-rest-multi-staff-center.ly @@ -4,7 +4,7 @@ independent on prefatory matter in other staves." } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t } diff --git a/input/regression/multi-measure-rest-spacing.ly b/input/regression/multi-measure-rest-spacing.ly index 1aaa6298d5..e0f268b176 100644 --- a/input/regression/multi-measure-rest-spacing.ly +++ b/input/regression/multi-measure-rest-spacing.ly @@ -8,7 +8,7 @@ extra spacing column is created. This should not cause problems." ragged-right = ##t } -\version "2.11.51" +\version "2.12.0" << diff --git a/input/regression/multi-measure-rest-text.ly b/input/regression/multi-measure-rest-text.ly index 1df15fcb19..05ab44cd81 100644 --- a/input/regression/multi-measure-rest-text.ly +++ b/input/regression/multi-measure-rest-text.ly @@ -1,4 +1,4 @@ -\version "2.11.57" +\version "2.12.0" \header { diff --git a/input/regression/multi-measure-rest-usebreve.ly b/input/regression/multi-measure-rest-usebreve.ly index 14e6ecc4b2..9bb8af348f 100644 --- a/input/regression/multi-measure-rest-usebreve.ly +++ b/input/regression/multi-measure-rest-usebreve.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc="For longer measure lengths, the breve rest is used." diff --git a/input/regression/multi-measure-rest.ly b/input/regression/multi-measure-rest.ly index e56edbf99a..7edfd5939e 100644 --- a/input/regression/multi-measure-rest.ly +++ b/input/regression/multi-measure-rest.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" diff --git a/input/regression/music-function-end-spanners.ly b/input/regression/music-function-end-spanners.ly index 3250372274..510af5eddd 100644 --- a/input/regression/music-function-end-spanners.ly +++ b/input/regression/music-function-end-spanners.ly @@ -6,7 +6,7 @@ end span events at the end of a note." } -\version "2.11.51" +\version "2.12.0" \paper{ ragged-right = ##T } diff --git a/input/regression/music-function.ly b/input/regression/music-function.ly index 5424dede7c..6a6ade9ce3 100644 --- a/input/regression/music-function.ly +++ b/input/regression/music-function.ly @@ -7,7 +7,7 @@ demonstrate a @code{\myBar} function, which works similar to @code{\bar}, but is implemented completely in Scheme." } -\version "2.11.51" +\version "2.12.0" myBar = #(define-music-function (parser location bar-type) (string?) (context-spec-music diff --git a/input/regression/music-map.ly b/input/regression/music-map.ly index 3afea4a35b..661dc03511 100644 --- a/input/regression/music-map.ly +++ b/input/regression/music-map.ly @@ -10,7 +10,7 @@ and dynamics are left over. These are put onto the 2nd measure." } -\version "2.11.51" +\version "2.12.0" #(define (notes-to-skip m) "Convert all stuff with duration (notes, lyrics, bass figures, etc.) to skips. diff --git a/input/regression/musicxml/GNUmakefile b/input/regression/musicxml/GNUmakefile index 0373860e6c..bc0f6b519d 100644 --- a/input/regression/musicxml/GNUmakefile +++ b/input/regression/musicxml/GNUmakefile @@ -22,4 +22,4 @@ local-WWW-2: zip zip: $(outdir)/MusicXML-TestSuite-$(TEST_SUITE_VERSION).zip $(outdir)/MusicXML-TestSuite-$(TEST_SUITE_VERSION).zip: $(MUSICXML_FILES) $(MUSICMXL_FILES) - $(ZIP) -r $@ $(MUSICXML_FILES) $(MUSICMXL_FILES) + $(ZIP) -r $@ $(addprefix $(src-dir)/,$(MUSICXML_FILES)) $(addprefix $(src-dir)/,$(MUSICMXL_FILES)) diff --git a/input/regression/newaddlyrics.ly b/input/regression/newaddlyrics.ly index c4c59d26a7..7b455e74f8 100644 --- a/input/regression/newaddlyrics.ly +++ b/input/regression/newaddlyrics.ly @@ -26,4 +26,4 @@ } >> -\version "2.11.51" +\version "2.12.0" diff --git a/input/regression/no-staff.ly b/input/regression/no-staff.ly index 4254916def..a261fbe83e 100644 --- a/input/regression/no-staff.ly +++ b/input/regression/no-staff.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" % possible rename to staff-something. -gp \header{ texidoc = "@cindex Staff Remove diff --git a/input/regression/non-centered-bar-lines.ly b/input/regression/non-centered-bar-lines.ly index 3c0738c96c..8749ae0f51 100644 --- a/input/regression/non-centered-bar-lines.ly +++ b/input/regression/non-centered-bar-lines.ly @@ -1,4 +1,4 @@ -\version "2.11.52" +\version "2.12.0" \header { texidoc = "Bar lines are positioned correctly when using custom staves which are not centered around position@tie{}0. diff --git a/input/regression/non-empty-text.ly b/input/regression/non-empty-text.ly index 2de070a573..f4d9e94e3d 100644 --- a/input/regression/non-empty-text.ly +++ b/input/regression/non-empty-text.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" By default, text is set with empty horizontal dimensions. diff --git a/input/regression/note-head-chord.ly b/input/regression/note-head-chord.ly index 73a7ff8eba..cf68bae01b 100644 --- a/input/regression/note-head-chord.ly +++ b/input/regression/note-head-chord.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Note heads are flipped on the stem to prevent collisions. diff --git a/input/regression/note-head-harmonic-dotted.ly b/input/regression/note-head-harmonic-dotted.ly index f7e4f48b24..9f15136a83 100644 --- a/input/regression/note-head-harmonic-dotted.ly +++ b/input/regression/note-head-harmonic-dotted.ly @@ -1,4 +1,4 @@ -\version "2.11.58" +\version "2.12.0" \header { texidoc = " diff --git a/input/regression/note-head-harmonic-whole.ly b/input/regression/note-head-harmonic-whole.ly index 64eba923e9..be2b49aa79 100644 --- a/input/regression/note-head-harmonic-whole.ly +++ b/input/regression/note-head-harmonic-whole.ly @@ -6,7 +6,7 @@ } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t diff --git a/input/regression/note-head-harmonic.ly b/input/regression/note-head-harmonic.ly index 9edbc5427a..775ab0c93b 100644 --- a/input/regression/note-head-harmonic.ly +++ b/input/regression/note-head-harmonic.ly @@ -13,7 +13,7 @@ ragged-right = ##t } -\version "2.11.51" +\version "2.12.0" { diff --git a/input/regression/note-head-solfa.ly b/input/regression/note-head-solfa.ly index dcde23c6d8..b4d24ca852 100644 --- a/input/regression/note-head-solfa.ly +++ b/input/regression/note-head-solfa.ly @@ -5,7 +5,7 @@ is adjusted according to the step of the scale, as measured relative to the @code{tonic} property." } -\version "2.11.51" +\version "2.12.0" fragment = { \key c \major diff --git a/input/regression/note-head-style.ly b/input/regression/note-head-style.ly index 3071c54de6..98d33a27f5 100644 --- a/input/regression/note-head-style.ly +++ b/input/regression/note-head-style.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" Note head shapes may be set from several choices. diff --git a/input/regression/note-line.ly b/input/regression/note-line.ly index 47c35f9d09..a59378224e 100644 --- a/input/regression/note-line.ly +++ b/input/regression/note-line.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Note head lines (e.g. glissando) diff --git a/input/regression/number-staff-lines.ly b/input/regression/number-staff-lines.ly index fa673aac2f..72ce5649fa 100644 --- a/input/regression/number-staff-lines.ly +++ b/input/regression/number-staff-lines.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" The number of stafflines of a staff can be set. Ledger diff --git a/input/regression/optimal-page-breaking-hstretch.ly b/input/regression/optimal-page-breaking-hstretch.ly index 1ffdb31aee..3205a976d5 100644 --- a/input/regression/optimal-page-breaking-hstretch.ly +++ b/input/regression/optimal-page-breaking-hstretch.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc="The optimal page breaker will stretch the diff --git a/input/regression/option-help.ly b/input/regression/option-help.ly index da820deac2..db2a869d74 100644 --- a/input/regression/option-help.ly +++ b/input/regression/option-help.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Print the option help text, for comparison against diff --git a/input/regression/ottava-broken.ly b/input/regression/ottava-broken.ly index a97629e714..f9263c7596 100644 --- a/input/regression/ottava-broken.ly +++ b/input/regression/ottava-broken.ly @@ -10,7 +10,7 @@ the end of the line (regardless of prefatory matter). } -\version "2.11.53" +\version "2.12.0" \layout { ragged-right = ##t } diff --git a/input/regression/ottava-edge.ly b/input/regression/ottava-edge.ly index 604b583952..4a4680fe59 100644 --- a/input/regression/ottava-edge.ly +++ b/input/regression/ottava-edge.ly @@ -5,7 +5,7 @@ "Both edge heights of an ottava bracket can be specified." } -\version "2.11.53" +\version "2.12.0" \layout { ragged-right = ##t} diff --git a/input/regression/ottava.ly b/input/regression/ottava.ly index 3aa9e03532..1c133a195a 100644 --- a/input/regression/ottava.ly +++ b/input/regression/ottava.ly @@ -11,7 +11,7 @@ markup can be tuned with @code{Staff.ottavation}. } -\version "2.11.53" +\version "2.12.0" %% . There must be a minimum distance between the octavation line and the %% topmost staff line, taking into account the height of the closing diff --git a/input/regression/override-nest.ly b/input/regression/override-nest.ly index f06eaa33cd..b1445374ad 100644 --- a/input/regression/override-nest.ly +++ b/input/regression/override-nest.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Sublist of grob property lists may be also tuned. In the diff --git a/input/regression/page-break-between-scores.ly b/input/regression/page-break-between-scores.ly index 37616ecb9c..9ec2278784 100644 --- a/input/regression/page-break-between-scores.ly +++ b/input/regression/page-break-between-scores.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Page breaks work when they are placed at the end of a score, diff --git a/input/regression/page-break-turn-toplevel.ly b/input/regression/page-break-turn-toplevel.ly index bd3bc2506b..6c5feeb30f 100644 --- a/input/regression/page-break-turn-toplevel.ly +++ b/input/regression/page-break-turn-toplevel.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Page breaking and page turning commands (@code{\\pageBreak}, diff --git a/input/regression/page-break-warn-forbidden.ly b/input/regression/page-break-warn-forbidden.ly index 0e5d07a4e2..9b417333bd 100644 --- a/input/regression/page-break-warn-forbidden.ly +++ b/input/regression/page-break-warn-forbidden.ly @@ -6,7 +6,7 @@ } -\version "2.11.51" +\version "2.12.0" \new Staff { c'1 \glissando diff --git a/input/regression/page-breaking-page-count1.ly b/input/regression/page-breaking-page-count1.ly index 35a8d5e8b4..a7132a3f81 100644 --- a/input/regression/page-breaking-page-count1.ly +++ b/input/regression/page-breaking-page-count1.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "The number of pages in a score can be forced by setting diff --git a/input/regression/page-breaking-page-count2.ly b/input/regression/page-breaking-page-count2.ly index 33f4c04bb4..749f091ad3 100644 --- a/input/regression/page-breaking-page-count2.ly +++ b/input/regression/page-breaking-page-count2.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "The number of pages in a score can be forced by setting diff --git a/input/regression/page-breaking-page-count3.ly b/input/regression/page-breaking-page-count3.ly index bd82d1f6c0..a6c5156778 100644 --- a/input/regression/page-breaking-page-count3.ly +++ b/input/regression/page-breaking-page-count3.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "The number of pages in a score can be forced by setting diff --git a/input/regression/page-breaks.ly b/input/regression/page-breaks.ly index 83b88dea90..dc481627d0 100644 --- a/input/regression/page-breaks.ly +++ b/input/regression/page-breaks.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/page-label.ly b/input/regression/page-label.ly index 4ec9ee363d..6c57725739 100644 --- a/input/regression/page-label.ly +++ b/input/regression/page-label.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Page labels may be placed inside music or at top-level, diff --git a/input/regression/page-layout-manual-position.ly b/input/regression/page-layout-manual-position.ly index 7d5971c252..2335c6979d 100644 --- a/input/regression/page-layout-manual-position.ly +++ b/input/regression/page-layout-manual-position.ly @@ -8,7 +8,7 @@ systems may be placed absolutely on the printable area of the page." } -\version "2.11.51" +\version "2.12.0" #(set-default-paper-size "a6" 'portrait) diff --git a/input/regression/page-layout-twopass.ly b/input/regression/page-layout-twopass.ly index 41cacdc8d6..c1e93dfc1d 100644 --- a/input/regression/page-layout-twopass.ly +++ b/input/regression/page-layout-twopass.ly @@ -3,7 +3,7 @@ texidoc = "Page breaking details can be stored for later reference." } -\version "2.11.51" +\version "2.12.0" \paper { #(define write-page-layout #t) diff --git a/input/regression/page-layout.ly b/input/regression/page-layout.ly index 807f05ddda..6674e53e43 100644 --- a/input/regression/page-layout.ly +++ b/input/regression/page-layout.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" diff --git a/input/regression/page-limited-space.ly b/input/regression/page-limited-space.ly index 5eeb2a4461..7dcce9a259 100644 --- a/input/regression/page-limited-space.ly +++ b/input/regression/page-limited-space.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" #(set-default-paper-size "a6") \header { diff --git a/input/regression/page-minimal-page-breaking-last-page.ly b/input/regression/page-minimal-page-breaking-last-page.ly index 60a94d27af..3094b8c1be 100644 --- a/input/regression/page-minimal-page-breaking-last-page.ly +++ b/input/regression/page-minimal-page-breaking-last-page.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" #(set-default-paper-size "a6") \header { diff --git a/input/regression/page-minimal-page-breaking.ly b/input/regression/page-minimal-page-breaking.ly index 61e09c5984..d41d796456 100644 --- a/input/regression/page-minimal-page-breaking.ly +++ b/input/regression/page-minimal-page-breaking.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" #(set-default-paper-size "a6") \header { diff --git a/input/regression/page-spacing.ly b/input/regression/page-spacing.ly index d5277d2057..dfafe2f1be 100644 --- a/input/regression/page-spacing.ly +++ b/input/regression/page-spacing.ly @@ -13,7 +13,7 @@ By setting @code{annotate-spacing}, we can see the effect of each property. } -\version "2.11.51" +\version "2.12.0" #(set-global-staff-size 11) diff --git a/input/regression/page-top-space.ly b/input/regression/page-top-space.ly index b8c4596602..fe84708be8 100644 --- a/input/regression/page-top-space.ly +++ b/input/regression/page-top-space.ly @@ -4,7 +4,7 @@ first system can be forced to be uniform." } -\version "2.11.51" +\version "2.12.0" #(set-default-paper-size "a6") diff --git a/input/regression/page-turn-page-breaking-auto-first-page.ly b/input/regression/page-turn-page-breaking-auto-first-page.ly index 53c5621f16..a9c3f31bf9 100644 --- a/input/regression/page-turn-page-breaking-auto-first-page.ly +++ b/input/regression/page-turn-page-breaking-auto-first-page.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "By default, we start with page 1, which is on the right hand side diff --git a/input/regression/page-turn-page-breaking-auto-first-page2.ly b/input/regression/page-turn-page-breaking-auto-first-page2.ly index 5f0faeeba6..a71c222e63 100644 --- a/input/regression/page-turn-page-breaking-auto-first-page2.ly +++ b/input/regression/page-turn-page-breaking-auto-first-page2.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "By default, we start with page 1, which is on the right hand side diff --git a/input/regression/page-turn-page-breaking-badturns.ly b/input/regression/page-turn-page-breaking-badturns.ly index 3bc8dddde1..6780c7ee56 100644 --- a/input/regression/page-turn-page-breaking-badturns.ly +++ b/input/regression/page-turn-page-breaking-badturns.ly @@ -1,4 +1,4 @@ -\version "2.11.58" +\version "2.12.0" \header { texidoc="If there are no good places to have a page turn, diff --git a/input/regression/page-turn-page-breaking-repeats.ly b/input/regression/page-turn-page-breaking-repeats.ly index 4834ceb0d1..377db25c55 100644 --- a/input/regression/page-turn-page-breaking-repeats.ly +++ b/input/regression/page-turn-page-breaking-repeats.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "The page-turn engraver will not count potential page diff --git a/input/regression/page-turn-page-breaking.ly b/input/regression/page-turn-page-breaking.ly index 45c033167a..371613f45b 100644 --- a/input/regression/page-turn-page-breaking.ly +++ b/input/regression/page-turn-page-breaking.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc="The page-turn breaker will put a page turn after diff --git a/input/regression/parenthesize-singlenotes-chords-rests.ly b/input/regression/parenthesize-singlenotes-chords-rests.ly index 30e381beb9..007eafc0ff 100644 --- a/input/regression/parenthesize-singlenotes-chords-rests.ly +++ b/input/regression/parenthesize-singlenotes-chords-rests.ly @@ -10,7 +10,7 @@ ragged-right = ##t } -\version "2.11.51" +\version "2.12.0" \relative c'' { diff --git a/input/regression/parenthesize.ly b/input/regression/parenthesize.ly index c440fa8d81..737e2c00d2 100644 --- a/input/regression/parenthesize.ly +++ b/input/regression/parenthesize.ly @@ -12,7 +12,7 @@ ragged-right = ##t } -\version "2.11.51" +\version "2.12.0" \relative { c4 -\parenthesize -. diff --git a/input/regression/part-combine-a2.ly b/input/regression/part-combine-a2.ly index b67cdadce9..3757d4bc7a 100644 --- a/input/regression/part-combine-a2.ly +++ b/input/regression/part-combine-a2.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc ="The a2 string is printed only on notes (i.e. not on rests), and only after chords, solo or polyphony." diff --git a/input/regression/part-combine-cross.ly b/input/regression/part-combine-cross.ly index b6097e9425..382e23d3d2 100644 --- a/input/regression/part-combine-cross.ly +++ b/input/regression/part-combine-cross.ly @@ -4,7 +4,7 @@ " } -\version "2.11.51" +\version "2.12.0" vone = \relative a' { g4 g f f e e d d } vtwo = \relative a' { e4 e f f g g a a } diff --git a/input/regression/part-combine-global.ly b/input/regression/part-combine-global.ly index 0016c04b5d..9c5ef8dae2 100644 --- a/input/regression/part-combine-global.ly +++ b/input/regression/part-combine-global.ly @@ -11,7 +11,7 @@ voices. " } -\version "2.11.51" +\version "2.12.0" vone = diff --git a/input/regression/part-combine-markup.ly b/input/regression/part-combine-markup.ly index ee054345c8..18a30b86a2 100644 --- a/input/regression/part-combine-markup.ly +++ b/input/regression/part-combine-markup.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Part combine texts accept markup." diff --git a/input/regression/part-combine-mmrest-after-solo.ly b/input/regression/part-combine-mmrest-after-solo.ly index 70545a0fb4..8b0be53557 100644 --- a/input/regression/part-combine-mmrest-after-solo.ly +++ b/input/regression/part-combine-mmrest-after-solo.ly @@ -1,7 +1,7 @@ \header { texidoc = " Multimeasure rests are printed after solos, both for solo1 and for solo2." } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t } \new Staff diff --git a/input/regression/part-combine-solo-end.ly b/input/regression/part-combine-solo-end.ly index bb2f7cb858..63c1318910 100644 --- a/input/regression/part-combine-solo-end.ly +++ b/input/regression/part-combine-solo-end.ly @@ -6,7 +6,7 @@ } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t } << diff --git a/input/regression/part-combine-solo-global.ly b/input/regression/part-combine-solo-global.ly index f72e8b1a88..5f0e7b8414 100644 --- a/input/regression/part-combine-solo-global.ly +++ b/input/regression/part-combine-solo-global.ly @@ -5,7 +5,7 @@ } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } \new Staff diff --git a/input/regression/part-combine-solo.ly b/input/regression/part-combine-solo.ly index 44ccbeee8f..6d7dc89c41 100644 --- a/input/regression/part-combine-solo.ly +++ b/input/regression/part-combine-solo.ly @@ -17,7 +17,7 @@ Solo 1/2 can not be used when a spanner is active, so there is no solo vone = \relative a' { d4 r8 d8 d8 r8 d8 r8 d2 ~ d2 ~ d4 } vtwo = \relative g' { g4. g8 r2 g4 r4 r2 g4 } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } diff --git a/input/regression/part-combine-text.ly b/input/regression/part-combine-text.ly index fc24962234..675b7c37a8 100644 --- a/input/regression/part-combine-text.ly +++ b/input/regression/part-combine-text.ly @@ -9,7 +9,7 @@ texts accordingly. } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right= ##t } diff --git a/input/regression/part-combine-tuplet-end.ly b/input/regression/part-combine-tuplet-end.ly index ed3d036cea..87552a19a5 100644 --- a/input/regression/part-combine-tuplet-end.ly +++ b/input/regression/part-combine-tuplet-end.ly @@ -5,7 +5,7 @@ even after a switch, a tuplet ends correctly." } -\version "2.11.51" +\version "2.12.0" \new Staff << \partcombine diff --git a/input/regression/part-combine-tuplet-single.ly b/input/regression/part-combine-tuplet-single.ly index 5cb9c97717..2a2e100a3f 100644 --- a/input/regression/part-combine-tuplet-single.ly +++ b/input/regression/part-combine-tuplet-single.ly @@ -5,7 +5,7 @@ \paper { ragged-right = ##T } -\version "2.11.51" +\version "2.12.0" \score { << diff --git a/input/regression/part-combine.ly b/input/regression/part-combine.ly index 89f5fd5fcb..13a0d82096 100644 --- a/input/regression/part-combine.ly +++ b/input/regression/part-combine.ly @@ -11,7 +11,7 @@ \layout { ragged-right = ##t } -\version "2.11.51" +\version "2.12.0" vone = \relative a' { g2 g g g4 g f' c c( c) c c c ~ c diff --git a/input/regression/pedal-bracket.ly b/input/regression/pedal-bracket.ly index 24fddc20ee..b8659e3625 100644 --- a/input/regression/pedal-bracket.ly +++ b/input/regression/pedal-bracket.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/pedal-end.ly b/input/regression/pedal-end.ly index 2db41f63ec..2539d8563b 100644 --- a/input/regression/pedal-end.ly +++ b/input/regression/pedal-end.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Unterminated piano pedal brackets run to the end of the piece. " diff --git a/input/regression/pedal-ped.ly b/input/regression/pedal-ped.ly index 2d6660b2e0..a0101ff071 100644 --- a/input/regression/pedal-ped.ly +++ b/input/regression/pedal-ped.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "The standard piano pedals style comes with Ped symbols. diff --git a/input/regression/phrasing-slur-dash.ly b/input/regression/phrasing-slur-dash.ly index 6fad54b21e..f8b13f57d9 100644 --- a/input/regression/phrasing-slur-dash.ly +++ b/input/regression/phrasing-slur-dash.ly @@ -1,4 +1,4 @@ -\version "2.11.65" +\version "2.12.0" \header { texidoc = " The appearance of phrasing slurs may be changed from solid to dotted or dashed. " diff --git a/input/regression/phrasing-slur-slur-avoid.ly b/input/regression/phrasing-slur-slur-avoid.ly index dd44fe6e5d..c94cd38fb8 100644 --- a/input/regression/phrasing-slur-slur-avoid.ly +++ b/input/regression/phrasing-slur-slur-avoid.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc="@code{PhrasingSlur}s go over normal slurs." } diff --git a/input/regression/phrasing-slur-tuplet.ly b/input/regression/phrasing-slur-tuplet.ly index 8d017f4c5f..968a899095 100644 --- a/input/regression/phrasing-slur-tuplet.ly +++ b/input/regression/phrasing-slur-tuplet.ly @@ -1,4 +1,4 @@ -\version "2.11.58" +\version "2.12.0" \header { texidoc = "Phrasing slurs do not collide with tuplet numbers." diff --git a/input/regression/predefined-fretboards.ly b/input/regression/predefined-fretboards.ly index 379eb8f6a7..00a9397ff6 100644 --- a/input/regression/predefined-fretboards.ly +++ b/input/regression/predefined-fretboards.ly @@ -1,17 +1,18 @@ +\version "2.12.0" + % add a chord shape -\version "2.11.56" -\addChordShape #'bes #"x;1-1-(;3-2;3-3;3-4;1-1-);" +\addChordShape #'bes #guitar-tuning #"x;1-1-(;3-2;3-3;3-4;1-1-);" % add chords \storePredefinedDiagram \chordmode {bes} #guitar-tuning - #(chord-shape 'bes) + #(chord-shape 'bes guitar-tuning) \storePredefinedDiagram \chordmode {c} #guitar-tuning - #(offset-fret 2 (chord-shape 'bes)) + #(offset-fret 2 (chord-shape 'bes guitar-tuning)) mychords = \chordmode { bes diff --git a/input/regression/prefatory-empty-spacing.ly b/input/regression/prefatory-empty-spacing.ly index 0fc715a705..6d88242c0a 100644 --- a/input/regression/prefatory-empty-spacing.ly +++ b/input/regression/prefatory-empty-spacing.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/prefatory-spacing-matter.ly b/input/regression/prefatory-spacing-matter.ly index 11d714a7b8..79d8eb4551 100644 --- a/input/regression/prefatory-spacing-matter.ly +++ b/input/regression/prefatory-spacing-matter.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Distances between prefatory items (e.g. clef, bar, diff --git a/input/regression/profile-property-access.ly b/input/regression/profile-property-access.ly index 0d31849fc8..4502719f68 100644 --- a/input/regression/profile-property-access.ly +++ b/input/regression/profile-property-access.ly @@ -7,7 +7,7 @@ #(ly:set-option 'profile-property-accesses #t) -\version "2.11.51" +\version "2.12.0" \include "../../input/typography-demo.ly" %\book { \score { {c4 } } } diff --git a/input/regression/property-grace-polyphony.ly b/input/regression/property-grace-polyphony.ly index 9c2fd46ec3..50125f2f6f 100644 --- a/input/regression/property-grace-polyphony.ly +++ b/input/regression/property-grace-polyphony.ly @@ -7,7 +7,7 @@ } \layout { ragged-right = ##t } -\version "2.11.51" +\version "2.12.0" \relative c'' { << { \grace e8 d2 } diff --git a/input/regression/property-nested-override.ly b/input/regression/property-nested-override.ly index 59bd26ff28..bfd63a7ed4 100644 --- a/input/regression/property-nested-override.ly +++ b/input/regression/property-nested-override.ly @@ -1,4 +1,4 @@ -\version "2.11.65" +\version "2.12.0" \header { texidoc = "Nested properties may be overridden using Scheme list syntax. This test performs two property overrides: the first diff --git a/input/regression/property-nested-revert.ly b/input/regression/property-nested-revert.ly index 3163cded46..139169ad2c 100644 --- a/input/regression/property-nested-revert.ly +++ b/input/regression/property-nested-revert.ly @@ -6,7 +6,7 @@ Scheme list syntax." } -\version "2.11.51" +\version "2.12.0" \relative { f2 \glissando c diff --git a/input/regression/property-once.ly b/input/regression/property-once.ly index e5d801e012..c03b0ed614 100644 --- a/input/regression/property-once.ly +++ b/input/regression/property-once.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Once properties take effect during a single time step only." } diff --git a/input/regression/quote-cue-during.ly b/input/regression/quote-cue-during.ly index 5593570e5e..2caea5994a 100644 --- a/input/regression/quote-cue-during.ly +++ b/input/regression/quote-cue-during.ly @@ -11,7 +11,7 @@ last note." } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t } diff --git a/input/regression/quote-cyclic.ly b/input/regression/quote-cyclic.ly index d259b3d49a..d55017c09d 100644 --- a/input/regression/quote-cyclic.ly +++ b/input/regression/quote-cyclic.ly @@ -6,7 +6,7 @@ example, there are notes with each full-bar rest." } -\version "2.11.51" +\version "2.12.0" A = \relative c' { c4 d e f | \cueDuring #"qB" #1 { R1 } | } B = \relative c' { \cueDuring #"qA" #1 { R1 } | f4 e d c | } diff --git a/input/regression/quote-during.ly b/input/regression/quote-during.ly index f28219d99a..225bf6ebdd 100644 --- a/input/regression/quote-during.ly +++ b/input/regression/quote-during.ly @@ -8,7 +8,7 @@ quoted. In this example, a 16th rest is not quoted, since @code{rest-event} is not in @code{quotedEventTypes}." } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t } diff --git a/input/regression/quote-grace.ly b/input/regression/quote-grace.ly index c3854eb427..b276bc5b92 100644 --- a/input/regression/quote-grace.ly +++ b/input/regression/quote-grace.ly @@ -7,7 +7,7 @@ } \paper { ragged-right= ##t } -\version "2.11.51" +\version "2.12.0" quoted = \relative c'' { R1 \grace g16 f4 \grace a16 bes4 \grace b16 c4 c4 diff --git a/input/regression/quote-tie.ly b/input/regression/quote-tie.ly index 628d0abf6d..76eeefd0ac 100644 --- a/input/regression/quote-tie.ly +++ b/input/regression/quote-tie.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/quote-transposition.ly b/input/regression/quote-transposition.ly index a61a9ad292..6138485c0a 100644 --- a/input/regression/quote-transposition.ly +++ b/input/regression/quote-transposition.ly @@ -10,7 +10,7 @@ quoted ones) will transposed as well. " } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t } diff --git a/input/regression/quote-tuplet-end.ly b/input/regression/quote-tuplet-end.ly index f4cfbe192c..ccb100f1b1 100644 --- a/input/regression/quote-tuplet-end.ly +++ b/input/regression/quote-tuplet-end.ly @@ -3,7 +3,7 @@ texidoc ="Tuplet bracket ends properly when quoting." } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } diff --git a/input/regression/quote-tuplet.ly b/input/regression/quote-tuplet.ly index a6d6974938..6ce70dfe06 100644 --- a/input/regression/quote-tuplet.ly +++ b/input/regression/quote-tuplet.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/quote.ly b/input/regression/quote.ly index f8e7ae6132..759a3d0a4f 100644 --- a/input/regression/quote.ly +++ b/input/regression/quote.ly @@ -7,7 +7,7 @@ things are quoted. In this example, a 16th rest is not quoted, since @code{rest-event} is not in @code{quotedEventTypes}." } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t } diff --git a/input/regression/ragged-bottom-one-page.ly b/input/regression/ragged-bottom-one-page.ly index 07f8f3885d..8e3cff69fb 100644 --- a/input/regression/ragged-bottom-one-page.ly +++ b/input/regression/ragged-bottom-one-page.ly @@ -1,4 +1,4 @@ -\version "2.11.64" +\version "2.12.0" \header { texidoc = "For a one-page score, ragged-bottom should have the diff --git a/input/regression/ragged-right-compressed.ly b/input/regression/ragged-right-compressed.ly index a6ef7c6f63..d487bbff52 100644 --- a/input/regression/ragged-right-compressed.ly +++ b/input/regression/ragged-right-compressed.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "When a score takes up only a single line and it is compressed, it diff --git a/input/regression/ragged-right-disabled.ly b/input/regression/ragged-right-disabled.ly index 5a21340a6d..b1b20bd6d5 100644 --- a/input/regression/ragged-right-disabled.ly +++ b/input/regression/ragged-right-disabled.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "When ragged-right is specifically disabled, a score with only one diff --git a/input/regression/ragged-right-one-line.ly b/input/regression/ragged-right-one-line.ly index dcb38a4d27..eb134d1849 100644 --- a/input/regression/ragged-right-one-line.ly +++ b/input/regression/ragged-right-one-line.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "When a score takes up only a single line and it is stretched, it diff --git a/input/regression/rehearsal-mark-align-priority.ly b/input/regression/rehearsal-mark-align-priority.ly index 1f02c7de70..c4a6b525ec 100644 --- a/input/regression/rehearsal-mark-align-priority.ly +++ b/input/regression/rehearsal-mark-align-priority.ly @@ -4,7 +4,7 @@ the alignment depends on which symbols are visible." } -\version "2.11.51" +\version "2.12.0" \relative { \override Score.RehearsalMark #'break-align-symbols = #'(clef key-signature staff-bar) diff --git a/input/regression/rehearsal-mark-align-staff-context.ly b/input/regression/rehearsal-mark-align-staff-context.ly index 0d2d4298a2..4fd1171c14 100644 --- a/input/regression/rehearsal-mark-align-staff-context.ly +++ b/input/regression/rehearsal-mark-align-staff-context.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "RehearsalMarks still align correctly if Mark_engraver is moved to diff --git a/input/regression/rehearsal-mark-align.ly b/input/regression/rehearsal-mark-align.ly index 0a5cde2292..d1f2fefe17 100644 --- a/input/regression/rehearsal-mark-align.ly +++ b/input/regression/rehearsal-mark-align.ly @@ -7,7 +7,7 @@ } -\version "2.11.51" +\version "2.12.0" \relative { c1 \mark "foo" diff --git a/input/regression/rehearsal-mark-letter.ly b/input/regression/rehearsal-mark-letter.ly index 04ea97688a..a54e1f8dea 100644 --- a/input/regression/rehearsal-mark-letter.ly +++ b/input/regression/rehearsal-mark-letter.ly @@ -8,7 +8,7 @@ after Z, double letters are used. The mark may be set with } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } \relative c'' { diff --git a/input/regression/rehearsal-mark-number.ly b/input/regression/rehearsal-mark-number.ly index 1110ca678b..3aab1f6af3 100644 --- a/input/regression/rehearsal-mark-number.ly +++ b/input/regression/rehearsal-mark-number.ly @@ -5,7 +5,7 @@ By setting @code{markFormatter} we may choose a different style of mark printing } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } diff --git a/input/regression/relative-repeat.ly b/input/regression/relative-repeat.ly index 7fbfd08f5b..4cf17989f0 100644 --- a/input/regression/relative-repeat.ly +++ b/input/regression/relative-repeat.ly @@ -1,7 +1,7 @@ \header { texidoc = "Relative mode for repeats uses order of entry." } -\version "2.11.51" +\version "2.12.0" \relative { \repeat "unfold" 3 diff --git a/input/regression/repeat-line-break.ly b/input/regression/repeat-line-break.ly index 8a7bbe5e50..e624ac4135 100644 --- a/input/regression/repeat-line-break.ly +++ b/input/regression/repeat-line-break.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" diff --git a/input/regression/repeat-percent-count-visibility.ly b/input/regression/repeat-percent-count-visibility.ly index 39e3fddb40..5266553766 100644 --- a/input/regression/repeat-percent-count-visibility.ly +++ b/input/regression/repeat-percent-count-visibility.ly @@ -1,4 +1,4 @@ -\version "2.11.64" +\version "2.12.0" \header { texidoc = " Percent repeat counters can be shown at regular diff --git a/input/regression/repeat-percent-count.ly b/input/regression/repeat-percent-count.ly index 22262e898e..e9cf8c6d98 100644 --- a/input/regression/repeat-percent-count.ly +++ b/input/regression/repeat-percent-count.ly @@ -9,7 +9,7 @@ only if there are more than two repeats." } -\version "2.11.51" +\version "2.12.0" \relative c'' \new Voice { \set countPercentRepeats = ##t diff --git a/input/regression/repeat-percent-grace.ly b/input/regression/repeat-percent-grace.ly index 276167b0f0..ffd9952485 100644 --- a/input/regression/repeat-percent-grace.ly +++ b/input/regression/repeat-percent-grace.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Percent repeats are also centered when there is a grace note in a parallel staff. " diff --git a/input/regression/repeat-percent-kerning.ly b/input/regression/repeat-percent-kerning.ly index 530fb1ab0f..0826c653be 100644 --- a/input/regression/repeat-percent-kerning.ly +++ b/input/regression/repeat-percent-kerning.ly @@ -1,4 +1,4 @@ -\version "2.11.65" +\version "2.12.0" \header { texidoc = "The positioning of dots and slashes in percent repeat glyphs can be altered using @code{dot-negative-kern} and diff --git a/input/regression/repeat-percent-skipbars.ly b/input/regression/repeat-percent-skipbars.ly index 28c6ec433d..d4bc04545c 100644 --- a/input/regression/repeat-percent-skipbars.ly +++ b/input/regression/repeat-percent-skipbars.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/repeat-percent.ly b/input/regression/repeat-percent.ly index 543ca6108d..412ac8e753 100644 --- a/input/regression/repeat-percent.ly +++ b/input/regression/repeat-percent.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Measure repeats may be nested with beat repeats." } diff --git a/input/regression/repeat-slash.ly b/input/regression/repeat-slash.ly index 731b8eec02..2434b16254 100644 --- a/input/regression/repeat-slash.ly +++ b/input/regression/repeat-slash.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Within a bar, beat repeats denote that a music snippet should be played again." diff --git a/input/regression/repeat-tie.ly b/input/regression/repeat-tie.ly index 3866bd747b..546232d548 100644 --- a/input/regression/repeat-tie.ly +++ b/input/regression/repeat-tie.ly @@ -5,7 +5,7 @@ note head." } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } diff --git a/input/regression/repeat-tremolo-beams.ly b/input/regression/repeat-tremolo-beams.ly index f0bcfd7ca6..997ff46491 100644 --- a/input/regression/repeat-tremolo-beams.ly +++ b/input/regression/repeat-tremolo-beams.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Each of the staves here should have four tremolo beams." diff --git a/input/regression/repeat-tremolo-dots.ly b/input/regression/repeat-tremolo-dots.ly index 200e8b3b5d..86652c8150 100644 --- a/input/regression/repeat-tremolo-dots.ly +++ b/input/regression/repeat-tremolo-dots.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Dots are added to tremolo notes if the durations involved require them." diff --git a/input/regression/repeat-unfold-all.ly b/input/regression/repeat-unfold-all.ly index b938cc2e73..92e8a47339 100644 --- a/input/regression/repeat-unfold-all.ly +++ b/input/regression/repeat-unfold-all.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Volta repeats may be unfolded through the music function @code{\unfoldRepeats}." diff --git a/input/regression/repeat-unfold-tremolo.ly b/input/regression/repeat-unfold-tremolo.ly index 7b5444077f..71b5ac5650 100644 --- a/input/regression/repeat-unfold-tremolo.ly +++ b/input/regression/repeat-unfold-tremolo.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Unfolding tremolo repeats. All fragments fill one diff --git a/input/regression/repeat-unfold.ly b/input/regression/repeat-unfold.ly index bacd676278..d2a5da49e0 100644 --- a/input/regression/repeat-unfold.ly +++ b/input/regression/repeat-unfold.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc="LilyPond has two modes for repeats: unfolded and semi-unfolded. diff --git a/input/regression/repeat-volta-skip-alternatives.ly b/input/regression/repeat-volta-skip-alternatives.ly index 505e024bf6..6cd3ee1ca4 100644 --- a/input/regression/repeat-volta-skip-alternatives.ly +++ b/input/regression/repeat-volta-skip-alternatives.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "When too few alternatives are present, the first diff --git a/input/regression/repeat-volta.ly b/input/regression/repeat-volta.ly index 647ed6f282..eb14c3cbd8 100644 --- a/input/regression/repeat-volta.ly +++ b/input/regression/repeat-volta.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" diff --git a/input/regression/rest-collision-beam-note.ly b/input/regression/rest-collision-beam-note.ly index e410265d51..30f2a43910 100644 --- a/input/regression/rest-collision-beam-note.ly +++ b/input/regression/rest-collision-beam-note.ly @@ -6,7 +6,7 @@ collisions can be combined." } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right=##t } diff --git a/input/regression/rest-collision-beam-quantized.ly b/input/regression/rest-collision-beam-quantized.ly index ef0bf41d97..0200d38c64 100644 --- a/input/regression/rest-collision-beam-quantized.ly +++ b/input/regression/rest-collision-beam-quantized.ly @@ -6,7 +6,7 @@ ragged-right = ##t } -\version "2.11.51" +\version "2.12.0" fig = \relative c' { 8[ diff --git a/input/regression/rest-collision-beam-restdir.ly b/input/regression/rest-collision-beam-restdir.ly index 572feaf594..642512bd8f 100644 --- a/input/regression/rest-collision-beam-restdir.ly +++ b/input/regression/rest-collision-beam-restdir.ly @@ -3,7 +3,7 @@ account properly." } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } diff --git a/input/regression/rest-collision-beam.ly b/input/regression/rest-collision-beam.ly index 38f1402987..1ec5441eb2 100644 --- a/input/regression/rest-collision-beam.ly +++ b/input/regression/rest-collision-beam.ly @@ -4,7 +4,7 @@ collision." } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } diff --git a/input/regression/rest-collision.ly b/input/regression/rest-collision.ly index e4f125e25d..1b98c177cf 100644 --- a/input/regression/rest-collision.ly +++ b/input/regression/rest-collision.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" Rests should not collide with beams, stems and noteheads. Rests may diff --git a/input/regression/rest-dot-position.ly b/input/regression/rest-dot-position.ly index 7da6357adf..78a587d58c 100644 --- a/input/regression/rest-dot-position.ly +++ b/input/regression/rest-dot-position.ly @@ -4,7 +4,7 @@ } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } diff --git a/input/regression/rest-ledger.ly b/input/regression/rest-ledger.ly index 58e02fd7f1..7ea955a369 100644 --- a/input/regression/rest-ledger.ly +++ b/input/regression/rest-ledger.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Whole and half rests moving outside the staff should get ledger lines." diff --git a/input/regression/rest-note-collision.ly b/input/regression/rest-note-collision.ly index c4f094dfbe..16a19df926 100644 --- a/input/regression/rest-note-collision.ly +++ b/input/regression/rest-note-collision.ly @@ -7,7 +7,7 @@ } -\version "2.11.51" +\version "2.12.0" \new Staff { << diff --git a/input/regression/rest-pitch.ly b/input/regression/rest-pitch.ly index 39736d6666..a413b7f4ca 100644 --- a/input/regression/rest-pitch.ly +++ b/input/regression/rest-pitch.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Rests can have pitches--these will be affected by diff --git a/input/regression/rest-pitched-beam.ly b/input/regression/rest-pitched-beam.ly index fa8a250fa9..a3f6c90e0a 100644 --- a/input/regression/rest-pitched-beam.ly +++ b/input/regression/rest-pitched-beam.ly @@ -4,7 +4,7 @@ } -\version "2.11.51" +\version "2.12.0" \relative c'{ a\rest a8[ a\rest b] diff --git a/input/regression/rest-polyphonic.ly b/input/regression/rest-polyphonic.ly index d260b90491..08e681a103 100644 --- a/input/regression/rest-polyphonic.ly +++ b/input/regression/rest-polyphonic.ly @@ -9,7 +9,7 @@ even if there is no opposite note or rest. The amount is two \layout { ragged-right = ##t } -\version "2.11.51" +\version "2.12.0" \new Staff \relative c' { diff --git a/input/regression/rest.ly b/input/regression/rest.ly index 62e9b58dd2..49656162bd 100644 --- a/input/regression/rest.ly +++ b/input/regression/rest.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" diff --git a/input/regression/rhythmic-staff.ly b/input/regression/rhythmic-staff.ly index 91bd361e43..10447e4b1e 100644 --- a/input/regression/rhythmic-staff.ly +++ b/input/regression/rhythmic-staff.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/safe.ly b/input/regression/safe.ly index 4d6d905896..00952f2ddd 100644 --- a/input/regression/safe.ly +++ b/input/regression/safe.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" "expect-error" = ##t diff --git a/input/regression/score-text.ly b/input/regression/score-text.ly index 183caacc8e..b662217acd 100644 --- a/input/regression/score-text.ly +++ b/input/regression/score-text.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/script-center-seconds.ly b/input/regression/script-center-seconds.ly index 1925d747fa..aab8e48c0d 100644 --- a/input/regression/script-center-seconds.ly +++ b/input/regression/script-center-seconds.ly @@ -4,7 +4,7 @@ } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t } \relative c''{ diff --git a/input/regression/script-collision.ly b/input/regression/script-collision.ly index 65634ffcc8..3277be73ef 100644 --- a/input/regression/script-collision.ly +++ b/input/regression/script-collision.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/script-horizontal-slur.ly b/input/regression/script-horizontal-slur.ly index 6aadddc5fc..67a86bcee5 100644 --- a/input/regression/script-horizontal-slur.ly +++ b/input/regression/script-horizontal-slur.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Horizontal scripts don't have @code{avoid-slur} set." diff --git a/input/regression/script-shift.ly b/input/regression/script-shift.ly new file mode 100644 index 0000000000..d5a3922643 --- /dev/null +++ b/input/regression/script-shift.ly @@ -0,0 +1,18 @@ + +\header { + texidoc = "The @code{toward-stem-shift} property controls the precise +horizontal location of scripts that are placed above an upstem or below +a downstem note (@code{0.0} means centered on the note head, @code{1.0} +means centered on the stem). +" +} + +\version "2.12.0" +\relative c'' +{ + \override Script #'toward-stem-shift = #0.0 + a4^. c_. + + \override Script #'toward-stem-shift = #1.0 + a4^. c_. +} diff --git a/input/regression/script-stack-horizontal.ly b/input/regression/script-stack-horizontal.ly index de71c33ec7..f5b0646e1d 100644 --- a/input/regression/script-stack-horizontal.ly +++ b/input/regression/script-stack-horizontal.ly @@ -8,7 +8,7 @@ The scripts should not be folded under the time signature. " } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t diff --git a/input/regression/script-stack-order.ly b/input/regression/script-stack-order.ly index 0ad7be2165..cca3c7656c 100644 --- a/input/regression/script-stack-order.ly +++ b/input/regression/script-stack-order.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Scripts can be stacked. The order is determined by a priority field, but when objects have the same priority, the input diff --git a/input/regression/script-stacked.ly b/input/regression/script-stacked.ly index c7ebf37346..a3d559b4d3 100644 --- a/input/regression/script-stacked.ly +++ b/input/regression/script-stacked.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \layout { ragged-right= ##t } diff --git a/input/regression/script-stem-tremolo.ly b/input/regression/script-stem-tremolo.ly index c8e717c859..1a58cf5223 100644 --- a/input/regression/script-stem-tremolo.ly +++ b/input/regression/script-stem-tremolo.ly @@ -3,7 +3,7 @@ texidoc = "Scripts avoid stem tremolos even if there is no visible stem." } -\version "2.11.51" +\version "2.12.0" \layout {ragged-right =##t} { diff --git a/input/regression/semi-tie-manual-direction.ly b/input/regression/semi-tie-manual-direction.ly index f075907251..5972277098 100644 --- a/input/regression/semi-tie-manual-direction.ly +++ b/input/regression/semi-tie-manual-direction.ly @@ -3,7 +3,7 @@ texidoc = "Semi tie directions may be forced from the input." } -\version "2.11.51" +\version "2.12.0" \layout{ ragged-right=##t diff --git a/input/regression/size11.ly b/input/regression/size11.ly index fda3b0f0c9..2f8223d525 100644 --- a/input/regression/size11.ly +++ b/input/regression/size11.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" diff --git a/input/regression/size13.ly b/input/regression/size13.ly index 8c9fcd288a..09a4b62ad5 100644 --- a/input/regression/size13.ly +++ b/input/regression/size13.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" foollilypondbook = " \score " diff --git a/input/regression/size16.ly b/input/regression/size16.ly index c8f34b1dc0..02260a969c 100644 --- a/input/regression/size16.ly +++ b/input/regression/size16.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" foollilypondbook = " \score " diff --git a/input/regression/size20.ly b/input/regression/size20.ly index 09cd4f4e33..c4eb50613f 100644 --- a/input/regression/size20.ly +++ b/input/regression/size20.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" foollilypondbook = " \score " diff --git a/input/regression/size23.ly b/input/regression/size23.ly index cbf472f945..5245045af8 100644 --- a/input/regression/size23.ly +++ b/input/regression/size23.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" foollilypondbook = " \score " diff --git a/input/regression/size26.ly b/input/regression/size26.ly index 5a2f7d111f..d9dbecb6e6 100644 --- a/input/regression/size26.ly +++ b/input/regression/size26.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" foollilypondbook = " \score " diff --git a/input/regression/skip-of-length.ly b/input/regression/skip-of-length.ly index f5a3bcd049..01c575f42d 100644 --- a/input/regression/skip-of-length.ly +++ b/input/regression/skip-of-length.ly @@ -7,7 +7,7 @@ last as long as their arguments." ragged-right = ##T } -\version "2.11.51" +\version "2.12.0" \relative << diff --git a/input/regression/skiptypesetting-bar-check.ly b/input/regression/skiptypesetting-bar-check.ly index 40f3746946..14721f0bee 100644 --- a/input/regression/skiptypesetting-bar-check.ly +++ b/input/regression/skiptypesetting-bar-check.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/skiptypesetting-show-first-and-last.ly b/input/regression/skiptypesetting-show-first-and-last.ly index 4dda5fa38c..1395cea129 100644 --- a/input/regression/skiptypesetting-show-first-and-last.ly +++ b/input/regression/skiptypesetting-show-first-and-last.ly @@ -5,7 +5,7 @@ } -\version "2.11.63" +\version "2.12.0" showFirstLength = R1*1 showLastLength = R1*2 diff --git a/input/regression/skiptypesetting-show-first.ly b/input/regression/skiptypesetting-show-first.ly index b8d2f6b3bb..027f33e365 100644 --- a/input/regression/skiptypesetting-show-first.ly +++ b/input/regression/skiptypesetting-show-first.ly @@ -4,7 +4,7 @@ } -\version "2.11.63" +\version "2.12.0" showFirstLength = R1*3 \paper { diff --git a/input/regression/skiptypesetting-show-last.ly b/input/regression/skiptypesetting-show-last.ly index cd280cde08..e1845924b0 100644 --- a/input/regression/skiptypesetting-show-last.ly +++ b/input/regression/skiptypesetting-show-last.ly @@ -4,7 +4,7 @@ } -\version "2.11.51" +\version "2.12.0" showLastLength = R1*3 \paper { diff --git a/input/regression/skiptypesetting-tuplet.ly b/input/regression/skiptypesetting-tuplet.ly index 4b7e51c2ae..07ec57e54e 100644 --- a/input/regression/skiptypesetting-tuplet.ly +++ b/input/regression/skiptypesetting-tuplet.ly @@ -7,7 +7,7 @@ } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##T } diff --git a/input/regression/skyline-debug.ly b/input/regression/skyline-debug.ly index 02c5aaa6c4..d6fb9e1077 100644 --- a/input/regression/skyline-debug.ly +++ b/input/regression/skyline-debug.ly @@ -1,7 +1,7 @@ \header { texidoc = "@code{-ddebug-skyline} draws the outline of the skyline used." } -\version "2.11.51" +\version "2.12.0" #(set-default-paper-size "a6" ) diff --git a/input/regression/skyline-vertical-placement.ly b/input/regression/skyline-vertical-placement.ly index bb9e11399f..731db4f2c5 100644 --- a/input/regression/skyline-vertical-placement.ly +++ b/input/regression/skyline-vertical-placement.ly @@ -5,7 +5,7 @@ using a skyline algorithm so that they don't collide with other objects." \layout {ragged-right = ##t} -\version "2.11.51" +\version "2.12.0" \relative c''' { \override TextScript #'outside-staff-priority = #2 \override DynamicLineSpanner #'outside-staff-priority = #1 diff --git a/input/regression/skyline-vertical-spacing.ly b/input/regression/skyline-vertical-spacing.ly index f94ffae468..159e1ca856 100644 --- a/input/regression/skyline-vertical-spacing.ly +++ b/input/regression/skyline-vertical-spacing.ly @@ -7,7 +7,7 @@ systems more uniform." \paper {ragged-right = ##t} #(set-default-paper-size "a6") -\version "2.11.51" +\version "2.12.0" \book { \score { { diff --git a/input/regression/slur-broken-trend.ly b/input/regression/slur-broken-trend.ly index 45e55c7de0..f2c524e823 100644 --- a/input/regression/slur-broken-trend.ly +++ b/input/regression/slur-broken-trend.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" diff --git a/input/regression/slur-clef.ly b/input/regression/slur-clef.ly index 5aaa2fb6c5..e9534fcbb1 100644 --- a/input/regression/slur-clef.ly +++ b/input/regression/slur-clef.ly @@ -6,6 +6,6 @@ ragged-right = ##t } -\version "2.11.51" +\version "2.12.0" \new Staff { \clef bass c4^( \clef "G" g'4) s2 c''1_( f'') } diff --git a/input/regression/slur-cross-staff-beam.ly b/input/regression/slur-cross-staff-beam.ly index 2ceaca6d7e..43230682be 100644 --- a/input/regression/slur-cross-staff-beam.ly +++ b/input/regression/slur-cross-staff-beam.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Slurs that depend on a cross-staff beam are not calculated until after line-breaking." diff --git a/input/regression/slur-cross-staff.ly b/input/regression/slur-cross-staff.ly index 76088ea634..3db78778ad 100644 --- a/input/regression/slur-cross-staff.ly +++ b/input/regression/slur-cross-staff.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" Slurs behave decently when broken across a linebreak. diff --git a/input/regression/slur-dash.ly b/input/regression/slur-dash.ly index b8b5d7c956..cd80e244b8 100644 --- a/input/regression/slur-dash.ly +++ b/input/regression/slur-dash.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header {texidoc = "@cindex Slur, dotted, dashed The appearance of slurs may be changed from solid to dotted or dashed. " diff --git a/input/regression/slur-dots.ly b/input/regression/slur-dots.ly index 5b99dcf484..6b5ba394ad 100644 --- a/input/regression/slur-dots.ly +++ b/input/regression/slur-dots.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc="Slurs should not get confused by augmentation dots. With a lot of dots, the problems becomes more visible." diff --git a/input/regression/slur-double.ly b/input/regression/slur-double.ly index 0d02183a08..93386d8a1b 100644 --- a/input/regression/slur-double.ly +++ b/input/regression/slur-double.ly @@ -3,7 +3,7 @@ texidoc = "Some composers use slurs both above and below chords. This can be typeset by setting @code{doubleSlurs}" } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t } \relative { diff --git a/input/regression/slur-dynamics.ly b/input/regression/slur-dynamics.ly index 9bd6fb1e02..d596231620 100644 --- a/input/regression/slur-dynamics.ly +++ b/input/regression/slur-dynamics.ly @@ -4,7 +4,7 @@ texidoc = "Dynamics avoid collision with slur." } -\version "2.11.51" +\version "2.12.0" \layout { indent = 0\mm ragged-right = ##t diff --git a/input/regression/slur-extreme.ly b/input/regression/slur-extreme.ly index 2cd310ea3f..47d7d5ec30 100644 --- a/input/regression/slur-extreme.ly +++ b/input/regression/slur-extreme.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/slur-manual.ly b/input/regression/slur-manual.ly index 76ee50f759..36ab15345e 100644 --- a/input/regression/slur-manual.ly +++ b/input/regression/slur-manual.ly @@ -6,7 +6,7 @@ positioning of the slur. It selects the slur configuration closest to the given pair. " } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##T } \relative { diff --git a/input/regression/slur-nice.ly b/input/regression/slur-nice.ly index a1f834e88b..bc0f9c3310 100644 --- a/input/regression/slur-nice.ly +++ b/input/regression/slur-nice.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" Slurs should look nice and symmetric. The curvature may increase diff --git a/input/regression/slur-rest.ly b/input/regression/slur-rest.ly index c2bd273cf2..07c48656ef 100644 --- a/input/regression/slur-rest.ly +++ b/input/regression/slur-rest.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc ="Slurs may be placed over rests. The slur will avoid diff --git a/input/regression/slur-scoring.ly b/input/regression/slur-scoring.ly index 8627cbf69d..a1b1ee4506 100644 --- a/input/regression/slur-scoring.ly +++ b/input/regression/slur-scoring.ly @@ -12,7 +12,7 @@ } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t % #(define debug-slur-scoring #t) diff --git a/input/regression/slur-script-inside.ly b/input/regression/slur-script-inside.ly index 1760b778ac..e4bdaae3ad 100644 --- a/input/regression/slur-script-inside.ly +++ b/input/regression/slur-script-inside.ly @@ -8,7 +8,7 @@ } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t } diff --git a/input/regression/slur-script.ly b/input/regression/slur-script.ly index 937224496c..84629752eb 100644 --- a/input/regression/slur-script.ly +++ b/input/regression/slur-script.ly @@ -6,7 +6,7 @@ slur responds appropriately if a script is moved." } -\version "2.11.51" +\version "2.12.0" \layout { indent = 0\mm ragged-right = ##t diff --git a/input/regression/slur-symmetry-1.ly b/input/regression/slur-symmetry-1.ly index 204a955eff..a1d04f0a91 100644 --- a/input/regression/slur-symmetry-1.ly +++ b/input/regression/slur-symmetry-1.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Symmetric figures should lead to symmetric slurs." diff --git a/input/regression/slur-symmetry.ly b/input/regression/slur-symmetry.ly index 44c731272e..aea6979bc2 100644 --- a/input/regression/slur-symmetry.ly +++ b/input/regression/slur-symmetry.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Symmetric figures should lead to symmetric slurs." diff --git a/input/regression/slur-tilt.ly b/input/regression/slur-tilt.ly index 992e80b5b0..ee5e3c1e87 100644 --- a/input/regression/slur-tilt.ly +++ b/input/regression/slur-tilt.ly @@ -8,7 +8,7 @@ point into one note head, and point over another note head." \layout { ragged-right = ##t } -\version "2.11.51" +\version "2.12.0" \relative c'' { \time 2/4 diff --git a/input/regression/slur-tuplet.ly b/input/regression/slur-tuplet.ly index bf03d252fd..eb5bae7aea 100644 --- a/input/regression/slur-tuplet.ly +++ b/input/regression/slur-tuplet.ly @@ -5,7 +5,7 @@ This may not work if the slur starts after the tuplet. " } -\version "2.11.65" +\version "2.12.0" \paper { ragged-right = ##t diff --git a/input/regression/song-associated-voice.ly b/input/regression/song-associated-voice.ly index 6b58961fd2..aceb759d8d 100644 --- a/input/regression/song-associated-voice.ly +++ b/input/regression/song-associated-voice.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \include "festival.ly" diff --git a/input/regression/song-basic-nonenglish.ly b/input/regression/song-basic-nonenglish.ly index a2b7971a95..4538db7ff0 100644 --- a/input/regression/song-basic-nonenglish.ly +++ b/input/regression/song-basic-nonenglish.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \include "festival.ly" diff --git a/input/regression/song-basic.ly b/input/regression/song-basic.ly index 99f104d496..06d3e3b4f7 100644 --- a/input/regression/song-basic.ly +++ b/input/regression/song-basic.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \include "festival.ly" diff --git a/input/regression/song-breathe.ly b/input/regression/song-breathe.ly index 1c553be6de..f0484c130e 100644 --- a/input/regression/song-breathe.ly +++ b/input/regression/song-breathe.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \include "festival.ly" diff --git a/input/regression/song-melisma.ly b/input/regression/song-melisma.ly index 8b33cde328..6eb9527061 100644 --- a/input/regression/song-melisma.ly +++ b/input/regression/song-melisma.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \include "festival.ly" diff --git a/input/regression/song-reordering.ly b/input/regression/song-reordering.ly index 846ee23ba6..97081984a8 100644 --- a/input/regression/song-reordering.ly +++ b/input/regression/song-reordering.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \include "festival.ly" diff --git a/input/regression/song-reordering2.ly b/input/regression/song-reordering2.ly index fa9f5ebba1..222b16d70a 100644 --- a/input/regression/song-reordering2.ly +++ b/input/regression/song-reordering2.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \include "festival.ly" diff --git a/input/regression/song-repetition.ly b/input/regression/song-repetition.ly index 9cfcdfacc6..e4b5ffa7dc 100644 --- a/input/regression/song-repetition.ly +++ b/input/regression/song-repetition.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \include "festival.ly" diff --git a/input/regression/song-skip-noword.ly b/input/regression/song-skip-noword.ly index 2edbf4474f..17e578f945 100644 --- a/input/regression/song-skip-noword.ly +++ b/input/regression/song-skip-noword.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \include "festival.ly" #(set! *skip-word* #f) diff --git a/input/regression/song-skip.ly b/input/regression/song-skip.ly index fea42c24d1..825e548cae 100644 --- a/input/regression/song-skip.ly +++ b/input/regression/song-skip.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \include "festival.ly" diff --git a/input/regression/song-slurs.ly b/input/regression/song-slurs.ly index 127ae8a4e6..57a54df7a6 100644 --- a/input/regression/song-slurs.ly +++ b/input/regression/song-slurs.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \include "festival.ly" diff --git a/input/regression/song-splitpart.ly b/input/regression/song-splitpart.ly index 901694ca7e..9079a66a2b 100644 --- a/input/regression/song-splitpart.ly +++ b/input/regression/song-splitpart.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \include "festival.ly" diff --git a/input/regression/song-stanzas.ly b/input/regression/song-stanzas.ly index ad805216b9..51fa612507 100644 --- a/input/regression/song-stanzas.ly +++ b/input/regression/song-stanzas.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \include "festival.ly" diff --git a/input/regression/song-tempo.ly b/input/regression/song-tempo.ly index f32281359f..7eec2b6d4e 100644 --- a/input/regression/song-tempo.ly +++ b/input/regression/song-tempo.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \include "festival.ly" diff --git a/input/regression/spacing-accidental-staffs.ly b/input/regression/spacing-accidental-staffs.ly index e5847b0bf0..17cbeb1cb3 100644 --- a/input/regression/spacing-accidental-staffs.ly +++ b/input/regression/spacing-accidental-staffs.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Accidentals in different staves do not affect the diff --git a/input/regression/spacing-accidental-stretch.ly b/input/regression/spacing-accidental-stretch.ly index 653ea2afaf..931d443836 100644 --- a/input/regression/spacing-accidental-stretch.ly +++ b/input/regression/spacing-accidental-stretch.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Accidentals do not influence the amount of stretchable space. diff --git a/input/regression/spacing-accidental-tie.ly b/input/regression/spacing-accidental-tie.ly index 20238cbf50..afcd919335 100644 --- a/input/regression/spacing-accidental-tie.ly +++ b/input/regression/spacing-accidental-tie.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Horizontal spacing works as expected on tied notes with diff --git a/input/regression/spacing-accidental.ly b/input/regression/spacing-accidental.ly index 5b4fd217b0..4cb0338040 100644 --- a/input/regression/spacing-accidental.ly +++ b/input/regression/spacing-accidental.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Accidentals sticking out to the left diff --git a/input/regression/spacing-bar-accidental.ly b/input/regression/spacing-bar-accidental.ly index 7a109eb827..edc807ba5f 100644 --- a/input/regression/spacing-bar-accidental.ly +++ b/input/regression/spacing-bar-accidental.ly @@ -5,7 +5,7 @@ } -\version "2.11.51" +\version "2.12.0" \layout{ ragged-right = ##t } diff --git a/input/regression/spacing-bar-arpeggio.ly b/input/regression/spacing-bar-arpeggio.ly index 43c52b1466..cdec5b2039 100644 --- a/input/regression/spacing-bar-arpeggio.ly +++ b/input/regression/spacing-bar-arpeggio.ly @@ -3,7 +3,7 @@ } -\version "2.11.51" +\version "2.12.0" \layout{ragged-right=##t} \new Staff { diff --git a/input/regression/spacing-bar-stem.ly b/input/regression/spacing-bar-stem.ly index 8079ac244d..c35d683139 100644 --- a/input/regression/spacing-bar-stem.ly +++ b/input/regression/spacing-bar-stem.ly @@ -9,7 +9,7 @@ to 1.5 staff space." } -\version "2.11.51" +\version "2.12.0" \layout{ ragged-right = ##t } diff --git a/input/regression/spacing-bar-whole-measure.ly b/input/regression/spacing-bar-whole-measure.ly index 5631171b56..c96228f619 100644 --- a/input/regression/spacing-bar-whole-measure.ly +++ b/input/regression/spacing-bar-whole-measure.ly @@ -3,7 +3,7 @@ } -\version "2.11.51" +\version "2.12.0" \layout{ ragged-right=##t diff --git a/input/regression/spacing-clef-first-note.ly b/input/regression/spacing-clef-first-note.ly index 7576ce6f1f..0024fc0a6a 100644 --- a/input/regression/spacing-clef-first-note.ly +++ b/input/regression/spacing-clef-first-note.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Clef changes at the start of a line get much more space diff --git a/input/regression/spacing-end-of-line.ly b/input/regression/spacing-end-of-line.ly index e59642f25d..70fceceaaa 100644 --- a/input/regression/spacing-end-of-line.ly +++ b/input/regression/spacing-end-of-line.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc ="Broken engraving of a bar at the end of a line does not upset diff --git a/input/regression/spacing-ended-voice.ly b/input/regression/spacing-ended-voice.ly index debe4cf67f..f4b4b83605 100644 --- a/input/regression/spacing-ended-voice.ly +++ b/input/regression/spacing-ended-voice.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = " A voicelet (a very short voice to get polyphonic chords correct) should not confuse the spacing engine." diff --git a/input/regression/spacing-folded-clef-cross-staff.ly b/input/regression/spacing-folded-clef-cross-staff.ly index 9effc273e6..03c169b25f 100644 --- a/input/regression/spacing-folded-clef-cross-staff.ly +++ b/input/regression/spacing-folded-clef-cross-staff.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Clefs are also folded under cross staff constructs." } diff --git a/input/regression/spacing-folded-clef.ly b/input/regression/spacing-folded-clef.ly index e98d14994e..720c9834bf 100644 --- a/input/regression/spacing-folded-clef.ly +++ b/input/regression/spacing-folded-clef.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "A clef can be folded below notes in a different staff, if this does not disrupt the flow of the notes." diff --git a/input/regression/spacing-folded-clef2.ly b/input/regression/spacing-folded-clef2.ly index 914525e93d..d272a005e1 100644 --- a/input/regression/spacing-folded-clef2.ly +++ b/input/regression/spacing-folded-clef2.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "A clef can be folded below notes in a different staff, if diff --git a/input/regression/spacing-folded-clef3.ly b/input/regression/spacing-folded-clef3.ly index 1fe4cf7fdd..e919050d10 100644 --- a/input/regression/spacing-folded-clef3.ly +++ b/input/regression/spacing-folded-clef3.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Voices that go back and forth between staves do not confuse the spacing engine." diff --git a/input/regression/spacing-grace-duration.ly b/input/regression/spacing-grace-duration.ly index 700bb6867d..e7b7b936a4 100644 --- a/input/regression/spacing-grace-duration.ly +++ b/input/regression/spacing-grace-duration.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Spacing uses the duration of the notes, but disregards diff --git a/input/regression/spacing-grace.ly b/input/regression/spacing-grace.ly index d135c189a7..2c76e8b36a 100644 --- a/input/regression/spacing-grace.ly +++ b/input/regression/spacing-grace.ly @@ -5,7 +5,7 @@ run are spaced accordingly. " } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } diff --git a/input/regression/spacing-horizontal-skyline-grace.ly b/input/regression/spacing-horizontal-skyline-grace.ly index 0ddc97c3ed..3b0db9daf2 100644 --- a/input/regression/spacing-horizontal-skyline-grace.ly +++ b/input/regression/spacing-horizontal-skyline-grace.ly @@ -6,7 +6,7 @@ and the barline do not collide." } -\version "2.11.51" +\version "2.12.0" \paper { diff --git a/input/regression/spacing-horizontal-skyline.ly b/input/regression/spacing-horizontal-skyline.ly index 39b1e82378..bf59899597 100644 --- a/input/regression/spacing-horizontal-skyline.ly +++ b/input/regression/spacing-horizontal-skyline.ly @@ -3,7 +3,7 @@ texidoc = "accidentals may be folded under preceding notes." } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t diff --git a/input/regression/spacing-knee-compressed.ly b/input/regression/spacing-knee-compressed.ly index 25981909ee..8cf8d2c0e8 100644 --- a/input/regression/spacing-knee-compressed.ly +++ b/input/regression/spacing-knee-compressed.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Spacing corrections for kneed beams still work when compression is involved." diff --git a/input/regression/spacing-knee.ly b/input/regression/spacing-knee.ly index 536f6d87c2..b5c1895385 100644 --- a/input/regression/spacing-knee.ly +++ b/input/regression/spacing-knee.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "For knees, the spacing correction is such that the diff --git a/input/regression/spacing-loose-grace-error.ly b/input/regression/spacing-loose-grace-error.ly index de46da1d2c..470754f059 100644 --- a/input/regression/spacing-loose-grace-error.ly +++ b/input/regression/spacing-loose-grace-error.ly @@ -7,7 +7,7 @@ texidoc = "Even in case of incorrect contexts (eg. shortlived } -\version "2.11.51" +\version "2.12.0" %% \new Staff cause shortlived, disconnected Voice contexts diff --git a/input/regression/spacing-loose-grace-linebreak.ly b/input/regression/spacing-loose-grace-linebreak.ly index fdc511ce38..8cc2597294 100644 --- a/input/regression/spacing-loose-grace-linebreak.ly +++ b/input/regression/spacing-loose-grace-linebreak.ly @@ -4,7 +4,7 @@ across a line break, it gets attached to the end of line." } -\version "2.11.51" +\version "2.12.0" \new Score \with { \override SpacingSpanner #'strict-grace-spacing = ##t diff --git a/input/regression/spacing-loose-grace.ly b/input/regression/spacing-loose-grace.ly index d0929ef48a..77d50385d6 100644 --- a/input/regression/spacing-loose-grace.ly +++ b/input/regression/spacing-loose-grace.ly @@ -8,7 +8,7 @@ spacing." } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } diff --git a/input/regression/spacing-mark-width.ly b/input/regression/spacing-mark-width.ly index 8eee855a72..0b138d1cce 100644 --- a/input/regression/spacing-mark-width.ly +++ b/input/regression/spacing-mark-width.ly @@ -4,7 +4,7 @@ } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t diff --git a/input/regression/spacing-measure-length.ly b/input/regression/spacing-measure-length.ly index 87fd02aba9..8cfa85df4a 100644 --- a/input/regression/spacing-measure-length.ly +++ b/input/regression/spacing-measure-length.ly @@ -6,7 +6,7 @@ This means that the 3/8 setting does not affect the whole rest spacing." } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t diff --git a/input/regression/spacing-multi-tuplet.ly b/input/regression/spacing-multi-tuplet.ly index aafa19a531..f6b578fdf0 100644 --- a/input/regression/spacing-multi-tuplet.ly +++ b/input/regression/spacing-multi-tuplet.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ diff --git a/input/regression/spacing-no-note.ly b/input/regression/spacing-no-note.ly index f3f0205481..fd1b3cc9af 100644 --- a/input/regression/spacing-no-note.ly +++ b/input/regression/spacing-no-note.ly @@ -6,7 +6,7 @@ more space. " } \layout { ragged-right = ##t } -\version "2.11.51" +\version "2.12.0" { \time 2/4 \repeat "percent" 3 { c'4 } diff --git a/input/regression/spacing-non-adjacent-columns1.ly b/input/regression/spacing-non-adjacent-columns1.ly index 1755aa284a..8176f2416a 100644 --- a/input/regression/spacing-non-adjacent-columns1.ly +++ b/input/regression/spacing-non-adjacent-columns1.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \paper {ragged-right = ##t} \header { texidoc = "The spacing engine avoids collisions between non-adjacent columns." diff --git a/input/regression/spacing-non-adjacent-columns2.ly b/input/regression/spacing-non-adjacent-columns2.ly index 8d36fb2df9..06579ae87b 100644 --- a/input/regression/spacing-non-adjacent-columns2.ly +++ b/input/regression/spacing-non-adjacent-columns2.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \paper {ragged-right = ##t} \header { texidoc = "The spacing engine avoids collisions between non-adjacent columns." diff --git a/input/regression/spacing-note-flags.ly b/input/regression/spacing-note-flags.ly index 1bff3ec93b..6a85c59d01 100644 --- a/input/regression/spacing-note-flags.ly +++ b/input/regression/spacing-note-flags.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/spacing-packed.ly b/input/regression/spacing-packed.ly index c14a74f667..138dbf01b3 100644 --- a/input/regression/spacing-packed.ly +++ b/input/regression/spacing-packed.ly @@ -10,7 +10,7 @@ " } -\version "2.11.51" +\version "2.12.0" \relative { \override Score.SpacingSpanner #'packed-spacing = ##t diff --git a/input/regression/spacing-proportional.ly b/input/regression/spacing-proportional.ly index ea9107cb5c..2cc2b6cfd1 100644 --- a/input/regression/spacing-proportional.ly +++ b/input/regression/spacing-proportional.ly @@ -6,7 +6,7 @@ to the distance for the given duration." } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } diff --git a/input/regression/spacing-ragged-last.ly b/input/regression/spacing-ragged-last.ly index aaac78f025..817ac43190 100644 --- a/input/regression/spacing-ragged-last.ly +++ b/input/regression/spacing-ragged-last.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/spacing-rest.ly b/input/regression/spacing-rest.ly index bb4f285b43..a55f4cbaf1 100644 --- a/input/regression/spacing-rest.ly +++ b/input/regression/spacing-rest.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Rests get a little less space, since they are narrower. However, the quarter rest in feta font is relatively wide, causing this diff --git a/input/regression/spacing-section.ly b/input/regression/spacing-section.ly index b95c794919..065cb423df 100644 --- a/input/regression/spacing-section.ly +++ b/input/regression/spacing-section.ly @@ -11,7 +11,7 @@ the 4/16, and a 16th in the second section takes as much space as a { ragged-right = ##t } -\version "2.11.51" +\version "2.12.0" \relative { \time 2/4 c4 c8 c diff --git a/input/regression/spacing-short-notes.ly b/input/regression/spacing-short-notes.ly index 0514305d02..8af2ae378c 100644 --- a/input/regression/spacing-short-notes.ly +++ b/input/regression/spacing-short-notes.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Notes that are shorter than the common shortest note get a diff --git a/input/regression/spacing-space-to-barline.ly b/input/regression/spacing-space-to-barline.ly index 47e8baa648..78dd605705 100644 --- a/input/regression/spacing-space-to-barline.ly +++ b/input/regression/spacing-space-to-barline.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "When space-to-barline is false, we measure the space between the note and the diff --git a/input/regression/spacing-stem-bar.ly b/input/regression/spacing-stem-bar.ly index d5fe84524e..570dc6c873 100644 --- a/input/regression/spacing-stem-bar.ly +++ b/input/regression/spacing-stem-bar.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Upstem notes before a barline are printed with some extra diff --git a/input/regression/spacing-stem-direction.ly b/input/regression/spacing-stem-direction.ly index c07e658183..a595db3ca2 100644 --- a/input/regression/spacing-stem-direction.ly +++ b/input/regression/spacing-stem-direction.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ diff --git a/input/regression/spacing-stem-same-direction.ly b/input/regression/spacing-stem-same-direction.ly index b4c1cd9d25..aa66276338 100644 --- a/input/regression/spacing-stem-same-direction.ly +++ b/input/regression/spacing-stem-same-direction.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "For juxtaposed chords with the same direction, a slight optical correction is used. It is constant, and works only if diff --git a/input/regression/spacing-stick-out.ly b/input/regression/spacing-stick-out.ly index 19373fce16..d89ee89e22 100644 --- a/input/regression/spacing-stick-out.ly +++ b/input/regression/spacing-stick-out.ly @@ -7,7 +7,7 @@ } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t } diff --git a/input/regression/spacing-strict-notespacing.ly b/input/regression/spacing-strict-notespacing.ly index 6acf1411cb..63792bd589 100644 --- a/input/regression/spacing-strict-notespacing.ly +++ b/input/regression/spacing-strict-notespacing.ly @@ -9,7 +9,7 @@ time. This may cause collisions. " } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t diff --git a/input/regression/spacing-strict-spacing-grace.ly b/input/regression/spacing-strict-spacing-grace.ly index 211e89ce7c..64614ebf87 100644 --- a/input/regression/spacing-strict-spacing-grace.ly +++ b/input/regression/spacing-strict-spacing-grace.ly @@ -5,7 +5,7 @@ } -\version "2.11.51" +\version "2.12.0" << \override Score.SpacingSpanner #'strict-grace-spacing = ##t diff --git a/input/regression/spacing-to-empty-barline.ly b/input/regression/spacing-to-empty-barline.ly index ac8bced723..af26d8e5ca 100644 --- a/input/regression/spacing-to-empty-barline.ly +++ b/input/regression/spacing-to-empty-barline.ly @@ -1,4 +1,4 @@ -\version "2.11.50" +\version "2.12.0" \header { texidoc = "An empty barline does not confuse the spacing engine too much. diff --git a/input/regression/spacing-to-grace.ly b/input/regression/spacing-to-grace.ly index 47cadb5372..483e7eef58 100644 --- a/input/regression/spacing-to-grace.ly +++ b/input/regression/spacing-to-grace.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc ="Space from a normal note (or barline) to a grace note is diff --git a/input/regression/spacing-uniform-stretching.ly b/input/regression/spacing-uniform-stretching.ly index ba1457b9f5..f32952e387 100644 --- a/input/regression/spacing-uniform-stretching.ly +++ b/input/regression/spacing-uniform-stretching.ly @@ -6,7 +6,7 @@ } -\version "2.11.51" +\version "2.12.0" \relative c'' << diff --git a/input/regression/span-bar-break.ly b/input/regression/span-bar-break.ly index fd65763d2a..3ac07160ff 100644 --- a/input/regression/span-bar-break.ly +++ b/input/regression/span-bar-break.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/span-bar-partial.ly b/input/regression/span-bar-partial.ly index 33aab7de3d..6ef67048fe 100644 --- a/input/regression/span-bar-partial.ly +++ b/input/regression/span-bar-partial.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Span bars can be turned on/off on a staff-by-staff basis." } diff --git a/input/regression/span-bar-spacing.ly b/input/regression/span-bar-spacing.ly index 3f06520560..0133543e99 100644 --- a/input/regression/span-bar-spacing.ly +++ b/input/regression/span-bar-spacing.ly @@ -3,7 +3,7 @@ the accidentals should not collide with the bar lines." } -\version "2.11.51" +\version "2.12.0" upper = \relative c' { \key f \minor \time 12/8 diff --git a/input/regression/span-bar.ly b/input/regression/span-bar.ly index 4ba6971a64..feb9520716 100644 --- a/input/regression/span-bar.ly +++ b/input/regression/span-bar.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Span bars are drawn only between staff bar lines. By setting bar lines to transparent, they are shown only between systems. diff --git a/input/regression/spanner-break-beyond-parent.ly b/input/regression/spanner-break-beyond-parent.ly index 3e9cb7de5d..4961d82e76 100644 --- a/input/regression/spanner-break-beyond-parent.ly +++ b/input/regression/spanner-break-beyond-parent.ly @@ -4,7 +4,7 @@ } -\version "2.11.51" +\version "2.12.0" \paper { ragged-bottom = ##t } diff --git a/input/regression/spanner-break-overshoot.ly b/input/regression/spanner-break-overshoot.ly index 6516799df9..43953bbe65 100644 --- a/input/regression/spanner-break-overshoot.ly +++ b/input/regression/spanner-break-overshoot.ly @@ -8,7 +8,7 @@ prefatory matter." } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } diff --git a/input/regression/staccato-pos.ly b/input/regression/staccato-pos.ly index bd32da26f2..025bf892d2 100644 --- a/input/regression/staccato-pos.ly +++ b/input/regression/staccato-pos.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ diff --git a/input/regression/staff-halfway.ly b/input/regression/staff-halfway.ly index 0c70d67d15..bb3f17e80e 100644 --- a/input/regression/staff-halfway.ly +++ b/input/regression/staff-halfway.ly @@ -2,7 +2,7 @@ texidoc = "Staves can be started and stopped at command. " } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t diff --git a/input/regression/staff-line-positions.ly b/input/regression/staff-line-positions.ly index a317e1cea6..498bd6ef52 100644 --- a/input/regression/staff-line-positions.ly +++ b/input/regression/staff-line-positions.ly @@ -6,7 +6,7 @@ } -\version "2.11.51" +\version "2.12.0" \new Staff \relative c' { diff --git a/input/regression/staff-mixed-size.ly b/input/regression/staff-mixed-size.ly index 9fa58fa852..c3bcc78b6a 100644 --- a/input/regression/staff-mixed-size.ly +++ b/input/regression/staff-mixed-size.ly @@ -7,7 +7,7 @@ large on smaller staves." } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t diff --git a/input/regression/staff-online-symbol-absence.ly b/input/regression/staff-online-symbol-absence.ly index 85bc4e81c6..583c690ece 100644 --- a/input/regression/staff-online-symbol-absence.ly +++ b/input/regression/staff-online-symbol-absence.ly @@ -1,4 +1,4 @@ -\version "2.11.55" +\version "2.12.0" \header { texidoc = "Symbols that need on-staffline info (like dots and ties) diff --git a/input/regression/staff-tweak.ly b/input/regression/staff-tweak.ly index 5058697693..53b0affb6d 100644 --- a/input/regression/staff-tweak.ly +++ b/input/regression/staff-tweak.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "The staff is a grob (graphical object) which may be adjusted as well, for example, to have 6 thick lines and a slightly large @code{staff-space}. diff --git a/input/regression/stanza-number.ly b/input/regression/stanza-number.ly index 05b5fa6f8f..8af4a9b2a7 100644 --- a/input/regression/stanza-number.ly +++ b/input/regression/stanza-number.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Stanza numbers are put left of their lyric. They are aligned in a column." } diff --git a/input/regression/stem-direction-context.ly b/input/regression/stem-direction-context.ly index 342561bd4c..18315d1eaa 100644 --- a/input/regression/stem-direction-context.ly +++ b/input/regression/stem-direction-context.ly @@ -5,7 +5,7 @@ } -\version "2.11.51" +\version "2.12.0" \relative c'' \new Voice \with { \consists "Melody_engraver" \override Stem #'neutral-direction = #'() diff --git a/input/regression/stem-direction.ly b/input/regression/stem-direction.ly index e041d41dfb..56fd43186b 100644 --- a/input/regression/stem-direction.ly +++ b/input/regression/stem-direction.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" diff --git a/input/regression/stem-shorten.ly b/input/regression/stem-shorten.ly index 2ff32f5c68..6274e711c6 100644 --- a/input/regression/stem-shorten.ly +++ b/input/regression/stem-shorten.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/stem-stemlet-whole.ly b/input/regression/stem-stemlet-whole.ly index b2b6e6896e..ba69bf2c31 100644 --- a/input/regression/stem-stemlet-whole.ly +++ b/input/regression/stem-stemlet-whole.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Stemlets don't cause stems on whole notes." } diff --git a/input/regression/stem-stemlet.ly b/input/regression/stem-stemlet.ly index 7279639842..5603b34457 100644 --- a/input/regression/stem-stemlet.ly +++ b/input/regression/stem-stemlet.ly @@ -5,7 +5,7 @@ length can be set with @code{stemlet-length}." } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t } \relative { diff --git a/input/regression/stem-tremolo-forced-dir.ly b/input/regression/stem-tremolo-forced-dir.ly index d87e53f0a0..9b716b74c7 100644 --- a/input/regression/stem-tremolo-forced-dir.ly +++ b/input/regression/stem-tremolo-forced-dir.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t } \relative c { diff --git a/input/regression/stem-tremolo-position.ly b/input/regression/stem-tremolo-position.ly index ea834903b3..e423eeb7c0 100644 --- a/input/regression/stem-tremolo-position.ly +++ b/input/regression/stem-tremolo-position.ly @@ -5,7 +5,7 @@ tilted extra on stem-down notes with a flag." } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##T } diff --git a/input/regression/stem-tremolo-staff-space.ly b/input/regression/stem-tremolo-staff-space.ly index 1d4663e8a4..5d4e85d6bd 100644 --- a/input/regression/stem-tremolo-staff-space.ly +++ b/input/regression/stem-tremolo-staff-space.ly @@ -4,7 +4,7 @@ } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t diff --git a/input/regression/stem-tremolo.ly b/input/regression/stem-tremolo.ly index 394e55b31e..df26319330 100644 --- a/input/regression/stem-tremolo.ly +++ b/input/regression/stem-tremolo.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" Stem tremolos or rolls are tremolo signs that look like beam segments diff --git a/input/regression/stencil-color-rotation.ly b/input/regression/stencil-color-rotation.ly index 88819aa9d0..7e89fa2cb1 100644 --- a/input/regression/stencil-color-rotation.ly +++ b/input/regression/stencil-color-rotation.ly @@ -2,7 +2,7 @@ texidoc = "Combinations of rotation and color do work." } -\version "2.11.51" +\version "2.12.0" \relative c'{ \override Hairpin #'rotation = #'(20 -1 0) \override Hairpin #'color = #(x11-color 'LimeGreen) diff --git a/input/regression/stencil-hacking.ly b/input/regression/stencil-hacking.ly index d7138c1a96..b95fffb857 100644 --- a/input/regression/stencil-hacking.ly +++ b/input/regression/stencil-hacking.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc=" You can write stencil callbacks in Scheme, thus providing custom glyphs for notation elements. A simple example is diff --git a/input/regression/string-number-around-slur.ly b/input/regression/string-number-around-slur.ly index 42c8a392c2..bd4a5b4d5c 100644 --- a/input/regression/string-number-around-slur.ly +++ b/input/regression/string-number-around-slur.ly @@ -1,4 +1,4 @@ -\version "2.11.57" +\version "2.12.0" \header { texidoc = "String numbers should only be moved outside slurs when there diff --git a/input/regression/string-number.ly b/input/regression/string-number.ly index e479733cf4..1b8692de79 100644 --- a/input/regression/string-number.ly +++ b/input/regression/string-number.ly @@ -4,7 +4,7 @@ positioning mechanism as finger instructions." } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } diff --git a/input/regression/system-extents.ly b/input/regression/system-extents.ly index e65801313f..4ff06b0385 100644 --- a/input/regression/system-extents.ly +++ b/input/regression/system-extents.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "The size of every system is correctly determined; this diff --git a/input/regression/system-overstrike.ly b/input/regression/system-overstrike.ly index 0bfda8f312..e584dde393 100644 --- a/input/regression/system-overstrike.ly +++ b/input/regression/system-overstrike.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "By setting between-system-padding to a negative value, it is possible to eliminate the anti-collision constraints. Then setting @code{between-system-space} to a low (nonzero) value, diff --git a/input/regression/system-separator.ly b/input/regression/system-separator.ly index d7c58f197f..840a650ef4 100644 --- a/input/regression/system-separator.ly +++ b/input/regression/system-separator.ly @@ -1,4 +1,4 @@ -\version "2.11.64" +\version "2.12.0" \header { texidoc = "System separators may be defined as markups in the diff --git a/input/regression/system-start-bracket.ly b/input/regression/system-start-bracket.ly index b6940b19f6..242f8d75f9 100644 --- a/input/regression/system-start-bracket.ly +++ b/input/regression/system-start-bracket.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "A piano context included within a staff group should cause the piano brace to be drawn to the left of the staff angle diff --git a/input/regression/system-start-heavy-bar.ly b/input/regression/system-start-heavy-bar.ly index f5d8a51b22..25b84c21ac 100644 --- a/input/regression/system-start-heavy-bar.ly +++ b/input/regression/system-start-heavy-bar.ly @@ -1,7 +1,7 @@ \header { texidoc = "A heavy-bar system start delimiter may be created by tuning the @code{SystemStartBar} grob." } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t diff --git a/input/regression/system-start-nesting.ly b/input/regression/system-start-nesting.ly index ac4f539d51..1b9e249b4e 100644 --- a/input/regression/system-start-nesting.ly +++ b/input/regression/system-start-nesting.ly @@ -2,7 +2,7 @@ created with the @code{systemStartDelimiterHierarchy} property." } -\version "2.11.56" +\version "2.12.0" \paper { ragged-right = ##t diff --git a/input/regression/tablature-banjo.ly b/input/regression/tablature-banjo.ly index 0246d540b6..cc5515b0fc 100644 --- a/input/regression/tablature-banjo.ly +++ b/input/regression/tablature-banjo.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/tablature-harmonic.ly b/input/regression/tablature-harmonic.ly index 8bec6998d3..1a32a62cd2 100644 --- a/input/regression/tablature-harmonic.ly +++ b/input/regression/tablature-harmonic.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Harmonics get angled brackets in tablature" diff --git a/input/regression/tablature-slide.ly b/input/regression/tablature-slide.ly index d5b18d0ebd..6fd511f09c 100644 --- a/input/regression/tablature-slide.ly +++ b/input/regression/tablature-slide.ly @@ -4,7 +4,7 @@ texidoc = "Tab supports slides." } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##T } diff --git a/input/regression/tablature-string-tunings.ly b/input/regression/tablature-string-tunings.ly index d404825691..d8f735e435 100644 --- a/input/regression/tablature-string-tunings.ly +++ b/input/regression/tablature-string-tunings.ly @@ -6,7 +6,7 @@ } -\version "2.11.51" +\version "2.12.0" \new TabStaff { diff --git a/input/regression/tablature.ly b/input/regression/tablature.ly index 93f82a1aac..0c631e87a1 100644 --- a/input/regression/tablature.ly +++ b/input/regression/tablature.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc = "@cindex Tabulature A sample tablature, with both normal staff and tab. diff --git a/input/regression/tag-filter.ly b/input/regression/tag-filter.ly index ccc8586295..dca241b0d7 100644 --- a/input/regression/tag-filter.ly +++ b/input/regression/tag-filter.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "The @code{\\tag} command marks music expressions with a diff --git a/input/regression/test-output-distance.ly b/input/regression/test-output-distance.ly index a956be6192..84bb5773d7 100644 --- a/input/regression/test-output-distance.ly +++ b/input/regression/test-output-distance.ly @@ -5,7 +5,7 @@ it should always show up in the output-distance testing. " } -\version "2.11.51" +\version "2.12.0" #(define time (gettimeofday)) diff --git a/input/regression/text-spanner-attachment-alignment.ly b/input/regression/text-spanner-attachment-alignment.ly index f90cde8881..942de5ff4d 100644 --- a/input/regression/text-spanner-attachment-alignment.ly +++ b/input/regression/text-spanner-attachment-alignment.ly @@ -9,7 +9,7 @@ ragged-right = ##t } -\version "2.11.65" +\version "2.12.0" << \new Staff { \override TextSpanner #'(bound-details left text) = "*" diff --git a/input/regression/text-spanner-override-order.ly b/input/regression/text-spanner-override-order.ly index 4b3022f6bd..09baf614e2 100644 --- a/input/regression/text-spanner-override-order.ly +++ b/input/regression/text-spanner-override-order.ly @@ -5,7 +5,7 @@ } -\version "2.11.65" +\version "2.12.0" sample = \relative c'' { c2\startTextSpan c2 \break diff --git a/input/regression/text-spanner.ly b/input/regression/text-spanner.ly index 241f7878f9..27a00ca0e4 100644 --- a/input/regression/text-spanner.ly +++ b/input/regression/text-spanner.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc= "Text spanners should not repeat start text when broken." } diff --git a/input/regression/tie-accidental.ly b/input/regression/tie-accidental.ly index 4cc1b7e245..609437b95d 100644 --- a/input/regression/tie-accidental.ly +++ b/input/regression/tie-accidental.ly @@ -4,7 +4,7 @@ " } -\version "2.11.51" +\version "2.12.0" \paper { debug-tie-scoring = ##t diff --git a/input/regression/tie-arpeggio-collision.ly b/input/regression/tie-arpeggio-collision.ly index 22e3ef567d..a874e2b411 100644 --- a/input/regression/tie-arpeggio-collision.ly +++ b/input/regression/tie-arpeggio-collision.ly @@ -8,7 +8,7 @@ unarpegiated case." } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t } diff --git a/input/regression/tie-arpeggio.ly b/input/regression/tie-arpeggio.ly index 37615498a2..e402303b19 100644 --- a/input/regression/tie-arpeggio.ly +++ b/input/regression/tie-arpeggio.ly @@ -9,7 +9,7 @@ } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } \relative { diff --git a/input/regression/tie-broken-minimum-length.ly b/input/regression/tie-broken-minimum-length.ly index 4684d9d981..c7e9c512ee 100644 --- a/input/regression/tie-broken-minimum-length.ly +++ b/input/regression/tie-broken-minimum-length.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/tie-broken-other-staff.ly b/input/regression/tie-broken-other-staff.ly index 5acee70ae4..b5ba583827 100644 --- a/input/regression/tie-broken-other-staff.ly +++ b/input/regression/tie-broken-other-staff.ly @@ -3,7 +3,7 @@ in other staves." } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t diff --git a/input/regression/tie-broken.ly b/input/regression/tie-broken.ly index 507b839158..41b71dc00b 100644 --- a/input/regression/tie-broken.ly +++ b/input/regression/tie-broken.ly @@ -3,7 +3,7 @@ texidoc = "Ties behave properly at line breaks." } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } diff --git a/input/regression/tie-chord-broken-extremal.ly b/input/regression/tie-chord-broken-extremal.ly index 5c6280f485..71fb2f6156 100644 --- a/input/regression/tie-chord-broken-extremal.ly +++ b/input/regression/tie-chord-broken-extremal.ly @@ -1,4 +1,4 @@ -\version "2.11.65" +\version "2.12.0" \header { texidoc = " diff --git a/input/regression/tie-chord-debug.ly b/input/regression/tie-chord-debug.ly index 62a25e06d2..4a5abc2551 100644 --- a/input/regression/tie-chord-debug.ly +++ b/input/regression/tie-chord-debug.ly @@ -5,7 +5,7 @@ decisions made." } -\version "2.11.51" +\version "2.12.0" \paper { diff --git a/input/regression/tie-chord-partial.ly b/input/regression/tie-chord-partial.ly index b448058914..d5ab64e1e0 100644 --- a/input/regression/tie-chord-partial.ly +++ b/input/regression/tie-chord-partial.ly @@ -2,7 +2,7 @@ { texidoc = "Individual chord notes can also be tied" } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t diff --git a/input/regression/tie-chord.ly b/input/regression/tie-chord.ly index 71ce356efd..2688680580 100644 --- a/input/regression/tie-chord.ly +++ b/input/regression/tie-chord.ly @@ -13,7 +13,7 @@ each system. " } -\version "2.11.51" +\version "2.12.0" \paper { indent = #0.0 diff --git a/input/regression/tie-direction-broken.ly b/input/regression/tie-direction-broken.ly index b1304f059c..25570e613f 100644 --- a/input/regression/tie-direction-broken.ly +++ b/input/regression/tie-direction-broken.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/tie-direction-manual.ly b/input/regression/tie-direction-manual.ly index 23304988bd..f6a6610c8c 100644 --- a/input/regression/tie-direction-manual.ly +++ b/input/regression/tie-direction-manual.ly @@ -4,7 +4,7 @@ This makes correction in complex chords easier." } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right= ##t diff --git a/input/regression/tie-dot.ly b/input/regression/tie-dot.ly index b3ab2d0da4..9b2107c64e 100644 --- a/input/regression/tie-dot.ly +++ b/input/regression/tie-dot.ly @@ -3,7 +3,7 @@ texidoc = "Ties avoid collisions with dots." } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##T } diff --git a/input/regression/tie-grace.ly b/input/regression/tie-grace.ly index 505b9b7433..c2e5606365 100644 --- a/input/regression/tie-grace.ly +++ b/input/regression/tie-grace.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Tying a grace to a following grace or main note works." } diff --git a/input/regression/tie-manual-vertical-tune.ly b/input/regression/tie-manual-vertical-tune.ly index a304f6da5d..0edfd18e16 100644 --- a/input/regression/tie-manual-vertical-tune.ly +++ b/input/regression/tie-manual-vertical-tune.ly @@ -1,23 +1,15 @@ -\header { - +\version "2.12.0" +\header { texidoc = "If using integers, the tie will vertically tuned for staff line avoidance. If using a floating point number, this is taken as the exact location." - } -\version "2.11.51" - -\layout { - ragged-right = ##t -} - -\version "2.11.51" \relative c'' { \override Tie #'staff-position = #3 d4 ~ \override Tie #'staff-position = #3.0 d ~ d - } +} diff --git a/input/regression/tie-manual.ly b/input/regression/tie-manual.ly index 3e5f252577..95be03dd47 100644 --- a/input/regression/tie-manual.ly +++ b/input/regression/tie-manual.ly @@ -11,7 +11,7 @@ You can leave a Tie alone by introducing a non-pair value } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t diff --git a/input/regression/tie-semi-single.ly b/input/regression/tie-semi-single.ly index 625ed9b7cb..a5c226dc00 100644 --- a/input/regression/tie-semi-single.ly +++ b/input/regression/tie-semi-single.ly @@ -8,7 +8,7 @@ tweaked with @code{#'direction}." } -\version "2.11.51" +\version "2.12.0" \layout{ragged-right=##t} { diff --git a/input/regression/tie-single-chord.ly b/input/regression/tie-single-chord.ly index a1d8ced47e..ab5410d6bb 100644 --- a/input/regression/tie-single-chord.ly +++ b/input/regression/tie-single-chord.ly @@ -5,7 +5,7 @@ } -\version "2.11.51" +\version "2.12.0" \paper { diff --git a/input/regression/tie-single-manual.ly b/input/regression/tie-single-manual.ly index e86c67562e..c505453d7f 100644 --- a/input/regression/tie-single-manual.ly +++ b/input/regression/tie-single-manual.ly @@ -5,7 +5,7 @@ specifying their @code{direction} and/or @code{staff-position}." } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t diff --git a/input/regression/tie-single.ly b/input/regression/tie-single.ly index 60dd2fc0ee..c8e3278eb5 100644 --- a/input/regression/tie-single.ly +++ b/input/regression/tie-single.ly @@ -22,7 +22,7 @@ that otherwise don't fit in a space ragged-right = ##t } -\version "2.11.51" +\version "2.12.0" frag = \relative c'' { diff --git a/input/regression/tie-whole.ly b/input/regression/tie-whole.ly index a030c7559e..e63d02b788 100644 --- a/input/regression/tie-whole.ly +++ b/input/regression/tie-whole.ly @@ -5,7 +5,7 @@ } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } \relative diff --git a/input/regression/to-xml.ly b/input/regression/to-xml.ly index 53177f60f6..1ac46ee0ef 100644 --- a/input/regression/to-xml.ly +++ b/input/regression/to-xml.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" testMusic = { << c''4 \\ g'4 >> } diff --git a/input/regression/toc.ly b/input/regression/toc.ly index f38acbb06e..94fe0f08e7 100644 --- a/input/regression/toc.ly +++ b/input/regression/toc.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "A table of contents is included using diff --git a/input/regression/trill-spanner-broken.ly b/input/regression/trill-spanner-broken.ly index b4bac596db..1ec7f8b17c 100644 --- a/input/regression/trill-spanner-broken.ly +++ b/input/regression/trill-spanner-broken.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = " diff --git a/input/regression/trill-spanner-grace.ly b/input/regression/trill-spanner-grace.ly index ddf2348d85..02b032aa26 100644 --- a/input/regression/trill-spanner-grace.ly +++ b/input/regression/trill-spanner-grace.ly @@ -2,7 +2,7 @@ texidoc = "Trill spanner can end on a grace note" } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##T } diff --git a/input/regression/trill-spanner-pitched-consecutive.ly b/input/regression/trill-spanner-pitched-consecutive.ly index 33fcf817dc..acd8e7b057 100644 --- a/input/regression/trill-spanner-pitched-consecutive.ly +++ b/input/regression/trill-spanner-pitched-consecutive.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Pitched trills on consecutive notes with the same diff --git a/input/regression/trill-spanner-pitched-forced.ly b/input/regression/trill-spanner-pitched-forced.ly index e888bbcdbb..2580752122 100644 --- a/input/regression/trill-spanner-pitched-forced.ly +++ b/input/regression/trill-spanner-pitched-forced.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Pitched trill accidentals can be forced." diff --git a/input/regression/trill-spanner-pitched.ly b/input/regression/trill-spanner-pitched.ly index 3ca0ba84cc..182639ac6c 100644 --- a/input/regression/trill-spanner-pitched.ly +++ b/input/regression/trill-spanner-pitched.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/trill-spanner.ly b/input/regression/trill-spanner.ly index 1b59c7605c..180c60c2f4 100644 --- a/input/regression/trill-spanner.ly +++ b/input/regression/trill-spanner.ly @@ -5,7 +5,7 @@ the wavy line should appear to come from the crook of the r" } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } \relative c'' { c1\startTrillSpan diff --git a/input/regression/tuplet-beam.ly b/input/regression/tuplet-beam.ly index be160d2f9f..1b9d32ee59 100644 --- a/input/regression/tuplet-beam.ly +++ b/input/regression/tuplet-beam.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "In combination with a beam, the bracket of the tuplet diff --git a/input/regression/tuplet-bracket-cross-staff.ly b/input/regression/tuplet-bracket-cross-staff.ly index d06d3cfb04..346287177a 100644 --- a/input/regression/tuplet-bracket-cross-staff.ly +++ b/input/regression/tuplet-bracket-cross-staff.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t diff --git a/input/regression/tuplet-broken.ly b/input/regression/tuplet-broken.ly index 4226f385b8..d8ceec7eb8 100644 --- a/input/regression/tuplet-broken.ly +++ b/input/regression/tuplet-broken.ly @@ -8,7 +8,7 @@ } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t diff --git a/input/regression/tuplet-full-length-extent.ly b/input/regression/tuplet-full-length-extent.ly index e2b1575c9e..cff49efa3c 100644 --- a/input/regression/tuplet-full-length-extent.ly +++ b/input/regression/tuplet-full-length-extent.ly @@ -4,7 +4,7 @@ attaching column for a full-length tuplet bracket can be ignored." } -\version "2.11.55" +\version "2.12.0" \new Staff { \set tupletFullLength = ##t diff --git a/input/regression/tuplet-full-length-note.ly b/input/regression/tuplet-full-length-note.ly index 88af2c64df..92a8f362b1 100644 --- a/input/regression/tuplet-full-length-note.ly +++ b/input/regression/tuplet-full-length-note.ly @@ -6,7 +6,7 @@ the next note, by setting @code{tupletFullLengthNote}." } -\version "2.11.51" +\version "2.12.0" \new RhythmicStaff { \set tupletFullLength = ##t diff --git a/input/regression/tuplet-full-length.ly b/input/regression/tuplet-full-length.ly index 827f291287..53ac8d57da 100644 --- a/input/regression/tuplet-full-length.ly +++ b/input/regression/tuplet-full-length.ly @@ -5,7 +5,7 @@ start of the next non-tuplet note. " } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t indent = 0.0 } diff --git a/input/regression/tuplet-gap.ly b/input/regression/tuplet-gap.ly index 6bb3b94437..373e9c1567 100644 --- a/input/regression/tuplet-gap.ly +++ b/input/regression/tuplet-gap.ly @@ -5,7 +5,7 @@ } -\version "2.11.51" +\version "2.12.0" \layout { indent = 0.0\mm diff --git a/input/regression/tuplet-nest-beam.ly b/input/regression/tuplet-nest-beam.ly index e1e9dedbed..c6e53caa47 100644 --- a/input/regression/tuplet-nest-beam.ly +++ b/input/regression/tuplet-nest-beam.ly @@ -5,7 +5,7 @@ } -\version "2.11.51" +\version "2.12.0" \paper{ ragged-right=##t } diff --git a/input/regression/tuplet-nest.ly b/input/regression/tuplet-nest.ly index 8bba889660..c090b2beb7 100644 --- a/input/regression/tuplet-nest.ly +++ b/input/regression/tuplet-nest.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc=" Tuplets may be nested." diff --git a/input/regression/tuplet-no-stems.ly b/input/regression/tuplet-no-stems.ly index 0284c7e948..1bd57dde6e 100644 --- a/input/regression/tuplet-no-stems.ly +++ b/input/regression/tuplet-no-stems.ly @@ -3,7 +3,7 @@ } -\version "2.11.51" +\version "2.12.0" \layout{ \context{ diff --git a/input/regression/tuplet-properties.ly b/input/regression/tuplet-properties.ly index 20299c7cc3..06681150f5 100644 --- a/input/regression/tuplet-properties.ly +++ b/input/regression/tuplet-properties.ly @@ -6,7 +6,7 @@ for instance, bracketed (B) and non-bracketed (NB). } -\version "2.11.51" +\version "2.12.0" diff --git a/input/regression/tuplet-rest.ly b/input/regression/tuplet-rest.ly index f973361948..ca991b0eb5 100644 --- a/input/regression/tuplet-rest.ly +++ b/input/regression/tuplet-rest.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Tuplets may contain rests. " diff --git a/input/regression/tuplet-single-note.ly b/input/regression/tuplet-single-note.ly index 63d0d0e72d..f5cd442413 100644 --- a/input/regression/tuplet-single-note.ly +++ b/input/regression/tuplet-single-note.ly @@ -4,7 +4,7 @@ texidoc = "Show tuplet numbers also on single-note tuplets (otherwise the timing would look messed up!), but don't show a bracket. Make sure that tuplets without any notes don't show any number, either." } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t indent = 0.0 } diff --git a/input/regression/tuplet-slope.ly b/input/regression/tuplet-slope.ly index 7839819d95..51f319fb0e 100644 --- a/input/regression/tuplet-slope.ly +++ b/input/regression/tuplet-slope.ly @@ -15,7 +15,7 @@ The bracket direction is determined by the dominating stem direction. ragged-right = ##t } -\version "2.11.51" +\version "2.12.0" \new Voice { \relative c'' { diff --git a/input/regression/tuplet-staffline-collision.ly b/input/regression/tuplet-staffline-collision.ly index 50ab09c771..6bbdbe6d45 100644 --- a/input/regression/tuplet-staffline-collision.ly +++ b/input/regression/tuplet-staffline-collision.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Horizontal tuplet brackets are shifted vertically diff --git a/input/regression/tuplets.ly b/input/regression/tuplets.ly index a1b3f95bfc..63fd9643e3 100644 --- a/input/regression/tuplets.ly +++ b/input/regression/tuplets.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" diff --git a/input/regression/utf-8-mixed-text.ly b/input/regression/utf-8-mixed-text.ly index b688477b00..47e9f7513b 100644 --- a/input/regression/utf-8-mixed-text.ly +++ b/input/regression/utf-8-mixed-text.ly @@ -5,6 +5,6 @@ } -\version "2.11.51" +\version "2.12.0" \markup { "Здравствуйт Hallo" } diff --git a/input/regression/utf-8.ly b/input/regression/utf-8.ly index ddede6d251..d8c5c5c9d5 100644 --- a/input/regression/utf-8.ly +++ b/input/regression/utf-8.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" %% Edit this file using a Unicode aware editor, such as GVIM, GEDIT, Emacs diff --git a/input/regression/voice-follower.ly b/input/regression/voice-follower.ly index 85881e730b..c06de358c1 100644 --- a/input/regression/voice-follower.ly +++ b/input/regression/voice-follower.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc= " diff --git a/input/regression/volta-broken-left-edge.ly b/input/regression/volta-broken-left-edge.ly index a8ea6b00bf..0bcac60ab4 100644 --- a/input/regression/volta-broken-left-edge.ly +++ b/input/regression/volta-broken-left-edge.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc ="Broken volta spanners behave correctly at their left edge in all cases." diff --git a/input/regression/volta-markup-text.ly b/input/regression/volta-markup-text.ly index 6eedd3e2c6..6e0ad569dc 100644 --- a/input/regression/volta-markup-text.ly +++ b/input/regression/volta-markup-text.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Volte using @code{repeatCommands} can have markup diff --git a/input/regression/volta-multi-staff-inner-staff.ly b/input/regression/volta-multi-staff-inner-staff.ly index 9839bc41cd..564f6657af 100644 --- a/input/regression/volta-multi-staff-inner-staff.ly +++ b/input/regression/volta-multi-staff-inner-staff.ly @@ -12,7 +12,7 @@ volta brackets on staves other than the topmost one." } } -\version "2.11.51" +\version "2.12.0" vmus = { \repeat volta 2 c1 \alternative { d e } } diff --git a/input/regression/volta-multi-staff.ly b/input/regression/volta-multi-staff.ly index 389b6f78c3..0a87f89b2c 100644 --- a/input/regression/volta-multi-staff.ly +++ b/input/regression/volta-multi-staff.ly @@ -3,7 +3,7 @@ } \layout { ragged-right = ##t } -\version "2.11.51" +\version "2.12.0" vmus = { \repeat volta 2 c1 \alternative { d e } } diff --git a/input/regression/warn-conflicting-key-signatures.ly b/input/regression/warn-conflicting-key-signatures.ly index 5ff27e608c..80dc236fa2 100644 --- a/input/regression/warn-conflicting-key-signatures.ly +++ b/input/regression/warn-conflicting-key-signatures.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "If you specify two different key signatures at one point, a diff --git a/input/regression/whiteout.ly b/input/regression/whiteout.ly index 09f35ece57..e75a168216 100644 --- a/input/regression/whiteout.ly +++ b/input/regression/whiteout.ly @@ -5,7 +5,7 @@ markup. The whitening effect only is only guaranteed for staff lines, since staff lines are in a lower layer than most other grobs. " } -\version "2.11.51" +\version "2.12.0" \paper { diff --git a/input/sakura-sakura.ly b/input/sakura-sakura.ly index 8bdcb2ebb5..2b86466b06 100644 --- a/input/sakura-sakura.ly +++ b/input/sakura-sakura.ly @@ -1,6 +1,6 @@ %% sakura-sakura.ly -\version "2.11.61" +\version "2.12.0" \header { diff --git a/input/simple-song.ly b/input/simple-song.ly index 654ca8f594..b05fa4613d 100644 --- a/input/simple-song.ly +++ b/input/simple-song.ly @@ -13,5 +13,5 @@ >> %% Optional helper for automatic updating by convert-ly. May be omitted. -\version "2.11.61" +\version "2.12.0" diff --git a/input/simple.ly b/input/simple.ly index cfa72542fa..0ce4bf40af 100644 --- a/input/simple.ly +++ b/input/simple.ly @@ -4,4 +4,4 @@ } %% Optional helper for automatic updating by convert-ly. May be omitted. -\version "2.11.61" +\version "2.12.0" diff --git a/input/texidocs/adding-a-figured-bass-above-or-below-the-notes.texidoc b/input/texidocs/adding-a-figured-bass-above-or-below-the-notes.texidoc index 94dd94820f..0f43098559 100644 --- a/input/texidocs/adding-a-figured-bass-above-or-below-the-notes.texidoc +++ b/input/texidocs/adding-a-figured-bass-above-or-below-the-notes.texidoc @@ -8,8 +8,10 @@ dentro de un contexto @code{Staff}). Se puede elegir entre centrado) y @code{#DOWN} (o @code{#-1}, abajo). Como podemos ver, esta propiedad se puede cambiar tantas veces -como queramos. Utilice @code{\\once \\override} si no quiere que el +como queramos. Utilice @code{\\once \\override} si no quiere que el truco se aplique a toda la partitura. " doctitlees = "Añadir un bajo cifrado encima o debajo de las notas" + + doctitlefr = "Ajout d'une basse chiffrée au-dessus ou au-dessous des notes" diff --git a/input/texidocs/adding-fingerings-to-tablatures.texidoc b/input/texidocs/adding-fingerings-to-tablatures.texidoc new file mode 100644 index 0000000000..4fc9caf6d3 --- /dev/null +++ b/input/texidocs/adding-fingerings-to-tablatures.texidoc @@ -0,0 +1,6 @@ + texidocfr = "Ajout de doigtés à des tablatures" + + doctitlefr = " +L'ajout de doigtés à des tablatures s'obtient en conjuguant des +@code{\\markup} et des @code{\\finger}. +" diff --git a/input/texidocs/adding-the-current-date-to-a-score.texidoc b/input/texidocs/adding-the-current-date-to-a-score.texidoc index f71fe81631..4e6a67cdf7 100644 --- a/input/texidocs/adding-the-current-date-to-a-score.texidoc +++ b/input/texidocs/adding-the-current-date-to-a-score.texidoc @@ -1,6 +1,12 @@ texidoces = " Con algo de código de Scheme, se puede añadir fácilmente la fecha actual a una partitura. - " doctitlees = "Añadir la fecha actual a una partitura" + + texidocfr = " +Avec un peu de code Scheme, voici comment ajouter facilement +la date du jour à votre partition. +" + + doctitlefr = "Ajout de la date du jour à une partition" diff --git a/input/texidocs/ancient-notation-template----modern-transcription-of-gregorian-music.texidoc b/input/texidocs/ancient-notation-template----modern-transcription-of-gregorian-music.texidoc index fe04ba0cc3..2c922a5af0 100644 --- a/input/texidocs/ancient-notation-template----modern-transcription-of-gregorian-music.texidoc +++ b/input/texidocs/ancient-notation-template----modern-transcription-of-gregorian-music.texidoc @@ -1,12 +1,12 @@ texidoces = " -Este ejemplo muestra cómo hacer una transcripción moderna de Canto -Gregoriano. El Canto Gregoriano no tiene compás ni plicas; utiliza +Este ejemplo muestra cómo hacer una transcripción moderna de canto +gregoriano. El canto gregoriano no tiene compás ni plicas; utiliza solamente cabezas de nota de blanca y de negra, y unas marcas especiales que indican silencios de distintas longitudes. " - doctitlees = "Plantilla para notación de música antigua (transcripción moderna de Canto Gregoriano)" + doctitlees = "Plantilla para notación de música antigua (transcripción moderna de canto gregoriano)" texidocde = " Dieses Beispiel zeigt eine moderne Transkription des Gregorianischen diff --git a/input/texidocs/changing-the-breath-mark-symbol.texidoc b/input/texidocs/changing-the-breath-mark-symbol.texidoc index d4950a6473..fdd1c4ebfd 100644 --- a/input/texidocs/changing-the-breath-mark-symbol.texidoc +++ b/input/texidocs/changing-the-breath-mark-symbol.texidoc @@ -1,6 +1,6 @@ texidoces = " El glifo de la marca de respiración se puede ajustar -sobreescribiendo la proopiedad de texto del objeto de presentación +sobreescribiendo la propiedad de texto del objeto de presentación @code{BreathingSign}, con cualquier otro texto de marcado. " diff --git a/input/texidocs/combining-two-parts-on-the-same-staff.texidoc b/input/texidocs/combining-two-parts-on-the-same-staff.texidoc index 2a5b213e83..55c8c0be30 100644 --- a/input/texidocs/combining-two-parts-on-the-same-staff.texidoc +++ b/input/texidocs/combining-two-parts-on-the-same-staff.texidoc @@ -3,7 +3,7 @@ La herramienta de combinación de partes ( instrucción @code{\\partcombine}) permite la combinación de varias partes diferentes sobre el mismo pentagrama. Las indicaciones textuales tales como \"solo\" o \"a2\" se añaden de forma predeterminada; -para quitarlas, sencillamente establezca la proopiedad +para quitarlas, sencillamente establezca la propiedad @code{printPartCombineTexts} al valor \"falso\". Para partituras vocales (como himnos), no hay necesidad de añadir los textos \"solo\" o \"a2\", por lo que se deben desactivar. Sin embargo, diff --git a/input/texidocs/modifying-default-values-for-articulation-shorthand-notation.texidoc b/input/texidocs/modifying-default-values-for-articulation-shorthand-notation.texidoc index de72a7111e..f17539ac85 100644 --- a/input/texidocs/modifying-default-values-for-articulation-shorthand-notation.texidoc +++ b/input/texidocs/modifying-default-values-for-articulation-shorthand-notation.texidoc @@ -6,7 +6,7 @@ Las abreviaturas se encuentran definidas dentro del archivo valores predeterminados. Se pueden modificar estos valores predeterminados para las abreviaturas. Por ejemplo, para asociar la abreviatura @code{-+} (@code{dashPlus}) con el símbolo del -semitrino en lugar del símboloo predeterminado +, asigne el valor +semitrino en lugar del símbolo predeterminado +, asigne el valor @code{trill} a la variable @code{dashPlus}: " diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly index d320f821e5..6e261127ba 100644 --- a/input/twinkle-pop.ly +++ b/input/twinkle-pop.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header{ filename = "twinkle-pop.ly" composer = "traditional" diff --git a/input/typography-demo.ly b/input/typography-demo.ly index c9db11c198..9938f6ce11 100644 --- a/input/typography-demo.ly +++ b/input/typography-demo.ly @@ -8,7 +8,7 @@ heavily mutilated Edition Peters Morgenlied by Schubert" } -\version "2.11.61" +\version "2.12.0" ignoreMelisma = \set ignoreMelismata = ##t ignoreMelismaOff = \unset ignoreMelismata diff --git a/input/wilhelmus.ly b/input/wilhelmus.ly index bd3eddc659..411ed3c7b5 100644 --- a/input/wilhelmus.ly +++ b/input/wilhelmus.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { texidoc = "Wilhelmus van Nassouwe" diff --git a/input/xiao-haizi-guai-guai.ly b/input/xiao-haizi-guai-guai.ly index cae08f8ae8..4fb107d344 100644 --- a/input/xiao-haizi-guai-guai.ly +++ b/input/xiao-haizi-guai-guai.ly @@ -4,7 +4,7 @@ %% hai2zi5: child, %% guai1-guai1: well-behaved) -\version "2.11.61" +\version "2.12.0" \header { title = "小孩子乖乖" diff --git a/lily/TODO b/lily/TODO deleted file mode 100644 index 3c9c0b80d5..0000000000 --- a/lily/TODO +++ /dev/null @@ -1,8 +0,0 @@ -Pango ------ - - . Add filter code to avoid font formats we do not want or can support; - in particular, avoid bitmap fonts. - - . Handle TTCs. Since Type 42 fonts don't support TTCs, convert them to - TTFs on the fly. diff --git a/lily/accidental-engraver.cc b/lily/accidental-engraver.cc index 457fd734c4..7fcea1ccfe 100644 --- a/lily/accidental-engraver.cc +++ b/lily/accidental-engraver.cc @@ -411,13 +411,11 @@ Accidental_engraver::create_accidental (Accidental_entry *entry, } Grob * -Accidental_engraver::make_standard_accidental (Stream_event *note, +Accidental_engraver::make_standard_accidental (Stream_event * /* note */, Grob *note_head, Engraver *trans, bool cautionary) { - (void)note; - /* We construct the accidentals at the originating Voice level, so that we get the property settings for @@ -455,12 +453,10 @@ Accidental_engraver::make_standard_accidental (Stream_event *note, } Grob * -Accidental_engraver::make_suggested_accidental (Stream_event *note, +Accidental_engraver::make_suggested_accidental (Stream_event * /* note */, Grob *note_head, Engraver *trans) { - (void) note; - Grob *a = trans->make_item ("AccidentalSuggestion", note_head->self_scm ()); Side_position_interface::add_support (a, note_head); diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc index 2deea75cda..96d8667c9d 100644 --- a/lily/all-font-metrics.cc +++ b/lily/all-font-metrics.cc @@ -8,6 +8,7 @@ #include "all-font-metrics.hh" +#include "string-convert.hh" #include "international.hh" #include "main.hh" #include "open-type-font.hh" @@ -17,13 +18,16 @@ Index_to_charcode_map const * -All_font_metrics::get_index_to_charcode_map (string filename, FT_Face face) +All_font_metrics::get_index_to_charcode_map (string filename, + int face_index, + FT_Face face) { - if (filename_charcode_maps_map_.find (filename) + string key = filename + String_convert::int_string (face_index); + if (filename_charcode_maps_map_.find (key) == filename_charcode_maps_map_.end ()) - filename_charcode_maps_map_[filename] = make_index_to_charcode_map (face); + filename_charcode_maps_map_[key] = make_index_to_charcode_map (face); - return &filename_charcode_maps_map_[filename]; + return &filename_charcode_maps_map_[key]; } diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc index f86edaecc8..af4f1fc2d9 100644 --- a/lily/auto-beam-engraver.cc +++ b/lily/auto-beam-engraver.cc @@ -302,27 +302,24 @@ Auto_beam_engraver::finalize () void -Auto_beam_engraver::acknowledge_beam (Grob_info info) +Auto_beam_engraver::acknowledge_beam (Grob_info /* info */) { - (void)info; check_bar_property (); if (stems_) end_beam (); } void -Auto_beam_engraver::acknowledge_bar_line (Grob_info info) +Auto_beam_engraver::acknowledge_bar_line (Grob_info /* info */) { - (void)info; check_bar_property (); if (stems_) end_beam (); } void -Auto_beam_engraver::acknowledge_rest (Grob_info info) +Auto_beam_engraver::acknowledge_rest (Grob_info /* info */) { - (void)info; check_bar_property (); if (stems_) end_beam (); diff --git a/lily/bar-line.cc b/lily/bar-line.cc index df97638dba..f13d8697c3 100644 --- a/lily/bar-line.cc +++ b/lily/bar-line.cc @@ -198,6 +198,10 @@ Bar_line::compound_barline (Grob *me, string str, Real h, { m = dashed_bar_line (me, h, hair); } + else if (str == "'") + { + m = tick_bar_line (me, h, rounded); + } else if (str == ".") { m = dot; @@ -222,6 +226,22 @@ Bar_line::simple_barline (Grob *me, Interval (-h / 2, h / 2)), blot); } +Stencil +Bar_line::tick_bar_line (Grob *me, Real h, bool rounded) +{ + Real th = Staff_symbol_referencer::staff_space (me) / 2; + Real line_thick = Staff_symbol_referencer::line_thickness (me); + + Real blot + = rounded + ? me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter")) + : 0.0; + + return Lookup::round_filled_box (Box (Interval (0, line_thick), + Interval (h / 2 - th, h / 2 + th)), blot); +} + + MAKE_SCHEME_CALLBACK (Bar_line, calc_bar_size, 1); SCM Bar_line::calc_bar_size (SCM smob) diff --git a/lily/beam.cc b/lily/beam.cc index c8adf5694d..b962fde776 100644 --- a/lily/beam.cc +++ b/lily/beam.cc @@ -341,6 +341,12 @@ Beam::get_beam_segments (Grob *me_grob, Grob **common) Position_stem_segments_map stem_segments; Real lt = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness")); + /* There are two concepts of "rank" that are used in the following code. + The beam_rank is the vertical position of the beam (larger numbers are + closer to the noteheads). Beam_stem_segment.rank_, on the other hand, + is the horizontal position of the segment (this is incremented by two + for each stem; the beam segment on the right side of the stem has + a higher rank (by one) than its neighbour to the left). */ Slice ranks; for (vsize i = 0; i < stems.size (); i++) { @@ -351,6 +357,10 @@ Beam::get_beam_segments (Grob *me_grob, Grob **common) Direction d = LEFT; do { + // Find the maximum and minimum beam ranks. + // Given that RANKS is never reset to empty, the interval will always be + // smallest for the left beamlet of the first stem, and then it might grow. + // Do we really want this? (It only affects the tremolo gaps) --jneem for (SCM s = index_get_cell (beaming, d); scm_is_pair (s); s = scm_cdr (s)) { @@ -400,34 +410,51 @@ Beam::get_beam_segments (Grob *me_grob, Grob **common) Beam_segment current; + // Iterate over all of the segments of the current beam rank, + // merging the adjacent Beam_stem_segments into one Beam_segment + // when appropriate. int vertical_count = (*i).first; for (vsize j = 0; j < segs.size (); j++) { - /* - event_dir == LEFT: left edge of a beamsegment. - */ + // Keeping track of the different directions here is a little tricky. + // segs[j].dir_ is the direction of the beam segment relative to the stem + // (ie. segs[j].dir_ == LEFT if the beam segment sticks out to the left of + // its stem) whereas event_dir refers to the edge of the beam segment that + // we are currently looking at (ie. if segs[j].dir_ == event_dir then we + // are looking at that edge of the beam segment that is furthest from its + // stem). Direction event_dir = LEFT; + Beam_stem_segment const& seg = segs[j]; do { - bool on_line_bound = (segs[j].dir_ == LEFT) ? segs[j].stem_index_ == 0 - : segs[j].stem_index_ == stems.size() - 1; + Beam_stem_segment const& neighbor_seg = segs[j + event_dir]; + // TODO: make names clearer? --jneem + // on_line_bound: whether the current segment is on the boundary of the WHOLE beam + // on_beam_bound: whether the current segment is on the boundary of just that part + // of the beam with the current beam_rank + bool on_line_bound = (seg.dir_ == LEFT) ? seg.stem_index_ == 0 + : seg.stem_index_ == stems.size() - 1; bool on_beam_bound = (event_dir == LEFT) ? j == 0 : j == segs.size () - 1; bool inside_stem = (event_dir == LEFT) - ? segs[j].stem_index_ > 0 - : segs[j].stem_index_ + 1 < stems.size () ; + ? seg.stem_index_ > 0 + : seg.stem_index_ + 1 < stems.size () ; bool event = on_beam_bound - || abs (segs[j].rank_ - segs[j+event_dir].rank_) > 1 - || (abs (vertical_count) >= segs[j].max_connect_ - || abs (vertical_count) >= segs[j + event_dir].max_connect_); + || abs (seg.rank_ - neighbor_seg.rank_) > 1 + || (abs (vertical_count) >= seg.max_connect_ + || abs (vertical_count) >= neighbor_seg.max_connect_); if (!event) + // Then this edge of the current segment is irrelevent because it will + // be connected with the next segment in the event_dir direction. continue; current.vertical_count_ = vertical_count; - current.horizontal_[event_dir] = segs[j].stem_x_; - if (segs[j].dir_ == event_dir) + current.horizontal_[event_dir] = seg.stem_x_; + if (seg.dir_ == event_dir) + // then we are examining the edge of a beam segment that is furthest + // from its stem. { if (on_line_bound && me->get_bound (event_dir)->break_status_dir ()) @@ -439,38 +466,40 @@ Beam::get_beam_segments (Grob *me_grob, Grob **common) } else { - Real notehead_width = - Stem::duration_log (segs[j].stem_) == 1 - ? 1.98 - : 1.32; // URG. - + Grob *stem = stems[seg.stem_index_]; + Drul_array beamlet_length = + robust_scm2interval (stem->get_property ("beamlet-default-length"), Interval (1.1, 1.1)); + Drul_array max_proportion = + robust_scm2interval (stem->get_property ("beamlet-max-length-proportion"), Interval (0.75, 0.75)); + Real length = beamlet_length[seg.dir_]; if (inside_stem) { - Grob *neighbor_stem = stems[segs[j].stem_index_ + event_dir]; - Real neighbor_stem_x - = neighbor_stem->relative_coordinate (commonx, X_AXIS); + Grob *neighbor_stem = stems[seg.stem_index_ + event_dir]; + Real neighbor_stem_x = neighbor_stem->relative_coordinate (commonx, X_AXIS); - notehead_width = min (notehead_width, - fabs (neighbor_stem_x - segs[j].stem_x_)/2.5); + length = min (length, + fabs (neighbor_stem_x - seg.stem_x_) * max_proportion[seg.dir_]); } - current.horizontal_[event_dir] += event_dir * notehead_width; + current.horizontal_[event_dir] += event_dir * length; } } else + // we are examining the edge of a beam segment that is closest + // (ie. touching, unless there is a gap) its stem. { - current.horizontal_[event_dir] += event_dir * segs[j].width_/2; - if (segs[j].gapped_) + current.horizontal_[event_dir] += event_dir * seg.width_/2; + if (seg.gapped_) { current.horizontal_[event_dir] -= event_dir * gap_length; - if (Stem::is_invisible (segs[j].stem_)) + if (Stem::is_invisible (seg.stem_)) { /* Need to do this in case of whole notes. We don't want the heads to collide with the beams. */ - extract_grob_set (segs[j].stem_, "note-heads", heads); + extract_grob_set (seg.stem_, "note-heads", heads); for (vsize k = 0; k < heads.size (); k ++) current.horizontal_[event_dir] @@ -893,10 +922,8 @@ Beam::no_visible_stem_positions (Grob *me, Interval default_value) */ MAKE_SCHEME_CALLBACK (Beam, calc_least_squares_positions, 2); SCM -Beam::calc_least_squares_positions (SCM smob, SCM posns) +Beam::calc_least_squares_positions (SCM smob, SCM /* posns */) { - (void) posns; - Grob *me = unsmob_grob (smob); int count = normal_stem_count (me); diff --git a/lily/book.cc b/lily/book.cc index 3a84865462..fa961d36f3 100644 --- a/lily/book.cc +++ b/lily/book.cc @@ -200,9 +200,14 @@ Book::process_bookparts (Paper_book *output_paper_book, Output_def *paper, Outpu { Paper_book *paper_book_part = book->process (paper, layout, output_paper_book); if (paper_book_part) - output_paper_book->add_bookpart (paper_book_part->self_scm ()); + { + output_paper_book->add_bookpart (paper_book_part->self_scm ()); + paper_book_part->unprotect (); + } } } + /* In a Paper_book, bookparts are stored in straight order */ + output_paper_book->bookparts_ = scm_reverse_x (output_paper_book->bookparts_, SCM_EOL); } void diff --git a/lily/box.cc b/lily/box.cc index 5cce139fd4..5c2af4d317 100644 --- a/lily/box.cc +++ b/lily/box.cc @@ -88,16 +88,14 @@ IMPLEMENT_TYPE_P (Box, "ly:box?"); IMPLEMENT_DEFAULT_EQUAL_P (Box); SCM -Box::mark_smob (SCM x) +Box::mark_smob (SCM /* x */) { - (void)x; return SCM_EOL; } int -Box::print_smob (SCM x, SCM p, scm_print_state*) +Box::print_smob (SCM /* x */, SCM p, scm_print_state*) { - (void)x; scm_puts ("#", p); return 1; } diff --git a/lily/context.cc b/lily/context.cc index 36e506cd7e..a1456a1bbf 100644 --- a/lily/context.cc +++ b/lily/context.cc @@ -46,9 +46,8 @@ Context::check_removal () } } -Context::Context (Context const &src) +Context::Context (Context const & /* src */) { - (void) src; assert (false); } diff --git a/lily/custos-engraver.cc b/lily/custos-engraver.cc index 8b5eb08ef8..578f57266e 100644 --- a/lily/custos-engraver.cc +++ b/lily/custos-engraver.cc @@ -65,9 +65,8 @@ Custos_engraver::start_translation_timestep () } void -Custos_engraver::acknowledge_bar (Grob_info info) +Custos_engraver::acknowledge_bar (Grob_info /* info */) { - (void) info; custos_permitted_ = true; } diff --git a/lily/dot-configuration.cc b/lily/dot-configuration.cc index e2680bd2d2..e82c17257a 100644 --- a/lily/dot-configuration.cc +++ b/lily/dot-configuration.cc @@ -8,6 +8,7 @@ (c) 1997--2008 Han-Wen Nienhuys */ +#include #include "dot-configuration.hh" #include "dot-formatting-problem.hh" #include "staff-symbol-referencer.hh" diff --git a/lily/duration-scheme.cc b/lily/duration-scheme.cc index a90fb1fda8..fe027dcf26 100644 --- a/lily/duration-scheme.cc +++ b/lily/duration-scheme.cc @@ -58,7 +58,7 @@ LY_DEFINE (ly_make_duration, "ly:make-duration", int dots = 0; if (dotcount != SCM_UNDEFINED) { - LY_ASSERT_TYPE (scm_is_integer, dotcount,2); + LY_ASSERT_TYPE (scm_is_integer, dotcount, 2); dots = scm_to_int (dotcount); } diff --git a/lily/engraver.cc b/lily/engraver.cc index dcda3031b4..9ac54f804e 100644 --- a/lily/engraver.cc +++ b/lily/engraver.cc @@ -106,13 +106,19 @@ LY_DEFINE (ly_set_grob_creation_callback, "ly:set-grob-creation-callback", #endif Grob * -Engraver::internal_make_grob (SCM symbol, SCM cause, char const *name, char const *file, int line, char const *fun) +Engraver::internal_make_grob (SCM symbol, + SCM cause, + char const * /* name */, + char const *file, + int line, + char const *fun) { - (void) file; - (void) fun; - (void) line; - (void) name; - +#ifdef NDEBUG + (void)file; + (void)line; + (void)fun; +#endif + SCM props = updated_grob_properties (context (), symbol); Grob *grob = 0; diff --git a/lily/figured-bass-position-engraver.cc b/lily/figured-bass-position-engraver.cc index fadb5f1cb3..15d1278fbd 100644 --- a/lily/figured-bass-position-engraver.cc +++ b/lily/figured-bass-position-engraver.cc @@ -115,9 +115,8 @@ Figured_bass_position_engraver::stop_translation_timestep () } void -Figured_bass_position_engraver::acknowledge_end_bass_figure_alignment (Grob_info info) +Figured_bass_position_engraver::acknowledge_end_bass_figure_alignment (Grob_info /* info */) { - (void)info; stop_spanner (); } diff --git a/lily/fingering-engraver.cc b/lily/fingering-engraver.cc index 1c4107e686..b48f38924f 100644 --- a/lily/fingering-engraver.cc +++ b/lily/fingering-engraver.cc @@ -45,14 +45,13 @@ Fingering_engraver::listen_fingering (Stream_event *ev) IMPLEMENT_TRANSLATOR_LISTENER (Fingering_engraver, stroke_finger); void -Fingering_engraver::listen_stroke_finger (Stream_event *ev) +Fingering_engraver::listen_stroke_finger (Stream_event * /* ev */) { /* FIXME: should do something. This function is mainly here to shut up a warning */ - (void)ev; } void diff --git a/lily/font-config-scheme.cc b/lily/font-config-scheme.cc index ce4525467a..9de2cd112d 100644 --- a/lily/font-config-scheme.cc +++ b/lily/font-config-scheme.cc @@ -29,6 +29,8 @@ display_fontset (FcFontSet *fs) font = FcNameUnparse (fs->fonts[j]); if (FcPatternGetString (fs->fonts[j], FC_FILE, 0, &str) == FcResultMatch) retval += String_convert::form_string ("FILE %s\n", str); + if (FcPatternGetString (fs->fonts[j], FC_INDEX, 0, &str) == FcResultMatch) + retval += String_convert::form_string ("INDEX %s\n", str); if (FcPatternGetString (fs->fonts[j], FC_FAMILY, 0, &str) == FcResultMatch) retval += String_convert::form_string ("family %s\n ", str); if (FcPatternGetString (fs->fonts[j], diff --git a/lily/font-config.cc b/lily/font-config.cc index 8cbd46d9cc..96247f6f76 100644 --- a/lily/font-config.cc +++ b/lily/font-config.cc @@ -10,6 +10,7 @@ #if HAVE_FONTCONFIG +#include #include #include diff --git a/lily/font-metric.cc b/lily/font-metric.cc index 9901f4c382..d9ccecbc91 100644 --- a/lily/font-metric.cc +++ b/lily/font-metric.cc @@ -185,9 +185,8 @@ Font_metric::word_stencil (string str) const } Stencil -Font_metric::text_stencil (string str) const +Font_metric::text_stencil (string /* str */) const { - (void) str; programming_error("Cannot get a text stencil from this font"); return Stencil (Box (), SCM_EOL); } diff --git a/lily/general-scheme.cc b/lily/general-scheme.cc index 3e1052aed3..94c05ee607 100644 --- a/lily/general-scheme.cc +++ b/lily/general-scheme.cc @@ -345,10 +345,11 @@ LY_DEFINE (ly_stderr_redirect, "ly:stderr-redirect", } static SCM -accumulate_symbol (void *closure, SCM key, SCM val, SCM result) +accumulate_symbol (void * /* closure */, + SCM key, + SCM /* val */, + SCM result) { - (void) closure; - (void) val; return scm_cons (key, result); } diff --git a/lily/include/all-font-metrics.hh b/lily/include/all-font-metrics.hh index 9c37a1a7d2..da1437bfac 100644 --- a/lily/include/all-font-metrics.hh +++ b/lily/include/all-font-metrics.hh @@ -39,7 +39,9 @@ class All_font_metrics All_font_metrics (All_font_metrics const &); public: - Index_to_charcode_map const *get_index_to_charcode_map (string filename, FT_Face face); + Index_to_charcode_map const *get_index_to_charcode_map (string filename, + int face_index, + FT_Face face); All_font_metrics (string search_path); ~All_font_metrics (); diff --git a/lily/include/bar-line.hh b/lily/include/bar-line.hh index a6585084b6..1ae1b59ae7 100644 --- a/lily/include/bar-line.hh +++ b/lily/include/bar-line.hh @@ -16,6 +16,7 @@ public: DECLARE_GROB_INTERFACE(); static Stencil dashed_bar_line (Grob *me, Real h, Real thick); + static Stencil tick_bar_line (Grob *me, Real h, bool rounded); static Stencil compound_barline (Grob *, string, Real height, bool rounded); static Stencil simple_barline (Grob *, Real wid, Real height, bool rounded); static Interval bar_y_extent (Grob *, Grob *); diff --git a/lily/include/freetype.hh b/lily/include/freetype.hh index 4880509636..3b6d830977 100644 --- a/lily/include/freetype.hh +++ b/lily/include/freetype.hh @@ -17,9 +17,6 @@ void init_freetype (); extern FT_Library freetype2_library; -FT_Face open_ft_face (string str); - string freetype_error_string (int code); #endif /* FREETYPE_HH */ - diff --git a/lily/include/open-type-font.hh b/lily/include/open-type-font.hh index f79e4c07ba..315113a27f 100644 --- a/lily/include/open-type-font.hh +++ b/lily/include/open-type-font.hh @@ -52,7 +52,7 @@ public: }; string get_otf_table (FT_Face face, string tag); -FT_Face open_ft_face (string str); +FT_Face open_ft_face (string str, FT_Long idx); #endif /* OPEN_TYPE_FONT_HH */ diff --git a/lily/include/pango-font.hh b/lily/include/pango-font.hh index 93ac7c11f8..dc93324da8 100644 --- a/lily/include/pango-font.hh +++ b/lily/include/pango-font.hh @@ -37,7 +37,7 @@ public: string description_string () const; SCM font_file_name () const; - void register_font_file (string, string); + void register_font_file (string, string, int); Stencil text_stencil (string, bool tight) const; Stencil pango_item_string_stencil (PangoItem const *, string, bool tight) const; diff --git a/lily/include/paper-book.hh b/lily/include/paper-book.hh index 1294dd144c..9087fd7c17 100644 --- a/lily/include/paper-book.hh +++ b/lily/include/paper-book.hh @@ -58,10 +58,10 @@ public: protected: void classic_output_aux (SCM output, int *first_performance_number); - void output_aux (SCM output_channel, - bool is_last, - int *first_page_number, - int *first_performance_number); + int output_aux (SCM output_channel, + bool is_last, + int *first_page_number, + int *first_performance_number); }; DECLARE_UNSMOB (Paper_book, paper_book) diff --git a/lily/include/scale.hh b/lily/include/scale.hh index f853636b8c..7984a2d233 100644 --- a/lily/include/scale.hh +++ b/lily/include/scale.hh @@ -20,7 +20,7 @@ public: Scale (vector const&); Scale (Scale const&); - Rational tones_at_step (int step, int octave = 0) const; + Rational tones_at_step (int step, int octave) const; Rational step_size (int step) const; int step_count () const; int normalize_step (int step) const; diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc index 7997d11c33..45300af686 100644 --- a/lily/key-engraver.cc +++ b/lily/key-engraver.cc @@ -119,18 +119,16 @@ Key_engraver::listen_key_change (Stream_event *ev) } void -Key_engraver::acknowledge_clef (Grob_info info) +Key_engraver::acknowledge_clef (Grob_info /* info */) { - (void)info; SCM c = get_property ("createKeyOnClefChange"); if (to_boolean (c)) create_key (false); } void -Key_engraver::acknowledge_bar_line (Grob_info info) +Key_engraver::acknowledge_bar_line (Grob_info /* info */) { - (void)info; if (scm_is_pair (get_property ("keySignature"))) create_key (true); } diff --git a/lily/ly-module.cc b/lily/ly-module.cc index 4d6b0a8f97..eb73cd68cd 100644 --- a/lily/ly-module.cc +++ b/lily/ly-module.cc @@ -97,9 +97,11 @@ ly_module_symbols (SCM mod) } static SCM -entry_to_alist (void *closure, SCM key, SCM val, SCM result) +entry_to_alist (void * /* closure */, + SCM key, + SCM val, + SCM result) { - (void) closure; if (scm_variable_bound_p (val) == SCM_BOOL_T) return scm_cons (scm_cons (key, scm_variable_ref (val)), result); programming_error ("unbound variable in module"); @@ -134,9 +136,11 @@ ly_reexport_module (SCM mod) #ifdef MODULE_GC_KLUDGE static SCM -redefine_keyval (void *closure, SCM key, SCM val, SCM result) +redefine_keyval (void * /* closure */, + SCM key, + SCM val, + SCM result) { - (void)closure; SCM new_tab = result; scm_hashq_set_x (new_tab, key, val); return new_tab; diff --git a/lily/lyric-combine-music-iterator.cc b/lily/lyric-combine-music-iterator.cc index 26a4dfa587..b75d309f2a 100644 --- a/lily/lyric-combine-music-iterator.cc +++ b/lily/lyric-combine-music-iterator.cc @@ -260,10 +260,8 @@ Lyric_combine_music_iterator::find_voice () } void -Lyric_combine_music_iterator::process (Moment when) +Lyric_combine_music_iterator::process (Moment /* when */) { - (void) when; - /* see if associatedVoice has been changed */ Context *new_voice = find_voice (); if (new_voice) diff --git a/lily/main.cc b/lily/main.cc index 29f3e685b3..ab25e953ce 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -12,6 +12,7 @@ #include #include #include +#include using namespace std; #include @@ -258,6 +259,10 @@ LY_DEFINE (ly_usage, "ly:usage", printf ("\n"); printf (Long_option_init::table_string (options_static).c_str ()); printf ("\n"); + /* Translators, please translate this string as + "Report bugs in English via %s", + or if there is a LilyPond users list or forum in your language + "Report bugs in English via %s or in YOUR_LANG via URI" */ printf (_f ("Report bugs via %s", "http://post.gmane.org/post.php?group=gmane.comp.gnu.lilypond.bugs" ).c_str ()); diff --git a/lily/melody-engraver.cc b/lily/melody-engraver.cc index 5189f674b5..9957185f04 100644 --- a/lily/melody-engraver.cc +++ b/lily/melody-engraver.cc @@ -62,9 +62,8 @@ Melody_engraver::stop_translation_timestep () void -Melody_engraver::acknowledge_slur (Grob_info info) +Melody_engraver::acknowledge_slur (Grob_info /* info */) { - (void)info; melody_item_ = 0; } diff --git a/lily/minimal-page-breaking.cc b/lily/minimal-page-breaking.cc index c25da7cb18..f26b4b5886 100644 --- a/lily/minimal-page-breaking.cc +++ b/lily/minimal-page-breaking.cc @@ -15,9 +15,8 @@ #include "paper-book.hh" static bool -is_break (Grob *g) +is_break (Grob *) { - (void) g; /* shutup warning */ return false; } @@ -35,11 +34,11 @@ Minimal_page_breaking::solve () { vsize end = last_break_position (); - message ("Computing line breaks..."); + message (_ ("Calculating line breaks...")); set_to_ideal_line_configuration (0, end); break_into_pieces (0, end, current_configuration (0)); - message (_ ("Computing page breaks...")); + message (_ ("Calculating page breaks...")); vsize first_page_num = robust_scm2int (book_->paper_->c_variable ("first-page-number"), 1); Page_spacing_result res = pack_systems_on_least_pages (0, first_page_num); SCM lines = systems (); diff --git a/lily/module-scheme.cc b/lily/module-scheme.cc index 173226ac15..627504d922 100644 --- a/lily/module-scheme.cc +++ b/lily/module-scheme.cc @@ -19,9 +19,11 @@ */ static SCM -module_define_closure_func (void *closure, SCM key, SCM val, SCM result) +module_define_closure_func (void *closure, + SCM key, + SCM val, + SCM /* result */) { - (void) result; SCM module = (SCM) closure; if (scm_variable_bound_p (val) == SCM_BOOL_T) scm_module_define (module, key, scm_variable_ref (val)); diff --git a/lily/new-dynamic-engraver.cc b/lily/new-dynamic-engraver.cc index 99d015067d..be395fa2d1 100644 --- a/lily/new-dynamic-engraver.cc +++ b/lily/new-dynamic-engraver.cc @@ -220,7 +220,11 @@ ADD_TRANSLATOR (New_dynamic_engraver, "TextSpanner ", /* read */ - "currentMusicalColumn ", + "crescendoSpanner " + "crescendoText " + "currentMusicalColumn " + "decrescendoSpanner " + "decrescendoText ", /* write */ "" diff --git a/lily/new-fingering-engraver.cc b/lily/new-fingering-engraver.cc index 5078e2d2db..cd9532206d 100644 --- a/lily/new-fingering-engraver.cc +++ b/lily/new-fingering-engraver.cc @@ -125,10 +125,8 @@ New_fingering_engraver::acknowledge_stem (Grob_info inf) void New_fingering_engraver::add_script (Grob *head, Stream_event *event, - Stream_event *note) + Stream_event * /* note */) { - (void) note; - Finger_tuple ft; Grob *g = make_item ("Script", event->self_scm ()); diff --git a/lily/open-type-font.cc b/lily/open-type-font.cc index 97c49feca2..771a875610 100644 --- a/lily/open-type-font.cc +++ b/lily/open-type-font.cc @@ -91,25 +91,24 @@ get_otf_table (FT_Face face, string tag) } FT_Face -open_ft_face (string str) +open_ft_face (string str, FT_Long idx) { FT_Face face; - int error_code = FT_New_Face (freetype2_library, str.c_str (), 0, &face); + int error_code = FT_New_Face (freetype2_library, str.c_str (), idx, &face); if (error_code == FT_Err_Unknown_File_Format) error (_f ("unsupported font format: %s", str.c_str ())); else if (error_code) error (_f ("error reading font file %s: %s", str.c_str (), - freetype_error_string (error_code).c_str () - )); + freetype_error_string (error_code).c_str ())); return face; } SCM Open_type_font::make_otf (string str) { - FT_Face face = open_ft_face (str); + FT_Face face = open_ft_face (str, 0 /* index */); Open_type_font *otf = new Open_type_font (face); return otf->self_scm (); diff --git a/lily/optimal-page-breaking.cc b/lily/optimal-page-breaking.cc index f495ab7fa6..c5a6133563 100644 --- a/lily/optimal-page-breaking.cc +++ b/lily/optimal-page-breaking.cc @@ -18,9 +18,8 @@ #include "system.hh" static bool -is_break (Grob *g) +is_break (Grob *) { - (void) g; /* shutup warning */ return false; } diff --git a/lily/output-def.cc b/lily/output-def.cc index 1fcc5f596e..212731bd5f 100644 --- a/lily/output-def.cc +++ b/lily/output-def.cc @@ -92,8 +92,6 @@ Output_def::print_smob (SCM s, SCM p, scm_print_state *) Output_def * def = unsmob_output_def (s); scm_puts ("#< ", p); scm_puts (def->class_name (), p); - - (void)def; scm_puts (">", p); return 1; } diff --git a/lily/page-spacing-result.cc b/lily/page-spacing-result.cc index 93c737c839..02cb009b43 100644 --- a/lily/page-spacing-result.cc +++ b/lily/page-spacing-result.cc @@ -8,6 +8,7 @@ */ #include "page-spacing-result.hh" +#include Page_spacing_result::Page_spacing_result () { diff --git a/lily/pango-font-scheme.cc b/lily/pango-font-scheme.cc index 955b4a8f16..2c6f13cc07 100644 --- a/lily/pango-font-scheme.cc +++ b/lily/pango-font-scheme.cc @@ -30,7 +30,8 @@ LY_DEFINE (ly_pango_font_p, "ly:pango-font?", LY_DEFINE (ly_pango_font_physical_fonts, "ly:pango-font-physical-fonts", 1, 0, 0, (SCM f), - "Return alist of @code{(PSNAME . FILENAME)} tuples.") + "Return alist of @code{(ps-name file-name font-index)} lists" + " for Pango font@tie{}@var{f}.") { Pango_font *pf = dynamic_cast (unsmob_metrics (f)); diff --git a/lily/pango-font.cc b/lily/pango-font.cc index aa2c7f35c4..f6456dd826 100644 --- a/lily/pango-font.cc +++ b/lily/pango-font.cc @@ -11,8 +11,9 @@ #include #include +#include -/* Ugh. */ +// Ugh. #include "pango-font.hh" #include "dimensions.hh" @@ -28,32 +29,27 @@ #if HAVE_PANGO_FT2 #include "stencil.hh" -Pango_font::Pango_font (PangoFT2FontMap *fontmap, +Pango_font::Pango_font (PangoFT2FontMap * /* fontmap */, PangoFontDescription const *description, Real output_scale) { - (void) fontmap; - physical_font_tab_ = scm_c_make_hash_table (11); PangoDirection pango_dir = PANGO_DIRECTION_LTR; - context_ - = pango_ft2_get_context (PANGO_RESOLUTION, PANGO_RESOLUTION); + context_ = pango_ft2_get_context (PANGO_RESOLUTION, + PANGO_RESOLUTION); pango_description_ = pango_font_description_copy (description); attribute_list_ = pango_attr_list_new (); - /* - urgh. I don't understand this. Why isn't this 1/(scale * - resolution * output_scale) - - --hwn - */ + // urgh. I don't understand this. Why isn't this 1/(scale * + // resolution * output_scale) + // + // --hwn output_scale_ = output_scale; - scale_ = INCH_TO_BP / (Real (PANGO_SCALE) * Real (PANGO_RESOLUTION) * output_scale); + scale_ = INCH_TO_BP + / (Real (PANGO_SCALE) * Real (PANGO_RESOLUTION) * output_scale); - /* - ugh. Should make this configurable. - */ + // ugh. Should make this configurable. pango_context_set_language (context_, pango_language_from_string ("en_US")); pango_context_set_base_dir (context_, pango_dir); pango_context_set_font_description (context_, description); @@ -67,11 +63,14 @@ Pango_font::~Pango_font () } void -Pango_font::register_font_file (string filename, string ps_name) +Pango_font::register_font_file (string filename, + string ps_name, + int face_index) { scm_hash_set_x (physical_font_tab_, ly_string2scm (ps_name), - ly_string2scm (filename)); + scm_list_2 (ly_string2scm (filename), + scm_from_int (face_index))); } void @@ -80,32 +79,33 @@ Pango_font::derived_mark () const scm_gc_mark (physical_font_tab_); } - void -get_glyph_index_name (char *s, FT_ULong code) +get_glyph_index_name (char *s, + FT_ULong code) { sprintf (s, "glyphIndex%lX", code); } void -get_unicode_name (char*s, FT_ULong code) +get_unicode_name (char *s, + FT_ULong code) { if (code > 0xFFFF) - sprintf (s, "u%lX", code); + sprintf (s, "u%lX", code); else - sprintf (s, "uni%04lX", code); + sprintf (s, "uni%04lX", code); } - Stencil -Pango_font::pango_item_string_stencil (PangoItem const *item, string str, +Pango_font::pango_item_string_stencil (PangoItem const *item, + string str, bool tight_bbox) const { const int GLYPH_NAME_LEN = 256; char glyph_name[GLYPH_NAME_LEN]; PangoAnalysis const *pa = &(item->analysis); PangoGlyphString *pgs = pango_glyph_string_new (); - + pango_shape (str.c_str () + item->offset, item->length, (PangoAnalysis*) pa, pgs); @@ -119,39 +119,44 @@ Pango_font::pango_item_string_stencil (PangoItem const *item, string str, FT_Face ftface = pango_fc_font_lock_face (fcfont); - PangoRectangle const *which_rect - = (tight_bbox) - ? &ink_rect - : &logical_rect; - + PangoRectangle const *which_rect = tight_bbox ? &ink_rect + : &logical_rect; + Box b (Interval (PANGO_LBEARING (logical_rect), PANGO_RBEARING (logical_rect)), Interval (-PANGO_DESCENT (*which_rect), PANGO_ASCENT (*which_rect))); - b.scale (scale_); + char const *ps_name_str0 = FT_Get_Postscript_Name (ftface); FcPattern *fcpat = fcfont->font_pattern; + FcChar8 *file_name_as_ptr = 0; FcPatternGetString (fcpat, FC_FILE, 0, &file_name_as_ptr); + // due to a bug in FreeType 2.3.7 and earlier we can't use + // ftface->face_index; it is always zero for some font formats, + // in particular TTCs which we are interested in + int face_index = 0; + FcPatternGetInteger (fcpat, FC_INDEX, 0, &face_index); + string file_name; if (file_name_as_ptr) - { - /* Normalize file name. */ - file_name = File_name ((char const *)file_name_as_ptr).to_string (); - } - + // Normalize file name. + file_name = File_name ((char const *)file_name_as_ptr).to_string (); + SCM glyph_exprs = SCM_EOL; SCM *tail = &glyph_exprs; - + Index_to_charcode_map const *cmap = 0; bool has_glyph_names = ftface->face_flags & FT_FACE_FLAG_GLYPH_NAMES; - if (! has_glyph_names) - cmap = all_fonts_global->get_index_to_charcode_map (file_name, ftface); + if (!has_glyph_names) + cmap = all_fonts_global->get_index_to_charcode_map ( + file_name, face_index, ftface); bool is_ttf = string (FT_Get_X11_Font_Format (ftface)) == "TrueType"; bool cid_keyed = false; + for (int i = 0; i < pgs->num_glyphs; i++) { PangoGlyphInfo *pgi = pgs->glyphs + i; @@ -162,11 +167,12 @@ Pango_font::pango_item_string_stencil (PangoItem const *item, string str, glyph_name[0] = '\0'; if (has_glyph_names) { - int errorcode = FT_Get_Glyph_Name (ftface, pg, glyph_name, GLYPH_NAME_LEN); + int errorcode = FT_Get_Glyph_Name (ftface, pg, glyph_name, + GLYPH_NAME_LEN); if (errorcode) - programming_error (_f ("FT_Get_Glyph_Name () error: %s", - freetype_error_string (errorcode).c_str () - )); + programming_error ( + _f ("FT_Get_Glyph_Name () error: %s", + freetype_error_string (errorcode).c_str ())); } SCM char_id = SCM_EOL; @@ -179,51 +185,44 @@ Pango_font::pango_item_string_stencil (PangoItem const *item, string str, get_unicode_name (glyph_name, char_code); } - if (glyph_name[0] == '\0' && has_glyph_names) + if (glyph_name[0] == '\0' && has_glyph_names) { - programming_error (_f ("Glyph has no name, but font supports glyph naming.\n" - "Skipping glyph U+%0X, file %s", - pg, - file_name.c_str ())); + programming_error ( + _f ("Glyph has no name, but font supports glyph naming.\n" + "Skipping glyph U+%0X, file %s", + pg, file_name.c_str ())); continue; } - if (glyph_name == string (".notdef") && is_ttf) glyph_name[0] = '\0'; - + if (glyph_name[0] == '\0' && is_ttf) - { - // access by glyph index directly. - get_glyph_index_name (glyph_name, pg); - } - + // Access by glyph index directly. + get_glyph_index_name (glyph_name, pg); + if (glyph_name[0] == '\0') { - /* - CID entry - */ + // CID entry cid_keyed = true; char_id = scm_from_uint32 (pg); } else char_id = scm_from_locale_string (glyph_name); - + *tail = scm_cons (scm_list_4 (scm_from_double (ggeo.width * scale_), scm_from_double (ggeo.x_offset * scale_), scm_from_double (ggeo.y_offset * scale_), - char_id), SCM_EOL); tail = SCM_CDRLOC (*tail); } - pango_glyph_string_free (pgs); + pango_glyph_string_free (pgs); pgs = 0; PangoFontDescription *descr = pango_font_describe (pa->font); Real size = pango_font_description_get_size (descr) - / (Real (PANGO_SCALE)); - + / (Real (PANGO_SCALE)); if (!ps_name_str0) warning (_f ("no PostScript font name for font `%s'", file_name)); @@ -234,8 +233,7 @@ Pango_font::pango_item_string_stencil (PangoItem const *item, string str, && (file_name.find (".otf") != NPOS || file_name.find (".cff") != NPOS)) { - - /* UGH: kludge a PS name for OTF/CFF fonts. */ + // UGH: kludge a PS name for OTF/CFF fonts. string name = file_name; ssize idx = file_name.find (".otf"); if (idx == NPOS) @@ -246,11 +244,11 @@ Pango_font::pango_item_string_stencil (PangoItem const *item, string str, ssize slash_idx = name.rfind ('/'); if (slash_idx != NPOS) { - slash_idx ++; + slash_idx ++; name = name.substr (slash_idx, name.length () - slash_idx); } - + string initial = name.substr (0, 1); initial = String_convert::to_upper (initial); name = name.substr (1, name.length () - 1); @@ -262,7 +260,9 @@ Pango_font::pango_item_string_stencil (PangoItem const *item, string str, if (ps_name.length ()) { - ((Pango_font *) this)->register_font_file (file_name, ps_name); + ((Pango_font *) this)->register_font_file (file_name, + ps_name, + face_index); pango_fc_font_unlock_face (fcfont); SCM expr = scm_list_5 (ly_symbol2scm ("glyph-string"), @@ -284,13 +284,12 @@ Pango_font::physical_font_tab () const return physical_font_tab_; } - Stencil Pango_font::word_stencil (string str) const { return text_stencil (str, true); } - + Stencil Pango_font::text_stencil (string str) const { @@ -298,7 +297,8 @@ Pango_font::text_stencil (string str) const } Stencil -Pango_font::text_stencil (string str, bool tight) const +Pango_font::text_stencil (string str, + bool tight) const { GList *items = pango_itemize (context_, @@ -317,7 +317,7 @@ Pango_font::text_stencil (string str, bool tight) const if (item->analysis.level == PANGO_DIRECTION_RTL) text_dir = LEFT; } - + for (GList *ptr = items; ptr; ptr = ptr->next) { PangoItem *item = (PangoItem *) ptr->data; @@ -330,11 +330,9 @@ Pango_font::text_stencil (string str, bool tight) const last_x = item_stencil.extent (X_AXIS)[RIGHT]; } else if (text_dir == LEFT) - { - dest.translate_axis (item_stencil.extent (X_AXIS)[RIGHT], X_AXIS); - } + dest.translate_axis (item_stencil.extent (X_AXIS)[RIGHT], X_AXIS); -#if 0 /* Check extents. */ +#if 0 // Check extents. if (!item_stencil.extent_box ()[X_AXIS].is_empty ()) { Stencil frame = Lookup::frame (item_stencil.extent_box (), 0.1, 0.1); @@ -344,24 +342,19 @@ Pango_font::text_stencil (string str, bool tight) const dest.add_stencil (frame); } #endif - + dest.add_stencil (item_stencil); } - /* - UGH. Should have flags per output format signifying supported - options. - */ + // UGH. Should have flags per output format signifying supported + // options. string name = get_output_backend_name (); if (name != "ps" && name != "eps") { - /* - For Pango based backends, we take a shortcut. - */ - SCM exp - = scm_list_3 (ly_symbol2scm ("utf-8-string"), - ly_string2scm (description_string ()), - ly_string2scm (str)); + // For Pango based backends, we take a shortcut. + SCM exp = scm_list_3 (ly_symbol2scm ("utf-8-string"), + ly_string2scm (description_string ()), + ly_string2scm (str)); Box b (Interval (0, 0), Interval (0, 0)); b.unite (dest.extent_box ()); @@ -382,11 +375,10 @@ Pango_font::description_string () const return s; } - SCM Pango_font::font_file_name () const { return SCM_BOOL_F; } -#endif +#endif // HAVE_PANGO_FT2 diff --git a/lily/paper-book.cc b/lily/paper-book.cc index 5f9d60c576..7b43799e99 100644 --- a/lily/paper-book.cc +++ b/lily/paper-book.cc @@ -108,12 +108,13 @@ Paper_book::add_performance (SCM s) performances_ = scm_cons (s, performances_); } -void +int Paper_book::output_aux (SCM output_channel, bool is_last, int *first_page_number, int *first_performance_number) { + int page_nb = 0; if (scm_is_pair (performances_)) { SCM proc = ly_lily_module_constant ("write-performances-midis"); @@ -127,27 +128,29 @@ Paper_book::output_aux (SCM output_channel, if (scm_is_pair (bookparts_)) { - for (SCM p = scm_reverse (bookparts_); scm_is_pair (p); p = scm_cdr (p)) + for (SCM p = bookparts_; scm_is_pair (p); p = scm_cdr (p)) if (Paper_book *pbookpart = unsmob_paper_book (scm_car (p))) { bool is_last_part = (is_last && !scm_is_pair (scm_cdr (p))); - pbookpart->output_aux (output_channel, - is_last_part, - first_page_number, - first_performance_number); + page_nb += pbookpart->output_aux (output_channel, + is_last_part, + first_page_number, + first_performance_number); } } else { if (scores_ == SCM_EOL) - return; + return 0; paper_->set_variable (ly_symbol2scm ("first-page-number"), scm_long2num (*first_page_number)); paper_->set_variable (ly_symbol2scm ("is-last-bookpart"), ly_bool2scm (is_last)); /* Generate all stencils to trigger font loads. */ - *first_page_number += scm_ilength (pages ()); + page_nb = scm_ilength (pages ()); + *first_page_number += page_nb; } + return page_nb; } void @@ -155,11 +158,12 @@ Paper_book::output (SCM output_channel) { int first_page_number = robust_scm2int (paper_->c_variable ("first-page-number"), 1); int first_performance_number = 0; - output_aux (output_channel, - true, - &first_page_number, - &first_performance_number); - + if (!output_aux (output_channel, + true, + &first_page_number, + &first_performance_number)) + return; + SCM scopes = SCM_EOL; if (ly_is_module (header_)) scopes = scm_cons (header_, scopes); @@ -517,7 +521,7 @@ Paper_book::systems () systems_ = SCM_EOL; if (scm_is_pair (bookparts_)) { - for (SCM p = scm_reverse (bookparts_); scm_is_pair (p); p = scm_cdr (p)) + for (SCM p = bookparts_; scm_is_pair (p); p = scm_cdr (p)) if (Paper_book *pbookpart = unsmob_paper_book (scm_car (p))) systems_ = scm_append_x (scm_list_2 (systems_, pbookpart->systems ())); } @@ -577,11 +581,11 @@ Paper_book::pages () pages_ = SCM_EOL; if (scm_is_pair (bookparts_)) { - for (SCM p = scm_reverse (bookparts_); scm_is_pair (p); p = scm_cdr (p)) + for (SCM p = bookparts_; scm_is_pair (p); p = scm_cdr (p)) if (Paper_book *pbookpart = unsmob_paper_book (scm_car (p))) pages_ = scm_append_x (scm_list_2 (pages_, pbookpart->pages ())); } - else + else if (scm_is_pair (scores_)) { SCM proc = paper_->c_variable ("page-breaking-wrapper"); pages_ = scm_apply_0 (proc, scm_list_1 (self_scm ())); diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc index 5f02a76549..d3b99055e9 100644 --- a/lily/paper-outputter.cc +++ b/lily/paper-outputter.cc @@ -55,9 +55,10 @@ Paper_outputter::mark_smob (SCM x) } int -Paper_outputter::print_smob (SCM x, SCM p, scm_print_state*) +Paper_outputter::print_smob (SCM /* x */, + SCM p, + scm_print_state *) { - (void) x; scm_puts ("#", p); return 1; } diff --git a/lily/parse-scm.cc b/lily/parse-scm.cc index f55be9829d..409ba88945 100644 --- a/lily/parse-scm.cc +++ b/lily/parse-scm.cc @@ -38,9 +38,6 @@ internal_ly_parse_scm (Parse_start *ps) SCM answer = SCM_UNSPECIFIED; SCM form = scm_read (port); - /* Reset read_buf for scm_ftell. - Shouldn't scm_read () do this for us? */ - scm_fill_input (port); SCM to = scm_ftell (port); ps->nchars = scm_to_int (to) - scm_to_int (from); diff --git a/lily/pfb-scheme.cc b/lily/pfb-scheme.cc index 7fcdc73de5..6713c1b08f 100644 --- a/lily/pfb-scheme.cc +++ b/lily/pfb-scheme.cc @@ -40,7 +40,7 @@ LY_DEFINE (ly_otf_2_cff, "ly:otf->cff", if (be_verbose_global) progress_indication ("[" + file_name); - FT_Face face = open_ft_face (file_name); + FT_Face face = open_ft_face (file_name, 0 /* index */); string table = get_otf_table (face, "CFF "); SCM asscm = scm_from_locale_stringn ((char *) table.data (), diff --git a/lily/prob.cc b/lily/prob.cc index e55e84afc1..9d75d744f3 100644 --- a/lily/prob.cc +++ b/lily/prob.cc @@ -174,10 +174,9 @@ Prob::internal_set_property (SCM sym, SCM val) } void -Prob::type_check_assignment (SCM sym, SCM val) const +Prob::type_check_assignment (SCM, SCM) const { - (void) sym; - (void) val; + /* empty */ } SCM diff --git a/lily/relative-octave-music.cc b/lily/relative-octave-music.cc index bf6116ab17..8d677c425b 100644 --- a/lily/relative-octave-music.cc +++ b/lily/relative-octave-music.cc @@ -19,9 +19,9 @@ public: MAKE_SCHEME_CALLBACK (Relative_octave_music, no_relative_callback, 2) SCM -Relative_octave_music::no_relative_callback (SCM music, SCM pitch) +Relative_octave_music::no_relative_callback (SCM /* music */, + SCM pitch) { - (void)music; return pitch; } diff --git a/lily/rest.cc b/lily/rest.cc index da13f6cdbc..9caae1f5e9 100644 --- a/lily/rest.cc +++ b/lily/rest.cc @@ -193,11 +193,10 @@ Rest::generic_extent_callback (Grob *me, Axis a) MAKE_SCHEME_CALLBACK (Rest, pure_height, 3); SCM -Rest::pure_height (SCM smob, SCM start, SCM end) +Rest::pure_height (SCM smob, + SCM /* start */, + SCM /* end */) { - (void) start; - (void) end; - Grob *me = unsmob_grob (smob); SCM m = brew_internal_stencil (me, false); return ly_interval2scm (unsmob_stencil (m)->extent (Y_AXIS)); diff --git a/lily/scale.cc b/lily/scale.cc index 9e39d8a99e..99cd6d91db 100644 --- a/lily/scale.cc +++ b/lily/scale.cc @@ -57,8 +57,8 @@ LY_DEFINE (ly_default_scale, "ly:default-scale", "Get the global default scale.") { return default_global_scale - ? SCM_BOOL_F - : default_global_scale->self_scm (); + ? default_global_scale->self_scm () + : SCM_BOOL_F; } @@ -121,19 +121,17 @@ Scale::normalize_step (int step) const } int -Scale::print_smob (SCM x, SCM port, scm_print_state *) +Scale::print_smob (SCM /* x */, + SCM port, + scm_print_state *) { - (void) x; - scm_puts ("#", port); return 1; } - SCM -Scale::mark_smob (SCM x) +Scale::mark_smob (SCM) { - (void) x; return SCM_UNSPECIFIED; } diff --git a/lily/scm-hash.cc b/lily/scm-hash.cc index ed3345b5ac..d3a8d7f9bd 100644 --- a/lily/scm-hash.cc +++ b/lily/scm-hash.cc @@ -120,9 +120,11 @@ Scheme_hash_table::remove (SCM k) } static SCM -collect_handles (void *closure, SCM key, SCM value, SCM result) +collect_handles (void * /* closure */, + SCM key, + SCM value, + SCM result) { - (void) closure; return scm_acons(key, value, result); } diff --git a/lily/script-interface.cc b/lily/script-interface.cc index a525500b2c..af2b8f934d 100644 --- a/lily/script-interface.cc +++ b/lily/script-interface.cc @@ -129,6 +129,7 @@ ADD_INTERFACE (Script_interface, "positioning-done " "script-priority " "script-stencil " + "toward-stem-shift " "slur " "slur-padding " ); diff --git a/lily/skyline.cc b/lily/skyline.cc index 6e64a2c96b..78c4e8cde0 100644 --- a/lily/skyline.cc +++ b/lily/skyline.cc @@ -7,6 +7,7 @@ #include "skyline.hh" #include +#include #include "ly-smobs.icc" diff --git a/lily/spacing-basic.cc b/lily/spacing-basic.cc index 7545ec4e5b..40e0a16b4a 100644 --- a/lily/spacing-basic.cc +++ b/lily/spacing-basic.cc @@ -83,11 +83,11 @@ get_measure_length (Grob *column) } Real -Spacing_spanner::note_spacing (Grob *me, Grob *lc, Grob *rc, +Spacing_spanner::note_spacing (Grob * /* me */, + Grob *lc, + Grob *rc, Spacing_options const *options) { - (void) me; - Moment shortest_playing_len = 0; SCM s = lc->get_property ("shortest-playing-duration"); diff --git a/lily/span-bar.cc b/lily/span-bar.cc index 08a04e3cff..31d91b1fc7 100644 --- a/lily/span-bar.cc +++ b/lily/span-bar.cc @@ -190,6 +190,8 @@ Span_bar::calc_glyph_name (SCM smob) type = "|.|"; else if (type == ":|.:") type = "|."; + else if (type == "'") + type = ""; return ly_string2scm (type); } diff --git a/lily/spring-smob.cc b/lily/spring-smob.cc index ae4533cc21..a50c4bf92f 100644 --- a/lily/spring-smob.cc +++ b/lily/spring-smob.cc @@ -13,10 +13,8 @@ IMPLEMENT_SIMPLE_SMOBS (Spring); SCM -Spring::mark_smob (SCM x) +Spring::mark_smob (SCM) { - (void)x; - return SCM_UNSPECIFIED; } diff --git a/lily/stem.cc b/lily/stem.cc index 1f8b21e85f..a5d23c3105 100644 --- a/lily/stem.cc +++ b/lily/stem.cc @@ -229,11 +229,10 @@ Stem::is_normal_stem (Grob *me) MAKE_SCHEME_CALLBACK (Stem, pure_height, 3) SCM -Stem::pure_height (SCM smob, SCM start, SCM end) +Stem::pure_height (SCM smob, + SCM /* start */, + SCM /* end */) { - (void) start; - (void) end; - Grob *me = unsmob_grob (smob); Interval iv; @@ -1052,6 +1051,8 @@ ADD_INTERFACE (Stem, "avoid-note-head " "beam " "beaming " + "beamlet-default-length " + "beamlet-max-length-proportion " "default-direction " "details " "direction " diff --git a/lily/tie-formatting-problem.cc b/lily/tie-formatting-problem.cc index dbbf1074a1..ba064bcd3d 100644 --- a/lily/tie-formatting-problem.cc +++ b/lily/tie-formatting-problem.cc @@ -7,6 +7,7 @@ */ +#include #include "tie-formatting-problem.hh" #include "axis-group-interface.hh" diff --git a/lily/translator-dispatch-list.cc b/lily/translator-dispatch-list.cc index 4298ffedaf..5a6ce4a0a6 100644 --- a/lily/translator-dispatch-list.cc +++ b/lily/translator-dispatch-list.cc @@ -63,16 +63,16 @@ Engraver_dispatch_list::create (SCM trans_list, } SCM -Engraver_dispatch_list::mark_smob (SCM x) +Engraver_dispatch_list::mark_smob (SCM) { - (void)x; return SCM_BOOL_F; } int -Engraver_dispatch_list::print_smob (SCM x, SCM p, scm_print_state *) +Engraver_dispatch_list::print_smob (SCM /* x */, + SCM p, + scm_print_state *) { - (void)x; scm_puts ("#", p); return 1; } diff --git a/lily/ttf.cc b/lily/ttf.cc index 2008c1d532..41363880c9 100644 --- a/lily/ttf.cc +++ b/lily/ttf.cc @@ -6,10 +6,12 @@ (c) 2005--2008 Han-Wen Nienhuys */ +#include #include "freetype.hh" #include +#include "international.hh" #include "memory-stream.hh" #include "warn.hh" #include "lily-guile.hh" @@ -453,9 +455,24 @@ print_trailer (void *out, } static void -create_type42_font (void *out, string name) +create_type42_font (void *out, string name, int idx) { - FT_Face face = open_ft_face (name); + FT_Face face; + + /* check whether font index is valid */ + if (idx > 0) + { + face = open_ft_face (name, -1); + if (idx >= face->num_faces) + { + warning (_f ("font index %d too large for font `%s', using index 0", + idx, name.c_str())); + idx = 0; + } + FT_Done_Face (face); + } + + face = open_ft_face (name, idx); print_header (out, face); print_body (out, face); @@ -464,20 +481,49 @@ create_type42_font (void *out, string name) FT_Done_Face (face); } - LY_DEFINE (ly_ttf_ps_name, "ly:ttf-ps-name", - 1, 0, 0, (SCM ttf_file_name), - "Extract the PostScript name from a TrueType font.") + 1, 1, 0, (SCM ttf_file_name, SCM idx), + "Extract the PostScript name from a TrueType font. The optional" + " @var{idx} argument is useful for TrueType collections (TTC)" + " only; it specifies the font index within the TTC. The default" + " value of @var{idx} is@tie{}0.") { LY_ASSERT_TYPE (scm_is_string, ttf_file_name, 1); + + int i = 0; + if (idx != SCM_UNDEFINED) + { + LY_ASSERT_TYPE (scm_is_integer, idx, 2); + i = scm_to_int (idx); + if (i < 0) + { + warning (_ ("font index must be non-negative, using index 0")); + i = 0; + } + } + string file_name = ly_scm2string (ttf_file_name); if (be_verbose_global) progress_indication ("[" + file_name); - FT_Face face = open_ft_face (file_name); + FT_Face face; + + /* check whether font index is valid */ + if (i > 0) + { + face = open_ft_face (file_name, -1); + if (i >= face->num_faces) + { + warning (_f ("font index %d too large for font `%s', using index 0", + i, file_name.c_str())); + i = 0; + } + FT_Done_Face (face); + } + + face = open_ft_face (file_name, i); char const *ps_name_str0 = FT_Get_Postscript_Name (face); SCM ps_name = scm_from_locale_string (ps_name_str0 ? ps_name_str0 : ""); - FT_Done_Face (face); if (be_verbose_global) @@ -486,22 +532,35 @@ LY_DEFINE (ly_ttf_ps_name, "ly:ttf-ps-name", return ps_name; } - - LY_DEFINE (ly_ttf_2_pfa, "ly:ttf->pfa", - 1, 0, 0, (SCM ttf_file_name), - "Convert the contents of a TTF file to Type42 PFA, returning it as" - " a string.") + 1, 1, 0, (SCM ttf_file_name, SCM idx), + "Convert the contents of a TrueType font file to PostScript" + " Type@tie{}42 font, returning it as a string. The optional" + " @var{idx} argument is useful for TrueType collections (TTC)" + " only; it specifies the font index within the TTC. The default" + " value of @var{idx} is@tie{}0.") { LY_ASSERT_TYPE (scm_is_string, ttf_file_name, 1); + int i = 0; + if (idx != SCM_UNDEFINED) + { + LY_ASSERT_TYPE (scm_is_integer, idx, 2); + i = scm_to_int (idx); + if (i < 0) + { + warning (_ ("font index must be non-negative, using index 0")); + i = 0; + } + } + string file_name = ly_scm2string (ttf_file_name); if (be_verbose_global) progress_indication ("[" + file_name); Memory_out_stream stream; - create_type42_font (&stream, file_name); + create_type42_font (&stream, file_name, i); SCM asscm = scm_from_locale_stringn (stream.get_string (), stream.get_length ()); diff --git a/lilypond-texi2html.init b/lilypond-texi2html.init index 8d593f20c6..6abc48cd98 100644 --- a/lilypond-texi2html.init +++ b/lilypond-texi2html.init @@ -76,7 +76,7 @@ $LY_LANGUAGES->{'fr'} = { 'Back to Documentation Index' => 'Retour à l\'accueil de la documentation', }; $LY_LANGUAGES->{'es'} = { - 'Back to Documentation Index' => '', + 'Back to Documentation Index' => 'Volver al índice de la documentación', }; $LY_LANGUAGES->{'de'} = { 'Back to Documentation Index' => '', diff --git a/ly/Welcome-to-LilyPond-MacOS.ly b/ly/Welcome-to-LilyPond-MacOS.ly index 17007c2fc4..93711b1c71 100644 --- a/ly/Welcome-to-LilyPond-MacOS.ly +++ b/ly/Welcome-to-LilyPond-MacOS.ly @@ -23,7 +23,7 @@ That's it. For more information, visit http://lilypond.org . %} -\version "2.11.65" % necessary for upgrading to future LilyPond versions. +\version "2.12.0" % necessary for upgrading to future LilyPond versions. \header{ title = "A scale in LilyPond" diff --git a/ly/Welcome_to_LilyPond.ly b/ly/Welcome_to_LilyPond.ly index 69910760e4..bfe7231ee0 100644 --- a/ly/Welcome_to_LilyPond.ly +++ b/ly/Welcome_to_LilyPond.ly @@ -27,7 +27,7 @@ LilyPond's interface is text-based. Please read the documentation. For more information, visit http://lilypond.org . %} -\version "2.11.65" % necessary for upgrading to future LilyPond versions. +\version "2.12.0" % necessary for upgrading to future LilyPond versions. \header{ title = "A scale in LilyPond" diff --git a/ly/arabic.ly b/ly/arabic.ly index 24017211a4..1a4273871a 100644 --- a/ly/arabic.ly +++ b/ly/arabic.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \include "italiano.ly" %%%%%%% diff --git a/ly/bagpipe.ly b/ly/bagpipe.ly index 3ed668ce8e..07c39a9bcd 100644 --- a/ly/bagpipe.ly +++ b/ly/bagpipe.ly @@ -9,7 +9,7 @@ $Id: bagpipe.ly,v 1.12 2006/03/16 14:39:46 hanwen Exp $ %} -\version "2.10.0" +\version "2.12.0" % Notes of the scale of the Great Highland Bagpipe. Extra high notes for bombarde. % Flat notes used mainly in some modern music. diff --git a/ly/catalan.ly b/ly/catalan.ly index 7d5ae8164a..aab7edf923 100644 --- a/ly/catalan.ly +++ b/ly/catalan.ly @@ -74,6 +74,6 @@ pitchnamesCatalan = #`( pitchnames = \pitchnamesCatalan -\version "2.10.0" +\version "2.12.0" #(ly:parser-set-note-names parser pitchnames) diff --git a/ly/chord-modifiers-init.ly b/ly/chord-modifiers-init.ly index 9eb3d8cb8f..98b11b6752 100644 --- a/ly/chord-modifiers-init.ly +++ b/ly/chord-modifiers-init.ly @@ -1,4 +1,4 @@ -\version "2.10.0" +\version "2.12.0" chordmodifiers = #default-chord-modifier-list diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly index 2e2f46ecb6..f822e0f3de 100644 --- a/ly/declarations-init.ly +++ b/ly/declarations-init.ly @@ -1,4 +1,4 @@ -\version "2.10.0" +\version "2.12.0" %% < 1.8 compatibility switch #(ly:set-option 'old-relative) @@ -31,10 +31,10 @@ bigger = #1 center = #0 %% FIXME -%% should also set allowBeamBreak, but how to do it "portably"? (ie. also +%% should also set \override Beam #'breakable, but how to do it "portably"? (ie. also %% working with lyric sections) %% -%% try \once \set Score.allowBeamBreak = ##t +%% try \once \override Score.Beam #'breakable = ##t %% rather name \newline, \pageBreak ? break = #(make-event-chord (list (make-music 'LineBreakEvent 'break-permission 'force))) @@ -64,6 +64,7 @@ escapedSmallerSymbol = #(make-span-event 'CrescendoEvent START) #(define fretboard-table (make-hash-table 100)) +#(define chord-shape-table (make-hash-table 100)) \include "scale-definitions-init.ly" diff --git a/ly/deutsch.ly b/ly/deutsch.ly index 747fd52921..0967f4cad2 100644 --- a/ly/deutsch.ly +++ b/ly/deutsch.ly @@ -84,6 +84,6 @@ pitchnamesDeutsch = #`( pitchnames = \pitchnamesDeutsch -\version "2.10.0" +\version "2.12.0" #(ly:parser-set-note-names parser pitchnames) diff --git a/ly/drumpitch-init.ly b/ly/drumpitch-init.ly index 70f3c87fa0..6574a76258 100644 --- a/ly/drumpitch-init.ly +++ b/ly/drumpitch-init.ly @@ -1,5 +1,5 @@ -\version "2.10.0" +\version "2.12.0" drumPitchNames = #'((acousticbassdrum . acousticbassdrum) diff --git a/ly/dynamic-scripts-init.ly b/ly/dynamic-scripts-init.ly index fdbc03fb01..a29430f158 100644 --- a/ly/dynamic-scripts-init.ly +++ b/ly/dynamic-scripts-init.ly @@ -1,4 +1,4 @@ -\version "2.10.0" +\version "2.12.0" % % declare the standard dynamic identifiers. diff --git a/ly/english.ly b/ly/english.ly index 4f7983c7a4..fec9b11aee 100644 --- a/ly/english.ly +++ b/ly/english.ly @@ -129,7 +129,7 @@ pitchnamesEnglish = #`( pitchnames = \pitchnamesEnglish -\version "2.10.0" +\version "2.12.0" #(ly:parser-set-note-names parser pitchnames) diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly index 7688912f6a..0c5b7e6db5 100644 --- a/ly/engraver-init.ly +++ b/ly/engraver-init.ly @@ -1,4 +1,4 @@ -\version "2.10.0" +\version "2.12.0" \context { \name "Global" @@ -534,7 +534,6 @@ automatically when an output definition (a @code{\score} or markFormatter = #format-mark-letters rehearsalMark = #1 subdivideBeams = ##f - allowBeamBreak = ##f extraNatural = ##t autoAccidentals = #`(Staff ,(make-accidental-rule 'same-octave 0)) autoCautionaries = #'() @@ -782,7 +781,7 @@ of Editio Vaticana." clefOctavation = #0 %% Select vaticana style font. - \override KeySignature #'style = #'vaticana + \override KeySignature #'glyph-name-alist = #alteration-vaticana-glyph-name-alist \override Accidental #'glyph-name-alist = #alteration-vaticana-glyph-name-alist \override Custos #'style = #'vaticana \override Custos #'neutral-position = #3 @@ -885,7 +884,7 @@ accommodated for typesetting a piece in mensural style." %% Select mensural style font. \override TimeSignature #'style = #'mensural - \override KeySignature #'style = #'mensural + \override KeySignature #'glyph-name-alist = #alteration-mensural-glyph-name-alist \override Accidental #'glyph-name-alist = #alteration-mensural-glyph-name-alist \override Custos #'style = #'mensural \override Custos #'neutral-position = #3 diff --git a/ly/espanol.ly b/ly/espanol.ly index 760ec8407a..90305f603e 100644 --- a/ly/espanol.ly +++ b/ly/espanol.ly @@ -58,6 +58,6 @@ pitchnamesEspanol = #`( pitchnames = \pitchnamesEspanol -\version "2.10.0" +\version "2.12.0" #(ly:parser-set-note-names parser pitchnames) diff --git a/ly/festival.ly b/ly/festival.ly index f77b48f8e5..66313e3f99 100644 --- a/ly/festival.ly +++ b/ly/festival.ly @@ -20,7 +20,7 @@ % along with this program; if not, write to the Free Software % Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. -\version "2.11.11" +\version "2.12.0" #(use-modules (scm song)) diff --git a/ly/generate-documentation.ly b/ly/generate-documentation.ly index a28da00378..c6b236d5c5 100644 --- a/ly/generate-documentation.ly +++ b/ly/generate-documentation.ly @@ -1,4 +1,4 @@ -\version "2.10.0" +\version "2.12.0" % % Running LilyPond on this file generates the documentation diff --git a/ly/generate-interface-doc-init.ly b/ly/generate-interface-doc-init.ly index b7e2ec1a97..20668317a1 100644 --- a/ly/generate-interface-doc-init.ly +++ b/ly/generate-interface-doc-init.ly @@ -1,4 +1,4 @@ -\version "2.10.0" +\version "2.12.0" % % Running LilyPond on this file generates the short interface doc diff --git a/ly/grace-init.ly b/ly/grace-init.ly index daea9d33c2..ea89bb2e4e 100644 --- a/ly/grace-init.ly +++ b/ly/grace-init.ly @@ -1,4 +1,4 @@ -\version "2.10.0" +\version "2.12.0" startGraceMusic = { diff --git a/ly/graphviz-init.ly b/ly/graphviz-init.ly index cae11b1a29..12330a345f 100644 --- a/ly/graphviz-init.ly +++ b/ly/graphviz-init.ly @@ -1,4 +1,4 @@ -\version "2.11.15" +\version "2.12.0" #(use-modules (scm graphviz)) diff --git a/ly/gregorian.ly b/ly/gregorian.ly index f2b6e55bfc..496e0b6717 100644 --- a/ly/gregorian.ly +++ b/ly/gregorian.ly @@ -3,7 +3,7 @@ $Id$ %} -\version "2.10.0" +\version "2.12.0" % % Declare memorable shortcuts for special unicode characters diff --git a/ly/init.ly b/ly/init.ly index 5a2103e83c..d1923659f9 100644 --- a/ly/init.ly +++ b/ly/init.ly @@ -4,7 +4,7 @@ #(if (and #t (defined? 'set-debug-cell-accesses!)) (set-debug-cell-accesses! 5000)) -\version "2.10.0" +\version "2.12.0" \include "declarations-init.ly" diff --git a/ly/italiano.ly b/ly/italiano.ly index 13c4c17634..c22292b827 100644 --- a/ly/italiano.ly +++ b/ly/italiano.ly @@ -86,6 +86,6 @@ pitchnamesItaliano = #`( pitchnames = \pitchnamesItaliano -\version "2.10.0" +\version "2.12.0" #(ly:parser-set-note-names parser pitchnames) diff --git a/ly/lilypond-book-preamble.ly b/ly/lilypond-book-preamble.ly index a7bea92f15..e6e72503eb 100644 --- a/ly/lilypond-book-preamble.ly +++ b/ly/lilypond-book-preamble.ly @@ -1,5 +1,5 @@ -\version "2.10.0" +\version "2.12.0" %% toplevel \book gets output per page, %% everything else gets output per system/title diff --git a/ly/makam.ly b/ly/makam.ly index 68cd7d7bc9..c7f793d267 100644 --- a/ly/makam.ly +++ b/ly/makam.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" %{ diff --git a/ly/markup-init.ly b/ly/markup-init.ly index 49c155c94e..5749c7bb8f 100644 --- a/ly/markup-init.ly +++ b/ly/markup-init.ly @@ -1,6 +1,6 @@ %% -*- Mode: Scheme -*- -\version "2.11.9" +\version "2.12.0" %%;; to be define later, in a closure #(define-public toplevel-module-define-public! #f) diff --git a/ly/midi-init.ly b/ly/midi-init.ly index 7a6166afae..3ba3651f06 100644 --- a/ly/midi-init.ly +++ b/ly/midi-init.ly @@ -1,4 +1,4 @@ -\version "2.10.0" +\version "2.12.0" \midi { \include "performer-init.ly" } diff --git a/ly/music-functions-init.ly b/ly/music-functions-init.ly index 10af2cfefb..6b38c58fab 100644 --- a/ly/music-functions-init.ly +++ b/ly/music-functions-init.ly @@ -1,6 +1,6 @@ % -*-Scheme-*- -\version "2.10.0" +\version "2.12.0" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -16,7 +16,7 @@ acciaccatura = addQuote = #(define-music-function (parser location name music) (string? ly:music?) - (_i "Add a piece of music to be quoted ") + "Add a piece of music to be quoted " (add-quotable parser name music) (make-music 'SequentialMusic 'void #t)) @@ -154,7 +154,7 @@ breathe = clef = #(define-music-function (parser location type) (string?) - (_i "Set the current clef.") + "Set the current clef." (make-clef-set type)) @@ -211,8 +211,8 @@ endSpanners = featherDurations= #(define-music-function (parser location factor argument) (ly:moment? ly:music?) - (_i "Rearrange durations in ARGUMENT so there is an -acceleration/deceleration. ") + "Rearrange durations in ARGUMENT so there is an +acceleration/deceleration. " (let* ((orig-duration (ly:music-length argument)) @@ -276,8 +276,8 @@ instrumentSwitch = includePageLayoutFile = #(define-music-function (parser location) () - (_i "If page breaks and tweak dump is not asked, and the file --page-layout.ly exists, include it.") + "If page breaks and tweak dump is not asked, and the file +-page-layout.ly exists, include it." (if (not (ly:get-option 'dump-tweaks)) (let ((tweak-filename (format #f "~a-page-layout.ly" (ly:parser-output-name parser)))) @@ -326,7 +326,7 @@ killCues = label = #(define-music-function (parser location label) (symbol?) - (_i "Place a bookmarking label, either at top-level or inside music.") + "Place a bookmarking label, either at top-level or inside music." (make-music 'EventChord 'page-marker #t 'page-label label @@ -357,9 +357,9 @@ overrideProperty = (string? symbol? scheme?) - (_i "Set @var{property} to @var{value} in all grobs named @var{name}. + "Set @var{property} to @var{value} in all grobs named @var{name}. The @var{name} argument is a string of the form @code{\"Context.GrobName\"} -or @code{\"GrobName\"}") +or @code{\"GrobName\"}" (let* ((name-components (string-split name #\.)) @@ -386,8 +386,8 @@ or @code{\"GrobName\"}") %% are not allowed at top-level. pageBreak = #(define-music-function (location parser) () - (_i "Force a page break. May be used at toplevel (ie between scores or -markups), or inside a score.") + "Force a page break. May be used at toplevel (ie between scores or +markups), or inside a score." (make-music 'EventChord 'page-marker #t 'line-break-permission 'force @@ -399,8 +399,8 @@ markups), or inside a score.") noPageBreak = #(define-music-function (location parser) () - (_i "Forbid a page break. May be used at toplevel (ie between scores or -markups), or inside a score.") + "Forbid a page break. May be used at toplevel (ie between scores or +markups), or inside a score." (make-music 'EventChord 'page-marker #t 'page-break-permission 'forbid @@ -409,7 +409,7 @@ markups), or inside a score.") pageTurn = #(define-music-function (location parser) () - (_i "Force a page turn between two scores or top-level markups.") + "Force a page turn between two scores or top-level markups." (make-music 'EventChord 'page-marker #t 'line-break-permission 'force @@ -424,8 +424,8 @@ pageTurn = noPageTurn = #(define-music-function (location parser) () - (_i "Forbid a page turn. May be used at toplevel (ie between scores or -markups), or inside a score.") + "Forbid a page turn. May be used at toplevel (ie between scores or +markups), or inside a score." (make-music 'EventChord 'page-marker #t 'page-turn-permission 'forbid @@ -434,8 +434,8 @@ markups), or inside a score.") allowPageTurn = #(define-music-function (location parser) () - (_i "Allow a page turn. May be used at toplevel (ie between scores or -markups), or inside a score.") + "Allow a page turn. May be used at toplevel (ie between scores or +markups), or inside a score." (make-music 'EventChord 'page-marker #t 'page-turn-permission 'allow @@ -448,7 +448,7 @@ markups), or inside a score.") octaveCheck = #(define-music-function (parser location pitch-note) (ly:music?) - (_i "octave check") + "octave check" (make-music 'RelativeOctaveCheck 'origin location @@ -456,7 +456,7 @@ octaveCheck = )) ottava = #(define-music-function (parser location octave) (number?) - (_i "set the octavation ") + "set the octavation " (make-ottava-set octave)) partcombine = @@ -503,7 +503,7 @@ pitchedTrill = parallelMusic = #(define-music-function (parser location voice-ids music) (list? ly:music?) - (_i "Define parallel music sequences, separated by '|' (bar check signs), + "Define parallel music sequences, separated by '|' (bar check signs), and assign them to the identifiers provided in @var{voice-ids}. @var{voice-ids}: a list of music identifiers (symbols containing only letters) @@ -522,7 +522,7 @@ Example: B = { d d | e e | } C = { e e | f f | } @end verbatim -") +" (let* ((voices (apply circular-list (make-list (length voice-ids) (list)))) (current-voices voices) (current-sequence (list))) @@ -596,7 +596,7 @@ Example: parenthesize = #(define-music-function (parser loc arg) (ly:music?) - (_i "Tag @var{arg} to be parenthesized.") + "Tag @var{arg} to be parenthesized." (if (memq 'event-chord (ly:music-property arg 'types)) ; arg is an EventChord -> set the parenthesize property on all child notes and rests @@ -611,8 +611,8 @@ parenthesize = arg) -quoteDuring = # -(define-music-function +quoteDuring = +#(define-music-function (parser location what main-music) (string? ly:music?) (make-music 'QuoteMusic @@ -626,7 +626,7 @@ resetRelativeOctave = #(define-music-function (parser location reference-note) (ly:music?) - (_i "Set the octave inside a \\relative section.") + "Set the octave inside a \\relative section." (let* ((notes (ly:music-property reference-note 'elements)) @@ -650,7 +650,7 @@ scaleDurations = shiftDurations = #(define-music-function (parser location dur dots arg) (integer? integer? ly:music?) - (_i "") + "" (music-map (lambda (x) @@ -658,8 +658,8 @@ shiftDurations = spacingTweaks = #(define-music-function (parser location parameters) (list?) - (_i "Set the system stretch, by reading the 'system-stretch property of -the `parameters' assoc list.") + "Set the system stretch, by reading the 'system-stretch property of +the `parameters' assoc list." #{ \overrideProperty #"Score.NonMusicalPaperColumn" #'line-break-system-details @@ -670,7 +670,7 @@ the `parameters' assoc list.") rightHandFinger = #(define-music-function (parser location finger) (number-or-string?) - (_i "Define a StrokeFingerEvent") + "Define a StrokeFingerEvent" (apply make-music (append @@ -683,7 +683,7 @@ rightHandFinger = scoreTweak = #(define-music-function (parser location name) (string?) - (_i "Include the score tweak, if exists.") + "Include the score tweak, if exists." (if (and page-layout-parser (not (ly:get-option 'dump-tweaks))) (let ((tweak-music (ly:parser-lookup page-layout-parser (string->symbol name)))) @@ -696,7 +696,7 @@ scoreTweak = tag = #(define-music-function (parser location tag arg) (symbol? ly:music?) - (_i "Add @var{tag} to the @code{tags} property of @var{arg}.") + "Add @var{tag} to the @code{tags} property of @var{arg}." (set! (ly:music-property arg 'tags) @@ -711,11 +711,11 @@ transposedCueDuring = (parser location what dir pitch-note main-music) (string? ly:dir? ly:music? ly:music?) - (_i "Insert notes from the part @var{what} into a voice called @code{cue}, + "Insert notes from the part @var{what} into a voice called @code{cue}, using the transposition defined by @var{pitch-note}. This happens simultaneously with @var{main-music}, which is usually a rest. The argument @var{dir} determines whether the cue notes should be notated -as a first or second voice.") +as a first or second voice." (make-music 'QuoteMusic 'element main-music @@ -730,7 +730,7 @@ as a first or second voice.") transposition = #(define-music-function (parser location pitch-note) (ly:music?) - (_i "Set instrument transposition") + "Set instrument transposition" (context-spec-music (make-property-set 'instrumentTransposition @@ -740,7 +740,7 @@ transposition = tweak = #(define-music-function (parser location sym val arg) (symbol? scheme? ly:music?) - (_i "Add @code{sym . val} to the @code{tweaks} property of @var{arg}.") + "Add @code{sym . val} to the @code{tweaks} property of @var{arg}." (set! (ly:music-property arg 'tweaks) @@ -758,7 +758,7 @@ unfoldRepeats = withMusicProperty = #(define-music-function (parser location sym val music) (symbol? scheme? ly:music?) - (_i "Set @var{sym} to @var{val} in @var{music}.") + "Set @var{sym} to @var{val} in @var{music}." (set! (ly:music-property music sym) val) music) diff --git a/ly/nederlands.ly b/ly/nederlands.ly index eed065349f..9a1eaab774 100644 --- a/ly/nederlands.ly +++ b/ly/nederlands.ly @@ -1,4 +1,4 @@ -\version "2.10.0" +\version "2.12.0" %{ common dutch names for notes. es means flat, is means sharp diff --git a/ly/norsk.ly b/ly/norsk.ly index 76db0ec2cc..5b02889ab4 100644 --- a/ly/norsk.ly +++ b/ly/norsk.ly @@ -105,6 +105,6 @@ pitchnamesNorsk = #`( pitchnames =\pitchnamesNorsk -\version "2.10.0" +\version "2.12.0" #(ly:parser-set-note-names parser pitchnames) diff --git a/ly/paper-defaults-init.ly b/ly/paper-defaults-init.ly index cac75ecb73..9d2725ede0 100644 --- a/ly/paper-defaults-init.ly +++ b/ly/paper-defaults-init.ly @@ -1,4 +1,4 @@ -\version "2.11.11" +\version "2.12.0" #(use-modules (scm layout-page-layout)) \paper { diff --git a/ly/params-init.ly b/ly/params-init.ly index 9c877d233a..2c0e87eae9 100644 --- a/ly/params-init.ly +++ b/ly/params-init.ly @@ -1,2 +1,2 @@ -\version "2.10.0" +\version "2.12.0" diff --git a/ly/performer-init.ly b/ly/performer-init.ly index b48bd5454d..3803396b20 100644 --- a/ly/performer-init.ly +++ b/ly/performer-init.ly @@ -1,4 +1,4 @@ -\version "2.10.0" +\version "2.12.0" %% %% setup for Request->Element conversion. diff --git a/ly/portugues.ly b/ly/portugues.ly index 1444d25771..4810c85548 100644 --- a/ly/portugues.ly +++ b/ly/portugues.ly @@ -86,6 +86,6 @@ pitchnamesPortuguese = #`( pitchnames = \pitchnamesPortuguese -\version "2.10.0" +\version "2.12.0" #(ly:parser-set-note-names parser pitchnames) diff --git a/ly/predefined-fretboards-init.ly b/ly/predefined-fretboards-init.ly index e999c93a4d..df88ee79bf 100644 --- a/ly/predefined-fretboards-init.ly +++ b/ly/predefined-fretboards-init.ly @@ -4,50 +4,50 @@ %%%% %%%% (c) 2008 Carl D. Sorensen -\version "2.11.56" - -%%%%% define storage structures - -% base-chord-shapes is an alist of chord shapes -% in the form of fret-diagram-terse strings with -% scheme symbols as keys. For convenience, the -% symbols are LilyPond chordmode chord descriptions, +\version "2.12.0" + +% chord-shape-table is a hash-table of chord shapes +% in the form of diagram-descriptions that can be +% fret-diagram-verbose markup-llsts or +% fret-diagram-terse strings. +% The hash keys are pairs of scheme symbols and +% string tunings. For convenience, the symbols in +% this file are LilyPond chordmode chord descriptions, % but that is unnecessary. -#(define base-chord-shapes '()) - - % music function for adding a chord shape to -% base-chord-shapes +% chord-shape-table addChordShape = -#(define-music-function (parser location key-symbol shape-string) - (symbol? string?) - "Add chord shape @code{shape-string} to the @code{base-chord-shapes} -alist with the key @code{key-symbol}." - (set! base-chord-shapes - (acons key-symbol shape-string base-chord-shapes)) +#(define-music-function (parser location key-symbol tuning shape-definition) + (symbol? pair? string-or-pair?) + "Add chord shape @code{shape-definition} to the @code{chord-shape-table} +hash with the key @code{(cons key-symbol tuning)}." + (hash-set! chord-shape-table + (cons key-symbol tuning) + shape-definition) (make-music 'SequentialMusic 'void #t)) -% for convenience, to eliminate storage list in .ly references - -#(define (chord-shape shape-code) - (get-chord-shape shape-code base-chord-shapes)) +#(define (chord-shape shape-code tuning) + (get-chord-shape shape-code tuning chord-shape-table)) % music function for adding a predefined diagram to % fretboard-table storePredefinedDiagram = -#(define-music-function (parser location chord tuning terse-definition) - (ly:music? list? string?) - "Add predefined fret diagram defined by fret-diagram-terse definition -string @code{terse-definition} for the chord pitches @code{chord} and +#(define-music-function (parser location chord tuning diagram-definition) + (ly:music? pair? string-or-pair?) + "Add predefined fret diagram defined by @code{diagram-definition} +for the chord pitches @code{chord} and the stringTuning @code{tuning}." (let* ((pitches (event-chord-pitches (car (extract-named-music chord 'EventChord)))) - (hash-key (cons tuning pitches))) + (hash-key (cons tuning pitches)) + (verbose-definition (if (string? diagram-definition) + (parse-terse-string diagram-definition) + diagram-definition))) (hash-set! fretboard-table hash-key - (parse-terse-string terse-definition))) + verbose-definition)) (make-music 'SequentialMusic 'void #t)) diff --git a/ly/predefined-guitar-fretboards.ly b/ly/predefined-guitar-fretboards.ly index a448f34ba1..84244b257c 100644 --- a/ly/predefined-guitar-fretboards.ly +++ b/ly/predefined-guitar-fretboards.ly @@ -6,22 +6,22 @@ %%% Add basic chordshapes -\version "2.11.56" +\version "2.12.0" -\addChordShape #'f #"1-1-(;3-3;3-4;2-2;1-1;1-1-);" -\addChordShape #'f:m #"1-1-(;3-3;3-4;1-1;1-1;1-1-);" -\addChordShape #'f:7 #"1-1-(;3-3;1-1;2-2;1-1;1-1-);" -\addChordShape #'f:m7 #"1-1-(;3-3;1-1;1-1;1-1;1-1-);" -\addChordShape #'bes #"x;1-1-(;3-2;3-3;3-4;1-1-);" -\addChordShape #'bes:m #"x;1-1-(;3-3;3-4;2-2;1-1-);" -\addChordShape #'bes:m7 #"x;1-1-(;3-3;1-1;2-2;1-1-);" -\addChordShape #'bes:7 #"x;1-1-(;3-2;1-1;3-3;1-1-);" -\addChordShape #'bes:maj7 #"x;1-1;3-3;2-2;3-4;x;" -\addChordShape #'c:dim #"x;x;1-1;2-3;1-2;2-4;" -\addChordShape #'c:aug #"x;x;2-2;1-1-(;1-1-);4-4;" -\addChordShape #'cis #"x;x;3-3;1-1-(;2-2;1-1-);" -\addChordShape #'ees:dim #"x;x;1-1;2-3;1-2;2-4;" -\addChordShape #'a:dim #"x;x;1-1;2-3;1-2;2-4;" +\addChordShape #'f #guitar-tuning #"1-1-(;3-3;3-4;2-2;1-1;1-1-);" +\addChordShape #'f:m #guitar-tuning #"1-1-(;3-3;3-4;1-1;1-1;1-1-);" +\addChordShape #'f:7 #guitar-tuning #"1-1-(;3-3;1-1;2-2;1-1;1-1-);" +\addChordShape #'f:m7 #guitar-tuning #"1-1-(;3-3;1-1;1-1;1-1;1-1-);" +\addChordShape #'bes #guitar-tuning #"x;1-1-(;3-2;3-3;3-4;1-1-);" +\addChordShape #'bes:m #guitar-tuning #"x;1-1-(;3-3;3-4;2-2;1-1-);" +\addChordShape #'bes:m7 #guitar-tuning #"x;1-1-(;3-3;1-1;2-2;1-1-);" +\addChordShape #'bes:7 #guitar-tuning #"x;1-1-(;3-2;1-1;3-3;1-1-);" +\addChordShape #'bes:maj7 #guitar-tuning #"x;1-1;3-3;2-2;3-4;x;" +\addChordShape #'c:dim #guitar-tuning #"x;x;1-1;2-3;1-2;2-4;" +\addChordShape #'c:aug #guitar-tuning #"x;x;2-2;1-1-(;1-1-);4-4;" +\addChordShape #'cis #guitar-tuning #"x;x;3-3;1-1-(;2-2;1-1-);" +\addChordShape #'ees:dim #guitar-tuning #"x;x;1-1;2-3;1-2;2-4;" +\addChordShape #'a:dim #guitar-tuning #"x;x;1-1;2-3;1-2;2-4;" %%% Add predefined chords @@ -34,13 +34,13 @@ #"x;3-3;2-2;o;1-1;o;" \storePredefinedDiagram \chordmode {c:m} #guitar-tuning - #(offset-fret 2 (chord-shape 'bes:m)) + #(offset-fret 2 (chord-shape 'bes:m guitar-tuning)) \storePredefinedDiagram \chordmode {c:aug} #guitar-tuning - #(chord-shape 'c:aug) + #(chord-shape 'c:aug guitar-tuning) \storePredefinedDiagram \chordmode {c:dim} #guitar-tuning - #(chord-shape 'c:dim) + #(chord-shape 'c:dim guitar-tuning) \storePredefinedDiagram \chordmode {c:7} #guitar-tuning #"o;3-3;2-2;3-4;1-1;o;" @@ -49,13 +49,13 @@ #"x;3-3;2-2;o;o;o;" \storePredefinedDiagram \chordmode {c:m7} #guitar-tuning - #(offset-fret 2 (chord-shape 'bes:m7)) + #(offset-fret 2 (chord-shape 'bes:m7 guitar-tuning)) %%%% cis chords % \storePredefinedDiagram \chordmode {cis} #guitar-tuning - #(chord-shape 'cis) + #(chord-shape 'cis guitar-tuning) \storePredefinedDiagram \chordmode {cis:m} #guitar-tuning #"x;x;2-2;1-1;2-3;o;" @@ -64,7 +64,7 @@ #"x;4-4;3-3;2-1;2-2;x;" \storePredefinedDiagram \chordmode {cis:dim} #guitar-tuning - #(offset-fret 1 (chord-shape 'c:dim)) + #(offset-fret 1 (chord-shape 'c:dim guitar-tuning)) \storePredefinedDiagram \chordmode {cis:7} #guitar-tuning #"x;x;3-2;4-3;2-1;4-4;" @@ -88,7 +88,7 @@ #"x;4-4;3-3;2-1;2-2;x;" \storePredefinedDiagram \chordmode {des:dim} #guitar-tuning - #(offset-fret 1 (chord-shape 'c:dim)) + #(offset-fret 1 (chord-shape 'c:dim guitar-tuning)) \storePredefinedDiagram \chordmode {des:7} #guitar-tuning #"x;x;3-2;4-3;2-1;4-4;" @@ -127,7 +127,7 @@ % \storePredefinedDiagram \chordmode {dis} #guitar-tuning - #(offset-fret 2 (chord-shape 'cis)) + #(offset-fret 2 (chord-shape 'cis guitar-tuning)) \storePredefinedDiagram \chordmode {dis:m} #guitar-tuning #"x;x;4-3;3-2;4-4;1-1;" @@ -136,7 +136,7 @@ #"3-3;2-2;1-1;o;o;3-4" \storePredefinedDiagram \chordmode {dis:dim} #guitar-tuning - #(chord-shape 'ees:dim) + #(chord-shape 'ees:dim guitar-tuning) \storePredefinedDiagram \chordmode {dis:7} #guitar-tuning #"x;x;1-1;3-3;2-2;3-4;" @@ -151,7 +151,7 @@ % \storePredefinedDiagram \chordmode {ees} #guitar-tuning - #(offset-fret 2 (chord-shape 'cis)) + #(offset-fret 2 (chord-shape 'cis guitar-tuning)) \storePredefinedDiagram \chordmode {ees:m} #guitar-tuning #"x;x;4-3;3-2;4-4;1-1;" @@ -160,7 +160,7 @@ #"3-3;2-2;1-1;o;o;3-4" \storePredefinedDiagram \chordmode {ees:dim} #guitar-tuning - #(chord-shape 'ees:dim) + #(chord-shape 'ees:dim guitar-tuning) \storePredefinedDiagram \chordmode {ees:7} #guitar-tuning #"x;x;1-1;3-3;2-2;3-4;" @@ -184,7 +184,7 @@ #"o;3-3;2-2;1-1;x;x;" \storePredefinedDiagram \chordmode {e:dim} #guitar-tuning - #(offset-fret 1 (chord-shape 'ees:dim)) + #(offset-fret 1 (chord-shape 'ees:dim guitar-tuning)) \storePredefinedDiagram \chordmode {e:7} #guitar-tuning #"o;2-2;o;1-1;o;o;" @@ -199,10 +199,10 @@ % \storePredefinedDiagram \chordmode {f} #guitar-tuning - #(chord-shape 'f) + #(chord-shape 'f guitar-tuning) \storePredefinedDiagram \chordmode {f:m} #guitar-tuning - #(chord-shape 'f:m) + #(chord-shape 'f:m guitar-tuning) \storePredefinedDiagram \chordmode {f:aug} #guitar-tuning #"x;x;1-1;4-3;4-4;3-2;" @@ -211,22 +211,22 @@ #"x;x;o;1-1;o;1-2;" \storePredefinedDiagram \chordmode {f:7} #guitar-tuning - #(chord-shape 'f:7) + #(chord-shape 'f:7 guitar-tuning) \storePredefinedDiagram \chordmode {f:maj7} #guitar-tuning #"x;3-3;3-4;2-2;1-1;" \storePredefinedDiagram \chordmode {f:m7} #guitar-tuning - #(chord-shape 'f:m7) + #(chord-shape 'f:m7 guitar-tuning) %%%% fis chords % \storePredefinedDiagram \chordmode {fis} #guitar-tuning - #(offset-fret 1 (chord-shape 'f)) + #(offset-fret 1 (chord-shape 'f guitar-tuning)) \storePredefinedDiagram \chordmode {fis:m} #guitar-tuning - #(offset-fret 1 (chord-shape 'f:m)) + #(offset-fret 1 (chord-shape 'f:m guitar-tuning)) \storePredefinedDiagram \chordmode {fis:aug} #guitar-tuning #"2-2;1-1;o;3-4-(;3-4-);2-3;" @@ -235,22 +235,22 @@ #"x;x;1-1;2-3;1-2;2-4;" \storePredefinedDiagram \chordmode {fis:7} #guitar-tuning - #(offset-fret 1 (chord-shape 'f:7)) + #(offset-fret 1 (chord-shape 'f:7 guitar-tuning)) \storePredefinedDiagram \chordmode {fis:maj7} #guitar-tuning #"x;x;4-4;3-3;2-2;1-1;" \storePredefinedDiagram \chordmode {fis:m7} #guitar-tuning - #(offset-fret 1 (chord-shape 'f:m7)) + #(offset-fret 1 (chord-shape 'f:m7 guitar-tuning)) %%%% ges chords % \storePredefinedDiagram \chordmode {ges} #guitar-tuning - #(offset-fret 1 (chord-shape 'f)) + #(offset-fret 1 (chord-shape 'f guitar-tuning)) \storePredefinedDiagram \chordmode {ges:m} #guitar-tuning - #(offset-fret 1 (chord-shape 'f:m)) + #(offset-fret 1 (chord-shape 'f:m guitar-tuning)) \storePredefinedDiagram \chordmode {ges:aug} #guitar-tuning #"2-2;1-1;o;3-4-(;3-4-);2-3;" @@ -259,13 +259,13 @@ #"x;x;1-1;2-3;1-2;2-4;" \storePredefinedDiagram \chordmode {ges:7} #guitar-tuning - #(offset-fret 1 (chord-shape 'f:7)) + #(offset-fret 1 (chord-shape 'f:7 guitar-tuning)) \storePredefinedDiagram \chordmode {ges:maj7} #guitar-tuning #"x;x;4-4;3-3;2-2;1-1;" \storePredefinedDiagram \chordmode {ges:m7} #guitar-tuning - #(offset-fret 1 (chord-shape 'f:m7)) + #(offset-fret 1 (chord-shape 'f:m7 guitar-tuning)) %%%% g chords % @@ -274,7 +274,7 @@ #"3-2;2-1;o;o;o;3-3;" \storePredefinedDiagram \chordmode {g:m} #guitar-tuning - #(offset-fret 2 (chord-shape 'f:m)) + #(offset-fret 2 (chord-shape 'f:m guitar-tuning)) \storePredefinedDiagram \chordmode {g:aug} #guitar-tuning #"x;x;5-1;8-3;8-4;7-2;" @@ -289,16 +289,16 @@ #"x;x;5-4;4-3;3-2;2-1;" \storePredefinedDiagram \chordmode {g:m7} #guitar-tuning - #(offset-fret 2 (chord-shape 'f:m7)) + #(offset-fret 2 (chord-shape 'f:m7 guitar-tuning)) %%%% gis chords % \storePredefinedDiagram \chordmode {gis} #guitar-tuning - #(offset-fret 3 (chord-shape 'f)) + #(offset-fret 3 (chord-shape 'f guitar-tuning)) \storePredefinedDiagram \chordmode {gis:m} #guitar-tuning - #(offset-fret 3 (chord-shape 'f:m)) + #(offset-fret 3 (chord-shape 'f:m guitar-tuning)) \storePredefinedDiagram \chordmode {gis:aug} #guitar-tuning #"o;3-4;2-3;1-1;1-2;o;" @@ -307,22 +307,22 @@ #"x;x;o;1-1;o;1-2;" \storePredefinedDiagram \chordmode {gis:7} #guitar-tuning - #(offset-fret 3 (chord-shape 'f:7)) + #(offset-fret 3 (chord-shape 'f:7 guitar-tuning)) \storePredefinedDiagram \chordmode {gis:maj7} #guitar-tuning #"x;x;1-1-(;1-1;1-1-);3-3;" \storePredefinedDiagram \chordmode {gis:m7} #guitar-tuning - #(offset-fret 3 (chord-shape 'f:m7)) + #(offset-fret 3 (chord-shape 'f:m7 guitar-tuning)) %%%% aes chords % \storePredefinedDiagram \chordmode {aes} #guitar-tuning - #(offset-fret 3 (chord-shape 'f)) + #(offset-fret 3 (chord-shape 'f guitar-tuning)) \storePredefinedDiagram \chordmode {aes:m} #guitar-tuning - #(offset-fret 3 (chord-shape 'f:m)) + #(offset-fret 3 (chord-shape 'f:m guitar-tuning)) \storePredefinedDiagram \chordmode {aes:aug} #guitar-tuning #"o;3-4;2-3;1-1;1-2;o;" @@ -331,13 +331,13 @@ #"x;x;o;1-1;o;1-2;" \storePredefinedDiagram \chordmode {aes:7} #guitar-tuning - #(offset-fret 3 (chord-shape 'f:7)) + #(offset-fret 3 (chord-shape 'f:7 guitar-tuning)) \storePredefinedDiagram \chordmode {aes:maj7} #guitar-tuning #"x;x;1-1-(;1-1;1-1-);3-3;" \storePredefinedDiagram \chordmode {aes:m7} #guitar-tuning - #(offset-fret 3 (chord-shape 'f:m7)) + #(offset-fret 3 (chord-shape 'f:m7 guitar-tuning)) %%%% a chords % @@ -352,7 +352,7 @@ #"x;o;3-4;2-2;2-3;1-1;" \storePredefinedDiagram \chordmode {a:dim} #guitar-tuning - #(chord-shape 'a:dim) + #(chord-shape 'a:dim guitar-tuning) \storePredefinedDiagram \chordmode {a:7} #guitar-tuning #"x;o;2-1;o;2-3;o;" @@ -367,58 +367,58 @@ % \storePredefinedDiagram \chordmode {ais} #guitar-tuning - #(chord-shape 'bes) + #(chord-shape 'bes guitar-tuning) \storePredefinedDiagram \chordmode {ais:m} #guitar-tuning - #(chord-shape 'bes:m) + #(chord-shape 'bes:m guitar-tuning) \storePredefinedDiagram \chordmode {ais:aug} #guitar-tuning #"2-2;1-1;o;3-4-(;3-4-);2-3;" \storePredefinedDiagram \chordmode {ais:dim} #guitar-tuning - #(offset-fret 1 (chord-shape 'a:dim)) + #(offset-fret 1 (chord-shape 'a:dim guitar-tuning)) \storePredefinedDiagram \chordmode {ais:7} #guitar-tuning - #(chord-shape 'bes:7) + #(chord-shape 'bes:7 guitar-tuning) \storePredefinedDiagram \chordmode {ais:maj7} #guitar-tuning #"x;1-1;3-3;2-2;3-4;x;" \storePredefinedDiagram \chordmode {ais:m7} #guitar-tuning - #(chord-shape 'bes:m7) + #(chord-shape 'bes:m7 guitar-tuning) %%%% bes chords % \storePredefinedDiagram \chordmode {bes} #guitar-tuning - #(chord-shape 'bes) + #(chord-shape 'bes guitar-tuning) \storePredefinedDiagram \chordmode {bes:m} #guitar-tuning - #(chord-shape 'bes:m) + #(chord-shape 'bes:m guitar-tuning) \storePredefinedDiagram \chordmode {bes:aug} #guitar-tuning #"2-2;1-1;o;3-4-(;3-4-);2-3;" \storePredefinedDiagram \chordmode {bes:dim} #guitar-tuning - #(offset-fret 1 (chord-shape 'a:dim)) + #(offset-fret 1 (chord-shape 'a:dim guitar-tuning)) \storePredefinedDiagram \chordmode {bes:7} #guitar-tuning - #(chord-shape 'bes:7) + #(chord-shape 'bes:7 guitar-tuning) \storePredefinedDiagram \chordmode {bes:maj7} #guitar-tuning #"x;1-1;3-3;2-2;3-4;x;" \storePredefinedDiagram \chordmode {bes:m7} #guitar-tuning - #(chord-shape 'bes:m7) + #(chord-shape 'bes:m7 guitar-tuning) %%%% b chords % \storePredefinedDiagram \chordmode {b} #guitar-tuning - #(offset-fret 1 (chord-shape 'bes)) + #(offset-fret 1 (chord-shape 'bes guitar-tuning)) \storePredefinedDiagram \chordmode {b:m} #guitar-tuning - #(offset-fret 1 (chord-shape 'bes:m)) + #(offset-fret 1 (chord-shape 'bes:m guitar-tuning)) \storePredefinedDiagram \chordmode {b:aug} #guitar-tuning #"x;3-2;2-1;o;o;x;" @@ -427,11 +427,11 @@ #"x;x;o;1-1;o;1-2;" \storePredefinedDiagram \chordmode {b:7} #guitar-tuning - #(offset-fret 1 (chord-shape 'bes:7)) + #(offset-fret 1 (chord-shape 'bes:7 guitar-tuning)) \storePredefinedDiagram \chordmode {b:maj7} #guitar-tuning #"x;2-1;4-3;3-2;4-4;x;" \storePredefinedDiagram \chordmode {b:m7} #guitar-tuning - #(offset-fret 1 (chord-shape 'bes:m7)) + #(offset-fret 1 (chord-shape 'bes:m7 guitar-tuning)) diff --git a/ly/predefined-guitar-ninth-fretboards.ly b/ly/predefined-guitar-ninth-fretboards.ly index 519323e0dd..fc0530f93b 100644 --- a/ly/predefined-guitar-ninth-fretboards.ly +++ b/ly/predefined-guitar-ninth-fretboards.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" % % Add ninth chords to to predefined fret diagrams for standard guitar tunings % @@ -8,57 +8,57 @@ % -\addChordShape #'c:9 #"x;3-2;2-1;3-3-(;3-3;3-3-);" -\addChordShape #'f:9 #"1-1-(;3-3;1-1;2-2;1-1-);3-4;" +\addChordShape #'c:9 #guitar-tuning #"x;3-2;2-1;3-3-(;3-3;3-3-);" +\addChordShape #'f:9 #guitar-tuning #"1-1-(;3-3;1-1;2-2;1-1-);3-4;" \storePredefinedDiagram \chordmode {c:9} #guitar-tuning - #(chord-shape 'c:9) + #(chord-shape 'c:9 guitar-tuning) \storePredefinedDiagram \chordmode {cis:9} #guitar-tuning - #(offset-fret 1 (chord-shape 'c:9)) + #(offset-fret 1 (chord-shape 'c:9 guitar-tuning)) \storePredefinedDiagram \chordmode {des:9} #guitar-tuning - #(offset-fret 1 (chord-shape 'c:9)) + #(offset-fret 1 (chord-shape 'c:9 guitar-tuning)) \storePredefinedDiagram \chordmode {d:9} #guitar-tuning - #(offset-fret 2 (chord-shape 'c:9)) + #(offset-fret 2 (chord-shape 'c:9 guitar-tuning)) \storePredefinedDiagram \chordmode {dis:9} #guitar-tuning - #(offset-fret 3 (chord-shape 'c:9)) + #(offset-fret 3 (chord-shape 'c:9 guitar-tuning)) \storePredefinedDiagram \chordmode {ees:9} #guitar-tuning - #(offset-fret 3 (chord-shape 'c:9)) + #(offset-fret 3 (chord-shape 'c:9 guitar-tuning)) \storePredefinedDiagram \chordmode {e:9} #guitar-tuning #"o;2-2;o;1-1;o;2-3;" \storePredefinedDiagram \chordmode {f:9} #guitar-tuning - #(chord-shape 'f:9) + #(chord-shape 'f:9 guitar-tuning) \storePredefinedDiagram \chordmode {fis:9} #guitar-tuning - #(offset-fret 1 (chord-shape 'f:9)) + #(offset-fret 1 (chord-shape 'f:9 guitar-tuning)) \storePredefinedDiagram \chordmode {ges:9} #guitar-tuning - #(offset-fret 1 (chord-shape 'f:9)) + #(offset-fret 1 (chord-shape 'f:9 guitar-tuning)) \storePredefinedDiagram \chordmode {g:9} #guitar-tuning - #(offset-fret 2 (chord-shape 'f:9)) + #(offset-fret 2 (chord-shape 'f:9 guitar-tuning)) \storePredefinedDiagram \chordmode {gis:9} #guitar-tuning - #(offset-fret 3 (chord-shape 'f:9)) + #(offset-fret 3 (chord-shape 'f:9 guitar-tuning)) \storePredefinedDiagram \chordmode {aes:9} #guitar-tuning - #(offset-fret 3 (chord-shape 'f:9)) + #(offset-fret 3 (chord-shape 'f:9 guitar-tuning)) \storePredefinedDiagram \chordmode {a:9} #guitar-tuning - #(offset-fret 4 (chord-shape 'f:9)) + #(offset-fret 4 (chord-shape 'f:9 guitar-tuning)) \storePredefinedDiagram \chordmode {ais:9} #guitar-tuning - #(offset-fret 5 (chord-shape 'f:9)) + #(offset-fret 5 (chord-shape 'f:9 guitar-tuning)) \storePredefinedDiagram \chordmode {bes:9} #guitar-tuning - #(offset-fret 5 (chord-shape 'f:9)) + #(offset-fret 5 (chord-shape 'f:9 guitar-tuning)) \storePredefinedDiagram \chordmode {b:9} #guitar-tuning - #(offset-fret -1 (chord-shape 'c:9)) + #(offset-fret -1 (chord-shape 'c:9 guitar-tuning)) diff --git a/ly/property-init.ly b/ly/property-init.ly index 8f4a2e3366..2d50a6c601 100644 --- a/ly/property-init.ly +++ b/ly/property-init.ly @@ -1,6 +1,6 @@ % property-init.ly -\version "2.11.53" +\version "2.12.0" stemUp = \override Stem #'direction = #UP stemDown = \override Stem #'direction = #DOWN diff --git a/ly/scale-definitions-init.ly b/ly/scale-definitions-init.ly index c462deb82d..4500920249 100644 --- a/ly/scale-definitions-init.ly +++ b/ly/scale-definitions-init.ly @@ -1,4 +1,4 @@ -\version "2.10.0" +\version "2.12.0" major = #`( diff --git a/ly/script-init.ly b/ly/script-init.ly index ab96dad9f1..d1d28a54af 100644 --- a/ly/script-init.ly +++ b/ly/script-init.ly @@ -1,4 +1,4 @@ -\version "2.10.0" +\version "2.12.0" % code char abbreviations diff --git a/ly/spanners-init.ly b/ly/spanners-init.ly index 28c4574019..7b26094e49 100644 --- a/ly/spanners-init.ly +++ b/ly/spanners-init.ly @@ -1,4 +1,4 @@ -\version "2.11.52" +\version "2.12.0" startGroup = #(make-span-event 'NoteGroupingEvent START) stopGroup = #(make-span-event 'NoteGroupingEvent STOP) diff --git a/ly/suomi.ly b/ly/suomi.ly index 153281e413..10e1cbf8cb 100644 --- a/ly/suomi.ly +++ b/ly/suomi.ly @@ -49,6 +49,6 @@ pitchnamesSuomi = #`( pitchnames = \pitchnamesSuomi -\version "2.10.0" +\version "2.12.0" #(ly:parser-set-note-names parser pitchnames) diff --git a/ly/svenska.ly b/ly/svenska.ly index ee341ac76c..260638994f 100644 --- a/ly/svenska.ly +++ b/ly/svenska.ly @@ -42,6 +42,6 @@ pitchnamesSvenska = #`( ) pitchnames = \pitchnamesSvenska -\version "2.10.0" +\version "2.12.0" #(ly:parser-set-note-names parser pitchnames) diff --git a/ly/titling-init.ly b/ly/titling-init.ly index 08b23d469d..60c07e6ef0 100644 --- a/ly/titling-init.ly +++ b/ly/titling-init.ly @@ -1,4 +1,4 @@ -\version "2.11.57" +\version "2.12.0" slashSeparator = \markup { \center-align diff --git a/ly/toc-init.ly b/ly/toc-init.ly index 334c983d0b..068563abf7 100644 --- a/ly/toc-init.ly +++ b/ly/toc-init.ly @@ -1,4 +1,4 @@ -\version "2.11.26" +\version "2.12.0" %% defined later, in a closure #(define-public (add-toc-item! markup-symbol text) diff --git a/ly/vlaams.ly b/ly/vlaams.ly index 37d9a91271..eb35589af4 100644 --- a/ly/vlaams.ly +++ b/ly/vlaams.ly @@ -1,4 +1,4 @@ -\version "2.10.0" %hier stond 2.1.36, mocht ik dat wel veranderen? +\version "2.12.0" %hier stond 2.1.36, mocht ik dat wel veranderen? %{ diff --git a/mf/feta-banier.mf b/mf/feta-banier.mf index 729dd1d6ce..f593c6f36f 100644 --- a/mf/feta-banier.mf +++ b/mf/feta-banier.mf @@ -247,6 +247,45 @@ fet_beginchar ("64th Flag (up)", "u6"); fet_endchar; +fet_beginchar ("128th Flag (up)", "u7"); + save flare, hip_depth_ratio, hip_width, foot_depth, foot_width_ratio; + save flagspace, total_depth, flag_count; + + flag_count = 5; + flare = .85 staff_space; + flagspace# = .93 staff_space#; + hip_depth_ratio = .72; + hip_width# = upflag_width# - hip_thickness# / 2; + total_depth# = 6.25 staff_space#; + foot_width_ratio = .8; + + (flag_count - 1) * flagspace# + foot_depth# = total_depth#; + + define_pixels (hip_width, foot_depth); + define_whole_vertical_pixels (flagspace); + + set_char_box (0, hip_width# + right_upflag_space#, + total_depth# + foot_thickness# / 2, stemthickness# / 2); + + draw_flag ((0, -(flag_count - 1) * flagspace), flare, + (hip_width, foot_depth), + hip_depth_ratio, foot_width_ratio, + hip_thickness, foot_thickness, 1); + + add_flag (flagspace, flare, .97, 1.00, 1.3, + hip_thickness, foot_thickness); + add_flag (flagspace, flare, 1.00, 1.00, 1.25, + hip_thickness, foot_thickness); + add_flag (flagspace, flare, 1.00, 1.00, 1.25, + hip_thickness, foot_thickness); + add_flag (flagspace, flare, 0.95, 1.05, 1.25, + hip_thickness, foot_thickness); + + draw_square_block ((-0.5 stemthickness_rounded, 0), + (0, -5 staff_space_rounded)); +fet_endchar; + + fet_beginchar ("8th (down)", "d3"); save flare, hip_depth_ratio, hip_width, foot_depth, foot_width_ratio; save flagspace, total_depth, flag_count; @@ -468,4 +507,44 @@ fet_beginchar ("64th (down)", "d6"); y_mirror_char; fet_endchar; + +fet_beginchar ("128th (down)", "d7"); + save flare, hip_depth_ratio, hip_width, foot_depth, foot_width_ratio; + save flagspace, total_depth, flag_count; + + flag_count = 5; + flare = .8 staff_space; + flagspace# = .9 staff_space#; + hip_depth_ratio = .85; + hip_width# = downflag_width# - hip_thickness# / 2; + total_depth# = 5.25 staff_space#; + foot_width_ratio = .98; + + (flag_count - 1) * flagspace# + foot_depth# = total_depth#; + define_pixels (hip_width, foot_depth); + define_whole_vertical_pixels (flagspace); + + set_char_box (0, hip_width# + right_downflag_space#, + total_depth# + foot_thickness# / 2, stemthickness# / 2); + + draw_flag ((0, -(flag_count - 1) * flagspace), flare, + (hip_width, foot_depth), + hip_depth_ratio, foot_width_ratio, + hip_thickness, foot_thickness, 0); + + add_flag (flagspace, flare, .97, 1.20, 1.175, + hip_thickness, foot_thickness); + add_flag (flagspace, flare, .97, 1.10, 1.175, + hip_thickness, foot_thickness); + add_flag (.98 flagspace, flare, .91, 1.05, 1.2, + hip_thickness, foot_thickness); + add_flag (.98 flagspace, flare, .91, 1.05, 1.2, + hip_thickness, foot_thickness); + + draw_square_block ((-0.5 stemthickness_rounded, 0), + (0, -5 staff_space_rounded)); + + y_mirror_char; +fet_endchar; + fet_endgroup ("flags"); diff --git a/mf/feta-toevallig.mf b/mf/feta-toevallig.mf index 80e8105540..ef536cae82 100644 --- a/mf/feta-toevallig.mf +++ b/mf/feta-toevallig.mf @@ -44,6 +44,87 @@ enddef; fet_begingroup ("accidentals"); +% +% Draw an arrow +% +% * `stemslant' gives the direction of the stem's left boundary +% (needed for brushed stems, equals "up" for straight stems) +% * `extend' is used to make the stem longer or shorter (if negative); +% different kinds of accidentals need different values here +% +def draw_arrow (expr attach, stemwidth, stemslant, extend, pointingdown) = +begingroup; + save htip; % tip height + save wwing; % wing `radius' + save angle_wing_bot, angle_wing_top, angle_tip; + save upshift; + clearxy; + + wwing := 0.26 stemwidth; + htip := staff_space * 0.85 + stafflinethickness - wwing; + + % `flip' is used to reflect the arrow vertically + % if arrow points downward + transform flip; + if pointingdown: + flip = identity reflectedabout (origin, right); + else: + flip = identity; + fi; + + z1 = attach shifted (-stemwidth / 2, 0); + upshift := max (0, wwing + 0.1 staff_space + extend); + z2 = z1 shifted (((unitvector stemslant) + scaled upshift) transformed flip); + + z7 = attach shifted ((stemwidth/2),0); + z6 = z7 shifted (((unitvector (-xpart stemslant, ypart stemslant)) + scaled upshift) transformed flip); + z2 - z3 = ( 0.38 staff_space, 0.05 htip) transformed flip; + z6 - z5 = (-0.38 staff_space, 0.05 htip) transformed flip; + + z4 = attach shifted ((-0.2 stemwidth, upshift + htip) + transformed flip); + z4'= attach shifted (( 0.2 stemwidth, upshift + htip) + transformed flip); + + % `angle_wing_bot' is the angle at which the arc + % from z2 to z3a enters z3a + % `angle_wing_top' is the angle at which the arc + % from z3b to z4 leaves z3b + % `angle_tip' is the angle at which the arc + % from z4 to z4' leaves z4 + angle_wing_bot = 30; + angle_wing_top = 55; + angle_tip = 68; + + z3a = z3 shifted ((((dir angle_wing_bot) rotated -90) + scaled wwing) transformed flip); + z3b = z3 shifted ((((dir angle_wing_top) rotated 90) + scaled wwing) transformed flip); + + z5a = z5 shifted ((((dir (180 - angle_wing_bot)) rotated 90) + scaled wwing) transformed flip); + z5b = z5 shifted ((((dir (180 - angle_wing_top)) rotated -90) + scaled wwing) transformed flip); + + % Draw the arrow + pickup pencircle scaled 1; + fill z1 + -- z2{stemslant transformed flip} + .. {(-dir angle_wing_bot) transformed flip}z3a + .. z3b{(dir angle_wing_top) transformed flip} + .. z4{(dir angle_tip) transformed flip} + .. z4'{(dir (-angle_tip)) transformed flip} + .. {(dir (-angle_wing_top)) transformed flip}z5b + .. z5a{(-dir (-angle_wing_bot)) transformed flip} + .. z6{((-stemslant) reflectedabout (origin, up)) transformed flip} + -- z7 + -- cycle; + + labels (range 0 thru 7, 4', 3a, 3b, 5a, 5b); +endgroup; +enddef; save remember_pic; picture remember_pic; @@ -97,17 +178,33 @@ def draw_meta_sharp (expr width, offset) = enddef; -fet_beginchar ("Sharp", "sharp"); +def draw_sharp(expr arrowup, arrowdown) = save stem, stemx, stemwidth; save outer_space, interbeam; + save stemlength, extendleft, extendright, height, depth; stemwidth# := stafflinethickness# + .05 staff_space#; define_whole_blacker_pixels (stemwidth); interbeam := 1.05 staff_space_rounded; - set_char_box (0, 1.1 staff_space#, - 1.5 staff_space#, 1.5 staff_space#); + stemlength# := 1.5 staff_space#; + define_pixels (stemlength); + + height# = stemlength#; + depth# = stemlength#; + extendright# = 0; + extendleft# = 0; + if arrowup: + height# := height# + 1.2 staff_space#; + extendright# := extendright# + 1.5 stafflinethickness#; + fi; + if arrowdown: + depth# := depth# + 1.2 staff_space#; + extendleft# := extendleft# + 1.5 stafflinethickness#; + fi; + define_pixels (extendleft, extendright); + set_char_box (extendleft#, 1.1 staff_space#, depth#, height#); stem := 7 / 16 * w; stemx := hround stem; @@ -119,23 +216,66 @@ fet_beginchar ("Sharp", "sharp"); draw_meta_sharp (w, -.5 interbeam); draw_meta_sharp (w, -.5 interbeam + vround interbeam); + % expand the charbox so that it encloses the whole arrow; + % this must not happen earlier because some commands above + % still rely on the old width + w := w + extendright; + pickup pencircle scaled stemwidth; lft x5 = lft x6 = outer_space; lft x7 = lft x8 = outer_space + stemx; - bot y5 = -d; + bot y5 = -stemlength; top y6 = vround (1.5 staff_space - stem * beamslope); bot y7 = -top y6 + feta_space_shift; - top y8 = h; + top y8 = stemlength; - labels (5, 6, 7, 8); + labels (5, 6, 7, 8); draw_gridline (z5, z6, stemwidth); draw_gridline (z7, z8, stemwidth); + if arrowup: + draw_arrow (z8, stemwidth, up, + stafflinethickness / 2 + stemwidth / 2, false); + fi; + if arrowdown: + draw_arrow (z5, stemwidth, up, + stafflinethickness / 2 + stemwidth / 2, true); + fi; + remember_pic := currentpicture; draw_staff (-2, 2, 0); +enddef; + + +fet_beginchar ("Sharp", "sharp"); + draw_sharp (false, false); +fet_endchar; + + +draw_shifted_too; + + +fet_beginchar ("Arrowed Sharp (arrow up)", "sharp.arrowup"); + draw_sharp (true, false); +fet_endchar; + + +draw_shifted_too; + + +fet_beginchar ("Arrowed Sharp (arrow down)", "sharp.arrowdown"); + draw_sharp (false, true); +fet_endchar; + + +draw_shifted_too; + + +fet_beginchar ("Arrowed Sharp (arrows up and down)", "sharp.arrowboth"); + draw_sharp (true, true); fet_endchar; @@ -329,9 +469,11 @@ draw_shifted_too; % The stems of the natural are brushed (at least, in Barenreiter SCS) % -fet_beginchar ("Natural", "natural"); +def draw_natural (expr arrowup, arrowdown) = save stemwidth, top_stem_thick; save ne, pat_top, pat_bottom; + save depth, height, extendleft, extendright, stemlength; + save brush_scale_up, brush_scale_down; pair ne; path pat_top, pat_bottom; @@ -339,39 +481,68 @@ fet_beginchar ("Natural", "natural"); stemwidth# = 0.09 staff_space# + .5 stafflinethickness#; define_whole_blacker_pixels (top_stem_thick, stemwidth); - set_char_box (0, 2/3 staff_space#, - 1.5 staff_space#, 1.5 staff_space#); + stemlength# = 1.5 staff_space#; + define_pixels (stemlength); + + height# = stemlength#; + depth# = stemlength#; + extendleft# = 0; + extendright# = 0; + if arrowup: + extendleft# := 3 stafflinethickness#; + height# := height# + 1.2 staff_space#; + fi; + if arrowdown: + extendright# := 3.15 stafflinethickness#; + depth# := depth# + 1.2 staff_space#; + fi; + define_pixels (extendright); + + set_char_box (extendleft#, 2/3 staff_space#, depth#, height#); d := d - feta_space_shift; pickup pencircle scaled stemwidth; + brush_scale_up := 1.0; + brush_scale_down := 1.0; + % to look nice, arrowed stems must be less brushed + if arrowup: + brush_scale_up := 0.85; + fi; + if arrowdown: + brush_scale_down := 0.85; + fi; + penpos1 (top_stem_thick, 0); penpos3 (top_stem_thick, 0); penpos2 (stemwidth, 0); penpos4 (stemwidth, 0); + % z1' and z3' are needed for the arrowed accidentals + penpos1' (top_stem_thick * brush_scale_up, 0); + penpos3' (top_stem_thick * brush_scale_down, 0); x2r = w; x4l = 0; - x3 = x2; - x1 = x4; + x3 = x3' = x2; + x1 = x1' = x4; - y1 = h; - y3 = -d; + y1 = y1' = stemlength; + y3 = y3' = -stemlength; top y2 = vround (staff_space - 3/2 stafflinethickness); y4 = -y2 + feta_space_shift; pat_bottom := z4r{z4r - z1r} .. bot z4 .. z4l{z1l - z4l}; - fill simple_serif (z1l, z1r, -30) + fill simple_serif (z1'l, z1'r, -30) -- pat_bottom -- cycle; pat_top := z2r{z2r - z3r} .. top z2 .. z2l{z3l - z2l}; - fill simple_serif (z3l, z3r, 30) + fill simple_serif (z3'l, z3'r, 30) -- pat_top -- cycle; @@ -408,12 +579,51 @@ fet_beginchar ("Natural", "natural"); -- z24 -- cycle; - penlabels (1, 2, 3, 4); + penlabels (1, 1', 2, 3, 3', 4); labels (11, 11', 12, 13, 14, 21, 21', 22, 23, 24); + if arrowup: + draw_arrow (z1, top_stem_thick * brush_scale_up, + z1'l - z4l, stafflinethickness / 2, false); + fi; + if arrowdown: + draw_arrow (z3, top_stem_thick * brush_scale_down, + z2r - z3'r, stafflinethickness / 2, true); + w := w + extendright; + fi; + remember_pic := currentpicture; draw_staff (-2, 2, 0); +enddef; + + +fet_beginchar ("Natural", "natural"); + draw_natural (false, false); +fet_endchar; + + +draw_shifted_too; + + +fet_beginchar ("Arrowed Natural (arrow up)", "natural.arrowup"); + draw_natural (true, false); +fet_endchar; + + +draw_shifted_too; + + +fet_beginchar ("Arrowed Natural (arrow down)", "natural.arrowdown"); + draw_natural (false, true); +fet_endchar; + + +draw_shifted_too; + + +fet_beginchar ("Arrowed Natural (arrows up and down)", "natural.arrowboth"); + draw_natural (true, true); fet_endchar; @@ -431,15 +641,16 @@ draw_shifted_too; % TODO: document, simplify! % -def draw_meta_flat (expr xcenter, w, crook_fatness) = +def draw_meta_flat (expr xcenter, w, crook_fatness, arrowup, arrowdown) = save crook_thinness; save bottom_overshoot, bot_crook_dir; - save top_stem_thick, bottom_stem_thick, hair, smaller_hole; + save top_stem_thick, top_stem_thick_orig; + save bottom_stem_thick, hair, smaller_hole; save top_crook_thinness; save zwiep; save center; pair center, bot_crook_dir; - save clearing; + save clearing, clearing_orig; clearxy; @@ -453,18 +664,31 @@ def draw_meta_flat (expr xcenter, w, crook_fatness) = else: smaller_hole = 0; fi; - clearing = 1.7 stafflinethickness; crook_thinness = .7 stafflinethickness + .06 staff_space; top_crook_thinness = 1 stafflinethickness + .065 staff_space; + clearing = 1.7 stafflinethickness; + clearing_orig = clearing; + if arrowup: + clearing := 0.5 staff_space; + fi; bottom_overshoot = stafflinethickness; bottom_stem_thick# = 0.06 staff_space# + 0.6 stafflinethickness#; top_stem_thick# = 0.1 staff_space# + 1.2 stafflinethickness#; - define_whole_blacker_pixels (bottom_stem_thick, top_stem_thick); + top_stem_thick_orig# = top_stem_thick#; + if arrowup: + % to look nice, arrowed stems should be less brushed + top_stem_thick# := top_stem_thick# * 0.8; + fi; + define_whole_blacker_pixels (bottom_stem_thick, top_stem_thick, + top_stem_thick_orig); if odd (top_stem_thick - bottom_stem_thick): top_stem_thick := top_stem_thick - 1; fi; + if odd (top_stem_thick_orig - bottom_stem_thick): + top_stem_thick_orig := top_stem_thick_orig - 1; + fi; center = (xcenter, 0); @@ -472,13 +696,22 @@ def draw_meta_flat (expr xcenter, w, crook_fatness) = y1 = vround (2 staff_space - clearing); x2l = hround (xcenter - .5 bottom_stem_thick); y2 = -.5 staff_space - .5 stafflinethickness; + % z16 and the `*_orig' variables are needed for arrowed accidentals + % because their inner part should be unchanged from plain ones but + % the points z3l, z3r, and z10 depend on values that are different + % for arrowed accidentals + x16l = hround (xcenter -.5 top_stem_thick_orig); + y16 = vround (2 staff_space - clearing_orig); penpos1 (top_stem_thick, 0); + penpos16 (top_stem_thick_orig, 0); penpos2 (bottom_stem_thick, 0); y3l = vfloor ((staff_space - stafflinethickness) / 2); z3l = whatever [z2r, z1r]; - z3r = .3 [z2r, z1r] + (smaller_hole, 0); + z3r = .3 [z2r, + (z16r shifted (0, clearing_orig - 1.7 stafflinethickness))] + + (smaller_hole, 0); x3r := hceiling x3r; % we insert z3l to get better conversion with mf2pt1 @@ -488,7 +721,7 @@ def draw_meta_flat (expr xcenter, w, crook_fatness) = -- z3l -- cycle; - z10 = whatever [z2r, z1r] + (smaller_hole, 0); + z10 = whatever [z2r, z16r] + (smaller_hole, 0); y10 = -1/10 staff_space; x10 := hceiling x10; @@ -496,6 +729,9 @@ def draw_meta_flat (expr xcenter, w, crook_fatness) = y11 = -vround (.5 (staff_space + stafflinethickness) + bottom_overshoot); + x2a = 0.2[x2r, x7]; + y2a = 1.5[y2, y11]; + penpos4 (whatever, 53); y4l - y4r = top_crook_thinness; @@ -524,25 +760,62 @@ def draw_meta_flat (expr xcenter, w, crook_fatness) = .. z10{z3r - z10} -- cycle; - fill z2l{down} - .. z11{right} - .. z8{bot_crook_dir} - .. z5l{up} - .. z4l{left} - .. z3l - -- cycle; + if arrowdown: + fill z2l{down} + .. z2a{up} + .. z8{bot_crook_dir} + .. z5l{up} + .. z4l{left} + .. z3l + -- cycle; + else: + fill z2l{down} + .. z11{right} + .. z8{bot_crook_dir} + .. z5l{up} + .. z4l{left} + .. z3l + -- cycle; + fi; + + if arrowup: + draw_arrow (z1, top_stem_thick, z1l - z2l, + 0.5 stafflinethickness, false); + fi; + if arrowdown: + draw_arrow ((0.5 [x2l, x2a], y2), x2a - x2l, up, + staff_space / 2, true); + fi; enddef; +def draw_arrowed_meta_flat (expr xcenter, width, crook_fatness, + arrowup, arrowdown) = + save depth, height, extendleft; + + depth# = 0.6 staff_space#; + height# = 1.9 staff_space#; + extendleft# := 1.2 stafflinethickness#; + if arrowup: + extendleft# := 3.45 stafflinethickness#; + height# := height# + 0.8 staff_space#; + fi; + if arrowdown: + extendleft# := 3.45 stafflinethickness#; + depth# := depth# + 1.6 staff_space#; + fi; + + set_char_box (extendleft#, width, depth#, height#); + draw_meta_flat(xcenter, w, crook_fatness, arrowup, arrowdown); +enddef; + % % unfortunately, 600dpi is not enough to show the brush of the stem. % fet_beginchar ("Flat", "flat"); - set_char_box (1.2 stafflinethickness#, .8 staff_space#, - 0.6 staff_space#, 1.9 staff_space#); - - draw_meta_flat (0, w, 0.31 staff_space); + draw_arrowed_meta_flat (0, 0.8 staff_space#, 0.31 staff_space, + false, false); penlabels (range 0 thru 11); remember_pic := currentpicture; @@ -554,11 +827,53 @@ fet_endchar; draw_shifted_too; +fet_beginchar ("Arrowed Flat (arrow up)", "flat.arrowup"); + draw_arrowed_meta_flat (0, 0.8 staff_space#, 0.31 staff_space, + true, false); + penlabels (range 0 thru 23); + + remember_pic := currentpicture; + + draw_staff (-2, 2, 0); +fet_endchar; + + +draw_shifted_too; + + +fet_beginchar ("Arrowed Flat (arrow down)", "flat.arrowdown"); + draw_arrowed_meta_flat (0, 0.8 staff_space#, 0.31 staff_space, + false, true); + penlabels (range 0 thru 23); + + remember_pic := currentpicture; + + draw_staff (-2, 2, 0); +fet_endchar; + + +draw_shifted_too; + + +fet_beginchar ("Arrowed Flat (arrow up and down)", "flat.arrowboth"); + draw_arrowed_meta_flat (0, 0.8 staff_space#, 0.31 staff_space, + true, true); + penlabels (range 0 thru 23); + + remember_pic := currentpicture; + + draw_staff (-2, 2, 0); +fet_endchar; + + +draw_shifted_too; + + fet_beginchar ("Flat (slashed)", "flat.slash"); set_char_box (.4 staff_space#, .8 staff_space#, 0.6 staff_space#, 1.9 staff_space#); - draw_meta_flat (0, w, 0.31 staff_space); + draw_meta_flat (0, w, 0.31 staff_space, false, false); clearxy; @@ -597,7 +912,7 @@ fet_beginchar ("Flat (slashed twice)", "flat.slashslash"); set_char_box (.4 staff_space#, .8 staff_space#, 0.6 staff_space#, 1.9 staff_space#); - draw_meta_flat (0, w, 0.31 staff_space); + draw_meta_flat (0, w, 0.31 staff_space, false, false); clearxy; @@ -776,7 +1091,7 @@ fet_beginchar ("Semi flat", "mirroredflat"); set_char_box (1.2 stafflinethickness#, .8 staff_space#, 0.6 staff_space#, 1.9 staff_space#); - draw_meta_flat (0, w, 0.31 staff_space); + draw_meta_flat (0, w, 0.31 staff_space, false, false); currentpicture := currentpicture xscaled -1 shifted (w - b, 0); fet_endchar; @@ -785,7 +1100,7 @@ fet_beginchar ("Semi flat", "mirroredflat.backslash"); set_char_box (.4 staff_space#, .8 staff_space#, 0.6 staff_space#, 1.9 staff_space#); - draw_meta_flat (0, w, 0.31 staff_space); + draw_meta_flat (0, w, 0.31 staff_space, false, false); clearxy; @@ -827,9 +1142,11 @@ fet_beginchar ("Double Flat", "flatflat"); set_char_box (1.2 stafflinethickness#, (left_wid + right_wid - overlap) * staff_space#, .6 staff_space#, 1.9 staff_space#); - draw_meta_flat (0, left_wid * staff_space, 1/3 staff_space); + draw_meta_flat (0, left_wid * staff_space, 1/3 staff_space, + false, false); draw_meta_flat (hround ((left_wid - overlap) * staff_space), - right_wid * staff_space, 1/3 staff_space); + right_wid * staff_space, 1/3 staff_space, + false, false); fet_endchar; @@ -843,9 +1160,11 @@ fet_beginchar ("3/4 Flat", "flatflat.slash"); set_char_box (1.2 stafflinethickness#, (left_wid + right_wid - overlap) * staff_space#, .6 staff_space#, 1.9 staff_space#); - draw_meta_flat (0, left_wid * staff_space, 1/3 staff_space); + draw_meta_flat (0, left_wid * staff_space, 1/3 staff_space, + false, false); draw_meta_flat (hround ((left_wid - overlap) * staff_space), - right_wid * staff_space, 1/3 staff_space); + right_wid * staff_space, 1/3 staff_space, + false, false); %% maybe we should clip part of the stems? %% or make the 1st flat smaller? diff --git a/po/es.po b/po/es.po index 9a04639c0c..4a6f5d7179 100644 --- a/po/es.po +++ b/po/es.po @@ -1,17 +1,19 @@ -# translation of lilypond-2.11.57.po to Spanish +# translation of lilypond-2.12.0.po to Español # Spanish translation of GNU Lilypond - http://lilypond.org # Copyright (C) 2002, 2007, 2008 Free Software Foundation, Inc. # # This file is distributed under the same license as the lilypond package. +# # Quique , 2002, 2004. # Daniel Tonda , 2006. # Francisco Vila , 2007, 2008. +# This file is distributed under the same license as the lilypond package. msgid "" msgstr "" -"Project-Id-Version: lilypond-2.11.57\n" +"Project-Id-Version: lilypond-2.12.0\n" "Report-Msgid-Bugs-To: http://post.gmane.org/post.php?group=gmane.comp.gnu.lilypond.bugs\n" -"POT-Creation-Date: 2008-08-23 18:49+0200\n" -"PO-Revision-Date: 2008-08-31 00:52+0200\n" +"POT-Creation-Date: 2008-12-20 11:58+0100\n" +"PO-Revision-Date: 2008-12-30 01:36+0100\n" "Last-Translator: Francisco Vila \n" "Language-Team: Spanish \n" "MIME-Version: 1.0\n" @@ -34,7 +36,7 @@ msgstr "Consulte el manual para ver los detalles, y efectúe una actualización msgid "%s has been replaced by %s" msgstr "%s se ha sustituido por %s" -#: convertrules.py:24 musicexp.py:16 convert-ly.py:48 lilypond-book.py:82 +#: convertrules.py:24 musicexp.py:16 convert-ly.py:50 lilypond-book.py:94 #: warn.cc:48 input.cc:90 #, c-format, python-format msgid "warning: %s" @@ -425,6 +427,22 @@ msgstr "El eje y la dirección ahora van antes de los marcados:\n" msgid "\\put-adjacent axis dir markup markup." msgstr "\\put-adjacent eje dirección marcado marcado." +#: convertrules.py:2832 +msgid "re-definition of InnerStaffGroup.\n" +msgstr "redefinición de InnerStaffGroup.\n" + +#: convertrules.py:2838 +msgid "re-definition of InnerChoirStaff.\n" +msgstr "redefinición de InnerChoirStaff.\n" + +#: convertrules.py:2851 +msgid "stringTuning must be added to addChordShape call.\n" +msgstr "stringTuning se debe añadir a la llamada a addChordShape.\n" + +#: convertrules.py:2857 +msgid "stringTuning must be added to chord-shape call.\n" +msgstr "stringTuning se debe añadir a la llamada a chord-shape.\n" + #: fontextract.py:25 #, python-format msgid "Scanning %s" @@ -440,56 +458,90 @@ msgstr "Se ha extraído %s" msgid "Writing fonts to %s" msgstr "Escribiendo las tipografías en %s" -#: lilylib.py:101 lilylib.py:152 +#: lilylib.py:91 lilylib.py:142 #, python-format msgid "Invoking `%s'" msgstr "Invocando «%s»" -#: lilylib.py:103 lilylib.py:154 +#: lilylib.py:93 lilylib.py:144 #, python-format msgid "Running %s..." msgstr "Ejecutando %s..." -#: lilylib.py:219 +#: lilylib.py:209 #, python-format msgid "Usage: %s" msgstr "uso: %s" -#: musicexp.py:585 +#: musicexp.py:215 musicexp.py:220 +msgid "Language does not support microtones contained in the piece" +msgstr "El lenguaje no contempla los microtonos de la pieza" + +#: musicexp.py:482 +msgid "Tuplet brackets of curved shape are not correctly implemented" +msgstr "Los corchetes curvos de grupo especial no están implementados correctamente" + +#. TODO: Implement this using actual_type and normal_type! +#: musicexp.py:511 +msgid "Tuplet brackets displaying both note durations are not implemented, using default" +msgstr "Los corchetes de grupo especial que muestran las dos duraciones de nota no están implementados, se usa el predeterminado" + +#: musicexp.py:656 #, python-format msgid "unable to set the music %(music)s for the repeat %(repeat)s" msgstr "no se ha podido establecer el fragmento de música %(music)s para la repetición %(repeat)s" -#: musicexp.py:594 +#: musicexp.py:665 msgid "encountered repeat without body" msgstr "se ha encontrado una repetición sin cuerpo" -#: musicxml.py:13 convert-ly.py:51 lilypond-book.py:85 warn.cc:54 input.cc:96 +#. no self.elements! +#: musicexp.py:835 +#, python-format +msgid "Grace note with no following music: %s" +msgstr "Nota de adorno sin música que le siga: %s" + +#: musicexp.py:997 +#, python-format +msgid "Invalid octave shift size found: %s. Using no shift." +msgstr "Se ha encontrado un tamaño de desplazamiento de octava no válido: %s. No se usará ningún desplazamiento." + +#: musicexp.py:1455 +#, python-format +msgid "Unable to convert alteration %s to a lilypond expression" +msgstr "No se pudo convertir la alteración %s a una expresión de lilypond" + +#: musicxml.py:13 convert-ly.py:53 lilypond-book.py:97 warn.cc:54 input.cc:96 #: input.cc:104 #, c-format, python-format msgid "error: %s" msgstr "error: %s" -#: musicxml.py:298 -msgid "requested time signature, but time sig is unknown" -msgstr "se requiere una indicación de compás, pero ésta es desconocida" +#. TODO: Handle pieces without a time signature! +#: musicxml.py:357 +msgid "Senza-misura time signatures are not yet supported!" +msgstr "¡Los compases senza-misura no están contemplados aún!" + +#: musicxml.py:375 +msgid "Unable to interpret time signature! Falling back to 4/4." +msgstr "¡Ha sido imposible interpretar la indicación de compás! Se va a usar 4/4 como opción de retroceso." -#: musicxml.py:354 +#: musicxml.py:431 #, python-format -msgid "Encountered note at %s with %s duration (no element):" -msgstr "Se ha encontrado una nota en %s con la duración %s (sin ningún elemento de ):" +msgid "Key alteration octave given for a non-existing alteration nr. %s, available numbers: %s!" +msgstr "¡Se ha proporcionado una octava de alteración de tonalidad para un número de alteraciones inexistente %s, números disponibles: %s!" -#: musicxml.py:388 +#: musicxml.py:519 #, python-format msgid "Unable to find instrument for ID=%s\n" msgstr "No se ha podido encontrar el instrumento con el ID=%s\n" -#: abc2ly.py:1342 convert-ly.py:72 lilypond-book.py:109 midi2ly.py:846 +#: abc2ly.py:1341 convert-ly.py:74 lilypond-book.py:121 midi2ly.py:845 #, python-format msgid "%s [OPTION]... FILE" msgstr "%s [OPCIÓN]... ARCHIVO" -#: abc2ly.py:1343 +#: abc2ly.py:1342 #, python-format msgid "" "abc2ly converts ABC music files (see\n" @@ -498,34 +550,39 @@ msgstr "" "abc2ly convierte archivos de música de ABC\n" "(véase %s) en código de entrada de LilyPond.\n" -#: abc2ly.py:1351 convert-ly.py:79 etf2ly.py:1190 lilypond-book.py:195 -#: midi2ly.py:882 musicxml2ly.py:2185 main.cc:161 +#: abc2ly.py:1350 convert-ly.py:81 etf2ly.py:1190 lilypond-book.py:207 +#: midi2ly.py:881 musicxml2ly.py:2590 main.cc:156 msgid "show version number and exit" msgstr "mostrar el número de versión y salir" -#: abc2ly.py:1355 convert-ly.py:83 etf2ly.py:1186 lilypond-book.py:126 -#: midi2ly.py:861 musicxml2ly.py:2167 main.cc:150 +#: abc2ly.py:1354 convert-ly.py:85 etf2ly.py:1186 lilypond-book.py:138 +#: midi2ly.py:860 musicxml2ly.py:2572 main.cc:145 msgid "show this help and exit" msgstr "mostrar esta ayuda y salir" -#: abc2ly.py:1357 etf2ly.py:1191 midi2ly.py:865 +#: abc2ly.py:1356 etf2ly.py:1191 midi2ly.py:864 msgid "write output to FILE" msgstr "escribir la salida en el ARCHIVO" -#: abc2ly.py:1359 +#: abc2ly.py:1358 msgid "be strict about success" msgstr "ser estricto respecto al éxito" -#: abc2ly.py:1361 +#: abc2ly.py:1360 msgid "preserve ABC's notion of beams" msgstr "preservar la noción de las barras de ABC" -#: abc2ly.py:1363 convert-ly.py:120 etf2ly.py:1199 lilypond-book.py:202 -#: midi2ly.py:894 musicxml2ly.py:2240 -msgid "Report bugs via" -msgstr "Informe de los fallos a través de" +#. Translators, please translate this string as +#. "Report bugs in English via %s", +#. or if there is a LilyPond users list or forum in your language +#. "Report bugs in English via %s or in YOUR_LANG via URI" +#: abc2ly.py:1363 convert-ly.py:123 etf2ly.py:1200 lilypond-book.py:214 +#: midi2ly.py:894 musicxml2ly.py:2646 main.cc:265 +#, c-format, python-format +msgid "Report bugs via %s" +msgstr "Informe de los fallos a %s" -#: convert-ly.py:31 +#: convert-ly.py:33 msgid "" "Update LilyPond input to newer version. By default, update from the\n" "version taken from the \\version command, to the current LilyPond version." @@ -534,72 +591,72 @@ msgstr "" "De manera predeterminada, actualizarlo desde la versión sacada de\n" "la instrucción \\version, a la versión actual de LilyPond." -#: convert-ly.py:33 lilypond-book.py:59 +#: convert-ly.py:35 lilypond-book.py:71 msgid "Examples:" msgstr "Ejemplos:" -#: convert-ly.py:67 etf2ly.py:1173 lilypond-book.py:105 midi2ly.py:77 +#: convert-ly.py:69 etf2ly.py:1173 lilypond-book.py:117 midi2ly.py:76 msgid "Distributed under terms of the GNU General Public License." msgstr "Distribuido bajo los términos de la Licencia Pública General de GNU." -#: convert-ly.py:68 etf2ly.py:1174 lilypond-book.py:106 midi2ly.py:78 +#: convert-ly.py:70 etf2ly.py:1174 lilypond-book.py:118 midi2ly.py:77 msgid "It comes with NO WARRANTY." msgstr "Se distribuye SIN NINGUNA GARANTÍA." -#: convert-ly.py:87 convert-ly.py:114 +#: convert-ly.py:89 convert-ly.py:116 msgid "VERSION" msgstr "VERSIÓN" -#: convert-ly.py:89 +#: convert-ly.py:91 msgid "start from VERSION [default: \\version found in file]" msgstr "comenzar a partir de VERSIÓN [predeterminado: \\version del archivo]" -#: convert-ly.py:92 +#: convert-ly.py:94 msgid "edit in place" msgstr "editar in situ" -#: convert-ly.py:96 +#: convert-ly.py:98 msgid "do not add \\version command if missing" msgstr "no añadir la instrucción \\version si no está presente" -#: convert-ly.py:102 +#: convert-ly.py:104 #, python-format msgid "force updating \\version number to %s" msgstr "forzar la actualización del número de \\version a %s" -#: convert-ly.py:108 +#: convert-ly.py:110 #, python-format msgid "show rules [default: -f 0, -t %s]" msgstr "mostrar las reglas [predeterminado: -f 0, -t %s]" -#: convert-ly.py:113 +#: convert-ly.py:115 #, python-format msgid "convert to VERSION [default: %s]" msgstr "convertir a VERSIÓN [predeterminado: %s]" -#: convert-ly.py:160 +#: convert-ly.py:163 msgid "Applying conversion: " msgstr "Aplicando la conversión: " -#: convert-ly.py:173 +#: convert-ly.py:176 msgid "Error while converting" msgstr "Error al convertir" -#: convert-ly.py:175 -msgid "Stopping at last succesful rule" -msgstr "Detención en la primera regla satisfactoria" +#: convert-ly.py:178 +msgid "Stopping at last successful rule" +msgstr "Detención en la última regla satisfactoria" -#: convert-ly.py:196 +#: convert-ly.py:199 #, python-format msgid "Processing `%s'... " msgstr "Procesando «%s»... " -#: convert-ly.py:286 relocate.cc:362 source-file.cc:59 +#: convert-ly.py:289 relocate.cc:362 source-file.cc:59 #, c-format, python-format msgid "cannot open file: `%s'" msgstr "no se puede abrir el archivo: «%s»" -#: convert-ly.py:293 +#: convert-ly.py:296 #, python-format msgid "cannot determine version for `%s'. Skipping" msgstr "no se puede determinar la versión de «%s»; se salta" @@ -618,275 +675,275 @@ msgstr "" "Finale de Coda Music Technology. etf2ly convierte un subconjunto de ETF a un\n" "archivo de LilyPond listo para usar.\n" -#: etf2ly.py:1192 midi2ly.py:866 musicxml2ly.py:2233 main.cc:154 main.cc:159 +#: etf2ly.py:1192 midi2ly.py:865 musicxml2ly.py:2638 main.cc:149 main.cc:154 msgid "FILE" msgstr "ARCHIVO" -#: etf2ly.py:1194 lilypond-book.py:198 midi2ly.py:883 main.cc:163 +#: etf2ly.py:1194 lilypond-book.py:210 midi2ly.py:882 main.cc:158 msgid "show warranty and copyright" msgstr "mostrar los avisos de garantía y de copyright" -#: lilypond-book.py:57 +#: lilypond-book.py:69 msgid "Process LilyPond snippets in hybrid HTML, LaTeX, texinfo or DocBook document." msgstr "Procesar los fragmentos de LylyPond en un documento de HTML híbrido, LaTeX, texinfo o DocBook." -#: lilypond-book.py:64 +#: lilypond-book.py:76 msgid "BOOK" msgstr "LIBRO" -#: lilypond-book.py:72 +#: lilypond-book.py:84 #, python-format msgid "Exiting (%d)..." msgstr "Saliendo (%d)..." -#: lilypond-book.py:103 +#: lilypond-book.py:115 #, python-format msgid "Copyright (c) %s by" msgstr "Copyright (c) %s por" -#: lilypond-book.py:113 +#: lilypond-book.py:125 msgid "FILTER" msgstr "FILTRO" -#: lilypond-book.py:116 +#: lilypond-book.py:128 msgid "pipe snippets through FILTER [default: `convert-ly -n -']" msgstr "redirigir fragmentos a través de FILTRO [predeterminado: `convert-ly -n -']" -#: lilypond-book.py:120 +#: lilypond-book.py:132 msgid "use output format FORMAT (texi [default], texi-html, latex, html, docbook)" msgstr "usar el formato de salida FORMATO (texi [predeterminado], texi-html, latex, html, docbook)" -#: lilypond-book.py:121 +#: lilypond-book.py:133 msgid "FORMAT" msgstr "FORMATO" -#: lilypond-book.py:128 +#: lilypond-book.py:140 msgid "add DIR to include path" msgstr "añadir DIRECTORIO a la ruta de inclusión" -#: lilypond-book.py:129 lilypond-book.py:136 lilypond-book.py:154 -#: lilypond-book.py:160 lilypond-book.py:166 lilypond-book.py:172 main.cc:153 +#: lilypond-book.py:141 lilypond-book.py:148 lilypond-book.py:166 +#: lilypond-book.py:172 lilypond-book.py:178 lilypond-book.py:184 main.cc:148 msgid "DIR" msgstr "DIRECTORIO" -#: lilypond-book.py:134 +#: lilypond-book.py:146 msgid "format Texinfo output so that Info will look for images of music in DIR" msgstr "formatear la salida de Texinfo de manera que Info busque las imágenes de música en DIRECTORIO" -#: lilypond-book.py:141 +#: lilypond-book.py:153 msgid "run executable PROG instead of latex" msgstr "ejecutar el programa PROGRAMA en lugar de latex" -#: lilypond-book.py:142 +#: lilypond-book.py:154 msgid "PROG" msgstr "PROGRAMA" -#: lilypond-book.py:147 +#: lilypond-book.py:159 msgid "PAD" msgstr "RELLENAR" -#: lilypond-book.py:149 +#: lilypond-book.py:161 msgid "pad left side of music to align music inspite of uneven bar numbers (in mm)" msgstr "rellenar el lado izquierdo de la música para alinear la música aunque haya un número desigual de compases (en mm)" -#: lilypond-book.py:153 +#: lilypond-book.py:165 msgid "write output to DIR" msgstr "escribir la salida en el DIRECTORIO" -#: lilypond-book.py:159 +#: lilypond-book.py:171 msgid "do not fail if no lilypond output is found" msgstr "no fracasar si no se encuentra ninguna salida de lilypond" -#: lilypond-book.py:165 +#: lilypond-book.py:177 msgid "do not fail if no PNG images are found for EPS files" msgstr "no fracasar si no se encuentra ninguna imagen PNG para los archivos EPS" -#: lilypond-book.py:171 +#: lilypond-book.py:183 msgid "write lily-XXX files to DIR, link into --output dir" msgstr "escribir archivos lily-XXX en DIR, enlazar al directorio de --output" -#: lilypond-book.py:176 +#: lilypond-book.py:188 msgid "COMMAND" msgstr "INSTRUCCIÓN" -#: lilypond-book.py:177 +#: lilypond-book.py:189 msgid "process ly_files using COMMAND FILE..." msgstr "procesar ly_files utilizando INSTRUCCIÓN ARCHIVO..." -#: lilypond-book.py:184 +#: lilypond-book.py:196 msgid "create PDF files for use with PDFTeX" msgstr "crear archivos PDF para su utilización con PDFTeX" -#: lilypond-book.py:187 midi2ly.py:876 musicxml2ly.py:2190 main.cc:162 +#: lilypond-book.py:199 midi2ly.py:875 musicxml2ly.py:2595 main.cc:157 msgid "be verbose" msgstr "ser prolijo" -#: lilypond-book.py:825 +#: lilypond-book.py:871 #, python-format msgid "file not found: %s" msgstr "archivo no encontrado: %s" -#: lilypond-book.py:1087 +#: lilypond-book.py:1142 #, python-format msgid "deprecated ly-option used: %s=%s" msgstr "se ha usado una ly-option obsoleta: %s=%s" -#: lilypond-book.py:1089 +#: lilypond-book.py:1144 #, python-format msgid "compatibility mode translation: %s=%s" msgstr "traducción en modo de compatibilidad: %s=%s" -#: lilypond-book.py:1092 +#: lilypond-book.py:1147 #, python-format msgid "deprecated ly-option used: %s" msgstr "se usó una ly-option obsoleta: %s" -#: lilypond-book.py:1094 +#: lilypond-book.py:1149 #, python-format msgid "compatibility mode translation: %s" msgstr "traducción en modo compatible: %s" -#: lilypond-book.py:1112 +#: lilypond-book.py:1167 #, python-format msgid "ignoring unknown ly option: %s" msgstr "opción ly desconocida e ignorada: %s" -#: lilypond-book.py:1538 +#: lilypond-book.py:1604 #, python-format msgid "Opening filter `%s'" msgstr "Filtro de apertura «%s»" -#: lilypond-book.py:1555 +#: lilypond-book.py:1621 #, python-format msgid "`%s' failed (%d)" msgstr "«%s» ha fallado (%d)" -#: lilypond-book.py:1556 +#: lilypond-book.py:1622 msgid "The error log is as follows:" msgstr "El registro de errores es como sigue:" -#: lilypond-book.py:1618 +#: lilypond-book.py:1684 msgid "cannot find \\begin{document} in LaTeX document" msgstr "no se encuentra \\begin{document} en el documento de LaTeX" -#: lilypond-book.py:1718 +#: lilypond-book.py:1784 msgid "Writing snippets..." msgstr "Escribiendo fragmentos..." -#: lilypond-book.py:1724 +#: lilypond-book.py:1790 msgid "Processing..." msgstr "Procesando..." -#: lilypond-book.py:1730 +#: lilypond-book.py:1796 msgid "All snippets are up to date..." msgstr "Todos los fragmentos están actualizados..." -#: lilypond-book.py:1764 +#: lilypond-book.py:1830 #, python-format msgid "cannot determine format for: %s" msgstr "no se puede determinar el formato de: %s" -#: lilypond-book.py:1775 +#: lilypond-book.py:1841 #, python-format msgid "%s is up to date." msgstr "%s está actualizado." -#: lilypond-book.py:1789 +#: lilypond-book.py:1855 #, python-format msgid "Writing `%s'..." msgstr "Escribiendo «%s»..." -#: lilypond-book.py:1847 +#: lilypond-book.py:1913 msgid "Output would overwrite input file; use --output." msgstr "La salida sobreescribiría el archivo de entrada; utilice --output." -#: lilypond-book.py:1851 +#: lilypond-book.py:1917 #, python-format msgid "Reading %s..." msgstr "Leyendo %s..." -#: lilypond-book.py:1870 +#: lilypond-book.py:1937 msgid "Dissecting..." msgstr "Diseccionando..." -#: lilypond-book.py:1886 +#: lilypond-book.py:1953 #, python-format msgid "Compiling %s..." msgstr "Compilando %s..." -#: lilypond-book.py:1895 +#: lilypond-book.py:1962 #, python-format msgid "Processing include: %s" msgstr "Procesando el archivo de inclusión: %s" -#: lilypond-book.py:1907 +#: lilypond-book.py:1974 #, python-format msgid "Removing `%s'" msgstr "Suprimiendo «%s»" -#: midi2ly.py:85 lily-library.scm:620 lily-library.scm:629 +#: midi2ly.py:84 lily-library.scm:634 lily-library.scm:643 msgid "warning: " msgstr "advertencia: " -#: midi2ly.py:88 midi2ly.py:907 +#: midi2ly.py:87 midi2ly.py:907 msgid "error: " msgstr "error: " -#: midi2ly.py:89 +#: midi2ly.py:88 msgid "Exiting... " msgstr "Saliendo... " -#: midi2ly.py:834 +#: midi2ly.py:833 #, python-format msgid "%s output to `%s'..." msgstr "salida de %s hacia «%s»..." -#: midi2ly.py:847 +#: midi2ly.py:846 #, python-format msgid "Convert %s to LilyPond input.\n" msgstr "Convertir %s a entrada de LilyPond.\n" -#: midi2ly.py:852 +#: midi2ly.py:851 msgid "print absolute pitches" msgstr "mostrar las alturas absolutas" -#: midi2ly.py:854 midi2ly.py:869 +#: midi2ly.py:853 midi2ly.py:868 msgid "DUR" msgstr "DURACIÓN" -#: midi2ly.py:855 +#: midi2ly.py:854 msgid "quantise note durations on DUR" msgstr "cuantizar las duraciones de las notas sobre DURACIÓN" -#: midi2ly.py:858 +#: midi2ly.py:857 msgid "print explicit durations" msgstr "mostrar las duraciones explícitas" -#: midi2ly.py:862 +#: midi2ly.py:861 msgid "set key: ALT=+sharps|-flats; MINOR=1" msgstr "establecer la tonalidad: ALT=+sostenidos|-bemoles; MENOR=1" -#: midi2ly.py:863 +#: midi2ly.py:862 msgid "ALT[:MINOR]" msgstr "ALT[:MENOR]" -#: midi2ly.py:868 +#: midi2ly.py:867 msgid "quantise note starts on DUR" msgstr "cuantizar los comienzos de las notras sobre DUR" -#: midi2ly.py:871 +#: midi2ly.py:870 msgid "DUR*NUM/DEN" msgstr "DURACIÓN*NUMERADOR/DENOMINADOR" -#: midi2ly.py:874 +#: midi2ly.py:873 msgid "allow tuplet durations DUR*NUM/DEN" msgstr "permitir duraciones de grupos irregulares DURACIÓN*NUMERADOR/DENOMINADOR" -#: midi2ly.py:886 +#: midi2ly.py:885 msgid "treat every text as a lyric" msgstr "tratar todos los textos como letra" -#: midi2ly.py:889 +#: midi2ly.py:888 msgid "Examples" msgstr "Ejemplos" @@ -894,96 +951,121 @@ msgstr "Ejemplos" msgid "no files specified on command line." msgstr "no se ha especificado ningún archivo en la línea de órdenes." -#: musicxml2ly.py:213 +#: musicxml2ly.py:343 msgid "Encountered file created by Dolet 3.4 for Sibelius, containing wrong beaming information. All beaming information in the MusicXML file will be ignored" msgstr "Se encontró un archivo creado mediante Dolet 3.4 para Sibelius que contiene información de barrados errónea. Toda la información de barrado en el archivo MusicXML se ignorará" -#: musicxml2ly.py:229 musicxml2ly.py:231 +#: musicxml2ly.py:346 +msgid "Encountered file created by Noteworthy Composer's nwc2xml, containing wrong beaming information. All beaming information in the MusicXML file will be ignored" +msgstr "Se encontró un archivo creado mediante Noteworthy Composer's nwc2xml que contiene información de barrados errónea. Toda la información de barrado en el archivo MusicXML se ignorará" + +#: musicxml2ly.py:362 musicxml2ly.py:364 #, python-format msgid "Unprocessed PartGroupInfo %s encountered" msgstr "Se ha encontrado el PartGroupInfo sin procesar %s" -#: musicxml2ly.py:471 +#: musicxml2ly.py:594 +#, python-format +msgid "Encountered note at %s without type and duration (=%s)" +msgstr "Se ha encontrado una nota en %s sin typo y duración (=%s)" + +#: musicxml2ly.py:613 #, python-format msgid "Encountered rational duration with denominator %s, unable to convert to lilypond duration" msgstr "Se ha encontrado una duración racional con denominador %s, no se puede convertir a duracion de lilypond" -#: musicxml2ly.py:654 +#: musicxml2ly.py:868 +msgid "Unable to extract key signature!" +msgstr "¡No se ha podido extraer la armadura de la tonalidad!" + +#: musicxml2ly.py:895 #, python-format -msgid "unknown mode %s, expecting 'major' or 'minor'" -msgstr "modo %s desconocido, se esperaba «major» or «minor»" +msgid "unknown mode %s, expecting 'major' or 'minor' or a church mode!" +msgstr "¡Modo %s desconocido, se esperaba «major», «minor» o un modo eclesiástico!" -#: musicxml2ly.py:692 +#: musicxml2ly.py:968 #, python-format msgid "Encountered unprocessed marker %s\n" msgstr "Se ha encontrado el marcador sin procesar %s\n" -#: musicxml2ly.py:786 +#: musicxml2ly.py:1062 #, python-format msgid "unknown span event %s" msgstr "evento de extensión %s desconocido" -#: musicxml2ly.py:796 +#: musicxml2ly.py:1072 #, python-format msgid "unknown span type %s for %s" msgstr "tipo de extensión %s deconocido para %s" -#: musicxml2ly.py:1222 +#: musicxml2ly.py:1498 msgid "Unknown metronome mark, ignoring" msgstr "Marca de metrónomo desconocida, se ignora" #. TODO: Implement the other (more complex) way for tempo marks! -#: musicxml2ly.py:1227 +#: musicxml2ly.py:1503 msgid "Metronome marks with complex relations ( in MusicXML) are not yet implemented." msgstr "Las marcas metronómicas con relaciones complejas ( en MusicXML) no se encuentran implementadas aún." -#: musicxml2ly.py:1383 +#: musicxml2ly.py:1703 #, python-format msgid "Unable to convert chord type %s to lilypond." msgstr "No se pudo convertir el acorde de tipo %s a lilypond." -#: musicxml2ly.py:1529 +#: musicxml2ly.py:1849 #, python-format msgid "drum %s type unknown, please add to instrument_drumtype_dict" msgstr "tipo de percusión %s desconocido, añádalo al diccionario instrument_drumtype_dict" -#: musicxml2ly.py:1533 +#: musicxml2ly.py:1853 msgid "cannot find suitable event" msgstr "no se encuentra un evento adecuado" -#: musicxml2ly.py:1623 +#: musicxml2ly.py:1994 #, python-format -msgid "Negative skip %s" -msgstr "Desplazamiento %s negativo" +msgid "Negative skip %s (from position %s to %s)" +msgstr "Desplazamiento negativo %s (desde la posición %s hasta la %s)" -#: musicxml2ly.py:1775 +#: musicxml2ly.py:2134 #, python-format msgid "Negative skip found: from %s to %s, difference is %s" msgstr "Se ha encontrado un desplazamiento negativo: desde %s hasta %s, la diferencia es %s" -#: musicxml2ly.py:1802 +#: musicxml2ly.py:2205 #, python-format msgid "unexpected %s; expected %s or %s or %s" msgstr "%s inesperado; se esperaba %s o %s o %s" -#: musicxml2ly.py:1912 -msgid "cannot have two simultaneous slurs" -msgstr "no puede haber dos ligaduras de expresión simultáneas" +#: musicxml2ly.py:2311 +msgid "Encountered closing slur, but no slur is open" +msgstr "Se ha encontrado el cierre de una ligadura de expresión, pero no hay ninguna abierta" + +#: musicxml2ly.py:2314 +msgid "Cannot have two simultaneous (closing) slurs" +msgstr "No puede haber dos ligaduras de expresión (cerrándose) simultáneas" + +#: musicxml2ly.py:2324 +msgid "Cannot have a slur inside another slur" +msgstr "No puede haber una ligadura de expresión dentro de otra" -#: musicxml2ly.py:2050 +#: musicxml2ly.py:2327 +msgid "Cannot have two simultaneous slurs" +msgstr "No puede haber dos ligaduras de expresión simultáneas" + +#: musicxml2ly.py:2455 #, python-format msgid "cannot simultaneously have more than one mode: %s" msgstr "no puede haber más de un modo al mismo tiempo: %s" -#: musicxml2ly.py:2148 +#: musicxml2ly.py:2553 msgid "Converting to LilyPond expressions..." msgstr "Conversión a expresiones de LilyPond..." -#: musicxml2ly.py:2159 +#: musicxml2ly.py:2564 msgid "musicxml2ly [OPTION]... FILE.xml" msgstr "musicxml2ly [OPCIÓN]... ARCHIVO.xml" -#: musicxml2ly.py:2161 +#: musicxml2ly.py:2566 msgid "" "Convert MusicXML from FILE.xml to LilyPond input.\n" "If the given filename is -, musicxml2ly reads from the command line.\n" @@ -991,7 +1073,7 @@ msgstr "" "Convertir MusicXML desde ARCHIVO.xml a entrada de LilyPond.\n" "SI el nombre de archivo aportado es -, musicxml2ly lee de la línea de órdenes.\n" -#: musicxml2ly.py:2171 +#: musicxml2ly.py:2576 msgid "" "Copyright (c) 2005--2008 by\n" " Han-Wen Nienhuys ,\n" @@ -1003,71 +1085,71 @@ msgstr "" " Jan Nieuwenhuizen y\n" " Reinhold Kainhofer \n" -#: musicxml2ly.py:2196 +#: musicxml2ly.py:2601 msgid "use lxml.etree; uses less memory and cpu time" msgstr "usar lxml.etree; utiliza menos memoria y tiempo de procesador" -#: musicxml2ly.py:2202 +#: musicxml2ly.py:2607 msgid "input file is a zip-compressed MusicXML file" msgstr "el archivo de entrada es un archivo MusicXML comprimido en zip" -#: musicxml2ly.py:2208 +#: musicxml2ly.py:2613 msgid "convert pitches in relative mode (default)" msgstr "convertir las notas al modo relativo (por omisión)" -#: musicxml2ly.py:2213 +#: musicxml2ly.py:2618 msgid "convert pitches in absolute mode" msgstr "convertir las notas al modo absoluto" -#: musicxml2ly.py:2216 +#: musicxml2ly.py:2621 msgid "LANG" msgstr "IDIOMA" -#: musicxml2ly.py:2218 +#: musicxml2ly.py:2623 msgid "use a different language file 'LANG.ly' and corresponding pitch names, e.g. 'deutsch' for deutsch.ly" msgstr "usar un archivo de idioma distinto 'IDIOMA.ly' y los nombres de nota correspondientes, p.ej. 'deutsch' (alemán) para deutsch.ly" -#: musicxml2ly.py:2224 +#: musicxml2ly.py:2629 msgid "do not convert directions (^, _ or -) for articulations, dynamics, etc." msgstr "no convertir las direcciones (^, _ o -) para las articulaciones, expresiones de dinámica, etc." -#: musicxml2ly.py:2230 +#: musicxml2ly.py:2635 msgid "do not convert beaming information, use lilypond's automatic beaming instead" msgstr "no convertir la información de barrado, en vez de ello utilizar el barrado automático de lilypond" -#: musicxml2ly.py:2238 +#: musicxml2ly.py:2643 msgid "set output filename to FILE, stdout if -" msgstr "establecer el nombre del archivo de salida a ARCHIVO, y a la salida estándar si es -" -#: musicxml2ly.py:2320 +#: musicxml2ly.py:2726 #, python-format msgid "unknown part in part-list: %s" msgstr "parte desconocida en la lista part-list: %s" -#: musicxml2ly.py:2382 +#: musicxml2ly.py:2788 msgid "Input is compressed, extracting raw MusicXML data from stdin" msgstr "El archivo de entrada está comprimido, extrayendo los datos de MusicXML en bruto a partir de la entrada estándar" -#: musicxml2ly.py:2385 +#: musicxml2ly.py:2791 #, python-format msgid "Input file %s is compressed, extracting raw MusicXML data" msgstr "El archivo de entrada %s está comprimido, extrayendo los datos de MusicXML en bruto" -#: musicxml2ly.py:2415 +#: musicxml2ly.py:2821 msgid "Reading MusicXML from Standard input ..." msgstr "Leyendo MusicXML desde la entrada estándar..." -#: musicxml2ly.py:2417 +#: musicxml2ly.py:2823 #, python-format msgid "Reading MusicXML from %s ..." msgstr "Leyendo MusicXML desde %s ..." -#: musicxml2ly.py:2450 +#: musicxml2ly.py:2856 #, python-format msgid "Output to `%s'" msgstr "La salida se dirige hacia `%s'" -#: musicxml2ly.py:2512 +#: musicxml2ly.py:2922 #, python-format msgid "Unable to find input file %s" msgstr "No se encuentra el archivo de entrada %s" @@ -1101,20 +1183,15 @@ msgstr "error de programación: %s" msgid "continuing, cross fingers" msgstr "continuamos; cruce los dedos" -#: accidental-engraver.cc:249 +#: accidental-engraver.cc:298 #, c-format msgid "accidental typesetting list must begin with context-name: %s" msgstr "la lista de tippografiado de alteraciones accidentales debe comenzar con context-name: %s" -#: accidental-engraver.cc:276 -#, c-format -msgid "ignoring unknown accidental rule: %s" -msgstr "se ignora la regla desconocida de alteración accidental: %s" - -#: accidental-engraver.cc:292 +#: accidental-engraver.cc:328 #, c-format -msgid "pair or context-name expected for accidental rule, found %s" -msgstr "se esperaba una pareja o un nombre de contexto para la regla de alteración accidental, se ha encontrado %s" +msgid "procedure or context-name expected for accidental rule, found %s" +msgstr "se esperaba un procedimiento o un nombre de contexto para la regla de alteración accidental, se ha encontrado %s" #: accidental.cc:187 #, c-format @@ -1335,6 +1412,26 @@ msgstr "(de)crescendo sin terminar" msgid "unterminated extender" msgstr "prolongación sin terminar" +#: font-config-scheme.cc:140 font-config.cc:57 +#, c-format +msgid "failed adding font directory: %s" +msgstr "fallo al añadir la carpeta de tipografías: %s" + +#: font-config-scheme.cc:142 font-config.cc:59 +#, c-format +msgid "adding font directory: %s" +msgstr "añadiendo carpeta de tipografías: %s" + +#: font-config-scheme.cc:156 +#, c-format +msgid "failed adding font file: %s" +msgstr "fallo al añadir el archivo de fuente tipográfica: %s" + +#: font-config-scheme.cc:158 +#, c-format +msgid "adding font file: %s" +msgstr "añadiendo archivo de fuente tipográfica: %s" + #: font-config.cc:28 msgid "Initializing FontConfig..." msgstr "Inicializando FontConfig..." @@ -1344,15 +1441,9 @@ msgstr "Inicializando FontConfig..." msgid "Rebuilding FontConfig cache %s, this may take a while..." msgstr "Reconstruyendo la caché de FontConfig %s, puede tardar un rato..." -#: font-config.cc:57 -#, c-format -msgid "failed adding font directory: %s" -msgstr "fallo al añadir la carpeta de tipografías: %s" - -#: font-config.cc:59 -#, c-format -msgid "adding font directory: %s" -msgstr "añadiendo carpeta de tipografías: %s" +#: font-config.cc:63 +msgid "Building font database." +msgstr "Construyendo la base de datos de fuentes tipográficas." #: general-scheme.cc:202 msgid "infinity or NaN encountered while converting Real number" @@ -1362,7 +1453,7 @@ msgstr "se ha encontrado infinito o NaN durante la conversión de un número Rea msgid "setting to zero" msgstr "estableciendo al valor cero" -#: general-scheme.cc:422 output-ps.scm:62 +#: general-scheme.cc:422 output-ps.scm:63 msgid "Found infinity or nan in output. Substituting 0.0" msgstr "Se ha encontrado Infinito o NaN en la salida. Se sustituye por 0.0" @@ -1522,16 +1613,16 @@ msgstr "se hace la asignación de todas formas" msgid "type check for `%s' failed; value `%s' must be of type `%s'" msgstr "ha fallado la comprobación de tipo para «%s»; el valor «%s» debe ser del tipo «%s»" -#: lily-lexer.cc:251 +#: lily-lexer.cc:252 msgid "include files are not allowed in safe mode" msgstr "no se permiten los archivos de inclusión en el modo seguro" -#: lily-lexer.cc:270 +#: lily-lexer.cc:271 #, c-format msgid "identifier name is a keyword: `%s'" msgstr "el nombre del identificativo es una palabra clave: «%s»" -#: lily-lexer.cc:285 +#: lily-lexer.cc:286 #, c-format msgid "error at EOF: %s" msgstr "error al final del archivo (EOF): %s" @@ -1556,11 +1647,11 @@ msgstr "no se encuentra el archivo de inicio: «%s»" msgid "Processing `%s'" msgstr "Procesando «%s»" -#: lily-parser.cc:99 +#: lily-parser.cc:95 msgid "Parsing..." msgstr "Analizando..." -#: lily-parser.cc:127 +#: lily-parser.cc:123 msgid "braces do not match" msgstr "las llaves no concuerdan" @@ -1573,7 +1664,7 @@ msgstr "no se encuentra la Voz «%s»" msgid "Lyric syllable does not have note. Use \\lyricsto or associatedVoice." msgstr "La sílaba de la letra no tiene nota. Utilice \\lyricsto o associatedVoice." -#: main.cc:100 +#: main.cc:97 #, c-format msgid "" "This program is free software. It is covered by the GNU General Public\n" @@ -1586,7 +1677,7 @@ msgstr "" "él bajo ciertas condiciones. Invóquelo como `%s --warranty' para obtener\n" "más información.\n" -#: main.cc:106 +#: main.cc:103 msgid "" " This program is free software; you can redistribute it and/or\n" "modify it under the terms of the GNU General Public License version 2\n" @@ -1628,11 +1719,11 @@ msgstr "" "59 Temple Place - Suite 330,\n" "Boston, MA 02111-1307, USA.\n" -#: main.cc:137 +#: main.cc:134 msgid "SYM[=VAL]" msgstr "SÍMBOLO[=VALOR]" -#: main.cc:138 +#: main.cc:135 msgid "" "set Scheme option SYM to VAL (default: #t).\n" "Use -dhelp for help." @@ -1640,49 +1731,41 @@ msgstr "" "establecer la opción de Scheme SÍMBOLO a VALOR (por omisión: #t).\n" "Use -dhelp para obtener ayuda." -#: main.cc:141 +#: main.cc:138 msgid "EXPR" msgstr "EXPRESIÓN" -#: main.cc:141 +#: main.cc:138 msgid "evaluate scheme code" msgstr "evaluar código de Scheme" #. Bug in option parser: --output =foe is taken as an abbreviation #. for --output-format. -#: main.cc:144 +#: main.cc:141 msgid "FORMATs" msgstr "FORMATOs" -#: main.cc:144 +#: main.cc:141 msgid "dump FORMAT,... Also as separate options:" msgstr "volcar FORMATO,... También como opciones separadas:" -#: main.cc:145 -msgid "generate DVI (tex backend only)" -msgstr "generar un DVI (sólo para el 'backend' tex)" - -#: main.cc:146 +#: main.cc:142 msgid "generate PDF (default)" msgstr "generar un PDF (predeterminado)" -#: main.cc:147 +#: main.cc:143 msgid "generate PNG" msgstr "generar un PNG" -#: main.cc:148 +#: main.cc:144 msgid "generate PostScript" msgstr "generar un PostScript" -#: main.cc:149 -msgid "generate TeX (tex backend only)" -msgstr "generar un TeX (sólo para el 'backend' tex)" - -#: main.cc:151 +#: main.cc:146 msgid "FIELD" msgstr "CAMPO" -#: main.cc:151 +#: main.cc:146 msgid "" "dump header field FIELD to file\n" "named BASENAME.FIELD" @@ -1690,19 +1773,19 @@ msgstr "" "volcar el campo de cabecera CAMPO a un archivo\n" "llamado NOMBRE_BASE.CAMPO" -#: main.cc:153 +#: main.cc:148 msgid "add DIR to search path" msgstr "añadir DIRECTORIO a la ruta de búsqueda" -#: main.cc:154 +#: main.cc:149 msgid "use FILE as init file" msgstr "usar ARCHIVO como archivo de inicialización" -#: main.cc:156 +#: main.cc:151 msgid "USER, GROUP, JAIL, DIR" msgstr "USUARIO, GRUPO, JAULA, DIRECTORIO" -#: main.cc:156 +#: main.cc:151 msgid "" "chroot to JAIL, become USER:GROUP\n" "and cd into DIR" @@ -1710,15 +1793,15 @@ msgstr "" "chroot a JAULA, convertirse en USUARIO:GRUPO\n" "y cd al DIRECTORIO" -#: main.cc:159 +#: main.cc:154 msgid "write output to FILE (suffix will be added)" msgstr "escribir la salida en el ARCHIVO (se añadirá el sufijo)" -#: main.cc:160 +#: main.cc:155 msgid "relocate using directory of lilypond program" msgstr "relocalizar utilizando el directorio del programa lilypond" -#: main.cc:226 +#: main.cc:221 #, c-format msgid "" "Copyright (c) %s by\n" @@ -1728,82 +1811,77 @@ msgstr "" "%s y otros." #. No version number or newline here. It confuses help2man. -#: main.cc:254 +#: main.cc:249 #, c-format msgid "Usage: %s [OPTION]... FILE..." msgstr "Uso: %s [OPCIÓN]... ARCHIVO..." -#: main.cc:256 +#: main.cc:251 #, c-format msgid "Typeset music and/or produce MIDI from FILE." msgstr "Componer tipográficamente la música y/o producir MIDI a partir de ARCHIVO." -#: main.cc:258 +#: main.cc:253 #, c-format msgid "LilyPond produces beautiful music notation." msgstr "LilyPond produce una notación musical bella y hermosa." -#: main.cc:260 +#: main.cc:255 #, c-format msgid "For more information, see %s" msgstr "Para ver más información, consulte %s" -#: main.cc:262 +#: main.cc:257 #, c-format msgid "Options:" msgstr "Opciones:" -#: main.cc:266 -#, c-format -msgid "Report bugs via %s" -msgstr "Informe de los fallos a %s" - -#: main.cc:312 +#: main.cc:311 #, c-format msgid "expected %d arguments with jail, found: %u" msgstr "se esperaban %d argumentos con la jaula, se han encontrado: %u" -#: main.cc:326 +#: main.cc:325 #, c-format msgid "no such user: %s" msgstr "no existe el usuario %s" -#: main.cc:328 +#: main.cc:327 #, c-format msgid "cannot get user id from user name: %s: %s" msgstr "no se puede obtener el identificador de usuario a partir del nombre: %s: %s" -#: main.cc:343 +#: main.cc:342 #, c-format msgid "no such group: %s" msgstr "no existe este grupo: %s" -#: main.cc:345 +#: main.cc:344 #, c-format msgid "cannot get group id from group name: %s: %s" msgstr "no se puede obtener el id de grupo a partir del nombre: %s: %s" -#: main.cc:353 +#: main.cc:352 #, c-format msgid "cannot chroot to: %s: %s" msgstr "no se puede hacer chroot a: %s: %s" -#: main.cc:360 +#: main.cc:359 #, c-format msgid "cannot change group id to: %d: %s" msgstr "no se puede cambiar el grupo del usuario a %d: %s" -#: main.cc:366 +#: main.cc:365 #, c-format msgid "cannot change user id to: %d: %s" msgstr "no se puede cambiar el identificador de usuario a %d: %s" -#: main.cc:372 +#: main.cc:371 #, c-format msgid "cannot change working directory to: %s: %s" msgstr "no se puede cambiar el directorio de trabajo a: %s: %s" -#: main.cc:619 +#: main.cc:611 #, c-format msgid "exception caught: %s" msgstr "se ha capturado una excepción: %s" @@ -1888,8 +1966,12 @@ msgstr "no se puede abrir el archivo en modo de escritura: %s: %s" msgid "cannot write to file: `%s'" msgstr "no se puede escribir el archivo: «%s»" -#: minimal-page-breaking.cc:42 -msgid "Computing page breaks..." +#: minimal-page-breaking.cc:38 paper-score.cc:105 +msgid "Calculating line breaks..." +msgstr "Calculando los saltos de línea..." + +#: minimal-page-breaking.cc:42 layout-page-layout.scm:463 +msgid "Calculating page breaks..." msgstr "Calculando saltos de página..." #: music-iterator.cc:171 @@ -1906,7 +1988,7 @@ msgstr "fallo en la comprobación de octava; se esperaba \"%s\", se ha encontrad msgid "transposition by %s makes alteration larger than double" msgstr "la transposición de %s transforma la alteración en más que doble" -#: new-dynamic-engraver.cc:128 +#: new-dynamic-engraver.cc:129 #, c-format msgid "" "unknown crescendo style: %s\n" @@ -1984,21 +2066,21 @@ msgstr "error en FT_Get_Glyph_Name (): %s" msgid "Finding the ideal number of pages..." msgstr "Buscando el número de páginas ideal..." -#: optimal-page-breaking.cc:76 +#: optimal-page-breaking.cc:78 msgid "Fitting music on 1 page..." msgstr "Disponiendo la música en una página..." -#: optimal-page-breaking.cc:78 +#: optimal-page-breaking.cc:80 #, c-format msgid "Fitting music on %d pages..." msgstr "Disponiendo la música en %d páginas..." -#: optimal-page-breaking.cc:80 +#: optimal-page-breaking.cc:82 #, c-format msgid "Fitting music on %d or %d pages..." msgstr "Disponiendo la música en %d o %d páginas..." -#: optimal-page-breaking.cc:157 page-turn-page-breaking.cc:226 +#: optimal-page-breaking.cc:159 page-turn-page-breaking.cc:226 #: paper-score.cc:146 msgid "Drawing systems..." msgstr "Dibujando los sistemas..." @@ -2069,10 +2151,6 @@ msgstr "el salto forzado ha sido sobreestablecido por algún otro evento, ¿quiz msgid "Layout output to `%s'..." msgstr "Salida de la página hacia «%s»..." -#: paper-score.cc:105 -msgid "Calculating line breaks..." -msgstr "Calculando los saltos de línea..." - #: paper-score.cc:118 #, c-format msgid "Element count %d (spanners %d) " @@ -2086,7 +2164,7 @@ msgstr "Preprocesando los objetos gráficos..." msgid "GUILE signaled an error for the expression beginning here" msgstr "GUILE ha señalado un error para la expresión que comienza aquí" -#: percent-repeat-engraver.cc:200 +#: percent-repeat-engraver.cc:202 msgid "unterminated percent repeat" msgstr "repetición de porcentaje sin terminar" @@ -2102,12 +2180,12 @@ msgstr "ha dado la vuelta el número de canal MIDI" msgid "remapping modulo 16" msgstr "se reasigna módulo 16" -#: performance.cc:101 +#: performance.cc:100 #, c-format msgid "MIDI output to `%s'..." msgstr "Salida MIDI hacia «%s»..." -#: phrasing-slur-engraver.cc:139 +#: phrasing-slur-engraver.cc:146 msgid "unterminated phrasing slur" msgstr "ligadura de fraseo sin terminar" @@ -2274,7 +2352,7 @@ msgstr "ligadura de expresión sin terminar" msgid "cannot end slur" msgstr "no se puede terminar la ligadura de expresión" -#: slur.cc:357 +#: slur.cc:359 #, c-format msgid "Ignoring grob for slur: %s. avoid-slur not set?" msgstr "Se ignora el objeto gráfico para la ligadura: %s. ¿No está establecido avoid-slur?" @@ -2311,12 +2389,12 @@ msgstr "quizá la entrada debiera especificar voces polifónicas" msgid "weird stem size, check for narrow beams" msgstr "tamaño de plica extraño, compruebe que no haya barras estrechas" -#: stem.cc:627 +#: stem.cc:623 #, c-format msgid "flag `%s' not found" msgstr "no se encuentra el indicador «%s»" -#: stem.cc:638 +#: stem.cc:639 #, c-format msgid "flag stroke `%s' not found" msgstr "no se encuentra el impacto «%s» de indicador" @@ -2441,40 +2519,40 @@ msgstr "ya hay un trazador finalizado" msgid "giving up" msgstr "abandonando" -#: parser.yy:729 +#: parser.yy:804 msgid "\\paper cannot be used in \\score, use \\layout instead" msgstr "no se puede usar \\paper dentro de \\score, utilice \\layout en su lugar" -#: parser.yy:753 +#: parser.yy:828 msgid "need \\paper for paper block" msgstr "es necesario \\paper para el bloque 'paper'" -#: parser.yy:1224 +#: parser.yy:1299 msgid "Grob name should be alphanumeric" msgstr "El nombre del objeto gráfico ha de ser alfanumérico" -#: parser.yy:1522 +#: parser.yy:1597 msgid "second argument must be pitch list" msgstr "el segundo argumento debe ser una lista de notas" -#: parser.yy:1549 parser.yy:1554 parser.yy:2026 +#: parser.yy:1624 parser.yy:1629 parser.yy:2101 msgid "have to be in Lyric mode for lyrics" msgstr "para la letra se debe estar en el modo Lyric" -#: parser.yy:1651 +#: parser.yy:1726 msgid "expecting string as script definition" msgstr "se espera una cadena como definición del guión" -#: parser.yy:1806 parser.yy:1856 +#: parser.yy:1881 parser.yy:1931 #, c-format msgid "not a duration: %d" msgstr "no es una duración: %d" -#: parser.yy:1980 +#: parser.yy:2055 msgid "have to be in Note mode for notes" msgstr "para las notas se debe estar en el modo Note" -#: parser.yy:2041 +#: parser.yy:2116 msgid "have to be in Chord mode for chords" msgstr "para los acordes se debe estar en el modo Chord" @@ -2535,26 +2613,26 @@ msgstr "Se ha encontrado una llave al final del marcado, ¿Olvidó un espacio?" msgid "invalid character: `%c'" msgstr "carácter no válido: «%c»" -#: lexer.ll:803 lexer.ll:804 +#: lexer.ll:803 #, c-format msgid "unknown escaped string: `\\%s'" msgstr "cadena de escape desconocida: `\\%s'" -#: lexer.ll:910 lexer.ll:911 +#: lexer.ll:910 #, c-format msgid "file too old: %s (oldest supported: %s)" msgstr "archivo demasiado antiguo: %s (el más antiguo que se puede tratar es: %s)" -#: lexer.ll:911 lexer.ll:912 +#: lexer.ll:911 msgid "consider updating the input with the convert-ly script" msgstr "considere la actualización de la entrada mediante el guión (script) convert-ly" -#: lexer.ll:917 lexer.ll:918 +#: lexer.ll:917 #, c-format msgid "program too old: %s (file requires: %s)" msgstr "el programa es demasiado antiguo: %s (el archivo necesita: %s)" -#: backend-library.scm:19 lily.scm:777 ps-to-png.scm:58 +#: backend-library.scm:19 lily.scm:761 ps-to-png.scm:58 #, scheme-format msgid "Invoking `~a'..." msgstr "Invocando «~a»..." @@ -2564,7 +2642,7 @@ msgstr "Invocando «~a»..." msgid "`~a' failed (~a)" msgstr "«~a» ha fallado (~a)" -#: backend-library.scm:116 framework-tex.scm:344 framework-tex.scm:369 +#: backend-library.scm:116 #, scheme-format msgid "Converting to `~a'..." msgstr "Convirtiendo en «~a»..." @@ -2598,16 +2676,16 @@ msgstr "parece que la clase de evento ~A está sin usar" msgid "translator listens to nonexisting event class ~A" msgstr "el traductor está escuchando a una clase de evento ~A que no existe" -#: define-markup-commands.scm:599 +#: define-markup-commands.scm:569 msgid "no systems found in \\score markup, does it have a \\layout block?" msgstr "no se ha encontrado ningún sistema en el marcado \\score, ¿tiene un bloque \\layout?" -#: define-markup-commands.scm:2428 +#: define-markup-commands.scm:2387 #, scheme-format msgid "Cannot find glyph ~a" msgstr "No se encuentra el glifo ~a" -#: define-markup-commands.scm:2737 +#: define-markup-commands.scm:2696 #, scheme-format msgid "not a valid duration string: ~a" msgstr "no es una cadena válida de duración: ~a" @@ -2628,8 +2706,8 @@ msgid "unknown repeat type `~S'" msgstr "tipo de repetición «~S» desconocido" #: define-music-types.scm:693 -msgid "See music-types.scm for supported repeats" -msgstr "Consulte el archivo music-types.scm para ver los tipos de repetición soportados" +msgid "See define-music-types.scm for supported repeats" +msgstr "Consulte el archivo define-music-types.scm para ver los tipos de repetición soportados" #: document-backend.scm:99 #, scheme-format @@ -2646,57 +2724,57 @@ msgstr "no se encuentra un interface para la propiedad ~S" msgid "unknown Grob interface: ~S" msgstr "interfaz de Objeto gráfico desconocido: ~S" -#: documentation-lib.scm:48 +#: documentation-lib.scm:49 #, scheme-format msgid "Processing ~S..." msgstr "Procesando ~S..." -#: documentation-lib.scm:164 +#: documentation-lib.scm:165 #, scheme-format msgid "Writing ~S..." msgstr "Escribiendo ~S..." -#: documentation-lib.scm:186 +#: documentation-lib.scm:187 #, scheme-format msgid "cannot find description for property ~S (~S)" msgstr "no se encuentra la descripción de la propiedad ~S (~S)" +#: flag-styles.scm:145 +#, scheme-format +msgid "flag stroke `~a' or `~a' not found" +msgstr "no se encuentra el impacto `~a' o `~a' de indicador" + #: framework-eps.scm:90 #, scheme-format msgid "Writing ~a..." msgstr "Escribiendo «~a»..." -#: framework-ps.scm:282 +#: framework-ps.scm:277 #, scheme-format msgid "cannot embed ~S=~S" msgstr "no se puede empotrar ~S=~S" -#: framework-ps.scm:335 +#: framework-ps.scm:330 #, scheme-format msgid "cannot extract file matching ~a from ~a" msgstr "no se puede extraer la coincidencia de archivos ~a a partir de ~a" -#: framework-ps.scm:352 +#: framework-ps.scm:347 #, scheme-format msgid "do not know how to embed ~S=~S" msgstr "no sabemos cómo empotrar ~S=~S" -#: framework-ps.scm:383 +#: framework-ps.scm:378 #, scheme-format msgid "do not know how to embed font ~s ~s ~s" msgstr "no sabemos cómo empotrar la tipografía ~s ~s ~s" -#: framework-ps.scm:753 +#: framework-ps.scm:748 #, scheme-format msgid "cannot convert to ~S" msgstr "no se puede convertir a ~S" -#: framework-ps.scm:772 framework-ps.scm:775 -#, scheme-format -msgid "cannot generate ~S using the postscript back-end" -msgstr "no se puede generar ~S usando el 'back-end' de postscript" - -#: framework-ps.scm:782 +#: framework-ps.scm:771 msgid "" "\n" "The PostScript backend does not support the system-by-system \n" @@ -2724,11 +2802,6 @@ msgstr "" " %% Start cut-&-pastable-section\n" " %% ****************************************************************\n" -#: framework-tex.scm:361 -#, scheme-format -msgid "TeX file name must not contain whitespace: `~a'" -msgstr "El nombre del archivo de TeX no debe contener espacios: «~a»" - #: graphviz.scm:53 #, scheme-format msgid "Writing graph `~a'..." @@ -2744,44 +2817,40 @@ msgstr "Error en la cuantización de la barra. Se esperaba (~S,~S), se ha encon msgid "Error in beam quanting. Expected ~S 0, found ~S." msgstr "Error en la cuantización de la barra. Se esperaba ~S 0, se ha encontrado ~S." -#: layout-page-layout.scm:124 +#: layout-page-layout.scm:126 msgid "Can't fit systems on page -- ignoring between-system-padding" msgstr "No se pueden dar cabida a todos los sistemas en la página; se ignora between-system-padding" -#: layout-page-layout.scm:458 -msgid "Calculating page breaks..." -msgstr "Calculando saltos de página..." - -#: lily-library.scm:588 +#: lily-library.scm:602 #, scheme-format msgid "unknown unit: ~S" msgstr "unidad desconocida: ~S " -#: lily-library.scm:622 +#: lily-library.scm:636 #, scheme-format msgid "no \\version statement found, please add~afor future compatibility" msgstr "no se ha encontrado ninguna instrucción \\version, escriba~apara disponer de compatibilidad en el futuro" -#: lily-library.scm:630 +#: lily-library.scm:644 msgid "old relative compatibility not used" msgstr "no se ha usado la compatibilidad con el modo relativo antiguo" -#: lily.scm:178 +#: lily.scm:179 #, scheme-format msgid "cannot find: ~A" msgstr "no se encuentra: ~A" -#: lily.scm:243 +#: lily.scm:228 #, scheme-format msgid "wrong type for argument ~a. Expecting ~a, found ~s" msgstr "tipo equivocado para el argumento ~a. Se esperaba ~a, se encontró ~s" -#: lily.scm:641 +#: lily.scm:625 #, scheme-format msgid "job ~a terminated with signal: ~a" msgstr "la tarea ~a ha terminado con la señal: ~a" -#: lily.scm:644 +#: lily.scm:628 #, scheme-format msgid "" "logfile ~a (exit ~a):\n" @@ -2790,12 +2859,12 @@ msgstr "" "archivo de registro ~a (salida ~a):\n" "~a" -#: lily.scm:669 lily.scm:767 +#: lily.scm:653 lily.scm:751 #, scheme-format msgid "failed files: ~S" msgstr "archivos que han fallado: ~S" -#: lily.scm:757 +#: lily.scm:741 #, scheme-format msgid "Redirecting output to ~a..." msgstr "Redirigiendo la salida hacia ~a..." @@ -2804,7 +2873,7 @@ msgstr "Redirigiendo la salida hacia ~a..." msgid "Music head function must return Music object" msgstr "La función principal de música debe devolver un objeto musical" -#: ly-syntax-constructors.scm:150 +#: ly-syntax-constructors.scm:154 #, scheme-format msgid "Invalid property operation ~a" msgstr "Operación de propiedad ~a inválida" @@ -2854,12 +2923,12 @@ msgstr "Ha fallado la comprobación de compás. Se esperaba que estuviera en ~a msgid "cannot find quoted music: `~S'" msgstr "no se encuentra la música citada: «~S»" -#: music-functions.scm:990 +#: music-functions.scm:1198 #, scheme-format msgid "unknown accidental style: ~S" msgstr "estilo de alteración ~S desconocido" -#: output-ps.scm:285 +#: output-ps.scm:294 msgid "utf-8-string encountered in PS backend" msgstr "se ha encontrado una cadena UTF-8 en el 'backend' de PostScript" @@ -2873,28 +2942,23 @@ msgstr "no definido: ~S" msgid "cannot decypher Pango description: ~a" msgstr "no se puede descifrar la descripción de Pango: ~a" -#: output-tex.scm:96 -#, scheme-format -msgid "cannot find ~a in ~a" -msgstr "no se encuentra ~a dentro de ~a" - -#: paper.scm:86 +#: paper.scm:104 msgid "set-global-staff-size: not in toplevel scope" msgstr "set-global-staff-size: no está en el ámbito de nivel más alto" -#: paper.scm:226 +#: paper.scm:244 #, scheme-format msgid "This is not a \\layout {} object, ~S" msgstr "Esto no es un objeto de \\layout {} , ~S" -#: paper.scm:238 +#: paper.scm:256 #, scheme-format -msgid "Unknown papersize: ~a" +msgid "Unknown paper size: ~a" msgstr "Tamaño de papel desconocido: ~a" #. TODO: should raise (generic) exception with throw, and catch #. that in parse-scm.cc -#: paper.scm:253 +#: paper.scm:271 msgid "Must use #(set-paper-size .. ) within \\paper { ... }" msgstr "Debe usar #(set-paper-size .. ) dentro de \\paper { ... }" diff --git a/po/fr.po b/po/fr.po index 5611043748..c433d5736e 100644 --- a/po/fr.po +++ b/po/fr.po @@ -3,14 +3,14 @@ # French translation of GNU/lilypond - http//lilypond.org # Copyright © 2004 Free Software Foundation, Inc. # Michel Robitaille , 1996-2007. -# Jean-Charles Malahieude , 2008 +# Jean-Charles Malahieude , 2008 # msgid "" msgstr "" -"Project-Id-Version: lilypond 2.11.57\n" +"Project-Id-Version: lilypond 2.12.0\n" "Report-Msgid-Bugs-To: http://post.gmane.org/post.php?group=gmane.comp.gnu.lilypond.bugs\n" -"POT-Creation-Date: 2008-08-23 18:49+0200\n" -"PO-Revision-Date: 2008-08-31 23:33+0200\n" +"POT-Creation-Date: 2008-12-20 11:58+0100\n" +"PO-Revision-Date: 2008-12-30 18:50+0100\n" "Last-Translator: Jean-Charles Malahieude \n" "Language-Team: French \n" "MIME-Version: 1.0\n" @@ -34,7 +34,7 @@ msgstr "" msgid "%s has been replaced by %s" msgstr "%s a été remplacé par %s" -#: convertrules.py:24 musicexp.py:16 convert-ly.py:48 lilypond-book.py:82 +#: convertrules.py:24 musicexp.py:16 convert-ly.py:50 lilypond-book.py:94 #: warn.cc:48 input.cc:90 #, c-format, python-format msgid "warning: %s" @@ -431,6 +431,22 @@ msgstr "Axe et direction doivent précéder les étiquettes :\n" msgid "\\put-adjacent axis dir markup markup." msgstr "\\put-adjacent axe direction étiquette étiquette." +#: convertrules.py:2832 +msgid "re-definition of InnerStaffGroup.\n" +msgstr "redéfinition de InnerStaffGroup.\n" + +#: convertrules.py:2838 +msgid "re-definition of InnerChoirStaff.\n" +msgstr "redéfinition de InnerChoirStaff.\n" + +#: convertrules.py:2851 +msgid "stringTuning must be added to addChordShape call.\n" +msgstr "stringTuning est requis lors de l'appel à addChordShape. \n" + +#: convertrules.py:2857 +msgid "stringTuning must be added to chord-shape call.\n" +msgstr "stringTuning est requis lors de l'appel à chord-shape.\n" + #: fontextract.py:25 #, python-format msgid "Scanning %s" @@ -446,56 +462,90 @@ msgstr "Extraction de %s" msgid "Writing fonts to %s" msgstr "Écriture des fontes vers %s" -#: lilylib.py:101 lilylib.py:152 +#: lilylib.py:91 lilylib.py:142 #, python-format msgid "Invoking `%s'" msgstr "Appel de « %s »" -#: lilylib.py:103 lilylib.py:154 +#: lilylib.py:93 lilylib.py:144 #, python-format msgid "Running %s..." msgstr "Exécution de %s..." -#: lilylib.py:219 +#: lilylib.py:209 #, python-format msgid "Usage: %s" msgstr "Utilisation : %s" -#: musicexp.py:585 +#: musicexp.py:215 musicexp.py:220 +msgid "Language does not support microtones contained in the piece" +msgstr "Le langage ne prend pas en charge les microintervalles de ce morceau" + +#: musicexp.py:482 +msgid "Tuplet brackets of curved shape are not correctly implemented" +msgstr "La courbure des crochets de nolet n'est pas implémentée de manière optimale" + +#. TODO: Implement this using actual_type and normal_type! +#: musicexp.py:511 +msgid "Tuplet brackets displaying both note durations are not implemented, using default" +msgstr "Les crochets de nolet indiquant le deux valeurs rythmiques ne sont pas implémentés ; utilisation du style par défaut" + +#: musicexp.py:656 #, python-format msgid "unable to set the music %(music)s for the repeat %(repeat)s" msgstr "impossible d'affecter le fragment %(music)s à la répétition %(repeat)s" -#: musicexp.py:594 +#: musicexp.py:665 msgid "encountered repeat without body" msgstr "réprise vide détectée" -#: musicxml.py:13 convert-ly.py:51 lilypond-book.py:85 warn.cc:54 input.cc:96 +#. no self.elements! +#: musicexp.py:835 +#, python-format +msgid "Grace note with no following music: %s" +msgstr "Apoggiature non suivie de musique :%s" + +#: musicexp.py:997 +#, python-format +msgid "Invalid octave shift size found: %s. Using no shift." +msgstr "Décalage d'octave invalide : %s. Décalage non appliqué." + +#: musicexp.py:1455 +#, python-format +msgid "Unable to convert alteration %s to a lilypond expression" +msgstr "Impossible de convertir l'altération %s en expression LilyPond" + +#: musicxml.py:13 convert-ly.py:53 lilypond-book.py:97 warn.cc:54 input.cc:96 #: input.cc:104 #, c-format, python-format msgid "error: %s" msgstr "Erreur : %s" -#: musicxml.py:298 -msgid "requested time signature, but time sig is unknown" -msgstr "Une métrique est obligatoire, mais la définition trouvée est inconnue" +#. TODO: Handle pieces without a time signature! +#: musicxml.py:357 +msgid "Senza-misura time signatures are not yet supported!" +msgstr "Les métriques « senza-misura » ne sont pas prises en charge." + +#: musicxml.py:375 +msgid "Unable to interpret time signature! Falling back to 4/4." +msgstr "Métrique non interprétable ; retour au 4/4." -#: musicxml.py:354 +#: musicxml.py:431 #, python-format -msgid "Encountered note at %s with %s duration (no element):" -msgstr "Une note se trouve en %s, avec une durée de %s (élément sans ) :" +msgid "Key alteration octave given for a non-existing alteration nr. %s, available numbers: %s!" +msgstr "" -#: musicxml.py:388 +#: musicxml.py:519 #, python-format msgid "Unable to find instrument for ID=%s\n" msgstr "Aucun instrument ne correspond à l'ID=%s\n" -#: abc2ly.py:1342 convert-ly.py:72 lilypond-book.py:109 midi2ly.py:846 +#: abc2ly.py:1341 convert-ly.py:74 lilypond-book.py:121 midi2ly.py:845 #, python-format msgid "%s [OPTION]... FILE" msgstr "%s [OPTIONS]... FICHIER" -#: abc2ly.py:1343 +#: abc2ly.py:1342 #, python-format msgid "" "abc2ly converts ABC music files (see\n" @@ -504,34 +554,41 @@ msgstr "" "abc2ly convertit les fichiers musicaux ABC (voir\n" "%s) au format LilyPond.\n" -#: abc2ly.py:1351 convert-ly.py:79 etf2ly.py:1190 lilypond-book.py:195 -#: midi2ly.py:882 musicxml2ly.py:2185 main.cc:161 +#: abc2ly.py:1350 convert-ly.py:81 etf2ly.py:1190 lilypond-book.py:207 +#: midi2ly.py:881 musicxml2ly.py:2590 main.cc:156 msgid "show version number and exit" msgstr "afficher le numéro de version et quitter" -#: abc2ly.py:1355 convert-ly.py:83 etf2ly.py:1186 lilypond-book.py:126 -#: midi2ly.py:861 musicxml2ly.py:2167 main.cc:150 +#: abc2ly.py:1354 convert-ly.py:85 etf2ly.py:1186 lilypond-book.py:138 +#: midi2ly.py:860 musicxml2ly.py:2572 main.cc:145 msgid "show this help and exit" msgstr "visualiser cette aide et quitter" -#: abc2ly.py:1357 etf2ly.py:1191 midi2ly.py:865 +#: abc2ly.py:1356 etf2ly.py:1191 midi2ly.py:864 msgid "write output to FILE" msgstr "produire la sortie dans le FICHIER" -#: abc2ly.py:1359 +#: abc2ly.py:1358 msgid "be strict about success" msgstr "être strict sur la réussite" -#: abc2ly.py:1361 +#: abc2ly.py:1360 msgid "preserve ABC's notion of beams" msgstr "préserver la notion de lien de croches propre à ABC" -#: abc2ly.py:1363 convert-ly.py:120 etf2ly.py:1199 lilypond-book.py:202 -#: midi2ly.py:894 musicxml2ly.py:2240 -msgid "Report bugs via" -msgstr "Rapporter toute anomalie à" +#. Translators, please translate this string as +#. "Report bugs in English via %s", +#. or if there is a LilyPond users list or forum in your language +#. "Report bugs in English via %s or in YOUR_LANG via URI" +#: abc2ly.py:1363 convert-ly.py:123 etf2ly.py:1200 lilypond-book.py:214 +#: midi2ly.py:894 musicxml2ly.py:2646 main.cc:265 +#, c-format, python-format +msgid "Report bugs via %s" +msgstr "" +"Signaler toute anomalie à \n" +"%s" -#: convert-ly.py:31 +#: convert-ly.py:33 msgid "" "Update LilyPond input to newer version. By default, update from the\n" "version taken from the \\version command, to the current LilyPond version." @@ -540,72 +597,72 @@ msgstr "" "Par défaut, de la version indiquée par la commande \\version \n" "vers la version courante de LilyPond." -#: convert-ly.py:33 lilypond-book.py:59 +#: convert-ly.py:35 lilypond-book.py:71 msgid "Examples:" msgstr "Exemples :" -#: convert-ly.py:67 etf2ly.py:1173 lilypond-book.py:105 midi2ly.py:77 +#: convert-ly.py:69 etf2ly.py:1173 lilypond-book.py:117 midi2ly.py:76 msgid "Distributed under terms of the GNU General Public License." msgstr "Distribué selon les termes de la GNU General Public License." -#: convert-ly.py:68 etf2ly.py:1174 lilypond-book.py:106 midi2ly.py:78 +#: convert-ly.py:70 etf2ly.py:1174 lilypond-book.py:118 midi2ly.py:77 msgid "It comes with NO WARRANTY." msgstr "Le logiciel est distribué SANS GARANTIE." -#: convert-ly.py:87 convert-ly.py:114 +#: convert-ly.py:89 convert-ly.py:116 msgid "VERSION" msgstr "VERSION" -#: convert-ly.py:89 +#: convert-ly.py:91 msgid "start from VERSION [default: \\version found in file]" msgstr "partir de la VERSION [par défaut : \\version trouvée dans le fichier]" -#: convert-ly.py:92 +#: convert-ly.py:94 msgid "edit in place" msgstr "éditer le fichier d'origine" -#: convert-ly.py:96 +#: convert-ly.py:98 msgid "do not add \\version command if missing" msgstr "ne pas ajouter la commande \\version si elle est absente" -#: convert-ly.py:102 +#: convert-ly.py:104 #, python-format msgid "force updating \\version number to %s" msgstr "forcer la mise à jour de \\version à %s" -#: convert-ly.py:108 +#: convert-ly.py:110 #, python-format msgid "show rules [default: -f 0, -t %s]" msgstr "afficher les règles [par défaut : -f 0, -t %s]" -#: convert-ly.py:113 +#: convert-ly.py:115 #, python-format msgid "convert to VERSION [default: %s]" msgstr "convertir jusqu'à la VERSION [par défaut : %s]" -#: convert-ly.py:160 +#: convert-ly.py:163 msgid "Applying conversion: " msgstr "Conversion en cours : " -#: convert-ly.py:173 +#: convert-ly.py:176 msgid "Error while converting" msgstr "Erreur lors de la conversion" -#: convert-ly.py:175 -msgid "Stopping at last succesful rule" -msgstr "Arrêt après la dernière règle appliquée avec succès" +#: convert-ly.py:178 +msgid "Stopping at last successful rule" +msgstr "Arrêt à la dernière règle appliquée avec succès" -#: convert-ly.py:196 +#: convert-ly.py:199 #, python-format msgid "Processing `%s'... " msgstr "Traitement de « %s »..." -#: convert-ly.py:286 relocate.cc:362 source-file.cc:59 +#: convert-ly.py:289 relocate.cc:362 source-file.cc:59 #, c-format, python-format msgid "cannot open file: `%s'" msgstr "Impossible d'ouvrir le fichier : « %s »" -#: convert-ly.py:293 +#: convert-ly.py:296 #, python-format msgid "cannot determine version for `%s'. Skipping" msgstr "impossible de déterminer la version de « %s ». Au suivant !" @@ -624,281 +681,281 @@ msgstr "" "etf2ly convertit partiellement un fichier ETF en un fichier LilyPond \n" "exploitable.\n" -#: etf2ly.py:1192 midi2ly.py:866 musicxml2ly.py:2233 main.cc:154 main.cc:159 +#: etf2ly.py:1192 midi2ly.py:865 musicxml2ly.py:2638 main.cc:149 main.cc:154 msgid "FILE" msgstr "FICHIER" -#: etf2ly.py:1194 lilypond-book.py:198 midi2ly.py:883 main.cc:163 +#: etf2ly.py:1194 lilypond-book.py:210 midi2ly.py:882 main.cc:158 msgid "show warranty and copyright" msgstr "afficher les notices de garantie et du droit d'auteur" -#: lilypond-book.py:57 +#: lilypond-book.py:69 msgid "Process LilyPond snippets in hybrid HTML, LaTeX, texinfo or DocBook document." msgstr "" "Traiter les extraits LilyPond dans un document HTML hybride, LaTeX, \n" "texinfo ou Docbook." -#: lilypond-book.py:64 +#: lilypond-book.py:76 msgid "BOOK" msgstr "LIVRE" -#: lilypond-book.py:72 +#: lilypond-book.py:84 #, python-format msgid "Exiting (%d)..." msgstr "Fin d'exécution (%d)..." -#: lilypond-book.py:103 +#: lilypond-book.py:115 #, python-format msgid "Copyright (c) %s by" msgstr "Copyright (c) %s détenu par" -#: lilypond-book.py:113 +#: lilypond-book.py:125 msgid "FILTER" msgstr "FILTRE" -#: lilypond-book.py:116 +#: lilypond-book.py:128 msgid "pipe snippets through FILTER [default: `convert-ly -n -']" msgstr "passer les extraits à travers le FILTRE [par défaut : `convert-ly -n -']" -#: lilypond-book.py:120 +#: lilypond-book.py:132 msgid "use output format FORMAT (texi [default], texi-html, latex, html, docbook)" msgstr "" "utiliser le format de sortie FORMAT (texi (par défaut), texi-html, latex, \n" "html, docbook)" -#: lilypond-book.py:121 +#: lilypond-book.py:133 msgid "FORMAT" msgstr "FORMAT" -#: lilypond-book.py:128 +#: lilypond-book.py:140 msgid "add DIR to include path" msgstr "ajouter le RÉPERTOIRE au chemin de recherche des inclusions" -#: lilypond-book.py:129 lilypond-book.py:136 lilypond-book.py:154 -#: lilypond-book.py:160 lilypond-book.py:166 lilypond-book.py:172 main.cc:153 +#: lilypond-book.py:141 lilypond-book.py:148 lilypond-book.py:166 +#: lilypond-book.py:172 lilypond-book.py:178 lilypond-book.py:184 main.cc:148 msgid "DIR" msgstr "RÉP" -#: lilypond-book.py:134 +#: lilypond-book.py:146 msgid "format Texinfo output so that Info will look for images of music in DIR" msgstr "formater la sortie Texinfo pour qu'Info cherche les images dans RÉP" -#: lilypond-book.py:141 +#: lilypond-book.py:153 msgid "run executable PROG instead of latex" msgstr "lancer l'exécutable PROG plutôt que latex" -#: lilypond-book.py:142 +#: lilypond-book.py:154 msgid "PROG" msgstr "PROG" -#: lilypond-book.py:147 +#: lilypond-book.py:159 msgid "PAD" msgstr "PAD" -#: lilypond-book.py:149 +#: lilypond-book.py:161 msgid "pad left side of music to align music inspite of uneven bar numbers (in mm)" msgstr "" "Tasser la musique par la gauche pour la répartir en dépit du nombre irrégulier \n" "de mesures (en mm)" -#: lilypond-book.py:153 +#: lilypond-book.py:165 msgid "write output to DIR" msgstr "produire la sortie dans le RÉPERTOIRE" -#: lilypond-book.py:159 +#: lilypond-book.py:171 msgid "do not fail if no lilypond output is found" msgstr "poursuivre même s'il n'y a pas de sortie lilypond" -#: lilypond-book.py:165 +#: lilypond-book.py:177 msgid "do not fail if no PNG images are found for EPS files" msgstr "poursuivre même s'il n'y a pas d'image PNG pour les fichiers EPS" -#: lilypond-book.py:171 +#: lilypond-book.py:183 msgid "write lily-XXX files to DIR, link into --output dir" msgstr "écrire les fichiers lily-XXX dans RÉP, et lier à --output rép" -#: lilypond-book.py:176 +#: lilypond-book.py:188 msgid "COMMAND" msgstr "COMMANDE" -#: lilypond-book.py:177 +#: lilypond-book.py:189 msgid "process ly_files using COMMAND FILE..." msgstr "Traîter ly_files en utilisant COMMANDE FICHIER..." -#: lilypond-book.py:184 +#: lilypond-book.py:196 msgid "create PDF files for use with PDFTeX" msgstr "Créer des fichiers PDF pour utilisation par PDFTeX" -#: lilypond-book.py:187 midi2ly.py:876 musicxml2ly.py:2190 main.cc:162 +#: lilypond-book.py:199 midi2ly.py:875 musicxml2ly.py:2595 main.cc:157 msgid "be verbose" msgstr "Passer en mode verbeux" -#: lilypond-book.py:825 +#: lilypond-book.py:871 #, python-format msgid "file not found: %s" msgstr "fichier non trouvé : %s" -#: lilypond-book.py:1087 +#: lilypond-book.py:1142 #, python-format msgid "deprecated ly-option used: %s=%s" msgstr "option ly-option obsolète : %s=%s" -#: lilypond-book.py:1089 +#: lilypond-book.py:1144 #, python-format msgid "compatibility mode translation: %s=%s" msgstr "bascule en mode de compatibilité : %s=%s" -#: lilypond-book.py:1092 +#: lilypond-book.py:1147 #, python-format msgid "deprecated ly-option used: %s" msgstr "option ly-option obsolète : %s" -#: lilypond-book.py:1094 +#: lilypond-book.py:1149 #, python-format msgid "compatibility mode translation: %s" msgstr "bascule en mode de compatibilité : %s" -#: lilypond-book.py:1112 +#: lilypond-book.py:1167 #, python-format msgid "ignoring unknown ly option: %s" msgstr "option ly inconnue et ignorée : %s" -#: lilypond-book.py:1538 +#: lilypond-book.py:1604 #, python-format msgid "Opening filter `%s'" msgstr "Ouverture du filtre « %s »" -#: lilypond-book.py:1555 +#: lilypond-book.py:1621 #, python-format msgid "`%s' failed (%d)" msgstr "« %s » a échoué (%d)" -#: lilypond-book.py:1556 +#: lilypond-book.py:1622 msgid "The error log is as follows:" msgstr "Voici le journal d'erreurs :" -#: lilypond-book.py:1618 +#: lilypond-book.py:1684 msgid "cannot find \\begin{document} in LaTeX document" msgstr "Impossible de trouver \\begin{document} dans le document LaTeX." -#: lilypond-book.py:1718 +#: lilypond-book.py:1784 msgid "Writing snippets..." msgstr "Écriture des extraits..." -#: lilypond-book.py:1724 +#: lilypond-book.py:1790 msgid "Processing..." msgstr "Traitement..." -#: lilypond-book.py:1730 +#: lilypond-book.py:1796 msgid "All snippets are up to date..." msgstr "Tous les extraits sont à jour..." -#: lilypond-book.py:1764 +#: lilypond-book.py:1830 #, python-format msgid "cannot determine format for: %s" msgstr "format indéterminé pour %s" -#: lilypond-book.py:1775 +#: lilypond-book.py:1841 #, python-format msgid "%s is up to date." msgstr "%s est à jour." -#: lilypond-book.py:1789 +#: lilypond-book.py:1855 #, python-format msgid "Writing `%s'..." msgstr "Écriture de « %s »..." -#: lilypond-book.py:1847 +#: lilypond-book.py:1913 msgid "Output would overwrite input file; use --output." msgstr "La sortie va écraser le fichier d'entrée ; utiliser --output" -#: lilypond-book.py:1851 +#: lilypond-book.py:1917 #, python-format msgid "Reading %s..." msgstr "Lecture en cours de %s..." -#: lilypond-book.py:1870 +#: lilypond-book.py:1937 msgid "Dissecting..." msgstr "Dissection en cours..." -#: lilypond-book.py:1886 +#: lilypond-book.py:1953 #, python-format msgid "Compiling %s..." msgstr "Compilation de %s..." -#: lilypond-book.py:1895 +#: lilypond-book.py:1962 #, python-format msgid "Processing include: %s" msgstr "Traitement d'inclusion : %s" -#: lilypond-book.py:1907 +#: lilypond-book.py:1974 #, python-format msgid "Removing `%s'" msgstr "Suppression de « %s »" -#: midi2ly.py:85 lily-library.scm:620 lily-library.scm:629 +#: midi2ly.py:84 lily-library.scm:634 lily-library.scm:643 msgid "warning: " msgstr "Avertissement : " -#: midi2ly.py:88 midi2ly.py:907 +#: midi2ly.py:87 midi2ly.py:907 msgid "error: " msgstr "Erreur : " -#: midi2ly.py:89 +#: midi2ly.py:88 msgid "Exiting... " msgstr "Fin d'exécution... " -#: midi2ly.py:834 +#: midi2ly.py:833 #, python-format msgid "%s output to `%s'..." msgstr "%s reproduit dans « %s »..." -#: midi2ly.py:847 +#: midi2ly.py:846 #, python-format msgid "Convert %s to LilyPond input.\n" msgstr "Convertir %s au format source LilyPond.\n" -#: midi2ly.py:852 +#: midi2ly.py:851 msgid "print absolute pitches" msgstr "afficher des tons absolus" -#: midi2ly.py:854 midi2ly.py:869 +#: midi2ly.py:853 midi2ly.py:868 msgid "DUR" msgstr "DUR" -#: midi2ly.py:855 +#: midi2ly.py:854 msgid "quantise note durations on DUR" msgstr "quantifier les durées de note d'après DUR" -#: midi2ly.py:858 +#: midi2ly.py:857 msgid "print explicit durations" msgstr "écrire des durées explicites" -#: midi2ly.py:862 +#: midi2ly.py:861 msgid "set key: ALT=+sharps|-flats; MINOR=1" msgstr "définir l'armure : ALT=+dièse|-bémol; MINEUR=1" -#: midi2ly.py:863 +#: midi2ly.py:862 msgid "ALT[:MINOR]" msgstr "ALT[:MINEUR]" -#: midi2ly.py:868 +#: midi2ly.py:867 msgid "quantise note starts on DUR" msgstr "quantifier les débuts de note sur DUR" -#: midi2ly.py:871 +#: midi2ly.py:870 msgid "DUR*NUM/DEN" msgstr "DUR*NUM/DEN" -#: midi2ly.py:874 +#: midi2ly.py:873 msgid "allow tuplet durations DUR*NUM/DEN" msgstr "permettre des n-olets de durée DUR*NUM/DEN" -#: midi2ly.py:886 +#: midi2ly.py:885 msgid "treat every text as a lyric" msgstr "traiter chaque texte comme des paroles" -#: midi2ly.py:889 +#: midi2ly.py:888 msgid "Examples" msgstr "Exemples" @@ -906,105 +963,133 @@ msgstr "Exemples" msgid "no files specified on command line." msgstr "aucun fichier spéficié sur la ligne de commande." -#: musicxml2ly.py:213 +#: musicxml2ly.py:343 msgid "Encountered file created by Dolet 3.4 for Sibelius, containing wrong beaming information. All beaming information in the MusicXML file will be ignored" msgstr "" "Détection d'un fichier créé par Dolet 3.4 pour Sibelius et contenant des \n" "informations de lien erronées. Toutes les informations de ligature du fichier \n" "MusicXML seront ignorées" -#: musicxml2ly.py:229 musicxml2ly.py:231 +#: musicxml2ly.py:346 +msgid "Encountered file created by Noteworthy Composer's nwc2xml, containing wrong beaming information. All beaming information in the MusicXML file will be ignored" +msgstr "" +"Détection d'un fichier créé par Noteworthy Composer's nwc2xml et contenant des \n" +"informations de lien erronées. Toutes les informations de ligature du fichier \n" +"MusicXML seront ignorées" + +#: musicxml2ly.py:362 musicxml2ly.py:364 #, python-format msgid "Unprocessed PartGroupInfo %s encountered" msgstr "PartGroupInfo %s détecté, mais non traité" -#: musicxml2ly.py:471 +#: musicxml2ly.py:594 +#, python-format +msgid "Encountered note at %s without type and duration (=%s)" +msgstr "Une note se trouve en %s, sans type ni durée (=%s)" + +#: musicxml2ly.py:613 #, python-format msgid "Encountered rational duration with denominator %s, unable to convert to lilypond duration" msgstr "" "Durée rationnelle au dénominateur de %s détectée ; \n" "impossible de traduire en durée LilyPond" -#: musicxml2ly.py:654 +#: musicxml2ly.py:868 +msgid "Unable to extract key signature!" +msgstr "Impossible de trouver l'armure." + +#: musicxml2ly.py:895 #, python-format -msgid "unknown mode %s, expecting 'major' or 'minor'" -msgstr "%s : mode inconnu. Devrait être « majeur » ou « mineur »" +msgid "unknown mode %s, expecting 'major' or 'minor' or a church mode!" +msgstr "%s : mode inconnu. Devrait être « majeur », « mineur » ou « mode d'église »" -#: musicxml2ly.py:692 +#: musicxml2ly.py:968 #, python-format msgid "Encountered unprocessed marker %s\n" msgstr "Détection d'un marqueur non traité : %s\n" -#: musicxml2ly.py:786 +#: musicxml2ly.py:1062 #, python-format msgid "unknown span event %s" msgstr "Événement de prolongation inconnu : « %s »" -#: musicxml2ly.py:796 +#: musicxml2ly.py:1072 #, python-format msgid "unknown span type %s for %s" msgstr "%s n'est pas un type de prolongateur reconnu pour %s" -#: musicxml2ly.py:1222 +#: musicxml2ly.py:1498 msgid "Unknown metronome mark, ignoring" msgstr "Indication métronomique inconnue et ignorée." #. TODO: Implement the other (more complex) way for tempo marks! -#: musicxml2ly.py:1227 +#: musicxml2ly.py:1503 msgid "Metronome marks with complex relations ( in MusicXML) are not yet implemented." msgstr "" "Les indications métronomiques aux relations complexes ( pour \n" "MusicXML) n'ont pas encore été implémentées." -#: musicxml2ly.py:1383 +#: musicxml2ly.py:1703 #, python-format msgid "Unable to convert chord type %s to lilypond." msgstr "Impossible de convertir le type d'accord %s au format LilyPond" -#: musicxml2ly.py:1529 +#: musicxml2ly.py:1849 #, python-format msgid "drum %s type unknown, please add to instrument_drumtype_dict" msgstr "" "%s n'est pas un type de percussion connu. \n" "L'ajouter à instrument_drumtype_dict" -#: musicxml2ly.py:1533 +#: musicxml2ly.py:1853 msgid "cannot find suitable event" msgstr "Aucun événement correspondant" -#: musicxml2ly.py:1623 +#: musicxml2ly.py:1994 #, python-format -msgid "Negative skip %s" -msgstr "Retour en arrière de %s" +msgid "Negative skip %s (from position %s to %s)" +msgstr "Retour en arrière de %s (partant de %s et jusqu'à %s)" -#: musicxml2ly.py:1775 +#: musicxml2ly.py:2134 #, python-format msgid "Negative skip found: from %s to %s, difference is %s" msgstr "Retour en arrière, de %s à %s ; différence = %s" -#: musicxml2ly.py:1802 +#: musicxml2ly.py:2205 #, python-format msgid "unexpected %s; expected %s or %s or %s" msgstr "%s détecté, au lieu de %s, %s ou %s" -#: musicxml2ly.py:1912 -msgid "cannot have two simultaneous slurs" +#: musicxml2ly.py:2311 +msgid "Encountered closing slur, but no slur is open" +msgstr "Terminaison d'une liaison qui n'a pas été débutée" + +#: musicxml2ly.py:2314 +msgid "Cannot have two simultaneous (closing) slurs" +msgstr "deux liaisons ne peuvent se terminer simultanément" + +#: musicxml2ly.py:2324 +msgid "Cannot have a slur inside another slur" +msgstr "des liaisons ne peuvent s'imbriquer" + +#: musicxml2ly.py:2327 +msgid "Cannot have two simultaneous slurs" msgstr "deux liaisons ne peuvent intervenir simultanément" -#: musicxml2ly.py:2050 +#: musicxml2ly.py:2455 #, python-format msgid "cannot simultaneously have more than one mode: %s" msgstr "SVP, un seul mode à la fois : %s" -#: musicxml2ly.py:2148 +#: musicxml2ly.py:2553 msgid "Converting to LilyPond expressions..." msgstr "Conversion en expressions LilyPond..." -#: musicxml2ly.py:2159 +#: musicxml2ly.py:2564 msgid "musicxml2ly [OPTION]... FILE.xml" msgstr "musicxml2ly [options]... FICHIER.xml" -#: musicxml2ly.py:2161 +#: musicxml2ly.py:2566 msgid "" "Convert MusicXML from FILE.xml to LilyPond input.\n" "If the given filename is -, musicxml2ly reads from the command line.\n" @@ -1012,7 +1097,7 @@ msgstr "" "Convertit FICHIER.xml (MusicXML) au format LilyPnd.\n" "Si le nom du fichier est « - », musicxml2ly lira la ligne de commande.\n" -#: musicxml2ly.py:2171 +#: musicxml2ly.py:2576 msgid "" "Copyright (c) 2005--2008 by\n" " Han-Wen Nienhuys ,\n" @@ -1024,81 +1109,81 @@ msgstr "" " Jan Nieuwenhuizen and\n" " Reinhold Kainhofer \n" -#: musicxml2ly.py:2196 +#: musicxml2ly.py:2601 msgid "use lxml.etree; uses less memory and cpu time" msgstr "" "Utiliser lxml.etree pour consommer moins de mémoire \n" "et de temps processeur." -#: musicxml2ly.py:2202 +#: musicxml2ly.py:2607 msgid "input file is a zip-compressed MusicXML file" msgstr "le fichier d'entrée est un fichier MusicXML compressé" -#: musicxml2ly.py:2208 +#: musicxml2ly.py:2613 msgid "convert pitches in relative mode (default)" msgstr "convertir les hauteurs en mode relatif (par défaut)" -#: musicxml2ly.py:2213 +#: musicxml2ly.py:2618 msgid "convert pitches in absolute mode" msgstr "convertir les hauteurs en mode absolu" -#: musicxml2ly.py:2216 +#: musicxml2ly.py:2621 msgid "LANG" msgstr "LANG" -#: musicxml2ly.py:2218 +#: musicxml2ly.py:2623 msgid "use a different language file 'LANG.ly' and corresponding pitch names, e.g. 'deutsch' for deutsch.ly" msgstr "" "utiliser un autre fichier linguistique « lang.ly » et ses noms de notes, \n" "comme « deutsch » pour deutsch.ly" -#: musicxml2ly.py:2224 +#: musicxml2ly.py:2629 msgid "do not convert directions (^, _ or -) for articulations, dynamics, etc." msgstr "" "ne pas convertir les emplacements (^, _ ou -) des articulations, \n" "nuances, etc." -#: musicxml2ly.py:2230 +#: musicxml2ly.py:2635 msgid "do not convert beaming information, use lilypond's automatic beaming instead" msgstr "" "ne pas convertir les informations de ligature ; \n" "laisser LilyPond gérer les ligatures automatiques" -#: musicxml2ly.py:2238 +#: musicxml2ly.py:2643 msgid "set output filename to FILE, stdout if -" msgstr "produire la sortie dans FICHIER (stdout si -)" -#: musicxml2ly.py:2320 +#: musicxml2ly.py:2726 #, python-format msgid "unknown part in part-list: %s" msgstr "la partie %s n'est pas mentionnée dans part-list" -#: musicxml2ly.py:2382 +#: musicxml2ly.py:2788 msgid "Input is compressed, extracting raw MusicXML data from stdin" msgstr "Le fichier d'entrée est compressé. Extraction des données MusicXML brutes" -#: musicxml2ly.py:2385 +#: musicxml2ly.py:2791 #, python-format msgid "Input file %s is compressed, extracting raw MusicXML data" msgstr "" "Le fichier d'entrée (%s) est compressé. \n" "Extraction des données MusicXML brutes" -#: musicxml2ly.py:2415 +#: musicxml2ly.py:2821 msgid "Reading MusicXML from Standard input ..." msgstr "Lecture du fichier MusicXML à partir de l'entrée standard..." -#: musicxml2ly.py:2417 +#: musicxml2ly.py:2823 #, python-format msgid "Reading MusicXML from %s ..." msgstr "Lecture du fichier MusicXML %s..." -#: musicxml2ly.py:2450 +#: musicxml2ly.py:2856 #, python-format msgid "Output to `%s'" msgstr "Fichier de sortie : « %s »" -#: musicxml2ly.py:2512 +#: musicxml2ly.py:2922 #, python-format msgid "Unable to find input file %s" msgstr "impossible de trouver le fichier d'entrée : « %s »" @@ -1132,23 +1217,18 @@ msgstr "erreur de programmation : %s" msgid "continuing, cross fingers" msgstr "poursuite ; croisons les doigts." -#: accidental-engraver.cc:249 +#: accidental-engraver.cc:298 #, c-format msgid "accidental typesetting list must begin with context-name: %s" msgstr "" "La saisie d'une liste d'altérations accidentelles doit débuter \n" "par un nom de contexte : %s" -#: accidental-engraver.cc:276 +#: accidental-engraver.cc:328 #, c-format -msgid "ignoring unknown accidental rule: %s" -msgstr "altération accidentelle inconnue, donc ignorée : %s" - -#: accidental-engraver.cc:292 -#, c-format -msgid "pair or context-name expected for accidental rule, found %s" +msgid "procedure or context-name expected for accidental rule, found %s" msgstr "" -"paire ou nom de contexte requis pour la règle d'altération accidentelle,\n" +"procédure ou nom de contexte requis pour la règle d'altération accidentelle,\n" "%s trouvé" #: accidental.cc:187 @@ -1374,6 +1454,26 @@ msgstr "(de)crescendo non terminé" msgid "unterminated extender" msgstr "prolongation non terminée" +#: font-config-scheme.cc:140 font-config.cc:57 +#, c-format +msgid "failed adding font directory: %s" +msgstr "échec lors de l'ajout d'un répertoire de fontes : « %s »" + +#: font-config-scheme.cc:142 font-config.cc:59 +#, c-format +msgid "adding font directory: %s" +msgstr "ajout d'un répertoire de fontes : « %s »" + +#: font-config-scheme.cc:156 +#, c-format +msgid "failed adding font file: %s" +msgstr "échec lors de l'ajout d'un fichier de fontes : « %s »" + +#: font-config-scheme.cc:158 +#, c-format +msgid "adding font file: %s" +msgstr "ajout d'un fichier de fontes : « %s »" + #: font-config.cc:28 msgid "Initializing FontConfig..." msgstr "Initialisation de FontConfig..." @@ -1383,15 +1483,9 @@ msgstr "Initialisation de FontConfig..." msgid "Rebuilding FontConfig cache %s, this may take a while..." msgstr "Reconstitution du cache FontConfig %s. Patientez..." -#: font-config.cc:57 -#, c-format -msgid "failed adding font directory: %s" -msgstr "échec lors de l'ajout d'un répertoire de fontes : « %s »" - -#: font-config.cc:59 -#, c-format -msgid "adding font directory: %s" -msgstr "ajout d'un répertoire de fontes : « %s »" +#: font-config.cc:63 +msgid "Building font database." +msgstr "Construction de la base de donnée des fontes." #: general-scheme.cc:202 msgid "infinity or NaN encountered while converting Real number" @@ -1401,7 +1495,7 @@ msgstr "Infini ou valeur non numérique rencontré lors de la conversion d'un no msgid "setting to zero" msgstr "initialisation à zéro" -#: general-scheme.cc:422 output-ps.scm:62 +#: general-scheme.cc:422 output-ps.scm:63 msgid "Found infinity or nan in output. Substituting 0.0" msgstr "" "La sortie contient l'infini ou une valeur non numérique. \n" @@ -1564,16 +1658,16 @@ msgstr "" "la vérification du type de « %s » a échoué ; \n" " la valeur « %s » doit être du type « %s »" -#: lily-lexer.cc:251 +#: lily-lexer.cc:252 msgid "include files are not allowed in safe mode" msgstr "l'inclusion de fichiers n'est pas permise en mode sans échec" -#: lily-lexer.cc:270 +#: lily-lexer.cc:271 #, c-format msgid "identifier name is a keyword: `%s'" msgstr "Le nom de l'identificateur est un mot clé : « %s »" -#: lily-lexer.cc:285 +#: lily-lexer.cc:286 #, c-format msgid "error at EOF: %s" msgstr "erreur à la fin du fichier (EOF) : %s" @@ -1598,11 +1692,11 @@ msgstr "impossible de trouver le fichier d'initialisation : « %s »" msgid "Processing `%s'" msgstr "Traitement de « %s »" -#: lily-parser.cc:99 +#: lily-parser.cc:95 msgid "Parsing..." msgstr "Analyse..." -#: lily-parser.cc:127 +#: lily-parser.cc:123 msgid "braces do not match" msgstr "accolades non pairées" @@ -1615,7 +1709,7 @@ msgstr "impossible de repérer la voix (Voice) « %s »" msgid "Lyric syllable does not have note. Use \\lyricsto or associatedVoice." msgstr "Syllabe sans note de rattachement. Utiliser \\lyricsto ou associatedVoice." -#: main.cc:100 +#: main.cc:97 #, c-format msgid "" "This program is free software. It is covered by the GNU General Public\n" @@ -1628,7 +1722,7 @@ msgstr "" "sous certaines conditions.\n" "Invoquez « %s --warranty » pour plus d'informations.\n" -#: main.cc:106 +#: main.cc:103 msgid "" " This program is free software; you can redistribute it and/or\n" "modify it under the terms of the GNU General Public License version 2\n" @@ -1658,11 +1752,11 @@ msgstr "" " écrire à la Free Software Foundation, Inc., 59 Temple Place - Suite 330, \n" "Boston, MA 02111-1307, USA.\n" -#: main.cc:137 +#: main.cc:134 msgid "SYM[=VAL]" msgstr "SYM[=VAL]" -#: main.cc:138 +#: main.cc:135 msgid "" "set Scheme option SYM to VAL (default: #t).\n" "Use -dhelp for help." @@ -1671,51 +1765,43 @@ msgstr "" "à l'option Scheme SYM.\n" "Utiliser -dhelp pour avoir de l'aide." -#: main.cc:141 +#: main.cc:138 msgid "EXPR" msgstr "EXPR" -#: main.cc:141 +#: main.cc:138 msgid "evaluate scheme code" msgstr "évaluation du code Scheme" #. Bug in option parser: --output =foe is taken as an abbreviation #. for --output-format. -#: main.cc:144 +#: main.cc:141 msgid "FORMATs" msgstr "FORMATs" -#: main.cc:144 +#: main.cc:141 msgid "dump FORMAT,... Also as separate options:" msgstr "" "produire FORMAT,...\n" "Aussi comme options séparées :" -#: main.cc:145 -msgid "generate DVI (tex backend only)" -msgstr "générer le DVI (uniquement pour tex)" - -#: main.cc:146 +#: main.cc:142 msgid "generate PDF (default)" msgstr "générer le PDF (par défaut)" -#: main.cc:147 +#: main.cc:143 msgid "generate PNG" msgstr "générer le PNG" -#: main.cc:148 +#: main.cc:144 msgid "generate PostScript" msgstr "générer le PostScript" -#: main.cc:149 -msgid "generate TeX (tex backend only)" -msgstr "générer le TeX (uniquement pour tex)" - -#: main.cc:151 +#: main.cc:146 msgid "FIELD" msgstr "CHAMP" -#: main.cc:151 +#: main.cc:146 msgid "" "dump header field FIELD to file\n" "named BASENAME.FIELD" @@ -1723,21 +1809,21 @@ msgstr "" "écrire le champ d'en-tête CHAMP dans le\n" "fichier nommé BASENAME.CHAMP" -#: main.cc:153 +#: main.cc:148 msgid "add DIR to search path" msgstr "ajouter RÉPERTOIRE au chemin de recherche" -#: main.cc:154 +#: main.cc:149 msgid "use FILE as init file" msgstr "" "utiliser FICHIER comme\n" "fichier d'initialisation" -#: main.cc:156 +#: main.cc:151 msgid "USER, GROUP, JAIL, DIR" msgstr "USER,GROUP,CAGE,RÉP" -#: main.cc:156 +#: main.cc:151 msgid "" "chroot to JAIL, become USER:GROUP\n" "and cd into DIR" @@ -1745,19 +1831,19 @@ msgstr "" "chroot dans CAGE, devenir UTILISATEUR:GROUPE\n" "et cd dans RÉPERTOIRE" -#: main.cc:159 +#: main.cc:154 msgid "write output to FILE (suffix will be added)" msgstr "" "produire la sortie dans FICHIER \n" "(adjonction automatique du suffixe)" -#: main.cc:160 +#: main.cc:155 msgid "relocate using directory of lilypond program" msgstr "" "redétermine le chemin d'exécution\n" "des composants de LilyPond" -#: main.cc:226 +#: main.cc:221 #, c-format msgid "" "Copyright (c) %s by\n" @@ -1767,88 +1853,81 @@ msgstr "" "%s et autres." #. No version number or newline here. It confuses help2man. -#: main.cc:254 +#: main.cc:249 #, c-format msgid "Usage: %s [OPTION]... FILE..." msgstr "Utilisation : %s [OPTIONS]... FICHIER..." -#: main.cc:256 +#: main.cc:251 #, c-format msgid "Typeset music and/or produce MIDI from FILE." msgstr "Composer la musique ou jouer en format MIDI à partir du FICHIER" -#: main.cc:258 +#: main.cc:253 #, c-format msgid "LilyPond produces beautiful music notation." msgstr "LilyPond produit une jolie notation musicale" -#: main.cc:260 +#: main.cc:255 #, c-format msgid "For more information, see %s" msgstr "Pour plus d'informations, voir %s" -#: main.cc:262 +#: main.cc:257 #, c-format msgid "Options:" msgstr "Options :" -#: main.cc:266 -#, c-format -msgid "Report bugs via %s" -msgstr "" -"Signaler toute anomalie à \n" -"%s" - -#: main.cc:312 +#: main.cc:311 #, c-format msgid "expected %d arguments with jail, found: %u" msgstr "une cage requiert %d arguments, il y en a %u" -#: main.cc:326 +#: main.cc:325 #, c-format msgid "no such user: %s" msgstr "utilisateur inconnu : « %s »" -#: main.cc:328 +#: main.cc:327 #, c-format msgid "cannot get user id from user name: %s: %s" msgstr "" "impossible de repérer l'identifiant utilisateur à partir du nom d'utilisateur :\n" "%s : %s" -#: main.cc:343 +#: main.cc:342 #, c-format msgid "no such group: %s" msgstr "groupe inconnu : %s" -#: main.cc:345 +#: main.cc:344 #, c-format msgid "cannot get group id from group name: %s: %s" msgstr "" "impossible de repérer l'identifiant groupe à partir du nom de groupe :\n" "%s : %s " -#: main.cc:353 +#: main.cc:352 #, c-format msgid "cannot chroot to: %s: %s" msgstr "impossible de chrooter vers : %s : %s" -#: main.cc:360 +#: main.cc:359 #, c-format msgid "cannot change group id to: %d: %s" msgstr "impossible de changer l'identifiant de groupe en : %d : %s" -#: main.cc:366 +#: main.cc:365 #, c-format msgid "cannot change user id to: %d: %s" msgstr "impossible de changer l'identifiant utilisateur en : %d : %s" -#: main.cc:372 +#: main.cc:371 #, c-format msgid "cannot change working directory to: %s: %s" msgstr "impossible de changer le répertoire de travail en : %s : %s" -#: main.cc:619 +#: main.cc:611 #, c-format msgid "exception caught: %s" msgstr "exception capturée : %s" @@ -1933,8 +2012,12 @@ msgstr "impossible d'ouvrir le fichier en écriture : %s : %s" msgid "cannot write to file: `%s'" msgstr "impossible d'écrire dans le fichier : « %s »" -#: minimal-page-breaking.cc:42 -msgid "Computing page breaks..." +#: minimal-page-breaking.cc:38 paper-score.cc:105 +msgid "Calculating line breaks..." +msgstr "Calcul des sauts de ligne..." + +#: minimal-page-breaking.cc:42 layout-page-layout.scm:463 +msgid "Calculating page breaks..." msgstr "Calcul des sauts de page..." #: music-iterator.cc:171 @@ -1951,7 +2034,7 @@ msgstr "Échec de vérification d'octave. Aurait dû être \"%s\", \"%s\" obtenu msgid "transposition by %s makes alteration larger than double" msgstr "La transposition de %s crée des altérations supérieures aux doubles" -#: new-dynamic-engraver.cc:128 +#: new-dynamic-engraver.cc:129 #, c-format msgid "" "unknown crescendo style: %s\n" @@ -2029,21 +2112,21 @@ msgstr "FT_Get_Glyph_Name () erreur : %s" msgid "Finding the ideal number of pages..." msgstr "Détermination du nombre optimal de pages..." -#: optimal-page-breaking.cc:76 +#: optimal-page-breaking.cc:78 msgid "Fitting music on 1 page..." msgstr "Répartition de la musique sur une page..." -#: optimal-page-breaking.cc:78 +#: optimal-page-breaking.cc:80 #, c-format msgid "Fitting music on %d pages..." msgstr "Répartition de la musique sur %d pages..." -#: optimal-page-breaking.cc:80 +#: optimal-page-breaking.cc:82 #, c-format msgid "Fitting music on %d or %d pages..." msgstr "Répartition de la musique sur %d ou %d pages..." -#: optimal-page-breaking.cc:157 page-turn-page-breaking.cc:226 +#: optimal-page-breaking.cc:159 page-turn-page-breaking.cc:226 #: paper-score.cc:146 msgid "Drawing systems..." msgstr "Dessin des systèmes..." @@ -2118,10 +2201,6 @@ msgstr "" msgid "Layout output to `%s'..." msgstr "Sortie mise en page vers « %s »..." -#: paper-score.cc:105 -msgid "Calculating line breaks..." -msgstr "Calcul des sauts de ligne..." - #: paper-score.cc:118 #, c-format msgid "Element count %d (spanners %d) " @@ -2135,7 +2214,7 @@ msgstr "Pré-traitement des éléments graphiques..." msgid "GUILE signaled an error for the expression beginning here" msgstr "GUILE a signalé une erreur pour l'expression débutant ici" -#: percent-repeat-engraver.cc:200 +#: percent-repeat-engraver.cc:202 msgid "unterminated percent repeat" msgstr "répétition en pourcent non terminée" @@ -2151,12 +2230,12 @@ msgstr "Bouclage du canal MIDI" msgid "remapping modulo 16" msgstr "réaffectation modulo 16" -#: performance.cc:101 +#: performance.cc:100 #, c-format msgid "MIDI output to `%s'..." msgstr "Sortie MIDI vers « %s »..." -#: phrasing-slur-engraver.cc:139 +#: phrasing-slur-engraver.cc:146 msgid "unterminated phrasing slur" msgstr "liaison de phrasé non terminée" @@ -2323,7 +2402,7 @@ msgstr "liaison non terminée" msgid "cannot end slur" msgstr "impossible de terminer la liaison" -#: slur.cc:357 +#: slur.cc:359 #, c-format msgid "Ignoring grob for slur: %s. avoid-slur not set?" msgstr "" @@ -2362,12 +2441,12 @@ msgstr "la source devrait spécifier des voix polyphoniques" msgid "weird stem size, check for narrow beams" msgstr "taille de hampe bizarre ; vérifier la présence de liens étroits" -#: stem.cc:627 +#: stem.cc:623 #, c-format msgid "flag `%s' not found" msgstr "crochet inconnu : « %s »" -#: stem.cc:638 +#: stem.cc:639 #, c-format msgid "flag stroke `%s' not found" msgstr "type de crochet inconnu : « %s »" @@ -2493,40 +2572,40 @@ msgstr "a déjà une extension terminée" msgid "giving up" msgstr "abandon" -#: parser.yy:729 +#: parser.yy:804 msgid "\\paper cannot be used in \\score, use \\layout instead" msgstr "dans la section \\score, utiliser \\layout au lieu de \\paper" -#: parser.yy:753 +#: parser.yy:828 msgid "need \\paper for paper block" msgstr "\\paper est nécessaire pour définir les paramètres de la page" -#: parser.yy:1224 +#: parser.yy:1299 msgid "Grob name should be alphanumeric" msgstr "Un nom de Grob devrait être alphanumérique" -#: parser.yy:1522 +#: parser.yy:1597 msgid "second argument must be pitch list" msgstr "le second argument doit être une liste de hauteurs" -#: parser.yy:1549 parser.yy:1554 parser.yy:2026 +#: parser.yy:1624 parser.yy:1629 parser.yy:2101 msgid "have to be in Lyric mode for lyrics" msgstr "doit être en mode Lyric pour des paroles" -#: parser.yy:1651 +#: parser.yy:1726 msgid "expecting string as script definition" msgstr "chaîne requise pour définir un script" -#: parser.yy:1806 parser.yy:1856 +#: parser.yy:1881 parser.yy:1931 #, c-format msgid "not a duration: %d" msgstr "%d n'est pas une durée" -#: parser.yy:1980 +#: parser.yy:2055 msgid "have to be in Note mode for notes" msgstr "doit être en mode Note pour des notes" -#: parser.yy:2041 +#: parser.yy:2116 msgid "have to be in Chord mode for chords" msgstr "doit être en mode Chord pour des accords" @@ -2586,28 +2665,28 @@ msgstr "Accolade repérée à la fin d'un \"markup\". Manquerait-il un espace ?" msgid "invalid character: `%c'" msgstr "caractère invalide : « %c »" -#: lexer.ll:803 lexer.ll:804 +#: lexer.ll:803 #, c-format msgid "unknown escaped string: `\\%s'" msgstr "chaîne d'échappement inconnue : « \\%s »" -#: lexer.ll:910 lexer.ll:911 +#: lexer.ll:910 #, c-format msgid "file too old: %s (oldest supported: %s)" msgstr "" "%s est plus qu'obsolète ; \n" "le plus ancien pouvant être supporté est : %s" -#: lexer.ll:911 lexer.ll:912 +#: lexer.ll:911 msgid "consider updating the input with the convert-ly script" msgstr "Envisagez la mise à jour de la source à l'aide du script convert-ly" -#: lexer.ll:917 lexer.ll:918 +#: lexer.ll:917 #, c-format msgid "program too old: %s (file requires: %s)" msgstr "Programme plus qu'obsolète : %s (le fichier requiert %s)" -#: backend-library.scm:19 lily.scm:777 ps-to-png.scm:58 +#: backend-library.scm:19 lily.scm:761 ps-to-png.scm:58 #, scheme-format msgid "Invoking `~a'..." msgstr "Appel de « ~a »..." @@ -2617,7 +2696,7 @@ msgstr "Appel de « ~a »..." msgid "`~a' failed (~a)" msgstr "échec de « ~a » (~a)" -#: backend-library.scm:116 framework-tex.scm:344 framework-tex.scm:369 +#: backend-library.scm:116 #, scheme-format msgid "Converting to `~a'..." msgstr "Conversion à « ~a »..." @@ -2651,16 +2730,16 @@ msgstr "la classe d'événement ~A semble être inutilisée" msgid "translator listens to nonexisting event class ~A" msgstr "le traducteur écoute la classe d'événements ~A inexistante" -#: define-markup-commands.scm:599 +#: define-markup-commands.scm:569 msgid "no systems found in \\score markup, does it have a \\layout block?" msgstr "pas de système trouvé dans le bloc \\score, contient-il un bloc \\layout ?" -#: define-markup-commands.scm:2428 +#: define-markup-commands.scm:2387 #, scheme-format msgid "Cannot find glyph ~a" msgstr "impossible de trouver le glyphe ~a" -#: define-markup-commands.scm:2737 +#: define-markup-commands.scm:2696 #, scheme-format msgid "not a valid duration string: ~a" msgstr "chaîne de durée invalide : ~a" @@ -2681,8 +2760,8 @@ msgid "unknown repeat type `~S'" msgstr "type de répétition inconnu : « ~S »" #: define-music-types.scm:693 -msgid "See music-types.scm for supported repeats" -msgstr "Consulter music-types.scm pour connaître les types de répétitions reconnus" +msgid "See define-music-types.scm for supported repeats" +msgstr "Consulter define-music-types.scm pour connaître les répétitions prises en charge" #: document-backend.scm:99 #, scheme-format @@ -2699,57 +2778,57 @@ msgstr "impossible de trouver l'interface pour la propriété ~S" msgid "unknown Grob interface: ~S" msgstr "interface d'objet graphique (Grob) inconnue : ~S" -#: documentation-lib.scm:48 +#: documentation-lib.scm:49 #, scheme-format msgid "Processing ~S..." msgstr "Traitement de ~S..." -#: documentation-lib.scm:164 +#: documentation-lib.scm:165 #, scheme-format msgid "Writing ~S..." msgstr "Écriture de ~S..." -#: documentation-lib.scm:186 +#: documentation-lib.scm:187 #, scheme-format msgid "cannot find description for property ~S (~S)" msgstr "impossible de trouver une description de la propriété ~S (~S)" +#: flag-styles.scm:145 +#, scheme-format +msgid "flag stroke `~a' or `~a' not found" +msgstr "type de crochet inconnu : « ~a » ou « ~a »" + #: framework-eps.scm:90 #, scheme-format msgid "Writing ~a..." msgstr "Écriture de ~a..." -#: framework-ps.scm:282 +#: framework-ps.scm:277 #, scheme-format msgid "cannot embed ~S=~S" msgstr "intégration impossible : ~S=~S" -#: framework-ps.scm:335 +#: framework-ps.scm:330 #, scheme-format msgid "cannot extract file matching ~a from ~a" msgstr "impossible d'extraire le fichier ~a à partir de ~a" -#: framework-ps.scm:352 +#: framework-ps.scm:347 #, scheme-format msgid "do not know how to embed ~S=~S" msgstr "imposible de réaliser l'intégration ~S=~S" -#: framework-ps.scm:383 +#: framework-ps.scm:378 #, scheme-format msgid "do not know how to embed font ~s ~s ~s" msgstr "impossible d'intégrer les fontes ~s ~s ~s" -#: framework-ps.scm:753 +#: framework-ps.scm:748 #, scheme-format msgid "cannot convert to ~S" msgstr "impossible de convertir en ~S" -#: framework-ps.scm:772 framework-ps.scm:775 -#, scheme-format -msgid "cannot generate ~S using the postscript back-end" -msgstr "impossible de générer ~S à l'aide du support postscript" - -#: framework-ps.scm:782 +#: framework-ps.scm:771 msgid "" "\n" "The PostScript backend does not support the system-by-system \n" @@ -2778,11 +2857,6 @@ msgstr "" " %% ****************************************************************\n" "\n" -#: framework-tex.scm:361 -#, scheme-format -msgid "TeX file name must not contain whitespace: `~a'" -msgstr "un nom de fichier TeX ne peut contenir d'espace : « ~a »" - #: graphviz.scm:53 #, scheme-format msgid "Writing graph `~a'..." @@ -2798,46 +2872,42 @@ msgstr "Erreur de définition du lien : attendait (~S,~S), ~S trouvé." msgid "Error in beam quanting. Expected ~S 0, found ~S." msgstr "Erreur de définition du lien : attendait ~S 0, repéré ~S." -#: layout-page-layout.scm:124 +#: layout-page-layout.scm:126 msgid "Can't fit systems on page -- ignoring between-system-padding" msgstr "Les système ne tiennent pas sur la page ; between-system-padding ignoré" -#: layout-page-layout.scm:458 -msgid "Calculating page breaks..." -msgstr "Calcul des sauts de page..." - -#: lily-library.scm:588 +#: lily-library.scm:602 #, scheme-format msgid "unknown unit: ~S" msgstr "unité inconnue : ~S" -#: lily-library.scm:622 +#: lily-library.scm:636 #, scheme-format msgid "no \\version statement found, please add~afor future compatibility" msgstr "" "déclaration de \\version absente ;\n" "ajoutez ~a pour une compatibilité future" -#: lily-library.scm:630 +#: lily-library.scm:644 msgid "old relative compatibility not used" msgstr "compatibilité avec l'ancien mode relatif non utilisée" -#: lily.scm:178 +#: lily.scm:179 #, scheme-format msgid "cannot find: ~A" msgstr "impossible de trouver ~A" -#: lily.scm:243 +#: lily.scm:228 #, scheme-format msgid "wrong type for argument ~a. Expecting ~a, found ~s" msgstr "type d'argument erroné pour ~a. Attendait ~a, ~s trouvé" -#: lily.scm:641 +#: lily.scm:625 #, scheme-format msgid "job ~a terminated with signal: ~a" msgstr "le travail ~a s'est terminé avec le signal ~a" -#: lily.scm:644 +#: lily.scm:628 #, scheme-format msgid "" "logfile ~a (exit ~a):\n" @@ -2846,12 +2916,12 @@ msgstr "" "fichier journal ~a (sortie ~a) :\n" "~a" -#: lily.scm:669 lily.scm:767 +#: lily.scm:653 lily.scm:751 #, scheme-format msgid "failed files: ~S" msgstr "erreur sur les fichiers : ~S" -#: lily.scm:757 +#: lily.scm:741 #, scheme-format msgid "Redirecting output to ~a..." msgstr "Redirection de la sortie vers ~a..." @@ -2860,7 +2930,7 @@ msgstr "Redirection de la sortie vers ~a..." msgid "Music head function must return Music object" msgstr "Une fonction musicale primitive devrait renvoyer un objet Music" -#: ly-syntax-constructors.scm:150 +#: ly-syntax-constructors.scm:154 #, scheme-format msgid "Invalid property operation ~a" msgstr "Opération de propriété invalide : ~a" @@ -2914,12 +2984,12 @@ msgstr "" msgid "cannot find quoted music: `~S'" msgstr "impossible de trouver la citation de musique « ~S »" -#: music-functions.scm:990 +#: music-functions.scm:1198 #, scheme-format msgid "unknown accidental style: ~S" msgstr "style d'altération inconnu : ~S" -#: output-ps.scm:285 +#: output-ps.scm:294 msgid "utf-8-string encountered in PS backend" msgstr "le support PS a rencontré une chaîne utf8" @@ -2933,28 +3003,23 @@ msgstr "~S indéfini(e)" msgid "cannot decypher Pango description: ~a" msgstr "la description de Pango ne peut être déchiffrée : ~a" -#: output-tex.scm:96 -#, scheme-format -msgid "cannot find ~a in ~a" -msgstr "impossible de trouver ~a dans ~a" - -#: paper.scm:86 +#: paper.scm:104 msgid "set-global-staff-size: not in toplevel scope" msgstr "set-global-staff-size n'est pas à un niveau de portée globale" -#: paper.scm:226 +#: paper.scm:244 #, scheme-format msgid "This is not a \\layout {} object, ~S" msgstr "~S n'est pas un objet de \\layout {}" -#: paper.scm:238 +#: paper.scm:256 #, scheme-format -msgid "Unknown papersize: ~a" +msgid "Unknown paper size: ~a" msgstr "Taille de papier inconnue : ~a" #. TODO: should raise (generic) exception with throw, and catch #. that in parse-scm.cc -#: paper.scm:253 +#: paper.scm:271 msgid "Must use #(set-paper-size .. ) within \\paper { ... }" msgstr "#(set-paper-size ..) doit être dans la section \\paper { ... }" @@ -2977,3 +3042,33 @@ msgstr "~a s'est terminé avec le statut ~S" #, scheme-format msgid "assertion failed: ~S" msgstr "erreur d'assertion : ~S" + +#~ msgid "requested time signature, but time sig is unknown" +#~ msgstr "Une métrique est obligatoire, mais la définition trouvée est inconnue" + +#~ msgid "Report bugs via" +#~ msgstr "Rapporter toute anomalie à" + +#~ msgid "Negative skip %s" +#~ msgstr "Retour en arrière de %s" + +#~ msgid "ignoring unknown accidental rule: %s" +#~ msgstr "altération accidentelle inconnue, donc ignorée : %s" + +#~ msgid "generate DVI (tex backend only)" +#~ msgstr "générer le DVI (uniquement pour tex)" + +#~ msgid "generate TeX (tex backend only)" +#~ msgstr "générer le TeX (uniquement pour tex)" + +#~ msgid "Computing page breaks..." +#~ msgstr "Calcul des sauts de page..." + +#~ msgid "cannot generate ~S using the postscript back-end" +#~ msgstr "impossible de générer ~S à l'aide du support postscript" + +#~ msgid "TeX file name must not contain whitespace: `~a'" +#~ msgstr "un nom de fichier TeX ne peut contenir d'espace : « ~a »" + +#~ msgid "cannot find ~a in ~a" +#~ msgstr "impossible de trouver ~a dans ~a" diff --git a/po/lilypond.pot b/po/lilypond.pot index b71d8259da..8a6be7ffcd 100644 --- a/po/lilypond.pot +++ b/po/lilypond.pot @@ -4,14 +4,14 @@ # msgid "" msgstr "" -"Project-Id-Version: lilypond 2.11.57\n" +"Project-Id-Version: lilypond 2.12.0\n" "Report-Msgid-Bugs-To: http://post.gmane.org/post.php?group=gmane.comp.gnu.lilypond.bugs\n" -"POT-Creation-Date: 2008-12-09 11:43+0100\n" +"POT-Creation-Date: 2008-12-20 11:58+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #: convertrules.py:12 @@ -391,6 +391,14 @@ msgstr "" msgid "re-definition of InnerChoirStaff.\n" msgstr "" +#: convertrules.py:2851 +msgid "stringTuning must be added to addChordShape call.\n" +msgstr "" + +#: convertrules.py:2857 +msgid "stringTuning must be added to chord-shape call.\n" +msgstr "" + #: fontextract.py:25 #, python-format msgid "Scanning %s" @@ -522,8 +530,12 @@ msgstr "" msgid "preserve ABC's notion of beams" msgstr "" +#. Translators, please translate this string as +#. "Report bugs in English via %s", +#. or if there is a LilyPond users list or forum in your language +#. "Report bugs in English via %s or in YOUR_LANG via URI" #: abc2ly.py:1363 convert-ly.py:123 etf2ly.py:1200 lilypond-book.py:214 -#: midi2ly.py:894 musicxml2ly.py:2646 main.cc:261 +#: midi2ly.py:894 musicxml2ly.py:2646 main.cc:265 #, c-format, python-format msgid "Report bugs via %s" msgstr "" @@ -722,105 +734,105 @@ msgstr "" msgid "be verbose" msgstr "" -#: lilypond-book.py:869 +#: lilypond-book.py:871 #, python-format msgid "file not found: %s" msgstr "" -#: lilypond-book.py:1137 +#: lilypond-book.py:1142 #, python-format msgid "deprecated ly-option used: %s=%s" msgstr "" -#: lilypond-book.py:1139 +#: lilypond-book.py:1144 #, python-format msgid "compatibility mode translation: %s=%s" msgstr "" -#: lilypond-book.py:1142 +#: lilypond-book.py:1147 #, python-format msgid "deprecated ly-option used: %s" msgstr "" -#: lilypond-book.py:1144 +#: lilypond-book.py:1149 #, python-format msgid "compatibility mode translation: %s" msgstr "" -#: lilypond-book.py:1162 +#: lilypond-book.py:1167 #, python-format msgid "ignoring unknown ly option: %s" msgstr "" -#: lilypond-book.py:1598 +#: lilypond-book.py:1604 #, python-format msgid "Opening filter `%s'" msgstr "" -#: lilypond-book.py:1615 +#: lilypond-book.py:1621 #, python-format msgid "`%s' failed (%d)" msgstr "" -#: lilypond-book.py:1616 +#: lilypond-book.py:1622 msgid "The error log is as follows:" msgstr "" -#: lilypond-book.py:1678 +#: lilypond-book.py:1684 msgid "cannot find \\begin{document} in LaTeX document" msgstr "" -#: lilypond-book.py:1778 +#: lilypond-book.py:1784 msgid "Writing snippets..." msgstr "" -#: lilypond-book.py:1784 +#: lilypond-book.py:1790 msgid "Processing..." msgstr "" -#: lilypond-book.py:1790 +#: lilypond-book.py:1796 msgid "All snippets are up to date..." msgstr "" -#: lilypond-book.py:1824 +#: lilypond-book.py:1830 #, python-format msgid "cannot determine format for: %s" msgstr "" -#: lilypond-book.py:1835 +#: lilypond-book.py:1841 #, python-format msgid "%s is up to date." msgstr "" -#: lilypond-book.py:1849 +#: lilypond-book.py:1855 #, python-format msgid "Writing `%s'..." msgstr "" -#: lilypond-book.py:1907 +#: lilypond-book.py:1913 msgid "Output would overwrite input file; use --output." msgstr "" -#: lilypond-book.py:1911 +#: lilypond-book.py:1917 #, python-format msgid "Reading %s..." msgstr "" -#: lilypond-book.py:1931 +#: lilypond-book.py:1937 msgid "Dissecting..." msgstr "" -#: lilypond-book.py:1947 +#: lilypond-book.py:1953 #, python-format msgid "Compiling %s..." msgstr "" -#: lilypond-book.py:1956 +#: lilypond-book.py:1962 #, python-format msgid "Processing include: %s" msgstr "" -#: lilypond-book.py:1968 +#: lilypond-book.py:1974 #, python-format msgid "Removing `%s'" msgstr "" @@ -1362,23 +1374,33 @@ msgstr "" msgid "unterminated extender" msgstr "" -#: font-config.cc:28 -msgid "Initializing FontConfig..." +#: font-config-scheme.cc:140 font-config.cc:57 +#, c-format +msgid "failed adding font directory: %s" msgstr "" -#: font-config.cc:44 +#: font-config-scheme.cc:142 font-config.cc:59 #, c-format -msgid "Rebuilding FontConfig cache %s, this may take a while..." +msgid "adding font directory: %s" msgstr "" -#: font-config.cc:57 +#: font-config-scheme.cc:156 #, c-format -msgid "failed adding font directory: %s" +msgid "failed adding font file: %s" msgstr "" -#: font-config.cc:59 +#: font-config-scheme.cc:158 #, c-format -msgid "adding font directory: %s" +msgid "adding font file: %s" +msgstr "" + +#: font-config.cc:28 +msgid "Initializing FontConfig..." +msgstr "" + +#: font-config.cc:44 +#, c-format +msgid "Rebuilding FontConfig cache %s, this may take a while..." msgstr "" #: font-config.cc:63 @@ -1738,52 +1760,52 @@ msgstr "" msgid "Options:" msgstr "" -#: main.cc:307 +#: main.cc:311 #, c-format msgid "expected %d arguments with jail, found: %u" msgstr "" -#: main.cc:321 +#: main.cc:325 #, c-format msgid "no such user: %s" msgstr "" -#: main.cc:323 +#: main.cc:327 #, c-format msgid "cannot get user id from user name: %s: %s" msgstr "" -#: main.cc:338 +#: main.cc:342 #, c-format msgid "no such group: %s" msgstr "" -#: main.cc:340 +#: main.cc:344 #, c-format msgid "cannot get group id from group name: %s: %s" msgstr "" -#: main.cc:348 +#: main.cc:352 #, c-format msgid "cannot chroot to: %s: %s" msgstr "" -#: main.cc:355 +#: main.cc:359 #, c-format msgid "cannot change group id to: %d: %s" msgstr "" -#: main.cc:361 +#: main.cc:365 #, c-format msgid "cannot change user id to: %d: %s" msgstr "" -#: main.cc:367 +#: main.cc:371 #, c-format msgid "cannot change working directory to: %s: %s" msgstr "" -#: main.cc:607 +#: main.cc:611 #, c-format msgid "exception caught: %s" msgstr "" @@ -1862,8 +1884,12 @@ msgstr "" msgid "cannot write to file: `%s'" msgstr "" -#: minimal-page-breaking.cc:42 -msgid "Computing page breaks..." +#: minimal-page-breaking.cc:38 paper-score.cc:105 +msgid "Calculating line breaks..." +msgstr "" + +#: minimal-page-breaking.cc:42 layout-page-layout.scm:463 +msgid "Calculating page breaks..." msgstr "" #: music-iterator.cc:171 @@ -2043,10 +2069,6 @@ msgstr "" msgid "Layout output to `%s'..." msgstr "" -#: paper-score.cc:105 -msgid "Calculating line breaks..." -msgstr "" - #: paper-score.cc:118 #, c-format msgid "Element count %d (spanners %d) " @@ -2507,21 +2529,21 @@ msgstr "" msgid "invalid character: `%c'" msgstr "" -#: lexer.ll:803 lexer.ll:804 +#: lexer.ll:803 #, c-format msgid "unknown escaped string: `\\%s'" msgstr "" -#: lexer.ll:910 lexer.ll:911 +#: lexer.ll:910 #, c-format msgid "file too old: %s (oldest supported: %s)" msgstr "" -#: lexer.ll:911 lexer.ll:912 +#: lexer.ll:911 msgid "consider updating the input with the convert-ly script" msgstr "" -#: lexer.ll:917 lexer.ll:918 +#: lexer.ll:917 #, c-format msgid "program too old: %s (file requires: %s)" msgstr "" @@ -2633,7 +2655,7 @@ msgstr "" msgid "cannot find description for property ~S (~S)" msgstr "" -#: flag-styles.scm:81 +#: flag-styles.scm:145 #, scheme-format msgid "flag stroke `~a' or `~a' not found" msgstr "" @@ -2703,10 +2725,6 @@ msgstr "" msgid "Can't fit systems on page -- ignoring between-system-padding" msgstr "" -#: layout-page-layout.scm:463 -msgid "Calculating page breaks..." -msgstr "" - #: lily-library.scm:602 #, scheme-format msgid "unknown unit: ~S" diff --git a/python/convertrules.py b/python/convertrules.py index 2384699cea..8aa8d29553 100644 --- a/python/convertrules.py +++ b/python/convertrules.py @@ -2820,7 +2820,7 @@ def conv (str): @rule ((2, 11, 62), "makam-init.ly -> makam.ly, \\bigger -> \\larger") def conv (str): str = re.sub (r'\\include(\s+)"makam-init.ly"', r'\\include\1"makam.ly"', str) - str = re.sub (r"\\bigger", r"\\larger", str) + str = re.sub (r"([\\:])bigger", r"\1larger", str) return str @rule ((2, 11, 64), "systemSeparatorMarkup -> system-separator-markup,\n\ @@ -2844,6 +2844,24 @@ def conv (str): str = re.sub ('InnerChoirStaff', 'ChoirStaff', str) return str +@rule ((2, 12, 0), + _ ("Syntax changes for \\addChordShape and \\chord-shape") + "\n" + \ + _ ("bump version for release")) +def conv(str): + if re.search(r'\\addChordShape', str): + stderr_write ("\n") + stderr_write (NOT_SMART % _("stringTuning must be added to \ +addChordShape call.\n")) + stderr_write (UPDATE_MANUALLY) + raise FatalConversionError () + if re.search (r'\\chord-shape', str): + stderr_write ("\n") + stderr_write (NOT_SMART % _("stringTuning must be added to \ +chord-shape call.\n")) + stderr_write (UPDATE_MANUALLY) + raise FatalConversionError () + return str + # Guidelines to write rules (please keep this at the end of this file) # # - keep at most one rule per version; if several conversions should be done, diff --git a/python/musicexp.py b/python/musicexp.py index b1df9417f7..440fcbfb3f 100644 --- a/python/musicexp.py +++ b/python/musicexp.py @@ -892,10 +892,10 @@ class BarLine (Music): self.type = None def print_ly (self, printer): - bar_symbol = { 'regular': "|", 'dotted': ":", 'dashed': ":", + bar_symbol = { 'regular': "|", 'dotted': ":", 'dashed': "dashed", 'heavy': "|", 'light-light': "||", 'light-heavy': "|.", 'heavy-light': ".|", 'heavy-heavy': ".|.", 'tick': "'", - 'short': "'", 'none': "" }.get (self.type, None) + 'short': "'|", 'none': "" }.get (self.type, None) if bar_symbol <> None: printer.dump ('\\bar "%s"' % bar_symbol) else: diff --git a/scm/c++.scm b/scm/c++.scm index ee4de99005..8e5fc8d447 100644 --- a/scm/c++.scm +++ b/scm/c++.scm @@ -33,6 +33,9 @@ (define-public (number-or-string? x) (or (number? x) (string? x))) +(define-public (string-or-pair? x) + (or (string? x) (pair? x))) + (define-public (scheme? x) #t) diff --git a/scm/define-context-properties.scm b/scm/define-context-properties.scm index 3b42e08b37..d45150f10f 100644 --- a/scm/define-context-properties.scm +++ b/scm/define-context-properties.scm @@ -162,14 +162,15 @@ Should be set for staves.") (crescendoText ,markup? "The text to print at start of non-hairpin crescendo, i.e., @samp{cresc.}.") (crescendoSpanner ,symbol? "The type of spanner to be used for -crescendi. Available values are @samp{hairpin}, @samp{line}, -@samp{dashed-line}, @samp{dotted-line}. If unset, a hairpin crescendo -is used.") +crescendi. Available values are @samp{hairpin} and @samp{text}. If unset, +a hairpin crescendo is used.") (currentBarNumber ,integer? "Contains the current barnumber. This property is incremented at every bar line.") - (decrescendoSpanner ,symbol? "See @code{crescendoSpanner}.") + (decrescendoSpanner ,symbol? "The type of spanner to be used for +decrescendi. Available values are @samp{hairpin} and @samp{text}. If +unset, a hairpin decrescendo is used.") (decrescendoText ,markup? "The text to print at start of non-hairpin decrescendo, i.e., @samp{dim.}.") (defaultBarType ,string? "Set the default type of bar line. See diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm index b697af3b30..9ed32e95a2 100644 --- a/scm/define-grob-properties.scm +++ b/scm/define-grob-properties.scm @@ -79,6 +79,14 @@ specifies which beams to make. @code{0}@tie{}is the central beam, @code{1}@tie{}is the next beam toward the note, etc. This information is used to determine how to connect the beaming patterns from stem to stem inside a beam.") + (beamlet-default-length ,pair? "A pair of numbers. The first number +specifies the default length of a beamlet that sticks out of the left hand +side of this stem; the second number specifies the default length of the +beamlet to the right. The actual length of a beamlet is determined by +taking either the default length or the length specified by +@code{beamlet-max-length-proportion}, whichever is smaller.") + (beamlet-max-length-proportion ,pair? "The maximum length of a beamlet, +as a proportion of the distance between two adjacent stems.") (before-line-breaking ,boolean? "Dummy property, used to trigger a callback function.") (between-cols ,pair? "Where to attach a loose column to.") @@ -133,6 +141,8 @@ stick out of its bounds?") (c0-position ,integer? "An integer indicating the position of middle@tie{}C.") + (circled-tip ,boolean? "Put a circle at start/end of hairpins (al/del +niente).") (clip-edges ,boolean? "Allow outward pointing beamlets at the edges of beams?") (collapse-height ,ly:dimension? "Minimum height of system start @@ -256,6 +266,9 @@ include the following: Choices include @code{curved}, @code{straight}, and @code{none}. Default @code{curved}. @item +@code{capo-thickness} -- Thickness of capo indicator, in +multiples of fret-space. Default value 0.5. +@item @code{dot-color} -- Color of dots. Options include @code{black} and @code{white}. Default @code{black}. @item @@ -497,6 +510,8 @@ In case of a potential collision, the grob with the smaller tightly as possible.") (padding ,ly:dimension? "Add this much extra space between objects that are next to each other.") + (padding-pairs ,list? "An alist mapping @code{(@var{name} . @var{name})} +to distances.") (page-break-penalty ,number? "Penalty for page break at this column. This affects the choices of the page breaker; it avoids a page break at a column with a positive penalty and prefers a page break @@ -551,6 +566,10 @@ value @code{-1} means left aligned, @code{0}@tie{}centered, and values may also be specified.") (self-alignment-Y ,number? "Like @code{self-alignment-X} but for the Y@tie{}axis.") + (toward-stem-shift ,number? "Amount by which scripts are shifted +toward the stem if their direction coincides with the stem direction. +@code{0.0} means keep the default position (centered on the note head), +@code{1.0} means centered on the stem. Interpolated values are possible.") (shorten-pair ,number-pair? "The lengths to shorten a text-spanner on both sides, for example a pedal bracket. Positive values shorten the text-spanner, while negative values lengthen it.") @@ -570,6 +589,11 @@ is placed vertically.") @code{direction-source} with this to get the direction of this object.") (size ,number? "Size of object, relative to standard size.") + (skyline-horizontal-padding ,number? "For determining the vertical +distance between two staves, it is possible to have a configuration which +would result in a tight interleaving of grobs from the top staff and the +bottom staff. The larger this parameter is, the farther apart the staves +are placed in such a configuration.") (slash-negative-kern ,number? "The space to remove between slashes in percent repeat glyphs. Larger values bring the two elements closer together.") @@ -758,9 +782,6 @@ columns.") (note-columns ,pair? "A list of @code{NoteColumn} grobs.") (note-head ,ly:grob? "A single note head.") (note-heads ,ly:grob-array? "A list of note head grobs.") - - (padding-pairs ,list? "An alist mapping @code{(@var{name} . @var{name})} -to distances.") (pedal-text ,ly:grob? "A pointer to the text of a mixed-style piano pedal.") (pure-Y-common ,ly:grob? "A cache of the @@ -804,9 +825,6 @@ that should only show changes.") (cause ,scheme? "Any kind of causation objects (i.e., music, or perhaps translator) that was the cause for this grob.") - (circled-tip ,boolean? "Put a circle at start/end of hairpins (al/del -niente).") - (delta-position ,number? "The vertical position difference.") (details ,list? "Alist of parameters for detailed grob behavior. @@ -849,11 +867,6 @@ acts as an index for looking up a @code{Stencil} object.") Internally used to distribute beam shortening over stems.") (skyline-distance ,number? "The distance between this staff and the next one, as determined by a skyline algorithm.") - (skyline-horizontal-padding ,number? "For determining the vertical -distance between two staves, it is possible to have a configuration which -would result in a tight interleaving of grobs from the top staff and the -bottom staff. The larger this parameter is, the farther apart the staves -are placed in such a configuration.") (stem-info ,pair? "A cache of stem parameters.") (use-breve-rest ,boolean? "Use breve rests for measures longer diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index 4009f6ebdf..60e4a3e8fb 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -1638,11 +1638,13 @@ (thickness . 1.3) (cross-staff . ,ly:stem::calc-cross-staff) (flag . ,ly:stem::calc-flag) + (beamlet-default-length . (1.1 . 1.1)) + (beamlet-max-length-proportion . (0.75 . 0.75)) (details . ( ;; 3.5 (or 3 measured from note head) is standard length - ;; 32nd, 64th flagged stems should be longer - (lengths . (3.5 3.5 3.5 4.5 5.0)) + ;; 32nd, 64th, 128th flagged stems should be longer + (lengths . (3.5 3.5 3.5 4.5 5.0 6.0)) ;; FIXME. 3.5 yields too long beams (according to Ross and ;; looking at Baerenreiter examples) for a number of common diff --git a/scm/flag-styles.scm b/scm/flag-styles.scm index acdc38108f..ae671db8ba 100644 --- a/scm/flag-styles.scm +++ b/scm/flag-styles.scm @@ -2,6 +2,10 @@ ;;;; ;;;; source file of the GNU LilyPOnd music typesetter ;;;; +;;;; This file implements different flag styles in Scheme / GUILE, most +;;;; notably the old-straight-flag and the modern-straight-flag styles. +;;;; + (define-public (no-flag stem-grob) "No flag: Simply return empty stencil" @@ -13,41 +17,101 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; ;; TODO -;; (define-public (add-stroke-straight stencil dir stroke-style) -;; stencil -;; ) -;; -;; ;; Create a stencil for a straight flag -;; ;; flag-thickness, -spacing are given in staff spaces -;; ;; *flag-length are given in black notehead widths -;; ;; TODO -;; (define-public (straight-flag flag-thickness flag-spacing -;; upflag-angle upflag-length -;; downflag-angle downflag-length) -;; (lambda (stem-grob) -;; (let* ((log (ly:grob-property stem-grob 'duration-log)) -;; (staff-space 1) ; TODO -;; (black-notehead-width 1) ; TODO -;; (stem-thickness 1) ; TODO: get rid of -;; (half-stem-thickness (/ stem-thickness 2)) -;; (staff-space 1) ; TODO -;; (up-length (+ (* upflag-length black-notehead-width) half-stem-thickness)) -;; (down-length (+ (* downflag-length black-notehead-width) half-stem-thickness)) -;; (thickness (* flag-thickness staff-space)) -;; (spacing (* flag-spacing staff-space))) -;; empty-stencil -;; ) -;; ) -;; ) -;; -;; ;; Modern straight flags: angles are not so large as with the old style -;; (define-public (modern-straight-flag stem-grob) -;; ((straight-flag 0.55 0.9 -18 0.95 22 1.0) stem-grob)) -;; -;; ;; Old-straight flags (Bach, etc.): quite large flag angles -;; (define-public (old-straight-flag stem-grob) -;; ((straight-flag 0.55 0.9 -45 0.95 45 1.0) stem-grob)) +(define-public (add-stroke-straight stencil stem-grob dir log stroke-style offset length thickness stroke-thickness) + "Add the stroke for acciaccatura to the given flag stencil. + The stroke starts for up-flags at upper-end-of-flag+(0,length/2) and + ends at (0, vertical-center-of-flag-end) - (flag-x-width/2, flag-x-width + flag-thickness). + Here length is the whole length, while flag-x-width is just the + x-extent and thus depends on the angle! Other combinations don't look as + good... For down-stems the y-coordinates are simply mirrored." + (let* ((start (offset-add offset (cons 0 (* (/ length 2) dir)))) + (end (offset-add (cons 0 (cdr offset)) + (cons (- (/ (car offset) 2)) (* (- (+ thickness (car offset))) dir)))) + (stroke (make-line-stencil stroke-thickness (car start) (cdr start) (car end) (cdr end)))) + (ly:stencil-add stencil stroke))) + +(define PI-OVER-180 (/ (atan 1 1) 45)) +(define (degrees->radians angle-degrees) + "Convert the given angle from degrees to radians" + (* angle-degrees PI-OVER-180)) + +(define (polar->rectangular radius angle-in-degrees) + "Convert polar coordinate @code{radius} and @code{angle-in-degrees} + to (x-length . y-length)" + (let* ((complex (make-polar + radius + (degrees->radians angle-in-degrees)))) + (cons + (real-part complex) + (imag-part complex)))) + +(define (buildflag flag-stencil remain curr-stencil spacing) + "Internal function to recursively create a stencil with @code{remain} flags + from the single-flag stencil curr-stencil, which is already translated to + the position of the previous flag position." + (if (> remain 0) + (let* ((translated-stencil (ly:stencil-translate-axis curr-stencil spacing Y)) + (new-stencil (ly:stencil-add flag-stencil translated-stencil))) + (buildflag new-stencil (- remain 1) translated-stencil spacing)) + flag-stencil)) + +(define-public (straight-flag flag-thickness flag-spacing + upflag-angle upflag-length + downflag-angle downflag-length) + "Create a stencil for a straight flag. + flag-thickness, -spacing are given in staff spaces, + *flag-angle is given in degree, *flag-length is given in staff spaces. + All lengths will be scaled according to the font size of the note." + (lambda (stem-grob) + (let* ((log (ly:grob-property stem-grob 'duration-log)) + (dir (ly:grob-property stem-grob 'direction)) + (stem-up (eqv? dir UP)) + (layout (ly:grob-layout stem-grob)) + ; scale with the note size (e.g. for grace notes) + (factor (magstep (ly:grob-property stem-grob 'font-size 0))) + (grob-stem-thickness (ly:grob-property stem-grob 'thickness)) + (line-thickness (ly:output-def-lookup layout 'line-thickness)) + (half-stem-thickness (/ (* grob-stem-thickness line-thickness) 2)) + (raw-length (if stem-up upflag-length downflag-length)) + (angle (if stem-up upflag-angle downflag-angle)) + (flag-length (+ (* raw-length factor) half-stem-thickness)) + (flag-end (polar->rectangular flag-length angle)) + (thickness (* flag-thickness factor)) + (thickness-offset (cons 0 (* -1 thickness dir))) + (spacing (* -1 flag-spacing factor dir )) + (start (cons (- half-stem-thickness) (* half-stem-thickness dir))) + ; The points of a round-filled-polygon need to be given in clockwise + ; order, otherwise the polygon will be enlarged by blot-size*2! + (points (if stem-up (list start flag-end + (offset-add flag-end thickness-offset) + (offset-add start thickness-offset)) + (list start + (offset-add start thickness-offset) + (offset-add flag-end thickness-offset) + flag-end))) + (stencil (ly:round-filled-polygon points half-stem-thickness)) + ; Log for 1/8 is 3, so we need to subtract 3 + (flag-stencil (buildflag stencil (- log 3) stencil spacing)) + (stroke-style (ly:grob-property stem-grob 'stroke-style))) + (if (equal? stroke-style "grace") + (add-stroke-straight flag-stencil stem-grob + dir log + stroke-style + flag-end flag-length + thickness + (* half-stem-thickness 2)) + flag-stencil)))) + +(define-public (modern-straight-flag stem-grob) + "Modern straight flag style (for composers like Stockhausen, Boulez, etc.). + The angles are 18 and 22 degrees and thus smaller than for the ancient style + of Bach etc." + ((straight-flag 0.55 1 -18 1.1 22 1.2) stem-grob)) + +(define-public (old-straight-flag stem-grob) + "Old straight flag style (for composers like Bach). The angles of the flags + are both 45 degrees." + ((straight-flag 0.55 1 -45 1.2 45 1.4) stem-grob)) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm index 58026ff726..cfd72cf041 100644 --- a/scm/framework-ps.scm +++ b/scm/framework-ps.scm @@ -27,7 +27,6 @@ (define-public (ps-font-command font) (let* ((name (ly:font-file-name font)) (magnify (ly:font-magnification font))) - (string-append "magfont" (ly:string-substitute @@ -40,24 +39,27 @@ (define (define-fonts paper) (define font-list (ly:paper-fonts paper)) + (define (define-font command fontname scaling) (string-append - "/" command " { /" fontname " " (ly:number->string scaling) " output-scale div selectfont } bind def\n")) + "/" command + " { /" fontname + " " (ly:number->string scaling) " output-scale div selectfont }" + " bind def\n")) (define (font-load-command font) (let* ((specced-font-name (ly:font-name font)) (fontname (if specced-font-name - specced-font-name + specced-font-name (ly:font-file-name font))) (command (ps-font-command font)) - ;; FIXME -- see (ps-font-command ) + ;; FIXME -- see (ps-font-command) (plain (ps-font-command font)) (designsize (ly:font-design-size font)) (magnification (* (ly:font-magnification font))) (ops (ly:output-def-lookup paper 'output-scale)) (scaling (* ops magnification designsize))) - (if (equal? fontname "unknown") (display (list font fontname))) (define-font plain fontname scaling))) @@ -85,15 +87,13 @@ (string-append "/lily-output-units " - (number->string (/ (ly:bp 1))) - " def %% millimeter\n" + (number->string (/ (ly:bp 1))) " def %% millimeter\n" (output-entry "staff-line-thickness" 'line-thickness) (output-entry "line-width" 'line-width) (output-entry "paper-size" 'papersizename) (output-entry "staff-height" 'staff-height) ;junkme. "/output-scale " - (number->string (ly:output-def-lookup layout 'output-scale)) - " def\n" + (number->string (ly:output-def-lookup layout 'output-scale)) " def\n" (output-entry "page-height" 'paper-height) (output-entry "page-width" 'paper-width))) @@ -107,11 +107,9 @@ "page-width output-scale lily-output-units mul mul 0 translate 90 rotate\n" "") "%%EndPageSetup\n" - + "\n" "true setstrokeadjust\n" - "gsave 0 paper-height translate " - "set-ps-scale-to-lily-scale " - "\n")) + "gsave 0 paper-height translate set-ps-scale-to-lily-scale\n")) (ly:outputter-dump-stencil outputter page) (ly:outputter-dump-string outputter "stroke grestore\nshowpage\n")) @@ -119,94 +117,85 @@ (define (extract-names font) (if (ly:pango-font? font) (map car (ly:pango-font-physical-fonts font)) - (list (ly:font-name font)))) + (list (ly:font-name font)))) (let* ((fonts (ly:paper-fonts paper)) (names (apply append (map extract-names fonts)))) - (apply string-append (map (lambda (f) (format (if load-fonts? - "%%DocumentSuppliedResources: font ~a\n" - "%%DocumentNeededResources: font ~a\n") + "%%DocumentSuppliedResources: font ~a\n" + "%%DocumentNeededResources: font ~a\n") f)) (uniq-list (sort names stringstring bbox) " ") "\n" + (string-join (map ly:number->string bbox) " ") "\n" "%%Orientation: " - (if (eq? (ly:output-def-lookup paper 'landscape) #t) - "Landscape\n" - "Portrait\n") + (if (eq? (ly:output-def-lookup paper 'landscape) #t) + "Landscape\n" + "Portrait\n") (supplies-or-needs paper load-fonts?) "%%EndComments\n")) -(define (ps-document-media paper) - (let* ((w (/ (* - (ly:output-def-lookup paper 'output-scale) - (ly:output-def-lookup paper 'paper-width)) (ly:bp 1))) - (h (/ (* - (ly:output-def-lookup paper 'paper-height) - (ly:output-def-lookup paper 'output-scale)) - (ly:bp 1))) - (landscape? (eq? (ly:output-def-lookup paper 'landscape) #t))) - (ly:format "%%DocumentMedia: ~a ~2f ~2f ~a ~a ~a\n" - (ly:output-def-lookup paper 'papersizename) - (if landscape? h w) - (if landscape? w h) - 80 ;; weight - "()" ;; color - "()" ;; type - ))) - +(define (ps-document-media paper) + (let* ((w (/ (* + (ly:output-def-lookup paper 'output-scale) + (ly:output-def-lookup paper 'paper-width)) (ly:bp 1))) + (h (/ (* + (ly:output-def-lookup paper 'paper-height) + (ly:output-def-lookup paper 'output-scale)) + (ly:bp 1))) + (landscape? (eq? (ly:output-def-lookup paper 'landscape) #t))) + (ly:format "%%DocumentMedia: ~a ~2f ~2f ~a ~a ~a\n" + (ly:output-def-lookup paper 'papersizename) + (if landscape? h w) + (if landscape? w h) + 80 ;; weight + "()" ;; color + "()" ;; type + ))) (define (file-header paper page-count load-fonts?) (string-append "%!PS-Adobe-3.0\n" - "%%Creator: LilyPond " - (lilypond-version) - "\n" - + "%%Creator: LilyPond " (lilypond-version) "\n" "%%Pages: " (number->string page-count) "\n" "%%PageOrder: Ascend\n" "%%Orientation: " - (if (eq? (ly:output-def-lookup paper 'landscape) #t) - "Landscape\n" - "Portrait\n") + (if (eq? (ly:output-def-lookup paper 'landscape) #t) + "Landscape\n" + "Portrait\n") (ps-document-media paper) (supplies-or-needs paper load-fonts?) "%%EndComments\n")) (define (procset file-name) (format - "%%BeginResource: procset (~a) 1 0 + "%%BeginResource: procset (~a) 1 0 ~a %%EndResource " - file-name (cached-file-contents file-name))) + file-name (cached-file-contents file-name))) (define (embed-document file-name) (format "%%BeginDocument: ~a ~a %%EndDocument -" - file-name (cached-file-contents file-name))) +" + file-name (cached-file-contents file-name))) (define (setup-variables paper) (string-append "\n" (define-fonts paper) - (output-variables paper) - )) + (output-variables paper))) (define (cff-font? font) - (let* - ((cff-string (ly:otf-font-table-data font "CFF "))) + (let* ((cff-string (ly:otf-font-table-data font "CFF "))) (> (string-length cff-string) 0))) (define-public (ps-embed-cff body font-set-name version) @@ -214,7 +203,6 @@ (string-append (format "/~a ~s StartData " font-set-name (string-length body)) body)) - (header (format "%%BeginResource: font ~a @@ -233,12 +221,9 @@ (footer "\n%%EndData %%EndResource %%EndResource\n")) - - (string-append - header - binary-data - footer))) - + (string-append header + binary-data + footer))) (define (write-preamble paper load-fonts? port) (define (internal-font? file-name) @@ -246,14 +231,17 @@ (string-startswith file-name "emmentaler") (string-startswith file-name "aybabtu") (string-startswith file-name "Aybabtu"))) - (define (load-font-via-GS font-name-filename) + + (define (load-font-via-GS font-name-filename) (define (ps-load-file file-name) (if (string? file-name) (if (string-contains file-name (ly:get-option 'datadir)) (begin - (set! file-name (ly:string-substitute (ly:get-option 'datadir) "" file-name)) - (format "lilypond-datadir (~a) concatstrings (r) file .loadfont" file-name)) - + (set! file-name (ly:string-substitute (ly:get-option 'datadir) + "" file-name)) + (format + "lilypond-datadir (~a) concatstrings (r) file .loadfont\n" + file-name)) (format "(~a) (r) file .loadfont\n" file-name)) (format "% cannot find font file: ~a\n" file-name))) @@ -261,79 +249,63 @@ (name (cadr font-name-filename)) (file-name (caddr font-name-filename)) (bare-file-name (ly:find-file file-name))) - - (cons - name - - (if (mac-font? bare-file-name) - (handle-mac-font name bare-file-name) - (cond - ((internal-font? file-name) - (ps-load-file (ly:find-file - (format "~a.otf" file-name)))) - ((string? bare-file-name) - (ps-load-file file-name)) - (else - (ly:warning (_ "cannot embed ~S=~S") name file-name) - ""))) - - ))) + (cons name + (if (mac-font? bare-file-name) + (handle-mac-font name bare-file-name) + (cond + ((internal-font? file-name) + (ps-load-file (ly:find-file + (format "~a.otf" file-name)))) + ((string? bare-file-name) + (ps-load-file file-name)) + (else + (ly:warning (_ "cannot embed ~S=~S") name file-name) + "")))))) (define (dir-join a b) (if (equal? a "") b (string-append a "/" b))) - + (define (dir-listing dir-name) (define (dir-helper dir lst) (let ((e (readdir dir))) - (if (eof-object? e) lst (dir-helper dir (cons e lst))))) + (if (eof-object? e) + lst + (dir-helper dir (cons e lst))))) (reverse (dir-helper (opendir dir-name) '()))) - - (define (handle-mac-font name filename) - (let* - ((dir-name (tmpnam)) - (files '()) - (status 0) - (embed #f)) + (define (handle-mac-font name filename) + (let* ((dir-name (tmpnam)) + (files '()) + (status 0) + (embed #f)) (mkdir dir-name #o700) (set! status (ly:system (format "cd ~a && fondu -force '~a'" dir-name filename))) - (set! files (dir-listing dir-name)) - (for-each (lambda (f) - (let* - ((full-name (dir-join dir-name f))) - + (let* ((full-name (dir-join dir-name f))) (if (and (not embed) (equal? 'regular (stat:type (stat full-name))) (equal? name (ly:ttf-ps-name full-name))) - - (set! embed - (font-file-as-ps-string name full-name))) - - (if (or (equal? "." f) + (set! embed (font-file-as-ps-string name full-name))) + (if (or (equal? "." f) (equal? ".." f)) #t (delete-file full-name)))) - - files) (rmdir dir-name) - (if (not embed) (begin (set! embed "% failed\n") - (ly:warning (_ "cannot extract file matching ~a from ~a") name filename))) + (ly:warning (_ "cannot extract file matching ~a from ~a") + name filename))) embed)) - (define (font-file-as-ps-string name file-name) - (let* - ((downcase-file-name (string-downcase file-name))) - + (define (font-file-as-ps-string name file-name font-index) + (let* ((downcase-file-name (string-downcase file-name))) (cond ((and file-name (string-endswith downcase-file-name ".pfa")) (embed-document file-name)) @@ -341,44 +313,39 @@ (ly:pfb->pfa file-name)) ((and file-name (string-endswith downcase-file-name ".ttf")) (ly:ttf->pfa file-name)) + ((and file-name (string-endswith downcase-file-name ".ttc")) + (ly:ttf->pfa file-name font-index)) ((and file-name (string-endswith downcase-file-name ".otf")) (ps-embed-cff (ly:otf->cff file-name) name 0)) (else (ly:warning (_ "do not know how to embed ~S=~S") name file-name) "")))) - (define (mac-font? bare-file-name) - (and - (eq? PLATFORM 'darwin) - bare-file-name - (or - (string-endswith bare-file-name ".dfont") - (= (stat:size (stat bare-file-name)) 0)))) - - (define (load-font font-name-filename) - (let* ((font (car font-name-filename)) - (name (cadr font-name-filename)) - (file-name (caddr font-name-filename)) + (define (mac-font? bare-file-name) + (and (eq? PLATFORM 'darwin) + bare-file-name + (or (string-endswith bare-file-name ".dfont") + (= (stat:size (stat bare-file-name)) 0)))) + + (define (load-font font-psname-filename-fontindex) + (let* ((font (list-ref font-psname-filename-fontindex 0)) + (name (list-ref font-psname-filename-fontindex 1)) + (file-name (list-ref font-psname-filename-fontindex 2)) + (font-index (list-ref font-psname-filename-fontindex 3)) (bare-file-name (ly:find-file file-name))) - - (cons - name - (cond - - ((mac-font? bare-file-name) - (handle-mac-font name bare-file-name)) - - ((and font (cff-font? font)) - (ps-embed-cff (ly:otf-font-table-data font "CFF ") - name - 0)) - - (bare-file-name (font-file-as-ps-string name bare-file-name)) - (else - (ly:warning (_ "do not know how to embed font ~s ~s ~s") - name file-name font)))))) + (cons name + (cond ((mac-font? bare-file-name) + (handle-mac-font name bare-file-name)) + ((and font (cff-font? font)) + (ps-embed-cff (ly:otf-font-table-data font "CFF ") + name + 0)) + (bare-file-name (font-file-as-ps-string + name bare-file-name font-index)) + (else + (ly:warning (_ "do not know how to embed font ~s ~s ~s") + name file-name font)))))) - (define (load-fonts paper) (let* ((fonts (ly:paper-fonts paper)) @@ -386,69 +353,59 @@ (all-font-names (map (lambda (font) - (cond - ((string? (ly:font-file-name font)) - (list (list - font - (ly:font-name font) - (ly:font-file-name font)))) - ((ly:pango-font? font) - (map - (lambda (name-psname-pair) - (list #f - (car name-psname-pair) - (cdr name-psname-pair))) - (ly:pango-font-physical-fonts font))) - - (else - (ly:font-sub-fonts font)))) - + (cond ((string? (ly:font-file-name font)) + (list (list font + (ly:font-name font) + (ly:font-file-name font) + #f))) + ((ly:pango-font? font) + (map (lambda (psname-filename-fontindex) + (list #f + (list-ref psname-filename-fontindex 0) + (list-ref psname-filename-fontindex 1) + (list-ref psname-filename-fontindex 2))) + (ly:pango-font-physical-fonts font))) + (else + (ly:font-sub-fonts font)))) fonts)) - (font-names - (uniq-list - (sort (apply append all-font-names) - (lambda (x y) (stringpdf 0 0 (format "~a.eps" filename))) + (postscript->pdf 0 0 (format "~a.eps" filename))) )) extents-system-pairs) @@ -618,13 +575,13 @@ (define-public (clip-system-EPSes basename paper-book) - (define do-pdf (member "pdf" (ly:output-formats))) + (define do-pdf (member "pdf" (ly:output-formats))) (define (clip-score-systems basename systems) (let* ((layout (ly:grob-layout (paper-system-system-grob (car systems)))) (regions (ly:output-def-lookup layout 'clip-regions))) - + (for-each (lambda (region) (clip-systems-to-region @@ -634,9 +591,9 @@ (rhythmic-location->file-string (cdr region))) layout systems region do-pdf)) - + regions))) - + ;; partition in system lists sharing their layout blocks (let* @@ -644,22 +601,22 @@ (count 0) (score-system-list '())) - (fold + (fold (lambda (system last-system) - - + + (if (not (and last-system (equal? (paper-system-layout last-system) (paper-system-layout system)))) (set! score-system-list (cons '() score-system-list))) - + (if (paper-system-layout system) (set-car! score-system-list (cons system (car score-system-list)))) ;; pass value. system) - #f + #f systems) (for-each @@ -736,7 +693,7 @@ (landscape (ly:output-def-lookup defs 'landscape)) (output-scale (ly:output-def-lookup defs 'output-scale)) (convert (lambda (x) (* x output-scale (/ (ly:bp 1))))) - + (paper-width (convert (ly:output-def-lookup defs 'paper-width))) (paper-height (convert (ly:output-def-lookup defs 'paper-height))) @@ -768,8 +725,8 @@ (define-public (output-classic-framework basename book scopes fields) - (ly:error (_ "\nThe PostScript backend does not support the system-by-system -output. For that, use the EPS backend instead, + (ly:error (_ "\nThe PostScript backend does not support the system-by-system +output. For that, use the EPS backend instead, lilypond -dbackend=eps FILE diff --git a/scm/fret-diagrams.scm b/scm/fret-diagrams.scm index 5e713e5d71..e4da9f08d4 100644 --- a/scm/fret-diagrams.scm +++ b/scm/fret-diagrams.scm @@ -6,6 +6,7 @@ (define (fret-parse-marking-list marking-list fret-count) (let* ((fret-range (list 1 fret-count)) + (capo-fret 0) (barre-list '()) (dot-list '()) (xo-list '()) @@ -18,11 +19,14 @@ (set! xo-list (cons* my-item xo-list))) ((eq? my-code 'barre) (set! barre-list (cons* (cdr my-item) barre-list))) + ((eq? my-code 'capo) + (set! capo-fret (cadr my-item))) ((eq? my-code 'place-fret) (set! dot-list (cons* (cdr my-item) dot-list)))) (parse-item (cdr mylist))))) ;; calculate fret-range - (let ((maxfret 0) (minfret 99)) + (let ((maxfret 0) + (minfret (if (> capo-fret 0) capo-fret 99))) (let updatemax ((fret-list dot-list)) (if (null? fret-list) '() @@ -35,12 +39,14 @@ (list minfret (let ((upfret (- (+ minfret fret-count) 1))) (if (> maxfret upfret) maxfret upfret))))) + (set! capo-fret (1+ (- capo-fret minfret))) ; subtract fret from dots (set! dot-list (subtract-base-fret (- (car fret-range) 1) dot-list))) (acons 'fret-range fret-range (acons 'barre-list barre-list (acons 'dot-list dot-list - (acons 'xo-list xo-list '())))))) + (acons 'xo-list xo-list + (acons 'capo-fret capo-fret '()))))))) (define (subtract-base-fret base-fret dot-list) "Subtract @var{base-fret} from every fret in @var{dot-list}" @@ -141,6 +147,26 @@ fret & string spacing by @var{size}. Orientation is given by @var{orientation}" (ly:make-stencil (list 'round-filled-box y1 y2 x1 x2 sth) y-extent x-extent)))) +(define (draw-capo details string-count fret fret-count th size + dot-pos orientation) + "Draw a capo indicator across the full width of the fret-board + at fret capo-fret." + (let* ((sth (* th size)) + (capo-thick + (* size (assoc-get 'capo-thickness details 0.5))) + (half-thick (* capo-thick 0.5)) + (last-string-pos 0) + (first-string-pos (* size (- string-count 1))) + (fret-pos ( * size (if (eq? orientation 'normal) + (+ 2 (- fret-count fret dot-pos)) + (1- (+ dot-pos fret)))))) + (if (eq? orientation 'normal) + (make-line-stencil capo-thick + last-string-pos fret-pos first-string-pos fret-pos) + (make-line-stencil capo-thick + fret-pos last-string-pos fret-pos first-string-pos)))) + + (define (draw-frets fret-range string-count th size orientation) "Draw the fret lines for a fret diagram with @var{string-count} strings and frets as indicated in @var{fret-range}. @@ -426,7 +452,7 @@ Line thickness is given by @var{th}, fret & string spacing by (* size (+ 1 label-vertical-offset)) X)))) (define-builtin-markup-command (fret-diagram-verbose layout props marking-list) - (list?) ; argument type + (pair?) ; argument type (list, but use pair? for speed) instrument-specific-markup ; markup type ((align-dir -0.4) ; properties and defaults (size 1.0) @@ -458,6 +484,11 @@ Place a small @q{o} at the top of string @var{string-number}. Place a barre indicator (much like a tie) from string @var{start-string} to string @var{end-string} at fret @var{fret-number}. +@item (capo @var{fret-number}) +Place a capo indicator (a large solid bar) across the entire fretboard +at fret location @var{fret-number}. Also, set fret @var{fret-number} +to be the lowest fret on the fret diagram. + @item (place-fret @var{string-number} @var{fret-number} @var{finger-value}) Place a fret playing indication on string @var{string-number} at fret @var{fret-number} with an optional fingering label @var{finger-value}. @@ -519,6 +550,7 @@ indications per string. (label-space (* 0.25 size)) (label-dir (assoc-get 'label-dir details RIGHT)) (parameters (fret-parse-marking-list marking-list fret-count)) + (capo-fret (assoc-get 'capo-fret parameters 0)) (dot-list (cdr (assoc 'dot-list parameters))) (xo-list (cdr (assoc 'xo-list parameters))) (fret-range (cdr (assoc 'fret-range parameters))) @@ -569,6 +601,12 @@ indications per string. (draw-xo layout props string-count fret-range size xo-list orientation) xo-padding)))) + (if (> capo-fret 0) + (set! fret-diagram-stencil + (ly:stencil-add + fret-diagram-stencil + (draw-capo details string-count capo-fret fret-count + th size dot-position orientation)))) (if (> (car fret-range) 1) (set! fret-diagram-stencil (if (eq? orientation 'normal) diff --git a/scm/lily.scm b/scm/lily.scm index 2c1eb188e6..086d80f09f 100644 --- a/scm/lily.scm +++ b/scm/lily.scm @@ -89,8 +89,6 @@ relative to the current file (instead of the root file)") (separate-log-files #f "Output to FILE.log per file.") (trace-memory-frequency #f "Record Scheme cell usage this many times per second, and dump to file.") (trace-scheme-coverage #f "Record coverage of Scheme files") - (ttf-verbosity 0 - "how much verbosity for TTF font embedding?") (show-available-fonts #f "List font names available.") (verbose ,(ly:command-line-verbose?) "value for the --verbose flag") diff --git a/scm/output-lib.scm b/scm/output-lib.scm index b93eddaa9a..6a547776b5 100644 --- a/scm/output-lib.scm +++ b/scm/output-lib.scm @@ -250,6 +250,7 @@ centered, X==1 is at the right, X == -1 is at the left." ("" . ("" . "")) (":" . (":" . "")) ("." . ("." . ())) + ("'" . ("'" . ())) ("empty" . (() . ())) ("brace" . (() . "brace")) ("bracket" . (() . "bracket")) @@ -669,4 +670,21 @@ centered, X==1 is at the right, X == -1 is at the left." (define-public (script-interface::calc-x-offset grob) (ly:grob-property grob 'positioning-done) - (ly:self-alignment-interface::centered-on-x-parent grob)) + (let* ((shift (ly:grob-property grob 'toward-stem-shift 0.0)) + (note-head-location (ly:self-alignment-interface::centered-on-x-parent grob)) + (note-head-grob (ly:grob-parent grob X)) + (stem-grob (ly:grob-object note-head-grob 'stem))) + (+ note-head-location + ;; If the property 'toward-stem-shift is defined and the script has the + ;; same direction as the stem, move the script accordingly. Since scripts can + ;; also be over skips, we need to check whether the grob has a stem at all. + (if (ly:grob? stem-grob) + (let ((dir1 (ly:grob-property grob 'direction)) + (dir2 (ly:grob-property stem-grob 'direction))) + (if (equal? dir1 dir2) + (let* ((common-refp (ly:grob-common-refpoint grob stem-grob X)) + (stem-location (ly:grob-relative-coordinate stem-grob common-refp X))) + (* shift (- stem-location + note-head-location))) + 0.0)) + 0.0)))) diff --git a/scm/predefined-fretboards.scm b/scm/predefined-fretboards.scm index 7040add95e..c08aa07a8e 100644 --- a/scm/predefined-fretboards.scm +++ b/scm/predefined-fretboards.scm @@ -7,62 +7,40 @@ (define-public (parse-terse-string terse-definition) "Parse a fret-diagram-terse definition string @code{terse-definition} and -return a marking list, which can be used as with a fretboard grob." +return a marking list, which can be used with a fretboard grob." (cdr (fret-parse-terse-definition-string (list '()) terse-definition))) -(define-public (get-chord-shape shape-code base-chord-shapes) -"Return the chord shape associated with key @code{shape-code} in -the alist @code{base-chord-shapes}." - (assoc-get shape-code base-chord-shapes #f)) - -(define-public (offset-fret fret-offset terse-string) -"Add @code{fret-offset} to each fret indication in @code{terse-string} -and return the resulting fret-diagram-terse definition string." - - (define (split-fretstring fret-string) - (map (lambda (x) (split-item x)) - (string-split fret-string #\sp ))) - - (define (split-item item-string) - (string-split item-string #\- )) - - (define (split-terse-string terse-string) - (let ((long-list - (string-split terse-string #\;))) - (map (lambda (x) (split-fretstring x)) - (list-head long-list (1- (length long-list)))))) - - (define (join-terse-string terse-string-list) - (string-join - (map (lambda (x) (join-fretstring x)) terse-string-list) - ";" 'suffix)) - - (define (join-item item-list) - (string-join item-list "-" )) - - (define (join-fretstring fretstring-list) - (string-join - (map (lambda (x) (join-item x)) fretstring-list) - " " )) - - (define (add-item-fret-offset fret-offset item-list) - (let ((fretval (string->number (car item-list)))) - (if fretval - (cons (number->string (+ fretval fret-offset)) - (cdr item-list)) - item-list))) - - (define (add-fretstring-fret-offset fret-offset fretstring-list) - (map (lambda (x) (add-item-fret-offset fret-offset x)) - fretstring-list)) - - (define (add-terse-fret-offset fret-offset terse-string-list) - (map (lambda (x) (add-fretstring-fret-offset fret-offset x)) - terse-string-list)) - -;; body - (join-terse-string - (add-terse-fret-offset - fret-offset - (split-terse-string terse-string)))) +(define-public (get-chord-shape shape-code tuning base-chord-shapes) +"Return the chord shape associated with @code{shape-code} and +@code{tuning} in the hash-table @code{base-chord-shapes}." + (let ((hash-handle (hash-get-handle base-chord-shapes + (cons shape-code tuning)))) + (if hash-handle + (cdr hash-handle) + '()))) + +(define-public (offset-fret fret-offset diagram-definition) +"Add @code{fret-offset} to each fret indication in @code{diagram-definition} +and return the resulting verbose fret-diagram-definition." + (let ((verbose-definition + (if (string? diagram-definition) + (parse-terse-string diagram-definition) + diagram-definition))) + (map (lambda(item) + (let ((code (car item))) + (cond + ((eq? code 'barre) + (list-set! item 3 + (+ fret-offset (list-ref item 3))) + item) + ((eq? code 'capo) + (list-set! item 1 + (+ fret-offset (list-ref item 1))) + item) + ((eq? code 'place-fret) + (list-set! item 2 + (+ fret-offset (list-ref item 2))) + item) + (else item)))) + verbose-definition))) diff --git a/scm/script.scm b/scm/script.scm index eb2fad500a..5e2a2a9ca0 100644 --- a/scm/script.scm +++ b/scm/script.scm @@ -111,6 +111,7 @@ (side-relative-direction . -1) (quantize-position . #t) (avoid-slur . inside) + (toward-stem-shift . 0.5) (padding . 0.20) (script-priority . -100))) ("tenuto" . diff --git a/tex/texinfo.tex b/tex/texinfo.tex index 434a90f5ae..c7c92b8de7 100644 --- a/tex/texinfo.tex +++ b/tex/texinfo.tex @@ -3,7 +3,7 @@ % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % -\def\texinfoversion{2008-11-07.12} +\def\texinfoversion{2008-12-16.21} % % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, @@ -98,6 +98,8 @@ \let\ptexstar=\* \let\ptext=\t \let\ptextop=\top +{\catcode`\'=\active +\global\let\ptexquoteright'}% Math-mode def from plain.tex. % If this character appears in an error message or help string, it % starts a new line in the output. @@ -945,6 +947,8 @@ where each line of input produces a line of output.} \catcode`>=\other \catcode`+=\other \catcode`-=\other + \catcode`\`=\other + \catcode`\'=\other } \def\pushthisfilestack{% @@ -1143,11 +1147,13 @@ where each line of input produces a line of output.} \catcode`< = \active \catcode`> = \active \catcode`+ = \active + \catcode`' = \active \gdef\mathactive{% \let^ = \ptexhat \let< = \ptexless \let> = \ptexgtr \let+ = \ptexplus + \let' = \ptexquoteright } } @@ -1329,7 +1335,10 @@ output) for that.)} \def\cmykDarkRed{0.28 1 1 0.35} \def\cmykBlack{0 0 0 1} % - \def\pdfsetcolor#1{\pdfliteral{#1 k}} + % k sets the color for filling (usual text, etc.); + % K sets the color for stroking (thin rules, e.g., normal _'s). + \def\pdfsetcolor#1{\pdfliteral{#1 k #1 K}} + % % Set color, and create a mark which defines \thiscolor accordingly, % so that \makeheadline knows which color to restore. \def\setcolor#1{% @@ -1598,6 +1607,7 @@ output) for that.)} \setcolor{\linkcolor}#1\endlink} \def\done{\edef\st{\global\noexpand\toksA={\the\toksB}}\st} \else + % non-pdf mode \let\pdfmkdest = \gobble \let\pdfurl = \gobble \let\endlink = \relax @@ -1628,6 +1638,10 @@ output) for that.)} \def\bf{\fam=\bffam \setfontstyle{bf}}\def\bfstylename{bf} \def\tt{\fam=\ttfam \setfontstyle{tt}} +% Unfortunately, we have to override this for titles and the like, since +% in those cases "rm" is bold. Sigh. +\def\rmisbold{\rm\def\curfontstyle{bf}} + % Texinfo sort of supports the sans serif font style, which plain TeX does not. % So we set up a \sf. \newfam\sffam @@ -2025,8 +2039,6 @@ end \setfont\titlesc\scbshape{10}{\magstep4}{OT1} \font\titlei=cmmi12 scaled \magstep3 \font\titlesy=cmsy10 scaled \magstep4 -\def\authorrm{\secrm} -\def\authortt{\sectt} \def\titleecsize{2074} % Chapter (and unnumbered) fonts (17.28pt). @@ -2158,8 +2170,6 @@ end \setfont\titlesc\scbshape{10}{\magstep4}{OT1} \font\titlei=cmmi12 scaled \magstep3 \font\titlesy=cmsy10 scaled \magstep4 -\def\authorrm{\secrm} -\def\authortt{\sectt} \def\titleecsize{2074} % Chapter fonts (14.4pt). @@ -2291,7 +2301,7 @@ end \def\curfontsize{title}% \def\lsize{chap}\def\lllsize{subsec}% \resetmathfonts \setleading{25pt}} -\def\titlefont#1{{\titlefonts\rm #1}} +\def\titlefont#1{{\titlefonts\rmisbold #1}} \def\chapfonts{% \let\tenrm=\chaprm \let\tenit=\chapit \let\tensl=\chapsl \let\tenbf=\chapbf \let\tentt=\chaptt \let\smallcaps=\chapsc @@ -2342,6 +2352,16 @@ end \def\lsize{smaller}\def\lllsize{smaller}% \resetmathfonts \setleading{9.5pt}} +% Fonts for short table of contents. +\setfont\shortcontrm\rmshape{12}{1000}{OT1} +\setfont\shortcontbf\bfshape{10}{\magstep1}{OT1} % no cmb12 +\setfont\shortcontsl\slshape{12}{1000}{OT1} +\setfont\shortconttt\ttshape{12}{1000}{OT1TT} + +% Define these just so they can be easily changed for other fonts. +\def\angleleft{$\langle$} +\def\angleright{$\rangle$} + % Set the fonts to use with the @small... environments. \let\smallexamplefonts = \smallfonts @@ -2355,28 +2375,128 @@ end % % By the way, for comparison, here's what fits with @example (10pt): % 8.5x11=71 smallbook=60 a4=75 a5=58 -% -% I wish the USA used A4 paper. % --karl, 24jan03. - % Set up the default fonts, so we can use them for creating boxes. % \definetextfontsizexi -% Define these so they can be easily changed for other fonts. -\def\angleleft{$\langle$} -\def\angleright{$\rangle$} + +\message{markup,} + +% Check if we are currently using a typewriter font. Since all the +% Computer Modern typewriter fonts have zero interword stretch (and +% shrink), and it is reasonable to expect all typewriter fonts to have +% this property, we can check that font parameter. +% +\def\ifmonospace{\ifdim\fontdimen3\font=0pt } + +% Markup style infrastructure. \defmarkupstylesetup\INITMACRO will +% define and register \INITMACRO to be called on markup style changes. +% \INITMACRO can check \currentmarkupstyle for the innermost +% style and the set of \ifmarkupSTYLE switches for all styles +% currently in effect. +\newif\ifmarkupvar +\newif\ifmarkupsamp +\newif\ifmarkupkey +%\newif\ifmarkupfile % @file == @samp. +%\newif\ifmarkupoption % @option == @samp. +\newif\ifmarkupcode +\newif\ifmarkupkbd +%\newif\ifmarkupenv % @env == @code. +%\newif\ifmarkupcommand % @command == @code. +\newif\ifmarkuptex % @tex (and part of @math, for now). +\newif\ifmarkupexample +\newif\ifmarkupverb +\newif\ifmarkupverbatim + +\let\currentmarkupstyle\empty + +\def\setupmarkupstyle#1{% + \csname markup#1true\endcsname + \def\currentmarkupstyle{#1}% + \markupstylesetup +} + +\let\markupstylesetup\empty + +\def\defmarkupstylesetup#1{% + \expandafter\def\expandafter\markupstylesetup + \expandafter{\markupstylesetup #1}% + \def#1% +} + +% Markup style setup for left and right quotes. +\defmarkupstylesetup\markupsetuplq{% + \expandafter\let\expandafter \temp \csname markupsetuplq\currentmarkupstyle\endcsname + \ifx\temp\relax \markupsetuplqdefault \else \temp \fi +} + +\defmarkupstylesetup\markupsetuprq{% + \expandafter\let\expandafter \temp \csname markupsetuprq\currentmarkupstyle\endcsname + \ifx\temp\relax \markupsetuprqdefault \else \temp \fi +} + +{ +\catcode`\'=\active +\catcode`\`=\active + +\gdef\markupsetuplqdefault{\let`\lq} +\gdef\markupsetuprqdefault{\let'\rq} + +\gdef\markupsetcodequoteleft{\let`\codequoteleft} +\gdef\markupsetcodequoteright{\let'\codequoteright} + +\gdef\markupsetnoligaturesquoteleft{\let`\noligaturesquoteleft} +} + +\let\markupsetuplqcode \markupsetcodequoteleft +\let\markupsetuprqcode \markupsetcodequoteright +\let\markupsetuplqexample \markupsetcodequoteleft +\let\markupsetuprqexample \markupsetcodequoteright +\let\markupsetuplqverb \markupsetcodequoteleft +\let\markupsetuprqverb \markupsetcodequoteright +\let\markupsetuplqverbatim \markupsetcodequoteleft +\let\markupsetuprqverbatim \markupsetcodequoteright + +\let\markupsetuplqsamp \markupsetnoligaturesquoteleft +\let\markupsetuplqkbd \markupsetnoligaturesquoteleft + +% Allow an option to not replace quotes with a regular directed right +% quote/apostrophe (char 0x27), but instead use the undirected quote +% from cmtt (char 0x0d). The undirected quote is ugly, so don't make it +% the default, but it works for pasting with more pdf viewers (at least +% evince), the lilypond developers report. xpdf does work with the +% regular 0x27. +% +\def\codequoteright{% + \expandafter\ifx\csname SETtxicodequoteundirected\endcsname\relax + \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax + '% + \else \char'15 \fi + \else \char'15 \fi +} +% +% and a similar option for the left quote char vs. a grave accent. +% Modern fonts display ASCII 0x60 as a grave accent, so some people like +% the code environments to do likewise. +% +\def\codequoteleft{% + \expandafter\ifx\csname SETtxicodequotebacktick\endcsname\relax + \expandafter\ifx\csname SETcodequotebacktick\endcsname\relax + % [Knuth] pp. 380,381,391 + % \relax disables Spanish ligatures ?` and !` of \tt font. + \relax`% + \else \char'22 \fi + \else \char'22 \fi +} + +% [Knuth] pp. 380,381,391, disable Spanish ligatures ?` and !` of \tt font. +\def\noligaturesquoteleft{\relax\lq} % Count depth in font-changes, for error checks \newcount\fontdepth \fontdepth=0 -% Fonts for short table of contents. -\setfont\shortcontrm\rmshape{12}{1000}{OT1} -\setfont\shortcontbf\bfshape{10}{\magstep1}{OT1} % no cmb12 -\setfont\shortcontsl\slshape{12}{1000}{OT1} -\setfont\shortconttt\ttshape{12}{1000}{OT1TT} - %% Add scribe-like font environments, plus @l for inline lisp (usually sans %% serif) and @ii for TeX italic @@ -2391,17 +2511,22 @@ end % @var is set to this for defun arguments. \def\ttslanted#1{{\ttsl #1}\futurelet\next\smartitalicx} -% like \smartslanted except unconditionally use \sl. We never want +% @cite is like \smartslanted except unconditionally use \sl. We never want % ttsl for book titles, do we? \def\cite#1{{\sl #1}\futurelet\next\smartitalicx} \let\i=\smartitalic \let\slanted=\smartslanted -\let\var=\smartslanted +\def\var#1{{\setupmarkupstyle{var}\smartslanted{#1}}} \let\dfn=\smartslanted \let\emph=\smartitalic -% @b, explicit bold. +% Explicit font changes: @r, @sc, undocumented @ii. +\def\r#1{{\rm #1}} % roman font +\def\sc#1{{\smallcaps#1}} % smallcaps font +\def\ii#1{{\it #1}} % italic font + +% @b, explicit bold. Also @strong. \def\b#1{{\bf #1}} \let\strong=\b @@ -2433,22 +2558,35 @@ end \catcode`@=\other \def\endofsentencespacefactor{3000}% default +% @t, explicit typewriter. \def\t#1{% {\tt \rawbackslash \plainfrenchspacing #1}% \null } -\def\samp#1{`\tclose{#1}'\null} -\setfont\keyrm\rmshape{8}{1000}{OT1} -\font\keysy=cmsy9 -\def\key#1{{\keyrm\textfont2=\keysy \leavevmode\hbox{% - \raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{% - \vbox{\hrule\kern-0.4pt - \hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}% - \kern-0.4pt\hrule}% - \kern-.06em\raise0.4pt\hbox{\angleright}}}} -\def\key #1{{\nohyphenation \uppercase{#1}}\null} -% The old definition, with no lozenge: -%\def\key #1{{\ttsl \nohyphenation \uppercase{#1}}\null} + +% @samp. +\def\samp#1{{\setupmarkupstyle{samp}\lq\tclose{#1}\rq\null}} + +% definition of @key that produces a lozenge. Doesn't adjust to text size. +%\setfont\keyrm\rmshape{8}{1000}{OT1} +%\font\keysy=cmsy9 +%\def\key#1{{\keyrm\textfont2=\keysy \leavevmode\hbox{% +% \raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{% +% \vbox{\hrule\kern-0.4pt +% \hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}% +% \kern-0.4pt\hrule}% +% \kern-.06em\raise0.4pt\hbox{\angleright}}}} + +% definition of @key with no lozenge. If the current font is already +% monospace, don't change it; that way, we respect @kbdinputstyle. But +% if it isn't monospace, then use \tt. +% +\def\key#1{{\setupmarkupstyle{key} + \nohyphenation + \ifmonospace\else\tt\fi + #1}\null} + +% ctrl is no longer a Texinfo command. \def\ctrl #1{{\tt \rawbackslash \hat}#1} % @file, @option are the same as @samp. @@ -2493,9 +2631,8 @@ end \global\let'=\rq \global\let`=\lq % default definitions % \global\def\code{\begingroup - \catcode\rquoteChar=\active \catcode\lquoteChar=\active - \let'\codequoteright \let`\codequoteleft - % + \setupmarkupstyle{code}% + % The following should really be moved into \setupmarkupstyle handlers. \catcode\dashChar=\active \catcode\underChar=\active \ifallowcodebreaks \let-\codedash @@ -2547,6 +2684,7 @@ end % @kbd is like @code, except that if the argument is just one @key command, % then @kbd has no effect. +\def\kbd#1{{\setupmarkupstyle{kbd}\def\look{#1}\expandafter\kbdfoo\look??\par}} % @kbdinputstyle -- arg is `distinct' (@kbd uses slanted tty font always), % `example' (@kbd uses ttsl only inside of @example and friends), @@ -2568,14 +2706,14 @@ end \def\wordexample{example} \def\wordcode{code} -% Default is `distinct.' +% Default is `distinct'. \kbdinputstyle distinct \def\xkey{\key} \def\kbdfoo#1#2#3\par{\def\one{#1}\def\three{#3}\def\threex{??}% \ifx\one\xkey\ifx\threex\three \key{#2}% -\else{\tclose{\kbdfont\look}}\fi -\else{\tclose{\kbdfont\look}}\fi} +\else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi +\else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi} % For @indicateurl, @env, @command quotes seem unnecessary, so use \code. \let\indicateurl=\code @@ -2638,30 +2776,16 @@ end \let\email=\uref \fi -% Check if we are currently using a typewriter font. Since all the -% Computer Modern typewriter fonts have zero interword stretch (and -% shrink), and it is reasonable to expect all typewriter fonts to have -% this property, we can check that font parameter. -% -\def\ifmonospace{\ifdim\fontdimen3\font=0pt } - % Typeset a dimension, e.g., `in' or `pt'. The only reason for the % argument is to make the input look right: @dmn{pt} instead of @dmn{}pt. % \def\dmn#1{\thinspace #1} -\def\kbd#1{\def\look{#1}\expandafter\kbdfoo\look??\par} - % @l was never documented to mean ``switch to the Lisp font'', % and it is not used as such in any manual I can find. We need it for % Polish suppressed-l. --karl, 22sep96. %\def\l#1{{\li #1}\null} -% Explicit font changes: @r, @sc, undocumented @ii. -\def\r#1{{\rm #1}} % roman font -\def\sc#1{{\smallcaps#1}} % smallcaps font -\def\ii#1{{\it #1}} % italic font - % @acronym for "FBI", "NATO", and the like. % We print this one point size smaller, since it's intended for % all-uppercase. @@ -2687,6 +2811,44 @@ end \fi } + +\message{glyphs,} + +% @point{}, @result{}, @expansion{}, @print{}, @equiv{}. +% +% Since these characters are used in examples, they should be an even number of +% \tt widths. Each \tt character is 1en, so two makes it 1em. +% +\def\point{$\star$} +\def\arrow{\leavevmode\raise.05ex\hbox to 1em{\hfil$\rightarrow$\hfil}} +\def\result{\leavevmode\raise.05ex\hbox to 1em{\hfil$\Rightarrow$\hfil}} +\def\expansion{\leavevmode\hbox to 1em{\hfil$\mapsto$\hfil}} +\def\print{\leavevmode\lower.1ex\hbox to 1em{\hfil$\dashv$\hfil}} +\def\equiv{\leavevmode\hbox to 1em{\hfil$\ptexequiv$\hfil}} + +% The @error{} command. +% Adapted from the TeXbook's \boxit. +% +\newbox\errorbox +% +{\tentt \global\dimen0 = 3em}% Width of the box. +\dimen2 = .55pt % Thickness of rules +% The text. (`r' is open on the right, `e' somewhat less so on the left.) +\setbox0 = \hbox{\kern-.75pt \reducedsf error\kern-1.5pt} +% +\setbox\errorbox=\hbox to \dimen0{\hfil + \hsize = \dimen0 \advance\hsize by -5.8pt % Space to left+right. + \advance\hsize by -2\dimen2 % Rules. + \vbox{% + \hrule height\dimen2 + \hbox{\vrule width\dimen2 \kern3pt % Space to left of text. + \vtop{\kern2.4pt \box0 \kern2.4pt}% Space above/below. + \kern3pt\vrule width\dimen2}% Space to right. + \hrule height\dimen2} + \hfil} +% +\def\error{\leavevmode\lower.7ex\copy\errorbox} + % @pounds{} is a sterling sign, which Knuth put in the CM italic font. % \def\pounds{{\it\$}} @@ -2752,16 +2914,31 @@ end \def\quotesinglbase{{\ecfont \char"0D}} % % This positioning is not perfect (see the ogonek LaTeX package), but -% we have the precomposed glyphs for the most common cases. +% we have the precomposed glyphs for the most common cases. We put the +% tests to use those glyphs in the single \ogonek macro so we have fewer +% dummy definitions to worry about for index entries, etc. +% % ogonek is also used with other letters in Lithuanian (IOU), but using % the precomposed glyphs for those is not so easy since they aren't in % the same EC font. -\def\ogonek#1{{\ecfont \setbox0=\hbox{#1}\ifdim\ht0=1ex\accent"0C #1% - \else\ooalign{\unhbox0\crcr\hidewidth\char"0C \hidewidth}\fi}} -\def\Aogonek{{\ecfont \char"81}} -\def\Eogonek{{\ecfont \char"86}} -\def\aogonek{{\ecfont \char"A1}} -\def\eogonek{{\ecfont \char"A6}} +\def\ogonek#1{{% + \def\temp{#1}% + \ifx\temp\macrocharA\Aogonek + \else\ifx\temp\macrochara\aogonek + \else\ifx\temp\macrocharE\Eogonek + \else\ifx\temp\macrochare\eogonek + \else + \ecfont \setbox0=\hbox{#1}% + \ifdim\ht0=1ex\accent"0C #1% + \else\ooalign{\unhbox0\crcr\hidewidth\char"0C \hidewidth}% + \fi + \fi\fi\fi\fi + }% +} +\def\Aogonek{{\ecfont \char"81}}\def\macrocharA{A} +\def\aogonek{{\ecfont \char"A1}}\def\macrochara{a} +\def\Eogonek{{\ecfont \char"86}}\def\macrocharE{E} +\def\eogonek{{\ecfont \char"A6}}\def\macrochare{e} % \def\ecfont{% % We can't distinguish serif/sans and italic/slanted, but this @@ -2892,12 +3069,9 @@ end \let\subtitlerm=\tenrm \def\subtitlefont{\subtitlerm \normalbaselineskip = 13pt \normalbaselines} -\def\authorfont{\authorrm \normalbaselineskip = 16pt \normalbaselines - \let\tt=\authortt} - \parseargdef\title{% \checkenv\titlepage - \leftline{\titlefonts\rm #1} + \leftline{\titlefonts\rmisbold #1} % print a rule at the page bottom also. \finishedtitlepagefalse \vskip4pt \hrule height 4pt width \hsize \vskip4pt @@ -2918,7 +3092,7 @@ end \else \checkenv\titlepage \ifseenauthor\else \vskip 0pt plus 1filll \seenauthortrue \fi - {\authorfont \leftline{#1}}% + {\secfonts\rmisbold \leftline{#1}}% \fi } @@ -4050,6 +4224,7 @@ end \definedummyword\guilsinglright \definedummyword\expansion \definedummyword\minus + \definedummyword\ogonek \definedummyword\pounds \definedummyword\point \definedummyword\print @@ -4093,6 +4268,7 @@ end \definedummyword\v \definedummyword\H \definedummyword\dotaccent + \definedummyword\ogonek \definedummyword\ringaccent \definedummyword\tieaccent \definedummyword\ubaraccent @@ -5075,7 +5251,6 @@ end % 3) Likewise, headings look best if no \parindent is used, and % if justification is not attempted. Hence \raggedright. - \def\majorheading{% {\advance\chapheadingskip by 10pt \chapbreak }% \parsearg\chapheadingzzz @@ -5085,7 +5260,7 @@ end \def\chapheadingzzz#1{% {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000 \parindent=0pt\raggedright - \rm #1\hfill}}% + \rmisbold #1\hfill}}% \bigskip \par\penalty 200\relax \suppressfirstparagraphindent } @@ -5204,7 +5379,7 @@ end \domark % {% - \chapfonts \rm + \chapfonts \rmisbold % % Have to define \lastsection before calling \donoderef, because the % xref code eventually uses it. On the other hand, it has to be called @@ -5266,7 +5441,7 @@ end \def\unnchfopen #1{% \chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000 \parindent=0pt\raggedright - \rm #1\hfill}}\bigskip \par\nobreak + \rmisbold #1\hfill}}\bigskip \par\nobreak } \def\chfopen #1#2{\chapoddpage {\chapfonts \vbox to 3in{\vfil \hbox to\hsize{\hfil #2} \hbox to\hsize{\hfil #1} \vfil}}% @@ -5275,7 +5450,7 @@ end \def\centerchfopen #1{% \chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000 \parindent=0pt - \hfill {\rm #1}\hfill}}\bigskip \par\nobreak + \hfill {\rmisbold #1}\hfill}}\bigskip \par\nobreak } \def\CHAPFopen{% \global\let\chapmacro=\chfopen @@ -5308,7 +5483,7 @@ end \def\sectionheading#1#2#3#4{% {% % Switch to the right set of fonts. - \csname #2fonts\endcsname \rm + \csname #2fonts\endcsname \rmisbold % \def\sectionlevel{#2}% \def\temptype{#3}% @@ -5344,6 +5519,11 @@ end \fi \fi\fi\fi % + % Go into vertical mode. Usually we'll already be there, but we + % don't want the following whatsit to end up in a preceding paragraph + % if the document didn't happen to have a blank line. + \par + % % Output the mark. Pass it through \safewhatsit, to take care of % the preceding space. \safewhatsit\domark @@ -5691,46 +5871,12 @@ end \message{environments,} % @foo ... @end foo. -% @point{}, @result{}, @expansion{}, @print{}, @equiv{}. -% -% Since these characters are used in examples, they should be an even number of -% \tt widths. Each \tt character is 1en, so two makes it 1em. -% -\def\point{$\star$} -\def\arrow{\leavevmode\raise.05ex\hbox to 1em{\hfil$\rightarrow$\hfil}} -\def\result{\leavevmode\raise.05ex\hbox to 1em{\hfil$\Rightarrow$\hfil}} -\def\expansion{\leavevmode\hbox to 1em{\hfil$\mapsto$\hfil}} -\def\print{\leavevmode\lower.1ex\hbox to 1em{\hfil$\dashv$\hfil}} -\def\equiv{\leavevmode\hbox to 1em{\hfil$\ptexequiv$\hfil}} - -% The @error{} command. -% Adapted from the TeXbook's \boxit. -% -\newbox\errorbox -% -{\tentt \global\dimen0 = 3em}% Width of the box. -\dimen2 = .55pt % Thickness of rules -% The text. (`r' is open on the right, `e' somewhat less so on the left.) -\setbox0 = \hbox{\kern-.75pt \reducedsf error\kern-1.5pt} -% -\setbox\errorbox=\hbox to \dimen0{\hfil - \hsize = \dimen0 \advance\hsize by -5.8pt % Space to left+right. - \advance\hsize by -2\dimen2 % Rules. - \vbox{% - \hrule height\dimen2 - \hbox{\vrule width\dimen2 \kern3pt % Space to left of text. - \vtop{\kern2.4pt \box0 \kern2.4pt}% Space above/below. - \kern3pt\vrule width\dimen2}% Space to right. - \hrule height\dimen2} - \hfil} -% -\def\error{\leavevmode\lower.7ex\copy\errorbox} - % @tex ... @end tex escapes into raw Tex temporarily. % One exception: @ is still an escape character, so that @end tex works. % But \@ or @@ will get a plain tex @ character. \envdef\tex{% + \setupmarkupstyle{tex}% \catcode `\\=0 \catcode `\{=1 \catcode `\}=2 \catcode `\$=3 \catcode `\&=4 \catcode `\#=6 \catcode `\^=7 \catcode `\_=8 \catcode `\~=\active \let~=\tie @@ -5740,6 +5886,8 @@ end \catcode `\|=\other \catcode `\<=\other \catcode `\>=\other + \catcode`\`=\other + \catcode`\'=\other \escapechar=`\\ % \let\b=\ptexb @@ -5875,6 +6023,7 @@ end % This macro is called at the beginning of all the @example variants, % inside a group. +\newdimen\nonfillparindent \def\nonfillstart{% \aboveenvbreak \hfuzz = 12pt % Don't be fussy @@ -5882,7 +6031,12 @@ end \let\par = \lisppar % don't ignore blank lines \obeylines % each line of input is a line of output \parskip = 0pt + % Turn off paragraph indentation but redefine \indent to emulate + % the normal \indent. + \nonfillparindent=\parindent \parindent = 0pt + \let\indent\nonfillindent + % \emergencystretch = 0pt % don't try to avoid overfull boxes \ifx\nonarrowing\relax \advance \leftskip by \lispnarrowing @@ -5893,6 +6047,24 @@ end \let\exdent=\nofillexdent } +\begingroup +\obeyspaces +% We want to swallow spaces (but not other tokens) after the fake +% @indent in our nonfill-environments, where spaces are normally +% active and set to @tie, resulting in them not being ignored after +% @indent. +\gdef\nonfillindent{\futurelet\temp\nonfillindentcheck}% +\gdef\nonfillindentcheck{% +\ifx\temp % +\expandafter\nonfillindentgobble% +\else% +\leavevmode\nonfillindentbox% +\fi% +}% +\endgroup +\def\nonfillindentgobble#1{\nonfillindent} +\def\nonfillindentbox{\hbox to \nonfillparindent{\hss}} + % If you want all examples etc. small: @set dispenvsize small. % If you want even small examples the full size: @set dispenvsize nosmall. % This affects the following displayed environments: @@ -5941,7 +6113,7 @@ end % \maketwodispenvs {lisp}{example}{% \nonfillstart - \tt\quoteexpand + \tt\setupmarkupstyle{example}% \let\kbdfont = \kbdexamplefont % Allow @kbd to do something special. \gobble % eat return } @@ -6045,6 +6217,10 @@ end \do\ \do\\\do\{\do\}\do\$\do\&% \do\#\do\^\do\^^K\do\_\do\^^A\do\%\do\~% \do\<\do\>\do\|\do\@\do+\do\"% + % Don't do the quotes -- if we do, @set txicodequoteundirected and + % @set txicodequotebacktick will not have effect on @verb and + % @verbatim, and ?` and !` ligatures won't get disabled. + %\do\`\do\'% } % % [Knuth] p. 380 @@ -6062,7 +6238,7 @@ end \def\setupverb{% \tt % easiest (and conventionally used) font for verbatim \def\par{\leavevmode\endgraf}% - \catcode`\`=\active + \setupmarkupstyle{verb}% \tabeightspaces % Respect line breaks, % print special symbols as themselves, and @@ -6077,33 +6253,6 @@ end \newdimen\tabw \setbox0=\hbox{\tt\space} \tabw=8\wd0 % tab amount % \def\starttabbox{\setbox0=\hbox\bgroup} - -% Allow an option to not replace quotes with a regular directed right -% quote/apostrophe (char 0x27), but instead use the undirected quote -% from cmtt (char 0x0d). The undirected quote is ugly, so don't make it -% the default, but it works for pasting with more pdf viewers (at least -% evince), the lilypond developers report. xpdf does work with the -% regular 0x27. -% -\def\codequoteright{% - \expandafter\ifx\csname SETtxicodequoteundirected\endcsname\relax - \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax - '% - \else \char'15 \fi - \else \char'15 \fi -} -% -% and a similar option for the left quote char vs. a grave accent. -% Modern fonts display ASCII 0x60 as a grave accent, so some people like -% the code environments to do likewise. -% -\def\codequoteleft{% - \expandafter\ifx\csname SETtxicodequotebacktick\endcsname\relax - \expandafter\ifx\csname SETcodequotebacktick\endcsname\relax - \relax`% the \relax disables the `! and `? ligatures - \else \char'22 \fi - \else \char'22 \fi -} % \begingroup \catcode`\^^I=\active @@ -6117,13 +6266,6 @@ end \wd0=\dimen0 \box0 \starttabbox }% } - \catcode`\'=\active - \gdef\rquoteexpand{\catcode\rquoteChar=\active \def'{\codequoteright}}% - % - \catcode`\`=\active - \gdef\lquoteexpand{\catcode\lquoteChar=\active \def`{\codequoteleft}}% - % - \gdef\quoteexpand{\rquoteexpand \lquoteexpand}% \endgroup % start the verbatim environment. @@ -6133,9 +6275,8 @@ end % Easiest (and conventionally used) font for verbatim \tt \def\par{\leavevmode\egroup\box0\endgraf}% - \catcode`\`=\active \tabexpand - \quoteexpand + \setupmarkupstyle{verbatim}% % Respect line breaks, % print special symbols as themselves, and % make each space count @@ -6474,7 +6615,7 @@ end % % On the other hand, if an argument has two dashes (for instance), we % want a way to get ttsl. Let's try @var for that. - \let\var=\ttslanted + \def\var##1{{\setupmarkupstyle{var}\ttslanted{##1}}}% #1% \sl\hyphenchar\font=45 } @@ -7923,7 +8064,7 @@ directory should work if nowhere else does.} \gdef^^a8{\"{}} \gdef^^a9{\copyright} \gdef^^aa{\ordf} - \gdef^^ab{\missingcharmsg{LEFT-POINTING DOUBLE ANGLE QUOTATION MARK}} + \gdef^^ab{\guillemetleft} \gdef^^ac{$\lnot$} \gdef^^ad{\-} \gdef^^ae{\registeredsymbol} @@ -7942,7 +8083,7 @@ directory should work if nowhere else does.} \gdef^^b9{$^1$} \gdef^^ba{\ordm} % - \gdef^^bb{\missingcharmsg{RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK}} + \gdef^^bb{\guilletright} \gdef^^bc{$1\over4$} \gdef^^bd{$1\over2$} \gdef^^be{$3\over4$} @@ -8035,7 +8176,7 @@ directory should work if nowhere else does.} % Latin2 (ISO-8859-2) character definitions. \def\lattwochardefs{% \gdef^^a0{~} - \gdef^^a1{\Aogonek} + \gdef^^a1{\ogonek{A}} \gdef^^a2{\u{}} \gdef^^a3{\L} \gdef^^a4{\missingcharmsg{CURRENCY SIGN}} @@ -8052,7 +8193,7 @@ directory should work if nowhere else does.} \gdef^^af{\dotaccent Z} % \gdef^^b0{\textdegree} - \gdef^^b1{\aogonek} + \gdef^^b1{\ogonek{a}} \gdef^^b2{\ogonek{ }} \gdef^^b3{\l} \gdef^^b4{\'{}} @@ -8078,7 +8219,7 @@ directory should work if nowhere else does.} \gdef^^c7{\cedilla C} \gdef^^c8{\v C} \gdef^^c9{\'E} - \gdef^^ca{\Eogonek} + \gdef^^ca{\ogonek{E}} \gdef^^cb{\"E} \gdef^^cc{\v E} \gdef^^cd{\'I} @@ -8112,7 +8253,7 @@ directory should work if nowhere else does.} \gdef^^e7{\cedilla c} \gdef^^e8{\v c} \gdef^^e9{\'e} - \gdef^^ea{\eogonek} + \gdef^^ea{\ogonek{e}} \gdef^^eb{\"e} \gdef^^ec{\v e} \gdef^^ed{\'\i} @@ -8341,14 +8482,14 @@ directory should work if nowhere else does.} \DeclareUnicodeCharacter{0101}{\=a} \DeclareUnicodeCharacter{0102}{\u{A}} \DeclareUnicodeCharacter{0103}{\u{a}} - \DeclareUnicodeCharacter{0104}{\Aogonek} - \DeclareUnicodeCharacter{0105}{\aogonek} + \DeclareUnicodeCharacter{0104}{\ogonek{A}} + \DeclareUnicodeCharacter{0105}{\ogonek{a}} \DeclareUnicodeCharacter{0106}{\'C} \DeclareUnicodeCharacter{0107}{\'c} \DeclareUnicodeCharacter{0108}{\^C} \DeclareUnicodeCharacter{0109}{\^c} - \DeclareUnicodeCharacter{0118}{\Eogonek} - \DeclareUnicodeCharacter{0119}{\eogonek} + \DeclareUnicodeCharacter{0118}{\ogonek{E}} + \DeclareUnicodeCharacter{0119}{\ogonek{e}} \DeclareUnicodeCharacter{010A}{\dotaccent{C}} \DeclareUnicodeCharacter{010B}{\dotaccent{c}} \DeclareUnicodeCharacter{010C}{\v{C}} @@ -8879,6 +9020,9 @@ directory should work if nowhere else does.} \message{and turning on texinfo input format.} +% DEL is a comment character, in case @c does not suffice. +\catcode`\^^? = 14 + % Define macros to output various characters with catcode for normal text. \catcode`\"=\other \catcode`\~=\other @@ -9000,6 +9144,8 @@ directory should work if nowhere else does.} @let>=@normalgreater @let+=@normalplus @let$=@normaldollar %$ font-lock fix + @markupsetuplqdefault + @markupsetuprqdefault @unsepspaces } @@ -9038,9 +9184,10 @@ directory should work if nowhere else does.} @c txicodequotebacktick work right in, e.g., @w{@code{`foo'}}. If we @c don't make ` and ' active, @code will not get them as active chars. @c Do this last of all since we use ` in the previous @catcode assignments. -@c (not ready yet, sigh) -@c atcode`@'=@active @let'@rq -@c atcode`@`=@active @let`@lq +@catcode`@'=@active +@catcode`@`=@active +@markupsetuplqdefault +@markupsetuprqdefault @c Local variables: @c eval: (add-hook 'write-file-hooks 'time-stamp)