5 files changed, 28 insertions, 40 deletions
diff --git a/Master/texmf-dist/source/latex/cweb-latex/Makefile b/Master/texmf-dist/doc/latex/cweb-latex/Makefile
index a280ae7cd99..a280ae7cd99 100644
--- a/Master/texmf-dist/source/latex/cweb-latex/Makefile
+++ b/Master/texmf-dist/doc/latex/cweb-latex/Makefile
diff --git a/Master/texmf-dist/tex/latex/cweb-latex/cweb.cls b/Master/texmf-dist/tex/latex/cweb-latex/cweb.cls
index ae512c54b15..284ee428f3a 100644
--- a/Master/texmf-dist/tex/latex/cweb-latex/cweb.cls
+++ b/Master/texmf-dist/tex/latex/cweb-latex/cweb.cls
@@ -836,16 +836,16 @@ by LaTeX.%
 
 %%% \sect Let's make sure that the expansion of |\end| is the one that we
 %%% expect. Then we can define |\cweb@skip_end| appropriately, we have to
-%%% skip 5~tokens.
+%%% skip 4~tokens.
 
 %%% \beginprog
 \CheckCommand*\end[1]{%
   \csname end#1\endcsname\@checkend{#1}%
   \expandafter\endgroup\if@endpe\@doendpe\fi
-% 1         2      3            4            5
-  \if@ignore\global\@ignorefalse\ignorespaces\fi}
+% 1         2            3            4
+  \if@ignore\@ignorefalse\ignorespaces\fi}
 
-\def\cweb@skip_end#1#2#3#4#5{\cweb@check_fi}
+\def\cweb@skip_end#1#2#3#4{\cweb@check_fi}
 %%% \endprog
 
 
diff --git a/Master/texmf-dist/tex/latex/cweb-latex/cweb.cls.patch b/Master/texmf-dist/tex/latex/cweb-latex/cweb.cls.patch
deleted file mode 100644
index 07f20ff7fa3..00000000000
--- a/Master/texmf-dist/tex/latex/cweb-latex/cweb.cls.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-This patch fixes cweb.cls so that it works with new versions of the
-LaTeX format.  (Any format later than 1997/06/30 or thereabouts is
-affected.)
-
-This patch may be freely redistributed.
-
-To use it, run the command "patch -p0 < cweb.cls.patch" in the
-directory containing cweb.cls if you have a UNIX-type system with the
-patch command.  If not, just make the necessary changes by hand to
-lines 846 and 848 as shown in the patch below.
-
-   Julian Gilbey <jdg@debian.org>, November 1999
-
---- cweb.cls.orig
-+++ cweb.cls
-@@ -836,16 +836,16 @@
- 
- %%% \sect Let's make sure that the expansion of |\end| is the one that we
- %%% expect. Then we can define |\cweb@skip_end| appropriately, we have to
--%%% skip 5~tokens.
-+%%% skip 4~tokens.
- 
- %%% \beginprog
- \CheckCommand*\end[1]{%
-   \csname end#1\endcsname\@checkend{#1}%
-   \expandafter\endgroup\if@endpe\@doendpe\fi
--% 1         2      3            4            5
--  \if@ignore\global\@ignorefalse\ignorespaces\fi}
-+% 1         2            3            4
-+  \if@ignore\@ignorefalse\ignorespaces\fi}
- 
--\def\cweb@skip_end#1#2#3#4#5{\cweb@check_fi}
-+\def\cweb@skip_end#1#2#3#4{\cweb@check_fi}
- %%% \endprog
- 
- 
diff --git a/Master/texmf-dist/doc/latex/cweb-latex/cwebbase.tex b/Master/texmf-dist/tex/latex/cweb-latex/cwebbase.tex
index dff1d3494b9..dff1d3494b9 100644
--- a/Master/texmf-dist/doc/latex/cweb-latex/cwebbase.tex
+++ b/Master/texmf-dist/tex/latex/cweb-latex/cwebbase.tex
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index de50089b2ff..80072f0ca32 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -284,6 +284,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
  'cursor',	"die 'skipping, no known license, very old and small'",
  'cvsty',	"die 'skipping, ca.2004, noinfo license'",
  'cweb',	"die 'skipping, programs'",
+ 'cweb-latex',  "&MAKEcweblatex",
  'cwpuzzle',	"die 'skipping, in crossword package'",
  'cyklop',      "&MAKEcopy",
  'dejavu',      "&MAKEcopy",
@@ -3516,6 +3517,29 @@ sub MAKEaurical {
   &MAKEcopy ();
 }
 
+sub MAKEcweblatex
+{
+  # don't do this in a tds-ready tree...
+  -e "$RAW_DIR/$packagedir/TDS_READY" 
+   && die "$0: using MAKEflatten with TDS_READY tree $RAW_DIR/$packagedir.\n";
+
+  &setup;
+  &xchdir ("$DEST/doc/$whichdocformat/$package");
+
+  # patch cweb.cls for new LaTeX format
+  &SYSTEM("patch -p0 < cweb.cls.patch");
+  # remove unneeded patch
+  &SYSTEM("$RM cweb.cls.patch");
+  # move cwebbase.tex to run files
+  &SYSTEM("$MV cwebbase.tex $DEST/tex/latex/$package");
+
+  #&flatten_dirtree ($package);
+  
+  # do the usual.
+  &buildfilelist;
+  &donormal ("nosetup");
+}
+
 sub MAKEeskdx
 {
  &setup;