CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/05/04 10:11:32
Modified files:
. : ChangeLog
flower/include : interval.hh
lily : auto-change-iterator.cc context-handle.cc
main.cc pango-font.cc part-combine-iterator.cc
quote-iterator.cc
lily/include : context.hh music-iterator.hh
Removed files:
lily/include : interpretation-context-handle.hh
Log message:
rename
Interpretation_context_handle to Context_handle.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3548&tr2=1.3549&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/flower/include/interval.hh.diff?tr1=1.47&tr2=1.48&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/auto-change-iterator.cc.diff?tr1=1.55&tr2=1.56&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/context-handle.cc.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/main.cc.diff?tr1=1.245&tr2=1.246&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/pango-font.cc.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/part-combine-iterator.cc.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/quote-iterator.cc.diff?tr1=1.37&tr2=1.38&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/context.hh.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/music-iterator.hh.diff?tr1=1.65&tr2=1.66&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3548 lilypond/ChangeLog:1.3549
--- lilypond/ChangeLog:1.3548 Wed May 4 08:56:37 2005
+++ lilypond/ChangeLog Wed May 4 10:11:32 2005
@@ -1,3 +1,8 @@
+2005-05-04 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * lily/include/interpretation-context-handle.hh: rename
+ Interpretation_context_handle to Context_handle.
+
2005-05-04 Heikki Junes <[EMAIL PROTECTED]>
* input/regression/GNUmakefile (local_delete): use `find` together
Index: lilypond/flower/include/interval.hh
diff -u lilypond/flower/include/interval.hh:1.47
lilypond/flower/include/interval.hh:1.48
--- lilypond/flower/include/interval.hh:1.47 Sat Apr 30 23:43:03 2005
+++ lilypond/flower/include/interval.hh Wed May 4 10:11:32 2005
@@ -205,7 +205,6 @@
return (elem (LEFT) + elem (RIGHT)) / T (2);
}
-// again? see flower-proto.hh
typedef Interval_t<Real> Interval;
typedef Interval_t<int> Slice; // weird name
Index: lilypond/lily/auto-change-iterator.cc
diff -u lilypond/lily/auto-change-iterator.cc:1.55
lilypond/lily/auto-change-iterator.cc:1.56
--- lilypond/lily/auto-change-iterator.cc:1.55 Tue Apr 12 22:49:29 2005
+++ lilypond/lily/auto-change-iterator.cc Wed May 4 10:11:32 2005
@@ -29,8 +29,8 @@
void change_to (Music_iterator *, SCM, String);
Moment start_moment_;
- Interpretation_context_handle up_;
- Interpretation_context_handle down_;
+ Context_handle up_;
+ Context_handle down_;
};
void
Index: lilypond/lily/context-handle.cc
diff -u lilypond/lily/context-handle.cc:1.8 lilypond/lily/context-handle.cc:1.9
--- lilypond/lily/context-handle.cc:1.8 Sat Apr 9 14:31:55 2005
+++ lilypond/lily/context-handle.cc Wed May 4 10:11:32 2005
@@ -1,27 +1,27 @@
/*
- interpretation-context-handle.cc -- implement Interpretation_context_handle
+ context-handle.cc -- implement Context_handle
source file of the GNU LilyPond music typesetter
(c) 1999--2005 Han-Wen Nienhuys <[EMAIL PROTECTED]>
*/
-#include "interpretation-context-handle.hh"
+#include "context-handle.hh"
#include "context.hh"
-Interpretation_context_handle::Interpretation_context_handle ()
+Context_handle::Context_handle ()
{
outlet_ = 0;
}
-Interpretation_context_handle::Interpretation_context_handle
(Interpretation_context_handle const &s)
+Context_handle::Context_handle (Context_handle const &s)
{
outlet_ = 0;
if (s.outlet_)
up (s.outlet_);
}
-Interpretation_context_handle::~Interpretation_context_handle ()
+Context_handle::~Context_handle ()
{
/*
Don't do
@@ -34,33 +34,33 @@
}
void
-Interpretation_context_handle::up (Context *t)
+Context_handle::up (Context *t)
{
outlet_ = t;
t->iterator_count_++;
}
void
-Interpretation_context_handle::down ()
+Context_handle::down ()
{
outlet_->iterator_count_--;
outlet_ = 0;
}
bool
-Interpretation_context_handle::try_music (Music *m)
+Context_handle::try_music (Music *m)
{
return outlet_->try_music (m);
}
void
-Interpretation_context_handle::operator = (Interpretation_context_handle const
&s)
+Context_handle::operator = (Context_handle const &s)
{
set_context (s.outlet_);
}
void
-Interpretation_context_handle::set_context (Context *trans)
+Context_handle::set_context (Context *trans)
{
if (outlet_ == trans)
return;
@@ -71,14 +71,14 @@
}
Context *
-Interpretation_context_handle::get_outlet () const
+Context_handle::get_outlet () const
{
return outlet_;
}
int
-Interpretation_context_handle::get_count () const
+Context_handle::get_count () const
{
return outlet_->iterator_count_;
}
Index: lilypond/lily/include/context.hh
diff -u lilypond/lily/include/context.hh:1.22
lilypond/lily/include/context.hh:1.23
--- lilypond/lily/include/context.hh:1.22 Tue May 3 12:13:28 2005
+++ lilypond/lily/include/context.hh Wed May 4 10:11:32 2005
@@ -24,7 +24,7 @@
void terminate ();
private:
- friend class Interpretation_context_handle;
+ friend class Context_handle;
int iterator_count_;
bool init_;
Index: lilypond/lily/include/music-iterator.hh
diff -u lilypond/lily/include/music-iterator.hh:1.65
lilypond/lily/include/music-iterator.hh:1.66
--- lilypond/lily/include/music-iterator.hh:1.65 Tue May 3 12:53:43 2005
+++ lilypond/lily/include/music-iterator.hh Wed May 4 10:11:32 2005
@@ -12,7 +12,7 @@
#include "array.hh"
#include "moment.hh"
#include "virtual-methods.hh"
-#include "interpretation-context-handle.hh"
+#include "context-handle.hh"
/**
---
@@ -85,7 +85,7 @@
void descend_to_child (Context *);
private:
- Interpretation_context_handle handle_;
+ Context_handle handle_;
Music *music_;
};
Index: lilypond/lily/main.cc
diff -u lilypond/lily/main.cc:1.245 lilypond/lily/main.cc:1.246
--- lilypond/lily/main.cc:1.245 Tue May 3 11:31:50 2005
+++ lilypond/lily/main.cc Wed May 4 10:11:32 2005
@@ -375,7 +375,7 @@
}
#endif
-void test_pango ();
+
static void
main_with_guile (void *, int, char **)
Index: lilypond/lily/pango-font.cc
diff -u lilypond/lily/pango-font.cc:1.29 lilypond/lily/pango-font.cc:1.30
--- lilypond/lily/pango-font.cc:1.29 Mon May 2 23:49:18 2005
+++ lilypond/lily/pango-font.cc Wed May 4 10:11:32 2005
@@ -30,9 +30,9 @@
: PANGO_DIRECTION_RTL;
context_
= pango_ft2_get_context (PANGO_RESOLUTION, PANGO_RESOLUTION);
+ // context_ = pango_ft2_font_map_create_context (fontmap);
pango_description_ = pango_font_description_copy (description);
- // context_ = pango_ft2_font_map_create_context (fontmap);
attribute_list_ = pango_attr_list_new ();
/*
Index: lilypond/lily/part-combine-iterator.cc
diff -u lilypond/lily/part-combine-iterator.cc:1.23
lilypond/lily/part-combine-iterator.cc:1.24
--- lilypond/lily/part-combine-iterator.cc:1.23 Sat Apr 30 23:43:03 2005
+++ lilypond/lily/part-combine-iterator.cc Wed May 4 10:11:32 2005
@@ -60,11 +60,11 @@
/*
TODO: this is getting of hand...
*/
- Interpretation_context_handle one_;
- Interpretation_context_handle two_;
- Interpretation_context_handle null_;
- Interpretation_context_handle shared_;
- Interpretation_context_handle solo_;
+ Context_handle one_;
+ Context_handle two_;
+ Context_handle null_;
+ Context_handle shared_;
+ Context_handle solo_;
void substitute_both (Context *to1,
Context *to2);
@@ -204,7 +204,7 @@
{
Context *tos[] = {to1, to2};
Music_iterator *mis[] = {first_iter_, second_iter_};
- Interpretation_context_handle *hs[]
+ Context_handle *hs[]
= {
&null_,
&one_, &two_,
Index: lilypond/lily/quote-iterator.cc
diff -u lilypond/lily/quote-iterator.cc:1.37
lilypond/lily/quote-iterator.cc:1.38
--- lilypond/lily/quote-iterator.cc:1.37 Sat Apr 30 23:43:03 2005
+++ lilypond/lily/quote-iterator.cc Wed May 4 10:11:32 2005
@@ -18,7 +18,7 @@
public:
Quote_iterator ();
Moment vector_moment (int idx) const;
- Interpretation_context_handle quote_outlet_;
+ Context_handle quote_outlet_;
Moment start_moment_;
Moment stop_moment_;
_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
