CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/05/03 12:53:43
Modified files:
. : ChangeLog VERSION
Documentation/user: global.itely
lily/include : music-iterator.hh
Log message:
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3536&tr2=1.3537&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/VERSION.diff?tr1=1.631&tr2=1.632&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/user/global.itely.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/music-iterator.hh.diff?tr1=1.64&tr2=1.65&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3536 lilypond/ChangeLog:1.3537
--- lilypond/ChangeLog:1.3536 Tue May 3 12:17:03 2005
+++ lilypond/ChangeLog Tue May 3 12:53:42 2005
@@ -85,7 +85,7 @@
($(outdir)/Fontmap.lily): idem.
* buildscripts/gen-emmentaler-scripts.py (i): load fetaXX encoding
- for PFAEmmentaler-XXX.pfa. This fixes ghostscript ps2pdf problems.
+ for PFAEmmentaler-XXX.pfa.
* Documentation/user/music-glossary.tely (accidental): NL
translation of accidental.
Index: lilypond/Documentation/user/global.itely
diff -u lilypond/Documentation/user/global.itely:1.9
lilypond/Documentation/user/global.itely:1.10
--- lilypond/Documentation/user/global.itely:1.9 Tue May 3 11:10:54 2005
+++ lilypond/Documentation/user/global.itely Tue May 3 12:53:43 2005
@@ -801,11 +801,11 @@
\book {
\header {
dedication = "dedicated to me"
- title = \markup \center-align < "Title first line" "Title second line,
longer" >
+ title = \markup \center-align { "Title first line" "Title second line,
longer" }
subtitle = "the subtitle,"
subsubtitle = #(string-append "subsubtitle LilyPond version "
(lilypond-version))
poet = "Poet"
- composer = \markup \center-align < "composer" \small "(1847-1973)" >
+ composer = \markup \center-align { "composer" \small "(1847-1973)" }
texttranslator = "Text Translator"
meter = \markup { \teeny "m" \tiny "e" \normalsize "t" \large "e" \huge
"r" }
arranger = "Arranger"
Index: lilypond/VERSION
diff -u lilypond/VERSION:1.631 lilypond/VERSION:1.632
--- lilypond/VERSION:1.631 Thu Apr 21 15:20:45 2005
+++ lilypond/VERSION Tue May 3 12:53:43 2005
@@ -1,6 +1,6 @@
PACKAGE_NAME=LilyPond
MAJOR_VERSION=2
MINOR_VERSION=5
-PATCH_LEVEL=21
+PATCH_LEVEL=22
MY_PATCH_LEVEL=
Index: lilypond/lily/include/music-iterator.hh
diff -u lilypond/lily/include/music-iterator.hh:1.64
lilypond/lily/include/music-iterator.hh:1.65
--- lilypond/lily/include/music-iterator.hh:1.64 Thu Mar 10 14:36:12 2005
+++ lilypond/lily/include/music-iterator.hh Tue May 3 12:53:43 2005
@@ -55,28 +55,14 @@
DECLARE_SMOBS (Music_iterator, dummy);
Music_iterator (Music_iterator const &);
-public:
+public:
Moment music_get_length () const;
Moment music_start_mom () const;
Music_iterator ();
-
- /**
- Do the reporting. Will try MUSIC_L_ in its own translator first,
- then its children. Returns the iterator that succeeded
- */
Music_iterator *try_music (Music *) const;
-
- /**
- The translation unit that we this iterator is reporting to now.
- */
Context *get_outlet () const;
-
void set_context (Context *);
-
- /** Get an iterator matching the type of MUS, and use TRANS to find
- an accompanying translation unit
- */
static SCM get_static_get_iterator (Music *mus);
void init_translator (Music *, Context *);
void quit ();
@@ -84,22 +70,11 @@
virtual void derived_substitute (Context *, Context *);
virtual Moment pending_moment () const;
virtual bool ok () const;
-
virtual bool run_always () const;
virtual void process (Moment until);
virtual void derived_mark () const;
virtual void construct_children ();
-
- /**
- Construct sub-iterators, and set the translator to
- report to.
- */
-
DECLARE_SCHEME_CALLBACK (constructor, ());
-
- /**
- Get an iterator for MUS, inheriting the translation unit from THIS.
- */
SCM get_iterator (Music *) const;
virtual Music_iterator *try_music_in_children (Music *) const;
@@ -108,6 +83,7 @@
protected:
virtual void do_quit ();
void descend_to_child (Context *);
+
private:
Interpretation_context_handle handle_;
Music *music_;
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
