summaryrefslogtreecommitdiff
path: root/macros/generic
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2024-01-17 03:01:02 +0000
committerNorbert Preining <norbert@preining.info>2024-01-17 03:01:02 +0000
commit4fd81a66c82a2ba8787c6ca78bfcc14820e4017c (patch)
treebd843b1d561c776d5f54e18c0f07c05b079bb791 /macros/generic
parent384734a07c53090ad651e786d248c5ba8cd4606e (diff)
CTAN sync 202401170301
Diffstat (limited to 'macros/generic')
-rw-r--r--macros/generic/memoize/CHANGELOG.md7
-rw-r--r--macros/generic/memoize/Makefile23
-rw-r--r--macros/generic/memoize/doc/memoize-clean.1.md4
-rw-r--r--macros/generic/memoize/doc/memoize-code.pdfbin626766 -> 626771 bytes
-rw-r--r--macros/generic/memoize/doc/memoize-doc.pdfbin2180931 -> 2181032 bytes
-rw-r--r--macros/generic/memoize/doc/memoize-doc.tex2
-rw-r--r--macros/generic/memoize/doc/memoize-extract.1.md4
-rwxr-xr-xmacros/generic/memoize/memoize-clean.pl2
-rwxr-xr-xmacros/generic/memoize/memoize-clean.py2
-rwxr-xr-xmacros/generic/memoize/memoize-extract.pl2
-rwxr-xr-xmacros/generic/memoize/memoize-extract.py2
-rw-r--r--macros/generic/memoize/memoize.edtx26
12 files changed, 41 insertions, 33 deletions
diff --git a/macros/generic/memoize/CHANGELOG.md b/macros/generic/memoize/CHANGELOG.md
index f0d283ee76..291490e568 100644
--- a/macros/generic/memoize/CHANGELOG.md
+++ b/macros/generic/memoize/CHANGELOG.md
@@ -3,7 +3,12 @@
For the development history, see [Memoize's GitHub
repository](https://github.com/sasozivanovic/memoize).
-## 2024/1/02 v1.1.0
+## 2024/01/16 v1.1.1
+
+* Fix a bug where, under `no memo dir`, Memoize was checking whether the extern
+ exists in the root folder.
+
+## 2024/01/02 v1.1.0
* Improve the extraction scripts:
* respect `TEXMF_OUTPUT_DIRECTORY`;
diff --git a/macros/generic/memoize/Makefile b/macros/generic/memoize/Makefile
index 2f79a3b8ce..120b104903 100644
--- a/macros/generic/memoize/Makefile
+++ b/macros/generic/memoize/Makefile
@@ -5,21 +5,22 @@ PACKAGES = memoize advice collargs
all: ctan/memoize.zip
$(MAKE) -f Makefile.advice ctan/advice.zip
$(MAKE) -f Makefile.collargs ctan/collargs.zip
+ @echo "Don't forget to run the tests!"
# Prepare the CTAN submission.
PACKAGE = memoize
-VERSION = 1.1.0
+VERSION = 1.1.1
YEAR = 2024
MONTH = 01
-DAY = 02
+DAY = 16
FORMAT = generic
COMMON = memoize nomemoize memoizable
PLAIN = memoize-extract-one.tex
GENERIC = memoizable.code.tex
-SOURCE = memoize.edtx memoize.ins # $(makefiles)
+SOURCE = memoize.edtx memoize.ins
SCRIPTS := memoize-extract memoize-clean
man-src := $(SCRIPTS:%=doc/%.1.md)
@@ -38,6 +39,9 @@ CHANGELOG = CHANGELOG.md
MAKEFILE = Makefile
LICENCE = LICENCE
+PACKAGES.edtx = $(PACKAGES:%=%.edtx)
+PACKAGES.ins = $(PACKAGES:%=%.ins)
+
makefiles = Makefile.package Makefile.runtimes Makefile.advice Makefile.collargs
codedoc-source = memoize-code.tex \
@@ -87,14 +91,13 @@ ctan/$(PACKAGE).zip:
edtx2dtx -s -c '#' -B '^my \$$PROG' -E '^# Local Variables:' $< \
| sed -e '/^% Local Variables:/Q' > $@
-doc/memoize-code.pdf: $(SOURCE) $(codedoc-source) \
- advice.edtx advice.ins collargs.edtx collargs.ins \
- $(SCRIPTS:%=%.dtx)
+doc/memoize-code.pdf: $(codedoc-source) \
+ $(PACKAGES.edtx) $(PACKAGES.ins) $(SCRIPTS:%=%.dtx)
-doc/memoize.pdf: $(manual-source) $(examples-src) memoize.edtx advice.edtx collargs.edtx
+doc/memoize.pdf: $(manual-source) $(examples-src) $(PACKAGES.edtx)
%.pdf: %.tex
- latexmk -cd -lualatex -bibtex- $< && touch $@
+ latexmk -cd -lualatex -bibtex- $(LATEXMK) $< && touch $@
@@ -128,11 +131,11 @@ version:
$(call EDIT-VERSION-MAN,doc/memoize-clean.1.md)
$(call EDIT-DATE-CHANGELOG,CHANGELOG.md)
define COLOR_VERSION
-grep -E --color '[0-9]{4}[/-][0-9]{2}[/-][0-9]{2}|v?[0-9]\.[0-9]\.[0-9]([-a-z]*)|(January|February|March|April|May|June|July|August|September|October|November|December) [0-9]+, [0-9]{4}'
+grep -E --color '[0-9]{4}[/-][0-9]{1,2}[/-][0-9]{1,2}|v?[0-9]\.[0-9]\.[0-9]([-a-z]*)|(January|February|March|April|May|June|July|August|September|October|November|December) [0-9]+, [0-9]{4}'
endef
versions-show:
- @grep -E '%<latex>\\ProvidesPackage|^%<context>%D\s*(version|date)=' $(PACKAGES:%=%.edtx) | ${COLOR_VERSION}
+ @grep -E '%<latex>\\ProvidesPackage|^%<context>%D\s*(version|date)=' $(PACKAGES.edtx) | ${COLOR_VERSION}
@grep __version__ *.py | ${COLOR_VERSION}
@grep VERSION *.pl | ${COLOR_VERSION}
@grep -E '^(footer|date):' doc/memoize-*.md | ${COLOR_VERSION}
diff --git a/macros/generic/memoize/doc/memoize-clean.1.md b/macros/generic/memoize/doc/memoize-clean.1.md
index b296697d6c..c64cbc0cd0 100644
--- a/macros/generic/memoize/doc/memoize-clean.1.md
+++ b/macros/generic/memoize/doc/memoize-clean.1.md
@@ -2,8 +2,8 @@
title: memoize-clean
section: 1
header: User Manual
-footer: memoize-clean of Memoize v1.1.0
-date: January 02, 2024
+footer: memoize-clean of Memoize v1.1.1
+date: January 16, 2024
hyphenate: false
---
diff --git a/macros/generic/memoize/doc/memoize-code.pdf b/macros/generic/memoize/doc/memoize-code.pdf
index 415b401f42..3ef2312ae0 100644
--- a/macros/generic/memoize/doc/memoize-code.pdf
+++ b/macros/generic/memoize/doc/memoize-code.pdf
Binary files differ
diff --git a/macros/generic/memoize/doc/memoize-doc.pdf b/macros/generic/memoize/doc/memoize-doc.pdf
index 02d3caf6f0..f02f803abc 100644
--- a/macros/generic/memoize/doc/memoize-doc.pdf
+++ b/macros/generic/memoize/doc/memoize-doc.pdf
Binary files differ
diff --git a/macros/generic/memoize/doc/memoize-doc.tex b/macros/generic/memoize/doc/memoize-doc.tex
index efde098ef0..951d4b469f 100644
--- a/macros/generic/memoize/doc/memoize-doc.tex
+++ b/macros/generic/memoize/doc/memoize-doc.tex
@@ -3360,7 +3360,7 @@ to memoize environment |listii|, we will at that point redefine \cs{label} to do
that. In effect, changing the location of |listii| will only recompile it if
it contains a \cs{label}.
-At announced, we redefine \cs{label} once the memoization of |listii| begins,
+As announced, we redefine \cs{label} once the memoization of |listii| begins,
so within \refmmz{at begin memoization}.\footnote{Another generally good
location for such redefinitions is among the auto-options of |listii|. We
could include an \refmmz{auto}\cs{label}\marg{...} there, or a |/utils/exec|
diff --git a/macros/generic/memoize/doc/memoize-extract.1.md b/macros/generic/memoize/doc/memoize-extract.1.md
index f3f3d52ad0..266f65b962 100644
--- a/macros/generic/memoize/doc/memoize-extract.1.md
+++ b/macros/generic/memoize/doc/memoize-extract.1.md
@@ -2,8 +2,8 @@
title: memoize-extract
section: 1
header: User Manual
-footer: memoize-extract of Memoize v1.1.0
-date: January 02, 2024
+footer: memoize-extract of Memoize v1.1.1
+date: January 16, 2024
hyphenate: false
---
diff --git a/macros/generic/memoize/memoize-clean.pl b/macros/generic/memoize/memoize-clean.pl
index 7d7e4f5b43..f3c4dd01bc 100755
--- a/macros/generic/memoize/memoize-clean.pl
+++ b/macros/generic/memoize/memoize-clean.pl
@@ -19,7 +19,7 @@
# <texmf>/doc/generic/memoize/FILES.
my $PROG = 'memoize-clean.pl';
-my $VERSION = '2024/01/02 v1.1.0';
+my $VERSION = '2024/01/16 v1.1.1';
use strict;
use Getopt::Long;
diff --git a/macros/generic/memoize/memoize-clean.py b/macros/generic/memoize/memoize-clean.py
index db758bbd35..b123ed68fe 100755
--- a/macros/generic/memoize/memoize-clean.py
+++ b/macros/generic/memoize/memoize-clean.py
@@ -18,7 +18,7 @@
# The files belonging to this work and covered by LPPL are listed in
# <texmf>/doc/generic/memoize/FILES.
-__version__ = '2024/01/02 v1.1.0'
+__version__ = '2024/01/16 v1.1.1'
import argparse, re, sys, pathlib, os
diff --git a/macros/generic/memoize/memoize-extract.pl b/macros/generic/memoize/memoize-extract.pl
index 96eec29b97..c3cd430016 100755
--- a/macros/generic/memoize/memoize-extract.pl
+++ b/macros/generic/memoize/memoize-extract.pl
@@ -19,7 +19,7 @@
# <texmf>/doc/generic/memoize/FILES.
my $PROG = 'memoize-extract.pl';
-my $VERSION = '2024/01/02 v1.1.0';
+my $VERSION = '2024/01/16 v1.1.1';
use strict;
use File::Basename qw/basename/;
diff --git a/macros/generic/memoize/memoize-extract.py b/macros/generic/memoize/memoize-extract.py
index 29ea58192c..cc936e0447 100755
--- a/macros/generic/memoize/memoize-extract.py
+++ b/macros/generic/memoize/memoize-extract.py
@@ -18,7 +18,7 @@
# The files belonging to this work and covered by LPPL are listed in
# <texmf>/doc/generic/memoize/FILES.
-__version__ = '2024/01/02 v1.1.0'
+__version__ = '2024/01/16 v1.1.1'
import argparse, re, sys, os, subprocess, itertools, traceback, platform
from pathlib import Path, PurePath
diff --git a/macros/generic/memoize/memoize.edtx b/macros/generic/memoize/memoize.edtx
index 86ed2b6197..77cf376391 100644
--- a/macros/generic/memoize/memoize.edtx
+++ b/macros/generic/memoize/memoize.edtx
@@ -90,55 +90,55 @@
%
% \paragraph{Identification} of |memoize|, |memoizable| and |nomemoize|.
%<*mmz>
-%<latex>\ProvidesPackage{memoize}[2024/1/02 v1.1.0 Fast and flexible externalization]
+%<latex>\ProvidesPackage{memoize}[2024/01/16 v1.1.1 Fast and flexible externalization]
%<context>%D \module[
%<context>%D file=t-memoize.tex,
-%<context>%D version=1.1.0,
+%<context>%D version=1.1.1,
%<context>%D title=Memoize,
%<context>%D subtitle=Fast and flexible externalization,
%<context>%D author=Saso Zivanovic,
-%<context>%D date=2024-01-02,
+%<context>%D date=2024-01-16,
%<context>%D copyright=Saso Zivanovic,
%<context>%D license=LPPL,
%<context>%D ]
%<context>\writestatus{loading}{ConTeXt User Module / memoize}
%<context>\unprotect
%<context>\startmodule[memoize]
-%<plain>% Package memoize 2024/01/02 v1.1.0
+%<plain>% Package memoize 2024/01/16 v1.1.1
%</mmz>
%<*mmzable>
-%<latex>\ProvidesPackage{memoizable}[2024/1/02 v1.1.0 A programmer's stub for Memoize]
+%<latex>\ProvidesPackage{memoizable}[2024/01/16 v1.1.1 A programmer's stub for Memoize]
%<context>%D \module[
%<context>%D file=t-memoizable.tex,
-%<context>%D version=1.1.0,
+%<context>%D version=1.1.1,
%<context>%D title=Memoizable,
%<context>%D subtitle=A programmer's stub for Memoize,
%<context>%D author=Saso Zivanovic,
-%<context>%D date=2024-01-02,
+%<context>%D date=2024-01-16,
%<context>%D copyright=Saso Zivanovic,
%<context>%D license=LPPL,
%<context>%D ]
%<context>\writestatus{loading}{ConTeXt User Module / memoizable}
%<context>\unprotect
%<context>\startmodule[memoizable]
-%<plain>% Package memoizable 2024/01/02 v1.1.0
+%<plain>% Package memoizable 2024/01/16 v1.1.1
%</mmzable>
%<*nommz>
-%<latex>\ProvidesPackage{nomemoize}[2024/1/02 v1.1.0 A no-op stub for Memoize]
+%<latex>\ProvidesPackage{nomemoize}[2024/01/16 v1.1.1 A no-op stub for Memoize]
%<context>%D \module[
%<context>%D file=t-nomemoize.tex,
-%<context>%D version=1.1.0,
+%<context>%D version=1.1.1,
%<context>%D title=Memoize,
%<context>%D subtitle=A no-op stub for Memoize,
%<context>%D author=Saso Zivanovic,
-%<context>%D date=2024-01-02,
+%<context>%D date=2024-01-16,
%<context>%D copyright=Saso Zivanovic,
%<context>%D license=LPPL,
%<context>%D ]
%<context>\writestatus{loading}{ConTeXt User Module / nomemoize}
%<context>\unprotect
%<context>\startmodule[nomemoize]
-%<mmz>% Package nomemoize 2024/01/02 v1.1.0
+%<mmz>% Package nomemoize 2024/01/16 v1.1.1
%</nommz>
%
% \paragraph{Required packages} and \hologo{LaTeX}ization of \hologo{plainTeX}
@@ -1766,7 +1766,7 @@
% might be produced by a failed \hologo{TeX}-based extraction, should count
% as no file. The |0| behind |\ifnum| is there because |\pdffilesize|
% returns an empty string when the file does not exist.
- \ifnum0\pdf@filesize{\mmz@prefix@dir/#1}=0
+ \ifnum0\pdf@filesize{\mmz@prefix@dir#1}=0
\ifmmz@direct@ccmemo@input
\let\mmzMemo\endinput
\else