*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index eaa9a2ba9caf68b70bd5154ca23e73ce1ad941fa..dfadf2365b489136905b31a916327f3dc3864b7f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,17 @@
 
 2006-08-20  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+       * make/ly-vars.make (OMF_FILES): strip ps.gz from OMF_FILES 
+
+       * scm/documentation-lib.scm (texi-file-head): category LilyPond.
+
+       * Documentation/user/lilypond.tely: strip lilypond/ from info
+       links, rename to category LilyPond
+
+       * lily/pango-font.cc (description_string): new function.
+
+       * VERSION: release 2.9.15
+
        * lily/spacing-engraver.cc (stop_translation_timestep): use
        Dscho's fix for spacing spanner. 
 
@@ -119,7 +130,6 @@
        * lily/spacing-loose-columns.cc (set_loose_columns): don't barf if
        spacing not set.
 
-
        * lily/spacing-engraver.cc (stop_translation_timestep): set
        spacing for proportional notation too.
 

diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely
index 05c9e4cf7a6f93aa9e9572d704c646d799b5314d..c80600f362d4fd4323045698550d51725f12b528 100644 (file)
--- a/Documentation/user/lilypond.tely
+++ b/Documentation/user/lilypond.tely
@@ -22,18 +22,17 @@ Distributions will want to install lilypond.info in postinstall, doing:
 @c    LilyPond  program.
 @end ignore
 
-@dircategory GNU music project
+@dircategory LilyPond
 @direntry
-* LilyPond: (lilypond/lilypond).           The GNU music typesetter.
-* abc2ly: (lilypond/lilypond)Invoking abc2ly.          Importing ABC.      
-* convert-ly: (lilypond/lilypond)Invoking convert-ly.  Older LilyPond versions.
-* etf2ly: (lilypond/lilypond)Invoking etf2ly.          Importing Finale.
-* lilypond-book: (lilypond/lilypond)LilyPond-book.     Itegrating text and music.
-* midi2ly: (lilypond/lilypond)Invoking midi2ly.        Importing MIDI.
-* mup2ly: (lilypond/lilypond)Invoking mup2ly.          Importing Mup.
+* LilyPond: (lilypond).           The GNU music typesetter.
+* abc2ly: (lilypond)Invoking abc2ly.          Importing ABC.      
+* convert-ly: (lilypond)Invoking convert-ly.  Older LilyPond versions.
+* etf2ly: (lilypond)Invoking etf2ly.          Importing Finale.
+* lilypond-book: (lilypond)LilyPond-book.     Itegrating text and music.
+* midi2ly: (lilypond)Invoking midi2ly.        Importing MIDI.
+* mup2ly: (lilypond)Invoking mup2ly.          Importing Mup.
 @end direntry
 
-
 @c don't remove this comment.
 @ignore
 @omfcreator Han-Wen Nienhuys, Jan Nieuwenhuizen and Graham Percival

diff --git a/Documentation/user/music-glossary.tely b/Documentation/user/music-glossary.tely
index b9929ca391572fb111c6b71faf075daec0ed2b36..b7287248d6e5240ca78d167588ec6fa6f70c91e6 100644 (file)
--- a/Documentation/user/music-glossary.tely
+++ b/Documentation/user/music-glossary.tely
@@ -5,9 +5,9 @@
 @documentencoding utf-8
 @documentlanguage en
 
-@dircategory GNU music project
+@dircategory LilyPond
 @direntry
-* Glossary: (lilypond/music-glossary).  Glossary of music terms.
+* Glossary: (music-glossary).  Glossary of music terms.
 @end direntry
 
 @ifhtml

diff --git a/lily/include/pango-font.hh b/lily/include/pango-font.hh
index dc21ccf684199089a65de939d4cd9569e5894818..44c2bf4e5b5efc67d82b6d41393742e2b4ac4ade 100644 (file)
--- a/lily/include/pango-font.hh
+++ b/lily/include/pango-font.hh
@@ -39,6 +39,7 @@ public:
              Real);
   ~Pango_font ();
 
+  string description_string () const; 
   SCM font_file_name () const;
   void register_font_file (string, string);
   Stencil text_stencil (string) const;

