summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/pmpostdir/ppsout.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/ppsout.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/ppsout.ch')
-rw-r--r--Build/source/texk/web2c/pmpostdir/ppsout.ch13
1 files changed, 2 insertions, 11 deletions
diff --git a/Build/source/texk/web2c/pmpostdir/ppsout.ch b/Build/source/texk/web2c/pmpostdir/ppsout.ch
index f1ca7cfe6c4..ec6ee5fdefd 100644
--- a/Build/source/texk/web2c/pmpostdir/ppsout.ch
+++ b/Build/source/texk/web2c/pmpostdir/ppsout.ch
@@ -36,9 +36,6 @@ static void mp_print_initial_comment(MP mp,mp_edge_object *hh, int prologues);
static void mp_ps_kanji_string_out (MP mp, char *s)
{
int i, c;
-#ifdef UPMP
- int cx;
-#endif
size_t len;
len = strlen(s);
@@ -51,7 +48,7 @@ static void mp_ps_kanji_string_out (MP mp, char *s)
c=toDVI(fromBUFF((unsigned char*)s, len, i));
i=i+multistrlen((unsigned char*)s, len, i);
if (isinternalUPTEX() && c>65535) {
- cx=UTF32toUTF16HS(c); /* High surrogate */
+ int cx=UTF32toUTF16HS(c); /* High surrogate */
mp_hex_digit_out(mp, Hi(cx) / 16);
mp_hex_digit_out(mp, Hi(cx) % 16);
mp_hex_digit_out(mp, Lo(cx) / 16);
@@ -74,22 +71,16 @@ static void mp_ps_kanji_string_out (MP mp, char *s)
@x
mp_ps_print_nl(mp, "%%Creator: MetaPost ");
@y
-#ifdef UPMP
- mp_ps_print_nl(mp, "%%Creator: MetaPost (upTeX version) ");
-#else
- mp_ps_print_nl(mp, "%%Creator: MetaPost (Japanese version) ");
-#endif
+ mp_ps_print_nl(mp, "%%Creator: " P_UP "MetaPost ");
@z
%
% Call Kanji string output routine if the font is JFM.
@x
mp_ps_string_out(mp, gr_text_p(p),gr_text_l(p));
- mp_ps_name_out(mp, mp->font_name[gr_font_n(p)],false);
@y
if (mp->font_id[gr_font_n(p)]!=0)
mp_ps_kanji_string_out(mp, gr_text_p(p));
else
mp_ps_string_out(mp, gr_text_p(p),gr_text_l(p));
- mp_ps_name_out(mp, mp->font_name[gr_font_n(p)],false);
@z