now \pdfomitcharset, pdftex r813

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

4 files changed, 22 insertions, 13 deletions

diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog
index 57776405150..d1c71dd05b7 100644
--- a/Build/source/texk/web2c/pdftexdir/ChangeLog
+++ b/Build/source/texk/web2c/pdftexdir/ChangeLog
@@ -1,4 +1,13 @@
-2014-02-14  Karl Berry  <karl@gnu.org>
+2019-01-27  Karl Berry  <karl@gnu.org>
+
+	* pdftex.web (pdf_omit_charset_code, pdf_omit_charset
+	print_param,
+	<Put each...>,
+	get_pdf_omit_charset)
+	* writefont.c (write_fontdescriptor): reverse sense and name
+	to \pdfomitcharset.
+
+2019-01-27  Karl Berry  <karl@gnu.org>
 
 	* pdftex.web (pdf_include_charset_code, pdf_include_charset):
 	new primitive parameter \pdfincludecharset.
diff --git a/Build/source/texk/web2c/pdftexdir/NEWS b/Build/source/texk/web2c/pdftexdir/NEWS
index b62e6eea66c..3a0ff89597c 100644
--- a/Build/source/texk/web2c/pdftexdir/NEWS
+++ b/Build/source/texk/web2c/pdftexdir/NEWS
@@ -1,10 +1,10 @@
 pdfTeX 3.14159265-2.6-1.40.20 (TeX Live 2019)
 - changes:
   - new primitive \expanded (from unreleased pdftex 1.50 branch + luatex).
-  - new primitive parameter \pdfincludecharset; zero by default to omit
-    the /CharSet string from the PDF output, since it cannot feasibly be
-    guaranteed correct as the PDF/A-2 and /A-3 standards require; setting
-    to 1 includes it again, as required by PDF/A-1.
+  - new primitive parameter \pdfomitcharset; zero by default to include
+    the /CharSet value from the PDF output as usual; setting to 1 omits
+    it, since it cannot feasibly be guaranteed correct as the PDF/A-2
+    and /A-3 standards require.
 
 pdfTeX 3.14159265-2.6-1.40.19 (TeX Live 2018)  (April 14, 2018)
 - changes:
diff --git a/Build/source/texk/web2c/pdftexdir/pdftex.web b/Build/source/texk/web2c/pdftexdir/pdftex.web
index 82875c247ec..80b6e00f880 100644
--- a/Build/source/texk/web2c/pdftexdir/pdftex.web
+++ b/Build/source/texk/web2c/pdftexdir/pdftex.web
@@ -5692,7 +5692,7 @@ that will be defined later.
 @d pdf_suppress_warning_page_group_code  = pdftex_first_integer_code + 29 {suppress warning about multiple pdfs with page group}
 @d pdf_info_omit_date_code  = pdftex_first_integer_code + 30 {omit generating CreationDate and ModDate}
 @d pdf_suppress_ptex_info_code = pdftex_first_integer_code + 31 {suppress /PTEX.* entries in PDF dictionaries}
-@d pdf_include_charset_code = pdftex_first_integer_code + 32 {suppress /PTEX.* entries in PDF dictionaries}
+@d pdf_omit_charset_code = pdftex_first_integer_code + 32 {suppress /PTEX.* entries in PDF dictionaries}
 @d pdf_int_pars=pdftex_first_integer_code + 33 {total number of \pdfTeX's integer parameters}
 @#
 @d etex_int_base=pdf_int_pars {base for \eTeX's integer parameters}
@@ -5804,7 +5804,7 @@ that will be defined later.
 @d pdf_suppress_warning_page_group == int_par(pdf_suppress_warning_page_group_code)
 @d pdf_info_omit_date == int_par(pdf_info_omit_date_code)
 @d pdf_suppress_ptex_info == int_par(pdf_suppress_ptex_info_code)
-@d pdf_include_charset == int_par(pdf_include_charset_code)
+@d pdf_omit_charset == int_par(pdf_omit_charset_code)
 @#
 @d tracing_assigns==int_par(tracing_assigns_code)
 @d tracing_groups==int_par(tracing_groups_code)
@@ -5912,7 +5912,7 @@ pdf_suppress_warning_dup_map_code:   print_esc("pdfsuppresswarningdupmap");
 pdf_suppress_warning_page_group_code:print_esc("pdfsuppresswarningpagegroup");
 pdf_info_omit_date_code:print_esc("pdfinfoomitdate");
 pdf_suppress_ptex_info_code: print_esc("pdfsuppressptexinfo");
-pdf_include_charset_code: print_esc("pdfincludecharset");
+pdf_omit_charset_code: print_esc("pdfomitcharset");
 @/@<Cases for |print_param|@>@/
 othercases print("[unknown integer parameter!]")
 endcases;
@@ -6106,8 +6106,8 @@ primitive("pdfinfoomitdate",assign_int,int_base+pdf_info_omit_date_code);@/
 primitive("pdfsuppressptexinfo",assign_int,int_base+pdf_suppress_ptex_info_code);@/
 @!@:pdf_suppress_ptex_info_}{\.{\\pdfsuppressptexinfo} primitive@>
 
-primitive("pdfincludecharset",assign_int,int_base+pdf_include_charset_code);@/
-@!@:pdf_include_charset}{\.{\\pdfincludecharset} primitive@>
+primitive("pdfomitcharset",assign_int,int_base+pdf_omit_charset_code);@/
+@!@:pdf_omit_charset}{\.{\\pdfomitcharset} primitive@>
 
 @ @<Cases of |print_cmd_chr|...@>=
 assign_int: if chr_code<count_base then print_param(chr_code-int_base)
@@ -15112,9 +15112,9 @@ begin
     get_pdf_suppress_ptex_info := pdf_suppress_ptex_info;
 end;
 
-function get_pdf_include_charset: integer;
+function get_pdf_omit_charset: integer;
 begin
-    get_pdf_include_charset := pdf_include_charset;
+    get_pdf_omit_charset := pdf_omit_charset;
 end;
 
 function get_nullfont: internal_font_number;
diff --git a/Build/source/texk/web2c/pdftexdir/writefont.c b/Build/source/texk/web2c/pdftexdir/writefont.c
index adda570dab7..ec073e0edff 100644
--- a/Build/source/texk/web2c/pdftexdir/writefont.c
+++ b/Build/source/texk/web2c/pdftexdir/writefont.c
@@ -484,7 +484,7 @@ static void write_fontdescriptor(fd_entry * fd)
     pdf_printf("/Flags %i\n", fd_flags);
     write_fontmetrics(fd);
     if (fd->ff_found) {
-        if (getpdfincludecharset() > 0 && is_subsetted(fd->fm) && is_type1(fd->fm)) {
+        if (getpdfomitcharset() == 0 && is_subsetted(fd->fm) && is_type1(fd->fm)) {
             /* We don't get CharSet right. For some PDF standards,
                CharSet is optional, but if it appears, it must be
                correct. Unfortunately, there seems to be no practical