Merge commit 'origin'

[lilypond.git] / input / lsr / non-traditional-key-signatures.ly

diff --git a/input/lsr/non-traditional-key-signatures.ly b/input/lsr/non-traditional-key-signatures.ly
index 772c4dad1d8e96d986dcab6bb4b0c19a5c9a6ab0..fa37eb1a1b5e4ca6e33ba0ffb78f6115430396c8 100644 (file)
--- a/input/lsr/non-traditional-key-signatures.ly
+++ b/input/lsr/non-traditional-key-signatures.ly
@@ -1,10 +1,9 @@
-%% 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.12.0"
+%% Note: this file works from version 2.13.0
+\version "2.13.1"
 
 \header {
-  lsrtags = "pitches, staff-notation"
-
   doctitlees = "Armaduras de tonalidad no tradicionales"
   texidoces = "
 La muy utilizada instrucción @code{\\key} establece la propiedad
@@ -29,6 +28,7 @@ He aquí un ejemplo de una posible armadura para generar una escala
 exátona:
 "
 
+%% Translation of GIT committish: 6bf3e9149eb97e66b4c813e41dc7625f06c501aa
   doctitlede = "Untypische Tonarten"
   texidocde = "
 Der üblicherweise benutzte @code{\\key}-Befehl setzt die
@@ -51,42 +51,37 @@ für alle Oktaven gelten.
 Hier ein Beispiel einer möglichen Tonart für eine Ganztonleiter:
 "
 
+  lsrtags = "pitches, staff-notation"
   texidoc = "
 The commonly used @code{\\key} command sets the @code{keySignature}
 property, in the @code{Staff} context.
 
-To create non-standard key signatures, set this property directly. The
+To create non-standard key signatures, set this property directly.  The
 format of this command is a list:
 
-@code{ \\set Staff.keySignature = #`(((octave . step) . alter) ((octave
-. step) . alter) ...) } where, for each element in the list,
-@code{octave} specifies the octave (0 being the octave from middle C to
-the B above), @code{step} specifies the note within the octave (0 means
-C and 6 means B), and @code{alter} is @code{,SHARP ,FLAT ,DOUBLE-SHARP}
-etc. (Note the leading comma.) The accidentals in the key signature
-will appear in the reverse order to that in which they are specified.
-
+@code{\\set Staff.keySignature = #`(((octave . step) . alter) ((octave
+. step) . alter) ...)} where, for each element in the list,
+@code{octave} specifies the octave (0@tie{}being the octave from
+middle@tie{}C to the B above), @code{step} specifies the note within the
+octave (0@tie{}means@tie{}C and 6@tie{}means@tie{}B), and @code{alter} is
+@code{,SHARP ,FLAT ,DOUBLE-SHARP} etc.  (Note the leading comma.)
 
 Alternatively, for each item in the list, using the more concise format
-@code{(step . alter)} specifies that the same alteration should hold in
-all octaves.
-
-
-For microtonal scales where a \"sharp\" is not 100 cents, @code{alter}
-refers to the alteration as a proportion of a 200-cent whole tone.
-
-
-Here is an example of a possible key signature for generating a
-whole-tone scale: 
+@code{(step . alter)} specifies that the same alteration should hold in all
+octaves.
 
+Here is an example of a possible key signature for generating a whole-tone
+scale:
 "
   doctitle = "Non-traditional key signatures"
 } % begin verbatim
 
+
 \relative c' {
-  \set Staff.keySignature = #`(((0 . 3) . ,SHARP)
+  \set Staff.keySignature = #`(((0 . 6) . ,FLAT)
                                ((0 . 5) . ,FLAT)
-                               ((0 . 6) . ,FLAT))
+                               ((0 . 3) . ,SHARP))
   c4 d e fis
   aes4 bes c2
 }
+