Simplify

git-svn-id: svn://tug.org/texlive/trunk@34719 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 6 insertions, 7 deletions

diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog
index 91839dd9b30..cc3e7faf48f 100644
--- a/Build/source/texk/dvipdfm-x/ChangeLog
+++ b/Build/source/texk/dvipdfm-x/ChangeLog
@@ -10,6 +10,8 @@
 
 	* pdfdev.c: Reduced dvipdfmx/xdvipdfmx diffs.
 
+	* dvi.c: Use dvi_is_tracking_boxes when applicable.
+
 2014-07-22  Khaled Hosny  <khaledhosny@eglug.org>
 
 	 * src/dvi.c, src/dvicodes.h: Support DVI-IVD inspired text reflection
diff --git a/Build/source/texk/dvipdfm-x/dvi.c b/Build/source/texk/dvipdfm-x/dvi.c
index edd61d3ad8f..0c74084dc95 100644
--- a/Build/source/texk/dvipdfm-x/dvi.c
+++ b/Build/source/texk/dvipdfm-x/dvi.c
@@ -1160,8 +1160,7 @@ do_string (unsigned char *s, int len)
     if (font->subfont_id < 0) {
       pdf_dev_set_string(dvi_state.h, -dvi_state.v, s, len,
                          width, font->font_id, 1);
-      if (compute_boxes && link_annot &&
-          marked_depth >= tagged_depth) {
+      if (dvi_is_tracking_boxes()) {
         pdf_rect rect;
 
         height = tfm_string_height(font->tfm_id, s, len);
@@ -1261,8 +1260,7 @@ dvi_set (SIGNED_QUAD ch)
       pdf_dev_set_string(dvi_state.h, -dvi_state.v, wbuf, 1,
 			 width, font->font_id, 1);
     }
-    if (compute_boxes && link_annot &&
-	marked_depth >= tagged_depth) {
+    if (dvi_is_tracking_boxes()) {
       pdf_rect rect;
 
       height = tfm_get_fw_height(font->tfm_id, ch);
@@ -1346,8 +1344,7 @@ dvi_put (SIGNED_QUAD ch)
       pdf_dev_set_string(dvi_state.h, -dvi_state.v, wbuf, 1,
 			 width, font->font_id, 1);
     }
-    if (compute_boxes && link_annot &&
-	marked_depth >= tagged_depth) {
+    if (dvi_is_tracking_boxes()) {
       pdf_rect rect;
 
       height = tfm_get_fw_height(font->tfm_id, ch);
@@ -2101,7 +2098,7 @@ do_glyph_array (int yLocsPresent)
 
       glyph_width = (double)font->size * (double)advance / (double)font->ft_face->units_per_EM;
       glyph_width = glyph_width * font->extend;
-      if (compute_boxes && link_annot && marked_depth >= tagged_depth) {
+      if (dvi_is_tracking_boxes()) {
         pdf_rect rect;
         height = (double)font->size * (double)font->ft_face->ascender / (double)font->ft_face->units_per_EM;
         depth  = (double)font->size * -(double)font->ft_face->descender / (double)font->ft_face->units_per_EM;