new file.

diff --git a/ChangeLog b/ChangeLog
index 493a70dab1f1bbeadd10cb856d356b3e72c28548..59f1bfd272c1f6395b6b71f2f8b595c85909e07c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-08  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * lily/open-type-font-scheme.cc:  new file.
+
 2005-03-08  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * lily/lexer.ll (Lily_lexer):

diff --git a/VERSION b/VERSION
index f2bd041d8b00b99ba720fe1b1f0df77f96f5d59f..fd4257a8d72ee0f9a75efb2e62e88f55e93ae4f1 100644 (file)
--- 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 baf57728d1609387c2538bcab23f4392994ffbbe..fe203f16ec8c3518934a1656722322e27ea883df 100644 (file)
--- 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 <hanwen@cs.uu.nl>
-
- */
+  (c) 2001--2005  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+*/
 
 #include "simple-music-iterator.hh"
 #include "event.hh"

diff --git a/lily/book-scheme.cc b/lily/book-scheme.cc
index ac296a6744e2debc3c888c231c7b62be0f3276db..32bcb0e1586fca4cdb3b388633f3c47407ea7a04 100644 (file)
--- 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 <hanwen@cs.uu.nl>
+*/
+
 #include "book.hh"
 #include "output-def.hh"
 #include "score.hh"

diff --git a/lily/book.cc b/lily/book.cc
index 114fb04b32ec38ae9a27c3e2f8183ef21c004dfa..d15233f70c5ac04eab8c0f1f84b90f15b1003b7c 100644 (file)
--- a/lily/book.cc
+++ b/lily/book.cc
@@ -6,10 +6,10 @@
   (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "book.hh"
 
 #include <cstdio>
 
+#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 24456265dbfba46eff6b62543291ee5dd23ed0af..22cfd55171103e379f78115736ddc8bfd105dc8f 100644 (file)
--- 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 e4dc04da6a45d50c12d9df707425e41bd8d5f38d..84d69b5a466f886c6011dfd2c1882dd840793905 100644 (file)
--- 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 9bbf42e3942bfced04cede289570059e07f83be6..66d78a666031ee192483a73d02c1f814ff1e6460 100644 (file)
--- 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 <hanwen@xs4all.nl>
+
+*/
 #include "rhythmic-head.hh"
 #include "grob.hh"
 #include "score-engraver.hh"

diff --git a/lily/function-documentation.cc b/lily/function-documentation.cc
index 891c9180cac5f091f26f372dadd31c478424ebd7..5e57203fc2e55902e654d99e79ef1f5589c1f8ce 100644 (file)
--- 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 a06e3f1f8593d3e7f9378c3bbb945c7461e6e1a9..140df2f15a7d30c689a21a3fb5af99b23a366f1c 100644 (file)
--- 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 dec122307bc2b4a4d1a3dbba6e08d1c6e128fa0a..9cd1741fab1953616ec103a48bf3452326d823e1 100644 (file)
--- 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 d2bba0544ade14228ff3c7e54acc5539b138c710..d8dbac75357e1f249ef130e7316afb78099841ee 100644 (file)
--- 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 27327e12bfb7e113cd601f7fe8426e8cf353ea90..1fe6e0730e4b69aacebefc3825003856f7c1ba3c 100644 (file)
--- 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 781c5b3cc3ee8360a8eb0ddd48942964d3389df1..22138e453cdf844af91397ff28808292fd614005 100644 (file)
--- a/lily/mensural-ligature.cc
+++ b/lily/mensural-ligature.cc
@@ -7,10 +7,10 @@
                 Pal Benko <benkop@freestart.hu>
 */
 
-#include "mensural-ligature.hh"
 
 #include <math.h>
 
+#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 (file)
index 0000000..27e5743
--- /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 <hanwen@xs4all.nl>
+*/
+
+#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<Modified_font_metric*> (unsmob_metrics (font));
+  Open_type_font * otf = dynamic_cast<Open_type_font*> (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 dabbbba28609171f2ed58bdcabaf45991e260005..347574f88cd92163530f83eb31f7e3801a95f565 100644 (file)
--- 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<Modified_font_metric*> (unsmob_metrics (font));
-  Open_type_font * otf = dynamic_cast<Open_type_font*> (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 52ead4644fb38b5e2a8c7c1c7e5c60c3a95a5c51..5a1e54835211bb503327382d0644985301e939ed 100644 (file)
--- 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 <hanwen@xs4all.nl>
+
+*/
+
 #include "config.hh"
 
 #if HAVE_PANGO_FT2