texlive[59160] Build/source/libs/xpdf: label error messages as coming

commits+karl at tug.org commits+karl at tug.org
Mon May 10 18:06:29 CEST 2021


Revision: 59160
          http://tug.org/svn/texlive?view=revision&revision=59160
Author:   karl
Date:     2021-05-10 18:06:29 +0200 (Mon, 10 May 2021)
Log Message:
-----------
label error messages as coming from libxpdf

Modified Paths:
--------------
    trunk/Build/source/libs/xpdf/ChangeLog
    trunk/Build/source/libs/xpdf/TLpatches/patch-bunched
    trunk/Build/source/libs/xpdf/xpdf-src/xpdf/Error.cc

Modified: trunk/Build/source/libs/xpdf/ChangeLog
===================================================================
--- trunk/Build/source/libs/xpdf/ChangeLog	2021-05-10 14:54:19 UTC (rev 59159)
+++ trunk/Build/source/libs/xpdf/ChangeLog	2021-05-10 16:06:29 UTC (rev 59160)
@@ -1,3 +1,8 @@
+2021-05-10  Karl Berry  <karl at freefriends.org>
+
+	* xpdf-src/xpdf/Error.cc (error): label error messages
+	as coming from libxpdf.
+
 2021-02-01  Akira Kakuto  <kakuto at w32tex.org>
 
 	* Import xpdf-4.03.

Modified: trunk/Build/source/libs/xpdf/TLpatches/patch-bunched
===================================================================
--- trunk/Build/source/libs/xpdf/TLpatches/patch-bunched	2021-05-10 14:54:19 UTC (rev 59159)
+++ trunk/Build/source/libs/xpdf/TLpatches/patch-bunched	2021-05-10 16:06:29 UTC (rev 59160)
@@ -312,3 +312,23 @@
  #if defined(VMS) || defined(VMCMS) || defined(DOS) || defined(OS2) || defined(__EMX__) || defined(_WIN32) || defined(__DJGPP__)
  #define POPEN_READ_MODE "rb"
  #else
+diff -ur xpdf-4.03/xpdf/Error.cc xpdf-src/xpdf/Error.cc
+--- xpdf-4.03/xpdf/Error.cc	Thu Jan 28 07:23:52 2021
++++ xpdf-src/xpdf/Error.cc	Mon Feb 01 12:34:28 2021
+@@ -77,11 +77,14 @@
+     (*errorCbk)(errorCbkData, category, (int)pos, sanitized->getCString());
+   } else {
+     fflush(stdout);
++    /* Label the error messages for pdftex's use as libxpdf.
++       It would be cleaner to use the callback feature, but seems
++       like too much trouble at this late date. */
+     if (pos >= 0) {
+-      fprintf(stderr, "%s (%d): %s\n",
++      fprintf(stderr, "\nlibxpdf: %s (%d): %s\n",
+ 	      errorCategoryNames[category], (int)pos, sanitized->getCString());
+     } else {
+-      fprintf(stderr, "%s: %s\n",
++      fprintf(stderr, "\nlibxpdf: %s: %s\n",
+ 	      errorCategoryNames[category], sanitized->getCString());
+     }
+     fflush(stderr);

Modified: trunk/Build/source/libs/xpdf/xpdf-src/xpdf/Error.cc
===================================================================
--- trunk/Build/source/libs/xpdf/xpdf-src/xpdf/Error.cc	2021-05-10 14:54:19 UTC (rev 59159)
+++ trunk/Build/source/libs/xpdf/xpdf-src/xpdf/Error.cc	2021-05-10 16:06:29 UTC (rev 59160)
@@ -77,11 +77,14 @@
     (*errorCbk)(errorCbkData, category, (int)pos, sanitized->getCString());
   } else {
     fflush(stdout);
+    /* Label the error messages for pdftex's use as libxpdf.
+       It would be cleaner to use the callback feature, but seems
+       like too much trouble at this late date. */
     if (pos >= 0) {
-      fprintf(stderr, "%s (%d): %s\n",
+      fprintf(stderr, "\nlibxpdf: %s (%d): %s\n",
 	      errorCategoryNames[category], (int)pos, sanitized->getCString());
     } else {
-      fprintf(stderr, "%s: %s\n",
+      fprintf(stderr, "\nlibxpdf: %s: %s\n",
 	      errorCategoryNames[category], sanitized->getCString());
     }
     fflush(stderr);



More information about the tex-live-commits mailing list.