fix "Command `\colon' already defined" error when fontspec is loaded without no-math...

[luatex-ja/luatexja.git] / src / ltj-jfont.lua

diff --git a/src/ltj-jfont.lua b/src/ltj-jfont.lua
index 17a2463..3679ad1 100644 (file)
--- a/src/ltj-jfont.lua
+++ b/src/ltj-jfont.lua
@@ -62,7 +62,6 @@ local function norm_val(a)
    end
 end
 
-
 function define_jfm(t)
    local real_char -- Does current character class have the 'real' character?
    if t.dir~=jfm_dir then
@@ -75,16 +74,13 @@ function define_jfm(t)
       if type(i) == 'number' then -- char_type
         if not v.chars then
            if i ~= 0 then defjfm_res= nil; return  end
-           real_char = true
         else
-           real_char = false
            for j,w in pairs(v.chars) do
               if type(w) == 'number' and w~=-1 then
-                 real_char = true;
               elseif type(w) == 'string' and utf.len(w)==1 then
-                 real_char = true; w = utf.byte(w)
+                 w = utf.byte(w)
               elseif type(w) == 'string' and utf.len(w)==2 and utf.sub(w,2) == '*' then
-                 real_char = true; w = utf.byte(utf.sub(w,1,1))
+                 w = utf.byte(utf.sub(w,1,1))
               end
               if not t.chars[w] then
                  t.chars[w] = i
@@ -92,35 +88,29 @@ function define_jfm(t)
                  defjfm_res= nil; return
               end
            end
-            if type(v.align)~='string' then
-               v.align = 'left' -- left
-            end
-           if real_char then
-              if type(v.width)~='number' and v.width~='prop' then
-                 defjfm_res= nil; return
-              else
-                 if v.width=='prop' and jfm_dir=='tate' then
-                    v.width = 1.0
-                 end
-                 if type(v.height)~='number' then
-                    v.height = 0.0
-                 end
-                 if type(v.depth)~='number' then
-                    v.depth = 0.0
-                 end
-                 if type(v.italic)~='number' then
-                    v.italic = 0.0
-                 end
-                 if type(v.left)~='number' then
-                    v.left = 0.0
-                 end
-                 if type(v.down)~='number' then
-                    v.down = 0.0
-                 end
-              end
-           end
            v.chars = nil
         end
+        if type(v.align)~='string' then
+           v.align = 'left' -- left
+        end
+        if type(v.width)~='number' then
+           v.width = (jfm_dir=='tate') and  1.0
+        end
+        if type(v.height)~='number' then
+           v.height = (jfm_dir=='tate') and  0.0
+        end
+        if type(v.depth)~='number' then
+           v.depth =  (jfm_dir=='tate') and  0.0
+        end
+        if type(v.italic)~='number' then
+           v.italic = 0.0
+        end
+        if type(v.left)~='number' then
+           v.left = 0.0
+        end
+        if type(v.down)~='number' then
+           v.down = 0.0
+        end
         v.kern = v.kern or {}; v.glue = v.glue or {}
         for j,x in pairs(v.glue) do
            if v.kern[j] then defjfm_res= nil; return end
@@ -335,6 +325,8 @@ do
    -- extract jfm_file_name and jfm_var
    -- normalize position of 'jfm=' and 'jfmvar=' keys
    local function extract_metric(name)
+      local is_braced = name:match('^{(.*)}$')
+       name= is_braced or name
       jfm_file_name = ''; jfm_var = ''; jfm_ksp = true
       local tmp, index = name:sub(1, 5), 1
       if tmp == 'file:' or tmp == 'name:' or tmp == 'psft:' then
@@ -373,16 +365,18 @@ do
            name = name .. 'jfmvar=' .. jfm_var
         end
       end
-      if name:match('-ltjksp') then jfm_ksp = false end
+      for x in string.gmatch (name, "[:;]([+%%-]?)ltjks") do
+        jfm_ksp = not (x=='-')
+      end
       if jfm_dir == 'tate' then
-        is_vert_enabled = (not name:match('-vert')) and (not  name:match('-vrt2'))
+        is_vert_enabled = (not name:match('[:;]%-vert')) and (not  name:match('[:;]%-vrt2'))
          if not name:match('vert') and not name:match('vrt2') then
-            name = name .. ';vert;vrt2'
+            name = name .. ';+vert;+vrt2'
          end
       else
         is_vert_enabled = nil
       end
-      return name
+      return is_braced and ('{' .. name .. '}') or name
    end
 
    -- define_font callback
@@ -391,6 +385,7 @@ do
    function luatexja.font_callback(name, size, id)
       local new_name = is_def_jfont and extract_metric(name) or name
       is_def_jfont = false
+      --local res =  otfl_fdr(new_name, size, id)
       local res =  ltjr_font_callback(new_name, size, id, otfl_fdr)
       luatexbase.call_callback('luatexja.define_font', res, new_name, size, id)
       -- this callback processes variation selector, so we execute it always
@@ -704,7 +699,7 @@ do
    local function add_fl_table(dest, glyphs, unitable, asc_des, units)
       local tg, glyphmin, glyphmax = glyphs.glyphs, 0, glyphs.glyphmax
       for _,v in pairs(fields(glyphs)) do
-        if v=='glyphmin' then glyphmin = glyphs.glyphmin; break end
+        if v=='glyphmin' then glyphmin, glyphmax = glyphs.glyphmin, glyphmax+1; break end
       end
       for i = glyphmin, glyphmax-1 do
         local gv = tg[i]
@@ -975,8 +970,10 @@ do
            if h then
               local g = node_new(id_kern)
               setfield(g, 'subtype', 1); set_attr(g, attr_icflag, ITALIC)
-              setfield(g, 'kern', h.characters[getchar(p)].italic)
-              node_write(g); ensure_tex_attr(attr_icflag, 0)
+              if h.characters[getchar(p)] and h.characters[getchar(p)].italic then 
+                 setfield(g, 'kern', h.characters[getchar(p)].italic)
+                 node_write(g); ensure_tex_attr(attr_icflag, 0)
+              end
            end
         end
       end