From 3dbd65e55c0b843b17de0ba699526927cf2c023b Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Mon, 24 Sep 2007 17:59:17 +0000
Subject: new doc package templates-sommer (21jun07)

git-svn-id: svn://tug.org/texlive/trunk@5027 c570f23f-e606-0410-a88d-b1316a301751
---
 Build/cdbuild/ctan2tds.pl  | 57 +++++++++++++++++++++++++++-------------------
 Build/tools/tpm-ctan-check |  3 ++-
 2 files changed, 36 insertions(+), 24 deletions(-)

(limited to 'Build')

diff --git a/Build/cdbuild/ctan2tds.pl b/Build/cdbuild/ctan2tds.pl
index 17d4bc2126a..641b7fae7b0 100755
--- a/Build/cdbuild/ctan2tds.pl
+++ b/Build/cdbuild/ctan2tds.pl
@@ -447,6 +447,7 @@ $standardfoundry='public';
  'wp-conv',		'texmf-doc',
  'xetexref',		'texmf-doc',
 );
+$standarddest = "texmf-dist";
 
 # 
 %specialsourcefmt = (
@@ -645,6 +646,7 @@ $standardfmt='latex';
  'pxfonts',	'fonts',
  'shapepar',	'generic',
  'splines',	'metapost',
+ 'templates-sommer', 'german',
  'texsis',	'texsis',
  'textpath',	'metapost',
  'thumbpdf',	'generic',
@@ -1168,12 +1170,14 @@ for (@ARGV) {
     next;
   }
 
-  @x=split(/\//,$packagedir);
-  $package=pop(@x);
-  my $dest=$specialdest{$package} || "texmf-dist";
+  &set_dir_defaults ($opt_ctan_dir);
+
+  @x = split(/\//,$packagedir);
+  $package = pop (@x);
+  $DEST_TREE = $specialdest{$package} || $standarddest;
 
   $TOPDEST="$TDS/$package";
-  $DEST="$TOPDEST/$dest";
+  $DEST="$TOPDEST/$DEST_TREE";
 
   my $MAKE=0;
   if (-f "$packagedir/Makefile") {
@@ -1189,13 +1193,12 @@ for (@ARGV) {
     print "Package $packagedir has a TeXlive-aware Makefile. Make and send to $DEST\n";
 
   } else {
-    &set_dir_defaults ($opt_ctan_dir);
     
     $insrunner = $specialinsrunner{$package} || $standardinsrunner;
 
     $whichformat = $specialfmt{$package} || $standardfmt;
     $whichdocformat = $specialdocfmt{$package}
-                      || ($dest eq "texmf-doc" ? "english" : $standarddocfmt);
+                  || ($DEST_TREE eq "texmf-doc" ? "english" : $standarddocfmt);
 
     print "pkg=$package (fmt=$whichformat docfmt=$whichdocformat) -> $DEST\n";
     if ($special{$package}) {
@@ -1217,20 +1220,25 @@ for (@ARGV) {
 sub set_dir_defaults
 {
   my ($ctan_dir) = @_;
-  my $changed = 1;
+  my $guess = "";
   
-  if ($ctan_dir =~ m!/graphics/metapost/!) {
+  if ($ctan_dir =~ m!/tex-archive/graphics/metapost/!) {
     $standarddocfmt = $standardsourcefmt = "metapost";
-  } elsif ($ctan_dir =~ m!/fonts/!) {
+    $guess = "$standarddocfmt for docfmt/srcfmt";
+
+  } elsif ($ctan_dir =~ m!/tex-archive/fonts/!) {
     $standarddocfmt = $standardsourcefmt = "fonts";
-    # leave standardfmt as latex, though, since we don't want
-    # texmf-dist/tex/fonts/ ...
+    $guess = "$standarddocfmt for docfmt/srcfmt";
+
+  } elsif ($ctan_dir =~ m!/tex-archive/info/!) {
+    $standarddest = "texmf-doc";
+    $guess = "$standarddest for dest";
+
   } else {
     $changed = 0;
   }
 
-  print "\t guessed $standarddocfmt for docfmt/srcfmt (based on $ctan_dir)\n"
-    if $changed;
+  print "\t guessed $guess (based on $ctan_dir)\n" if $guess;
 }
 
 
@@ -1402,13 +1410,13 @@ sub install {
 }
 
 # build the documentation files
-sub dodvi {
-   $dvipatt = $specialdvi{$package};
-   # packages which are doc themselves rarely rebuild cleanly,
-   # and aren't worth it.
-   $dvipatt = "NULL" if $specialdest{$package} eq "texmf-doc";
-   if ($dvipatt eq "") { $dvipatt=$standarddvi; }
-   &rundvi($dvipatt);
+sub dodvi
+{
+  # packages which are doc themselves rarely rebuild cleanly,
+  # and aren't worth it.
+  return if $DEST_TREE eq "texmf-doc";
+  $dvipatt = $specialdvi{$package} || $standarddvi;
+  &rundvi ($dvipatt);
 }
 
 # move the runtime files
@@ -1447,9 +1455,12 @@ sub domp {
 }
 
 # BibTeX bibliography files:
-sub dobib{
-   $bibpatt = $specialbib{$package} || $standardbib;
-   &install("$DEST/bibtex/bib/$package", $bibpatt);
+sub dobib
+{
+warn "bib, $DEST_TREE";
+  return if ! $specialbib{$package} && $DEST_TREE eq "texmf-doc";
+  $bibpatt = $specialbib{$package} || $standardbib;
+  &install("$DEST/bibtex/bib/$package", $bibpatt);
 }
 
 # source files:
diff --git a/Build/tools/tpm-ctan-check b/Build/tools/tpm-ctan-check
index c2bbc7bfe52..8167a9ade61 100755
--- a/Build/tools/tpm-ctan-check
+++ b/Build/tools/tpm-ctan-check
@@ -136,7 +136,8 @@ my @WorkingTPM = qw(
           sudokubundle sugconf supertabular svgcolor svn svn-multi svninfo
           swebib syntax synproof syntrace synttree
         t-angles Tabbing tableaux tabulary tabvar talk tamethebeast
-          tengwarscript tensor teubner tex-gyre texilikecover texmate
+          templates-sommer tengwarscript
+          tensor teubner tex-gyre texilikecover texmate
           texpower texshade
           textcase textfit textopo textpath textpos thesis-titlepage-fhac
           thumb thumbpdf ticket titlefoot titlesec titling tocbibind
-- 
cgit v1.2.3