summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-05-22 20:54:09 +0000
committerKarl Berry <karl@freefriends.org>2022-05-22 20:54:09 +0000
commit5ed39f636ca01505011cbc230d3a171f4cde08f7 (patch)
tree349f864b08afe94cd93c181ed9f259358b5ef0a6
parenta970931b012822a9e5d2aba79938171cf913165c (diff)
listings rm spurious newline, tex4ht r1136
git-svn-id: svn://tug.org/texlive/trunk@63372 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/ChangeLog6
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex6
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex4
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/html4.4ht6
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/listings.4ht8
5 files changed, 18 insertions, 12 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
index 97678beb035..cf8ec3b96ae 100644
--- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog
+++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
@@ -1,3 +1,9 @@
+2022-05-22 Michal Hoftich <michal.h21@gmail.com>
+
+ * tex4ht-4ht.tex (listings.4ht),
+ * tex4ht-html4.tex (html4.4ht): removed spurious line from listings.
+ https://tex.stackexchange.com/a/645197/2891
+
2022-05-19 Michal Hoftich <michal.h21@gmail.com>
* tex4ht-4ht.tex (cancel.4ht),
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
index e5345d87595..af9b237e4c1 100644
--- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
+++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-4ht.tex 1135 2022-05-19 15:28:47Z michal_h21 $
+% $Id: tex4ht-4ht.tex 1136 2022-05-22 18:03:36Z michal_h21 $
% tex tex4ht-4ht or ht tex tex4ht-4ht
%
% Copyright 2009-2022 TeX Users Group
@@ -31212,11 +31212,11 @@ Configure list of listings
\expandafter\lstset\expandafter{\lst@set}%
\lsthk@DisplayStyle%
\catcode\active=\active%
- \a:lstinputlisting\special{t4ht@[}\lst@Init\relax \let\lst@gobble\z@%
+ \a:lstinputlisting\ht:special{t4ht@[}\lst@Init\relax \let\lst@gobble\z@%
\lst@SkipToFirst%
\lst@ifprint \def\lst@next{\input{#1}}%
\else \let\lst@next\@empty \fi%
- \special{t4ht@]}\lst@next \lst@DeInit%
+ \ht:special{t4ht@]}\lst@next\ht:special{t4ht@[}\lst@DeInit\ht:special{t4ht@]}%
\b:lstinputlisting%
\endgroup}
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex
index ab80f9af01c..ecb66c1b58f 100644
--- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex
+++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-html4.tex 1135 2022-05-19 15:28:47Z michal_h21 $
+% $Id: tex4ht-html4.tex 1136 2022-05-22 18:03:36Z michal_h21 $
% Compile 4 times: latex tex4ht-html4
% Copy html4.4ht into the work directory before all but the last compilation.
%
@@ -15300,7 +15300,7 @@ This configuration is used mainly when user defines new environment using \verb|
>>>
\<configure html4 listings\><<<
-\Configure{listings-init}{\ttfamily\special{t4ht@(}}{\special{t4ht@)}}
+\Configure{listings-init}{\ttfamily\ht:special{t4ht@(}}{\ht:special{t4ht@)}}
>>>
diff --git a/Master/texmf-dist/tex/generic/tex4ht/html4.4ht b/Master/texmf-dist/tex/generic/tex4ht/html4.4ht
index e78f626dcaa..2ca119f6bc0 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/html4.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/html4.4ht
@@ -1,4 +1,4 @@
-% html4.4ht (2022-05-19-13:37), generated from tex4ht-html4.tex
+% html4.4ht (2022-05-22-13:50), generated from tex4ht-html4.tex
% Copyright 2009-2022 TeX Users Group
% Copyright 1997-2009 Eitan M. Gurari
%
@@ -17,7 +17,7 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2022-05-19-13:37}
+\immediate\write-1{version 2022-05-22-13:50}
\exit:ifnot{8859-6,%
CJK,%
@@ -37478,7 +37478,7 @@ description">}%
\Css{pre.listings{font-family: monospace,monospace; white-space: pre-wrap;
margin-top:0.5em; margin-bottom:0.5em;
}}
-\Configure{listings-init}{\ttfamily\special{t4ht@(}}{\special{t4ht@)}}
+\Configure{listings-init}{\ttfamily\ht:special{t4ht@(}}{\ht:special{t4ht@)}}
\ConfigureEnv{lstlisting}
{\ifvmode \IgnorePar\fi \EndP
\HCode{<!--l. \the\inputlineno-->}%
diff --git a/Master/texmf-dist/tex/generic/tex4ht/listings.4ht b/Master/texmf-dist/tex/generic/tex4ht/listings.4ht
index 5b85ea0ab3b..3a165766406 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/listings.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/listings.4ht
@@ -1,4 +1,4 @@
-% listings.4ht (2022-04-04-07:06), generated from tex4ht-4ht.tex
+% listings.4ht (2022-05-22-13:50), generated from tex4ht-4ht.tex
% Copyright 2001-2009 Eitan M. Gurari
% Copyright 2009-2022 TeX Users Group
%
@@ -17,7 +17,7 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2022-04-04-07:06}
+\immediate\write-1{version 2022-05-22-13:50}
\@ifpackageloaded{xcolor}{}{%
\RequirePackage{xcolor}
@@ -74,11 +74,11 @@
\expandafter\lstset\expandafter{\lst@set}%
\lsthk@DisplayStyle%
\catcode\active=\active%
- \a:lstinputlisting\special{t4ht@[}\lst@Init\relax \let\lst@gobble\z@%
+ \a:lstinputlisting\ht:special{t4ht@[}\lst@Init\relax \let\lst@gobble\z@%
\lst@SkipToFirst%
\lst@ifprint \def\lst@next{\input{#1}}%
\else \let\lst@next\@empty \fi%
- \special{t4ht@]}\lst@next \lst@DeInit%
+ \ht:special{t4ht@]}\lst@next\ht:special{t4ht@[}\lst@DeInit\ht:special{t4ht@]}%
\b:lstinputlisting%
\endgroup}