summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/pmpostdir/pmp.ch
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2014-09-17 09:30:27 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2014-09-17 09:30:27 +0000
commit46f2ce3859e36658833aedad0a5f7e7256ddcf7c (patch)
tree7f98ab6ea503a273beef399196a3f0281b37c48f /Build/source/texk/web2c/pmpostdir/pmp.ch
parent22eeef14f89eda307eeb626baa9445b93a803d05 (diff)
(u)pMetaPost: Bug fix for upTeX fonts and monor cleanup
git-svn-id: svn://tug.org/texlive/trunk@35188 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/pmpostdir/pmp.ch')
-rw-r--r--Build/source/texk/web2c/pmpostdir/pmp.ch10
1 files changed, 4 insertions, 6 deletions
diff --git a/Build/source/texk/web2c/pmpostdir/pmp.ch b/Build/source/texk/web2c/pmpostdir/pmp.ch
index aef89a90598..2e6023e223e 100644
--- a/Build/source/texk/web2c/pmpostdir/pmp.ch
+++ b/Build/source/texk/web2c/pmpostdir/pmp.ch
@@ -21,13 +21,13 @@
#define metapost_version "1.999"
@y
#ifdef UPMP
-#define metapost_name "upMetaPost"
+#define P_UP "up"
#define metapost_version "1.999-0.04-u1.11"
#else
-#define metapost_name "pMetaPost"
+#define P_UP "p"
#define metapost_version "1.999-0.04"
#endif
-#define default_banner "This is " metapost_name ", Version " metapost_version /* printed when \MP\ starts */
+#define default_banner "This is " P_UP "MetaPost, Version " metapost_version /* printed when \MP\ starts */
@z
@x
@@ -307,9 +307,6 @@ void mp_set_text_box (MP mp, mp_text_node p) {
@y
@<Declare JFM function for text measuring@>;
void mp_set_text_box (MP mp, mp_text_node p) {
-#ifdef UPMP
- integer cx; /* code for Japanese two byte character */
-#endif
@z
@x
@@ -323,6 +320,7 @@ void mp_set_text_box (MP mp, mp_text_node p) {
} else {
if (mp->font_id[f]!=0) {
#ifdef UPMP
+ integer cx; /* code for Japanese two byte character */
if (multistrlen(mp_text_p (p)->str, kk, k)>1) {
cx=fromBUFF(mp_text_p (p)->str, kk, k);
k=k+multistrlen(mp_text_p (p)->str, kk, k)-1;