summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/context/base/core-con.lua
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/context/base/core-con.lua')
-rw-r--r--Master/texmf-dist/tex/context/base/core-con.lua31
1 files changed, 8 insertions, 23 deletions
diff --git a/Master/texmf-dist/tex/context/base/core-con.lua b/Master/texmf-dist/tex/context/base/core-con.lua
index cb284b9a781..73ca3e304ef 100644
--- a/Master/texmf-dist/tex/context/base/core-con.lua
+++ b/Master/texmf-dist/tex/context/base/core-con.lua
@@ -14,14 +14,13 @@ slower but look nicer this way.</p>
<p>Some code may move to a module in the language namespace.</p>
--ldx]]--
-local command, context = commands, context
-
local floor, date, time, concat = math.floor, os.date, os.time, table.concat
local lower, rep, match = string.lower, string.rep, string.match
local utfchar, utfbyte = utf.char, utf.byte
local tonumber, tostring = tonumber, tostring
local context = context
+local commands = commands
local settings_to_array = utilities.parsers.settings_to_array
local allocate = utilities.storage.allocate
@@ -37,9 +36,8 @@ local languages = languages
converters.number = tonumber
converters.numbers = tonumber
-function commands.number(n) context(n) end
-
-commands.numbers = commands.number
+commands.number = context
+commands.numbers = context
-- to be reconsidered ... languages namespace here, might become local plus a register command
@@ -216,27 +214,14 @@ function commands.Character (n) context(chr (n,upper_offset)) end
function commands.characters(n) context(chrs(n,lower_offset)) end
function commands.Characters(n) context(chrs(n,upper_offset)) end
-local days = {
- [false] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 },
- [true] = { 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }
-}
-
-local function weekday(day,month,year)
- return date("%w",time{year=year,month=month,day=day}) + 1
-end
-
-local function isleapyear(year)
- return (year % 400 == 0) or ((year % 100 ~= 0) and (year % 4 == 0))
-end
+local weekday = os.weekday -- moved to l-os
+local isleapyear = os.isleapyear -- moved to l-os
+local nofdays = os.nofdays -- moved to l-os
local function leapyear(year)
return isleapyear(year) and 1 or 0
end
-local function nofdays(year,month)
- return days[isleapyear(year)][month]
-end
-
local function textime()
return tonumber(date("%H")) * 60 + tonumber(date("%M"))
end
@@ -254,7 +239,7 @@ converters.nofdays = nofdays
converters.textime = textime
function commands.weekday (day,month,year) context(weekday (day,month,year)) end
-function commands.leapyear(year) context(leapyear(year)) end -- rather useless
+function commands.leapyear(year) context(leapyear(year)) end -- rather useless, only for ifcase
function commands.nofdays (year,month) context(nofdays (year,month)) end
function commands.year () context(date("%Y")) end
@@ -984,7 +969,7 @@ local days = { -- not variables.sunday
"saturday",
}
-local months = { -- not variables.januari
+local months = { -- not variables.january
"january",
"february",
"march",