Hello,
This patch fixes `make all' and `make web'. Can someone apply it for
me? Thanks.
-Patrick
>From 0a71cddf46357085aab922b6041a532eefb0cfe3 Mon Sep 17 00:00:00 2001
From: Patrick McCarty <[EMAIL PROTECTED]>
Date: Sun, 28 Sep 2008 19:59:20 -0700
Subject: [PATCH] Fix compile
* complete the conversion from
gregorian-init.ly -> gregorian.ly
* fix one xref
Signed-off-by: Patrick McCarty <[EMAIL PROTECTED]>
---
Documentation/fr/user/ancient.itely | 80 ++++++++++++++--------------
Documentation/user/install.itely | 2 +-
input/regression/breathing-sign-ancient.ly | 2 +-
ly/engraver-init.ly | 6 +-
ly/gregorian.ly | 2 +-
scm/define-grob-properties.scm | 2 +-
6 files changed, 47 insertions(+), 47 deletions(-)
diff --git a/Documentation/fr/user/ancient.itely
b/Documentation/fr/user/ancient.itely
index b979807..7fd6989 100644
--- a/Documentation/fr/user/ancient.itely
+++ b/Documentation/fr/user/ancient.itely
@@ -703,7 +703,7 @@ En plus des signes d'articulation standards décrits à la
section
ancienne. Elles sont spécifiquement destinées au style Editio Vaticana.
@lilypond[quote,ragged-right,verbatim]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
\score {
\new VaticanaVoice {
\override TextScript #'font-family = #'typewriter
@@ -1056,7 +1056,7 @@ Deminutae}
@code{1. Punctum}
@tab
@lilypond[staffsize=26,line-width=1.5\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
\score {
\transpose c c' {
% Punctum
@@ -1071,7 +1071,7 @@ Deminutae}
@end lilypond
@tab
@lilypond[staffsize=26,line-width=2.5\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
\score {
\transpose c c' {
% Punctum Auctum Ascendens
@@ -1090,7 +1090,7 @@ Deminutae}
@end lilypond
@tab
@lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
\score {
\transpose c c' {
% Punctum Inclinatum Parvum
@@ -1104,7 +1104,7 @@ Deminutae}
@code{2. Virga}
@tab
@lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
\score {
\transpose c c' {
% Virga
@@ -1120,7 +1120,7 @@ Deminutae}
@code{3. Apostropha vel Stropha}
@tab
@lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
\score {
\transpose c c' {
% Stropha
@@ -1131,7 +1131,7 @@ Deminutae}
@end lilypond
@tab
@lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
\score {
\transpose c c' {
% Stropha Aucta
@@ -1146,7 +1146,7 @@ Deminutae}
@code{4. Oriscus}
@tab
@lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
\score {
\transpose c c' {
% Oriscus
@@ -1162,7 +1162,7 @@ Deminutae}
@code{5. Clivis vel Flexa}
@tab
@lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
\score {
\transpose c c' {
% Clivis vel Flexa
@@ -1173,7 +1173,7 @@ Deminutae}
@end lilypond
@tab
@lilypond[staffsize=26,line-width=2.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
\score {
\transpose c c' {
% Clivis Aucta Descendens
@@ -1188,7 +1188,7 @@ Deminutae}
@end lilypond
@tab
@lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
\score {
\transpose c c' {
% Cephalicus
@@ -1202,7 +1202,7 @@ Deminutae}
@code{6. Podatus vel Pes}
@tab
@lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
\score {
\transpose c c' {
% Podatus vel Pes
@@ -1213,7 +1213,7 @@ Deminutae}
@end lilypond
@tab
@lilypond[staffsize=26,line-width=2.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
\score {
\transpose c c' {
% Pes Auctus Descendens
@@ -1228,7 +1228,7 @@ Deminutae}
@end lilypond
@tab
@lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
\score {
\transpose c c' {
% Epiphonus
@@ -1242,7 +1242,7 @@ Deminutae}
@code{7. Pes Quassus}
@tab
@lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
\score {
\transpose c c' {
% Pes Quassus
@@ -1253,7 +1253,7 @@ Deminutae}
@end lilypond
@tab
@lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
\score {
\transpose c c' {
% Pes Quassus Auctus Descendens
@@ -1268,7 +1268,7 @@ Deminutae}
@code{8. Quilisma Pes}
@tab
@lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
\score {
\transpose c c' {
% Quilisma Pes
@@ -1279,7 +1279,7 @@ Deminutae}
@end lilypond
@tab
@lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
\score {
\transpose c c' {
% Quilisma Pes Auctus Descendens
@@ -1294,7 +1294,7 @@ Deminutae}
@code{9. Podatus Initio Debilis}
@tab
@lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
\score {
\transpose c c' {
% Pes Initio Debilis
@@ -1305,7 +1305,7 @@ Deminutae}
@end lilypond
@tab
@lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
\score {
\transpose c c' {
% Pes Auctus Descendens Initio Debilis
@@ -1320,7 +1320,7 @@ Deminutae}
@code{10. Torculus}
@tab
@lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
\score {
\transpose c c' {
% Torculus
@@ -1331,7 +1331,7 @@ Deminutae}
@end lilypond
@tab
@lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
\score {
\transpose c c' {
% Torculus Auctus Descendens
@@ -1342,7 +1342,7 @@ Deminutae}
@end lilypond
@tab
@lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
\score {
\transpose c c' {
% Torculus Deminutus
@@ -1356,7 +1356,7 @@ Deminutae}
@code{11. Torculus Initio Debilis}
@tab
@lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
\score {
\transpose c c' {
% Torculus Initio Debilis
@@ -1367,7 +1367,7 @@ Deminutae}
@end lilypond
@tab
@lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
\score {
\transpose c c' {
% Torculus Auctus Descendens Initio Debilis
@@ -1378,7 +1378,7 @@ Deminutae}
@end lilypond
@tab
@lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
\score {
\transpose c c' {
% Torculus Deminutus Initio Debilis
@@ -1392,7 +1392,7 @@ Deminutae}
@code{12. Porrectus}
@tab
@lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
\score {
\transpose c c' {
% Porrectus
@@ -1403,7 +1403,7 @@ Deminutae}
@end lilypond
@tab
@lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
\score {
\transpose c c' {
% Porrectus Auctus Descendens
@@ -1414,7 +1414,7 @@ Deminutae}
@end lilypond
@tab
@lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
\score {
\transpose c c' {
% Porrectus Deminutus
@@ -1428,7 +1428,7 @@ Deminutae}
@code{13. Climacus}
@tab
@lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
\score {
\transpose c c' {
% Climacus
@@ -1440,7 +1440,7 @@ Deminutae}
@end lilypond
@tab
@lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
\score {
\transpose c c' {
% Climacus Auctus
@@ -1451,7 +1451,7 @@ Deminutae}
@end lilypond
@tab
@lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
\score {
\transpose c c' {
% Climacus Deminutus
@@ -1465,7 +1465,7 @@ Deminutae}
@code{14. Scandicus}
@tab
@lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
\score {
\transpose c c' {
% Scandicus
@@ -1476,7 +1476,7 @@ Deminutae}
@end lilypond
@tab
@lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
\score {
\transpose c c' {
% Scandicus Auctus Descendens
@@ -1487,7 +1487,7 @@ Deminutae}
@end lilypond
@tab
@lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
\score {
\transpose c c' {
% Scandicus Deminutus
@@ -1501,7 +1501,7 @@ Deminutae}
@code{15. Salicus}
@tab
@lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
\score {
\transpose c c' {
% Salicus
@@ -1512,7 +1512,7 @@ Deminutae}
@end lilypond
@tab
@lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
\score {
\transpose c c' {
% Salicus Auctus Descendens
@@ -1527,7 +1527,7 @@ Deminutae}
@code{16. Trigonus}
@tab
@lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
\score {
\transpose c c' {
% Trigonus
@@ -1899,7 +1899,7 @@ c} ou @code{\augmentum @{\virga [EMAIL PROTECTED] Par
ailleurs, l'expression
@code{\augmentum a \augmentum g}.
@lilypond[quote,ragged-right,verbatim]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
\score {
\new VaticanaVoice {
\[ \augmentum a \flexa \augmentum g \]
@@ -1989,7 +1989,7 @@ valeurs adéquates, de telle sorte que vous pouvez tout de
suite vous
lancer dans la saisie de votre chant, comme ci-dessous :
@lilypond[quote,ragged-right,packed,verbatim]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
\score {
<<
\new VaticanaVoice = "cantus" {
diff --git a/Documentation/user/install.itely b/Documentation/user/install.itely
index d556bc5..e203291 100644
--- a/Documentation/user/install.itely
+++ b/Documentation/user/install.itely
@@ -56,7 +56,7 @@ mingw - Windows x86
If you have MacOS 10.3 or 10.4 and you would like to use Python
scripts such as @command{convert-ly} and @command{lilypond-book}, see
[EMAIL PROTECTED] for MacOS X}.
[EMAIL PROTECTED] for MacOS X,,,lilypond-program,Application Usage}.
@node Compiling from source
diff --git a/input/regression/breathing-sign-ancient.ly
b/input/regression/breathing-sign-ancient.ly
index 3a366ae..e2b2892 100644
--- a/input/regression/breathing-sign-ancient.ly
+++ b/input/regression/breathing-sign-ancient.ly
@@ -9,7 +9,7 @@ finalis, the latter three looking similar to bar glyphs.
" }
-\include "gregorian-init.ly"
+\include "gregorian.ly"
\context VaticanaStaff {
\relative c' {
diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index ba0d48d..6b78eaf 100644
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -718,15 +718,15 @@ context."
clefPosition = #0
}
-%% TODO: Gregorian Chant contexts should be moved to gregorian-init.ly,
+%% TODO: Gregorian Chant contexts should be moved to gregorian.ly,
%% but this does not work (is this a bug or intended behaviour?):
%%
%% If I try to do so, I get "error: unknown escaped string:
%% `\VaticanaStaff'" in params-init.ly. If I also move
%% "\context { \Vaticana*Context }" from params-init.ly to the end
-%% of gregorian-init.ly, then I get "error: parse error, unexpected
+%% of gregorian.ly, then I get "error: parse error, unexpected
%% TRANSLATOR: \context { \VaticanaStaff }" in
-%% gregorian-init.ly. --jr
+%% gregorian.ly. --jr
\context {
\Voice
diff --git a/ly/gregorian.ly b/ly/gregorian.ly
index 3a99d82..30a556a 100644
--- a/ly/gregorian.ly
+++ b/ly/gregorian.ly
@@ -219,7 +219,7 @@ ligature = #(define-music-function
% over there, leave the style-independent Gregorian stuff here, and let
% the style-specific file (vaticana-init.ly) include this file. The
% user then will have to include vaticana-init.ly instead of
-% gregorian-init.ly.
+% gregorian.ly.
%
\layout {
indent = 0.0
diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm
index fedda67..7879fcd 100644
--- a/scm/define-grob-properties.scm
+++ b/scm/define-grob-properties.scm
@@ -861,7 +861,7 @@ than a whole rest.")
;; However, such a list would consist of a couple of dozens of
;; entries, since head prefixes may be combined in many ways. If
- ;; the macros in `gregorian-init.ly' would directly set prefix-set,
+ ;; the macros in `gregorian.ly' would directly set prefix-set,
;; all the head prefixes could be junked; however, such macros
;; would be quite numerous, I guess. --jr
--
1.6.0.2
_______________________________________________
lilypond-devel mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-devel
