texlive-bin updated
This commit is contained in:
@@ -0,0 +1,12 @@
|
||||
--- source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/noprefs.c.orig 2009-09-30 19:27:00.935039526 +0200
|
||||
+++ source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/noprefs.c 2009-09-30 19:28:04.908364646 +0200
|
||||
@@ -495,6 +495,9 @@
|
||||
{ "Big5HKSCS", e_big5hkscs },
|
||||
{ "Big5-HKSCS", e_big5hkscs },
|
||||
{ "UTF-8", e_utf8 },
|
||||
+ { "utf-8", e_utf8 },
|
||||
+ { "UTF8", e_utf8 },
|
||||
+ { "utf8", e_utf8 },
|
||||
{ "ISO-10646/UTF-8", e_utf8 },
|
||||
{ "ISO_10646/UTF-8", e_utf8 },
|
||||
{ "UCS2", e_unicode },
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,104 @@
|
||||
--- trunk/source/texk/web2c/luatexdir/image/epdf.h 2013/01/20 19:58:26 4559
|
||||
+++ trunk/source/texk/web2c/luatexdir/image/epdf.h 2014/01/02 15:35:31 4718
|
||||
@@ -40,21 +40,22 @@
|
||||
# include <goo/GooString.h>
|
||||
# include <goo/gmem.h>
|
||||
# include <goo/gfile.h>
|
||||
-# include "Object.h"
|
||||
-# include "Stream.h"
|
||||
-# include "Gfx.h"
|
||||
-# include "Annot.h"
|
||||
-# include "Array.h"
|
||||
-# include "Dict.h"
|
||||
-# include "XRef.h"
|
||||
-# include "Catalog.h"
|
||||
-# include "Link.h"
|
||||
-# include "Page.h"
|
||||
-# include "GfxFont.h"
|
||||
-# include "PDFDoc.h"
|
||||
-# include "GlobalParams.h"
|
||||
-# include "Error.h"
|
||||
-# include "FileSpec.h"
|
||||
+# include <Object.h>
|
||||
+# include <Stream.h>
|
||||
+# include <Gfx.h>
|
||||
+# include <Annot.h>
|
||||
+# include <Array.h>
|
||||
+# include <Dict.h>
|
||||
+# include <XRef.h>
|
||||
+# include <Catalog.h>
|
||||
+# include <StructTreeRoot.h>
|
||||
+# include <Link.h>
|
||||
+# include <Page.h>
|
||||
+# include <GfxFont.h>
|
||||
+# include <PDFDoc.h>
|
||||
+# include <GlobalParams.h>
|
||||
+# include <Error.h>
|
||||
+# include <FileSpec.h>
|
||||
|
||||
extern "C" {
|
||||
|
||||
@@ -81,8 +82,8 @@
|
||||
# include "utils/avlstuff.h"
|
||||
# include "pdf/pdftypes.h"
|
||||
|
||||
-# include "lua52/lua.h"
|
||||
-# include "lua52/lauxlib.h"
|
||||
+# include "lua.h"
|
||||
+# include "lauxlib.h"
|
||||
|
||||
/* pdfgen.w */
|
||||
extern int ten_pow[10];
|
||||
--- trunk/source/texk/web2c/luatexdir/lua/lepdflib.cc 2013/04/05 10:54:08 4629
|
||||
+++ trunk/source/texk/web2c/luatexdir/lua/lepdflib.cc 2014/01/02 15:35:31 4718
|
||||
@@ -65,6 +65,7 @@
|
||||
#define M_PDFRectangle "PDFRectangle"
|
||||
#define M_Ref "Ref"
|
||||
#define M_Stream "Stream"
|
||||
+#define M_StructTreeRoot "StructTreeRoot"
|
||||
#define M_XRefEntry "XRefEntry"
|
||||
#define M_XRef "XRef"
|
||||
|
||||
@@ -96,6 +97,7 @@
|
||||
new_poppler_userdata(PDFRectangle);
|
||||
new_poppler_userdata(Ref);
|
||||
new_poppler_userdata(Stream);
|
||||
+new_poppler_userdata(StructTreeRoot);
|
||||
new_poppler_userdata(XRef);
|
||||
|
||||
//**********************************************************************
|
||||
@@ -573,7 +575,11 @@
|
||||
|
||||
m_poppler_get_GOOSTRING(Catalog, getBaseURI);
|
||||
m_poppler_get_GOOSTRING(Catalog, readMetadata);
|
||||
+#ifdef GETSTRUCTTREEROOT_RETURNS_OBJECT
|
||||
m_poppler_get_poppler(Catalog, Object, getStructTreeRoot);
|
||||
+#else
|
||||
+m_poppler_get_poppler(Catalog, StructTreeRoot, getStructTreeRoot);
|
||||
+#endif
|
||||
|
||||
static int m_Catalog_findPage(lua_State * L)
|
||||
{
|
||||
@@ -2146,14 +2152,22 @@
|
||||
|
||||
static int m_PDFDoc_getStructTreeRoot(lua_State * L)
|
||||
{
|
||||
+#ifdef GETSTRUCTTREEROOT_RETURNS_OBJECT
|
||||
Object *obj;
|
||||
+#else
|
||||
+ StructTreeRoot *obj;
|
||||
+#endif
|
||||
udstruct *uin, *uout;
|
||||
uin = (udstruct *) luaL_checkudata(L, 1, M_PDFDoc);
|
||||
if (uin->pd != NULL && uin->pd->pc != uin->pc)
|
||||
pdfdoc_changed_error(L);
|
||||
if (((PdfDocument *) uin->d)->doc->getCatalog()->isOk()) {
|
||||
obj = ((PdfDocument *) uin->d)->doc->getStructTreeRoot();
|
||||
+#ifdef GETSTRUCTTREEROOT_RETURNS_OBJECT
|
||||
uout = new_Object_userdata(L);
|
||||
+#else
|
||||
+ uout = new_StructTreeRoot_userdata(L);
|
||||
+#endif
|
||||
uout->d = obj;
|
||||
uout->pc = uin->pc;
|
||||
uout->pd = uin->pd;
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,46 @@
|
||||
diff -ru texlive-source-orig/texk/web2c/pdftexdir/pdftoepdf.cc texlive-source/texk/web2c/pdftexdir/pdftoepdf.cc
|
||||
--- texlive-source-orig/texk/web2c/pdftexdir/pdftoepdf.cc 2020-01-07 22:42:03.717667766 +0000
|
||||
+++ texlive-source/texk/web2c/pdftexdir/pdftoepdf.cc 2020-01-07 22:47:42.818888622 +0000
|
||||
@@ -723,7 +723,7 @@
|
||||
#endif
|
||||
// initialize
|
||||
if (!isInit) {
|
||||
- globalParams = new GlobalParams();
|
||||
+ globalParams.reset(new GlobalParams());
|
||||
globalParams->setErrQuiet(false);
|
||||
isInit = true;
|
||||
}
|
||||
@@ -1108,6 +1108,5 @@
|
||||
delete_document(p);
|
||||
}
|
||||
// see above for globalParams
|
||||
- delete globalParams;
|
||||
}
|
||||
}
|
||||
diff -ru texlive-source-orig/texk/web2c/pdftexdir/pdftosrc.cc texlive-source/texk/web2c/pdftexdir/pdftosrc.cc
|
||||
--- texlive-source-orig/texk/web2c/pdftexdir/pdftosrc.cc 2020-01-07 22:42:03.714334387 +0000
|
||||
+++ texlive-source/texk/web2c/pdftexdir/pdftosrc.cc 2020-01-07 22:50:08.070708640 +0000
|
||||
@@ -79,7 +79,7 @@
|
||||
exit(1);
|
||||
}
|
||||
fileName = new GString(argv[1]);
|
||||
- globalParams = new GlobalParams();
|
||||
+ globalParams.reset(new GlobalParams());
|
||||
doc = new PDFDoc(fileName);
|
||||
if (!doc->isOk()) {
|
||||
fprintf(stderr, "Invalid PDF file\n");
|
||||
@@ -100,7 +100,7 @@
|
||||
if (objnum == 0) {
|
||||
srcStream = catalogDict.dictLookup("SourceObject");
|
||||
static char const_SourceFile[] = "SourceFile";
|
||||
- if (!srcStream.isStream(const_SourceFile)) {
|
||||
+ if (!srcStream.isDict(const_SourceFile)) {
|
||||
fprintf(stderr, "No SourceObject found\n");
|
||||
exit(1);
|
||||
}
|
||||
@@ -202,5 +202,4 @@
|
||||
fprintf(stderr, "Cross-reference table extracted to %s\n", outname);
|
||||
fclose(outfile);
|
||||
delete doc;
|
||||
- delete globalParams;
|
||||
}
|
||||
@@ -0,0 +1,44 @@
|
||||
From cf05aae9685e5c6a46b4313e7bfce49edc6f51f9 Mon Sep 17 00:00:00 2001
|
||||
From: Mikle Kolyada <zlogene@gentoo.org>
|
||||
Date: Tue, 31 Dec 2019 11:29:30 +0300
|
||||
Subject: [PATCH] poppler-0.84 compat
|
||||
|
||||
Upstream report: https://tug.org/pipermail/tex-k/2019-December/003096.html
|
||||
|
||||
Signed-off-by: Mikle Kolyada <zlogene@gentoo.org>
|
||||
---
|
||||
texk/web2c/pdftexdir/utils.c | 1 -
|
||||
texk/web2c/xetexdir/XeTeX_ext.c | 3 +++
|
||||
2 files changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/texk/web2c/pdftexdir/utils.c b/texk/web2c/pdftexdir/utils.c
|
||||
index c93a8781..6f866e76 100644
|
||||
--- a/texk/web2c/pdftexdir/utils.c
|
||||
+++ b/texk/web2c/pdftexdir/utils.c
|
||||
@@ -33,7 +33,6 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#include "ptexlib.h"
|
||||
#include <png.h>
|
||||
#ifdef POPPLER_VERSION
|
||||
-#include <poppler-config.h>
|
||||
#define xpdfVersion POPPLER_VERSION
|
||||
#define xpdfString "poppler"
|
||||
#else
|
||||
diff --git a/texk/web2c/xetexdir/XeTeX_ext.c b/texk/web2c/xetexdir/XeTeX_ext.c
|
||||
index 4968ee41..0aee4ee3 100644
|
||||
--- a/texk/web2c/xetexdir/XeTeX_ext.c
|
||||
+++ b/texk/web2c/xetexdir/XeTeX_ext.c
|
||||
@@ -38,7 +38,10 @@ authorization from the copyright holders.
|
||||
|
||||
#include <w2c/config.h>
|
||||
|
||||
+#ifndef POPPLER_VERSION
|
||||
#include <poppler-config.h>
|
||||
+#endif
|
||||
+
|
||||
#include <png.h>
|
||||
#include <zlib.h>
|
||||
#include <graphite2/Font.h>
|
||||
--
|
||||
2.24.1
|
||||
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
--- a/texk/web2c/pdftexdir/pdftoepdf.cc 2020-03-03 21:11:35.102711802 +0000
|
||||
+++ b/texk/web2c/pdftexdir/pdftoepdf.cc 2020-03-03 21:13:13.057420111 +0000
|
||||
@@ -757,7 +757,7 @@
|
||||
if (page_name) {
|
||||
// get page by name
|
||||
GString name(page_name);
|
||||
- LinkDest *link = pdf_doc->doc->findDest(&name);
|
||||
+ LinkDest *link = pdf_doc->doc->findDest(&name).get();
|
||||
if (link == 0 || !link->isOk())
|
||||
pdftex_fail("PDF inclusion: invalid destination <%s>", page_name);
|
||||
Ref ref = link->getPageRef();
|
||||
Reference in New Issue
Block a user