From 870449057137d926aaf8fbe157f15637240edfe8 Mon Sep 17 00:00:00 2001 From: hanwen Date: Tue, 8 Mar 2005 12:40:39 +0000 Subject: [PATCH] new file. --- ChangeLog | 4 ++++ VERSION | 2 +- lily/bar-check-iterator.cc | 10 ++++----- lily/book-scheme.cc | 8 +++++++ lily/book.cc | 2 +- lily/collision-engraver.cc | 2 +- lily/column-x-positions.cc | 2 +- lily/forbid-break-engraver.cc | 8 +++++++ lily/function-documentation.cc | 2 +- lily/grob-interface-scheme.cc | 2 +- lily/ledger-line-engraver.cc | 2 +- lily/melisma-translator.cc | 4 ---- lily/mensural-ligature-engraver.cc | 1 - lily/mensural-ligature.cc | 2 +- lily/open-type-font-scheme.cc | 36 ++++++++++++++++++++++++++++++ lily/open-type-font.cc | 26 --------------------- lily/pango-select-scheme.cc | 9 ++++++++ 17 files changed, 77 insertions(+), 45 deletions(-) create mode 100644 lily/open-type-font-scheme.cc diff --git a/ChangeLog b/ChangeLog index 493a70dab1..59f1bfd272 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-03-08 Han-Wen Nienhuys + + * lily/open-type-font-scheme.cc: new file. + 2005-03-08 Jan Nieuwenhuizen * lily/lexer.ll (Lily_lexer): diff --git a/VERSION b/VERSION index f2bd041d8b..fd4257a8d7 100644 --- a/VERSION +++ b/VERSION @@ -1,6 +1,6 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=2 MINOR_VERSION=5 -PATCH_LEVEL=14 +PATCH_LEVEL=15 MY_PATCH_LEVEL= diff --git a/lily/bar-check-iterator.cc b/lily/bar-check-iterator.cc index baf57728d1..fe203f16ec 100644 --- a/lily/bar-check-iterator.cc +++ b/lily/bar-check-iterator.cc @@ -1,12 +1,10 @@ /* + bar-check-iterator.cc -- implement Bar_check_iterator - bar-check-iterator.cc -- implement Bar_check_iterator + source file of the GNU LilyPond music typesetter - source file of the GNU LilyPond music typesetter - - (c) 2001--2005 Han-Wen Nienhuys - - */ + (c) 2001--2005 Han-Wen Nienhuys +*/ #include "simple-music-iterator.hh" #include "event.hh" diff --git a/lily/book-scheme.cc b/lily/book-scheme.cc index ac296a6744..32bcb0e158 100644 --- a/lily/book-scheme.cc +++ b/lily/book-scheme.cc @@ -1,3 +1,11 @@ +/* + book-scheme.cc -- implement Book bindings + + source file of the GNU LilyPond music typesetter + + (c) 2004--2005 Han-Wen Nienhuys +*/ + #include "book.hh" #include "output-def.hh" #include "score.hh" diff --git a/lily/book.cc b/lily/book.cc index 114fb04b32..d15233f70c 100644 --- a/lily/book.cc +++ b/lily/book.cc @@ -6,10 +6,10 @@ (c) 1997--2005 Han-Wen Nienhuys */ -#include "book.hh" #include +#include "book.hh" #include "lilypond-key.hh" #include "global-context.hh" #include "main.hh" diff --git a/lily/collision-engraver.cc b/lily/collision-engraver.cc index 24456265db..22cfd55171 100644 --- a/lily/collision-engraver.cc +++ b/lily/collision-engraver.cc @@ -1,5 +1,5 @@ /* - collision-reg.cc -- implement Collision_engraver + collision-engraver.cc -- implement Collision_engraver source file of the GNU LilyPond music typesetter diff --git a/lily/column-x-positions.cc b/lily/column-x-positions.cc index e4dc04da6a..84d69b5a46 100644 --- a/lily/column-x-positions.cc +++ b/lily/column-x-positions.cc @@ -1,5 +1,5 @@ /* - colhpos.cc -- implement Column_x_positions + column-x-positions.cc -- implement Column_x_positions source file of the GNU LilyPond music typesetter diff --git a/lily/forbid-break-engraver.cc b/lily/forbid-break-engraver.cc index 9bbf42e394..66d78a6660 100644 --- a/lily/forbid-break-engraver.cc +++ b/lily/forbid-break-engraver.cc @@ -1,3 +1,11 @@ +/* + forbid-break-engraver.cc -- implement Forbid_line_break_engraver + + source file of the GNU LilyPond music typesetter + + (c) 2002--_2005 Han-Wen Nienhuys + +*/ #include "rhythmic-head.hh" #include "grob.hh" #include "score-engraver.hh" diff --git a/lily/function-documentation.cc b/lily/function-documentation.cc index 891c9180ca..5e57203fc2 100644 --- a/lily/function-documentation.cc +++ b/lily/function-documentation.cc @@ -1,5 +1,5 @@ /* - function-documentation.cc -- + function-documentation.cc -- Scheme doc strings. source file of the GNU LilyPond music typesetter diff --git a/lily/grob-interface-scheme.cc b/lily/grob-interface-scheme.cc index a06e3f1f85..140df2f15a 100644 --- a/lily/grob-interface-scheme.cc +++ b/lily/grob-interface-scheme.cc @@ -1,5 +1,5 @@ /* - lily/grob-interface-scheme.cc -- implement + grob-interface-scheme.cc -- implement grob interface bindings. source file of the GNU LilyPond music typesetter diff --git a/lily/ledger-line-engraver.cc b/lily/ledger-line-engraver.cc index dec122307b..9cd1741fab 100644 --- a/lily/ledger-line-engraver.cc +++ b/lily/ledger-line-engraver.cc @@ -1,5 +1,5 @@ /* - ledger-line-engraver.cc -- implement Ledger_line_engraver = + ledger-line-engraver.cc -- implement Ledger_line_engraver source file of the GNU LilyPond music typesetter diff --git a/lily/melisma-translator.cc b/lily/melisma-translator.cc index d2bba0544a..d8dbac7535 100644 --- a/lily/melisma-translator.cc +++ b/lily/melisma-translator.cc @@ -7,10 +7,6 @@ */ -/* - duplicated in melisma-performer - */ - #include "engraver.hh" #include "grob.hh" #include "context.hh" diff --git a/lily/mensural-ligature-engraver.cc b/lily/mensural-ligature-engraver.cc index 27327e12bf..1fe6e0730e 100644 --- a/lily/mensural-ligature-engraver.cc +++ b/lily/mensural-ligature-engraver.cc @@ -8,7 +8,6 @@ */ #include "coherent-ligature-engraver.hh" - #include "mensural-ligature.hh" #include "event.hh" #include "warn.hh" diff --git a/lily/mensural-ligature.cc b/lily/mensural-ligature.cc index 781c5b3cc3..22138e453c 100644 --- a/lily/mensural-ligature.cc +++ b/lily/mensural-ligature.cc @@ -7,10 +7,10 @@ Pal Benko */ -#include "mensural-ligature.hh" #include +#include "mensural-ligature.hh" #include "item.hh" #include "font-interface.hh" #include "lookup.hh" diff --git a/lily/open-type-font-scheme.cc b/lily/open-type-font-scheme.cc new file mode 100644 index 0000000000..27e574312e --- /dev/null +++ b/lily/open-type-font-scheme.cc @@ -0,0 +1,36 @@ +/* + open-type-font.cc -- implement Open_type_font + + source file of the GNU LilyPond music typesetter + + (c) 2004--2005 Han-Wen Nienhuys +*/ + +#include "modified-font-metric.hh" +#include "open-type-font.hh" + +LY_DEFINE (ly_font_sub_fonts, "ly:font-sub-fonts", 1, 0, 0, + (SCM font), + "Given the font metric @var{font} of an OpenType font, return the " + "names of the subfonts within @var{font}.") +{ + Font_metric *fm = unsmob_metrics (font); + SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric"); + return fm->sub_fonts (); +} + +LY_DEFINE (ly_otf_font_glyph_info, "ly:otf-font-glyph-info", 2, 0, 0, + (SCM font, SCM glyph), + "Given the font metric @var{font} of an OpenType font, return the " + "information about named glyph @var{glyph} (a string)") +{ + Modified_font_metric * fm + = dynamic_cast (unsmob_metrics (font)); + Open_type_font * otf = dynamic_cast (fm->original_font ()); + SCM_ASSERT_TYPE (otf, font, SCM_ARG1, __FUNCTION__, "OTF font-metric"); + SCM_ASSERT_TYPE (scm_is_string (glyph), glyph, SCM_ARG1, + __FUNCTION__, "string"); + + SCM sym = scm_string_to_symbol (glyph); + return scm_hashq_ref (otf->get_char_table (), sym, SCM_EOL); +} diff --git a/lily/open-type-font.cc b/lily/open-type-font.cc index dabbbba286..347574f88c 100644 --- a/lily/open-type-font.cc +++ b/lily/open-type-font.cc @@ -224,32 +224,6 @@ Open_type_font::sub_fonts () const return lily_subfonts_; } -LY_DEFINE (ly_font_sub_fonts, "ly:font-sub-fonts", 1, 0, 0, - (SCM font), - "Given the font metric @var{font} of an OpenType font, return the " - "names of the subfonts within @var{font}.") -{ - Font_metric *fm = unsmob_metrics (font); - SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric"); - return fm->sub_fonts (); -} - -LY_DEFINE (ly_otf_font_glyph_info, "ly:otf-font-glyph-info", 2, 0, 0, - (SCM font, SCM glyph), - "Given the font metric @var{font} of an OpenType font, return the " - "information about named glyph @var{glyph} (a string)") -{ - Modified_font_metric * fm - = dynamic_cast (unsmob_metrics (font)); - Open_type_font * otf = dynamic_cast (fm->original_font ()); - SCM_ASSERT_TYPE (otf, font, SCM_ARG1, __FUNCTION__, "OTF font-metric"); - SCM_ASSERT_TYPE (scm_is_string (glyph), glyph, SCM_ARG1, - __FUNCTION__, "string"); - - SCM sym = scm_string_to_symbol (glyph); - return scm_hashq_ref (otf->get_char_table (), sym, SCM_EOL); -} - SCM Open_type_font::get_char_table () const { diff --git a/lily/pango-select-scheme.cc b/lily/pango-select-scheme.cc index 52ead4644f..5a1e548352 100644 --- a/lily/pango-select-scheme.cc +++ b/lily/pango-select-scheme.cc @@ -1,3 +1,12 @@ +/* + pango-select-scheme.cc -- implement Pango descr <-> string bindings + + source file of the GNU LilyPond music typesetter + + (c) 2005 Han-Wen Nienhuys + +*/ + #include "config.hh" #if HAVE_PANGO_FT2 -- 2.39.2