texlive[45484] trunk: latex2man (6oct17)

commits+karl at tug.org commits+karl at tug.org
Fri Oct 6 22:19:35 CEST 2017


Revision: 45484
          http://tug.org/svn/texlive?view=revision&revision=45484
Author:   karl
Date:     2017-10-06 22:19:34 +0200 (Fri, 06 Oct 2017)
Log Message:
-----------
latex2man (6oct17)

Modified Paths:
--------------
    trunk/Build/source/texk/texlive/linked_scripts/latex2man/latex2man
    trunk/Master/texmf-dist/doc/info/latex2man.info
    trunk/Master/texmf-dist/doc/man/man1/latex2man.1
    trunk/Master/texmf-dist/doc/man/man1/latex2man.man1.pdf
    trunk/Master/texmf-dist/doc/support/latex2man/CHANGES
    trunk/Master/texmf-dist/doc/support/latex2man/Makefile
    trunk/Master/texmf-dist/doc/support/latex2man/README
    trunk/Master/texmf-dist/doc/support/latex2man/latex2man-CHANGES.html
    trunk/Master/texmf-dist/doc/support/latex2man/latex2man.html
    trunk/Master/texmf-dist/doc/support/latex2man/latex2man.pdf
    trunk/Master/texmf-dist/doc/support/latex2man/latex2man.tex
    trunk/Master/texmf-dist/doc/support/latex2man/latex2man.texi
    trunk/Master/texmf-dist/doc/support/latex2man/latex2man.txt
    trunk/Master/texmf-dist/scripts/latex2man/latex2man
    trunk/Master/texmf-dist/tex/latex/latex2man/latex2man.sty

Added Paths:
-----------
    trunk/Master/texmf-dist/doc/support/latex2man/THIS-IS-VERSION-1.26

Removed Paths:
-------------
    trunk/Master/texmf-dist/doc/support/latex2man/THIS-IS-VERSION-1.25

Modified: trunk/Build/source/texk/texlive/linked_scripts/latex2man/latex2man
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/latex2man/latex2man	2017-10-06 20:18:55 UTC (rev 45483)
+++ trunk/Build/source/texk/texlive/linked_scripts/latex2man/latex2man	2017-10-06 20:19:34 UTC (rev 45484)
@@ -1,9 +1,10 @@
 #!/usr/bin/env perl
+#!/usr/bin/perl -w
 # Project: 	Documentation Tools
 # Descr:	Latex -->  MAN-page (groff -man), HTML and TexInfo;
 # Language:	PERL (>= 5.0)
 # Author:	Dr. J\xFCrgen Vollmer, Juergen.Vollmer at informatik-vollmer.de
-# $Id: latex2man,v 1.163 2017/04/13 14:25:56 vollmer Exp $
+# $Id: latex2man,v 1.175 2017/10/06 17:19:31 vollmer Exp $
 #
 # Copyright (C) 1998 Dr. Juergen Vollmer
 #                    Am Rennbuckel 21, D-76185 Karlsruhe, Germany
@@ -19,7 +20,7 @@
 require 5.0004_03;
 
 use Getopt::Std;
-
+no warnings 'once';
 # use strict 'vars';
 
 $CMD=`basename $0`; chop ($CMD);
@@ -26,8 +27,8 @@
 $gen_date = `date`; chomp $gen_date;       # date when the output was generated
 
 sub date2str;
-$VERSION = "1.25";
-$DATE    = date2str ('$Date: 2017/04/13 14:25:56 $' =~ m|(\d+/\d+/\d+)|);
+$VERSION = "1.26";
+$DATE    = date2str ('$Date: 2017/10/06 17:19:31 $' =~ m|(\d+/\d+/\d+)|);
 
 $tmp = "/tmp/$CMD.$$";
 
@@ -35,6 +36,8 @@
 # check option and arguments
 ##################################################################
 
+$opt_D = 0;
+$opt_M = 0;
 getopts('o:t:c:VhMHTLC:D:a:'); # -D1: write each read line -D2: write each word
 
 sub usage
@@ -127,6 +130,7 @@
 # global variables
 
 # $Prefix is used to construct procedure and variable names
+$Prefix = "";
 if ($opt_M) {
     $Prefix  = "man";
 }
@@ -156,7 +160,7 @@
 $inside_table = 0; # true, if inside a table environment
 $first_column = 0; # true, if this is the first column in a table row
 $columns      = 0; # nr of columns in the current table
-$enum_nr      = 0; # current number of an enumeration
+# $enum_nr    = 0; # current number of an enumeration
 $nesting      = 0; # count recursive calls of interpret_word
 $section_cnt  = 0; # Index into $sections
 #$sections[0]      # Array of all sections
@@ -723,7 +727,7 @@
 {
     if ($manRS) {
 	Print '\n.RE\n';
-	$manRS == 0;
+	$manRS = 0;
     }
     if ($list_nest > 1) {
 	Print '\n.RE\n';
@@ -742,7 +746,7 @@
 {
     if ($manRS) {
 	Print '\n.RE\n';
-	$manRS == 0;
+	$manRS = 0;
     }
     if ($list_nest > 1) {
 	Print '\n.RE\n';
@@ -754,7 +758,7 @@
 {
     if ($manRS) {
 	Print '\n.RE\n';
-	$manRS == 0;
+	$manRS = 0;
     }
     if ($list_nest > 1) {
 	Print '\n.RE\n';
@@ -1188,7 +1192,7 @@
 
 sub texiVerbatimLine
 {
-    s/({|}|@| )/@\1/g;
+    s/(\{|\}|@| )/\@$1/g;
     chop;
     print DEST ".$_\@*\n";
 }
@@ -1326,7 +1330,7 @@
 					    last SWITCH;
 					};
        # LaTeX macros with two arguments
-       /\\([a-zA-Z]+){([^}]*)}{([^}]*)}/
+       /\\([a-zA-Z]+)\{([^}]*)\}\{([^}]*)\}/
  				     && do {$s=$`;$m=$1;$a1=$2;$a2=$3;$r=$';	#'
                                             check_Macro2 $m;
                                             interpret_word $s;
@@ -1340,7 +1344,7 @@
 					    last SWITCH;
 					};
        # Special Handling of Email and URL LaTeX macros with one argument
-       /\\(URL|Email){([^}]*)}/ && ($opt_H)
+       /\\(URL|Email)\{([^}]*)\}/ && ($opt_H)
  				     && do {$s=$`;$m=$1;$a1=$2;$r=$';	#'
 					    interpret_word $s;
 					    PrintM $Macro2a->{$m};
@@ -1353,7 +1357,7 @@
 					    last SWITCH;
 					};
        # LaTeX macros with one argument
-       /\\([a-zA-Z]+){([^}]*)}/      && do {$s=$`;$m=$1;$a1=$2;$r=$';	#'
+       /\\([a-zA-Z]+)\{([^}]*)\}/    && do {$s=$`;$m=$1;$a1=$2;$r=$';	#'
 					    check_Macro1 $m;
 					    interpret_word $s;
 					    PrintM $Macro1a->{$m};
@@ -1513,7 +1517,7 @@
 		if (/\\item/) {
 		    my $cnt1 = tr/[/[/;
 		    my $cnt2 = tr/]/]/;
-		    $join = $cnt1 != $cnt2 | $cnt1 == 0;
+		    $join = $cnt1 != $cnt2 || $cnt1 == 0;
 		    $kind = 1;
 		} elsif (/\\verb/) {
 		    my $cnt = tr/+/+/;
@@ -1520,8 +1524,8 @@
 		    $join = $cnt % 2 != 0;
 		    $kind = 3;
 		} else {
-		    my @x = $_ =~ /[^\\]{/g;
-		    my @y = $_ =~ /[^\\]}/g;
+		    my @x = $_ =~ /[^\\]\{/g;
+		    my @y = $_ =~ /[^\\]\}/g;
 		    $join = $#x != $#y;
 		    $kind = 2;
 		}
@@ -1681,7 +1685,7 @@
 	    my $line = $_; chop $line;
 	    print "--- \`$line'\n";
 	}
