clojure-pamphlet (11sep19)

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

5 files changed, 9 insertions, 48 deletions

diff --git a/Build/source/texk/texlive/linked_scripts/clojure-pamphlet/pamphletangler b/Build/source/texk/texlive/linked_scripts/clojure-pamphlet/pamphletangler
index e0054e8da59..50c384cc98e 100755
--- a/Build/source/texk/texlive/linked_scripts/clojure-pamphlet/pamphletangler
+++ b/Build/source/texk/texlive/linked_scripts/clojure-pamphlet/pamphletangler
@@ -94,7 +94,7 @@ use Getopt::Long;
 use Pod::Usage qw(pod2usage);
 use vars qw/$VERSION/;
 
-BEGIN { $VERSION = '1.2' }
+BEGIN { $VERSION = '1.3' }
 
 my $linetext = "";
 my $changetext = "{}";
@@ -111,27 +111,6 @@ OPTS: {
         'change|C=s' => \$changetext
     );
 
-
-#pod
-    while ( my ($option, $value, $pretty) = Getopt::Mixed::nextOption() ) {
-        $linetext = $value if $option eq 'L';
-        if( $option eq 'V' ) {
-            print "$VERSION\n";
-            exit;
-        }
-        if ($option eq '?') {
-            pod2usage( -verbose => 99, -sections => [ qw(SYNOPSIS OPTIONS BUGS) ]);
-            exit;
-        }
-        if ($option eq 'man') {
-            pod2usage( -verbose => 2 );
-            exit;
-        }
-        $linetext = $value if $option eq 'L';
-        $changetext = $value if $option eq 'C';
-    }
-#cut
-
     pod2usage( -message => "[ERROR]: Invalid number of arguments." )
         if scalar(@ARGV) != 2;
     $filename = shift;
diff --git a/Master/texmf-dist/doc/support/clojure-pamphlet/clojure-pamphlet_guide.pdf b/Master/texmf-dist/doc/support/clojure-pamphlet/clojure-pamphlet_guide.pdf
index 6ffa96f3aaf..d30cb3841d8 100644
--- a/Master/texmf-dist/doc/support/clojure-pamphlet/clojure-pamphlet_guide.pdf
+++ b/Master/texmf-dist/doc/support/clojure-pamphlet/clojure-pamphlet_guide.pdf
diff --git a/Master/texmf-dist/doc/support/clojure-pamphlet/pamphletangler.1 b/Master/texmf-dist/doc/support/clojure-pamphlet/pamphletangler.1
index 0c33bdba080..82c95e751bf 100644
--- a/Master/texmf-dist/doc/support/clojure-pamphlet/pamphletangler.1
+++ b/Master/texmf-dist/doc/support/clojure-pamphlet/pamphletangler.1
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "PAMPHLETANGLER 1"
-.TH PAMPHLETANGLER 1 "2019-08-23" "clojure-pamphlet" "Ernesto Lanchares"
+.TH PAMPHLETANGLER 1 "2019-09-09" "clojure-pamphlet" "Ernesto Lanchares"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/Master/texmf-dist/scripts/clojure-pamphlet/pamphletangler b/Master/texmf-dist/scripts/clojure-pamphlet/pamphletangler
index e0054e8da59..50c384cc98e 100755
--- a/Master/texmf-dist/scripts/clojure-pamphlet/pamphletangler
+++ b/Master/texmf-dist/scripts/clojure-pamphlet/pamphletangler
@@ -94,7 +94,7 @@ use Getopt::Long;
 use Pod::Usage qw(pod2usage);
 use vars qw/$VERSION/;
 
-BEGIN { $VERSION = '1.2' }
+BEGIN { $VERSION = '1.3' }
 
 my $linetext = "";
 my $changetext = "{}";
@@ -111,27 +111,6 @@ OPTS: {
         'change|C=s' => \$changetext
     );
 
-
-#pod
-    while ( my ($option, $value, $pretty) = Getopt::Mixed::nextOption() ) {
-        $linetext = $value if $option eq 'L';
-        if( $option eq 'V' ) {
-            print "$VERSION\n";
-            exit;
-        }
-        if ($option eq '?') {
-            pod2usage( -verbose => 99, -sections => [ qw(SYNOPSIS OPTIONS BUGS) ]);
-            exit;
-        }
-        if ($option eq 'man') {
-            pod2usage( -verbose => 2 );
-            exit;
-        }
-        $linetext = $value if $option eq 'L';
-        $changetext = $value if $option eq 'C';
-    }
-#cut
-
     pod2usage( -message => "[ERROR]: Invalid number of arguments." )
         if scalar(@ARGV) != 2;
     $filename = shift;
diff --git a/Master/texmf-dist/source/support/clojure-pamphlet/clojure-pamphlet.dtx b/Master/texmf-dist/source/support/clojure-pamphlet/clojure-pamphlet.dtx
index e0cb5b2f022..28249569077 100644
--- a/Master/texmf-dist/source/support/clojure-pamphlet/clojure-pamphlet.dtx
+++ b/Master/texmf-dist/source/support/clojure-pamphlet/clojure-pamphlet.dtx
@@ -54,6 +54,9 @@
 %   Right brace   \}     Tilde         \~}
 %
 % \changes{v1.0}{2019/07/14}{Initial version}
+% \changes{v1.1}{2019/07/20}{Added support for indented code}
+% \changes{v1.2}{2019/07/25}{Moved tangler over to Perl}
+% \changes{v1.3}{2019/09/08}{Fixed small bug in tangler}
 %
 % \GetFileInfo{clojure-pamphlet.sty}
 % 
@@ -123,7 +126,7 @@
 %
 % Here's an example of a code usage and it's output
 % \begin{verbatim}
-% \begin{chunk}{main}
+% \begin{chunk}{main-routine}
 % int main(int argc, char* argv[]) {
 %   printf("Hello World.\n");
 % }
@@ -133,7 +136,7 @@
 % \iffalse
 %<*test>
 % \fi
-\begin{chunk}{main}
+\begin{chunk}{main-routine}
  int main(int argc, char* argv[]) {
    printf("Hello World.\n");
  }
@@ -191,7 +194,7 @@ int main(int argc, char* argv[]) {
 % }
 % \end{verbatim}
 %
-% \StopEventually{\PrintIndex}
+% \StopEventually{}
 %
 % \section{Implementation}
 %