framed boxes in oo output, tex4ht r1059

git-svn-id: svn://tug.org/texlive/trunk@61664 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 160 insertions, 3 deletions

diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
index 58ca9bee340..dc66ea6549e 100644
--- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog
+++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
@@ -1,3 +1,95 @@
+2022-01-19  Michal Hoftich  <michal.h21@gmail.com>
+
+	* tex4ht-ooffice.tex (ooffice.4ht): added support for the Framed
+	package's boxes.
+
+2022-01-18  Michal Hoftich  <michal.h21@gmail.com>
+
+	* tex4ht-fonts-noncjk.tex (
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/jknappen/tc/tcrm.htf
+	): new version of the HTF file that doesn't use private unicode
+	characters.
+
+	* tex4ht-fonts-ebgaramond.tex,
+	* tex4ht-fonts-fourier.tex,
+	* tex4ht-fonts-kpfonts.tex,
+	* tex4ht-fonts-libertine.tex,
+	* tex4ht-fonts-newtx.tex,
+	* tex4ht-fonts-noncjk.tex (
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/alias/adobe/avantgar/pagdo8c.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/alias/adobe/avantgar/pagdo8c.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/alias/adobe/avantgar/pagdo8r.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/alias/adobe/courier/pcrbo7t.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/alias/adobe/courier/pcrbc7t.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/alias/adobe/courier/pcrbo8c.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/alias/adobe/courier/pcrbo8c.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/Century_Schoolbook_L/pncr8c.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/Century_Schoolbook_L/pncr8c.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/Linux_Biolinum_T/LinBiolinumT-lf-ly1.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/Linux_Biolinum_T/LinBiolinumT-lf-sc-ly1.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/Linux_Biolinum_T/LinBiolinumT-lf-ts1.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/Linux_Biolinum_T/LinBiolinumT-sup-ly1.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/Linux_Biolinum_T/LinBiolinumTB-lf-ly1.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/Linux_Biolinum_T/LinBiolinumTB-lf-sc-ly1.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/Linux_Biolinum_T/LinBiolinumTB-lf-ts1.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/Linux_Biolinum_T/LinBiolinumTB-sup-ly1.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/Linux_Biolinum_T/LinBiolinumTI-lf-sc-ly1.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/Linux_Biolinum_T/LinBiolinumTI-sup-ly1.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/Linux_Libertine_Display_T/LinLibertineDisplayT-lf-ly1.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/Linux_Libertine_Display_T/LinLibertineDisplayT-lf-ts1.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/Linux_Libertine_Display_T/LinLibertineDisplayT-sup-ly1.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/Linux_Libertine_Mono_T/LinLibertineMTB-lf-ly1.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/Linux_Libertine_Mono_T/LinLibertineMTB-lf-ts1.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/Linux_Libertine_Mono_T/LinLibertineMTB-sup-ly1.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/Linux_Libertine_T/LinLibertineT-lf-ly1.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/Linux_Libertine_T/LinLibertineT-lf-sc-ly1.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/Linux_Libertine_T/LinLibertineT-lf-ts1.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/Linux_Libertine_T/LinLibertineTB-lf-ly1.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/Linux_Libertine_T/LinLibertineTB-lf-sc-ly1.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/Linux_Libertine_T/LinLibertineTB-lf-ts1.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/Linux_Libertine_T/LinLibertineTBI-lf-ly1.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/Linux_Libertine_T/LinLibertineTBI-lf-ts1.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/Linux_Libertine_T/LinLibertineTI-lf-ly1.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/Linux_Libertine_T/LinLibertineTI-lf-ts1.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/Linux_Libertine_T/LinLibertineTZ-lf-ly1.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/Linux_Libertine_T/LinLibertineTZ-lf-ts1.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/Linux_Libertine_T/LinLibertineTZI-lf-ly1.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/Linux_Libertine_T/LinLibertineTZI-lf-sc-ly1.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/Linux_Libertine_T/LinLibertineTZI-lf-ts1.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/Linux_Libertine_T/LinLibertineTZI-sup-ly1.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/MinLib/MinLibBol-ly1.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/MinLib/MinLibBolIta-ly1.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/MinLib/MinLibIta-ly1.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/MinLib/MinLibReg-ly1.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/Nimbus_Roman_No9_L/tcxsl.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/TeXGyreTermes/ts1-qtmb.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/TeXGyreTermesX/ntx-Bold-lf-ly1.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/Utopia/futr8c.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/Utopia/futr8c.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/Utopia/futr9c.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/Utopia/futr9c.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/ntxtm/ntx-Italic-tlf-th-ly1.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/t1xtt/tyxtt.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/tcxtt/tcxtt.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/txtt/txtt.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/Kp-SC-Expert/jkpmsc7t.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/Kp-SC-Expert/jkposnmsc7t.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/Kp-SC-Expert/jkpkosmsc7t.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/Tt-Kp-Exp/jkpttmn7t.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/Tt-Kp-Exp/jkpttosmn7t.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/Tt-Kp-Exp/jkpttosnmn7t.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/Tt-Kp-Exp/jkpttvosmn7t.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/Kp-Companion/jkpmn7c.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/EB_Garamond_Regular/EBGaramond-Regular-inf-ly1.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/EB_Garamond_Regular/EBGaramond-Regular-lf-sc-ly1.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/EB_Garamond_Regular/EBGaramond-Regular-lf-ly1.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/EB_Garamond_Regular/EBGaramond-Regular-lf-swash-ly1.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/EB_Garamond_Regular/EBGaramond-Regular-sup-ly1.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/EB_Garamond_Regular/EBGaramond-Regular-lf-ts1.htf
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/EB_Garamond_Italic/EBGaramond-Italic-lf-swash-ly1.htf
+	): use XML entity instead of ' for
+	single quote character.
+
 2022-01-12  Michal Hoftich  <michal.h21@gmail.com>
 
 	* tex4ht-ooffice.tex (ooffice.4ht): added alternative
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex
index 663fdb47116..29e849348fb 100644
--- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex
+++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-ooffice.tex 1056 2022-01-12 22:24:14Z michal_h21 $
+% $Id: tex4ht-ooffice.tex 1059 2022-01-19 14:11:34Z michal_h21 $
 % compile 3 times: latex tex4ht-ooffice
 %      htlatex tex4ht-ooffice "xhtml,4,sections+"
 %
