From b1715a6813527390232dccf7b62358d95974704c Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Thu, 5 May 2005 22:13:58 +0000 Subject: [PATCH] *** empty log message *** --- ChangeLog | 5 +++ Documentation/user/introduction.itely | 6 +-- .../user/programming-interface.itely | 14 +++---- lily/include/context-handle.hh | 37 +++++++++++++++++++ lily/note-head.cc | 2 +- lily/pango-font.cc | 5 ++- 6 files changed, 54 insertions(+), 15 deletions(-) create mode 100644 lily/include/context-handle.hh diff --git a/ChangeLog b/ChangeLog index 050a2a872d..e404e8b53c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-05-05 Han-Wen Nienhuys + + * Documentation/user/programming-interface.itely (How markups work + internally ): remove \encoding reference. + 2005-05-04 Mats Bengtsson * scripts/convert-ly.py: Attempt to do a smarter update of diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely index 8eb1739442..7aecfb286c 100644 --- 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 e4b143ce5d..0a673932c1 100644 --- 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 index 0000000000..8e2298a628 --- /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 +*/ + +#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 c3844dae6b..5e86f75c62 100644 --- 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 5288a25b48..8af090c106 100644 --- 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); -- 2.39.2