diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-10-24 14:26:46 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-10-24 14:26:46 +0000 |
commit | 3abca69ae2714caba89314bd9d7c003b10801c6c (patch) | |
tree | 79ce78c82d028584ff7a00d4f81c9cd443a1489c /Build/source/libs/paper/libpaper-1.1.24+nmu2-PATCHES | |
parent | 75e42af0e9b0601844032849e0a5be947c3ee237 (diff) |
libs/paper: Add libpaper 1.1.24+nmu2
git-svn-id: svn://tug.org/texlive/trunk@31986 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/paper/libpaper-1.1.24+nmu2-PATCHES')
4 files changed, 195 insertions, 0 deletions
diff --git a/Build/source/libs/paper/libpaper-1.1.24+nmu2-PATCHES/ChangeLog b/Build/source/libs/paper/libpaper-1.1.24+nmu2-PATCHES/ChangeLog new file mode 100644 index 00000000000..e6dc24f618b --- /dev/null +++ b/Build/source/libs/paper/libpaper-1.1.24+nmu2-PATCHES/ChangeLog @@ -0,0 +1,8 @@ +2013-10-24 Peter Breitenlohner <peb@mppmu.mpg.de> + + Imported libpaper-1.1.24+nmu2 source tree from: + ftp://ftp.de.debian.org/debian/pool/main/libp/libpaper + + * patch-01-JIS (new): Add JIS paper specs. + * patch-02-TL (new): No /etc/papersize for TeX Live. + diff --git a/Build/source/libs/paper/libpaper-1.1.24+nmu2-PATCHES/TL-Changes b/Build/source/libs/paper/libpaper-1.1.24+nmu2-PATCHES/TL-Changes new file mode 100644 index 00000000000..779b6d4ff35 --- /dev/null +++ b/Build/source/libs/paper/libpaper-1.1.24+nmu2-PATCHES/TL-Changes @@ -0,0 +1,23 @@ +Changes applied to the libpaper-1.1.24+nmu2/ tree as obtained from: + ftp://ftp.de.debian.org/debian/pool/main/libp/libpaper/ + +Removed: + COPYING + INSTALL + Makefile.in + aclocal.m4 + compile + config.guess + config.sub + configure + depcomp + install-sh + ltmain.sh + missing + mkinstalldirs + lib/Makefile.in + man/Makefile.in + src/Makefile.in + +Removed unused dirs: + debian diff --git a/Build/source/libs/paper/libpaper-1.1.24+nmu2-PATCHES/patch-01-JIS b/Build/source/libs/paper/libpaper-1.1.24+nmu2-PATCHES/patch-01-JIS new file mode 100644 index 00000000000..ce2016ad995 --- /dev/null +++ b/Build/source/libs/paper/libpaper-1.1.24+nmu2-PATCHES/patch-01-JIS @@ -0,0 +1,44 @@ +diff -ur libpaper-1.1.24+nmu2.orig/lib/paperspecs libpaper-1.1.24+nmu2/lib/paperspecs +--- libpaper-1.1.24+nmu2.orig/lib/paperspecs 2012-05-03 21:05:12.000000000 +0200 ++++ libpaper-1.1.24+nmu2/lib/paperspecs 2013-10-24 11:32:28.000000000 +0200 +@@ -40,6 +40,18 @@ + c6 114 162 mm + c7 81 114 mm + c8 57 81 mm ++jisb0 1030 1456 mm ++jisb1 728 1030 mm ++jisb2 515 728 mm ++jisb3 364 515 mm ++jisb4 257 364 mm ++jisb5 182 257 mm ++jisb6 128 182 mm ++jisb7 91 128 mm ++jisb8 64 91 mm ++jisb9 45 64 mm ++jisb10 32 45 mm ++b5var 182 230 mm + DL 110 220 mm + Comm10 297 684 + Monarch 279 540 +diff -ur libpaper-1.1.24+nmu2.orig/lib/paperspecs.h libpaper-1.1.24+nmu2/lib/paperspecs.h +--- libpaper-1.1.24+nmu2.orig/lib/paperspecs.h 2012-05-04 12:11:27.000000000 +0200 ++++ libpaper-1.1.24+nmu2/lib/paperspecs.h 2013-10-24 11:32:42.000000000 +0200 +@@ -43,6 +43,18 @@ + { "c6", 323.149606, 459.212598 }, + { "c7", 229.606299, 323.149606 }, + { "c8", 161.574803, 229.606299 }, ++ { "jisb0", 2919.685039, 4127.244094 }, ++ { "jisb1", 2063.622047, 2919.685039 }, ++ { "jisb2", 1459.842520, 2063.622047 }, ++ { "jisb3", 1031.811024, 1459.842520 }, ++ { "jisb4", 728.503937, 1031.811024 }, ++ { "jisb5", 515.905512, 728.503937 }, ++ { "jisb6", 362.834646, 515.905512 }, ++ { "jisb7", 257.952756, 362.834646 }, ++ { "jisb8", 181.417323, 257.952756 }, ++ { "jisb9", 127.559055, 181.417323 }, ++ { "jisb10", 90.708661, 127.559055 }, ++ { "b5var", 515.905512, 651.968504 }, + { "DL", 311.811024, 623.622047 }, + { "Comm10", 297.000000, 684.000000 }, + { "Monarch", 279.000000, 540.000000 }, diff --git a/Build/source/libs/paper/libpaper-1.1.24+nmu2-PATCHES/patch-02-TL b/Build/source/libs/paper/libpaper-1.1.24+nmu2-PATCHES/patch-02-TL new file mode 100644 index 00000000000..c83c09fe847 --- /dev/null +++ b/Build/source/libs/paper/libpaper-1.1.24+nmu2-PATCHES/patch-02-TL @@ -0,0 +1,120 @@ +diff -ur libpaper-1.1.24+nmu2.orig/lib/paper.c libpaper-1.1.24+nmu2/lib/paper.c +--- libpaper-1.1.24+nmu2.orig/lib/paper.c 2010-04-24 14:12:11.000000000 +0200 ++++ libpaper-1.1.24+nmu2/lib/paper.c 2013-10-24 15:45:37.955710461 +0200 +@@ -87,24 +87,11 @@ + } + + const char* defaultpapersizefile(void) { +- return PAPERCONF; ++ return NULL; + } + + const char* systempapersizefile(void) { +- const char* paperconf = getenv(PAPERCONFVAR); +-/* +-Previously PAPERCONFVAR used to contain a paper name and PAPERSIZEVAR +-contained a file path. Now they're reversed. If we don't find a '/' +-in PAPERCONFVAR, fall-back to the old behaviour. +-*/ +- +- if ((paperconf != NULL) && (strchr(paperconf, '/') == NULL)) { +- paperconf = getenv(PAPERSIZEVAR); +- if ((paperconf != NULL) && (strchr(paperconf, '/') == NULL)) +- paperconf = NULL; +- } +- +- return paperconf ? paperconf : defaultpapersizefile(); ++ return NULL; + } + + const char* defaultpapername(void) { +@@ -112,26 +99,14 @@ + } + + char* systempapername(void) { +- const char* paperconf; + char* paperstr; + char* paperenv; + const char* paperdef; +- FILE* ps; +- struct stat statbuf; + const struct paper* pp; +- int c; +- +-/* +-Previously PAPERSIZEVAR used to contain a file path and PAPERCONFVAR +-contained a paper name. Now they're reversed. If we find a '/' in +-PAPERSIZEVAR, fall-back to the old behaviour. +-*/ + + paperenv = getenv(PAPERSIZEVAR); + if ((paperenv != NULL) && (strchr(paperenv, '/') != NULL)) { +- paperenv = getenv(PAPERCONFVAR); +- if ((paperenv != NULL) && (strchr(paperenv, '/') != NULL)) +- paperenv = NULL; ++ paperenv = NULL; + } + + if (paperenv) { +@@ -145,61 +120,6 @@ + return strcpy(paperstr, paperenv); + } + +- paperconf = systempapersizefile(); +- if (paperconf && stat(paperconf, &statbuf) == -1) return 0; +- +- if (!paperconf) paperconf = defaultpapersizefile(); +- +- if ((stat(paperconf, &statbuf) != -1) && +- (ps = fopen(paperconf, "r"))) { +- +- while ((c = getc(ps)) != EOF) { +- if (c == '#') { +- while ((c = getc(ps)) != EOF && c != '\n'); +- if (c == EOF) { +- break; +- } +- } else if (!isspace(c)) { +- unsigned n = 0, m = 64; +- char* papername = malloc(m * sizeof(char)); +- +- if (!papername) { +- fclose(ps); +- return 0; +- } +- +- do { +- if (n == m-1) { +- char* newpaper = realloc(papername, +- (m *= 2) * sizeof(char)); +- if (!newpaper) { +- free(papername); +- fclose(ps); +- return 0; +- } +- papername = newpaper; +- } +- papername[n++] = c; +- } while ((c = getc(ps)) != EOF && !isspace(c)); +- +- papername[n] = 0; +- +- fclose(ps); +- +- paperstr = malloc((strlen(papername) + 1) * sizeof(char)); +- if (! paperstr) return 0; +- +- strcpy(paperstr, papername); +- free(papername); +- +- if ((pp = paperinfo(paperstr))) +- return strcpy(paperstr, pp->name); +- else +- return paperstr; +- } +- } +- } +- + paperdef = defaultpapername(); + paperstr = malloc((strlen(paperdef) + 1) * sizeof(char)); + |