texlive[41440] trunk: xhlatex: restore; ooffice.4ht: elide incorrect

commits+karl at tug.org commits+karl at tug.org
Tue Jun 14 01:30:22 CEST 2016


Revision: 41440
          http://tug.org/svn/texlive?view=revision&revision=41440
Author:   karl
Date:     2016-06-14 01:30:22 +0200 (Tue, 14 Jun 2016)
Log Message:
-----------
xhlatex: restore; ooffice.4ht: elide incorrect indentation

Modified Paths:
--------------
    trunk/Build/source/texk/tex4htk/ChangeLog
    trunk/Build/source/texk/tex4htk/Makefile.am
    trunk/Build/source/texk/tex4htk/Makefile.in
    trunk/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht
    trunk/Master/tlpkg/tlpsrc/tex4ht.tlpsrc

Added Paths:
-----------
    trunk/Build/source/texk/tex4htk/xhlatex.sh
    trunk/Master/bin/amd64-freebsd/xhlatex
    trunk/Master/bin/amd64-netbsd/xhlatex
    trunk/Master/bin/armel-linux/xhlatex
    trunk/Master/bin/armhf-linux/xhlatex
    trunk/Master/bin/i386-cygwin/xhlatex
    trunk/Master/bin/i386-freebsd/xhlatex
    trunk/Master/bin/i386-linux/xhlatex
    trunk/Master/bin/i386-netbsd/xhlatex
    trunk/Master/bin/i386-solaris/xhlatex
    trunk/Master/bin/powerpc-linux/xhlatex
    trunk/Master/bin/sparc-solaris/xhlatex
    trunk/Master/bin/universal-darwin/xhlatex
    trunk/Master/bin/win32/xhlatex.bat
    trunk/Master/bin/win32/xhlatex.exe
    trunk/Master/bin/x86_64-cygwin/xhlatex
    trunk/Master/bin/x86_64-darwin/xhlatex
    trunk/Master/bin/x86_64-linux/xhlatex
    trunk/Master/bin/x86_64-solaris/xhlatex
    trunk/Master/texmf-dist/scripts/tex4ht/xhlatex.sh

Removed Paths:
-------------
    trunk/Build/source/texk/tex4htk/xhlatex

Modified: trunk/Build/source/texk/tex4htk/ChangeLog
===================================================================
--- trunk/Build/source/texk/tex4htk/ChangeLog	2016-06-13 22:10:08 UTC (rev 41439)
+++ trunk/Build/source/texk/tex4htk/ChangeLog	2016-06-13 23:30:22 UTC (rev 41440)
@@ -1,3 +1,9 @@
+2016-06-14  Karl Berry  <karl at tug.org>
+
+	* Makefile.am (shell_scripts): re-add xhlatex.
+	(EXTRA_DIST): remove from unused list.
+	* xhlatex.sh: rename from xhlatex.
+
 2016-05-22  Karl Berry  <karl at freefriends.org>
 
         * tex4ht-c.tex (search_file): return NULL rather than FALSE

Modified: trunk/Build/source/texk/tex4htk/Makefile.am
===================================================================
--- trunk/Build/source/texk/tex4htk/Makefile.am	2016-06-13 22:10:08 UTC (rev 41439)
+++ trunk/Build/source/texk/tex4htk/Makefile.am	2016-06-13 23:30:22 UTC (rev 41440)
@@ -1,6 +1,7 @@
 ## Makefile.am for the TeX Live subdirectory texk/tex4htk/
 ##
-## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live at tug.org>
+## Copyright 2016 Karl Berry <tex-live at tug.org>
+## Copyright 2009-2015 Peter Breitenlohner <tex-live at tug.org>
 ## You may freely use, modify and/or distribute this file.
 ##
 ## We distribute the whole java tree.
@@ -26,7 +27,9 @@
 @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 @@
 	wxelatex \
 	wxetex \
 	xhcontext \
-	xhlatex \
 	xhmcontext \
 	xhmex \
 	xhmlatex \

Modified: trunk/Build/source/texk/tex4htk/Makefile.in
===================================================================
--- trunk/Build/source/texk/tex4htk/Makefile.in	2016-06-13 22:10:08 UTC (rev 41439)
+++ trunk/Build/source/texk/tex4htk/Makefile.in	2016-06-13 23:30:22 UTC (rev 41440)
@@ -131,7 +131,7 @@
 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 @@
 	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 @@
 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)

