CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Jan Nieuwenhuizen <[EMAIL PROTECTED]> 05/04/18 18:22:35
Modified files:
po : lilypond.pot
mf : SConscript
buildscripts : builder.py
. : SConstruct ChangeLog
Log message:
scons update
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/po/lilypond.pot.diff?tr1=1.69&tr2=1.70&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/mf/SConscript.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/buildscripts/builder.py.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/SConstruct.diff?tr1=1.74&tr2=1.75&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3466&tr2=1.3467&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3466 lilypond/ChangeLog:1.3467
--- lilypond/ChangeLog:1.3466 Mon Apr 18 17:02:29 2005
+++ lilypond/ChangeLog Mon Apr 18 18:22:35 2005
@@ -1,3 +1,7 @@
+2005-04-18 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
+
+ * SCons updates.
+
2005-04-18 Han-Wen Nienhuys <[EMAIL PROTECTED]>
* VERSION (PACKAGE_NAME): release 2.5.20
Index: lilypond/SConstruct
diff -u lilypond/SConstruct:1.74 lilypond/SConstruct:1.75
--- lilypond/SConstruct:1.74 Mon Apr 18 13:35:14 2005
+++ lilypond/SConstruct Mon Apr 18 18:22:35 2005
@@ -95,16 +95,24 @@
EnsureSConsVersion (0, 95)
usage = r'''Usage:
-scons [KEY=VALUE].. [TARGET|DIR]..
+[ENVVAR=VALUE]... scons [OPTION=VALUE]... [TARGET|DIR]...
TARGETS: clean, config, doc, dist, install, mf-essential, po-update,
realclean, release, sconsclean, tar, TAGS
+ENVVARS: BASH, CCFLAGS, CC, CXX, LIBS, PYTHON, SH...
+ (see SConstruct:config_vars)
+
+OPTIONS:
'''
config_cache = 'scons.cache'
+# All config_vars can be set as ENVVAR, eg:
+#
+# CXX=g++-4.0 GS=~/usr/pkg/gs/bin/gs scons config
+#
# append test_program variables automagically?
config_vars = [
'BASH',
@@ -116,12 +124,15 @@
'CXX',
'CXXFLAGS',
'DEFINES',
+ 'DVIPS',
'FONTFORGE',
'GCC',
'GXX',
+ 'GS',
'LIBS',
'LINKFLAGS',
- 'METAFONT',
+ 'MF',
+ 'MFTRACE',
'PERL',
'PYTHON',
'SH',
@@ -162,24 +173,16 @@
version = packagepython.version_tuple_to_str (package.version)
ENV = { 'PATH' : os.environ['PATH'] }
-for key in ['LD_LIBRARY_PATH', 'GUILE_LOAD_PATH', 'PKG_CONFIG_PATH']:
- if os.environ.has_key (key):
- ENV[key] = os.environ[key]
-
-for key in config_vars:
+for key in ['LD_LIBRARY_PATH', 'GUILE_LOAD_PATH', 'PKG_CONFIG_PATH', 'TEXMF']:
if os.environ.has_key (key):
ENV[key] = os.environ[key]
env = Environment (
ENV = ENV,
-
- #BASH = '/bin/bash',
BYTEORDER = sys.byteorder.upper (),
+ CC = '$GCC',
+ CXX = '$GXX',
CPPDEFINES = '-DHAVE_CONFIG_H',
- #PERL = '/usr/bin/perl',
- #PYTHON = '/usr/bin/python',
- #SH = '/bin/sh',
-
MAKEINFO = 'LANG= makeinfo',
MF_TO_TABLE_PY = srcdir + '/buildscripts/mf-to-table.py',
@@ -192,14 +195,17 @@
TOPLEVEL_VERSION = version,
)
+Help (usage + opts.GenerateHelpText (env))
+
# Add all config_vars to opts, so that they will be read and saved
# together with the other configure options.
map (lambda x: opts.AddOptions ((x,)), config_vars)
-
-Help (usage + opts.GenerateHelpText (env))
-
opts.Update (env)
+for key in config_vars:
+ if os.environ.has_key (key):
+ env[key] = os.environ[key]
+
if env['fast']:
# Usability switch (Anthony Roach).
# See http://www.scons.org/cgi-bin/wiki/GoFastButton
@@ -260,7 +266,7 @@
def configure (target, source, env):
- vre = re.compile ('^.*[^-.0-9]([0-9][0-9]*\.[0-9][.0-9]*).*$',
+ vre = re.compile ('^.*[^-.0-9]([0-9][0-9]*\.[0-9]([.0-9]*[0-9])*).*$',
re.DOTALL)
def get_version (program):
command = '(pkg-config --modversion %(program)s || %(program)s
--version || %(program)s -V) 2>&1' % vars ()
@@ -291,19 +297,23 @@
return 1
def test_program (lst, program, minimal, description, package):
+ key = program.upper ()
+ if key.find ('+-'):
+ key = re.sub ('\+', 'X', key)
+ key = re.sub ('-', '_', key)
sys.stdout.write ('Checking for %s ... ' % program)
- f = WhereIs (program)
+ if env.has_key (key):
+ f = env[key]
+ sys.stdout.write ('(cached) ')
+ else:
+ f = WhereIs (program)
+ env[key] = f
if not f:
print 'not found'
lst.append ((description, package, minimal, program,
'not installed'))
return 0
print f
- key = program.upper ()
- if key.find ('+-'):
- key = re.sub ('\+', 'X', key)
- key = re.sub ('-', '_', key)
- env[key] = f
return test_version (lst, program, minimal, description,
package)
def test_lib (lst, program, minimal, description):
@@ -320,32 +330,25 @@
return 1
return 0
- for i in []: #['bash', 'perl', 'python', 'sh']:
- sys.stdout.write ('Checking for %s... ' % i)
- c = WhereIs (i)
- key = string.upper (i)
- if c:
- env[key] = c
- sys.stdout.write (c)
- else:
- sys.stdout.write ('not found: %s (using: %s)' \
- % (c, env[key]))
- # Hmm? abort?
- sys.stdout.write ('\n')
-
required = []
test_program (required, 'bash', '2.0', 'Bash', 'bash')
test_program (required, 'gcc', '2.8', 'GNU C compiler', 'gcc')
test_program (required, 'g++', '3.0.5', 'GNU C++ compiler', 'g++')
test_program (required, 'guile-config', '1.6', 'GUILE development',
'libguile-dev or guile-devel')
+ test_program (required, 'mf', '0.0', 'Metafont', 'tetex-bin')
+ test_program (required, 'mftrace', '1.1.6', 'mftrace
(http://xs4all.nl/~hanwen/mftrace)', 'mftrace')
+ test_program (required, 'potrace', '0.0', 'Potrace', 'potrace')
test_program (required, 'python', '2.1', 'Python (www.python.org)',
'python')
test_program (required, 'sh', '0.0', 'Bourne shell', 'sh')
optional = []
# Do not use bison 1.50 and 1.75.
+ #test_program (optional, 'foo', '2.0', 'Foomatic tester', 'bar')
test_program (optional, 'bison', '1.25', 'Bison -- parser generator',
'bison')
+ test_program (optional, 'dvips', '0.0', 'Dvips', 'tetex-bin')
+ test_program (optional, 'fontforge', '0.0.20041224', 'FontForge',
'fontforge')
test_program (optional, 'flex', '0.0', 'Flex -- lexer generator',
'flex')
test_program (optional, 'guile', '1.6', 'GUILE scheme', 'guile')
test_program (optional, 'gs', '8.14', 'Ghostscript PostScript
interpreter', 'gs or gs-afpl or gs-esp or gs-gpl')
@@ -353,13 +356,12 @@
'mftrace')
test_program (optional, 'makeinfo', '4.7', 'Makeinfo tool', 'texinfo')
test_program (optional, 'perl', '4.0',
- 'Perl practical efficient readonly language', 'perl')
- #test_program (optional, 'foo', '2.0', 'Foomatic tester', 'bar')
- test_program (optional, 'fontforge', '0.0.20041224', 'FontForge',
'fontforge')
+ 'Perl practical efficient readonly language', 'perl')
+ #test_program (optional, 'ps2pdf', '0.0', 'Ps2pdf', 'gs')
def CheckYYCurrentBuffer (context):
context.Message ('Checking for yy_current_buffer... ')
- ret = conf.TryCompile ("""using namespace std;
+ ret = conf.TryLink ("""using namespace std;
#include <FlexLexer.h>
class yy_flex_lexer: public yyFlexLexer
{
@@ -372,8 +374,45 @@
context.Result (ret)
return ret
+ def CheckLibkpathseaSo (context):
+ saveCFLAGS = []
+ if context.env.has_key ('CFLAGS'):
+ saveCFLAGS = context.env['CFLAGS']
+ CFLAGS_shared_no_debugging = filter (lambda x: x != '-g',
+ saveCFLAGS)\
+ + ['-shared']
+ # FIXME: how does this work, with scons
+ context.env.Replace (CFLAGS = CFLAGS_shared_no_debugging)
+ #context.env.Replace (CFLAGS = '')
+ #context.env.Append (CFLAGS = ['-shared'])
+ context.Message ('Checking for libkpathsea... ')
+ ret = conf.TryLink ('''#include <kpathsea/kpathsea.h>
+ int main ()
+ {
+ kpse_var_expand ("\$TEXMF");
+ return 0;
+ }
+ ''', '.c')
+ context.env.Replace (CFLAGS = saveCFLAGS)
+ # FIXME: this prints 'ok' already
+ context.Result (ret)
+ if not ret:
+ return 0
+
+ sys.stdout.write ('Checking for libkpathsea.so... ')
+ testfile = str (context.sconf.lastTarget)
+ shared_size = os.path.getsize (testfile)
+ ret = shared_size < 40000
+ if ret:
+ print 'ok'
+ else:
+ print 'no'
+ return ret
+
conf = Configure (env, custom_tests = { 'CheckYYCurrentBuffer'
- : CheckYYCurrentBuffer })
+ : CheckYYCurrentBuffer,
+ 'CheckLibkpathseaSo'
+ : CheckLibkpathseaSo })
defines = {
'DIRSEP' : "'%s'" % os.sep,
@@ -415,6 +454,9 @@
if conf.CheckYYCurrentBuffer ():
conf.env['DEFINES']['HAVE_FLEXLEXER_YY_CURRENT_BUFFER'] = 1
+ if conf.CheckLibkpathseaSo ():
+ conf.env['DEFINES']['HAVE_LIBKPATHSEA_SO'] = '1'
+
if conf.CheckLib ('dl'):
pass
@@ -427,9 +469,6 @@
if conf.CheckLib ('kpathsea', 'kpse_find_tfm'):
conf.env['DEFINES']['HAVE_KPSE_FIND_TFM'] = '1'
- # FIXME fc3 - move to kpath-guile/SConscript?
- conf.env['DEFINES']['HAVE_LIBKPATHSEA_SO'] = '1'
-
if env['fast']:
cpppath = []
if env.has_key ('CPPPATH'):
@@ -570,17 +609,21 @@
env.PrependENVPath ('PATH',
os.path.join (env['absbuild'], env['out'], 'usr/bin'))
-if os.environ.has_key ('TEXMF'):
- env.Append (ENV = {'TEXMF' : os.environ['TEXMF']})
+LILYPONDPREFIX = os.path.join (run_prefix, 'share/lilypond/', version)
+
env.Append (ENV = {
- 'TEXMF' : '{$LILYPONDPREFIX,' \
+ #'LILYPONDPREFIX' : os.path.join (run_prefix, 'share/lilypond/',
version),
+ 'LILYPONDPREFIX' : LILYPONDPREFIX,
+ # ugh, can't use LILYPONDPREFIX here
+ #'TEXMF' : '{' + os.path.join (run_prefix, 'share/lilypond/', version)\
+ #+ ',' \
+ 'TEXMF' : '{$LILYPONDPREFIX,'
+ os.popen ('kpsexpand \$TEXMF').read ()[:-1] + '}',
- 'LILYPONDPREFIX' : os.path.join (run_prefix, 'share/lilypond/',
version),
})
BUILD_ABC2LY = '${set__x}$PYTHON $srcdir/scripts/abc2ly.py'
BUILD_LILYPOND = '$absbuild/lily/$out/lilypond ${__verbose}'
-BUILD_LILYPOND_BOOK = '$PYTHON $srcdir/scripts/lilypond-book.py --verbose'
+BUILD_LILYPOND_BOOK = '$PYTHON $srcdir/scripts/lilypond-book.py ${__verbose}'
# post-option environment-update
@@ -595,6 +638,9 @@
sharedir_doc_package = sharedir_doc_package,
sharedir_package_version = sharedir_package_version,
+ # global build verbosity switch
+ __verbose = ' --verbose',
+
LILYPOND = BUILD_LILYPOND,
ABC2LY = BUILD_ABC2LY,
LILYPOND_BOOK = BUILD_LILYPOND_BOOK,
@@ -603,9 +649,9 @@
# should not be necessary
# PYTHONPATH = ['$absbuild/python/$out'],
TEXI2DVI_PAPERSIZE = '@afourpaper',
- TEXI2DVI_FLAGS = [ '-t $TEXI2DVI_PAPERSIZE'],
+ TEXI2DVI_FLAGS = [ '-t$TEXI2DVI_PAPERSIZE'],
DVIPS_PAPERSIZE = 'a4',
- DVIPS_FLAGS = ['-t $DVIPS_PAPERSIZE',
+ DVIPS_FLAGS = ['-t$DVIPS_PAPERSIZE',
'-u+lilypond.map',
'-u+ec-mftrace.map'],
PSPDF_FLAGS = ['-sPAPERSIZE=$DVIPS_PAPERSIZE'],
@@ -686,7 +732,7 @@
# post-config environment update
env.Append (
run_prefix = run_prefix,
- LILYPONDPREFIX = os.path.join (run_prefix, 'share/lilypond/', version),
+ LILYPONDPREFIX = LILYPONDPREFIX,
# FIXME: move to lily/SConscript?
LIBPATH = [os.path.join (absbuild, 'flower', env['out']),
@@ -900,14 +946,16 @@
web_ball = web_base + '.tar.gz'
env['footify'] = '[EMAIL PROTECTED] $PYTHON
stepmake/bin/add-html-footer.py --name=lilypond --version=$TOPLEVEL_VERSION'
web_ext = ['.html', '.ly', '.midi', '.pdf', '.png', '.ps.gz', '.txt',]
- web_path = '-path "*/$out/*"' + string.join (web_ext, ' -or -path
"*/$out/*"')
+ web_path = '-path "*/$out/*"' + string.join (web_ext, ' -or -path
"*/$out/*"') + '-or -type l'
env['web_path'] = web_path
web_list = os.path.join (outdir, 'weblist')
# compatible make heritits
# fixme: generate in $outdir is cwd/builddir
env.Command (web_list,
- ## this is correct, but takes > 5min if you have a peder
:-)
- ##'doc',
+ ## Adding 'doc' dependency is correct, but takes
+ ## > 5min extra if you have a peder :-)
+ #'doc',
+
'#/VERSION',
['$PYTHON buildscripts/mutopia-index.py -o examples.html
./',
'cd $absbuild && $footify $$(find . -name "*.html"
-print)',
Index: lilypond/buildscripts/builder.py
diff -u lilypond/buildscripts/builder.py:1.30
lilypond/buildscripts/builder.py:1.31
--- lilypond/buildscripts/builder.py:1.30 Mon Apr 18 13:35:14 2005
+++ lilypond/buildscripts/builder.py Mon Apr 18 18:22:35 2005
@@ -67,7 +67,7 @@
env.Append (
_fixme = _fixme,
- ABC2LY = 'abc2ly',
+ ##ABC2LY = 'abc2ly',
##LILYPOND = 'lilypond',
LILYOND_BOOK = 'lilypond-book',
@@ -125,12 +125,12 @@
env.Append (BUILDERS = {'TEXIDVI': TEXIDVI})
DVIPS =\
- Builder (action = 'dvips -o $TARGET $DVIPS_FLAGS $SOURCE',
+ Builder (action = 'TEXINPUTS=${TARGET.dir}:$$TEXINPUTS $DVIPS -o $TARGET
$DVIPS_FLAGS $SOURCE',
suffix = '.ps', src_suffix = '.dvi')
env.Append (BUILDERS = {'DVIPS': DVIPS})
DVIPDF =\
- Builder (action = 'dvips -o $TARGET -Ppdf $DVIPS_FLAGS $SOURCE',
+ Builder (action = 'TEXINPUTS=${TARGET.dir}:$$TEXINPUTS $DVIPS -o $TARGET
-Ppdf $DVIPS_FLAGS $SOURCE',
suffix = '.pdfps', src_suffix = '.dvi')
env.Append (BUILDERS = {'DVIPDF': DVIPDF})
@@ -192,7 +192,7 @@
a = 'cd ${TARGET.dir} \
&& MFINPUTS=.:${SOURCE.dir}:$srcdir/${SOURCE.dir}: \
-mf "\\mode:=$MFMODE; nonstopmode; input ${SOURCE.filebase};" \
+$MF "\\mode:=$MFMODE; nonstopmode; input ${SOURCE.filebase};" \
| grep -v "@\|>>\|w:\|h:";'
tfm = Builder (action = a, suffix = '.tfm', src_suffix = '.mf',
# emitter = lambda t, s, e: add_suffixes (t, s, e, ['.log'], []))
@@ -215,13 +215,12 @@
base = os.path.splitext (str (target[0]))[0]
return (target, source + [base + '.enc'])
-# UGH, should fix --output option for mftrace
-# mftrace --verbose is too verbose
+# FIXME UGH, should fix --output option for mftrace
a = 'cd ${TARGET.dir} && \
if test -e ${SOURCE.filebase}.enc; then
encoding="--encoding=${SOURCE.filebase}.enc"; fi; \
MFINPUTS=$srcdir/mf:.: \
-mftrace --formats=pfa --simplify --keep-trying --no-afm --verbose \
-$$encoding $TOO__verbose \
+$MFTRACE --formats=pfa --simplify --keep-trying --no-afm \
+$$encoding $__verbose \
--include=${TARGET.dir} \
${SOURCE.file}'
@@ -231,7 +230,7 @@
emitter = add_enc_src)
env.Append (BUILDERS = {'PFA': pfa})
-a = ['(cd ${TARGET.dir} && fontforge -script ${SOURCE.file})',
+a = ['(cd ${TARGET.dir} && $FONTFORGE -script ${SOURCE.file})',
'$PYTHON $srcdir/buildscripts/ps-embed-cff.py ${SOURCE.base}.cff $$(cat
${SOURCE.base}.fontname) ${SOURCE.base}.cff.ps',
'rm -f ${TARGET.dir}/*.scale.pfa']
otf = Builder (action = a,
Index: lilypond/mf/SConscript
diff -u lilypond/mf/SConscript:1.19 lilypond/mf/SConscript:1.20
--- lilypond/mf/SConscript:1.19 Mon Apr 18 13:35:13 2005
+++ lilypond/mf/SConscript Mon Apr 18 18:22:35 2005
@@ -93,6 +93,9 @@
env.Command ('cmr.enc', 'cmr.enc.in', 'cp $SOURCE $TARGET')
env.Alias ('mf', 'cmr.enc')
+env['fonts'] = string.join (fonts)
+env['feta_sizes'] = string.join (feta_sizes)
+env['sauter'] = string.join (sauter)
env.Command ('lilypond.map', p,
['for i in $fonts; do echo $$i $$i "<"$$i.pfa; done > $TARGET',
'for i in $feta_sizes; do\
Index: lilypond/po/lilypond.pot
diff -u lilypond/po/lilypond.pot:1.69 lilypond/po/lilypond.pot:1.70
--- lilypond/po/lilypond.pot:1.69 Sun Apr 17 21:16:31 2005
+++ lilypond/po/lilypond.pot Mon Apr 18 18:22:35 2005
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-04-17 18:18+0200\n"
+"POT-Creation-Date: 2005-04-18 14:27+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[EMAIL PROTECTED]>\n"
"Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n"
@@ -625,11 +625,6 @@
msgstr ""
#. FIXME: broken sentence
-#. FIXME: broken sentence
-#. FIXME: broken sentence
-#. FIXME: broken sentence
-#. FIXME: broken sentence
-#. FIXME: broken sentence
#: all-font-metrics.cc:176 lily/all-font-metrics.cc:176
#, c-format
msgid "checksum mismatch for font file: `%s'"
@@ -749,11 +744,6 @@
msgstr ""
#. FIXME: constant error message.
-#. FIXME: constant error message.
-#. FIXME: constant error message.
-#. FIXME: constant error message.
-#. FIXME: constant error message.
-#. FIXME: constant error message.
#: change-iterator.cc:81 lily/change-iterator.cc:81
msgid "can't find context to switch to"
msgstr ""
@@ -763,42 +753,12 @@
#.
#. last->translator_id_string () = get_change
#. ()->change_to_id_string ();
-#. We could change the current translator's id, but that would make
-#. errors hard to catch.
-#.
-#. last->translator_id_string () = get_change
-#. ()->change_to_id_string ();
-#. We could change the current translator's id, but that would make
-#. errors hard to catch.
-#.
-#. last->translator_id_string () = get_change
-#. ()->change_to_id_string ();
-#. We could change the current translator's id, but that would make
-#. errors hard to catch.
-#.
-#. last->translator_id_string () = get_change
-#. ()->change_to_id_string ();
-#. We could change the current translator's id, but that would make
-#. errors hard to catch.
-#.
-#. last->translator_id_string () = get_change
-#. ()->change_to_id_string ();
-#. We could change the current translator's id, but that would make
-#. errors hard to catch.
-#.
-#. last->translator_id_string () = get_change
-#. ()->change_to_id_string ();
#: change-iterator.cc:90 lily/change-iterator.cc:90
#, c-format
msgid "not changing to same context type: %s"
msgstr ""
#. FIXME: uncomprehensable message
-#. FIXME: uncomprehensable message
-#. FIXME: uncomprehensable message
-#. FIXME: uncomprehensable message
-#. FIXME: uncomprehensable message
-#. FIXME: uncomprehensable message
#: change-iterator.cc:94 lily/change-iterator.cc:94
msgid "none of these in my family"
msgstr ""
@@ -951,14 +911,17 @@
#: global-context-scheme.cc:50 global-context-scheme.cc:77
#: lily/global-context-scheme.cc:50 lily/global-context-scheme.cc:77
+#: lily/global-context-scheme.cc:49 lily/global-context-scheme.cc:76
msgid "no music found in score"
msgstr ""
#: global-context-scheme.cc:67 lily/global-context-scheme.cc:67
+#: lily/global-context-scheme.cc:66
msgid "Interpreting music... "
msgstr ""
#: global-context-scheme.cc:88 lily/global-context-scheme.cc:88
+#: lily/global-context-scheme.cc:87
#, c-format
msgid "elapsed time: %.2f seconds"
msgstr ""
@@ -1172,16 +1135,6 @@
#. Bug in option parser: --output =foe is taken as an abbreviation
#. for --output-format.
-#. Bug in option parser: --output =foe is taken as an abbreviation
-#. for --output-format.
-#. Bug in option parser: --output =foe is taken as an abbreviation
-#. for --output-format.
-#. Bug in option parser: --output =foe is taken as an abbreviation
-#. for --output-format.
-#. Bug in option parser: --output =foe is taken as an abbreviation
-#. for --output-format.
-#. Bug in option parser: --output =foe is taken as an abbreviation
-#. for --output-format.
#: main.cc:139 lily/main.cc:139
msgid "FORMATs"
msgstr ""
@@ -1260,11 +1213,6 @@
msgstr ""
#. No version number or newline here. It confuses help2man.
-#. No version number or newline here. It confuses help2man.
-#. No version number or newline here. It confuses help2man.
-#. No version number or newline here. It confuses help2man.
-#. No version number or newline here. It confuses help2man.
-#. No version number or newline here. It confuses help2man.
#: main.cc:203 lily/main.cc:203
#, c-format
msgid "Usage: %s [OPTION]... FILE..."
@@ -1331,11 +1279,6 @@
msgstr ""
#. FIXME: constant error message.
-#. FIXME: constant error message.
-#. FIXME: constant error message.
-#. FIXME: constant error message.
-#. FIXME: constant error message.
-#. FIXME: constant error message.
#: mark-engraver.cc:123 lily/mark-engraver.cc:123
msgid "rehearsalMark must have integer value"
msgstr ""
@@ -1432,22 +1375,6 @@
msgid "can't add text scripts to individual note heads"
msgstr ""
-#.
-#. music for the softenon children?
-#.
-#.
-#. music for the softenon children?
-#.
-#.
-#. music for the softenon children?
-#.
-#.
-#. music for the softenon children?
-#.
-#.
-#. music for the softenon children?
-#.
-#.
#. music for the softenon children?
#.
#: new-fingering-engraver.cc:158 lily/new-fingering-engraver.cc:158
@@ -1520,12 +1447,12 @@
msgid "Layout output to `%s'..."
msgstr ""
-#: paper-score.cc:66 lily/paper-score.cc:66
+#: paper-score.cc:66 lily/paper-score.cc:66 lily/paper-score.cc:76
#, c-format
msgid "Element count %d (spanners %d) "
msgstr ""
-#: paper-score.cc:70 lily/paper-score.cc:70
+#: paper-score.cc:70 lily/paper-score.cc:70 lily/paper-score.cc:80
msgid "Preprocessing graphical objects..."
msgstr ""
@@ -1566,7 +1493,7 @@
msgid "at "
msgstr ""
-#: performance.cc:164 lily/performance.cc:164
+#: performance.cc:164 lily/performance.cc:164 lily/performance.cc:165
#, c-format
msgid "MIDI output to `%s'..."
msgstr ""
@@ -1672,24 +1599,19 @@
msgid "Search path `%s'"
msgstr ""
-#: score.cc:213 lily/score.cc:213
+#: score.cc:213 lily/score.cc:213 lily/score.cc:214
msgid "already have music in score"
msgstr ""
-#: score.cc:214 lily/score.cc:214
+#: score.cc:214 lily/score.cc:214 lily/score.cc:215
msgid "this is the previous music"
msgstr ""
-#: score.cc:219 lily/score.cc:219
+#: score.cc:219 lily/score.cc:219 lily/score.cc:220
msgid "errors found, ignoring music expression"
msgstr ""
#. FIXME:
-#. FIXME:
-#. FIXME:
-#. FIXME:
-#. FIXME:
-#. FIXME:
#: script-engraver.cc:100 lily/script-engraver.cc:100
msgid "don't know how to interpret articulation: "
msgstr ""
@@ -1699,11 +1621,6 @@
msgstr ""
#. this shouldn't happen, but let's continue anyway.
-#. this shouldn't happen, but let's continue anyway.
-#. this shouldn't happen, but let's continue anyway.
-#. this shouldn't happen, but let's continue anyway.
-#. this shouldn't happen, but let's continue anyway.
-#. this shouldn't happen, but let's continue anyway.
#: separation-item.cc:52 separation-item.cc:96 lily/separation-item.cc:52
#: lily/separation-item.cc:96
msgid "Separation_item: I've been drinking too much"
@@ -1742,11 +1659,6 @@
msgstr ""
#. FIXME:
-#. FIXME:
-#. FIXME:
-#. FIXME:
-#. FIXME:
-#. FIXME:
#: stem-engraver.cc:125 lily/stem-engraver.cc:125
#, c-format
msgid "adding note head to incompatible stem (type = %d)"
@@ -1798,16 +1710,6 @@
#. Not using ngettext's plural feature here, as this message is
#. more of a programming error.
-#. Not using ngettext's plural feature here, as this message is
-#. more of a programming error.
-#. Not using ngettext's plural feature here, as this message is
-#. more of a programming error.
-#. Not using ngettext's plural feature here, as this message is
-#. more of a programming error.
-#. Not using ngettext's plural feature here, as this message is
-#. more of a programming error.
-#. Not using ngettext's plural feature here, as this message is
-#. more of a programming error.
#: tfm-reader.cc:106 lily/tfm-reader.cc:106
#, c-format
msgid "TFM header of `%s' has only %u word (s)"
@@ -1831,32 +1733,6 @@
msgid "no one to print a tuplet start bracket"
msgstr ""
-#.
-#. Todo: should make typecheck?
-#.
-#. OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
-#.
-#.
-#. Todo: should make typecheck?
-#.
-#. OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
-#.
-#.
-#. Todo: should make typecheck?
-#.
-#. OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
-#.
-#.
-#. Todo: should make typecheck?
-#.
-#. OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
-#.
-#.
-#. Todo: should make typecheck?
-#.
-#. OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
-#.
-#.
#. Todo: should make typecheck?
#.
#. OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
@@ -1878,6 +1754,10 @@
#. (Here really with a warning!)
#. If there is no such symbol, we default to the numbered style.
#. (Here really with a warning!)
+#. If there is no such symbol, we default to the numbered style.
+#. (Here really with a warning!)
+#. If there is no such symbol, we default to the numbered style.
+#. (Here really with a warning!)
#: time-signature.cc:83 lily/time-signature.cc:83
#, c-format
msgid "time signature symbol `%s' not found; reverting to numbered style"
@@ -1929,11 +1809,6 @@
msgstr ""
#. fixme: be more verbose.
-#. fixme: be more verbose.
-#. fixme: be more verbose.
-#. fixme: be more verbose.
-#. fixme: be more verbose.
-#. fixme: be more verbose.
#: volta-engraver.cc:127 lily/volta-engraver.cc:127
msgid "can't end volta spanner"
msgstr ""
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
