texdef (30apr12)

git-svn-id: svn://tug.org/texlive/trunk@26162 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 409 insertions, 37 deletions

diff --git a/Build/source/texk/texlive/linked_scripts/texdef/texdef.pl b/Build/source/texk/texlive/linked_scripts/texdef/texdef.pl
index 09d132f2894..826ad869704 100755
--- a/Build/source/texk/texlive/linked_scripts/texdef/texdef.pl
+++ b/Build/source/texk/texlive/linked_scripts/texdef/texdef.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 ################################################################################
 #  texdef -- Show definitions of TeX commands
-#  Copyright (c) 2011 Martin Scharrer <martin@scharrer-online.de>
+#  Copyright (c) 2011-2012 Martin Scharrer <martin@scharrer-online.de>
 #
 #  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
@@ -29,7 +29,9 @@ my $TEX = 'pdflatex';
 if ($scriptname =~ /^(.*)def$/) {
     $TEX = $1;
 }
+my $TEXOPTIONS = " -interaction nonstopmode ";
 
+## Variables for options and settings
 my $CLASS      = undef;
 my $USERCLASS  = 0;
 my @PACKAGES   = ();
@@ -38,6 +40,7 @@ my $INPREAMBLE = 0;
 my $PRINTVERSION = 0;
 my $TMPDIR     = '';
 my $SHOWVALUE  = 0;
+my $PRINTORIGDEF  = 0;
 my $FINDDEF    = 0;
 my $LISTCMD    = 0;
 my $LISTCMDDEF = 0;
@@ -79,6 +82,8 @@ my %IGNOREDEF = map { $_ => 1 } qw(
    @ifdefinable default@ds ds@ @curroptions
    filename@area filename@base filename@ext
 );
