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

[Ralf Stubner]

Author: stubner-guest
Date: 2006-06-19 19:14:07 +0000 (Mon, 19 Jun 2006)
New Revision: 1445

Modified:
   make-texfontpkg/trunk/scripts/mk-tex-fontpack
Log:
implemented '--tex-only' option. Some fonts should not be registered with X11 ...


Modified: make-texfontpkg/trunk/scripts/mk-tex-fontpack
===================================================================
--- make-texfontpkg/trunk/scripts/mk-tex-fontpack	2006-06-19 16:21:30 UTC (rev 1444)
+++ make-texfontpkg/trunk/scripts/mk-tex-fontpack	2006-06-19 19:14:07 UTC (rev 1445)
@@ -28,6 +28,7 @@
 # initial values
 revision=1
 type1inst=false
+texonly=false
 
 # output usage information
 usage() {
@@ -36,7 +37,8 @@
 
 Valid options:
  -r|--revision <n>  specify revision number <n>
- -t|--type1inst     use type1inst instead of mkfontscale
+ -t|--tex-only      don't register fonts with X11/defoma
+    --type1inst     use type1inst instead of mkfontscale
  -h|--help          this message
 
 EOF
@@ -53,7 +55,10 @@
           revision=$2 
           shift
           ;;
-      --type1inst|-t)
+      --tex-only|-t)
+          texonly=true
+          ;;
+      --type1inst)
           type1inst=true
           ;;
       -*)
@@ -100,13 +105,21 @@
         $tdsdir/fonts/type1/*)
             nn=$(echo $f | sed -e "s|$tdsdir/||")
             fontfiles="$fontfiles $nn"
-            nn="usr/share/fonts/type1/$packname/$(basename $nn)"
+            if $texonly; then
+                nn="usr/share/$nn"
+            else
+                nn="usr/share/fonts/type1/$packname/$(basename $nn)"
+            fi
             ;;
 
         $tdsdir/fonts/afm/*)
             nn=$(echo $f | sed -e "s|$tdsdir/||")
             afmfiles="$afmfiles $nn"
-            nn="usr/share/fonts/type1/$packname/$(basename $nn)"
+            if $texonly; then
+                nn="usr/share/$nn"
+            else
+                nn="usr/share/fonts/type1/$packname/$(basename $nn)"
+            fi
             ;;
 
         $tdsdir/doc/*)
@@ -114,10 +127,15 @@
             ;;
 
         # don't include map files at TDS 1.0 location
-        $tdsdir/dvips/config/*.map)
+        $tdsdir/dvips/*.map)
             continue
             ;;
 
+        # don't include enc files at TDS 1.0 location
+        $tdsdir/dvips/*.enc)
+            continue
+            ;;
+
         *)
             nn=$(echo $f | sed -e "s|$tdsdir|usr/share/texmf|")
             ;;
@@ -136,7 +154,12 @@
     exit 0
 fi
 
-if [ "$fontfiles" ] ; then
+if [ ! "$fontfiles" ] ; then
+    echo "No font files found. Exiting ..."
+    exit 0
+elif $texonly; then
+    echo "Do not register fonts with X11 and defoma."
+else
     # create links for TeX and X11
     for texmffile in $fontfiles $afmfiles ; do
         f=$(basename $texmffile)
@@ -149,14 +172,14 @@
 
     if $type1inst; then
         # generate fonts.scale using type1inst
-        echo "using type1inst"
+        echo "Register fonts with X11 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"
+        echo "Register fonts with X11 using mkfontscale."
         mkfontscale $tmproot/usr/share/fonts/type1/$packname
     fi
 
@@ -164,14 +187,14 @@
     mv $tmproot/usr/share/fonts/type1/$packname/fonts.scale \
         $tmproot/etc/X11/fonts/Type1/$packname.scale
 
+    # this should be done by dh_installdefoma ...
+    echo "misc:Depends=defoma (>= 0.7.0)" \
+        > $tmpdir/debian/$packname.substvars
     # create defoma-hints file
     mkdir -p $tmproot/etc/defoma/hints/
     defoma-hints --no-question type1 \
         $tmproot/usr/share/fonts/type1/$packname/*.pf[ab] | \
         sed -e "s|$tmproot||" > $tmpdir/debian/$packname.defoma-hints
-else
-    echo "No font files found. Exiting ..."
-    exit 0
 fi
 
 # create essential debian/* files
@@ -204,7 +227,7 @@
 
 Package: $packname
 Architecture: all
-Depends: defoma (>= 0.7.0), \${misc:Depends}
+Depends: \${misc:Depends}
 Description: Font Pack $2
  This package provides the fonts from font pack $2.
 EOF