From e713d5aa882024dc438506c2f75eae6c5021a237 Mon Sep 17 00:00:00 2001 From: Context Git Mirror Bot Date: Mon, 12 Sep 2016 18:59:25 +0200 Subject: 2016-09-12 18:31:00 --- tex/context/base/mkiv/cont-new.mkiv | 2 +- tex/context/base/mkiv/context.mkiv | 2 +- tex/context/base/mkiv/core-sys.lua | 2 ++ tex/context/base/mkiv/core-sys.mkiv | 5 +++-- tex/context/base/mkiv/status-files.pdf | Bin 9189 -> 9189 bytes tex/context/base/mkiv/status-lua.pdf | Bin 368972 -> 368996 bytes tex/context/base/mkiv/strc-num.lua | 2 +- 7 files changed, 8 insertions(+), 5 deletions(-) (limited to 'tex/context/base/mkiv') diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv index 7a4ffd2d3..a93ba75a5 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.09.12 08:13} +\newcontextversion{2016.09.12 18:27} %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 c2a273351..4d0e51241 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.09.12 08:13} +\edef\contextversion{2016.09.12 18:27} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/mkiv/core-sys.lua b/tex/context/base/mkiv/core-sys.lua index 3e39fa9da..0dbe76685 100644 --- a/tex/context/base/mkiv/core-sys.lua +++ b/tex/context/base/mkiv/core-sys.lua @@ -40,6 +40,7 @@ function environment.initializefilenames() -- jobfilename = gsub(jobfilename, "^./","") -- inputfilename = gsub(inputfilename,"^./","") + environment.jobfilefullname = fulljobname environment.jobfilename = jobfilebase environment.jobfilesuffix = lower(suffixonly(jobfilebase)) @@ -60,6 +61,7 @@ end -- we could set a macro (but will that work when we're expanding? needs testing!) implement { name = "operatingsystem", actions = function() context(os.platform) end } +implement { name = "jobfilefullname", actions = function() context(environment.jobfilefullname) end } implement { name = "jobfilename", actions = function() context(environment.jobfilename) end } implement { name = "jobfilesuffix", actions = function() context(environment.jobfilesuffix) end } implement { name = "inputfilebarename", actions = function() context(environment.inputfilebarename) end } diff --git a/tex/context/base/mkiv/core-sys.mkiv b/tex/context/base/mkiv/core-sys.mkiv index cc9dafdd2..172cb7a38 100644 --- a/tex/context/base/mkiv/core-sys.mkiv +++ b/tex/context/base/mkiv/core-sys.mkiv @@ -40,8 +40,9 @@ %D The jobname is what gets loaded by the cont-yes stub file. This name %D also determines the name of tuc etc files. -\let\jobfilename \clf_jobfilename -\let\jobfilesuffix\clf_jobfilesuffix +\let\jobfilefullname\clf_jobfilefullname +\let\jobfilename \clf_jobfilename +\let\jobfilesuffix \clf_jobfilesuffix %D However, that one can itself load another file. diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf index ab7944b82..b8fff7f4d 100644 Binary files a/tex/context/base/mkiv/status-files.pdf 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 index a490ae3e4..88d519c15 100644 Binary files a/tex/context/base/mkiv/status-lua.pdf and b/tex/context/base/mkiv/status-lua.pdf differ diff --git a/tex/context/base/mkiv/strc-num.lua b/tex/context/base/mkiv/strc-num.lua index 233f8f0a8..d2181342a 100644 --- a/tex/context/base/mkiv/strc-num.lua +++ b/tex/context/base/mkiv/strc-num.lua @@ -631,7 +631,7 @@ implement { name = "countervalue", actions = { counters.value , con implement { name = "lastcountervalue", actions = { counters.last , context }, arguments = { "string", 1 } } implement { name = "firstcountervalue", actions = { counters.first , context }, arguments = { "string", 1 } } implement { name = "nextcountervalue", actions = { counters.next , context }, arguments = { "string", 1 } } -implement { name = "prevcountervalue", actions = { counters.previous, context }, arguments = { "string", 1 } } +implement { name = "previouscountervalue", actions = { counters.previous, context }, arguments = { "string", 1 } } implement { name = "subcountervalues", actions = { counters.subs , context }, arguments = { "string", 1 } } implement { name = "rawsubcountervalue", actions = { counters.raw , context }, arguments = { "string", "integer" } } -- cgit v1.2.3