textmerg doc/license update

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

11 files changed, 4 insertions, 114 deletions

diff --git a/Master/texmf-dist/doc/generic/textmerg/results.dat b/Master/texmf-dist/doc/generic/textmerg/results.dat
deleted file mode 100644
index 781e3869f5e..00000000000
--- a/Master/texmf-dist/doc/generic/textmerg/results.dat
+++ /dev/null
@@ -1,10 +0,0 @@
-Miss
-Iusta
-Mo
-34 Winchester Road\\Sheffield\\England
-A
-Mr
-Arthur
-Minit
-43 Sheffield Road\\Winchester\\England
-C
diff --git a/Master/texmf-dist/doc/generic/textmerg/silly.dat b/Master/texmf-dist/doc/generic/textmerg/silly.dat
deleted file mode 100644
index 70cd4b45a93..00000000000
--- a/Master/texmf-dist/doc/generic/textmerg/silly.dat
+++ /dev/null
@@ -1,20 +0,0 @@
-Mike
-look
-3
-1
-2
-3
-11
-12
-13
-***
-good
-Shelagh
-gaze
-2
-21
-22
-23
-24
-***
-horrid
diff --git a/Master/texmf-dist/doc/generic/textmerg/textmerg.pdf b/Master/texmf-dist/doc/generic/textmerg/textmerg.pdf
new file mode 100644
index 00000000000..f50465e0d91
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/textmerg/textmerg.pdf
diff --git a/Master/texmf-dist/tex/generic/textmerg/textmerg.tex b/Master/texmf-dist/doc/generic/textmerg/textmerg.tex
index b34dc635d63..b34dc635d63 100644
--- a/Master/texmf-dist/tex/generic/textmerg/textmerg.tex
+++ b/Master/texmf-dist/doc/generic/textmerg/textmerg.tex
diff --git a/Master/texmf-dist/doc/generic/textmerg/tmexamp1.dvi b/Master/texmf-dist/doc/generic/textmerg/tmexamp1.dvi
deleted file mode 100644
index 0b268815700..00000000000
--- a/Master/texmf-dist/doc/generic/textmerg/tmexamp1.dvi
+++ /dev/null
diff --git a/Master/texmf-dist/doc/generic/textmerg/tmexamp1.tex b/Master/texmf-dist/doc/generic/textmerg/tmexamp1.tex
deleted file mode 100644
index 7f3be5c00dd..00000000000
--- a/Master/texmf-dist/doc/generic/textmerg/tmexamp1.tex
+++ /dev/null
@@ -1,26 +0,0 @@
-%%
-%% This is file `tmexamp1.tex',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% textmerg.dtx  (with options: `examp')
-%% 
-\documentclass[12pt]{letter}
-\usepackage{textmerg}
-\begin{document}
-\Fields{\Title\Forenames\Surname
-   \Address\Grade}
-\Merge{results.dat}{%
-\begin{letter}{\Title\ \Forenames\
-   \Surname\\\Address}
-   \opening{Dear \Title\ \Surname,}
-   This letter is to inform you
-   that you obtained grade \Grade\ in
-   your recent examinations.
-   \closing{Yours faithfully,}
-\end{letter}}
-\end{document}
-\endinput
-%%
-%% End of file `tmexamp1.tex'.
diff --git a/Master/texmf-dist/doc/generic/textmerg/tmexamp2.dvi b/Master/texmf-dist/doc/generic/textmerg/tmexamp2.dvi
deleted file mode 100644
index 911bb361bc7..00000000000
--- a/Master/texmf-dist/doc/generic/textmerg/tmexamp2.dvi
+++ /dev/null
diff --git a/Master/texmf-dist/doc/generic/textmerg/tmexamp2.tex b/Master/texmf-dist/doc/generic/textmerg/tmexamp2.tex
deleted file mode 100644
index cf97a1301e5..00000000000
--- a/Master/texmf-dist/doc/generic/textmerg/tmexamp2.tex
+++ /dev/null
@@ -1,29 +0,0 @@
-%%
-%% This is file `tmexamp2.tex',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% textmerg.dtx  (with options: `example')
-%% 
-\documentclass[12pt]{article}
-\usepackage{textmerg}
-\MarkEnd{***}
-\Process{2}{\Advance}
-\def\Advance#1{#1\addtocounter{page}{#1}}
-\Fields{+\Name\Verb}
-\begin{document}
-\Merge{silly.dat}{%
-   Dear \Name,\par
-   Here is a table to \Verb\ at:
-   \Fields{\Width}%
-   \begin{tabular}{*{\Width}c}
-      \MultiRead\Width
-   \end{tabular}.\par
-   \Fields{\Adj}%
-   That was \Adj!
-   \clearpage}
-\end{document}
-\endinput
-%%
-%% End of file `tmexamp2.tex'.
diff --git a/Master/texmf-dist/doc/generic/textmerg/tmexampp.tex b/Master/texmf-dist/doc/generic/textmerg/tmexampp.tex
deleted file mode 100644
index 22ac23f28c0..00000000000
--- a/Master/texmf-dist/doc/generic/textmerg/tmexampp.tex
+++ /dev/null
@@ -1,28 +0,0 @@
-%%
-%% This is file `tmexampp.tex',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% textmerg.dtx  (with options: `plainexample')
-%% 
-\input textmerg
-\MarkEnd{***}
-\Process{2}{\Advance}
-\def\Advance#1{#1\global\advance\count0by#1}
-\Fields{+\Name\Verb}
-\Merge{silly.dat}{%
-   Dear \Name,\par
-   Here is a table to \Verb\ at:
-   \Fields{\Width}%
-   \vbox{\halign{\hfil{} ## {}\hfil&&\hfil{} ## {}\hfil\cr
-      \MultiRead\Width\cr
-   }}.\par
-   \Fields{\Adj}%
-   That was \Adj!
-   \vfill\eject}
-\end
-
-\endinput
-%%
-%% End of file `tmexampp.tex'.
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index f16721b6589..e7c425679fe 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -319,7 +319,7 @@ my @TLP_working = qw(
     texdiff texdirflatten texilikechaps texilikecover
     texloganalyser texlogos texmate texments
     texpower texshade
-    textcase textfit textopo textpath textpos tfrupee
+    textcase textfit textmerg textopo textpath textpos tfrupee
     thailatex theoremref thesis-titlepage-fhac
     thinsp thmbox thmtools threeparttable threeparttablex
     thumb thumbpdf thumby thuthesis
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 92a42d6677d..23f7946ea60 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -887,6 +887,7 @@ $standarddest = "texmf-dist";
  'shapepar',		'generic',
  'tabto-generic',	'generic',
  'texsis',		'texsis',
+ 'textmerg',		'generic',
  'tugboat-plain',	'plain',
  'ulem',		'generic',
  'variations',		'generic',
@@ -1296,6 +1297,7 @@ $standardtex='\.(.bx|cfg|sty|clo|ldf|cls|def|fd|cmap|4ht)$';
  'texdirflatten',	'support',
  'texloganalyser',	'support',
  'texsis',		'texsis',
+ 'textmerg',		'generic',
  'textpath',		'metapost',
  'timing',		'fonts',
  'trajan',		'fonts',
@@ -1415,6 +1417,7 @@ $standarddocfmt='latex';
  'ruhyphen',	'generic',
  'splines',	'metapost',
  't2',		'generic',
+ 'textmerg',	'generic',
  'trajan',	'fonts',
  'universa',	'fonts',
  'variations',	'generic',