schulschriften (3dec14)

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

1 files changed, 14 insertions, 21 deletions

diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index bd39e5af50a..f8a2d5b5da2 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -1548,6 +1548,7 @@ $standardtex='\.(.bx|cfg|sty|clo|ldf|cls|def|fd|cmap|4ht)$';
  'ofs',         '^ofs\.tex|ofsdef\.tex|ofs-.*\.tex|\.sty|a.*\.tex|.*fn\.tex',
  'pageslts',    '\.sty|[^c]\.cfg',      # omit ltxdoc.cfg, would be system-wide
  'papermas',    '\.sty|[^c]\.cfg',      # omit ltxdoc.cfg, would be system-wide
+ 'passivetex',  '\.xmt|' . $standardtex,
  'patch',       '\.tex',
  'pdf-trans',   'pdf-trans.tex',
  'pdfcprot',    '\.cpa|\.sty',
@@ -2481,10 +2482,6 @@ $standardttf = '\.ttf';
 %specialttf = (
 );
 
-# packages which have xmltex files
-$standardxmt='\.xmt';
-%specialxmt = ();
-
 
 # scripts to install under texmf*/.../scripts, but not bindir.
 %specialscripts_nobin = (
@@ -3078,7 +3075,6 @@ sub donormal {
      &dobst;
      &domp;
      &dobib;
-     &doxmt;
      &dotex;
      &runfonts;
      &domakeindex;
@@ -3427,12 +3423,6 @@ sub tl_man_to_pdf {
 }
 
 
-# xmltex files
-sub doxmt {
-   my $xmtpatt = $specialxmt{$package} || $standardxmt;
-   &install ("$DEST/tex/xmltex/$package", $xmtpatt);
-}
-
 # build the font files
 sub domf {
   $mfpatt = $specialmf{$package} || $standardmf;
@@ -4517,18 +4507,21 @@ sub MAKEliterat {
   &runjob("$CP [A-Z]* insta* license $DEST/doc/fonts/literat");
  }
 
-
-sub MAKExmltex
-{
-  &xchdir($packagedir);
-  &runjob("mkdir -p $DEST/tex/xmltex/config");
-  &runjob("mkdir -p $DEST/tex/xmltex/base");
-  &runjob("mkdir -p $DEST/doc/xmltex/base");
-
+sub MAKExmltex {
+  &xchdir ($packagedir);
+  
+  &xmkdir ("$DEST/tex/xmltex/config");
   &runjob("$CP *.ini $DEST/tex/xmltex/config");
+  
+  my $basedir = "$DEST/tex/xmltex/base";
+  &xmkdir ($basedir);
   &runjob("$CP xmltex.tex *xmt xmltex.cfg $DEST/tex/xmltex/base");
-  &runjob("$CP manual* *xml test* *txt  $DEST/doc/xmltex/base");
- }
+  &SYSTEM ("$RM -f $basedir/tei.xmt"); # the one in passivetex is newer
+
+  my $docdir = "$DEST/doc/otherformats/xmltex/base";
+  &xmkdir ($docdir);
+  &runjob("$CP manual* *xml test* *txt $docdir");
+}
 
 sub MAKEfancyvrb {
  &setup;