From 14cc1affca69af428c8e3798a34ddc324006aa71 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 17 Oct 2004 12:16:56 +0000 Subject: [PATCH] * Documentation/user/macros.itexi: Use @ref instead of @inforef for html. Apparently, ``you should'' in texinfo documentation is merely a guideline that can safely be ignored. * elisp/lilypond-init.el (auto-mode-alist): Add .ily to auto-mode-alist. * input/test/engraver-example.ily: * input/regression/allfontstyle.ily: Rename, update users. --- ChangeLog | 12 ++++++++++++ Documentation/user/introduction.itely | 14 +++++++------- Documentation/user/macros.itexi | 9 +++++++-- elisp/lilypond-init.el | 1 + .../{allfontstyle.lyinc => allfontstyle.ily} | 0 input/regression/size11.ly | 2 +- input/regression/size13.ly | 2 +- input/regression/size16.ly | 2 +- input/regression/size20.ly | 2 +- input/regression/size23.ly | 2 +- input/regression/size26.ly | 2 +- input/test/engraver-contexts.ly | 2 +- ...engraver-example.lyinc => engraver-example.ily} | 0 input/test/engraver-one-by-one.ly | 2 +- make/ly-vars.make | 3 +-- 15 files changed, 36 insertions(+), 19 deletions(-) rename input/regression/{allfontstyle.lyinc => allfontstyle.ily} (100%) rename input/test/{engraver-example.lyinc => engraver-example.ily} (100%) diff --git a/ChangeLog b/ChangeLog index ea0f4288a7..a40aa909d0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2004-10-17 Jan Nieuwenhuizen + + * Documentation/user/macros.itexi: Use @ref instead of @inforef + for html. Apparently, ``you should'' in texinfo documentation is + merely a guideline that can safely be ignored. + + * elisp/lilypond-init.el (auto-mode-alist): Add .ily to + auto-mode-alist. + + * input/test/engraver-example.ily: + * input/regression/allfontstyle.ily: Rename, update users. + 2004-10-16 Graham Percival * Documentation/user/lilypond-book.itely: add more details about diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely index 904d233a13..6d42beab6f 100644 --- a/Documentation/user/introduction.itely +++ b/Documentation/user/introduction.itely @@ -341,7 +341,7 @@ In the following example, we see how we start out with a plug-in for note heads, the @code{Note_heads_engraver}. @lilypond[quote,raggedright] -\include "engraver-example.lyinc" +\include "engraver-example.ily" \score { \topVoice @@ -373,7 +373,7 @@ note heads, the @code{Note_heads_engraver}. Then a @code{Staff_symbol_engraver} adds the staff @lilypond[quote,raggedright] -\include "engraver-example.lyinc" +\include "engraver-example.ily" \score { \topVoice @@ -404,7 +404,7 @@ Then a @code{Staff_symbol_engraver} adds the staff the @code{Clef_engraver} defines a reference point for the staff @lilypond[quote,raggedright] -\include "engraver-example.lyinc" +\include "engraver-example.ily" \score { \topVoice @@ -433,7 +433,7 @@ the @code{Clef_engraver} defines a reference point for the staff and the @code{Stem_engraver} adds stems. @lilypond[quote,raggedright] -\include "engraver-example.lyinc" +\include "engraver-example.ily" \score { \topVoice @@ -465,7 +465,7 @@ time signature, and key signature, we get a complete piece of notation. @lilypond[quote,raggedright] -\include "engraver-example.lyinc" +\include "engraver-example.ily" \score { \topVoice } @end lilypond @@ -473,7 +473,7 @@ This system works well for monophonic music, but what about polyphony? In polyphonic notation, many voices can share a staff. @lilypond[quote,raggedright] -\include "engraver-example.lyinc" +\include "engraver-example.ily" \new Staff << \topVoice \\ \botVoice >> @end lilypond @@ -491,7 +491,7 @@ context. The Score context is the top level notation context. Program reference: @internalsref{Contexts}. @lilypond[quote,raggedright] -\include "engraver-example.lyinc" +\include "engraver-example.ily" \score { << \new Staff << \topVoice \\ \botVoice >> diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi index f9a42dce90..6b531fc814 100644 --- a/Documentation/user/macros.itexi +++ b/Documentation/user/macros.itexi @@ -71,15 +71,20 @@ @c @uref{../lilypond-internals/\NAME\.html,\NAME\}@c @c @inforef{} adds ``See'' to the sentence, which is annoying, but @c better than a broken link. -@inforef{\NAME\,,lilypond-internals}@c +@c @inforef{\NAME\,,lilypond-internals}@c +@c using @ref without punctuation is OK without for formats other than info +@ref{\NAME\,,,lilypond-internals}@c @c should we do this? @cindex @code{\NAME\} @end macro + @c what is this? -- jcn @macro hyphenatedinternalsref{NAME,NODENAME} @c @uref{../lilypond-internals/\NODENAME\.html,\NAME\}@c - @inforef{\NODENAME\,,lilypond-internals}@c + @c @inforef{\NODENAME\,,lilypond-internals}@c @c should we do this? + @c using @ref without punctuation is OK without for formats other than info + @ref{\NODENAME\,,\NAME\,lilypond-internals}@c @cindex @code{\NAME\} @end macro diff --git a/elisp/lilypond-init.el b/elisp/lilypond-init.el index be841c2654..2ee31da1b2 100644 --- a/elisp/lilypond-init.el +++ b/elisp/lilypond-init.el @@ -16,5 +16,6 @@ (autoload 'LilyPond-mode "lilypond-mode" "LilyPond Editing Mode" t) (add-to-list 'auto-mode-alist '("\\.ly$" . LilyPond-mode)) +(add-to-list 'auto-mode-alist '("\\.ily$" . LilyPond-mode)) (add-hook 'LilyPond-mode-hook (lambda () (turn-on-font-lock))) diff --git a/input/regression/allfontstyle.lyinc b/input/regression/allfontstyle.ily similarity index 100% rename from input/regression/allfontstyle.lyinc rename to input/regression/allfontstyle.ily diff --git a/input/regression/size11.ly b/input/regression/size11.ly index e641cc98b2..4cb6075351 100644 --- a/input/regression/size11.ly +++ b/input/regression/size11.ly @@ -15,4 +15,4 @@ foollilypondbook = " #(set-global-staff-size 11) -\include "allfontstyle.lyinc" +\include "allfontstyle.ily" diff --git a/input/regression/size13.ly b/input/regression/size13.ly index 8309574d70..73ecdf33fc 100644 --- a/input/regression/size13.ly +++ b/input/regression/size13.ly @@ -8,4 +8,4 @@ foollilypondbook = " } #(set-global-staff-size 13) -\include "allfontstyle.lyinc" +\include "allfontstyle.ily" diff --git a/input/regression/size16.ly b/input/regression/size16.ly index 9947569b5d..6b356c3268 100644 --- a/input/regression/size16.ly +++ b/input/regression/size16.ly @@ -10,4 +10,4 @@ foollilypondbook = " #(set-global-staff-size 16) -\include "allfontstyle.lyinc" +\include "allfontstyle.ily" diff --git a/input/regression/size20.ly b/input/regression/size20.ly index e0cadd408e..1ac63c6f77 100644 --- a/input/regression/size20.ly +++ b/input/regression/size20.ly @@ -10,4 +10,4 @@ foollilypondbook = " #(set-global-staff-size 20) -\include "allfontstyle.lyinc" +\include "allfontstyle.ily" diff --git a/input/regression/size23.ly b/input/regression/size23.ly index 1116ee91eb..251ce840d6 100644 --- a/input/regression/size23.ly +++ b/input/regression/size23.ly @@ -9,4 +9,4 @@ foollilypondbook = " #(set-global-staff-size 23) -\include "allfontstyle.lyinc" +\include "allfontstyle.ily" diff --git a/input/regression/size26.ly b/input/regression/size26.ly index 2e7ee43314..025c0cfd98 100644 --- a/input/regression/size26.ly +++ b/input/regression/size26.ly @@ -10,4 +10,4 @@ foollilypondbook = " #(set-global-staff-size 26) -\include "allfontstyle.lyinc" +\include "allfontstyle.ily" diff --git a/input/test/engraver-contexts.ly b/input/test/engraver-contexts.ly index 6ef81e4912..8c9e5c2f1e 100644 --- a/input/test/engraver-contexts.ly +++ b/input/test/engraver-contexts.ly @@ -13,7 +13,7 @@ context. " } -\include "engraver-example.lyinc" +\include "engraver-example.ily" \score { \context Staff << \topVoice \\ \botVoice >> diff --git a/input/test/engraver-example.lyinc b/input/test/engraver-example.ily similarity index 100% rename from input/test/engraver-example.lyinc rename to input/test/engraver-example.ily diff --git a/input/test/engraver-one-by-one.ly b/input/test/engraver-one-by-one.ly index ae3742df65..e89c0dd6d8 100644 --- a/input/test/engraver-one-by-one.ly +++ b/input/test/engraver-one-by-one.ly @@ -24,7 +24,7 @@ Staff context. } \layout { raggedright = ##t } -\include "engraver-example.lyinc" +\include "engraver-example.ily" % diff --git a/make/ly-vars.make b/make/ly-vars.make index 4be6e91ab8..ac07c96114 100644 --- a/make/ly-vars.make +++ b/make/ly-vars.make @@ -10,11 +10,10 @@ OMF_FILES += $(foreach format, html pdf ps.gz, $(foreach f, $(TELY_FILES), $(out ITELY_FILES := $(wildcard *.itely) ITEXI_FILES := $(wildcard *.itexi) LY_FILES := $(wildcard *.ly) -LYINC_FILES := $(wildcard *.lyinc) ILY_FILES := $(wildcard *.ily) TEXINFO_SOURCES += $(TELY_FILES) $(ITELY_FILES) $(ITEXI_FILES) -EXTRA_DIST_FILES +=$(TELY_FILES) $(LY_FILES) $(ITEXI_FILES) $(ITELY_FILES) $(LYINC_FILES) $(ILY_FILES) +EXTRA_DIST_FILES +=$(TELY_FILES) $(LY_FILES) $(ITEXI_FILES) $(ITELY_FILES) $(ILY_FILES) DVIPS_FLAGS= -u+ec-mftrace.map -u +lilypond.map -Ppdf -- 2.39.2