[tex4ht-commits] [SCM] tex4ht updated: r435 - in trunk: doc/tex4ht-doc doc/tex4ht-doc/secti [more]
michal_h21 at gnu.org.ua
michal_h21 at gnu.org.ua
Sat Oct 20 20:03:56 CEST 2018
Author: michal_h21
Date: 2018-10-20 21:03:56 +0300 (Sat, 20 Oct 2018)
New Revision: 435
Modified:
trunk/doc/tex4ht-doc/Makefile
trunk/doc/tex4ht-doc/README
trunk/doc/tex4ht-doc/config.cfg
trunk/doc/tex4ht-doc/sections/tex4ht-commands.tex
trunk/doc/tex4ht-doc/style.css
trunk/lit/ChangeLog
trunk/lit/tex4ht-4ht.tex
Log:
Disabled patching of the old font commands
Modified: trunk/doc/tex4ht-doc/Makefile
===================================================================
--- trunk/doc/tex4ht-doc/Makefile 2018-10-15 13:50:14 UTC (rev 434)
+++ trunk/doc/tex4ht-doc/Makefile 2018-10-20 18:03:56 UTC (rev 435)
@@ -1,4 +1,4 @@
-mode = draft
+mode = final
engine =
ifeq (lualatex, lualatex)
@@ -8,16 +8,18 @@
ifeq (lualatex, xelatex)
engine = -x
endif
+
+sections = sections/tex4ht-commands.tex
all: tex4ht-doc.pdf tex4ht-doc.html
.PHONY: final
-tex4ht-doc.pdf: tex4ht-doc.tex tex4ht-styles.sty
+tex4ht-doc.pdf: tex4ht-doc.tex tex4ht-styles.sty ${sections}
lualatex tex4ht-doc.tex
-tex4ht-doc.html: tex4ht-doc.tex config.cfg tex4ht-styles.sty
- make4ht -um $(mode) -c config $(engine) -f html5-common_domfilters -e build.mk4 tex4ht-doc.tex
+tex4ht-doc.html: tex4ht-doc.tex config.cfg tex4ht-styles.sty ${sections}
+ make4ht -um $(mode) -c config $(engine) -f html5+common_domfilters -e build.mk4 tex4ht-doc.tex
# use only one LaTeX run by default, request three compilations with final rule
final: mode=final
Modified: trunk/doc/tex4ht-doc/README
===================================================================
--- trunk/doc/tex4ht-doc/README 2018-10-15 13:50:14 UTC (rev 434)
+++ trunk/doc/tex4ht-doc/README 2018-10-20 18:03:56 UTC (rev 435)
@@ -2,4 +2,5 @@
Clone this repository and run `make` command to get the documentation in PDF and HTMl formats.
+At least `make4ht` version 0.2 is necessary to compile the HTML version.
Modified: trunk/doc/tex4ht-doc/config.cfg
===================================================================
--- trunk/doc/tex4ht-doc/config.cfg 2018-10-15 13:50:14 UTC (rev 434)
+++ trunk/doc/tex4ht-doc/config.cfg 2018-10-20 18:03:56 UTC (rev 435)
@@ -2,7 +2,7 @@
\special{t4ht+ at File: style.css}
\Configure{@HEAD}{\HCode{<link rel="stylesheet" type="text/css" href="style.css" />}}
\Configure{texttt}{\HCode{<code>}\NoFonts}{\EndNoFonts\HCode{</code>}}
-\ConfigureEnv{texsource}{\ifvmode\IgnorePar\fi\EndP\HCode{<figure>}}{\ifvmode\IgnorePar\fi\EndP\HCode{</figure>}}{}{}
+\ConfigureEnv{texsource}{\ifvmode\IgnorePar\fi\EndP\HCode{<figure class="texsource">}}{\ifvmode\IgnorePar\fi\EndP\HCode{</figure>}}{}{}
\ConfigureEnv{shellcommand}{\ifvmode\IgnorePar\fi\EndP\HCode{<figure>}}{\ifvmode\IgnorePar\fi\EndP\HCode{</figure>}}{}{}
\ConfigureEnv{htmlsource}{\ifvmode\IgnorePar\fi\EndP\HCode{<figure>}}{\ifvmode\IgnorePar\fi\EndP\HCode{</figure>}}{}{}
Modified: trunk/doc/tex4ht-doc/sections/tex4ht-commands.tex
===================================================================
--- trunk/doc/tex4ht-doc/sections/tex4ht-commands.tex 2018-10-15 13:50:14 UTC (rev 434)
+++ trunk/doc/tex4ht-doc/sections/tex4ht-commands.tex 2018-10-20 18:03:56 UTC (rev 435)
@@ -1,8 +1,8 @@
-I've created some alternative commands to \verb|\HCode| or \verb|\Tg|. The idea is to define
+I've created some alternative commands to \texcommand{\HCode} or \texcommand{\Tg}. The idea is to define
semantic names for logical elements of the document, such as titles, authors,
sections etc. It is possible to assign HTML elements and attributes to these
logical elements. There are commands for inline and block level elements,
-which should eliminate the need for constructs like \verb|\ifvmode\IgnorePar\fi\EndP|
+which should eliminate the need for constructs like \texcommand{\ifvmode\IgnorePar\fi\EndP}
etc.
I think it will be best to show some concrete examples:
@@ -36,10 +36,10 @@
-The \verb|\NewLogicalBlock| creates a new logical element. The used tag is configured
-using \verb|\SetTag|, the attributes are set using \verb|\SetBlockProperty|. The blocks are
-inserted to the document using \verb|\InlineElementStart| ... \verb|\InlineElementEnd| or
-\verb|\BlockElementStart| ... \verb|\BlockElementEnd| pairs. The start commands take two
+The \texcommand{\NewLogicalBlock} creates a new logical element. The used tag is configured
+using \texcommand{\SetTag}, the attributes are set using \texcommand{\SetBlockProperty}. The blocks are
+inserted to the document using \texcommand{\InlineElementStart} ... \texcommand{\InlineElementEnd} or
+\texcommand{\BlockElementStart} ... \texcommand{\BlockElementEnd} pairs. The start commands take two
parameters, first is the logical block name, the second can be local
parameters which shouldn't be used for the given logical block globally.
Modified: trunk/doc/tex4ht-doc/style.css
===================================================================
--- trunk/doc/tex4ht-doc/style.css 2018-10-15 13:50:14 UTC (rev 434)
+++ trunk/doc/tex4ht-doc/style.css 2018-10-20 18:03:56 UTC (rev 435)
@@ -1,4 +1,5 @@
body{max-width:50rem;margin:0 auto;}
p.indent, p.noindent{text-indent:0}
code{font-size:1.4em;}
+figure pre.listings{font-size: 1.4em;}
Modified: trunk/lit/ChangeLog
===================================================================
--- trunk/lit/ChangeLog 2018-10-15 13:50:14 UTC (rev 434)
+++ trunk/lit/ChangeLog 2018-10-20 18:03:56 UTC (rev 435)
@@ -1,3 +1,11 @@
+2018-10-20 Michal Hoftich <michal.h21 at gmail.com>
+
+ * tex4ht-4ht.tex (book.4ht, report.4ht, article.4ht, amsart.4ht,
+ amsbook.4ht, amsproc.4ht, scrartcl.4ht, scrreprt.4ht, mwbk.4ht, mwart.4ht,
+ mwrep.4ht): disabled patching of the old commands, it seemd like really old
+ weird hack that is not useful anymore.
+ https://tex.stackexchange.com/q/455994/2891
+
2018-10-15 Michal Hoftich <michal.h21 at gmail.com>
* tex4ht-html4.tex (html4.4ht): test for presence of image converted from
Modified: trunk/lit/tex4ht-4ht.tex
===================================================================
--- trunk/lit/tex4ht-4ht.tex 2018-10-15 13:50:14 UTC (rev 434)
+++ trunk/lit/tex4ht-4ht.tex 2018-10-20 18:03:56 UTC (rev 435)
@@ -13350,6 +13350,7 @@
\fi
>>>
+
\<not latex209 base fonts\><<<
\def\:tempa#1#2#3#4{\tmp:toks{#1{#2}}%
\long\expandafter\edef\csname #4 \endcsname{\the\tmp:toks
@@ -13367,14 +13368,22 @@
\:temp{it}
>>>
-\<book / report / article\><<<
-|<base fonts|>
->>>
+I don't really understand what the above code does. Is it really necessary anymore?
+The short font commands are deprecated for quite some time, KOMA classes removed them
+and this definition causes issues with it.
-\<ams art + book + proc\><<<
-|<base fonts|>
->>>
+Michal, October 2018
+Just disable the old font commands patching for now.
+
+% \<book / report / article\><<<
+% |<base fonts|>
+% >>>
+%
+% \<ams art + book + proc\><<<
+% |<base fonts|>
+% >>>
+
The else part is for compabibility when the \`'fonts' option is
inactive.
@@ -15284,27 +15293,29 @@
\NewConfigure{quotation}{1}
\NewConfigure{listof}{6}
-\ifx \@openbib at code\:UnDef \else
- \pend:def\@openbib at code{\labelsep\z@}
-\fi
-\def\:temp#1#2!*?: {\def\:temp{#1}}
-\expandafter\:temp\usepackage!*?:
-\def\:tempa{\@latex at e@error}
-\ifx \:temp\:tempa \else
- \def\:tempa#1#2#3#4{\tmp:toks{#1{#2}}%
- \long\expandafter\edef\csname #4 \endcsname{\the\tmp:toks
- {\expandafter\noexpand
- \csname o:\expandafter\:gobble\string #3:\endcsname}}}
-\def\:temp#1{%
- \expandafter\expandafter\expandafter\:tempa\csname #1 \endcsname{#1}}
-\:temp{rm}
-\:temp{sf}
-\:temp{tt}
-\:temp{bf}
-\:temp{it}
-\fi
+% We removed this code from base class declarations, so we can disable it here as well
+% \ifx \@openbib at code\:UnDef \else
+% \pend:def\@openbib at code{\labelsep\z@}
+% \fi
+% \def\:temp#1#2!*?: {\def\:temp{#1}}
+% \expandafter\:temp\usepackage!*?:
+% \def\:tempa{\@latex at e@error}
+% \ifx \:temp\:tempa \else
+% \def\:tempa#1#2#3#4{\tmp:toks{#1{#2}}%
+% \long\expandafter\edef\csname #4 \endcsname{\the\tmp:toks
+% {\expandafter\noexpand
+% \csname o:\expandafter\:gobble\string #3:\endcsname}}}
+% \def\:temp#1{%
+% \expandafter\expandafter\expandafter\:tempa\csname #1 \endcsname{#1}}
+% \:temp{rm}
+% \:temp{sf}
+% \:temp{tt}
+% \:temp{bf}
+% \:temp{it}
+% \fi
+
\let\:tempc\listoffigures
\pend:def\:tempc{\begingroup \a:listoffigures
\def\@starttoc{\:tableofcontents[lof]\:gobble}}
@@ -16590,26 +16601,27 @@
}
>>>
-\<scr old fonts\><<<
-\def\:temp#1#2!*?: {\def\:temp{#1}}
-\expandafter\:temp\usepackage!*?:
-\def\:tempa{\@latex at e@error}
-\ifx \:temp\:tempa \else
- \def\popthree#1#2#3#4{#4}
- \def\:tempa#1#2#3#4{\tmp:toks{#1{#2}}%
- \long\expandafter\edef\csname #4 \endcsname{\the\tmp:toks
- {\expandafter\noexpand
- \csname o:\expandafter\expandafter\:gobble\expandafter\string \popthree#3:\endcsname}}}
-\def\:temp#1{%
- \expandafter\expandafter\expandafter\:tempa\csname #1 \endcsname{#1}}
-\:temp{rm}
-\:temp{sf}
-\:temp{tt}
-\:temp{bf}
-\:temp{it}
+% we disabled this in the base classes, so it isn't necessary anymore
+% \<scr old fonts\><<<
+% \def\:temp#1#2!*?: {\def\:temp{#1}}
+% \expandafter\:temp\usepackage!*?:
+% \def\:tempa{\@latex at e@error}
+% \ifx \:temp\:tempa \else
+% \def\popthree#1#2#3#4{#4}
+% \def\:tempa#1#2#3#4{\tmp:toks{#1{#2}}%
+% \long\expandafter\edef\csname #4 \endcsname{\the\tmp:toks
+% {\expandafter\noexpand
+% \csname o:\expandafter\expandafter\:gobble\expandafter\string \popthree#3:\endcsname}}}
+% \def\:temp#1{%
+% \expandafter\expandafter\expandafter\:tempa\csname #1 \endcsname{#1}}
+% \:temp{rm}
+% \:temp{sf}
+% \:temp{tt}
+% \:temp{bf}
+% \:temp{it}
-\fi
->>>
+% \fi
+% >>>
\<addchap confic\><<<
\ifx \@@maybeautodot\:UnDef
More information about the tex4ht-commits
mailing list