* 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.

diff --git a/ChangeLog b/ChangeLog
index ea0f4288a7209fe0803fd9d0d7b46c5ad5e8dc99..a40aa909d0afb8d689c72408b471810819081dd9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2004-10-17  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * 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  <gperlist@shaw.ca>
 
        * Documentation/user/lilypond-book.itely: add more details about

diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely
index 904d233a1390177603efa58be812c9fa19a4209e..6d42beab6f547f1ee8102282067f8d916d9aeafe 100644 (file)
--- 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 f9a42dce90c7f492c467ec605a80ec52dd5db190..6b531fc814bb38b69a4936e956ae9133a7f9ded2 100644 (file)
--- 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 be841c2654cdad0a0da2167265fa573bd92d3b34..2ee31da1b25a3f1aa717f65d12beb0ae440bb1cc 100644 (file)
--- 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.ily b/input/regression/allfontstyle.ily
new file mode 100644 (file)
index 0000000..14bab67
--- /dev/null
+++ b/input/regression/allfontstyle.ily
@@ -0,0 +1,22 @@
+\version "2.3.22"
+
+\header{
+    texidoc="
+Different text styles are used for various purposes.
+"
+}
+
+\paper {
+    raggedright = ##t
+}
+
+\relative c'' \context Staff {
+    \emptyText
+    \repeat volta 2 { \time 4/4 c4^"cuivr\\'e"_\fermata }
+    \alternative {
+       {
+           d-4_\markup { \italic "cantabile"  } }
+       {  e }  } \acciaccatura { c16 }
+
+    f4\ff^""^\markup  { \large "Largo" } \mark "B" g 
+}

diff --git a/input/regression/allfontstyle.lyinc b/input/regression/allfontstyle.lyinc
deleted file mode 100644 (file)
index 14bab67..0000000
--- a/input/regression/allfontstyle.lyinc
+++ /dev/null
@@ -1,22 +0,0 @@
-\version "2.3.22"
-
-\header{
-    texidoc="
-Different text styles are used for various purposes.
-"
-}
-
-\paper {
-    raggedright = ##t
-}
-
-\relative c'' \context Staff {
-    \emptyText
-    \repeat volta 2 { \time 4/4 c4^"cuivr\\'e"_\fermata }
-    \alternative {
-       {
-           d-4_\markup { \italic "cantabile"  } }
-       {  e }  } \acciaccatura { c16 }
-
-    f4\ff^""^\markup  { \large "Largo" } \mark "B" g 
-}

diff --git a/input/regression/size11.ly b/input/regression/size11.ly
index e641cc98b21733bf28b279654535fae9b8ff57b7..4cb607535179adfbbddebb914890f84d5af95406 100644 (file)
--- 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 8309574d70cea3638df291a3c6abcbecc08ce269..73ecdf33fc4a179742f3c0392bf2cd918ecc1e70 100644 (file)
--- 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 9947569b5d8f0595c18593417e926f280989d51f..6b356c3268e801aa87ae7bc4136bad36d656b7d8 100644 (file)
--- 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 e0cadd408edf240129d4b8489f2c959e16e44b9d..1ac63c6f776c9299e4a4aa1e9511fbb419f140f3 100644 (file)
--- 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 1116ee91ebdbafd84c1d7cd14f38caf8050487e9..251ce840d6c703a71959aff6c034e0ff5e4ead76 100644 (file)
--- 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 2e7ee4331474c8f04a9c7e1215d133ff64b2e54f..025c0cfd98b64162120155c06cdcf86847deebbb 100644 (file)
--- 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 6ef81e49124204dcd2a185fa1e0f487b1acb2120..8c9e5c2f1e7befb4c215afb322e91833c648fa06 100644 (file)
--- 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.ily b/input/test/engraver-example.ily
new file mode 100644 (file)
index 0000000..8f0bd13
--- /dev/null
+++ b/input/test/engraver-example.ily
@@ -0,0 +1,37 @@
+%% texidoc = "Include file for engraver example."
+\version "2.3.22"
+topVoice =  \relative c' {
+  \key d\major
+  es8([ g] a[ fis])
+  b4
+  b16[-. b-. b-. cis-.]
+  d4->
+}
+
+botVoice =  \relative c' {
+  \key d\major
+  c8[( f] b[ a)]
+  es4
+  es16[-. es-. es-. fis-.]
+  b4->
+}
+
+hoom =  \relative c {
+  \key d \major
+  \clef bass
+  g8-. r
+  r4 
+  fis8-.
+  r8
+  r4
+  b'4->
+}
+
+pah =  \relative c' {
+  r8 b-.
+  r4
+  r8 g8-.
+  r16 g-. r8
+  \clef treble
+  fis'4->
+}

diff --git a/input/test/engraver-example.lyinc b/input/test/engraver-example.lyinc
deleted file mode 100644 (file)
index 8f0bd13..0000000
--- a/input/test/engraver-example.lyinc
+++ /dev/null
@@ -1,37 +0,0 @@
-%% texidoc = "Include file for engraver example."
-\version "2.3.22"
-topVoice =  \relative c' {
-  \key d\major
-  es8([ g] a[ fis])
-  b4
-  b16[-. b-. b-. cis-.]
-  d4->
-}
-
-botVoice =  \relative c' {
-  \key d\major
-  c8[( f] b[ a)]
-  es4
-  es16[-. es-. es-. fis-.]
-  b4->
-}
-
-hoom =  \relative c {
-  \key d \major
-  \clef bass
-  g8-. r
-  r4 
-  fis8-.
-  r8
-  r4
-  b'4->
-}
-
-pah =  \relative c' {
-  r8 b-.
-  r4
-  r8 g8-.
-  r16 g-. r8
-  \clef treble
-  fis'4->
-}

diff --git a/input/test/engraver-one-by-one.ly b/input/test/engraver-one-by-one.ly
index ae3742df65a7db69c6b3bdbc82954066ecdf9935..e89c0dd6d8cb383ed77ba0fb76f45b39f635e1cc 100644 (file)
--- 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 4be6e91ab89447a14567c5b4302df146e16fa86f..ac07c961141e4695374c19ff34c40c7ffd90e85f 100644 (file)
--- 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