summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-12-09 18:45:41 +0000
committerKarl Berry <karl@freefriends.org>2008-12-09 18:45:41 +0000
commita04cd5203028d7814866e4107e11078359c55953 (patch)
treebcba5fee9b1c3cf7321624d99dc6a1cee91c0e53
parent0ea54764c71176922c80dc7b7b371be550dca7ed (diff)
more pdf version changes; make default be 4
git-svn-id: svn://tug.org/texlive/trunk@11568 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/dvipdfm/ChangeLog7
-rw-r--r--Build/source/texk/dvipdfm/dvipdfm.c2
-rw-r--r--Build/source/texk/dvipdfm/pdfobj.c5
-rw-r--r--Master/texmf/dvipdfm/config/config2
4 files changed, 12 insertions, 4 deletions
diff --git a/Build/source/texk/dvipdfm/ChangeLog b/Build/source/texk/dvipdfm/ChangeLog
index e80edd8fca6..e4efdccb07c 100644
--- a/Build/source/texk/dvipdfm/ChangeLog
+++ b/Build/source/texk/dvipdfm/ChangeLog
@@ -1,3 +1,10 @@
+2008-12-09 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+
+ * pdfobj.c (pdf_version): change default to 4.
+ (pdf_set_verson): don't limit upper bound to 3.
+ (pdf_out_init): magic bytes.
+ * dvipdfm.c (do_args): don't mention 3 as upper bound in error message.
+
2008-12-06 Karl Berry <karl@tug.org>
* dvipdfm.c (do_args): omit check of upper bound for minor
diff --git a/Build/source/texk/dvipdfm/dvipdfm.c b/Build/source/texk/dvipdfm/dvipdfm.c
index acc39c3be53..02b81ad906b 100644
--- a/Build/source/texk/dvipdfm/dvipdfm.c
+++ b/Build/source/texk/dvipdfm/dvipdfm.c
@@ -411,7 +411,7 @@ static void do_args (int argc, char *argv[])
} else {
char *result, *end, *start = argv[1];
if (argc < 2) {
- fprintf (stderr, "\nVersion specification missing number (2 or 3)\n\n");
+ fprintf (stderr, "\nVersion specification missing number (2, 3, ...)\n\n");
usage();
}
end = start + strlen(argv[1]);
diff --git a/Build/source/texk/dvipdfm/pdfobj.c b/Build/source/texk/dvipdfm/pdfobj.c
index 69ad6aadf1e..5280ea3778a 100644
--- a/Build/source/texk/dvipdfm/pdfobj.c
+++ b/Build/source/texk/dvipdfm/pdfobj.c
@@ -113,10 +113,10 @@ void pdf_obj_set_compression (int level)
return;
}
-static unsigned pdf_version = 3;
+static unsigned pdf_version = 4;
void pdf_set_version (unsigned version)
{
- if (version >= 2 && version <= 3) {
+ if (version >= 2 && version <= 7) {
pdf_version = version;
}
}
@@ -150,6 +150,7 @@ MEM_START
v = '0'+pdf_version;
pdf_out (pdf_output_file, &v, 1);
pdf_out (pdf_output_file, "\n", 1);
+ pdf_out (pdf_output_file, "\045\360\344\346\355\n", 6);
#ifdef MEM_DEBUG
MEM_END
#endif
diff --git a/Master/texmf/dvipdfm/config/config b/Master/texmf/dvipdfm/config/config
index e8e5b959947..ce86c46d403 100644
--- a/Master/texmf/dvipdfm/config/config
+++ b/Master/texmf/dvipdfm/config/config
@@ -25,7 +25,7 @@ g 1
% PDF version stamp to use in output file and max version of files
% allowed to be included (2 for 1.2, 3 for 1.3)
-V 2
+V 4
% For correct searching / text extraction:
f cm-dvipdfm-fix.map