summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/generic
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-12-12 21:43:29 +0000
committerKarl Berry <karl@freefriends.org>2023-12-12 21:43:29 +0000
commit110698a8bc3bbfb4b779f97894f9acf4b7649a0b (patch)
tree6a80b6bb4ad0da8711b03ca6533ef0b338612d05 /Master/texmf-dist/source/generic
parent35d3e5599357c126fa4198208e45094f0a827381 (diff)
support \marginnote, tex4ht r1420; rm spurious blank lines from \VerbatimInput, tex4ht r1421; close para before end of \fbox, tex4ht r1422
git-svn-id: svn://tug.org/texlive/trunk@69104 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/generic')
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/ChangeLog21
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/Makefile34
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/mktex4ht-cnf.tex3
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex21
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex42
5 files changed, 104 insertions, 17 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
index e0e7610e473..452fb44ffcd 100644
--- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog
+++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
@@ -1,3 +1,24 @@
+2023-12-12 Michal Hoftich <michal.h21@gmail.com>
+
+ * tex4ht-html4.tex (html4.4ht): close paragraph before end of \fbox.
+ https://tex.stackexchange.com/a/703823/2891
+
+ * tex4ht-html4.tex (html4.4ht): removed spurious blank lines in
+ files included using \VerbatimInput from the fancyvrb package.
+ https://puszcza.gnu.org.ua/bugs/?617
+
+ * tex4ht-4ht.tex (marginnote.4ht),
+ * tex4ht-html4.tex (html4.4ht): added support for the \marginnote
+ command.
+
+2023-12-11 Karl Berry <karl@freefriends.org>
+
+ * tex4ht-env.tex: copyright 2023, leading comments.
+ * Makefile (diff-env, update-env): new targets to handle
+ tex4ht.env[-*] files.
+ (update-env, update): rename these never-used
+ and non-working targets to dev-update-env and dev-update.
+
2023-12-11 Michal Hoftich <michal.h21@gmail.com>
* tex4ht-4ht.tex (biblatex.4ht): declare the \BibFileName in the aux
diff --git a/Master/texmf-dist/source/generic/tex4ht/Makefile b/Master/texmf-dist/source/generic/tex4ht/Makefile
index 0d330dd3d55..b783b5d4582 100644
--- a/Master/texmf-dist/source/generic/tex4ht/Makefile
+++ b/Master/texmf-dist/source/generic/tex4ht/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile 1296 2023-02-12 22:24:09Z karl $
+# $Id: Makefile 1419 2023-12-11 23:23:52Z karl $
# This file is public domain. Originally written 2010, Karl Berry.
# Assumes GNU make.
@@ -616,12 +616,12 @@ dest_java = $(dest_src)/java
update = cp -pr
mkdir = install -d
#
-update-env:
+dev-update-env:
$(mkdir) $(dest_base)/unix $(dest_base)/win32
$(update) tex4ht.env-unix $(dest_base)/unix/tex4ht.env
$(update) tex4ht.env-win32 $(dest_base)/win32/tex4ht.env
-update: all
+dev-update: all
$(update) $(tex4ht_bibtex2_derived) $(dest_src)/
#
$(update) $(tex4ht_c_derived) $(dest_src)/
@@ -633,7 +633,7 @@ update: all
#
$(update) $(tex4ht_docbook_derived) $(dest_texmf)/
#
- $(MAKE) update-env
+ $(MAKE) dev-update-env
#
$(update) $(tex4ht_html_speech_xtpipes_derived) $(dest_texmf)/
#
@@ -758,6 +758,11 @@ inst_dir_all = $(inst_dir_4ht) $(inst_dir_top) $(inst_dir_scripts) \
# (Other methods are also used.)
install_data = cp -p
+# svn status of installed tree.
+svnstatus st:
+ svn status $(inst_dir_all) | sed s,$(texmf),, # reduce output
+ @echo $(inst_dir_all)
+
# Diff and install the *.unix and *.bat scripts.
# The suffix changes from .unix in development to .sh in TL,
# and many of the scripts are not installed at all;
@@ -817,10 +822,21 @@ update-htfonts:
./update-htfonts update $(ht_fonts_devdir) $(ht_fonts_instdir) | tee /tmp/htupd
.PHONY: update-htfonts
-# svn status of results.
-svnstatus st:
- svn status $(inst_dir_all) | sed s,$(texmf),, # reduce output
- @echo $(inst_dir_all)
+#
+# Checking and updating tex4ht.env files.
+
+# Where they are in the installed tree.
+env_instdir = $(inst_dir_top)/base
+
+# Compare only.
+diff-env: $(tex4ht_env_derived)
+ -$(diff) $(env_instdir)/unix/tex4ht.env tex4ht.env-unix
+ -$(diff) $(env_instdir)/win32/tex4ht.env tex4ht.env-win32
+
+# Compare and update.
+update-env:
+ $(install_data) tex4ht.env-unix $(env_instdir)/unix/tex4ht.env
+ $(install_data) tex4ht.env-win32 $(env_instdir)/win32/tex4ht.env
#
# diff all files in the main TeX Live installation directory against
@@ -832,7 +848,7 @@ svnstatus st:
#
# The diff-scripts output is usually empty, so we can run that;
# but diff-htfonts is too verbose to run every time.
-diff-all: diff-src diff-scripts diff-htfonts
+diff-all: diff-src diff-scripts diff-htfonts diff-env
@echo; echo '>>> $@'
-for f in $(inst_dir_4ht)/*; do $(diff) $$f .; done \
| tee /tmp/u | egrep -v '^ *[-+]%|^@@ |^- *$$|-1.version' \
diff --git a/Master/texmf-dist/source/generic/tex4ht/mktex4ht-cnf.tex b/Master/texmf-dist/source/generic/tex4ht/mktex4ht-cnf.tex
index 894e50b7c15..8d30dfd4908 100644
--- a/Master/texmf-dist/source/generic/tex4ht/mktex4ht-cnf.tex
+++ b/Master/texmf-dist/source/generic/tex4ht/mktex4ht-cnf.tex
@@ -1,4 +1,4 @@
-% $Id: mktex4ht-cnf.tex 1412 2023-11-20 10:08:03Z michal_h21 $
+% $Id: mktex4ht-cnf.tex 1420 2023-12-12 15:53:16Z michal_h21 $
% Manually-maintained file, listing *.4ht files created by tex4ht-4ht.tex.
% Read by tex4ht-cond4ht.
%
@@ -322,6 +322,7 @@
\AddFile{9}{th4}
\AddFile{9}{footmisc}
\AddFile{9}{tablefootnote}
+\AddFile{9}{marginnote}
\AddFile{9}{writer}
\AddFile{9}{mdwlist}
\AddFile{9}{sverb}
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
index 12c6bfd8f97..e896969c1e6 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 1418 2023-12-11 13:44:02Z michal_h21 $
+% $Id: tex4ht-4ht.tex 1420 2023-12-12 15:53:16Z michal_h21 $
% tex tex4ht-4ht or ht tex tex4ht-4ht
%
% Copyright 2009-2023 TeX Users Group
@@ -37226,6 +37226,25 @@ instead.
%%%%%%%%%%%%%%%
+\Section{marginnote}
+%%%%%%%%%%%%%%%%%
+
+\<marginnote.4ht\><<<
+% marginnote.4ht (|version), generated from |jobname.tex
+% Copyright 2023 TeX Users Group
+|<TeX4ht license text|>
+|<config marginnote|>
+\Hinput{marginnote}
+\endinput
+>>> \AddFile{9}{marginnote}
+
+\<config marginnote\><<<
+\NewConfigure{marginnote}{2}
+\long\def\:tempa[#1]#2[#3]{\a:marginnote#2\b:marginnote}
+\HLet\@mn@@@marginnote\:tempa
+>>>
+
+%%%%%%%%%%%%%%%
\Section{Other}
%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex
index 39c1fea16e2..51e3f909f21 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 1408 2023-11-10 14:51:19Z michal_h21 $
+% $Id: tex4ht-html4.tex 1422 2023-12-12 16:44:24Z michal_h21 $
% Compile 4 times: latex tex4ht-html4
% Copy html4.4ht into the work directory before all but the last compilation.
%
@@ -5626,6 +5626,33 @@ An alternative css-based approach:
>>>
%%%%%%%%%%%%%%%%
+\subsection{marginnote}
+%%%%%%%%%%%%%%%%
+
+This configuration will put marginnote into right margin if there is sufficient ammount of space.
+Otherwise, it will display it as a italic text.
+
+\<configure html4 marginnote\><<<
+\Configure{marginnote}{\HCode{<span class="marginnote">}}{\HCode{</span>}}
+
+\Css{.marginnote{
+ font-style: italic;}
+}
+
+\Css{
+ @media (min-width: 104ch){
+ .marginnote{
+ display: block;
+ float: right;
+ width: 12ch;
+ margin-right: -14ch;
+ font-style: normal;
+ }}
+}
+
+>>>
+
+%%%%%%%%%%%%%%%%
\section{Floats}
%%%%%%%%%%%%%%%%
@@ -7933,7 +7960,7 @@ tag possibly missing.
\Configure{fbox}
{\ifvmode \IgnorePar\EndP
\HCode{<div class="fbox">}%
- \def\end:bx{\HCode{</div>}\par}%
+ \def\end:bx{\ifvmode\IgnorePar\fi\EndP\HCode{</div>}\par}%
\else
\HCode{<span class="fbox">}%
\def\end:bx{\HCode{</span>}}%
@@ -15242,18 +15269,21 @@ imported from aux or another file.
\subsection{fancyvrb}
%%%%%%%%%%%%%%%%%%%
+We need to use special instructions to prevent extra blank lines that
+are comming from fancyvrb somehow. "x" before closing tag for "pre"
+is necessary because the last newline was not deleted otherwise.
\<configure html4 fancyvrb\><<<
\HAssign\fancyvrbNo|=0
\Configure{fancyvrb}
{\IgnorePar \EndP \gHAdvance\fancyvrbNo by 1
\gHAssign\fancyvrb:cnt0
- \HCode{<pre class="fancyvrb" id="fancyvrb\fancyvrbNo">}}
- {\EndP\HCode{</pre>}}
- {\gHAdvance\fancyvrb:cnt by 1
+ \HCode{<pre class="fancyvrb" id="fancyvrb\fancyvrbNo">}\ht:special{t4ht@[}}
+ {x\ht:special{t4ht@]}\EndP\HCode{</pre>}}
+ {\ht:special{t4ht@]}\gHAdvance\fancyvrb:cnt by 1
\ifnum \fancyvrb:cnt>1
\HCode{\Hnewline}\fi} {}
- {}{}
+ {}{\ht:special{t4ht@[}}
\Css{pre.fancyvrb {white-space: pre-wrap; margin:0em;font-family:monospace,monospace;}}
>>>