pdftex[813] branches/stable/tests/11-omitcharset: reverse sense and

commits+karl at tug.org commits+karl at tug.org
Mon Jan 28 01:04:18 CET 2019


Revision: 813
          http://tug.org/svn/pdftex?view=revision&revision=813
Author:   karl
Date:     2019-01-28 01:04:18 +0100 (Mon, 28 Jan 2019)
Log Message:
-----------
reverse sense and name to \pdfomitcharset

Modified Paths:
--------------
    branches/stable/doc/manual/pdftex-t.tex
    branches/stable/source/src/texk/web2c/pdftexdir/ChangeLog
    branches/stable/source/src/texk/web2c/pdftexdir/NEWS
    branches/stable/source/src/texk/web2c/pdftexdir/pdftex.web
    branches/stable/source/src/texk/web2c/pdftexdir/writefont.c
    branches/stable/tests/11-omitcharset/Makefile

Added Paths:
-----------
    branches/stable/tests/11-omitcharset/
    branches/stable/tests/11-omitcharset/test-omitcharset.tex

Removed Paths:
-------------
    branches/stable/tests/11-includecharset/
    branches/stable/tests/11-omitcharset/test-includecharset.tex

Property Changed:
----------------
    branches/stable/tests/11-omitcharset/Makefile

Modified: branches/stable/doc/manual/pdftex-t.tex
===================================================================
--- branches/stable/doc/manual/pdftex-t.tex	2019-01-27 17:56:20 UTC (rev 812)
+++ branches/stable/doc/manual/pdftex-t.tex	2019-01-28 00:04:18 UTC (rev 813)
@@ -2786,19 +2786,18 @@
 corresponding glyphs will be embedded into the font resources in the \PDF\
 output. Nothing is appended to the list being built.
 
-\pdftexprimitive{\Syntax{\Tex{\pdfincludecharset} \Whatever{integer}}}
-\bookmark{\tex{pdfincludecharset}}
+\pdftexprimitive{\Syntax{\Tex{\pdfomitcharset} \Whatever{integer}}}
+\bookmark{\tex{pdfomitcharset}}
 
 If this primitive parameter is zero (the default), the \type{/CharSet}
-entry is omitted from fonts in the \PDF\ output; if it is set to 1, then
-\type{/CharSet} is included. (Other values may have other meanings in
-the future, so do not rely on them.)
+entry is included as usual for fonts in the \PDF\ output; if it is set
+to 1, then \type{/CharSet} is omitted. (Other values may have other
+meanings in the future, so do not rely on them.)
 
 Explanation: This parameter was created because the \PDFA-1 standard
 requires \type{/CharSet}, whereas \PDFA-2 and \PDFA-3 allow it to be
-omitted but have extraordinary requirements if it is included. Viewers
-in general do not care one way or the other, this is only about
-satisfying the standards. \introduced{1.40.20}
+omitted but have extraordinary requirements, which \PDFTEX\ does not
+currently meet, if it is included.\introduced{1.40.20}
 
 \pdftexprimitive{\Syntax{\Tex{\pdfuniqueresname} \Whatever{integer}}}
 \bookmark{\tex{pdfuniqueresname}}

Modified: branches/stable/source/src/texk/web2c/pdftexdir/ChangeLog
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/ChangeLog	2019-01-27 17:56:20 UTC (rev 812)
+++ branches/stable/source/src/texk/web2c/pdftexdir/ChangeLog	2019-01-28 00:04:18 UTC (rev 813)
@@ -1,5 +1,14 @@
-2014-02-14  Karl Berry  <karl at gnu.org>
+2019-01-27  Karl Berry  <karl at 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 at gnu.org>
+
 	* pdftex.web (pdf_include_charset_code, pdf_include_charset):
 	new primitive parameter \pdfincludecharset.
 	(print_param): print_esc it.

Modified: branches/stable/source/src/texk/web2c/pdftexdir/NEWS
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/NEWS	2019-01-27 17:56:20 UTC (rev 812)
+++ branches/stable/source/src/texk/web2c/pdftexdir/NEWS	2019-01-28 00:04:18 UTC (rev 813)
@@ -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:

