summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-04-09 22:57:19 +0000
committerKarl Berry <karl@freefriends.org>2018-04-09 22:57:19 +0000
commit4837f7ae035889497f64bbe5a97767b09d140c2d (patch)
tree31178e44fa08f2b3b30c289893aed0951dfd567c
parent8332274ebd0d286768355471bc43f4041922f385 (diff)
texdef
git-svn-id: svn://tug.org/texlive/trunk@47420 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texdef/texdef.pl18
-rw-r--r--Master/texmf-dist/doc/support/texdef/CHANGELOG2
-rw-r--r--Master/texmf-dist/doc/support/texdef/README2
-rw-r--r--Master/texmf-dist/doc/support/texdef/texdef.pdfbin151394 -> 151692 bytes
-rwxr-xr-xMaster/texmf-dist/scripts/texdef/texdef.pl18
-rw-r--r--Master/texmf-dist/source/support/texdef/texdef.tex6
6 files changed, 26 insertions, 20 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/texdef/texdef.pl b/Build/source/texk/texlive/linked_scripts/texdef/texdef.pl
index 7294ef595f0..8b7b69a4da6 100755
--- a/Build/source/texk/texlive/linked_scripts/texdef/texdef.pl
+++ b/Build/source/texk/texlive/linked_scripts/texdef/texdef.pl
@@ -116,13 +116,13 @@ my $ISCONTEXT = 0;
my $BEGINENVSTR = '%s';
my $ENDENVSTR = '%s';
-my $VERSION = 'Version 1.8 -- 2018/03/25';
+my $VERSION = 'Version 1.8a -- 2018/03/28';
sub usage {
my $option = shift;
my $ret = ($option) ? 0 : 1;
print << 'EOT';
texdef -- Show definitions of TeX commands
-Version 1.8 -- 2019/03/25
+Version 1.8a -- 2019/03/28
Copyright (C) 2011-2018 Martin Scharrer <martin@scharrer-online.de>
This program comes with ABSOLUTELY NO WARRANTY;
This is free software, and you are welcome to redistribute it under certain conditions;
@@ -679,17 +679,17 @@ sub print_orig_def {
my $rmacrodef = qr/
^ # Begin of line (no whitespaces!)
(
- (?:(?:\\global|\\long|\\protected|\\outer)\s*)* # Prefixes (maybe with whitespace between them)
+ (?:(?:\\global|\\long|\\protected|\\outer)\s*)* # Prefixes (maybe with whitespace between them)
)
\\(
(?:[gex]?def) \s* \\ # TeX definitions
- | (?:new|renew|provide)command\s* \*? \s* {? \s* \\ # LaTeX definitions
- | (?:new|renew|provide)robustcmd\s* \*? \s* {? \s* \\ # etoolbox definitions
+ | (?:new|renew|provide)command\s* \*? \s* \{? \s* \\ # LaTeX definitions
+ | (?:new|renew|provide)robustcmd\s* \*? \s* \{? \s* \\ # etoolbox definitions
| (?:new(?:box|count|dimen|if|insert|read|skip|muskip|toks|write)) \s* \\ # TeX registers etc.
| (?:char|count|dimen|mathchar|skip|toks)def \s* \\ # TeX chardefs etc.
- | \@namedef{? # Definition by name only
- | Declare[a-zA-z]+ \s* \*? \s* {? \s* \\ # Declare... definitions
- | declare[a-zA-z]+ \s* \*? \s* {? \s* \\ # declare... definitions
+ | \@namedef\{? # Definition by name only
+ | Declare[a-zA-z]+ \s* \*? \s* \{? \s* \\ # Declare... definitions
+ | declare[a-zA-z]+ \s* \*? \s* \{? \s* \\ # declare... definitions
)
$rmacroname # Macro name without backslash
[^a-zA-Z@]
@@ -705,7 +705,7 @@ sub print_orig_def {
my $renvdef = qr/
^ # Begin of line (no whitespaces!)
\\(
- (?:new|renew|provide)environment\s* { \s* # LaTeX definitions
+ (?:new|renew|provide)environment\s* \{ \s* # LaTeX definitions
)
($rmacroname) # Environment names follow same rules as macro names
\s* } # closing brace
diff --git a/Master/texmf-dist/doc/support/texdef/CHANGELOG b/Master/texmf-dist/doc/support/texdef/CHANGELOG
index 9a82888129b..4cdb7aa1ca7 100644
--- a/Master/texmf-dist/doc/support/texdef/CHANGELOG
+++ b/Master/texmf-dist/doc/support/texdef/CHANGELOG
@@ -1,5 +1,7 @@
= Changelog =
+== v1.8a from 2018/03/28 ==
+ * Further fixes of braces in regexs to avoid "Unescaped left brace in regex is deprecated" warnings or errors.
== v1.8 from 2018/03/25 ==
* Added "dvitex" and "dvilatex" as formats. These will set DVI mode on "tex" or "latex".
diff --git a/Master/texmf-dist/doc/support/texdef/README b/Master/texmf-dist/doc/support/texdef/README
index 482cba6f39e..b8b1554d988 100644
--- a/Master/texmf-dist/doc/support/texdef/README
+++ b/Master/texmf-dist/doc/support/texdef/README
@@ -1,5 +1,5 @@
texdef -- Show definitions of TeX commands
-Version 1.8 -- 2019/03/25
+Version 1.8a -- 2019/03/28
Copyright (C) 2011-2018 Martin Scharrer <martin@scharrer-online.de>
This program comes with ABSOLUTELY NO WARRANTY;
This is free software, and you are welcome to redistribute it under certain conditions;
diff --git a/Master/texmf-dist/doc/support/texdef/texdef.pdf b/Master/texmf-dist/doc/support/texdef/texdef.pdf
index 6af99054721..9a0cfd2bdd5 100644
--- a/Master/texmf-dist/doc/support/texdef/texdef.pdf
+++ b/Master/texmf-dist/doc/support/texdef/texdef.pdf
Binary files differ
diff --git a/Master/texmf-dist/scripts/texdef/texdef.pl b/Master/texmf-dist/scripts/texdef/texdef.pl
index 7294ef595f0..8b7b69a4da6 100755
--- a/Master/texmf-dist/scripts/texdef/texdef.pl
+++ b/Master/texmf-dist/scripts/texdef/texdef.pl
@@ -116,13 +116,13 @@ my $ISCONTEXT = 0;
my $BEGINENVSTR = '%s';
my $ENDENVSTR = '%s';
-my $VERSION = 'Version 1.8 -- 2018/03/25';
+my $VERSION = 'Version 1.8a -- 2018/03/28';
sub usage {
my $option = shift;
my $ret = ($option) ? 0 : 1;
print << 'EOT';
texdef -- Show definitions of TeX commands
-Version 1.8 -- 2019/03/25
+Version 1.8a -- 2019/03/28
Copyright (C) 2011-2018 Martin Scharrer <martin@scharrer-online.de>
This program comes with ABSOLUTELY NO WARRANTY;
This is free software, and you are welcome to redistribute it under certain conditions;
@@ -679,17 +679,17 @@ sub print_orig_def {
my $rmacrodef = qr/
^ # Begin of line (no whitespaces!)
(
- (?:(?:\\global|\\long|\\protected|\\outer)\s*)* # Prefixes (maybe with whitespace between them)
+ (?:(?:\\global|\\long|\\protected|\\outer)\s*)* # Prefixes (maybe with whitespace between them)
)
\\(
(?:[gex]?def) \s* \\ # TeX definitions
- | (?:new|renew|provide)command\s* \*? \s* {? \s* \\ # LaTeX definitions
- | (?:new|renew|provide)robustcmd\s* \*? \s* {? \s* \\ # etoolbox definitions
+ | (?:new|renew|provide)command\s* \*? \s* \{? \s* \\ # LaTeX definitions
+ | (?:new|renew|provide)robustcmd\s* \*? \s* \{? \s* \\ # etoolbox definitions
| (?:new(?:box|count|dimen|if|insert|read|skip|muskip|toks|write)) \s* \\ # TeX registers etc.
| (?:char|count|dimen|mathchar|skip|toks)def \s* \\ # TeX chardefs etc.
- | \@namedef{? # Definition by name only
- | Declare[a-zA-z]+ \s* \*? \s* {? \s* \\ # Declare... definitions
- | declare[a-zA-z]+ \s* \*? \s* {? \s* \\ # declare... definitions
+ | \@namedef\{? # Definition by name only
+ | Declare[a-zA-z]+ \s* \*? \s* \{? \s* \\ # Declare... definitions
+ | declare[a-zA-z]+ \s* \*? \s* \{? \s* \\ # declare... definitions
)
$rmacroname # Macro name without backslash
[^a-zA-Z@]
@@ -705,7 +705,7 @@ sub print_orig_def {
my $renvdef = qr/
^ # Begin of line (no whitespaces!)
\\(
- (?:new|renew|provide)environment\s* { \s* # LaTeX definitions
+ (?:new|renew|provide)environment\s* \{ \s* # LaTeX definitions
)
($rmacroname) # Environment names follow same rules as macro names
\s* } # closing brace
diff --git a/Master/texmf-dist/source/support/texdef/texdef.tex b/Master/texmf-dist/source/support/texdef/texdef.tex
index 36df3aea079..744814822b6 100644
--- a/Master/texmf-dist/source/support/texdef/texdef.tex
+++ b/Master/texmf-dist/source/support/texdef/texdef.tex
@@ -5,7 +5,7 @@
\author{Martin Scharrer}
\email{martin@scharrer-online.de}
\repository{https://bitbucket.org/martin_scharrer/texdef}
-\date{Version 1.8 -- 2018/03/25}
+\date{Version 1.8a -- 2018/03/28}
\makeatletter
\DeclareRobustCommand{\LATeX}{%
@@ -201,6 +201,10 @@ latexdef -l -p xspace
\section{Changelog}
+\subsection*{v1.8a from 2018/03/28}
+\begin{itemize}
+ \item Further fixes of braces in regexs to avoid ``Unescaped left brace in regex is deprecated'' warnings or errors.
+\end{itemize}
\subsection*{v1.8 from 2018/03/25}
\begin{itemize}