first paragraph in {theindex}, tex4ht r1307

git-svn-id: svn://tug.org/texlive/trunk@66632 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 57 insertions, 13 deletions

diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
index 474e3c98d62..1d6da3207a2 100644
--- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog
+++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
@@ -1,3 +1,25 @@
+2023-03-19  Michal Hoftich  <michal.h21@gmail.com>
+
+	* tex4ht-4ht.tex (memhfixc.4ht): fixed interaction between Memoir
+	and Nameref.
+	https://github.com/michal-h21/make4ht/issues/74
+
+2023-03-15  Michal Hoftich  <michal.h21@gmail.com>
+
+	* tex4ht-4ht.tex(amsart.4ht, amsart.4ht, amsbook.4ht,
+	amsproc.4ht, article.4ht, book.4ht, mwart.4ht,
+	mwbk.4ht, mwrep.4ht, report.4ht, scrbook.4ht,
+	scrreprt.4ht),
+	* tex4ht-html4.tex (html4.4ht): Fixed wrong first pagaraph in
+	theindex environment.
+	https://tex.stackexchange.com/a/679239/2891
+	
+2023-03-13  Michal Hoftich  <michal.h21@gmail.com>
+
+	* tex4ht-fonts-noncjk.tex (
+	./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/txfonts/txbmia.htf
+	): fixed Unicode characters. Thanks to Arkady Benediktov.
+
 2023-03-10  Michal Hoftich  <michal.h21@gmail.com>
 
 	* tex4ht-4ht.tex (xr.4ht,  xr-hyper.4ht, cleveref.4ht): fixed clash
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
index ffc1469088a..4cb3efa66c4 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 1305 2023-03-10 16:01:24Z michal_h21 $
+% $Id: tex4ht-4ht.tex 1308 2023-03-19 13:09:23Z michal_h21 $
 % tex tex4ht-4ht   or   ht tex tex4ht-4ht
 %
 % Copyright 2009-2023 TeX Users Group    
@@ -12802,8 +12802,8 @@ latex foo
 
 \<book-report-article idx\><<<
 \long\def\c:theindex:#1#2#3#4#5#6#7#8#9{%
-   \def\theindex{%
-      \def\idx:item{\SaveEverypar\ht:everypar{}#1}%
+   \def\theindex{\SaveEverypar\ht:everypar{}#1%
+      \def\idx:item{}%
       \def\endtheindex{\idx:item#2\RecallEverypar}%
       \def\item{\idx:item\def\idx:item{#4}\let\index|=\@gobble #3}%
       \def\subitem{\idx:item\def\idx:item{#6}\let\index|=\@gobble #5}%
@@ -16360,6 +16360,31 @@ Hfootnote counter, which isn't declared.
 >>>
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\Section{memhfixc}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\<memhfixc.4ht\><<<
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%  
+% memhfixc.4ht (|version), generated from |jobname.tex 
+% Copyright 2023 TeX Users Group
+|<TeX4ht copyright|>
+|<memhfixc nameref|>
+\Hinput{memhfixc}
+\endinput
+>>>        \AddFile{8}{memhfixc}
+
+Memoir redefines the nameref command in a way that it prints ref number instead
+of the desired title. This should fix that, and in addition it should fix the
+titleref command.
+
+\<memhfixc nameref\><<<
+\@ifpackageloaded{nameref}{
+\HLet\@mem@titlerefnolink\@namerefstar
+\HLet\@mem@titleref\T@nameref
+}{}
+>>>
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \Chapter{revtex}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex
index f76a092fe29..d6e02f520e6 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 1303 2023-03-02 10:52:32Z michal_h21 $
+% $Id: tex4ht-html4.tex 1307 2023-03-15 13:39:09Z michal_h21 $
 % Compile 4 times: latex tex4ht-html4
 % Copy html4.4ht into the work directory before all but the last compilation.
 %
@@ -4519,13 +4519,12 @@ Q. Where placefigure is declared?
 \Configure{@begin}{theindex}{\section*{\indexname}}
 \Configure{theindex}
    {\ifvmode \IgnorePar\fi \EndP
-    \HCode{<div class="theindex">}\let\end:theidx\empty}
+    \HCode{<div class="theindex">}\HCode{<p class="theindex">}\def\end:theidx{\HCode{</p>}}}
    {\end:theidx\HCode{</div>}}
    {} {\HCode{<br />}\hfil\break}
    {\ \ \ \ } {\HCode{<br />}\hfil\break}
    {\ \ \ \ \ \ \ \ } {\HCode{<br />}\hfil\break}
-   {\hbox{\end:theidx\HCode{<p class="theindex">}}%
-    \def\end:theidx{\HCode{</p>}}}
+   {\hbox{\end:theidx\HCode{<p class="theindex">}}}
 >>>
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -4557,7 +4556,7 @@ The `index=i' provides the initial setting.
                use the command line option `index=i' (e.g., index=2)}
 \Configure{theindex}
    {\ifvmode \IgnorePar\fi \EndP
-    \HCode{<div class="theindex">}\let\end:theidx|=\empty}
+    \HCode{<div class="theindex">}\HCode{<p class="theindex">}\def\end:theidx{\HCode{</p>}}}
    {\end:theidx\HCode{</div>}}
    {\hbox\bgroup\HCode{<span class="index-item">}} 
    {\HCode{<br /></span>}\egroup\hfill\break}
@@ -4565,8 +4564,7 @@ The `index=i' provides the initial setting.
    {\HCode{<br /></span>}\egroup\hfill\break}
    {\hbox\bgroup\HCode{<span class="index-subsubitem">}\ \ \ \ \ \ \ \ } 
    {\HCode{<br /></span>}\egroup\hfill\break}
-   {\hbox{\end:theidx\HCode{<p class="theindex">}}%
-    \def\end:theidx{\HCode{</p>}}}
+   {\hbox{\end:theidx\HCode{<p class="theindex">}}}
 \Css{.index-item, .index-subitem, .index-subsubitem {display:block}}
 >>>
 
@@ -4577,13 +4575,12 @@ The `index=i' provides the initial setting.
                use the command line option `index=i' (e.g., index=2)}
 \Configure{theindex}
    {\ifvmode \IgnorePar\fi \EndP
-    \HCode{<div class="theindex">}\let\end:theidx|=\empty}
+    \HCode{<div class="theindex">}\HCode{<p class="theindex">}\def\end:theidx{\HCode{</p>}}}
    {\end:theidx\HCode{</div>}}
    {} {\hfil\break\HCode{<br />}}
    {\ \ \ \ } {\hfil\break\HCode{<br />}}
    {\ \ \ \ \ \ \ \ } {\hfil\break\HCode{<br />}}
-   {\hbox{\end:theidx\HCode{<p class="theindex">}}%
-    \def\end:theidx{\HCode{</p>}}}
+   {\hbox{\end:theidx\HCode{<p class="theindex">}}}
 >>>
 
 \<conf multi cols\><<<