*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 050a2a872da26f87839317ecf34c4186241470b0..e404e8b53c76fd717f0a7f74b5320d432b9a2a95 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-05  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * Documentation/user/programming-interface.itely (How markups work
+       internally ): remove \encoding reference.
+
 2005-05-04  Mats Bengtsson  <mabe@drongo.s3.kth.se>
 
        * scripts/convert-ly.py: Attempt to do a smarter update of 

diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely
index 8eb173944283becd292d0ca56b4ca711f0743914..7aecfb286cba1965a63e5ba5946d6b9f4e65f05e 100644 (file)
--- a/Documentation/user/introduction.itely
+++ b/Documentation/user/introduction.itely
@@ -665,7 +665,7 @@ files from previous versions of LilyPond.
 The
 @end ifhtml
 @emph{@ref{Basic notation}}
-@ifteml
+@ifhtml
 chapter
 @end ifhtml
 discusses topics grouped by notation construct.  This section gives
@@ -677,7 +677,7 @@ notation project.
 The
 @end ifhtml
 @emph{@ref{Instrument-specific notation}}
-@ifteml
+@ifhtml
 chapter
 @end ifhtml
 discusses topics grouped by notation construct.  This section gives
@@ -689,7 +689,7 @@ instrument (or vocal) groups.
 The
 @end ifhtml
 @emph{@ref{Advanced notation}}
-@ifteml
+@ifhtml
 chapter
 @end ifhtml
 discusses topics grouped by notation construct.  This section gives

diff --git a/Documentation/user/programming-interface.itely b/Documentation/user/programming-interface.itely
index e4b143ce5d5fd70bf8943b0ae8748d829b17d846..0a673932c15c6f4fc1c82676a98cf1c82e8a6732 100644 (file)
--- a/Documentation/user/programming-interface.itely
+++ b/Documentation/user/programming-interface.itely
@@ -501,13 +501,9 @@ In a markup like
 function.  The markup expression is stored as
 
 @example
-(list raise-markup 0.5 (list simple-markup 'latin1 "foo"))
+(list raise-markup 0.5 (list simple-markup "foo"))
 @end example
 
-@noindent
-In this case, @code{latin1} is the input encoding, which is set with
-the @code{\encoding} command.
-
 When the markup is converted to printable objects (Stencils), the
 @code{raise-markup} function is called as
 
@@ -519,10 +515,10 @@ When the markup is converted to printable objects (Stencils), the
        @var{the "foo" markup})
 @end example
 
-The @code{raise-markup} first creates the stencil for the @code{foo}
-string, and then it raises that Stencil by 0.5 staff space.  This is a
-rather simple example; more complex examples are in the rest of this
-section, and in @file{scm/@/define@/-markup@/-commands@/.scm}.
+The @code{raise-markup} function first creates the stencil for the
+@code{foo} string, and then it raises that Stencil by 0.5 staff space.
+This is a rather simple example; more complex examples are in the rest
+of this section, and in @file{scm/@/define@/-markup@/-commands@/.scm}.
 
 @node Markup command definition
 @subsection Markup command definition

diff --git a/lily/include/context-handle.hh b/lily/include/context-handle.hh
new file mode 100644 (file)
index 0000000..8e2298a
--- /dev/null
+++ b/lily/include/context-handle.hh
@@ -0,0 +1,37 @@
+/*
+  context-handle.hh -- declare  Context_handle
+
+  source file of the GNU LilyPond music typesetter
+
+  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+*/
+
+#ifndef INTERPRETATION_CONTEXT_HANDLE_HH
+#define INTERPRETATION_CONTEXT_HANDLE_HH
+#include "lily-proto.hh"
+
+/*
+  Rename me to Context_handle.
+*/
+
+class Context_handle
+{
+public:
+  ~Context_handle ();
+  Context_handle ();
+
+  void set_context (Context *);
+  bool try_music (Music *);
+  void operator = (Context_handle const &);
+  Context_handle (Context_handle const &);
+  Context *get_outlet () const;
+
+  int get_count () const;
+private:
+  Context *outlet_;
+  void down ();
+  void up (Context *);
+};
+
+#endif /* INTERPRETATION_CONTEXT_HANDLE_HH */
+

diff --git a/lily/note-head.cc b/lily/note-head.cc
index c3844dae6beba4c09c2d39503c419f82c3d5cb44..5e86f75c62614da3f9dfa7f643ed088e853d0439 100644 (file)
--- a/lily/note-head.cc
+++ b/lily/note-head.cc
@@ -165,7 +165,7 @@ int
 Note_head::get_balltype (Grob *me)
 {
   SCM s = me->get_property ("duration-log");
-  return scm_is_number (s) ? min ((int) scm_to_int (s), (int) 2) : 0;
+  return scm_is_number (s) ? min (scm_to_int (s), 2) : 0;
 }
 
 ADD_INTERFACE (Note_head, "note-head-interface",

diff --git a/lily/pango-font.cc b/lily/pango-font.cc
index 5288a25b48df01a07b48a544b25988975fb931e2..8af090c106b64cb5e9ee5b2d78ed89ba3c02392b 100644 (file)
--- a/lily/pango-font.cc
+++ b/lily/pango-font.cc
@@ -24,6 +24,7 @@ Pango_font::Pango_font (PangoFT2FontMap *fontmap,
                        PangoFontDescription *description,
                        Real output_scale)
 {
+  (void) fontmap;
   physical_font_tab_ = scm_c_make_hash_table (11);
   PangoDirection pango_dir = (dir == RIGHT)
     ? PANGO_DIRECTION_LTR
@@ -142,8 +143,8 @@ Pango_font::pango_item_string_stencil (PangoItem *item, String str, Real dx) con
       */
 
       String name = filename;
-      int idx = String (filename).index (".otf")
-       >? String (filename).index (".cff");
+      int idx = max (String (filename).index (".otf"),
+                    String (filename).index (".cff"));
 
       name = name.left_string (idx);