summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/texk/dvipsk/ChangeLog5
-rw-r--r--Build/source/texk/dvipsk/output.c38
2 files changed, 18 insertions, 25 deletions
diff --git a/Build/source/texk/dvipsk/ChangeLog b/Build/source/texk/dvipsk/ChangeLog
index ee8443c8da2..816926f56cd 100644
--- a/Build/source/texk/dvipsk/ChangeLog
+++ b/Build/source/texk/dvipsk/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-23 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+
+ * output.c (hvpos): simplify the change 2010-10-22.
+ Many thanks Peter.
+
2010-10-22 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
* output.c (hvpos): recover the old code in hvpos() for japanese
diff --git a/Build/source/texk/dvipsk/output.c b/Build/source/texk/dvipsk/output.c
index 915335a1387..dacbf1f0fe2 100644
--- a/Build/source/texk/dvipsk/output.c
+++ b/Build/source/texk/dvipsk/output.c
@@ -914,19 +914,13 @@ hvpos(void)
numout(hh);
numout(vv);
chrcmd('y');
- } else if (jflag) {
- numout(hh) ;
- numout(vv) ;
+ } else if (rhh != hh || jflag) {
+ numout(hh);
+ numout(vv);
chrcmd('a') ;
- } else {
- if (rhh != hh) {
- numout(hh);
- numout(vv);
- chrcmd('a');
- } else { /* hard to get this case, but it's there when you need it! */
- numout(vv - rvv);
- chrcmd('x');
- }
+ } else { /* hard to get this case, but it's there when you need it! */
+ numout(vv - rvv);
+ chrcmd('x');
}
rvv = vv;
} else if (rhh != hh || jflag) {
@@ -963,19 +957,13 @@ hvpos(void)
numout(vv);
numout(-hh);
chrcmd('y');
- } else if (jflag) {
- numout(vv) ;
- numout(-hh) ;
- chrcmd('a') ;
- } else {
- if (rvv != vv) {
- numout(vv);
- numout(-hh);
- chrcmd('a');
- } else { /* hard to get this case, but it's there when you need it! */
- numout(rhh - hh);
- chrcmd('x');
- }
+ } else if (rvv != vv || jflag) {
+ numout(vv);
+ numout(-hh);
+ chrcmd('a');
+ } else { /* hard to get this case, but it's there when you need it! */
+ numout(rhh - hh);
+ chrcmd('x');
}
rhh = hh;
} else if (rvv != vv || jflag) {