From 96dfd6389ee5b1214b5fdd09c39d85ea383fc7f5 Mon Sep 17 00:00:00 2001
From: Hans Hagen <pragma@wxs.nl>
Date: Wed, 13 Nov 2019 00:57:49 +0100
Subject: 2019-11-13 00:07:00

---
 tex/context/base/mkii/cont-new.mkii                |   2 +-
 tex/context/base/mkii/context.mkii                 |   2 +-
 tex/context/base/mkii/mult-de.mkii                 |   1 +
 tex/context/base/mkiv/buff-ver.lua                 |   2 --
 tex/context/base/mkiv/cont-new.mkiv                |   2 +-
 tex/context/base/mkiv/context.mkiv                 |   2 +-
 tex/context/base/mkiv/context.mkxl                 |   2 +-
 tex/context/base/mkiv/math-ini.mkiv                |   2 +-
 tex/context/base/mkiv/status-files.pdf             | Bin 0 -> 26616 bytes
 tex/context/base/mkiv/status-lua.pdf               | Bin 0 -> 268793 bytes
 tex/context/interface/mkii/keys-de.xml             |   1 +
 tex/context/interface/mkiv/context-en.xml          |  20 ++++++++++++++++++++
 tex/context/interface/mkiv/i-context.pdf           | Bin 0 -> 894053 bytes
 tex/context/interface/mkiv/i-readme.pdf            | Bin 24417 -> 61165 bytes
 tex/generic/context/luatex/luatex-fonts-merged.lua |   2 +-
 15 files changed, 29 insertions(+), 9 deletions(-)
 create mode 100644 tex/context/base/mkiv/status-files.pdf
 create mode 100644 tex/context/base/mkiv/status-lua.pdf
 create mode 100644 tex/context/interface/mkiv/i-context.pdf

(limited to 'tex')

diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii
index b7e8f54ca..d54c79a55 100644
--- a/tex/context/base/mkii/cont-new.mkii
+++ b/tex/context/base/mkii/cont-new.mkii
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2019.11.12 18:49}
+\newcontextversion{2019.11.12 23:58}
 
 %D This file is loaded at runtime, thereby providing an
 %D excellent place for hacks, patches, extensions and new
diff --git a/tex/context/base/mkii/context.mkii b/tex/context/base/mkii/context.mkii
index bf5be5b20..5a3abfe91 100644
--- a/tex/context/base/mkii/context.mkii
+++ b/tex/context/base/mkii/context.mkii
@@ -20,7 +20,7 @@
 %D your styles an modules.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2019.11.12 18:49}
+\edef\contextversion{2019.11.12 23:58}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/mkii/mult-de.mkii b/tex/context/base/mkii/mult-de.mkii
index 9632dc07e..005d93672 100644
--- a/tex/context/base/mkii/mult-de.mkii
+++ b/tex/context/base/mkii/mult-de.mkii
@@ -1053,6 +1053,7 @@
 \setinterfaceconstant{pageconversion}{pageconversion}
 \setinterfaceconstant{pageconversionset}{pageconversionset}
 \setinterfaceconstant{pageleft}{pageleft}
+\setinterfaceconstant{pagemethod}{pagemethod}
 \setinterfaceconstant{pagenumber}{seitennummer}
 \setinterfaceconstant{pageprefix}{pageprefix}
 \setinterfaceconstant{pageprefixconnector}{pageprefixconnector}
diff --git a/tex/context/base/mkiv/buff-ver.lua b/tex/context/base/mkiv/buff-ver.lua
index 0aa2fa62a..ad06dceec 100644
--- a/tex/context/base/mkiv/buff-ver.lua
+++ b/tex/context/base/mkiv/buff-ver.lua
@@ -818,9 +818,7 @@ local function typestring(settings)
         local compact   = settings.compact
         local compactor = compact and compactors[compact]
         if compactor then
-print("!!!!!!!!!!1",content)
             content = lpegmatch(compactor,content) or content
-print("!!!!!!!!!!2",content)
         end
      -- content = decodecomment(content)
      -- content = dotabs(content,settings)
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index f94412de7..8b1011cfc 100644
--- a/tex/context/base/mkiv/cont-new.mkiv
+++ b/tex/context/base/mkiv/cont-new.mkiv
@@ -13,7 +13,7 @@
 
 % \normalend % uncomment this to get the real base runtime
 
-\newcontextversion{2019.11.12 18:49}
+\newcontextversion{2019.11.12 23:58}
 
 %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 bd0607c5a..193c901bd 100644
--- a/tex/context/base/mkiv/context.mkiv
+++ b/tex/context/base/mkiv/context.mkiv
@@ -45,7 +45,7 @@
 %D {YYYY.MM.DD HH:MM} format.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2019.11.12 18:49}
+\edef\contextversion{2019.11.12 23:58}
 \edef\contextkind   {beta}
 
 %D Kind of special:
