disable \babelfont, tex4ht r1244; spurious space after \ref, tex4ht r1245; spurious space in biblatex in-text citations, tex4ht r1246

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

5 files changed, 48 insertions, 16 deletions

diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
index a9fe288e21d..47acd724602 100644
--- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog
+++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
@@ -1,3 +1,14 @@
+2022-11-21  Michal Hoftich  <michal.h21@gmail.com>
+
+	* tex4ht-4ht.tex (biblatex.4ht): removed spurious space from in text
+	citations.
+
+	* tex4ht-4ht.tex (nameref.4ht): removed spurious space after \ref.
+
+	* tex4ht-4ht.tex (babel-sty-hooks.4ht): disable the \babelfont
+	command.
+	https://github.com/michal-h21/tex4ebook/issues/94
+
 2022-11-20  Karl Berry  <karl@freefriends.org>
 
 	* tex4ht-4ht.tex (authblk.4ht, caption-hooks.4ht): copyright 2022.
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
index f007b9e8c34..d7e023a1323 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 1243 2022-11-20 15:09:18Z karl $
+% $Id: tex4ht-4ht.tex 1246 2022-11-21 21:00:44Z michal_h21 $
 % tex tex4ht-4ht   or   ht tex tex4ht-4ht
 %
 % Copyright 2009-2022 TeX Users Group    
@@ -2837,7 +2837,7 @@ Fix backlink support in BibLaTeX
     \html:addr\Link-{}{|<haddr prefix|>\last:haddr}\EndLink%
     % save link to the .xref file
     % we need to use \protected@write to get correct page numbers in backrefs
-    \protected@write\:refout{}{\string\:CrossWord{)Q##1\thepage}{|<haddr prefix|>\last:haddr}{\folio}}
+    \protected@write\:refout{}{\string\:CrossWord{)Q##1\thepage}{|<haddr prefix|>\last:haddr}{\folio}}%
     % we need to save the link destination in .xref file
     % too, otherwise \Link command would issue warning
     \Tag{)Q|<haddr prefix|>\last:haddr}{\FileNumber}%
@@ -3588,11 +3588,11 @@ definitions.
 \let\T:ref=\::ref
 \def\::ref{\@ifstar{\protect\T@ref}{\protect\T@ref}}
 \def\T@ref#1{%
-  \@safe@activestrue
-  \let\::ref \T:ref
+  \@safe@activestrue%
+  \let\::ref\T:ref%
   \expandafter\@setref\csname r@#1\endcsname\@firstoffive{#1}%
-  \def\::ref{\@ifstar{\protect\T@ref}{\protect\T@ref}}
-  \@safe@activesfalse
+  \def\::ref{\@ifstar{\protect\T@ref}{\protect\T@ref}}%
+  \@safe@activesfalse%
 }
 
 \gdef\defineautorefname#1#2{%
@@ -24007,9 +24007,23 @@ Handle circumflex catcodes when the \Verb|early^| option is used.
 % Copyright 2022 TeX Users Group
 |<TeX4ht license text|>
 |<disable early sup|>
+|<babelfont|>
 >>> 
 \AddFile{9}{babel-sty-hooks}
 
+The babelfont command can be used in the document preamble.
+It can cause fatal errors, because it changes font encodings
+and can cause loating of OTF fonts
+
+\<babelfont\><<<
+\NewDocumentCommand\:babelfont{o m o m}{}
+
+\:AtEndOfPackage{%
+  % disable \babelfont
+  \let\babelfont\:babelfont
+}
+>>>
+
 %%%%%%%%%%%%%%%%%%%%%%
 \Section{CJK}
 %%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/generic/tex4ht/babel-sty-hooks.4ht b/Master/texmf-dist/tex/generic/tex4ht/babel-sty-hooks.4ht
index 0de37b30447..9eb1b02a232 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/babel-sty-hooks.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/babel-sty-hooks.4ht
@@ -16,7 +16,7 @@
 %
 % If you modify this program, changing the
 % version identification would be appreciated.
-\immediate\write-1{version 2022-08-17-14:10}
+\immediate\write-1{version 2022-11-21-13:02}
 
 \ifdefined\recall:sup
 \recall:sup
@@ -25,4 +25,11 @@
 }
 \fi
 
+\NewDocumentCommand\:babelfont{o m o m}{}
+
+\:AtEndOfPackage{%
+  % disable \babelfont
+  \let\babelfont\:babelfont
+}
+
 
diff --git a/Master/texmf-dist/tex/generic/tex4ht/biblatex.4ht b/Master/texmf-dist/tex/generic/tex4ht/biblatex.4ht
index fab7d6384bc..d85dff304cb 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/biblatex.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/biblatex.4ht
@@ -1,4 +1,4 @@
-% biblatex.4ht (2022-07-25-13:46), generated from tex4ht-4ht.tex
+% biblatex.4ht (2022-11-21-13:02), generated from tex4ht-4ht.tex
 % Copyright 2007-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-07-25-13:46}
+\immediate\write-1{version 2022-11-21-13:02}
 
    \def\make:blx:ver#1.#2#3\relax{%
    %\ifdim#1pt< 3pt \xdef\blx:ver:no{2}\else\xdef\blx:ver:no{3}\fi%
@@ -576,7 +576,7 @@
     \html:addr\Link-{}{x\last:haddr}\EndLink%
     % save link to the .xref file
     % we need to use \protected@write to get correct page numbers in backrefs
-    \protected@write\:refout{}{\string\:CrossWord{)Q##1\thepage}{x\last:haddr}{\folio}}
+    \protected@write\:refout{}{\string\:CrossWord{)Q##1\thepage}{x\last:haddr}{\folio}}%
     % we need to save the link destination in .xref file
     % too, otherwise \Link command would issue warning
     \Tag{)Qx\last:haddr}{\FileNumber}%
diff --git a/Master/texmf-dist/tex/generic/tex4ht/nameref.4ht b/Master/texmf-dist/tex/generic/tex4ht/nameref.4ht
index 359cedcf4c6..b99de6ca5e1 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/nameref.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/nameref.4ht
@@ -1,4 +1,4 @@
-% nameref.4ht (2022-11-18-14:11), generated from tex4ht-4ht.tex
+% nameref.4ht (2022-11-21-13:02), generated from tex4ht-4ht.tex
 % Copyright 2005-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-11-18-14:11}
+\immediate\write-1{version 2022-11-21-13:02}
 
    \let\NR:Type\relax
 \let\ltx@label\label
@@ -177,11 +177,11 @@
 \let\T:ref=\::ref
 \def\::ref{\@ifstar{\protect\T@ref}{\protect\T@ref}}
 \def\T@ref#1{%
-  \@safe@activestrue
-  \let\::ref \T:ref
+  \@safe@activestrue%
+  \let\::ref\T:ref%
   \expandafter\@setref\csname r@#1\endcsname\@firstoffive{#1}%
-  \def\::ref{\@ifstar{\protect\T@ref}{\protect\T@ref}}
-  \@safe@activesfalse
+  \def\::ref{\@ifstar{\protect\T@ref}{\protect\T@ref}}%
+  \@safe@activesfalse%
 }
 
 \gdef\defineautorefname#1#2{%