浏览代码

bgcolor=none should disable drawing of background (merge https://trac.osgeo.org/grass/changeset/40214 from devbr6); copy over more understandable test file from old d.text

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@40239 15284696-431f-4ddb-bdfa-cd5b030d7da7
Hamish Bowman 15 年之前
父节点
当前提交
32b50b329d
共有 2 个文件被更改,包括 45 次插入4 次删除
  1. 6 4
      display/d.text/main.c
  2. 39 0
      display/d.text/test.input

+ 6 - 4
display/d.text/main.c

@@ -312,12 +312,14 @@ int main(int argc, char **argv)
 	size = atof(opt.size->answer) / 100.0 * (win.b - win.t);
 	size = atof(opt.size->answer) / 100.0 * (win.b - win.t);
 #endif
 #endif
 
 
-    fg_color = D_parse_color(opt.fgcolor->answer, 1);
+    fg_color = D_parse_color(opt.fgcolor->answer, TRUE);
     if (opt.bgcolor->answer) {
     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
     } else
-       do_background = 0;
+	do_background = 0;
     set_color(opt.fgcolor->answer);
     set_color(opt.fgcolor->answer);
 
 
     orig_x = orig_y = 0;
     orig_x = orig_y = 0;

+ 39 - 0
display/d.text/test.input

@@ -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