summaryrefslogtreecommitdiff
path: root/pcl/pctext.c
diff options
context:
space:
mode:
authorHenry Stiles <henry.stiles@artifex.com>2004-01-29 23:58:13 +0000
committerHenry Stiles <henry.stiles@artifex.com>2004-01-29 23:58:13 +0000
commita49bf8807263130d48ceec2c250170cd3b46dc64 (patch)
tree3f048ef592f5977fdbaffc0197dc5223a96bd109 /pcl/pctext.c
parentdfb7f86da602759f582d3ac1246d176df137bc2b (diff)
changed to use the default next_char_glyph procedure.
git-svn-id: http://svn.ghostscript.com/ghostpcl/trunk/ghostpcl@2055 06663e23-700e-0410-b217-a244a6096597
Diffstat (limited to 'pcl/pctext.c')
-rw-r--r--pcl/pctext.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/pcl/pctext.c b/pcl/pctext.c
index e1ca5b49a..d5bd3193f 100644
--- a/pcl/pctext.c
+++ b/pcl/pctext.c
@@ -71,8 +71,6 @@ set_gs_font(
)
{
gs_font * pfont = (gs_font *)pcs->font->pfont;
-
- pfont->procs.next_char_glyph = get_gs_next_char;
gs_setfont(pcs->pgs, pfont);
}
@@ -216,6 +214,7 @@ get_next_char(
const byte ** ppb,
uint * plen,
gs_char * pchr,
+ gs_char * porig_char,
bool * pis_space,
bool literal,
gs_point * pwidth
@@ -236,7 +235,7 @@ get_next_char(
*pis_space = (chr == ' ' && pcs->font->storage == pcds_internal);
*ppb = pb;
*plen = len;
-
+ *porig_char = chr;
/* check if the code is considered "printable" in the current symbol set */
if (!is_printable(pcs, chr, literal)) {
*pis_space = literal;
@@ -531,7 +530,7 @@ pcl_show_chars_slow(
bool wrap = pcs->end_of_line_wrap;
bool is_space = false;
bool use_rmargin = (pcs->cap.x <= rmargin);
- gs_char chr;
+ gs_char chr, orig_chr;
int code = 0;
floatp width;
gs_point cpt;
@@ -540,7 +539,7 @@ pcl_show_chars_slow(
cpt.x = pcs->cap.x;
cpt.y = pcs->cap.y;
- while (get_next_char(pcs, &str, &size, &chr, &is_space, literal, &advance_vector) == 0) {
+ while (get_next_char(pcs, &str, &size, &chr, &orig_chr, &is_space, literal, &advance_vector) == 0) {
floatp tmp_x;
/* check if a character was found */
@@ -602,7 +601,6 @@ pcl_show_chars_slow(
gs_moveto(pgs, tmp_x / pscale->x, cpt.y / pscale->y);
if (chr != 0xffff) {
-
/* if source is opaque, show and opaque background */
if (source_opaque)
code = show_char_background(pcs, buff);