From 4e2ed715cdafd95d4dd12dddd95282777cf75838 Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Wed, 30 Jul 2014 11:58:53 +0000 Subject: Use dvi_right where appropriate git-svn-id: svn://tug.org/texlive/trunk@34777 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/dvipdfm-x/ChangeLog | 3 +++ Build/source/texk/dvipdfm-x/dvi.c | 27 ++++++++------------------- 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog index 9bbf6127689..149e6394074 100644 --- a/Build/source/texk/dvipdfm-x/ChangeLog +++ b/Build/source/texk/dvipdfm-x/ChangeLog @@ -3,6 +3,9 @@ * dvi.c, dvicodes.h: Support TeX-XeT's begin_reflect and end_reclect opcodes in dvipdfmx. + * dvi.c (dvi_set, do_glyph_array): Use dvi_right to ensure + consistency. + 2014-07-29 Khaled Hosny * spc_pdfm.c: remove the #ifdef ENABLE_TOUNICODE as it is always true. diff --git a/Build/source/texk/dvipdfm-x/dvi.c b/Build/source/texk/dvipdfm-x/dvi.c index 73e50822723..d2102764a82 100644 --- a/Build/source/texk/dvipdfm-x/dvi.c +++ b/Build/source/texk/dvipdfm-x/dvi.c @@ -1227,7 +1227,7 @@ dvi_set (SIGNED_QUAD ch) } if (lr_mode == RTYPESETTING) - dvi_right(width); + dvi_right(width); /* Will actually move left */ switch (font->type) { case PHYSICAL: @@ -1276,16 +1276,10 @@ dvi_set (SIGNED_QUAD ch) vf_set_char(ch, font->font_id); /* push/pop invoked */ break; } - if (lr_mode == LTYPESETTING) { - switch (dvi_state.d) { - case 0: - dvi_state.h += width; break; - case 1: - dvi_state.v += width; break; - case 3: - dvi_state.v -= width; break; - } - } + + if (lr_mode == LTYPESETTING) + dvi_right(width); + } void @@ -2042,7 +2036,7 @@ do_glyph_array (int yLocsPresent) } if (lr_mode == RTYPESETTING) - dvi_right(width); + dvi_right(width); /* Will actually move left */ slen = (unsigned int) get_buffered_unsigned_pair(); xloc = NEW(slen, spt_t); @@ -2098,13 +2092,8 @@ do_glyph_array (int yLocsPresent) RELEASE(xloc); RELEASE(yloc); - if (lr_mode == LTYPESETTING) { - if (!dvi_state.d) { - dvi_state.h += width; - } else { - dvi_state.v += width; - } - } + if (lr_mode == LTYPESETTING) + dvi_right(width); return; } -- cgit v1.2.3