From michal_h21 at gnu.org.ua Mon Oct 1 22:06:20 2018 From: michal_h21 at gnu.org.ua (michal_h21 at gnu.org.ua) Date: Mon, 1 Oct 2018 23:06:20 +0300 Subject: [tex4ht-commits] [SCM] tex4ht updated: r432 - trunk/lit Message-ID: <201810012006.w91K6KEY025641@ulysses.gnu.org.ua> Author: michal_h21 Date: 2018-10-01 23:06:20 +0300 (Mon, 01 Oct 2018) New Revision: 432 Modified: trunk/lit/ChangeLog trunk/lit/tex4ht-4ht.tex trunk/lit/tex4ht-html4.tex Log: Added support for \rotatebox Modified: trunk/lit/ChangeLog =================================================================== --- trunk/lit/ChangeLog 2018-09-16 11:00:35 UTC (rev 431) +++ trunk/lit/ChangeLog 2018-10-01 20:06:20 UTC (rev 432) @@ -1,3 +1,9 @@ +2018-10-01 Michal Hoftich + + * tex4ht-4ht.tex (graphicx.4ht): defined configurations for \rotatebox + * tex4ht-html4.tex (html4.4ht): configured \rotatebox + https://tex.stackexchange.com/a/453376/2891 + 2018-09-16 Michal Hoftich * tex4ht-4ht.tex (titlesec.4ht): fix for the runin and display formats. Modified: trunk/lit/tex4ht-4ht.tex =================================================================== --- trunk/lit/tex4ht-4ht.tex 2018-09-16 11:00:35 UTC (rev 431) +++ trunk/lit/tex4ht-4ht.tex 2018-10-01 20:06:20 UTC (rev 432) @@ -24832,6 +24832,11 @@ \DeclareGraphicsRule{.gif}{bmp}{.xbb}{} \DeclareGraphicsRule{.pdf}{bmp}{.xbb}{} \DeclareGraphicsRule{.svg}{bmp}{.xbb}{} + +\NewConfigure{rotatebox}{2} +\pend:def\Grot at box{\a:rotatebox} +\append:def\Grot at box{\b:rotatebox} + >>> The calc package redefined \`'\setlength' to allow expressions of the Modified: trunk/lit/tex4ht-html4.tex =================================================================== --- trunk/lit/tex4ht-html4.tex 2018-09-16 11:00:35 UTC (rev 431) +++ trunk/lit/tex4ht-html4.tex 2018-10-01 20:06:20 UTC (rev 432) @@ -13740,7 +13740,14 @@ \fi >>> +%%%%%%%%%%%%%%%%%% +\subsection{graphicx} +\<<< +\Configure{rotatebox}{\HCode{}}{\HCode{}} +\Css{.rotatebox{display: inline-block;}} +>>> + %%%%%%%%%%%%%%%%%% \subsection{xy} %%%%%%%%%%%%%%%%%% From michal_h21 at gnu.org.ua Mon Oct 15 15:39:48 2018 From: michal_h21 at gnu.org.ua (michal_h21 at gnu.org.ua) Date: Mon, 15 Oct 2018 16:39:48 +0300 Subject: [tex4ht-commits] [SCM] tex4ht updated: r433 - trunk/lit Message-ID: <201810151339.w9FDdmgQ022753@ulysses.gnu.org.ua> Author: michal_h21 Date: 2018-10-15 16:39:48 +0300 (Mon, 15 Oct 2018) New Revision: 433 Modified: trunk/lit/ChangeLog trunk/lit/tex4ht-html4.tex Log: test for presence of an image converted from a pdf file Modified: trunk/lit/ChangeLog =================================================================== --- trunk/lit/ChangeLog 2018-10-01 20:06:20 UTC (rev 432) +++ trunk/lit/ChangeLog 2018-10-15 13:39:48 UTC (rev 433) @@ -1,3 +1,8 @@ +2018-10-15 Michal Hoftich + + * tex4ht-html4.tex (html4.4ht): test for presence of image converted from + pdf file. + 2018-10-01 Michal Hoftich * tex4ht-4ht.tex (graphicx.4ht): defined configurations for \rotatebox Modified: trunk/lit/tex4ht-html4.tex =================================================================== --- trunk/lit/tex4ht-html4.tex 2018-10-01 20:06:20 UTC (rev 432) +++ trunk/lit/tex4ht-html4.tex 2018-10-15 13:39:48 UTC (rev 433) @@ -13634,8 +13634,13 @@ \Configure{graphics*} {pdf} {\ifdefined\Gin at page\else\def\Gin at page{1}\fi% - \Needs{\b:PdfConvert}% \edef\svg:filename{\Gin at base-\Gin at page.\a:PdfConvert}% + % test for existence of the converted file + \openin15=\svg:filename\relax + \ifeof15 + \Needs{\b:PdfConvert}% + \fi + \closein15 { \Configure{Needs}{File: \svg:filename}\Needs{}}% \Picture[\a:GraphicsAlt]{{\svg:filename} |}} From michal_h21 at gnu.org.ua Mon Oct 15 15:50:14 2018 From: michal_h21 at gnu.org.ua (michal_h21 at gnu.org.ua) Date: Mon, 15 Oct 2018 16:50:14 +0300 Subject: [tex4ht-commits] [SCM] tex4ht updated: r434 - trunk/lit Message-ID: <201810151350.w9FDoExJ023756@ulysses.gnu.org.ua> Author: michal_h21 Date: 2018-10-15 16:50:14 +0300 (Mon, 15 Oct 2018) New Revision: 434 Modified: trunk/lit/ChangeLog trunk/lit/tex4ht-html4.tex Log: Added support for conversion of the eps format to the current picture format Modified: trunk/lit/ChangeLog =================================================================== --- trunk/lit/ChangeLog 2018-10-15 13:39:48 UTC (rev 433) +++ trunk/lit/ChangeLog 2018-10-15 13:50:14 UTC (rev 434) @@ -2,7 +2,9 @@ * tex4ht-html4.tex (html4.4ht): test for presence of image converted from pdf file. + added support for conversion of eps files to the current picture format. + 2018-10-01 Michal Hoftich * tex4ht-4ht.tex (graphicx.4ht): defined configurations for \rotatebox Modified: trunk/lit/tex4ht-html4.tex =================================================================== --- trunk/lit/tex4ht-html4.tex 2018-10-15 13:39:48 UTC (rev 433) +++ trunk/lit/tex4ht-html4.tex 2018-10-15 13:50:14 UTC (rev 434) @@ -13622,6 +13622,15 @@ {svg} {{\Configure{Needs}{File: \Gin at base.svg}\Needs{}}% \Picture[\a:GraphicsAlt]{{\Gin at base.svg} |}} +\Configure{graphics*} + {eps} + {\openin15=\csname Gin at base\endcsname\PictExt\relax% + \ifeof15% + \Needs{"convert \csname Gin at base\endcsname.eps \csname Gin at base\endcsname\PictExt"}% + \fi% + \closein15% + {\Configure{Needs}{File: \Gin at base\PictExt}\Needs{}}% + \Picture[\a:GraphicsAlt]{{\Gin at base\PictExt} |}} \NewConfigure{PdfConvert}{2} From michal_h21 at gnu.org.ua Sat Oct 20 20:03:56 2018 From: michal_h21 at gnu.org.ua (michal_h21 at gnu.org.ua) Date: Sat, 20 Oct 2018 21:03:56 +0300 Subject: [tex4ht-commits] [SCM] tex4ht updated: r435 - in trunk: doc/tex4ht-doc doc/tex4ht-doc/secti [more] Message-ID: <201810201803.w9KI3uZ7021031@ulysses.gnu.org.ua> 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{}} \Configure{texttt}{\HCode{}\NoFonts}{\EndNoFonts\HCode{}} -\ConfigureEnv{texsource}{\ifvmode\IgnorePar\fi\EndP\HCode{
}}{\ifvmode\IgnorePar\fi\EndP\HCode{
}}{}{} +\ConfigureEnv{texsource}{\ifvmode\IgnorePar\fi\EndP\HCode{
}}{\ifvmode\IgnorePar\fi\EndP\HCode{
}}{}{} \ConfigureEnv{shellcommand}{\ifvmode\IgnorePar\fi\EndP\HCode{
}}{\ifvmode\IgnorePar\fi\EndP\HCode{
}}{}{} \ConfigureEnv{htmlsource}{\ifvmode\IgnorePar\fi\EndP\HCode{
}}{\ifvmode\IgnorePar\fi\EndP\HCode{
}}{}{} 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 + + * 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 * 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 >>> + \<<< \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} >>> -\<<< -| ->>> +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. -\<<< -| ->>> +Michal, October 2018 +Just disable the old font commands patching for now. + +% \<<< +% | +% >>> +% +% \<<< +% | +% >>> + 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 @@ } >>> -\<<< -\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 +% \<<< +% \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 +% >>> \<<< \ifx \@@maybeautodot\:UnDef From michal_h21 at gnu.org.ua Thu Oct 25 23:47:34 2018 From: michal_h21 at gnu.org.ua (michal_h21 at gnu.org.ua) Date: Fri, 26 Oct 2018 00:47:34 +0300 Subject: [tex4ht-commits] [SCM] tex4ht updated: r436 - trunk/lit Message-ID: <201810252147.w9PLlYTA031384@ulysses.gnu.org.ua> Author: michal_h21 Date: 2018-10-26 00:47:34 +0300 (Fri, 26 Oct 2018) New Revision: 436 Modified: trunk/lit/ChangeLog trunk/lit/tex4ht-ooffice.tex Log: Removed space before footnote mark Modified: trunk/lit/ChangeLog =================================================================== --- trunk/lit/ChangeLog 2018-10-20 18:03:56 UTC (rev 435) +++ trunk/lit/ChangeLog 2018-10-25 21:47:34 UTC (rev 436) @@ -1,3 +1,8 @@ +2018-10-25 Michal Hoftich + + * tex4ht-ooffice.tex (ooffice.4ht): removed space before footnote mark. + https://puszcza.gnu.org.ua/bugs/?172 + 2018-10-20 Michal Hoftich * tex4ht-4ht.tex (book.4ht, report.4ht, article.4ht, amsart.4ht, Modified: trunk/lit/tex4ht-ooffice.tex =================================================================== --- trunk/lit/tex4ht-ooffice.tex 2018-10-20 18:03:56 UTC (rev 435) +++ trunk/lit/tex4ht-ooffice.tex 2018-10-25 21:47:34 UTC (rev 436) @@ -8456,7 +8456,7 @@ \<<< \Configure{footnotetext} - {\Tag{|-tx}{}% + {\special{t4ht@)}\Tag{|-tx}{}% |% \SaveEndP \NoFonts \let\@textsuperscript\hbox \HCode{<\text:footnote\Hnewline\text:note:class @@ -8523,7 +8523,8 @@ \Configure{footnotemark} {\Tag{|}{}% |} - {|} + {|% + \special{t4ht@(}} >>> \<<< From michal_h21 at gnu.org.ua Sat Oct 27 00:20:45 2018 From: michal_h21 at gnu.org.ua (michal_h21 at gnu.org.ua) Date: Sat, 27 Oct 2018 01:20:45 +0300 Subject: [tex4ht-commits] [SCM] tex4ht updated: r437 - trunk/lit Message-ID: <201810262220.w9QMKjId027636@ulysses.gnu.org.ua> Author: michal_h21 Date: 2018-10-27 01:20:45 +0300 (Sat, 27 Oct 2018) New Revision: 437 Modified: trunk/lit/ChangeLog trunk/lit/tex4ht-ooffice.tex Log: Added support for TocLink option Modified: trunk/lit/ChangeLog =================================================================== --- trunk/lit/ChangeLog 2018-10-25 21:47:34 UTC (rev 436) +++ trunk/lit/ChangeLog 2018-10-26 22:20:45 UTC (rev 437) @@ -1,3 +1,7 @@ +2018-10-26 Michal Hoftich + + * tex4ht-ooffice.tex (ooffice.4ht): added support for TocLink option. + 2018-10-25 Michal Hoftich * tex4ht-ooffice.tex (ooffice.4ht): removed space before footnote mark. Modified: trunk/lit/tex4ht-ooffice.tex =================================================================== --- trunk/lit/tex4ht-ooffice.tex 2018-10-25 21:47:34 UTC (rev 436) +++ trunk/lit/tex4ht-ooffice.tex 2018-10-26 22:20:45 UTC (rev 437) @@ -4768,7 +4768,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \<<< -\:CheckOption{info}\if:Option +\:CheckOption{TocLink}\if:Option \Configure{TocLink}{\Link{#2}{#3}#4\ifvmode\IgnorePar\fi\EndLink} \else \Log:Note{to request links from the tables of contents, From michal_h21 at gnu.org.ua Mon Nov 5 09:43:08 2018 From: michal_h21 at gnu.org.ua (michal_h21 at gnu.org.ua) Date: Mon, 5 Nov 2018 10:43:08 +0200 Subject: [tex4ht-commits] [SCM] tex4ht updated: r438 - trunk/lit Message-ID: <201811050843.wA58h8M2030266@ulysses.gnu.org.ua> Author: michal_h21 Date: 2018-11-05 10:43:08 +0200 (Mon, 05 Nov 2018) New Revision: 438 Modified: trunk/lit/ChangeLog trunk/lit/tex4ht-4ht.tex Log: Use the same keyval namespace as lettrine.sty Modified: trunk/lit/ChangeLog =================================================================== --- trunk/lit/ChangeLog 2018-10-26 22:20:45 UTC (rev 437) +++ trunk/lit/ChangeLog 2018-11-05 08:43:08 UTC (rev 438) @@ -1,3 +1,9 @@ +2018-11-05 Michal Hoftich + + * tex4ht-4ht.tex (lettrine.4ht): use the same keyval namespace as + lettrine.sty. + https://github.com/michal-h21/tex4ebook/issues/48 + 2018-10-26 Michal Hoftich * tex4ht-ooffice.tex (ooffice.4ht): added support for TocLink option. Modified: trunk/lit/tex4ht-4ht.tex =================================================================== --- trunk/lit/tex4ht-4ht.tex 2018-10-26 22:20:45 UTC (rev 437) +++ trunk/lit/tex4ht-4ht.tex 2018-11-05 08:43:08 UTC (rev 438) @@ -30258,17 +30258,17 @@ \<<< \NewConfigure{lettrine}{7} -\define at key{LH}{ante}{\def\LH:ante{#1}}% -\define at key{LH}{findent}{\def\LH:findent{#1}}% -\define at key{LH}{lhang}{\def\LH:lhang{#1}}% -\define at key{LH}{lines}{\def\LH:lines{#1}}% +\define at key{L}{ante}{\def\LH:ante{#1}}% +\define at key{L}{findent}{\def\LH:findent{#1}}% +\define at key{L}{lhang}{\def\LH:lhang{#1}}% +\define at key{L}{lines}{\def\LH:lines{#1}}% \def\reset:LH:keys{\let\LH:ante\@empty \def\LH:lines{2}% \def\LH:lhang{0}% \def\LH:findent{0pt}} \reset:LH:keys % -\def\@lettrine[#1]#2#3{\setkeys{LH}{#1}% +\def\@lettrine[#1]#2#3{\setkeys{L}{#1}% \def\HlettrineChar{#2}% \def\HlettrineString{#3}% \a:lettrine From karl at gnu.org.ua Mon Nov 5 23:56:32 2018 From: karl at gnu.org.ua (karl at gnu.org.ua) Date: Tue, 6 Nov 2018 00:56:32 +0200 Subject: [tex4ht-commits] [SCM] tex4ht updated: r439 - trunk/lit Message-ID: <201811052256.wA5MuWIS025894@ulysses.gnu.org.ua> Author: karl Date: 2018-11-06 00:56:32 +0200 (Tue, 06 Nov 2018) New Revision: 439 Modified: trunk/lit/ChangeLog trunk/lit/tex4ht-4ht.tex Log: lettrine copyright 2018 Modified: trunk/lit/ChangeLog =================================================================== --- trunk/lit/ChangeLog 2018-11-05 08:43:08 UTC (rev 438) +++ trunk/lit/ChangeLog 2018-11-05 22:56:32 UTC (rev 439) @@ -1,3 +1,7 @@ +2018-11-05 Karl Berry + + * tex4ht-4ht.tex (lettrine.4ht): copyright 2018. + 2018-11-05 Michal Hoftich * tex4ht-4ht.tex (lettrine.4ht): use the same keyval namespace as @@ -16,18 +20,18 @@ 2018-10-20 Michal Hoftich * 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. + 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 - * tex4ht-html4.tex (html4.4ht): test for presence of image converted from - pdf file. - added support for conversion of eps files to the current picture format. + * tex4ht-html4.tex (html4.4ht): test for presence of image + converted from pdf file. + added support for conversion of eps files to the current picture + format. - 2018-10-01 Michal Hoftich * tex4ht-4ht.tex (graphicx.4ht): defined configurations for \rotatebox Modified: trunk/lit/tex4ht-4ht.tex =================================================================== --- trunk/lit/tex4ht-4ht.tex 2018-11-05 08:43:08 UTC (rev 438) +++ trunk/lit/tex4ht-4ht.tex 2018-11-05 22:56:32 UTC (rev 439) @@ -30249,7 +30249,7 @@ % Lettrine \<<< % lettrine.4ht (|version), generated from |jobname.tex -% Copyright 2012-2016 TeX Users Group +% Copyright 2012-2018 TeX Users Group | | \Hinput{lettrine} From michal_h21 at gnu.org.ua Tue Nov 6 23:35:30 2018 From: michal_h21 at gnu.org.ua (michal_h21 at gnu.org.ua) Date: Wed, 7 Nov 2018 00:35:30 +0200 Subject: [tex4ht-commits] [SCM] tex4ht updated: r440 - trunk/lit Message-ID: <201811062235.wA6MZUtu012778@ulysses.gnu.org.ua> Author: michal_h21 Date: 2018-11-07 00:35:30 +0200 (Wed, 07 Nov 2018) New Revision: 440 Modified: trunk/lit/ChangeLog trunk/lit/tex4ht-4ht.tex Log: Added definition of \ldots Modified: trunk/lit/ChangeLog =================================================================== --- trunk/lit/ChangeLog 2018-11-05 22:56:32 UTC (rev 439) +++ trunk/lit/ChangeLog 2018-11-06 22:35:30 UTC (rev 440) @@ -1,3 +1,7 @@ +2018-11-06 Michal Hoftich + + * tex4ht-4ht.tex (plain.4ht, fontmath.4ht): added definition of \ldots + 2018-11-05 Karl Berry * tex4ht-4ht.tex (lettrine.4ht): copyright 2018. Modified: trunk/lit/tex4ht-4ht.tex =================================================================== --- trunk/lit/tex4ht-4ht.tex 2018-11-05 22:56:32 UTC (rev 439) +++ trunk/lit/tex4ht-4ht.tex 2018-11-06 22:35:30 UTC (rev 440) @@ -33228,7 +33228,6 @@ >>> \<<< -\MathSymbol\mathop{ldots} \MathSymbol\mathop{l} \MathSymbol\mathop{longleftarrow} \MathSymbol\mathop{longrightarrow} @@ -33248,6 +33247,7 @@ \MathSymbol\mathop{angle} \MathSymbol\mathop{cong} \MathSymbol\mathop{vdots} +\MathSymbol\mathop{ldots} \MathSymbol\mathrel{Longleftrightarrow} \MathSymbol\mathrel{Longrightarrow} \MathSymbol\mathrel{bowtie} From karl at gnu.org.ua Wed Nov 7 00:55:22 2018 From: karl at gnu.org.ua (karl at gnu.org.ua) Date: Wed, 7 Nov 2018 01:55:22 +0200 Subject: [tex4ht-commits] [SCM] tex4ht updated: r441 - trunk/lit Message-ID: <201811062355.wA6NtM3q025975@ulysses.gnu.org.ua> Author: karl Date: 2018-11-07 01:55:22 +0200 (Wed, 07 Nov 2018) New Revision: 441 Modified: trunk/lit/ChangeLog trunk/lit/tex4ht-4ht.tex Log: copywrite to include timestamps Modified: trunk/lit/ChangeLog =================================================================== --- trunk/lit/ChangeLog 2018-11-06 22:35:30 UTC (rev 440) +++ trunk/lit/ChangeLog 2018-11-06 23:55:22 UTC (rev 441) @@ -1,3 +1,8 @@ +2018-11-06 Karl Berry + + * tex4ht-4ht.tex (plain.4ht, fontmath.4ht): "copywrite" + to include timestamps. + 2018-11-06 Michal Hoftich * tex4ht-4ht.tex (plain.4ht, fontmath.4ht): added definition of \ldots Modified: trunk/lit/tex4ht-4ht.tex =================================================================== --- trunk/lit/tex4ht-4ht.tex 2018-11-06 22:35:30 UTC (rev 440) +++ trunk/lit/tex4ht-4ht.tex 2018-11-06 23:55:22 UTC (rev 441) @@ -13121,10 +13121,9 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \<<< -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% fontmath.4ht |version % -% Copyright (C) |CopyYear.1997. Eitan M. Gurari % -| +% fontmath.4ht (|version), generated from |jobname.tex +% Copyright |CopyYear.1997. Eitan M. Gurari +| | | | @@ -13937,7 +13936,7 @@ a list which starts at the top of a page. This effect is achieved by having the \''\if at newlist' changing to false from true at the page break. -In the case of tex4ht, the side effect of loosing the list header +In the case of tex4ht, the side effect of losing the list header caused also the loss of the code \''
    '. Latex 200 introduces \`'\global\let\if at newlist\@@if at newlist' at the @@ -33672,10 +33671,9 @@ %%%%%%%%%%%%%%% \<<< -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% plain.4ht |version % -% Copyright (C) |CopyYear.1997. Eitan M. Gurari % -| +% plain.4ht (|version), generated from |jobname.tex +% Copyright |CopyYear.1997. Eitan M. Gurari +| | | | From michal_h21 at gnu.org.ua Thu Nov 8 20:51:27 2018 From: michal_h21 at gnu.org.ua (michal_h21 at gnu.org.ua) Date: Thu, 8 Nov 2018 21:51:27 +0200 Subject: [tex4ht-commits] [SCM] tex4ht updated: r442 - trunk/lit Message-ID: <201811081951.wA8JpRZZ019936@ulysses.gnu.org.ua> Author: michal_h21 Date: 2018-11-08 21:51:27 +0200 (Thu, 08 Nov 2018) New Revision: 442 Modified: trunk/lit/ChangeLog trunk/lit/tex4ht-4ht.tex Log: Fixed left quote for Czech babel in OT1 font encoding Modified: trunk/lit/ChangeLog =================================================================== --- trunk/lit/ChangeLog 2018-11-06 23:55:22 UTC (rev 441) +++ trunk/lit/ChangeLog 2018-11-08 19:51:27 UTC (rev 442) @@ -1,3 +1,8 @@ +2018-11-08 Michal Hoftich + + * tex4ht.4ht (czech.4ht): use \quotedblbase instead of custom code for + opening quote. + 2018-11-06 Karl Berry * tex4ht-4ht.tex (plain.4ht, fontmath.4ht): "copywrite" Modified: trunk/lit/tex4ht-4ht.tex =================================================================== --- trunk/lit/tex4ht-4ht.tex 2018-11-06 23:55:22 UTC (rev 441) +++ trunk/lit/tex4ht-4ht.tex 2018-11-08 19:51:27 UTC (rev 442) @@ -36964,7 +36964,7 @@ % czech.4ht |version % % Copyright (C) |CopyYear.2000. Eitan M. Gurari % | - +\let\clqq\quotedblbase \Hinput{czech} \endinput >>> \AddFile{9}{czech} From karl at gnu.org.ua Thu Nov 8 23:21:57 2018 From: karl at gnu.org.ua (karl at gnu.org.ua) Date: Fri, 9 Nov 2018 00:21:57 +0200 Subject: [tex4ht-commits] [SCM] tex4ht updated: r443 - trunk/lit Message-ID: <201811082221.wA8MLv8q022884@ulysses.gnu.org.ua> Author: karl Date: 2018-11-09 00:21:57 +0200 (Fri, 09 Nov 2018) New Revision: 443 Modified: trunk/lit/tex4ht-4ht.tex Log: (czech.4ht) copywrite to get \version Modified: trunk/lit/tex4ht-4ht.tex =================================================================== --- trunk/lit/tex4ht-4ht.tex 2018-11-08 19:51:27 UTC (rev 442) +++ trunk/lit/tex4ht-4ht.tex 2018-11-08 22:21:57 UTC (rev 443) @@ -36963,7 +36963,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % czech.4ht |version % % Copyright (C) |CopyYear.2000. Eitan M. Gurari % -| +| \let\clqq\quotedblbase \Hinput{czech} \endinput From michal_h21 at gnu.org.ua Fri Nov 9 14:54:27 2018 From: michal_h21 at gnu.org.ua (michal_h21 at gnu.org.ua) Date: Fri, 9 Nov 2018 15:54:27 +0200 Subject: [tex4ht-commits] [SCM] tex4ht updated: r444 - trunk/lit Message-ID: <201811091354.wA9DsRSA032012@ulysses.gnu.org.ua> Author: michal_h21 Date: 2018-11-09 15:54:27 +0200 (Fri, 09 Nov 2018) New Revision: 444 Modified: trunk/lit/ChangeLog trunk/lit/tex4ht-fonts-4hf.tex Log: Removed lot of unnecessary mappings from Unicode math to ASCII Modified: trunk/lit/ChangeLog =================================================================== --- trunk/lit/ChangeLog 2018-11-08 22:21:57 UTC (rev 443) +++ trunk/lit/ChangeLog 2018-11-09 13:54:27 UTC (rev 444) @@ -1,3 +1,9 @@ +2018-11-09 Michal Hoftich + + * tex4ht-fonts-4hf.tex + (tex4ht.dir/texmf/tex4ht/ht-fonts/mozilla/charset/unicode.4hf): removed lot + of unnecessary mappings from Unicode math to ASCII. + 2018-11-08 Michal Hoftich * tex4ht.4ht (czech.4ht): use \quotedblbase instead of custom code for Modified: trunk/lit/tex4ht-fonts-4hf.tex =================================================================== --- trunk/lit/tex4ht-fonts-4hf.tex 2018-11-08 22:21:57 UTC (rev 443) +++ trunk/lit/tex4ht-fonts-4hf.tex 2018-11-09 13:54:27 UTC (rev 444) @@ -1689,15 +1689,15 @@ ` ` ` -` -` -` -`\Hnewline}} +} +>>> + + + %%%%%%%%%%%%%%%% \section{?????} %%%%%%%%%%%%%%%% @@ -20521,6 +20534,8 @@ \csname EndPauseMathClass\endcsname \EndNoFonts |% |} + +| >>> From michal_h21 at gnu.org.ua Thu Nov 29 16:02:17 2018 From: michal_h21 at gnu.org.ua (michal_h21 at gnu.org.ua) Date: Thu, 29 Nov 2018 17:02:17 +0200 Subject: [tex4ht-commits] [SCM] tex4ht updated: r451 - trunk/lit Message-ID: <201811291502.wATF2HFY028197@ulysses.gnu.org.ua> Author: michal_h21 Date: 2018-11-29 17:02:17 +0200 (Thu, 29 Nov 2018) New Revision: 451 Modified: trunk/lit/ChangeLog trunk/lit/tex4ht-html4.tex Log: Added support for webfonts Modified: trunk/lit/ChangeLog =================================================================== --- trunk/lit/ChangeLog 2018-11-29 14:09:48 UTC (rev 450) +++ trunk/lit/ChangeLog 2018-11-29 15:02:17 UTC (rev 451) @@ -2,6 +2,7 @@ * tex4ht-html4.tex (html4.4ht): Added \Configure{AddJs} and \Configure{AddCss} for external script and style sheet inclusion. + * tex4ht-html4.tex (html4.4ht): Added support for web fonts. 2018-11-24 Karl Berry Modified: trunk/lit/tex4ht-html4.tex =================================================================== --- trunk/lit/tex4ht-html4.tex 2018-11-29 14:09:48 UTC (rev 450) +++ trunk/lit/tex4ht-html4.tex 2018-11-29 15:02:17 UTC (rev 451) @@ -17207,6 +17207,7 @@ \expandafter\:temp\expandafter{\aa:Css}\Needs{#1}}} >>> +\section{External scripts and styles} \<<< @@ -17221,9 +17222,64 @@ } >>> +\section{Web fonts support} +These commands declare new font family in the CSS file +The default font family name which should be used in the Css +\textit{font-family} command for a declared font is \textit{rmfamily}. +It use the Latin Modern font installed on the viewer's system. +The Css font family and the local font name can be changed using +\verb|\Configure{FontFamily}{cssfamilyname}{LocalFontName}| command. + +\begin{verbatim} +\Configure{FontFamily}{rmfamily}{Latin Modern} +\end{verbatim} + +The font shapes can be configure using \verb|\Configure{NormalFont}|, +\verb|\Configure{ItalicFont}|, \verb|\Configure{BoldItalicFont}| and +\verb|Configure{BoldFont}|. The argument should be font file in the format +supported by browsers, such as \textit{woff} or \textit{otf}. + +\begin{verbatim} +\Configure{NormalFont}{normal-font-file.otf} +\Configure{BoldFont}{bold-font-file.otf} +\Configure{BoldItalicFont}{bold-italic-font-file.otf} +\Configure{ItalicFont}{italic-font-file.otf} +% Add another font family +\Configure{FontFamily}{hello}{Linux Libertine O} +\Configure{NormalFont}{hello-font-file.otf} +\Css{body{font-family: rmfamily, "AnotherFontFamilyName", serif;}} +\Css{span.hello{font-family: hello, sans-serif;}} +\end{verbatim} + +\<<< + +\newcommand\AddFontFace[4]{% +\Css{@font-face { + font-family: #1; + src: local("#2"), + url('#3'); + #4 + }} + \Configure{Needs}{File: #3}\Needs{} +} + + +% If more font families are used, they need to have different names +\NewConfigure{FontFamily}{2} + +\Configure{FontFamily}{rmfamily}{Latin Modern} + +% Declarations for common font styles, just local family name and font file name are needed to be provided +\NewConfigure{NormalFont}[1]{\AddFontFace{\a:FontFamily}{\b:FontFamily}{#1}{font-weight: normal;font-style: normal;}} +\NewConfigure{BoldFont}[1]{\AddFontFace{\a:FontFamily}{\b:FontFamily}{#1}{font-weight: bold;font-style: normal;}} +\NewConfigure{ItalicFont}[1]{\AddFontFace{\a:FontFamily}{\b:FontFamily}{#1}{font-weight: normal;font-style: italic;}} +\NewConfigure{BoldItalicFont}[1]{\AddFontFace{\a:FontFamily}{\b:FontFamily}{#1}{font-weight: bold;font-style: italic;}} +>>> + + %%%%%%%%%%%%%%%% \section{?????} %%%%%%%%%%%%%%%% @@ -20536,6 +20592,7 @@ |} | +| >>> From michal_h21 at gnu.org.ua Thu Nov 29 19:47:26 2018 From: michal_h21 at gnu.org.ua (michal_h21 at gnu.org.ua) Date: Thu, 29 Nov 2018 20:47:26 +0200 Subject: [tex4ht-commits] [SCM] tex4ht updated: r452 - trunk/lit Message-ID: <201811291847.wATIlPxG030892@ulysses.gnu.org.ua> Author: michal_h21 Date: 2018-11-29 20:47:25 +0200 (Thu, 29 Nov 2018) New Revision: 452 Modified: trunk/lit/tex4ht-html4.tex Log: Redefine \Needs inside a group Modified: trunk/lit/tex4ht-html4.tex =================================================================== --- trunk/lit/tex4ht-html4.tex 2018-11-29 15:02:17 UTC (rev 451) +++ trunk/lit/tex4ht-html4.tex 2018-11-29 18:47:25 UTC (rev 452) @@ -17212,12 +17212,12 @@ \<<< \NewConfigure{AddCss}[1]{% - \Configure{Needs}{File: #1}\Needs{} + {\Configure{Needs}{File: #1}\Needs{}} \Configure{@HEAD}{\HCode{\Hnewline}} } \NewConfigure{AddJs}[1]{% - \Configure{Needs}{File: #1}\Needs{} + {\Configure{Needs}{File: #1}\Needs{}} \Configure{@HEAD}{\HCode{\Hnewline\Hnewline}} } >>> @@ -17263,7 +17263,7 @@ url('#3'); #4 }} - \Configure{Needs}{File: #3}\Needs{} + {\Configure{Needs}{File: #3}\Needs{}} } From michal_h21 at gnu.org.ua Thu Nov 29 20:01:55 2018 From: michal_h21 at gnu.org.ua (michal_h21 at gnu.org.ua) Date: Thu, 29 Nov 2018 21:01:55 +0200 Subject: [tex4ht-commits] [SCM] tex4ht updated: r453 - trunk/lit Message-ID: <201811291901.wATJ1tZh001485@ulysses.gnu.org.ua> Author: michal_h21 Date: 2018-11-29 21:01:55 +0200 (Thu, 29 Nov 2018) New Revision: 453 Modified: trunk/lit/ChangeLog trunk/lit/tex4ht-html4.tex Log: Made the gs command for pdf to png conversion configurable using \Configure{GhostScript}{rungs} Modified: trunk/lit/ChangeLog =================================================================== --- trunk/lit/ChangeLog 2018-11-29 18:47:25 UTC (rev 452) +++ trunk/lit/ChangeLog 2018-11-29 19:01:55 UTC (rev 453) @@ -3,6 +3,8 @@ * tex4ht-html4.tex (html4.4ht): Added \Configure{AddJs} and \Configure{AddCss} for external script and style sheet inclusion. * tex4ht-html4.tex (html4.4ht): Added support for web fonts. + * tex4ht-html4.tex (html4.4ht): Made the GhostScript configuration for + actuall gs executable selection for the PDF to png conversion. 2018-11-24 Karl Berry Modified: trunk/lit/tex4ht-html4.tex =================================================================== --- trunk/lit/tex4ht-html4.tex 2018-11-29 18:47:25 UTC (rev 452) +++ trunk/lit/tex4ht-html4.tex 2018-11-29 19:01:55 UTC (rev 453) @@ -13633,12 +13633,14 @@ \Picture[\a:GraphicsAlt]{{\Gin at base\PictExt} |}} +\NewConfigure{GhostScript}{1} \NewConfigure{PdfConvert}{2} +\Configure{GhostScript}{rungs} \edef\svg:ext{.svg} \ifx\PictExt\svg:ext \Configure{PdfConvert}{svg}{"pdf2svg '\Gin at base.pdf' '\Gin at base-\Gin at page.\a:PdfConvert' \Gin at page"} \else -\Configure{PdfConvert}{png}{"rungs -q -dNOPAUSE -dBATCH -sDEVICE=pngalpha -r300 \ifx\Gin at page\@empty\else -dFirstPage='\Gin at page' -dLastPage='\Gin at page'\fi\space -sOutputFile='\Gin at base-\Gin at page.\a:PdfConvert' \Gin at base.pdf"} +\Configure{PdfConvert}{png}{"\a:GhostScript\space -q -dNOPAUSE -dBATCH -sDEVICE=pngalpha -r300 \ifx\Gin at page\@empty\else -dFirstPage='\Gin at page' -dLastPage='\Gin at page'\fi\space -sOutputFile='\Gin at base-\Gin at page.\a:PdfConvert' \Gin at base.pdf"} \fi \Configure{graphics*} {pdf} From michal_h21 at gnu.org.ua Fri Nov 30 00:25:43 2018 From: michal_h21 at gnu.org.ua (michal_h21 at gnu.org.ua) Date: Fri, 30 Nov 2018 01:25:43 +0200 Subject: [tex4ht-commits] [SCM] tex4ht updated: r454 - trunk/lit Message-ID: <201811292325.wATNPhjs015290@ulysses.gnu.org.ua> Author: michal_h21 Date: 2018-11-30 01:25:43 +0200 (Fri, 30 Nov 2018) New Revision: 454 Modified: trunk/lit/tex4ht-html4.tex Log: Use small s in the Ghostscript configuration name Modified: trunk/lit/tex4ht-html4.tex =================================================================== --- trunk/lit/tex4ht-html4.tex 2018-11-29 19:01:55 UTC (rev 453) +++ trunk/lit/tex4ht-html4.tex 2018-11-29 23:25:43 UTC (rev 454) @@ -13633,14 +13633,14 @@ \Picture[\a:GraphicsAlt]{{\Gin at base\PictExt} |}} -\NewConfigure{GhostScript}{1} +\NewConfigure{Ghostscript}{1} \NewConfigure{PdfConvert}{2} -\Configure{GhostScript}{rungs} +\Configure{Ghostscript}{rungs} \edef\svg:ext{.svg} \ifx\PictExt\svg:ext \Configure{PdfConvert}{svg}{"pdf2svg '\Gin at base.pdf' '\Gin at base-\Gin at page.\a:PdfConvert' \Gin at page"} \else -\Configure{PdfConvert}{png}{"\a:GhostScript\space -q -dNOPAUSE -dBATCH -sDEVICE=pngalpha -r300 \ifx\Gin at page\@empty\else -dFirstPage='\Gin at page' -dLastPage='\Gin at page'\fi\space -sOutputFile='\Gin at base-\Gin at page.\a:PdfConvert' \Gin at base.pdf"} +\Configure{PdfConvert}{png}{"\a:Ghostscript\space -q -dNOPAUSE -dBATCH -sDEVICE=pngalpha -r300 \ifx\Gin at page\@empty\else -dFirstPage='\Gin at page' -dLastPage='\Gin at page'\fi\space -sOutputFile='\Gin at base-\Gin at page.\a:PdfConvert' \Gin at base.pdf"} \fi \Configure{graphics*} {pdf} From michal_h21 at gnu.org.ua Tue Dec 4 15:55:08 2018 From: michal_h21 at gnu.org.ua (michal_h21 at gnu.org.ua) Date: Tue, 4 Dec 2018 16:55:08 +0200 Subject: [tex4ht-commits] [SCM] tex4ht updated: r455 - trunk/lit Message-ID: <201812041455.wB4Et8Ft019292@ulysses.gnu.org.ua> Author: michal_h21 Date: 2018-12-04 16:55:08 +0200 (Tue, 04 Dec 2018) New Revision: 455 Added: trunk/lit/tex4ht-mathjax.tex Modified: trunk/lit/ChangeLog trunk/lit/Makefile trunk/lit/tex4ht-html4.tex Log: Added basic MathJax support Modified: trunk/lit/ChangeLog =================================================================== --- trunk/lit/ChangeLog 2018-11-29 23:25:43 UTC (rev 454) +++ trunk/lit/ChangeLog 2018-12-04 14:55:08 UTC (rev 455) @@ -1,3 +1,9 @@ +2018-12-04 Michal Hoftich + + * tex4ht-html4.tex (html4-math.4ht): added "mathjax" option. + * tex4ht-mathjax.tex (mathjax-latex-4ht.4ht): new literate source holding + definitions for keeping of LaTeX commands in math commands and environments. + 2018-11-29 Michal Hoftich * tex4ht-html4.tex (html4.4ht): Added \Configure{AddJs} and Modified: trunk/lit/Makefile =================================================================== --- trunk/lit/Makefile 2018-11-29 23:25:43 UTC (rev 454) +++ trunk/lit/Makefile 2018-12-04 14:55:08 UTC (rev 455) @@ -242,8 +242,13 @@ derived += $(tex4ht_xhtmml_xtpipes_derived) tex4ht_xhtmml_xtpipes_derived = xhtmml.4xt XhtmmlUtilities.java +derived += $(tex4ht_mathjax_derived) +tex4ht_mathjax_derived = mathjax-latex-4ht.4ht + # wripro.tex generates nothing (not literate). +# + derived += $(xtpipes_derived) xtpipes_derived = \ $(wd)/xtpipes.java \ @@ -410,6 +415,9 @@ $(xtpipes_derived): xtpipes.tex $(common) htlatex $< "xhtml,3,next" "" "" $(tex_1opt) + +$(tex4ht_mathjax_derived): tex4ht-mathjax.tex + htlatex $< "xhtml,3,next" "" "" $(tex_1opt) # Derived files are generated in . and $(wd). # (corresponds to src/java for xtpipes.tex) Modified: trunk/lit/tex4ht-html4.tex =================================================================== --- trunk/lit/tex4ht-html4.tex 2018-11-29 23:25:43 UTC (rev 454) +++ trunk/lit/tex4ht-html4.tex 2018-12-04 14:55:08 UTC (rev 455) @@ -8414,6 +8414,7 @@ | |<32,4 picmath latex|> | +| >>> @@ -8529,9 +8530,36 @@ \Configure{underbrace} {}{\Picture+{}}{\EndPicture} >>> +\<<< +\:CheckOption{mathjax}\if:Option +\input{mathjax-latex-4ht.4ht} +\Configure{@HEAD}{\HCode{ +\Hnewline +}} +\Configure{@HEAD}{\HCode{ \Hnewline}} +\Configure{$}{}{}{\expandafter\AltMathOne} +\Configure{()}{\AltlMath}{} +\Configure{[]}{\AltlDisplay}{} +\fi +>>> - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \section{Shared plain latex Math} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% From michal_h21 at gnu.org.ua Tue Dec 4 21:40:30 2018 From: michal_h21 at gnu.org.ua (michal_h21 at gnu.org.ua) Date: Tue, 4 Dec 2018 22:40:30 +0200 Subject: [tex4ht-commits] [SCM] tex4ht updated: r456 - trunk/lit Message-ID: <201812042040.wB4KeUhN015028@ulysses.gnu.org.ua> Author: michal_h21 Date: 2018-12-04 22:40:30 +0200 (Tue, 04 Dec 2018) New Revision: 456 Modified: trunk/lit/ChangeLog trunk/lit/tex4ht-html4.tex Log: Use \def instead of \newcommand for \AddFontFace Modified: trunk/lit/ChangeLog =================================================================== --- trunk/lit/ChangeLog 2018-12-04 14:55:08 UTC (rev 455) +++ trunk/lit/ChangeLog 2018-12-04 20:40:30 UTC (rev 456) @@ -3,6 +3,8 @@ * tex4ht-html4.tex (html4-math.4ht): added "mathjax" option. * tex4ht-mathjax.tex (mathjax-latex-4ht.4ht): new literate source holding definitions for keeping of LaTeX commands in math commands and environments. + * tex4ht-html4.tex (html4.4ht): use \def instead of \newcommand for + \AddFontFace, it causes compilation error. 2018-11-29 Michal Hoftich Modified: trunk/lit/tex4ht-html4.tex =================================================================== --- trunk/lit/tex4ht-html4.tex 2018-12-04 14:55:08 UTC (rev 455) +++ trunk/lit/tex4ht-html4.tex 2018-12-04 20:40:30 UTC (rev 456) @@ -17286,7 +17286,8 @@ \<<< -\newcommand\AddFontFace[4]{% +% \newcommand\AddFontFace[4]{% +\def\AddFontFace#1#2#3#4{% \Css{@font-face { font-family: #1; src: local("#2"), From michal_h21 at gnu.org.ua Tue Dec 4 22:41:47 2018 From: michal_h21 at gnu.org.ua (michal_h21 at gnu.org.ua) Date: Tue, 4 Dec 2018 23:41:47 +0200 Subject: [tex4ht-commits] [SCM] tex4ht updated: r457 - trunk/lit Message-ID: <201812042141.wB4LflHM023977@ulysses.gnu.org.ua> Author: michal_h21 Date: 2018-12-04 23:41:47 +0200 (Tue, 04 Dec 2018) New Revision: 457 Modified: trunk/lit/ChangeLog trunk/lit/tex4ht-4ht.tex trunk/lit/tex4ht-html4.tex trunk/lit/tex4ht-mathml.tex Log: Use MathJax also for MathML output Modified: trunk/lit/ChangeLog =================================================================== --- trunk/lit/ChangeLog 2018-12-04 20:40:30 UTC (rev 456) +++ trunk/lit/ChangeLog 2018-12-04 21:41:47 UTC (rev 457) @@ -3,6 +3,8 @@ * tex4ht-html4.tex (html4-math.4ht): added "mathjax" option. * tex4ht-mathjax.tex (mathjax-latex-4ht.4ht): new literate source holding definitions for keeping of LaTeX commands in math commands and environments. + * tex4ht-mathml.tex (html-mml.4ht): use "mathjax" option also for MathML + output. * tex4ht-html4.tex (html4.4ht): use \def instead of \newcommand for \AddFontFace, it causes compilation error. Modified: trunk/lit/tex4ht-4ht.tex =================================================================== --- trunk/lit/tex4ht-4ht.tex 2018-12-04 20:40:30 UTC (rev 456) +++ trunk/lit/tex4ht-4ht.tex 2018-12-04 21:41:47 UTC (rev 457) @@ -33629,6 +33629,12 @@ \<<< {\HCode{}}>>> +\Section{MathJax} + +\<<< +\NewConfigure{MathjaxSource}{1} +>>> + \Section{Space Characters} We have the definition \`'\def~{\penalty \@M \ }' in TeX, Modified: trunk/lit/tex4ht-html4.tex =================================================================== --- trunk/lit/tex4ht-html4.tex 2018-12-04 20:40:30 UTC (rev 456) +++ trunk/lit/tex4ht-html4.tex 2018-12-04 21:41:47 UTC (rev 457) @@ -8552,7 +8552,8 @@ }); \Hnewline }} -\Configure{@HEAD}{\HCode{ \Hnewline}} +\Configure{MathjaxSource}{https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/latest.js?config=TeX-AMS-MML_HTMLorMML} +\Configure{@HEAD}{\HCode{ \Hnewline}} \Configure{$}{}{}{\expandafter\AltMathOne} \Configure{()}{\AltlMath}{} \Configure{[]}{\AltlDisplay}{} Modified: trunk/lit/tex4ht-mathml.tex =================================================================== --- trunk/lit/tex4ht-mathml.tex 2018-12-04 20:40:30 UTC (rev 456) +++ trunk/lit/tex4ht-mathml.tex 2018-12-04 21:41:47 UTC (rev 457) @@ -1805,6 +1805,14 @@ unicode maps already seem to assume raised representation for the primes. + +\<<< +\:CheckOption{mathjax}\if:Option +\Configure{MathjaxSource}{https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/latest.js?config=MML_HTMLorMML} +\Configure{@HEAD}{\HCode{ \Hnewline}} +\fi +>>> + %%%%%%%%%%%%%%%%%%%%%%%%%% \subsection{plain.sty} %%%%%%%%%%%%%%%%%%%%%%%%%% From karl at gnu.org.ua Thu Dec 6 03:12:54 2018 From: karl at gnu.org.ua (karl at gnu.org.ua) Date: Thu, 6 Dec 2018 04:12:54 +0200 Subject: [tex4ht-commits] [SCM] tex4ht updated: r458 - trunk/lit Message-ID: <201812060212.wB62CsOo014692@ulysses.gnu.org.ua> Author: karl Date: 2018-12-06 04:12:54 +0200 (Thu, 06 Dec 2018) New Revision: 458 Modified: trunk/lit/ChangeLog trunk/lit/tex4ht-html4.tex trunk/lit/tex4ht-mathjax.tex Log: copyright,id Modified: trunk/lit/ChangeLog =================================================================== --- trunk/lit/ChangeLog 2018-12-04 21:41:47 UTC (rev 457) +++ trunk/lit/ChangeLog 2018-12-06 02:12:54 UTC (rev 458) @@ -1,10 +1,11 @@ 2018-12-04 Michal Hoftich * tex4ht-html4.tex (html4-math.4ht): added "mathjax" option. - * tex4ht-mathjax.tex (mathjax-latex-4ht.4ht): new literate source holding - definitions for keeping of LaTeX commands in math commands and environments. - * tex4ht-mathml.tex (html-mml.4ht): use "mathjax" option also for MathML - output. + * tex4ht-mathjax.tex (mathjax-latex-4ht.4ht): new literate + source holding definitions for keeping of LaTeX commands in math + commands and environments. + * tex4ht-mathml.tex (html-mml.4ht): use "mathjax" option also + for MathML output. * tex4ht-html4.tex (html4.4ht): use \def instead of \newcommand for \AddFontFace, it causes compilation error. Modified: trunk/lit/tex4ht-html4.tex =================================================================== --- trunk/lit/tex4ht-html4.tex 2018-12-04 21:41:47 UTC (rev 457) +++ trunk/lit/tex4ht-html4.tex 2018-12-06 02:12:54 UTC (rev 458) @@ -73,7 +73,7 @@ \<<< % html4-math.4ht (|version), generated from |jobname.tex -% Copyright 2009-2017 TeX Users Group +% Copyright 2009-2018 TeX Users Group % Copyright |CopyYear.1999. Eitan M. Gurari | >>> Modified: trunk/lit/tex4ht-mathjax.tex =================================================================== --- trunk/lit/tex4ht-mathjax.tex 2018-12-04 21:41:47 UTC (rev 457) +++ trunk/lit/tex4ht-mathjax.tex 2018-12-06 02:12:54 UTC (rev 458) @@ -1,9 +1,9 @@ -% compile times: latex tex4ht-mathjax +% $Id$ +% compile: latex tex4ht-mathjax % -% Copyright (C) 2018 TeX Users Group +% Copyright 2018 TeX Users Group % Released under LPPL 1.3c+. % See tex4ht-cpright.tex for license text. -% \ifx \HTML\UnDef \def\HTML{mathjax-latex-4ht} @@ -19,7 +19,7 @@ \<<< % mathjax-latex-4ht.sty (|version), generated from |jobname.tex -% Copyright (C) 2018 TeX Users Group +% Copyright 2018 TeX Users Group | | | Property changes on: trunk/lit/tex4ht-mathjax.tex ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Date Author Id Revision \ No newline at end of property From michal_h21 at gnu.org.ua Sun Dec 9 10:55:54 2018 From: michal_h21 at gnu.org.ua (michal_h21 at gnu.org.ua) Date: Sun, 9 Dec 2018 11:55:54 +0200 Subject: [tex4ht-commits] [SCM] tex4ht updated: r459 - trunk/lit Message-ID: <201812090955.wB99ts1x023012@ulysses.gnu.org.ua> Author: michal_h21 Date: 2018-12-09 11:55:54 +0200 (Sun, 09 Dec 2018) New Revision: 459 Modified: trunk/lit/ChangeLog trunk/lit/tex4ht-mathjax.tex Log: Fixed environment configurations Modified: trunk/lit/ChangeLog =================================================================== --- trunk/lit/ChangeLog 2018-12-06 02:12:54 UTC (rev 458) +++ trunk/lit/ChangeLog 2018-12-09 09:55:54 UTC (rev 459) @@ -1,3 +1,8 @@ +2018-12-10 Michal Hoftich + + * tex4ht-mathjax.tex (mathjax-latex-4ht.4ht): configure environments and + other redefinitions inside \AtBeginDocument. + 2018-12-04 Michal Hoftich * tex4ht-html4.tex (html4-math.4ht): added "mathjax" option. @@ -8,6 +13,7 @@ for MathML output. * tex4ht-html4.tex (html4.4ht): use \def instead of \newcommand for \AddFontFace, it causes compilation error. + * tex4ht-4ht.tex (latex.4ht): added \NewConfigure{MathjaxSource}. 2018-11-29 Michal Hoftich Modified: trunk/lit/tex4ht-mathjax.tex =================================================================== --- trunk/lit/tex4ht-mathjax.tex 2018-12-06 02:12:54 UTC (rev 458) +++ trunk/lit/tex4ht-mathjax.tex 2018-12-09 09:55:54 UTC (rev 459) @@ -23,7 +23,9 @@ | | | +\AtBeginDocument{% | +} \endinput >>> From michal_h21 at gnu.org.ua Mon Dec 10 18:01:18 2018 From: michal_h21 at gnu.org.ua (michal_h21 at gnu.org.ua) Date: Mon, 10 Dec 2018 19:01:18 +0200 Subject: [tex4ht-commits] [SCM] tex4ht updated: r460 - trunk/lit Message-ID: <201812101701.wBAH1I6K021284@ulysses.gnu.org.ua> Author: michal_h21 Date: 2018-12-10 19:01:18 +0200 (Mon, 10 Dec 2018) New Revision: 460 Modified: trunk/lit/ChangeLog trunk/lit/tex4ht-mathjax.tex Log: Added configurations for eqnarray Modified: trunk/lit/ChangeLog =================================================================== --- trunk/lit/ChangeLog 2018-12-09 09:55:54 UTC (rev 459) +++ trunk/lit/ChangeLog 2018-12-10 17:01:18 UTC (rev 460) @@ -2,6 +2,8 @@ * tex4ht-mathjax.tex (mathjax-latex-4ht.4ht): configure environments and other redefinitions inside \AtBeginDocument. + * tex4ht-mathjax.tex (mathjax-latex-4ht.4ht): added configurations for + eqnarray. 2018-12-04 Michal Hoftich Modified: trunk/lit/tex4ht-mathjax.tex =================================================================== --- trunk/lit/tex4ht-mathjax.tex 2018-12-09 09:55:54 UTC (rev 459) +++ trunk/lit/tex4ht-mathjax.tex 2018-12-10 17:01:18 UTC (rev 460) @@ -120,6 +120,8 @@ \VerbMath{equation*} \VerbMath{math} \VerbMath{displaymath} +\VerbMath{eqnarray} +\VerbMath{eqnarray*} >>> It is necessary to reset env configurations for multline From michal_h21 at gnu.org.ua Tue Dec 18 12:20:22 2018 From: michal_h21 at gnu.org.ua (michal_h21 at gnu.org.ua) Date: Tue, 18 Dec 2018 13:20:22 +0200 Subject: [tex4ht-commits] [SCM] tex4ht updated: r461 - trunk/lit Message-ID: <201812181120.wBIBKMTF012711@ulysses.gnu.org.ua> Author: michal_h21 Date: 2018-12-18 13:20:22 +0200 (Tue, 18 Dec 2018) New Revision: 461 Modified: trunk/lit/ChangeLog trunk/lit/Makefile trunk/lit/tex4ht-4ht.tex Log: Fixed compilation error for pstricks Modified: trunk/lit/ChangeLog =================================================================== --- trunk/lit/ChangeLog 2018-12-10 17:01:18 UTC (rev 460) +++ trunk/lit/ChangeLog 2018-12-18 11:20:22 UTC (rev 461) @@ -1,3 +1,8 @@ +2018-12-18 Michal Hoftich + + * tex4ht-4ht.tex (pstricks.4ht): fixed compilation error. + https://tex.stackexchange.com/a/466340/2891 + 2018-12-10 Michal Hoftich * tex4ht-mathjax.tex (mathjax-latex-4ht.4ht): configure environments and Modified: trunk/lit/Makefile =================================================================== --- trunk/lit/Makefile 2018-12-10 17:01:18 UTC (rev 460) +++ trunk/lit/Makefile 2018-12-18 11:20:22 UTC (rev 461) @@ -52,6 +52,7 @@ latex.4ht lettrine.4ht listings.4ht \ magyar.4ht mdframed.4ht memoir.4ht multicol.4ht multirow.4ht \ nameref.4ht \ + pstricks.4ht \ quoting.4ht \ reading.4ht \ scrartcl.4ht scrbook.4ht scrreprt.4ht sectionbreak.4ht \ Modified: trunk/lit/tex4ht-4ht.tex =================================================================== --- trunk/lit/tex4ht-4ht.tex 2018-12-10 17:01:18 UTC (rev 460) +++ trunk/lit/tex4ht-4ht.tex 2018-12-18 11:20:22 UTC (rev 461) @@ -24452,7 +24452,7 @@ \dp\pst at hbox=-\pst at dimb \setbox\pst at hbox=\hbox{% \kern-\pst at dima -\ifx\pst at tempa\@empty\else +\ifx\pst at tempa\@undefined\else \advance\pst at dimd-\pst at dimb \pst at dimd=\pst at tempa\pst at dimd \advance\pst at dimd\pst at dimb From karl at gnu.org.ua Wed Dec 19 00:43:12 2018 From: karl at gnu.org.ua (karl at gnu.org.ua) Date: Wed, 19 Dec 2018 01:43:12 +0200 Subject: [tex4ht-commits] [SCM] tex4ht updated: r462 - trunk/lit Message-ID: <201812182343.wBINhCjr001970@ulysses.gnu.org.ua> Author: karl Date: 2018-12-19 01:43:12 +0200 (Wed, 19 Dec 2018) New Revision: 462 Modified: trunk/lit/ChangeLog trunk/lit/Makefile trunk/lit/tex4ht-4ht.tex Log: copyright notice Modified: trunk/lit/ChangeLog =================================================================== --- trunk/lit/ChangeLog 2018-12-18 11:20:22 UTC (rev 461) +++ trunk/lit/ChangeLog 2018-12-18 23:43:12 UTC (rev 462) @@ -1,3 +1,7 @@ +2018-12-18 Karl Berry + + * tex4ht-4ht.tex (pstricks.4ht): copyright. + 2018-12-18 Michal Hoftich * tex4ht-4ht.tex (pstricks.4ht): fixed compilation error. Modified: trunk/lit/Makefile =================================================================== --- trunk/lit/Makefile 2018-12-18 11:20:22 UTC (rev 461) +++ trunk/lit/Makefile 2018-12-18 23:43:12 UTC (rev 462) @@ -52,7 +52,7 @@ latex.4ht lettrine.4ht listings.4ht \ magyar.4ht mdframed.4ht memoir.4ht multicol.4ht multirow.4ht \ nameref.4ht \ - pstricks.4ht \ + pstricks.4ht \ quoting.4ht \ reading.4ht \ scrartcl.4ht scrbook.4ht scrreprt.4ht sectionbreak.4ht \ Modified: trunk/lit/tex4ht-4ht.tex =================================================================== --- trunk/lit/tex4ht-4ht.tex 2018-12-18 11:20:22 UTC (rev 461) +++ trunk/lit/tex4ht-4ht.tex 2018-12-18 23:43:12 UTC (rev 462) @@ -24383,10 +24383,9 @@ %%%%%%%%%%%%%%%%%%%% \<<< -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% pstricks.4ht |version % -% Copyright (C) |CopyYear.1997. Eitan M. Gurari % -| +% lettrine.4ht (|version), generated from |jobname.tex +% Copyright |CopyYear.1997. Eitan M. Gurari +| | | | From michal_h21 at gnu.org.ua Wed Dec 19 10:43:45 2018 From: michal_h21 at gnu.org.ua (michal_h21 at gnu.org.ua) Date: Wed, 19 Dec 2018 11:43:45 +0200 Subject: [tex4ht-commits] [SCM] tex4ht updated: r463 - trunk/lit Message-ID: <201812190943.wBJ9hjPA022430@ulysses.gnu.org.ua> Author: michal_h21 Date: 2018-12-19 11:43:45 +0200 (Wed, 19 Dec 2018) New Revision: 463 Modified: trunk/lit/ChangeLog trunk/lit/tex4ht-options.tex Log: Added support for mathml option for docbook and tei formats Modified: trunk/lit/ChangeLog =================================================================== --- trunk/lit/ChangeLog 2018-12-18 23:43:12 UTC (rev 462) +++ trunk/lit/ChangeLog 2018-12-19 09:43:45 UTC (rev 463) @@ -1,3 +1,8 @@ +2018-12-19 Michal Hoftich + + * tex4ht-options.tex (tex4ht.4ht): added support for mathml option for + docbook and tei formats. + 2018-12-18 Karl Berry * tex4ht-4ht.tex (pstricks.4ht): copyright. Modified: trunk/lit/tex4ht-options.tex =================================================================== --- trunk/lit/tex4ht-options.tex 2018-12-18 23:43:12 UTC (rev 462) +++ trunk/lit/tex4ht-options.tex 2018-12-19 09:43:45 UTC (rev 463) @@ -293,7 +293,14 @@ \Configure{tei}{% \Hinclude[*]{tei.4ht}% \Hinclude[*]{unicode.4ht}% - \Hinclude[*]{tei-math.4ht}% + \:CheckOption{mathml}\if:Option% + \else\:CheckOption{mathml-}\fi% + \if:Option% + \Hinclude[*]{mathml.4ht}% + \Hinclude[*]{tei-mml.4ht}% + \else + \Hinclude[*]{tei-math.4ht}% + \fi \:CheckOption{svg}% \if:Option \else\:CheckOption{svg-}\fi \if:Option \else\:CheckOption{svg-obj}\fi @@ -324,7 +331,14 @@ \Configure{docbook}{% \Hinclude[*]{docbook.4ht}% \Hinclude[*]{unicode.4ht}% - \Hinclude[*]{docbook-math.4ht}% + \:CheckOption{mathml}\if:Option% + \else\:CheckOption{mathml-}\fi% + \if:Option% + \Hinclude[*]{mathml.4ht}% + \Hinclude[*]{docbook-mml.4ht}% + \else + \Hinclude[*]{docbook-math.4ht}% + \fi \:CheckOption{svg}% \if:Option \else\:CheckOption{svg-}\fi \if:Option \else\:CheckOption{svg-obj}\fi From karl at gnu.org.ua Wed Dec 19 23:40:19 2018 From: karl at gnu.org.ua (karl at gnu.org.ua) Date: Thu, 20 Dec 2018 00:40:19 +0200 Subject: [tex4ht-commits] [SCM] tex4ht updated: r464 - trunk/lit Message-ID: <201812192240.wBJMeJtE012350@ulysses.gnu.org.ua> Author: karl Date: 2018-12-20 00:40:19 +0200 (Thu, 20 Dec 2018) New Revision: 464 Modified: trunk/lit/tex4ht-options.tex Log: copyright Modified: trunk/lit/tex4ht-options.tex =================================================================== --- trunk/lit/tex4ht-options.tex 2018-12-19 09:43:45 UTC (rev 463) +++ trunk/lit/tex4ht-options.tex 2018-12-19 22:40:19 UTC (rev 464) @@ -49,7 +49,7 @@ \string:RestoreCatcodes\endcsname{\catcode`\%|=\the \catcode`\%}\catcode`\%|=14\fi % tex4ht.4ht (|version), generated from |jobname.tex -% Copyright 2009-2017 TeX Users Group +% Copyright 2009-2018 TeX Users Group % Copyright |CopyYear.1997. Eitan M. Gurari | | From michal_h21 at gnu.org.ua Thu Dec 20 09:56:19 2018 From: michal_h21 at gnu.org.ua (michal_h21 at gnu.org.ua) Date: Thu, 20 Dec 2018 10:56:19 +0200 Subject: [tex4ht-commits] [SCM] tex4ht updated: r465 - trunk/lit Message-ID: <201812200856.wBK8uJfL023952@ulysses.gnu.org.ua> Author: michal_h21 Date: 2018-12-20 10:56:19 +0200 (Thu, 20 Dec 2018) New Revision: 465 Modified: trunk/lit/ChangeLog trunk/lit/tex4ht-4ht.tex Log: use dvips driver for xcolor and graphics with xelatex Modified: trunk/lit/ChangeLog =================================================================== --- trunk/lit/ChangeLog 2018-12-19 22:40:19 UTC (rev 464) +++ trunk/lit/ChangeLog 2018-12-20 08:56:19 UTC (rev 465) @@ -1,3 +1,8 @@ +2018-12-20 Michal Hoftich + + * tex4ht-4ht.tex (usepackage.4ht): load dvips driver for graphicx and xcolor + packages with XeLaTeX. It fixes PDF support. + 2018-12-19 Michal Hoftich * tex4ht-options.tex (tex4ht.4ht): added support for mathml option for Modified: trunk/lit/tex4ht-4ht.tex =================================================================== --- trunk/lit/tex4ht-4ht.tex 2018-12-19 22:40:19 UTC (rev 464) +++ trunk/lit/tex4ht-4ht.tex 2018-12-20 08:56:19 UTC (rev 465) @@ -24806,6 +24806,20 @@ \EndVerbatim +Fix for XeTeX graphics - PDF inclusion doesn't work with default driver, +dvips needs to be used instead + +\<<< +graphics,>>> + +\<<< +\def\:temp{graphics}\ifx\@currname\:temp + \ifdefined\XeTeXversion + \PassOptionsToPackage{dvips}{graphics} + \fi +\fi +>>> + %%%%%%%%%%%%%%%%%%%%%%% \SubSection{graphicx} %%%%%%%%%%%%%%%%%%%%%%% @@ -25324,6 +25338,19 @@ >>> +We need to use dvips driver with XeLaTeX + +\<<< +xcolor,>>> + +\<<< +\def\:temp{xcolor}\ifx\@currname\:temp + \ifdefined\XeTeXversion + \PassOptionsToPackage{dvips}{xcolor} + \fi +\fi +>>> + %%%%%%%%%%%%%%%%%%%%%%% \Section{framed} %%%%%%%%%%%%%%%%%%%%%%% From karl at gnu.org.ua Fri Dec 21 00:39:52 2018 From: karl at gnu.org.ua (karl at gnu.org.ua) Date: Fri, 21 Dec 2018 01:39:52 +0200 Subject: [tex4ht-commits] [SCM] tex4ht updated: r466 - trunk/lit Message-ID: <201812202339.wBKNdqKO023758@ulysses.gnu.org.ua> Author: karl Date: 2018-12-21 01:39:51 +0200 (Fri, 21 Dec 2018) New Revision: 466 Modified: trunk/lit/tex4ht-4ht.tex Log: copywrite Modified: trunk/lit/tex4ht-4ht.tex =================================================================== --- trunk/lit/tex4ht-4ht.tex 2018-12-20 08:56:19 UTC (rev 465) +++ trunk/lit/tex4ht-4ht.tex 2018-12-20 23:39:51 UTC (rev 466) @@ -442,7 +442,7 @@ \<<< % usepackage.4ht (|version), generated from |jobname.tex % Copyright |CopyYear.2003. Eitan M. Gurari -| +| | \endinput >>> From michal_h21 at gnu.org.ua Thu Dec 27 21:00:00 2018 From: michal_h21 at gnu.org.ua (michal_h21 at gnu.org.ua) Date: Thu, 27 Dec 2018 22:00:00 +0200 Subject: [tex4ht-commits] [SCM] tex4ht updated: r467 - trunk/lit Message-ID: <201812272000.wBRK004h020466@ulysses.gnu.org.ua> Author: michal_h21 Date: 2018-12-27 21:59:59 +0200 (Thu, 27 Dec 2018) New Revision: 467 Modified: trunk/lit/ChangeLog trunk/lit/tex4ht-options.tex trunk/lit/tex4ht-svg.tex Log: Renamed file svg.4ht to svg-option.4ht to prevent conflicts with svg.sty Modified: trunk/lit/ChangeLog =================================================================== --- trunk/lit/ChangeLog 2018-12-20 23:39:51 UTC (rev 466) +++ trunk/lit/ChangeLog 2018-12-27 19:59:59 UTC (rev 467) @@ -1,3 +1,9 @@ +2018-12-27 Michal Hoftich + + * tex4ht-svg.tex (svg-option.4ht, html4-svg.4ht): renamed svg.4ht to + svg-option.4ht due to name conflict with svg.sty. + * tex4ht-options.tex (tex4ht.4ht): use svg-option.4ht instead of svg.4ht. + 2018-12-20 Michal Hoftich * tex4ht-4ht.tex (usepackage.4ht): load dvips driver for graphicx and xcolor Modified: trunk/lit/tex4ht-options.tex =================================================================== --- trunk/lit/tex4ht-options.tex 2018-12-20 23:39:51 UTC (rev 466) +++ trunk/lit/tex4ht-options.tex 2018-12-27 19:59:59 UTC (rev 467) @@ -133,7 +133,7 @@ \if:Option \else\:CheckOption{svg-obj}\fi \if:Option \else\:CheckOption{svg-inline}\fi \if:Option - \Hinclude[*]{svg.4ht}% + \Hinclude[*]{svg-option.4ht}% \Hinclude[*]{html4-svg.4ht}% \:CheckOption{info}\if:Option \Hinclude[*]{infosvg.4ht}\fi \fi @@ -149,7 +149,7 @@ \if:Option \else\:CheckOption{svg-}\fi \if:Option \else\:CheckOption{svg-obj}\fi \if:Option \else\:CheckOption{svg-inline}\fi - \if:Option \Hinclude[*]{svg.4ht}% + \if:Option \Hinclude[*]{svg-option.4ht}% \:CheckOption{info}\if:Option \Hinclude[*]{infosvg.4ht}\fi \fi } @@ -167,7 +167,7 @@ \if:Option \else\:CheckOption{svg-}\fi \if:Option \else\:CheckOption{svg-obj}\fi \if:Option \else\:CheckOption{svg-inline}\fi - \if:Option \Hinclude[*]{svg.4ht}% + \if:Option \Hinclude[*]{svg-option.4ht}% \:CheckOption{info}\if:Option \Hinclude[*]{infosvg.4ht}\fi \fi \:CheckOption{mathplayer}\if:Option @@ -193,7 +193,7 @@ \if:Option \else\:CheckOption{svg-}\fi \if:Option \else\:CheckOption{svg-obj}\fi \if:Option \else\:CheckOption{svg-inline}\fi - \if:Option \Hinclude[*]{svg.4ht}% + \if:Option \Hinclude[*]{svg-option.4ht}% \:CheckOption{info}\if:Option \Hinclude[*]{infosvg.4ht}\fi \fi } @@ -249,7 +249,7 @@ \if:Option \else\:CheckOption{svg-}\fi \if:Option \else\:CheckOption{svg-obj}\fi \if:Option \else\:CheckOption{svg-inline}\fi - \if:Option \Hinclude[*]{svg.4ht}% + \if:Option \Hinclude[*]{svg-option.4ht}% \:CheckOption{info}\if:Option \Hinclude[*]{infosvg.4ht}\fi \fi \:CheckOption{mathplayer}\if:Option @@ -282,7 +282,7 @@ \if:Option \else\:CheckOption{svg-}\fi \if:Option \else\:CheckOption{svg-obj}\fi \if:Option \else\:CheckOption{svg-inline}\fi - \if:Option \Hinclude[*]{svg.4ht}% + \if:Option \Hinclude[*]{svg-option.4ht}% \:CheckOption{info}\if:Option \Hinclude[*]{infosvg.4ht}\fi \fi \Hinclude[*]{html5.4ht}% @@ -305,7 +305,7 @@ \if:Option \else\:CheckOption{svg-}\fi \if:Option \else\:CheckOption{svg-obj}\fi \if:Option \else\:CheckOption{svg-inline}\fi - \if:Option \Hinclude[*]{svg.4ht}% + \if:Option \Hinclude[*]{svg-option.4ht}% \:CheckOption{info}\if:Option \Hinclude[*]{infosvg.4ht}\fi \fi } @@ -320,7 +320,7 @@ \if:Option \else\:CheckOption{svg-}\fi \if:Option \else\:CheckOption{svg-obj}\fi \if:Option \else\:CheckOption{svg-inline}\fi - \if:Option \Hinclude[*]{svg.4ht}% + \if:Option \Hinclude[*]{svg-option.4ht}% \:CheckOption{info}\if:Option \Hinclude[*]{infosvg.4ht}\fi \fi } @@ -343,7 +343,7 @@ \if:Option \else\:CheckOption{svg-}\fi \if:Option \else\:CheckOption{svg-obj}\fi \if:Option \else\:CheckOption{svg-inline}\fi - \if:Option \Hinclude[*]{svg.4ht}% + \if:Option \Hinclude[*]{svg-option.4ht}% \:CheckOption{info}\if:Option \Hinclude[*]{infosvg.4ht}\fi \fi } @@ -358,7 +358,7 @@ \if:Option \else\:CheckOption{svg-}\fi \if:Option \else\:CheckOption{svg-obj}\fi \if:Option \else\:CheckOption{svg-inline}\fi - \if:Option \Hinclude[*]{svg.4ht}% + \if:Option \Hinclude[*]{svg-option.4ht}% \:CheckOption{info}\if:Option \Hinclude[*]{infosvg.4ht}\fi \fi } Modified: trunk/lit/tex4ht-svg.tex =================================================================== --- trunk/lit/tex4ht-svg.tex 2018-12-20 23:39:51 UTC (rev 466) +++ trunk/lit/tex4ht-svg.tex 2018-12-27 19:59:59 UTC (rev 467) @@ -10,7 +10,7 @@ %%%%%%%%%%%%%%%%%% load style files %%%%%%%%%%%%%%%%%%%%%%%%%% \ifx \HTML\UnDef - \def\HTML{svg,html4-svg} + \def\HTML{svg-option,html4-svg} \def\CONFIG{\jobname} \def\MAKETITLE{\author{Eitan M. Gurari}} \def\next{\input mktex4ht.4ht \endinput} @@ -24,8 +24,8 @@ \chapter{Preamble} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\<<< -% svg.4ht (|version), generated from |jobname.tex +\<<< +% svg-option.4ht (|version), generated from |jobname.tex % Copyright 2009-2017 TeX Users Group % Copyright |CopyYear.2001. Eitan M. Gurari | @@ -34,7 +34,7 @@ % 2017-05-05 Michal % Change DTD and other stuff only for svg-inline % this is legacy option which will hold the original `svg` option behaviour -\<<< +\<<< \:CheckOption{svg-inline}\if:Option \Configure{VERSION} {\IgnorePar\HCode{ ?> \Hnewline}} @@ -52,7 +52,7 @@ \else \expandafter\:encoding\a:charset\fi" >>> -\<<< +\<<< \Configure{@DOCTYPE} {"\Hnewline "http://www.w3.org/TR/2001/PR-SVG-20010719/DTD/svg10.dtd">\Hnewline @@ -77,7 +77,7 @@ \fi >>> -\<<< +\<<< \Configure{@HTML} {\Hnewline xmlns:svg="http://www.w3.org/2000/svg"\Hnewline } \fi @@ -97,7 +97,7 @@ -\<<< +\<<< \Configure{Picture}{.svg} \:CheckOption{svg-obj} \if:Option | @@ -157,7 +157,7 @@ \section{Include graphics} %%%%%%%%%%%%%%%%%% -\<<< +\<<< \Configure{graphics*} {svg} {{\Configure{Needs}{File: \csname Gin at base\endcsname.svg}\Needs{}}% @@ -178,7 +178,7 @@ -\<<< +\<<< \:CheckOption{draw} \if:Option \:CheckOption{th4} \if:Option \Configure{Fig} {\Svg} From michal_h21 at gnu.org.ua Thu Dec 27 21:01:42 2018 From: michal_h21 at gnu.org.ua (michal_h21 at gnu.org.ua) Date: Thu, 27 Dec 2018 22:01:42 +0200 Subject: [tex4ht-commits] [SCM] tex4ht updated: r468 - trunk/lit Message-ID: <201812272001.wBRK1gwR020788@ulysses.gnu.org.ua> Author: michal_h21 Date: 2018-12-27 22:01:42 +0200 (Thu, 27 Dec 2018) New Revision: 468 Modified: trunk/lit/Makefile Log: Updated Makefile to take into account svg-options Modified: trunk/lit/Makefile =================================================================== --- trunk/lit/Makefile 2018-12-27 19:59:59 UTC (rev 467) +++ trunk/lit/Makefile 2018-12-27 20:01:42 UTC (rev 468) @@ -223,7 +223,7 @@ tex4ht_sty_derived = tex4ht.sty derived += $(tex4ht_svg_derived) -tex4ht_svg_derived = svg.4ht html4-svg.4ht +tex4ht_svg_derived = svg-option.4ht html4-svg.4ht derived += $(tex4ht_t4ht_derived) tex4ht_t4ht_derived = t4ht.c From michal_h21 at gnu.org.ua Thu Dec 27 21:23:16 2018 From: michal_h21 at gnu.org.ua (michal_h21 at gnu.org.ua) Date: Thu, 27 Dec 2018 22:23:16 +0200 Subject: [tex4ht-commits] [SCM] tex4ht updated: r469 - trunk/lit Message-ID: <201812272023.wBRKNGq5025274@ulysses.gnu.org.ua> Author: michal_h21 Date: 2018-12-27 22:23:16 +0200 (Thu, 27 Dec 2018) New Revision: 469 Modified: trunk/lit/ChangeLog trunk/lit/Makefile trunk/lit/mktex4ht-cnf.tex trunk/lit/tex4ht-4ht.tex Log: Added basic support for the svg package Modified: trunk/lit/ChangeLog =================================================================== --- trunk/lit/ChangeLog 2018-12-27 20:01:42 UTC (rev 468) +++ trunk/lit/ChangeLog 2018-12-27 20:23:16 UTC (rev 469) @@ -3,6 +3,7 @@ * tex4ht-svg.tex (svg-option.4ht, html4-svg.4ht): renamed svg.4ht to svg-option.4ht due to name conflict with svg.sty. * tex4ht-options.tex (tex4ht.4ht): use svg-option.4ht instead of svg.4ht. + * tex4ht-4ht.tex (svg.4ht): added basic support for the svg.sty package. 2018-12-20 Michal Hoftich Modified: trunk/lit/Makefile =================================================================== --- trunk/lit/Makefile 2018-12-27 20:01:42 UTC (rev 468) +++ trunk/lit/Makefile 2018-12-27 20:23:16 UTC (rev 469) @@ -56,7 +56,7 @@ quoting.4ht \ reading.4ht \ scrartcl.4ht scrbook.4ht scrreprt.4ht sectionbreak.4ht \ - skak.4ht spanish.4ht subscript.4ht \ + skak.4ht spanish.4ht subscript.4ht svg.4ht \ titlesec.4ht tocloft.4ht tuenc-luatex.4ht tuenc-xetex.4ht \ usepackage.4ht usepackage-fontspec.4ht \ wrapfig.4ht \ Modified: trunk/lit/mktex4ht-cnf.tex =================================================================== --- trunk/lit/mktex4ht-cnf.tex 2018-12-27 20:01:42 UTC (rev 468) +++ trunk/lit/mktex4ht-cnf.tex 2018-12-27 20:23:16 UTC (rev 469) @@ -176,6 +176,7 @@ \AddFile{7}{epsfig} \AddFile{4}{graphics} \AddFile{4}{graphicx} +\AddFile{9}{svg} \AddFile{9}{endfloat} \AddFile{9}{mfpic} \AddFile{9}{pb-diagram} Modified: trunk/lit/tex4ht-4ht.tex =================================================================== --- trunk/lit/tex4ht-4ht.tex 2018-12-27 20:01:42 UTC (rev 468) +++ trunk/lit/tex4ht-4ht.tex 2018-12-27 20:23:16 UTC (rev 469) @@ -24868,10 +24868,33 @@ use instructions like \`'\setlength\tmp:dim\Gin at ewidth' instead of \`'\tmp:dim=\Gin at ewidth'. + %%%%%%%%%%%%%%%%%%%%%%% -\SubSection{endfloat} +\Section{svg} %%%%%%%%%%%%%%%%%%%%%%% +\<<< +% svg.4ht (|version), generated from |jobname.tex +% Copyright 2018 TeX Users Group +| +| +\Hinput{svg} +\endinput +>>> \AddFile{9}{svg} + +\<<< +\renewcommand\includesvg[2][]{% +% detect if an extension has been used +\filename at parse{#2} +\@ifundefined{filename at ext}{\edef\svg:filename{#2.svg}}{\edef\svg:filename{#2}} +\includegraphics{\svg:filename} +} +>>> + +%%%%%%%%%%%%%%%%%%%%%%% +\Section{endfloat} +%%%%%%%%%%%%%%%%%%%%%%% + \<<< %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % endfloat.4ht |version % From michal_h21 at gnu.org.ua Thu Dec 27 21:43:48 2018 From: michal_h21 at gnu.org.ua (michal_h21 at gnu.org.ua) Date: Thu, 27 Dec 2018 22:43:48 +0200 Subject: [tex4ht-commits] [SCM] tex4ht updated: r470 - trunk/lit Message-ID: <201812272043.wBRKhmxr030620@ulysses.gnu.org.ua> Author: michal_h21 Date: 2018-12-27 22:43:48 +0200 (Thu, 27 Dec 2018) New Revision: 470 Modified: trunk/lit/ChangeLog trunk/lit/Makefile trunk/lit/mktex4ht-cnf.tex trunk/lit/tex4ht-4ht.tex Log: Added basic support for the tabu package Modified: trunk/lit/ChangeLog =================================================================== --- trunk/lit/ChangeLog 2018-12-27 20:23:16 UTC (rev 469) +++ trunk/lit/ChangeLog 2018-12-27 20:43:48 UTC (rev 470) @@ -4,6 +4,7 @@ svg-option.4ht due to name conflict with svg.sty. * tex4ht-options.tex (tex4ht.4ht): use svg-option.4ht instead of svg.4ht. * tex4ht-4ht.tex (svg.4ht): added basic support for the svg.sty package. + * tex4ht-4ht.tex (tabu.4ht): added basic support for the tabu package. 2018-12-20 Michal Hoftich Modified: trunk/lit/Makefile =================================================================== --- trunk/lit/Makefile 2018-12-27 20:23:16 UTC (rev 469) +++ trunk/lit/Makefile 2018-12-27 20:43:48 UTC (rev 470) @@ -57,7 +57,7 @@ reading.4ht \ scrartcl.4ht scrbook.4ht scrreprt.4ht sectionbreak.4ht \ skak.4ht spanish.4ht subscript.4ht svg.4ht \ - titlesec.4ht tocloft.4ht tuenc-luatex.4ht tuenc-xetex.4ht \ + tabu.4ht titlesec.4ht tocloft.4ht tuenc-luatex.4ht tuenc-xetex.4ht \ usepackage.4ht usepackage-fontspec.4ht \ wrapfig.4ht \ xcolor.4ht xr.4ht xr-hyper.4ht Modified: trunk/lit/mktex4ht-cnf.tex =================================================================== --- trunk/lit/mktex4ht-cnf.tex 2018-12-27 20:23:16 UTC (rev 469) +++ trunk/lit/mktex4ht-cnf.tex 2018-12-27 20:43:48 UTC (rev 470) @@ -46,6 +46,7 @@ \AddFile{8}{tabulary} \AddFile{8}{tabulary-a} \AddFile{7}{tabularx} +\AddFile{9}{tabu} \AddFile{9}{mdwtab} \AddFile{9}{multirow} \AddFile{8}{theorem} Modified: trunk/lit/tex4ht-4ht.tex =================================================================== --- trunk/lit/tex4ht-4ht.tex 2018-12-27 20:23:16 UTC (rev 469) +++ trunk/lit/tex4ht-4ht.tex 2018-12-27 20:43:48 UTC (rev 470) @@ -9503,6 +9503,71 @@ >>> \AddFile{7}{tabularx} %%%%%%%%%%%%%%%%%%%%%%%% +\Section{Tabu} +%%%%%%%%%%%%%%%%%%%%%%%% + +Some details are \Link[https://tex.stackexchange.com/a/467126/2891]{}{here}\EndLink. I was +not able to fix all tabu issues, it is too aggressive in basic table handling. Michal + +\<<< +% sample.4ht (|version), generated from |jobname.tex +% Copyright 2017 TeX Users Group +| +| +\Hinput{tabu} +\endinput +>>> \AddFile{9}{tabu} + +\<<< +% we must suppress \everyrow redefintion by tabu, so some macro patching is necessary +\def\tabu at AtBeginDocument{ +\ifdefined\CT at arc@ \else \let\CT at arc@ \relax \fi +\ifdefined\CT at drsc@\else \let\CT at drsc@ \relax \fi + \let\tabu at arc@L \CT at arc@ \let\tabu at drsc@L \CT at drsc@ +% \everyrow{}% +} + +\let\orig:hline\hline +\def\tabu at firstline{\orig:hline} +\def\tabu at firsthline{\orig:hline} +\def\tabu at lastline {\orig:hline} +\def\tabu at lasthline {\orig:hline} +% there is a clash between tabu and tex4ht on \hline handling +% we will just use \cr in place of \hline +\def\tabu at hline {\cr}% \tabu at hline + +% this is basically a rewrite of the \tabu at select macro +% the original code just crashed everything +\def\tabu at select {% + \expandafter \tabuthepreamble +}% \tabu at select + + +\def\tabu at setup{\tabu at alloc@ + \ifcase \tabu at nested + \ifmmode \else \iftabu at spread\else \ifdim\tabu at target=\z@ + \let\tabu at afterendpar \par + \fi\fi\fi + \def\tabu at aligndefault{c} + \tabu at init + \tabu at indent + \else % + \def\tabu at aligndefault{t} + \let\tabudefaulttarget \linewidth + \fi + \let\tabu at thetarget \tabudefaulttarget \let\tabu at restored \@undefined + \edef\tabu at NC@list{\the\NC at list}\NC at list{\NC at do \tabu at rewritefirst}% + %\everycr{} % don't let tabu redefine \everycr + \let\@startpbox \tabu at startpbox % for nested tabu inside longtabu... + \let\@endpbox \tabu at endpbox % idem " " " " " " + \let\@tabarray \tabu at tabarray % idem " " " " " " + \tabu at setcleanup + % \tabu at setreset % this causes issues +}% \tabu at setup +>>> + + +%%%%%%%%%%%%%%%%%%%%%%%% \Section{mdwtab} %%%%%%%%%%%%%%%%%%%%%%%% From michal_h21 at gnu.org.ua Thu Dec 27 22:01:13 2018 From: michal_h21 at gnu.org.ua (michal_h21 at gnu.org.ua) Date: Thu, 27 Dec 2018 23:01:13 +0200 Subject: [tex4ht-commits] [SCM] tex4ht updated: r471 - trunk/lit Message-ID: <201812272101.wBRL1DCa001641@ulysses.gnu.org.ua> Author: michal_h21 Date: 2018-12-27 23:01:13 +0200 (Thu, 27 Dec 2018) New Revision: 471 Modified: trunk/lit/ChangeLog trunk/lit/Makefile trunk/lit/mktex4ht-cnf.tex trunk/lit/tex4ht-4ht.tex trunk/lit/tex4ht-html4.tex Log: Added basic support for the scrjura package Modified: trunk/lit/ChangeLog =================================================================== --- trunk/lit/ChangeLog 2018-12-27 20:43:48 UTC (rev 470) +++ trunk/lit/ChangeLog 2018-12-27 21:01:13 UTC (rev 471) @@ -5,6 +5,8 @@ * tex4ht-options.tex (tex4ht.4ht): use svg-option.4ht instead of svg.4ht. * tex4ht-4ht.tex (svg.4ht): added basic support for the svg.sty package. * tex4ht-4ht.tex (tabu.4ht): added basic support for the tabu package. + * tex4ht-4ht.tex (scrjura.4ht), + tex4ht-html4.tex (html4.4ht): added basic support for the scrjura package. 2018-12-20 Michal Hoftich Modified: trunk/lit/Makefile =================================================================== --- trunk/lit/Makefile 2018-12-27 20:43:48 UTC (rev 470) +++ trunk/lit/Makefile 2018-12-27 21:01:13 UTC (rev 471) @@ -49,13 +49,14 @@ framed.4ht frenchb.4ht \ geometry.4ht graphics.4ht graphicx.4ht \ hyperref.4ht \ + jurabibib.4ht \ latex.4ht lettrine.4ht listings.4ht \ magyar.4ht mdframed.4ht memoir.4ht multicol.4ht multirow.4ht \ nameref.4ht \ pstricks.4ht \ quoting.4ht \ reading.4ht \ - scrartcl.4ht scrbook.4ht scrreprt.4ht sectionbreak.4ht \ + scrartcl.4ht scrbook.4ht scrreprt.4ht scrjura.4ht sectionbreak.4ht \ skak.4ht spanish.4ht subscript.4ht svg.4ht \ tabu.4ht titlesec.4ht tocloft.4ht tuenc-luatex.4ht tuenc-xetex.4ht \ usepackage.4ht usepackage-fontspec.4ht \ Modified: trunk/lit/mktex4ht-cnf.tex =================================================================== --- trunk/lit/mktex4ht-cnf.tex 2018-12-27 20:43:48 UTC (rev 470) +++ trunk/lit/mktex4ht-cnf.tex 2018-12-27 21:01:13 UTC (rev 471) @@ -127,6 +127,7 @@ \AddFile{9}{overcite} \AddFile{9}{harvard} \AddFile{9}{jurabib} +\AddFile{9}{scrjura} \AddFile{7}{natbib} \AddFile{5}{babel} \AddFile{7}{CJK} Modified: trunk/lit/tex4ht-4ht.tex =================================================================== --- trunk/lit/tex4ht-4ht.tex 2018-12-27 20:43:48 UTC (rev 470) +++ trunk/lit/tex4ht-4ht.tex 2018-12-27 21:01:13 UTC (rev 471) @@ -21706,6 +21706,78 @@ >>> %%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\Section{scrjura} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\<<< +% sample.4ht (|version), generated from |jobname.tex +% Copyright 2018 TeX Users Group +| +| +\Hinput{scrjura} +\endinput +>>> \AddFile{9}{scrjura} + +Why is needed the \Verbatim\:qtchr\EndVerbatim instead of quotes? I don't know :( +But quotes don't work + +\<<< +\def\:qtchr{\expandafter\@gobble\string\"} + +\pend:def\contract at paragraph@font{\a:contract at paragraph@font} +\append:def\contract at paragraph@font{\b:contract at paragraph@font\gdef\end:prevpara{}} + +\NewConfigure{contract at paragraph@font}{2} + +% \end:prevpara is needed to correctly handle paragraphs +\def\end:prevpara{} +\pend:def\parformat{\end:prevpara\a:parformat} +\append:def\parformat{\b:parformat\global\let\end:prevpara\c:parformat} + +\NewConfigure{parformat}{3} + + +% this is a modified version of original macro from scrjura.sty +\renewcommand*{\ref at Par}[2]{% + \expandafter\ifx\csname r@#2\endcsname\relax + \ref#1{#2}% + \else + \begingroup + % this definitions are needed to get correct content from the \csname r@#2\endcsname + \def\rEfLiNK##1##2{##2} + \expandafter\expandafter\expandafter\expandafter + \expandafter\expandafter\expandafter\def + \expandafter\expandafter\expandafter\expandafter + \expandafter\expandafter\expandafter\@tempb + \expandafter\expandafter\expandafter\expandafter + \expandafter\expandafter\expandafter{% + \expandafter\expandafter\expandafter\@gobble\csname r@#2\endcsname}% + \def\@tempc##1##2\@nil{##1}% + \let\scrjura at separator\@gobble + \protected at edef\@tempa{\expandafter\expandafter\expandafter\@tempc + \csname r@#2\endcsname\noexpand\@nil}% + \def\@tempc##1##2##3\@nil{##2}% + \protected at edef\@tempa{\expandafter\expandafter\expandafter\@tempc + \@tempa{% + \protect\G at refundefinedtrue + \nfss at text{\reset at font\bfseries ??}% + \@latex at warning{Reference `#2' on page \thepage \space + with undefined par number}% + }\noexpand\@nil}% + \let\@@protect\protect + \let\protect\noexpand + \expandafter\edef\csname r@#2\endcsname{{\@tempa}\@tempb}% + \let\protect\@@protect + \ref#1{#2}% + \endgroup + \fi +} + \Css{.sentence{margin-left:2em; padding-top: .5em;}} + \Css{.paragraph{margin: 1em;}} + \Css{.para{margin: .5em;}} +>>> + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \Section{natbib.sty} %%%%%%%%%%%%%%%%%%%%%%%%%%%%% Modified: trunk/lit/tex4ht-html4.tex =================================================================== --- trunk/lit/tex4ht-html4.tex 2018-12-27 20:43:48 UTC (rev 470) +++ trunk/lit/tex4ht-html4.tex 2018-12-27 21:01:13 UTC (rev 471) @@ -15545,7 +15545,26 @@ border-bottom: 1px solid black; margin-bottom:1pt; }} >>> +%%%%%%%%%%%%%%%%%% +\section{scrjura} +%%%%%%%%%%%%%%%%%% +\<<< +\ConfigureEnv{contract} +{\ifvmode\IgnorePar\fi\EndP\HCode{
    }} +{\ifvmode\IgnorePar\fi\end:prevpara\HCode{
    }} +{}{} + +\Configure{contract at paragraph@font} + {\ifvmode\IgnorePar\fi\end:prevpara\HCode{
    }} + {\Tg
    } + +\Configure{parformat} +{\EndP\HCode{

    \Hnewline +}} + {\Tg}{\Tg

    } +>>> + %%%%%%%%%%%%%%%%%%% \section{Bibliography} %%%%%%%%%%%%%%%%%%% From karl at gnu.org.ua Sun Dec 30 18:39:42 2018 From: karl at gnu.org.ua (karl at gnu.org.ua) Date: Sun, 30 Dec 2018 19:39:42 +0200 Subject: [tex4ht-commits] [SCM] tex4ht updated: r472 - trunk/lit Message-ID: <201812301739.wBUHdg0v009443@ulysses.gnu.org.ua> Author: karl Date: 2018-12-30 19:39:42 +0200 (Sun, 30 Dec 2018) New Revision: 472 Modified: trunk/lit/ChangeLog trunk/lit/tex4ht-4ht.tex trunk/lit/tex4ht-svg.tex Log: copyright,doc Modified: trunk/lit/ChangeLog =================================================================== --- trunk/lit/ChangeLog 2018-12-27 21:01:13 UTC (rev 471) +++ trunk/lit/ChangeLog 2018-12-30 17:39:42 UTC (rev 472) @@ -2,11 +2,17 @@ * tex4ht-svg.tex (svg-option.4ht, html4-svg.4ht): renamed svg.4ht to svg-option.4ht due to name conflict with svg.sty. - * tex4ht-options.tex (tex4ht.4ht): use svg-option.4ht instead of svg.4ht. - * tex4ht-4ht.tex (svg.4ht): added basic support for the svg.sty package. + * tex4ht-options.tex (tex4ht.4ht): use svg-option.4ht instead of + svg.4ht. + * tex4ht-4ht.tex (svg.4ht): added basic support for the svg.sty + package. + * Makefile (tex4ht_svg_derived): change names accordingly. + * mktex4ht-cnf.tex: \AddFile{9}{svg}. + * tex4ht-4ht.tex (tabu.4ht): added basic support for the tabu package. * tex4ht-4ht.tex (scrjura.4ht), - tex4ht-html4.tex (html4.4ht): added basic support for the scrjura package. + tex4ht-html4.tex (html4.4ht): added basic support for the + scrjura package. 2018-12-20 Michal Hoftich Modified: trunk/lit/tex4ht-4ht.tex =================================================================== --- trunk/lit/tex4ht-4ht.tex 2018-12-27 21:01:13 UTC (rev 471) +++ trunk/lit/tex4ht-4ht.tex 2018-12-30 17:39:42 UTC (rev 472) @@ -9506,12 +9506,14 @@ \Section{Tabu} %%%%%%%%%%%%%%%%%%%%%%%% -Some details are \Link[https://tex.stackexchange.com/a/467126/2891]{}{here}\EndLink. I was -not able to fix all tabu issues, it is too aggressive in basic table handling. Michal +Some details are +\Link[https://tex.stackexchange.com/a/467126/2891]{}{here}\EndLink. I +was not able to fix all tabu issues, it is too aggressive in basic table +handling. Michal \<<< -% sample.4ht (|version), generated from |jobname.tex -% Copyright 2017 TeX Users Group +% tabu.4ht (|version), generated from |jobname.tex +% Copyright 2018 TeX Users Group | | \Hinput{tabu} @@ -21710,7 +21712,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%% \<<< -% sample.4ht (|version), generated from |jobname.tex +% scrjura.4ht (|version), generated from |jobname.tex % Copyright 2018 TeX Users Group | | Modified: trunk/lit/tex4ht-svg.tex =================================================================== --- trunk/lit/tex4ht-svg.tex 2018-12-27 21:01:13 UTC (rev 471) +++ trunk/lit/tex4ht-svg.tex 2018-12-30 17:39:42 UTC (rev 472) @@ -2,7 +2,7 @@ % compile 3 times: latex tex4ht-svg % or xhlatex tex4ht-svg "html,3,sections+" % -% Copyright 2009-2017 TeX Users Group +% Copyright 2009-2018 TeX Users Group % Copyright 2000-2009 Eitan M. Gurari % Released under LPPL 1.3c+. % See tex4ht-cpright.tex for license text. @@ -26,7 +26,7 @@ \<<< % svg-option.4ht (|version), generated from |jobname.tex -% Copyright 2009-2017 TeX Users Group +% Copyright 2009-2018 TeX Users Group % Copyright |CopyYear.2001. Eitan M. Gurari | >>> @@ -62,7 +62,7 @@ \<<< % hmtl-svg.4ht (|version), generated from |jobname.tex -% Copyright 2009-2017 TeX Users Group +% Copyright 2009-2018 TeX Users Group % Copyright |CopyYear.2001. Eitan M. Gurari | \Configure{@DOCTYPE}