luaotfload (3jan14)

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

6 files changed, 20 insertions, 54 deletions

diff --git a/Master/texmf-dist/doc/luatex/luaotfload/luaotfload.pdf b/Master/texmf-dist/doc/luatex/luaotfload/luaotfload.pdf
index 451315b9082..b40f9443896 100644
--- a/Master/texmf-dist/doc/luatex/luaotfload/luaotfload.pdf
+++ b/Master/texmf-dist/doc/luatex/luaotfload/luaotfload.pdf
diff --git a/Master/texmf-dist/doc/man/man1/luaotfload-tool.man1.pdf b/Master/texmf-dist/doc/man/man1/luaotfload-tool.man1.pdf
index dd8df8abab4..ab20f593657 100644
--- a/Master/texmf-dist/doc/man/man1/luaotfload-tool.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/luaotfload-tool.man1.pdf
diff --git a/Master/texmf-dist/source/luatex/luaotfload/luaotfload.dtx b/Master/texmf-dist/source/luatex/luaotfload/luaotfload.dtx
index adbdf26f122..08f56af43bc 100644
--- a/Master/texmf-dist/source/luatex/luaotfload/luaotfload.dtx
+++ b/Master/texmf-dist/source/luatex/luaotfload/luaotfload.dtx
@@ -2078,13 +2078,14 @@ request_resolvers.path = function (specification)
           name)
         file_resolver (specification)
     else
-      local suffix = filesuffix (name)
-      if formats[suffix] then
-        specification.forced  = suffix
-        specification.name    = file.removesuffix(name)
-      else
-        specification.name = name
-      end
+        local suffix = filesuffix (name)
+        if formats[suffix] then
+            specification.forced      = suffix
+            specification.name        = file.removesuffix(name)
+            specification.forcedname  = name
+        else
+            specification.name = name
+        end
     end
 end
 
diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-characters.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-characters.lua
index 13f0482bb2d..036c69118ed 100644
--- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-characters.lua
+++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-characters.lua
@@ -163,13 +163,11 @@ return {
   category="ps",
   direction="on",
   mirror=0x0029,
-  textclass="open",
  },
  {
   category="pe",
   direction="on",
   mirror=0x0028,
-  textclass="close",
  },
  {
   category="po",
@@ -247,7 +245,6 @@ return {
   category="sm",
   direction="on",
   mirror=0x003E,
-  textclass="open",
  },
  {
   category="sm",
@@ -257,7 +254,6 @@ return {
   category="sm",
   direction="on",
   mirror=0x003C,
-  textclass="close",
  },
  {
   category="po",
@@ -375,7 +371,6 @@ return {
   category="ps",
   direction="on",
   mirror=0x005D,
-  textclass="open",
  },
  {
   category="po",
@@ -385,7 +380,6 @@ return {
   category="pe",
   direction="on",
   mirror=0x005B,
-  textclass="close",
  },
  {
   category="sk",
@@ -507,7 +501,6 @@ return {
   category="ps",
   direction="on",
   mirror=0x007D,
-  textclass="open",
  },
  {
   category="sm",
@@ -517,7 +510,6 @@ return {
   category="pe",
   direction="on",
   mirror=0x007B,
-  textclass="close",
  },
  {
   category="sm",
@@ -703,7 +695,6 @@ return {
   category="pi",
   direction="on",
   mirror=0x00BB,
-  textclass="open",
  },
  {
   category="sm",
@@ -769,7 +760,6 @@ return {
   category="pf",
   direction="on",
   mirror=0x00AB,
-  textclass="close",
  },
  {
   category="no",
@@ -28325,13 +28315,11 @@ return {
   category="pi",
   direction="on",
   mirror=0x203A,
-  textclass="open",
  },
  [0x203A]={
   category="pf",
   direction="on",
   mirror=0x2039,
-  textclass="close",
  },
  [0x203B]={
   category="po",
@@ -28575,13 +28563,11 @@ return {
   category="ps",
   direction="on",
   mirror=0x207E,
-  textclass="open",
  },
  [0x207E]={
   category="pe",
   direction="on",
   mirror=0x207D,
-  textclass="close",
  },
  [0x207F]={
   category="ll",
@@ -28643,13 +28629,11 @@ return {
   category="ps",
   direction="on",
   mirror=0x208E,
-  textclass="open",
  },
  [0x208E]={
   category="pe",
   direction="on",
   mirror=0x208D,
-  textclass="close",
  },
  [0x2090]={
   category="lm",
@@ -62955,37 +62939,31 @@ return {
   category="ps",
   direction="on",
   mirror=0xFE5A,
-  textclass="open",
  },
  [0xFE5A]={
   category="pe",
   direction="on",
   mirror=0xFE59,
-  textclass="close",
  },
  [0xFE5B]={
   category="ps",
   direction="on",
   mirror=0xFE5C,
-  textclass="open",
  },
  [0xFE5C]={
   category="pe",
   direction="on",
   mirror=0xFE5B,
-  textclass="close",
  },
  [0xFE5D]={
   category="ps",
   direction="on",
   mirror=0xFE5E,
-  textclass="open",
  },
  [0xFE5E]={
   category="pe",
   direction="on",
   mirror=0xFE5D,
-  textclass="close",
  },
  [0xFE5F]={
   category="po",
@@ -63011,13 +62989,11 @@ return {
   category="sm",
   direction="on",
   mirror=0xFE65,
-  textclass="open",
  },
  [0xFE65]={
   category="sm",
   direction="on",
   mirror=0xFE64,
-  textclass="close",
  },
  [0xFE66]={
   category="sm",
@@ -63635,13 +63611,11 @@ return {
   category="ps",
   direction="on",
   mirror=0xFF09,
-  textclass="open",
  },
  [0xFF09]={
   category="pe",
   direction="on",
   mirror=0xFF08,
-  textclass="close",
  },
  [0xFF0A]={
   category="po",
@@ -63719,7 +63693,6 @@ return {
   category="sm",
   direction="on",
   mirror=0xFF1E,
-  textclass="open",
  },
  [0xFF1D]={
   category="sm",
@@ -63729,7 +63702,6 @@ return {
   category="sm",
   direction="on",
   mirror=0xFF1C,
-  textclass="close",
  },
  [0xFF1F]={
   category="po",
@@ -63847,7 +63819,6 @@ return {
   category="ps",
   direction="on",
   mirror=0xFF3D,
-  textclass="open",
  },
  [0xFF3C]={
   category="po",
@@ -63857,7 +63828,6 @@ return {
   category="pe",
   direction="on",
   mirror=0xFF3B,
-  textclass="close",
  },
  [0xFF3E]={
   category="sk",
@@ -63979,7 +63949,6 @@ return {
   category="ps",
   direction="on",
   mirror=0xFF5D,
-  textclass="open",
  },
  [0xFF5C]={
   category="sm",
@@ -63989,7 +63958,6 @@ return {
   category="pe",
   direction="on",
   mirror=0xFF5B,
-  textclass="close",
  },
  [0xFF5E]={
   category="sm",
@@ -63999,13 +63967,11 @@ return {
   category="ps",
   direction="on",
   mirror=0xFF60,
-  textclass="open",
  },
  [0xFF60]={
   category="pe",
   direction="on",
   mirror=0xFF5F,
-  textclass="close",
  },
  [0xFF61]={
   category="po",
@@ -64015,13 +63981,11 @@ return {
   category="ps",
   direction="on",
   mirror=0xFF63,
-  textclass="open",
  },
  [0xFF63]={
   category="pe",
   direction="on",
   mirror=0xFF62,
-  textclass="close",
  },
  [0xFF64]={
   category="po",
diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-status.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-status.lua
index 2ee0421a761..376a5055513 100644
--- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-status.lua
+++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-status.lua
@@ -6,7 +6,7 @@ return {
   { "luaotfload-tool.lua", "eb34dc11cc91c01de4626bba5ff9ae17" },
   { "luaotfload-override.lua", "b878d157af7147e30a067a41d3ea3cfe" },
   { "luaotfload-fontloader.lua", "21b625efe6630b76250e18f7d2832cff" },
-  { "luaotfload.lua", "2321885f4704a11001e51fcf0afc0835" },
+  { "luaotfload.lua", "c12b302cc953e59476c6cf6ca129a233" },
   { "luaotfload-loaders.lua", "b04c6d9aa2974d56895fe3dff3fea90d" },
   { "luaotfload-letterspace.lua", "19e6181076dda7c8c34e7096cee1f873" },
   { "luaotfload-glyphlist.lua", "ff440162d1b8a78a586375ee65630c21" },
@@ -20,14 +20,14 @@ return {
   { "luaotfload-diagnostics.lua", "eed12e7b7fe6545daa6786fed1405a4f" },
   { "luaotfload-database.lua", "7280e8cbdf00a4767272a39c0545af29" },
   { "luaotfload-colors.lua", "248c4c42586c17e934a4d046c3c873b9" },
-  { "luaotfload-characters.lua", "2673ffb19e8505af4782aad437a76a4f" },
+  { "luaotfload-characters.lua", "5843d02ff98a7419fae5a3cf904b101e" },
   { "luaotfload-basics-nod.lua", "d6b26ec86c0b1c1516936b425df04432" },
   { "luaotfload-basics-gen.lua", "3dadc2cd31ab348f7effb28e335af3ae" },
   { "luaotfload-auxiliary.lua", "7efa9d365f12006d5c4c7c38e0e2872c" },
  },
  ["notes"]={
   ["committer"]="Philipp Gesang <phg42.2a@gmail.com>",
-  ["revision"]="a679d233954dc989621bb6754d838dc537fd3d02",
-  ["timestamp"]="2013-12-31 17:04:24 +0100",
+  ["revision"]="9fd4c4523b1e69b5c49de7fda01da5540e60fcda",
+  ["timestamp"]="2014-01-02 17:19:53 +0100",
  },
 }
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.lua
index 4aa050025a2..73fb0172a1d 100644
--- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.lua
+++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.lua
@@ -340,13 +340,14 @@ request_resolvers.path = function (specification)
           name)
         file_resolver (specification)
     else
-      local suffix = filesuffix (name)
-      if formats[suffix] then
-        specification.forced  = suffix
-        specification.name    = file.removesuffix(name)
-      else
-        specification.name = name
-      end
+        local suffix = filesuffix (name)
+        if formats[suffix] then
+            specification.forced      = suffix
+            specification.name        = file.removesuffix(name)
+            specification.forcedname  = name
+        else
+            specification.name = name
+        end
     end
 end