@@ -7589,6 +7589,45 @@ The section style  can't be in style.xml?
    {\HCode{</text:span>}}%
 >>>
 
+%%%%%%%%%%%%%%%%%%
+\section{frames}
+%%%%%%%%%%%%%%%%%
+
+Basic support for framed boxes. 
+
+\subsection{framed.sty}
+
+\<configure ooffice framed\><<<
+|<framedbox|>
+|<framedbox style|>
+
+>>>
+
+I've found that the framed box must be placed inside paragraph. It doesn't matter that it can contain
+nested paragraphs, it still works, unlike in HTML, where nested paragraphs are invalid.
+
+I've found this solution by investigating of the code that LO creates for frame boxes.
+It seems that it is a best method how to come with solutions that work in the ODT format.
+
+\<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
+  <draw:text-box>}\par\ShowPar%
+}
+{\ifvmode\IgnorePar\fi\EndP\HCode{</draw:text-box></draw:frame></text:p>}\par\ShowPar}
+>>>
+
+\<framedbox style\><<<
+\NewConfigureOO{framebox} 
+\ConfigureOO{framebox}
+{<style:style style:name="framebox" style:family="graphic" style:class="text">\Hnewline
+  <style:graphic-properties style:vertical-pos="from-top" style:vertical-rel="paragraph" 
+  style:horizontal-pos="from-left" style:horizontal-rel="paragraph" fo:padding="0.25cm" 
+  fo:border="0.06pt solid \#000000"/>
+  </style:style>
+}
+>>>
 
 %%%%%%%%%%%%%%%%%%
 \section{Pictures}
diff --git a/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht b/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht
index 51dccea4f00..2aea0dd09cc 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 (2022-01-12-14:29), generated from tex4ht-ooffice.tex
+% ooffice.4ht (2022-01-19-13:43), generated from tex4ht-ooffice.tex
 % Copyright 2009-2022 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 2022-01-12-14:29}
+\immediate\write-1{version 2022-01-19-13:43}
 
   \exit:ifnot{Preamble,% 
 algorithmicx,% 
@@ -43,6 +43,7 @@ fancyvrb,%
 foils,% 
 fontmath,% 
 footmisc,% 
+framed,% 
 frenchb,% 
 g-brief,% 
 german,% 
@@ -20146,6 +20147,31 @@ Y{0178}\i{00EF}%
 
 
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+                \ConfigureHinput{framed}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+    \Configure{makeframed}
+{\ifvmode\IgnorePar\fi\EndP%
+  \HCode{<text:p><draw:frame draw:style-name="framebox" text:anchor-type="as-char" svg:width="100\%">\Hnewline
+  <draw:text-box>}\par\ShowPar%
+}
+{\ifvmode\IgnorePar\fi\EndP\HCode{</draw:text-box></draw:frame></text:p>}\par\ShowPar}
+
+\NewConfigureOO{framebox}
+\ConfigureOO{framebox}
+{<style:style style:name="framebox" style:family="graphic" style:class="text">\Hnewline
+  <style:graphic-properties style:vertical-pos="from-top" style:vertical-rel="paragraph"
+  style:horizontal-pos="from-left" style:horizontal-rel="paragraph" fo:padding="0.25cm"
+  fo:border="0.06pt solid \#000000"/>
+  </style:style>
+}
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+  
+\endinput\empty\empty\empty\empty\empty\empty
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%