4 files changed, 40 insertions, 6 deletions
diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog
index 701c844fc01..abdfbfeff02 100644
--- a/Build/source/texk/web2c/pdftexdir/ChangeLog
+++ b/Build/source/texk/web2c/pdftexdir/ChangeLog
@@ -1,3 +1,10 @@
+2014-02-14  Karl Berry  <karl@gnu.org>
+
+	* pdftex.web (pdf_suppress_warning_page_group): new primitive
+	parameter \pdfsuppresswarningpagegroup.
+	(get_pdf_suppress_warning_page_group): new fn to get its value.
+	* pdftopdf.cc (write_epdf): check it before issuing warning.
+
 2014-01-20  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	TeX tuneup of 2014.
diff --git a/Build/source/texk/web2c/pdftexdir/NEWS b/Build/source/texk/web2c/pdftexdir/NEWS
index 5a5a68c023e..57bd501cfe0 100644
--- a/Build/source/texk/web2c/pdftexdir/NEWS
+++ b/Build/source/texk/web2c/pdftexdir/NEWS
@@ -1,4 +1,11 @@
 ---------------------------------------------------
+pdfTeX 3.14159265-1.40.14
+---------------------------------------------------
+- changes:
+  - sync for Knuth TeX 3.14159265
+  - new warning-suppression parameter \pdfsuppresswarningpagegroup
+
+---------------------------------------------------
 pdfTeX 3.1415926-1.40.13 was released on 2012-04-21 (TeX Live 2012)
 ---------------------------------------------------
 - changes:
diff --git a/Build/source/texk/web2c/pdftexdir/pdftex.web b/Build/source/texk/web2c/pdftexdir/pdftex.web
index 8da48670304..bfb3cc303ea 100644
--- a/Build/source/texk/web2c/pdftexdir/pdftex.web
+++ b/Build/source/texk/web2c/pdftexdir/pdftex.web
@@ -5687,7 +5687,8 @@ that will be defined later.
 @d pdf_inclusion_copy_font_code = pdftex_first_integer_code + 26 {generate ToUnicode for fonts?}
 @d pdf_suppress_warning_dup_dest_code    = pdftex_first_integer_code + 27 {suppress warning about duplicated destinations}
 @d pdf_suppress_warning_dup_map_code     = pdftex_first_integer_code + 28 {suppress warning about duplicated map lines}
-@d pdf_int_pars=pdftex_first_integer_code + 29 {total number of \pdfTeX's integer parameters}
+@d pdf_suppress_warning_page_group_code  = pdftex_first_integer_code + 29 {suppress warning about multiple pdfs with page group}
+@d pdf_int_pars=pdftex_first_integer_code + 30 {total number of \pdfTeX's integer parameters}
 @#
 @d etex_int_base=pdf_int_pars {base for \eTeX's integer parameters}
 @d tracing_assigns_code=etex_int_base {show assignments}
@@ -5795,6 +5796,7 @@ that will be defined later.
 @d pdf_inclusion_copy_font == int_par(pdf_inclusion_copy_font_code)
 @d pdf_suppress_warning_dup_dest == int_par(pdf_suppress_warning_dup_dest_code)
 @d pdf_suppress_warning_dup_map == int_par(pdf_suppress_warning_dup_map_code)
+@d pdf_suppress_warning_page_group == int_par(pdf_suppress_warning_page_group_code)
 @#
 @d tracing_assigns==int_par(tracing_assigns_code)
 @d tracing_groups==int_par(tracing_groups_code)
@@ -5899,6 +5901,7 @@ pdf_draftmode_code:        print_esc("pdfdraftmode");
 pdf_inclusion_copy_font_code:   print_esc("pdfinclusioncopyfonts");
 pdf_suppress_warning_dup_dest_code:  print_esc("pdfsuppresswarningdupdest");
 pdf_suppress_warning_dup_map_code:   print_esc("pdfsuppresswarningdupmap");
+pdf_suppress_warning_page_group_code:print_esc("pdfsuppresswarningpagegroup");
 @/@<Cases for |print_param|@>@/
 othercases print("[unknown integer parameter!]")
 endcases;
@@ -6076,11 +6079,16 @@ primitive("pdfdraftmode",assign_int,int_base+pdf_draftmode_code);@/
 @!@:pdf_draftmode_}{\.{\\pdfdraftmode} primitive@>
 primitive("pdfinclusioncopyfonts",assign_int,int_base+pdf_inclusion_copy_font_code);@/
 @!@:pdf_inclusion_copy_font_}{\.{\\pdfinclusioncopyfonts} primitive@>
+
 primitive("pdfsuppresswarningdupdest",assign_int,int_base+pdf_suppress_warning_dup_dest_code);@/
 @!@:pdf_suppress_warning_dup_dest_}{\.{\\pdfsuppresswarningdupdest} primitive@>
+
 primitive("pdfsuppresswarningdupmap",assign_int,int_base+pdf_suppress_warning_dup_map_code);@/
 @!@:pdf_suppress_warning_dup_map_}{\.{\\pdfsuppresswarningdupmap} primitive@>
 
+primitive("pdfsuppresswarningpagegroup",assign_int,int_base+pdf_suppress_warning_page_group_code);@/
+@!@:pdf_suppress_warning_page_group_}{\.{\\pdfsuppresswarningpagegroup} primitive@>
+
 @ @<Cases of |print_cmd_chr|...@>=
 assign_int: if chr_code<count_base then print_param(chr_code-int_base)
   else  begin print_esc("count"); print_int(chr_code-count_base);
@@ -15002,6 +15010,10 @@ begin
     get_pdf_suppress_warning_dup_map := pdf_suppress_warning_dup_map;
 end;
 
+function get_pdf_suppress_warning_page_group: integer;
+begin
+    get_pdf_suppress_warning_page_group := pdf_suppress_warning_page_group;
+end;
 
 function get_nullfont: internal_font_number;
 begin
diff --git a/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc b/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc
index fa7fa1bf1d5..736371035c7 100644
--- a/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc
+++ b/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc
@@ -62,11 +62,16 @@ extern "C" {
 #include "Error.h"
 
 // This file is mostly C and not very much C++; it's just used to interface
-// the functions of xpdf, which happens to be written in C++.
+// the functions of xpdf, which are written in C++.
 
 extern "C" {
 #include <pdftexdir/ptexmac.h>
 #include <pdftexdir/pdftex-common.h>
+
+// This function from pdftex.web gets declared in pdftexcoerce.h in the
+// usual web2c way, but we cannot include that file here because C++
+// does not allow it.
+extern int getpdfsuppresswarningpagegroup(void);
 }
 
 // The prefix "PTEX" for the PDF keys is special to pdfTeX;
@@ -935,10 +940,13 @@ void write_epdf(void)
     pageDict->lookupNF((char *)"Group", &dictObj);
     if (!dictObj->isNull()) {
         if (pdfpagegroupval == 0) { 
-            // another pdf with page group was included earlier on the same page;
-            // copy the Group entry as is
-            pdftex_warn
-                ("PDF inclusion: multiple pdfs with page group included in a single page");
+            // another pdf with page group was included earlier on the
+            // same page; copy the Group entry as is.  See manual for
+            // info on why this is a warning.
+            if (getpdfsuppresswarningpagegroup() == 0) {
+                pdftex_warn
+    ("PDF inclusion: multiple pdfs with page group included in a single page");
+            }
             pdf_newline();
             pdf_puts("/Group ");
             copyObject(&dictObj);