diff options
Diffstat (limited to 'Master/texmf-dist/source')
-rw-r--r-- | Master/texmf-dist/source/generic/tex4ht/ChangeLog | 6 | ||||
-rw-r--r-- | Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex | 136 |
2 files changed, 74 insertions, 68 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog index 46df45ccfe0..5374eab377d 100644 --- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog +++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog @@ -1,3 +1,9 @@ +2023-01-19 Michal Hoftich <michal.h21@gmail.com> + + * tex4ht-ooffice.tex (ooffice.4ht, ooffice-mml.4ht): use \prcnt:ch + instead of \% in style declarations, because it would produce extra + backslash otherwise (thanks Gareth Walker for the report. + 2023-01-12 Michal Hoftich <michal.h21@gmail.com> * tex4ht-4ht.tex (embedfile-hooks.4ht, usepackage.4ht): declared diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex index 8e86f7e9565..00a281d2785 100644 --- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex +++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex @@ -1,8 +1,8 @@ -% $Id: tex4ht-ooffice.tex 1122 2022-04-28 15:04:04Z michal_h21 $ +% $Id: tex4ht-ooffice.tex 1288 2023-01-19 21:31:12Z karl $ % compile 3 times: latex tex4ht-ooffice % htlatex tex4ht-ooffice "xhtml,4,sections+" % -% Copyright 2009-2022 TeX Users Group +% Copyright 2009-2023 TeX Users Group % Copyright 2001-2009 Eitan M. Gurari % Released under LPPL 1.3c+. % See tex4ht-cpright.tex for license text. @@ -112,7 +112,7 @@ tail>>> \<copy right notice\><<< -% Copyright 2009-2022 TeX Users Group +% Copyright 2009-2023 TeX Users Group % Copyright |CopyYear.2001. Maarten Wisse, James Naughton, Eitan M. Gurari |<TeX4ht copywrite|> >>> @@ -841,8 +841,8 @@ TeX4ht from \jobname.tex, style:horizontal-pos="center" style:horizontal-rel="paragraph-content" fo:background-color="transparent" - style:background-transparency="100\%" - fo:margin-left="5\%" + style:background-transparency="100\prcnt:ch" + fo:margin-left="5\prcnt:ch" > </style:graphic-properties> </style:style>\Hnewline @@ -3491,7 +3491,7 @@ completelly. draw:style-name="env-frame" text:anchor-type="as-char" % fo:min-width="0.14in" - svg:width="90\%" + svg:width="90\prcnt:ch" draw:z-index="0" > <draw:text-box @@ -4091,9 +4091,9 @@ a more desirable for translations into MS Word. style:class="text">\Hnewline <style:paragraph-properties fo:font-size="17.2999992370605pt" fo:font-weight="bold" - style:font-size-asian="115\%" + style:font-size-asian="115\prcnt:ch%" style:font-weight-asian="bold" - style:font-size-complex="115\%" + style:font-size-complex="115\prcnt:ch%" style:font-weight-complex="bold" fo:margin-top="40pt" fo:margin-bottom="25pt" @@ -4165,7 +4165,7 @@ a more desirable for translations into MS Word. fo:font-weight="bold" fo:margin-top="0.42cm" fo:margin-bottom="0cm" - style:font-size-complex="85\%" + style:font-size-complex="85\prcnt:ch%" style:font-style-complex="italic" style:font-weight-complex="bold" /> @@ -4192,7 +4192,7 @@ a more desirable for translations into MS Word. fo:font-size="12pt" fo:font-style="italic" fo:font-weight="normal" - style:font-size-complex="85\%" + style:font-size-complex="85\prcnt:ch%" style:font-weight-complex="bold" fo:text-indent="0cm" style:auto-text-indent="false"/> @@ -4211,11 +4211,11 @@ a more desirable for translations into MS Word. style:parent-style-name="Heading" style:next-style-name="Text-body" style:class="text">\Hnewline -<style:paragraph-properties fo:font-size="75\%" +<style:paragraph-properties fo:font-size="75\prcnt:ch%" fo:font-weight="bold" - style:font-size-asian="75\%" + style:font-size-asian="75\prcnt:ch%" style:font-weight-asian="bold" - style:font-size-complex="75\%" + style:font-size-complex="75\prcnt:ch%" style:font-weight-complex="bold"/> </style:style> \Hnewline |<Heading 6 rtl|>} @@ -4231,11 +4231,11 @@ a more desirable for translations into MS Word. style:parent-style-name="Heading" style:next-style-name="Text-body" style:class="text">\Hnewline -<style:paragraph-properties fo:font-size="75\%" +<style:paragraph-properties fo:font-size="75\prcnt:ch%" fo:font-weight="bold" - style:font-size-asian="75\%" + style:font-size-asian="75\prcnt:ch%" style:font-weight-asian="bold" - style:font-size-complex="75\%" + style:font-size-complex="75\prcnt:ch%" style:font-weight-complex="bold"/> </style:style> \Hnewline |<Heading 7 rtl|>} @@ -4251,11 +4251,11 @@ a more desirable for translations into MS Word. style:parent-style-name="Heading" style:next-style-name="Text-body" style:class="text">\Hnewline -<style:paragraph-properties fo:font-size="75\%" +<style:paragraph-properties fo:font-size="75\prcnt:ch%" fo:font-weight="bold" - style:font-size-asian="75\%" + style:font-size-asian="75\prcnt:ch%" style:font-weight-asian="bold" - style:font-size-complex="75\%" + style:font-size-complex="75\prcnt:ch%" style:font-weight-complex="bold"/> </style:style> \Hnewline |<Heading 8 rtl|>} @@ -4272,11 +4272,11 @@ a more desirable for translations into MS Word. style:parent-style-name="Heading" style:next-style-name="Text-body" style:class="text">\Hnewline -<style:paragraph-properties fo:font-size="75\%" +<style:paragraph-properties fo:font-size="75\prcnt:ch%" fo:font-weight="bold" - style:font-size-asian="75\%" + style:font-size-asian="75\prcnt:ch%" style:font-weight-asian="bold" - style:font-size-complex="75\%" + style:font-size-complex="75\prcnt:ch%" style:font-weight-complex="bold"/> </style:style> \Hnewline |<Heading 9 rtl|>} @@ -4293,11 +4293,11 @@ a more desirable for translations into MS Word. style:parent-style-name="Heading" style:next-style-name="Text-body" style:class="text">\Hnewline -<style:paragraph-properties fo:font-size="75\%" +<style:paragraph-properties fo:font-size="75\prcnt:ch%" fo:font-weight="bold" - style:font-size-asian="75\%" + style:font-size-asian="75\prcnt:ch%" style:font-weight-asian="bold" - style:font-size-complex="75\%" + style:font-size-complex="75\prcnt:ch%" style:font-weight-complex="bold"/> </style:style> \Hnewline |<Heading 10 rtl|>} @@ -5530,7 +5530,7 @@ section \<automatic styles\><<< <style:style style:name="tabular" style:family="table">\Hnewline -<style:table-properties style:rel-width="76\%" +<style:table-properties style:rel-width="76\prcnt:ch%" fo:margin-left="1cm" fo:margin-right="1cm" table:align="margins"/>\Hnewline @@ -7514,7 +7514,7 @@ The section style can't be in style.xml? fo:font-style="normal" fo:font-weight="normal" % fo:font-size="75\%" - style:text-position="0\% 100\%" + style:text-position="0\prcnt:ch 100\prcnt:ch" />\Hnewline </style:style>\Hnewline >>> @@ -7680,7 +7680,7 @@ It seems that it is a best method how to come with solutions that work in the OD \<framedbox\><<< \Configure{makeframed} {\ifvmode\IgnorePar\fi\EndP% - \HCode{<text:p><draw:frame draw:style-name="framebox" text:anchor-type="as-char" svg:width="100\%">\Hnewline + \HCode{<text:p><draw:frame draw:style-name="framebox" text:anchor-type="as-char" svg:width="100\prcnt:ch">\Hnewline <draw:text-box>}\par\ShowPar% } {\ifvmode\IgnorePar\fi\EndP\HCode{</draw:text-box></draw:frame></text:p>}\par\ShowPar} @@ -7860,7 +7860,7 @@ It seems that it is a best method how to come with solutions that work in the OD <style:style style:name="equation" style:family="table">\Hnewline <\style:tableproperties - style:rel-width="88\%" + style:rel-width="88\prcnt:ch" fo:margin-left="1cm" fo:margin-right="0cm" fo:margin-top="0.3cm" @@ -8240,7 +8240,7 @@ An approximation is provided here, to be cleaned by xtpipes. \OOstyles{% <style:style style:name="reference-ref" style:family="text"> <style:text-properties - style:text-scale = "0\%" + style:text-scale = "0\prcnt:ch" /> </style:style> } @@ -8756,7 +8756,7 @@ style:auto-text-indent="false" style:master-page-name="">\Hnewline <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" - fo:line-height="120\%" + fo:line-height="120\prcnt:ch" fo:text-align="justify" style:justify-single-word="false" fo:hyphenate="true" @@ -8774,7 +8774,7 @@ style:auto-text-indent="false" style:master-page-name="">\Hnewline <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" - fo:line-height="120\%" + fo:line-height="120\prcnt:ch" fo:text-align="justify" style:justify-single-word="false" fo:hyphenate="true" @@ -8847,7 +8847,7 @@ referring to names. style:distance-before-sep="0.0398in" style:distance-after-sep="0.0398in" style:adjustment="left" - style:rel-width="25\%" + style:rel-width="25\prcnt:ch" style:color="\#000000"/>\Hnewline </style:page-layout-properties>\Hnewline <style:header-style/> @@ -9008,9 +9008,9 @@ referring to names. fo:margin-right="0in" fo:text-indent="-0.2in" style:auto-text-indent="false"/> - <style:text-properties fo:font-size="85\%" - style:font-size-asian="85\%" - style:font-size-complex="85\%" /> + <style:text-properties fo:font-size="85\prcnt:ch" + style:font-size-asian="85\prcnt:ch" + style:font-size-complex="85\prcnt:ch" /> </style:style>\Hnewline <text:notes-configuration text:note-class="footnote" text:citation-style-name="Footnote_20_Symbol" @@ -9020,11 +9020,11 @@ referring to names. text:start-numbering-at="document" />\Hnewline <style:style style:name="Footnote_20_Symbol" style:display-name="Footnote Symbol" style:family="text" >\Hnewline - <style:text-properties style:text-position="super 70\%" />\Hnewline + <style:text-properties style:text-position="super 70\prcnt:ch" />\Hnewline </style:style> <style:style style:name="Footnote_20_anchor" style:display-name="Footnote anchor" style:family="text"> - <style:text-properties style:text-position="super 58\%" />\Hnewline + <style:text-properties style:text-position="super 58\prcnt:ch" />\Hnewline </style:style>\Hnewline } >>> @@ -9132,7 +9132,7 @@ fn\the\c@footnote x\minipageNum {\HCode{</text:span>}} \OOstyles{% <style:style style:name="textsuperscript" style:family="text">\Hnewline - <style:text-properties style:text-position="super 58\%"/>\Hnewline + <style:text-properties style:text-position="super 58\prcnt:ch"/>\Hnewline </style:style>\Hnewline } \Configure{textsubscript} @@ -9140,7 +9140,7 @@ fn\the\c@footnote x\minipageNum {\HCode{</text:span>}} \OOstyles{% <style:style style:name="textsubscript" style:family="text">\Hnewline - <style:text-properties style:text-position="sub 58\%"/>\Hnewline + <style:text-properties style:text-position="sub 58\prcnt:ch"/>\Hnewline </style:style>\Hnewline } >>> @@ -9163,7 +9163,7 @@ fn\the\c@footnote x\minipageNum \HLet\TeX\:temp \OOstyles{\Hnewline <style:style style:name="TEX" style:family="text"> - <style:text-properties style:text-position="-25 100\%"/> + <style:text-properties style:text-position="-25 100\prcnt:ch"/> </style:style> \Hnewline} >>> @@ -9173,7 +9173,7 @@ fn\the\c@footnote x\minipageNum \HLet\LaTeX\:temp \OOstyles{\Hnewline <style:style style:name="LATEX" style:family="text"> - <style:text-properties style:text-position="15 70\%"/> + <style:text-properties style:text-position="15 70\prcnt:ch"/> </style:style> \Hnewline} >>> @@ -9743,7 +9743,7 @@ The following configuration does not show. <style:style style:name="tabular" style:family="table" style:parent-style-name="header-style">\Hnewline -<\style:tableproperties style:rel-width="46\%" +<\style:tableproperties style:rel-width="46\prcnt:ch" fo:margin-left="1cm" fo:margin-right="0cm" table:align="margins"/>\Hnewline @@ -11356,9 +11356,9 @@ semicolons from catcode changes when loaded, e.g., in french. style:class="text">\Hnewline <style:paragraph-properties fo:font-size="17.2999992370605pt" fo:font-weight="bold" - style:font-size-asian="115\%" + style:font-size-asian="115\prcnt:ch" style:font-weight-asian="bold" - style:font-size-complex="115\%" + style:font-size-complex="115\prcnt:ch" style:font-weight-complex="bold" fo:text-align="end" style:justify-single-word="false" @@ -11421,7 +11421,7 @@ semicolons from catcode changes when loaded, e.g., in french. fo:font-weight="bold" fo:margin-top="0.42cm" fo:margin-bottom="0cm" - style:font-size-complex="85\%" + style:font-size-complex="85\prcnt:ch" style:font-style-complex="italic" style:font-weight-complex="bold" fo:text-align="end" @@ -11446,7 +11446,7 @@ semicolons from catcode changes when loaded, e.g., in french. fo:font-size="12pt" fo:font-style="italic" fo:font-weight="normal" - style:font-size-complex="85\%" + style:font-size-complex="85\prcnt:ch" style:font-weight-complex="bold" fo:text-indent="0cm" style:auto-text-indent="false" @@ -11465,11 +11465,11 @@ semicolons from catcode changes when loaded, e.g., in french. style:parent-style-name="Heading-rtl" style:next-style-name="Text-body-rtl" style:class="text">\Hnewline -<style:paragraph-properties fo:font-size="75\%" +<style:paragraph-properties fo:font-size="75\prcnt:ch" fo:font-weight="bold" - style:font-size-asian="75\%" + style:font-size-asian="75\prcnt:ch" style:font-weight-asian="bold" - style:font-size-complex="75\%" + style:font-size-complex="75\prcnt:ch" style:font-weight-complex="bold" fo:text-align="end" style:justify-single-word="false" @@ -11486,11 +11486,11 @@ semicolons from catcode changes when loaded, e.g., in french. style:parent-style-name="Heading-rtl" style:next-style-name="Text-body-rtl" style:class="text">\Hnewline -<style:paragraph-properties fo:font-size="75\%" +<style:paragraph-properties fo:font-size="75\prcnt:ch" fo:font-weight="bold" - style:font-size-asian="75\%" + style:font-size-asian="75\prcnt:ch" style:font-weight-asian="bold" - style:font-size-complex="75\%" + style:font-size-complex="75\prcnt:ch" style:font-weight-complex="bold" fo:text-align="end" style:justify-single-word="false" @@ -11506,11 +11506,11 @@ semicolons from catcode changes when loaded, e.g., in french. style:parent-style-name="Heading-rtl" style:next-style-name="Text-body-rtl" style:class="text">\Hnewline -<style:paragraph-properties fo:font-size="75\%" +<style:paragraph-properties fo:font-size="75\prcnt:ch" fo:font-weight="bold" - style:font-size-asian="75\%" + style:font-size-asian="75\prcnt:ch" style:font-weight-asian="bold" - style:font-size-complex="75\%" + style:font-size-complex="75\prcnt:ch" style:font-weight-complex="bold" fo:text-align="end" style:justify-single-word="false" @@ -11527,11 +11527,11 @@ semicolons from catcode changes when loaded, e.g., in french. style:parent-style-name="Heading" style:next-style-name="Text-body" style:class="text">\Hnewline -<style:paragraph-properties fo:font-size="75\%" +<style:paragraph-properties fo:font-size="75\prcnt:ch" fo:font-weight="bold" - style:font-size-asian="75\%" + style:font-size-asian="75\prcnt:ch" style:font-weight-asian="bold" - style:font-size-complex="75\%" + style:font-size-complex="75\prcnt:ch" style:font-weight-complex="bold" fo:text-align="end" style:justify-single-word="false" @@ -11547,11 +11547,11 @@ semicolons from catcode changes when loaded, e.g., in french. style:parent-style-name="Heading-rtl" style:next-style-name="Text-body-rtl" style:class="text">\Hnewline -<style:paragraph-properties fo:font-size="75\%" +<style:paragraph-properties fo:font-size="75\prcnt:ch" fo:font-weight="bold" - style:font-size-asian="75\%" + style:font-size-asian="75\prcnt:ch" style:font-weight-asian="bold" - style:font-size-complex="75\%" + style:font-size-complex="75\prcnt:ch" style:font-weight-complex="bold"/> </style:style> \Hnewline @@ -11658,7 +11658,7 @@ semicolons from catcode changes when loaded, e.g., in french. style:master-page-name="">\Hnewline <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" - fo:line-height="120\%" + fo:line-height="120\prcnt:ch" style:justify-single-word="false" fo:hyphenate="true" fo:hyphenation-remain-char-count="2" @@ -11677,7 +11677,7 @@ semicolons from catcode changes when loaded, e.g., in french. style:master-page-name="">\Hnewline <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" - fo:line-height="120\%" + fo:line-height="120\prcnt:ch" style:justify-single-word="false" fo:hyphenate="true" fo:hyphenation-remain-char-count="2" @@ -12166,7 +12166,7 @@ OO doesn't seem to hono mfenced fo:margin-bottom="0.1cm" /> \Hnewline <style:text-properties - fo:font-size="145\%" + fo:font-size="145\prcnt:ch" fo:font-weight="bold" /> \Hnewline </style:style> \Hnewline @@ -12189,7 +12189,7 @@ OO doesn't seem to hono mfenced fo:margin-bottom="0.2cm" /> \Hnewline <style:text-properties - fo:font-size="130\%" + fo:font-size="130\prcnt:ch" fo:font-weight="normal" fo:font-style="italic" /> \Hnewline @@ -12272,7 +12272,7 @@ OO doesn't seem to hono mfenced style:family="text" > \Hnewline <style:text-properties - fo:font-size="110\%" + fo:font-size="110\prcnt:ch" fo:font-weight="bold" /> \Hnewline </style:style> \Hnewline @@ -12319,7 +12319,7 @@ OO doesn't seem to hono mfenced <style:text-properties fo:font-weight="normal" fo:font-style="italic" - fo:font-size="130\%" + fo:font-size="130\prcnt:ch" /> \Hnewline </style:style> \Hnewline } |