[GRASS-SVN] r40239 - grass/trunk/display/d.text

[svn_grass at osgeo.org]

Author: hamish
Date: 2010-01-05 04:13:56 -0500 (Tue, 05 Jan 2010)
New Revision: 40239

Added:
   grass/trunk/display/d.text/test.input
Modified:
   grass/trunk/display/d.text/main.c
Log:
bgcolor=none should disable drawing of background (merge r40214 from devbr6); copy over more understandable test file from old d.text

Modified: grass/trunk/display/d.text/main.c
===================================================================
--- grass/trunk/display/d.text/main.c	2010-01-05 09:07:23 UTC (rev 40238)
+++ grass/trunk/display/d.text/main.c	2010-01-05 09:13:56 UTC (rev 40239)
@@ -312,12 +312,14 @@
 	size = atof(opt.size->answer) / 100.0 * (win.b - win.t);
 #endif
 
-    fg_color = D_parse_color(opt.fgcolor->answer, 1);
+    fg_color = D_parse_color(opt.fgcolor->answer, TRUE);
     if (opt.bgcolor->answer) {
-       do_background = 1;
-       bg_color = D_parse_color(opt.bgcolor->answer, 1);
+	do_background = 1;
+	bg_color = D_parse_color(opt.bgcolor->answer, TRUE);
+	if (bg_color == 0) /* ie color="none" */
+	    do_background = 0;
     } else
-       do_background = 0;
+	do_background = 0;
     set_color(opt.fgcolor->answer);
 
     orig_x = orig_y = 0;

Copied: grass/trunk/display/d.text/test.input (from rev 40238, grass/branches/develbranch_6/display/d.text/test.input)
===================================================================
--- grass/trunk/display/d.text/test.input	                        (rev 0)
+++ grass/trunk/display/d.text/test.input	2010-01-05 09:13:56 UTC (rev 40239)
@@ -0,0 +1,39 @@
+.S 5
+.F cyrilc
+cyrilc    AaBbCcDdEeFfGgHhIiJj
+.F gothgbt
+gothgbt   AaBbCcDdEeFfGgHhIiJj
+.F gothgrt
+gothgrt   AaBbCcDdEeFfGgHhIiJj
+.F gothitt
+gothitt   AaBbCcDdEeFfGgHhIiJj
+.F greekc
+greekc    AaBbCcDdEeFfGgHhIiJj
+.F greekcs
+greekcs   AaBbCcDdEeFfGgHhIiJj
+.F greekp
+greekp    AaBbCcDdEeFfGgHhIiJj
+.F greeks
+greeks    AaBbCcDdEeFfGgHhIiJj
+.F italicc
+italicc   AaBbCcDdEeFfGgHhIiJj
+.F italiccs
+italiccs  AaBbCcDdEeFfGgHhIiJj
+.F italict
+italict   AaBbCcDdEeFfGgHhIiJj
+.F romanc
+romanc    AaBbCcDdEeFfGgHhIiJj
+.F romancs
+romancs   AaBbCcDdEeFfGgHhIiJj
+.F romand
+romand    AaBbCcDdEeFfGgHhIiJj
+.F romanp
+romanp    AaBbCcDdEeFfGgHhIiJj
+.F romans
+romans    AaBbCcDdEeFfGgHhIiJj
+.F romant
+romant    AaBbCcDdEeFfGgHhIiJj
+.F scriptc
+scriptc   AaBbCcDdEeFfGgHhIiJj
+.F scripts
+scripts   AaBbCcDdEeFfGgHhIiJj