Deleted: trunk/Build/source/texk/tex4htk/xhlatex
===================================================================
--- trunk/Build/source/texk/tex4htk/xhlatex	2016-06-13 22:10:08 UTC (rev 41439)
+++ trunk/Build/source/texk/tex4htk/xhlatex	2016-06-13 23:30:22 UTC (rev 41440)
@@ -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 at 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 at 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 at 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 
-
-
-

Copied: trunk/Build/source/texk/tex4htk/xhlatex.sh (from rev 41439, trunk/Build/source/texk/tex4htk/xhlatex)
===================================================================
--- trunk/Build/source/texk/tex4htk/xhlatex.sh	                        (rev 0)
+++ trunk/Build/source/texk/tex4htk/xhlatex.sh	2016-06-13 23:30:22 UTC (rev 41440)
@@ -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 at 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 at 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 at 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 
+
+
+

Added: trunk/Master/bin/amd64-freebsd/xhlatex
===================================================================
--- trunk/Master/bin/amd64-freebsd/xhlatex	                        (rev 0)
+++ trunk/Master/bin/amd64-freebsd/xhlatex	2016-06-13 23:30:22 UTC (rev 41440)
@@ -0,0 +1 @@
+link ../../texmf-dist/scripts/tex4ht/xhlatex.sh
\ No newline at end of file


Property changes on: trunk/Master/bin/amd64-freebsd/xhlatex
___________________________________________________________________
Added: svn:special
## -0,0 +1 ##
+*
\ No newline at end of property
Added: trunk/Master/bin/amd64-netbsd/xhlatex
===================================================================
--- trunk/Master/bin/amd64-netbsd/xhlatex	                        (rev 0)
+++ trunk/Master/bin/amd64-netbsd/xhlatex	2016-06-13 23:30:22 UTC (rev 41440)
@@ -0,0 +1 @@
+link ../../texmf-dist/scripts/tex4ht/xhlatex.sh
\ No newline at end of file


Property changes on: trunk/Master/bin/amd64-netbsd/xhlatex
___________________________________________________________________
Added: svn:special
## -0,0 +1 ##
+*
\ No newline at end of property
Added: trunk/Master/bin/armel-linux/xhlatex
===================================================================
--- trunk/Master/bin/armel-linux/xhlatex	                        (rev 0)
+++ trunk/Master/bin/armel-linux/xhlatex	2016-06-13 23:30:22 UTC (rev 41440)
@@ -0,0 +1 @@
+link ../../texmf-dist/scripts/tex4ht/xhlatex.sh
\ No newline at end of file


Property changes on: trunk/Master/bin/armel-linux/xhlatex
___________________________________________________________________
Added: svn:special
## -0,0 +1 ##
+*
\ No newline at end of property
Added: trunk/Master/bin/armhf-linux/xhlatex
===================================================================
--- trunk/Master/bin/armhf-linux/xhlatex	                        (rev 0)
+++ trunk/Master/bin/armhf-linux/xhlatex	2016-06-13 23:30:22 UTC (rev 41440)
@@ -0,0 +1 @@
+link ../../texmf-dist/scripts/tex4ht/xhlatex.sh
\ No newline at end of file


Property changes on: trunk/Master/bin/armhf-linux/xhlatex
___________________________________________________________________
Added: svn:special
## -0,0 +1 ##
+*
\ No newline at end of property
Added: trunk/Master/bin/i386-cygwin/xhlatex
===================================================================
--- trunk/Master/bin/i386-cygwin/xhlatex	                        (rev 0)
+++ trunk/Master/bin/i386-cygwin/xhlatex	2016-06-13 23:30:22 UTC (rev 41440)
@@ -0,0 +1 @@
+link ../../texmf-dist/scripts/tex4ht/xhlatex.sh
\ No newline at end of file


Property changes on: trunk/Master/bin/i386-cygwin/xhlatex
___________________________________________________________________
Added: svn:special
## -0,0 +1 ##
+*
\ No newline at end of property
Added: trunk/Master/bin/i386-freebsd/xhlatex
===================================================================
--- trunk/Master/bin/i386-freebsd/xhlatex	                        (rev 0)
+++ trunk/Master/bin/i386-freebsd/xhlatex	2016-06-13 23:30:22 UTC (rev 41440)
@@ -0,0 +1 @@
+link ../../texmf-dist/scripts/tex4ht/xhlatex.sh
\ No newline at end of file


