From aa384518d059d26ffd6c0da3068fbdc2a345ecc1 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Wed, 15 May 2002 11:47:39 +0000 Subject: [PATCH] duh. --- ChangeLog | 11 +++ Documentation/topdocs/INSTALL.texi | 38 +++----- buildscripts/make-font-dir.py | 6 +- config.make.in | 2 +- flower/data-file.cc | 143 ----------------------------- flower/getopt-long.cc | 6 +- flower/include/data-file.hh | 57 ------------ flower/include/getopt-long.hh | 6 +- flower/include/rational.hh | 2 + flower/include/string.hh | 12 ++- flower/include/text-db.hh | 53 ----------- flower/include/text-stream.hh | 70 -------------- flower/input.cc | 6 +- flower/rational.cc | 3 + flower/string.cc | 21 +++-- flower/text-db.cc | 58 ------------ flower/text-stream.cc | 51 ---------- flower/warn.cc | 15 ++- input/baerenreiter-sarabande.ly | 4 +- input/example-3.ly | 2 +- input/just-friends.ly | 2 +- input/les-nereides.ly | 2 +- input/mozart-hrn3-allegro.ly | 2 +- input/mozart-hrn3-defs.ly | 2 +- input/mozart-hrn3-romanze.ly | 2 +- input/mozart-hrn3-rondo.ly | 2 +- input/mutopia-header.ly | 2 +- input/opus-130.ly | 2 +- input/praeludium-fuga-E.ly | 2 +- input/rhythm.ly | 2 +- input/scarlatti-paper.ly | 4 +- input/star-spangled-banner.ly | 2 +- input/trip.ly | 2 +- input/twinkle-pop.ly | 2 +- input/twinkle.ly | 2 +- lily/engraver-group-engraver.cc | 2 +- lily/include/midi-stream.hh | 1 + lily/include/moment.hh | 6 +- lily/lexer.ll | 15 +-- lily/main.cc | 33 +++---- lily/midi-stream.cc | 9 +- lily/moment.cc | 3 + lily/scm-option.cc | 3 +- lily/scores.cc | 18 ++-- lily/warn.cc | 14 +-- ly/a4-init.ly | 2 +- ly/accordion-defs-init.ly | 2 +- ly/book-init-init.ly | 2 +- ly/catalan.ly | 2 +- ly/center-init.ly | 2 +- ly/chord-modifiers-init.ly | 2 +- ly/declarations-init.ly | 2 +- ly/deutsch.ly | 2 +- ly/drumpitch-init.ly | 2 +- ly/dynamic-scripts-init.ly | 2 +- ly/english.ly | 2 +- ly/engraver-init.ly | 2 +- ly/generate-documentation.ly | 2 +- ly/generic-paper-init.ly | 2 +- ly/german-chords-init.ly | 2 +- ly/init.ly | 2 +- ly/italiano.ly | 2 +- ly/ledger-init.ly | 2 +- ly/legal-init.ly | 2 +- ly/letter-init.ly | 2 +- ly/midi-init.ly | 2 +- ly/nederlands.ly | 2 +- ly/norsk.ly | 2 +- ly/paper-as5-init.ly | 2 +- ly/paper-as9-init.ly | 2 +- ly/paper-init.ly | 2 +- ly/paper11-init.ly | 2 +- ly/paper13-init.ly | 2 +- ly/paper16-init.ly | 2 +- ly/paper20-init.ly | 2 +- ly/paper23-init.ly | 2 +- ly/paper26-init.ly | 2 +- ly/params-as-init.ly | 2 +- ly/params-init.ly | 2 +- ly/part-paper-init.ly | 2 +- ly/performer-init.ly | 2 +- ly/property-init.ly | 2 +- ly/scale-definitions-init.ly | 2 +- ly/script-init.ly | 2 +- ly/spanners-init.ly | 2 +- ly/suomi.ly | 2 +- ly/svenska.ly | 2 +- mf/GNUmakefile | 5 +- scripts/lilypond-book.py | 2 +- 89 files changed, 188 insertions(+), 605 deletions(-) delete mode 100644 flower/data-file.cc delete mode 100644 flower/include/data-file.hh delete mode 100644 flower/include/text-db.hh delete mode 100644 flower/include/text-stream.hh delete mode 100644 flower/text-db.cc delete mode 100644 flower/text-stream.cc diff --git a/ChangeLog b/ChangeLog index 1b714ec0da..bc8062bb52 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2002-05-15 Han-Wen Nienhuys + + * lily/*.cc: remove as many iostream use as possible. + + * flower/ : remove text-db, text-stream, data-file. + 2002-05-15 Han-Wen * scripts/lilypond-book.py: add --no-music option: strip all blocks. @@ -9,6 +15,11 @@ 2002-05-13 Han-Wen Nienhuys + * scripts/lilypond-book.py (make_pixmap): output png directly. + + * mf/GNUmakefile (INSTALLATION_OUT_FILES4): create and install + fonts.dir file. + * lily/parser.yy (My_lily_parser): uncomment code. (Causes problems with recent bison releases). diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi index c050addd46..1130e259d3 100644 --- a/Documentation/topdocs/INSTALL.texi +++ b/Documentation/topdocs/INSTALL.texi @@ -146,7 +146,7 @@ Also, @TeX{}'s libkpathsea is used to find the fonts (@file{.mf}, @file{.afm}, @ Make sure you have tetex 1.0 or newer (1.0.6 is known to work). You may need to install a tetex-devel or tetex-dev package too. -@item Texinfo (version 4.0 or newer). +@item Texinfo (version 4.2 or newer). The documentation of lily is written in texinfo. Check out @uref{ftp://ftp.gnu.org/gnu/texinfo/,the texinfo FTP directory}. @@ -159,7 +159,7 @@ with the @TeX{} distribution. @item kpathsea, a library for searching (@TeX{}) files. @code{kpathsea} is usually included with your installation of @TeX{}. You may need to install a tetex-devel or tetex-dev package too. If kpathsea is not installed in -a directory where the compiler normaly looks, read the hints for +a directory where the compiler normally looks, read the hints for Slackware below. In the very unlikely case that kpathsea is not available for your @@ -172,11 +172,6 @@ configure something like: ./configure --without-kpathsea --enable-tfm-path=/usr/share/texmf/fonts/tfm/public/cm/:/usr/share/texmf/fonts/tfm/ams/symbols @end example - -@item pktrace 1.0 or newer, [OPTIONAL], needed for generating PostScript Type1 -fonts. Get it from @uref{http://www.cs.uu.nl/~hanwen/pktrace/}. You -will need to install some additional packages to get pktrace to work. - @end itemize @subsection Running requirements @@ -216,22 +211,10 @@ by issuing Building the website requires some additional tools: @itemize @bullet -@item xpmtoppm (from the netpbm package: the Portable Bitmap Utilities). - The original is at -@uref{ftp://ftp.x.org/contrib/utilities/netpbm-1mar1994.p1.tar.gz,the -netpbm FTP site} - -@item pnmtopng. The original is -at -@uref{ftp://swrinde.nde.swri.edu/pub/png/applications/pnmtopng-2.37.2.tar.gz,in -the pnmtopng FTP site}. - -@item texinfo (a development release) -The documentation will build with texinfo-4.0, but if you want split -html pages, you're best off using the lates pretest version from -@uref{ftp://texinfo.org/texinfo/pretests/texinfo-4.0b.tar.gz, -texinfo-4.0b} or -@uref{ftp://alpha.gnu.org/gnu/texinfo-4.0b.tar.gz,texinfo-4.0b} +@item The netpbm utilities, see @uref{http://netpbm.sourceforge.net/} +@item pktrace 1.0 or newer, needed for generating PostScript Type1 +fonts. Get it from @uref{http://www.cs.uu.nl/~hanwen/pktrace/}. You +will need to install some additional packages to get pktrace to work. @end itemize @section Building LilyPond @@ -325,7 +308,7 @@ file. @subsection Red Hat Linux -Red Hat 7.0 i386 RPMS are available from +Red Hat 7.x i386 RPMS are available from @uref{ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/binaries/}. You can also compile them yourself. A spec file is in @@ -342,9 +325,10 @@ with the sources. You can make the rpm by issuing For running on a Red Hat system you need these packages: guile, tetex, tetex-latex, tetex-dvips, libstdc++, python, ghostscript. -For compilation on a Red Hat system you need these packages, in addition -to the those needed for running: glibc-devel, gcc-c++, libstdc++-devel, -guile-devel, flex, bison, texinfo, groff, pktrace. +For compilation on a Red Hat system you need these packages, in +addition to the those needed for running: glibc-devel, gcc-c++, +libstdc++-devel, guile-devel, flex, bison, texinfo, groff, pktrace, +netpbm-progs, autotrace, t1utils. diff --git a/buildscripts/make-font-dir.py b/buildscripts/make-font-dir.py index 8edcffca3b..f81fe87baf 100644 --- a/buildscripts/make-font-dir.py +++ b/buildscripts/make-font-dir.py @@ -1,4 +1,8 @@ - +#!@PYTHON + + +## make a fonts.scale file. + import re import sys import string diff --git a/config.make.in b/config.make.in index 0cf0c6e36a..43a87ceab8 100644 --- a/config.make.in +++ b/config.make.in @@ -11,7 +11,7 @@ USER_LDFLAGS = @LDFLAGS@ @GUILE_LDFLAGS@ CC = @CC@ CROSS = @cross_compiling@ CXX = @CXX@ -GCC = @GCC@ + LD = @LD@ PACKAGE = @PACKAGE@ package = @package@ diff --git a/flower/data-file.cc b/flower/data-file.cc deleted file mode 100644 index 9f4c16b115..0000000000 --- a/flower/data-file.cc +++ /dev/null @@ -1,143 +0,0 @@ -/* - data-file.cc -- implement Data_file - - source file of the Flower Library - - (c) '95, '96, '97 Han-Wen Nienhuys - - DEPRECATED - - */ -#include -#include - -#include "international.hh" -#include "data-file.hh" - -void -Data_file::gobble_white () -{ - char c; - - while ((c=data_get ()) == ' ' ||c == '\t') - if (eof_b ()) - return; - - data_unget (c); -} - -String -Data_file::get_word () -{// should handle escape seq's - String s; - - while (1) - { - char c = data_get (); - - if (eof_b ()) - break; - - if (isspace (c)) - { - data_unget (c); - break; - } - - - if (c == '\"') - { - rawmode= true; - - while ((c = data_get ()) != '\"') - if (eof_b ()) - error (_ ("EOF in a string")); - else - s += to_str (c); - - - rawmode= false; - } - else - s += to_str (c); - } - - return s; -} - -char -Data_file::data_get () -{ - char c = get (); - if (!rawmode && c == '#') // gobble comment - { - while (!eof_b () && (c = get ()) != '\n') - ; - return '\n'; - } - - return c; -} - -String -Data_file::get_line () -{ - char c; - String s; - - while (!eof_b () && (c = data_get ()) != '\n') - s += to_str (c); - return s; -} - -void -Data_file::gobble_leading_white () -{ - // eat blank lines. - while (!eof_b ()) - { - char c = data_get (); - if (!isspace (c)) - { - data_unget (c); - break; - } - } -} - -Data_file::Data_file (String s) - : Text_stream (s) -{ - //*mlog << " (" << s << flush; - rawmode= false; -} - -void -Data_file::warning (String s) -{ - message (_ ("warning: ") + s); -} - -void -Data_file::error (String s) -{ - message (s); - exit (1); -} - -String -Data_file::gulp () -{ - String s; - - while (!eof_b ()) - { - s += to_str (data_get ()); - } - return s; -} - - -Data_file::~Data_file () -{ -} diff --git a/flower/getopt-long.cc b/flower/getopt-long.cc index 8e210efe20..7395555e79 100644 --- a/flower/getopt-long.cc +++ b/flower/getopt-long.cc @@ -134,7 +134,7 @@ void Getopt_long::report (Errorcod c) { error_ = c; - if (!error_ostream_l_) + if (!error_out_) return; String str = arg_value_ch_a_a_[0]; @@ -163,7 +163,7 @@ Getopt_long::report (Errorcod c) default: assert (false); } - *error_ostream_l_ << str << endl; + fprintf(error_out_, "%s\n", str.ch_C()); exit (2); } @@ -254,7 +254,7 @@ Getopt_long::operator () () Getopt_long::Getopt_long (int c, char **v, Long_option_init *lo) { option_a_ = lo; - error_ostream_l_ = &cerr; + error_out_ = stderr; arg_value_ch_a_a_ = v; argument_count_i_ = c; array_index_i_ = 1; diff --git a/flower/include/data-file.hh b/flower/include/data-file.hh deleted file mode 100644 index 797765c90b..0000000000 --- a/flower/include/data-file.hh +++ /dev/null @@ -1,57 +0,0 @@ -/* - data-file.hh -- declare Data_file - - source file of the LilyPond music typesetter - - (c) 1997--2000 Han-Wen Nienhuys -*/ - - -#ifndef DATAFILE_HH -#define DATAFILE_HH - -#include "text-stream.hh" - -/// read a data file -class Data_file : private Text_stream -{ - -public: - bool rawmode; - - Text_stream::line; - Text_stream::eof_b; - Text_stream::get_name; - - /** - Get a char. - Only class member who uses text_file::get - */ - char data_get (); - void data_unget (char c) { - unget (c); - } - - /// read line, eat #\n# - String get_line (); - - /// read a word till next space, leave space. Also does quotes - String get_word (); - - /// gobble horizontal white stuff. - void gobble_white (); - - /// gobble empty stuff before first field. - void gobble_leading_white (); - Data_file (String); - ~Data_file (); - /** - eat complete file - @post - eof () is true - */ - String gulp (); - void warning (String s); - void error (String s); -}; -#endif // DATAFILE_HH diff --git a/flower/include/getopt-long.hh b/flower/include/getopt-long.hh index a0992c98e6..58efbfe211 100644 --- a/flower/include/getopt-long.hh +++ b/flower/include/getopt-long.hh @@ -1,7 +1,7 @@ #ifndef GETOPT_LONG_HH #define GETOPT_LONG_HH -#include /* gcc 3.0 */ + #include "string.hh" /** @@ -66,7 +66,7 @@ public: /// the arg. count int argument_count_i_; - ostream *error_ostream_l_; + FILE *error_out_; public: /// get ready for processing next error. @@ -90,7 +90,7 @@ public: if #os# is null, then do not report nor abort, just set #error# */ - void seterror (ostream *os); + void seterror (FILE *os); /// construct: pass arguments and option info. Getopt_long (int c, char **v, Long_option_init *lo); diff --git a/flower/include/rational.hh b/flower/include/rational.hh index 9373b48448..5b4402f4c4 100644 --- a/flower/include/rational.hh +++ b/flower/include/rational.hh @@ -92,8 +92,10 @@ Rational::copy (Rational const&r) den_ = r.den_; } +#if 0 ostream & operator << (ostream &, Rational); +#endif const Rational infinity_rat = INT_MAX; diff --git a/flower/include/string.hh b/flower/include/string.hh index 334b0540a0..921afb2a65 100644 --- a/flower/include/string.hh +++ b/flower/include/string.hh @@ -11,11 +11,14 @@ #define STRING_HH +// too darn slow with gcc3 +#ifdef STREAM_SUPPORT #if ( __GNUC__ > 2 ) -#include /* gcc 3.0 */ +#include #else class ostream; #endif +#endif #include "arithmetic-operator.hh" #include "flower-proto.hh" @@ -138,9 +141,11 @@ public: void to_upper (); void to_lower (); +#ifdef STREAM_SUPPORT /// provide Stream output void print_on (ostream& os) const; - +#endif + /// the length of the string int length_i () const; @@ -209,7 +214,8 @@ inline bool operator!= (char const* s1,String s2) { } IMPLEMENT_ARITHMETIC_OPERATOR (String, +); - +#ifdef STREAM_SUPPORT ostream &operator << (ostream& os, String d); +#endif #endif diff --git a/flower/include/text-db.hh b/flower/include/text-db.hh deleted file mode 100644 index 813bdf041e..0000000000 --- a/flower/include/text-db.hh +++ /dev/null @@ -1,53 +0,0 @@ -#ifndef TEXTDB_HH -#define TEXTDB_HH - -#include "data-file.hh" - -/**a "const" Array. Contents can't be changed. do "#" comments, read quote enclosed fields */ - -class Text_record : Array -{ - int line_no; - String filename; - -public: - Text_record () { } // needed because of other ctor - - /// report an error in this line. - void message (String s); - String operator[] (int j) { - return Array::operator[] (j); - } - - Text_record (Array s, String fn, int j) : Array (s) { - filename = fn; line_no = j; - } - Array::size; -}; - -/** abstraction for a datafile. - add a subrec/fieldsep/record separator - */ - -class Text_db : private Data_file -{ - void gobble_leading_white (); -public: - /// get a line with records - Text_record get_record (); - - Text_db (String fn):Data_file (fn) { } - Data_file::error; - bool eof_b (); - - /// get next line. - Text_record operator++ (int) { - return get_record (); - } - /// are we done yet? - operator bool () { - return !eof_b (); - } -}; - -#endif diff --git a/flower/include/text-stream.hh b/flower/include/text-stream.hh deleted file mode 100644 index 6d7e5530a8..0000000000 --- a/flower/include/text-stream.hh +++ /dev/null @@ -1,70 +0,0 @@ - -#ifndef TEXTSTR_HH -#define TEXTSTR_HH - -#include -#include -#include "string.hh" -#include "array.hh" - -/** - line counting input stream. - a stream for textfiles. linecounting. Thin interface getchar and - ungetchar. (ungetc is unlimited) - - should protect get and unget against improper use -*/ - - -class Text_stream -{ - int line_no; - - // could just have used streams. - FILE *f; - Array pushback; - String name; - -public: - Text_stream (String fn); - String get_name () { return name; } - bool eof_b (); - char get () { - char c; - - if (pushback.empty ()) - c = getc (f); - else - c = pushback.pop (); - - if (c =='\n') - line_no++; - return c; - } - void unget (char c) { - if (c =='\n') - line_no--; - pushback.push (c); - } - char peek () { - if (eof_b ()) - return (char)-1; - char c = get (); - unget (c); - return c; - } - bool eol () { - return (peek () == '\n'); - } - int line (){ - return line_no; - } - - ~Text_stream (); - - - /// GNU format message. - void message (String s); -}; - -#endif diff --git a/flower/input.cc b/flower/input.cc index d45f81b9d3..98bbab4ee9 100644 --- a/flower/input.cc +++ b/flower/input.cc @@ -5,7 +5,9 @@ (c) 1997--2000 Han-Wen Nienhuys */ -#include + +#include + #include "flower-proto.hh" #include "input.hh" #include "string.hh" @@ -76,7 +78,7 @@ Input::message (String message_str) const str += ":\n"; str += source_file_l_->error_str (defined_ch_C_); } - cerr << str << endl; + fprintf (stderr, "%s\n", str.ch_C()); } void diff --git a/flower/rational.cc b/flower/rational.cc index 42e0c0a97c..4c7c293e35 100644 --- a/flower/rational.cc +++ b/flower/rational.cc @@ -17,12 +17,15 @@ Rational::operator double () const return (double)sign_ * num_ / den_; } +#ifdef STREAM_SUPPORT ostream & operator << (ostream &o, Rational r) { o << r.str (); return o; } +#endif + Rational Rational::trunc_rat () const diff --git a/flower/string.cc b/flower/string.cc index 4659807f0c..e08e908efe 100644 --- a/flower/string.cc +++ b/flower/string.cc @@ -42,15 +42,6 @@ String::copy_ch_p () const return (char*)copy_byte_p (); } -void -String::print_on (ostream& os) const -{ - if (!strh_.is_binary_bo ()) - os << ch_C (); - else - for (int i = 0; i < length_i (); i++) - os << (Byte) (*this)[ i ]; -} /* copying, constructing. @@ -397,6 +388,7 @@ String::value_f () const return String_convert::dec2_f (*this); } +#ifdef STREAM_SUPPORT ostream & operator << (ostream& os, String d) { @@ -405,4 +397,13 @@ operator << (ostream& os, String d) } - +void +String::print_on (ostream& os) const +{ + if (!strh_.is_binary_bo ()) + os << ch_C (); + else + for (int i = 0; i < length_i (); i++) + os << (Byte) (*this)[ i ]; +} +#endif diff --git a/flower/text-db.cc b/flower/text-db.cc deleted file mode 100644 index 6acfa9eeef..0000000000 --- a/flower/text-db.cc +++ /dev/null @@ -1,58 +0,0 @@ -#include -#include "text-db.hh" - -bool -Text_db::eof_b () -{ - Data_file::gobble_leading_white (); - return Data_file::eof_b (); -} - -void -Text_db::gobble_leading_white () -{ - while (1) - { - Data_file::gobble_leading_white (); - if (eof_b ()) - return ; - char c; - if ((c = data_get ()) !='\n') - { - data_unget (c); - return ; - } - } -} - - -Text_record -Text_db::get_record () -{ - while (1) - { - String s; - Array fields; - assert (!eof_b ()); - - while ((s = get_word ()) != "") - { - fields.push (s); - gobble_white (); - } - - - if (get_line () != "") - assert (false); - - assert (fields.size ()); - return Text_record (fields, get_name (), line ()); - } -} - - -void -Text_record::message (String s) -{ - cerr << '\n'<< filename << ": "<< line_no << s << "\n"; -} diff --git a/flower/text-stream.cc b/flower/text-stream.cc deleted file mode 100644 index e6a1202a14..0000000000 --- a/flower/text-stream.cc +++ /dev/null @@ -1,51 +0,0 @@ -#include -#include -#include "text-stream.hh" - -Text_stream::Text_stream (String fn) -{ - ios::sync_with_stdio (); - if (fn == "") - { - name = _ (""); - f = stdin; - } - - else - { - name = fn; - f = fopen (fn.ch_C (), "r"); - } - - if (!f) - { - cerr << __FUNCTION__ - << ": " << _f ("can't open file: `%s'", fn) << '\n'; - exit (1); - } - - line_no = 1; -} - -void -Text_stream::message (String s) -{ - cerr << '\n'< -#include +#include + #include "warn.hh" void error (String s) { - cerr << _ ("error: ") << s << '\n'; - + fputs ( _f("error: %s\n", s.ch_C()).ch_C(), stderr); exit (1); } void non_fatal_error (String s) { - cerr << _ ("error: ") << s << '\n'; + fputs ( _f("error: %s\n", s.ch_C()).ch_C(), stderr); } void warning (String m) { - cerr << _ ("warning: ") < -\version "1.3.148" +\version "1.5.49" sarabandeCelloGlobal = \notes{ \time 3/4 diff --git a/input/example-3.ly b/input/example-3.ly index 8a445f1dbb..b3514e34a3 100644 --- a/input/example-3.ly +++ b/input/example-3.ly @@ -1,4 +1,4 @@ -\version "1.3.146" +\version "1.5.49" one = \notes\relative c{ c'' d e f diff --git a/input/just-friends.ly b/input/just-friends.ly index 193884c7f8..68427d9baa 100644 --- a/input/just-friends.ly +++ b/input/just-friends.ly @@ -1,4 +1,4 @@ -\version "1.3.146" +\version "1.5.49" \header { filename = "just-friends.ly" title = "Just Friends" diff --git a/input/les-nereides.ly b/input/les-nereides.ly index 838020509c..2f8f5af765 100644 --- a/input/les-nereides.ly +++ b/input/les-nereides.ly @@ -10,7 +10,7 @@ FAKE_GRACE looks best. %} -\version "1.3.148" +\version "1.5.49" \header { composer = "ARTHUR GRAY" diff --git a/input/mozart-hrn3-allegro.ly b/input/mozart-hrn3-allegro.ly index be8e05fb98..684a5d667b 100644 --- a/input/mozart-hrn3-allegro.ly +++ b/input/mozart-hrn3-allegro.ly @@ -1,4 +1,4 @@ -\version "1.3.146" +\version "1.5.49" %\include "mozart-hrn3-defs.ly" allegro = diff --git a/input/mozart-hrn3-defs.ly b/input/mozart-hrn3-defs.ly index 3d3f528859..ba2550e090 100644 --- a/input/mozart-hrn3-defs.ly +++ b/input/mozart-hrn3-defs.ly @@ -6,7 +6,7 @@ longgrace = \property Voice.Stem \override #'flag-style = #'() endlonggrace = \property Voice.Stem \revert #'flag-style ritenuto = \textscript #'(italic "rit.") -\version "1.5.47" +\version "1.5.49" #(define italic-bf '((font-shape . italic) (font-series . bold))) diff --git a/input/mozart-hrn3-romanze.ly b/input/mozart-hrn3-romanze.ly index 04370123c8..5fb0a103f7 100644 --- a/input/mozart-hrn3-romanze.ly +++ b/input/mozart-hrn3-romanze.ly @@ -1,5 +1,5 @@ -\version "1.3.146" +\version "1.5.49" %\include "mozart-hrn3-defs.ly" romanze = \notes \relative c' { diff --git a/input/mozart-hrn3-rondo.ly b/input/mozart-hrn3-rondo.ly index f53b86fea9..95e7298451 100644 --- a/input/mozart-hrn3-rondo.ly +++ b/input/mozart-hrn3-rondo.ly @@ -1,4 +1,4 @@ -\version "1.3.146" +\version "1.5.49" % \include "mozart-hrn3-defs.ly" diff --git a/input/mutopia-header.ly b/input/mutopia-header.ly index 4f324102f5..19ebc33f39 100644 --- a/input/mutopia-header.ly +++ b/input/mutopia-header.ly @@ -1,4 +1,4 @@ -\version "1.3.146" +\version "1.5.49" \header { title = "Title" subtitle = "Subtitle" diff --git a/input/opus-130.ly b/input/opus-130.ly index 33de967a31..3202051363 100644 --- a/input/opus-130.ly +++ b/input/opus-130.ly @@ -1,4 +1,4 @@ -\version "1.3.146" +\version "1.5.49" \header{ filename = "opus-130.ly" title = "Quartett" diff --git a/input/praeludium-fuga-E.ly b/input/praeludium-fuga-E.ly index 34289d19bd..6df079171b 100644 --- a/input/praeludium-fuga-E.ly +++ b/input/praeludium-fuga-E.ly @@ -1,4 +1,4 @@ -\version "1.3.146" +\version "1.5.49" \header { filename = "praeludium-fuga-E.ly" title = "praeludium and fuga in E-major" diff --git a/input/rhythm.ly b/input/rhythm.ly index d7e336c252..16a72f34e9 100644 --- a/input/rhythm.ly +++ b/input/rhythm.ly @@ -1,4 +1,4 @@ -\version "1.3.146" +\version "1.5.49" \header{ filename = "rhythm.ly" enteredby = "HWN" diff --git a/input/scarlatti-paper.ly b/input/scarlatti-paper.ly index 6840d979be..c754748bc8 100644 --- a/input/scarlatti-paper.ly +++ b/input/scarlatti-paper.ly @@ -1,4 +1,4 @@ -\version "1.3.146" +\version "1.5.49" \paper{ indent=0. @@ -13,7 +13,7 @@ } \translator { \ScoreContext - SpacingSpanner \override #'arithmetic-multiplier = #1.4 + SpacingSpanner \override #'spacing-increment = #1.4 } \translator{ \VoiceContext diff --git a/input/star-spangled-banner.ly b/input/star-spangled-banner.ly index 739d47ec42..a15d8f49a7 100644 --- a/input/star-spangled-banner.ly +++ b/input/star-spangled-banner.ly @@ -1,4 +1,4 @@ -\version "1.3.146" +\version "1.5.49" %{ Converted from star.mup with the aid of mup2ly.py http://www.arkkra.com/doc/star.html diff --git a/input/trip.ly b/input/trip.ly index 50add21ba5..7342f420fd 100644 --- a/input/trip.ly +++ b/input/trip.ly @@ -7,7 +7,7 @@ } -\version "1.3.146" +\version "1.5.49" %{ diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly index e5073265d0..0511c64448 100644 --- a/input/twinkle-pop.ly +++ b/input/twinkle-pop.ly @@ -1,4 +1,4 @@ -\version "1.3.146" +\version "1.5.49" \header{ filename = "twinkle-pop.ly" xtitle = "Ah, vous dirais-je, maman " diff --git a/input/twinkle.ly b/input/twinkle.ly index c6726d473f..756ca659d9 100644 --- a/input/twinkle.ly +++ b/input/twinkle.ly @@ -1,4 +1,4 @@ -\version "1.3.146" +\version "1.5.49" \header{ filename = "twinkle.ly" title = "Twinkle Twinkle Little Star" diff --git a/lily/engraver-group-engraver.cc b/lily/engraver-group-engraver.cc index c07095e9c1..7bd0641015 100644 --- a/lily/engraver-group-engraver.cc +++ b/lily/engraver-group-engraver.cc @@ -135,7 +135,7 @@ Engraver_group_engraver::do_announces () } } -#include + /* order is : top to bottom (as opposed to do_announces) diff --git a/lily/include/midi-stream.hh b/lily/include/midi-stream.hh index dfca5cc62f..fbe3973cd2 100644 --- a/lily/include/midi-stream.hh +++ b/lily/include/midi-stream.hh @@ -7,6 +7,7 @@ #ifndef MIDI_STREAM_HH #define MIDI_STREAM_HH +#include #include "string.hh" /// Midi outputfile diff --git a/lily/include/moment.hh b/lily/include/moment.hh index 1b132cb60c..30689a5d26 100644 --- a/lily/include/moment.hh +++ b/lily/include/moment.hh @@ -56,14 +56,14 @@ IMPLEMENT_ARITHMETIC_OPERATOR (Moment, - ); IMPLEMENT_ARITHMETIC_OPERATOR (Moment, / ); IMPLEMENT_ARITHMETIC_OPERATOR (Moment, * ); -ostream & operator << ( ostream &,Moment const &); DECLARE_UNSMOB(Moment,moment); int compare (Moment const&,Moment const&); INSTANTIATE_COMPARE (Moment const&, Moment::compare); -#if 0 -IMPLEMENT_ARITHMETIC_OPERATOR (Moment, % ); + +#ifdef STREAM_SUPPORT +ostream & operator << ( ostream &,Moment const &); #endif #endif /* MOMENT_HH */ diff --git a/lily/lexer.ll b/lily/lexer.ll index fef2c28b82..53d56e4dde 100644 --- a/lily/lexer.ll +++ b/lily/lexer.ll @@ -219,7 +219,7 @@ HYPHEN -- } } \"[^"]* { // backup rule - cerr << _ ("Missing end quote") << endl; + error (_ ("Missing end quote")); exit (1); } {RESTNAME} { @@ -241,11 +241,11 @@ HYPHEN -- return scan_bare_word (s); } \\\${BLACK}* { // backup rule - cerr << _ ("white expected") << endl; + error (_("white expected")); exit (1); } \${BLACK}* { // backup rule - cerr << _ ("white expected") << endl; + error (_("white expected")); exit (1); } @@ -640,14 +640,7 @@ strip_trailing_white (String&s) -Lilypond_version oldest_version ("1.3.59"); - -void -print_lilypond_versions (ostream &os) -{ - os << _f ("Oldest supported input version: %s", oldest_version.str ()) - << endl; -} +Lilypond_version oldest_version ("1.4.0"); bool diff --git a/lily/main.cc b/lily/main.cc index 37d8dfff9e..a78bcf89cd 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -7,6 +7,7 @@ */ #include +#include #include #include #include @@ -124,9 +125,9 @@ static Long_option_init options_static[] = { }; void -identify (ostream* os) +identify (FILE* os) { - *os << gnu_lilypond_version_str (); + fputs(gnu_lilypond_version_str ().ch_C(), os); } void @@ -136,23 +137,23 @@ usage () /* No version number or newline here. It confuses help2man */ - cout << _f ("Usage: %s [OPTION]... FILE...", "lilypond"); + cout << _f ("Usage: %s [OPTION]... FILE...", "lilypond").ch_C(); cout << "\n\n"; - cout << _ ("Typeset music and or play MIDI from FILE"); + cout << _ ("Typeset music and or play MIDI from FILE").ch_C(); cout << "\n\n"; cout << _ ( "LilyPond is a music typesetter. It produces beautiful sheet music\n" "using a high level description file as input. LilyPond is part of \n" "the GNU Project.\n" -); +).ch_C(); cout << '\n'; - cout << _ ("Options:"); + cout << _ ("Options:").ch_C(); cout << '\n'; - cout << Long_option_init::table_str (options_static); + cout << Long_option_init::table_str (options_static).ch_C(); cout << '\n'; - cout << _ ("This binary was compiled with the following options:") + cout << _ ("This binary was compiled with the following options:") .ch_C() << " " << #ifdef NDEBUG "NDEBUG " @@ -165,22 +166,22 @@ _ ( cout << endl; - cout << _f ("Report bugs to %s", "bug-lilypond@gnu.org") << endl; + cout << _f ("Report bugs to %s", "bug-lilypond@gnu.org").ch_C() << endl; } void version () { - identify (&cout); + identify (stdout); cout << '\n'; cout << _f ("" "This is free software. It is covered by the GNU General Public License,\n" "and you are welcome to change it and/or distribute copies of it under\n" "certain conditions. Invoke as `%s --warranty' for more information.\n", - "lilypond"); + "lilypond").ch_C(); cout << endl; - cout << _f ("Copyright (c) %s by", "1996--2002"); + cout << _f ("Copyright (c) %s by", "1996--2002").ch_C(); cout << '\n'; cout << " Han-Wen Nienhuys \n"; cout << " Jan Nieuwenhuizen \n"; @@ -190,9 +191,9 @@ void notice () { cout << '\n'; - cout << _ ("GNU LilyPond -- The music typesetter"); + cout << _ ("GNU LilyPond -- The music typesetter").ch_C(); cout << '\n'; - cout << _f ("Copyright (c) %s by", "1996--2002"); + cout << _f ("Copyright (c) %s by", "1996--2002").ch_C(); cout << '\n'; cout << " Han-Wen Nienhuys \n"; cout << " Jan Nieuwenhuizen \n"; @@ -210,7 +211,7 @@ notice () " You should have received a copy (refer to the file COPYING) of the\n" "GNU General Public License along with this program; if not, write to\n" "the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,\n" - "USA.\n"); + "USA.\n").ch_C(); } String prefix_directory; @@ -488,7 +489,7 @@ main (int argc, char **argv) break; } } - identify (&cerr); + identify (stderr); #ifdef WINNT scm_boot_guile (argc, argv, main_prog, 0); diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc index cbfe7075f1..6fc0980ac8 100644 --- a/lily/midi-stream.cc +++ b/lily/midi-stream.cc @@ -35,7 +35,9 @@ Midi_stream::~Midi_stream () Midi_stream& Midi_stream::operator << (String str) { - *os_p_ << str; + Byte * b = str.byte_l(); + for (int sz = str.length_i (); sz--;) + *os_p_ << *b; return *this; } @@ -58,7 +60,10 @@ Midi_stream::operator << (Midi_item const& midi_c_r) } } - *os_p_ << str; + Byte * b = str.byte_l(); + for (int sz = str.length_i (); sz--;) + *os_p_ << *b; + return *this; } diff --git a/lily/moment.cc b/lily/moment.cc index 2be3ea129d..97c8e067da 100644 --- a/lily/moment.cc +++ b/lily/moment.cc @@ -204,9 +204,12 @@ Moment::operator - () const return m; } + +#ifdef STREAM_SUPPORT ostream & operator << (ostream &os, Moment const &m) { os << m.str (); return os; } +#endif diff --git a/lily/scm-option.cc b/lily/scm-option.cc index 97ee9ec2c6..c8d58fe048 100644 --- a/lily/scm-option.cc +++ b/lily/scm-option.cc @@ -8,6 +8,7 @@ */ #include + #include "string.hh" #include "lily-guile.hh" #include "scm-option.hh" @@ -68,7 +69,7 @@ variables. Usage: (set-lily-option SYMBOL VAL) possible options for SYMBOL are : -")< #include +#include + + #if HAVE_SYS_STAT_H #include #endif #include -#include + #include "main.hh" #include "score.hh" #include "string.hh" @@ -42,23 +45,22 @@ void write_dependency_file (String fn, Array targets, progress_indication (_f ("dependencies output to `%s'...", fn.ch_C ())); progress_indication ("\n"); - ofstream f (fn.ch_C ()); + FILE * f = fopen (fn.ch_C (), "w"); if (!f) warning (_f ("can't open file: `%s'", fn)); - f << "# Generated automatically by: " << gnu_lilypond_version_str () << '\n'; + fprintf (f, "# Generated automatically by: %s\n", gnu_lilypond_version_str ().ch_C()); + String out; for (int i=0; i < targets.size (); i ++) out += dependency_prefix_global + targets[i] + " "; out += ": "; -#if 0 - struct stat stat_buf; -#endif + for (int i=0; i < deps.size (); i ++) { if (out.length_i () > WRAPWIDTH) { - f << out << "\\\n"; + fprintf (f, "%s\\\n", out.ch_C()); out = " "; } String dep = deps[i]; @@ -74,7 +76,7 @@ void write_dependency_file (String fn, Array targets, } out += " " + dep; } - f << out << endl; + fprintf (f, "%s\n", out.ch_C()); } void diff --git a/lily/warn.cc b/lily/warn.cc index 721cdb1eb8..492824563c 100644 --- a/lily/warn.cc +++ b/lily/warn.cc @@ -6,19 +6,13 @@ (c) 1997--2002 Han-Wen Nienhuys */ -#include "debug.hh" -#include "my-lily-lexer.hh" -#include "moment.hh" -#include "source-file.hh" -#include "source.hh" -#include "main.hh" -#include "input.hh" - -ostream &warnout (cerr); +#include +#include "string.hh" void progress_indication (String s) { - cerr << s << flush; + fputs (s.ch_C(), stderr); + fflush (stderr); } diff --git a/ly/a4-init.ly b/ly/a4-init.ly index 8c729c5f5b..1f741376fb 100644 --- a/ly/a4-init.ly +++ b/ly/a4-init.ly @@ -1,4 +1,4 @@ -\version "1.3.146" +\version "1.5.49" % a4.ly hsize = 210.0 \mm diff --git a/ly/accordion-defs-init.ly b/ly/accordion-defs-init.ly index f363efc71d..f78bde1ee6 100644 --- a/ly/accordion-defs-init.ly +++ b/ly/accordion-defs-init.ly @@ -1,4 +1,4 @@ -\version "1.3.146" +\version "1.5.49" % Symbols needed to print accordion music % % 2' = T diff --git a/ly/book-init-init.ly b/ly/book-init-init.ly index f12fc8683b..7476786d8e 100644 --- a/ly/book-init-init.ly +++ b/ly/book-init-init.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.3.146" +\version "1.5.49" \include "declarations-init.ly" diff --git a/ly/catalan.ly b/ly/catalan.ly index 74d42851d1..f9ebe1da2a 100644 --- a/ly/catalan.ly +++ b/ly/catalan.ly @@ -71,4 +71,4 @@ -\version "1.3.146" +\version "1.5.49" diff --git a/ly/center-init.ly b/ly/center-init.ly index 72ecace841..e237c3d029 100644 --- a/ly/center-init.ly +++ b/ly/center-init.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.3.146" +\version "1.5.49" \include "declarations-init.ly" diff --git a/ly/chord-modifiers-init.ly b/ly/chord-modifiers-init.ly index dd82fdb331..ac3c2a1568 100644 --- a/ly/chord-modifiers-init.ly +++ b/ly/chord-modifiers-init.ly @@ -1,4 +1,4 @@ -\version "1.3.146" +\version "1.5.49" % urg! % diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly index c200465244..f10830f9b2 100644 --- a/ly/declarations-init.ly +++ b/ly/declarations-init.ly @@ -1,5 +1,5 @@ -\version "1.3.146" +\version "1.5.49" breve = \duration #(make-duration -1 0) longa = \duration #(make-duration -2 0 ) maxima = \duration #(make-duration -3 0) diff --git a/ly/deutsch.ly b/ly/deutsch.ly index 8476b59531..11ac4d0afc 100644 --- a/ly/deutsch.ly +++ b/ly/deutsch.ly @@ -49,4 +49,4 @@ -\version "1.3.146" +\version "1.5.49" diff --git a/ly/drumpitch-init.ly b/ly/drumpitch-init.ly index c70b18e0fe..9b61fda615 100644 --- a/ly/drumpitch-init.ly +++ b/ly/drumpitch-init.ly @@ -160,4 +160,4 @@ ) -\version "1.3.146" +\version "1.5.49" diff --git a/ly/dynamic-scripts-init.ly b/ly/dynamic-scripts-init.ly index 80eabb0adc..c91bd8d257 100644 --- a/ly/dynamic-scripts-init.ly +++ b/ly/dynamic-scripts-init.ly @@ -1,4 +1,4 @@ -\version "1.3.146" +\version "1.5.49" % % declare the standard dynamic identifiers. diff --git a/ly/english.ly b/ly/english.ly index 9afeff28f6..ceddb8ac31 100644 --- a/ly/english.ly +++ b/ly/english.ly @@ -78,5 +78,5 @@ (bss . ,(make-pitch -1 6 2 )) ) -\version "1.3.146" +\version "1.5.49" diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly index 4c75541b06..b262582301 100644 --- a/ly/engraver-init.ly +++ b/ly/engraver-init.ly @@ -1,4 +1,4 @@ -\version "1.5.33" +\version "1.5.49" % % setup for Request->Element conversion. Guru-only diff --git a/ly/generate-documentation.ly b/ly/generate-documentation.ly index 104d57efeb..0b1c94f534 100644 --- a/ly/generate-documentation.ly +++ b/ly/generate-documentation.ly @@ -1,4 +1,4 @@ -\version "1.3.146" +\version "1.5.49" % % Running LilyPond on this file generates the documentation diff --git a/ly/generic-paper-init.ly b/ly/generic-paper-init.ly index df96f2abcd..7d4aea8229 100644 --- a/ly/generic-paper-init.ly +++ b/ly/generic-paper-init.ly @@ -1,4 +1,4 @@ -\version "1.3.146" +\version "1.5.49" \paper { texsetting = "" diff --git a/ly/german-chords-init.ly b/ly/german-chords-init.ly index 644b6efe3c..020d1a9463 100644 --- a/ly/german-chords-init.ly +++ b/ly/german-chords-init.ly @@ -1,4 +1,4 @@ -\version "1.5.12" +\version "1.5.49" % german-chords-init.ly: % german/norwegian/danish? diff --git a/ly/init.ly b/ly/init.ly index 0ddb2db3a9..9ee764b980 100644 --- a/ly/init.ly +++ b/ly/init.ly @@ -1,7 +1,7 @@ % Toplevel initialisation file. -\version "1.3.146" +\version "1.5.49" \include "declarations-init.ly" diff --git a/ly/italiano.ly b/ly/italiano.ly index 263d2bfab9..d03b07daf3 100644 --- a/ly/italiano.ly +++ b/ly/italiano.ly @@ -48,4 +48,4 @@ (sidd . ,(make-pitch -1 6 2 )) ) -\version "1.3.146" +\version "1.5.49" diff --git a/ly/ledger-init.ly b/ly/ledger-init.ly index e1b774d343..df9b4cbbba 100644 --- a/ly/ledger-init.ly +++ b/ly/ledger-init.ly @@ -1,4 +1,4 @@ -\version "1.3.146" +\version "1.5.49" % ledger.ly diff --git a/ly/legal-init.ly b/ly/legal-init.ly index 47f413c0d3..3f82c0b028 100644 --- a/ly/legal-init.ly +++ b/ly/legal-init.ly @@ -1,4 +1,4 @@ -\version "1.3.146" +\version "1.5.49" % legal-init.ly hsize = 8.5 \in diff --git a/ly/letter-init.ly b/ly/letter-init.ly index 1ae8c499db..fd264f0d99 100644 --- a/ly/letter-init.ly +++ b/ly/letter-init.ly @@ -1,4 +1,4 @@ -\version "1.3.146" +\version "1.5.49" % letter-init.ly hsize = 8.5 \in diff --git a/ly/midi-init.ly b/ly/midi-init.ly index 730d92a483..b54c03037d 100644 --- a/ly/midi-init.ly +++ b/ly/midi-init.ly @@ -1,4 +1,4 @@ -\version "1.3.146" +\version "1.5.49" \midi { \tempo 4=60 \include "performer-init.ly" diff --git a/ly/nederlands.ly b/ly/nederlands.ly index bba3d0ad31..f33d860eb0 100644 --- a/ly/nederlands.ly +++ b/ly/nederlands.ly @@ -1,4 +1,4 @@ -\version "1.3.146" +\version "1.5.49" %{ common dutch names for notes. es means flat, is means sharp %} diff --git a/ly/norsk.ly b/ly/norsk.ly index f6630bab93..4414041af7 100644 --- a/ly/norsk.ly +++ b/ly/norsk.ly @@ -104,4 +104,4 @@ -\version "1.3.146" +\version "1.5.49" diff --git a/ly/paper-as5-init.ly b/ly/paper-as5-init.ly index f7f58a3a3d..96ce985cd7 100644 --- a/ly/paper-as5-init.ly +++ b/ly/paper-as5-init.ly @@ -1,6 +1,6 @@ % paper-as5-init.ly -\version "1.3.146" +\version "1.5.49" paperAsFive = \paper { staffheight = 5.\char diff --git a/ly/paper-as9-init.ly b/ly/paper-as9-init.ly index 86866b0eff..9370150f00 100644 --- a/ly/paper-as9-init.ly +++ b/ly/paper-as9-init.ly @@ -1,6 +1,6 @@ % paper-as9-init.ly -\version "1.3.146" +\version "1.5.49" paperAsNine = \paper { staffheight = 9.\char diff --git a/ly/paper-init.ly b/ly/paper-init.ly index f6ac488597..c32802e012 100644 --- a/ly/paper-init.ly +++ b/ly/paper-init.ly @@ -1,4 +1,4 @@ -\version "1.3.146" +\version "1.5.49" % paper-init.ly %% Why som complicated? /MB diff --git a/ly/paper11-init.ly b/ly/paper11-init.ly index 2cc39133f3..daadc522cc 100644 --- a/ly/paper11-init.ly +++ b/ly/paper11-init.ly @@ -1,6 +1,6 @@ % paper11-init.ly -\version "1.3.146" +\version "1.5.49" paperEleven = \paper { staffheight = 11.0\pt diff --git a/ly/paper13-init.ly b/ly/paper13-init.ly index d053f1e440..f3fa2aa7d3 100644 --- a/ly/paper13-init.ly +++ b/ly/paper13-init.ly @@ -1,7 +1,7 @@ % paper13-init.ly -\version "1.3.146" +\version "1.5.49" paperThirteen = \paper { staffheight = 13.0\pt diff --git a/ly/paper16-init.ly b/ly/paper16-init.ly index c747eac11d..975a014725 100644 --- a/ly/paper16-init.ly +++ b/ly/paper16-init.ly @@ -1,6 +1,6 @@ % paper16-init.ly -\version "1.3.146" +\version "1.5.49" paperSixteen = \paper { staffheight = 16.0\pt diff --git a/ly/paper20-init.ly b/ly/paper20-init.ly index 13a67f0809..4fdb2b2c3f 100644 --- a/ly/paper20-init.ly +++ b/ly/paper20-init.ly @@ -1,7 +1,7 @@ % paper20-init.ly -\version "1.3.146" +\version "1.5.49" paperTwenty = \paper { staffheight = 20.0\pt diff --git a/ly/paper23-init.ly b/ly/paper23-init.ly index bbb55106e0..4318d466f6 100644 --- a/ly/paper23-init.ly +++ b/ly/paper23-init.ly @@ -1,7 +1,7 @@ % paper23-init.ly -\version "1.3.146" +\version "1.5.49" paperTwentythree = \paper { staffheight = 23.0\pt diff --git a/ly/paper26-init.ly b/ly/paper26-init.ly index e64eba6a54..3466f87b29 100644 --- a/ly/paper26-init.ly +++ b/ly/paper26-init.ly @@ -1,6 +1,6 @@ % paper26-init.ly -\version "1.3.146" +\version "1.5.49" paperTwentysix = \paper { staffheight = 26.0\pt diff --git a/ly/params-as-init.ly b/ly/params-as-init.ly index b9928df8b1..484c694070 100644 --- a/ly/params-as-init.ly +++ b/ly/params-as-init.ly @@ -1,4 +1,4 @@ -\version "1.3.146" +\version "1.5.49" % params-as-init.ly % generic paper parameters diff --git a/ly/params-init.ly b/ly/params-init.ly index 9dd6f2c2f8..5dd3aa44e2 100644 --- a/ly/params-init.ly +++ b/ly/params-init.ly @@ -1,4 +1,4 @@ -\version "1.3.146" +\version "1.5.49" % JUNKME. %% deprecated diff --git a/ly/part-paper-init.ly b/ly/part-paper-init.ly index 4e8fea418f..9637fa0d8f 100644 --- a/ly/part-paper-init.ly +++ b/ly/part-paper-init.ly @@ -1,4 +1,4 @@ -\version "1.3.146" +\version "1.5.49" % JUNKME %part-paper-init.ly diff --git a/ly/performer-init.ly b/ly/performer-init.ly index 748e29229c..90e2bd74a8 100644 --- a/ly/performer-init.ly +++ b/ly/performer-init.ly @@ -1,4 +1,4 @@ -\version "1.3.146" +\version "1.5.49" % % setup for Request->Element conversion. Guru-only % diff --git a/ly/property-init.ly b/ly/property-init.ly index a49e7e1f39..ae9359906c 100644 --- a/ly/property-init.ly +++ b/ly/property-init.ly @@ -1,6 +1,6 @@ % property-init.ly -\version "1.3.146" +\version "1.5.49" stemUp = \property Voice.Stem \set #'direction = #1 stemDown = \property Voice.Stem \set #'direction = #-1 diff --git a/ly/scale-definitions-init.ly b/ly/scale-definitions-init.ly index b3268ffef9..975686f667 100644 --- a/ly/scale-definitions-init.ly +++ b/ly/scale-definitions-init.ly @@ -1,4 +1,4 @@ -\version "1.3.146" +\version "1.5.49" major = #'( diff --git a/ly/script-init.ly b/ly/script-init.ly index e81d20d96b..51bcba0e97 100644 --- a/ly/script-init.ly +++ b/ly/script-init.ly @@ -1,4 +1,4 @@ -\version "1.3.146" +\version "1.5.49" dashHat= "marcato" diff --git a/ly/spanners-init.ly b/ly/spanners-init.ly index d2f5457236..dc3e55fd56 100644 --- a/ly/spanners-init.ly +++ b/ly/spanners-init.ly @@ -1,4 +1,4 @@ -\version "1.3.146" +\version "1.5.49" cr = \spanrequest \start "crescendo" decr = \spanrequest \start "decrescendo" diff --git a/ly/suomi.ly b/ly/suomi.ly index 66e1fa1464..9506428ad7 100644 --- a/ly/suomi.ly +++ b/ly/suomi.ly @@ -45,4 +45,4 @@ (his . ,(make-pitch -1 6 1 )) (hisis . ,(make-pitch -1 6 2 )) ) -\version "1.3.146" +\version "1.5.49" diff --git a/ly/svenska.ly b/ly/svenska.ly index c9b54987e9..c756324d05 100644 --- a/ly/svenska.ly +++ b/ly/svenska.ly @@ -40,4 +40,4 @@ (hiss . ,(make-pitch -1 6 1 )) (hississ . ,(make-pitch -1 6 2 )) ) -\version "1.3.146" +\version "1.5.49" diff --git a/mf/GNUmakefile b/mf/GNUmakefile index 0a576e5467..f7fa87e2a0 100644 --- a/mf/GNUmakefile +++ b/mf/GNUmakefile @@ -59,7 +59,7 @@ PFA_FILES = $(addprefix $(outdir)/, $(FONT_FILES:.mf=.pfa)) ifdef MAKE_PFA_FILES ALL_GEN_FILES += $(PFA_FILES) $(outdir)/lilypond.map INSTALLATION_OUT_DIR4=$(datadir)/fonts/type1 -INSTALLATION_OUT_FILES4=$(PFA_FILES) +INSTALLATION_OUT_FILES4=$(PFA_FILES) $(outdir)/fonts.scale INSTALLATION_OUT_DIR5=$(datadir)/dvips/ INSTALLATION_OUT_FILES5=$(outdir)/lilypond.map @@ -74,6 +74,9 @@ $(outdir)/lilypond.map: echo $(FONT_FILES:.mf=) | tr ' ' '\n' | \ sed 's/\(.*\)/\1 \1 <\1.pfa/' > $@ +$(outdir)/fonts.scale: + echo $(FONT_FILES:.mf=.pfa) | $(PYTHON) $(topdir)/buildscripts/make-font-dir.py > $@ + ## ## todo: this also depends on .tfm, FIXME. $(outdir)/%.afm $(outdir)/%.enc $(outdir)/%.tex $(outdir)/%.dep: $(outdir)/%.log diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py index f27abf5788..004ea592c9 100644 --- a/scripts/lilypond-book.py +++ b/scripts/lilypond-book.py @@ -1192,7 +1192,7 @@ def make_pixmap (name): x = (2* margin + bbox[2] - bbox[0]) * res / 72. y = (2* margin + bbox[3] - bbox[1]) * res / 72. - cmd = r'''gs -g%dx%d -sDEVICE=pgm -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -q -sOutputFile=- -r%d -dNOPAUSE %s %s -c quit | pnmtopng > %s''' + cmd = r'''gs -g%dx%d -sDEVICE=pnggray -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -q -sOutputFile=- -r%d -dNOPAUSE %s %s -c quit > %s''' cmd = cmd % (x, y, res, name + '.trans.eps', name + '.eps',name + '.png') quiet_system (cmd, 'gs') -- 2.39.2