Does anybody know if I can push this patch?  It removes
Documentation/included/divisiones.ly and puts that info in the
main .itely files.

I started going in circles and getting lost while trying to figure
out if I was supposed to use git pull or change the comment at the
top or whatever.

Cheers,
- Graham
>From b51656614f8e76da5912ffd6ce1377f7a95f1fb4 Mon Sep 17 00:00:00 2001
From: Graham Percival <[email protected]>
Date: Sat, 30 Jan 2010 00:02:46 +0000
Subject: [PATCH] Doc: move divisiones.ly into Ancient.

Translations: I did the same thing here to retain compiling;
hopefully this doesn't break anything.  AFAIK nobody has touched
the translations of Ancient in years.
---
 Documentation/de/notation/ancient.itely |   31 ++++++++++++++++++++++-
 Documentation/es/notation/ancient.itely |   31 ++++++++++++++++++++++-
 Documentation/fr/notation/ancient.itely |   32 ++++++++++++++++++++++-
 Documentation/included/divisiones.ly    |   42 -------------------------------
 Documentation/notation/ancient.itely    |   31 ++++++++++++++++++++++-
 5 files changed, 121 insertions(+), 46 deletions(-)
 delete mode 100644 Documentation/included/divisiones.ly

diff --git a/Documentation/de/notation/ancient.itely b/Documentation/de/notation/ancient.itely
index 4999627..b2ac2d9 100644
--- a/Documentation/de/notation/ancient.itely
+++ b/Documentation/de/notation/ancient.itely
@@ -1247,7 +1247,36 @@ entsprechenden Stellen zu schreiben. Einige Editionen verwenden eine
 sich in der Datei @file{gregorian@/-init@/.ly} auch eine Definition für
 @code{\virgula} und @code{\caesura}.
 
-...@lilypondfile[quote,ragged-right]{divisiones.ly}
+...@lilypond[quote,ragged-right]
+\include "gregorian.ly"
+\score {
+  <<
+    \context VaticanaVoice {
+      \override TextScript  #'padding = #3
+      g a g
+      s^\markup { "divisio minima" }
+      \divisioMinima
+      g a g
+      s^\markup { "divisio maior" }
+      \divisioMaior
+      g a g
+      s^\markup { "divisio maxima" }
+      \divisioMaxima
+      \break
+      g a g
+      s^\markup { "finalis" }
+      \finalis
+      g a g
+      s^\markup { "virgula" }
+      \virgula
+      g a g
+      s^\markup { "caesura" }
+      \caesura
+      g a g
+    }
+  >>
+}
+...@end lilypond
 
 @funindex \virgula
 @funindex \caesura
diff --git a/Documentation/es/notation/ancient.itely b/Documentation/es/notation/ancient.itely
index 357aa6a..da40193 100644
--- a/Documentation/es/notation/ancient.itely
+++ b/Documentation/es/notation/ancient.itely
@@ -1257,7 +1257,36 @@ ediciones usan @emph{virgula} o @emph{caesura} en vez de divisio
 minima.  Por ello, @file{gregorian@/.ly} define también las
 instrucciones @code{\virgula} y @code{\caesura}.
 
-...@lilypondfile[quote,ragged-right]{divisiones.ly}
+...@lilypond[quote,ragged-right]
+\include "gregorian.ly"
+\score {
+  <<
+    \context VaticanaVoice {
+      \override TextScript  #'padding = #3
+      g a g
+      s^\markup { "divisio minima" }
+      \divisioMinima
+      g a g
+      s^\markup { "divisio maior" }
+      \divisioMaior
+      g a g
+      s^\markup { "divisio maxima" }
+      \divisioMaxima
+      \break
+      g a g
+      s^\markup { "finalis" }
+      \finalis
+      g a g
+      s^\markup { "virgula" }
+      \virgula
+      g a g
+      s^\markup { "caesura" }
+      \caesura
+      g a g
+    }
+  >>
+}
+...@end lilypond
 
 
 @predefined