Property changes on: trunk/Master/bin/i386-freebsd/xhlatex
___________________________________________________________________
Added: svn:special
## -0,0 +1 ##
+*
\ No newline at end of property
Added: trunk/Master/bin/i386-linux/xhlatex
===================================================================
--- trunk/Master/bin/i386-linux/xhlatex	                        (rev 0)
+++ trunk/Master/bin/i386-linux/xhlatex	2016-06-13 23:30:22 UTC (rev 41440)
@@ -0,0 +1 @@
+link ../../texmf-dist/scripts/tex4ht/xhlatex.sh
\ No newline at end of file


Property changes on: trunk/Master/bin/i386-linux/xhlatex
___________________________________________________________________
Added: svn:special
## -0,0 +1 ##
+*
\ No newline at end of property
Added: trunk/Master/bin/i386-netbsd/xhlatex
===================================================================
--- trunk/Master/bin/i386-netbsd/xhlatex	                        (rev 0)
+++ trunk/Master/bin/i386-netbsd/xhlatex	2016-06-13 23:30:22 UTC (rev 41440)
@@ -0,0 +1 @@
+link ../../texmf-dist/scripts/tex4ht/xhlatex.sh
\ No newline at end of file


Property changes on: trunk/Master/bin/i386-netbsd/xhlatex
___________________________________________________________________
Added: svn:special
## -0,0 +1 ##
+*
\ No newline at end of property
Added: trunk/Master/bin/i386-solaris/xhlatex
===================================================================
--- trunk/Master/bin/i386-solaris/xhlatex	                        (rev 0)
+++ trunk/Master/bin/i386-solaris/xhlatex	2016-06-13 23:30:22 UTC (rev 41440)
@@ -0,0 +1 @@
+link ../../texmf-dist/scripts/tex4ht/xhlatex.sh
\ No newline at end of file


Property changes on: trunk/Master/bin/i386-solaris/xhlatex
___________________________________________________________________
Added: svn:special
## -0,0 +1 ##
+*
\ No newline at end of property
Added: trunk/Master/bin/powerpc-linux/xhlatex
===================================================================
--- trunk/Master/bin/powerpc-linux/xhlatex	                        (rev 0)
+++ trunk/Master/bin/powerpc-linux/xhlatex	2016-06-13 23:30:22 UTC (rev 41440)
@@ -0,0 +1 @@
+link ../../texmf-dist/scripts/tex4ht/xhlatex.sh
\ No newline at end of file


Property changes on: trunk/Master/bin/powerpc-linux/xhlatex
___________________________________________________________________
Added: svn:special
## -0,0 +1 ##
+*
\ No newline at end of property
Added: trunk/Master/bin/sparc-solaris/xhlatex
===================================================================
--- trunk/Master/bin/sparc-solaris/xhlatex	                        (rev 0)
+++ trunk/Master/bin/sparc-solaris/xhlatex	2016-06-13 23:30:22 UTC (rev 41440)
@@ -0,0 +1 @@
+link ../../texmf-dist/scripts/tex4ht/xhlatex.sh
\ No newline at end of file


Property changes on: trunk/Master/bin/sparc-solaris/xhlatex
___________________________________________________________________
Added: svn:special
## -0,0 +1 ##
+*
\ No newline at end of property
Added: trunk/Master/bin/universal-darwin/xhlatex
===================================================================
--- trunk/Master/bin/universal-darwin/xhlatex	                        (rev 0)
+++ trunk/Master/bin/universal-darwin/xhlatex	2016-06-13 23:30:22 UTC (rev 41440)
@@ -0,0 +1 @@
+link ../../texmf-dist/scripts/tex4ht/xhlatex.sh
\ No newline at end of file


Property changes on: trunk/Master/bin/universal-darwin/xhlatex
___________________________________________________________________
Added: svn:special
## -0,0 +1 ##
+*
\ No newline at end of property
Added: trunk/Master/bin/win32/xhlatex.bat
===================================================================
--- trunk/Master/bin/win32/xhlatex.bat	                        (rev 0)
+++ trunk/Master/bin/win32/xhlatex.bat	2016-06-13 23:30:22 UTC (rev 41440)
@@ -0,0 +1,35 @@
+
+Rem 
+Rem 
+Rem   xhlatex.bat                                  Version 1.1
+Rem   Copyright (C) 2003--2009               Eitan M. Gurari
+Rem   Copyright 2009 TeX Users Group
+Rem 
+Rem   This work may be distributed and/or modified under the
+Rem   conditions of the LaTeX Project Public License, either
+Rem   version 1.3 of this license or (at your option) any
+Rem   later version. The latest version of this license is
+Rem   in
+Rem     http://www.latex-project.org/lppl.txt
+Rem   and version 1.3 or later is part of all distributions
+Rem   of LaTeX version 2003/12/01 or later.
+Rem 
+Rem   This work has the LPPL maintenance status "maintained".
+Rem 
+Rem   The Current Maintainer of this work
+Rem   is the TeX4ht Project.
+Rem 
+Rem                                          tex4ht at tug.org
+Rem                               http://www.tug.org/tex4ht
+Rem 
+Rem 
+
+
+        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 at 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 at 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 at 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 %1  -ic:/tex4ht/texmf/tex4ht/ht-fonts/%3 -ec:/tex4ht/texmf/tex4ht/base/win32/tex4ht.env
+        t4ht %1 %4 -ec:/tex4ht/texmf/tex4ht/base/win32/tex4ht.env -cvalidate 
+
+
+


