[Brlcad-commits] CVS: brlcad/src/libbn vectfont.c,14.7,14.8

[John A. <joh...@us...>]

Update of /cvsroot/brlcad/brlcad/src/libbn
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7725

Modified Files:
	vectfont.c 
Log Message:
Added new symbols: plus/minus, degree, and centerline.
Corrected tp_setup() method (it was over-writing the symbols)


Index: vectfont.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/libbn/vectfont.c,v
retrieving revision 14.7
retrieving revision 14.8
diff -w -u -r14.7 -r14.8
--- vectfont.c	12 Aug 2005 22:28:35 -0000	14.7
+++ vectfont.c	7 Oct 2005 01:06:02 -0000	14.8
@@ -70,6 +70,8 @@
 #include "plot3.h"
 #include "vectfont.h"
 
+#define NUM_SYMBOLS	8
+
 TINY		*tp_cindex[256];	/* index to stroke tokens */
 
 /*
@@ -85,15 +87,15 @@
 	p = tp_ctable;		/* pointer to stroke list */
 
 	/* Store start addrs of each stroke list */
-	for( i=040-5; i<128; i++)  {
+	for( i=040-NUM_SYMBOLS; i<128; i++)  {
 		tp_cindex[i+128] = tp_cindex[i] = p;
 		while( (*p++) != LAST );
 	}
-	for( i=6; i<040; i++ )  {
-		tp_cindex[i+128] = tp_cindex[i] = tp_cindex['?'];
+	for( i=1; i<=NUM_SYMBOLS; i++ )  {
+		tp_cindex[i+128] = tp_cindex[i] = tp_cindex[040-NUM_SYMBOLS-1+i];
 	}
-	for( i=1; i<6; i++ )  {
-		tp_cindex[i+128] = tp_cindex[i] = tp_cindex[040-1+i];
+	for( i=NUM_SYMBOLS+1; i<040; i++ )  {
+		tp_cindex[i+128] = tp_cindex[i] = tp_cindex['?'];
 	}
 }
 
@@ -138,6 +140,41 @@
 	brt(0, 2),
 	LAST,
 
+/*	plus-minus	*/
+	drk(5, 7),
+	brt(5, 2),
+	drk(2, 2),
+	brt(8, 2),
+	drk(2, 5),
+	brt(8, 5),
+	LAST,
+
+/*	centerline symbol	*/
+	drk(8, 4),
+	brt(7, 6),
+	brt(4, 7),
+	brt(1, 6),
+	brt(0, 4),
+	brt(1, 2),
+	brt(4, 1),
+	brt(7, 2),
+	brt(8, 4),
+	drk(1, 1),
+	brt(7, 7),
+	LAST,
+
+/*	degree symbol	*/
+	drk(1, 9),
+	brt(2, 9),
+	brt(3, 8),
+	brt(3, 7),
+	brt(2, 6),
+	brt(1, 6),
+	brt(0, 7),
+	brt(0, 8),
+	brt(1, 9),
+	LAST,
+
 /*	table for ascii 040, ' '	*/
 	LAST,
 
@@ -165,6 +202,7 @@
 	brt(5, 10),
 	LAST,
 
+
 /*	table for #	*/
 	drk(1, 0),
 	brt(3, 9),