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

diff --git a/CHANGES b/CHANGES
index af019b8376e81d2f342822705e2fd9ae151ad7a4..314d36abdff53fadc6fb18252ad443bb54110b15 100644 (file)
--- 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 9f2fa8bf9b3759eae578a16ed0c01f18dada128e..2ea28d7d192bbe1c90ac79c7de543e8d0393df5b 100644 (file)
--- 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 3a559ca47c649d54cab98248eeb8c49949e0844c..5ae3acbad1c26922d034d67de55cb9e7ec160b86 100644 (file)
--- 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 c2c1480dd89aecf4b5ccb62e0f1c4371a7d2bdf2..eb14f1679100e07155fd26a205ec84f86d3d067f 100644 (file)
--- 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 379fa33fd32cbb69f34741f755e60d288df76b14..8bc4689359db11616a85176725280749bc5d7bbb 100644 (file)
--- 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 5ac6d69667a601007bb24da29345591c73fe3f6c..2311323101fe738a57053d1aed9a5f4faa06f3b4 100644 (file)
--- 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)