From 3ea86bef2e63ca77c8fbfe4e3b4617804de11855 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 20 Apr 2009 23:02:43 +0000 Subject: tex4ht-1.0.2009_04_18_1145 git-svn-id: svn://tug.org/texlive/trunk@12767 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/generic/tex4ht/docbook.4ht | 299 ++++++++++++++++------- 1 file changed, 216 insertions(+), 83 deletions(-) (limited to 'Master/texmf-dist/tex/generic/tex4ht/docbook.4ht') diff --git a/Master/texmf-dist/tex/generic/tex4ht/docbook.4ht b/Master/texmf-dist/tex/generic/tex4ht/docbook.4ht index 15a263a2cf1..f40bda762b8 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/docbook.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/docbook.4ht @@ -1,6 +1,6 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% docbook.4ht 2008-08-20-13:01 % -% Copyright (C) 2000--2008 Eitan M. Gurari % +% docbook.4ht 2009-04-13-13:09 % +% Copyright (C) 2000--2009 Eitan M. Gurari % % % % This work may be distributed and/or modified under the % % conditions of the LaTeX Project Public License, either % @@ -24,7 +24,7 @@ % gurari@cse.ohio-state.edu % % http://www.cse.ohio-state.edu/~gurari % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\immediate\write-1{version 2008-08-20-13:01} +\immediate\write-1{version 2009-04-13-13:09} \exit:ifnot{Preamble,% algorithmic,% @@ -66,6 +66,11 @@ texinfo} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \Configure{ext}{xml} \edef\Preamble{\Preamble,refcaption} +\:CheckOption{debug-} \if:Option + \def\IgnoreDebug#1{} +\else + \def\IgnoreDebug#1{#1} +\fi \Configure{PROLOG}{VERSION,DOCTYPE,*XML-STYLESHEET} \:CheckOption{no-DOCTYPE} \if:Option \Configure{PROLOG}{VERSION,*XML-STYLESHEET} @@ -103,18 +108,22 @@ texinfo} \fi \fi \Configure{HTML}{}{} -\Configure{HEAD}{}{} +\Configure{HEAD}{\bgroup \Configure{TITLE}{}{}}{\egroup} \Configure{BODY}{}{} -\Configure{TITLE} {}{} \Configure{TITLE+} {} +\ifx \a:TITLE\:UnDef + \Configure{TITLE}{\Protect\IgnorePar + \HCode{}}{\HCode{\Hnewline}} +\fi \Configure{HtmlPar} {\EndP\HCode{}} {\EndP\HCode{}} {\HCode{}} {\HCode{}} -\LinkCommand\DBLink{ulink, url} -\LinkCommand\Anchor{anchor,, id,,,\empty} +%\LinkCommand\DBLink{ulink, url} +\LinkCommand\DBLink{link, xlink:href} +\LinkCommand\Anchor{anchor,, xml:id,,,\empty} \Odef\Link[#1]#2#3{% \global\let\EndLink=\empty \if ]#3]\else \Anchor{}{#3}\EndAnchor @@ -129,17 +138,18 @@ texinfo} \else\expandafter\do:Link\fi} \def\minus:Link#1{\do:Link} -\Configure{Link}{anchor}{linkend=}{id=}{} +\Configure{Link}{anchor}{linkend=}{xml:id=}{} \newif\ifHCond \Configure{Picture+}{}{} \Configure{Picture*}{}{} \Configure{IMG} - {\ht:special{t4ht=}} + \HCode{}% + \tmp:cnt = 0 +\loop +\ifnum \tmp:cnt < \ar:cnt + \advance\tmp:cnt by 1 + {\HAssign\HCol=\tmp:cnt + \HCode{}}% +\repeat +% + \HCode{}} {\HCode{}\ShowPar} {\HCode{}} {\HCode{}} @@ -442,9 +482,9 @@ texinfo} \ifnum \HMultispan>1 \tmp:cnt=\HCol \advance\tmp:cnt by \HMultispan \advance\tmp:cnt by -1 - \HCode{ namest="\HCol" nameend="\the\tmp:cnt"}\fi - \HCode{>}} - {\HCode{}} + \HCode{ namest="c\HCol" \IgnoreDebug{nameend="c\the\tmp:cnt"}}\fi + \HCode{>}\par\ShowPar} + {\ifvmode\IgnorePar\fi \EndP \HCode{}} \HAssign\tabularN=0 \Configure{halignTB<>}{tabular}{<>\HAlign} \Configure{halignTB} @@ -731,7 +771,14 @@ texinfo} \else \HCode{\Hnewline} \fi -\HCode{
}\par\ShowPar} +% + \HCode{
}% + \a:TITLE\bgroup \:TITLE: \c:TITLE \egroup \b:TITLE + \par\ShowPar + } {\IgnorePar\EndP\HCode{
}} \immediate\write-1{TeX4ht package options: \expandafter\:gobbleM\meaning\Preamble} @@ -739,15 +786,13 @@ texinfo} \Configure{VERSION} {\HCode{\Hnewline}} \Configure{DOCTYPE} - {\HCode{ -\Hnewline \%docbook.dtd; \Hnewline -] >\Hnewline }} + "http://www.oasis-open.org/docbook/xml/5.0/docbook.dtd" + >\Hnewline }} \Configure{maketitle} {\HCode{}} @@ -1041,7 +1086,13 @@ texinfo} \else \HCode{\Hnewline} \fi -\HCode{
}\par\ShowPar} +% + \HCode{
}% + \a:TITLE\bgroup \:TITLE: \c:TITLE \egroup \b:TITLE + \par\ShowPar} {\IgnorePar\EndP\HCode{
}} \immediate\write-1{TeX4ht package options: \expandafter\:gobbleM\meaning\Preamble} @@ -1049,15 +1100,13 @@ texinfo} \Configure{VERSION} {\HCode{\Hnewline}} \Configure{DOCTYPE} - {\HCode{ -\Hnewline \%docbook.dtd; \Hnewline -] >\Hnewline }} + "http://www.oasis-open.org/docbook/xml/5.0/docbook.dtd" + >\Hnewline }} \Configure{maketitle} {\HCode{}} @@ -1357,7 +1406,14 @@ texinfo} \else \HCode{\Hnewline} \fi -\HCode{
}\par\ShowPar} +% + \HCode{
}% + \a:TITLE\bgroup \:TITLE: \c:TITLE \egroup \b:TITLE + \par\ShowPar + } {\IgnorePar\EndP\HCode{
}} \immediate\write-1{TeX4ht package options: \expandafter\:gobbleM\meaning\Preamble} @@ -1365,15 +1421,13 @@ texinfo} \Configure{VERSION} {\HCode{\Hnewline}} \Configure{DOCTYPE} - {\HCode{ -\Hnewline \%docbook.dtd; \Hnewline -] >\Hnewline }} + "http://www.oasis-open.org/docbook/xml/5.0/docbook.dtd" + >\Hnewline }} \Configure{maketitle} {\HCode{}} @@ -1600,9 +1654,31 @@ texinfo} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \Configure{graphics} {} - {\HCode{}% + {\HCode{}% } +\Configure{graphics*} + {gif} + {{\Configure{Needs}{File: \Gin@base.gif}\Needs{}}% + \Picture[\a:GraphicsAlt]{\Gin@base.gif \csname a:Gin-dim\endcsname +}} +\Configure{graphics*} + {png} + {{\Configure{Needs}{File: \Gin@base.png}\Needs{}}% + \Picture[\a:GraphicsAlt]{\Gin@base.png \csname a:Gin-dim\endcsname +}} +\Configure{graphics*} + {jpg} + {{\Configure{Needs}{File: \Gin@base.jpg}\Needs{}}% + \Picture[\a:GraphicsAlt]{\Gin@base.jpg \csname a:Gin-dim\endcsname +}} +\Configure{graphics*} + {jpeg} + {{\Configure{Needs}{File: \Gin@base.jpeg}\Needs{}}% + \Picture[\a:GraphicsAlt]{\Gin@base.jpeg \csname a:Gin-dim\endcsname +}} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1613,6 +1689,9 @@ texinfo} + + + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{amsart} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1628,7 +1707,14 @@ texinfo} \else \HCode{\Hnewline} \fi -\HCode{
}\par\ShowPar} +% + \HCode{
}% + \a:TITLE\bgroup \:TITLE: \c:TITLE \egroup \b:TITLE + \par\ShowPar + } {\IgnorePar\EndP\HCode{
}} \immediate\write-1{TeX4ht package options: \expandafter\:gobbleM\meaning\Preamble} @@ -1636,15 +1722,13 @@ texinfo} \Configure{VERSION} {\HCode{\Hnewline}} \Configure{DOCTYPE} - {\HCode{ -\Hnewline \%docbook.dtd; \Hnewline -] >\Hnewline }} + "http://www.oasis-open.org/docbook/xml/5.0/docbook.dtd" + >\Hnewline }} \def\OpenDiv#1{% \IgnorePar\EndP \HCode{