lhs2tex 1.25 → 1.26
raw patch · 9 files changed
+284/−223 lines, 9 filesdep ~filepathsetup-changed
Dependency ranges changed: filepath
Files
- CHANGELOG.md +7/−0
- Setup.hs +36/−14
- configure +208/−189
- doc/Guide2.lhs +15/−0
- doc/Guide2.pdf binary
- doc/InteractivePre.lhs +1/−1
- doc/RawSearchPath.lhs +7/−7
- lhs2TeX.sty.lit +4/−6
- lhs2tex.cabal +6/−6
CHANGELOG.md view
@@ -1,3 +1,10 @@+# lhs2tex-1.26 (2025-12-30)++- Support for up to ghc-9.14.1 and cabal-3.14+ (thanks to Naïm Camille Favier and Sebastian Graf).+- Replace amsmath with newtxmath+ (thanks to Sebastian Graf).+ # lhs2tex-1.25 (2023-11-14) - Support for up to ghc-9.8.1.
Setup.hs view
@@ -8,10 +8,12 @@ import Distribution.Simple.Setup (CopyDest(..),ConfigFlags(..),BuildFlags(..), CopyFlags(..),RegisterFlags(..),InstallFlags(..), defaultRegisterFlags,fromFlagOrDefault,Flag(..),+#if (MIN_VERSION_Cabal(3,14,0))+ CommonSetupFlags(..),+#endif defaultCopyFlags) import Distribution.Simple (UserHooks(..), simpleUserHooks, defaultMainWithHooks) import Distribution.Simple.LocalBuildInfo- (LocalBuildInfo(..),absoluteInstallDirs) import Distribution.PackageDescription (PackageDescription(..)) import Distribution.Simple.InstallDirs (InstallDirs(..))@@ -22,6 +24,9 @@ import Distribution.Simple.Program.Db (ProgramDb) import Distribution.Simple.Utils import Distribution.Verbosity+#if (MIN_VERSION_Cabal(3,14,0))+import Distribution.Utils.Path (getSymbolicPath)+#endif import Data.Char (isSpace, showLitChar) import Data.List (isSuffixOf,isPrefixOf) import Data.Maybe (listToMaybe,isJust)@@ -40,7 +45,7 @@ minPolytableVersion = [0,8,6] shortversion = show (numversion `div` 100) ++ "." ++ show (numversion `mod` 100) version = shortversion ++ if ispre then "pre" ++ show pre else ""-numversion = 125+numversion = 126 ispre = False pre = 1 @@ -123,7 +128,7 @@ hugs <- case hugsExists of Nothing -> return "" Just _ -> fmap fst (getProgram "hugs" (withPrograms lbi))- let lhs2texDir = buildDir lbi `joinFileName` lhs2tex+ let lhs2texDir = buildDirString lbi `joinFileName` lhs2tex let lhs2texBin = lhs2texDir `joinFileName` lhs2tex readFile (f ++ ".in") >>= return . -- these paths could contain backslashes, so we@@ -141,10 +146,10 @@ where runKpseWhich v = runCommandProgramConf silent "kpsewhich" (withPrograms lbi) [v] runKpseWhichVar v = runKpseWhich $ "-expand-var='$" ++ v ++ "'" -lhs2texPostBuild a bf@(BuildFlags { buildVerbosity = vf }) pd lbi =- do let v = fromFlagOrDefault normal vf+lhs2texPostBuild a bf@(BuildFlags { }) pd lbi =+ do let v = fromFlagOrDefault normal (buildVerbosity bf) ebi <- getPersistLhs2texBuildConfig- let lhs2texDir = buildDir lbi `joinFileName` lhs2tex+ let lhs2texDir = buildDirString lbi `joinFileName` lhs2tex let lhs2texBin = lhs2texDir `joinFileName` lhs2tex let lhs2texDocDir = lhs2texDir `joinFileName` "doc" callLhs2tex v lbi ["--code", "lhs2TeX.sty.lit"] (lhs2texDir `joinFileName` "lhs2TeX.sty")@@ -153,9 +158,9 @@ if rebuildDocumentation ebi then lhs2texBuildDocumentation a bf pd lbi else copyFileVerbose v ("doc" `joinFileName` "Guide2.pdf") (lhs2texDocDir `joinFileName` "Guide2.pdf") -lhs2texBuildDocumentation a (BuildFlags { buildVerbosity = vf }) pd lbi =- do let v = fromFlagOrDefault normal vf- let lhs2texDir = buildDir lbi `joinFileName` lhs2tex+lhs2texBuildDocumentation a bf@(BuildFlags { }) pd lbi =+ do let v = fromFlagOrDefault normal (buildVerbosity bf)+ let lhs2texDir = buildDirString lbi `joinFileName` lhs2tex let lhs2texBin = lhs2texDir `joinFileName` lhs2tex let lhs2texDocDir = lhs2texDir `joinFileName` "doc" snippets <- do guide <- readFile $ "doc" `joinFileName` "Guide2.lhs"@@ -195,13 +200,13 @@ loop setCurrentDirectory d -lhs2texPostCopy a (CopyFlags { copyDest = cdf, copyVerbosity = vf }) pd lbi =- do let v = fromFlagOrDefault normal vf+lhs2texPostCopy a cf@(CopyFlags { copyDest = cdf }) pd lbi =+ do let v = fromFlagOrDefault normal (copyVerbosity cf) let cd = fromFlagOrDefault NoCopyDest cdf ebi <- getPersistLhs2texBuildConfig let dataPref = datadir (absoluteInstallDirs pd lbi cd) createDirectoryIfMissing True dataPref- let lhs2texDir = buildDir lbi `joinFileName` lhs2tex+ let lhs2texDir = buildDirString lbi `joinFileName` lhs2tex -- lhs2TeX.{fmt,sty} mapM_ (\f -> installOrdinaryFile v (lhs2texDir `joinFileName` f) (dataPref `joinFileName` f)) ["lhs2TeX.fmt","lhs2TeX.sty"]@@ -235,11 +240,21 @@ stys Nothing -> return () +#if (MIN_VERSION_Cabal(3,14,0))+lhs2texPostInst a (InstallFlags { installPackageDB = db, installCommonFlags = f }) pd lbi =+ do lhs2texPostCopy a (defaultCopyFlags { copyDest = Flag NoCopyDest, copyCommonFlags = f }) pd lbi+ lhs2texRegHook pd lbi Nothing (defaultRegisterFlags { regPackageDB = db, registerCommonFlags = f })+#else lhs2texPostInst a (InstallFlags { installPackageDB = db, installVerbosity = v }) pd lbi = do lhs2texPostCopy a (defaultCopyFlags { copyDest = Flag NoCopyDest, copyVerbosity = v }) pd lbi lhs2texRegHook pd lbi Nothing (defaultRegisterFlags { regPackageDB = db, regVerbosity = v })+#endif +#if (MIN_VERSION_Cabal(3,14,0))+lhs2texRegHook pd lbi _ (RegisterFlags { registerCommonFlags = CommonSetupFlags { setupVerbosity = vf } }) =+#else lhs2texRegHook pd lbi _ (RegisterFlags { regVerbosity = vf }) =+#endif do let v = fromFlagOrDefault normal vf ebi <- getPersistLhs2texBuildConfig when (isJust . installPolyTable $ ebi) $@@ -279,7 +294,7 @@ stripQuotes x = x callLhs2tex v lbi params outf =- do let lhs2texDir = buildDir lbi `joinFileName` lhs2tex+ do let lhs2texDir = buildDirString lbi `joinFileName` lhs2tex let lhs2texBin = lhs2texDir `joinFileName` lhs2tex let args = [ "-P" ++ lhs2texDir ++ sep ] ++ [ "-o" ++ outf ]@@ -356,7 +371,7 @@ tryIO :: IO a -> IO (Either IOError a) tryIO = try --- HACKS because the Cabal API isn't sufficient:+-- HACKS because the Cabal API is only sufficient once we may assume version >= 3.14 -- Distribution.Compat.FilePath is supposed to be hidden in future -- versions, so we need our own version of it:@@ -373,6 +388,13 @@ | otherwise = ( == '/' ) pathSeparator | isWindows = '\\' | otherwise = '/'+++#if (MIN_VERSION_Cabal(3,14,0))+buildDirString = getSymbolicPath . buildDir+#else+buildDirString = buildDir+#endif -- It would be nice if there'd be a predefined way to detect this isWindows = "mingw" `isPrefixOf` os || "win" `isPrefixOf` os
configure view
@@ -1,9 +1,9 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles.-# Generated by GNU Autoconf 2.71 for lhs2tex 1.25.+# Generated by GNU Autoconf 2.72 for lhs2tex 1.26. # #-# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,+# Copyright (C) 1992-1996, 1998-2017, 2020-2023 Free Software Foundation, # Inc. # #@@ -15,7 +15,6 @@ # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh-as_nop=: if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 then : emulate sh@@ -24,12 +23,13 @@ # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST-else $as_nop- case `(set -o) 2>/dev/null` in #(+else case e in #(+ e) case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( *) : ;;+esac ;; esac fi @@ -101,7 +101,7 @@ ;; esac-# We did not find ourselves, most probably we were run as `sh COMMAND'+# We did not find ourselves, most probably we were run as 'sh COMMAND' # in which case we are not to be found in the path. if test "x$as_myself" = x; then as_myself=$0@@ -131,15 +131,14 @@ esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail-# out after a failed `exec'.+# out after a failed 'exec'. printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi # We don't want this to propagate to other subprocesses. { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then- as_bourne_compatible="as_nop=:-if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1+ as_bourne_compatible="if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 then : emulate sh NULLCMD=:@@ -147,12 +146,13 @@ # is contrary to our usage. Disable this feature. alias -g '\${1+\"\$@\"}'='\"\$@\"' setopt NO_GLOB_SUBST-else \$as_nop- case \`(set -o) 2>/dev/null\` in #(+else case e in #(+ e) case \`(set -o) 2>/dev/null\` in #( *posix*) : set -o posix ;; #( *) : ;;+esac ;; esac fi "@@ -170,8 +170,9 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ) then : -else \$as_nop- exitcode=1; echo positional parameters were not saved.+else case e in #(+ e) exitcode=1; echo positional parameters were not saved. ;;+esac fi test x\$exitcode = x0 || exit 1 blah=\$(echo \$(echo blah))@@ -184,14 +185,15 @@ if (eval "$as_required") 2>/dev/null then : as_have_required=yes-else $as_nop- as_have_required=no+else case e in #(+ e) as_have_required=no ;;+esac fi if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null then : -else $as_nop- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR+else case e in #(+ e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR as_found=false for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do@@ -224,12 +226,13 @@ if $as_found then : -else $as_nop- if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&+else case e in #(+ e) if { test -f "$SHELL" || test -f "$SHELL.exe"; } && as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null then : CONFIG_SHELL=$SHELL as_have_required=yes-fi+fi ;;+esac fi @@ -251,7 +254,7 @@ esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail-# out after a failed `exec'.+# out after a failed 'exec'. printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi@@ -270,7 +273,8 @@ $0: the script under such a shell if you do have one." fi exit 1-fi+fi ;;+esac fi fi SHELL=${CONFIG_SHELL-/bin/sh}@@ -309,14 +313,6 @@ as_fn_set_status $1 exit $1 } # as_fn_exit-# as_fn_nop-# ----------# Do nothing but, unlike ":", preserve the value of $?.-as_fn_nop ()-{- return $?-}-as_nop=as_fn_nop # as_fn_mkdir_p # -------------@@ -385,11 +381,12 @@ { eval $1+=\$2 }'-else $as_nop- as_fn_append ()+else case e in #(+ e) as_fn_append () { eval $1=\$$1\$2- }+ } ;;+esac fi # as_fn_append # as_fn_arith ARG...@@ -403,21 +400,14 @@ { as_val=$(( $* )) }'-else $as_nop- as_fn_arith ()+else case e in #(+ e) as_fn_arith () { as_val=`expr "$@" || test $? -eq 1`- }+ } ;;+esac fi # as_fn_arith -# as_fn_nop-# ----------# Do nothing but, unlike ":", preserve the value of $?.-as_fn_nop ()-{- return $?-}-as_nop=as_fn_nop # as_fn_error STATUS ERROR [LINENO LOG_FD] # ----------------------------------------@@ -491,6 +481,8 @@ /[$]LINENO/= ' <$as_myself | sed '+ t clear+ :clear s/[$]LINENO.*/&-/ t lineno b@@ -539,7 +531,6 @@ as_echo='printf %s\n' as_echo_n='printf %s' - rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file@@ -551,9 +542,9 @@ if ln -s conf$$.file conf$$ 2>/dev/null; then as_ln_s='ln -s' # ... but there are two gotchas:- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.- # In both cases, we have to default to `cp -pR'.+ # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail.+ # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable.+ # In both cases, we have to default to 'cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then@@ -578,10 +569,12 @@ as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name.-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"+as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"+as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated # Sed expression to map a string onto a valid variable name.-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"+as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g"+as_tr_sh="eval sed '$as_sed_sh'" # deprecated test -n "$DJDIR" || exec 7<&0 </dev/null@@ -607,8 +600,8 @@ # Identity of this package. PACKAGE_NAME='lhs2tex' PACKAGE_TARNAME='lhs2tex'-PACKAGE_VERSION='1.25'-PACKAGE_STRING='lhs2tex 1.25'+PACKAGE_VERSION='1.26'+PACKAGE_STRING='lhs2tex 1.26' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -804,7 +797,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&- as_fn_error $? "invalid feature name: \`$ac_useropt'"+ as_fn_error $? "invalid feature name: '$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in@@ -830,7 +823,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&- as_fn_error $? "invalid feature name: \`$ac_useropt'"+ as_fn_error $? "invalid feature name: '$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in@@ -1043,7 +1036,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&- as_fn_error $? "invalid package name: \`$ac_useropt'"+ as_fn_error $? "invalid package name: '$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in@@ -1059,7 +1052,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&- as_fn_error $? "invalid package name: \`$ac_useropt'"+ as_fn_error $? "invalid package name: '$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in@@ -1089,8 +1082,8 @@ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) as_fn_error $? "unrecognized option: \`$ac_option'-Try \`$0 --help' for more information"+ -*) as_fn_error $? "unrecognized option: '$ac_option'+Try '$0 --help' for more information" ;; *=*)@@ -1098,7 +1091,7 @@ # Reject names that are not valid shell variable names. case $ac_envvar in #( '' | [0-9]* | *[!_$as_cr_alnum]* )- as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;+ as_fn_error $? "invalid variable name: '$ac_envvar'" ;; esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;;@@ -1148,7 +1141,7 @@ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done -# There might be people who depend on the old broken behavior: `$host'+# There might be people who depend on the old broken behavior: '$host' # used to hold the argument of --host etc. # FIXME: To remove some day. build=$build_alias@@ -1216,7 +1209,7 @@ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" fi-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"+ac_msg="sources are in $srcdir, but 'cd $srcdir' does not work" ac_abs_confdir=`( cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" pwd)`@@ -1244,7 +1237,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF-\`configure' configures lhs2tex 1.25 to adapt to many kinds of systems.+'configure' configures lhs2tex 1.26 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1258,11 +1251,11 @@ --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit- -q, --quiet, --silent do not print \`checking ...' messages+ -q, --quiet, --silent do not print 'checking ...' messages --cache-file=FILE cache test results in FILE [disabled]- -C, --config-cache alias for \`--cache-file=config.cache'+ -C, --config-cache alias for '--cache-file=config.cache' -n, --no-create do not create output files- --srcdir=DIR find the sources in DIR [configure dir or \`..']+ --srcdir=DIR find the sources in DIR [configure dir or '..'] Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX@@ -1270,10 +1263,10 @@ --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX [PREFIX] -By default, \`make install' will install all the files in-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify-an installation prefix other than \`$ac_default_prefix' using \`--prefix',-for instance \`--prefix=\$HOME'.+By default, 'make install' will install all the files in+'$ac_default_prefix/bin', '$ac_default_prefix/lib' etc. You can specify+an installation prefix other than '$ac_default_prefix' using '--prefix',+for instance '--prefix=\$HOME'. For better control, use the options below. @@ -1306,7 +1299,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in- short | recursive ) echo "Configuration of lhs2tex 1.25:";;+ short | recursive ) echo "Configuration of lhs2tex 1.26:";; esac cat <<\_ACEOF @@ -1385,10 +1378,10 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF-lhs2tex configure 1.25-generated by GNU Autoconf 2.71+lhs2tex configure 1.26+generated by GNU Autoconf 2.72 -Copyright (C) 2021 Free Software Foundation, Inc.+Copyright (C) 2023 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF@@ -1422,8 +1415,8 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by lhs2tex $as_me 1.25, which was-generated by GNU Autoconf 2.71. Invocation command line was+It was created by lhs2tex $as_me 1.26, which was+generated by GNU Autoconf 2.72. Invocation command line was $ $0$ac_configure_args_raw @@ -1669,10 +1662,10 @@ printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" \- || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}+ || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5+printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file-See \`config.log' for more details" "$LINENO" 5; }+See 'config.log' for more details" "$LINENO" 5; } fi done @@ -1772,8 +1765,9 @@ if $as_found then : -else $as_nop- as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5+else case e in #(+ e) as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5 ;;+esac fi @@ -1801,12 +1795,12 @@ eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,)- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5-printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&5+printf "%s\n" "$as_me: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set)- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5-printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was not set in the previous run" >&5+printf "%s\n" "$as_me: error: '$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *)@@ -1815,18 +1809,18 @@ ac_old_val_w=`echo x $ac_old_val` ac_new_val_w=`echo x $ac_new_val` if test "$ac_old_val_w" != "$ac_new_val_w"; then- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5-printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' has changed since the previous run:" >&5+printf "%s\n" "$as_me: error: '$ac_var' has changed since the previous run:" >&2;} ac_cache_corrupted=: else- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5-printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&5+printf "%s\n" "$as_me: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&2;} eval $ac_var=\$ac_old_val fi- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5-printf "%s\n" "$as_me: former value: \`$ac_old_val'" >&2;}- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5-printf "%s\n" "$as_me: current value: \`$ac_new_val'" >&2;}+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: '$ac_old_val'" >&5+printf "%s\n" "$as_me: former value: '$ac_old_val'" >&2;}+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: '$ac_new_val'" >&5+printf "%s\n" "$as_me: current value: '$ac_new_val'" >&2;} fi;; esac # Pass precious variables to config.status.@@ -1842,11 +1836,11 @@ fi done if $ac_cache_corrupted; then- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5+printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;}- as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file'+ as_fn_error $? "run '${MAKE-make} distclean' and/or 'rm $cache_file' and start over" "$LINENO" 5 fi ## -------------------- ##@@ -1861,9 +1855,9 @@ -VERSION="1.25"-SHORTVERSION="1.25"-NUMVERSION=125+VERSION="1.26"+SHORTVERSION="1.26"+NUMVERSION=126 PRE=1 @@ -1878,8 +1872,8 @@ if test ${ac_cv_path_GHC+y} then : printf %s "(cached) " >&6-else $as_nop- case $GHC in+else case e in #(+ e) case $GHC in [\\/]* | ?:[\\/]*) ac_cv_path_GHC="$GHC" # Let the user override the test with a path. ;;@@ -1904,6 +1898,7 @@ IFS=$as_save_IFS ;;+esac ;; esac fi GHC=$ac_cv_path_GHC@@ -1924,8 +1919,8 @@ if test ${ac_cv_path_HUGS+y} then : printf %s "(cached) " >&6-else $as_nop- case $HUGS in+else case e in #(+ e) case $HUGS in [\\/]* | ?:[\\/]*) ac_cv_path_HUGS="$HUGS" # Let the user override the test with a path. ;;@@ -1950,6 +1945,7 @@ IFS=$as_save_IFS ;;+esac ;; esac fi HUGS=$ac_cv_path_HUGS@@ -1986,8 +1982,8 @@ if test ${ac_cv_path_install+y} then : printf %s "(cached) " >&6-else $as_nop- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR+else case e in #(+ e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS@@ -2041,7 +2037,8 @@ IFS=$as_save_IFS rm -rf conftest.one conftest.two conftest.dir-+ ;;+esac fi if test ${ac_cv_path_install+y}; then INSTALL=$ac_cv_path_install@@ -2086,8 +2083,8 @@ if test ${ac_cv_path_BASH+y} then : printf %s "(cached) " >&6-else $as_nop- case $BASH in+else case e in #(+ e) case $BASH in [\\/]* | ?:[\\/]*) ac_cv_path_BASH="$BASH" # Let the user override the test with a path. ;;@@ -2112,6 +2109,7 @@ IFS=$as_save_IFS ;;+esac ;; esac fi BASH=$ac_cv_path_BASH@@ -2131,8 +2129,8 @@ if test ${ac_cv_path_MV+y} then : printf %s "(cached) " >&6-else $as_nop- case $MV in+else case e in #(+ e) case $MV in [\\/]* | ?:[\\/]*) ac_cv_path_MV="$MV" # Let the user override the test with a path. ;;@@ -2157,6 +2155,7 @@ IFS=$as_save_IFS ;;+esac ;; esac fi MV=$ac_cv_path_MV@@ -2176,8 +2175,8 @@ if test ${ac_cv_path_CP+y} then : printf %s "(cached) " >&6-else $as_nop- case $CP in+else case e in #(+ e) case $CP in [\\/]* | ?:[\\/]*) ac_cv_path_CP="$CP" # Let the user override the test with a path. ;;@@ -2202,6 +2201,7 @@ IFS=$as_save_IFS ;;+esac ;; esac fi CP=$ac_cv_path_CP@@ -2221,8 +2221,8 @@ if test ${ac_cv_path_RM+y} then : printf %s "(cached) " >&6-else $as_nop- case $RM in+else case e in #(+ e) case $RM in [\\/]* | ?:[\\/]*) ac_cv_path_RM="$RM" # Let the user override the test with a path. ;;@@ -2247,6 +2247,7 @@ IFS=$as_save_IFS ;;+esac ;; esac fi RM=$ac_cv_path_RM@@ -2266,8 +2267,8 @@ if test ${ac_cv_path_MKDIR+y} then : printf %s "(cached) " >&6-else $as_nop- case $MKDIR in+else case e in #(+ e) case $MKDIR in [\\/]* | ?:[\\/]*) ac_cv_path_MKDIR="$MKDIR" # Let the user override the test with a path. ;;@@ -2292,6 +2293,7 @@ IFS=$as_save_IFS ;;+esac ;; esac fi MKDIR=$ac_cv_path_MKDIR@@ -2311,8 +2313,8 @@ if test ${ac_cv_path_TOUCH+y} then : printf %s "(cached) " >&6-else $as_nop- case $TOUCH in+else case e in #(+ e) case $TOUCH in [\\/]* | ?:[\\/]*) ac_cv_path_TOUCH="$TOUCH" # Let the user override the test with a path. ;;@@ -2337,6 +2339,7 @@ IFS=$as_save_IFS ;;+esac ;; esac fi TOUCH=$ac_cv_path_TOUCH@@ -2356,8 +2359,8 @@ if test ${ac_cv_path_DIFF+y} then : printf %s "(cached) " >&6-else $as_nop- case $DIFF in+else case e in #(+ e) case $DIFF in [\\/]* | ?:[\\/]*) ac_cv_path_DIFF="$DIFF" # Let the user override the test with a path. ;;@@ -2382,6 +2385,7 @@ IFS=$as_save_IFS ;;+esac ;; esac fi DIFF=$ac_cv_path_DIFF@@ -2401,8 +2405,8 @@ if test ${ac_cv_path_GREP+y} then : printf %s "(cached) " >&6-else $as_nop- case $GREP in+else case e in #(+ e) case $GREP in [\\/]* | ?:[\\/]*) ac_cv_path_GREP="$GREP" # Let the user override the test with a path. ;;@@ -2427,6 +2431,7 @@ IFS=$as_save_IFS ;;+esac ;; esac fi GREP=$ac_cv_path_GREP@@ -2446,8 +2451,8 @@ if test ${ac_cv_path_SED+y} then : printf %s "(cached) " >&6-else $as_nop- case $SED in+else case e in #(+ e) case $SED in [\\/]* | ?:[\\/]*) ac_cv_path_SED="$SED" # Let the user override the test with a path. ;;@@ -2472,6 +2477,7 @@ IFS=$as_save_IFS ;;+esac ;; esac fi SED=$ac_cv_path_SED@@ -2491,8 +2497,8 @@ if test ${ac_cv_path_SORT+y} then : printf %s "(cached) " >&6-else $as_nop- case $SORT in+else case e in #(+ e) case $SORT in [\\/]* | ?:[\\/]*) ac_cv_path_SORT="$SORT" # Let the user override the test with a path. ;;@@ -2517,6 +2523,7 @@ IFS=$as_save_IFS ;;+esac ;; esac fi SORT=$ac_cv_path_SORT@@ -2536,8 +2543,8 @@ if test ${ac_cv_path_UNIQ+y} then : printf %s "(cached) " >&6-else $as_nop- case $UNIQ in+else case e in #(+ e) case $UNIQ in [\\/]* | ?:[\\/]*) ac_cv_path_UNIQ="$UNIQ" # Let the user override the test with a path. ;;@@ -2562,6 +2569,7 @@ IFS=$as_save_IFS ;;+esac ;; esac fi UNIQ=$ac_cv_path_UNIQ@@ -2581,8 +2589,8 @@ if test ${ac_cv_path_FIND+y} then : printf %s "(cached) " >&6-else $as_nop- case $FIND in+else case e in #(+ e) case $FIND in [\\/]* | ?:[\\/]*) ac_cv_path_FIND="$FIND" # Let the user override the test with a path. ;;@@ -2607,6 +2615,7 @@ IFS=$as_save_IFS ;;+esac ;; esac fi FIND=$ac_cv_path_FIND@@ -2626,8 +2635,8 @@ if test ${ac_cv_path_LATEX+y} then : printf %s "(cached) " >&6-else $as_nop- case $LATEX in+else case e in #(+ e) case $LATEX in [\\/]* | ?:[\\/]*) ac_cv_path_LATEX="$LATEX" # Let the user override the test with a path. ;;@@ -2652,6 +2661,7 @@ IFS=$as_save_IFS ;;+esac ;; esac fi LATEX=$ac_cv_path_LATEX@@ -2671,8 +2681,8 @@ if test ${ac_cv_path_PDFLATEX+y} then : printf %s "(cached) " >&6-else $as_nop- case $PDFLATEX in+else case e in #(+ e) case $PDFLATEX in [\\/]* | ?:[\\/]*) ac_cv_path_PDFLATEX="$PDFLATEX" # Let the user override the test with a path. ;;@@ -2697,6 +2707,7 @@ IFS=$as_save_IFS ;;+esac ;; esac fi PDFLATEX=$ac_cv_path_PDFLATEX@@ -2716,8 +2727,8 @@ if test ${ac_cv_path_XDVI+y} then : printf %s "(cached) " >&6-else $as_nop- case $XDVI in+else case e in #(+ e) case $XDVI in [\\/]* | ?:[\\/]*) ac_cv_path_XDVI="$XDVI" # Let the user override the test with a path. ;;@@ -2742,6 +2753,7 @@ IFS=$as_save_IFS ;;+esac ;; esac fi XDVI=$ac_cv_path_XDVI@@ -2761,8 +2773,8 @@ if test ${ac_cv_path_GV+y} then : printf %s "(cached) " >&6-else $as_nop- case $GV in+else case e in #(+ e) case $GV in [\\/]* | ?:[\\/]*) ac_cv_path_GV="$GV" # Let the user override the test with a path. ;;@@ -2787,6 +2799,7 @@ IFS=$as_save_IFS ;;+esac ;; esac fi GV=$ac_cv_path_GV@@ -2806,8 +2819,8 @@ if test ${ac_cv_path_DVIPS+y} then : printf %s "(cached) " >&6-else $as_nop- case $DVIPS in+else case e in #(+ e) case $DVIPS in [\\/]* | ?:[\\/]*) ac_cv_path_DVIPS="$DVIPS" # Let the user override the test with a path. ;;@@ -2832,6 +2845,7 @@ IFS=$as_save_IFS ;;+esac ;; esac fi DVIPS=$ac_cv_path_DVIPS@@ -2864,8 +2878,8 @@ if test ${ac_cv_path_KPSEWHICH+y} then : printf %s "(cached) " >&6-else $as_nop- case $KPSEWHICH in+else case e in #(+ e) case $KPSEWHICH in [\\/]* | ?:[\\/]*) ac_cv_path_KPSEWHICH="$KPSEWHICH" # Let the user override the test with a path. ;;@@ -2890,6 +2904,7 @@ IFS=$as_save_IFS ;;+esac ;; esac fi KPSEWHICH=$ac_cv_path_KPSEWHICH@@ -2909,8 +2924,8 @@ if test ${ac_cv_texmf_tree+y} then : printf %s "(cached) " >&6-else $as_nop-+else case e in #(+ e) if test -x "$KPSEWHICH"; then ac_cv_texmf_tree=`$KPSEWHICH --expand-var='$TEXMFLOCAL'` if test -z "$ac_cv_texmf_tree"; then@@ -2926,7 +2941,8 @@ fi done fi-+ ;;+esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_texmf_tree" >&5@@ -2966,8 +2982,9 @@ if test ${enable_polytable+y} then : enableval=$enable_polytable; POLYTABLE_INSTALL=$enableval-else $as_nop- POLYTABLE_INSTALL=yes+else case e in #(+ e) POLYTABLE_INSTALL=yes ;;+esac fi if test "z$POLYTABLE_INSTALL" = "zyes"; then@@ -3025,8 +3042,8 @@ if test ${ac_cv_path_MKTEXLSR+y} then : printf %s "(cached) " >&6-else $as_nop- case $MKTEXLSR in+else case e in #(+ e) case $MKTEXLSR in [\\/]* | ?:[\\/]*) ac_cv_path_MKTEXLSR="$MKTEXLSR" # Let the user override the test with a path. ;;@@ -3051,6 +3068,7 @@ IFS=$as_save_IFS ;;+esac ;; esac fi MKTEXLSR=$ac_cv_path_MKTEXLSR@@ -3090,8 +3108,8 @@ # config.status only pays attention to the cache file if you give it # the --recheck option to rerun configure. #-# `ac_cv_env_foo' variables (set or unset) will be overridden when-# loading this file, other *unset* `ac_cv_foo' will be assigned the+# 'ac_cv_env_foo' variables (set or unset) will be overridden when+# loading this file, other *unset* 'ac_cv_foo' will be assigned the # following values. _ACEOF@@ -3121,14 +3139,14 @@ (set) 2>&1 | case $as_nl`(ac_space=' '; set) 2>&1` in #( *${as_nl}ac_space=\ *)- # `set' does not quote correctly, so add quotes: double-quote+ # 'set' does not quote correctly, so add quotes: double-quote # substitution turns \\\\ into \\, and sed turns \\ into \. sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" ;; #( *)- # `set' quotes correctly as required by POSIX, so do not add quotes.+ # 'set' quotes correctly as required by POSIX, so do not add quotes. sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ;; esac |@@ -3192,9 +3210,7 @@ t quote b any :quote-s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g-s/\[/\\&/g-s/\]/\\&/g+s/[][ `~#$^&*(){}\\|;'\''"<>?]/\\&/g s/\$/$$/g H :any@@ -3254,7 +3270,6 @@ # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh-as_nop=: if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 then : emulate sh@@ -3263,12 +3278,13 @@ # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST-else $as_nop- case `(set -o) 2>/dev/null` in #(+else case e in #(+ e) case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( *) : ;;+esac ;; esac fi @@ -3340,7 +3356,7 @@ ;; esac-# We did not find ourselves, most probably we were run as `sh COMMAND'+# We did not find ourselves, most probably we were run as 'sh COMMAND' # in which case we are not to be found in the path. if test "x$as_myself" = x; then as_myself=$0@@ -3369,7 +3385,6 @@ } # as_fn_error - # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking.@@ -3409,11 +3424,12 @@ { eval $1+=\$2 }'-else $as_nop- as_fn_append ()+else case e in #(+ e) as_fn_append () { eval $1=\$$1\$2- }+ } ;;+esac fi # as_fn_append # as_fn_arith ARG...@@ -3427,11 +3443,12 @@ { as_val=$(( $* )) }'-else $as_nop- as_fn_arith ()+else case e in #(+ e) as_fn_arith () { as_val=`expr "$@" || test $? -eq 1`- }+ } ;;+esac fi # as_fn_arith @@ -3514,9 +3531,9 @@ if ln -s conf$$.file conf$$ 2>/dev/null; then as_ln_s='ln -s' # ... but there are two gotchas:- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.- # In both cases, we have to default to `cp -pR'.+ # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail.+ # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable.+ # In both cases, we have to default to 'cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then@@ -3597,10 +3614,12 @@ as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name.-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"+as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"+as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated # Sed expression to map a string onto a valid variable name.-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"+as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g"+as_tr_sh="eval sed '$as_sed_sh'" # deprecated exec 6>&1@@ -3615,8 +3634,8 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log="-This file was extended by lhs2tex $as_me 1.25, which was-generated by GNU Autoconf 2.71. Invocation command line was+This file was extended by lhs2tex $as_me 1.26, which was+generated by GNU Autoconf 2.72. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS@@ -3643,7 +3662,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\-\`$as_me' instantiates files and other configuration actions+'$as_me' instantiates files and other configuration actions from templates according to the current configuration. Unless the files and actions are specified as TAGs, all are instantiated by default. @@ -3670,11 +3689,11 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\-lhs2tex config.status 1.25-configured by $0, generated by GNU Autoconf 2.71,+lhs2tex config.status 1.26+configured by $0, generated by GNU Autoconf 2.72, with options \\"\$ac_cs_config\\" -Copyright (C) 2021 Free Software Foundation, Inc.+Copyright (C) 2023 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -3732,8 +3751,8 @@ ac_cs_silent=: ;; # This is an error.- -*) as_fn_error $? "unrecognized option: \`$1'-Try \`$0 --help' for more information." ;;+ -*) as_fn_error $? "unrecognized option: '$1'+Try '$0 --help' for more information." ;; *) as_fn_append ac_config_targets " $1" ac_need_defaults=false ;;@@ -3787,7 +3806,7 @@ "doc/InteractiveHugs.lhs") CONFIG_FILES="$CONFIG_FILES doc/InteractiveHugs.lhs" ;; "doc/InteractivePre.lhs") CONFIG_FILES="$CONFIG_FILES doc/InteractivePre.lhs" ;; - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;+ *) as_fn_error $? "invalid argument: '$ac_config_target'" "$LINENO" 5;; esac done @@ -3805,7 +3824,7 @@ # creating and moving files from /tmp can sometimes cause problems. # Hook for its removal unless debugging. # Note that there is a small window in which the directory will not be cleaned:-# after its creation but before its name has been assigned to `$tmp'.+# after its creation but before its name has been assigned to '$tmp'. $debug || { tmp= ac_tmp=@@ -3829,7 +3848,7 @@ # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES.-# This happens for instance with `./config.status config.h'.+# This happens for instance with './config.status config.h'. if test -n "$CONFIG_FILES"; then @@ -3995,7 +4014,7 @@ esac case $ac_mode$ac_tag in :[FHL]*:*);;- :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;+ :L* | :C*:*) as_fn_error $? "invalid tag '$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac@@ -4017,19 +4036,19 @@ -) ac_f="$ac_tmp/stdin";; *) # Look for the file first in the build tree, then in the source tree # (if the path is not absolute). The absolute path cannot be DOS-style,- # because $ac_f cannot contain `:'.+ # because $ac_f cannot contain ':'. test -f "$ac_f" || case $ac_f in [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac ||- as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;+ as_fn_error 1 "cannot find input file: '$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" done - # Let's still pretend it is `configure' which instantiates (i.e., don't+ # Let's still pretend it is 'configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ configure_input='Generated from '`@@ -4157,7 +4176,7 @@ esac _ACEOF -# Neutralize VPATH when `$srcdir' = `.'.+# Neutralize VPATH when '$srcdir' = '.'. # Shell code in configure.ac might set extrasub. # FIXME: do we really want to maintain this feature? cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1@@ -4187,9 +4206,9 @@ { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ "$ac_tmp/out"`; test -z "$ac_out"; } &&- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable 'datarootdir' which seems to be undefined. Please make sure it is defined" >&5-printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'+printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable 'datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$ac_tmp/stdin"
doc/Guide2.lhs view
@@ -1893,6 +1893,17 @@ an aligned column. %TODO: Write example. +\begin{problem}+My document takes ages to compile compared to a document of similar size in pure TeX.+\end{problem}+Make sure your macro expansions don't needlessly leave math mode only to re-enter it.+For example, @\newcommand{\varid}[1]{\textbf{\textcolor{Blue}{#1}}}@, +@%format tau = \varid{$\tau$}@ is a code smell.+Better factor out @\newcommand{\varcolor}[1]{{\color{Blue} #1}}@ and +define @%format tau = \varcolor{\tau}@.+This issue is exacerbated when @acmart@ is included, due to+an interaction between @microtype@ and @newtxmath@~\cite{microtype-newtxmath}.+ \begin{thebibliography}{99} \bibitem{polytable}@@ -1925,6 +1936,10 @@ \bibitem{platform} The Haskell Platform. \url{http://hackage.haskell.org/platform/}++\bibitem{platform}+ TeX Exchange: Speed up macros involving `\text` when using `microtype` and `newtxmath`.+ \url{https://tex.stackexchange.com/questions/702854/speed-up-macros-involving-text-when-using-microtype-and-newtxmath} \end{thebibliography}
doc/Guide2.pdf view
binary file changed (444227 → 460456 bytes)
doc/InteractivePre.lhs view
@@ -14,7 +14,7 @@ %format ^^ = "\; " %endif -%options ghci -fth -pgmL "/home/andres/repos/lhs2tex/dist-newstyle/build/x86_64-linux/ghc-9.8.1/lhs2tex-1.25/build/lhs2TeX/lhs2TeX" -optL-Pdoc: -optL--pre+%options ghci -fth -pgmL "/home/andres/repos/lhs2tex/dist-newstyle/build/x86_64-linux/ghc-9.6.6/lhs2tex-1.26/build/lhs2TeX/lhs2TeX" -optL-Pdoc: -optL--pre This is a rather stupid way of computing |42| using Template Haskell:
doc/RawSearchPath.lhs view
@@ -1,17 +1,17 @@ \begin{code} .-{HOME}/lhs2tex-1.25//+{HOME}/lhs2tex-1.26// {HOME}/lhs2tex// {HOME}/lhs2TeX//-{HOME}/.lhs2tex-1.25//+{HOME}/.lhs2tex-1.26// {HOME}/.lhs2tex// {HOME}/.lhs2TeX// {LHS2TEX}//-/usr/local/share/lhs2tex-1.25//-/usr/local/share/lhs2tex-1.25//-/usr/local/lib/lhs2tex-1.25//-/usr/share/lhs2tex-1.25//-/usr/lib/lhs2tex-1.25//+/usr/local/share/lhs2tex-1.26//+/usr/local/share/lhs2tex-1.26//+/usr/local/lib/lhs2tex-1.26//+/usr/share/lhs2tex-1.26//+/usr/lib/lhs2tex-1.26// /usr/local/share/lhs2tex// /usr/local/lib/lhs2tex// /usr/share/lhs2tex//
lhs2TeX.sty.lit view
@@ -1,8 +1,8 @@ \begin{code} %if False %-% Permission is granted to include this file (or parts of this file) -% literally into other documents, regardless of the conditions or +% Permission is granted to include this file (or parts of this file)+% literally into other documents, regardless of the conditions or % license applying to these documents. % %endif@@ -29,16 +29,14 @@ \begin{code} %if latex209-\input{amstext.sty}-\input{amssymb.sty}+\input{newtxmath.sty} \input{stmaryrd.sty} \newcommand\ensuremath[1]{\ifmmode#1\else\mbox{$#1$}\fi} %if euler \input{euler.sty} %endif %else-\usepackage{amstext}-\usepackage{amssymb}+\usepackage{newtxmath} \usepackage{stmaryrd} %if euler \usepackage{euler}
lhs2tex.cabal view
@@ -1,7 +1,7 @@-cabal-version: 2.0+cabal-version: 2.2 name: lhs2tex-version: 1.25-license: GPL+version: 1.26+license: GPL-2.0-or-later license-file: LICENSE author: Ralf Hinze <ralf.hinze@comlab.ox.ac.uk>, Andres Loeh <lhs2tex@andres-loeh.de> maintainer: Andres Loeh <lhs2tex@andres-loeh.de>@@ -24,7 +24,7 @@ be invoked in another mode to just extract the Haskell code. category: Development, Language build-type: Custom-tested-with: GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.5, GHC == 8.8.3, GHC == 8.10.7, GHC == 9.2.7, GHC == 9.4.5, GHC == 9.6.3, GHC == 9.8.1+tested-with: GHC == 8.4.4, GHC == 8.6.5, GHC == 8.8.3, GHC == 8.10.7, GHC == 9.2.7, GHC == 9.4.5, GHC == 9.6.3, GHC == 9.8.1, GHC == 9.10.3, GHC == 9.12.2 extra-source-files: AUTHORS INSTALL TODO@@ -61,7 +61,7 @@ custom-setup setup-depends: base >= 4.2 && < 5,- Cabal >= 2.0 && < 3.11,+ Cabal >= 2.2 && < 3.15, directory >= 1.3 && < 1.4, process >= 1.6 && < 1.7, regex-compat >= 0.95.2 && < 0.96@@ -82,7 +82,7 @@ build-depends: base >= 4.2 && < 5, regex-compat >= 0.95.2 && < 0.96, mtl >= 2.2.1 && < 2.4,- filepath >= 1.4 && < 1.5,+ filepath >= 1.4 && < 1.6, directory >= 1.3 && < 1.4, process >= 1.6 && < 1.7 autogen-modules: Version