[subversion-commit] SVN tetex commit + diffs: r193 - make-texfontpkg/trunk/scripts

[Ralf Stubner]

Author: stubner-guest
Date: 2005-10-02 22:23:39 +0000 (Sun, 02 Oct 2005)
New Revision: 193

Modified:
   make-texfontpkg/trunk/scripts/mk-tex-fontpack
Log:
* use continue instead of break to make exclusion of old map files
  work properly
* framework for option processing
* new option --type1inst for switching between type1inst and mkfontsscale
* some cleanup


Modified: make-texfontpkg/trunk/scripts/mk-tex-fontpack
===================================================================
--- make-texfontpkg/trunk/scripts/mk-tex-fontpack	2005-10-02 20:46:17 UTC (rev 192)
+++ make-texfontpkg/trunk/scripts/mk-tex-fontpack	2005-10-02 22:23:39 UTC (rev 193)
@@ -10,7 +10,9 @@
 #
 
 set -e
+shopt -s nullglob
 
+
 if [ "$DEBFULLNAME" ] ; then
     name=$DEBFULLNAME
 else
@@ -23,27 +25,56 @@
     email="$LOGNAME@`hostname --fqdn`"
 fi
 
-shopt -s nullglob
+# initial values
+revision=1
+type1inst=false
 
+# output usage information
 usage() {
-    echo "usage: `basename $0` [-r n] tds-dir packname"
-}
+    cat <<EOF
+usage: `basename $0` [options] tds-dir packname
 
-revision=1
+Valid options:
+ -r|--revision <n>  specify revision number <n>
+ -t|--type1inst     use type1inst instead of mkfontscale
+ -h|--help          this message
 
-if [ "X$1" = "X-r" ] ; then
-    shift
-    revision=$1
-    shift
-fi
+EOF
+}
 
-tdsdir=`echo $1 | sed  "s|/$||"` 
-packname="tex-fontpack-$2"
+# option processing
+while 
+  case $1 in
+      --help|-h)
+          usage
+          exit 0
+          ;;
+      --revision|-r)
+          revision=$2 
+          shift
+          ;;
+      --type1inst|-t)
+          type1inst=true
+          ;;
+      -*)
+          echo "Unknown option $1."
+          usage
+          exit 1
+          ;;
+      *)
+          if [ $# -eq 2 ]; then
+              tdsdir=`echo $1 | sed  "s|/$||"` 
+              packname="tex-fontpack-$2"
+              break
+          else
+              usage
+              exit 1
+          fi
+          ;;
+  esac
+  do test $# -gt 0 && shift 
+done
 
-if [ "X$tdsdir" = "X" -o "X$2" = "X" ] ; then
-	usage
-	exit 1
-fi
 
 # working directory
 tmpdir=`mktemp -d`
@@ -59,30 +90,35 @@
     # $fontfiles, $afmfiles: list of font and .afm files *with path*
     #     relative to TEXMF
     case $f in
-      $tdsdir/fonts/map/dvips/*)
-      		nn=`echo $f | sed -e "s|$tdsdir/fonts|etc/texmf|"`
-		mapfiles="$mapfiles `basename $f`"
-		;;
-      $tdsdir/fonts/type1/*)
-      		nn=`echo $f | sed -e "s|$tdsdir/||"`
-		fontfiles="$fontfiles $nn"
-                nn="usr/share/fonts/type1/$packname/`basename $nn`"
-		;;
-      $tdsdir/fonts/afm/*)
-      		nn=`echo $f | sed -e "s|$tdsdir/||"`
-		afmfiles="$afmfiles $nn"
-                nn="usr/share/fonts/type1/$packname/`basename $nn`"
-		;;
-      $tdsdir/doc/*)
-      		nn=`echo $f | sed -e "s|$tdsdir/doc|usr/share/doc/texmf|"`
-		;;
-      # don't include map files at TDS 1.0 location
-      $tdsdir/dvips/config/*.map)
-      		break
-		;;
-      *)
-      		nn=`echo $f | sed -e "s|$tdsdir|usr/share/texmf|"`
-		;;
+        $tdsdir/fonts/map/dvips/*)
+            nn=`echo $f | sed -e "s|$tdsdir/fonts|etc/texmf|"`
+            mapfiles="$mapfiles `basename $f`"
+            ;;
+
+        $tdsdir/fonts/type1/*)
+            nn=`echo $f | sed -e "s|$tdsdir/||"`
+            fontfiles="$fontfiles $nn"
+            nn="usr/share/fonts/type1/$packname/`basename $nn`"
+            ;;
+
+        $tdsdir/fonts/afm/*)
+            nn=`echo $f | sed -e "s|$tdsdir/||"`
+            afmfiles="$afmfiles $nn"
+            nn="usr/share/fonts/type1/$packname/`basename $nn`"
+            ;;
+
+        $tdsdir/doc/*)
+            nn=`echo $f | sed -e "s|$tdsdir/doc|usr/share/doc/texmf|"`
+            ;;
+
+        # don't include map files at TDS 1.0 location
+        $tdsdir/dvips/config/*.map)
+            continue
+            ;;
+
+        *)
+            nn=`echo $f | sed -e "s|$tdsdir|usr/share/texmf|"`
+            ;;
     esac
     mkdir -p `dirname "$tmproot/$nn"`
     cp -p $f `dirname "$tmproot/$nn"`
@@ -121,13 +157,19 @@
     done
     mkdir -p $tmproot/etc/X11/fonts/Type1
 
-    # generate fonts.scale using mkfontscale
-    # mkfontscale $tmproot/usr/share/fonts/type1/$packname
-    # generate fonts.scale using type1inst
-    (cd $tmproot/usr/share/fonts/type1/$packname; \
-        type1inst -quiet -nogs -nolog)
-    rm $tmproot/usr/share/fonts/type1/$packname/fonts.dir
-    chmod 644 $tmproot/usr/share/fonts/type1/$packname/fonts.scale 
+    if $type1inst; then
+        # generate fonts.scale using type1inst
+        echo "using type1inst"
+        (cd $tmproot/usr/share/fonts/type1/$packname; \
+            type1inst -quiet -nogs -nolog)
+        rm $tmproot/usr/share/fonts/type1/$packname/fonts.dir
+        chmod 644 $tmproot/usr/share/fonts/type1/$packname/fonts.scale 
+    else
+        # generate fonts.scale using mkfontscale
+        echo "using mkfontscale"
+        mkfontscale $tmproot/usr/share/fonts/type1/$packname
+    fi
+
     # move fonts.scale into place
     mv $tmproot/usr/share/fonts/type1/$packname/fonts.scale \
         $tmproot/etc/X11/fonts/Type1/$packname.scale