summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-08-05 00:14:59 +0000
committerKarl Berry <karl@freefriends.org>2013-08-05 00:14:59 +0000
commita50ccb850160ea9d8cdab844a1dd42304153a36f (patch)
tree1f27bbf83cdbaccfc79c7cc7ac30c9450ed6bad0 /Master
parent00041ba7082175ecb4164449c169306eb6ca6a29 (diff)
support the multicol package via css; from cvr/vidhya, tex4ht commits r107 and r108
git-svn-id: svn://tug.org/texlive/trunk@31349 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/html4.4ht94
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/multicol.4ht126
2 files changed, 160 insertions, 60 deletions
diff --git a/Master/texmf-dist/tex/generic/tex4ht/html4.4ht b/Master/texmf-dist/tex/generic/tex4ht/html4.4ht
index bdd9144c037..6c605dc0a6d 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/html4.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/html4.4ht
@@ -1,30 +1,22 @@
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% html4.4ht 2009-05-18-23:01 %
-% Copyright (C) 1997--2009 Eitan M. Gurari %
-% %
-% 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".%
-% %
-% This Current Maintainer of this work %
-% is Eitan M. Gurari. %
-% %
-% If you modify this program your changing its signature %
-% with a directive of the following form will be %
-% appreciated. %
-% \message{signature} %
-% %
-% gurari@cse.ohio-state.edu %
-% http://www.cse.ohio-state.edu/~gurari %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\immediate\write-1{version 2009-05-18-23:01}
+% html4.4ht (2013-07-31-09:45), generated from tex4ht-html4.tex
+% Copyright (C) 2009-2010 TeX Users Group
+% Copyright (C) 1997-2009 Eitan M. Gurari
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either
+% version 1.3c 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.3c or later is part of all distributions
+% of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status "maintained".
+%
+% The Current Maintainer of this work
+% is the TeX4ht Project <http://tug.org/tex4ht>.
+%
+% If you modify this program, changing the
+% version identification would be appreciated.\immediate\write-1{version 2013-07-31-09:45}
\exit:ifnot{8859-6,%
CJK,%
@@ -806,12 +798,10 @@ switches of tex4ht.c)
\def\:gobbleM#1->{}
\Configure{@HEAD}{\HCode{<meta
name="generator" content="TeX4ht
- (http://www.cse.ohio-state.edu/\string
- ~gurari/TeX4ht/)"\xml:empty>\Hnewline}}
+ (http://www.tug.org/tex4ht/)"\xml:empty>\Hnewline}}
\Configure{@HEAD}{\HCode{<meta
name="originator" content="TeX4ht
- (http://www.cse.ohio-state.edu/\string
- ~gurari/TeX4ht/)"\xml:empty>\Hnewline
+ (http://www.tug.org/tex4ht/)"\xml:empty>\Hnewline
<!--\space\expandafter\:gobbleM\meaning
\Preamble\space-->\Hnewline}}
@@ -37470,27 +37460,27 @@ emailing the fix to gurari@cse.ohio-state.edu. Thanks\Hnewline
\ConfigureHinput{multicol}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\HAssign\MultiCols=0
-\ConfigureEnv{multicols}
- {\par\IgnorePar\EndP
- \gHAdvance\MultiCols by 1\relax
- \HCode{<table class="multicols"
- id="multicols-\MultiCols"><tr><td class="multicol-1">}%
- \let\sv:HCol=\HCol
- \bgroup \gHAssign\HCol=1\relax
- }
- {\egroup
- \global\let\HCol=\sv:HCol
- \ifvmode\IgnorePar\fi\EndP
- \HCode{</td></tr></table>}\par
- }
- {}{}
-\Configure{columnbreak}
- {\gHAdvance\HCol by 1\relax
- \par \IgnorePar \EndP
- \HCode{</td><td class="multicol-\HCol">}}
-\Css{table.multicols {
- width:100\%; margin-left:1em; margin-top:1em; margin-bottom:1em;
-}}
+\ConfigureEnv{multicols}{}{}{}{}
+% {\par\IgnorePar\EndP
+% \gHAdvance\MultiCols by 1\relax
+% \HCode{<table class="multicols"
+% id="multicols-\MultiCols"><tr><td class="multicol-1">}%
+% \let\sv:HCol=\HCol
+% \bgroup \gHAssign\HCol=1\relax
+% }
+% {\egroup
+% \global\let\HCol=\sv:HCol
+% \ifvmode\IgnorePar\fi\EndP
+% \HCode{</td></tr></table>}\par
+% }
+% {}{}
+% \Configure{columnbreak}
+% {\gHAdvance\HCol by 1\relax
+% \par \IgnorePar \EndP
+% \HCode{</td><td class="multicol-\HCol">}}
+% \Css{table.multicols {
+% width:100\%; margin-left:1em; margin-top:1em; margin-bottom:1em;
+% }}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/generic/tex4ht/multicol.4ht b/Master/texmf-dist/tex/generic/tex4ht/multicol.4ht
index a4d39f456bd..8449e63f6a5 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/multicol.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/multicol.4ht
@@ -1,6 +1,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% multicol.4ht 2009-05-21-09:32 %
+% multicol.4ht 2013-07-31-09:45 %
% Copyright (C) 1997--2009 Eitan M. Gurari %
+% 2009--2013 TeX Users Group %
% %
% This work may be distributed and/or modified under the %
% conditions of the LaTeX Project Public License, either %
@@ -14,28 +15,137 @@
% This work has the LPPL maintenance status "maintained".%
% %
% This Current Maintainer of this work %
-% is Eitan M. Gurari. %
+% is the TeX4ht Project <tex4ht@tug.org>. %
% %
% If you modify this program your changing its signature %
% with a directive of the following form will be %
% appreciated. %
% \message{signature} %
% %
-% gurari@cse.ohio-state.edu %
-% http://www.cse.ohio-state.edu/~gurari %
+% tex4ht@tug.org %
+% http://www.tug.org/tex4ht %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\immediate\write-1{version 2009-05-21-09:32}
+\immediate\write-1{version 2013-07-31-09:45}
\append:def\set@floatcmds{\let\end@dblfloat\end@float}
\def\slocitlum#1{\let\endslocitlum\empty
\end{slocitlum}}
-\def\multicols#1{\bgroup \par \col@number=1
- \@ifnextchar[\mult@cols{\mult@cols[]}}
-\def\mult@@cols#1[#2]{\ignorespaces}
+\def\mcolnum{1}
+\def\multicols#1{%
+ \bgroup \par \col@number=#1
+ \def\mcolnum{#1}
+ \@ifnextchar[{\mult@cols}{\mult@cols[]}%]
+ }
+
+\def\mult@@cols#1[#2]{#1\ignorespaces\mult:cols}
\def\endmulticols{\egroup\par }
+
\def\columnbreak{\a:columnbreak}
\NewConfigure{columnbreak}{1}
+\Configure{columnbreak}{auto}
+
+% break-before, break-after, break-inside
+%-----------------------------------------
+% auto always avoid left right page column avoid-page
+% avoid-column
+
+\def\columngap{\a:columngap}
+\NewConfigure{columngap}{1}
+\Configure{columngap}{\the\columnsep}
+
+% dimen normal (1em)
+
+\def\columnrulewidth{\a:columnrulewidth}
+\NewConfigure{columnrulewidth}{1}
+\Configure{columnrulewidth}{\the\columnseprule}
+
+% thin medium thick dimen
+
+\def\columnrulecolor{\a:columnrulecolor}
+\NewConfigure{columnrulecolor}{1}
+\Configure{columnrulecolor}{\#555;}
+
+% legal color
+
+\def\columnrulestyle{\a:columnrulestyle}
+\NewConfigure{columnrulestyle}{1}
+\Configure{columnrulestyle}{outset}
+
+% none
+% No border.
+% *hidden
+% Same as 'none', but in the collapsing border model, also inhibits
+% any other border (see the section on border conflicts).
+% dotted
+% The border is a series of dots.
+% dashed
+% The border is a series of short line segments.
+% solid
+% The border is a single line segment.
+% double
+% The border is two solid lines. The sum of the two lines and the
+% space between them equals the value of 'border-width'.
+% groove
+% The border looks as though it were carved into the canvas.
+% ridge
+% The opposite of 'groove': the border looks as though it were
+% coming out of the canvas.
+% *inset
+% In the separated borders model, the border makes the entire box
+% look as though it were embedded in the canvas. In the collapsing
+% border model, drawn the same as 'ridge'.
+% *outset
+% In the separated borders model, the border makes the entire box
+% look as though it were coming out of the canvas. In the collapsing
+% border model, drawn the same as 'groove'.
+
+\def\columnspan{\a:columnspan}
+\NewConfigure{columnspan}{1}
+\Configure{columnspan}{none}
+
+% none all
+
+\def\columnfill{\a:columnfill}
+\NewConfigure{columnfill}{1}
+\Configure{columnfill}{balance}
+
+% auto balance
+
+\NewConfigure{multicols}{1}
+\Configure{multicols}{columns}
+
+\def\:wr:mcol:css{%
+ \Css{.\a:multicols-\mcolnum\space p:first-child { margin-top: 0em; }}%
+ \Css{.\a:multicols-\mcolnum {%
+ -moz-column-count:\mcolnum;
+ -webkit-column-count:\mcolnum;
+ column-count:\mcolnum;
+ -moz-column-gap: \a:columngap;
+ -webkit-column-gap: \a:columngap;
+ column-gap: \a:columngap;
+ -moz-column-rule-width: \a:columnrulewidth;
+ -webkit-column-rule-width: \a:columnrulewidth;
+ column-rule-rule-width: \a:columnrulewidth;
+ -moz-column-rule-color: \a:columnrulecolor;
+ -webkit-column-rule-color: \a:columnrulecolor;
+ column-rule-color: \a:columnrulecolor;
+ -moz-column-rule-style: \a:columnrulestyle;
+ -webkit-column-rule-style: \a:columnrulestyle;
+ column-rule-style: \a:columnrulestyle;
+ -moz-column-fill: \a:columnfill;
+ -webkit-column-fill: \a:columnfill;
+ column-fill: \a:columnfill;
+ }%
+ }%
+}
+\def\mult:cols{\IgnorePar\EndP%
+ \HCode{<div class="\a:multicols-\mcolnum">}%
+ \expandafter\ifx\csname .\a:multicols-\mcolnum\endcsname\relax%
+ \:wr:mcol:css
+ \expandafter\gdef\csname .\a:multicols-\mcolnum\endcsname{1}%
+ \fi\ShowPar\par}
+\append:def\endmulticols{\EndP\HCode{</div>}}
\Hinput{multicol}
\endinput