better greek/russian accents, etc., tex4ht r256-260

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

4 files changed, 67 insertions, 63 deletions

diff --git a/Master/texmf-dist/tex/generic/tex4ht/fontspec-4ht.lua b/Master/texmf-dist/tex/generic/tex4ht/fontspec-4ht.lua
index 8f62cb10ec4..ab0f50ef1ca 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/fontspec-4ht.lua
+++ b/Master/texmf-dist/tex/generic/tex4ht/fontspec-4ht.lua
@@ -1,7 +1,6 @@
--- fontspec-4ht.lua (2016-12-10-15:36), generated from tex4ht-4ht.tex
--- Copyright 2016       TeX Users Group
+-- fontspec-4ht.lua (2017-03-22-16:24), generated from tex4ht-4ht.tex
+-- Copyright 2016-2017 TeX Users Group
 --[[
-% Copyright 2009-2016 TeX Users Group
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either
@@ -18,6 +17,8 @@
 %
 % If you modify this program, changing the
 % version identification would be appreciated.
+\immediate\write-1{version 2017-03-22-16:24}
+
 --]]
 local M = {}
 
@@ -40,7 +41,7 @@ local make_node = function(data)
 end
 
 -- this should be table with patterns for allowed fonts
-local allowed_names = {"^cmr", "^cmb","^cmt", "^cmb", "^cmcs", "^rm%-l", "^cmi", "none"}
+local allowed_names = {"^cmr", "^cmb","^cmt", "^cmb", "^cmcs", "^rm%-l", "^cmi", "^ec%-lm", "none"}
 
 local testfont = function(name)
   -- test font name for all allowed names, when it is found, return true
