From 1264a5c78919c58e6aab959da0c951d7921efac6 Mon Sep 17 00:00:00 2001
From: Takuji Tanaka <ttk@t-lab.opal.ne.jp>
Date: Sat, 5 Dec 2020 03:24:25 +0000
Subject: texk/dvipsk: Output error of html special to STDERR

git-svn-id: svn://tug.org/texlive/trunk@57071 c570f23f-e606-0410-a88d-b1316a301751
---
 Build/source/texk/dvipsk/ChangeLog   |  6 ++++
 Build/source/texk/dvipsk/NEWS        |  3 +-
 Build/source/texk/dvipsk/dospecial.c | 53 ++++++++++++++++++------------------
 3 files changed, 35 insertions(+), 27 deletions(-)

(limited to 'Build/source')

diff --git a/Build/source/texk/dvipsk/ChangeLog b/Build/source/texk/dvipsk/ChangeLog
index 4742924c660..58086bddc24 100644
--- a/Build/source/texk/dvipsk/ChangeLog
+++ b/Build/source/texk/dvipsk/ChangeLog
@@ -1,3 +1,9 @@
+2020-12-05  TANAKA Takuji  <ttk@t-lab.opal.ne.jp>
+
+	* NEWS: Mention new/jfm feature.
+	* dospecial.c:
+	Output error of html special not to STDOUT but to STDERR.
+
 2020-11-28  Akira Kakuto  <kakuto@w32tex.org>
 
 	* protos.h (titlename): new global.
diff --git a/Build/source/texk/dvipsk/NEWS b/Build/source/texk/dvipsk/NEWS
index d32fcd5fef8..ae5552e76df 100644
--- a/Build/source/texk/dvipsk/NEWS
+++ b/Build/source/texk/dvipsk/NEWS
@@ -1,9 +1,10 @@
 $Id$
 This file records noteworthy changes.  (Public domain.)
 
-dvips 2021.1 (TeX Live 2020):
+dvips 2021.1 (TeX Live 2021):
   Default title is now the basename of the input file isntead of the
   full path, and can be overridden with new option -title.
+  Support new feature of virtual font to fallback Japanese font definition.
 
 dvips 2020.1 (TeX Live 2020):
   Encodings for bitmap fonts.
diff --git a/Build/source/texk/dvipsk/dospecial.c b/Build/source/texk/dvipsk/dospecial.c
index 3967bff62d4..eb8ce1ac186 100644
--- a/Build/source/texk/dvipsk/dospecial.c
+++ b/Build/source/texk/dvipsk/dospecial.c
@@ -817,36 +817,37 @@ case 'h':
    if (strncmp(p, "header", 6)==0) return;
 #ifdef HPS
    if (strncmp(p, "html:", 5)==0) {
-     if (! HPS_FLAG) return;
-	 		p += 5;
-			while (isspace((unsigned char)*p))
-   		p++;
-			if (*p == '<') {
-    			char               *sp = p;
-    			char               *str;
-    			int                 ii=0;int len;int lower_len;
+      if (! HPS_FLAG) return;
+      p += 5;
+      while (isspace((unsigned char)*p))
+         p++;
+      if (*p == '<') {
+         char *sp = p;
+         char *str;
+         int  ii=0, len, lower_len;
 
-    			while ((*p) && (*p != '>')) {
-						ii++;
-						p++;
-   			 }
-    		str = (char *)mymalloc(ii+2);
-   			strncpy(str,sp+1,ii-1);
-    		str[ii-1] = 0;len=strlen(str);
-				if(len>6) lower_len=6; else lower_len=len;
-				for(ii=0;ii<lower_len;ii++) str[ii]=tolower((unsigned char)str[ii]);
-				do_html(str);
-   			free(str);
-				} else
+         while ((*p) && (*p != '>')) {
+            ii++;
+            p++;
+         }
+         str = (char *)mymalloc(ii+2);
+         strncpy(str,sp+1,ii-1);
+         str[ii-1] = 0;len=strlen(str);
+         if(len>6) lower_len=6; else lower_len=len;
+         for(ii=0;ii<lower_len;ii++) str[ii]=tolower((unsigned char)str[ii]);
+         do_html(str);
+         free(str);
+      } else
 #ifdef KPATHSEA
-				  if (!kpse_tex_hush ("special"))
+         if (!kpse_tex_hush ("special"))
 #endif
-				    {
+      {
 
-    			printf("Error in html special\n");
-    			return;
-				}
-	return;
+         sprintf(errbuf,"Error in html special\n");
+         error(errbuf);
+         return;
+      }
+      return;
    }
 #else
    if (strncmp(p, "html:", 5)==0) return;
-- 
cgit v1.2.3