[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.5.0-20080706-203-g2b36577)
The branch, master has been updated
via 2b36577f5634ff99e919773c4e34aa2e39dbce51 (commit)
from fa9ee5f3a5776cda1df419457864c0e51d8585b4 (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/tests/alignment.sch | 164 ++++++++++++++++++++++++--------------------
libgeda/src/o_text_basic.c | 10 +++-
2 files changed, 99 insertions(+), 75 deletions(-)
=================
Commit Messages
=================
commit 2b36577f5634ff99e919773c4e34aa2e39dbce51
Author: Ales Hvezda <ahvezda@xxxxxxxx>
Date: Sun Sep 28 14:09:50 2008 -0400
Added code to do something more sane when trying to print tabs
Previously if a tab character was encountered in a text string, the
postscript output code would output a Y with a dot on top. This is
clearly not a tab character. The patch adds explict handling of the tab
character to output 8 spaces instead. Not perfect, but better behavior
than before.
:100644 100644 6ac5133... 71419bc... M gschem/tests/alignment.sch
:100644 100644 7cf332a... 406e6fd... M libgeda/src/o_text_basic.c
=========
Changes
=========
commit 2b36577f5634ff99e919773c4e34aa2e39dbce51
Author: Ales Hvezda <ahvezda@xxxxxxxx>
Date: Sun Sep 28 14:09:50 2008 -0400
Added code to do something more sane when trying to print tabs
Previously if a tab character was encountered in a text string, the
postscript output code would output a Y with a dot on top. This is
clearly not a tab character. The patch adds explict handling of the tab
character to output 8 spaces instead. Not perfect, but better behavior
than before.
diff --git a/gschem/tests/alignment.sch b/gschem/tests/alignment.sch
index 6ac5133..71419bc 100644
--- a/gschem/tests/alignment.sch
+++ b/gschem/tests/alignment.sch
@@ -1,20 +1,20 @@
-v 20030921
-T 28600 57000 9 10 1 0 0 0
+v 20080706 1
+T 28600 57000 9 10 1 0 0 0 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 28600 56700 9 10 1 0 0 1
+T 28600 56700 9 10 1 0 0 1 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
L 28600 56700 28400 56700 2 0 0 0 -1 -1
L 28600 57000 28400 57000 2 0 0 0 -1 -1
-T 28600 56400 9 10 1 0 0 2
+T 28600 56400 9 10 1 0 0 2 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
L 28600 56400 28400 56400 2 0 0 0 -1 -1
-T 30700 55800 9 10 1 0 0 3
+T 30700 55800 9 10 1 0 0 3 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
L 30700 55800 30700 55600 2 0 0 0 -1 -1
-T 30700 55500 9 10 1 0 0 4
+T 30700 55500 9 10 1 0 0 4 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
L 30700 55500 30700 55300 2 0 0 0 -1 -1
-T 30700 55200 9 10 1 0 0 5
+T 30700 55200 9 10 1 0 0 5 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
L 30700 55200 30700 54900 2 0 0 0 -1 -1
L 30800 55300 30600 55300 2 0 0 0 -1 -1
@@ -23,17 +23,17 @@ L 30800 54900 30600 54900 2 0 0 0 -1 -1
L 28400 56500 28400 56300 2 0 0 0 -1 -1
L 28400 56800 28400 56600 2 0 0 0 -1 -1
L 28400 57100 28400 56900 2 0 0 0 -1 -1
-T 32700 54500 9 10 1 0 0 6
+T 32700 54500 9 10 1 0 0 6 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
L 32700 54500 32900 54500 2 0 0 0 -1 -1
L 32900 54400 32900 54600 2 0 0 0 -1 -1
-T 32700 54200 9 10 1 0 0 7
+T 32700 54200 9 10 1 0 0 7 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
L 32700 54200 32900 54200 2 0 0 0 -1 -1
L 32900 54300 32900 54100 2 0 0 0 -1 -1
B 28300 56100 4400 1200 15 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
B 28600 54800 4200 1200 15 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
-T 32700 53900 9 10 1 0 0 8
+T 32700 53900 9 10 1 0 0 8 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
L 32700 53900 32900 53900 2 0 0 0 -1 -1
L 32900 53800 32900 54000 2 0 0 0 -1 -1
@@ -59,23 +59,23 @@ B 34800 54000 1200 4200 15 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
L 36900 58100 36900 58300 2 0 0 0 -1 -1
L 37000 58300 36800 58300 2 0 0 0 -1 -1
B 36100 54000 1100 4400 15 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
-T 33800 54000 9 10 1 0 90 0
+T 33800 54000 9 10 1 0 90 0 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 34100 54000 9 10 1 0 90 1
+T 34100 54000 9 10 1 0 90 1 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 34400 54000 9 10 1 0 90 2
+T 34400 54000 9 10 1 0 90 2 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 35000 56100 9 10 1 0 90 3
+T 35000 56100 9 10 1 0 90 3 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 35300 56100 9 10 1 0 90 4
+T 35300 56100 9 10 1 0 90 4 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 35600 56100 9 10 1 0 90 5
+T 35600 56100 9 10 1 0 90 5 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 36300 58100 9 10 1 0 90 6
+T 36300 58100 9 10 1 0 90 6 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 36600 58100 9 10 1 0 90 7
+T 36600 58100 9 10 1 0 90 7 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 36900 58100 9 10 1 0 90 8
+T 36900 58100 9 10 1 0 90 8 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
L 32400 58300 32600 58300 2 0 0 0 -1 -1
L 32400 58000 32600 58000 2 0 0 0 -1 -1
@@ -98,23 +98,23 @@ B 28200 59000 4200 1200 15 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
L 28300 61100 28100 61100 2 0 0 0 -1 -1
L 28100 61200 28100 61000 2 0 0 0 -1 -1
B 28000 60300 4400 1100 15 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
-T 32400 58000 9 10 1 0 180 0
+T 32400 58000 9 10 1 0 180 0 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 32400 58300 9 10 1 0 180 1
+T 32400 58300 9 10 1 0 180 1 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 32400 58600 9 10 1 0 180 2
+T 32400 58600 9 10 1 0 180 2 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 30300 59200 9 10 1 0 180 3
+T 30300 59200 9 10 1 0 180 3 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 30300 59500 9 10 1 0 180 4
+T 30300 59500 9 10 1 0 180 4 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 30300 59800 9 10 1 0 180 5
+T 30300 59800 9 10 1 0 180 5 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 28300 60500 9 10 1 0 180 6
+T 28300 60500 9 10 1 0 180 6 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 28300 60800 9 10 1 0 180 7
+T 28300 60800 9 10 1 0 180 7 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 28300 61100 9 10 1 0 180 8
+T 28300 61100 9 10 1 0 180 8 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
L 27200 57800 27200 58000 2 0 0 0 -1 -1
L 27500 57800 27500 58000 2 0 0 0 -1 -1
@@ -137,23 +137,23 @@ B 25300 53600 1200 4200 15 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
L 24400 53700 24400 53500 2 0 0 0 -1 -1
L 24300 53500 24500 53500 2 0 0 0 -1 -1
B 24100 53400 1100 4400 15 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
-T 27500 57800 9 10 1 0 270 0
+T 27500 57800 9 10 1 0 270 0 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 27200 57800 9 10 1 0 270 1
+T 27200 57800 9 10 1 0 270 1 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 26900 57800 9 10 1 0 270 2
+T 26900 57800 9 10 1 0 270 2 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 26300 55700 9 10 1 0 270 3
+T 26300 55700 9 10 1 0 270 3 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 26000 55700 9 10 1 0 270 4
+T 26000 55700 9 10 1 0 270 4 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 25700 55700 9 10 1 0 270 5
+T 25700 55700 9 10 1 0 270 5 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 25000 53700 9 10 1 0 270 6
+T 25000 53700 9 10 1 0 270 6 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 24700 53700 9 10 1 0 270 7
+T 24700 53700 9 10 1 0 270 7 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 24400 53700 9 10 1 0 270 8
+T 24400 53700 9 10 1 0 270 8 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
L 33000 66200 33200 66200 2 0 0 0 -1 -1
L 33000 66500 33200 66500 2 0 0 0 -1 -1
@@ -239,77 +239,93 @@ B 35100 63100 1200 4200 15 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
L 37200 63200 37200 63000 2 0 0 0 -1 -1
L 37300 63000 37100 63000 2 0 0 0 -1 -1
B 36400 62900 1100 4400 15 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
-T 33000 66500 9 10 1 0 0 6
+T 33000 66500 9 10 1 0 0 6 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 33000 66200 9 10 1 0 0 7
+T 33000 66200 9 10 1 0 0 7 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 33000 65900 9 10 1 0 0 8
+T 33000 65900 9 10 1 0 0 8 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 30900 65300 9 10 1 0 0 3
+T 30900 65300 9 10 1 0 0 3 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 30900 65000 9 10 1 0 0 4
+T 30900 65000 9 10 1 0 0 4 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 30900 64700 9 10 1 0 0 5
+T 30900 64700 9 10 1 0 0 5 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 28900 64000 9 10 1 0 0 0
+T 28900 64000 9 10 1 0 0 0 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 28900 63700 9 10 1 0 0 1
+T 28900 63700 9 10 1 0 0 1 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 28900 63400 9 10 1 0 0 2
+T 28900 63400 9 10 1 0 0 2 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 27800 63500 9 10 1 0 90 2
+T 27800 63500 9 10 1 0 90 2 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 27500 63500 9 10 1 0 90 1
+T 27500 63500 9 10 1 0 90 1 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 27200 63500 9 10 1 0 90 0
+T 27200 63500 9 10 1 0 90 0 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 26600 65600 9 10 1 0 90 5
+T 26600 65600 9 10 1 0 90 5 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 26300 65600 9 10 1 0 90 4
+T 26300 65600 9 10 1 0 90 4 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 26000 65600 9 10 1 0 90 3
+T 26000 65600 9 10 1 0 90 3 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 25300 67600 9 10 1 0 90 8
+T 25300 67600 9 10 1 0 90 8 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 25000 67600 9 10 1 0 90 7
+T 25000 67600 9 10 1 0 90 7 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 24700 67600 9 10 1 0 90 6
+T 24700 67600 9 10 1 0 90 6 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 29200 67500 9 10 1 0 180 6
+T 29200 67500 9 10 1 0 180 6 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 29200 67800 9 10 1 0 180 7
+T 29200 67800 9 10 1 0 180 7 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 29200 68100 9 10 1 0 180 8
+T 29200 68100 9 10 1 0 180 8 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 31300 68700 9 10 1 0 180 3
+T 31300 68700 9 10 1 0 180 3 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 31300 69000 9 10 1 0 180 4
+T 31300 69000 9 10 1 0 180 4 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 31300 69300 9 10 1 0 180 5
+T 31300 69300 9 10 1 0 180 5 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 33300 70000 9 10 1 0 180 0
+T 33300 70000 9 10 1 0 180 0 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 33300 70300 9 10 1 0 180 1
+T 33300 70300 9 10 1 0 180 1 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 33300 70600 9 10 1 0 180 2
+T 33300 70600 9 10 1 0 180 2 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 34100 67300 9 10 1 0 270 2
+T 34100 67300 9 10 1 0 270 2 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 34400 67300 9 10 1 0 270 1
+T 34400 67300 9 10 1 0 270 1 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 34700 67300 9 10 1 0 270 0
+T 34700 67300 9 10 1 0 270 0 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 35300 65200 9 10 1 0 270 5
+T 35300 65200 9 10 1 0 270 5 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 35600 65200 9 10 1 0 270 4
+T 35600 65200 9 10 1 0 270 4 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 35900 65200 9 10 1 0 270 3
+T 35900 65200 9 10 1 0 270 3 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 36600 63200 9 10 1 0 270 8
+T 36600 63200 9 10 1 0 270 8 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 36900 63200 9 10 1 0 270 7
+T 36900 63200 9 10 1 0 270 7 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 37200 63200 9 10 1 0 270 6
+T 37200 63200 9 10 1 0 270 6 1
This is some text. ABC abc 1 2 3 4 5 6 7 8 9 0
-T 27000 68800 9 10 1 0 0 0
+T 27000 68800 9 10 1 0 0 0 1
Mirrored
+T 21800 59100 9 10 1 0 0 0 1
+text with a tab
+T 21600 59400 9 10 1 0 90 0 1
+text with a tab
+T 21300 59200 9 10 1 0 180 0 1
+text with a tab
+T 21500 58900 9 10 1 0 270 0 1
+text with a tab
+T 21100 68500 9 10 1 0 0 6 1
+text with a tab
+T 21600 68600 9 10 1 0 180 6 1
+text with a tab
+T 21300 68800 9 10 1 0 90 2 1
+text with a tab
+T 21400 68300 9 10 1 0 270 2 1
+text with a tab
diff --git a/libgeda/src/o_text_basic.c b/libgeda/src/o_text_basic.c
index 7cf332a..406e6fd 100644
--- a/libgeda/src/o_text_basic.c
+++ b/libgeda/src/o_text_basic.c
@@ -1529,7 +1529,15 @@ void o_text_print_text_string(FILE *fp, char *string, int unicode_count,
}
}
}
- fprintf(fp, "%c", current_char);
+
+
+ if (current_char == '\t') {
+ /* Output eight spaces instead of the tab character */
+ fprintf(fp, " ");
+ } else {
+ fprintf(fp, "%c", current_char);
+ }
+
aux = g_utf8_find_next_char(aux, NULL);
}
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs