From 9947f971144fa1e4ea834d3fcda1b1d3c55fc67d Mon Sep 17 00:00:00 2001 From: Neil Puttock Date: Tue, 24 Nov 2009 01:04:52 +0000 Subject: [PATCH] LSR: Update. --- ...ing-marks-with-various-notation-objects.ly | 47 +++++++++---------- ...g-spanner-visibility-after-a-line-break.ly | 42 +++++++++++++++++ .../creating-simultaneous-rehearsal-marks.ly | 3 ++ .../snippets/expressive-marks.snippet-list | 1 + Documentation/snippets/nesting-staves.ly | 2 +- ...g-spanner-visibility-after-a-line-break.ly | 37 +++++++++++++++ .../printing-marks-at-the-end-of-a-line.ly | 4 +- .../snippets/printing-marks-on-every-staff.ly | 19 ++++---- .../snippets/stand-alone-two-column-markup.ly | 17 ++++--- .../tweaks-and-overrides.snippet-list | 1 + 10 files changed, 127 insertions(+), 46 deletions(-) create mode 100644 Documentation/snippets/controlling-spanner-visibility-after-a-line-break.ly create mode 100644 Documentation/snippets/new/controlling-spanner-visibility-after-a-line-break.ly diff --git a/Documentation/snippets/aligning-marks-with-various-notation-objects.ly b/Documentation/snippets/aligning-marks-with-various-notation-objects.ly index 54552b3dfd..eadb92c4db 100644 --- a/Documentation/snippets/aligning-marks-with-various-notation-objects.ly +++ b/Documentation/snippets/aligning-marks-with-various-notation-objects.ly @@ -4,30 +4,6 @@ \version "2.13.4" \header { -%% Translation of GIT committish: c2e8b1d6d671dbfc138f890cbc7e9882b7be2761 - texidocfr = " -Les indications textuelles peuvent s'aligner par rapport à d'autres -objets que des barres de mesure, tels que @code{ambitus}, -@code{breathing-sign}, @code{clef}, @code{custos}, @code{staff-bar}, -@code{left-edge}, @code{key-cancellation}, @code{key-signature}, ou -@code{time-signature}. - - - -Par défaut, les indications textuelles sont alignées avec le milieu -des objets de notation. Bien entendu, vous pouvez modifier les -propriétés des objets en question pour obtenir un autre -résultat comme l'illustre la deuxième ligne de l'exemple. Dans le cas -de portées multiples, ces réglages doivent être faits pour chacune -d'entre elles. - - - -" - doctitlefr = "Alignement des indications par rapport à divers objets -de notation" - - lsrtags = "text" %% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca @@ -62,6 +38,29 @@ diese Einstellung für alle Systeme gemacht werden. " doctitlede = "Zeichen an verschiedenen Notationsobjekten ausrichten" +%% Translation of GIT committish: c2e8b1d6d671dbfc138f890cbc7e9882b7be2761 + texidocfr = " +Les indications textuelles peuvent s'aligner par rapport à d'autres +objets que des barres de mesure, tels que @code{ambitus}, +@code{breathing-sign}, @code{clef}, @code{custos}, @code{staff-bar}, +@code{left-edge}, @code{key-cancellation}, @code{key-signature}, ou +@code{time-signature}. + + + +Par défaut, les indications textuelles sont alignées avec le milieu +des objets de notation. Bien entendu, vous pouvez modifier les +propriétés des objets en question pour obtenir un autre +résultat comme l'illustre la deuxième ligne de l'exemple. Dans le cas +de portées multiples, ces réglages doivent être faits pour chacune +d'entre elles. + + + +" + doctitlefr = "Alignement des indications par rapport à divers objets +de notation" + texidoc = " If specified, text marks may be aligned with notation objects other diff --git a/Documentation/snippets/controlling-spanner-visibility-after-a-line-break.ly b/Documentation/snippets/controlling-spanner-visibility-after-a-line-break.ly new file mode 100644 index 0000000000..8fa822f174 --- /dev/null +++ b/Documentation/snippets/controlling-spanner-visibility-after-a-line-break.ly @@ -0,0 +1,42 @@ +% Do not edit this file; it is automatically +% generated from Documentation/snippets/new +% This file is in the public domain. +%% Note: this file works from version 2.13.1 +\version "2.13.4" + +\header { + lsrtags = "expressive-marks, tweaks-and-overrides" + texidoc = "The visibility of spanners which end on the first note +following a line break is controlled by the @code{after-line-breaking} +callback @code{ly:spanner::kill-zero-spanned-time}. + +For objects such as glissandos and hairpins, the default behaviour is +to hide the spanner after a break; disabling the callback will allow +the left-broken span to be shown. + +Conversely, spanners which are usually visible, such as text spans, +can be hidden by enabling the callback. +" + + doctitle = "Controlling spanner visibility after a line break" +} % begin verbatim + + +\paper { ragged-right = ##t } + +\relative c'' { + \override Hairpin #'to-barline = ##f + \override Glissando #'breakable = ##t + % show hairpin + \override Hairpin #'after-line-breaking = ##t + % hide text span + \override TextSpanner #'after-line-breaking = + #ly:spanner::kill-zero-spanned-time + e2\<\startTextSpan + % show glissando + \override Glissando #'after-line-breaking = ##t + f2\glissando + \break + f,1\!\stopTextSpan +} + diff --git a/Documentation/snippets/creating-simultaneous-rehearsal-marks.ly b/Documentation/snippets/creating-simultaneous-rehearsal-marks.ly index 64fbef0c6e..9f464b2d8c 100644 --- a/Documentation/snippets/creating-simultaneous-rehearsal-marks.ly +++ b/Documentation/snippets/creating-simultaneous-rehearsal-marks.ly @@ -42,9 +42,12 @@ end of one system and the start of the following system. \mark \markup { \bold { Senza denti } } % the hidden measure and bar line + % \cadenzaOn turns off automatic calculation of bar numbers + \cadenzaOn \once \override Score.TimeSignature #'stencil = ##f \time 1/16 s16 \bar "" + \cadenzaOff \time 4/4 \once \override Score.RehearsalMark #'self-alignment-X = #LEFT diff --git a/Documentation/snippets/expressive-marks.snippet-list b/Documentation/snippets/expressive-marks.snippet-list index abed115afd..83e6631a78 100644 --- a/Documentation/snippets/expressive-marks.snippet-list +++ b/Documentation/snippets/expressive-marks.snippet-list @@ -11,6 +11,7 @@ changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly changing-the-breath-mark-symbol.ly combining-dynamics-with-markup-texts.ly contemporary-glissando.ly +controlling-spanner-visibility-after-a-line-break.ly controlling-the-vertical-ordering-of-scripts.ly creating-a-delayed-turn.ly creating-arpeggios-across-notes-in-different-voices.ly diff --git a/Documentation/snippets/nesting-staves.ly b/Documentation/snippets/nesting-staves.ly index c6c8efca4d..2aa4a3cd59 100644 --- a/Documentation/snippets/nesting-staves.ly +++ b/Documentation/snippets/nesting-staves.ly @@ -46,7 +46,7 @@ regroupements imbriqués complexes. La commande @code{\\set@tie{}StaffGroup.systemStartDelimiterHierarchy} prend en argument la liste alphabétique des sous-groupes à hiérarchiser. Chaque sous-groupe peut être affublé d'un délimiteur particulier. Chacun des -regroupements intermédiaires doît être borné par des parenthèses. Bien +regroupements intermédiaires doit être borné par des parenthèses. Bien que des éléments de la liste puissent être omis, le premier délimiteur embrassera toujours l'intégralité des portées. Vous disposez des quatre délimiteurs @code{SystemStartBar}, @code{SystemStartBracket}, diff --git a/Documentation/snippets/new/controlling-spanner-visibility-after-a-line-break.ly b/Documentation/snippets/new/controlling-spanner-visibility-after-a-line-break.ly new file mode 100644 index 0000000000..9b04063b37 --- /dev/null +++ b/Documentation/snippets/new/controlling-spanner-visibility-after-a-line-break.ly @@ -0,0 +1,37 @@ +\version "2.13.1" + +\header { + lsrtags = "expressive-marks, tweaks-and-overrides" + texidoc = "The visibility of spanners which end on the first note +following a line break is controlled by the @code{after-line-breaking} +callback @code{ly:spanner::kill-zero-spanned-time}. + +For objects such as glissandos and hairpins, the default behaviour is +to hide the spanner after a break; disabling the callback will allow +the left-broken span to be shown. + +Conversely, spanners which are usually visible, such as text spans, +can be hidden by enabling the callback. +" + + doctitle = "Controlling spanner visibility after a line break" +} + +\paper { ragged-right = ##t } + +\relative c'' { + \override Hairpin #'to-barline = ##f + \override Glissando #'breakable = ##t + % show hairpin + \override Hairpin #'after-line-breaking = ##t + % hide text span + \override TextSpanner #'after-line-breaking = + #ly:spanner::kill-zero-spanned-time + e2\<\startTextSpan + % show glissando + \override Glissando #'after-line-breaking = ##t + f2\glissando + \break + f,1\!\stopTextSpan +} + diff --git a/Documentation/snippets/printing-marks-at-the-end-of-a-line.ly b/Documentation/snippets/printing-marks-at-the-end-of-a-line.ly index 594cb35fd0..b2ebd0e2fa 100644 --- a/Documentation/snippets/printing-marks-at-the-end-of-a-line.ly +++ b/Documentation/snippets/printing-marks-at-the-end-of-a-line.ly @@ -4,6 +4,8 @@ \version "2.13.4" \header { + lsrtags = "text" + %% Translation of GIT committish: c2e8b1d6d671dbfc138f890cbc7e9882b7be2761 texidocfr = " Les indications textuelles peuvent être imprimées à la fin d'une ligne @@ -14,8 +16,6 @@ droite de l'indication sur la barre de mesure. doctitlefr = "Indication texuelle en fin de ligne" - lsrtags = "text" - texidoc = " Marks can be printed at the end of the current line, instead of the beginning of the following line. In such cases, it might be preferable diff --git a/Documentation/snippets/printing-marks-on-every-staff.ly b/Documentation/snippets/printing-marks-on-every-staff.ly index 950a2e461b..bc8660cbd6 100644 --- a/Documentation/snippets/printing-marks-on-every-staff.ly +++ b/Documentation/snippets/printing-marks-on-every-staff.ly @@ -4,16 +4,6 @@ \version "2.13.4" \header { -%% Translation of GIT committish: c2e8b1d6d671dbfc138f890cbc7e9882b7be2761 - texidocfr = " -Bien que ces indications textuelles ne soient habituellement imprimées -qu'au niveau de la portée supérieure, vous pouvez forcer leur -affectation à chacune des portées. - -" - doctitlefr = "Impression des indications sur toutes les portées d'un système" - - lsrtags = "text" %% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca @@ -32,6 +22,15 @@ können aber auch über jedem System ausgegeben werden. " doctitlede = "Zeichen über jedem System ausgeben" +%% Translation of GIT committish: c2e8b1d6d671dbfc138f890cbc7e9882b7be2761 + texidocfr = " +Bien que ces indications textuelles ne soient habituellement imprimées +qu'au niveau de la portée supérieure, vous pouvez forcer leur +affectation à chacune des portées. + +" + doctitlefr = "Impression des indications sur toutes les portées d'un système" + texidoc = " Although text marks are normally only printed above the topmost staff, diff --git a/Documentation/snippets/stand-alone-two-column-markup.ly b/Documentation/snippets/stand-alone-two-column-markup.ly index 202049d6a5..6f25f8ff65 100644 --- a/Documentation/snippets/stand-alone-two-column-markup.ly +++ b/Documentation/snippets/stand-alone-two-column-markup.ly @@ -4,15 +4,6 @@ \version "2.13.4" \header { -%% Translation of GIT committish: c2e8b1d6d671dbfc138f890cbc7e9882b7be2761 - texidocfr = " -L'utilisation de la commande @code{\\markup} permet de distribuer un bloc -de texte indépendant sur plusieurs colonnes. - -" - doctitlefr = "Bloc de texte indépendant sur deux colonnes" - - lsrtags = "text" %% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca @@ -30,6 +21,14 @@ angeordnet werden: " doctitlede = "Isolierter Text in zwei Spalten" +%% Translation of GIT committish: c2e8b1d6d671dbfc138f890cbc7e9882b7be2761 + texidocfr = " +L'utilisation de la commande @code{\\markup} permet de distribuer un bloc +de texte indépendant sur plusieurs colonnes. + +" + doctitlefr = "Bloc de texte indépendant sur deux colonnes" + texidoc = " Stand-alone text may be arranged in several columns using diff --git a/Documentation/snippets/tweaks-and-overrides.snippet-list b/Documentation/snippets/tweaks-and-overrides.snippet-list index d7d55ade26..67efdd20a1 100644 --- a/Documentation/snippets/tweaks-and-overrides.snippet-list +++ b/Documentation/snippets/tweaks-and-overrides.snippet-list @@ -7,6 +7,7 @@ changing-form-of-multi-measure-rests.ly changing-properties-for-individual-grobs.ly changing-the-default-text-font-family.ly changing-the-staff-size.ly +controlling-spanner-visibility-after-a-line-break.ly controlling-the-vertical-ordering-of-scripts.ly controlling-tuplet-bracket-visibility.ly creating-a-delayed-turn.ly -- 2.39.2