+
+## Adds arguments to %IGNOREDEF
 sub addignore {
   my $opt  = shift;
   my $arg  = shift;
@@ -103,12 +108,12 @@ my $ISCONTEXT = 0;
 my $BEGINENVSTR = '%s';
 my $ENDENVSTR   = '%s';
 
-my $VERSION = 'Version 1.4 -- 2011/07/28';
+my $VERSION = 'Version 1.5 -- 2012/04/29';
 sub usage {
 print << 'EOT';
 texdef -- Show definitions of TeX commands
-Version 1.4 -- 2011/07/28
-Copyright (C) 2011  Martin Scharrer <martin@scharrer-online.de>
+Version 1.5 -- 2012/04/29
+Copyright (C) 2011-2012  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;
 
@@ -140,6 +145,7 @@ Options:
                                   The <code> can be arbitray TeX code and doesn't need be be balanced.
   --find, -f                    : Find file where the command sequence was defined (L).
   --Find, -F                    : Show full filepath of the file where the command sequence was defined (L).
+  --source, -s                  : Try to show the original source code of the command definition (L).
   --list, -l                    : List user level command sequences of the given packages (L).
   --list-defs, -L               : List user level command sequences and their shorten definitions of the given packages (L).
   --list-all, -ll               : List all command sequences of the given packages (L).
@@ -194,7 +200,7 @@ sub envcode {
   push @ENVCODE, [ $opt, $arg ];
 }
 
-
+## Define and process options
 Getopt::Long::Configure ("bundling");
 GetOptions (
    'value|v!' => \$SHOWVALUE,
@@ -202,6 +208,7 @@ GetOptions (
    'tempdir=s' => \$TMPDIR,
    'find|f!' => sub { $FINDDEF = 1 },
    'Find|F!' => sub { $FINDDEF = 2 },
+   'source|s!' => \$PRINTORIGDEF,
    'list|l' => sub { $LISTCMD++ },
    'list-def|L' => sub { $LISTCMDDEF++ },
    'list-all' => sub { $LISTCMD=2 },
@@ -228,6 +235,7 @@ GetOptions (
 
 # usage() unless @ARGV;
 
+## Format specific settings
 if ($TEX =~ /latex$/) {
   $ISLATEX = 1;
   $BEGINENVSTR = '\begin{%s}' . "\n";
@@ -282,14 +290,20 @@ sub print_versions {
 
 usage() if not @cmds;
 my $cwd = getcwd();
-$ENV{TEXINPUTS} = '.:' . $cwd . ':' . ($ENV{TEXINPUTS} || '');
+my $OS = $^O;
+my $DIRSEP;
+if ($OS =~ /MSWin/) {
+    $DIRSEP = ';';
+} else {
+    $DIRSEP = ':';
+}
+$ENV{TEXINPUTS} = '.' . $DIRSEP . $cwd . $DIRSEP . ($ENV{TEXINPUTS} || '');
 
 if (!$TMPDIR) {
    $TMPDIR = tempdir( 'texdef_XXXXXX', CLEANUP => 1, TMPDIR => 1 );
 }
 chdir $TMPDIR or die "Couldn't change into temporary directory '$TMPDIR'\n";
-my $TMPFILE = 'texdef.tex';
-
+my $TMPFILE = 'texdeftmp.tex';
 
 sub testdef {
     my $cmd = shift;
@@ -342,6 +356,9 @@ sub special_chars {
     print '\endgroup'."\n";
 }
 
+#######################################################################################################################
+##  Loop around given commands                                                                                       ##
+#######################################################################################################################
 while (my $cmd = shift @cmds) {
 
 next if $cmd eq '';
@@ -378,7 +395,7 @@ print "\\nonstopmode\n";
 
 if ($ISLATEX) {
     #print "\\nofiles\n";
-    if ($FINDDEF || $LISTCMD) {
+    if ($FINDDEF || $LISTCMD || $PRINTORIGDEF) {
         # Load the 'filehook' and 'currfile' packages without 'kvoptions' by providing dummy definitions for the 'currfile' options:
         print '\makeatletter\expandafter\def\csname ver@kvoptions.sty\endcsname{0000/00/00}\let\SetupKeyvalOptions\@gobble\newcommand\DeclareBoolOption[2][]{}\let\DeclareStringOption\DeclareBoolOption';
         print '\let\DeclareVoidOption\@gobbletwo\def\ProcessKeyvalOptions{\@ifstar{}{}}';
@@ -388,7 +405,7 @@ if ($ISLATEX) {
         print '\makeatletter\expandafter\let\csname ver@kvoptions.sty\endcsname\relax\let\SetupKeyvalOptions\@undefined\let\DeclareBoolOption\@undefined\let\DeclareStringOption\@undefined';
         print '\let\DeclareVoidOption\@undefined\let\ProcessKeyvalOptions\@undefined\makeatother';
     }
-    if ($FINDDEF) {
+    if ($FINDDEF || $PRINTORIGDEF) {
         print '{\expandafter}\expandafter\ifx\csname ' . $cmd . '\expandafter\endcsname\csname @undefined\endcsname' . "\n";
         print '\AtEndOfFiles{{{\expandafter}\expandafter\ifx\csname ' . $cmd . '\expandafter\endcsname\csname @undefined\endcsname\else' . "\n";
         print '  \ClearHook\AtEndOfFiles{}\relax';
@@ -525,7 +542,58 @@ close ($tmpfile);
 
 select STDOUT;
 
-open (my $texpipe, '-|', "$TEX '$TMPFILE' ");
+# Removes all '{' and '}' characters which no real braces.
+sub remove_invalid_braces {
+    $_[0] =~ s/%.*$//; # remove line comments
+    $_[0] =~ s/\\[{}]//; # remove \{ and \}
+}
+
+sub print_orig_def {
+    my $rmacroname = shift;
+    my $file = shift;
+    my $path = shift;
+    my $found = 0;
+    open (my $fh, '<', $path) or return;
+    my $rmacrodef  = qr/
+        ^                                                        # Begin of line (no whitespaces!)
+        (
+        (?:(?:\\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
+            | \@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@]
+        /xms;
+    while (my $line = <$fh>) {
+        if ($line =~ $rmacrodef) {
+            $found = 1;
+            print "% $file, line $.:\n";
+            print $line;
+            remove_invalid_braces $line;
+            my $obrace = $line =~ tr/{/{/;
+            my $cbrace = $line =~ tr/}/}/;
+            while ($obrace != $cbrace) {
+                my $line = <$fh>;
+                print $line;
+                remove_invalid_braces $line;
+                $obrace += $line =~ tr/{/{/;
+                $cbrace += $line =~ tr/}/}/;
+            }
+            print "\n";
+            last;
+        }
+    }
+    close($fh);
+    return $found;
+}
+
+open (my $texpipe, '-|', "$TEX $TEXOPTIONS \"$TMPFILE\" ");
 
 my $name = '';
 my $definition = '';
@@ -541,7 +609,23 @@ while (<$texpipe>) {
             $line =~ s/$1/$path/;
         }
     }
-    print "$line\n";
+    if ($PRINTORIGDEF) {
+        if ($line =~ /first defined in "(.*)"/) {
+            my $file = $1;
+            my $path = `kpsewhich "$file"`;
+            chomp $path;
+            print_orig_def($cmd, $file, $path);
+        }
+        elsif ($line =~ /is defined by \(La\)TeX./) {
+            my $file = 'latex.ltx';
+            my $path = `kpsewhich "$file"`;
+            chomp $path;
+            print_orig_def($cmd, $file, $path);
+        }
+    }
+    else {
+        print "$line\n";
+    }
     next;
   }
   if (/^(:TEXDEF:\s*(.*))/) {
@@ -649,7 +733,7 @@ if ($cmd eq $LISTSTR) {
             print "\n";
         }
     }
-} else {
+} elsif (!$PRINTORIGDEF) {
     print "\n(in preamble)" if $inpreamble;
     print "\n$name:\n$definition\n\n";
 }
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
index e075ac8acf9..1aead5fd526 100755
--- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
+++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
@@ -1,12 +1,12 @@
 #!/usr/bin/env perl
-# $Id: tlmgr.pl 26063 2012-04-20 00:18:04Z preining $
+# $Id: tlmgr.pl 26138 2012-04-25 15:23:08Z karl $
 #
 # Copyright 2008, 2009, 2010, 2011, 2012 Norbert Preining
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
 
-my $svnrev = '$Revision: 26063 $';
-my $datrev = '$Date: 2012-04-20 02:18:04 +0200 (Fri, 20 Apr 2012) $';
+my $svnrev = '$Revision: 26138 $';
+my $datrev = '$Date: 2012-04-25 17:23:08 +0200 (Wed, 25 Apr 2012) $';
 my $tlmgrrevision;
 my $prg;
 if ($svnrev =~ m/: ([0-9]+) /) {
@@ -3039,7 +3039,7 @@ sub action_update {
           if ($opts{"list"}) {
             upd_info($pkg, $kb, "<absent>", $mediarevstr, "autoinst");
           } else {
-            info("[$currnr/$totalnr, $estrem/$esttot] auto-install: $pkg ($mediarevstr) [${kb}k]\n");
+            info("[$currnr/$totalnr, $estrem/$esttot] auto-install: $pkg ($mediarevstr) [${kb}k] ... ");
           }
         }
         $currnr++;
@@ -3049,6 +3049,7 @@ sub action_update {
           # installation succeeded because we got a reference
           logpackage("auto-install new: $pkg ($mediarevstr)");
           $nrupdated++;
+          info("done\n") unless $::machinereadable;
         } else {
           tlwarn("$prg: couldn't install new package $pkg\n");
         }
@@ -3198,11 +3199,15 @@ sub action_update {
         && !$opts{"dry-run"}
         && !$opts{"repository"}
        ) {
-      tlwarn("\nYour installation is set up to look on the disk for updates.\n");
-      tlwarn("To install from the Internet for this one time only, run\n");
-      tlwarn("  tlmgr -repository $TeXLiveURL\n");
-      tlwarn("\nTo change the default for all future updates, run\n");
-      tlwarn("  tlmgr option repository $TeXLiveURL\n\n");
+      tlwarn(<<END_DISK_WARN);
+tlmgr: Your installation is set up to look on the disk for updates.
+To install from the Internet for this one time only, run:
+  tlmgr -repository $TeXLiveURL ACTION ARG...
+where ACTION is install, update, etc.; see tlmgr -help if needed.
+
+To change the default for all future updates, run:
+  tlmgr option repository $TeXLiveURL
+END_DISK_WARN
     }
   }
 }
@@ -5733,6 +5738,12 @@ all packages on which the given I<pkg>s are dependent, also.  Options:
 
 =over 4
 
+=item B<--file>
+
+Instead of fetching a package from the installation repository, use
+the packages files given on the command line. These files need
+to be proper TeX Live package files (with contained tlpobj file).
+
 =item B<--reinstall>
 
 Reinstall a package (including dependencies for collections) even if it
diff --git a/Master/texmf-dist/doc/support/texdef/README b/Master/texmf-dist/doc/support/texdef/README
index 651703d14d0..61e032093ef 100644
--- a/Master/texmf-dist/doc/support/texdef/README
+++ b/Master/texmf-dist/doc/support/texdef/README
@@ -2,8 +2,8 @@ texdef -- Show definitions of TeX commands
 
 This perl script shows the definition of (La)TeX commands in a similar way as `\show`.
 
-Version 1.4 -- 2011/07/28
-Copyright (C) 2011  Martin Scharrer <martin@scharrer-online.de>
+Version 1.5 -- 2012/04/29
+Copyright (C) 2011-2012  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
new file mode 100644
index 00000000000..3e5dfd7f982
--- /dev/null
+++ b/Master/texmf-dist/doc/support/texdef/texdef.pdf
diff --git a/Master/texmf-dist/doc/support/texdef/texdef.tex b/Master/texmf-dist/doc/support/texdef/texdef.tex
new file mode 100644
index 00000000000..eefa7e730f2
--- /dev/null
+++ b/Master/texmf-dist/doc/support/texdef/texdef.tex
@@ -0,0 +1,193 @@
+\documentclass{ydoc}
+\usepackage{tabularx}
+
+\title{The \textsf{texdef} script}
+\author{Martin Scharrer}
+\email{martin@scharrer.me}
+\date{Version 1.5 -- 2011/04/29}
+
+\makeatletter
+\DeclareRobustCommand{\LATeX}{%
+    (L\kern -.36em{\sbox \z@ T\vbox to\ht \z@ {\hbox {\check@mathfonts \fontsize \sf@size \z@ \math@fontsfalse \selectfont A}\vss }}\kern -.075em)\kern -.15em\TeX
+}
+\makeatother
+
+\newenvironment{options}{%
+    \def\cstart{\begingroup\ttfamily\par\noindent\ignorespaces}%
+    \def\csep{\endgroup\begingroup\list {}{}\item \relax}%
+    \def\cend{\endlist\par\medskip\endgroup\cstart}%
+    \cstart
+}{%
+    \endgroup
+}
+
+\begin{document}
+\maketitle
+
+\begin{abstract}
+This Perl script shows the definition of \LATeX\ commands in a similar way as the \TeX\ primitive \Macro\show.
+It is intended to allow users to quickly see the definitions of user level or internal package macros as well as the
+values of registers. The given commands are compiled internally with \LATeX\ and the output of \Macro\show is formatted
+and shown to the user.
+\end{abstract}
+
+\tableofcontents
+
+
+\section{Usage}
+The script executable is called \texttt{texdef} (or maybe \texttt{texdef.pl}).
+A normal installation is supposed to also install it as \texttt{latexdef} (e.g.\ using a symlink to \texttt{texdef}) in order to 
+allow for quick access to the \LaTeX\ format. Further format shortcuts are possible as explained in the installation section.
+
+\parindent=0pt
+\DescribeScript{texdef}[<options>]~<commandname>~[<commandname>~!\ldots!]
+\DescribeScript{latexdef}[<options>]~<commandname>~[<commandname>~!\ldots!]
+
+Other program names are possible. See the \texttt{tex} option.  Command names do not need to start with `|\|'.
+
+\subsection*{Options}
+The following options can be used:
+\par\medskip
+
+\begin{options}
+  --tex \MacroArgs<flv>, -t \MacroArgs<flv>          \csep Use given flavour of TeX: 'tex', 'latex', 'context'.
+                                                       Variations of 'tex' and 'latex', like 'luatex', 'lualatex', 'xetex', 'xelatex' are supported.
+                                                       The default is given by the used program name: 'texdef' -> 'tex', 'latexdef' -> 'latex', etc.\cend
+  --value, -v                                        \csep Show value of command instead (i.e. \Macro\the\AlsoMacro\command).\cend
+  --preamble, -P                                     \csep Show definition of the command inside the preamble.\cend
+  --beforeclass, -B                                  \csep Show definition of the command before \Macro\documentclass.\cend
+  --package \MacroArgs<pkg>, -p \MacroArgs<pkg>      \csep (M) Load given tex-file, package or module depending on whether '*tex', '*latex'
+                                                       or 'context' is used. For LaTeX the \MacroArgs<pkg> can start with `[<options>]` and end
+                                                       with \MacroArgs<pkgname> or \MacroArgs{<pkgname>}.\cend
+  --class \MacroArgs<class>, -c \MacroArgs<class>    \csep (LaTeX only) Load given class instead of default ('article').
+                                                       The \MacroArgs<class> can start with \MacroArgs[<class options>] and end
+                                                       with \MacroArgs<classname> or \MacroArgs{<classname>}.\cend
+  --environment \MacroArgs<env>, -p \MacroArgs<env>  \csep (M) Show definition inside the given environment \MacroArgs<env>.\cend
+  --othercode \MacroArgs<code>, -o \MacroArgs<code>  \csep (M) Add other code into the preamble before the definition is shown.
+                                                       This can be used to e.g. load PGF/TikZ libraries.\cend
+  --before \MacroArgs<code>, -b \MacroArgs<code>     \csep (M) Place \MacroArgs<code> before definition is shown.
+                                                       The \MacroArgs<code> can be arbitray TeX code and doesn't need be be balanced.\cend
+  --after  \MacroArgs<code>, -a \MacroArgs<code>     \csep (M) Place \MacroArgs<code> after definition is shown.
+                                                       The \MacroArgs<code> can be arbitray TeX code and doesn't need be be balanced.\cend
+  --find, -f                                         \csep Find file where the command sequence was defined (L).\cend
+  --Find, -F                                         \csep Show full filepath of the file where the command sequence was defined (L).\cend
+  --source, -s                                       \csep Try to show the original source code of the command definition (L).\cend
+  --list, -l                                         \csep List user level command sequences of the given packages (L).\cend
+  --list-defs, -L                                    \csep List user level command sequences and their shorten definitions of the given packages (L).\cend
+  --list-all, -ll                                    \csep List all command sequences of the given packages (L).\cend
+  --list-defs-all, -LL                               \csep List all command sequences and their shorten definitions of the given packages (L).\cend
+  --ignore-cmds \MacroArgs<cs,cs,..>,  -i            \csep Ignore the following command sequence(s) in the above lists. (M)\cend
+  --ignore-regex \MacroArgs<regex,..>, -I            \csep Ignore all command sequences in the above lists which match the given Perl regular expression(s). (M)\cend
+  --pgf-keys, -k                                     \csep Takes commands as \pkg{pgfkeys} and displays their definitions. Keys must use the full path but the common '.\@cmd' prefix is applied.\cend
+  --pgf-Keys, -K                                     \csep Takes commands as \pkg{pgfkeys} and displays their definitions. Keys must use the full path.\cend
+  --version, -V                                      \csep If used alone prints version of this script.
+                                                       (L) Together with -p or -c prints version of LaTeX package(s) or class, respectively.\cend
+  --tempdir <directory>                              \csep Use given existing directory for temporary files.\cend
+  --help, -h                                         \csep Print this help and quit.\cend
+\end{options}
+
+\noindent \textbf{Notes:}\\
+ Long option can be shorten as long the are still unique.  Short options can be combined.
+ If the option 'environment', 'before' and 'after' are used toegether the
+ produced code will be inserted in the given order (reversed order for 'after').\\
+ (M) = This option can be given multiple times.\\
+ (L) = LaTeX only. Requires the packages 'filehook' and 'currfile'.
+
+
+\section{Installation}\label{sec:install}
+
+The latest official release of the script can be obtained from CTAN under \url{http://mirrors.ctan.org/support/texdef/texdef.pl}.
+The latest develop version (which can be unstable!) can be obtained from the source code repository under 
+\url{https://bitbucket.org/martin_scharrer/texdef/src/tip/texdef.pl}.
+
+For installation the script file |texdef.pl| must simply renamed to |texdef| and be copied to a location suitable for executables,
+i.e. a directory in the |PATH|, e.g.\ |/usr/bin| or |/usr/local/bin| for Linux/Unix.
+The script should be set as \emph{executable}, i.e. |chmod +x texdef.pl| for Linux/Unix.
+This is not required for MS Windows.
+
+This script can show the definitions of commands with different flavours of TeX
+(|tex|, |etex|, |latex|, |pdftex|, |pdfetex|, |pdflatex|, |xetex|, |xelatex|, |context|, \ldots).
+The flavour can be given using an command line option or over the \emph{script name},
+i.e.\ if the script is called |texdef| it will use |tex|, but called |latexdef|
+it will use |latex| and so on.
+The script can be simply copied several times, but creating \emph{symbolic links}
+to the real script is enough on operation systems/file systems which support
+this.
+At least the two variations |texdef| and |latexdef| should be installed.
+
+
+\subsection*{Requirements}
+
+The |texdef| program is a Perl script which needs a Perl interpreter to work.
+Informations about installing Perl can be found at \url{http://www.perl.org/get.html}.
+
+The script calls a TeX compiler (|tex|, |latex|, \ldots) to display the definition of commands/macros.
+Therefore \LATeX\ must also be installed.
+Informations about installing \LATeX\ can be found at \url{http://www.latex-project.org/ftp.html}.
+
+
+
+
+\subsection*{Quick Install Nodes for Linux/Unix}
+
+\begin{verbatim}
+    cp texdef.pl /usr/local/bin/
+    cd /usr/local/bin
+    ln -s texdef.pl texdef
+    ln -s texdef.pl latexdef
+    ln -s texdef.pl etexdef
+    ln -s texdef.pl luatexdef
+    ln -s texdef.pl lualatexdef
+    ln -s texdef.pl pdftexdef
+    ln -s texdef.pl pdflatexdef
+    ln -s texdef.pl xetexdef
+    ln -s texdef.pl xelatexdef
+    ln -s texdef.pl 'some other TeX flavour of your choice'
+\end{verbatim}
+
+\noindent or use the Makefile (defaults to |/usr/local/bin|)
+
+\begin{verbatim}
+    make install INSTALLDIR=/your/path
+\end{verbatim}
+
+\clearpage
+\section{Examples}
+Show the definition of \Macro\chapter with different classes (\cls{article} (default), \cls{book} and \cls{scrbook}):
+
+\begin{verbatim}
+latexdef chapter
+latexdef -c book chapter
+latexdef -c scrbook chapter
+\end{verbatim}
+
+Show value of \Macro\textwidth with different class options:
+
+\begin{verbatim}
+latexdef -c [a4paper]{book} -v paperwidth
+latexdef -c [letter]{book}  -v paperwidth
+\end{verbatim}
+
+Show definition of TikZ's \Macro\draw outside and inside a \env{tikzpicture} environment:
+
+\begin{verbatim}
+latexdef -p tikz draw
+latexdef -p tikz --env tikzpicture draw
+\end{verbatim}
+
+Show definition of TikZ's \Macro\draw inside a node, inside a \cls{beamer} frame in \opt{handout} mode:
+
+\begin{verbatim}
+latexdef -c [handout]beamer -p tikz --env frame \
+    --env tikzpicture -b '\node {' -a '};' draw
+\end{verbatim}
+
+List all user level command sequences (macros) defined by the \pkg{xspace} LaTeX package:
+
+\begin{verbatim}
+latexdef -l -p xspace
+\end{verbatim}
+
+
+\end{document}
+
diff --git a/Master/texmf-dist/scripts/texdef/texdef.pl b/Master/texmf-dist/scripts/texdef/texdef.pl
index 09d132f2894..826ad869704 100755
--- a/Master/texmf-dist/scripts/texdef/texdef.pl
+++ b/Master/texmf-dist/scripts/texdef/texdef.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 ################################################################################
 #  texdef -- Show definitions of TeX commands
-#  Copyright (c) 2011 Martin Scharrer <martin@scharrer-online.de>
+#  Copyright (c) 2011-2012 Martin Scharrer <martin@scharrer-online.de>
 #
 #  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
@@ -29,7 +29,9 @@ my $TEX = 'pdflatex';
 if ($scriptname =~ /^(.*)def$/) {
     $TEX = $1;
 }
+my $TEXOPTIONS = " -interaction nonstopmode ";
 
+## Variables for options and settings
 my $CLASS      = undef;
 my $USERCLASS  = 0;
 my @PACKAGES   = ();
@@ -38,6 +40,7 @@ my $INPREAMBLE = 0;
 my $PRINTVERSION = 0;
 my $TMPDIR     = '';
 my $SHOWVALUE  = 0;
+my $PRINTORIGDEF  = 0;
 my $FINDDEF    = 0;
 my $LISTCMD    = 0;
 my $LISTCMDDEF = 0;
@@ -79,6 +82,8 @@ my %IGNOREDEF = map { $_ => 1 } qw(
    @ifdefinable default@ds ds@ @curroptions
    filename@area filename@base filename@ext
 );
+
+## Adds arguments to %IGNOREDEF
 sub addignore {
   my $opt  = shift;
   my $arg  = shift;
@@ -103,12 +108,12 @@ my $ISCONTEXT = 0;
 my $BEGINENVSTR = '%s';
 my $ENDENVSTR   = '%s';
 
-my $VERSION = 'Version 1.4 -- 2011/07/28';
+my $VERSION = 'Version 1.5 -- 2012/04/29';
 sub usage {
 print << 'EOT';
 texdef -- Show definitions of TeX commands
-Version 1.4 -- 2011/07/28
-Copyright (C) 2011  Martin Scharrer <martin@scharrer-online.de>
+Version 1.5 -- 2012/04/29
+Copyright (C) 2011-2012  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;
 
@@ -140,6 +145,7 @@ Options:
                                   The <code> can be arbitray TeX code and doesn't need be be balanced.
   --find, -f                    : Find file where the command sequence was defined (L).
   --Find, -F                    : Show full filepath of the file where the command sequence was defined (L).
+  --source, -s                  : Try to show the original source code of the command definition (L).
   --list, -l                    : List user level command sequences of the given packages (L).
   --list-defs, -L               : List user level command sequences and their shorten definitions of the given packages (L).
   --list-all, -ll               : List all command sequences of the given packages (L).
@@ -194,7 +200,7 @@ sub envcode {
   push @ENVCODE, [ $opt, $arg ];
 }
 
-
+## Define and process options
 Getopt::Long::Configure ("bundling");
 GetOptions (
    'value|v!' => \$SHOWVALUE,
@@ -202,6 +208,7 @@ GetOptions (
    'tempdir=s' => \$TMPDIR,
    'find|f!' => sub { $FINDDEF = 1 },
    'Find|F!' => sub { $FINDDEF = 2 },
+   'source|s!' => \$PRINTORIGDEF,
    'list|l' => sub { $LISTCMD++ },
    'list-def|L' => sub { $LISTCMDDEF++ },
    'list-all' => sub { $LISTCMD=2 },
@@ -228,6 +235,7 @@ GetOptions (
 
 # usage() unless @ARGV;
 
+## Format specific settings
 if ($TEX =~ /latex$/) {
   $ISLATEX = 1;
   $BEGINENVSTR = '\begin{%s}' . "\n";
@@ -282,14 +290,20 @@ sub print_versions {
 
 usage() if not @cmds;
 my $cwd = getcwd();
-$ENV{TEXINPUTS} = '.:' . $cwd . ':' . ($ENV{TEXINPUTS} || '');
+my $OS = $^O;
+my $DIRSEP;
+if ($OS =~ /MSWin/) {
+    $DIRSEP = ';';
+} else {
+    $DIRSEP = ':';
+}
+$ENV{TEXINPUTS} = '.' . $DIRSEP . $cwd . $DIRSEP . ($ENV{TEXINPUTS} || '');
 
 if (!$TMPDIR) {
    $TMPDIR = tempdir( 'texdef_XXXXXX', CLEANUP => 1, TMPDIR => 1 );
 }
 chdir $TMPDIR or die "Couldn't change into temporary directory '$TMPDIR'\n";
-my $TMPFILE = 'texdef.tex';
-
+my $TMPFILE = 'texdeftmp.tex';
 
 sub testdef {
     my $cmd = shift;
@@ -342,6 +356,9 @@ sub special_chars {
     print '\endgroup'."\n";
 }
 
+#######################################################################################################################
+##  Loop around given commands                                                                                       ##
+#######################################################################################################################
 while (my $cmd = shift @cmds) {
 
 next if $cmd eq '';
@@ -378,7 +395,7 @@ print "\\nonstopmode\n";
 
 if ($ISLATEX) {
     #print "\\nofiles\n";
-    if ($FINDDEF || $LISTCMD) {
+    if ($FINDDEF || $LISTCMD || $PRINTORIGDEF) {
         # Load the 'filehook' and 'currfile' packages without 'kvoptions' by providing dummy definitions for the 'currfile' options:
         print '\makeatletter\expandafter\def\csname ver@kvoptions.sty\endcsname{0000/00/00}\let\SetupKeyvalOptions\@gobble\newcommand\DeclareBoolOption[2][]{}\let\DeclareStringOption\DeclareBoolOption';
         print '\let\DeclareVoidOption\@gobbletwo\def\ProcessKeyvalOptions{\@ifstar{}{}}';
@@ -388,7 +405,7 @@ if ($ISLATEX) {
         print '\makeatletter\expandafter\let\csname ver@kvoptions.sty\endcsname\relax\let\SetupKeyvalOptions\@undefined\let\DeclareBoolOption\@undefined\let\DeclareStringOption\@undefined';
         print '\let\DeclareVoidOption\@undefined\let\ProcessKeyvalOptions\@undefined\makeatother';
     }
-    if ($FINDDEF) {
+    if ($FINDDEF || $PRINTORIGDEF) {
         print '{\expandafter}\expandafter\ifx\csname ' . $cmd . '\expandafter\endcsname\csname @undefined\endcsname' . "\n";
         print '\AtEndOfFiles{{{\expandafter}\expandafter\ifx\csname ' . $cmd . '\expandafter\endcsname\csname @undefined\endcsname\else' . "\n";
         print '  \ClearHook\AtEndOfFiles{}\relax';
@@ -525,7 +542,58 @@ close ($tmpfile);
 
 select STDOUT;
 
-open (my $texpipe, '-|', "$TEX '$TMPFILE' ");
+# Removes all '{' and '}' characters which no real braces.
+sub remove_invalid_braces {
+    $_[0] =~ s/%.*$//; # remove line comments
+    $_[0] =~ s/\\[{}]//; # remove \{ and \}
+}
+
+sub print_orig_def {
+    my $rmacroname = shift;
+    my $file = shift;
+    my $path = shift;
+    my $found = 0;
+    open (my $fh, '<', $path) or return;
+    my $rmacrodef  = qr/
+        ^                                                        # Begin of line (no whitespaces!)
+        (
+        (?:(?:\\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
+            | \@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@]
+        /xms;
+    while (my $line = <$fh>) {
+        if ($line =~ $rmacrodef) {
+            $found = 1;
+            print "% $file, line $.:\n";
+            print $line;
+            remove_invalid_braces $line;
+            my $obrace = $line =~ tr/{/{/;
+            my $cbrace = $line =~ tr/}/}/;
+            while ($obrace != $cbrace) {
+                my $line = <$fh>;
+                print $line;
+                remove_invalid_braces $line;
+                $obrace += $line =~ tr/{/{/;
+                $cbrace += $line =~ tr/}/}/;
+            }
+            print "\n";
+            last;
+        }
+    }
+    close($fh);
+    return $found;
+}
+
+open (my $texpipe, '-|', "$TEX $TEXOPTIONS \"$TMPFILE\" ");
 
 my $name = '';
 my $definition = '';
@@ -541,7 +609,23 @@ while (<$texpipe>) {
             $line =~ s/$1/$path/;
         }
     }
-    print "$line\n";
+    if ($PRINTORIGDEF) {
+        if ($line =~ /first defined in "(.*)"/) {
+            my $file = $1;
+            my $path = `kpsewhich "$file"`;
+            chomp $path;
+            print_orig_def($cmd, $file, $path);
+        }
+        elsif ($line =~ /is defined by \(La\)TeX./) {
+            my $file = 'latex.ltx';
+            my $path = `kpsewhich "$file"`;
+            chomp $path;
+            print_orig_def($cmd, $file, $path);
+        }
+    }
+    else {
+        print "$line\n";
+    }
     next;
   }
   if (/^(:TEXDEF:\s*(.*))/) {
@@ -649,7 +733,7 @@ if ($cmd eq $LISTSTR) {
             print "\n";
         }
     }
-} else {
+} elsif (!$PRINTORIGDEF) {
     print "\n(in preamble)" if $inpreamble;
     print "\n$name:\n$definition\n\n";
 }