[GRASS-SVN] r55167 - grass/branches/develbranch_6/ps/ps.map
svn_grass at osgeo.org
svn_grass at osgeo.org
Fri Feb 22 03:02:37 PST 2013
Author: hamish
Date: 2013-02-22 03:02:37 -0800 (Fri, 22 Feb 2013)
New Revision: 55167
Modified:
grass/branches/develbranch_6/ps/ps.map/box.c
grass/branches/develbranch_6/ps/ps.map/do_grid.c
grass/branches/develbranch_6/ps/ps.map/do_header.c
grass/branches/develbranch_6/ps/ps.map/getgrid.c
grass/branches/develbranch_6/ps/ps.map/main.c
grass/branches/develbranch_6/ps/ps.map/map_setup.c
grass/branches/develbranch_6/ps/ps.map/ps_outline.c
grass/branches/develbranch_6/ps/ps.map/r_header.c
Log:
stray whitespace, i18n
Modified: grass/branches/develbranch_6/ps/ps.map/box.c
===================================================================
--- grass/branches/develbranch_6/ps/ps.map/box.c 2013-02-22 10:35:07 UTC (rev 55166)
+++ grass/branches/develbranch_6/ps/ps.map/box.c 2013-02-22 11:02:37 UTC (rev 55167)
@@ -16,7 +16,7 @@
{
box_path(t, b, l, r);
fprintf(PS.fp, "clip newpath\n");
-
+
return 0;
}
Modified: grass/branches/develbranch_6/ps/ps.map/do_grid.c
===================================================================
--- grass/branches/develbranch_6/ps/ps.map/do_grid.c 2013-02-22 10:35:07 UTC (rev 55166)
+++ grass/branches/develbranch_6/ps/ps.map/do_grid.c 2013-02-22 11:02:37 UTC (rev 55167)
@@ -6,7 +6,6 @@
*/
#include <string.h>
#include <math.h>
-
#include "local_proto.h"
#define LEFT 0
Modified: grass/branches/develbranch_6/ps/ps.map/do_header.c
===================================================================
--- grass/branches/develbranch_6/ps/ps.map/do_header.c 2013-02-22 10:35:07 UTC (rev 55166)
+++ grass/branches/develbranch_6/ps/ps.map/do_header.c 2013-02-22 11:02:37 UTC (rev 55167)
@@ -6,7 +6,6 @@
#include <unistd.h>
#include <string.h>
#include "header.h"
-
#include "local_proto.h"
static double x, y, dy, fontsize;
Modified: grass/branches/develbranch_6/ps/ps.map/getgrid.c
===================================================================
--- grass/branches/develbranch_6/ps/ps.map/getgrid.c 2013-02-22 10:35:07 UTC (rev 55166)
+++ grass/branches/develbranch_6/ps/ps.map/getgrid.c 2013-02-22 11:02:37 UTC (rev 55167)
@@ -59,7 +59,7 @@
/* unset_color(&color); */
error(key, data, _("Unsupported color request"));
else
- error(key, data, _("illegal color request"));
+ error(key, data, _("illegal color request"));
continue;
}
@@ -169,7 +169,7 @@
/* unset_color(&color); */
error(key, data, _("Unsupported color request"));
else
- error(key, data, _("illegal color request"));
+ error(key, data, _("illegal color request"));
continue;
}
Modified: grass/branches/develbranch_6/ps/ps.map/main.c
===================================================================
--- grass/branches/develbranch_6/ps/ps.map/main.c 2013-02-22 10:35:07 UTC (rev 55166)
+++ grass/branches/develbranch_6/ps/ps.map/main.c 2013-02-22 11:02:37 UTC (rev 55167)
@@ -2,7 +2,7 @@
/****************************************************************************
*
* MODULE: ps.map
- * AUTHOR(S): Paul W. Carlson 1992 (original contributor)
+ * AUTHOR(S): Paul W. Carlson 1992 (original contributor)
* Radim Blazek <radim.blazek gmail.com>
* Bob Covill <bcovill tekmap.ns.ca>
* Huidae Cho <grass4u gmail.com>
@@ -99,18 +99,18 @@
bflag->description =
_("Describe map-box's position on the page and exit (inches from top-left of paper)");
bflag->guisection = _("Utility");
-
+
input_file = G_define_standard_option(G_OPT_F_INPUT);
input_file->label = _("File containing mapping instructions");
input_file->description = _("Use '-' to enter instructions from keyboard)");
input_file->required = NO;
input_file->guisection = _("Required");
-
+
output_file = G_define_standard_option(G_OPT_F_OUTPUT);
output_file->description = _("Name for PostScript output file");
output_file->required = NO;
output_file->guisection = _("Required");
-
+
map_scale = G_define_option();
map_scale->key = "scale";
map_scale->key_desc = "mapscale";
@@ -126,12 +126,12 @@
copies->description = _("Number of copies to print");
copies->required = NO;
copies->guisection = _("Output settings");
-
+
if (!isatty(0))
G_disable_interactive();
if (G_parser(argc, argv))
usage(0);
-
+
/* PS.map_* variables are set to 0 (not defined) and then may be
* reset by 'maploc'. When script is read, main() should call
* reset_map_location() to reset map size to fit to paper */
@@ -211,9 +211,9 @@
if (check_scale(map_scale->answer))
G_strcpy(PS.scaletext, map_scale->answer);
else
- error(map_scale->answer, "", "illegal scale request");
+ error(map_scale->answer, "", _("illegal scale request"));
}
-
+
if (copies->answer) {
if (sscanf(copies->answer, "%d", &ps_copies) != 1) {
ps_copies = 1;
@@ -236,6 +236,7 @@
else
PS.fp = NULL;
+
/* get current mapset */
PS.cell_mapset = G_mapset();
@@ -243,12 +244,12 @@
G_get_set_window(&PS.w);
if (G_set_window(&PS.w) == -1)
G_fatal_error(_("Current region cannot be set."));
-
+
read_instructions(copies_set, can_reset_scale);
/* reset map location base on 'paper' on 'location' */
reset_map_location();
-
+
if (bflag->answer) {
map_setup();
fprintf(stdout, "bbox=%.3f,%.3f,%.3f,%.3f\n", PS.map_left / 72.0,
Modified: grass/branches/develbranch_6/ps/ps.map/map_setup.c
===================================================================
--- grass/branches/develbranch_6/ps/ps.map/map_setup.c 2013-02-22 10:35:07 UTC (rev 55166)
+++ grass/branches/develbranch_6/ps/ps.map/map_setup.c 2013-02-22 11:02:37 UTC (rev 55167)
@@ -110,7 +110,7 @@
/* save original graphics state */
fprintf(PS.fp, "gsave ");
-
+
/* compute conversion factor from meters to PostScript window coordinates */
/*
G_begin_distance_calculations();
Modified: grass/branches/develbranch_6/ps/ps.map/ps_outline.c
===================================================================
--- grass/branches/develbranch_6/ps/ps.map/ps_outline.c 2013-02-22 10:35:07 UTC (rev 55166)
+++ grass/branches/develbranch_6/ps/ps.map/ps_outline.c 2013-02-22 11:02:37 UTC (rev 55167)
@@ -84,7 +84,7 @@
/* unset_color(&color); */
error(key, data, _("Unsupported color request"));
else
- error(key, data, _("illegal color request"));
+ error(key, data, _("illegal color request"));
continue;
}
@@ -104,6 +104,7 @@
error(key, data, _("illegal outline sub-request"));
}
+
PS.outline_color = color;
PS.do_outline = 1;
Modified: grass/branches/develbranch_6/ps/ps.map/r_header.c
===================================================================
--- grass/branches/develbranch_6/ps/ps.map/r_header.c 2013-02-22 10:35:07 UTC (rev 55166)
+++ grass/branches/develbranch_6/ps/ps.map/r_header.c 2013-02-22 11:02:37 UTC (rev 55167)
@@ -57,13 +57,13 @@
if (KEY("color")) {
ret = G_str_to_color(data, &r, &g, &b);
- if (ret == 1)
- set_color(&color, r, g, b);
- else if (ret == 2) /* i.e. "none" */
- /* unset_color(&color); */
- error(key, data, _("Unsupported color request"));
- else
- error(key, data, _("illegal color request"));
+ if (ret == 1)
+ set_color(&color, r, g, b);
+ else if (ret == 2) /* i.e. "none" */
+ /* unset_color(&color); */
+ error(key, data, _("Unsupported color request"));
+ else
+ error(key, data, _("illegal color request"));
continue;
}
More information about the grass-commit
mailing list