texlive[70128] Master: context-squares (24feb24)
commits+karl at tug.org
commits+karl at tug.org
Sat Feb 24 21:37:56 CET 2024
Revision: 70128
https://tug.org/svn/texlive?view=revision&revision=70128
Author: karl
Date: 2024-02-24 21:37:55 +0100 (Sat, 24 Feb 2024)
Log Message:
-----------
context-squares (24feb24)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/context/third/squares/LICENSE
trunk/Master/texmf-dist/doc/context/third/squares/README.md
trunk/Master/texmf-dist/doc/context/third/squares/VERSION
trunk/Master/texmf-dist/tex/context/third/squares/t-squares.mklx
trunk/Master/tlpkg/libexec/ctan2tds
Added Paths:
-----------
trunk/Master/texmf-dist/doc/context/third/squares/CHANGELOG.md
trunk/Master/texmf-dist/tex/context/third/squares/t-squares.lmt
Removed Paths:
-------------
trunk/Master/texmf-dist/tex/context/third/squares/t-squares.lua
Added: trunk/Master/texmf-dist/doc/context/third/squares/CHANGELOG.md
===================================================================
--- trunk/Master/texmf-dist/doc/context/third/squares/CHANGELOG.md (rev 0)
+++ trunk/Master/texmf-dist/doc/context/third/squares/CHANGELOG.md 2024-02-24 20:37:55 UTC (rev 70128)
@@ -0,0 +1,12 @@
+# Changelog
+
+## [20240223 ("Авдеевка — это Россия!")] - 2024-02-23
+
+### Added
+
+- CHANGELOG added. Previous versions won't have a CHANGELOG entry.
+
+### Changed
+
+- VERSION is now a decimal integer in the format YYYYMMDD.
+- My ConTeXt modules are now mirrored from Gitlab due to personal concerns with Github.
Property changes on: trunk/Master/texmf-dist/doc/context/third/squares/CHANGELOG.md
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/doc/context/third/squares/LICENSE
===================================================================
--- trunk/Master/texmf-dist/doc/context/third/squares/LICENSE 2024-02-24 17:21:03 UTC (rev 70127)
+++ trunk/Master/texmf-dist/doc/context/third/squares/LICENSE 2024-02-24 20:37:55 UTC (rev 70128)
@@ -1,6 +1,6 @@
MIT License
-Copyright (c) 2023 Jairo A. del Rio
+Copyright (c) 2023-2024 Jairo A. del Rio
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Modified: trunk/Master/texmf-dist/doc/context/third/squares/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/context/third/squares/README.md 2024-02-24 17:21:03 UTC (rev 70127)
+++ trunk/Master/texmf-dist/doc/context/third/squares/README.md 2024-02-24 20:37:55 UTC (rev 70128)
@@ -40,4 +40,6 @@
```
_Caveat emptor_: this module is only for ConTeXt LMTX. I no longer use
-ConTeXt MKIV, so no support is provided, sorry.
+ConTeXt MKIV, so no support is provided, sorry. Moreover, I'm using
+cutting-edge features, such as new macro extensions. An updated
+distribution is recommended.
Modified: trunk/Master/texmf-dist/doc/context/third/squares/VERSION
===================================================================
--- trunk/Master/texmf-dist/doc/context/third/squares/VERSION 2024-02-24 17:21:03 UTC (rev 70127)
+++ trunk/Master/texmf-dist/doc/context/third/squares/VERSION 2024-02-24 20:37:55 UTC (rev 70128)
@@ -1 +1 @@
-2023-08-01
+20240223
Added: trunk/Master/texmf-dist/tex/context/third/squares/t-squares.lmt
===================================================================
--- trunk/Master/texmf-dist/tex/context/third/squares/t-squares.lmt (rev 0)
+++ trunk/Master/texmf-dist/tex/context/third/squares/t-squares.lmt 2024-02-24 20:37:55 UTC (rev 70128)
@@ -0,0 +1,329 @@
+if not modules then modules = {} end modules["t-squares"] = {
+ version = 20240223,
+ comment = "Magic and Latin squares",
+ author = "Jairo A. del Rio",
+ copyright = "Jairo A. del Rio",
+ license = "MIT License",
+}
+
+local interfaces = interfaces
+local implement = interfaces.implement
+local magic_reporter = logs.reporter("squares", "magic")
+local latin_reporter = logs.reporter("squares", "latin")
+local random = math.random
+local context = context
+
+-- https://www.iupindia.in/910/IJCM_Magic_Square_Construction_Algorithms34.pdf
+-- https://arxiv.org/pdf/1402.3273.pdf
+-- https://en.wikipedia.org/wiki/Conway%27s_LUX_method_for_magic_squares
+
+-- Helpers
+local function init(s)
+ local q = {}
+ for j = 1, s do
+ q[j] = {}
+ local c = q[j]
+ for i = 1, s do
+ c[i] = 0
+ end
+ end
+ return q
+end
+
+-- Odd numbers
+
+local function magic_01(n)
+ local res = init(n)
+ local i, j = 1 + (n >> 1), 1
+ local k, l
+ res[i][j] = 1
+ for key = 2, n * n do
+ k = i % n + 1
+ l = 2 <= j and j - 1 or n
+ if res[k][l] > 0 then
+ j = j % n + 1
+ else
+ i, j = k, l
+ end
+ res[i][j] = key
+ end
+ return res
+end
+
+-- LUX method
+
+local function magic_02(N)
+ local res = init(N)
+ local n = N // 2
+ local lux = init(n)
+ local L, U, X = 1, 2, 4
+ local x1, x2, x3, x4 = 0, -1, 0, -1
+ for i = 1, n do
+ for j = 1, n // 2 + 1 do
+ lux[i][j] = L
+ end
+ end
+ for i = 1, n do
+ lux[i][n // 2 + 2] = U
+ end
+ for j = n // 2 + 3, n do
+ for i = 1, n do
+ lux[i][j] = X
+ end
+ end
+ lux[n // 2 + 1][n // 2 + 1] = U
+ lux[n // 2 + 1][n // 2 + 2] = L
+ local i, j = 1 + (n >> 1), 1
+ local k, l
+ res[2 * i + x1][2 * j - 1] = 1
+ res[2 * i + x2][2 * j] = 2
+ res[2 * i + x3][2 * j] = 3
+ res[2 * i + x4][2 * j - 1] = 4
+ for key = 2, n * n do
+ k = i % n + 1
+ l = 2 <= j and j - 1 or n
+ if res[2 * k][2 * l] > 0 then
+ j = j % n + 1
+ else
+ i, j = k, l
+ end
+ if lux[i][j] == L then
+ x1, x2, x3, x4 = 0, -1, 0, -1
+ elseif lux[i][j] == U then
+ x1, x2, x3, x4 = -1, -1, 0, 0
+ else
+ x1, x2, x3, x4 = -1, 0, -1, 0
+ end
+ res[2 * i + x1][2 * j - 1] = 4 * (key - 1) + 1
+ res[2 * i + x2][2 * j] = 4 * (key - 1) + 2
+ res[2 * i + x3][2 * j] = 4 * (key - 1) + 3
+ res[2 * i + x4][2 * j - 1] = 4 * key
+ end
+ return res
+end
+
+local function magic_03(n)
+ local res = init(n)
+ for x = 1, n, 4 do
+ for y = 1, n, 4 do
+ local q = 0
+ for i = x, x + 3 do
+ q = q + 1
+ local q1 = 0
+ for j = y, y + 3 do
+ q1 = q1 + 1
+ if i == j or i + j == 5 or q + q1 == 5 or q == q1 then
+ res[i][j] = n * (i - 1) + j
+ else
+ res[i][j] = n * n - ((i - 1) * n + j) + 1
+ end
+ end
+ end
+ end
+ end
+ return res
+end
+
+local currentsquare = nil
+
+local function magicsquare(n)
+ local r = n & 3
+ if r == 0 then
+ return magic_03(n)
+ elseif r == 2 then
+ return magic_02(n)
+ end
+ return magic_01(n)
+end
+
+local bTR, eTR = context.bTR, context.eTR
+local bTD, eTD = context.bTD, context.eTD
+
+implement({
+ name = "magicsquarecell",
+ arguments = { "integer", "integer" },
+ actions = function(x, y)
+ context(currentsquare and currentsquare[x][y] or "")
+ end,
+})
+
+implement({
+ name = "magicsquareinit",
+ arguments = { "integer" },
+ actions = function(n)
+ if n > 0 and n ~= 2 then
+ currentsquare = magicsquare(n)
+ else
+ magic_reporter(("Invalid number %d: nothing will be provided"):format(n))
+ end
+ end,
+})
+
+implement({
+ name = "magicsquarereset",
+ actions = function()
+ currentsquare = nil
+ end,
+})
+
+implement({
+ name = "magicsquare",
+ actions = function()
+ local r = currentsquare
+ if r then
+ local n = #r
+ for j = 1, n do
+ bTR()
+ for i = 1, n do
+ bTD()
+ context(r[i][j])
+ eTD()
+ end
+ eTR()
+ end
+ else
+ magic_reporter("Magic square not initialized...")
+ return
+ end
+ end,
+})
+
+local function rand2(a, b)
+ if random(2) == 1 then
+ return a, b
+ else
+ return b, a
+ end
+end
+
+local function latinsquare(n)
+ local xy = {}
+ local xz = {}
+ local yz = {}
+
+ for i = 1, n do
+ xy[i] = {}
+ xz[i] = {}
+ yz[i] = {}
+ for j = 1, n do
+ xy[i][j] = 0
+ xz[i][j] = 0
+ yz[i][j] = 0
+ end
+ end
+
+ for i = 1, n do
+ for j = 1, n do
+ local k = (i + j - 2) % n + 1
+ xy[i][j] = k
+ xz[i][k] = j
+ yz[j][k] = i
+ end
+ end
+
+ local mxy, mxz, myz = 0, 0, 0
+ local m = { 0, 0, 0 }
+ local proper = true
+ local minIter = n * n * n
+ local iter = 0
+
+ while iter < minIter or not proper do
+ local i, j, k, i2, j2, k2
+ local i2_, j2_, k2_
+
+ if proper then
+ i, j, k = random(n), random(n), random(n)
+ while xy[i][j] == k do
+ i, j, k = random(n), random(n), random(n)
+ end
+
+ i2 = yz[j][k]
+ j2 = xz[i][k]
+ k2 = xy[i][j]
+ i2_, j2_, k2_ = i, j, k
+ else
+ i, j, k = m[1], m[2], m[3]
+
+ i2, i2_ = rand2(yz[j][k], myz)
+ j2, j2_ = rand2(xz[i][k], mxz)
+ k2, k2_ = rand2(xy[i][j], mxy)
+ end
+
+ proper = xy[i2][j2] == k2
+ if not proper then
+ m = { i2, j2, k2 }
+ mxy = xy[i2][j2]
+ myz = yz[j2][k2]
+ mxz = xz[i2][k2]
+ end
+
+ xy[i][j] = k2_
+ xy[i][j2] = k2
+ xy[i2][j] = k2
+ xy[i2][j2] = k
+
+ yz[j][k] = i2_
+ yz[j][k2] = i2
+ yz[j2][k] = i2
+ yz[j2][k2] = i
+
+ xz[i][k] = j2_
+ xz[i][k2] = j2
+ xz[i2][k] = j2
+ xz[i2][k2] = j
+
+ iter = iter + 1
+ end
+ return xy
+end
+
+local currentlatin = nil
+
+implement({
+ name = "latinsquarecell",
+ arguments = { "integer", "integer" },
+ actions = function(x, y)
+ context(currentlatin and currentlatin[x][y] or "")
+ end,
+})
+
+implement({
+ name = "latinsquareinit",
+ arguments = { "integer" },
+ actions = function(n)
+ if n > 0 then
+ currentlatin = latinsquare(n)
+ else
+ latin_reporter(("Invalid number %d: nothing will be provided"):format(n))
+ end
+ end,
+})
+
+implement({
+ name = "latinsquarereset",
+ actions = function()
+ currentlatin = nil
+ end,
+})
+
+implement({
+ name = "latinsquare",
+ actions = function()
+ local r = currentlatin
+ if r then
+ local n = #r
+ for j = 1, n do
+ bTR()
+ for i = 1, n do
+ bTD()
+ context(r[i][j])
+ eTD()
+ end
+ eTR()
+ end
+ else
+ latin_reporter("Latin square not initialized...")
+ return
+ end
+ end,
+})
Deleted: trunk/Master/texmf-dist/tex/context/third/squares/t-squares.lua
===================================================================
--- trunk/Master/texmf-dist/tex/context/third/squares/t-squares.lua 2024-02-24 17:21:03 UTC (rev 70127)
+++ trunk/Master/texmf-dist/tex/context/third/squares/t-squares.lua 2024-02-24 20:37:55 UTC (rev 70128)
@@ -1,306 +0,0 @@
-if not modules then modules = {} end modules["t-squares"] = {
- version = "2023-08-01",
- comment = "Magic and Latin squares",
- author = "Jairo A. del Rio",
- copyright = "Jairo A. del Rio",
- license = "MIT License",
-}
-
-local interfaces = interfaces
-local implement = interfaces.implement
-local magic_reporter = logs.reporter("squares", "magic")
-local latin_reporter = logs.reporter("squares", "latin")
-local random = math.random
-
--- https://www.iupindia.in/910/IJCM_Magic_Square_Construction_Algorithms34.pdf
--- https://arxiv.org/pdf/1402.3273.pdf
--- https://en.wikipedia.org/wiki/Conway%27s_LUX_method_for_magic_squares
-
--- Helpers
-local function init(s)
- local q = {}
- for j = 1, s do
- q[j] = {}
- local c = q[j]
- for i = 1, s do
- c[i] = 0
- end
- end
- return q
-end
-
--- Odd numbers
-
-local function magic_01(n)
- local res = init(n)
- local i, j = 1 + (n >> 1), 1
- local k, l
- res[i][j] = 1
- for key = 2, n * n do
- k = 2 <= i and i - 1 or n
- l = 2 <= j and j - 1 or n
- if res[k][l] > 0 then
- i = i % n + 1
- else
- i, j = k, l
- end
- res[i][j] = key
- end
- return res
-end
-
-local function magic_02(N)
- local res = init(N)
- local n = N // 2
- local lux = init(n)
- local L, U, X = 1, 2, 4
- local x1, x2, x3, x4 = -1, 0, -1, 0
- for i = 1, n do
- for j = 1, n // 2 + 1 do
- lux[i][j] = L
- end
- end
- for i = 1, n do
- lux[i][n // 2 + 2] = U
- end
- for j = n // 2 + 3, n do
- for i = 1, n do
- lux[i][j] = X
- end
- end
- lux[n // 2 + 1][n // 2 + 1] = U
- lux[n // 2 + 1][n // 2 + 2] = L
- local i, j = 1, 1 + (n >> 1)
- local k, l
- res[2 * i + x1][2 * j - 1] = 1
- res[2 * i + x2][2 * j] = 2
- res[2 * i + x3][2 * j] = 3
- res[2 * i + x4][2 * j - 1] = 4
- for key = 2, n * n do
- k = 2 <= i and i - 1 or n
- l = 2 <= j and j - 1 or n
- if res[2 * k][2 * l] > 0 then
- i = i % n + 1
- else
- i, j = k, l
- end
- if lux[i][j] == L then
- x1, x2, x3, x4 = -1, 0, -1, 0
- elseif lux[i][j] == U then
- x1, x2, x3, x4 = 0, 0, -1, -1
- else
- x1, x2, x3, x4 = 0, -1, 0, -1
- end
- res[2 * i + x1][2 * j] = 4 * (key - 1) + 1
- res[2 * i + x2][2 * j - 1] = 4 * (key - 1) + 2
- res[2 * i + x3][2 * j - 1] = 4 * (key - 1) + 3
- res[2 * i + x4][2 * j] = 4 * key
- end
- return res
-end
-
-local function magic_03(n)
- local res = init(n)
- for x = 1, n, 4 do
- for y = 1, n, 4 do
- local q = 0
- for i = x, x + 3 do
- q = q + 1
- local q1 = 0
- for j = y, y + 3 do
- q1 = q1 + 1
- if i == j or i + j == 5 or q + q1 == 5 or q == q1 then
- res[i][j] = n * (i - 1) + j
- else
- res[i][j] = n * n - ((i - 1) * n + j) + 1
- end
- end
- end
- end
- end
- return res
-end
-
-local currentsquare = nil
-
-local function magicsquare(n)
- local r = n & 3
- if r == 0 then
- return magic_03(n)
- elseif r == 2 then
- return magic_02(n)
- end
- return magic_01(n)
-end
-
-local bTR, eTR = context.bTR, context.eTR
-local bTD, eTD = context.bTD, context.eTD
-
-implement({
- name = "magicsquarecell",
- arguments = { "integer", "integer" },
- actions = function(x, y)
- context(currentsquare and currentsquare[x][y] or "")
- end,
-})
-
-implement({
- name = "magicsquareinit",
- arguments = { "integer" },
- actions = function(n)
- if n > 0 and n ~= 2 then
- currentsquare = magicsquare(n)
- else
- magic_reporter(("Invalid number %d: nothing will be provided"):format(n))
- end
- end,
-})
-
-implement({
- name = "magicsquarereset",
- actions = function()
- currentsquare = nil
- end,
-})
-
-implement({
- name = "magicsquare",
- actions = function()
- local r = currentsquare
- if r then
- local n = #r
- for i = 1, n do
- bTR()
- for j = 1, n do
- bTD()
- context(r[i][j])
- eTD()
- end
- eTR()
- end
- else
- magic_reporter("Magic square not initialized...")
- return
- end
- end,
-})
-
-local function rand2(a, b)
- if random(2) == 1 then
- return a, b
- else
- return b, a
- end
-end
-
-local function latinsquare(n)
- local xy, xz, yz = {}, {}, {}
- local mxy, mxz, myz
- local m
- local proper = true
- local min = n * n * n
- for i = 1, n do
- xy[i] = {}
- yz[i] = {}
- xz[i] = {}
- end
- for i = 1, n do
- for j = 1, n do
- local k = (i + j - 2) % n + 1
- xy[i][j] = k
- xz[i][k] = j
- yz[j][k] = i
- end
- end
- for _ = 1, min do
- local i, j, k, i2, j2, k2, i2_, j2_, k2_
- if proper then
- i, j, k = random(n), random(n), random(n)
- while xy[i][j] == k do
- i, j, k = random(n), random(n), random(n)
- end
- i2 = yz[j][k]
- j2 = xz[i][k]
- k2 = xy[i][j]
- i2_, j2_, k2_ = i, j, k
- else
- i, j, k = m[1], m[2], m[3]
- i2, i2_ = rand2(yz[j][k], myz)
- j2, j2_ = rand2(xz[i][k], mxz)
- k2, k2_ = rand2(xy[i][j], mxy)
- end
- proper = xy[i2][j2] == k2
- if not proper then
- m = { i2, j2, k2 }
- mxy = xy[i2][j2]
- myz = yz[j2][k2]
- mxz = xz[i2][k2]
- end
- xy[i][j] = k2_
- xy[i][j2] = k2
- xy[i2][j] = k2
- xy[i2][j2] = k
-
- yz[j][k] = i2_
- yz[j][k2] = i2
- yz[j2][k] = i2
- yz[j2][k2] = i
-
- xz[i][k] = j2_
- xz[i][k2] = j2
- xz[i2][k] = j2
- xz[i2][k2] = j
- end
- return xy
-end
-
-local currentlatin = nil
-
-implement({
- name = "latinsquarecell",
- arguments = { "integer", "integer" },
- actions = function(x, y)
- context(currentlatin and currentlatin[x][y] or "")
- end,
-})
-
-implement({
- name = "latinsquareinit",
- arguments = { "integer" },
- actions = function(n)
- if n > 0 then
- currentlatin = latinsquare(n)
- else
- latin_reporter(("Invalid number %d: nothing will be provided"):format(n))
- end
- end,
-})
-
-implement({
- name = "latinsquarereset",
- actions = function()
- currentlatin = nil
- end,
-})
-
-implement({
- name = "latinsquare",
- actions = function()
- local r = currentlatin
- if r then
- local n = #r
- for i = 1, n do
- bTR()
- for j = 1, n do
- bTD()
- context(r[i][j])
- eTD()
- end
- eTR()
- end
- else
- latin_reporter("Latin square not initialized...")
- return
- end
- end,
-})
Modified: trunk/Master/texmf-dist/tex/context/third/squares/t-squares.mklx
===================================================================
--- trunk/Master/texmf-dist/tex/context/third/squares/t-squares.mklx 2024-02-24 17:21:03 UTC (rev 70127)
+++ trunk/Master/texmf-dist/tex/context/third/squares/t-squares.mklx 2024-02-24 20:37:55 UTC (rev 70128)
@@ -1,194 +1,201 @@
-%D \module
-%D [ file=t-squares,
-%D version=2023-08-01,
-%D title=\CONTEXT\ User Module,
-%D subtitle=Squares for ConTeXt,
-%D author=Jairo A. del Rio,
-%D date=\currentdate,
-%D copyright=Jairo A. del Rio,
-%D email=jairoadelrio6 at gmail.com,
-%D license=MIT License]
-
-%C Copyright (c) 2023 Jairo A. del Rio
-%C
-%C Permission is hereby granted, free of charge, to any person obtaining
-%C a copy of this software and associated documentation files (the
-%C "Software"), to deal in the Software without restriction, including
-%C without limitation the rights to use, copy, modify, merge, publish,
-%C distribute, sublicense, and/or sell copies of the Software, and to
-%C permit persons to whom the Software is furnished to do so, subject to
-%C the following conditions:
-%C
-%C The above copyright notice and this permission notice shall be
-%C included in all copies or substantial portions of the Software.
-%C
-%C THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-%C EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-%C MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-%C IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-%C CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-%C TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-%C SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-\writestatus{loading}{Squares for ConTeXt!}
-
-\startmodule[squares]
-
-\unprotect
-
-\registerctxluafile{t-squares}{autosuffix}
-
-\installnamespace {magicsquare}
-\installsimplecommandhandler\????magicsquare{magicsquare}\????magicsquare
-
-\startsetups[\????magicsquare:\c!renderingsetup:\v!color]
-\dorecurse{\numexpr\magicsquareparameter\c!n}{
- \dorecurse{\numexpr\magicsquareparameter\c!n}{
- \definecolor[\????magicsquare:\v!color:##1:####1]
- [h=\the\numexpr(360*\clf_magicsquarecell\numexpr##1\relax\numexpr####1\relax):(\magicsquareparameter\c!n*\magicsquareparameter\c!n)\relax,
- v=1,
- s=0.5]%
- \setupTABLE[####1][##1]
- [\c!background=\v!color,
- \c!backgroundcolor=\????magicsquare:\v!color:##1:####1]%
- }
-}
-\stopsetups
-
-\setupmagicsquare
- [\c!n=5,
- \c!size=2em,
- \c!align={\v!middle,\v!lohi},
- \c!renderingsetup=\v!none]
-
-\tolerant\protected\def\magicsquare[#parameters]%
-{\begingroup%
- \ifarguments\or
- \setupmagicsquare[#parameters]%
- \fi
- \clf_magicsquareinit\numexpr\magicsquareparameter\c!n\relax%
- \ifcstok{\magicsquareparameter\c!renderingsetup}\emptytoks
- \else
- \directsetup{\????magicsquare:\c!renderingsetup:\magicsquareparameter\c!renderingsetup}%
- \fi
- \bTABLE
- [#parameters,
- \c!width=\magicsquareparameter\c!size,
- \c!height=\magicsquareparameter\c!size,
- \c!align=\magicsquareparameter\c!align]%
- \clf_magicsquare%
- \eTABLE%
- \clf_magicsquarereset%
- \endgroup}
-
-\installnamespace{latinsquare}
-\installsimplecommandhandler\????latinsquare{latinsquare}\????latinsquare
-
-\startsetups[\????latinsquare:\c!renderingsetup:\v!none]
-\stopsetups
-
-\startsetups[\????latinsquare:\c!renderingsetup:\v!color]
-\dorecurse{\numexpr\latinsquareparameter\c!n}{
- \definecolor[\????latinsquare:\v!color:##1][h=\the\numexpr(360*##1):(\magicsquareparameter\c!n)\relax,v=1,s=0.5]%
- \dorecurse{\numexpr\latinsquareparameter\c!n}{
- \setupTABLE[####1][##1]
- [\c!background=\v!color,
- \c!backgroundcolor=\????latinsquare:\v!color:\clf_latinsquarecell\numexpr##1\relax\numexpr####1\relax]%
- }
-}
-\stopsetups
-
-\setuplatinsquare
- [\c!n=5,
- \c!size=2em,
- \c!align={\v!middle,\v!lohi},
- \c!renderingsetup=\v!none]
-
-\tolerant\protected\def\latinsquare[#parameters]%
-{\begingroup%
- \ifarguments\or
- \setuplatinsquare[#parameters]%
- \fi
- \clf_latinsquareinit\numexpr\latinsquareparameter\c!n\relax%
- \ifcstok{\latinsquareparameter\c!renderingsetup}\emptytoks
- \else
- \directsetup{\????latinsquare:\c!renderingsetup:\latinsquareparameter\c!renderingsetup}%
- \fi
- \bTABLE
- [#parameters,
- \c!width=\latinsquareparameter\c!size,
- \c!height=\latinsquareparameter\c!size,
- \c!align=\latinsquareparameter\c!align]%
- \clf_latinsquare%
- \eTABLE%
- \clf_latinsquarereset%
- \endgroup}
-
-\protect
-
-\stopmodule
-
-\continueifinputfile{t-squares.mklx}
-
-\starttext
-
-\startsection[title=\type{\magicsquare}]
-
-% Magic squares
-
-\startbuffer
-\magicsquare[n=6,renderingsetup=color]
-\stopbuffer
-
-\typebuffer
-
-\getbuffer
-
-\startbuffer
-\magicsquare[n=7,renderingsetup=color]
-\stopbuffer
-
-\typebuffer
-
-\getbuffer
-
-\startbuffer
-\magicsquare[n=8,renderingsetup=color]
-\stopbuffer
-
-\typebuffer
-
-\getbuffer
-
-\startbuffer
-\magicsquare[n=2]
-\stopbuffer
-
-\typebuffer
-
-\getbuffer
-
-\stopsection
-
-% Latin squares
-
-\startsection[title=\type{\latinsquare}]
-
-\startbuffer
-\latinsquare[n=7]
-\stopbuffer
-
-\typebuffer
-
-\getbuffer
-
-\startbuffer
-\latinsquare[n=5,renderingsetup=color]
-\stopbuffer
-
-\typebuffer
-
-\getbuffer
-
-\stopsection
-\stoptext
+%D \module
+%D [ file=t-squares,
+%D version=20240223,
+%D title=\CONTEXT\ User Module,
+%D subtitle=Squares for ConTeXt,
+%D author=Jairo A. del Rio,
+%D date=\currentdate,
+%D copyright=Jairo A. del Rio,
+%D email=jairoadelrio6 at gmail.com,
+%D license=MIT License]
+
+%C Copyright (c) 2023-2024 Jairo A. del Rio
+%C
+%C Permission is hereby granted, free of charge, to any person obtaining
+%C a copy of this software and associated documentation files (the
+%C "Software"), to deal in the Software without restriction, including
+%C without limitation the rights to use, copy, modify, merge, publish,
+%C distribute, sublicense, and/or sell copies of the Software, and to
+%C permit persons to whom the Software is furnished to do so, subject to
+%C the following conditions:
+%C
+%C The above copyright notice and this permission notice shall be
+%C included in all copies or substantial portions of the Software.
+%C
+%C THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+%C EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+%C MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+%C IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+%C CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+%C TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+%C SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+\writestatus{loading}{Squares for ConTeXt!}
+
+\startmodule[squares]
+
+\registerctxluafile{t-squares}{autosuffix}
+
+\unprotect
+
+% Experiment: simpler setup command handler...
+
+\installnamespace {magicsquare}
+\installsetuponlycommandhandler\????magicsquare{magicsquare}
+
+\startsetups[\????magicsquare:\c!renderingsetup:\v!color]
+\cdef\c_n{\magicsquareparameter\c!n}
+\expandedrepeat\numexpr\c_n\relax{
+ \expandedrepeat\numexpr\c_n\relax{
+ \definecolor[\????magicsquare:\v!color:##P:##I]
+ [h=\the\numexpr(360*\clf_magicsquarecell##P##I):(\c_n*\c_n)\relax,v=1,s=0.5]%
+ \setupTABLE[##P][##I]
+ [\c!background=\v!color,
+ \c!backgroundcolor=\????magicsquare:\v!color:##P:##I]%
+ }
+}
+\stopsetups
+
+\setupmagicsquare
+ [\c!n=5,
+ \c!size=2em,
+ \c!align={\v!middle,\v!lohi},
+ \c!renderingsetup=\v!none]
+
+\permanent\tolerant\protected\def\magicsquare[#S#parameters]%
+ {\begingroup%
+ \setupmagicsquare[#parameters]%
+ \clf_magicsquareinit\numexpr\magicsquareparameter\c!n\relax%
+ \ifempty{\magicsquareparameter\c!renderingsetup}%
+ \else
+ \directsetup{\????magicsquare:\c!renderingsetup:\magicsquareparameter\c!renderingsetup}%
+ \fi%
+ \bTABLE
+ [#parameters,
+ \c!width=\magicsquareparameter\c!size,
+ \c!height=\magicsquareparameter\c!size,
+ \c!align=\magicsquareparameter\c!align]%
+ \clf_magicsquare%
+ \eTABLE%
+ \clf_magicsquarereset%
+ \endgroup}
+
+\installnamespace {latinsquare}
+\installsetuponlycommandhandler\????latinsquare{latinsquare}
+
+\startsetups[\????latinsquare:\c!renderingsetup:\v!none]
+\stopsetups
+
+\startsetups[\????latinsquare:\c!renderingsetup:\v!color]
+\expandedrepeat\numexpr\latinsquareparameter\c!n\relax{
+ \definecolor[\????latinsquare:\v!color:##I][h=\the\numexpr(360*##I):(\latinsquareparameter\c!n)\relax,v=1,s=0.5]%
+ \expandedrepeat\numexpr\latinsquareparameter\c!n\relax{
+ \setupTABLE[##P][##I]
+ [\c!background=\v!color,
+ \c!backgroundcolor=\????latinsquare:\v!color:\clf_latinsquarecell##P##I]%
+ }
+}
+\stopsetups
+
+\setuplatinsquare
+ [\c!n=5,
+ \c!size=2em,
+ \c!align={\v!middle,\v!lohi},
+ \c!renderingsetup=\v!none]
+
+\permanent\tolerant\protected\def\latinsquare[#S#parameters]%
+ {\begingroup%
+ \setuplatinsquare[#parameters]%
+ \clf_latinsquareinit\numexpr\latinsquareparameter\c!n\relax%
+ \ifempty{\latinsquareparameter\c!renderingsetup}%
+ \else
+ \directsetup{\????latinsquare:\c!renderingsetup:\latinsquareparameter\c!renderingsetup}%
+ \fi%
+ \bTABLE
+ [#parameters,
+ \c!width=\latinsquareparameter\c!size,
+ \c!height=\latinsquareparameter\c!size,
+ \c!align=\latinsquareparameter\c!align]%
+ \clf_latinsquare%
+ \eTABLE%
+ \clf_latinsquarereset%
+ \endgroup}
+
+\protect
+
+\stopmodule
+
+\continueifinputfile{t-squares.mklx}
+
+\starttext
+
+\startsection[title=\type{\magicsquare}]
+
+% Magic squares
+
+\startbuffer
+\magicsquare[n=10,renderingsetup=color]
+\stopbuffer
+
+\typebuffer
+
+\getbuffer
+
+\startbuffer
+\magicsquare[n=3,renderingsetup=color]
+\stopbuffer
+
+\typebuffer
+
+\getbuffer
+
+\startbuffer
+\magicsquare[n=8,renderingsetup=color]
+\stopbuffer
+
+\typebuffer
+
+\getbuffer
+
+\startbuffer
+\magicsquare[n=2]
+\stopbuffer
+
+\typebuffer
+
+\getbuffer
+
+\startbuffer
+\magicsquare
+\stopbuffer
+
+\typebuffer
+
+\getbuffer
+
+\stopsection
+
+% Latin squares
+
+\startsection[title=\type{\latinsquare}]
+
+\startbuffer
+\latinsquare[n=7,renderingsetup=color]
+\stopbuffer
+
+\typebuffer
+
+\getbuffer
+
+\startbuffer
+\latinsquare[n=5,renderingsetup=color]
+\stopbuffer
+
+\typebuffer
+
+\getbuffer
+
+\stopsection
+\stoptext
+
+% vim: tw=80:ts=2:sts=2:expandtab:wrap:linebreak:breakindent
\ No newline at end of file
Modified: trunk/Master/tlpkg/libexec/ctan2tds
===================================================================
--- trunk/Master/tlpkg/libexec/ctan2tds 2024-02-24 17:21:03 UTC (rev 70127)
+++ trunk/Master/tlpkg/libexec/ctan2tds 2024-02-24 20:37:55 UTC (rev 70128)
@@ -4336,17 +4336,17 @@
-r "$dest/MANIFEST.txt"
&& &SYSTEM ("cd $dest && $RM GUST*.txt MANIFEST.txt README.eng");
- # move README for encxvlna and others
- -r "$dest/README"
- && &SYSTEM ("$MV $dest/README $dest/README.md $docdir/");
+ # move README for encxvlna and others.
+ -r "$dest/README"
+ && &SYSTEM ("$MV $dest/README $docdir/");
- # move manifest.txt for droid
+ # move manifest.txt for droid.
-r "$dest/manifest.txt"
&& &SYSTEM ("$MV $dest/manifest.txt $docdir/");
# move CHANGELOG for stellenbosch.
- -r "$dest/CHANGELOG"
- && &SYSTEM ("$MV $dest/CHANGELOG $docdir/");
+ -r "$dest/CHANGELOG"
+ && &SYSTEM ("$MV $dest/CHANGELOG* $docdir/");
# move README.eulervm for eulervm.
-r "$dest/README.eulervm"
@@ -6928,6 +6928,7 @@
(my $context_package = $package) =~ s/^context-//;
my $destdir = "$DEST/doc/context/third/$context_package";
&mv_with_mkdir ("LICENSE", "$DEST/doc/context/third/$context_package");
+ &mv_with_mkdir ("CHANGELOG.md", "$DEST/doc/context/third/$context_package");
&mv_with_mkdir ("README.md", "$DEST/doc/context/third/$context_package");
&mv_with_mkdir ("VERSION", "$DEST/doc/context/third/$context_package");
}
More information about the tex-live-commits
mailing list.