* Documentation/index.html.in: Fix url to one big page. (backportme)

* Documentation/user/GNUmakefile: Separate rules for split and
unsplit html documents.  Remove perl massaging.  (backportme)

diff --git a/ChangeLog b/ChangeLog
index cf101a4e993ee5c7da28f69c25b1b670fdb5beba..e83c20d21e3462f3d956fcd985db234f50a10bd0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-11-12  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * Documentation/index.html.in: Fix url to one big page.  (backportme)
+
+       * Documentation/user/GNUmakefile: Separate rules for split and
+       unsplit html documents.  Remove perl massaging.  (backportme)
+
 2004-11-11  Graham Percival  <gperlist@shaw.ca>
 
        * Documentation/user/lilypond-book.itely: add short warning about

diff --git a/Documentation/index.html.in b/Documentation/index.html.in
index cc2e0b39174829e9f54dc3b5b026a8380961be25..905384d21bcbe354f42a6af4d4a95d57c6d5b5bd 100644 (file)
--- a/Documentation/index.html.in
+++ b/Documentation/index.html.in
@@ -64,7 +64,7 @@
            <li>
 <a class="title" href="../user/out-www/lilypond/index.html">User manual</a>
 (in <a class="title" href="../user/out-www/lilypond.pdf">PDF</a>, in
-<a class="title" href="../user/out-www/lilypond/lilypond.html">one big page</a>)
+<a class="title" href="../user/out-www/lilypond.html">one big page</a>)
 
      <br>(everything about LilyPond)
      

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index 073924a74ba3326ad0cf85f9c0f1b600c576be16..0980a1ab6bd81c9a656c4f48f12ca58197086e69 100644 (file)
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -11,7 +11,8 @@ IMAGES=$(wildcard *.png)
 OUT_EPS_IMAGES=$(addprefix $(outdir)/,$(IMAGES:.png=.eps))
 OUT_PNG_IMAGES=$(addprefix $(outdir)/,$(IMAGES))
 OUT_ITEXI_FILES=$(addprefix $(outdir)/,$(ITELY_FILES:.itely=.itexi) 
-HTML_FILES = $(addprefix $(outdir)/, $(TELY_FILES:.tely=.html))
+HTML_FILES = $(addprefix $(outdir)/, $(TELY_FILES:.tely=.html))\
+ $(outdir)/lilypond-internals.html
 
 PS_FILES = $(DVI_FILES:.dvi=.ps)
 PDF_FILES = $(DVI_FILES:.dvi=.pdf)
@@ -93,25 +94,39 @@ extra-local-help:
 $(outdir)/lilypond.texi: $(outdir)/lilypond-internals.texi
 $(outdir)/lilypond.nexi: $(outdir)/lilypond-internals.texi
 
-
-$(outdir)/lilypond/lilypond.html: $(outdir)/lilypond.texi 
+#
+# The split user manual
+#
+$(outdir)/lilypond/index.html: $(outdir)/lilypond.texi
        mkdir -p $(dir $@)
        $(MAKEINFO) -I$(outdir) --output=$(outdir)/lilypond --css-include=$(abs-srcdir)/Documentation/texinfo.css --html $<
-       $(MAKEINFO) -I$(outdir) --output=$@ --css-include=$(abs-srcdir)/Documentation/texinfo.css --html --no-split --no-headers $<
-       perl -i~ -pe 's!../lilypond-internals!lilypond-internals/!g' $(outdir)/lilypond.html
        find $(outdir)/lilypond/ -name '*'.png -o -name '*'.ly | xargs rm -f
 # symbolic links to save space 
        (cd $(outdir)/lilypond/ ; ln -sf ../*.png ../*.ly . )
 
-$(outdir)/lilypond-internals/lilypond-internals.html: $(outdir)/lilypond-internals.texi
+#
+# One big page manual
+#
+$(outdir)/lilypond.html: $(outdir)/lilypond.texi
+       $(MAKEINFO) -I$(outdir) --output=$@ --css-include=$(abs-srcdir)/Documentation/texinfo.css --html --no-split --no-headers $<
+
+#
+# The split internals reference
+#
+$(outdir)/lilypond-internals/index.html: $(outdir)/lilypond-internals.texi
        mkdir -p $(dir $@)
        $(MAKEINFO) --output=$(outdir)/lilypond-internals --css-include=$(abs-srcdir)/Documentation/texinfo.css --html $<
-       $(MAKEINFO) -I$(outdir) --output=$@ --css-include=$(abs-srcdir)/Documentation/texinfo.css --html --no-split --no-headers $<
 
-$(outdir)/lilypond/lilypond.xml: $(outdir)/lilypond.texi 
+#
+# One big page internals reference
+#
+$(outdir)/lilypond-internals.html: $(outdir)/lilypond-internals.texi
+       $(MAKEINFO) --output=$@ --css-include=$(abs-srcdir)/Documentation/texinfo.css --html --no-split --no-headers $<
+
+
+$(outdir)/lilypond.xml: $(outdir)/lilypond.texi 
        mkdir -p $(dir $@)
        $(MAKEINFO) -I$(outdir) --output=$@ --docbook $<
-       perl -i~ -pe 's!../lilypond-internals!lilypond-internals/!g' $(outdir)/lilypond.xml
 
 $(outdir)/lilypond-internals/lilypond-internals.xml: $(outdir)/lilypond-internals.texi
        mkdir -p $(dir $@)
@@ -127,8 +142,10 @@ $(outdir)/%.png: %.png
 $(outdir)/%.eps: %.png
        convert $< $@
 
-DEEP_HTML_FILES = $(outdir)/lilypond/lilypond.html $(outdir)/lilypond-internals/lilypond-internals.html
-
+DEEP_HTML_FILES =\
+ $(outdir)/lilypond/index.html\
+ $(outdir)/lilypond-internals/index.html
+       
 else
 
 # Links referred to by Documentation index
@@ -143,8 +160,8 @@ deep-symlinks:
 
 endif
 
-
-local-WWW: $(HTML_FILES) $(datafiles) $(PDF_FILES) $(PS_GZ_FILES) $(DEEP_HTML_FILES) info info-dir
+local-WWW: $(HTML_FILES) $(DEEP_HTML_FILES)\
+ $(datafiles) $(PDF_FILES) $(PS_GZ_FILES) info info-dir
 
 local-WWW-clean: deep-WWW-clean
 

diff --git a/lily/context.cc b/lily/context.cc
index 48e93080b99a947e3ae632dc731db57c0f72d672..6d5a94b4cc485efbd19d69fc1317f2a7d758734c 100644 (file)
--- a/lily/context.cc
+++ b/lily/context.cc
@@ -99,9 +99,8 @@ Context::Context ()
 
 
 
-Context*
-Context::find_create_context (SCM n, String id,
-                             SCM operations)
+Context *
+Context::find_create_context (SCM n, String id, SCM operations)
 {
   /*
     Don't create multiple score contexts.
@@ -109,10 +108,8 @@ Context::find_create_context (SCM n, String id,
   if (dynamic_cast<Global_context*> (this)
       && dynamic_cast<Global_context*> (this)->get_score_context ())
     return get_score_context ()->find_create_context (n, id, operations);
-    
-  
-  Context * existing = find_context_below (this, n,id);
-  if (existing)
+
+  if (Context *existing = find_context_below (this, n, id))
     return existing;
 
   if (n == ly_symbol2scm ("Bottom"))

diff --git a/lily/include/music.hh b/lily/include/music.hh
index a28786ba6681f52466ee2c4659743f491f404409..d669d39e52d89e361ee8fe3d6fefb564dfb771c1 100644 (file)
--- a/lily/include/music.hh
+++ b/lily/include/music.hh
@@ -63,14 +63,14 @@ protected:
   DECLARE_SMOBS (Music,);
   SCM immutable_property_alist_;
   SCM mutable_property_alist_;
-  friend SCM ly_extended_make_music(SCM,SCM);
+  friend SCM ly_extended_make_music (SCM, SCM);
 };
 
 DECLARE_TYPE_P(Music);
 DECLARE_UNSMOB(Music,music);
 
-Music* make_music_by_name (SCM sym);
-SCM ly_deep_mus_copy (SCM);
+Music *make_music_by_name (SCM sym);
+SCM ly_music_deep_copy (SCM);
 SCM ly_music_scorify (SCM, SCM);
 
 #endif /* MUSIC_HH */

diff --git a/lily/music-constructor.cc b/lily/music-constructor.cc
index e86672d7c7db6b6eccafc1a5b2979443485c56a6..e6d5c11de7f4e446cbcd7c32495b24a7818e3715 100644 (file)
--- a/lily/music-constructor.cc
+++ b/lily/music-constructor.cc
@@ -13,12 +13,12 @@
 #include "warn.hh"
 #include "music-constructor.hh"
 
-typedef Music* (*Music_ctor) ();
+typedef Music *(*Music_ctor) ();
 
 static std::map<String,Music_ctor> *ctors_map_;
 
 void
-add_music_ctor (String s,  Music_ctor c)
+add_music_ctor (String s, Music_ctor c)
 {
   if (!ctors_map_)
     ctors_map_ = new std::map<String, Music_ctor>;
@@ -26,17 +26,16 @@ add_music_ctor (String s,  Music_ctor c)
  (*ctors_map_)[s] = c;
 }
 
-
 Music_ctor
 get_music_ctor (String s)
 {
   if (ctors_map_->find (s) == ctors_map_->end ())
     return 0;
 
-  return (* ctors_map_)[s];
+  return (*ctors_map_)[s];
 }
 
-Music* 
+Music * 
 make_music (String s)
 {
   Music_ctor c = get_music_ctor (s);

diff --git a/lily/music-sequence.cc b/lily/music-sequence.cc
index 3ba671e27b23ba975464f604bb2f5b58a08e0327..acaf88d389b2253769439c4efab2056001d5be1a 100644 (file)
--- a/lily/music-sequence.cc
+++ b/lily/music-sequence.cc
@@ -4,15 +4,20 @@
   source file of the GNU LilyPond music typesetter
   
   (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+*/
+
 #include "music-list.hh"
 #include "warn.hh"
 #include "pitch.hh"
 #include "input.hh"
 
+Music_sequence::Music_sequence ()
+  : Music ()
+{
+}
+
 SCM
-Music_sequence::music_list ()const
+Music_sequence::music_list () const
 {
   return get_property ("elements");
 }
@@ -24,19 +29,14 @@ void
 Music_sequence::append_music (Music *m)
 {
   set_property ("elements",
-                   ly_append2 (music_list (), scm_cons (m->self_scm (), SCM_EOL)));
+               ly_append2 (music_list (), scm_cons (m->self_scm (), SCM_EOL)));
   scm_gc_unprotect_object (m->self_scm ());
 }
 
-Music_sequence::Music_sequence ( )
-  : Music ()
-{
-}
-
 void
-transpose_music_list (SCM l,  Pitch rq)
+transpose_music_list (SCM lst, Pitch rq)
 {
-  for (SCM s = l; scm_is_pair (s);  s = scm_cdr (s))
+  for (SCM s = lst; scm_is_pair (s);  s = scm_cdr (s))
     unsmob_music (scm_car (s))->transpose (rq);    
 }
 

diff --git a/lily/music.cc b/lily/music.cc
index ad1a5fb6c1f58da1807a693f2253162fd2da57e9..24420279870dd3fb93248e86ebdec8a1049d6699 100644 (file)
--- a/lily/music.cc
+++ b/lily/music.cc
@@ -56,7 +56,7 @@ Music::Music (Music const &m)
      stack vars that hold the copy might be optimized away, meaning
      that they won't be protected from GC. */
   smobify_self ();
-  mutable_property_alist_ = ly_deep_mus_copy (m.mutable_property_alist_);
+  mutable_property_alist_ = ly_music_deep_copy (m.mutable_property_alist_);
   set_spot (*m.origin ());
 }
 
@@ -348,7 +348,7 @@ LY_DEFINE (ly_music_list_p,"ly:music-list?",
   return SCM_BOOL_T;
 }
 
-LY_DEFINE (ly_deep_mus_copy, "ly:music-deep-copy",
+LY_DEFINE (ly_music_deep_copy, "ly:music-deep-copy",
          1, 0, 0, (SCM m),
          "Copy @var{m} and all sub expressions of @var{m}")
 {
@@ -359,8 +359,8 @@ LY_DEFINE (ly_deep_mus_copy, "ly:music-deep-copy",
       scm_gc_unprotect_object (copy);
     }
   else if (scm_is_pair (m))
-    copy = scm_cons (ly_deep_mus_copy (scm_car (m)),
-                   ly_deep_mus_copy (scm_cdr (m)));
+    copy = scm_cons (ly_music_deep_copy (scm_car (m)),
+                   ly_music_deep_copy (scm_cdr (m)));
   return copy;
 }
 

diff --git a/lily/quote-iterator.cc b/lily/quote-iterator.cc
index 4998d735f811f851b4d120e492968bbc991b65da..4f2e5ab2fc2c4cf357b62f7f9bf44eaae310975d 100644 (file)
--- a/lily/quote-iterator.cc
+++ b/lily/quote-iterator.cc
@@ -242,7 +242,7 @@ Quote_iterator::process (Moment m)
 
                  Pitch diff = pitch_interval (qp, mp);
 
-                 SCM copy = ly_deep_mus_copy (mus->self_scm ());
+                 SCM copy = ly_music_deep_copy (mus->self_scm ());
                  mus = unsmob_music (copy);
                  
                  transposed_musics_ = scm_cons (copy, transposed_musics_);