+2002-05-15 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+
+ * lily/*.cc: remove as many iostream use as possible.
+
+ * flower/ : remove text-db, text-stream, data-file.
+
2002-05-15 Han-Wen <hanwen@cs.uu.nl>
* scripts/lilypond-book.py: add --no-music option: strip all blocks.
2002-05-13 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ * 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).
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}.
@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
./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
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
@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
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.
-
+#!@PYTHON
+
+
+## make a fonts.scale file.
+
import re
import sys
import string
CC = @CC@
CROSS = @cross_compiling@
CXX = @CXX@
-GCC = @GCC@
+
LD = @LD@
PACKAGE = @PACKAGE@
package = @package@
+++ /dev/null
-/*
- data-file.cc -- implement Data_file
-
- source file of the Flower Library
-
- (c) '95, '96, '97 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-
- DEPRECATED
-
- */
-#include <ctype.h>
-#include <stdlib.h>
-
-#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 ()
-{
-}
Getopt_long::report (Errorcod c)
{
error_ = c;
- if (!error_ostream_l_)
+ if (!error_out_)
return;
String str = arg_value_ch_a_a_[0];
default:
assert (false);
}
- *error_ostream_l_ << str << endl;
+ fprintf(error_out_, "%s\n", str.ch_C());
exit (2);
}
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;
+++ /dev/null
-/*
- data-file.hh -- declare Data_file
-
- source file of the LilyPond music typesetter
-
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-*/
-
-
-#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
#ifndef GETOPT_LONG_HH
#define GETOPT_LONG_HH
-#include <ostream.h> /* gcc 3.0 */
+
#include "string.hh"
/**
/// the arg. count
int argument_count_i_;
- ostream *error_ostream_l_;
+ FILE *error_out_;
public:
/// get ready for processing next error.
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);
den_ = r.den_;
}
+#if 0
ostream &
operator << (ostream &, Rational);
+#endif
const Rational infinity_rat = INT_MAX;
#define STRING_HH
+// too darn slow with gcc3
+#ifdef STREAM_SUPPORT
#if ( __GNUC__ > 2 )
-#include <iostream.h> /* gcc 3.0 */
+#include <iostream.h>
#else
class ostream;
#endif
+#endif
#include "arithmetic-operator.hh"
#include "flower-proto.hh"
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;
}
IMPLEMENT_ARITHMETIC_OPERATOR (String, +);
-
+#ifdef STREAM_SUPPORT
ostream &operator << (ostream& os, String d);
+#endif
#endif
+++ /dev/null
-#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<String>
-{
- 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<String>::operator[] (j);
- }
-
- Text_record (Array<String> s, String fn, int j) : Array<String> (s) {
- filename = fn; line_no = j;
- }
- Array<String>::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
+++ /dev/null
-
-#ifndef TEXTSTR_HH
-#define TEXTSTR_HH
-
-#include <stdio.h>
-#include <ctype.h>
-#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<char> 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
(c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
-#include <iostream.h>
+
+#include <stdio.h>
+
#include "flower-proto.hh"
#include "input.hh"
#include "string.hh"
str += ":\n";
str += source_file_l_->error_str (defined_ch_C_);
}
- cerr << str << endl;
+ fprintf (stderr, "%s\n", str.ch_C());
}
void
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
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 ];
-}
\f
/*
copying, constructing.
return String_convert::dec2_f (*this);
}
+#ifdef STREAM_SUPPORT
ostream &
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
+++ /dev/null
-#include <iostream.h>
-#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<String> 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";
-}
+++ /dev/null
-#include <stdlib.h>
-#include <iostream.h>
-#include "text-stream.hh"
-
-Text_stream::Text_stream (String fn)
-{
- ios::sync_with_stdio ();
- if (fn == "")
- {
- name = _ ("<stdin>");
- 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'<<get_name () << ": " << line ()<<": "<<s<<endl;
-}
-
-bool
-Text_stream::eof_b ()
-{
- /* UGH UGH ugh*/
- return
- // !pushback.size () &&
- feof (f);
-}
-
-Text_stream::~Text_stream ()
-{
- if (!eof_b ())
- cerr <<__FUNCTION__<< ": closing unended file";
-
- fclose (f);
- }
#include <stdlib.h>
-#include <stream.h>
+#include <stdio.h>
+
#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: ") <<m <<endl;
-
+ fputs ( _f("warning: %s\n", m.ch_C()).ch_C(), stderr);
}
void
message (String m)
{
- cerr << m<<endl;
+ fprintf (stderr, "%s\n",m.ch_C());
}
void
programming_error (String s)
{
- cerr << _ ("programming error: ") << s << _ (" (Continuing; cross thumbs)") << '\n';
+ fputs ( _f("programming error: %s (Continuing; cross thumbs)\n", s.ch_C()).ch_C(), stderr);
}
}
-\version "1.3.148"
+\version "1.5.49"
sarabandeA = \context Voice \notes \relative c {
>
-\version "1.3.148"
+\version "1.5.49"
sarabandeCelloGlobal = \notes{
\time 3/4
-\version "1.3.146"
+\version "1.5.49"
one = \notes\relative c{
c'' d e f
-\version "1.3.146"
+\version "1.5.49"
\header {
filename = "just-friends.ly"
title = "Just Friends"
%}
-\version "1.3.148"
+\version "1.5.49"
\header {
composer = "ARTHUR GRAY"
-\version "1.3.146"
+\version "1.5.49"
%\include "mozart-hrn3-defs.ly"
allegro =
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)))
-\version "1.3.146"
+\version "1.5.49"
%\include "mozart-hrn3-defs.ly"
romanze = \notes \relative c' {
-\version "1.3.146"
+\version "1.5.49"
% \include "mozart-hrn3-defs.ly"
-\version "1.3.146"
+\version "1.5.49"
\header {
title = "Title"
subtitle = "Subtitle"
-\version "1.3.146"
+\version "1.5.49"
\header{
filename = "opus-130.ly"
title = "Quartett"
-\version "1.3.146"
+\version "1.5.49"
\header {
filename = "praeludium-fuga-E.ly"
title = "praeludium and fuga in E-major"
-\version "1.3.146"
+\version "1.5.49"
\header{
filename = "rhythm.ly"
enteredby = "HWN"
-\version "1.3.146"
+\version "1.5.49"
\paper{
indent=0.
}
\translator {
\ScoreContext
- SpacingSpanner \override #'arithmetic-multiplier = #1.4
+ SpacingSpanner \override #'spacing-increment = #1.4
}
\translator{
\VoiceContext
-\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
}
-\version "1.3.146"
+\version "1.5.49"
%{
-\version "1.3.146"
+\version "1.5.49"
\header{
filename = "twinkle-pop.ly"
xtitle = "Ah, vous dirais-je, maman "
-\version "1.3.146"
+\version "1.5.49"
\header{
filename = "twinkle.ly"
title = "Twinkle Twinkle Little Star"
}
}
-#include <iostream.h>
+
/*
order is : top to bottom (as opposed to do_announces)
#ifndef MIDI_STREAM_HH
#define MIDI_STREAM_HH
+#include <iostream.h>
#include "string.hh"
/// Midi outputfile
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 */
}
}
<incl>\"[^"]* { // backup rule
- cerr << _ ("Missing end quote") << endl;
+ error (_ ("Missing end quote"));
exit (1);
}
<chords,notes,figures>{RESTNAME} {
return scan_bare_word (s);
}
<INITIAL,chords,lyrics,notes,figures>\\\${BLACK}* { // backup rule
- cerr << _ ("white expected") << endl;
+ error (_("white expected"));
exit (1);
}
<INITIAL,chords,lyrics,notes,figures>\${BLACK}* { // backup rule
- cerr << _ ("white expected") << endl;
+ error (_("white expected"));
exit (1);
}
-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
*/
#include <stdlib.h>
+#include <stdio.h>
#include <iostream.h>
#include <assert.h>
#include <locale.h>
};
void
-identify (ostream* os)
+identify (FILE* os)
{
- *os << gnu_lilypond_version_str ();
+ fputs(gnu_lilypond_version_str ().ch_C(), os);
}
void
/*
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 "
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 <hanwen@cs.uu.nl>\n";
cout << " Jan Nieuwenhuizen <janneke@gnu.org>\n";
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 <hanwen@cs.uu.nl>\n";
cout << " Jan Nieuwenhuizen <janneke@gnu.org>\n";
" 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;
break;
}
}
- identify (&cerr);
+ identify (stderr);
#ifdef WINNT
scm_boot_guile (argc, argv, main_prog, 0);
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;
}
}
}
- *os_p_ << str;
+ Byte * b = str.byte_l();
+ for (int sz = str.length_i (); sz--;)
+ *os_p_ << *b;
+
return *this;
}
return m;
}
+
+#ifdef STREAM_SUPPORT
ostream &
operator << (ostream &os, Moment const &m)
{
os << m.str ();
return os;
}
+#endif
*/
#include <iostream.h>
+
#include "string.hh"
#include "lily-guile.hh"
#include "scm-option.hh"
(set-lily-option SYMBOL VAL)
possible options for SYMBOL are :
-")<<endl;
+").ch_C()<<endl;
cout << " help (any-symbol)"<<endl;
cout << " internal-type-checking (boolean)"<<endl;
#include <errno.h>
#include <sys/types.h>
+#include <stdio.h>
+
+
#if HAVE_SYS_STAT_H
#include <sys/stat.h>
#endif
#include <unistd.h>
-#include <fstream.h>
+
#include "main.hh"
#include "score.hh"
#include "string.hh"
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];
}
out += " " + dep;
}
- f << out << endl;
+ fprintf (f, "%s\n", out.ch_C());
}
void
(c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
-#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 <stdio.h>
+#include "string.hh"
void
progress_indication (String s)
{
- cerr << s << flush;
+ fputs (s.ch_C(), stderr);
+ fflush (stderr);
}
-\version "1.3.146"
+\version "1.5.49"
% a4.ly
hsize = 210.0 \mm
-\version "1.3.146"
+\version "1.5.49"
% Symbols needed to print accordion music
%
% 2' = T
% Toplevel initialisation file.
-\version "1.3.146"
+\version "1.5.49"
\include "declarations-init.ly"
-\version "1.3.146"
+\version "1.5.49"
% Toplevel initialisation file.
-\version "1.3.146"
+\version "1.5.49"
\include "declarations-init.ly"
-\version "1.3.146"
+\version "1.5.49"
% urg!
%
-\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)
-\version "1.3.146"
+\version "1.5.49"
)
-\version "1.3.146"
+\version "1.5.49"
-\version "1.3.146"
+\version "1.5.49"
%
% declare the standard dynamic identifiers.
(bss . ,(make-pitch -1 6 2 ))
)
-\version "1.3.146"
+\version "1.5.49"
-\version "1.5.33"
+\version "1.5.49"
%
% setup for Request->Element conversion. Guru-only
-\version "1.3.146"
+\version "1.5.49"
%
% Running LilyPond on this file generates the documentation
-\version "1.3.146"
+\version "1.5.49"
\paper {
texsetting = ""
-\version "1.5.12"
+\version "1.5.49"
% german-chords-init.ly:
% german/norwegian/danish?
% Toplevel initialisation file.
-\version "1.3.146"
+\version "1.5.49"
\include "declarations-init.ly"
(sidd . ,(make-pitch -1 6 2 ))
)
-\version "1.3.146"
+\version "1.5.49"
-\version "1.3.146"
+\version "1.5.49"
% ledger.ly
-\version "1.3.146"
+\version "1.5.49"
% legal-init.ly
hsize = 8.5 \in
-\version "1.3.146"
+\version "1.5.49"
% letter-init.ly
hsize = 8.5 \in
-\version "1.3.146"
+\version "1.5.49"
\midi {
\tempo 4=60
\include "performer-init.ly"
-\version "1.3.146"
+\version "1.5.49"
%{
common dutch names for notes. es means flat, is means sharp
%}
-\version "1.3.146"
+\version "1.5.49"
% paper-as5-init.ly
-\version "1.3.146"
+\version "1.5.49"
paperAsFive = \paper {
staffheight = 5.\char
% paper-as9-init.ly
-\version "1.3.146"
+\version "1.5.49"
paperAsNine = \paper {
staffheight = 9.\char
-\version "1.3.146"
+\version "1.5.49"
% paper-init.ly
%% Why som complicated? /MB
% paper11-init.ly
-\version "1.3.146"
+\version "1.5.49"
paperEleven = \paper {
staffheight = 11.0\pt
% paper13-init.ly
-\version "1.3.146"
+\version "1.5.49"
paperThirteen = \paper {
staffheight = 13.0\pt
% paper16-init.ly
-\version "1.3.146"
+\version "1.5.49"
paperSixteen = \paper {
staffheight = 16.0\pt
% paper20-init.ly
-\version "1.3.146"
+\version "1.5.49"
paperTwenty = \paper {
staffheight = 20.0\pt
% paper23-init.ly
-\version "1.3.146"
+\version "1.5.49"
paperTwentythree = \paper {
staffheight = 23.0\pt
% paper26-init.ly
-\version "1.3.146"
+\version "1.5.49"
paperTwentysix = \paper {
staffheight = 26.0\pt
-\version "1.3.146"
+\version "1.5.49"
% params-as-init.ly
% generic paper parameters
-\version "1.3.146"
+\version "1.5.49"
% JUNKME.
%% deprecated
-\version "1.3.146"
+\version "1.5.49"
% JUNKME
%part-paper-init.ly
-\version "1.3.146"
+\version "1.5.49"
%
% setup for Request->Element conversion. Guru-only
%
% 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
-\version "1.3.146"
+\version "1.5.49"
major = #'(
-\version "1.3.146"
+\version "1.5.49"
dashHat= "marcato"
-\version "1.3.146"
+\version "1.5.49"
cr = \spanrequest \start "crescendo"
decr = \spanrequest \start "decrescendo"
(his . ,(make-pitch -1 6 1 ))
(hisis . ,(make-pitch -1 6 2 ))
)
-\version "1.3.146"
+\version "1.5.49"
(hiss . ,(make-pitch -1 6 1 ))
(hississ . ,(make-pitch -1 6 2 ))
)
-\version "1.3.146"
+\version "1.5.49"
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
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
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')
projects / lilypond.git / commitdiff