diff --git a/lily/pango-font.cc b/lily/pango-font.cc
index 93c4ec5ff7a8986394242bff3f35e0e170cfd89b..65b8ed016f562b6fd7495a02ceca59f057b16d4a 100644 (file)
--- a/lily/pango-font.cc
+++ b/lily/pango-font.cc
@@ -174,7 +174,8 @@ Pango_font::pango_item_string_stencil (PangoItem const *item, string str) const
 
       if (glyph_name[0] ==  '\0' && has_glyph_names)
        {
-         programming_error ("Glyph has no name, but font supports glyph naming. Skipping glyph.");
+         programming_error ("Glyph has no name, but font supports glyph naming. Skipping glyph: "
+                            + description_string ());
          continue;
        }
          
@@ -323,14 +324,11 @@ Pango_font::text_stencil (string str) const
       /*
        For Pango based backends, we take a shortcut.
       */
-      char *descr_string = pango_font_description_to_string (pango_description_);
       SCM exp
        = scm_list_3 (ly_symbol2scm ("utf-8-string"),
-                     scm_makfrom0str (descr_string),
+                     scm_makfrom0str (description_string ().c_str ()),
                      scm_makfrom0str (str.c_str ()));
 
-      g_free (descr_string);
-
       Box b (Interval (0, 0), Interval (0, 0));
       b.unite (dest.extent_box ());
       return Stencil (b, exp);
@@ -340,6 +338,16 @@ Pango_font::text_stencil (string str) const
   return dest;
 }
 
+string
+Pango_font::description_string () const
+{
+  char *descr_string = pango_font_description_to_string (pango_description_);
+  string s (descr_string);
+  g_free (descr_string);
+  return s;
+}
+
+
 SCM
 Pango_font::font_file_name () const
 {

diff --git a/make/ly-vars.make b/make/ly-vars.make
index 802c89b4ce42ca62ae71a4014a039e685ea2c739..d3559691301f2f2f256d964e9250067e1f328541 100644 (file)
--- a/make/ly-vars.make
+++ b/make/ly-vars.make
@@ -5,7 +5,7 @@
 # huh ? these are for documentation?!
 TELY_FILES := $(call src-wildcard,*.tely)
 
-OMF_FILES += $(foreach format, html pdf ps.gz, $(foreach f, $(TELY_FILES), $(outdir)/$(f:.tely=.$(format)).omf))
+OMF_FILES += $(foreach format, html pdf, $(foreach f, $(TELY_FILES), $(outdir)/$(f:.tely=.$(format)).omf))
 
 ITELY_FILES := $(call src-wildcard,*.itely)
 ITEXI_FILES := $(call src-wildcard,*.itexi)

diff --git a/scm/documentation-lib.scm b/scm/documentation-lib.scm
index 5a62f9728c15a52244f06cdffea190cc14260b0a..859032cc422c661461a7c5921b5443e54d198e2f 100644 (file)
--- a/scm/documentation-lib.scm
+++ b/scm/documentation-lib.scm
@@ -111,7 +111,7 @@
    "\\input texinfo @c -*-texinfo-*-"
    "\n@setfilename " file-name ".info"
    "\n@settitle " name
-   "\n@dircategory GNU music project"
+   "\n@dircategory LilyPond"
    "\n@direntry"
    ;; prepend GNU for dir, must be unique
    "\n* GNU " name ": (" file-name ").          " name "."

diff --git a/scm/lily.scm b/scm/lily.scm
index 79b060ec7056236d2fcd0ef0c06b0ed3217cef4e..484c81ecd9c172ac1e2e26557910af75790efdb8 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -13,9 +13,9 @@
            `((point-and-click #t "use point & click")
              (paper-size "a4" "the default paper size")
              (midi-debug #f "generate human readable MIDI")
-             (dump-signatures #f "dump output signatures of each system (EPS backend)")
+             (dump-signatures #f "dump output signatures of each system")
              (internal-type-checking #f "check every property assignment for types")
-             (parse-protect #t    "continue when finding errors in inline
+             (parse-protect #t "continue when finding errors in inline
 scheme are caught in the parser. If off, halt 
 on errors, and print a stack trace.")
              (profile-property-accesses #f "keep statistics of get_property() calls.")
@@ -39,7 +39,7 @@ similar to chord syntax")
              (ttf-verbosity 0
                           "how much verbosity for TTF font embedding?")
              (debug-gc #f
-                       "dump GC protection info")
+                       "dump memory debugging statistics")
              (show-available-fonts #f
                                    "List  font names available.")
              (read-file-list #f "Read files to be processed from command line arguments")