summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/ChangeLog5
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex45
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/biblatex.4ht26
3 files changed, 33 insertions, 43 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
index 7dc4ce3b8fd..7c41010bb14 100644
--- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog
+++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
@@ -1,3 +1,8 @@
+2022-07-25 Michal Hoftich <michal.h21@gmail.com>
+
+ * tex4ht-4ht.tex (biblatex.4ht): don't redefine \MakeUppercase and
+ \MakeLowercase in BibLaTeX.
+
2022-07-24 Michal Hoftich <michal.h21@gmail.com>
* tex4ht-4ht.tex (babel.4ht): don't redefine \ref in Babel.
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
index 355df13c57e..dbd0b1c60d6 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 1178 2022-07-24 17:04:30Z michal_h21 $
+% $Id: tex4ht-4ht.tex 1179 2022-07-25 20:40:57Z michal_h21 $
% tex tex4ht-4ht or ht tex tex4ht-4ht
%
% Copyright 2009-2022 TeX Users Group
@@ -2215,6 +2215,31 @@ We put the hook ourselves thanks to Configure{ifthenelse}.
% Biblatex 3.0
%
% Hacks for biblatex
+
+% I don't really understand this, but language processing is broken by default
+% with biblatex. It loads language file, but it executes code which should be
+% executed only in the case if the language file fails, it displays an error message
+% and language handling doesn't work. When we execute following code, the language
+% files are loaded before checking of the success and it seems to work.
+
+\AtBeginDocument{%
+\@ifpackageloaded{babel}
+ {% This is required for languages which are never explicitly selected
+ % It seems this code was executed also with Polyglossia, where it caused compilation error
+ \@ifpackageloaded{polyglossia}{}{%
+ \def\do#1{\blx@lbxinput{#1}{}{}}%
+ \ifx\@empty\bbl@loaded\else%
+ \expandafter\docsvlist\expandafter{\bbl@loaded}%
+ \fi}}{}%
+}
+\fi % end of version boolean
+>>>
+
+2022/07/25: It seems that we don't need to redefine MakeUppercase and MakeLowercase, BiBLaTeX works without these
+redefinitions, and on the contrary, we get compilation error with these, as they were changed in the LaTeX kernel.
+So I think it is best to remove them.
+
+\<biblatex dont use\><<<
% MakeUppercase is redefined by tex4ht, biblatex tries to redefine it as well, but it relies on original
% LaTeX version:
\DeclareRobustCommand{\MakeUppercase}[1]{{%
@@ -2237,24 +2262,6 @@ We put the hook ourselves thanks to Configure{ifthenelse}.
\blx@hook@lc\protected@edef\reserved@a{\lowercase{#1}}%
\reserved@a
}}
-
-% I don't really understand this, but language processing is broken by default
-% with biblatex. It loads language file, but it executes code which should be
-% executed only in the case if the language file fails, it displays an error message
-% and language handling doesn't work. When we execute following code, the language
-% files are loaded before checking of the success and it seems to work.
-
-\AtBeginDocument{%
-\@ifpackageloaded{babel}
- {% This is required for languages which are never explicitly selected
- % It seems this code was executed also with Polyglossia, where it caused compilation error
- \@ifpackageloaded{polyglossia}{}{%
- \def\do#1{\blx@lbxinput{#1}{}{}}%
- \ifx\@empty\bbl@loaded\else%
- \expandafter\docsvlist\expandafter{\bbl@loaded}%
- \fi}}{}%
-}
-\fi % end of version boolean
>>>
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/generic/tex4ht/biblatex.4ht b/Master/texmf-dist/tex/generic/tex4ht/biblatex.4ht
index 74bd0edcdbc..fab7d6384bc 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-04-04-07:06), generated from tex4ht-4ht.tex
+% biblatex.4ht (2022-07-25-13:46), 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-04-04-07:06}
+\immediate\write-1{version 2022-07-25-13:46}
\def\make:blx:ver#1.#2#3\relax{%
%\ifdim#1pt< 3pt \xdef\blx:ver:no{2}\else\xdef\blx:ver:no{3}\fi%
@@ -204,28 +204,6 @@
% Biblatex 3.0
%
% Hacks for biblatex
-% MakeUppercase is redefined by tex4ht, biblatex tries to redefine it as well, but it relies on original
-% LaTeX version:
-\DeclareRobustCommand{\MakeUppercase}[1]{{%
- \def\i{I}\def\j{J}%
- \def\reserved@a##1##2{\let##1##2\reserved@a}%
- \expandafter\reserved@a\@uclclist\reserved@b{\reserved@b\@gobble}%
- \let\UTF@two@octets@noexpand\@empty
- \let\UTF@three@octets@noexpand\@empty
- \let\UTF@four@octets@noexpand\@empty
- \blx@hook@uc\protected@edef\reserved@a{\uppercase{#1}}%
- \reserved@a
-}}
-% Same applies also for \MakeLowercase
-\DeclareRobustCommand{\MakeLowercase}[1]{{%
- \def\reserved@a##1##2{\let##2##1\reserved@a}%
- \expandafter\reserved@a\@uclclist\reserved@b{\reserved@b\@gobble}%
- \let\UTF@two@octets@noexpand\@empty
- \let\UTF@three@octets@noexpand\@empty
- \let\UTF@four@octets@noexpand\@empty
- \blx@hook@lc\protected@edef\reserved@a{\lowercase{#1}}%
- \reserved@a
-}}
% I don't really understand this, but language processing is broken by default
% with biblatex. It loads language file, but it executes code which should be