remove SJIS option.

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

5 files changed, 16 insertions, 18 deletions

diff --git a/Build/source/texk/dvipsk/ChangeLog b/Build/source/texk/dvipsk/ChangeLog
index 12215e1b2b2..b43d556fb2f 100644
--- a/Build/source/texk/dvipsk/ChangeLog
+++ b/Build/source/texk/dvipsk/ChangeLog
@@ -1,3 +1,11 @@
+2010-05-07  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
+
+	* output.c: correct wrong boundary values of characters.
+	(from Takuji Tanaka <KXD02663@nifty.ne.jp>.)
+	* protos.h, dvips.c, output.c, resident.c: remove unnecessary SJIS option.
+	(from Takuji Tanaka <KXD02663@nifty.ne.jp>.)
+	(a commit r18123 seemes to be eliminated, so try again)
+
 2010-05-07  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* dosection.c (dosection): Add newline before "@start".
diff --git a/Build/source/texk/dvipsk/dvips.c b/Build/source/texk/dvipsk/dvips.c
index 292647b35c9..1be2dd53070 100644
--- a/Build/source/texk/dvipsk/dvips.c
+++ b/Build/source/texk/dvipsk/dvips.c
@@ -63,8 +63,6 @@ extern char *strtok(); /* some systems don't have this in strings.h */
     static char ofnme[252],infnme[252],pap[40],thh[20];
 #endif
 
-Boolean SJIS;                /* KANJI code encoding */
-
 /* PS fonts fully downloaded as headers */
 char *downloadedpsnames[DOWNLOADEDPSSIZE];
 
@@ -303,7 +301,6 @@ static const char *helparr[] = {
 #else
 "                                     -Z*  Compress bitmap fonts",
 #endif
-"-SJIS* Shift-JIS encoding",
 /*"-   Interactive query of options", */
 "    # = number   f = file   s = string  * = suffix, `0' to turn off",
 "    c = comma-separated dimension pair (e.g., 3.2in,-32.1cm)",
@@ -474,7 +471,6 @@ initialize(void)
       downloadedpsnames[i] = NULL;
    unused_top_of_psnames = 0;
    morestrings();
-   SJIS = 0;
    maxpages = 100000;
    numcopies = 1;
    iname = fulliname = strings;
@@ -811,13 +807,10 @@ case 'R':
                   secure_option = 1; /* Never used */
                break;
 case 'S':
-               if (strncmp (p, "JIS", 3) == 0) SJIS = (*(p + 3) != '0');
-               else {
-                  if (*p == 0 && argv[i+1])
-                     p = argv[++i];
-                  if (sscanf(p, "%d", &maxsecsize)==0)
-                     error("! Bad section size arg (-S).");
-               }
+               if (*p == 0 && argv[i+1])
+                  p = argv[++i];
+               if (sscanf(p, "%d", &maxsecsize)==0)
+                  error("! Bad section size arg (-S).");
                break;
 case 'm' :
                if (STREQ (p, "ode") && argv[i+1]) {
diff --git a/Build/source/texk/dvipsk/output.c b/Build/source/texk/dvipsk/output.c
index 3b2a3f24ed4..57a98979c1c 100644
--- a/Build/source/texk/dvipsk/output.c
+++ b/Build/source/texk/dvipsk/output.c
@@ -770,9 +770,9 @@ jscout(int c, char *fs)   /* string character out */
          sprintf(s, "a<%02x>p", c);
       } else if (c<0x800) {
 	 sprintf(s, "a<%02x%02x>p", UCStoUTF8B1(c), UCStoUTF8B2(c));
-      } else if (c<0xffff) {
+      } else if (c<0x10000) {
 	 sprintf(s, "a<%02x%02x%02x>p", UCStoUTF8C1(c), UCStoUTF8C2(c), UCStoUTF8C3(c));
-      } else if (c<0x10ffff) {
+      } else if (c<0x110000) {
 	 sprintf(s, "a<%02x%02x%02x%02x>p", UCStoUTF8D1(c), UCStoUTF8D2(c), UCStoUTF8D3(c), UCStoUTF8D4(c));
       } else {
          error("warning: Illegal code value.");
@@ -780,7 +780,7 @@ jscout(int c, char *fs)   /* string character out */
    } else if (c>0xffff && strstr(fs,"-UTF16-")!=NULL) {
       sprintf(s, "a<%04x%04x>p", UTF32toUTF16HS(c), UTF32toUTF16LS(c));
    } else {
-      if ((strstr(fs,"-RKSJ-")!=NULL) || (SJIS && c > 0x2120)) c = JIStoSJIS(c);
+      if ((strstr(fs,"-RKSJ-")!=NULL)) c = JIStoSJIS(c);
       sprintf(s, "a<%04x>p", c);
    }
    cmdout(s);
diff --git a/Build/source/texk/dvipsk/protos.h b/Build/source/texk/dvipsk/protos.h
index d66ec8760e1..52a25559240 100644
--- a/Build/source/texk/dvipsk/protos.h
+++ b/Build/source/texk/dvipsk/protos.h
@@ -245,7 +245,6 @@ extern int pagecounter;
 #endif
 
 /* global variables from dvips.c */
-extern Boolean SJIS;
 extern char *downloadedpsnames[];
 extern int unused_top_of_psnames;
 extern fontdesctype *fonthead;
diff --git a/Build/source/texk/dvipsk/resident.c b/Build/source/texk/dvipsk/resident.c
index 073e21bfff9..23a92cff753 100644
--- a/Build/source/texk/dvipsk/resident.c
+++ b/Build/source/texk/dvipsk/resident.c
@@ -570,9 +570,7 @@ case 'v' : case 'V' :
 #endif
          break;
 case 'S' :
-         if (!strncmp(was_inline, "SJIS", 4))
-           SJIS = (was_inline[4] != '0');
-         else if (sscanf(was_inline+1, "%s", PSname) != 1)
+         if (sscanf(was_inline+1, "%s", PSname) != 1)
            bad_config("missing arg to S");
          else
 #ifdef KPATHSEA