From: fred Date: Tue, 26 Mar 2002 21:47:32 +0000 (+0000) Subject: lilypond-1.1.33 X-Git-Tag: release/1.5.59~2564 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=43d897ab0066ad3957d4f73872ba198eba70826c;p=lilypond.git lilypond-1.1.33 --- diff --git a/buildscripts/mf-to-table.py b/buildscripts/mf-to-table.py index aab7f94a2b..eb45314a1b 100644 --- a/buildscripts/mf-to-table.py +++ b/buildscripts/mf-to-table.py @@ -1,6 +1,6 @@ #!@PYTHON@ -# mf-to-table.py -- convert spacing info in MF logs .ly and .tex +# mf-to-table.py -- convert spacing info in MF logs .afm and .tex # # source file of the GNU LilyPond music typesetter # @@ -17,7 +17,7 @@ import time (options, files) = getopt.getopt( sys.argv[1:], 'a:d:hl:o:p:t:', - ['afm=', 'outdir=', 'dep=', 'ly=', 'tex=', 'debug', 'help', 'package=']) + ['afm=', 'outdir=', 'dep=', 'tex=', 'debug', 'help', 'package=']) for opt in options: o = opt[0] @@ -140,35 +140,6 @@ class Afm_file (File): def end (self,nm): self.write ('End%s\n' % nm) -class Ly_file(Indentable_file): - """extra provisions for mozarella quirks""" - def print_lit(self, str): - self.write('\"%s\"\t' % str) - - def print_f_dimen(self, f): - dimstr = '%.2f' % f - - # try to mask rounding errors - if (dimstr == '-0.00'): - dimstr = '0.00' - self.write( dimstr +'\\pt\t'); - - def print_dimen(self, str): - self.print_f_dimen(atof(str)) - - def neg_print_dimen(self, str): - self.print_f_dimen(-atof(str)); - - def def_symbol(self, code, lily_id, tex_id, xdim, ydim): - self.print_lit(lily_id) - self.print_lit('\\\\' + tex_id) - - self.neg_print_dimen(xdim [0]) - self.print_dimen(xdim [1]) - self.neg_print_dimen(ydim [0]) - self.print_dimen(ydim [1]) - self.write('\n') - class Log_reader: """Read logs, destill info, and put into output files""" @@ -179,11 +150,8 @@ class Log_reader: tags = split(line, '@:') label = tags[0] name = tags[1] - ly = self.lyfile afm = self.afmfile if tags[0] == 'font': - ly.indent() - ly.write("% name=\\symboltables {\n") self.texfile.write("% name\n") afm.write ('FontName %s\n' % name) @@ -191,18 +159,11 @@ class Log_reader: afm.start ('CharMetrics') afm.fontsize = atof(tags[2]) elif label == "group": - ly.indent() - ly.print_lit(name) - ly.write(' = \\table {\n') self.texfile.write("% " + name + "\n") afm.groupname = name elif label == "puorg": - ly.dedent() - ly.write("}\n") self.texfile.write("\n") elif label == "tnof": - ly.dedent() - ly.write("% } % $name\n") afm.end ('CharMetrics') afm.end('FontMetrics'); elif label == "char": @@ -211,7 +172,6 @@ class Log_reader: texstr = tags [8] xdim = tags[3:5] ydim = tags[5:7] - ly.def_symbol(code, id, texstr, xdim, ydim) self.texfile.write("\\fetdef\\%s{%s}\n" % (texstr, code)) afm.def_symbol (code, id, texstr, xdim, ydim) @@ -233,7 +193,6 @@ class Log_reader: self.depfile.write (x + '\n') def do_file(self,filenm): - self.lyfile.write ('\n% input from ' + filenm + '\n') self.texfile.write ('\n% input from ' + filenm + '\n') feta = Feta_file(filenm) while not feta.eof(): @@ -243,20 +202,17 @@ class Log_reader: self.writedeps (feta.dependencies) - def __init__(self, lyfile_nm, texfile_nm, depfile_nm, afmfile_nm): - self.lyfile = Ly_file(lyfile_nm, 'w') + def __init__(self, texfile_nm, depfile_nm, afmfile_nm): self.texfile = Indentable_file(texfile_nm, 'w') self.depfile = File (depfile_nm, 'w') self.afmfile = Afm_file (afmfile_nm, 'w') headerstr = '%% Creator: %s\n%% Automatically generated on\n%% Do not edit' % \ (program_id() ) - self.lyfile.write(headerstr) self.texfile.write(headerstr) self.depfile.write ('# automatically generated by %s\n' % program_id ()) def close(self): - self.lyfile.close() self.texfile.close() self.depfile.close () @@ -290,7 +246,7 @@ def help(): def main(): identify() - lyfile_nm = texfile_nm = ''; + texfile_nm = ''; depfile_nm = '' afmfile_nm = '' outdir_prefix = '.' @@ -301,8 +257,6 @@ def main(): depfile_nm = a elif o == '--outdir' or o == '-o': outdir_prefix = a - elif o == '--ly' or o == '-l': - lyfile_nm = a elif o == '--tex' or o == '-t': texfile_nm = a elif o== '--help' or o == '-h': @@ -317,7 +271,7 @@ def main(): print o raise getopt.error - log_reader = Log_reader(lyfile_nm, texfile_nm, depfile_nm, afmfile_nm) + log_reader = Log_reader( texfile_nm, depfile_nm, afmfile_nm) log_reader.outdir = outdir_prefix for filenm in files: log_reader.do_file(filenm) diff --git a/buildscripts/set-lily.sh b/buildscripts/set-lily.sh index dcc41e444e..214f3218c1 100644 --- a/buildscripts/set-lily.sh +++ b/buildscripts/set-lily.sh @@ -48,13 +48,25 @@ ln -sf $LILYPOND_SOURCEDIR/scripts/out/mudela-book $prefix/bin/mudela-book chmod 755 $LILYPOND_SOURCEDIR/buildscripts/ps-to-gifs.sh ln -sf $LILYPOND_SOURCEDIR/buildscripts/ps-to-gifs.sh $prefix/bin/ps-to-gifs ln -sf $LILYPOND_SOURCEDIR/mf/out/ afm -TFMDIR=`kpsewhich cmr10.tfm` -ln -sf `dirname $TFMDIR` tfm +TFMDIR=`kpsewhich tfm cmr10.tfm` +ln -sf `dirname $TFMDIR` cmtfm +rm -f tfm; +ln -s mf/out tfm + mkdir -p $prefix/share/ if [ ! -x $prefix/share/lilypond ]; then echo ln -sf $sources/lilypond $prefix/share ln -sf $sources/lilypond $prefix/ fi +# real weird locale dir if $LILYPONDPREFIX is set... +if [ $LILYPONDPREFIX != "" ]; then + LOCALES="it nl" + for i in $LOCALES; do + dir=$LILYPONDPREFIX/share/locale/$i/LC_MESSAGES + mkdir -p $dir + ln -sf $LILYPOND_SOURCEDIR/po/out/$i.mo $dir/lilypond.mo + done +fi if [ -f ../.gdbinit ]; then ln ../.gdbinit . diff --git a/lily/main.cc b/lily/main.cc index 8d8dc26690..763c5e15b2 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -235,7 +235,7 @@ setup_paths () global_path.parse_path (env_sz); - char *suffixes[] = {"ly", "afm", "scm", "tfm", 0}; + char *suffixes[] = {"ly", "afm", "scm", "tfm", "cmtfm", 0}; for (char **s = suffixes; *s; s++){ if (!prefix_directory.empty_b()) global_path.add (prefix_directory + to_str ('/') + String (*s)); diff --git a/make/toplevel.make.in b/make/toplevel.make.in index 00da08431c..32e2911ba5 100644 --- a/make/toplevel.make.in +++ b/make/toplevel.make.in @@ -36,4 +36,4 @@ examples: localinstall: mkdir -p $(datadir) - ln -s $(TEX_TFMDIR) $(datadir)/tfm + ln -s $(TEX_TFMDIR) $(datadir)/cmtfm