summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvipsk/hps.c
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-09-22 18:11:36 +0000
committerKarl Berry <karl@freefriends.org>2008-09-22 18:11:36 +0000
commit48744873d6fc03bfdb58ee36332e242f0ece2994 (patch)
tree1dec5d431de9951a23fe597c0ac308a327d985d8 /Build/source/texk/dvipsk/hps.c
parentfca13548b6ef87dbcecd0151d6f706cf6849cf21 (diff)
get scale factors right for -O so -z does not fail (from Akira)
git-svn-id: svn://tug.org/texlive/trunk@10692 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipsk/hps.c')
-rw-r--r--Build/source/texk/dvipsk/hps.c25
1 files changed, 12 insertions, 13 deletions
diff --git a/Build/source/texk/dvipsk/hps.c b/Build/source/texk/dvipsk/hps.c
index 8348a170e67..3be0750716d 100644
--- a/Build/source/texk/dvipsk/hps.c
+++ b/Build/source/texk/dvipsk/hps.c
@@ -114,7 +114,6 @@ extern char *oname ;
extern integer pagenum ;
extern integer hh ;
extern integer vv ;
-extern integer hoff, voff ;
char *hs = NULL ; /* html string to be handled */
char *url_name = NULL ; /* url between double quotes */
@@ -157,16 +156,16 @@ void do_html P1C(char *, s)
}
if (current_type == HREF && current_name[0] != '#') {
if ((nl = lookup_link(current_name, current_type)->defn)) {
- nl->rect.urx = dvi_to_hps_conv(hh + hoff,HORIZONTAL) ;
- nl->rect.ury = dvi_to_hps_conv(vv + voff, VERTICAL)-FUDGE+12.0 ;
+ nl->rect.urx = dvi_to_hps_conv(hh, HORIZONTAL) ;
+ nl->rect.ury = dvi_to_hps_conv(vv, VERTICAL)-FUDGE+12.0 ;
stamp_external(current_name,nl); /* Broken lines ? */
} else {
error("!Null lookup");
}
} else {
if ((nl = lookup_link(current_name, current_type)->defn)) {
- nl->rect.urx = dvi_to_hps_conv(hh + hoff,HORIZONTAL) ;
- nl->rect.ury = dvi_to_hps_conv(vv + voff, VERTICAL)-FUDGE+12.0 ;
+ nl->rect.urx = dvi_to_hps_conv(hh, HORIZONTAL) ;
+ nl->rect.ury = dvi_to_hps_conv(vv, VERTICAL)-FUDGE+12.0 ;
if (current_type) {
stamp_hps(nl) ; /* Put link info right where special is */
print_rect_list() ; /* print out rectangles */
@@ -256,8 +255,8 @@ int do_link P2C(char *, s, int, type)
p->title = (char *)malloc(strlen(s)+1) ;
p->title = s ;
p->srcpg = pagecounter ;
- p->rect.llx = dvi_to_hps_conv(hh + hoff,HORIZONTAL) ;
- p->rect.lly = dvi_to_hps_conv(vv + voff,VERTICAL)-FUDGE ;
+ p->rect.llx = dvi_to_hps_conv(hh, HORIZONTAL) ;
+ p->rect.lly = dvi_to_hps_conv(vv, VERTICAL)-FUDGE ;
p->rect.urx = -1.0 ;
p->rect.ury = -1.0 ;
p->vert_dest = -1 ;
@@ -538,8 +537,8 @@ void vertical_in_hps P1H(void) {
rl->next = current_rect_list ;
current_rect_list = rl ;
}
- current_rect_list->rect.llx = dvi_to_hps_conv(hh + hoff,HORIZONTAL) ;
- current_rect_list->rect.lly = dvi_to_hps_conv(vv + voff,VERTICAL)-FUDGE ;
+ current_rect_list->rect.llx = dvi_to_hps_conv(hh, HORIZONTAL) ;
+ current_rect_list->rect.lly = dvi_to_hps_conv(vv, VERTICAL)-FUDGE ;
current_rect_list->rect.urx = dvi_to_hps_conv(hhmem, HORIZONTAL) ;
current_rect_list->rect.ury = dvi_to_hps_conv(vvmem, VERTICAL)-FUDGE ;
@@ -564,16 +563,16 @@ void end_current_box P1H(void) {
HREF_COUNT-- ;
if (current_type == HREF && current_name[0] != '#') {
if ((nl = lookup_link(current_name, current_type)->defn)) {
- nl->rect.urx = dvi_to_hps_conv(hhmem + hoff,HORIZONTAL) ;
- nl->rect.ury = dvi_to_hps_conv(vvmem + voff, VERTICAL)-FUDGE+12.0 ;
+ nl->rect.urx = dvi_to_hps_conv(hhmem, HORIZONTAL) ;
+ nl->rect.ury = dvi_to_hps_conv(vvmem, VERTICAL)-FUDGE+12.0 ;
stamp_external(current_name,nl); /* Broken lines ? */
} else {
error("!Null lookup");
}
} else {
if ((nl = lookup_link(current_name, current_type)->defn)) {
- nl->rect.urx = dvi_to_hps_conv(hhmem + hoff,HORIZONTAL) ;
- nl->rect.ury = dvi_to_hps_conv(vvmem + voff, VERTICAL)-FUDGE+12.0 ;
+ nl->rect.urx = dvi_to_hps_conv(hhmem, HORIZONTAL) ;
+ nl->rect.ury = dvi_to_hps_conv(vvmem, VERTICAL)-FUDGE+12.0 ;
if (current_type) {
stamp_hps(nl) ; /* Put link info right where special is */
}