From abf98de31f1f8a24715ad35c1d9255dadb46dcd5 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Wed, 30 Aug 2000 22:03:41 +0200 Subject: [PATCH] patch::: 1.3.81.jcn1 1.3.81.jcn1 =========== * Activated regex for windows. * New guile-1.4 patch for cross windows build. * Added configure messages for metapost checking. --- CHANGES | 9 ++ .../ntweb/guile-1.3.4-gnu-windows.patch | 105 ------------------ .../ntweb/guile-1.4-gnu-windows.patch | 85 ++++++++++++++ VERSION | 2 +- aclocal.m4 | 6 +- input/bugs/slur-steep-broken.ly | 9 ++ scm/chord-names.scm | 8 +- scm/lily.scm | 8 +- stepmake/aclocal.m4 | 8 +- 9 files changed, 126 insertions(+), 114 deletions(-) create mode 100644 Documentation/ntweb/guile-1.4-gnu-windows.patch create mode 100644 input/bugs/slur-steep-broken.ly diff --git a/CHANGES b/CHANGES index d5564b062f..4d150c249c 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,12 @@ +1.3.81.jcn1 +=========== + +* Activated regex for windows. + +* New guile-1.4 patch for cross windows build. + +* Added configure messages for metapost checking. + 1.3.80.gp1 ========== diff --git a/Documentation/ntweb/guile-1.3.4-gnu-windows.patch b/Documentation/ntweb/guile-1.3.4-gnu-windows.patch index 6a29dda59a..e69de29bb2 100644 --- a/Documentation/ntweb/guile-1.3.4-gnu-windows.patch +++ b/Documentation/ntweb/guile-1.3.4-gnu-windows.patch @@ -1,105 +0,0 @@ -diff -urN ../guile-1.3.4/ChangeLog ./ChangeLog ---- ../guile-1.3.4/ChangeLog Sat Sep 25 19:26:50 1999 -+++ ./ChangeLog Mon Mar 27 15:46:54 2000 -@@ -1,3 +1,12 @@ -+2000-03-24 -+ -+ * guile-config/cross-guile-config.in: Simple shell script to -+ take over guile-config's functionality for cross-compilation. -+ It will be installed as ${target}-guile-config. -+ -+ * guile-config/Makefile.am: Provide for cross-guile-config.in -+ and its targets. -+ - 1999-09-25 Jim Blandy - - * Guile 1.3.4 released. -diff -urN ../guile-1.3.4/configure.in ./configure.in ---- ../guile-1.3.4/configure.in Sat Sep 25 19:26:50 1999 -+++ ./configure.in Wed Mar 29 15:49:56 2000 -@@ -21,6 +21,7 @@ - dnl Boston, MA 02111-1307, USA. - - AC_INIT(Makefile.in) -+AC_CANONICAL_SYSTEM - . $srcdir/GUILE-VERSION - AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define) - AM_MAINTAINER_MODE -diff -urN ../guile-1.3.4/guile-config/Makefile.am ./guile-config/Makefile.am ---- ../guile-1.3.4/guile-config/Makefile.am Mon Oct 19 17:24:31 1998 -+++ ./guile-config/Makefile.am Mon Mar 27 15:47:43 2000 -@@ -20,9 +20,9 @@ - ## to the Free Software Foundation, Inc., 59 Temple Place, Suite - ## 330, Boston, MA 02111-1307 USA - --bin_SCRIPTS=guile-config --CLEANFILES=guile-config --EXTRA_DIST=guile-config.in -+bin_SCRIPTS=guile-config @target@-guile-config -+CLEANFILES=guile-config @target@-guile-config -+EXTRA_DIST=guile-config.in cross-guile-config.in - - ## We use @-...-@ as the substitution brackets here, instead of the - ## usual @...@, so autoconf doesn't go and substitute the values -@@ -34,6 +34,15 @@ - -e s:@-GUILE_VERSION-@:${GUILE_VERSION}: - chmod +x guile-config.tmp - mv guile-config.tmp guile-config -+ -+@target@-guile-config: cross-guile-config.in -+ rm -f $<.tmp -+ sed < ${srcdir}/$< > $<.tmp \ -+ -e s:@-SHELL-@:${SHELL}: \ -+ -e s:@-GUILE_VERSION-@:${GUILE_VERSION}:\ -+ -e s:@-PREFIX-@:${prefix}: -+ chmod +x $<.tmp -+ mv $<.tmp $@ - - ## Get rid of any copies of the configuration script under the old - ## name, so people don't end up running ancient copies of it. -diff -urN ../guile-1.3.4/guile-config/cross-guile-config.in ./guile-config/cross-guile-config.in ---- ../guile-1.3.4/guile-config/cross-guile-config.in Thu Jan 1 01:00:00 1970 -+++ ./guile-config/cross-guile-config.in Mon Mar 27 15:46:36 2000 -@@ -0,0 +1,16 @@ -+#!@-SHELL-@ -+# target-guile-config.in -+case $1 in -+ --version) -+ echo "@-GUILE_VERSION-@" -+ exit 0 -+ ;; -+ compile) -+ echo "-I @-PREFIX-@/include/guile" -+ exit 0 -+ ;; -+ link) -+ echo "-L @-PREFIX-@/lib -lguile" -+ exit 0 -+ ;; -+esac -diff -urN ../guile-1.3.4/libguile/dynl-dl.c ./libguile/dynl-dl.c ---- ../guile-1.3.4/libguile/dynl-dl.c Sun Aug 29 20:03:26 1999 -+++ ./libguile/dynl-dl.c Mon Mar 27 15:57:24 2000 -@@ -45,7 +45,9 @@ - Author: Aubrey Jaffer - Modified for libguile by Marius Vollmer */ - -+#ifndef __CYGWIN__ - #include -+#endif - - #ifdef RTLD_LAZY /* Solaris 2. */ - # define DLOPEN_MODE RTLD_LAZY -diff -urN ../guile-1.3.4/libguile/filesys.c ./libguile/filesys.c ---- ../guile-1.3.4/libguile/filesys.c Sun Sep 12 05:47:39 1999 -+++ ./libguile/filesys.c Mon Mar 27 15:57:24 2000 -@@ -138,7 +138,9 @@ - fdes = SCM_INUM (object); - else - fdes = SCM_FPORT_FDES (object); -+#ifndef __CYGWIN__ - SCM_SYSCALL (rv = fchown (fdes, SCM_INUM (owner), SCM_INUM (group))); -+#endif - } - else - { diff --git a/Documentation/ntweb/guile-1.4-gnu-windows.patch b/Documentation/ntweb/guile-1.4-gnu-windows.patch new file mode 100644 index 0000000000..4dd55d3205 --- /dev/null +++ b/Documentation/ntweb/guile-1.4-gnu-windows.patch @@ -0,0 +1,85 @@ +diff -urN ../guile-1.4/ChangeLog ./ChangeLog +--- ../guile-1.4/ChangeLog Fri Jun 2 15:17:01 2000 ++++ ./ChangeLog Mon Jun 5 15:18:32 2000 +@@ -1,3 +1,12 @@ ++2000-06-05 ++ ++ * guile-config/cross-guile-config.in: Simple shell script to ++ take over guile-config's functionality for cross-compilation. ++ It will be installed as ${target}-guile-config. ++ ++ * guile-config/Makefile.am: Provide for cross-guile-config.in ++ and its targets. ++ + 2000-06-21 Mikael Djurfeldt + + * Guile 1.4 released. +diff -urN ../guile-1.4/configure.in ./configure.in +--- ../guile-1.4/configure.in Fri Jun 2 08:44:27 2000 ++++ ./configure.in Mon Jun 5 15:13:58 2000 +@@ -21,6 +21,7 @@ + dnl Boston, MA 02111-1307, USA. + + AC_INIT(Makefile.in) ++AC_CANONICAL_SYSTEM + . $srcdir/GUILE-VERSION + AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define) + AM_MAINTAINER_MODE +diff -urN ../guile-1.4/guile-config/Makefile.am ./guile-config/Makefile.am +--- ../guile-1.4/guile-config/Makefile.am Wed Jan 12 22:42:41 2000 ++++ ./guile-config/Makefile.am Mon Jun 5 15:17:37 2000 +@@ -20,9 +20,9 @@ + ## to the Free Software Foundation, Inc., 59 Temple Place, Suite + ## 330, Boston, MA 02111-1307 USA + +-bin_SCRIPTS=guile-config +-CLEANFILES=guile-config +-EXTRA_DIST=guile-config.in guile.m4 ++bin_SCRIPTS=guile-config @target@-guile-config ++CLEANFILES=guile-config @target@-guile-config ++EXTRA_DIST=guile-config.in guile.m4 cross-guile-config.in + + ## FIXME: in the future there will be direct automake support for + ## doing this. When that happens, switch over. +@@ -39,6 +39,21 @@ + -e s:@-GUILE_VERSION-@:${GUILE_VERSION}: + chmod +x guile-config.tmp + mv guile-config.tmp guile-config ++ ++LDFLAGS=@LDFLAGS@ ++CFLAGS=@CFLAGS@ ++CPPFLAGS=@CPPFLAGS@ ++ ++@target@-guile-config: cross-guile-config.in ++ rm -f $<.tmp ++ sed < ${srcdir}/$< > $<.tmp \ ++ -e s:@-SHELL-@:${SHELL}: \ ++ -e s:@-GUILE_VERSION-@:${GUILE_VERSION}:\ ++ -e s:@-PREFIX-@:${prefix}: \ ++ -e "s:@-CPPFLAGS-@:${CPPFLAGS}:" \ ++ -e "s:@-LDFLAGS-@:${LDFLAGS}:" ++ chmod +x $<.tmp ++ mv $<.tmp $@ + + ## Get rid of any copies of the configuration script under the old + ## name, so people don't end up running ancient copies of it. +diff -urN ../guile-1.4/guile-config/cross-guile-config.in ./guile-config/cross-guile-config.in +--- ../guile-1.4/guile-config/cross-guile-config.in Thu Jan 1 01:00:00 1970 ++++ ./guile-config/cross-guile-config.in Mon Jun 5 15:13:58 2000 +@@ -0,0 +1,16 @@ ++#!@-SHELL-@ ++# target-guile-config.in ++case $1 in ++ --version) ++ echo "@-GUILE_VERSION-@" ++ exit 0 ++ ;; ++ compile) ++ echo "@-CPPFLAGS-@ -I @-PREFIX-@/include/guile" ++ exit 0 ++ ;; ++ link) ++ echo "-L @-PREFIX-@/lib -lguile @-LDFLAGS-@" ++ exit 0 ++ ;; ++esac diff --git a/VERSION b/VERSION index 3284699c10..d8889964f6 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 PATCH_LEVEL=81 -MY_PATCH_LEVEL= +MY_PATCH_LEVEL=jcn1 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/aclocal.m4 b/aclocal.m4 index 122038c7f7..d1220794a6 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -648,20 +648,24 @@ AC_DEFUN(AC_STEPMAKE_TEXMF, [ break; fi done + AC_MSG_RESULT($MFMODE) + AC_MSG_CHECKING(for mfplain.mp) # # For now let people define these in their environments # : ${MFPLAIN_MP=`kpsewhich mp mfplain.mp`} + AC_MSG_RESULT($MFPLAIN_MP) + AC_MSG_CHECKING(for inimetapost flags) if test ${INIMETAPOST} = "inimp" ; then : ${INIMETAPOST_FLAGS=''} else : ${INIMETAPOST_FLAGS='-interaction=nonstopmode'} fi + AC_MSG_RESULT($INIMETAPOST_FLAGS) rm -f mfput.* - AC_MSG_RESULT($MFMODE) AC_SUBST(METAFONT) AC_SUBST(METAPOST) diff --git a/input/bugs/slur-steep-broken.ly b/input/bugs/slur-steep-broken.ly new file mode 100644 index 0000000000..f5f495e700 --- /dev/null +++ b/input/bugs/slur-steep-broken.ly @@ -0,0 +1,9 @@ +\score{ + \notes\relative c''{ + \time 2/4; + [f8 e d f, (] | \break + [) a'8. gis16 fis8. cis16] | + } + \paper{linewidth = 3.0\cm;indent = .0;} +} + diff --git a/scm/chord-names.scm b/scm/chord-names.scm index 5116a7904f..70285815a7 100644 --- a/scm/chord-names.scm +++ b/scm/chord-names.scm @@ -11,10 +11,14 @@ ) ;; The regex module may not be available, or may be broken. -(define use-regex +(define chord-use-regex (let ((os (string-downcase (vector-ref (uname) 0)))) (not (equal? "cygwin" (substring os 0 (min 6 (string-length os))))))) +;; If you have trouble with regex, define #f +(define chord-use-regex #t) +;;(define chord-use-regex #f) + ;; ;; (octave notename accidental) ;; @@ -260,7 +264,7 @@ (apply append (pitch->text-banter tonic) (if user-name user-name '()) ;; why does list->string not work, format seems only hope... - (if (and use-regex + (if (and chord-use-regex (string-match "super" (format "~s" user-name)) (or (pair? additions) (pair? subtractions))) diff --git a/scm/lily.scm b/scm/lily.scm index 13f8359c55..147f5b5850 100644 --- a/scm/lily.scm +++ b/scm/lily.scm @@ -18,14 +18,14 @@ (use-modules (ice-9 regex)) ;; The regex module may not be available, or may be broken. -;; If you have trouble with regex, define #f -;;(define use-regex #t) -;;(define use-regex #f) - (define use-regex (let ((os (string-downcase (vector-ref (uname) 0)))) (not (equal? "cygwin" (substring os 0 (min 6 (string-length os))))))) +;; If you have trouble with regex, define #f +(define use-regex #t) +;;(define use-regex #f) + ;; do nothing in .scm output (define (comment s) "") diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4 index 6bca70dc77..d1220794a6 100644 --- a/stepmake/aclocal.m4 +++ b/stepmake/aclocal.m4 @@ -1,3 +1,5 @@ +dnl WARNING WARNING WARNING WARNING +dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 dnl aclocal.m4 -*-shell-script-*- dnl StepMake subroutines for configure.in @@ -646,20 +648,24 @@ AC_DEFUN(AC_STEPMAKE_TEXMF, [ break; fi done + AC_MSG_RESULT($MFMODE) + AC_MSG_CHECKING(for mfplain.mp) # # For now let people define these in their environments # : ${MFPLAIN_MP=`kpsewhich mp mfplain.mp`} + AC_MSG_RESULT($MFPLAIN_MP) + AC_MSG_CHECKING(for inimetapost flags) if test ${INIMETAPOST} = "inimp" ; then : ${INIMETAPOST_FLAGS=''} else : ${INIMETAPOST_FLAGS='-interaction=nonstopmode'} fi + AC_MSG_RESULT($INIMETAPOST_FLAGS) rm -f mfput.* - AC_MSG_RESULT($MFMODE) AC_SUBST(METAFONT) AC_SUBST(METAPOST) -- 2.39.2