2015-10-04 19:27:00

5 files changed, 12 insertions, 12 deletions

diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 25aef72a0..2fd824467 100644
--- a/tex/generic/context/luatex/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
 -- merged file : luatex-fonts-merged.lua
 -- parent file : luatex-fonts.lua
--- merge date  : 09/13/15 13:31:08
+-- merge date  : 10/04/15 19:25:05
 
 do -- begin closure to overcome local limits and interference
 
@@ -14232,7 +14232,7 @@ local function featuresprocessor(head,font,attr)
                   rlmode=-1
                 elseif dir=="-TLT" or dir=="-TRT" then
                   topstack=topstack-1
-                  rlmode=dirstack[topstack]=="+TLT" and 1 or -1
+                  rlmode=dirstack[topstack]=="+TRT" and -1 or 1
                 else
                   rlmode=rlparmode
                 end
@@ -14488,7 +14488,7 @@ local function featuresprocessor(head,font,attr)
                 rlmode=-1
               elseif dir=="-TLT" or dir=="-TRT" then
                 topstack=topstack-1
-                rlmode=dirstack[topstack]=="+TLT" and 1 or -1
+                rlmode=dirstack[topstack]=="+TRT" and -1 or 1
               else
                 rlmode=rlparmode
               end
diff --git a/tex/generic/context/luatex/luatex-fonts-otn.lua b/tex/generic/context/luatex/luatex-fonts-otn.lua
index 8066b0f08..1b99c56de 100644
--- a/tex/generic/context/luatex/luatex-fonts-otn.lua
+++ b/tex/generic/context/luatex/luatex-fonts-otn.lua
@@ -553,7 +553,7 @@ local function toligature(kind,lookupname,head,start,stop,char,markflag,discfoun
     resetinjection(base)
     setfield(base,"char",char)
     setfield(base,"subtype",ligature_code)
-    setfield(base,"components",comp) -- start can have components .. do we need to flush?
+    setfield(base,"components",comp) -- start can have components ... do we need to flush?
     if prev then
         setfield(prev,"next",base)
     end
@@ -3334,7 +3334,7 @@ local function featuresprocessor(head,font,attr)
                                     rlmode = -1
                                 elseif dir == "-TLT" or dir == "-TRT" then
                                     topstack = topstack - 1
-                                    rlmode = dirstack[topstack] == "+TLT" and 1 or -1
+                                    rlmode = dirstack[topstack] == "+TRT" and -1 or 1
                                 else
                                     rlmode = rlparmode
                                 end
@@ -3606,7 +3606,7 @@ local function featuresprocessor(head,font,attr)
                                 rlmode = -1
                             elseif dir == "-TLT" or dir == "-TRT" then
                                 topstack = topstack - 1
-                                rlmode = dirstack[topstack] == "+TLT" and 1 or -1
+                                rlmode = dirstack[topstack] == "+TRT" and -1 or 1
                             else
                                 rlmode = rlparmode
                             end
diff --git a/tex/generic/context/luatex/luatex-mplib.lua b/tex/generic/context/luatex/luatex-mplib.lua
index c093b8333..fd6eb975c 100644
--- a/tex/generic/context/luatex/luatex-mplib.lua
+++ b/tex/generic/context/luatex/luatex-mplib.lua
@@ -157,8 +157,8 @@ else
             \voffset=\hoffset
             \topskip=0pt
             \setbox0=\hbox{%s}\relax
-            \pdfpageheight=\ht0
-            \pdfpagewidth=\wd0
+            \pageheight=\ht0
+            \pagewidth=\wd0
             \box0
             \bye
         ]]
diff --git a/tex/generic/context/luatex/luatex-plain.tex b/tex/generic/context/luatex/luatex-plain.tex
index 2c04a27c0..9902c49f3 100644
--- a/tex/generic/context/luatex/luatex-plain.tex
+++ b/tex/generic/context/luatex/luatex-plain.tex
@@ -27,8 +27,8 @@
 % has to deal with the lack of a page concept on tex by some guessing. Normally
 % a macro package will set the dimensions to something reasonable anyway.
 
-\pdfpagewidth   8.5in
-\pdfpageheight 11.0in
+\pagewidth   8.5in
+\pageheight 11.0in
 
 % We load some code at runtime:
 
diff --git a/tex/generic/context/luatex/luatex-test.tex b/tex/generic/context/luatex/luatex-test.tex
index 9f03027bc..f851aab6f 100644
--- a/tex/generic/context/luatex/luatex-test.tex
+++ b/tex/generic/context/luatex/luatex-test.tex
@@ -39,8 +39,8 @@
 
 \bgroup
 
-    \pdfprotrudechars2
-    \pdfadjustspacing2
+    \ifdefined\pdfprotrudechars \pdfprotrudechars \else \protrudechars \fi 2 \relax
+    \ifdefined\pdfadjustspacing \pdfadjustspacing \else \adjustspacing \fi 2 \relax
 
     \font\testb=file:lmroman12-regular:+liga;extend=1.5         at 12pt \testb \input tufte \par
     \font\testb=file:lmroman12-regular:+liga;slant=0.8          at 12pt \testb \input tufte \par