diff --git a/tex/context/base/mkiv/context.mkxl b/tex/context/base/mkiv/context.mkxl
index 00afd486d..79854c811 100644
--- a/tex/context/base/mkiv/context.mkxl
+++ b/tex/context/base/mkiv/context.mkxl
@@ -29,7 +29,7 @@
 %D {YYYY.MM.DD HH:MM} format.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2019.11.12 18:49}
+\edef\contextversion{2019.11.12 23:58}
 \edef\contextkind   {beta}
 
 %D Kind of special:
diff --git a/tex/context/base/mkiv/math-ini.mkiv b/tex/context/base/mkiv/math-ini.mkiv
index 3a6afaa34..caddfca53 100644
--- a/tex/context/base/mkiv/math-ini.mkiv
+++ b/tex/context/base/mkiv/math-ini.mkiv
@@ -130,7 +130,7 @@
 \mathflattenmode 31
 
 \ifdefined\ordlimits\else
-    \ordlimits\limits
+    \let\ordlimits\limits
 \fi
 
 \appendtoks
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
new file mode 100644
index 000000000..93cdbfb08
Binary files /dev/null and b/tex/context/base/mkiv/status-files.pdf differ
diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf
new file mode 100644
index 000000000..6a88d3f34
Binary files /dev/null and b/tex/context/base/mkiv/status-lua.pdf differ
diff --git a/tex/context/interface/mkii/keys-de.xml b/tex/context/interface/mkii/keys-de.xml
index 5d1009959..e8e797c4e 100644
--- a/tex/context/interface/mkii/keys-de.xml
+++ b/tex/context/interface/mkii/keys-de.xml
@@ -1059,6 +1059,7 @@
 		<cd:constant name='pageconversion' value='pageconversion'/>
 		<cd:constant name='pageconversionset' value='pageconversionset'/>
 		<cd:constant name='pageleft' value='pageleft'/>
+		<cd:constant name='pagemethod' value='pagemethod'/>
 		<cd:constant name='pagenumber' value='seitennummer'/>
 		<cd:constant name='pageprefix' value='pageprefix'/>
 		<cd:constant name='pageprefixconnector' value='pageprefixconnector'/>
diff --git a/tex/context/interface/mkiv/context-en.xml b/tex/context/interface/mkiv/context-en.xml
index 3953a8a04..c99aa0cdf 100644
--- a/tex/context/interface/mkiv/context-en.xml
+++ b/tex/context/interface/mkiv/context-en.xml
@@ -34652,6 +34652,10 @@
      <cd:parameter name="numberorder">
       <cd:constant default="yes" type="numbers"/>
      </cd:parameter>
+     <cd:parameter name="pagemethod">
+      <cd:constant default="yes" type="page"/>
+      <cd:constant type="section"/>
+     </cd:parameter>
     </cd:assignments>
    </cd:arguments>
   </cd:command>
@@ -34868,6 +34872,10 @@
      <cd:parameter name="numberorder">
       <cd:constant default="yes" type="numbers"/>
      </cd:parameter>
+     <cd:parameter name="pagemethod">
+      <cd:constant default="yes" type="page"/>
+      <cd:constant type="section"/>
+     </cd:parameter>
     </cd:assignments>
    </cd:arguments>
   </cd:command>
@@ -35086,6 +35094,10 @@
      <cd:parameter name="numberorder">
       <cd:constant default="yes" type="numbers"/>
      </cd:parameter>
+     <cd:parameter name="pagemethod">
+      <cd:constant default="yes" type="page"/>
+      <cd:constant type="section"/>
+     </cd:parameter>
     </cd:assignments>
    </cd:arguments>
   </cd:command>
@@ -35302,6 +35314,10 @@
      <cd:parameter name="numberorder">
       <cd:constant default="yes" type="numbers"/>
      </cd:parameter>
+     <cd:parameter name="pagemethod">
+      <cd:constant default="yes" type="page"/>
+      <cd:constant type="section"/>
+     </cd:parameter>
     </cd:assignments>
    </cd:arguments>
   </cd:command>
@@ -35602,6 +35618,10 @@
      <cd:parameter name="numberorder">
       <cd:constant default="yes" type="numbers"/>
      </cd:parameter>
+     <cd:parameter name="pagemethod">
+      <cd:constant default="yes" type="page"/>
+      <cd:constant type="section"/>
+     </cd:parameter>
     </cd:assignments>
    </cd:arguments>
    <cd:instances>
diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf
new file mode 100644
index 000000000..d07b620e3
Binary files /dev/null and b/tex/context/interface/mkiv/i-context.pdf differ
diff --git a/tex/context/interface/mkiv/i-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf
index 0034c778c..effcf86ac 100644
Binary files a/tex/context/interface/mkiv/i-readme.pdf and b/tex/context/interface/mkiv/i-readme.pdf differ
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index a0a45c63d..76ddc0b62 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  : 11/12/19 18:49:12
+-- merge date  : 11/12/19 23:58:31
 
 do -- begin closure to overcome local limits and interference
 
-- 
cgit v1.2.3