2016-07-11 13:48:00

15 files changed, 43 insertions, 22 deletions

diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf
index 49ee19eb0..321b846c9 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index 04932eef5..d0da531db 100644
--- a/tex/context/base/mkiv/cont-new.mkiv
+++ b/tex/context/base/mkiv/cont-new.mkiv
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2016.07.08 17:19}
+\newcontextversion{2016.07.11 13:44}
 
 %D This file is loaded at runtime, thereby providing an excellent place for
 %D hacks, patches, extensions and new features.
diff --git a/tex/context/base/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv
index 55d4ff148..084f519ea 100644
--- a/tex/context/base/mkiv/context.mkiv
+++ b/tex/context/base/mkiv/context.mkiv
@@ -39,7 +39,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2016.07.08 17:19}
+\edef\contextversion{2016.07.11 13:44}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/mkiv/core-con.lua b/tex/context/base/mkiv/core-con.lua
index fb5c3defe..36f1774e9 100644
--- a/tex/context/base/mkiv/core-con.lua
+++ b/tex/context/base/mkiv/core-con.lua
@@ -1258,7 +1258,7 @@ local spaced = {
     [v_day]     = true,
 }
 
-local converters = {
+local dateconverters = {
     ["jalali:to"]   = gregorian_to_jalali,
     ["jalali:from"] = jalali_to_gregorian,
 }
@@ -1280,7 +1280,7 @@ local function currentdate(str,currentlanguage) -- second argument false : no la
     end
     for i=1,#list do
         local entry = list[i]
-        local convert = converters[entry]
+        local convert = dateconverters[entry]
         if convert then
             year, month, day = convert(year,month,day)
         else
diff --git a/tex/context/base/mkiv/font-otj.lua b/tex/context/base/mkiv/font-otj.lua
index 27422c2a1..46b2ca8d4 100644
--- a/tex/context/base/mkiv/font-otj.lua
+++ b/tex/context/base/mkiv/font-otj.lua
@@ -1092,6 +1092,10 @@ local function inject_everything(head,where)
                             nofmarks = nofmarks + 1
                             marks[nofmarks] = current
                         else
+local yoffset = i.yoffset
+if yoffset and yoffset ~= 0 then
+    setfield(current,"yoffset",yoffset)
+end
                             if hascursives then
                                 local cursivex = i.cursivex
                                 if cursivex then
@@ -1144,10 +1148,10 @@ local function inject_everything(head,where)
                                 end
                             end
                             -- left|glyph|right
-                            local yoffset = i.yoffset
-                            if yoffset and yoffset ~= 0 then
-                                setfield(current,"yoffset",yoffset)
-                            end
+--                             local yoffset = i.yoffset
+--                             if yoffset and yoffset ~= 0 then
+--                                 setfield(current,"yoffset",yoffset)
+--                             end
                             local leftkern = i.leftkern
                             if leftkern and leftkern ~= 0 then
                                 insert_node_before(head,current,newkern(leftkern))
diff --git a/tex/context/base/mkiv/lang-txt.lua b/tex/context/base/mkiv/lang-txt.lua
index 6d9c94e0f..c6fa97401 100644
--- a/tex/context/base/mkiv/lang-txt.lua
+++ b/tex/context/base/mkiv/lang-txt.lua
@@ -2309,7 +2309,7 @@ data.labels={
   ["november:jalali"] = {
    labels = {
     en = "Bahman",
-    fa = "unset",
+    fa = "بهمن",
    },
   },
   ["september:jalali"] = {
@@ -2330,7 +2330,7 @@ data.labels={
     fa = "اسفند",
    },
   },
-  ["januari:jalali"] = {
+  ["january:jalali"] = {
    labels = {
     en = "Farvardin",
     fa = "فروردین",
@@ -2354,7 +2354,7 @@ data.labels={
     fa = "مرداد",
    },
   },
-  ["februari:jalali"] = {
+  ["february:jalali"] = {
    labels = {
     en = "Ordibehesht",
     fa = "اردیبهشت",
diff --git a/tex/context/base/mkiv/mlib-pps.lua b/tex/context/base/mkiv/mlib-pps.lua
index 74df758d1..b2c6bc785 100644
--- a/tex/context/base/mkiv/mlib-pps.lua
+++ b/tex/context/base/mkiv/mlib-pps.lua
@@ -1382,7 +1382,7 @@ local function tr_process(object,prescript,before,after)
                 defineprocesscolor(sp_temp,r and r(unpack(s)) or "s=0",true,true)
                 definespotcolor(sp_name,sp_temp,"p=1",true)
                 sp_type = "named"
-            elseif sp_type == "multitone" then
+            elseif sp_type == "multitone" then -- (fractions of a multitone) don't work well in mupdf
                 local sp_value = prescript.sp_value or "s:1"
                 local sp_spec  = { }
                 local sp_list  = split(sp_value," ")
diff --git a/tex/context/base/mkiv/mult-prm.lua b/tex/context/base/mkiv/mult-prm.lua
index 8efa0031d..9d10cf6c1 100644
--- a/tex/context/base/mkiv/mult-prm.lua
+++ b/tex/context/base/mkiv/mult-prm.lua
@@ -252,6 +252,7 @@ return {
   "formatname",
   "gleaders",
   "hyphenationmin",
+  "hyphenationbounds",
   "ifabsdim",
   "ifabsnum",
   "ifprimitive",
@@ -325,6 +326,7 @@ return {
   "scantextokens",
   "setfontid",
   "setrandomseed",
+  "shapemode",
   "suppressfontnotfounderror",
   "suppressifcsnameerror",
   "suppresslongerror",
@@ -822,6 +824,8 @@ return {
   "hyphenation",
   "hyphenchar",
   "hyphenpenalty",
+  "hyphenationmin",
+  "hyphenationbounds",
   "if",
   "ifabsdim",
   "ifabsnum",
@@ -1168,6 +1172,7 @@ return {
   "setfontid",
   "setlanguage",
   "setrandomseed",
+  "shapemode",
   "sfcode",
   "shipout",
   "show",
diff --git a/tex/context/base/mkiv/page-sel.mkvi b/tex/context/base/mkiv/page-sel.mkvi
index eb8389032..b6bb3174d 100644
--- a/tex/context/base/mkiv/page-sel.mkvi
+++ b/tex/context/base/mkiv/page-sel.mkvi
@@ -45,6 +45,9 @@
 %D
 %D This macros inserts the page, according to the settings provided.
 
+%D Beware: width is not the width of the image, but height can be used to control
+%D its dimensions.
+
 \installcorenamespace{withpages}
 
 \installsetuponlycommandhandler \??withpages {withpages}
@@ -108,13 +111,19 @@
    \egroup}
 
 \def\page_selectors_filter_a_page#filename#page%
-  {\hbox to \textwidth
+  {\hpack to \textwidth
      {\ifdim\scratchwidth>\zeropoint
         \rightorleftpageaction{\scratchwidth\zeropoint}{\hfill}%
       \fi
-      \setbox\scratchbox\hbox
+      \setbox\scratchbox\hpack
         {\hskip-\scratchwidth
-         \externalfigure[#filename][\c!page=#page,\c!height=\textheight]\hss}%
+         \edef\p_category{\directwithpagesparameter\c!category}% \useexternalfigure[foo][width=\textwidth]
+         \ifx\p_category\empty
+           \externalfigure[#filename][\c!page=#page,\c!height=\textheight]%
+         \else
+           \externalfigure[#filename][\p_category][\c!page=#page]%
+         \fi
+         \hss}%
       \wd\scratchbox\zeropoint
       \box\scratchbox}
    \page}
@@ -132,7 +141,7 @@
      {\vbox to \textheight
         {\hsize\textwidth
          \centeredbox
-           {\doifelse{\directwithpagesparameter\c!marking}\v!on\cuthbox\hbox % only place where cuthbox is used
+           {\doifelse{\directwithpagesparameter\c!marking}\v!on\cuthbox\hpack % only place where cuthbox is used
               {\ifdim\scratchoffset>\zeropoint\relax
                  \advance\vsize -2\scratchoffset
                  \advance\hsize -2\scratchoffset
@@ -199,7 +208,7 @@
    \directwithpagesparameter\c!after
    \egroup}
 
-\setvalue{\??combinepagesalternative\v!a}%
+\setvalue{\??combinepagesalternative\v!a}% use hpacks
   {\global\combinedpagescounter\directwithpagesparameter\c!start\relax
    \doloop
      {\vbox to \textheight
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index c7630f4bf..348cb41cb 100644
--- a/tex/context/base/mkiv/status-files.pdf
+++ b/tex/context/base/mkiv/status-files.pdf
diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf
index 0f50e6861..133e6ff9d 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf
diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf
index 645256f15..8752b9498 100644
--- a/tex/context/interface/mkiv/i-context.pdf
+++ b/tex/context/interface/mkiv/i-context.pdf
diff --git a/tex/context/interface/mkiv/i-pageselection.xml b/tex/context/interface/mkiv/i-pageselection.xml
index 45c433269..d8d144216 100644
--- a/tex/context/interface/mkiv/i-pageselection.xml
+++ b/tex/context/interface/mkiv/i-pageselection.xml
@@ -32,6 +32,9 @@
                 <cd:parameter name="width">
                     <cd:constant type="cd:dimension"/>
                 </cd:parameter>
+                <cd:parameter name="category">
+                    <cd:constant type="cd:string"/>
+                </cd:parameter>
                 <cd:parameter name="n">
                     <cd:constant type="cd:number"/>
                 </cd:parameter>
diff --git a/tex/context/interface/mkiv/i-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf
index e64c98b10..f720d3e86 100644
--- a/tex/context/interface/mkiv/i-readme.pdf
+++ b/tex/context/interface/mkiv/i-readme.pdf
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 178757a7d..7aad6aade 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 : c:/data/develop/context/sources/luatex-fonts-merged.lua
 -- parent file : c:/data/develop/context/sources/luatex-fonts.lua
--- merge date  : 07/08/16 17:19:16
+-- merge date  : 07/11/16 13:44:22
 
 do -- begin closure to overcome local limits and interference
 
@@ -17149,6 +17149,10 @@ local function inject_everything(head,where)
               nofmarks=nofmarks+1
               marks[nofmarks]=current
             else
+local yoffset=i.yoffset
+if yoffset and yoffset~=0 then
+  setfield(current,"yoffset",yoffset)
+end
               if hascursives then
                 local cursivex=i.cursivex
                 if cursivex then
@@ -17200,10 +17204,6 @@ local function inject_everything(head,where)
                   cursiveanchor=nil
                 end
               end
-              local yoffset=i.yoffset
-              if yoffset and yoffset~=0 then
-                setfield(current,"yoffset",yoffset)
-              end
               local leftkern=i.leftkern
               if leftkern and leftkern~=0 then
                 insert_node_before(head,current,newkern(leftkern))