Modified: branches/stable/source/src/texk/web2c/pdftexdir/pdftex.web
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/pdftex.web	2019-01-27 17:56:20 UTC (rev 812)
+++ branches/stable/source/src/texk/web2c/pdftexdir/pdftex.web	2019-01-28 00:04:18 UTC (rev 813)
@@ -5692,7 +5692,7 @@
 @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}
- at d pdf_include_charset_code = pdftex_first_integer_code + 32 {suppress /PTEX.* entries in PDF dictionaries}
+ at 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 @@
 @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)
- at d pdf_include_charset == int_par(pdf_include_charset_code)
+ at 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_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("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 @@
     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;

Modified: branches/stable/source/src/texk/web2c/pdftexdir/writefont.c
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/writefont.c	2019-01-27 17:56:20 UTC (rev 812)
+++ branches/stable/source/src/texk/web2c/pdftexdir/writefont.c	2019-01-28 00:04:18 UTC (rev 813)
@@ -484,7 +484,7 @@
     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

Index: branches/stable/tests/11-omitcharset
===================================================================
--- branches/stable/tests/11-includecharset	2019-01-27 17:56:20 UTC (rev 812)
+++ branches/stable/tests/11-omitcharset	2019-01-28 00:04:18 UTC (rev 813)

Property changes on: branches/stable/tests/11-omitcharset
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+*.pdf
Modified: branches/stable/tests/11-omitcharset/Makefile
===================================================================
--- branches/stable/tests/11-includecharset/Makefile	2019-01-27 17:56:20 UTC (rev 812)
+++ branches/stable/tests/11-omitcharset/Makefile	2019-01-28 00:04:18 UTC (rev 813)
@@ -1,18 +1,18 @@
-# $Id: Makefile 808 2018-11-13 18:39:00Z karl $
+# $Id$
 # Public domain.
 
 include ../Common.mak
 
-default: test-includecharset
+default: test-omitcharset
 
-test-includecharset:
-	# by default, no CharSet
-	$(prog) test-includecharset.tex
-	! grep "/CharSet" test-includecharset.pdf >/dev/null
+test-omitcharset:
+	# by default, CharSet is included.
+	$(prog) test-omitcharset.tex
+	grep "/CharSet" test-omitcharset.pdf >/dev/null
 	#
-	# force CharSet to be included
-	$(prog) '\pdfincludecharset=1 \input test-includecharset.tex'
-	grep "/CharSet" test-includecharset.pdf >/dev/null
+	# force CharSet to be omitted.
+	$(prog) '\pdfomitcharset=1 \input test-omitcharset.tex'
+	! grep "/CharSet" test-omitcharset.pdf >/dev/null
 
 clean:
 	$(clean)


Property changes on: branches/stable/tests/11-omitcharset/Makefile
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id Revision
\ No newline at end of property
Deleted: branches/stable/tests/11-omitcharset/test-includecharset.tex
===================================================================
--- branches/stable/tests/11-includecharset/test-includecharset.tex	2019-01-27 17:56:20 UTC (rev 812)
+++ branches/stable/tests/11-omitcharset/test-includecharset.tex	2019-01-28 00:04:18 UTC (rev 813)
@@ -1,10 +0,0 @@
-% $Id: abc.tex 737 2016-03-21 22:54:16Z karl $
-% Public domain.
-\input plain.tex
-\input pdftexconfig.tex
-\input pdftexmagfix.tex
-\pdfcompresslevel=0 % get greppable output
-\pdfobjcompresslevel=0
-
-abc
-\bye

Copied: branches/stable/tests/11-omitcharset/test-omitcharset.tex (from rev 812, branches/stable/tests/11-includecharset/test-includecharset.tex)
===================================================================
--- branches/stable/tests/11-omitcharset/test-omitcharset.tex	                        (rev 0)
+++ branches/stable/tests/11-omitcharset/test-omitcharset.tex	2019-01-28 00:04:18 UTC (rev 813)
@@ -0,0 +1,10 @@
+% $Id$
+% Public domain.
+\input plain.tex
+\input pdftexconfig.tex
+\input pdftexmagfix.tex
+\pdfcompresslevel=0 % get greppable output
+\pdfobjcompresslevel=0
+
+abc
+\bye


Property changes on: branches/stable/tests/11-omitcharset/test-omitcharset.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id Revision
\ No newline at end of property


More information about the pdftex-commits mailing list