The branch, tex4htTesting, has been updated.
- Log -----------------------------------------------------------------
commit 84aec000f388049452a9922d31069227ce3ccab3
Author: Prannoy Pilligundla <prannoy.b...@gmail.com>
Date: Sun Jun 29 17:32:43 2014 +0530
Image conversion configured in ooffice.4ht, no need of a seperate
configuration file from now on.
Image conversion also configured for jgp,jpeg and gif. Now scaling is
perfectly done for png,jpg,jpeg,gif and pdf images
diff --git a/tests/convert.sh b/tests/convert.sh
index 6d03788..8a756c8 100755
--- a/tests/convert.sh
+++ b/tests/convert.sh
@@ -20,8 +20,8 @@ if [ $1 ]; then
else
lyx -e xetex $1
texfile=${1/".lyx"}
- mk4ht ooxelatex "$texfile.tex" imageconv
- mk4ht ooxelatex "$texfile.tex" imageconv
+ mk4ht ooxelatex "$texfile.tex"
+ mk4ht ooxelatex "$texfile.tex"
fi
else
echo "Please enter an argument.Enter a particular .lyx file to convert it
or type all to convert all the .lyx files in this directory"
diff --git a/tests/ooffice.4ht b/tests/ooffice.4ht
index 30e1f0a..4813565 100644
--- a/tests/ooffice.4ht
+++ b/tests/ooffice.4ht
@@ -1,4 +1,4 @@
-% ooffice.4ht (2014-05-26-18:21), generated from tex4ht-ooffice.tex
+% ooffice.4ht (2014-06-29-17:31), generated from tex4ht-ooffice.tex
% Copyright (C) 2009-2010 TeX Users Group
% Copyright (C) 2001-2009 Maarten Wisse, James Naughton, Eitan M. Gurari
% maarten.wi...@urz.uni-heidelberg.de, http://home.wanadoo.nl/pmwisse
@@ -18,7 +18,7 @@
% is the TeX4ht Project <http://tug.org/tex4ht>.
%
% If you modify this program, changing the
-% version identification would be appreciated.\immediate\write-1{version
2014-05-26-18:21}
+% version identification would be appreciated.\immediate\write-1{version
2014-06-29-17:31}
\exit:ifnot{Preamble,%
algorithmicx,%
@@ -6728,6 +6728,81 @@
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"\Hnew
svg:height="\the\Gin@req@height"
\fi
}}
+\Configure{graphics*}
+ {pdf}
+ {\Needs{"convert \csname Gin@base\endcsname.pdf -scale
+ \expandafter\dim\the\csname
Gin@req@width\endcsname\space
+ "\csname Gin@base\endcsname-\expandafter\the\csname
Gin@req@width\endcsname.png" "}%
+ \Picture[pict]{\csname Gin@base\endcsname.png}%
+ \special{t4ht+@File: \csname
Gin@base\endcsname-\expandafter\the\csname Gin@req@width\endcsname.png}
+ }
+ {
+ \def\dim{%
+ \catcode`\p=12
+ \catcode`\t=12
+ \gdef\dim}
+ \dim#1pt{#1}
+ }
+\Configure{graphics*}
+ {png}
+ {\Needs{"convert \csname Gin@base\endcsname.png -scale
+ \expandafter\dim\the\csname
Gin@req@width\endcsname\space
+ "\csname Gin@base\endcsname-\expandafter\the\csname
Gin@req@width\endcsname.png"
+ "}%
+ \Picture[pict]{\csname Gin@base\endcsname-\expandafter\the\csname
Gin@req@width\endcsname.png }}
+
+ {
+ \def\dim{%
+ \catcode`\p=12
+ \catcode`\t=12
+ \gdef\dim}
+ \dim#1pt{#1}
+ }
+\Configure{graphics*}
+ {jpeg}
+ {\Needs{"convert \csname Gin@base\endcsname.jpeg -scale
+ \expandafter\dim\the\csname
Gin@req@width\endcsname\space
+ "\csname Gin@base\endcsname-\expandafter\the\csname
Gin@req@width\endcsname.jpeg"
+ "}%
+ \Picture[pict]{\csname Gin@base\endcsname-\expandafter\the\csname
Gin@req@width\endcsname.jpeg }}
+
+ {
+ \def\dim{%
+ \catcode`\p=12
+ \catcode`\t=12
+ \gdef\dim}
+ \dim#1pt{#1}
+ }
+\Configure{graphics*}
+ {jpg}
+ {\Needs{"convert \csname Gin@base\endcsname.jpg -scale
+ \expandafter\dim\the\csname
Gin@req@width\endcsname\space
+ "\csname Gin@base\endcsname-\expandafter\the\csname
Gin@req@width\endcsname.jpg"
+ "}%
+ \Picture[pict]{\csname Gin@base\endcsname-\expandafter\the\csname
Gin@req@width\endcsname.jpg }}
+
+ {
+ \def\dim{%
+ \catcode`\p=12
+ \catcode`\t=12
+ \gdef\dim}
+ \dim#1pt{#1}
+ }
+\Configure{graphics*}
+ {gif}
+ {\Needs{"convert \csname Gin@base\endcsname.gif -scale
+ \expandafter\dim\the\csname
Gin@req@width\endcsname\space
+ "\csname Gin@base\endcsname-\expandafter\the\csname
Gin@req@width\endcsname.gif"
+ "}%
+ \Picture[pict]{\csname Gin@base\endcsname-\expandafter\the\csname
Gin@req@width\endcsname.gif }}
+
+ {
+ \def\dim{%
+ \catcode`\p=12
+ \catcode`\t=12
+ \gdef\dim}
+ \dim#1pt{#1}
+ }
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -8203,8 +8278,7 @@ Y{0178}\i{00EF}%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{fancyvrb}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- \HAssign\fancyvrbNo=0
-\Configure{fancyvrb}
+ \Configure{fancyvrb}
{}
{\EndP}
{\NoFonts}{\Hnewline}
diff --git a/tex4ht/trunk/lit/tex4ht-ooffice.tex
b/tex4ht/trunk/lit/tex4ht-ooffice.tex
index b5c3b8a..47aa682 100644
--- a/tex4ht/trunk/lit/tex4ht-ooffice.tex
+++ b/tex4ht/trunk/lit/tex4ht-ooffice.tex
@@ -1023,6 +1023,81 @@ TeX4ht from \jobname.tex,
\Configure{graphics*}
{jpeg}
{\Picture[IMG]{\g...@base.jpeg |<graphics dimensions|> }}
+\Configure{graphics*}
+ {pdf}
+ {\Needs{"convert \csname Gin@base\endcsname.pdf -scale
+ \expandafter\dim\the\csname
Gin@req@width\endcsname\space
+ "\csname Gin@base\endcsname-\expandafter\the\csname
Gin@req@width\endcsname.png" "}%
+ \Picture[pict]{\csname Gin@base\endcsname.png}%
+ \special{t4ht+@File: \csname
Gin@base\endcsname-\expandafter\the\csname Gin@req@width\endcsname.png}
+ }
+ {
+ \def\dim{%
+ \catcode`\p=12
+ \catcode`\t=12
+ \gdef\dim}
+ \dim#1pt{#1}
+ }
+\Configure{graphics*}
+ {png}
+ {\Needs{"convert \csname Gin@base\endcsname.png -scale
+ \expandafter\dim\the\csname
Gin@req@width\endcsname\space
+ "\csname Gin@base\endcsname-\expandafter\the\csname
Gin@req@width\endcsname.png"
+ "}%
+ \Picture[pict]{\csname Gin@base\endcsname-\expandafter\the\csname
Gin@req@width\endcsname.png }}
+
+ {
+ \def\dim{%
+ \catcode`\p=12
+ \catcode`\t=12
+ \gdef\dim}
+ \dim#1pt{#1}
+ }
+\Configure{graphics*}
+ {jpeg}
+ {\Needs{"convert \csname Gin@base\endcsname.jpeg -scale
+ \expandafter\dim\the\csname
Gin@req@width\endcsname\space
+ "\csname Gin@base\endcsname-\expandafter\the\csname
Gin@req@width\endcsname.jpeg"
+ "}%
+ \Picture[pict]{\csname Gin@base\endcsname-\expandafter\the\csname
Gin@req@width\endcsname.jpeg }}
+
+ {
+ \def\dim{%
+ \catcode`\p=12
+ \catcode`\t=12
+ \gdef\dim}
+ \dim#1pt{#1}
+ }
+\Configure{graphics*}
+ {jpg}
+ {\Needs{"convert \csname Gin@base\endcsname.jpg -scale
+ \expandafter\dim\the\csname
Gin@req@width\endcsname\space
+ "\csname Gin@base\endcsname-\expandafter\the\csname
Gin@req@width\endcsname.jpg"
+ "}%
+ \Picture[pict]{\csname Gin@base\endcsname-\expandafter\the\csname
Gin@req@width\endcsname.jpg }}
+
+ {
+ \def\dim{%
+ \catcode`\p=12
+ \catcode`\t=12
+ \gdef\dim}
+ \dim#1pt{#1}
+ }
+\Configure{graphics*}
+ {gif}
+ {\Needs{"convert \csname Gin@base\endcsname.gif -scale
+ \expandafter\dim\the\csname
Gin@req@width\endcsname\space
+ "\csname Gin@base\endcsname-\expandafter\the\csname
Gin@req@width\endcsname.gif"
+ "}%
+ \Picture[pict]{\csname Gin@base\endcsname-\expandafter\the\csname
Gin@req@width\endcsname.gif }}
+
+ {
+ \def\dim{%
+ \catcode`\p=12
+ \catcode`\t=12
+ \gdef\dim}
+ \dim#1pt{#1}
+ }
>>>
\<\><<<
@@ -7548,6 +7623,7 @@ The section style can't be in style.xml?
>>>
+
\<configure ooffice-mml amsmath\><<<
\ConfigureEnv{align*}
{\ifmathml\else
@@ -9876,16 +9952,11 @@ The following configuration does not show.
\<configure ooffice fancyvrb\><<<
-\HAssign\fancyvrbNo=0
\Configure{fancyvrb}
- {\IgnorePar \EndP \gHAdvance\fancyvrbNo by 1
- \gHAssign\fancyvrb:cnt0
- \HCode{<text:p text:style-name="fancyvrb\fancyvrbNo">}}
- {\EndP\HCode{</text:p>}}
- {\gHAdvance\fancyvrb:cnt by 1
- \ifnum \fancyvrb:cnt>1
- \HCode{<text:line-break />}\fi} {}
- {\ \ }{}
+ {}
+ {\EndP}
+ {\NoFonts}{\Hnewline}
+ {\NoFonts}{\EndNoFonts}
>>>
-----------------------------------------------------------------------
Summary of changes:
tests/convert.sh | 4 +-
tests/ooffice.4ht | 82 ++++++++++++++++++++++++++++++--
tex4ht/trunk/lit/tex4ht-ooffice.tex | 89 +++++++++++++++++++++++++++++++----
3 files changed, 160 insertions(+), 15 deletions(-)
hooks/post-receive
--
Repositories for GSOC work
