* Documentation/topdocs/NEWS.tely: add inputfileref macro.

* scm/framework-ps.scm (supplies-or-needs): uniq font name list.

diff --git a/ChangeLog b/ChangeLog
index fde7b5e6b25b5d24aac4cc93328a336f58165355..9b1022384f135ac63ec9764870559d0df0b2e69a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-02-20  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * Documentation/topdocs/NEWS.tely: add inputfileref macro.
+
+       * scm/framework-ps.scm (supplies-or-needs): uniq font name list.
+
 2005-02-20  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * input/regression/stanza-number.ly:

diff --git a/Documentation/topdocs/NEWS.tely b/Documentation/topdocs/NEWS.tely
index 2f16f96df28e26ce4c6b970af5253c7671a8ac36..a8e2038ad81e82b028144d5b41c9cd1d5aab167a 100644 (file)
--- a/Documentation/topdocs/NEWS.tely
+++ b/Documentation/topdocs/NEWS.tely
@@ -1,4 +1,17 @@
 \input texinfo @c -*-texinfo-*-
+
+@ifhtml
+@macro inputfileref{DIR,NAME}
+@uref{../../../../\DIR\/out-www/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}@c
+@end macro
+@end ifhtml
+
+@ifnothtml
+@macro inputfileref{DIR,NAME}
+@file{\DIR\/\NAME\}@c
+@end macro
+@end ifnothtml
+
 @setfilename NEWS.info
 @settitle NEWS
 
@@ -23,8 +36,7 @@ Thanks to Steve Doonan for funding development of this feature.
 Individual objects may be assigned colors, for example,
 
 @lilypond[fragment,relative=1,verbatim,raggedright] 
-       \override Beam #'color = #cyan
-       \override NoteHead #'color = #darkyellow
+       \override NoteHead #'color = #red
        c4
 @end lilypond 
 
@@ -37,18 +49,15 @@ to GhostScript 8.x.
 
 @item
 Separator slashes may be inserted between systems in a score. For an
-example,   see
-@file{input/regression/system-separator.ly}:
-
-@lilypondfile{system-separator.ly}
+example, see @inputfileref{input/regression/system-separator.ly}:
 
 @item
 Locations of errors in the input are now calculated more precisely.
 
 @item
 LilyPond now uses Pango and FontConfig for selecting and rendering
-internationalized text in non-@TeX{} backends. A font may be selected
-by using a FontConfig name,
+UTF-8 input in non-@TeX{} backends. A font may be selected by using a
+FontConfig name,
 
 @example
 \override TextScript #'font-name = #"Serif"
@@ -66,9 +75,6 @@ or using the classic font selection mechanism
 Any Type1 and TrueType font recognized by FontConfig is available in
 LilyPond as well.
 
-@noindent
-Input strings encoded in UTF-8 are then rendered through Pango.
-
 @item
 Metrics of blocks of text can be retrieved from (La)@TeX{} directly,
 using the @code{-f texstr} output backend. This provides exact metrics

diff --git a/flower/include/memory-stream.hh b/flower/include/memory-stream.hh
index 822c4470d2416c29f4f4be4fed24db47e79be478..e5077ffc4302460bc81eee31bc965e4b9fb4fb5c 100644 (file)
--- a/flower/include/memory-stream.hh
+++ b/flower/include/memory-stream.hh
@@ -1,5 +1,5 @@
 /*
-  memory-stream.hh -- declare
+  memory-stream.hh -- declare Memory_out_stream
 
   source file of the GNU LilyPond music typesetter
 
@@ -13,10 +13,6 @@
 #include <stdio.h>
 #include <unistd.h>
 
-
-/*
-  TODO: read support as well.
- */
 class Memory_out_stream
 {
   char *buffer_;

diff --git a/flower/memory-stream.cc b/flower/memory-stream.cc
index d73e808ee26d52946c5684d72088757a3490406b..8ba06441d32116a701a7d0ad0a68205c8222f1cf 100644 (file)
--- a/flower/memory-stream.cc
+++ b/flower/memory-stream.cc
@@ -13,6 +13,10 @@
 #include <libio.h>
 #include "memory-stream.hh"
 
+
+/*
+  TODO: add read support as well.
+*/
 const int Memory_out_stream::block_size_ = 1024;
 
 cookie_io_functions_t

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index b11aa79f66f37f65fc40216e6d16422872987f03..7232131374691e725514a1a3ed9486c0e920d50a 100644 (file)
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -155,11 +155,11 @@
                    "%%DocumentSuppliedResources: font ~a\n"
                    "%%DocumentNeededResources: font ~a\n")
                   f))
-               names))))
+               (uniq-list (sort names string<?))))))
 
 (define (eps-header paper bbox load-fonts?)
     (string-append "%!PS-Adobe-2.0 EPSF-2.0\n"
-                "%%Creator: creator time-stamp\n"
+                "%%Creator: LilyPond\n"
                 "%%BoundingBox: "
                 (string-join (map ly:number->string bbox) " ") "\n"
                 "%%Orientation: "
@@ -171,7 +171,7 @@
 
 (define (page-header paper page-count load-fonts?)
   (string-append "%!PS-Adobe-3.0\n"
-                "%%Creator: creator time-stamp\n"
+                "%%Creator: LilyPond\n"
                 "%%Pages: " (number->string page-count) "\n"
                 "%%PageOrder: Ascend\n"
                 "%%Orientation: "

diff --git a/ttftool/include/GNUmakefile b/ttftool/include/GNUmakefile
index 9c1603440a91e6d46414fbb57bc91b6f2fee6afc..6bcedbb14bcdc809641a90ee66f256e985fae538 100644 (file)
--- a/ttftool/include/GNUmakefile
+++ b/ttftool/include/GNUmakefile
@@ -2,7 +2,7 @@
 
 depth = ../..
 
-STEPMAKE_TEMPLATES=c++
+STEPMAKE_TEMPLATES=c
 
 include $(depth)/make/stepmake.make