Remove unnecessary std

[lilypond.git] / Documentation / music-glossary.tely

diff --git a/Documentation/music-glossary.tely b/Documentation/music-glossary.tely
index 1a435fdf674480308678ca5230ca2df499277eaa..fb01b8ca89d974edc9027a3f8d224055a60a8537 100644 (file)
--- a/Documentation/music-glossary.tely
+++ b/Documentation/music-glossary.tely
@@ -14,7 +14,7 @@ terms used in the documentation manuals for LilyPond version
 
 @c `Music Glossary' was born 1999-10-04 with git commit 280a0bb...
 @macro copyrightDeclare
-Copyright @copyright{} 1999--2010 by the authors
+Copyright @copyright{} 1999--2011 by the authors
 @end macro
 
 @set FDL
@@ -57,6 +57,7 @@ Copyright @copyright{} 1999--2010 by the authors
 * Musical terms A-Z::
 * Duration names notes and rests::
 * Pitch names::
+* Non-Western terms A-Z::
 
 Appendices
 
@@ -538,7 +539,7 @@ principal note to which it is attached.  The acciaccatura is drawn as a
 small eighth note (quaver) with a line drawn through the flag and stem.
 
 @seealso
-@ref{appoggiatura}, @ref{grace notes}, @ref{ornament}.
+@ref{appoggiatura}, @ref{grace notes}, @ref{mordent}, @ref{ornament}.
 
 
 @node accidental
@@ -2004,10 +2005,10 @@ S: ?,
 FI: ?.
 
 @c TODO:
-This is a stubs for Common Practice Period (CPP).
+This is a stub for Common Practice Period (CPP).
 
 @seealso
-@user{Note names in other languages}.
+@ruser{Note names in other languages}.
 
 
 @node common time
@@ -2101,29 +2102,16 @@ A meter that includes a triplet subdivision within the beat: see
 @ref{compound meter}.
 
 @item
-A time signature that additively combines two or more unequal meters, e.g.,
-@q{3/8 + 2/8} instead of @q{5/8}.  Sometimes called additive time signatures.
+A time signature that additively combines two or more unequal meters,
+e.g., @q{3/8 + 2/8} instead of @q{5/8}.  Sometimes called additive time
+signatures.
 
 @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)
-      #:number
-      #:line (
-        #:left-column (one num)
-        #:vcenter "+"
-        #:left-column (two num)
-        #:vcenter "+"
-        #:left-column (three num)))))
-
+@lilypond[quote,verbatim]
 \relative c' {
   \key f \major
-  #(set-time-signature 8 8 '(3 2 3))
-  \override Staff.TimeSignature #'stencil =
-    #(compound-time "3" "2" "3" "8")
+  \compoundMeter #'((3 8) (2 8) (3 8))
   c8 d e f4 d8 c bes
   c4 g'8 e c f4.
   \bar "||"
@@ -2131,7 +2119,9 @@ A time signature that additively combines two or more unequal meters, e.g.,
 @end lilypond
 
 @seealso
-@ref{compound meter}, @ref{meter}, @ref{polymetric time signature}.
+@ref{compound meter},
+@ref{meter},
+@ref{polymetric time signature}.
 
 
 @node concert pitch
@@ -4000,8 +3990,7 @@ Notes printed in small types to indicate that their time values are not
 counted in the rhythm of the bar.
 
 @seealso
-@ref{acciaccatura}, @ref{appoggiatura}, @ref{grace notes},
-@ref{ornament}.
+@ref{acciaccatura}, @ref{appoggiatura}, @ref{mordent}, @ref{ornament}.
 
 
 @node grand staff
@@ -5543,6 +5532,7 @@ S: mordent,
 FI: mordent, korukuvio.
 
 @seealso
+@ref{acciaccatura}, @ref{appoggiatura}, @ref{grace notes},
 @ref{ornament}.
 
 
@@ -5673,7 +5663,7 @@ FI: ?.
 
 @seealso
 @ref{acciaccatura}, @ref{appoggiatura}, @ref{grace notes},
-@ref{ornament}.
+@ref{mordent}, @ref{ornament}.
 
 
 @node ninth
@@ -6001,7 +5991,8 @@ the @emph{prall} (inverted mordent).
 @end lilypond
 
 @seealso
-@ref{acciaccatura}, @ref{appoggiatura}, @ref{grace notes}.
+@ref{acciaccatura}, @ref{appoggiatura}, @ref{grace notes},
+@ref{mordent}.
 
 
 @node ossia
@@ -6841,10 +6832,8 @@ scale as roots of chords.  The most important are degrees I = tonic
 \new Staff \relative c' {
   c1 d e f g a b c
 }
- \lyrics {
-  << { I II III IV V VI VII I }
-     { T "" ""  S  D } >>
-}
+ \lyrics { I II III IV V VI VII I }
+ \lyrics { T "" ""  S  D }
 >>
 @end lilypond
 
@@ -8761,6 +8750,134 @@ send it to me, care of the lilypond-user discussion list.
 @end multitable
 
 
+@node Non-Western terms A-Z
+@chapter Non-Western terms A-Z
+
+@menu
+* bayati::
+* iraq::
+* kurd::
+* makam::
+* makamlar::
+* maqam::
+* rast::
+* semai::
+* sikah::
+* taqasim::
+@end menu
+
+
+@node bayati
+@section bayati
+
+@c TODO
+This is a stub for @code{bayati}.
+
+@seealso
+Notation Reference:
+@ruser{Arabic key signatures}.
+
+
+@node iraq
+@section iraq
+
+@c TODO
+This is a stub for @code{iraq}.
+
+@seealso
+Notation Reference:
+@ruser{Arabic key signatures}.
+
+
+@node kurd
+@section kurd
+
+@c TODO
+This is a stub for @code{kurd}.
+
+@seealso
+Notation Reference:
+@ruser{Arabic key signatures}.
+
+
+@node makam
+@section makam
+
+@c TODO
+This is a stub for @code{makam}.
+
+@seealso
+Notation Reference:
+@ruser{Turkish classical music}.
+
+
+@node makamlar
+@section makamlar
+
+@c TODO
+This is a stub for @code{makamlar}.
+
+@seealso
+Notation Reference:
+@ruser{Turkish classical music}.
+
+
+@node maqam
+@section maqam
+
+@c TODO
+This is a stub for @code{maqam}.
+
+@seealso
+Notation Reference:
+@ruser{Arabic music},
+@ruser{Arabic key signatures}.
+
+
+@node rast
+@section rast
+
+@c TODO
+This is a stub for @code{rast}.
+
+@seealso
+Notation Reference:
+@ruser{Arabic key signatures}.
+
+
+@node semai
+@section semai
+
+@c TODO
+This is a stub for @code{semai}.
+
+@seealso
+Notation Reference:
+@ruser{Arabic key signatures}.
+
+
+@node sikah
+@section sikah
+
+@c TODO
+This is a stub for @code{sikah}.
+
+@seealso
+Notation Reference:
+@ruser{Arabic key signatures}.
+
+
+@node taqasim
+@section taqasim
+
+@c TODO
+This is a stub for @code{taqasim}.
+
+@seealso
+Notation Reference:
+@ruser{Arabic key signatures}.
+
+
 @node Literature used
 @appendix Literature used