easydtx (24nov24)

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

1 files changed, 83 insertions, 25 deletions

diff --git a/Master/texmf-dist/scripts/easydtx/edtx2dtx.pl b/Master/texmf-dist/scripts/easydtx/edtx2dtx.pl
index f3965b1a485..93552cd8532 100755
--- a/Master/texmf-dist/scripts/easydtx/edtx2dtx.pl
+++ b/Master/texmf-dist/scripts/easydtx/edtx2dtx.pl
@@ -18,7 +18,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #
-# The files belonging to this work and covered by LPPL are listed in
+# The files belonging to this program and covered by GPL are listed in
 # <texmf>/doc/support/easydtx/FILES.
 
 use strict;
@@ -26,12 +26,28 @@ use Getopt::Long;
 
 my $usage = <<END;
 EasyDTX: convert .edtx into .dtx
-Usage: edtx2dtx filename.edtx > filename.dtx
+Usage: edtx2dtx [options] filename.edtx > filename.dtx
+Options: TODO
 END
 
-my $VERSION = '0.1.0';
+my $VERSION = '0.2.0';
 my ($help,  $print_version);
+
+my $comment = '%';
+my $begin_macrocode = '^%    \\\\begin{macrocode}';
+my $end_macrocode = '%    \\\\end{macrocode}';
+my $Begin_macrocode = '';
+my $End_macrocode = '';
+my $strip = '';
+
+Getopt::Long::Configure (qw/bundling no_ignore_case/);
 GetOptions(
+    "comment|c=s"  => \$comment,
+    "begin-macrocode|b=s"  => \$begin_macrocode,
+    "end-macrocode|e=s"  => \$end_macrocode,
+    "Begin-macrocode|B=s"  => \$Begin_macrocode,
+    "End-macrocode|E=s"  => \$End_macrocode,
+    "strip-empty|s"  => \$strip,
     "help|h|?"  => \$help,
     "version|V"  => \$print_version,
     ) or die $usage;
@@ -39,42 +55,76 @@ if ($help) {print($usage); exit 0}
 if ($print_version) { print("edtx2dtx $VERSION\n"); exit 0 }
 die $usage unless @ARGV == 1;
 
+my $keep_begin_macrocode = '';
+my $keep_end_macrocode = '';
+if ($Begin_macrocode) {
+    $begin_macrocode = $Begin_macrocode;
+    $keep_begin_macrocode = 1;
+}
+if ($End_macrocode) {
+    $end_macrocode = $End_macrocode;
+    $keep_end_macrocode = 1;
+}
+
 sub begin_macrocode { print("%    \\begin{macrocode}\n"); }
 sub end_macrocode   { print("%    \\end{macrocode}\n");   }
 
+# doc: replace initial in-comments with out-comments
+sub convert_comments { s/^\Q$comment\E+// && print('%' x length($&)); }
+
+my $indoc;
 sub process_edtx {
-    my $indoc = 1;
+    my $done;
+    my $empty;
     while (<>) {
-	if (/^%    \\end{macrocode}/) { # trailer starts here
-	    end_macrocode unless ($indoc);
-	    last;
-	} elsif (/^%    \\begin{macrocode}/) {
-	    die "Nested \\begin{macrocode}";
-	} elsif (/^ *(%%+)/) { # code: multiple comments
-	    begin_macrocode if ($indoc);
+	if (/$end_macrocode/) { # trailer starts here
+	    if ($keep_end_macrocode) {
+		$done = 1;
+	    } else {
+		end_macrocode unless $indoc;
+		last;
+	    }
+	} elsif (/$begin_macrocode/) {
+	    die "Nested '$begin_macrocode'";
+	}
+	if (/^ *(\Q$comment$comment\E+)/) { # code: multiple comments
+	    begin_macrocode if $indoc;
+	    print($empty); $empty = '';
 	    print;
 	    $indoc = 0;
-	} elsif (/^%(<[^>]*>)(.*)$/) { # code: unindented guard
-	    begin_macrocode if ($indoc);
+	} elsif (/^\Q$comment\E(<[^>]*>)(.*)$/) { # code: unindented guard
+	    begin_macrocode if $indoc;
 	    print;
 	    $indoc = 0;
-	} elsif (/^( *)%(<[^>]*>) *(.*)$/) { # code: indented guard
-	    begin_macrocode if ($indoc);
+	} elsif (/^( *)\Q$comment\E(<[^>]*>) *(.*)$/) { # code: indented guard
+	    begin_macrocode if $indoc;
 	    print("%$2$1$3\n");
 	    $indoc = 0;
-	} elsif (/^% *(.*)$/) { # doc: unindented comment
-	    end_macrocode unless ($indoc);
+	} elsif (/^\Q$comment\E *(.*)$/) { # doc: unindented comment
+	    end_macrocode unless $indoc;
+	    convert_comments;
 	    print;
 	    $indoc = 1;
-	} elsif (/^( ?)( *)% *(.*)$/) { # doc: indented comment
-	    end_macrocode unless ($indoc);
+	} elsif (/^( ?)( *)\Q$comment\E *(.*)$/) { # doc: indented comment
+	    end_macrocode unless $indoc;
 	    print "%$2$3\n";
 	    $indoc = 1;
+	} elsif (/^\s*$/) { # code: empty line
+	    if ($strip) {
+		$empty .= $_ unless $indoc;
+	    } else {
+		print;
+	    }
 	} else { # code
-	    begin_macrocode if ($indoc);
+	    print($empty); $empty = '';
+	    begin_macrocode if $indoc;
 	    print;
 	    $indoc = 0;
 	}
+	if ($done) {
+	    end_macrocode unless $indoc;
+	    last;
+	}
     }
 }
 
@@ -83,17 +133,25 @@ my $dtx = $edtx;
 $dtx =~ s/\.edtx$/.dtx/;
 
 my $first = 1;
+print("% \\iffalse\n%\n");
 while (<>) {
     if ($first and s/$edtx +(.*)/$dtx (generated from $edtx by edtx2dtx)/) {
 	print;
 	$first = 0;
-    } elsif (/^%    \\begin{macrocode}/) {
+    } elsif (/$begin_macrocode/) {
+	print("% \\fi\n%\n");
+	if ($keep_begin_macrocode) {
+	    $indoc = 1 if /^\Q$comment\E/;
+	    begin_macrocode unless $indoc;
+	    print;
+	} else {
+	    $indoc = 1;
+	}
 	process_edtx;
-    } elsif (/^%    \\end{macrocode}/) {
-	die "\\end{macrocode} without the opening \\begin{macrocode}!";
+    } elsif (/$end_macrocode/) {
+	die "'$end_macrocode' without the opening '$begin_macrocode'!";
     } else {
+	convert_comments;
 	print;
     }
 }
-
-