From 468705804f75812ddcbda9904e54cc1feebf0988 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 13 Jun 2016 23:30:22 +0000 Subject: xhlatex: restore; ooffice.4ht: elide incorrect indentation git-svn-id: svn://tug.org/texlive/trunk@41440 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/tex4htk/ChangeLog | 6 ++++++ Build/source/texk/tex4htk/Makefile.am | 8 +++++--- Build/source/texk/tex4htk/Makefile.in | 10 ++++++---- Build/source/texk/tex4htk/xhlatex | 9 --------- Build/source/texk/tex4htk/xhlatex.sh | 9 +++++++++ 5 files changed, 26 insertions(+), 16 deletions(-) delete mode 100755 Build/source/texk/tex4htk/xhlatex create mode 100755 Build/source/texk/tex4htk/xhlatex.sh (limited to 'Build/source') diff --git a/Build/source/texk/tex4htk/ChangeLog b/Build/source/texk/tex4htk/ChangeLog index b87ce8abef8..9199e44d177 100644 --- a/Build/source/texk/tex4htk/ChangeLog +++ b/Build/source/texk/tex4htk/ChangeLog @@ -1,3 +1,9 @@ +2016-06-14 Karl Berry + + * Makefile.am (shell_scripts): re-add xhlatex. + (EXTRA_DIST): remove from unused list. + * xhlatex.sh: rename from xhlatex. + 2016-05-22 Karl Berry * tex4ht-c.tex (search_file): return NULL rather than FALSE diff --git a/Build/source/texk/tex4htk/Makefile.am b/Build/source/texk/tex4htk/Makefile.am index 4a1aa2dd9ce..cce13b45005 100644 --- a/Build/source/texk/tex4htk/Makefile.am +++ b/Build/source/texk/tex4htk/Makefile.am @@ -1,6 +1,7 @@ ## Makefile.am for the TeX Live subdirectory texk/tex4htk/ ## -## Copyright (C) 2009-2015 Peter Breitenlohner +## Copyright 2016 Karl Berry +## Copyright 2009-2015 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. ## ## We distribute the whole java tree. @@ -26,7 +27,9 @@ LDADD = $(KPATHSEA_LIBS) @KPATHSEA_RULE@ perl_scripts = mk4ht -shell_scripts = ht htcontext htlatex htmex httex httexi htxelatex htxetex +shell_scripts = ht htcontext htlatex htmex httex httexi \ + htxelatex htxetex xhlatex + scriptsdir = texmf-dist/scripts/tex4ht nodist_bin_SCRIPTS = @@ -144,7 +147,6 @@ EXTRA_DIST += \ wxelatex \ wxetex \ xhcontext \ - xhlatex \ xhmcontext \ xhmex \ xhmlatex \ diff --git a/Build/source/texk/tex4htk/Makefile.in b/Build/source/texk/tex4htk/Makefile.in index dcb497ee985..ab88614565b 100644 --- a/Build/source/texk/tex4htk/Makefile.in +++ b/Build/source/texk/tex4htk/Makefile.in @@ -131,7 +131,7 @@ tex4ht_OBJECTS = $(am_tex4ht_OBJECTS) tex4ht_LDADD = $(LDADD) tex4ht_DEPENDENCIES = $(am__DEPENDENCIES_1) am__dist_bin_SCRIPTS_DIST = ht.bat htcontext.bat htlatex.bat htmex.bat \ - httex.bat httexi.bat htxelatex.bat htxetex.bat + httex.bat httexi.bat htxelatex.bat htxetex.bat xhlatex.bat am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -392,8 +392,8 @@ EXTRA_DIST = java $(top_builddir)/../../build-aux/relpath dbcontext \ teixelatex teixetex test.tex test1.tex testa.tex testb.tex \ uxhcontext uxhlatex uxhmex uxhtex uxhtexi uxhxelatex uxhxetex \ wcontext wlatex wmex wtex wtexi wxelatex wxetex xhcontext \ - xhlatex xhmcontext xhmex xhmlatex xhmmex xhmtex xhmtexi \ - xhmxelatex xhmxetex xhtex xhtexi xhxelatex xhxetex xv4ht.java + xhmcontext xhmex xhmlatex xhmmex xhmtex xhmtexi xhmxelatex \ + xhmxetex xhtex xhtexi xhxelatex xhxetex xv4ht.java NEVER_DIST = `find . $(NEVER_NAMES)` NEVER_NAMES = -name .svn NEVER_NAMES_SUB = -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)' @@ -406,7 +406,9 @@ t4ht_SOURCES = t4ht.c tex4ht_SOURCES = tex4ht.c LDADD = $(KPATHSEA_LIBS) perl_scripts = mk4ht -shell_scripts = ht htcontext htlatex htmex httex httexi htxelatex htxetex +shell_scripts = ht htcontext htlatex htmex httex httexi \ + htxelatex htxetex xhlatex + scriptsdir = texmf-dist/scripts/tex4ht nodist_bin_SCRIPTS = $(am__append_1) all_scripts = $(lua_scripts) $(perl_scripts) $(shell_scripts) diff --git a/Build/source/texk/tex4htk/xhlatex b/Build/source/texk/tex4htk/xhlatex deleted file mode 100755 index 2889e48571f..00000000000 --- a/Build/source/texk/tex4htk/xhlatex +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - 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,xhtml]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,xhtml}\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,xhtml]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,xhtml}\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,xhtml]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,xhtml}\def\HCode####1{\documentstyle[tex4ht,}\@ifnextchar[{\HCode}{\documentstyle[tex4ht]}}}\makeatother\HCode '$2'.a.b.c.\input ' $1 - tex4ht -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3 - t4ht -f/$1 $4 -cvalidate ## -d~/WWW/temp/ -m644 - - - diff --git a/Build/source/texk/tex4htk/xhlatex.sh b/Build/source/texk/tex4htk/xhlatex.sh new file mode 100755 index 00000000000..2889e48571f --- /dev/null +++ b/Build/source/texk/tex4htk/xhlatex.sh @@ -0,0 +1,9 @@ +#!/bin/sh + 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,xhtml]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,xhtml}\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,xhtml]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,xhtml}\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,xhtml]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,xhtml}\def\HCode####1{\documentstyle[tex4ht,}\@ifnextchar[{\HCode}{\documentstyle[tex4ht]}}}\makeatother\HCode '$2'.a.b.c.\input ' $1 + tex4ht -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3 + t4ht -f/$1 $4 -cvalidate ## -d~/WWW/temp/ -m644 + + + -- cgit v1.2.3