From c2767cf55ca3fa24345fcdc5c3c3661d039a8182 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 10 Dec 2016 23:38:30 +0000 Subject: fontspec fixes, tex4ht r215, http://puszcza.gnu.org.ua/bugs/?123 git-svn-id: svn://tug.org/texlive/trunk@42672 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/generic/tex4ht/fontspec-4ht.lua | 23 ++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) (limited to 'Master/texmf-dist/tex/generic/tex4ht/fontspec-4ht.lua') diff --git a/Master/texmf-dist/tex/generic/tex4ht/fontspec-4ht.lua b/Master/texmf-dist/tex/generic/tex4ht/fontspec-4ht.lua index b7e0873e1c9..8f62cb10ec4 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/fontspec-4ht.lua +++ b/Master/texmf-dist/tex/generic/tex4ht/fontspec-4ht.lua @@ -1,8 +1,23 @@ --- fontspec-4ht.lua (2016-12-08-16:38), generated from tex4ht-4ht.tex +-- fontspec-4ht.lua (2016-12-10-15:36), generated from tex4ht-4ht.tex -- Copyright 2016 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 +% 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 . +% +% If you modify this program, changing the +% version identification would be appreciated. --]] local M = {} @@ -25,7 +40,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"} +local allowed_names = {"^cmr", "^cmb","^cmt", "^cmb", "^cmcs", "^rm%-l", "^cmi", "none"} local testfont = function(name) -- test font name for all allowed names, when it is found, return true @@ -41,7 +56,7 @@ end local fonttypes = {} local get_font_type = function(id) if fonttypes[id]~=nil then return fonttypes[id] end - local f = font.getfont(id) + local f = font.getfont(id) or {name = "none"} -- font object can be nil sometimes local name = f.name local type = testfont(string.lower(name)) if not type then -- cgit v1.2.3