diff options
| -rw-r--r-- | Build/source/texk/tex4htk/ChangeLog | 6 | ||||
| -rw-r--r-- | Build/source/texk/tex4htk/Makefile.am | 12 | ||||
| -rw-r--r-- | Build/source/texk/tex4htk/Makefile.in | 4 | ||||
| -rw-r--r-- | Build/source/texk/tex4htk/aclocal.m4 | 1 | ||||
| -rwxr-xr-x | Build/source/texk/tex4htk/configure | 61 | ||||
| -rw-r--r-- | Build/source/texk/tex4htk/configure.ac | 5 | ||||
| -rwxr-xr-x | Build/source/texk/tex4htk/ht.bat | 9 | ||||
| -rwxr-xr-x | Build/source/texk/tex4htk/htcontext.bat | 3 | ||||
| -rwxr-xr-x | Build/source/texk/tex4htk/htlatex.bat | 5 | ||||
| -rwxr-xr-x | Build/source/texk/tex4htk/htmex.bat | 5 | ||||
| -rwxr-xr-x | Build/source/texk/tex4htk/httex.bat | 5 | ||||
| -rwxr-xr-x | Build/source/texk/tex4htk/httexi.bat | 6 | ||||
| -rwxr-xr-x | Build/source/texk/tex4htk/htxelatex.bat | 5 | ||||
| -rwxr-xr-x | Build/source/texk/tex4htk/htxetex.bat | 5 |
14 files changed, 126 insertions, 6 deletions
diff --git a/Build/source/texk/tex4htk/ChangeLog b/Build/source/texk/tex4htk/ChangeLog index 1b82bc83b4e..e21819c900a 100644 --- a/Build/source/texk/tex4htk/ChangeLog +++ b/Build/source/texk/tex4htk/ChangeLog @@ -1,3 +1,9 @@ +2010-12-20 Peter Breitenlohner <peb@mppmu.mpg.de> + + * ht{,context,latex,mex,tex,texi,xelatex,xetex}.bat: + Scripts for WIN32 (copied from Master/bin/win32/). + * Makefile.am, configure.ac [WIN32]: Install ht*.bat scripts. + 2010-12-02 Karl Berry <karl@tug.org> * Makefile.am (EXTRA_DIST): rm htcmd.c. diff --git a/Build/source/texk/tex4htk/Makefile.am b/Build/source/texk/tex4htk/Makefile.am index 0b38365992c..0deb247a419 100644 --- a/Build/source/texk/tex4htk/Makefile.am +++ b/Build/source/texk/tex4htk/Makefile.am @@ -33,6 +33,14 @@ tex4ht_subdir = texmf-dist/scripts/tex4ht tex4htdir = ${prefix}/$(tex4ht_subdir) tex4ht_SCRIPTS = +if WIN32 +bin_SCRIPTS = $(shell_scripts:=.bat) +else !WIN32 +## Make sure $(bindir) exists +## +bin_SCRIPTS = +endif !WIN32 + # We support both multiplatform and non-multiplatform builds. install-data-hook: @for p in $(perl_scripts); do \ @@ -50,10 +58,6 @@ install-data-hook: exit 1;; \ esac -## Make sure $(bindir) exists -## -bin_SCRIPTS = - ## Link to the basename, removing the extension, .PHONY: install-links install-links: diff --git a/Build/source/texk/tex4htk/Makefile.in b/Build/source/texk/tex4htk/Makefile.in index 66d6adcb04f..4703553e914 100644 --- a/Build/source/texk/tex4htk/Makefile.in +++ b/Build/source/texk/tex4htk/Makefile.in @@ -54,6 +54,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \ $(top_srcdir)/../../m4/kpse-warnings.m4 \ + $(top_srcdir)/../../m4/kpse-win32.m4 \ $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/ltoptions.m4 \ $(top_srcdir)/../../m4/ltsugar.m4 \ @@ -278,7 +279,8 @@ EXTRA_DIST = $(perl_scripts) $(shell_scripts) dbcontext dblatex \ tex4ht_subdir = texmf-dist/scripts/tex4ht tex4htdir = ${prefix}/$(tex4ht_subdir) tex4ht_SCRIPTS = -bin_SCRIPTS = +@WIN32_FALSE@bin_SCRIPTS = +@WIN32_TRUE@bin_SCRIPTS = $(shell_scripts:=.bat) all: c-auto.h $(MAKE) $(AM_MAKEFLAGS) all-am diff --git a/Build/source/texk/tex4htk/aclocal.m4 b/Build/source/texk/tex4htk/aclocal.m4 index d77f3a9c0b1..2e8f28004fa 100644 --- a/Build/source/texk/tex4htk/aclocal.m4 +++ b/Build/source/texk/tex4htk/aclocal.m4 @@ -992,6 +992,7 @@ AC_SUBST([am__untar]) m4_include([../../m4/kpse-common.m4]) m4_include([../../m4/kpse-kpathsea-flags.m4]) m4_include([../../m4/kpse-warnings.m4]) +m4_include([../../m4/kpse-win32.m4]) m4_include([../../m4/libtool.m4]) m4_include([../../m4/ltoptions.m4]) m4_include([../../m4/ltsugar.m4]) diff --git a/Build/source/texk/tex4htk/configure b/Build/source/texk/tex4htk/configure index 070b47360e4..d144cc61d94 100755 --- a/Build/source/texk/tex4htk/configure +++ b/Build/source/texk/tex4htk/configure @@ -616,6 +616,8 @@ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS +WIN32_FALSE +WIN32_TRUE KPATHSEA_RULE KPATHSEA_DEPEND KPATHSEA_LIBS @@ -14229,6 +14231,61 @@ if test "x$kpse_cv_kpse_debug" != xyes; then : fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for native WIN32 or MINGW32" >&5 +$as_echo_n "checking for native WIN32 or MINGW32... " >&6; } +if ${kpse_cv_have_win32+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifndef WIN32 + choke me +#endif +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifndef __MINGW32__ + choke me +#endif +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + kpse_cv_have_win32=mingw32 +else + kpse_cv_have_win32=native +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +else + kpse_cv_have_win32=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_have_win32" >&5 +$as_echo "$kpse_cv_have_win32" >&6; } + + if test "x$kpse_cv_have_win32" != xno; then + WIN32_TRUE= + WIN32_FALSE='#' +else + WIN32_TRUE='#' + WIN32_FALSE= +fi + + ac_config_files="$ac_config_files Makefile" @@ -14361,6 +14418,10 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${WIN32_TRUE}" && test -z "${WIN32_FALSE}"; then + as_fn_error $? "conditional \"WIN32\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 diff --git a/Build/source/texk/tex4htk/configure.ac b/Build/source/texk/tex4htk/configure.ac index 987e7f062ef..e34350eb6ec 100644 --- a/Build/source/texk/tex4htk/configure.ac +++ b/Build/source/texk/tex4htk/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. dnl -dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org> dnl dnl This file is free software; the copyright holder dnl gives unlimited permission to copy and/or distribute it, @@ -21,6 +21,9 @@ AC_CHECK_SIZEOF([int]) KPSE_KPATHSEA_FLAGS +KPSE_CHECK_WIN32 +AM_CONDITIONAL([WIN32], [test "x$kpse_cv_have_win32" != xno]) + AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/Build/source/texk/tex4htk/ht.bat b/Build/source/texk/tex4htk/ht.bat new file mode 100755 index 00000000000..57d06517b79 --- /dev/null +++ b/Build/source/texk/tex4htk/ht.bat @@ -0,0 +1,9 @@ +%1 %2
+
+%1 %2
+
+%1 %2
+
+tex4ht %2 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env
+
+t4ht %2 -ewin32/tex4ht.env
diff --git a/Build/source/texk/tex4htk/htcontext.bat b/Build/source/texk/tex4htk/htcontext.bat new file mode 100755 index 00000000000..0c0856fe94a --- /dev/null +++ b/Build/source/texk/tex4htk/htcontext.bat @@ -0,0 +1,3 @@ + texexec --arg="ht-1=%2" --use=tex4ht --dvi --nobackend %5 %1
+ tex4ht %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env
+ t4ht %1 %4 -ewin32/tex4ht.env
diff --git a/Build/source/texk/tex4htk/htlatex.bat b/Build/source/texk/tex4htk/htlatex.bat new file mode 100755 index 00000000000..4b580982716 --- /dev/null +++ b/Build/source/texk/tex4htk/htlatex.bat @@ -0,0 +1,5 @@ + latex %5 \makeatletter\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\def\Link#1.a.b.c.{\g@addto@macro\@documentclasshook{\RequirePackage[#1,html]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,html}\def\HCode####1{\documentstyle[tex4ht,}\@ifnextchar[{\HCode}{\documentstyle[tex4ht]}}}\makeatother\HCode %2.a.b.c.\input %1
+ latex %5 \makeatletter\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\def\Link#1.a.b.c.{\g@addto@macro\@documentclasshook{\RequirePackage[#1,html]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,html}\def\HCode####1{\documentstyle[tex4ht,}\@ifnextchar[{\HCode}{\documentstyle[tex4ht]}}}\makeatother\HCode %2.a.b.c.\input %1
+ latex %5 \makeatletter\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\def\Link#1.a.b.c.{\g@addto@macro\@documentclasshook{\RequirePackage[#1,html]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,html}\def\HCode####1{\documentstyle[tex4ht,}\@ifnextchar[{\HCode}{\documentstyle[tex4ht]}}}\makeatother\HCode %2.a.b.c.\input %1
+ tex4ht %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env
+ t4ht %1 %4 -ewin32/tex4ht.env
diff --git a/Build/source/texk/tex4htk/htmex.bat b/Build/source/texk/tex4htk/htmex.bat new file mode 100755 index 00000000000..2b4764d87ed --- /dev/null +++ b/Build/source/texk/tex4htk/htmex.bat @@ -0,0 +1,5 @@ + mex %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input %1
+ mex %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input %1
+ mex %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input %1
+ tex4ht %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env
+ t4ht %1 %4 -ewin32/tex4ht.env
diff --git a/Build/source/texk/tex4htk/httex.bat b/Build/source/texk/tex4htk/httex.bat new file mode 100755 index 00000000000..5e39fbdaf5c --- /dev/null +++ b/Build/source/texk/tex4htk/httex.bat @@ -0,0 +1,5 @@ + tex %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input %1
+ tex %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input %1
+ tex %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input %1
+ tex4ht %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env
+ t4ht %1 %4 -ewin32/tex4ht.env
diff --git a/Build/source/texk/tex4htk/httexi.bat b/Build/source/texk/tex4htk/httexi.bat new file mode 100755 index 00000000000..8263f9d5d24 --- /dev/null +++ b/Build/source/texk/tex4htk/httexi.bat @@ -0,0 +1,6 @@ + tex %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode %2.a.b.c.\input %1
+ tex %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode %2.a.b.c.\input %1
+ tex %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode %2.a.b.c.\input %1
+ tex4ht %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env
+ t4ht %1 %4 -ewin32/tex4ht.env
+Rem texindex ?
diff --git a/Build/source/texk/tex4htk/htxelatex.bat b/Build/source/texk/tex4htk/htxelatex.bat new file mode 100755 index 00000000000..95ee8c9d2f6 --- /dev/null +++ b/Build/source/texk/tex4htk/htxelatex.bat @@ -0,0 +1,5 @@ + xelatex -no-pdf %5 \makeatletter\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\def\Link#1.a.b.c.{\g@addto@macro\@documentclasshook{\RequirePackage[#1,html]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,html}\def\HCode####1{\documentstyle[tex4ht,}\@ifnextchar[{\HCode}{\documentstyle[tex4ht]}}}\makeatother\HCode %2.a.b.c.\input %1
+ xelatex -no-pdf %5 \makeatletter\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\def\Link#1.a.b.c.{\g@addto@macro\@documentclasshook{\RequirePackage[#1,html]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,html}\def\HCode####1{\documentstyle[tex4ht,}\@ifnextchar[{\HCode}{\documentstyle[tex4ht]}}}\makeatother\HCode %2.a.b.c.\input %1
+ xelatex -no-pdf %5 \makeatletter\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\def\Link#1.a.b.c.{\g@addto@macro\@documentclasshook{\RequirePackage[#1,html]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,html}\def\HCode####1{\documentstyle[tex4ht,}\@ifnextchar[{\HCode}{\documentstyle[tex4ht]}}}\makeatother\HCode %2.a.b.c.\input %1
+ tex4ht -.xdv %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env
+ t4ht -.xdv %1 %4 -ewin32/tex4ht.env
diff --git a/Build/source/texk/tex4htk/htxetex.bat b/Build/source/texk/tex4htk/htxetex.bat new file mode 100755 index 00000000000..4df12ce146d --- /dev/null +++ b/Build/source/texk/tex4htk/htxetex.bat @@ -0,0 +1,5 @@ + xetex -no-pdf %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input %1
+ xetex -no-pdf %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input %1
+ xetex -no-pdf %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input %1
+ tex4ht -.xdv %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env
+ t4ht -.xdv %1 %4 -ewin32/tex4ht.env
|