diff --git a/Documentation/fr/notation/ancient.itely b/Documentation/fr/notation/ancient.itely
index cce6eb3..ef51166 100644
--- a/Documentation/fr/notation/ancient.itely
+++ b/Documentation/fr/notation/ancient.itely
@@ -847,7 +847,37 @@ Les divisions sont disponibles après inclusion du fichier
 pourquoi @file{gregorian@/-init@/.ly} définit aussi @code{\virgula} et
 @code{\caesura}.
 
-...@lilypondfile[quote,ragged-right]{divisiones.ly}
+...@lilypond[quote,ragged-right]
+\include "gregorian.ly"
+\score {
+  <<
+    \context VaticanaVoice {
+      \override TextScript  #'padding = #3
+      g a g
+      s^\markup { "divisio minima" }
+      \divisioMinima
+      g a g
+      s^\markup { "divisio maior" }
+      \divisioMaior
+      g a g
+      s^\markup { "divisio maxima" }
+      \divisioMaxima
+      \break
+      g a g
+      s^\markup { "finalis" }
+      \finalis
+      g a g
+      s^\markup { "virgula" }
+      \virgula
+      g a g
+      s^\markup { "caesura" }
+      \caesura
+      g a g
+    }
+  >>
+}
+...@end lilypond
+
 
 
 @predefined
diff --git a/Documentation/included/divisiones.ly b/Documentation/included/divisiones.ly
deleted file mode 100644
index 6307c9a..0000000
--- a/Documentation/included/divisiones.ly
+++ /dev/null
@@ -1,42 +0,0 @@
-% possible rename to ancient- or gregorian- ?
-\header {
-    texidoc = "@cindex Divisiones
-
-Divisiones are ancient variants of breathing signs.
-Choices are @code{divisioMinima}, @code{divisioMaior},
-...@code{divisiomaxima} and @code{finalis}, @code{virgula} and
-...@code{caesura}.
-
-" }
-
-\version "2.12.0"
-
-\include "gregorian.ly"
-
-\score {
-  <<
-    \context VaticanaVoice {
-      \override TextScript  #'padding = #3
-      g a g
-      s^\markup { "divisio minima" }
-      \divisioMinima
-      g a g
-      s^\markup { "divisio maior" }
-      \divisioMaior
-      g a g
-      s^\markup { "divisio maxima" }
-      \divisioMaxima
-      \break
-      g a g
-      s^\markup { "finalis" }
-      \finalis
-      g a g
-      s^\markup { "virgula" }
-      \virgula
-      g a g
-      s^\markup { "caesura" }
-      \caesura
-      g a g
-    }
-  >>
-}
diff --git a/Documentation/notation/ancient.itely b/Documentation/notation/ancient.itely
index 2563572..adec460 100644
--- a/Documentation/notation/ancient.itely
+++ b/Documentation/notation/ancient.itely
@@ -1236,7 +1236,36 @@ and @code{\finalis} at proper places in the input.  Some editions use
 Therefore, @file{gregorian@/.ly} also defines @code{\virgula} and
 @code{\caesura}
 
-...@lilypondfile[quote,ragged-right]{divisiones.ly}
+...@lilypond[quote,ragged-right]
+\include "gregorian.ly"
+\score {
+  <<
+    \context VaticanaVoice {
+      \override TextScript  #'padding = #3
+      g a g
+      s^\markup { "divisio minima" }
+      \divisioMinima
+      g a g
+      s^\markup { "divisio maior" }
+      \divisioMaior
+      g a g
+      s^\markup { "divisio maxima" }
+      \divisioMaxima
+      \break
+      g a g
+      s^\markup { "finalis" }
+      \finalis
+      g a g
+      s^\markup { "virgula" }
+      \virgula
+      g a g
+      s^\markup { "caesura" }
+      \caesura
+      g a g
+    }
+  >>
+}
+...@end lilypond
 
 
 @predefined
-- 
1.5.6.5

_______________________________________________
lilypond-devel mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-devel

Reply via email to