Property changes on: trunk/Master/bin/win32/xhlatex.bat
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: trunk/Master/bin/win32/xhlatex.exe
===================================================================
(Binary files differ)

Index: trunk/Master/bin/win32/xhlatex.exe
===================================================================
--- trunk/Master/bin/win32/xhlatex.exe	2016-06-13 22:10:08 UTC (rev 41439)
+++ trunk/Master/bin/win32/xhlatex.exe	2016-06-13 23:30:22 UTC (rev 41440)

Property changes on: trunk/Master/bin/win32/xhlatex.exe
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/bin/x86_64-cygwin/xhlatex
===================================================================
--- trunk/Master/bin/x86_64-cygwin/xhlatex	                        (rev 0)
+++ trunk/Master/bin/x86_64-cygwin/xhlatex	2016-06-13 23:30:22 UTC (rev 41440)
@@ -0,0 +1 @@
+link ../../texmf-dist/scripts/tex4ht/xhlatex.sh
\ No newline at end of file


Property changes on: trunk/Master/bin/x86_64-cygwin/xhlatex
___________________________________________________________________
Added: svn:special
## -0,0 +1 ##
+*
\ No newline at end of property
Added: trunk/Master/bin/x86_64-darwin/xhlatex
===================================================================
--- trunk/Master/bin/x86_64-darwin/xhlatex	                        (rev 0)
+++ trunk/Master/bin/x86_64-darwin/xhlatex	2016-06-13 23:30:22 UTC (rev 41440)
@@ -0,0 +1 @@
+link ../../texmf-dist/scripts/tex4ht/xhlatex.sh
\ No newline at end of file


Property changes on: trunk/Master/bin/x86_64-darwin/xhlatex
___________________________________________________________________
Added: svn:special
## -0,0 +1 ##
+*
\ No newline at end of property
Added: trunk/Master/bin/x86_64-linux/xhlatex
===================================================================
--- trunk/Master/bin/x86_64-linux/xhlatex	                        (rev 0)
+++ trunk/Master/bin/x86_64-linux/xhlatex	2016-06-13 23:30:22 UTC (rev 41440)
@@ -0,0 +1 @@
+link ../../texmf-dist/scripts/tex4ht/xhlatex.sh
\ No newline at end of file


Property changes on: trunk/Master/bin/x86_64-linux/xhlatex
___________________________________________________________________
Added: svn:special
## -0,0 +1 ##
+*
\ No newline at end of property
Added: trunk/Master/bin/x86_64-solaris/xhlatex
===================================================================
--- trunk/Master/bin/x86_64-solaris/xhlatex	                        (rev 0)
+++ trunk/Master/bin/x86_64-solaris/xhlatex	2016-06-13 23:30:22 UTC (rev 41440)
@@ -0,0 +1 @@
+link ../../texmf-dist/scripts/tex4ht/xhlatex.sh
\ No newline at end of file


Property changes on: trunk/Master/bin/x86_64-solaris/xhlatex
___________________________________________________________________
Added: svn:special
## -0,0 +1 ##
+*
\ No newline at end of property
Added: trunk/Master/texmf-dist/scripts/tex4ht/xhlatex.sh
===================================================================
--- trunk/Master/texmf-dist/scripts/tex4ht/xhlatex.sh	                        (rev 0)
+++ trunk/Master/texmf-dist/scripts/tex4ht/xhlatex.sh	2016-06-13 23:30:22 UTC (rev 41440)
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+#
+#
+#  xhlatex                                  Version 1.1
+#  Copyright (C) 2003--2009               Eitan M. Gurari
+#  Copyright 2009 TeX Users Group
+#
+#  This work may be distributed and/or modified under the
+#  conditions of the LaTeX Project Public License, either
+#  version 1.3 of this license or (at your option) any
+#  later version. The latest version of this license is
+#  in
+#    http://www.latex-project.org/lppl.txt
+#  and version 1.3 or later is part of all distributions
+#  of LaTeX version 2003/12/01 or later.
+#
+#  This work has the LPPL maintenance status "maintained".
+#
+#  The Current Maintainer of this work
+#  is the TeX4ht Project.
+#
+#                                         tex4ht at tug.org
+#                              http://www.tug.org/tex4ht
+#
+#
+
+
+        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 at 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 at 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 at 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 
+
+
+