diff --git a/Master/texmf-dist/tex/generic/tex4ht/greek.4ht b/Master/texmf-dist/tex/generic/tex4ht/greek.4ht
index d685f928df4..9acdda97bd3 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/greek.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/greek.4ht
@@ -1,35 +1,34 @@
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% greek.4ht                          2009-05-21-09:32 %
-% Copyright (C) 2000--2009       Eitan M. Gurari         %
-%                                                        %
-% This work may be distributed and/or modified under the %
-% conditions of the LaTeX Project Public License, either %
-% version 1.3c of this license or (at your option) any   %
-% later version. The latest version of this license is   %
-% in                                                     %
-%   http://www.latex-project.org/lppl.txt                %
-% and version 1.3c or later is part of all distributions %
-% of LaTeX version 2005/12/01 or later.                  %
-%                                                        %
-% This work has the LPPL maintenance status "maintained".%
-%                                                        %
-% This Current Maintainer of this work                   %
-% is Eitan M. Gurari.                                    %
-%                                                        %
-% If you modify this program your changing its signature %
-% with a directive of the following form will be         %
-% appreciated.                                           %
-%            \message{signature}                         %
-%                                                        %
-%                             gurari@cse.ohio-state.edu  %
-%                 http://www.cse.ohio-state.edu/~gurari  %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\immediate\write-1{version 2009-05-21-09:32}
-
+% greek.4ht (2017-03-22-16:19), generated from tex4ht-4ht.tex
+% Copyright (C) 2000-2009 Eitan M. Gurari
+% Copyright 2009-2017 TeX Users Group
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either
+% version 1.3c of this license or (at your option) any
+% later version. The latest version of this license is in
+%   http://www.latex-project.org/lppl.txt
+% and version 1.3c or later is part of all distributions
+% of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status "maintained".
+%
+% The Current Maintainer of this work
+% is the TeX4ht Project <http://tug.org/tex4ht>.
+%
+% If you modify this program, changing the
+% version identification would be appreciated.
 
 \Configure{AtBeginDocument}
   {\immediate\write\@mainaux{\catcode`\string\^=7}} {}
 
+\ifdefined\XeTeXrevision%
+\renewcommand*{\greekfontencoding}{OT1}
+\xeuniuseblock{Greek}
+\fi
+\ifdefined\luatexversion
+\renewcommand*{\greekfontencoding}{OT1}
+\fi
+
 \Hinput{greek}
 \endinput
 
diff --git a/Master/texmf-dist/tex/generic/tex4ht/html4.4ht b/Master/texmf-dist/tex/generic/tex4ht/html4.4ht
index 9ec5dcab94d..12ea25e367a 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/html4.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/html4.4ht
@@ -1,5 +1,5 @@
-% html4.4ht (2017-03-13-15:52), generated from tex4ht-html4.tex
-% Copyright 2009-2016 TeX Users Group
+% html4.4ht (2017-03-22-16:19), generated from tex4ht-html4.tex
+% Copyright 2009-2017 TeX Users Group
 % Copyright 1997-2009 Eitan M. Gurari
 %
 % This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
 %
 % If you modify this program, changing the
 % version identification would be appreciated.
-\immediate\write-1{version 2017-03-13-15:52}
+\immediate\write-1{version 2017-03-22-16:19}
 
 \exit:ifnot{8859-6,% 
 CJK,% 
@@ -19531,6 +19531,7 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}%
 \fi \fi
 
 
+\:CheckOption{new-accents}     \if:Option \else
 \Configure{accent}\bbl@umlauta
    \bbl@umlaute{H{1E26}h{1E27}W{1E84}w{1E85}X{1E8C}x{1E8D}%
 t{1E97}A{00C4}E{00CB}I{00CF}O{00D6}U{00DC}%
@@ -19538,6 +19539,7 @@ a{00E4}e{00EB}i{00EF}o{00F6}u{00FC}y{00FF}%
 Y{0178}\i{00EF}%
 {}{34}}
    {\a:accents{uml}{#1}}     {\b:accents{uml}{#1}{#2}}
+\fi
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -38359,7 +38361,10 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}%
 \ifx \@begindocumenthook\:UnDef\else
    \:CheckOption{new-accents}     \if:Option \else
 %      \def\:temp{russian}\ifx \languagename\:temp
-         \input{html4-russian-accents.4ht}
+         \ifdefined\XeTeXrevision\else
+\ifdefined\luatexversion\else
+\input{html4-russian-accents.4ht}
+\fi\fi
 
 %      \fi
 \fi\fi
diff --git a/Master/texmf-dist/tex/generic/tex4ht/russianb.4ht b/Master/texmf-dist/tex/generic/tex4ht/russianb.4ht
index 8f65a994df2..b711c8ca200 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/russianb.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/russianb.4ht
@@ -1,31 +1,30 @@
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% russianb.4ht                          2009-05-21-09:32 %
-% Copyright (C) 2000--2009       Eitan M. Gurari         %
-%                                                        %
-% This work may be distributed and/or modified under the %
-% conditions of the LaTeX Project Public License, either %
-% version 1.3c of this license or (at your option) any   %
-% later version. The latest version of this license is   %
-% in                                                     %
-%   http://www.latex-project.org/lppl.txt                %
-% and version 1.3c or later is part of all distributions %
-% of LaTeX version 2005/12/01 or later.                  %
-%                                                        %
-% This work has the LPPL maintenance status "maintained".%
-%                                                        %
-% This Current Maintainer of this work                   %
-% is Eitan M. Gurari.                                    %
-%                                                        %
-% If you modify this program your changing its signature %
-% with a directive of the following form will be         %
-% appreciated.                                           %
-%            \message{signature}                         %
-%                                                        %
-%                             gurari@cse.ohio-state.edu  %
-%                 http://www.cse.ohio-state.edu/~gurari  %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\immediate\write-1{version 2009-05-21-09:32}
+% russianb.4ht (2017-03-22-16:19), generated from tex4ht-4ht.tex
+% Copyright (C) 2000-2009 Eitan M. Gurari
+% Copyright 2009-2017 TeX Users Group
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either
+% version 1.3c of this license or (at your option) any
+% later version. The latest version of this license is in
+%   http://www.latex-project.org/lppl.txt
+% and version 1.3c or later is part of all distributions
+% of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status "maintained".
+%
+% The Current Maintainer of this work
+% is the TeX4ht Project <http://tug.org/tex4ht>.
+%
+% If you modify this program, changing the
+% version identification would be appreciated.
 
+\if@uni@ode
+\DeclareRobustCommand{\cyrillictext}{%
+\language\l@russian}%
+\fi
+\ifdefined\XeTeXrevision%
+\xeuniuseblock{Cyrillic}%
+\fi%
 
 \Hinput{russianb}
 \endinput