From 28531c1a986b6f12e334dc86c033e656032c36b8 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 4 Jul 2018 22:19:18 +0000 Subject: odt output fixes, tex4ht r419,420,421 git-svn-id: svn://tug.org/texlive/trunk@48140 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/generic/tex4ht/ooffice-mml.4ht | 44 ++++++------- Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht | 74 +++++----------------- 2 files changed, 33 insertions(+), 85 deletions(-) (limited to 'Master/texmf-dist/tex/generic') diff --git a/Master/texmf-dist/tex/generic/tex4ht/ooffice-mml.4ht b/Master/texmf-dist/tex/generic/tex4ht/ooffice-mml.4ht index c7afa162f62..a6ff9f79ef9 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/ooffice-mml.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/ooffice-mml.4ht @@ -1,5 +1,5 @@ -% ooffice-mml.4ht (2017-10-23-16:54), generated from tex4ht-ooffice.tex -% Copyright 2009-2017 TeX Users Group +% ooffice-mml.4ht (2018-07-04-14:25), generated from tex4ht-ooffice.tex +% Copyright 2009-2018 TeX Users Group % Copyright 2001-2009 Maarten Wisse, James Naughton, Eitan M. Gurari % % This work may be distributed and/or modified under the @@ -17,7 +17,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2017-10-23-16:54} +\immediate\write-1{version 2018-07-04-14:25} \exit:ifnot{Preamble,% amsmath,% @@ -29,7 +29,7 @@ tex4ht} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{Preamble} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \Configure{mathml}{math:} + \Configure{mathml}{} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -41,7 +41,7 @@ tex4ht} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \Configure{math-xmlns} { - xmlns:math="http://www.w3.org/1998/Math/MathML"\Hnewline + xmlns="http://www.w3.org/1998/Math/MathML"\Hnewline xmlns:xlink="http://www.w3.org/1999/xlink" } \HAssign\math:obj=0 @@ -95,36 +95,22 @@ tex4ht} manifest:full-path="\jobname-m\math:obj /settings.xml"/>\Hnewline }% - \Configure{DOCTYPE}{\HCode{\Hnewline} -}% + \Configure{DOCTYPE}{\HCode{}}% \:CheckOption{-xtpipes} \if:Option \Log:Note{Use the `-xtpipes' command line option to avoid xtpipes post processing} \else \Configure{DOCTYPE}{%% - \HCode{\Hnewline} -% - \HCode{\Hnewline + \HCode{\Hnewline +\Hnewline \Hnewline }% @@ -287,7 +273,7 @@ tex4ht} {\ifmathml <\a:mathml mtr\Hnewline class="hline"> \else % \fi} -{\ifmathml <\a:mathml mtd> \string&\#x0332; +{\ifmathml <\a:mathml mtd><\a:mathml mo> \string&\#x0332; \else % @@ -306,7 +292,7 @@ tex4ht} % \Hnewline \fi } -{\ifmathml <\a:mathml mtd> \string&\#x0332; +{\ifmathml <\a:mathml mtd><\a:mathml mo> \string&\#x0332; \else % % @@ -498,6 +484,7 @@ accent="true">&\#x0332;}% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -639,6 +626,9 @@ accent="true">&\#x0332;}% + + + @@ -1056,6 +1046,8 @@ accent="true">&\#x0332;}% + + diff --git a/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht b/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht index d067f55d7e6..a2561d5c7b8 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht @@ -1,4 +1,4 @@ -% ooffice.4ht (2018-06-13-14:03), generated from tex4ht-ooffice.tex +% ooffice.4ht (2018-07-04-14:25), generated from tex4ht-ooffice.tex % Copyright 2009-2018 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 2018-06-13-14:03} +\immediate\write-1{version 2018-07-04-14:25} \exit:ifnot{Preamble,% algorithmicx,% @@ -129,13 +129,6 @@ xcolor} \def\OOstyles#1{\edef\:OOstyles{\:OOstyles #1}} \OOstyles{\Hnewline % -\Hnewline \Hnewline % -\Hnewline \Hnewline @@ -247,24 +233,9 @@ xmlns:xlink="http://www.w3.org/1999/xlink"\Hnewline \Configure{VERSION}{\HCode{\Hnewline }} \:CheckOption{-xtpipes} \if:Option - \Configure{DOCTYPE}{\HCode{\Hnewline -}} + \Configure{DOCTYPE}{} \else - \Configure{DOCTYPE}{\HCode{\Hnewline -\Hnewline - \Hnewline}} + \Configure{DOCTYPE}{\HCode{\Hnewline}} \fi {\Configure{Needs}{File: \jobname.odt}\Needs{}} \Configure{HTML} @@ -383,14 +354,7 @@ xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"\Hnew {\ht:special{t4ht>\jobname-settings.4os}% \ht:special{t4ht=\Hnewline }% - \ht:special{t4ht=\Hnewline -}% + \ht:special{t4ht=}% \ht:special{t4ht=\jobname-meta.4ot}% \ht:special{t4ht=\Hnewline -}% - \ht:special{t4ht=\Hnewline }% \ht:special{t4ht=}% + {\ifmmode \HCode{<\a:mathml mrow class="uline">}% \else \HCode{}\fi} - {\ifmmode \HCode{}\else \HCode{}\fi} + {\ifmmode \HCode{}\else \HCode{}\fi} \NewConfigureOO{uline} \ConfigureOO{uline}{ } \Configure{uuline} - {\ifmmode \HCode{}% + {\ifmmode \HCode{<\a:mathml mrow class="uuline">}% \else \HCode{}\fi} - {\ifmmode \HCode{}\else \HCode{}\fi} + {\ifmmode \HCode{}\else \HCode{}\fi} \NewConfigureOO{uuline} \ConfigureOO{uuline}{ } \Configure{uwave} - {\ifmmode \HCode{}% + {\ifmmode \HCode{<\a:mathml mrow class="uwave">}% \else \HCode{}\fi} - {\ifmmode \HCode{}\else \HCode{}\fi} + {\ifmmode \HCode{}\else \HCode{}\fi} \NewConfigureOO{uwave} \ConfigureOO{uwave}{ } \Configure{sout} - {\ifmmode \HCode{}% + {\ifmmode \HCode{<\a:mathml mrow class="sout">}% \else \HCode{}\fi} - {\ifmmode \HCode{}\else \HCode{}\fi} + {\ifmmode \HCode{}\else \HCode{}\fi} \NewConfigureOO{sout} \ConfigureOO{sout}{ } \Configure{xout} - {\ifmmode \HCode{}% + {\ifmmode \HCode{<\a:mathml mrow class="xout">}% \else \HCode{}\fi} - {\ifmmode \HCode{}\else \HCode{}\fi} + {\ifmmode \HCode{}\else \HCode{}\fi} \NewConfigureOO{xout} \ConfigureOO{xout}{