summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2024-01-15 21:00:10 +0000
committerKarl Berry <karl@freefriends.org>2024-01-15 21:00:10 +0000
commit3fb6cf2313253dab16594f39926cdc309231b4a6 (patch)
tree7c292dd906490dc79bb225901366234347b94b48
parent9a719d12a7ac6c071831d3a2e3a709d95e3b0619 (diff)
texlogsieve (15jan24)
git-svn-id: svn://tug.org/texlive/trunk@69436 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive/tlmgr.pl58
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlogsieve/texlogsieve38
-rw-r--r--Master/texmf-dist/doc/man/man1/texlogsieve.14
-rw-r--r--Master/texmf-dist/doc/man/man1/texlogsieve.man1.pdfbin41983 -> 41946 bytes
-rw-r--r--Master/texmf-dist/doc/support/texlogsieve/README.md2
-rw-r--r--Master/texmf-dist/doc/support/texlogsieve/texlogsieve.pdfbin60571 -> 60722 bytes
-rw-r--r--Master/texmf-dist/doc/support/texlogsieve/texlogsieve.tex11
-rwxr-xr-xMaster/texmf-dist/scripts/texlogsieve/texlogsieve38
8 files changed, 109 insertions, 42 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
index 60e5b1fede8..4addf9c917f 100755
--- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
+++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
@@ -1,6 +1,6 @@
#!/usr/bin/env perl
-# $Id: tlmgr.pl 69327 2024-01-07 11:10:51Z preining $
-# Copyright 2008-2023 Norbert Preining
+# $Id: tlmgr.pl 69413 2024-01-13 22:43:25Z karl $
+# Copyright 2008-2024 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
#
@@ -8,8 +8,8 @@
use strict; use warnings;
-my $svnrev = '$Revision: 69327 $';
-my $datrev = '$Date: 2024-01-07 12:10:51 +0100 (Sun, 07 Jan 2024) $';
+my $svnrev = '$Revision: 69413 $';
+my $datrev = '$Date: 2024-01-13 23:43:25 +0100 (Sat, 13 Jan 2024) $';
my $tlmgrrevision;
my $tlmgrversion;
my $prg;
@@ -7344,40 +7344,56 @@ and the repository are not compatible:
}
}
- # check for remote main db being *older* than what we have seen before
+ # Check for remote main db being *older* than what we have seen
+ # before, to avoid wrongly removing packages because a stale mirror
+ # happens to be chosen.
+ #
# The check we employ is heuristic: texlive-scripts is updated practically
- # every day. We compare the locally installed texlive-scripts with the
- # remove revision, and if that does not line up, we error out.
+ # every day. We compare the locally-installed texlive-scripts with the
+ # remote revision, and if that does not line up, we error out.
+ #
+ # We only do this check if the remote database contains texlive-scripts
+ # otherwise sub-repos (like tlgpg) will fail.
# Alternative approaches:
# - loop over all installed packages and take the maximum of revisions found
# - on every update, save the last seen remote main revision into
# 00texlive.installation
#
if ($is_main) {
- my $remote_revision = $remotetlpdb->config_revision;
- my $tlp = $localtlpdb->get_package("texlive-scripts");
+ my $rtlp = $remotetlpdb->get_package("texlive-scripts");
+ my $ltlp = $localtlpdb->get_package("texlive-scripts");
my $local_revision;
- if (!defined($tlp)) {
+ my $remote_revision;
+ if (!defined($rtlp)) {
+ # remote db does not contain texlive-scripts, so we skip all checks
+ debug("Remote database does not contain the texlive-scripts package, "
+ . "skipping version consistency check\n");
+ $remote_revision = 0;
+ } else {
+ $remote_revision = $rtlp->revision;
+ }
+ if (!defined($ltlp)) {
info("texlive-scripts package not found (?!), "
- . "skipping revision consistency check\n");
+ . "skipping version consistency check\n");
$local_revision = 0;
} else {
- $local_revision = $tlp->revision;
+ $local_revision = $ltlp->revision;
}
- debug("Remote database revision $remote_revision, "
+ debug("texlive-scripts remote revision $remote_revision, "
. "texlive-scripts local revision $local_revision\n");
- if ($local_revision > $remote_revision) {
+ if ($remote_revision > 0 && $local_revision > $remote_revision) {
info("fail load $location\n") if ($::machinereadable);
- return(undef, "Remote database (rev $remote_revision) seems to be "
- . "older than local (rev $local_revision of "
- . "texlive-scripts); please use different mirror or "
- . " wait a day or so.")
+ return(undef, <<OLD_REMOTE_MSG);
+Remote database (revision $remote_revision of the texlive-scripts package)
+seems to be older than the local installation (rev $local_revision of
+texlive-scripts); please use a different mirror and/or wait a day or two.
+OLD_REMOTE_MSG
}
}
# check for being frozen
if ($remotetlpdb->config_frozen) {
- my $frozen_msg = <<FROZEN;
+ my $frozen_msg = <<FROZEN_MSG;
TeX Live $TeXLive::TLConfig::ReleaseYear is frozen
and will no longer be routinely updated. This happens when a new
release is made, or will be made shortly.
@@ -7385,7 +7401,7 @@ release is made, or will be made shortly.
For general status information about TeX Live, see its home page:
https://tug.org/texlive
-FROZEN
+FROZEN_MSG
# don't die here, we want to allow updates even if tlnet is frozen!
tlwarn($frozen_msg);
}
@@ -10281,7 +10297,7 @@ This script and its documentation were written for the TeX Live
distribution (L<https://tug.org/texlive>) and both are licensed under the
GNU General Public License Version 2 or later.
-$Id: tlmgr.pl 69327 2024-01-07 11:10:51Z preining $
+$Id: tlmgr.pl 69413 2024-01-13 22:43:25Z karl $
=cut
# test HTML version: pod2html --cachedir=/tmp tlmgr.pl >/tmp/tlmgr.html
diff --git a/Build/source/texk/texlive/linked_scripts/texlogsieve/texlogsieve b/Build/source/texk/texlive/linked_scripts/texlogsieve/texlogsieve
index bffaec6d46e..5d8b66ea8e0 100755
--- a/Build/source/texk/texlive/linked_scripts/texlogsieve/texlogsieve
+++ b/Build/source/texk/texlive/linked_scripts/texlogsieve/texlogsieve
@@ -2,7 +2,7 @@
-- texlogsieve - filter and summarize LaTeX log files
--
--- Copyright (C) 2021-2023 Nelson Lago <lago@ime.usp.br>
+-- Copyright (C) 2021-2024 Nelson Lago <lago@ime.usp.br>
--
-- This program is free software: you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
@@ -974,8 +974,8 @@ Options:
--version print program version]]
versionmsg = [[
-texlogsieve 1.4.0
-Copyright (C) 2021-2023 Nelson Lago <lago@ime.usp.br>
+texlogsieve 1.4.1
+Copyright (C) 2021-2024 Nelson Lago <lago@ime.usp.br>
License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>.
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.]]
@@ -1527,6 +1527,10 @@ function adjustSeverity(msg)
"Unknown feature `' in font %b`'", -- empty feature, not a problem
"Package refcheck Warning: Unused label %b`'", -- we process these specially
"Token not allowed in a PDF string %(Unicode%):",
+ "Font shape `[^']*/m/[^']*' in size %b<> not available.*"
+ .. "Font shape `[^']*/regular/[^']*' tried instead",
+ "Font shape `[^']*/b/[^']*' in size %b<> not available.*"
+ .. "Font shape `[^']*/bold/[^']*' tried instead",
}
DEFAULT_FORCED_WARNING = {}
@@ -2633,7 +2637,7 @@ end
-- The pattern we want to check may stretch over several lines. This
-- function recursively checks each line of the pattern against the
--- corresponding input line, but only up to three lines, as that is
+-- corresponding input line, but only up to five lines, as that is
-- enough to make sure the pattern really matches.
function stringsHandler:canDoitRecursive(patternLines,
position, offset, depth)
@@ -2655,7 +2659,7 @@ function stringsHandler:canDoitRecursive(patternLines,
-- see comment below about "nextline, patternLine"
if first ~= nil and not string.find(nextline, patternLine) then
-- Found it!
- if depth > 2 -- 3 lines matched, that is enough
+ if depth > 4 -- 5 lines matched, that is enough
or #patternLines == 1 -- no more pattern lines
or Lines:get(position +1) == nil -- no more input lines
@@ -2972,6 +2976,7 @@ anywhereDebugStringsHandler.patterns = {
beginningOfLineInfoStringsHandler = stringsHandler:new()
beginningOfLineInfoStringsHandler.severity = INFO
beginningOfLineInfoStringsHandler.patterns = {
+ "^%s*system commands enabled%.",
"^Writing index file.*%.idx",
"^Writing glossary file.*%.glo",
"^%*geometry%* driver:.*",
@@ -2988,6 +2993,8 @@ beginningOfLineInfoStringsHandler.patterns = {
"^No file .-%.bbl%.",
"^No file .-%.gls%.",
+ "^runsystem%b()%.%.%.executed",
+
'luaotfload | db : Reload initiated %(formats: .-%); reason: Font ".-" not found%.',
"^reledmac reminder:%s*\n"
@@ -2999,9 +3006,26 @@ beginningOfLineInfoStringsHandler.patterns = {
"^ ?LaTeX document class for Lecture Notes in Computer Science",
- "^%*%*%*%*%*%*%*%*%*%*%*%*%*%*%*%*%*%*%*%*%*%*%*%*%*%*%*%*%*%*%*%*%*%*%*%*%*\n"
+ -- Remember that order matters here!
+ "^" .. string.rep("%*", 37) .. "%*?%*?\n"
+ .. "%* Local config file " .. filepat .. " used\n"
+ .. string.rep("%*", 37) .. "%*?%*?\n",
+
+ "^" .. string.rep("%*", 38) .. "\n"
+ .. "%*\n"
.. "%* Local config file " .. filepat .. " used\n"
- .. "%*",
+ .. "%*\n"
+ .. string.rep("%*", 38) .. "\n",
+
+ "^" .. string.rep("%*", 37) .. "%*?%*?\n"
+ .. "%* Local config file " .. filepat .. " used\n"
+ .. "%*\n",
+
+ "^" .. string.rep("%=", 36) .. "\n"
+ .. "%s*Local config file " .. filepat .. " used\n"
+ .. string.rep("%=", 36) .. "%=?\n",
+
+ "^Local config file " .. filepat .. " used\n",
"^=== Package selnolig, Version %S+, Date " .. datepat .. " ===",
diff --git a/Master/texmf-dist/doc/man/man1/texlogsieve.1 b/Master/texmf-dist/doc/man/man1/texlogsieve.1
index 33ba12d888d..7aa5a38cb21 100644
--- a/Master/texmf-dist/doc/man/man1/texlogsieve.1
+++ b/Master/texmf-dist/doc/man/man1/texlogsieve.1
@@ -1,4 +1,4 @@
-.TH TEXLOGSIEVE "1" "November 2023" "texlogsieve 1.4.0" "User Commands"
+.TH TEXLOGSIEVE "1" "January 2024" "texlogsieve 1.4.1" "User Commands"
.SH NAME
@@ -303,7 +303,7 @@ program, check the initial comments in the code.
.SH COPYRIGHT
-Copyright \[co] 2021-2023 Nelson Lago <lago@ime.usp.br>
+Copyright \[co] 2021-2024 Nelson Lago <lago@ime.usp.br>
.br
License GPLv3+: GNU GPL version 3 or later
.UR https://gnu.org/licenses/gpl.html
diff --git a/Master/texmf-dist/doc/man/man1/texlogsieve.man1.pdf b/Master/texmf-dist/doc/man/man1/texlogsieve.man1.pdf
index e80d65eb42b..985152665b3 100644
--- a/Master/texmf-dist/doc/man/man1/texlogsieve.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/texlogsieve.man1.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/support/texlogsieve/README.md b/Master/texmf-dist/doc/support/texlogsieve/README.md
index 78de4a1c900..23939d4388e 100644
--- a/Master/texmf-dist/doc/support/texlogsieve/README.md
+++ b/Master/texmf-dist/doc/support/texlogsieve/README.md
@@ -56,7 +56,7 @@ the program, check the initial comments in the code.
Code etc: <https://gitlab.com/lago/texlogsieve>
-Copyright (C) 2021-2023 Nelson Lago <lago@ime.usp.br>
+Copyright (C) 2021-2024 Nelson Lago <lago@ime.usp.br>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/Master/texmf-dist/doc/support/texlogsieve/texlogsieve.pdf b/Master/texmf-dist/doc/support/texlogsieve/texlogsieve.pdf
index 2ff51c97e02..a0e2ac061b1 100644
--- a/Master/texmf-dist/doc/support/texlogsieve/texlogsieve.pdf
+++ b/Master/texmf-dist/doc/support/texlogsieve/texlogsieve.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/support/texlogsieve/texlogsieve.tex b/Master/texmf-dist/doc/support/texlogsieve/texlogsieve.tex
index c0a1aab12d1..4bfe0b26768 100644
--- a/Master/texmf-dist/doc/support/texlogsieve/texlogsieve.tex
+++ b/Master/texmf-dist/doc/support/texlogsieve/texlogsieve.tex
@@ -1,6 +1,6 @@
% texlogsieve - filter and summarize LaTeX log files
%
-% Copyright (C) 2021-2023 Nelson Lago <lago@ime.usp.br>
+% Copyright (C) 2021-2024 Nelson Lago <lago@ime.usp.br>
%
% This program is free software: you can redistribute it and/or modify
% it under the terms of the GNU General Public License as published by
@@ -95,12 +95,15 @@
\changes{1.3.1}{2022/09/05}{Fix bug when searching for config files in Windows}
\changes{1.4.0}{2023/11/30}{Add tips on how to fix some warnings}
\changes{1.4.0}{2023/11/30}{Handle files opened during shipout}
+\changes{1.4.1}{2024/01/15}{Look 5 lines ahead instead of 3}
+\changes{1.4.1}{2024/01/15}{Reduce priority of harmless font substitutions}
+\changes{1.4.1}{2024/01/15}{Recognize more messages}
\begin{document}
\title{\textsf{texlogsieve}:\thanks{This document
-corresponds to \textsf{texlogsieve}~1.4.0,
-dated~2023-11-30.}\\[.3\baselineskip]
+corresponds to \textsf{texlogsieve}~1.4.1,
+dated~2024-01-15.}\\[.3\baselineskip]
{\normalsize(yet another program to)\\[-.6\baselineskip]}
{\large filter and summarize \LaTeX\ log files}
}
@@ -547,7 +550,7 @@ END {
\section{License}
-Copyright © 2021--2023 Nelson Lago \textless lago@ime.usp.br\textgreater\\
+Copyright © 2021--2024 Nelson Lago \textless lago@ime.usp.br\textgreater\\
License GPLv3+: GNU GPL version 3 or later
\url{https://gnu.org/licenses/gpl.html}.\\
This is free software: you are free to change and redistribute it.\\
diff --git a/Master/texmf-dist/scripts/texlogsieve/texlogsieve b/Master/texmf-dist/scripts/texlogsieve/texlogsieve
index bffaec6d46e..5d8b66ea8e0 100755
--- a/Master/texmf-dist/scripts/texlogsieve/texlogsieve
+++ b/Master/texmf-dist/scripts/texlogsieve/texlogsieve
@@ -2,7 +2,7 @@
-- texlogsieve - filter and summarize LaTeX log files
--
--- Copyright (C) 2021-2023 Nelson Lago <lago@ime.usp.br>
+-- Copyright (C) 2021-2024 Nelson Lago <lago@ime.usp.br>
--
-- This program is free software: you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
@@ -974,8 +974,8 @@ Options:
--version print program version]]
versionmsg = [[
-texlogsieve 1.4.0
-Copyright (C) 2021-2023 Nelson Lago <lago@ime.usp.br>
+texlogsieve 1.4.1
+Copyright (C) 2021-2024 Nelson Lago <lago@ime.usp.br>
License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>.
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.]]
@@ -1527,6 +1527,10 @@ function adjustSeverity(msg)
"Unknown feature `' in font %b`'", -- empty feature, not a problem
"Package refcheck Warning: Unused label %b`'", -- we process these specially
"Token not allowed in a PDF string %(Unicode%):",
+ "Font shape `[^']*/m/[^']*' in size %b<> not available.*"
+ .. "Font shape `[^']*/regular/[^']*' tried instead",
+ "Font shape `[^']*/b/[^']*' in size %b<> not available.*"
+ .. "Font shape `[^']*/bold/[^']*' tried instead",
}
DEFAULT_FORCED_WARNING = {}
@@ -2633,7 +2637,7 @@ end
-- The pattern we want to check may stretch over several lines. This
-- function recursively checks each line of the pattern against the
--- corresponding input line, but only up to three lines, as that is
+-- corresponding input line, but only up to five lines, as that is
-- enough to make sure the pattern really matches.
function stringsHandler:canDoitRecursive(patternLines,
position, offset, depth)
@@ -2655,7 +2659,7 @@ function stringsHandler:canDoitRecursive(patternLines,
-- see comment below about "nextline, patternLine"
if first ~= nil and not string.find(nextline, patternLine) then
-- Found it!
- if depth > 2 -- 3 lines matched, that is enough
+ if depth > 4 -- 5 lines matched, that is enough
or #patternLines == 1 -- no more pattern lines
or Lines:get(position +1) == nil -- no more input lines
@@ -2972,6 +2976,7 @@ anywhereDebugStringsHandler.patterns = {
beginningOfLineInfoStringsHandler = stringsHandler:new()
beginningOfLineInfoStringsHandler.severity = INFO
beginningOfLineInfoStringsHandler.patterns = {
+ "^%s*system commands enabled%.",
"^Writing index file.*%.idx",
"^Writing glossary file.*%.glo",
"^%*geometry%* driver:.*",
@@ -2988,6 +2993,8 @@ beginningOfLineInfoStringsHandler.patterns = {
"^No file .-%.bbl%.",
"^No file .-%.gls%.",
+ "^runsystem%b()%.%.%.executed",
+
'luaotfload | db : Reload initiated %(formats: .-%); reason: Font ".-" not found%.',
"^reledmac reminder:%s*\n"
@@ -2999,9 +3006,26 @@ beginningOfLineInfoStringsHandler.patterns = {
"^ ?LaTeX document class for Lecture Notes in Computer Science",
- "^%*%*%*%*%*%*%*%*%*%*%*%*%*%*%*%*%*%*%*%*%*%*%*%*%*%*%*%*%*%*%*%*%*%*%*%*%*\n"
+ -- Remember that order matters here!
+ "^" .. string.rep("%*", 37) .. "%*?%*?\n"
+ .. "%* Local config file " .. filepat .. " used\n"
+ .. string.rep("%*", 37) .. "%*?%*?\n",
+
+ "^" .. string.rep("%*", 38) .. "\n"
+ .. "%*\n"
.. "%* Local config file " .. filepat .. " used\n"
- .. "%*",
+ .. "%*\n"
+ .. string.rep("%*", 38) .. "\n",
+
+ "^" .. string.rep("%*", 37) .. "%*?%*?\n"
+ .. "%* Local config file " .. filepat .. " used\n"
+ .. "%*\n",
+
+ "^" .. string.rep("%=", 36) .. "\n"
+ .. "%s*Local config file " .. filepat .. " used\n"
+ .. string.rep("%=", 36) .. "%=?\n",
+
+ "^Local config file " .. filepat .. " used\n",
"^=== Package selnolig, Version %S+, Date " .. datepat .. " ===",