Menu
▾
▴
CVS: dists/10.2/stable/main/finkinfo/text pdftex-20010417-10.info,NONE,1.1 pdftex-20010417-10.patch,NONE,1.1 pdftex-20010417-9.info,1.2,NONE pdftex-20010417-9.patch,1.1,NONE
|
From: David R. M. <dm...@us...> - 2003-01-11 18:33:52
|
Update of /cvsroot/fink/dists/10.2/stable/main/finkinfo/text
In directory sc8-pr-cvs1:/tmp/cvs-serv31709
Added Files:
pdftex-20010417-10.info pdftex-20010417-10.patch
Removed Files:
pdftex-20010417-9.info pdftex-20010417-9.patch
Log Message:
move to stable
--- NEW FILE: pdftex-20010417-10.info ---
Package: pdftex
Version: 20010417
Revision: 10
Depends: libpng-shlibs, libwww-bin, libtiff-bin, ghostscript | ghostscript-nox | ghostscript6 | ghostscript6-nox, tetex-base (>= 1.0-12), fink (>= 0.9.3)
GCC: 3.1
BuildDepends: libpng (>= 1.0.12-3), libtiff (>= 3.5.7-5), libwww, dlcompat-dev
Conflicts: system-tetex
Source: mirror:ctan:obsolete/systems/pdftex/0.14h/pdftex-%v.tgz
SourceDirectory: src
Source-MD5: 207723f3a322690c17e1246bfa6dbe70
Source2: mirror:ctan:systems/unix/teTeX/current/distrib/sources/LICENSE
NoSource2Directory: true
Source2Rename: tetex-LICENSE
Source2-MD5: 712ee2a5dced37456f5f984861b0c609
UpdateConfigGuessInDirs: . config texinfo texk
Patch: %f.patch
SetCPPFLAGS: -no-cpp-precomp
SetCXXFLAGS: -fno-rtti
SetLDFLAGS: -flat_namespace
ConfigureParams: --datadir='${prefix}/share' --infodir='${prefix}/share/info' --mandir='${prefix}/share/man' --without-texinfo --disable-multiplatform --with-system-zlib --with-system-ncurses --with-system-pnglib --with-system-wwwlib --without-x --without-dialog --with-system-tifflib
CompileScript: <<
./configure %c
(cd texk/web2c; make pdftex pdfetex)
<<
InstallScript: <<
mkdir -p %i/bin
mkdir -p %i/share/texmf/web2c
install -p -m 755 texk/web2c/pdftex %i/bin
install -p -m 755 texk/web2c/pdfetex %i/bin
strip %i/bin/pdftex %i/bin/pdfetex
ln -s %p/bin/pdftex %i/bin/pdflatex
ln -s %p/bin/pdftex %i/bin/pdfinitex
ln -s %p/bin/pdftex %i/bin/pdfvirtex
ln -s %p/bin/pdfetex %i/bin/pdfelatex
ln -s %p/bin/pdfetex %i/bin/pdfeinitex
ln -s %p/bin/pdfetex %i/bin/pdfevirtex
install -p -m 755 texk/web2c/pdftex.pool %i/share/texmf/web2c
install -p -m 755 texk/web2c/pdfetex.pool %i/share/texmf/web2c
<<
DocFiles: texk/web2c/pdftexdir/readme ../tetex-LICENSE
License: OSI-Approved
PreRmScript: <<
rm -f %p/etc/texmf.local/web2c/pdf*.efmt
rm -f %p/etc/texmf.local/web2c/pdf*.fmt
rm -f %p/etc/texmf.local/web2c/pdf*.log
<<
PostRmScript: <<
if [ -f %p/bin/mktexlsr ]; then %p/bin/mktexlsr %p/share/texmf; %p/bin/mktexlsr %p/etc/texmf.local; fi
<<
PostInstScript: <<
if [ -f %p/bin/mktexlsr ]; then %p/bin/mktexlsr %p/share/texmf; fi
fmtutil --byfmt pdftex
fmtutil --byfmt pdfetex
fmtutil --byfmt pdflatex
fmtutil --byfmt pdfelatex
if [ -f %p/bin/mktexlsr ]; then %p/bin/mktexlsr %p/etc/texmf.local; fi
<<
Description: Generate PDF from TeX directly
DescDetail: <<
An extension of TeX which directly generates PDF documents instead of DVI.
<<
DescPort: <<
Lots of linker warnings are removed by
SetLDFLAGS: -flat_namespace
Patches to cpascal.h, eofeoln.c, and writet1.c from Gerben Wierda which allow
(pdf)TeX to recognize Macintosh line breaks in input files.
Added -fno-rtti to workaround a bug in the gcc3.1 compiler.
<<
Maintainer: Dave Morrison <dm...@us...>
Homepage: http://www.tug.org/applications/pdftex/
--- NEW FILE: pdftex-20010417-10.patch ---
diff -c2 -r -N teTeX-src-beta-20001218.org/texk/web2c/cpascal.h teTeX-src-beta-20001218/texk/web2c/cpascal.h
*** teTeX-src-beta-20001218.org/texk/web2c/cpascal.h Sun Feb 14 13:04:45 1999
--- teTeX-src-beta-20001218/texk/web2c/cpascal.h Sat May 26 01:39:18 2001
***************
*** 83,87 ****
#endif
#define read(f,b) ((b) = getc (f))
! #define readln(f) { register int c; while ((c=getc(f)) != '\n' && c != EOF); }
/* We hope this will be efficient than the `x = x - 1' that decr would
--- 83,94 ----
#endif
#define read(f,b) ((b) = getc (f))
! #define readln(f) { \
! register c; \
! while ((c = getc (f)) != '\n' && c != '\r' && c != EOF); \
! if (c == '\r') { \
! c = getc (f); \
! if (c != '\n') ungetc (c, f); \
! } \
! }
/* We hope this will be efficient than the `x = x - 1' that decr would
diff -c2 -r -N teTeX-src-beta-20001218.org/texk/web2c/lib/eofeoln.c teTeX-src-beta-20001218/texk/web2c/lib/eofeoln.c
*** teTeX-src-beta-20001218.org/texk/web2c/lib/eofeoln.c Tue Feb 10 15:14:26 1998
--- teTeX-src-beta-20001218/texk/web2c/lib/eofeoln.c Sat May 26 01:39:18 2001
***************
*** 48,51 ****
(void) ungetc (c, file);
! return c == '\n' || c == EOF;
}
--- 48,51 ----
(void) ungetc (c, file);
! return c == '\n' || c == '\r' || c == EOF;
}
--- src/texk/web2c/pdftexdir/writet1.c 2001/06/15 22:54:57 1.1
+++ src/texk/web2c/pdftexdir/writet1.c 2001/06/22 14:40:39 1.7
@@ -199,7 +199,8 @@
static unsigned short t1_dr, t1_er;
static unsigned short t1_c1 = 52845, t1_c2 = 22719;
-static unsigned short t1_cslen, t1_lenIV;
+static unsigned short t1_cslen;
+static short t1_lenIV;
static char t1_line[T1_BUF_SIZE], t1_buf[T1_BUF_SIZE], *t1_line_ptr;
static char enc_line[ENC_BUF_SIZE];
@@ -213,6 +214,19 @@
static char *subr_array_start, *subr_array_end;
static int subr_max, subr_size, subr_size_pos;
+/* This array contains the begin/end tokens commonly used in the */
+/* /Subrs array of a Type 1 font. */
+static char *cs_token_pairs[4][2] = {
+ {"RD", "NP"},
+ {"-|", "|"},
+ {"RD", "noaccess put"},
+ {"-|", "noaccess put"}
+};
+
+/* Which begin/end token set do we use for the font? */
+static int cs_token_choice = -1;
+static boolean cs_tokens_found = false;
+
static boolean t1_pfa, t1_cs, t1_scan, t1_eexec_encrypt, t1_synthetic;
static int t1_in_eexec; /* 0 before eexec-encrypted, 1 during, 2 after */
static long t1_block_length;
@@ -222,6 +236,7 @@
#define str_prefix(s1, s2) (strncmp(s1, s2, strlen(s2)) == 0)
#define t1_prefix(s) str_prefix(t1_line, s)
+#define t1_buf_prefix(s) str_prefix(t1_buf, s)
#define t1_charstrings() strstr(t1_line, "/CharStrings")
#define t1_subrs() t1_prefix("/Subrs")
#define t1_end_eexec() t1_suffix("mark currentfile closefile")
@@ -417,6 +432,13 @@
return cipher;
}
+static byte cencrypt(byte plain, unsigned short *cr)
+{
+ byte cipher = (plain^(*cr >> 8));
+ *cr = (cipher + *cr)*t1_c1 + t1_c2;
+ return cipher;
+}
+
static char *eol(char *s)
{
char *p = strend(s);
@@ -456,6 +478,19 @@
return s1 >= t1_line - 1;
}
+static boolean t1_buf_suffix(char *s, char *r)
+{
+ char *s1 = r - 1,
+ *s2 = strend(s) - 1;
+ if (*s1 == 10)
+ s1--;
+ while (s1 >= t1_buf && s2 >= s) {
+ if (*s1-- != *s2--)
+ return false;
+ }
+ return s1 >= t1_buf - 1;
+}
+
static void t1_getline(void)
{
int c, l, eexec_scan;
@@ -1055,10 +1090,22 @@
else
ptr->name = xstrdup(t1_buf + 1);
}
- memcpy(t1_buf, cs_start - 4, (unsigned)(t1_cslen + 4)); /* copy " RD " + cs data to t1_buf */
- for (p = cs_start + t1_cslen, q = t1_buf + t1_cslen + 4; *p != 10; *q++ = *p++);
+ /* copy " RD " + cs data to t1_buf */
+ memcpy(t1_buf, cs_start - 4, (unsigned)(t1_cslen + 4));
/* copy the end of cs data to t1_buf */
- *q++ = 10;
+ for (p = cs_start + t1_cslen, q = t1_buf + t1_cslen + 4; *p != 10; *q++ = *p++);
+ *q++ = 10;
+ /* get the begin/end token pairs. Modify this as necessary for other token pairs. */
+ if (is_subr && !cs_tokens_found) {
+ if (t1_buf_prefix(" RD") && t1_buf_suffix("NP", q))
+ { cs_token_choice = 0; cs_tokens_found = true; }
+ else if (t1_buf_prefix(" -|") && t1_buf_suffix("|", q))
+ { cs_token_choice = 1; cs_tokens_found = true; }
+ else if (t1_buf_prefix(" RD") && t1_buf_suffix("noaccess put", q))
+ { cs_token_choice = 2; cs_tokens_found = true; }
+ else if (t1_buf_prefix(" -|") && t1_buf_suffix("noaccess put", q))
+ { cs_token_choice = 3; cs_tokens_found = true; }
+ }
ptr->len = q - t1_buf;
ptr->cslen = t1_cslen;
ptr->data = xtalloc(ptr->len, byte);
@@ -1447,16 +1494,18 @@
static void t1_flush_cs(boolean is_subr)
{
char *p;
+ byte *r, return_cs[T1_BUF_SIZE];
cs_entry *tab, *end_tab, *ptr;
char *start_line, *line_end;
int count, size_pos;
+ unsigned short cr, cs_len;
if (is_subr) {
start_line = subr_array_start;
line_end = subr_array_end;
size_pos = subr_size_pos;
tab = subr_tab;
- end_tab = subr_tab + subr_size;
count = subr_max + 1;
+ end_tab = subr_tab + count;
}
else {
start_line = cs_dict_start;
@@ -1475,7 +1524,23 @@
strcat(t1_line_ptr, p);
t1_line_ptr = eol(t1_line);
t1_putline();
+
+ if (is_subr) {
+ cr = 4330;
+ cs_len = 0;
+ if (t1_lenIV >= 0) {
+ for (cs_len = 0, r = return_cs; cs_len < t1_lenIV; cs_len++, r++)
+ *r = cencrypt(0x00, &cr);
+ *r = cencrypt(CS_RETURN, &cr);
+ }
+ else {
+ *return_cs = CS_RETURN;
+ }
+ cs_len++;
+ }
+
for (ptr = tab; ptr < end_tab; ptr++) {
+
if (ptr->used) {
if (is_subr)
sprintf(t1_line, "dup %u %u", ptr - tab, ptr->cslen);
@@ -1486,6 +1551,19 @@
t1_line_ptr = p + ptr->len;
t1_putline();
}
+ else {
+ if (is_subr) {
+ sprintf(t1_line, "dup %u %u %s ", ptr - tab, cs_len,
+ cs_token_pairs[cs_token_choice][0]);
+ p = strend(t1_line);
+ memcpy(p, return_cs, cs_len);
+ t1_line_ptr = p + cs_len;
+ t1_putline();
+ sprintf(t1_line, " %s", cs_token_pairs[cs_token_choice][1]);
+ t1_line_ptr = eol(t1_line);
+ t1_putline();
+ }
+ }
xfree(ptr->data);
if (ptr->name != 0 && ptr->name != notdef)
xfree(ptr->name);
@@ -1493,6 +1571,10 @@
sprintf(t1_line, "%s", line_end);
t1_line_ptr = eol(t1_line);
t1_putline();
+ if (is_subr) {
+ cs_token_choice = -1;
+ cs_tokens_found = false;
+ }
xfree(tab);
xfree(start_line);
xfree(line_end);
@@ -1563,8 +1645,11 @@
}
cs_dict_end = xstrdup(t1_line);
t1_mark_glyphs();
- if (subr_tab != 0)
+ if (subr_tab != 0) {
+ if (cs_token_choice == -1)
+ pdftex_fail("This Type 1 font uses mismatched subroutine begin/end token pairs.");
t1_subr_flush();
+ }
for (cs_count = 0, ptr = cs_tab; ptr < cs_ptr; ptr++)
if (ptr->used)
cs_count++;
--- pdftex-20010417-9.info DELETED ---
--- pdftex-20010417-9.patch DELETED ---
|