From 62197fdab444ec46feb32cf7f449efd7a2381285 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 27 Sep 2022 21:35:22 +0000 Subject: beamer \addtocontents and \emph, tex4ht r1201-1202 git-svn-id: svn://tug.org/texlive/trunk@64534 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/generic/tex4ht/ChangeLog | 7 + .../source/generic/tex4ht/tex4ht-4ht.tex | 12 +- .../source/generic/tex4ht/tex4ht-fonts-modern.tex | 142 ++++++++++++++++++++- Master/texmf-dist/tex/generic/tex4ht/beamer.4ht | 23 +--- .../texmf-dist/tex/generic/tex4ht/usepackage.4ht | 4 +- 5 files changed, 162 insertions(+), 26 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog index 00d6409a36b..be4678d63b5 100644 --- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog +++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog @@ -1,3 +1,10 @@ +2022-09-27 Michal Hoftich + + * tex4ht-4ht.tex (beamer.4ht): don't redeclare \addtocontents, in + order to prevent clash with BibLaTeX. + + * tex4ht-4ht.tex (beamer.4ht): declare hooks for \emph. + 2022-09-26 Michal Hoftich * tex4ht-fonts-modern.tex ( diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex index e85b3ce283d..546222bacc9 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 1199 2022-09-26 13:25:22Z michal_h21 $ +% $Id: tex4ht-4ht.tex 1202 2022-09-27 14:51:50Z michal_h21 $ % tex tex4ht-4ht or ht tex tex4ht-4ht % % Copyright 2009-2022 TeX Users Group @@ -25793,8 +25793,14 @@ A \''\relax' is prepended to the start of the definitions \NewConfigure{inst}{2} >>> -\<<< +It seems that TOC in Beamer doesn't work. It probably isn't that +important, as it is usually used only in frame outlines, which +aren't used in \TeX4ht output anyway. I will remove the following +code because it causes clash with BibLaTeX. + +\<<< \def\addtocontents#1#2{% + \let\glossary\@gobble% \add:toc{#1}{}{#2}% } \def\add:toc#1#2#3{{% @@ -25946,7 +25952,7 @@ transported into the slide blocks. \HLet\beamer@@frametitle\:temp % Beamer redefines \emph, it is necessary to insert hooks again - +\NewConfigure{emph}{2} \pend:defI\emph{\a:emph}% \append:defI\emph{\b:emph}% diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-fonts-modern.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-fonts-modern.tex index 0b012649336..d0d08a78bf2 100644 --- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-fonts-modern.tex +++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-fonts-modern.tex @@ -1,4 +1,4 @@ -% $Id: tex4ht-fonts-modern.tex 1140 2022-06-01 13:54:37Z michal_h21 $ +% $Id: tex4ht-fonts-modern.tex 1200 2022-09-26 15:08:39Z michal_h21 $ % Included from tex4ht-fonts-noncjk.tex, not run on its own. % % Copyright 2009-2020 TeX Users Group @@ -24113,7 +24113,145 @@ htfcss: rpxbsl font-style:italic; font-weight: bold; \AddFont{rpxsc}{unicode/pxfonts/rpxsc} - +\Section{SansMathAccent} + + + +\<<< +mathkerncmssi 0 127 +'Γ' '' Gamma 0 % generated from mathkerncmssi10.tfm, 2022-09-26-16:02 +'∆' '' Delta 1 % Copyright 2022 TeX Users Group +'Θ' '' Theta 2 % +'Λ' '' Lambda 3 % This work may be distributed and/or modified under the +'Ξ' '' Xi 4 % conditions of the LaTeX Project Public License, either +'Π' '' Pi 5 % version 1.3c of this license or (at your option) any +'Σ' '' Sigma 6 % later version. The latest version of this license is in +'Υ' '' Upsilon 7 % http://www.latex-project.org/lppl.txt +'Φ' '' Phi 8 % and version 1.3c or later is part of all distributions +'Ψ' '' Psi 9 % of LaTeX version 2005/12/01 or later. +'Ω' '' Omega 10 % +'ff' '' ff 11 % This work has the LPPL maintenance status "maintained". +'fi' '' fi 12 % +'fl' '' fl 13 % The Current Maintainer of this work +'ffi' '' ffi 14 % is the TeX4ht Project . +'ffl' '' ffl 15 % +'ı' '' dotlessi 16 % If you modify this program, changing the +'ȷ' '' dotlessj 17 % version identification would be appreciated. +'`' '' grave 18 +'´' '' acute 19 +'ˇ' '' caron 20 +'˘' '' breve 21 +'¯' '' macron 22 +'˚' '' ring 23 +'¸' '' cedilla 24 +'ß' '' germandbls 25 +'æ' '' ae 26 +'œ' '' oe 27 +'ø' '' oslash 28 +'Æ' '' AE 29 +'Œ' '' OE 30 +'Ø' '' Oslash 31 +'/' '' suppress 32 +'!' '' exclam 33 +'”' '' quotedblright 34 +'#' '' numbersign 35 +'$' '' dollar 36 +'%' '' percent 37 +'&' '' ampersand 38 +'’' '' quoteright 39 +'(' '' parenleft 40 +')' '' parenright 41 +'*' '' asterisk 42 +'+' '' plus 43 +',' '' comma 44 +'-' '' hyphen 45 +'.' '' period 46 +'/' '' slash 47 +'0' '' zero 48 +'1' '' one 49 +'2' '' two 50 +'3' '' three 51 +'4' '' four 52 +'5' '' five 53 +'6' '' six 54 +'7' '' seven 55 +'8' '' eight 56 +'9' '' nine 57 +':' '' colon 58 +';' '' semicolon 59 +'¡' '' exclamdown 60 +'=' '' equal 61 +'¿' '' questiondown 62 +'?' '' question 63 +'@' '' at 64 +'A' '' A 65 +'B' '' B 66 +'C' '' C 67 +'D' '' D 68 +'E' '' E 69 +'F' '' F 70 +'G' '' G 71 +'H' '' H 72 +'I' '' I 73 +'J' '' J 74 +'K' '' K 75 +'L' '' L 76 +'M' '' M 77 +'N' '' N 78 +'O' '' O 79 +'P' '' P 80 +'Q' '' Q 81 +'R' '' R 82 +'S' '' S 83 +'T' '' T 84 +'U' '' U 85 +'V' '' V 86 +'W' '' W 87 +'X' '' X 88 +'Y' '' Y 89 +'Z' '' Z 90 +'[' '' bracketleft 91 +'“' '' quotedblleft 92 +']' '' bracketright 93 +'ˆ' '' circumflex 94 +'˙' '' dotaccent 95 +'‘' '' quoteleft 96 +'a' '' a 97 +'b' '' b 98 +'c' '' c 99 +'d' '' d 100 +'e' '' e 101 +'f' '' f 102 +'g' '' g 103 +'h' '' h 104 +'i' '' i 105 +'j' '' j 106 +'k' '' k 107 +'l' '' l 108 +'m' '' m 109 +'n' '' n 110 +'o' '' o 111 +'p' '' p 112 +'q' '' q 113 +'r' '' r 114 +'s' '' s 115 +'t' '' t 116 +'u' '' u 117 +'v' '' v 118 +'w' '' w 119 +'x' '' x 120 +'y' '' y 121 +'z' '' z 122 +'–' '' endash 123 +'—' '' emdash 124 +'˝' '' hungarumlaut 125 +'˜' '' tilde 126 +'¨' '' dieresis 127 +mathkerncmssi 0 127 +htfcss: mathkerncmssi font-family: 'Computer Modern', serif; +>>> + +\AddFont{mathkerncmssi}{unicode/mathkerncmssi/mathkerncmssi} diff --git a/Master/texmf-dist/tex/generic/tex4ht/beamer.4ht b/Master/texmf-dist/tex/generic/tex4ht/beamer.4ht index 589fd19fee2..fe908d87a01 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/beamer.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/beamer.4ht @@ -1,6 +1,6 @@ -% beamer.4ht (2021-05-16-09:21), generated from tex4ht-4ht.tex +% beamer.4ht (2022-09-27-14:07), generated from tex4ht-4ht.tex % Copyright 2003-2009 Eitan M. Gurari -% Copyright 2009-2021 TeX Users Group +% Copyright 2009-2022 TeX Users Group % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either @@ -17,7 +17,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2021-05-16-09:21} +\immediate\write-1{version 2022-09-27-14:07} \NewConfigure{titlepage}{2} \NewConfigure{title}{2} @@ -54,21 +54,6 @@ \newtoks\sl:toks \NewConfigure{sec@slide}{2} -\def\addtocontents#1#2{% - \add:toc{#1}{}{#2}% -} -\def\add:toc#1#2#3{{% - \csname if:toc\endcsname{ - \def\protect{\noexpand\noexpand\noexpand}% - \edef\:tempa{\the\:tokwrite{\string\doTocEntry - \string\toc#1{#2}{% - \string\csname\space a:TocLink\string\endcsname - {\FileNumber}{\cur:th\@currentlabel}{}{#3}% - }{}\relax -}% -}\:tempa - }% -}} \def\tableofcontents{\futurelet\:temp\:TOC} \def\:TOC{\ifx [\:temp \expandafter\:TableOfContents \else \:TableOfContents[toc]\fi} @@ -176,7 +161,7 @@ \HLet\beamer@@frametitle\:temp % Beamer redefines \emph, it is necessary to insert hooks again - +\NewConfigure{emph}{2} \pend:defI\emph{\a:emph}% \append:defI\emph{\b:emph}% diff --git a/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht b/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht index 1b773a5a2f1..de174923907 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht @@ -1,4 +1,4 @@ -% usepackage.4ht (2022-09-26-14:05), generated from tex4ht-4ht.tex +% usepackage.4ht (2022-09-27-14:07), generated from tex4ht-4ht.tex % Copyright 2003-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-09-26-14:05} +\immediate\write-1{version 2022-09-27-14:07} \def\:temp{tex4ht}\ifx \:temp\@currname \:warning{\string\usepackage{tex4ht} again?} -- cgit v1.2.3