From 754f430ea761aadcc1ff37122f11d246aaab2618 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 5 Jun 2022 14:15:25 +0000 Subject: EC mlmodern source updates; cond4ht \fi git-svn-id: svn://tug.org/texlive/trunk@63489 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/generic/tex4ht/ChangeLog | 15 ++++++++++ Master/texmf-dist/source/generic/tex4ht/Makefile | 6 ++-- .../source/generic/tex4ht/tex4ht-cond4ht.tex | 17 ++++++----- .../source/generic/tex4ht/tex4ht-fonts-modern.tex | 34 +++++++++++++++++++++- Master/texmf-dist/tex/generic/tex4ht/cond4ht.4ht | 18 +++++++----- 5 files changed, 71 insertions(+), 19 deletions(-) diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog index e91efca8121..b104481a422 100644 --- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog +++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog @@ -1,3 +1,18 @@ +2022-06-01 Michal Hoftich + + * tex4ht-fonts-modern.tex ( + ./tex4ht.dir/texmf/tex4ht/ht-fonts/alias/mlm/ec-mlm.htf, + ./tex4ht.dir/texmf/tex4ht/ht-fonts/alias/mlm/ec-mlmvt.htf + ): added EC versions of Mlmodern fonts. + https://tex.stackexchange.com/a/643260/2891 + +2022-05-24 Karl Berry + + * tex4ht-cond4ht.tex (\mkfilename == mktex4ht.4ht): + instead of doing an \ifx inside \usepackage[...], set and use + \toks0. Seems to avoid some instances of + "(\end occurred when \ifx on line NN was incomplete)". + 2022-05-23 Michal Hoftich * tex4ht-4ht.tex (xr-hyper.4ht): added closing \fi to prevent diff --git a/Master/texmf-dist/source/generic/tex4ht/Makefile b/Master/texmf-dist/source/generic/tex4ht/Makefile index 97e49ce447a..01514e9fe72 100644 --- a/Master/texmf-dist/source/generic/tex4ht/Makefile +++ b/Master/texmf-dist/source/generic/tex4ht/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 1091 2022-03-17 11:02:16Z michal_h21 $ +# $Id: Makefile 1141 2022-06-01 21:43:42Z karl $ # This file is public domain. Originally written 2010, Karl Berry. # Assumes GNU make. @@ -718,7 +718,7 @@ endif # The directories where tex4ht is installed in TeX Live, # i.e., where we will copy and commit updates. -texmf = /r/tug/home/texlive/karl/Master/texmf-dist +texmf = /v/texlive/karl/Master/texmf-dist inst_dir_4ht = $(texmf)/tex/generic/tex4ht inst_dir_top = $(texmf)/tex4ht inst_dir_scripts = $(texmf)/scripts/tex4ht @@ -784,7 +784,7 @@ diff-htfonts: # Compare and update. update-htfonts: - ./update-htfonts update $(ht_fonts_devdir) $(ht_fonts_instdir) | tee /tmp/htdif + ./update-htfonts update $(ht_fonts_devdir) $(ht_fonts_instdir) | tee /tmp/htupd .PHONY: update-htfonts # diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-cond4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-cond4ht.tex index c0a03421397..f768f2e77d9 100644 --- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-cond4ht.tex +++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-cond4ht.tex @@ -1,12 +1,13 @@ -% $Id: tex4ht-cond4ht.tex 906 2021-04-18 15:43:04Z karl $ +% $Id: tex4ht-cond4ht.tex 1139 2022-05-25 01:16:19Z karl $ % (1) tex tex4ht-cond4ht or xhtex tex4ht-cond4ht % (2) tex cond4ht.4ht % -% Copyright 2009-2021 TeX Users Group +% Copyright 2009-2022 TeX Users Group % Copyright 1997-2009 Eitan M. Gurari % Released under LPPL 1.3c+. % See tex4ht-cpright.tex for license text. +\vbadness=10000 \csname tex4ht\endcsname \input ProTex.sty @@ -454,7 +455,7 @@ tex4ht-4ht, e.g., for adding cases to {\tt\string\exit:ifnot}. % the copyright notice. % % |mkfilename (|version), generated from |jobname.4ht -% Copyright 2009-2021 TeX Users Group +% Copyright 2009-2022 TeX Users Group % Copyright 1997-2009 Eitan M. Gurari | @@ -567,12 +568,14 @@ tex4ht-4ht, e.g., for adding cases to {\tt\string\exit:ifnot}. } \catcode`\:=12 - - \documentclass{book} \ifx \HCode\UnDef - \def\temp{\usepackage[\ifx \OPTIONS\UnDef - xhtml,3,sections+\else \OPTIONS\fi]{tex4ht}} + \ifx\OPTIONS\UnDef + \toks0={xhtml,3,sections+}% + \else + \toks0={\OPTIONS}% + \fi + \def\temp{\usepackage[\the\toks0]{tex4ht}} \expandafter\temp \fi \Configure{ProTex}{4ht,<<<>>|empty>,||,title,list,[[]]} 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 bbffa7db8fe..0b012649336 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 1132 2022-05-09 08:32:38Z michal_h21 $ +% $Id: tex4ht-fonts-modern.tex 1140 2022-06-01 13:54:37Z michal_h21 $ % Included from tex4ht-fonts-noncjk.tex, not run on its own. % % Copyright 2009-2020 TeX Users Group @@ -2151,6 +2151,38 @@ htfcss: rm-mlmvtto font-style: oblique; font-family: monospace,monospace; >>> \AddFont{rm-mlmvt}{alias/mlm/rm-mlmvt} +\<<< +.lm-ec +htfcss: ec-mlmbo font-style: oblique; +htfcss: ec-mlmbx font-weight: bold; +htfcss: ec-mlmbxi font-style:italic; font-weight: bold; +htfcss: ec-mlmbxo font-style: oblique; font-weight: bold; +htfcss: ec-mlmri font-style:italic; +htfcss: ec-mlmro font-style: oblique; +htfcss: ec-mlmss font-family: sans-serif; +htfcss: ec-mlmssbo font-family: sans-serif; font-style: oblique; font-weight: bold; +htfcss: ec-mlmssbx font-family: sans-serif; font-weight: bold; +htfcss: ec-mlmssdc font-family: sans-serif; +htfcss: ec-mlmssdo font-family: sans-serif; font-style: oblique; +htfcss: ec-mlmsso font-family: sans-serif; font-style: oblique; +htfcss: ec-mlmssq font-family: sans-serif; +htfcss: ec-mlmssqbo font-family: sans-serif; font-style: oblique; font-weight: bold; +htfcss: ec-mlmssqbx font-family: sans-serif; font-weight: bold; +htfcss: ec-mlmssqo font-family: sans-serif; font-style: oblique; +htfcss: ec-mlmcsc font-variant: small-caps; +>>> +\AddFont{ec-mlm}{alias/mlm/ec-mlm} + +\<<< +.lm-ec +htfcss: ec-mlmvtk font-family: monospace,monospace; +htfcss: ec-mlmvtko font-style: oblique; font-family: monospace,monospace; +htfcss: ec-mlmvtl font-weight: light; font-family: monospace,monospace; +htfcss: ec-mlmvtlo font-weight: light; font-style: oblique; font-family: monospace,monospace; +htfcss: ec-mlmvtt font-family: monospace,monospace; +htfcss: ec-mlmvtto font-style: oblique; font-family: monospace,monospace; +>>> +\AddFont{ec-mlmvt}{alias/mlm/ec-mlmvt} \<<< .plbsy diff --git a/Master/texmf-dist/tex/generic/tex4ht/cond4ht.4ht b/Master/texmf-dist/tex/generic/tex4ht/cond4ht.4ht index f365d58d732..6ff55c0da0b 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/cond4ht.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/cond4ht.4ht @@ -14,8 +14,8 @@ % \AddFile{1}{latex} \AddFile{2}{article} % \AddFile{5}{amsmath} \AddFile{2}{report} ... -% cond4ht.4ht (2020-10-16-13:47), generated from tex4ht-cond4ht.tex -% Copyright 2009-2019 TeX Users Group +% cond4ht.4ht (2022-06-01-13:59), generated from tex4ht-cond4ht.tex +% Copyright 2009-2021 TeX Users Group % Copyright 1997-2009 Eitan M. Gurari % % This work may be distributed and/or modified under the @@ -33,7 +33,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2020-10-16-13:47} +\immediate\write-1{version 2022-06-01-13:59} \ifx \BREAK\UnDef @@ -453,7 +453,7 @@ tex4ht-4ht, e.g., for adding cases to {\tt\string\exit:ifnot}. % the copyright notice. % % |mkfilename (|version), generated from |jobname.4ht -% Copyright 2009-2019 TeX Users Group +% Copyright 2009-2022 TeX Users Group % Copyright 1997-2009 Eitan M. Gurari | @@ -566,12 +566,14 @@ tex4ht-4ht, e.g., for adding cases to {\tt\string\exit:ifnot}. } \catcode`\:=12 - - \documentclass{book} \ifx \HCode\UnDef - \def\temp{\usepackage[\ifx \OPTIONS\UnDef - xhtml,3,sections+\else \OPTIONS\fi]{tex4ht}} + \ifx\OPTIONS\UnDef + \toks0={xhtml,3,sections+}% + \else + \toks0={\OPTIONS}% + \fi + \def\temp{\usepackage[\the\toks0]{tex4ht}} \expandafter\temp \fi \Configure{ProTex}{4ht,<<<>>|empty>,||,title,list,[[]]} -- cgit v1.2.3