-	if (/^\s*\\input{([^}]*)}\s*/) {
+	if (/^\s*\\input\{([^}]*)\}\s*/) {
 	    # handle \input{fn}
 	    my $fn = $1;
 	    printf DEST "%%%%%%%%%%%%%%%%%% start of \\input{%s}\n", $fn;
@@ -1733,7 +1737,7 @@
 	    my $line = $_; chop $line;
 	    print "--- \`$line'\n";
 	}
-	if (/^\s*\\input{([^}]*)}\s*/) {
+	if (/^\s*\\input\{([^}]*)\}\s*/) {
 	    # handle \input{fn}
 	    my $fn = $1;
 	    if ($opt_M) {
@@ -1762,7 +1766,7 @@
 	next if ($skip[-1] == 1);
 
 	if ($inside_verb) {
-	    if (/^\s*\\end{verbatim}/) {
+	    if (/^\s*\\end\{verbatim\}/) {
 		if ($started == 1) {
 		    &{$Prefix . "VerbatimEnd"};
 		    $inside_verb = 0;
@@ -1774,8 +1778,8 @@
 	}
 
 	# remove {, } around Umlaute
-	s/{(\\".)}/\1/g;      # "
-	s/{(\\ss)}/\1/g;
+	s/\{(\\".)\}/$1/g;      # "
+	s/\{(\\ss)\}/$1/g;
 
 	# normalize special characters
 	s/\\"a/\xE4/g;
@@ -1791,19 +1795,19 @@
 		$rcs_date,$rcs_time,$rcs_owner,$rcs_status,$rcs_locker) = split(/\s/,$1);
 	    $date = date2str ($rcs_date);
 	    $Macro->{'today'}  = $date;
-	} elsif (/^\s*\\setDate{\\rcsInfoLongDate}/) {
+	} elsif (/^\s*\\setDate\{\\rcsInfoLongDate\}/) {
 	    $Macro->{'Date'} = $date;
-	} elsif (/^\s*\\setDate{\\today}/) {
+	} elsif (/^\s*\\setDate\{\\today\}/) {
 	    $Macro->{'Date'} = $date;
-	} elsif (/^\s*\\setDate{([^}]*)}/) {
+	} elsif (/^\s*\\setDate\{([^}]*)\}/) {
 	    $date = $1;
 	    $date =~ s/~/$Macro->{'~'}/g;
 	    $Macro->{'Date'} = $date;
-	} elsif (/^\s*\\setVersion{([^}]*)}/) {
+	} elsif (/^\s*\\setVersion\{([^}]*)\}/) {
 	    $version            = $1;
-	    $versin             =~ s/~/$Macro->{'~'}/g;
+	    $version            =~ s/~/$Macro->{'~'}/g;
 	    $Macro->{'Version'} = $version;
-	} elsif (/^\s*\\begin{Name}{([^}]*)}{([^}]*)}{([^}]*)}{([^}]*)}{([^}]*)}/) {
+	} elsif (/^\s*\\begin\{Name\}\{([^}]*)\}\{([^}]*)\}\{([^}]*)\}\{([^}]*)\}\{([^}]*)\}/) {
 	    $section = "Name";
 	    $chapter = $1;
 	    $name    = $2;
@@ -1812,29 +1816,29 @@
 	    $tool    = $4;
 	    $title   = $5;
 	    $rest    = $';  #'
-		$started = 1;
+	    $started = 1;
 	    $sections[0] = $section;
 	    $section_cnt = 0;
 	    &{$Prefix . "Start"}     ($name, $chapter, $author, $tool, $title);
 	    &{$Prefix . "NameStart"} ($name, $chapter, $author, $tool, $title);
-	} elsif (/^\s*\\end{Name}/) {
+	} elsif (/^\s*\\end\{Name\}/) {
 	    &{$Prefix . "NameEnd"} ($name, $chapter, $author, $tool);
-	} elsif (/^\s*\\begin{Table}(\[([^]]*)\])?{([^}]*)}/) {
+	} elsif (/^\s*\\begin\{Table\}(\[([^]]*)\])?\{([^}]*)\}/) {
 	    # \begin{Table}[width]{columns}
 	    if ($started == 1) {
 		$columns      = $3;
-		$column       = $_[0];
+		# $column       = $_[0];
 		$inside_table = 1;
 		$first_column = 1;
 		&{$Prefix . "TableStart"} ($columns, $2);
 	    }
-	} elsif (/^\s*\\end{Table}/) {
+	} elsif (/^\s*\\end\{Table\}/) {
 	    if ($started == 1) {
 		$inside_table = 0;
 		$first_column = 0;
 		&{$Prefix . "TableEnd"} ($columns);
 	    }
-	} elsif (/^\s*\\begin{Description}(\[[^]]*\])?/) {
+	} elsif (/^\s*\\begin\{Description\}(\[[^]]*\])?/) {
 	    if ($started == 1) {
 		$list_nest++;
 		$cur_list[$list_nest] = 'descr';
@@ -1841,12 +1845,12 @@
 		$item_nr[$list_nest]  = 0;
 		&{$Prefix . "DescriptionStart"};
 	    }
-	} elsif (/^\s*\\end{Description}/) {
+	} elsif (/^\s*\\end\{Description\}/) {
 	    if ($started == 1) {
 		&{$Prefix . "DescriptionEnd"};
 		$list_nest--;
 	    }
-	} elsif (/^\s*\\begin{description}/) {
+	} elsif (/^\s*\\begin\{description\}/) {
 	    if ($started == 1) {
 		$list_nest++;
 		$cur_list[$list_nest] = 'descr';
@@ -1853,20 +1857,20 @@
 		$item_nr[$list_nest]  = 0;
 		&{$Prefix . "DescriptionStart"};
 	    }
-	} elsif (/^\s*\\end{description}/) {
+	} elsif (/^\s*\\end\{description\}/) {
 	    if ($started == 1) {
 		&{$Prefix . "DescriptionEnd"};
 		$list_nest--;
 	    }
-	} elsif (/^\s*\\begin{center}/) {
+	} elsif (/^\s*\\begin\{center\}/) {
 	    if ($started == 1) {
 		&{$Prefix . "CenterStart"};
 	    }
-	} elsif (/^\s*\\end{center}/) {
+	} elsif (/^\s*\\end\{center\}/) {
 	    if ($started == 1) {
 		&{$Prefix . "CenterEnd"};
 	    }
-	} elsif (/^\s*\\begin{enumerate}/) {
+	} elsif (/^\s*\\begin\{enumerate\}/) {
 	    if ($started == 1) {
 		$list_nest++;
 		$cur_list[$list_nest] = 'enum';
@@ -1873,12 +1877,12 @@
 		$item_nr[$list_nest]  = 0;
 		&{$Prefix . "EnumStart"} ;
 	    }
-	} elsif (/^\s*\\end{enumerate}/) {
+	} elsif (/^\s*\\end\{enumerate\}/) {
 	    if ($started == 1) {
 		&{$Prefix . "EnumEnd"} ;
 		$list_nest--;
 	    }
-	} elsif (/^\s*\\begin{itemize}/) {
+	} elsif (/^\s*\\begin\{itemize\}/) {
 	    if ($started == 1) {
 		$list_nest++;
 		$cur_list[$list_nest] = 'item';
@@ -1885,17 +1889,17 @@
 		$item_nr[$list_nest]  = 0;
 		&{$Prefix . "ItemStart"} ;
 	    }
-	} elsif (/^\s*\\end{itemize}/) {
+	} elsif (/^\s*\\end\{itemize\}/) {
 	    if ($started == 1) {
 		&{$Prefix . "ItemEnd"} ;
 		$list_nest--;
 	    }
-	} elsif (/^\s*\\begin{verbatim}/) {
+	} elsif (/^\s*\\begin\{verbatim\}/) {
 	    if ($started == 1) {
 		&{$Prefix . "VerbatimStart"};
 		$inside_verb = 1;
 	    }
-	} elsif (/^\s*\\(subsubsection|subsection|section){([^}]*)}/) {
+	} elsif (/^\s*\\(subsubsection|subsection|section)\{([^}]*)\}/) {
 	    $kind    = $1;
 	    $section = $2;
 	    $section_cnt ++;
@@ -1904,9 +1908,9 @@
 	    if ($started == 1) {
 		&{$Prefix . "Section"} ($section_cnt, $kind, $section);
 	    }
-	} elsif (/^\s*\\LatexManEnd/) {
+	} elsif (/^\s*\\LatexManEnd/ || /^\s*\\end\{document\}/) {
 	    last;
-	} elsif (/^\s*((\\begin{Name|Table|Description})|(\\(sub)?section))/) {
+	} elsif (/^\s*((\\begin\{Name|Table|Description\})|(\\(sub)?section))/) {
 	    die "$CMD: in line $.\n           " .
 		"Arguments of $1 are not contained in a single " .
 		"line.\n           " .

Modified: trunk/Master/texmf-dist/doc/info/latex2man.info
===================================================================
--- trunk/Master/texmf-dist/doc/info/latex2man.info	2017-10-06 20:18:55 UTC (rev 45483)
+++ trunk/Master/texmf-dist/doc/info/latex2man.info	2017-10-06 20:19:34 UTC (rev 45484)
@@ -511,7 +511,7 @@
      \textbf{example} is typeset as *example*.
 
 `\texttt{..}'
-     \textt{example} is typeset as example.
+     \texttt{example} is typeset as example.
 
 `\underline{..}'
      \underline{example} is typeset as example of underline.
@@ -612,7 +612,7 @@
      inside a itemize, enumerate, or description environment.
 
 `\today'
-     13 April 2017(see also the rcsinfo LaTeXpackage).
+     06 October 2017(see also the rcsinfo LaTeXpackage).
 
 `\ss,\"a, ...'
      \ss = ss, \"a= a", \"o= o", \"u= u", \"A= A", \"O= O", \"U= U". It
@@ -630,6 +630,9 @@
 `\input{..}'
      Read and process the given filename.
 
+   Please note: the name of the LaTeX-macrosand its arguments must be
+contained in one line.
+
 
 File: latex2man.info,  Node: Conditional Text,  Next: Translation of User Defined Macros,  Prev: Accepted LaTeX Macros,  Up: Top
 
@@ -990,7 +993,7 @@
 Version
 =======
 
-Version: 1.25 of 2017/04/13.
+Version: 1.26 of 2017/10/06.
 
 
 File: latex2man.info,  Node: License and Copyright,  Next: Author,  Prev: Version,  Up: Top
@@ -1003,7 +1006,7 @@
      Germany,
      <Juergen.Vollmer at informatik-vollmer.de>
 
-     The actual version of Latex2man may be found on my homepage
+     The most recent version of Latex2man may be found on my homepage
      `http://www.informatik-vollmer.de/software/latex2man.html'.
 
 `License'
@@ -1043,19 +1046,19 @@
 Node: Package Specific Macros9133
 Node: Accepted Macros from the rcsinfo Package12719
 Node: Accepted LaTeX Macros13216
-Node: Conditional Text16338
-Node: Translation of User Defined Macros18376
-Node: Verbatim Environment20490
-Node: Subsection works20816
-Node: Subsubsection works20991
-Node: Subsubsection still works21180
-Node: General Remarks21386
-Node: CSS classnames22124
-Node: Some Bug Fix Tests27805
-Node: Requirements28543
-Node: Changes28957
-Node: Version29196
-Node: License and Copyright29339
-Node: Author30131
+Node: Conditional Text16435
+Node: Translation of User Defined Macros18473
+Node: Verbatim Environment20587
+Node: Subsection works20913
+Node: Subsubsection works21088
+Node: Subsubsection still works21277
+Node: General Remarks21483
+Node: CSS classnames22221
+Node: Some Bug Fix Tests27902
+Node: Requirements28640
+Node: Changes29054
+Node: Version29293
+Node: License and Copyright29436
+Node: Author30233
 
 End Tag Table

Modified: trunk/Master/texmf-dist/doc/man/man1/latex2man.1
===================================================================
--- trunk/Master/texmf-dist/doc/man/man1/latex2man.1	2017-10-06 20:18:55 UTC (rev 45483)
+++ trunk/Master/texmf-dist/doc/man/man1/latex2man.1	2017-10-06 20:19:34 UTC (rev 45484)
@@ -1,5 +1,5 @@
 '\" t
-.\" Manual page created with latex2man on Do 13. Apr 21:21:18 CEST 2017
+.\" Manual page created with latex2man on Fr 6. Okt 19:19:31 CEST 2017
 .\" NOTE: This file is generated, DO NOT EDIT.
 .de Vb
 .ft CW
@@ -10,7 +10,7 @@
 
 .fi
 ..
-.TH "LATEX2MAN" "1" "2017/04/13" "Documentation Tools " "Documentation Tools "
+.TH "LATEX2MAN" "1" "2017/10/06" "Documentation Tools " "Documentation Tools "
 .SH NAME
 
 .PP
@@ -373,7 +373,6 @@
 .SS ACCEPTED LaTeX ENVIRONMENTS
 .PP
 The following environments are accepted: 
-.RE
 .TP
 .B *
 description
@@ -418,7 +417,6 @@
 .SS PACKAGE SPECIFIC MACROS
 .PP
 The following commands are provided: 
-.RE
 .TP
 \\Opt{option} 
 Option: \\Opt{\-o} will be typeset as \fB\-o\fP\&.
@@ -632,7 +630,7 @@
 \\textbf{example} is typeset as \fBexample\fP\&.
 .TP
 \\texttt{\&.\&.} 
-\\textt{example} is typeset as example\&.
+\\texttt{example} is typeset as example\&.
 .TP
 \\underline{\&.\&.} 
 \\underline{example} is typeset as 
@@ -727,7 +725,7 @@
 environment. 
 .TP
 \\today 
-13 April 2017(see also the rcsinfo
+06 October 2017(see also the rcsinfo
 LaTeXpackage). 
 .TP
 \\ss,\\"a, ... 
@@ -752,6 +750,8 @@
 \\input{\&.\&.} 
 Read and process the given filename. 
 .PP
+Please note: the name of the LaTeX\-macrosand its arguments must be contained in one line. 
+.PP
 .SS CONDITIONAL TEXT
 .PP
 latex2man
@@ -1310,7 +1310,7 @@
 .SH VERSION
 
 .PP
-Version: 1.25 of 2017/04/13\&.
+Version: 1.26 of 2017/10/06\&.
 .PP
 .SH LICENSE AND COPYRIGHT
 
@@ -1322,7 +1322,7 @@
 .br
 \fBJuergen.Vollmer at informatik\-vollmer.de\fP
 .PP
-The actual version of Latex2man
+The most recent version of Latex2man
 may be found on my homepage
 .br
 \fBhttp://www.informatik\-vollmer.de/software/latex2man.html\fP\&.

Modified: trunk/Master/texmf-dist/doc/man/man1/latex2man.man1.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/support/latex2man/CHANGES
===================================================================
--- trunk/Master/texmf-dist/doc/support/latex2man/CHANGES	2017-10-06 20:18:55 UTC (rev 45483)
+++ trunk/Master/texmf-dist/doc/support/latex2man/CHANGES	2017-10-06 20:19:34 UTC (rev 45484)
@@ -2,7 +2,10 @@
                 Change history of the latex2man package
                 =======================================
 
-$Id: CHANGES,v 1.65 2017/04/13 14:34:26 vollmer Exp $
+$Id: CHANGES,v 1.69 2017/10/06 16:24:45 vollmer Exp $
+1.26   06 Oct  2017     - Handle \end{document},
+       	       		  fixed deprecated regular exprs and minor typoos
+                          Thanks to "Gene Cooperman" <gene at ccs.neu.edu>
 1.25   13 Apr  2017     - Handle \input{filename} macro.
 1.24   21 Dec  2010     - Thanks to "Tom Brand" <tbrand at manumit-systems.com>,
                           who added the CSS support to the HTML generation procedure.

Modified: trunk/Master/texmf-dist/doc/support/latex2man/Makefile
===================================================================
--- trunk/Master/texmf-dist/doc/support/latex2man/Makefile	2017-10-06 20:18:55 UTC (rev 45483)
+++ trunk/Master/texmf-dist/doc/support/latex2man/Makefile	2017-10-06 20:19:34 UTC (rev 45484)
@@ -1,7 +1,7 @@
 # Project: 	Documentation Tools
 # Descr:	Latex -->  MAN-page (groff -man), Makefile
 # Author:	Dr. J\xFCrgen Vollmer, Juergen.Vollmer at informatik-vollmer.de
-# $Id: Makefile,v 1.121 2017/04/13 14:47:10 vollmer Exp $
+# $Id: Makefile,v 1.124 2017/10/06 16:25:08 vollmer Exp $
 
 BASE		= latex2man
 
@@ -23,8 +23,8 @@
 		  --exclude "*.a" --exclude "*.php"
 EXrcs		= $(EX) --exclude "*/RCS/*"  --exclude "*/RCS"
 
-VERSION		= 1.25
-V_DATE		= 2017/04/13
+VERSION		= 1.26
+V_DATE		= 2017/10/06
 latex2man	= ./latex2man
 
 D		= $

Modified: trunk/Master/texmf-dist/doc/support/latex2man/README
===================================================================
--- trunk/Master/texmf-dist/doc/support/latex2man/README	2017-10-06 20:18:55 UTC (rev 45483)
+++ trunk/Master/texmf-dist/doc/support/latex2man/README	2017-10-06 20:19:34 UTC (rev 45484)
@@ -17,7 +17,7 @@
  - Latex2man requires Perl version >= 5.0004_03.
  - LaTeX2e
 
-VERSION: 1.25
+VERSION: 1.26
 
 Author and Copyright (c) 1998:
 	 Dr. Jürgen Vollmer
@@ -33,4 +33,4 @@
 
 If you find this software useful, please send me a postcard.
 
-$Id: README,v 1.66 2017/04/13 19:20:00 vollmer Exp $
+$Id: README,v 1.67 2017/10/02 13:25:29 vollmer Exp $

Deleted: trunk/Master/texmf-dist/doc/support/latex2man/THIS-IS-VERSION-1.25
===================================================================
--- trunk/Master/texmf-dist/doc/support/latex2man/THIS-IS-VERSION-1.25	2017-10-06 20:18:55 UTC (rev 45483)
+++ trunk/Master/texmf-dist/doc/support/latex2man/THIS-IS-VERSION-1.25	2017-10-06 20:19:34 UTC (rev 45484)
@@ -1 +0,0 @@
-VERSION 1.25 DATE=2017/04/13

Added: trunk/Master/texmf-dist/doc/support/latex2man/THIS-IS-VERSION-1.26
===================================================================
--- trunk/Master/texmf-dist/doc/support/latex2man/THIS-IS-VERSION-1.26	                        (rev 0)
+++ trunk/Master/texmf-dist/doc/support/latex2man/THIS-IS-VERSION-1.26	2017-10-06 20:19:34 UTC (rev 45484)
@@ -0,0 +1 @@
+VERSION 1.26 DATE=2017/10/06

Modified: trunk/Master/texmf-dist/doc/support/latex2man/latex2man-CHANGES.html
===================================================================
--- trunk/Master/texmf-dist/doc/support/latex2man/latex2man-CHANGES.html	2017-10-06 20:18:55 UTC (rev 45483)
+++ trunk/Master/texmf-dist/doc/support/latex2man/latex2man-CHANGES.html	2017-10-06 20:19:34 UTC (rev 45484)
@@ -7,7 +7,10 @@
                 Change history of the latex2man package
                 =======================================
 
-$Id: CHANGES,v 1.65 2017/04/13 14:34:26 vollmer Exp $
+$Id: CHANGES,v 1.69 2017/10/06 16:24:45 vollmer Exp $
+1.26   06 Oct  2017     - Handle \end{document},
+       	       		  fixed deprecated regular exprs and minor typoos
+                          Thanks to "Gene Cooperman" <gene at ccs.neu.edu>
 1.25   13 Apr  2017     - Handle \input{filename} macro.
 1.24   21 Dec  2010     - Thanks to "Tom Brand" <tbrand at manumit-systems.com>,
                           who added the CSS support to the HTML generation procedure.

Modified: trunk/Master/texmf-dist/doc/support/latex2man/latex2man.html
===================================================================
--- trunk/Master/texmf-dist/doc/support/latex2man/latex2man.html	2017-10-06 20:18:55 UTC (rev 45483)
+++ trunk/Master/texmf-dist/doc/support/latex2man/latex2man.html	2017-10-06 20:19:34 UTC (rev 45484)
@@ -1,5 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<!-- Manual page created with latex2man on Do 13. Apr 21:21:18 CEST 2017
+<!-- Manual page created with latex2man on Fr 6. Okt 19:19:31 CEST 2017
 ** Author of latex2man: Juergen.Vollmer at informatik-vollmer.de
 ** NOTE: This file is generated, DO NOT EDIT. -->
 <html>
@@ -11,8 +11,8 @@
 A Documentation Tool 
 </h1>
 <h4 class="authorhead">Dr. Jürgen Vollmer </h4>
-<h4 class="datehead">2017/04/13</h4>
-<h4 class="versionhead">Version 1.25</h4>
+<h4 class="datehead">2017/10/06</h4>
+<h4 class="versionhead">Version 1.26</h4>
 <p>
 <font class="progname">Latex2man</font>
 is a tool to translate UNIX manual pages written with 
@@ -669,7 +669,7 @@
 <dd> <tt>\textbf{example}</tt> is typeset as <strong>example</strong>.
 </dd>
 <dt>\texttt{..}</dt>
-<dd><tt>\textt{example}</tt> is typeset as <tt>example</tt>.
+<dd><tt>\texttt{example}</tt> is typeset as <tt>example</tt>.
 </dd>
 <dt>\underline{..}</dt>
 <dd><tt>\underline{example}</tt> is typeset as 
@@ -780,7 +780,7 @@
 environment. 
 </dd>
 <dt>\today</dt>
-<dd> 13 April 2017 (see also the <tt>rcsinfo</tt>
+<dd> 06 October 2017 (see also the <tt>rcsinfo</tt>
 LaTeXpackage). 
 </dd>
 <dt>\ss,\"a, ...</dt>
@@ -807,6 +807,8 @@
 </dd>
 </dl>
 <p>
+Please note: the name of the LaTeX-macrosand its arguments must be contained in one line. 
+<p>
 <h4 class="subsectionname"><a name="section_13">Conditional Text</a></h4>
 
 <p>
@@ -1346,7 +1348,7 @@
 <h2 class="sectionname"><a name="section_24">Version</a></h2>
 
 <p>
-Version: 1.25 of 2017/04/13.
+Version: 1.26 of 2017/10/06.
 <p>
 <h2 class="sectionname"><a name="section_25">License and Copyright</a></h2>
 
@@ -1358,7 +1360,7 @@
 
 <a class="emailstyle" href ="mailto:Juergen.Vollmer at informatik-vollmer.de">Juergen.Vollmer at informatik-vollmer.de</a>
 <p>
-The actual version of <font class="progname">Latex2man</font>
+The most recent version of <font class="progname">Latex2man</font>
 may be found on my homepage<br>
 
 <a class="urlstyle" href ="http://www.informatik-vollmer.de/software/latex2man.html"><tt>http://www.informatik-vollmer.de/software/latex2man.html</tt></a>.

Modified: trunk/Master/texmf-dist/doc/support/latex2man/latex2man.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/support/latex2man/latex2man.tex
===================================================================
--- trunk/Master/texmf-dist/doc/support/latex2man/latex2man.tex	2017-10-06 20:18:55 UTC (rev 45483)
+++ trunk/Master/texmf-dist/doc/support/latex2man/latex2man.tex	2017-10-06 20:19:34 UTC (rev 45484)
@@ -2,7 +2,7 @@
 %% Project:     Documentation Tools
 %% Descr:       Latex -->  MAN-page (groff -man), LATEX documentation
 %% Author:      Dr. J\xFCrgen Vollmer, Juergen.Vollmer at informatik-vollmer.de
-%% $Id: latex2man.tex,v 1.196 2017/04/13 14:46:35 vollmer Exp $
+%% $Id: latex2man.tex,v 1.200 2017/10/06 17:19:31 vollmer Exp $
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%
 %% Latex2man is a tool to translate UNIX manual pages written with LaTeX into a
@@ -53,15 +53,15 @@
 %% do we have the `rcsinfo' package?
 \IfFileExists{rcsinfo.sty}{
 \usepackage[nofancy]{rcsinfo}
-\rcsInfo $Id: latex2man.tex,v 1.196 2017/04/13 14:46:35 vollmer Exp $
+\rcsInfo $Id: latex2man.tex,v 1.200 2017/10/06 17:19:31 vollmer Exp $
 \setDate{\rcsInfoLongDate}
 }{
-\setDate{2017/04/13}    %%%% must be manually set, if rcsinfo is not present
+\setDate{2017/10/06}    %%%% must be manually set, if rcsinfo is not present
 \message{package rcsinfo not present, discard it}
 }
 
 \setVersionWord{Version:}  %%% that's the default, no need to set it.
-\setVersion{1.25}
+\setVersion{1.26}
 
 \begin{document}
 
@@ -402,7 +402,7 @@
 \item[\Bs subsubsection\{..\}] those.
 \item[\Bs emph\{..\}] \verb+\emph{example}+ is typeset as \emph{example}.
 \item[\Bs textbf\{..\}] \verb+\textbf{example}+ is typeset as \textbf{example}.
-\item[\Bs texttt\{..\}]\verb+\textt{example}+ is typeset as \texttt{example}.
+\item[\Bs texttt\{..\}]\verb+\texttt{example}+ is typeset as \texttt{example}.
 \item[\Bs underline\{..\}]\verb+\underline{example}+ is typeset as
      \underline{example of underline}.
 \item[\Bs date\{..\}] uses \verb+..+ as date.
@@ -460,6 +460,8 @@
 \item[\Bs input\{..\}] Read and process the given filename.
 \end{description}
 
+Please note: the name of the \LaTeX-macros and its arguments must be contained in one line.
+
 \subsection{Conditional Text}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -779,7 +781,7 @@
      \Email{Juergen.Vollmer at informatik-vollmer.de}
 
 
-     The actual version of  \Prog{Latex2man} may be found on my homepage\\
+     The most recent version of  \Prog{Latex2man} may be found on my homepage\\
      \URL{http://www.informatik-vollmer.de/software/latex2man.html}.
 
 \item[License] This program can be redistributed and/or modified under the

Modified: trunk/Master/texmf-dist/doc/support/latex2man/latex2man.texi
===================================================================
--- trunk/Master/texmf-dist/doc/support/latex2man/latex2man.texi	2017-10-06 20:18:55 UTC (rev 45483)
+++ trunk/Master/texmf-dist/doc/support/latex2man/latex2man.texi	2017-10-06 20:19:34 UTC (rev 45484)
@@ -3,7 +3,7 @@
 @setfilename latex2man.info
 @settitle latex2man
 @c %**end of header
- at c Manual page created with latex2man on Do 13. Apr 21:21:18 CEST 2017>
+ at c Manual page created with latex2man on Fr 6. Okt 19:19:31 CEST 2017>
 @c NOTE: This file is generated, DO NOT EDIT.
 @dircategory Man-pages
 @direntry
@@ -569,7 +569,7 @@
 @item \textbf@{..@}
 @t{\textbf@{example@}} is typeset as @strong{example}.
 @item \texttt@{..@}
- at t{\textt@{example@}} is typeset as @t{example}.
+ at t{\texttt@{example@}} is typeset as @t{example}.
 @item \underline@{..@}
 @t{\underline@{example@}} is typeset as 
 example of underline.
@@ -646,7 +646,7 @@
 @t{description}
 environment. 
 @item \today
-13 April 2017(see also the @t{rcsinfo}
+06 October 2017(see also the @t{rcsinfo}
 LaTeXpackage). 
 @item \ss,\"a, ...
 \ss = @ss{}, \"a= @"a, \"o= @"o, \"u= @"u, 
@@ -669,6 +669,8 @@
 Read and process the given filename. 
 @end table
 
+Please note: the name of the LaTeX-macrosand its arguments must be contained in one line. 
+
 @node Conditional Text,  Translation of User Defined Macros,  Accepted LaTeX Macros, Top 
 @subsection Conditional Text
 
@@ -1080,7 +1082,7 @@
 @section Version
 
 
-Version: 1.25 of 2017/04/13.
+Version: 1.26 of 2017/10/06.
 
 @node License and Copyright,  Author,  Version, Top  
 @section License and Copyright
@@ -1093,7 +1095,7 @@
 
 @email{Juergen.Vollmer@@informatik-vollmer.de}
 
-The actual version of Latex2man
+The most recent version of Latex2man
 may be found on my homepage@*
 
 @url{http://www.informatik-vollmer.de/software/latex2man.html}.

Modified: trunk/Master/texmf-dist/doc/support/latex2man/latex2man.txt
===================================================================
--- trunk/Master/texmf-dist/doc/support/latex2man/latex2man.txt	2017-10-06 20:18:55 UTC (rev 45483)
+++ trunk/Master/texmf-dist/doc/support/latex2man/latex2man.txt	2017-10-06 20:19:34 UTC (rev 45484)
@@ -409,7 +409,7 @@
               \textbf{example} is typeset as [1mexample[22m.
 
        \texttt{..}
-              \textt{example} is typeset as example.
+              \texttt{example} is typeset as example.
 
        \underline{..}
               \underline{example} is typeset as [4mexample[24m [4mof[24m [4munderline[24m .
@@ -487,7 +487,7 @@
 
        \item  inside a itemize, enumerate, or description environment.
 
-       \today 13 April 2017(see also the rcsinfo LaTeXpackage).
+       \today 06 October 2017(see also the rcsinfo LaTeXpackage).
 
        \ss,\"a, ...
               \ss  =  \xDF, \"a= \xE4, \"o= \xF6, \"u= \xFC, \"A= \xC4, \"O= \xD6, \"U= \xDC. It is
@@ -507,8 +507,11 @@
        \input{..}
               Read and process the given filename.
 
+       Please note: the name of the LaTeX-macrosand its arguments must be con-
+       tained in one line.
+
    [1mCONDITIONAL TEXT[0m
-       latex2man  preprocesses the LaTeX input to allow text to be used condi-
+       latex2man preprocesses the LaTeX input to allow text to be used  condi-
        tionally. A special sort of LaTeX comment is used for that purpose.
 
        [1m*      [22m%@% IF [4mcondition[24m %@%
@@ -517,13 +520,13 @@
 
        [1m*      [22m%@% END-IF %@%
 
-       A line must contain only such a comment and nothing else. [4mcondition[24m  is
-       a  boolean  expression  containing  ``names''  and operators. The names
-       given with the [1m-C[4m[22mname[24m option have the value ``true'', while  all  other
-       names  occuring  in  the expression are assumed to be ``false''. If the
+       A  line must contain only such a comment and nothing else. [4mcondition[24m is
+       a boolean expression containing  ``names''  and  operators.  The  names
+       given  with  the [1m-C[4m[22mname[24m option have the value ``true'', while all other
+       names occuring in the expression are assumed to be  ``false''.  If  the
        evaluation of the boolean expression results in the value ``true'', the
-       text  in  the  ``then''-part  is  used  and  the  text  in the optional
-       ``else''-part is skipped (and vice versa). The  IF/ELSE/END-IF  may  be
+       text in the  ``then''-part  is  used  and  the  text  in  the  optional
+       ``else''-part  is  skipped  (and vice versa). The IF/ELSE/END-IF may be
        nested. As boolean operators the following are allowed:
 
        ( and ) for grouping are allowed.
@@ -545,8 +548,8 @@
        %@%  END-IF %@%
        %@% END-IF %@%
 
-       Run  this manual page through latex2man with e.g.  [1m-C[4m[22m'abc[24m [4mXYZ'[24m and have
-       a look to the generated output.  (If simply running the  LaTeX-document
+       Run this manual page through latex2man with e.g.  [1m-C[4m[22m'abc[24m [4mXYZ'[24m and  have
+       a  look to the generated output.  (If simply running the LaTeX-document
        through LaTeX,all lines are shown in the .dvi file).
        abc NOT set
        xyz OR !XYZ set
@@ -579,14 +582,14 @@
        4b. The LATEX conditional was not set.
 
    [1mTRANSLATION OF USER DEFINED MACROS[0m
-       The  user  macro translation file (given by the [[1m-t[4m[22mtransfile[24m]) contains
+       The user macro translation file (given by the  [[1m-t[4m[22mtransfile[24m])  contains
        Perl commands specifying the translation of LaTeX macros defined by the
-       user.  These  macros may have none, one or two arguments. The following
+       user. These macros may have none, one or two arguments.  The  following
        code is expected:
 
        [1m*      [22mComments start with a # up to the end of the line.
 
-       [1m*      [22mFor a macro \foo with no arguments, the following code  must  be
+       [1m*      [22mFor  a  macro \foo with no arguments, the following code must be
               specified:
 
               Translation to Man-Pages
@@ -600,7 +603,7 @@
 
               where ... is the translation.
 
-       [1m*      [22mFor  a macro \foo{..} with one argument, the following code must
+       [1m*      [22mFor a macro \foo{..} with one argument, the following code  must
               be specified:
 
               Translation to Man-Pages
@@ -615,10 +618,10 @@
                      $texiMacro1a{'foo'} = '...';
                      $texiMacro1b{'foo'} = '...';
 
-              where ... is the translation. The 1a code  is  used  before  the
+              where  ...  is  the  translation. The 1a code is used before the
               argument, while 1b is typeset after the argument is set.
 
-       [1m*      [22mFor  a macro \foo{..}{..} with two arguments, the following code
+       [1m*      [22mFor a macro \foo{..}{..} with two arguments, the following  code
               must be specified:
 
               Translation to Man-Pages
@@ -636,8 +639,8 @@
                      $texiMacro2b{'foo'} = '...';
                      $texiMacro2c{'foo'} = '...';
 
-              where ... is the translation. The 2a code  is  used  before  the
-              first  argument,  2b between the two arguments and 2c is typeset
+              where  ...  is  the  translation. The 2a code is used before the
+              first argument, 2b between the two arguments and 2c  is  typeset
               after the second argument is set.
 
        [1m*      [22mThe file latex2man.trans contains some example code.
@@ -664,13 +667,13 @@
    [1mGENERAL REMARKS[0m
        1.     Empty lines are typeset as paragraph separators.
 
-       2.     The arguments of the LaTeX commands must not be split over  sev-
+       2.     The  arguments of the LaTeX commands must not be split over sev-
               eral lines.
 
        3.     Do not nest calls to macros.
 
-       4.     Except  the mentioned environment and macros, the usage of other
-              LaTeX environments or macros are  not  translated.  Their  usage
+       4.     Except the mentioned environment and macros, the usage of  other
+              LaTeX  environments  or  macros  are not translated. Their usage
               will cause garbage in the output.
 
        5.     latex2man requires Perl version >= 5.0004_03.
@@ -681,44 +684,44 @@
 
 [1mCSS CLASSNAMES[0m
        The table below shows the names of CSS classes that will be included in
-       the HTML tags as attributes.  You can specify the CSS style  properties
+       the  HTML tags as attributes.  You can specify the CSS style properties
        in the [4mCSSfile[24m for these classes:
 
        [1mHTML tag   Class                Style applies to[0m
        body                            the body of the HTML page
-       h1         titlehead            the  title at the top of the HTML
-                                       page specified as an argument  to
+       h1         titlehead            the title at the top of the  HTML
+                                       page  specified as an argument to
                                        the [4mName[24m environment
        h4         authorhead           the author at the top of the HTML
-                                       page specified as an argument  to
+                                       page  specified as an argument to
                                        the [4mName[24m environment
-       h4         datehead             the  date  at the top of the HTML
+       h4         datehead             the date at the top of  the  HTML
                                        page
-       h4         versionhead          the man page version at  the  top
-                                       of  the HTML page specified as an
+       h4         versionhead          the  man  page version at the top
+                                       of the HTML page specified as  an
                                        argument to the [4msetVersion[24m macro
-       h2         sectionname          a section title specified  as  an
+       h2         sectionname          a  section  title specified as an
                                        argument to the [4msection[24m macro
-       h4         subsectionname       a  subsection  title specified as
+       h4         subsectionname       a subsection title  specified  as
                                        an  argument  to  the  [4msubsection[0m
                                        macro
-       h5         subsubsectionname    a  subsubsection  title specified
-                                       as an argument to the  [4msubsubsec-[0m
+       h5         subsubsectionname    a subsubsection  title  specified
+                                       as  an argument to the [4msubsubsec-[0m
                                        [4mtion[24m macro
-       font       progname             a  program  name  specified as an
+       font       progname             a program name  specified  as  an
                                        argument to the [4mProg[24m macro
        font       filename             a file name specified as an argu-
                                        ment to the [4mFile[24m macro
-       font       commandname          a  command  name  specified as an
+       font       commandname          a command name  specified  as  an
                                        argument to the [4mCmd[24m macro
-       font       textstyle            all text that is not an  argument
+       font       textstyle            all  text that is not an argument
                                        to some LaTeX or latex2man macro
-       font       optstyle             a  name of an option specified as
-                                       an argument  to  the  [4mOpt[24m,  [4moOpt[24m,
+       font       optstyle             a name of an option specified  as
+                                       an  argument  to  the  [4mOpt[24m, [4moOpt[24m,
                                        [4mOptArg[24m,   [4moOptArg[24m   or   [4moOptoArg[0m
                                        macros
-       font       argstyle             a name of an  argument  specified
-                                       as  an argument to the [4mArg[24m, [4moArg[24m,
+       font       argstyle             a  name  of an argument specified
+                                       as an argument to the [4mArg[24m,  [4moArg[24m,
                                        [4mOptArg[24m,   [4moOptArg[24m   or   [4moOptoArg[0m
                                        macros
        a, font    urlstyle             a URL specified as an argument to
@@ -733,15 +736,15 @@
        a, font    emailstyle.hover     subclass of emailstyle class
        table      tablestyle           a  table  specified  as  a  [4mTable[0m
                                        environment
-       tr         rowstyle             a row of a table specified  as  a
+       tr         rowstyle             a  row  of a table specified as a
                                        [4mTable[24m environment
-       td         cellstyle            a  cell of a table specified as a
+       td         cellstyle            a cell of a table specified as  a
                                        [4mTable[24m environment
 
 [1mSOME BUG FIX TESTS[0m
        Leading . and '
               Now leading . and ' in generation troff output should work prop-
-              perly,  since  a  \&  is added. Therfore the \Dot macro has been
+              perly, since a \& is added. Therfore the  \Dot  macro  has  been
               deleted.
               Thanks to [1mFrank.Schilder at Mathematik.Tu-Ilmenau.De[22m.
               Testcase 1:
@@ -755,7 +758,7 @@
               abc ...  abc . efg ' 123
 
        %in verbatim
-              A % in a \verb and verbatim-environment  was  not  emitted  cor-
+              A  %  in  a  \verb and verbatim-environment was not emitted cor-
               rectly. Thanks to Aleksey Nogin [1mnogin at cs.caltech.edu [22mfor the bug
               report and bug fix.
 
@@ -776,24 +779,24 @@
        LaTeX LaTeX2e is required.
 
 [1mCHANGES[0m
-       Please check the file [1mlatex2man-CHANGES [22mfor the  list  of  changes  and
+       Please  check  the  file  [1mlatex2man-CHANGES [22mfor the list of changes and
        acknowledgment to people contributing bugfixes or enhancements.
 
 [1mVERSION[0m
-       Version: 1.25 of 2017/04/13.
+       Version: 1.26 of 2017/10/06.
 
 [1mLICENSE AND COPYRIGHT[0m
        Copyright
-              (C)1998,  Dr.  J\xFCrgen  Vollmer, Am Rennbuckel 21, D-76185 Karls-
+              (C)1998, Dr. J\xFCrgen Vollmer, Am Rennbuckel  21,  D-76185  Karls-
               ruhe, Germany,
               [1mJuergen.Vollmer at informatik-vollmer.de[0m
 
-       The actual version of Latex2man may be found on my homepage
+       The most recent version of Latex2man may be found on my homepage
        [1mhttp://www.informatik-vollmer.de/software/latex2man.html[22m.
 
        License
-              This program can be  redistributed  and/or  modified  under  the
-              terms  of the LaTeX Project Public License Distributed from CTAN
+              This  program  can  be  redistributed  and/or modified under the
+              terms of the LaTeX Project Public License Distributed from  CTAN
               archives in directory macros/latex/base/lppl.txt; either version
               1 of the License, or any later version.
 
@@ -807,4 +810,4 @@
        Email: [1mJuergen.Vollmer at informatik-vollmer.de[0m
        WWW: [1mhttp://www.informatik-vollmer.de[22m.
 
-Documentation Tools               2017/04/13                      LATEX2MAN(1)
+Documentation Tools               2017/10/06                      LATEX2MAN(1)

Modified: trunk/Master/texmf-dist/scripts/latex2man/latex2man
===================================================================
--- trunk/Master/texmf-dist/scripts/latex2man/latex2man	2017-10-06 20:18:55 UTC (rev 45483)
+++ trunk/Master/texmf-dist/scripts/latex2man/latex2man	2017-10-06 20:19:34 UTC (rev 45484)
@@ -1,9 +1,10 @@
 #!/usr/bin/env perl
+#!/usr/bin/perl -w
 # Project: 	Documentation Tools
 # Descr:	Latex -->  MAN-page (groff -man), HTML and TexInfo;
 # Language:	PERL (>= 5.0)
 # Author:	Dr. J\xFCrgen Vollmer, Juergen.Vollmer at informatik-vollmer.de
-# $Id: latex2man,v 1.163 2017/04/13 14:25:56 vollmer Exp $
+# $Id: latex2man,v 1.175 2017/10/06 17:19:31 vollmer Exp $
 #
 # Copyright (C) 1998 Dr. Juergen Vollmer
 #                    Am Rennbuckel 21, D-76185 Karlsruhe, Germany
@@ -19,7 +20,7 @@
 require 5.0004_03;
 
 use Getopt::Std;
-
+no warnings 'once';
 # use strict 'vars';
 
 $CMD=`basename $0`; chop ($CMD);
@@ -26,8 +27,8 @@
 $gen_date = `date`; chomp $gen_date;       # date when the output was generated
 
 sub date2str;
-$VERSION = "1.25";
-$DATE    = date2str ('$Date: 2017/04/13 14:25:56 $' =~ m|(\d+/\d+/\d+)|);
+$VERSION = "1.26";
+$DATE    = date2str ('$Date: 2017/10/06 17:19:31 $' =~ m|(\d+/\d+/\d+)|);
 
 $tmp = "/tmp/$CMD.$$";
 
@@ -35,6 +36,8 @@
 # check option and arguments
 ##################################################################
 
+$opt_D = 0;
+$opt_M = 0;
 getopts('o:t:c:VhMHTLC:D:a:'); # -D1: write each read line -D2: write each word
 
 sub usage
@@ -127,6 +130,7 @@
 # global variables
 
 # $Prefix is used to construct procedure and variable names
+$Prefix = "";
 if ($opt_M) {
     $Prefix  = "man";
 }
@@ -156,7 +160,7 @@
 $inside_table = 0; # true, if inside a table environment
 $first_column = 0; # true, if this is the first column in a table row
 $columns      = 0; # nr of columns in the current table
-$enum_nr      = 0; # current number of an enumeration
+# $enum_nr    = 0; # current number of an enumeration
 $nesting      = 0; # count recursive calls of interpret_word
 $section_cnt  = 0; # Index into $sections
 #$sections[0]      # Array of all sections
@@ -723,7 +727,7 @@
 {
     if ($manRS) {
 	Print '\n.RE\n';
-	$manRS == 0;
+	$manRS = 0;
     }
     if ($list_nest > 1) {
 	Print '\n.RE\n';
@@ -742,7 +746,7 @@
 {
     if ($manRS) {
 	Print '\n.RE\n';
-	$manRS == 0;
+	$manRS = 0;
     }
     if ($list_nest > 1) {
 	Print '\n.RE\n';
@@ -754,7 +758,7 @@
 {
     if ($manRS) {
 	Print '\n.RE\n';
-	$manRS == 0;
+	$manRS = 0;
     }
     if ($list_nest > 1) {
 	Print '\n.RE\n';
@@ -1188,7 +1192,7 @@
 
 sub texiVerbatimLine
 {
-    s/({|}|@| )/@\1/g;
+    s/(\{|\}|@| )/\@$1/g;
     chop;
     print DEST ".$_\@*\n";
 }
@@ -1326,7 +1330,7 @@
 					    last SWITCH;
 					};
        # LaTeX macros with two arguments
-       /\\([a-zA-Z]+){([^}]*)}{([^}]*)}/
+       /\\([a-zA-Z]+)\{([^}]*)\}\{([^}]*)\}/
  				     && do {$s=$`;$m=$1;$a1=$2;$a2=$3;$r=$';	#'
                                             check_Macro2 $m;
                                             interpret_word $s;
@@ -1340,7 +1344,7 @@
 					    last SWITCH;
 					};
        # Special Handling of Email and URL LaTeX macros with one argument
-       /\\(URL|Email){([^}]*)}/ && ($opt_H)
+       /\\(URL|Email)\{([^}]*)\}/ && ($opt_H)
  				     && do {$s=$`;$m=$1;$a1=$2;$r=$';	#'
 					    interpret_word $s;
 					    PrintM $Macro2a->{$m};
@@ -1353,7 +1357,7 @@
 					    last SWITCH;
 					};
        # LaTeX macros with one argument
-       /\\([a-zA-Z]+){([^}]*)}/      && do {$s=$`;$m=$1;$a1=$2;$r=$';	#'
+       /\\([a-zA-Z]+)\{([^}]*)\}/    && do {$s=$`;$m=$1;$a1=$2;$r=$';	#'
 					    check_Macro1 $m;
 					    interpret_word $s;
 					    PrintM $Macro1a->{$m};
@@ -1513,7 +1517,7 @@
 		if (/\\item/) {
 		    my $cnt1 = tr/[/[/;
 		    my $cnt2 = tr/]/]/;
-		    $join = $cnt1 != $cnt2 | $cnt1 == 0;
+		    $join = $cnt1 != $cnt2 || $cnt1 == 0;
 		    $kind = 1;
 		} elsif (/\\verb/) {
 		    my $cnt = tr/+/+/;
@@ -1520,8 +1524,8 @@
 		    $join = $cnt % 2 != 0;
 		    $kind = 3;
 		} else {
-		    my @x = $_ =~ /[^\\]{/g;
-		    my @y = $_ =~ /[^\\]}/g;
+		    my @x = $_ =~ /[^\\]\{/g;
+		    my @y = $_ =~ /[^\\]\}/g;
 		    $join = $#x != $#y;
 		    $kind = 2;
 		}
@@ -1681,7 +1685,7 @@
 	    my $line = $_; chop $line;
 	    print "--- \`$line'\n";
 	}
-	if (/^\s*\\input{([^}]*)}\s*/) {
+	if (/^\s*\\input\{([^}]*)\}\s*/) {
 	    # handle \input{fn}
 	    my $fn = $1;
 	    printf DEST "%%%%%%%%%%%%%%%%%% start of \\input{%s}\n", $fn;
@@ -1733,7 +1737,7 @@
 	    my $line = $_; chop $line;
 	    print "--- \`$line'\n";
 	}
-	if (/^\s*\\input{([^}]*)}\s*/) {
+	if (/^\s*\\input\{([^}]*)\}\s*/) {
 	    # handle \input{fn}
 	    my $fn = $1;
 	    if ($opt_M) {
@@ -1762,7 +1766,7 @@
 	next if ($skip[-1] == 1);
 
 	if ($inside_verb) {
-	    if (/^\s*\\end{verbatim}/) {
+	    if (/^\s*\\end\{verbatim\}/) {
 		if ($started == 1) {
 		    &{$Prefix . "VerbatimEnd"};
 		    $inside_verb = 0;
@@ -1774,8 +1778,8 @@
 	}
 
 	# remove {, } around Umlaute
-	s/{(\\".)}/\1/g;      # "
-	s/{(\\ss)}/\1/g;
+	s/\{(\\".)\}/$1/g;      # "
+	s/\{(\\ss)\}/$1/g;
 
 	# normalize special characters
 	s/\\"a/\xE4/g;
@@ -1791,19 +1795,19 @@
 		$rcs_date,$rcs_time,$rcs_owner,$rcs_status,$rcs_locker) = split(/\s/,$1);
 	    $date = date2str ($rcs_date);
 	    $Macro->{'today'}  = $date;
-	} elsif (/^\s*\\setDate{\\rcsInfoLongDate}/) {
+	} elsif (/^\s*\\setDate\{\\rcsInfoLongDate\}/) {
 	    $Macro->{'Date'} = $date;
-	} elsif (/^\s*\\setDate{\\today}/) {
+	} elsif (/^\s*\\setDate\{\\today\}/) {
 	    $Macro->{'Date'} = $date;
-	} elsif (/^\s*\\setDate{([^}]*)}/) {
+	} elsif (/^\s*\\setDate\{([^}]*)\}/) {
 	    $date = $1;
 	    $date =~ s/~/$Macro->{'~'}/g;
 	    $Macro->{'Date'} = $date;
-	} elsif (/^\s*\\setVersion{([^}]*)}/) {
+	} elsif (/^\s*\\setVersion\{([^}]*)\}/) {
 	    $version            = $1;
-	    $versin             =~ s/~/$Macro->{'~'}/g;
+	    $version            =~ s/~/$Macro->{'~'}/g;
 	    $Macro->{'Version'} = $version;
-	} elsif (/^\s*\\begin{Name}{([^}]*)}{([^}]*)}{([^}]*)}{([^}]*)}{([^}]*)}/) {
+	} elsif (/^\s*\\begin\{Name\}\{([^}]*)\}\{([^}]*)\}\{([^}]*)\}\{([^}]*)\}\{([^}]*)\}/) {
 	    $section = "Name";
 	    $chapter = $1;
 	    $name    = $2;
@@ -1812,29 +1816,29 @@
 	    $tool    = $4;
 	    $title   = $5;
 	    $rest    = $';  #'
-		$started = 1;
+	    $started = 1;
 	    $sections[0] = $section;
 	    $section_cnt = 0;
 	    &{$Prefix . "Start"}     ($name, $chapter, $author, $tool, $title);
 	    &{$Prefix . "NameStart"} ($name, $chapter, $author, $tool, $title);
-	} elsif (/^\s*\\end{Name}/) {
+	} elsif (/^\s*\\end\{Name\}/) {
 	    &{$Prefix . "NameEnd"} ($name, $chapter, $author, $tool);
-	} elsif (/^\s*\\begin{Table}(\[([^]]*)\])?{([^}]*)}/) {
+	} elsif (/^\s*\\begin\{Table\}(\[([^]]*)\])?\{([^}]*)\}/) {
 	    # \begin{Table}[width]{columns}
 	    if ($started == 1) {
 		$columns      = $3;
-		$column       = $_[0];
+		# $column       = $_[0];
 		$inside_table = 1;
 		$first_column = 1;
 		&{$Prefix . "TableStart"} ($columns, $2);
 	    }
-	} elsif (/^\s*\\end{Table}/) {
+	} elsif (/^\s*\\end\{Table\}/) {
 	    if ($started == 1) {
 		$inside_table = 0;
 		$first_column = 0;
 		&{$Prefix . "TableEnd"} ($columns);
 	    }
-	} elsif (/^\s*\\begin{Description}(\[[^]]*\])?/) {
+	} elsif (/^\s*\\begin\{Description\}(\[[^]]*\])?/) {
 	    if ($started == 1) {
 		$list_nest++;
 		$cur_list[$list_nest] = 'descr';
@@ -1841,12 +1845,12 @@
 		$item_nr[$list_nest]  = 0;
 		&{$Prefix . "DescriptionStart"};
 	    }
-	} elsif (/^\s*\\end{Description}/) {
+	} elsif (/^\s*\\end\{Description\}/) {
 	    if ($started == 1) {
 		&{$Prefix . "DescriptionEnd"};
 		$list_nest--;
 	    }
-	} elsif (/^\s*\\begin{description}/) {
+	} elsif (/^\s*\\begin\{description\}/) {
 	    if ($started == 1) {
 		$list_nest++;
 		$cur_list[$list_nest] = 'descr';
@@ -1853,20 +1857,20 @@
 		$item_nr[$list_nest]  = 0;
 		&{$Prefix . "DescriptionStart"};
 	    }
-	} elsif (/^\s*\\end{description}/) {
+	} elsif (/^\s*\\end\{description\}/) {
 	    if ($started == 1) {
 		&{$Prefix . "DescriptionEnd"};
 		$list_nest--;
 	    }
-	} elsif (/^\s*\\begin{center}/) {
+	} elsif (/^\s*\\begin\{center\}/) {
 	    if ($started == 1) {
 		&{$Prefix . "CenterStart"};
 	    }
-	} elsif (/^\s*\\end{center}/) {
+	} elsif (/^\s*\\end\{center\}/) {
 	    if ($started == 1) {
 		&{$Prefix . "CenterEnd"};
 	    }
-	} elsif (/^\s*\\begin{enumerate}/) {
+	} elsif (/^\s*\\begin\{enumerate\}/) {
 	    if ($started == 1) {
 		$list_nest++;
 		$cur_list[$list_nest] = 'enum';
@@ -1873,12 +1877,12 @@
 		$item_nr[$list_nest]  = 0;
 		&{$Prefix . "EnumStart"} ;
 	    }
-	} elsif (/^\s*\\end{enumerate}/) {
+	} elsif (/^\s*\\end\{enumerate\}/) {
 	    if ($started == 1) {
 		&{$Prefix . "EnumEnd"} ;
 		$list_nest--;
 	    }
-	} elsif (/^\s*\\begin{itemize}/) {
+	} elsif (/^\s*\\begin\{itemize\}/) {
 	    if ($started == 1) {
 		$list_nest++;
 		$cur_list[$list_nest] = 'item';
@@ -1885,17 +1889,17 @@
 		$item_nr[$list_nest]  = 0;
 		&{$Prefix . "ItemStart"} ;
 	    }
-	} elsif (/^\s*\\end{itemize}/) {
+	} elsif (/^\s*\\end\{itemize\}/) {
 	    if ($started == 1) {
 		&{$Prefix . "ItemEnd"} ;
 		$list_nest--;
 	    }
-	} elsif (/^\s*\\begin{verbatim}/) {
+	} elsif (/^\s*\\begin\{verbatim\}/) {
 	    if ($started == 1) {
 		&{$Prefix . "VerbatimStart"};
 		$inside_verb = 1;
 	    }
-	} elsif (/^\s*\\(subsubsection|subsection|section){([^}]*)}/) {
+	} elsif (/^\s*\\(subsubsection|subsection|section)\{([^}]*)\}/) {
 	    $kind    = $1;
 	    $section = $2;
 	    $section_cnt ++;
@@ -1904,9 +1908,9 @@
 	    if ($started == 1) {
 		&{$Prefix . "Section"} ($section_cnt, $kind, $section);
 	    }
-	} elsif (/^\s*\\LatexManEnd/) {
+	} elsif (/^\s*\\LatexManEnd/ || /^\s*\\end\{document\}/) {
 	    last;
-	} elsif (/^\s*((\\begin{Name|Table|Description})|(\\(sub)?section))/) {
+	} elsif (/^\s*((\\begin\{Name|Table|Description\})|(\\(sub)?section))/) {
 	    die "$CMD: in line $.\n           " .
 		"Arguments of $1 are not contained in a single " .
 		"line.\n           " .

Modified: trunk/Master/texmf-dist/tex/latex/latex2man/latex2man.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/latex2man/latex2man.sty	2017-10-06 20:18:55 UTC (rev 45483)
+++ trunk/Master/texmf-dist/tex/latex/latex2man/latex2man.sty	2017-10-06 20:19:34 UTC (rev 45484)
@@ -2,8 +2,8 @@
 %% Project:     Documentation Tools
 %% Descr:       Latex -->  MAN-page (groff -man), LaTeX package
 %% Author:      Dr. J\xFCrgen Vollmer, Juergen.Vollmer at informatik-vollmer.de
-%% $Id: latex2man.sty,v 1.88 2017/04/13 14:42:01 vollmer Exp $
-%% VERSION: 1.25
+%% $Id: latex2man.sty,v 1.90 2017/10/06 17:19:31 vollmer Exp $
+%% VERSION: 1.26
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%
 %% `latex2man' package to use with LaTeX2e.
@@ -31,7 +31,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{latex2man}[2017/04/13 v1.25]
+\ProvidesPackage{latex2man}[2017/10/06 v1.26]
 \usepackage{ifthen}
 
 \newif\if at LM@UseFancy@



More information about the tex-live-commits mailing list