From fce21752168a88c5887fb5544e664fa7395fb597 Mon Sep 17 00:00:00 2001 From: Neil Puttock Date: Sun, 16 Nov 2008 17:39:41 +0000 Subject: [PATCH] Remove InnerStaffGroup/InnerChoirStaff froms docs. --- Documentation/de/user/rhythms.itely | 4 +- Documentation/es/user/changing-defaults.itely | 11 ---- Documentation/es/user/staff.itely | 14 ++--- Documentation/user/changing-defaults.itely | 58 ++++++++----------- Documentation/user/rhythms.itely | 2 +- Documentation/user/staff.itely | 42 ++++---------- ...bracket-with-only-one-staff-in-a-system.ly | 7 +-- ...et-with-only-one-staff-in-a-system.texidoc | 7 +-- 8 files changed, 50 insertions(+), 95 deletions(-) diff --git a/Documentation/de/user/rhythms.itely b/Documentation/de/user/rhythms.itely index 76c1048607..ff13fa2f2e 100644 --- a/Documentation/de/user/rhythms.itely +++ b/Documentation/de/user/rhythms.itely @@ -2103,8 +2103,8 @@ c c c c In Partituren mit vielen Systemen wird ein @code{\bar}-Befehl in einem System automatisch auf alle anderen Systeme angewendet. Die resultierenden Taktlinien sind miteinander verbunden innerhalb einer Gruppe -(@code{StaffGroup} bzw. @code{InnerStaffGroup}) oder einem -Klaviersystem (@code{PianoStaff} bzw. (@code{GrandStaff}). +(@code{StaffGroup}) oder einem Klaviersystem +(@code{PianoStaff} bzw. (@code{GrandStaff}). @lilypond[quote,fragment,verbatim] << diff --git a/Documentation/es/user/changing-defaults.itely b/Documentation/es/user/changing-defaults.itely index f1aa3a5924..0d89ce2d24 100644 --- a/Documentation/es/user/changing-defaults.itely +++ b/Documentation/es/user/changing-defaults.itely @@ -139,17 +139,6 @@ Igual que GrandStaff pero con una distancia fija entre los pentagramas, de manera que se pueden usar ligaduras y barras que cruzan de un pentagrama a otro. -@ignore -@strong{@emph{InnerStaffGroup}} - -TODO -td - -@strong{@emph{InnerChoirStaff}} - -TODO -td - -@end ignore - @node Intermediate-level contexts - staves @unnumberedsubsubsec Intermediate-level contexts - staves diff --git a/Documentation/es/user/staff.itely b/Documentation/es/user/staff.itely index a78dfc2cf3..bc1bbe8103 100644 --- a/Documentation/es/user/staff.itely +++ b/Documentation/es/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.11.64" @node Staff notation @section Staff notation @@ -285,18 +285,18 @@ Referencia de funcionamiento interno: Están disponibles dos contextos adicionales de grupo de pentagramas que se pueden anidar dentro de un contexto @code{StaffGroup} o -@code{ChoirStaff}: @code{InnerStaffGroup} y @code{InnerChoirStaff}. +@code{ChoirStaff}: @code{StaffGroup} y @code{ChoirStaff}. Estos contextos crean un corchete nuevo adyacente al corchete del grupo de pentagramas que constituye su «padre». -Un @code{InnerStaffGroup} se trata de forma similar a un +Un @code{StaffGroup} se trata de forma similar a un @code{StaffGroup}; las barras de compás están conectadas entre todos los pentagramas que están dentro del contexto: @lilypond[verbatim,quote,relative=2] \new StaffGroup << \new Staff { c2 c | c2 c } - \new InnerStaffGroup << + \new StaffGroup << \new Staff { g2 g | g2 g } \new Staff { e2 e | e2 e } >> @@ -304,12 +304,12 @@ los pentagramas que están dentro del contexto: @end lilypond Las barras de compás @emph{no} se conectan entre los pentagramas de un -@code{InnerChoirStaff}, de igual forma que un @code{ChoirStaff}: +@code{ChoirStaff}, de igual forma que un @code{ChoirStaff}: @lilypond[verbatim,quote,relative=2] \new ChoirStaff << \new Staff { c2 c | c2 c } - \new InnerChoirStaff << + \new ChoirStaff << \new Staff { g2 g | g2 g } \new Staff { e2 e | e2 e } >> @@ -338,9 +338,7 @@ Fragmentos de código: @rlsr{Staff notation}. Referencia de funcionamiento interno: -@rinternals{InnerStaffGroup}, @rinternals{StaffGroup}, -@rinternals{InnerChoirStaff}, @rinternals{ChoirStaff}, @rinternals{SystemStartBar}, @rinternals{SystemStartBrace}, diff --git a/Documentation/user/changing-defaults.itely b/Documentation/user/changing-defaults.itely index 2dc41815d7..9ad68c3f81 100644 --- a/Documentation/user/changing-defaults.itely +++ b/Documentation/user/changing-defaults.itely @@ -108,7 +108,7 @@ further explanation and with links to the IR. @c TODO Describe propagation of property values -td -Contexts are arranged heirarchically: +Contexts are arranged hierarchically: @menu * Score - the master of all contexts:: @@ -138,67 +138,55 @@ executed. Groups staves while adding a bracket on the left side, grouping the staves together. The bar lines of the contained staves are -connected vertically. StaffGroup only consists of a collection +connected vertically. @code{StaffGroup} only consists of a collection of staves, with a bracket in front and spanning bar lines. @strong{@emph{ChoirStaff}} -Identical to StaffGroup except that the bar lines of the contained -staves are not connected vertically. +Identical to @code{StaffGroup} except that the bar lines of the +contained staves are not connected vertically. @strong{@emph{GrandStaff}} -A group of staves, with a brace on the left side, grouping -the staves together. The bar lines of the contained staves are +A group of staves, with a brace on the left side, grouping the +staves together. The bar lines of the contained staves are connected vertically. @strong{@emph{PianoStaff}} -@c TODO No longer correct? Check. -td -Just like GrandStaff but with a forced distance between the -staves, so cross staff beaming and slurring can be used. - -@ignore -@strong{@emph{InnerStaffGroup}} - -TODO -td - -@strong{@emph{InnerChoirStaff}} - -TODO -td - -@end ignore +Just like @code{GrandStaff}, but with support for instrument names +to the left of each system. @node Intermediate-level contexts - staves @unnumberedsubsubsec Intermediate-level contexts - staves @strong{@emph{Staff}} -Handles clefs, bar lines, keys, accidentals. It can contain -Voice contexts. +Handles clefs, bar lines, keys, accidentals. It can contain +@code{Voice} contexts. @strong{@emph{RhythmicStaff}} -Like Staff but for printing rhythms. Pitches are ignored; +Like @code{Staff} but for printing rhythms. Pitches are ignored; the notes are printed on one line. @strong{@emph{TabStaff}} -Context for generating tablature. By default lays the music +Context for generating tablature. By default lays the music expression out as a guitar tablature, printed on six lines. @strong{@emph{DrumStaff}} -Handles typesetting for percussion. Can contain DrumVoice +Handles typesetting for percussion. Can contain @code{DrumVoice} @strong{@emph{VaticanaStaff}} -Same as Staff, except that it is designed for typesetting +Same as @code{Staff}, except that it is designed for typesetting a piece in gregorian style. @strong{@emph{MensuralStaff}} -Same as Staff, except that it is designed for typesetting +Same as @code{Staff}, except that it is designed for typesetting a piece in mensural style. @node Bottom-level contexts - voices @@ -210,24 +198,24 @@ contain other contexts. @strong{@emph{Voice}} -Corresponds to a voice on a staff. This context handles the +Corresponds to a voice on a staff. This context handles the conversion of dynamic signs, stems, beams, super- and sub-scripts, slurs, ties, and rests. You have to instantiate this explicitly if you require multiple voices on the same staff. @strong{@emph{VaticanaVoice}} -Same as Voice, except that it is designed for typesetting a piece -in gregorian style. +Same as @code{Voice}, except that it is designed for typesetting +a piece in gregorian style. @strong{@emph{MensuralVoice}} -Same as Voice, with modifications for typesetting a piece in +Same as @code{Voice}, with modifications for typesetting a piece in mensural style. @strong{@emph{Lyrics}} -Corresponds to a voice with lyrics. Handles the printing of a +Corresponds to a voice with lyrics. Handles the printing of a single line of lyrics. @strong{@emph{DrumVoice}} @@ -236,13 +224,13 @@ The voice context used in a percussion staff. @strong{@emph{FiguredBass}} -The context in which BassFigure objects are created from +The context in which @code{BassFigure} objects are created from input entered in @code{\figuremode} mode. @strong{@emph{TabVoice}} -The voice context used within a TabStaff context. Usually left to -be created implicitly. +The voice context used within a @code{TabStaff} context. Usually +left to be created implicitly. @strong{@emph{ChordNames}} diff --git a/Documentation/user/rhythms.itely b/Documentation/user/rhythms.itely index c64ea779a6..7a1dae4a81 100644 --- a/Documentation/user/rhythms.itely +++ b/Documentation/user/rhythms.itely @@ -1961,7 +1961,7 @@ c c c c In scores with many staves, a @code{\bar} command in one staff is automatically applied to all staves. The resulting bar lines are connected between different staves of a @code{StaffGroup}, -@code{InnerStaffGroup}, @code{PianoStaff}, or @code{GrandStaff}. +@code{PianoStaff}, or @code{GrandStaff}. @lilypond[quote,fragment,verbatim] << diff --git a/Documentation/user/staff.itely b/Documentation/user/staff.itely index 4cd9eeab56..146bc526c1 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.61" +@c \version "2.11.64" @node Staff notation @section Staff notation @@ -274,40 +274,24 @@ Internals Reference: @cindex nested staff brackets @cindex brackets, nesting of @cindex braces, nesting of -@cindex inner staff group -@cindex inner choir staff group -Two additional staff-group contexts are available that can be -nested within a @code{StaffGroup} or @code{ChoirStaff} context: -@code{InnerStaffGroup} and @code{InnerChoirStaff}. These contexts -create a new bracket adjacent to the bracket of their parent staff -group. - -An @code{InnerStaffGroup} is treated similarly to a -@code{StaffGroup}; bar lines are connected between each staff -within the context: +Staff-group contexts can be nested to arbitrary depths. In this +case, each child context creates a new bracket adjacent to the +bracket of its parent group. @lilypond[verbatim,quote,relative=2] \new StaffGroup << \new Staff { c2 c | c2 c } - \new InnerStaffGroup << + \new StaffGroup << \new Staff { g2 g | g2 g } - \new Staff { e2 e | e2 e } - >> ->> -@end lilypond - -Bar lines are @emph{not} connected between staves of an -@code{InnerChoirStaff}, just like a @code{ChoirStaff}: - -@lilypond[verbatim,quote,relative=2] -\new ChoirStaff << - \new Staff { c2 c | c2 c } - \new InnerChoirStaff << - \new Staff { g2 g | g2 g } - \new Staff { e2 e | e2 e } + \new StaffGroup \with { + systemStartDelimiter = #'SystemStartSquare + } + << + \new Staff { e2 e | e2 e } + \new Staff { c2 c | c2 c } + >> >> - \new Staff { c1 | c1 } >> @end lilypond @@ -332,9 +316,7 @@ Snippets: @rlsr{Staff notation}. Internals Reference: -@rinternals{InnerStaffGroup}, @rinternals{StaffGroup}, -@rinternals{InnerChoirStaff}, @rinternals{ChoirStaff}, @rinternals{SystemStartBar}, @rinternals{SystemStartBrace}, 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 816dda50f3..f38616e553 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 @@ -2,10 +2,9 @@ \header { lsrtags = "staff-notation,tweaks-and-overrides" texidoc = "If there is only one staff in one of the staff types -@code{ChoirStaff}, @code{InnerChoirStaff}, @code{InnerStaffGroup} -or @code{StaffGroup}, the bracket and the starting bar line will not -be displayed as standard behavior. This can be changed by overriding -the relevant properties. +@code{ChoirStaff} or @code{StaffGroup}, the bracket and the starting +bar line will not be displayed as standard behavior. This can be changed +by overriding the relevant properties. Note that in contexts such as @code{PianoStaff} and @code{GrandStaff} where the systems begin with a brace instead of a bracket, another diff --git a/input/texidocs/display-bracket-with-only-one-staff-in-a-system.texidoc b/input/texidocs/display-bracket-with-only-one-staff-in-a-system.texidoc index ebcf4b0182..2735ccb5cf 100644 --- a/input/texidocs/display-bracket-with-only-one-staff-in-a-system.texidoc +++ b/input/texidocs/display-bracket-with-only-one-staff-in-a-system.texidoc @@ -1,9 +1,8 @@ texidoces = " Si hay un solo pentagrama en un de los tipos de sistema -@code{ChoirStaff}, @code{InnerChoirStaff}, @code{InnerStaffGroup} -o @code{StaffGroup}, el comportamiento predeterminado es que no se -imprima el corchete en la barra inicial. Esto se puede cambiar -sobreescribiendo las propiedades adecuadas. +@code{ChoirStaff} o @code{StaffGroup}, el comportamiento +predeterminado es que no se imprima el corchete en la barra inicial. +Esto se puede cambiar sobreescribiendo las propiedades adecuadas. Observe que en contextos como @code{PianoStaff} y @code{GrandStaff} en que los sistemas empiezan con una llave en -- 2.39.2