From 7415c4f234fb377ab958c9d7088f5703adc91aba Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Tue, 19 Jun 2001 12:40:33 +0200 Subject: [PATCH] patch::: 1.4.3.jcn2 1.4.3.jcn2 --- Generated by janneke@gnu.org, From = lilypond-1.4.3.jcn1, To = lilypond-1.4.3.jcn2 usage cd lilypond-source-dir; patch -E -p1 < lilypond-1.4.3.jcn2.diff Patches do not contain automatically generated files or (urg) empty directories, i.e., you should rerun autoconf, configure --- CHANGES | 17 +++++++- Documentation/windows/installing.texi | 4 +- Documentation/windows/lily-gs.sh | 2 +- Documentation/windows/lily-miktex.sh | 2 +- VERSION | 2 +- scripts/ly2dvi.py | 62 +++++++++++++++------------ 6 files changed, 56 insertions(+), 33 deletions(-) diff --git a/CHANGES b/CHANGES index af019b8376..314d36abdf 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,19 @@ -1.4.2.jcn4 +--- ../lilypond-1.4.3.jcn1/CHANGES Thu Jun 14 21:29:50 2001 +++ b/CHANGES Tue Jun 19 12:40:33 2001 +@@ -1,5 +1,12 @@ +-1.4.3.jcn1 +1.4.3.jcn2 + ========== + +* Fixed broken link in website. + +* Ly2dvi now leaves .tex and .latex output if latex fails, and cleans +the temp dir if anything fails. + +* Fixes for windows scripts (Raybro Brohinksy). + + * Added -mieee to CFLAGS for alpha. + 1.4.2.jcn4 ========== * Windows: bugfix for tex-wrappers, added tex wrapper for dvips. diff --git a/Documentation/windows/installing.texi b/Documentation/windows/installing.texi index 9f2fa8bf9b..2ea28d7d19 100644 --- a/Documentation/windows/installing.texi +++ b/Documentation/windows/installing.texi @@ -90,8 +90,8 @@ and try again. @subsection Trouble For problems and solutions see -@uref{Troubleshooting Windows,http://lilypond.org/TroubleshootingWindows}. - +@uref{http://lilypond.org/wiki/?TroubleshootingWindows,Troubleshooting +Windows}. @subsection Additional software diff --git a/Documentation/windows/lily-gs.sh b/Documentation/windows/lily-gs.sh index 3a559ca47c..5ae3acbad1 100644 --- a/Documentation/windows/lily-gs.sh +++ b/Documentation/windows/lily-gs.sh @@ -3,7 +3,7 @@ gs550="/usr/windows/gstools/gs5.50" -gs650="/usr/windows/gs/gs6.50" +gs650="/usr/windows/gs/gs6.50/bin" gsview26="/usr/windows/gstools/gsview" gsview36="/usr/windows/Ghostgum/GSview" diff --git a/Documentation/windows/lily-miktex.sh b/Documentation/windows/lily-miktex.sh index c2c1480dd8..eb14f16791 100644 --- a/Documentation/windows/lily-miktex.sh +++ b/Documentation/windows/lily-miktex.sh @@ -10,7 +10,7 @@ reg="$(regtool -q get 'HKLM\Software\MiK\MiKTeX\CurrentVersion\MiKTeX\Install Ro b="$(cygpath -u ""$reg"")" # Where we installed it -c=texmf="/usr/windows/MiKTeX" +c="/usr/windows/MiKTeX" for i in "$a" "$b" "$c"; do if [ -d "$i" ]; then diff --git a/VERSION b/VERSION index 379fa33fd3..8bc4689359 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=4 PATCH_LEVEL=3 -MY_PATCH_LEVEL=jcn1 +MY_PATCH_LEVEL=jcn2 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py index 5ac6d69667..2311323101 100644 --- a/scripts/ly2dvi.py +++ b/scripts/ly2dvi.py @@ -65,6 +65,7 @@ import shutil import __main__ import operator import tempfile +import traceback datadir = '@datadir@' sys.path.append (datadir + '/python') @@ -702,8 +703,10 @@ include_path = map (abspath, include_path) original_output = output_name + if files and files[0] != '-': + # Ugh, maybe make a setup () function files = map (lambda x: strip_extension (x, '.ly'), files) (outdir, outbase) = ('','') @@ -738,40 +741,44 @@ if files and files[0] != '-': os.chdir (tmpdir) - extra = extra_init - if lily_p: -## try: + try: run_lilypond (files, outbase, dep_prefix) -## # except: -## # TODO: friendly message about LilyPond setup/failing? -## # -## # TODO: lilypond should fail with different -## # error codes for: -## # - guile setup/startup failure -## # - font setup failure -## # - init.ly setup failure -## # - parse error in .ly -## # - unexpected: assert/core dump -## # targets = {} + except: + # TODO: friendly message about LilyPond setup/failing? + # + # TODO: lilypond should fail with different + # error codes for: + # - guile setup/startup failure + # - font setup failure + # - init.ly setup failure + # - parse error in .ly + # - unexpected: assert/core dump + targets = {} + traceback.print_exc () if targets.has_key ('DVI') or targets.has_key ('PS'): -# try: - run_latex (files, outbase, extra) + try: + run_latex (files, outbase, extra_init) # unless: add --tex, or --latex? del targets['TEX'] del targets['LATEX'] -# except Foobar: -# # TODO: friendly message about TeX/LaTeX setup, -# # trying to run tex/latex by hand -# if targets.has_key ('DVI'): -# del targets['DVI'] -# if targets.has_key ('PS'): -# del targets['PS'] - - # TODO: does dvips ever fail? + except: + # TODO: friendly message about TeX/LaTeX setup, + # trying to run tex/latex by hand + if targets.has_key ('DVI'): + del targets['DVI'] + if targets.has_key ('PS'): + del targets['PS'] + traceback.print_exc () + if targets.has_key ('PS'): - run_dvips (outbase, extra) + try: + run_dvips (outbase, extra_init) + except: + if targets.has_key ('PS'): + del targets['PS'] + traceback.print_exc () # add DEP to targets? if track_dependencies_p: @@ -780,6 +787,7 @@ if files and files[0] != '-': if os.path.isfile (depfile): progress (_ ("dependencies output to `%s'...") % depfile) + # Hmm, if this were a function, we could call it the except: clauses for i in targets.keys (): ext = string.lower (i) cp_to_dir ('.*\.%s$' % ext, outdir) @@ -799,7 +807,7 @@ if files and files[0] != '-': cleanup_temp () else: - # FIXME + # FIXME: read from stdin when files[0] = '-' help () errorport.write ("ly2dvi: " + _ ("error: ") + _ ("no files specified on command line.") + '\n') sys.exit (2) -- 2.39.5