summaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
Diffstat (limited to 'tex')
-rw-r--r--tex/context/base/mkii/cont-new.mkii2
-rw-r--r--tex/context/base/mkii/context.mkii2
-rw-r--r--tex/context/base/mkii/mult-fr.mkii1
-rw-r--r--tex/context/base/mkiv/cont-new.mkiv2
-rw-r--r--tex/context/base/mkiv/context.mkiv2
-rw-r--r--tex/context/base/mkiv/mult-low.lua1
-rw-r--r--tex/context/base/mkiv/mult-mes.lua16
-rw-r--r--tex/context/base/mkiv/page-flt.mkiv2
-rw-r--r--tex/context/base/mkiv/page-sid.mkiv6
-rw-r--r--tex/context/base/mkiv/status-files.pdfbin25806 -> 25822 bytes
-rw-r--r--tex/context/base/mkiv/status-lua.pdfbin249990 -> 249990 bytes
-rw-r--r--tex/context/base/mkiv/strc-mat.mkiv16
-rw-r--r--tex/context/base/mkiv/util-sql-imp-ffi.lua2
-rw-r--r--tex/context/interface/mkii/keys-fr.xml1
-rw-r--r--tex/context/interface/mkiv/i-context.pdfbin839412 -> 839406 bytes
-rw-r--r--tex/context/interface/mkiv/i-readme.pdfbin60775 -> 60774 bytes
-rw-r--r--tex/context/modules/mkiv/m-three.mkiv72
-rw-r--r--tex/context/modules/mkiv/x-setups-basics.mkiv1
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
19 files changed, 107 insertions, 21 deletions
diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii
index 7162b6225..bca89a4a3 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{2017.11.07 11:37}
+\newcontextversion{2017.11.08 22:45}
%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 7226a502a..3e2bab562 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{2017.11.07 11:37}
+\edef\contextversion{2017.11.08 22:45}
%D For those who want to use this:
diff --git a/tex/context/base/mkii/mult-fr.mkii b/tex/context/base/mkii/mult-fr.mkii
index 63ddbeed7..42335c3ac 100644
--- a/tex/context/base/mkii/mult-fr.mkii
+++ b/tex/context/base/mkii/mult-fr.mkii
@@ -796,6 +796,7 @@
\setinterfaceconstant{fieldoffset}{offsetchamp}
\setinterfaceconstant{file}{fichier}
\setinterfaceconstant{filler}{filler}
+\setinterfaceconstant{filter}{filter}
\setinterfaceconstant{filtercommand}{filtercommand}
\setinterfaceconstant{finalnamesep}{finalnamesep}
\setinterfaceconstant{finalpagesep}{finalpagesep}
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index 565388df2..6c42048c9 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{2017.11.07 11:37}
+\newcontextversion{2017.11.08 22:45}
%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 4254db4d5..a78b7d31f 100644
--- a/tex/context/base/mkiv/context.mkiv
+++ b/tex/context/base/mkiv/context.mkiv
@@ -41,7 +41,7 @@
%D up and the dependencies are more consistent.
\edef\contextformat {\jobname}
-\edef\contextversion{2017.11.07 11:37}
+\edef\contextversion{2017.11.08 22:45}
\edef\contextkind {beta}
%D For those who want to use this:
diff --git a/tex/context/base/mkiv/mult-low.lua b/tex/context/base/mkiv/mult-low.lua
index 55edc191c..848bd8804 100644
--- a/tex/context/base/mkiv/mult-low.lua
+++ b/tex/context/base/mkiv/mult-low.lua
@@ -261,6 +261,7 @@ return {
"doifelsecommon", "doifcommonelse", "doifcommon", "doifnotcommon",
"doifinstring", "doifnotinstring", "doifelseinstring", "doifinstringelse",
"doifelseassignment", "doifassignmentelse", "docheckassignment",
+ "doiftext", "doifelsetext", "doiftextelse", "doifnottext",
--
"tracingall", "tracingnone", "loggingall",
--
diff --git a/tex/context/base/mkiv/mult-mes.lua b/tex/context/base/mkiv/mult-mes.lua
index ffb9b32da..21bb16eab 100644
--- a/tex/context/base/mkiv/mult-mes.lua
+++ b/tex/context/base/mkiv/mult-mes.lua
@@ -522,14 +522,14 @@ return {
ro = "%a mutat",
},
["floatblocks:4"] = {
- cs = "%a umisteno",
- de = "%a plaziert",
- en = "%a placed",
- fr = "%a placé",
- it = "%a sistemato",
- nl = "%a geplaatst",
- no = "%a plassert",
- ro = "%a plasat",
+ cs = "%a umisteno (%s)",
+ de = "%a plaziert (%s)",
+ en = "%a placed (%s)",
+ fr = "%a placé (%s)",
+ it = "%a sistemato (%s)",
+ nl = "%a geplaatst (%s)",
+ no = "%a plassert (%s)",
+ ro = "%a plasat (%s)",
},
["floatblocks:5"] = {
cs = "poradi prizpusobeno",
diff --git a/tex/context/base/mkiv/page-flt.mkiv b/tex/context/base/mkiv/page-flt.mkiv
index 17e24fe27..c43fb3c69 100644
--- a/tex/context/base/mkiv/page-flt.mkiv
+++ b/tex/context/base/mkiv/page-flt.mkiv
@@ -34,7 +34,7 @@
\newconstant\c_page_floats_insertions_topskip_mode % 1 = no topskip
%def\page_floats_report_saved {\showmessage\m!floatblocks2{\the\totalnoffloats}}
-\def\page_floats_report_total {\showmessage\m!floatblocks4{\the\totalnoffloats}}
+\def\page_floats_report_total {\showmessage\m!floatblocks4{\the\totalnoffloats,\floatlocation}}
\def\page_floats_report_flushed{\showmessage\m!floatblocks3{\the\numexpr\totalnoffloats-\savednoffloats\relax}}
%D Extra float registers.
diff --git a/tex/context/base/mkiv/page-sid.mkiv b/tex/context/base/mkiv/page-sid.mkiv
index 477675ce6..75f7725c3 100644
--- a/tex/context/base/mkiv/page-sid.mkiv
+++ b/tex/context/base/mkiv/page-sid.mkiv
@@ -29,7 +29,8 @@
% associate it with the local par node instead. This is something to discuss with
% Taco as it could be a new luatex/mkiv feature: explicitly set par properties.
-% Maybe I should just rewrite the lot.
+% Maybe I should just rewrite the lot, if only because we're now too far from
+% the original. For instance we do this 'after' spacing differently.
\newdimen \d_page_sides_height % includes the topskip
\newdimen \d_page_sides_width
@@ -610,7 +611,8 @@
% method 0 : raw
\or
% method 1 : safe (default)
- \scratchdimentwo .99\pagegoal
+ % too fuzzy as it can change and for a high page it's a lot : \scratchdimentwo .99\pagegoal
+ \advance\scratchdimentwo -\strutdp
\or
% method 2 : tight
\advance\scratchdimenone -\onepoint
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index e21fd578f..2279d5eba 100644
--- a/tex/context/base/mkiv/status-files.pdf
+++ b/tex/context/base/mkiv/status-files.pdf
Binary files differ
diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf
index 25226669a..42e37801c 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf
Binary files differ
diff --git a/tex/context/base/mkiv/strc-mat.mkiv b/tex/context/base/mkiv/strc-mat.mkiv
index 507ae5548..20a639fa3 100644
--- a/tex/context/base/mkiv/strc-mat.mkiv
+++ b/tex/context/base/mkiv/strc-mat.mkiv
@@ -295,8 +295,14 @@
\endgroup}
\unexpanded\def\strc_formulas_place_current_number
- {\strc_formulas_handle_current_references
- \labeltexts\currentformula{\convertedcounter[\v!formula][]}}
+ {\ifx\namedformulaentry\empty
+ \strc_formulas_handle_current_references
+ \labeltexts\currentformula{\convertedcounter[\v!formula][]}%
+ \else
+ \expandafter % hm, the next one reset \namedformulaentry
+ \strc_formulas_handle_current_references
+ \namedformulaentry
+ \fi}
\def\theformuladestinationattribute#1%
{\iflocation\ifx#1\relax\else\ifx#1\empty\else
@@ -395,8 +401,10 @@
% needs checking ... too many:
\def\strc_formulas_handle_numbering_indeed
- {\strc_counters_increment\v!formula
- \doiftext\currentplaceformulasuffix{\strc_counters_setown_sub\v!formula\plustwo\currentplaceformulasuffix}%
+ {\ifx\namedformulaentry\empty
+ \strc_counters_increment\v!formula
+ \doiftext\currentplaceformulasuffix{\strc_counters_setown_sub\v!formula\plustwo\currentplaceformulasuffix}%
+ \fi
\placecurrentformulanumber}
\def\strc_formulas_handle_numbering
diff --git a/tex/context/base/mkiv/util-sql-imp-ffi.lua b/tex/context/base/mkiv/util-sql-imp-ffi.lua
index 152b0fec9..4c0a17d27 100644
--- a/tex/context/base/mkiv/util-sql-imp-ffi.lua
+++ b/tex/context/base/mkiv/util-sql-imp-ffi.lua
@@ -270,7 +270,7 @@ local function execute(t,query)
local result = mysql_execute_query(connection,query,#query)
if result == 0 then
local result = mysql_store_result(connection)
- if result then
+ if result ~= NULL then
mysql_field_seek(result,0)
local nofrows = tonumber(mysql_num_rows(result) or 0)
local noffields = tonumber(mysql_num_fields(result))
diff --git a/tex/context/interface/mkii/keys-fr.xml b/tex/context/interface/mkii/keys-fr.xml
index a993165f5..5c5d2f0fb 100644
--- a/tex/context/interface/mkii/keys-fr.xml
+++ b/tex/context/interface/mkii/keys-fr.xml
@@ -802,6 +802,7 @@
<cd:constant name='fieldoffset' value='offsetchamp'/>
<cd:constant name='file' value='fichier'/>
<cd:constant name='filler' value='filler'/>
+ <cd:constant name='filter' value='filter'/>
<cd:constant name='filtercommand' value='filtercommand'/>
<cd:constant name='finalnamesep' value='finalnamesep'/>
<cd:constant name='finalpagesep' value='finalpagesep'/>
diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf
index 50dc00a0c..bc74703e1 100644
--- a/tex/context/interface/mkiv/i-context.pdf
+++ b/tex/context/interface/mkiv/i-context.pdf
Binary files differ
diff --git a/tex/context/interface/mkiv/i-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf
index ae04197dd..121dc7bba 100644
--- a/tex/context/interface/mkiv/i-readme.pdf
+++ b/tex/context/interface/mkiv/i-readme.pdf
Binary files differ
diff --git a/tex/context/modules/mkiv/m-three.mkiv b/tex/context/modules/mkiv/m-three.mkiv
new file mode 100644
index 000000000..c8ff2167a
--- /dev/null
+++ b/tex/context/modules/mkiv/m-three.mkiv
@@ -0,0 +1,72 @@
+%D \module
+%D [ file=m-three,
+%D version=2017.11.08,
+%D title=\CONTEXT\ Extra Modules,
+%D subtitle=\METAPOST\ pseudo-3D module support,
+%D author=Hans Hagen and Alan Braslau,
+%D date=\currentdate,
+%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+\unprotect
+
+\defineMPinstance
+ [three]
+ [\s!format=metafun,
+ \s!extensions=\v!yes,
+ \s!initializations=\v!yes,
+ \c!method=\s!double]
+
+\startMPdefinitions{three}
+ loadmodule "tres" ;
+\stopMPdefinitions
+
+\protect
+
+\continueifinputfile{m-three.mkiv}
+
+%D We put this test here as in \type {meta-tex.mkiv} it would abort due to redefinition
+%D of namespaces.
+
+\starttext
+
+%D Alan: we need to make a fill example:
+
+\startMPpage[instance=three]
+ path f ; f := (
+ projection Origin --
+ projection (1,0,0) --
+ projection (1,1,0) --
+ projection (0,1,0) --
+ projection (0,1,1) --
+ projection (1,1,1) --
+ projection (1,0,1) --
+ projection (0,0,1) --
+ cycle
+ ) scaled 5cm ;
+
+ fill f withcolor "darkred" ;
+
+ path p ; p := (
+ projection Origin --
+ projection (1,0,0) --
+ projection (1,1,0) --
+ projection (0,1,0) --
+ projection (0,1,1) --
+ projection (1,1,1) --
+ projection (1,0,1) --
+ projection (0,0,1) --
+ cycle
+ ) scaled 5cm ;
+
+ draw p withcolor .5white ;
+
+ for i=0 upto length p :
+ draw point i of p withpen currentpen scaled 2mm withcolor "lightblue" ;
+ endfor ;
+\stopMPpage
+
+\stoptext
diff --git a/tex/context/modules/mkiv/x-setups-basics.mkiv b/tex/context/modules/mkiv/x-setups-basics.mkiv
index f3c5d2d53..6975df684 100644
--- a/tex/context/modules/mkiv/x-setups-basics.mkiv
+++ b/tex/context/modules/mkiv/x-setups-basics.mkiv
@@ -508,6 +508,7 @@
\edef\m_cmd_instance{\expandafter\secondoftwoarguments\cmd_id}%
\fi
\xmlsetup{\expandafter\firstoftwoarguments\cmd_id}{xml:setups:typeset}
+ \let\m_cmd_instance\empty
\fi
\stopelement
\stopelement}
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 100bd770e..741f4e7ac 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/07/17 11:37:34
+-- merge date : 11/08/17 22:45:06
do -- begin closure to overcome local limits and interference