[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.5.2-20090328-195-gc394dc7)
The branch, master has been updated
via c394dc703ac479b4d095b65bdb67526ed6e7c1e0 (commit)
from 3191d47aa5f71847c876a35371a89cb38825e66b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
gschem/include/i_vars.h | 2 --
gschem/include/prototype.h | 2 --
gschem/lib/system-gschemrc.in | 24 ------------------------
gschem/src/g_rc.c | 36 ------------------------------------
gschem/src/g_register.c | 4 ----
gschem/src/i_vars.c | 4 ----
libgeda/include/libgeda/struct.h | 7 -------
libgeda/src/f_print.c | 33 ++++-----------------------------
libgeda/src/s_toplevel.c | 4 ----
9 files changed, 4 insertions(+), 112 deletions(-)
=================
Commit Messages
=================
commit c394dc703ac479b4d095b65bdb67526ed6e7c1e0
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
Always use PostScript fonts in PostScript output.
Removes the "output-text", "text-output" and "output-vector-threshold"
config functions.
:100644 100644 b256a7d... cd5829e... M gschem/include/i_vars.h
:100644 100644 6f079f7... 0a43389... M gschem/include/prototype.h
:100644 100644 89ef69d... 2a806b3... M gschem/lib/system-gschemrc.in
:100644 100644 0d7eb94... 068dcbf... M gschem/src/g_rc.c
:100644 100644 e46dc8a... c8aebe9... M gschem/src/g_register.c
:100644 100644 79f40ec... 71a3c76... M gschem/src/i_vars.c
:100644 100644 7a19f39... ba17787... M libgeda/include/libgeda/struct.h
:100644 100644 e601616... 381532f... M libgeda/src/f_print.c
:100644 100644 24f9e54... 8da3498... M libgeda/src/s_toplevel.c
=========
Changes
=========
commit c394dc703ac479b4d095b65bdb67526ed6e7c1e0
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
Always use PostScript fonts in PostScript output.
Removes the "output-text", "text-output" and "output-vector-threshold"
config functions.
diff --git a/gschem/include/i_vars.h b/gschem/include/i_vars.h
index b256a7d..cd5829e 100644
--- a/gschem/include/i_vars.h
+++ b/gschem/include/i_vars.h
@@ -24,7 +24,6 @@ extern int default_do_logging;
extern int default_logging_dest;
extern int default_embed_complex;
extern int default_include_complex;
-extern int default_text_output;
extern int default_snap_size;
extern int default_paper_width;
@@ -76,7 +75,6 @@ extern int default_dots_grid_dot_size;
extern int default_dots_grid_mode;
extern int default_dots_grid_fixed_threshold;
extern int default_mesh_grid_display_threshold;
-extern int default_print_vector_threshold;
extern int default_add_attribute_offset;
extern int default_auto_save_interval;
extern int default_drag_can_move;
diff --git a/gschem/include/prototype.h b/gschem/include/prototype.h
index 6f079f7..0a43389 100644
--- a/gschem/include/prototype.h
+++ b/gschem/include/prototype.h
@@ -223,7 +223,6 @@ SCM g_rc_attribute_name(SCM path);
SCM g_rc_scrollbars(SCM mode);
SCM g_rc_paper_size(SCM width, SCM height);
SCM g_rc_paper_sizes(SCM papername, SCM scm_width, SCM scm_height);
-SCM g_rc_output_text(SCM mode);
SCM g_rc_output_type(SCM mode);
SCM g_rc_output_orientation(SCM mode);
SCM g_rc_image_color(SCM mode);
@@ -265,7 +264,6 @@ SCM g_rc_dots_grid_dot_size(SCM dotsize);
SCM g_rc_dots_grid_mode(SCM mode);
SCM g_rc_dots_grid_fixed_threshold(SCM spacing);
SCM g_rc_mesh_grid_display_threshold(SCM spacing);
-SCM g_rc_output_vector_threshold(SCM numlines);
SCM g_rc_add_attribute_offset(SCM offset);
SCM g_rc_auto_save_interval(SCM seconds);
SCM g_rc_drag_can_move(SCM mode);
diff --git a/gschem/lib/system-gschemrc.in b/gschem/lib/system-gschemrc.in
index 89ef69d..2a806b3 100644
--- a/gschem/lib/system-gschemrc.in
+++ b/gschem/lib/system-gschemrc.in
@@ -602,18 +602,6 @@
;
(print-command "lpr")
-; output-text string
-;
-; Controls how text is rendered to postscript
-; vector - the displayed vector font is rendered to the postscript file
-; ps - an equivalent postscript font is rendered to the ps file
-; vector rendering is *exactly* as the display is shown
-; PostScript text is close, but looks nicer.
-; Also vector rendered text files are much much larger then ps files.
-;
-;(output-text "vector")
-(output-text "ps")
-
; postscript-font-scale real
;
; Sets a scaling factor for the text in the PostScript output. This
@@ -623,18 +611,6 @@
; The default value is 1.0.
(postscript-font-scale 1.0)
-; output-vector-threshold
-;
-; Controls the threshold (in text lines) where multi-line text objects
-; are outputted using the postscript font or the vector font. If the
-; number of lines exceeds the specified threshold, then the whole multi-line
-; text item is outputted using the vector font instead of the postscript
-; font. If you want to enable this feature, then set the value to a positive
-; integer greater than 0. This feature is disabled by default.
-;
-(output-vector-threshold -1)
-;(output-vector-threshold 3)
-
; output-type string
;
diff --git a/gschem/src/g_rc.c b/gschem/src/g_rc.c
index 0d7eb94..068dcbf 100644
--- a/gschem/src/g_rc.c
+++ b/gschem/src/g_rc.c
@@ -615,23 +615,6 @@ SCM g_rc_paper_sizes(SCM scm_papername, SCM scm_width, SCM scm_height)
* \brief
* \par Function Description
*
- */
-SCM g_rc_output_text(SCM mode)
-{
- static const vstbl_entry mode_table[] = {
- {VECTOR_FONTS , "vector" },
- {PS_FONTS , "ps" },
- };
-
- RETURN_G_RC_MODE("output-text",
- default_text_output,
- 2);
-}
-
-/*! \todo Finish function documentation!!!
- * \brief
- * \par Function Description
- *
* \todo this keyword needs a better name ...
*/
SCM g_rc_output_type(SCM mode)
@@ -1371,25 +1354,6 @@ SCM g_rc_mesh_grid_display_threshold (SCM spacing)
* \par Function Description
*
*/
-SCM g_rc_output_vector_threshold(SCM numlines)
-{
- int val;
-
- SCM_ASSERT (scm_is_integer (numlines), numlines,
- SCM_ARG1, "output-vector-threshold");
-
- val = scm_to_int (numlines);
-
- default_print_vector_threshold = val;
-
- return SCM_BOOL_T;
-}
-
-/*! \todo Finish function documentation!!!
- * \brief
- * \par Function Description
- *
- */
SCM g_rc_add_attribute_offset(SCM offset)
{
int val;
diff --git a/gschem/src/g_register.c b/gschem/src/g_register.c
index e46dc8a..c8aebe9 100644
--- a/gschem/src/g_register.c
+++ b/gschem/src/g_register.c
@@ -83,9 +83,6 @@ static struct gsubr_t gschem_funcs[] = {
{ "paper-sizes", 3, 0, 0, g_rc_paper_sizes },
{ "postscript-font-scale", 1, 0, 0, g_rc_postscript_font_scale },
- /* text-output is old... will eventually be removed! */
- { "text-output", 1, 0, 0, g_rc_output_text },
- { "output-text", 1, 0, 0, g_rc_output_text },
{ "output-type", 1, 0, 0, g_rc_output_type },
{ "output-orientation", 1, 0, 0, g_rc_output_orientation },
{ "output-color", 1, 0, 0, g_rc_output_color },
@@ -130,7 +127,6 @@ static struct gsubr_t gschem_funcs[] = {
{ "dots-grid-mode", 1, 0, 0, g_rc_dots_grid_mode },
{ "dots-grid-fixed-threshold", 1, 0, 0, g_rc_dots_grid_fixed_threshold },
{ "mesh-grid-display-threshold", 1, 0, 0, g_rc_mesh_grid_display_threshold },
- { "output-vector-threshold", 1, 0, 0, g_rc_output_vector_threshold },
{ "add-attribute-offset", 1, 0, 0, g_rc_add_attribute_offset },
{ "mousepan-gain", 1, 0, 0, g_rc_mousepan_gain },
{ "keyboardpan-gain", 1, 0, 0, g_rc_keyboardpan_gain },
diff --git a/gschem/src/i_vars.c b/gschem/src/i_vars.c
index 79f40ec..71a3c76 100644
--- a/gschem/src/i_vars.c
+++ b/gschem/src/i_vars.c
@@ -62,7 +62,6 @@ int default_do_logging = TRUE;
int default_logging_dest = LOG_WINDOW;
int default_embed_complex = FALSE;
int default_include_complex = FALSE;
-int default_text_output = VECTOR_FONTS;
int default_snap_size = 100;
int default_paper_width = 11000; /* letter size */
@@ -115,7 +114,6 @@ int default_dots_grid_dot_size = 1;
int default_dots_grid_mode = DOTS_GRID_VARIABLE_MODE;
int default_dots_grid_fixed_threshold = 10;
int default_mesh_grid_display_threshold = 3;
-int default_print_vector_threshold = 3;
int default_add_attribute_offset = 50;
int default_auto_save_interval = 120;
@@ -183,7 +181,6 @@ void i_vars_set(GSCHEM_TOPLEVEL *w_current)
toplevel->object_clipping = default_object_clipping;
w_current->embed_complex = default_embed_complex;
w_current->include_complex = default_include_complex;
- toplevel->text_output = default_text_output;
toplevel->snap_size = default_snap_size;
w_current->log_window = default_log_window;
w_current->log_window_type = default_log_window_type;
@@ -239,7 +236,6 @@ void i_vars_set(GSCHEM_TOPLEVEL *w_current)
w_current->dots_grid_fixed_threshold = default_dots_grid_fixed_threshold;
w_current->mesh_grid_display_threshold = default_mesh_grid_display_threshold;
- toplevel->print_vector_threshold = default_print_vector_threshold;
w_current->add_attribute_offset = default_add_attribute_offset;
w_current->drag_can_move = default_drag_can_move;
diff --git a/libgeda/include/libgeda/struct.h b/libgeda/include/libgeda/struct.h
index 7a19f39..ba17787 100644
--- a/libgeda/include/libgeda/struct.h
+++ b/libgeda/include/libgeda/struct.h
@@ -498,9 +498,6 @@ struct st_toplevel {
/* controls whether objects are clipped */
int object_clipping;
- /* controls how text is printed (vector / PS font) */
- int text_output;
-
/* either landscape or portrait */
int print_orientation;
@@ -552,10 +549,6 @@ struct st_toplevel {
/* controls if the whole bounding box is used in the auto whichend code */
int force_boundingbox;
- /* controls the threshold (in lines of text) when the multi-line text */
- /* output font is forced to vector */
- int print_vector_threshold;
-
/* List of attributes to always promote */
GList *always_promote_attributes;
diff --git a/libgeda/src/f_print.c b/libgeda/src/f_print.c
index e601616..381532f 100644
--- a/libgeda/src/f_print.c
+++ b/libgeda/src/f_print.c
@@ -299,37 +299,12 @@ void f_print_objects (TOPLEVEL *toplevel, FILE *fp, const GList *obj_list,
case(OBJ_TEXT):
if (o_current->visibility == VISIBLE) {
- int vectors = 0;
-
- /* Look at flags and determine if vector text should
- * be used for output.
- */
- if(toplevel->text_output == VECTOR_FONTS) {
- vectors = 1;
- } else if (toplevel->print_vector_threshold > 0 &&
- o_text_num_lines (o_current->text->string) >
- toplevel->print_vector_threshold) {
- vectors = 1;
- }
-
+ /* Output text */
save_last_ps_color = toplevel->last_ps_color;
fprintf(fp, "gsave\n");
-
- if (vectors)
- {
- /* Output vectors */
- f_print_objects(toplevel,
- fp,
- o_current->text->
- prim_objs,
- origin_x, origin_y,
- scale, unicode_count, unicode_table);
- } else {
- /* Output text */
- o_text_print(toplevel, fp,
- o_current,
- origin_x, origin_y, unicode_count, unicode_table);
- }
+ o_text_print(toplevel, fp,
+ o_current,
+ origin_x, origin_y, unicode_count, unicode_table);
fprintf(fp, "grestore\n");
toplevel->last_ps_color = save_last_ps_color;
diff --git a/libgeda/src/s_toplevel.c b/libgeda/src/s_toplevel.c
index 24f9e54..8da3498 100644
--- a/libgeda/src/s_toplevel.c
+++ b/libgeda/src/s_toplevel.c
@@ -87,8 +87,6 @@ TOPLEVEL *s_toplevel_new (void)
toplevel->object_clipping = 0;
- toplevel->text_output = 0;
-
toplevel->print_orientation = 0;
toplevel->image_color = FALSE;
@@ -123,8 +121,6 @@ TOPLEVEL *s_toplevel_new (void)
toplevel->force_boundingbox = FALSE;
- toplevel->print_vector_threshold = 3;
-
toplevel->always_promote_attributes = NULL;
toplevel->net_naming_priority = 0;
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs