summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElie Roux <elie.roux@telecom-bretagne.eu>2013-04-25 08:46:06 -0700
committerElie Roux <elie.roux@telecom-bretagne.eu>2013-04-25 08:46:06 -0700
commit7ef916abd7e8131ee0886c8134431ccd73c6c92a (patch)
tree0a497b7451572afd33408f16edca535faf4b2dea
parent8160803d6d06f3133daaf1de55ca386033cfd374 (diff)
parent335446c44d46742513adf300e0066c4c4c36f623 (diff)
downloadluaotfload-7ef916abd7e8131ee0886c8134431ccd73c6c92a.tar.gz
Merge pull request #9 from phi-gamma/texlive2011
catch more odd subfamily strings
-rw-r--r--otfl-font-nms.lua30
1 files changed, 13 insertions, 17 deletions
diff --git a/otfl-font-nms.lua b/otfl-font-nms.lua
index 1f01693..84cdf6e 100644
--- a/otfl-font-nms.lua
+++ b/otfl-font-nms.lua
@@ -154,27 +154,23 @@ function names.resolve(specification)
elseif subfamily == "regular" or
table.contains(synonyms.regular, subfamily) then
found.fallback = face
- elseif name = fullname then
- found[1] = face
- break
end
- else
- if name == fullname
- or name == pfullname
- or name == fontname
- or name == psname then
- if optsize then
- if dsnsize == size
- or (size > minsize and size <= maxsize) then
- found[1] = face
- break
- else
- found[#found+1] = face
- end
- else
+ end
+ if name == fullname
+ or name == pfullname
+ or name == fontname
+ or name == psname then
+ if optsize then
+ if dsnsize == size
+ or (size > minsize and size <= maxsize) then
found[1] = face
break
+ else
+ found[#found+1] = face
end
+ else
+ found[1] = face
+ break
end
end
end