lh fonts 3.5d update

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

3 files changed, 16 insertions, 42 deletions

diff --git a/Build/cdbuild/ctan2tds.pl b/Build/cdbuild/ctan2tds.pl
index c15b3348481..35f8e41143f 100755
--- a/Build/cdbuild/ctan2tds.pl
+++ b/Build/cdbuild/ctan2tds.pl
@@ -2166,45 +2166,11 @@ sub MAKElfb {
 }
 
 sub MAKElh {
-  # this simply copies source files and then runs tex to make .mf's.
-  &xchdir ($packagedir);
-  #
-  &runjob("mkdir -p $DEST/doc/fonts");
-  &runjob("$CP -r doc/fonts/lh $DEST/doc/fonts");
-  #
-  &runjob("mkdir -p $DEST/fonts/source");
-  &runjob("$CP -r fonts/source/lh $DEST/fonts/source");
-
-  &runjob("mkdir -p $DEST/source/fonts");
-  &runjob("$CP -r source/lh $DEST/source/fonts");
-  
-  &xchdir ("$DEST/source/fonts/lh/tex");
-  &runjob("mkdir -p wrk");  # 99allenc.tex wants to write there
-  &runjob ("tex 99allenc.tex");
-#  &inst_lh_fonts ("01cm-lh","lcy");
-#  &inst_lh_fonts ("03cm-wn","ot2");
-#  &inst_lh_fonts ("11ex-rx","x2");
-#  &inst_lh_fonts ("12ex-la","t2a");
-#  &inst_lh_fonts ("13ex-lb","t2b");
-#  &inst_lh_fonts ("14ex-lc","t2c");
-#  &inst_lh_fonts ("15ex-ld","t2d");
-}
-
-sub inst_lh_fonts {
-  my ($texfile,$dir) = @_;
-  &runjob("tex $texfile ");
-  &runjob("rm  -f $texfile.dvi $texfile.log");
-  &runjob("mkdir -p $DEST/fonts/source/lh/lh-$dir");
-  &runjob("$CP wrk/*.mf $DEST/fonts/source/lh/lh-$dir");
-  &runjob("rm -r wrk/*");
-}
-
-sub MAKElucida {
-# this simply copies source files
-   chdir($packagedir) || die ("ERROR: cannot open directory");
-  &runjob("mkdir -p $DEST");
-  &runjob("$CP -r * $DEST");
-  }
+  &MAKEcopy ();
+  # alternative fd files for cyrillic, etc.  Don't install them.
+  # Rename directory to go with the rest of the package.
+  rename ("$DEST/source/latex/lhfonts", "$DEST/source/latex/lh");
+}
 
 sub MAKEliterat {
 # this simply copies source files
diff --git a/Build/cdbuild/place b/Build/cdbuild/place
index e8cd110ad08..00854662692 100755
--- a/Build/cdbuild/place
+++ b/Build/cdbuild/place
@@ -54,7 +54,7 @@ else {
   $newpackage=1;
 }
 
-xchdir ("$mydir/$package");
+&xchdir ("$mydir/$package");
 find (\&files,".");
 foreach $file (sort keys %Old) {
   print "* $file: [retained=$New{$file}]\n";
@@ -169,7 +169,8 @@ sub files
 
 
 # add a file to the repository.  for svn, we also have to add the
-# containing dir, if it is new.
+# containing dir, and the parent of that dir, if they are new.
+# (Should really just traverse )
 # 
 sub add_file
 {
@@ -177,6 +178,13 @@ sub add_file
   
   my $newdir = dirname ($newfile);
   
+  # when it's needed, parent must come first, else have svn "not working copy".
+  my $parentdir = dirname ($newdir);
+  unless (-d "$parentdir/.svn") {
+    &my_system ("svn add -N $parentdir");
+    $dirs{$parentdir}++;
+  }
+  
   unless (-d "$newdir/.svn") {
     &my_system ("svn add -N $newdir");
   }
diff --git a/Build/tools/ctan2tl b/Build/tools/ctan2tl
index 7ceda807a6b..3c3c158e899 100755
--- a/Build/tools/ctan2tl
+++ b/Build/tools/ctan2tl
@@ -119,4 +119,4 @@ rm -rf $pkg.done
 status=$?
 
 rm -rf ../raw/$pkg
-exit $?
+exit $status