From 4190a75c5b6022eff073d9bd9280990c46d9e5d2 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 12 Nov 2004 14:19:55 +0000 Subject: [PATCH] * 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) --- ChangeLog | 7 ++++++ Documentation/index.html.in | 2 +- Documentation/user/GNUmakefile | 43 ++++++++++++++++++++++++---------- lily/context.cc | 11 ++++----- lily/include/music.hh | 6 ++--- lily/music-constructor.cc | 9 ++++--- lily/music-sequence.cc | 22 ++++++++--------- lily/music.cc | 8 +++---- lily/quote-iterator.cc | 2 +- 9 files changed, 65 insertions(+), 45 deletions(-) diff --git a/ChangeLog b/ChangeLog index cf101a4e99..e83c20d21e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2004-11-12 Jan Nieuwenhuizen + + * 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 * Documentation/user/lilypond-book.itely: add short warning about diff --git a/Documentation/index.html.in b/Documentation/index.html.in index cc2e0b3917..905384d21b 100644 --- a/Documentation/index.html.in +++ b/Documentation/index.html.in @@ -64,7 +64,7 @@
  • User manual (in PDF, in -one big page) +one big page)
    (everything about LilyPond) diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile index 073924a74b..0980a1ab6b 100644 --- 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 48e93080b9..6d5a94b4cc 100644 --- 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 (this) && dynamic_cast (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 a28786ba66..d669d39e52 100644 --- 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 e86672d7c7..e6d5c11de7 100644 --- 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 *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; @@ -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 3ba671e27b..acaf88d389 100644 --- 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 - - */ +*/ + #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 ad1a5fb6c1..2442027987 100644 --- 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 4998d735f8..4f2e5ab2fc 100644 --- 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_); -- 2.39.5