-F option for multiple fontfiles

SCCS-vsn: old/roff/common_source/n1.c 4.3
SCCS-vsn: old/roff/troff/t6.c 4.2

diff --git a/usr/src/old/roff/common_source/n1.c b/usr/src/old/roff/common_source/n1.c
index 6316184..90acf14 100644 (file)
--- a/usr/src/old/roff/common_source/n1.c
+++ b/usr/src/old/roff/common_source/n1.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)n1.c       4.2 %G%";
+static char sccsid[] = "@(#)n1.c       4.3 %G%";

 #endif lint
 
 #include "tdef.h"
 #endif lint
 
 #include "tdef.h"


@@ -252,6 +252,12 @@ char *local = "/usr/local/lib/tmac/tmac.\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
                        stop = ptid = gflag = 1;
                        dpn = 0;
                        continue;
                        stop = ptid = gflag = 1;
                        dpn = 0;
                        continue;

+               case 'F':
+                       {
+                         extern char *fontfile;
+                         fontfile = &argv[0][2];
+                       }
+                       continue;

 #endif
                default:
                        pto = cnum(&argv[0][1]);
 #endif
                default:
                        pto = cnum(&argv[0][1]);

diff --git a/usr/src/old/roff/troff/t6.c b/usr/src/old/roff/troff/t6.c
index 978701f..8b58b48 100644 (file)
--- a/usr/src/old/roff/troff/t6.c
+++ b/usr/src/old/roff/troff/t6.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)t6.c       4.1 %G%";
+static char sccsid[] = "@(#)t6.c       4.2 %G%";

 #endif lint
 
 #include "tdef.h"
 #endif lint
 
 #include "tdef.h"


@@ -52,8 +52,8 @@ extern int lss1;
 extern int vflag;
 extern int ch0;
 extern int lg;
 extern int vflag;
 extern int ch0;
 extern int lg;

-char fontfile[] = "/usr/lib/font/ftXX";
-int ffi = 16;
+char *fontfile = "/usr/lib/font/ftXX";
+int ffi = 0;

 extern int bd;
 extern int level;
 extern int ch;
 extern int bd;
 extern int level;
 extern int ch;


@@ -506,6 +506,9 @@ casefp(){
        register i, j, k;
        int x;
 
        register i, j, k;
        int x;
 

+       if (ffi == 0)
+               while (fontfile[ffi] != 'X')
+                       ffi++;

        skip();
        if(((i = (getch() & CMASK) - '0' -1) < 0) || (i >3)){prstr("fp: bad font position\n"); return;}
        if(skip() || !(j = getrq())){prstr("fp: no font name\n"); return;}
        skip();
        if(((i = (getch() & CMASK) - '0' -1) < 0) || (i >3)){prstr("fp: bad font position\n"); return;}
        if(skip() || !(j = getrq())){prstr("fp: no font name\n"); return;}