Property changes on: trunk/Master/texmf-dist/scripts/tex4ht/xhlatex.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht	2016-06-13 22:10:08 UTC (rev 41439)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht	2016-06-13 23:30:22 UTC (rev 41440)
@@ -1,4 +1,4 @@
-% ooffice.4ht (2016-03-31-11:13), generated from tex4ht-ooffice.tex
+% ooffice.4ht (2016-06-13-16:17), generated from tex4ht-ooffice.tex
 % Copyright 2009-2016 TeX Users Group
 % Copyright 2001-2009 Maarten Wisse, James Naughton, Eitan M. Gurari
 %
@@ -17,7 +17,7 @@
 %
 % If you modify this program, changing the
 % version identification would be appreciated.
-\immediate\write-1{version 2016-03-31-11:13}
+\immediate\write-1{version 2016-06-13-16:17}
 
   \exit:ifnot{Preamble,% 
 algorithmicx,% 
@@ -6884,7 +6884,6 @@
 
 
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{graphics}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -7986,6 +7985,7 @@
 
 
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{amsmath}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -8140,6 +8140,7 @@
 
 
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{biblatex}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -8221,6 +8222,7 @@
 
 
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{url}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -8294,6 +8296,8 @@
 
 
 
+
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{longtable}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -8383,6 +8387,7 @@
 
 
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{fancyvrb}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -8395,7 +8400,7 @@
    {\gHAdvance\fancyvrb:cnt by 1
     \ifnum \fancyvrb:cnt>1
     \HCode{<text:line-break />}\fi} {}
-   {\ \ }{}
+   {}{}
 \Configure{BVerbatimInput}
    {\ifvmode \IgnorePar \fi \EndP
     \gHAssign\HRow=0
@@ -8413,6 +8418,7 @@
 
 
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{color}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -8541,7 +8547,6 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{xcolor}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -8619,11 +8624,6 @@
 
 
 
-
-
-
-
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{apacite}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -8648,7 +8648,6 @@
 
 
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{wrapfig}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -8714,6 +8713,10 @@
 
 
 
+
+
+
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{scrbook}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -10101,7 +10104,6 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{scrartcl}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -12790,7 +12792,6 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{apa}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -13233,6 +13234,7 @@
 
 
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{jurabib}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -13274,9 +13276,6 @@
 
 
 
-
-
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{slides}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -13562,6 +13561,7 @@
 
 
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{pstricks}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -13585,7 +13585,6 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{pst-all}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -13615,6 +13614,7 @@
 
 
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{curve}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -13873,6 +13873,7 @@
 
 
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{enumerate}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -13978,7 +13979,6 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{linguex}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -14062,6 +14062,7 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{covington}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -14171,7 +14172,6 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{pst-jtree}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -14329,6 +14329,7 @@
 
 
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{ulem}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -14395,6 +14396,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{paralist}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -14689,7 +14691,6 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{listings}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -14814,6 +14815,7 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{lineno}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -14893,7 +14895,6 @@
 
 
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{soul}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

Modified: trunk/Master/tlpkg/tlpsrc/tex4ht.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/tex4ht.tlpsrc	2016-06-13 22:10:08 UTC (rev 41439)
+++ trunk/Master/tlpkg/tlpsrc/tex4ht.tlpsrc	2016-06-13 23:30:22 UTC (rev 41440)
@@ -10,7 +10,10 @@
 binpattern f bin/${ARCH}/mk4ht
 binpattern f bin/${ARCH}/t4ht
 binpattern f bin/${ARCH}/tex4ht
+binpattern f bin/${ARCH}/xhlatex
+
 docpattern d texmf-dist/doc/generic/tex4ht
+
 runpattern d texmf-dist/scripts/tex4ht
 runpattern d texmf-dist/tex/generic/tex4ht
 runpattern d texmf-dist/tex4ht



More information about the tex-live-commits mailing list