diff options
author | Karl Berry <karl@freefriends.org> | 2024-04-03 21:14:47 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2024-04-03 21:14:47 +0000 |
commit | a8984fc15cfa095b926aac9fe1bf0fd2f7b32e01 (patch) | |
tree | eaab5832220d4878b5f3fe6550596ca99328b38f /Build | |
parent | a02954fdc72a0a19c86b35343bba815784f4ccf8 (diff) |
memoize (3apr24)
git-svn-id: svn://tug.org/texlive/trunk@70841 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
4 files changed, 26 insertions, 20 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/memoize/memoize-clean.pl b/Build/source/texk/texlive/linked_scripts/memoize/memoize-clean.pl index 4901a98aa3b..b2d9c90c4a8 100755 --- a/Build/source/texk/texlive/linked_scripts/memoize/memoize-clean.pl +++ b/Build/source/texk/texlive/linked_scripts/memoize/memoize-clean.pl @@ -19,7 +19,7 @@ # <texmf>/doc/generic/memoize/FILES. my $PROG = 'memoize-clean.pl'; -my $VERSION = '2024/03/15 v1.2.0'; +my $VERSION = '2024/04/02 v1.3.0'; use strict; use Getopt::Long; @@ -53,7 +53,7 @@ GetOptions( "yes|y" => \$yes, "all|a" => \$all, "prefix|p=s" => \@prefixes, - "quiet|q|?" => \$quiet, + "quiet|q" => \$quiet, "help|h|?" => \$help, "version|V" => \$print_version, ) or die $usage; diff --git a/Build/source/texk/texlive/linked_scripts/memoize/memoize-clean.py b/Build/source/texk/texlive/linked_scripts/memoize/memoize-clean.py index 3b70d63a31b..74b8d9b57a7 100755 --- a/Build/source/texk/texlive/linked_scripts/memoize/memoize-clean.py +++ b/Build/source/texk/texlive/linked_scripts/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/03/15 v1.2.0' +__version__ = '2024/04/02 v1.3.0' import argparse, re, sys, pathlib, os diff --git a/Build/source/texk/texlive/linked_scripts/memoize/memoize-extract.pl b/Build/source/texk/texlive/linked_scripts/memoize/memoize-extract.pl index d5cd1f9aa44..0f2cfa3a229 100755 --- a/Build/source/texk/texlive/linked_scripts/memoize/memoize-extract.pl +++ b/Build/source/texk/texlive/linked_scripts/memoize/memoize-extract.pl @@ -19,7 +19,7 @@ # <texmf>/doc/generic/memoize/FILES. my $PROG = 'memoize-extract.pl'; -my $VERSION = '2024/03/15 v1.2.0'; +my $VERSION = '2024/04/02 v1.3.0'; use strict; use File::Basename qw/basename/; @@ -86,6 +86,7 @@ sub error { print(STDOUT "$_\n"); } if ($log) { + $short =~ s/\\/\\string\\/g; $long =~ s/\\/\\string\\/g; $_ = $ERROR{$format}; s/\$short/$short/; @@ -98,12 +99,6 @@ sub error { sub warning { my $text = shift; - if ($log) { - $_ = $WARNING{$format}; - s/\$texindent/$texindent/; - s/\$text/$text/; - print(LOG "$_\n"); - } if (! $quiet) { $_ = $WARNING{''}; s/\$header/$header/; @@ -111,6 +106,13 @@ sub warning { s/\$text/$text/; print(STDOUT "$_\n"); } + if ($log) { + $_ = $WARNING{$format}; + $text =~ s/\\/\\string\\/g; + s/\$texindent/$texindent/; + s/\$text/$text/; + print(LOG "$_\n"); + } $exit_code = 10; } @@ -124,6 +126,7 @@ sub info { print(STDOUT "$_\n"); if ($log) { $_ = $INFO{$format}; + $text =~ s/\\/\\string\\/g; s/\$texindent/$texindent/; s/\$text/$text/; print(LOG "$_\n"); diff --git a/Build/source/texk/texlive/linked_scripts/memoize/memoize-extract.py b/Build/source/texk/texlive/linked_scripts/memoize/memoize-extract.py index 962f6380e89..e1fcbe5ad32 100755 --- a/Build/source/texk/texlive/linked_scripts/memoize/memoize-extract.py +++ b/Build/source/texk/texlive/linked_scripts/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/03/15 v1.2.0' +__version__ = '2024/04/02 v1.3.0' import argparse, re, sys, os, subprocess, itertools, traceback, platform from pathlib import Path, PurePath @@ -72,6 +72,7 @@ def error(short, long): if not args.quiet: print(ERROR[None].format(short = short, long = long, header = header)) if log: + short = short.replace('\\', '\\string\\') long = long.replace('\\', '\\string\\') print( ERROR[args.format].format( @@ -82,13 +83,14 @@ def error(short, long): endinput() def warning(text): + if text and not args.quiet: + print(WARNING[None].format(text = text, header = header, indent = indent)) if log: + text = text.replace('\\', '\\string\\') print( WARNING[args.format].format( text = text, texindent = texindent, package_name = package_name), file = log) - if not args.quiet: - print(WARNING[None].format(text = text, header = header, indent = indent)) global exit_code exit_code = 10 @@ -96,6 +98,7 @@ def info(text): if text and not args.quiet: print(INFO[None].format(text = text, header = header, indent = indent)) if log: + text = text.replace('\\', '\\string\\') print( INFO[args.format].format( text = text, texindent = texindent, package_name = package_name), @@ -424,7 +427,7 @@ if __name__ == '__main__': info(f"Extracting new externs listed in '{mmz_file}' from '{pdf_file}'") done_message = "Done (there was nothing to extract)" indent = ' ' - texindent = '\space\space ' + texindent = r'\space\space ' # \paragraph{Process \texttt{.mmz}} @@ -482,12 +485,12 @@ if __name__ == '__main__': except pdfrw.errors.PdfParseError as err: error(rf"File '{pdf_file}' seems corrupted. Perhaps you " rf"have to load Memoize earlier in the preamble", - f"In particular, Memoize must be loaded before " - f"TikZ library 'fadings' and any package " - f"deploying it, and in Beamer, load Memoize " - f"by writing \RequirePackage{{memoize}} before " - f"\documentclass{{beamer}}. " - f"This was the error thrown by Python: \n{err}") + rf"In particular, Memoize must be loaded before " + rf"TikZ library 'fadings' and any package " + rf"deploying it, and in Beamer, load Memoize " + rf"by writing \RequirePackage{{memoize}} before " + rf"\documentclass{{beamer}}. " + rf"This was the error thrown by Python: \n{err}") # Does the page exist? if page_n >= len(pdf.pages): error(rf"I cannot extract page {page_n} from '{pdf_file}', " |