;
#print STDERR "<$so>$sn\n";
if($so ne $sn) {
if(!$inlist) {
$inlist = 1;
push(@symlist, $sym);
}
if($sn =~ m|^(/\S+)\s+\{|) {
$nstop = 1;
#printf STDERR "stop at $1\n";
}
}
}
}
unshift(@symlist, $cmd, '-c', $oldf, $newf);
#printf("%s\n", join(' ', @symlist));
exec @symlist;
ttf2ufm-3.4.4~r2.orig/other/bzscreen.h 0000644 0001750 0001750 00000001734 11474170642 017156 0 ustar ondrej ondrej /*
* see COPYRIGHT
*/
/*
* Screen for drawing the Bezier curves in text mode
*/
struct screen {
unsigned physx;
unsigned physy;
unsigned cols;
unsigned rows;
unsigned xoff;
unsigned yoff;
unsigned minx;
unsigned miny;
char *dots;
double xscale;
double yscale;
} screen;
#define screenabsdot(x,y) (screen.dots[(y)*screen.cols+(x)])
#define screendot(x,y) screenabsdot((x)+screen.xoff, (y)+screen.yoff)
/* prototypes */
double fmin(double a, double b);
int abs(int x);
void initscreen(unsigned physx, unsigned physy,
unsigned cols, unsigned rows, unsigned xoff, unsigned yoff,
unsigned minx, unsigned miny, unsigned maxx, unsigned maxy);
void drawcurve(int mark, int ax,int ay,
int bx,int by, int cx,int cy, int dx,int dy);
void drawcurvedir(int mark, int ax,int ay,
int bx,int by, int cx,int cy, int dx,int dy);
void drawdot(int mark, int x, int y);
void setabsdot(int mark, int x, int y);
void setfdot(int mark, double x, double y);
void printscreen(FILE *f);
ttf2ufm-3.4.4~r2.orig/other/Makefile 0000644 0001750 0001750 00000000566 11474170642 016634 0 ustar ondrej ondrej
PROGS= bz cmpf dmpf
BZOBJS= bz.o bzscreen.o
CFLAGS= -g
all: $(PROGS)
clean:
rm -f $(PROGS) *.o *.core core.* core
bz: $(BZOBJS)
$(CC) $(CFLAGS) -o bz $(BZOBJS)
cmpf: cmpf.c bmpfont.h
$(CC) $(CFLAGS) -o cmpf -I/usr/local/include -L/usr/local/lib cmpf.c -lt1 -lm
dmpf: dmpf.c bmpfont.h
$(CC) $(CFLAGS) -o dmpf -I/usr/local/include -L/usr/local/lib dmpf.c -lt1 -lm
ttf2ufm-3.4.4~r2.orig/other/README.html 0000644 0001750 0001750 00000012716 11474170642 017017 0 ustar ondrej ondrej
Supplements for True Type to PostScript Type 1 Converter
Supplements for True Type to PostScript Type 1 Converter
bz
A small program to draw the Bezier curves on an alphanumeric display.
The recommended way of uing it is to run it from xterm with "Tiny"
(if you want higher magnification) or "Unreadable" (if you want
higher resolution) font and as big window size as possible. The size
of the window can be obtained by running "stty -a". For everything else
just "Use the source, Luke!"
cmpf
A small program to compare the rendering of two supposedly
nearly-identical fonts at low resolutions. It requires the
T1LIB library. This program may be used to compare the
effect of various options of the converter on the resulting
fonts. Create two .pfa files, one with one set of options,
another with another set of options, then use this program
to compare them.
dmpf
A small program to dump the bitmaps of all glyphs of the font
at low pixel sizes, up to 20 pixels. It requires the
T1LIB library. This program may be used to compare the
effect of changes in the T1LIB rasterizer and just for visual
search for rendering anomalies.
lst.pl
A simple PERL script that generates an HTML file
with the full list of all characters in all
possible styles of the Variable-width and Fixed-width
fonts. This file is quite convenient to look
at the converted fonts in Netscape (or other
graphical browser).
cntstems.pl
A simple PERL script that counts the required hint stack in the
interpreter to rasterize the glyphs of the font. May be quite
useful in search for missing glyphs which may be aborted due to
insufficient stack depth.
showg
A PERL script that draws the glyphs and their interesting
metrics (such as coordinates of the dots, hints and blue zones)
in PostScript. It works only with un-encoded font files generated
by ttf2pt1. The intended use is like:
showg [-c <fontfile.t1a>]... <fontfile.t1a> <glyph-to-draw>... >file.ps
gv file.ps # start the Ghostscript viewer
As you can see, multiple glyphs may be specified. The glyphs may be
specified in one of three ways:
- as a decimal code (for example, 43 )
- as a glyph name preceded by a slash (for example, /plus )
- as a literal character preceded by a dot (for example, .+ )
So for example the following command would draw the same glyph "left
parenthesis" three times:
showg file.t1a 40 /parenleft .\( >/file.ps
Don't forget that some characters have to be protected from the shell
by backslash as shown above, or else the shell would try to interpret
them before passing to the program.
One file (given as the first argument) is considered the main file
but multiple files can be specified with option -c for visual comparison
of the outlines. The glyphs from the main file are drawn in black
and supplemented with coordinate grid and sidebars for hints. The
glyphs from the comparison files are drawn in slightly lighter colors
(red, cyan, brown) and no supplemental information is provided for them.
Each use of option -c adds one comparison file, this option may be used
multiple times. If there are more than 3 comparison files the colors
repeat cyclically.
So for example the following command would draw the same glyph "left
parenthesis" from three files on the same page:
showg -c fileA.t1a -c fileB.t1a file.t1a .\( >/file.ps
This program is quite valuable it you want to take a close-up view at
the font.
The outlines are drawn in black, the ends of the curves and
lines are marked as dots, the first dots of the outlines
are fatter. The Blue Zones are drawn in light blue. The
substituted hints are marked in red, the global hints are
marked in blue. The coordinate grid is drawn in green.
The stems and the values of coordinates are for convenience
marked twice, on each size of the picture.
showdf
A Perl script to find a list of differing glyphs in two versions of a font
file (for example, converted with different versions of ttf2pt1 or
with different options given to ttf2pt1) and feed this list into the showg
program for display. The intended use is like:
showdf <showg-location> <fontfile1.t1a> <fontfile2.t1a> >file.ps
gv file.ps # start the Ghostscript viewer
If both showdf and showg scripts are located in the
same directory, the command would look like:
./showdf ./showg font1.t1a font2.t1a >file.ps
For decent results both font files should be converted from the same original
font and contain the same glyphs with the same names in the same order.
Otherwise most probably all the glyphs will be included, or a failure may
happen if some glyph is not found in one of the files. It is also a good
idea to convert the fonts for comparison with hinting disabled, otherwise
the differences in hinting may trigger the otherwise equal glyphs to be shown.
ttf2ufm-3.4.4~r2.orig/other/bzscreen.c 0000644 0001750 0001750 00000010030 11474170642 017136 0 ustar ondrej ondrej /*
* see COPYRIGHT
*/
#include
#include
#include "bzscreen.h"
/*
* functions to draw the bezier curves in text mode
*/
double
fmin(a,b)
double a, b;
{
if(a cols || physy+yoff > rows) {
fprintf(stderr, "*** drawable area out of screen\n");
exit(1);
}
if(minx>maxx || miny>maxy) {
fprintf(stderr, "*** empty drawable area\n");
exit(1);
}
screen.physx = physx;
screen.physy = physy;
screen.rows = rows;
screen.cols = cols+2; /* for '\n\0' */
screen.xoff = xoff;
screen.yoff = yoff;
screen.minx = minx;
screen.miny = miny;
if(( screen.dots=malloc(screen.rows*screen.cols) )==NULL) {
perror("*** no memory for screen: ");
exit(1);
}
j=screen.rows*screen.cols;
for(i=0; i abs(bx-ax) ) {
if(by>ay)
markb='^';
else
markb='v';
} else {
if(bx>ax)
markb='>';
else
markb='<';
}
if(dx==cx && dy==cy) {
marke=mark;
} else if( abs(dy-cy) > abs(dx-cx) ) {
if(dy>cy)
marke='^';
else
marke='v';
} else {
if(dx>cx)
marke='>';
else
marke='<';
}
for(i=1; i=screen.physy || x<0 || x>=screen.physx)
return;
screendot(x,y)=mark;
}
void
setabsdot(mark, x, y)
int x, y, mark;
{
if(y<0 || y>=screen.rows || x<0 || x>=screen.cols-2)
return;
screenabsdot(x,y)=mark;
}
void
setfdot(mark, fx, fy)
int mark;
double fx, fy;
{
int x, y;
x=(int)(fx*screen.xscale+0.5);
y=(int)(fy*screen.yscale+0.5);
if(y<0 || y>=screen.physy || x<0 || x>=screen.physx)
return;
screendot(x,y)=mark;
}
/* destructive */
void
printscreen(f)
FILE *f;
{
int r;
char *pi, *pc;
for(r=screen.rows-1; r>=0; r--) {
pc=&screenabsdot(0,r);
for(pi=&screenabsdot(-2,r+1); pi>=pc && *pi == ' '; pi--)
{}
pi[1]='\n';
pi[2]=0;
fputs(pc, f);
}
}
ttf2ufm-3.4.4~r2.orig/ttf.h 0000644 0001750 0001750 00000007032 11474170642 015014 0 ustar ondrej ondrej /*
* see COPYRIGHT
*/
/* these definitions are mostly taken from Microsoft's True Type
documentation.
*/
#define BYTE unsigned char
#define CHAR signed char
#define USHORT unsigned short
#define SHORT signed short
#define ULONG unsigned int
#define LONG signed int
#define FWORD SHORT
#define UFWORD USHORT
#define ONOROFF 0x01
#define XSHORT 0x02
#define YSHORT 0x04
#define REPEAT 0x08
#define XSAME 0x10
#define YSAME 0x20
#define ARG_1_AND_2_ARE_WORDS 0x0001
#define ARGS_ARE_XY_VALUES 0x0002
#define XY_BOUND_TO_GRID 0x0004
#define WE_HAVE_A_SCALE 0x0008
#define MORE_COMPONENTS 0x0020
#define WE_HAVE_AN_X_AND_Y_SCALE 0x0040
#define WE_HAVE_A_TWO_BY_TWO 0x0080
#define WE_HAVE_INSTRUCTIONS 0x0100
#define USE_MY_METRICS 0x0200
typedef struct short_2 {
SHORT upper;
USHORT lower;
} FIXED ;
typedef struct longhormetric {
UFWORD advanceWidth;
FWORD lsb;
} LONGHORMETRIC;
typedef struct ttf_hhea {
BYTE version[4];
SHORT ascender, descender, lineGap;
USHORT advnaceWidthMax;
SHORT minLSB, minRSB, xMaxExtent;
SHORT caretSlopeRise, caretSlopeRun;
SHORT reserved[5];
SHORT metricDataFormat;
USHORT numberOfHMetrics;
} TTF_HHEA;
typedef struct ttf_dir_entry {
char tag[4];
ULONG checksum;
ULONG offset;
ULONG length;
} TTF_DIR_ENTRY ;
typedef struct ttf_directory {
ULONG sfntVersion;
USHORT numTables;
USHORT searchRange;
USHORT entrySelector;
USHORT rangeShift;
TTF_DIR_ENTRY list;
} TTF_DIRECTORY ;
typedef struct ttf_name_rec {
USHORT platformID;
USHORT encodingID;
USHORT languageID;
USHORT nameID;
USHORT stringLength;
USHORT stringOffset;
} TTF_NAME_REC;
typedef struct ttf_name {
USHORT format;
USHORT numberOfNameRecords;
USHORT offset;
TTF_NAME_REC nameRecords;
} TTF_NAME ;
typedef struct ttf_head {
ULONG version;
ULONG fontRevision;
ULONG checksumAdjust;
ULONG magicNo;
USHORT flags;
USHORT unitsPerEm;
BYTE created[8];
BYTE modified[8];
FWORD xMin, yMin, xMax, yMax;
USHORT macStyle, lowestRecPPEM;
SHORT fontDirection, indexToLocFormat, glyphDataFormat;
} TTF_HEAD ;
typedef struct ttf_kern {
USHORT version, nTables;
} TTF_KERN ;
typedef struct ttf_kern_sub {
USHORT version, length, coverage;
USHORT nPairs, searchRange, entrySelector, rangeShift;
} TTF_KERN_SUB;
typedef struct ttf_kern_entry {
USHORT left, right;
FWORD value;
} TTF_KERN_ENTRY;
typedef struct ttf_cmap_fmt0 {
USHORT format;
USHORT length;
USHORT version;
BYTE glyphIdArray[256];
} TTF_CMAP_FMT0;
typedef struct ttf_cmap_fmt4 {
USHORT format;
USHORT length;
USHORT version;
USHORT segCountX2;
USHORT searchRange;
USHORT entrySelector;
USHORT rangeShift;
} TTF_CMAP_FMT4;
typedef struct ttf_cmap_entry {
USHORT platformID;
USHORT encodingID;
ULONG offset;
} TTF_CMAP_ENTRY;
typedef struct ttf_cmap {
USHORT version;
USHORT numberOfEncodingTables;
TTF_CMAP_ENTRY encodingTable[1];
} TTF_CMAP ;
typedef struct ttf_glyf {
SHORT numberOfContours;
FWORD xMin, yMin, xMax, yMax;
} TTF_GLYF ;
typedef struct ttf_maxp {
ULONG version;
USHORT numGlyphs, maxPoints, maxContours;
USHORT maxCompositePoints, maxCompositeContours;
USHORT maxZones, maxTwilightPoints, maxStorage;
USHORT maxFunctionDefs, maxInstructionsDefs;
USHORT maxSizeOfInstructions, maxComponentElements;
USHORT maxComponentDepth;
} TTF_MAXP ;
typedef struct ttf_post_head {
ULONG formatType;
FIXED italicAngle;
FWORD underlinePosition;
FWORD underlineThickness;
ULONG isFixedPitch;
ULONG minMemType42;
ULONG maxMemType42;
ULONG minMemType1;
ULONG maxMemType1;
USHORT numGlyphs;
USHORT glyphNameIndex;
} TTF_POST_HEAD ;
ttf2ufm-3.4.4~r2.orig/Makefile 0000644 0001750 0001750 00000017112 11474170642 015506 0 ustar ondrej ondrej
# This file should be configured before running `make'.
# Uncomment or change the values that are relevant for your OS.
# The preferred C compiler (by default use the OS-specific default value).
# For BSD/OS, FreeBSD, Linux (all flavors), NetBSD, OpenBSD the default
# compiler is GNU C.
# (Note please the politically correct ordering by alphabet ! :-)
#
# Use GNU C even if it's not the default compiler
#
#CC=gcc
#
# Use the standard ANSI C compiler on HP-UX even if it's not default
#
#CC=c89
#
# The system-dependent flags for the C compiler
#
# Default
CFLAGS_SYS= -g
# For GNU C
#
#CFLAGS_SYS= -O2
#
# For GNU C with long options support library (Linux etc.)
#
#CFLAGS_SYS= -O2 -D_GNU_SOURCE
#
# For GNU C on HP-UX/PA-RISC 1.1
#
#CFLAGS_SYS= -O2 -Wa,-w
#
# For the standard ANSI C on HP-UX
#
#CFLAGS_SYS= +O2 -D_HPUX_SOURCE
#
# The system-dependent libraries
#
# Defalut (for the BSD-style OSes)
LIBS_SYS= -lm
# For SystemV (such as SCO, UnixWare, Solaris, but _NOT_ Linux or HP-UX)
#
#LIBS_SYS= -lm -lsocket
#
# The flags for C compiler for the FreeType-2 library (disabled by default).
# This WON'T BUILD with FT2-beta8, use the FreeType release 2.0.4
# http://download.sourceforge.net/freetype/freetype-2.0.4.tar.gz
#CFLAGS_FT=
# To enable use of the FreeType-2 library
# (if the include and lib directory do not match your installation,
# modify them), also uncomment LIBS_FT
#
CFLAGS_FT = -DUSE_FREETYPE -I/usr/include/freetype2 -I/usr/include
#
# The FreeType-2 library flags (disabled by default)
#LIBS_FT=
# To enable use of the FreeType-2 library
# (if the include and lib directory do not match your installation,
# modify them), also uncomment CFLAGS_FT
#
LIBS_FT= -L/usr/lib -lfreetype
#
# The flags for C compiler for the Autotrace library (disabled by default).
# USE OF THIS FEATURE IS STRONGLY DISCOURAGED, THE BUILT-IN TRACING
# (AKA VECTORIZATION) PROVIDES MUCH BETTER RESULTS.
# The tested version is 0.29a (and the fonts produced with it are
# absolutely not usable).
# http://download.sourceforge.net/autotrace/autotrace-0.29.tar.gz
CFLAGS_AT=
# To enable use of the Autotrace library
# (if the include and lib directory do not match your installation,
# modify them), also uncomment LIBS_AT
#
#CFLAGS_AT = -DUSE_AUTOTRACE -I/usr/local/include
#
# The Autotrace library flags (disabled by default)
LIBS_AT=
# To enable use of the Autotrace library
# (if the include and lib directory do not match your installation,
# modify them), also uncomment CFLAGS_AT
#
#LIBS_AT= -L/usr/local/lib -lautotrace
#
# Preference of front-ends if multiple parsers match a file
# (by default the build-in front-end takes preference over FreeType)
CFLAGS_PREF=
# To prefer FreeType (if enabled):
#
#CFLAGS_PREF= -DPREFER_FREETYPE
# Uncomment the second line to not compile t1asm into ttf2pt1
CFLAGS_EXTT1ASM=
#CFLAGS_EXTT1ASM= -DEXTERNAL_T1ASM
CFLAGS= $(CFLAGS_SYS) $(CFLAGS_FT) $(CFLAGS_AT) $(CFLAGS_PREF)
LIBS= $(LIBS_SYS) $(LIBS_FT) $(LIBS_AT)
# Installation-related stuff
#
# The base dir for installation and subdirs in it
INSTDIR = /usr/local
# for binaries
BINDIR = $(INSTDIR)/bin
# for binaries of little general interest
LIBXDIR = $(INSTDIR)/libexec/ttf2pt1
# for scripts, maps/encodings etc.
SHAREDIR = $(INSTDIR)/share/ttf2pt1
MANDIR = $(INSTDIR)/man
# owner and group of installed files
OWNER = root
GROUP = bin
# After you have configured the Makefile, comment out the following
# definition:
warning: docs
@echo >&2
@echo " You have to configure the Makefile before running make!" >&2
@echo "(or if you are lazy and hope that it will work as is run \`make all')">&2
@echo >&2
DOCS=CHANGES README FONTS FONTS.hpux encodings/README other/README \
app/X11/README app/netscape/README app/TeX/README
SUBDIRS = app encodings maps scripts other
TXTFILES = README* FONTS* CHANGES* COPYRIGHT
MANS1=ttf2pt1.1 ttf2pt1_convert.1 ttf2pt1_x2gs.1
MANS=$(MANS1) $(MANS5)
all: t1asm ttf2pt1 docs mans rpm
docs: $(DOCS)
mans: $(MANS)
clean:
rm -f t1asm ttf2pt1 *.o app/RPM/Makefile app/RPM/*.spec *.core core.* core
( cd other && make clean; )
( cd app/netscape && make clean; )
veryclean: clean
rm -f $(DOCS) $(MANS)
rpm: app/RPM/Makefile app/RPM/ttf2pt1.spec
ttf2pt1.1: README.html
scripts/html2man . . app/RPM/Makefile
app/RPM/ttf2pt1.spec: app/RPM/ttf2pt1.spec.src version.h
sed 's/^Version:.*/Version: '`grep TTF2PT1_VERSION version.h| cut -d\" -f2`'/' $@
t1asm: t1asm.c
$(CC) $(CFLAGS) -o t1asm -DSTANDALONE t1asm.c $(LIBS)
ttf2pt1.o: ttf2pt1.c ttf.h pt1.h global.h version.h
$(CC) $(CFLAGS) -c ttf2pt1.c
pt1.o: pt1.c ttf.h pt1.h global.h
$(CC) $(CFLAGS) -c pt1.c
ttf.o: ttf.c ttf.h pt1.h global.h
$(CC) $(CFLAGS) -c ttf.c
ft.o: ft.c pt1.h global.h
$(CC) $(CFLAGS) -c ft.c
bdf.o: bdf.c pt1.h global.h
$(CC) $(CFLAGS) -c bdf.c
bitmap.o: bitmap.c pt1.h global.h
$(CC) $(CFLAGS) -c bitmap.c
runt1asm.o: runt1asm.c global.h
$(CC) $(CFLAGS) $(CFLAGS_EXTT1ASM) -c runt1asm.c
ttf2pt1: ttf2pt1.o pt1.o runt1asm.o ttf.o ft.o bdf.o bitmap.o
$(CC) $(CFLAGS) -o ttf2pt1 ttf2pt1.o pt1.o runt1asm.o ttf.o ft.o bdf.o bitmap.o $(LIBS)
CHANGES: CHANGES.html
scripts/unhtml CHANGES
README: README.html
scripts/unhtml README
encodings/README: encodings/README.html
scripts/unhtml encodings/README
other/README: other/README.html
scripts/unhtml other/README
app/X11/README: app/X11/README.html
scripts/unhtml app/X11/README
app/netscape/README: app/netscape/README.html
scripts/unhtml app/netscape/README
app/TeX/README: app/TeX/README.html
scripts/unhtml app/TeX/README
FONTS: FONTS.html
scripts/unhtml FONTS
FONTS.hpux: FONTS.hpux.html
scripts/unhtml FONTS.hpux
install: all
scripts/inst_dir $(BINDIR) $(OWNER) $(GROUP) 0755
scripts/inst_dir $(LIBXDIR) $(OWNER) $(GROUP) 0755
scripts/inst_dir $(SHAREDIR) $(OWNER) $(GROUP) 0755
scripts/inst_dir $(MANDIR)/man1 $(OWNER) $(GROUP) 0755
scripts/inst_dir $(MANDIR)/man5 $(OWNER) $(GROUP) 0755
cp -R $(TXTFILES) $(SUBDIRS) $(SHAREDIR)
chown -R $(OWNER) $(SHAREDIR)
chgrp -R $(GROUP) $(SHAREDIR)
chmod -R go-w $(SHAREDIR)
scripts/inst_file ttf2pt1 $(BINDIR)/ttf2pt1 $(OWNER) $(GROUP) 0755
[ -f $(BINDIR)/t1asm ] || scripts/inst_file t1asm $(LIBXDIR)/t1asm $(OWNER) $(GROUP) 0755
sed -e 's|^TTF2PT1_BINDIR=$$|TTF2PT1_BINDIR=$(BINDIR)|;' \
-e 's|^TTF2PT1_LIBXDIR=$$|TTF2PT1_LIBXDIR=$(LIBXDIR)|;' \
-e 's|^TTF2PT1_SHAREDIR=$$|TTF2PT1_SHAREDIR=$(SHAREDIR)|;' cvt.tmp
scripts/inst_file cvt.tmp $(BINDIR)/ttf2pt1_convert $(OWNER) $(GROUP) 0755
scripts/inst_file cvt.tmp $(SHAREDIR)/scripts/convert $(OWNER) $(GROUP) 0755
rm cvt.tmp
scripts/inst_file scripts/x2gs $(BINDIR)/ttf2pt1_x2gs $(OWNER) $(GROUP) 0755
for i in $(MANS1); do { \
sed -e 's|TTF2PT1_BINDIR|$(BINDIR)|;' \
-e 's|TTF2PT1_LIBXDIR|$(LIBXDIR)|;' \
-e 's|TTF2PT1_SHAREDIR|$(SHAREDIR)|;' <$$i >$(MANDIR)/man1/$$i \
&& chown $(OWNER) $(MANDIR)/man1/$$i \
&& chgrp $(GROUP) $(MANDIR)/man1/$$i \
&& chmod 0644 $(MANDIR)/man1/$$i \
|| exit 1; \
} done
uninstall:
rm -f $(BINDIR)/ttf2pt1 $(BINDIR)/ttf2pt1_convert $(BINDIR)/ttf2pt1_x2gs
rm -rf $(LIBXDIR)
rm -rf $(SHAREDIR)
for i in $(MANS1); do { \
rm -f $(MANDIR)/man1/$$i $(MANDIR)/man1/$$i.gz; \
} done
# targets for automatic generation of releases and snapshots
snapshot:
scripts/mkrel snapshot
release:
scripts/mkrel release
ttf2ufm-3.4.4~r2.orig/t1asm.c 0000644 0001750 0001750 00000034751 11474170642 015247 0 ustar ondrej ondrej /* t1asm
*
* This program `assembles' Adobe Type-1 font programs in pseudo-PostScript
* form into either PFB or PFA format. The human readable/editable input is
* charstring- and eexec-encrypted as specified in the `Adobe Type 1 Font
* Format' version 1.1 (the `black book'). There is a companion program,
* t1disasm, which `disassembles' PFB and PFA files into a pseudo-PostScript
* file.
*
* Copyright (c) 1992 by I. Lee Hetherington, all rights reserved.
*
* Permission is hereby granted to use, modify, and distribute this program
* for any purpose provided this copyright notice and the one below remain
* intact.
*
* I. Lee Hetherington (ilh@lcs.mit.edu)
*
* Revision 1.2 92/05/22 11:54:45 ilh
* Fixed bug where integers larger than 32000 could not be encoded in
* charstrings. Now integer range is correct for four-byte
* twos-complement integers: -(1<<31) <= i <= (1<<31)-1. Bug detected by
* Piet Tutelaers (rcpt@urc.tue.nl).
*
* Revision 1.1 92/05/22 11:48:46 ilh
* initial version
*
* Ported to Microsoft C/C++ Compiler and MS-DOS operating system by
* Kai-Uwe Herbing (herbing@netmbx.netmbx.de) on June 12, 1992. Code
* specific to the MS-DOS version is encapsulated with #ifdef _MSDOS
* ... #endif, where _MSDOS is an identifier, which is automatically
* defined, if you compile with the Microsoft C/C++ Compiler.
*
*/
#ifndef lint
static char copyright[] =
"@(#) Copyright (c) 1992 by I. Lee Hetherington, all rights reserved.";
#ifdef _MSDOS
static char portnotice[] =
"@(#) Ported to MS-DOS by Kai-Uwe Herbing (herbing@netmbx.netmbx.de).";
#endif
#endif
/* Note: this is ANSI C. */
#ifdef _MSDOS
#include
#include
#include
#endif
#include
#include
#include
#include
#include
#ifdef WINDOWS
# ifdef STANDALONE
# define WINDOWS_FUNCTIONS
# include "windows.h"
# endif
#endif
/* int32 must be at least 32-bit and uint16 must be at least 16-bit */
#if INT_MAX >= 0x7FFFFFFFUL
typedef int int32;
#else
typedef long int32;
#endif
#if USHRT_MAX >= 0xFFFFUL
typedef unsigned short uint16;
#else
typedef unsigned int uint16;
#endif
#define LINESIZE 256
#define MAXBLOCKLEN ((1L<<17)-6)
#define MINBLOCKLEN ((1L<<8)-6)
#define MARKER 128
#define ASCII 1
#define BINARY 2
#define DONE 3
typedef unsigned char byte;
/* must be visible from outside */
FILE *ifp;
FILE *ofp;
/* flags */
static int pfb = 0;
static int active = 0;
static int start_charstring = 0;
static int in_eexec = 0;
static char line[LINESIZE];
/* lenIV and charstring start command */
static int lenIV = 4;
static char cs_start[10];
/* for charstring buffering */
static byte charstring_buf[65535];
static byte *charstring_bp;
/* for PFB block buffering */
static byte blockbuf[MAXBLOCKLEN];
static int32 blocklen = MAXBLOCKLEN;
static int32 blockpos = -1;
static int blocktyp = ASCII;
/* decryption stuff */
static uint16 er, cr;
static uint16 c1 = 52845, c2 = 22719;
/* table of charstring commands */
static struct command {
char *name;
int one, two;
} command_table[] = {
{ "callothersubr", 12, 16 },
{ "callsubr", 10, -1 },
{ "closepath", 9, -1 },
{ "div", 12, 12 },
{ "dotsection", 12, 0 },
{ "endchar", 14, -1 },
{ "hlineto", 6, -1 },
{ "hmoveto", 22, -1 },
{ "hsbw", 13, -1 },
{ "hstem", 1, -1 },
{ "hstem3", 12, 2 },
{ "hvcurveto", 31, -1 },
{ "pop", 12, 17 },
{ "return", 11, -1 },
{ "rlineto", 5, -1 },
{ "rmoveto", 21, -1 },
{ "rrcurveto", 8, -1 },
{ "sbw", 12, 7 },
{ "seac", 12, 6 },
{ "setcurrentpoint", 12, 33 },
{ "vhcurveto", 30, -1 },
{ "vlineto", 7, -1 },
{ "vmoveto", 4, -1 },
{ "vstem", 3, -1 },
{ "vstem3", 12, 1 },
}; /* alphabetical */
/* Two separate encryption functions because eexec and charstring encryption
must proceed in parallel. */
static byte eencrypt(byte plain)
{
byte cipher;
cipher = (byte) (plain ^ (er >> 8));
er = (uint16) ((cipher + er) * c1 + c2);
return cipher;
}
static byte cencrypt(byte plain)
{
byte cipher;
cipher = (byte) (plain ^ (cr >> 8));
cr = (uint16) ((cipher + cr) * c1 + c2);
return cipher;
}
/* This function flushes a buffered PFB block. */
static void output_block()
{
int32 i;
/* output four-byte block length */
fputc((int) (blockpos & 0xff), ofp);
fputc((int) ((blockpos >> 8) & 0xff), ofp);
fputc((int) ((blockpos >> 16) & 0xff), ofp);
fputc((int) ((blockpos >> 24) & 0xff), ofp);
/* output block data */
for (i = 0; i < blockpos; i++)
fputc(blockbuf[i], ofp);
/* mark block buffer empty and uninitialized */
blockpos = -1;
}
/* This function outputs a single byte. If output is in PFB format then output
is buffered through blockbuf[]. If output is in PFA format, then output
will be hexadecimal if in_eexec is set, ASCII otherwise. */
static void output_byte(byte b)
{
static char *hexchar = "0123456789ABCDEF";
static int hexcol = 0;
if (pfb) {
/* PFB */
if (blockpos < 0) {
fputc(MARKER, ofp);
fputc(blocktyp, ofp);
blockpos = 0;
}
blockbuf[blockpos++] = b;
if (blockpos == blocklen)
output_block();
} else {
/* PFA */
if (in_eexec) {
/* trim hexadecimal lines to 64 columns */
if (hexcol >= 64) {
fputc('\n', ofp);
hexcol = 0;
}
fputc(hexchar[(b >> 4) & 0xf], ofp);
fputc(hexchar[b & 0xf], ofp);
hexcol += 2;
} else {
fputc(b, ofp);
}
}
}
/* This function outputs a byte through possible eexec encryption. */
static void eexec_byte(byte b)
{
if (in_eexec)
output_byte(eencrypt(b));
else
output_byte(b);
}
/* This function outputs a null-terminated string through possible eexec
encryption. */
static void eexec_string(char *string)
{
while (*string)
eexec_byte((byte) *string++);
}
/* This function gets ready for the eexec-encrypted data. If output is in
PFB format then flush current ASCII block and get ready for binary block.
We start encryption with four random (zero) bytes. */
static void eexec_start()
{
eexec_string(line);
if (pfb) {
output_block();
blocktyp = BINARY;
}
in_eexec = 1;
er = 55665;
eexec_byte(0);
eexec_byte(0);
eexec_byte(0);
eexec_byte(0);
}
/* This function wraps-up the eexec-encrypted data.
If output is in PFB format then this entails flushing binary block and
starting an ASCII block. */
static void eexec_end()
{
int i, j;
if (pfb) {
output_block();
blocktyp = ASCII;
} else {
fputc('\n', ofp);
}
in_eexec = 0;
for (i = 0; i < 8; i++) {
for (j = 0; j < 64; j++)
eexec_byte('0');
eexec_byte('\n');
}
#if 0
eexec_string("cleartomark\n");
#endif
}
/* This function writes ASCII trailer.
If output is in PFB format then this entails flushing binary block and
starting an ASCII block. */
static void file_end()
{
if (pfb) {
output_block();
fputc(MARKER, ofp);
fputc(DONE, ofp);
}
}
/* This function returns an input line of characters. A line is terminated by
length (including terminating null) greater than LINESIZE, a newline \n, or
when active (looking for charstrings) by '{'. When terminated by a newline
the newline is put into line[]. When terminated by '{', the '{' is not put
into line[], and the flag start_charstring is set to 1. */
static void t1asm_getline()
{
int c;
char *p = line;
int comment = 0;
start_charstring = 0;
while (p < line + LINESIZE) {
c = fgetc(ifp);
if (c == EOF)
break;
if (c == '%')
comment = 1;
if (active && !comment && c == '{') {
start_charstring = 1;
break;
}
*p++ = (char) c;
if (c == '\n')
break;
}
*p = '\0';
}
/* This function is used by the binary search, bsearch(), for command names in
the command table. */
static int command_compare(const void *key, const void *item)
{
return strcmp((char *) key, ((struct command *) item)->name);
}
/* This function returns 1 if the string is an integer and 0 otherwise. */
static int is_integer(char *string)
{
if (isdigit(string[0]) || string[0] == '-' || string[0] == '+') {
while (*++string && isdigit(*string))
; /* deliberately empty */
if (!*string)
return 1;
}
return 0;
}
/* This function initializes charstring encryption. Note that this is called
at the beginning of every charstring. */
static void charstring_start()
{
int i;
charstring_bp = charstring_buf;
cr = 4330;
for (i = 0; i < lenIV; i++)
*charstring_bp++ = cencrypt((byte) 0);
}
/* This function encrypts and buffers a single byte of charstring data. */
static void charstring_byte(int v)
{
byte b = (byte) (v & 0xff);
if (charstring_bp - charstring_buf > sizeof(charstring_buf)) {
fprintf(stderr, "error: charstring_buf full (%d bytes)\n",
sizeof(charstring_buf));
exit(1);
}
*charstring_bp++ = cencrypt(b);
}
/* This function outputs buffered, encrypted charstring data through possible
eexec encryption. */
static void charstring_end()
{
byte *bp;
sprintf(line, "%d ", charstring_bp - charstring_buf);
eexec_string(line);
sprintf(line, "%s ", cs_start);
eexec_string(line);
for (bp = charstring_buf; bp < charstring_bp; bp++)
eexec_byte(*bp);
}
/* This function generates the charstring representation of an integer. */
static void charstring_int(int num)
{
int x;
if (num >= -107 && num <= 107) {
charstring_byte(num + 139);
} else if (num >= 108 && num <= 1131) {
x = num - 108;
charstring_byte(x / 256 + 247);
charstring_byte(x % 256);
} else if (num >= -1131 && num <= -108) {
x = abs(num) - 108;
charstring_byte(x / 256 + 251);
charstring_byte(x % 256);
} else if (num >= (-2147483647-1) && num <= 2147483647) {
charstring_byte(255);
charstring_byte(num >> 24);
charstring_byte(num >> 16);
charstring_byte(num >> 8);
charstring_byte(num);
} else {
fprintf(stderr,
"error: cannot format the integer %d, too large\n", num);
exit(1);
}
}
/* This function parses an entire charstring into integers and commands,
outputting bytes through the charstring buffer. */
static void parse_charstring()
{
struct command *cp;
charstring_start();
while (fscanf(ifp, "%s", line) == 1) {
if (line[0] == '%') {
/* eat comment to end of line */
while (fgetc(ifp) != '\n' && !feof(ifp))
; /* deliberately empty */
continue;
}
if (line[0] == '}')
break;
if (is_integer(line)) {
charstring_int(atoi(line));
} else {
cp = (struct command *)
bsearch((void *) line, (void *) command_table,
sizeof(command_table) / sizeof(struct command),
sizeof(struct command),
command_compare);
if (cp) {
charstring_byte(cp->one);
if (cp->two >= 0)
charstring_byte(cp->two);
} else {
fprintf(stderr, "error: cannot use `%s' in charstring\n",line);
exit(1);
}
}
}
charstring_end();
}
static void usage()
{
fprintf(stderr,
"usage: t1asm [-b] [-l block-length] [input [output]]\n");
fprintf(stderr,
"\n-b means output in PFB format, otherwise PFA format.\n");
fprintf(stderr,
"The block length applies to the length of blocks in the\n");
fprintf(stderr,
"PFB output file; the default is to use the largest possible.\n");
exit(1);
}
static void print_banner()
{
static char rcs_revision[] = ""; /* removed RCS */
static char revision[20];
if (sscanf(rcs_revision, "$Revision: %19s", revision) != 1)
revision[0] = '\0';
fprintf(stderr, "This is t1asm %s.\n", revision);
}
#ifdef STANDALONE
int main(int argc, char **argv)
{
char *p, *q, *r;
int c;
extern char *optarg;
extern int optind;
ifp = stdin;
ofp = stdout;
print_banner();
/* interpret command line arguments using getopt */
while ((c = getopt(argc, argv, "bl:")) != -1)
switch (c) {
case 'b':
pfb = 1;
break;
case 'l':
blocklen = atoi(optarg);
if (blocklen < MINBLOCKLEN) {
blocklen = MINBLOCKLEN;
fprintf(stderr,
"warning: using minimum block length of %d\n",
blocklen);
} else if (blocklen > MAXBLOCKLEN) {
blocklen = MAXBLOCKLEN;
fprintf(stderr,
"warning: using maximum block length of %d\n",
blocklen);
}
break;
default:
usage();
break;
}
if (argc - optind > 2)
usage();
/* possibly open input & output files */
if (argc - optind >= 1) {
ifp = fopen(argv[optind], "r");
if (!ifp) {
fprintf(stderr, "error: cannot open %s for reading\n", argv[1]);
exit(1);
}
}
if (argc - optind >= 2) {
ofp = fopen(argv[optind + 1], "w");
if (!ofp) {
fprintf(stderr, "error: cannot open %s for writing\n", argv[2]);
exit(1);
}
}
#else
int runt1asm(int pfbflag)
{
char *p, *q, *r;
pfb = pfbflag;
#endif
#ifdef _MSDOS
/* If we are processing a PFB (binary) output */
/* file, we must set its file mode to binary. */
if (pfb)
_setmode(_fileno(ofp), _O_BINARY);
#endif
/* Finally, we loop until no more input. Some special things to look for
are the `currentfile eexec' line, the beginning of the `/Subrs'
definition, the definition of `/lenIV', and the definition of the
charstring start command which has `...string currentfile...' in it. */
while (!feof(ifp) && !ferror(ifp)) {
t1asm_getline();
if (strcmp(line, "currentfile eexec\n") == 0) {
eexec_start();
continue;
} else if (strstr(line, "/Subrs") && isspace(line[6])) {
active = 1;
} else if ((p = strstr(line, "/lenIV"))) {
sscanf(p, "%*s %d", &lenIV);
} else if ((p = strstr(line, "string currentfile"))) {
/* locate the name of the charstring start command */
*p = '\0'; /* damage line[] */
q = strrchr(line, '/');
if (q) {
r = cs_start;
++q;
while (!isspace(*q) && *q != '{')
*r++ = *q++;
*r = '\0';
}
*p = 's'; /* repair line[] */
}
/* output line data */
eexec_string(line);
if ((p = strstr(line, "currentfile closefile"))) {
eexec_end();
}
if (start_charstring) {
if (!cs_start[0]) {
fprintf(stderr, "error: couldn't find charstring start command\n");
exit(1);
}
parse_charstring();
}
}
file_end();
fclose(ifp);
fclose(ofp);
return 0;
}
ttf2ufm-3.4.4~r2.orig/app/ 0000755 0001750 0001750 00000000000 11620174065 014620 5 ustar ondrej ondrej ttf2ufm-3.4.4~r2.orig/app/X11/ 0000755 0001750 0001750 00000000000 11620174065 015171 5 ustar ondrej ondrej ttf2ufm-3.4.4~r2.orig/app/X11/t1-xf86.39.patch 0000644 0001750 0001750 00000016274 11474170642 017577 0 ustar ondrej ondrej *** scanfont.c 1999/12/27 00:34:02 1.1
--- scanfont.c 1999/12/27 00:35:34
***************
*** 2234,2239 ****
--- 2234,2241 ----
/* point to name and search for leading blanks */
nameP= FontP->FontFileName.data.nameP;
namelen = FontP->FontFileName.len;
+ if (namelen > (128-1) ) /* prevent getting out of filename[] */
+ namelen = (128-1);
while (nameP[0] == ' ') {
nameP++;
namelen--;
*** paths.c 1999/12/27 00:37:01 1.1
--- paths.c 1999/12/27 00:37:43
***************
*** 583,589 ****
CONCAT(before, r);
r = before;
}
! else
r->context = after->context;
if (after != NULL)
CONCAT(r, after);
--- 583,589 ----
CONCAT(before, r);
r = before;
}
! else if (after != NULL)
r->context = after->context;
if (after != NULL)
CONCAT(r, after);
*** type1.c 1999/12/27 00:38:16 1.1
--- type1.c 1999/12/27 01:08:02
***************
*** 399,412 ****
/* ADJUST STEM WIDTHS */
/**********************/
! widthdiff = 0.0;
/* Find standard stem with smallest width difference from this stem */
if (stems[stemno].vertical) { /* vertical stem */
if (blues->StdVW != 0) /* there is an entry for StdVW */
widthdiff = blues->StdVW - stemwidth;
for (i = 0; i < blues->numStemSnapV; ++i) { /* now look at StemSnapV */
! if (blues->StemSnapV[i] - stemwidth < widthdiff)
/* this standard width is the best match so far for this stem */
widthdiff = blues->StemSnapV[i] - stemwidth;
}
--- 399,414 ----
/* ADJUST STEM WIDTHS */
/**********************/
! /* a big value to not compete with StemSnap */
! /* if there is no StemSnap it will be caught later */
! widthdiff = onepixel*2;
/* Find standard stem with smallest width difference from this stem */
if (stems[stemno].vertical) { /* vertical stem */
if (blues->StdVW != 0) /* there is an entry for StdVW */
widthdiff = blues->StdVW - stemwidth;
for (i = 0; i < blues->numStemSnapV; ++i) { /* now look at StemSnapV */
! if ( FABS(blues->StemSnapV[i] - stemwidth) < FABS(widthdiff) )
/* this standard width is the best match so far for this stem */
widthdiff = blues->StemSnapV[i] - stemwidth;
}
***************
*** 414,420 ****
if (blues->StdHW != 0) /* there is an entry for StdHW */
widthdiff = blues->StdHW - stemwidth;
for (i = 0; i < blues->numStemSnapH; ++i) { /* now look at StemSnapH */
! if (blues->StemSnapH[i] - stemwidth < widthdiff)
/* this standard width is the best match so far for this stem */
widthdiff = blues->StemSnapH[i] - stemwidth;
}
--- 416,422 ----
if (blues->StdHW != 0) /* there is an entry for StdHW */
widthdiff = blues->StdHW - stemwidth;
for (i = 0; i < blues->numStemSnapH; ++i) { /* now look at StemSnapH */
! if ( FABS(blues->StemSnapH[i] - stemwidth) < FABS(widthdiff) )
/* this standard width is the best match so far for this stem */
widthdiff = blues->StemSnapH[i] - stemwidth;
}
*** t1io.c 2000/01/01 00:41:44 1.1
--- t1io.c 2000/01/01 01:23:38
***************
*** 78,83 ****
--- 78,86 ----
/* Our single FILE structure and buffer for this package */
STATIC F_FILE TheFile;
STATIC unsigned char TheBuffer[F_BUFSIZ];
+
+ /* the size of the file we read */
+ int T1FileSize;
/* Our routines */
F_FILE *T1Open(), *T1Eexec();
***************
*** 118,123 ****
--- 121,127 ----
of->flags = 0;
of->error = 0;
haveextrach = 0;
+ T1FileSize = 0;
return &TheFile;
} /* end Open */
***************
*** 196,202 ****
--- 200,212 ----
int T1Close(f) /* Close the file */
F_FILE *f; /* Stream descriptor */
{
+ int rc;
+
if (f->b_base == NULL) return 0; /* already closed */
+
+ while ( (rc = read(f->fd, f->b_base, F_BUFSIZ)) >0)
+ T1FileSize += rc; /* count the rest of the file */
+
f->b_base = NULL; /* no valid stream */
return close(f->fd);
} /* end Close */
***************
*** 381,386 ****
--- 391,397 ----
}
}
f->b_ptr = f->b_base;
+ T1FileSize += rc; /* remember how many bytes we have */
if (Decrypt) rc = T1Decrypt(f->b_base, rc);
return rc;
} /* end Fill */
*** t1stdio.h 2000/01/01 00:43:38 1.1
--- t1stdio.h 2000/01/01 01:24:19
***************
*** 73,78 ****
--- 73,79 ----
extern FILE *T1Open(), *T1eexec();
extern int T1Close(), T1Ungetc(), T1Read();
+ extern int T1FileSize;
#undef fclose
#undef fopen
*** fontfcn.c 2000/01/01 00:07:54 1.1
--- fontfcn.c 2000/01/01 01:36:02
***************
*** 57,62 ****
--- 57,63 ----
#endif
#include "t1imager.h"
#include "util.h"
+ #include "t1stdio.h"
#ifdef BUILDCID
#include "range.h"
#include "fontmisc.h"
***************
*** 300,333 ****
resetFont(env);
/* This will load the font into the FontP */
rcode = scan_font(FontP);
! if (rcode == SCAN_OUT_OF_MEMORY) {
/* free the memory and start again */
#ifdef BUILDCID
/* xfree(vm_base); */
#else
xfree(vm_base);
#endif
if (!(initFont(vm_size * 2))) {
/* we are really out of memory */
return(SCAN_OUT_OF_MEMORY);
}
resetFont(env);
rcode = scan_font(FontP);
- #ifdef BUILDCID
- /* only double the memory twice, then report error */
- if (rcode == SCAN_OUT_OF_MEMORY) {
- /* free the memory and start again */
- /* xfree(vm_base) */
- if (!(initFont(vm_size * 2))) {
- /* we are really out of memory */
- return(SCAN_OUT_OF_MEMORY);
- }
- resetFont(env);
- rcode = scan_font(FontP);
- }
- #else
- /* only double the memory once, then report error */
- #endif
}
return(rcode);
}
--- 301,342 ----
resetFont(env);
/* This will load the font into the FontP */
rcode = scan_font(FontP);
! if (rcode != SCAN_OUT_OF_MEMORY)
! return rcode;
!
! if (T1FileSize > VM_SIZE) {
! /* use the file size as estimation */
!
/* free the memory and start again */
#ifdef BUILDCID
/* xfree(vm_base); */
#else
xfree(vm_base);
#endif
+ if (!(initFont(T1FileSize))) {
+ /* we are really out of memory */
+ return(SCAN_OUT_OF_MEMORY);
+ }
+ resetFont(env);
+ rcode = scan_font(FontP);
+ if (rcode != SCAN_OUT_OF_MEMORY)
+ return rcode;
+ }
+
+ /* if still not enough, increase up to maximum */
+ while (rcode == SCAN_OUT_OF_MEMORY
+ && vm_size <= VM_SIZE_MAX/2 ) {
+ #ifdef BUILDCID
+ /* xfree(vm_base); */
+ #else
+ xfree(vm_base);
+ #endif
if (!(initFont(vm_size * 2))) {
/* we are really out of memory */
return(SCAN_OUT_OF_MEMORY);
}
resetFont(env);
rcode = scan_font(FontP);
}
return(rcode);
}
*** util.h 2000/01/01 00:40:11 1.1
--- util.h 2000/01/01 01:29:18
***************
*** 83,88 ****
--- 83,92 ----
#else
#define VM_SIZE (50*1024)
#endif
+
+ /* this is the maximal permitted memory size */
+ #define VM_SIZE_MAX (1024*1024)
+
/***================================================================***/
#ifndef MIN
ttf2ufm-3.4.4~r2.orig/app/X11/README.html 0000644 0001750 0001750 00000002014 11474170642 017015 0 ustar ondrej ondrej
Recommended patches for the X11 font library
Recommended patches for the X11 font library
by Sergey Babkin
<babkin@bellatlantic.net>, <sab123@hotmail.com>
These are patches for XFree86 versions 3.3.4 and 3.9
to fix a few known problems with big Type1 fonts and
with strange handling of the standard stem width table.
The patch for XFree86 3.3.4 probably may be easily
installed on any other distribution of X11.
They are supposed to be installed in the subdirectory
xc/lib/font/Type1
of the X11 source tree and after that the font library,
font server and X server should be rebuilt.
Sorry that the description has so little details but if
you know how to build X11 then this is enough, otherwise
any more details won't help much.
The patches have been submitted to the XFree86 project,
hope they will be included in some next release of XFree86
and X11.
ttf2ufm-3.4.4~r2.orig/app/X11/t1-xf86.334.patch 0000644 0001750 0001750 00000013762 11474170642 017654 0 ustar ondrej ondrej *** fontfcn.c 2000/01/02 18:55:56 1.1
--- fontfcn.c 2000/01/02 19:00:17
***************
*** 33,38 ****
--- 33,39 ----
#include
#include "t1imager.h"
#include "util.h"
+ #include "t1stdio.h"
#include "fontfcn.h"
#include "fontmisc.h"
***************
*** 117,132 ****
resetFont(env);
/* This will load the font into the FontP */
rcode = scan_font(FontP);
! if (rcode == SCAN_OUT_OF_MEMORY) {
/* free the memory and start again */
xfree(vm_base);
if (!(initFont(vm_size * 2))) {
/* we are really out of memory */
return(SCAN_OUT_OF_MEMORY);
}
resetFont(env);
rcode = scan_font(FontP);
- /* only double the memory once, then report error */
}
return(rcode);
}
--- 118,151 ----
resetFont(env);
/* This will load the font into the FontP */
rcode = scan_font(FontP);
! if (rcode != SCAN_OUT_OF_MEMORY)
! return rcode;
!
! if (T1FileSize > VM_SIZE) {
! /* use the file size as estimation */
!
/* free the memory and start again */
xfree(vm_base);
+ if (!(initFont(T1FileSize))) {
+ /* we are really out of memory */
+ return(SCAN_OUT_OF_MEMORY);
+ }
+ resetFont(env);
+ rcode = scan_font(FontP);
+ if (rcode != SCAN_OUT_OF_MEMORY)
+ return rcode;
+ }
+
+ /* if still not enough, increase up to maximum */
+ while (rcode == SCAN_OUT_OF_MEMORY
+ && vm_size <= VM_SIZE_MAX/2 ) {
+ xfree(vm_base);
if (!(initFont(vm_size * 2))) {
/* we are really out of memory */
return(SCAN_OUT_OF_MEMORY);
}
resetFont(env);
rcode = scan_font(FontP);
}
return(rcode);
}
*** paths.c 2000/01/02 18:55:56 1.1
--- paths.c 2000/01/02 18:56:27
***************
*** 584,590 ****
CONCAT(before, r);
r = before;
}
! else
r->context = after->context;
if (after != NULL)
CONCAT(r, after);
--- 584,590 ----
CONCAT(before, r);
r = before;
}
! else if (after != NULL)
r->context = after->context;
if (after != NULL)
CONCAT(r, after);
*** scanfont.c 2000/01/02 18:55:56 1.1
--- scanfont.c 2000/01/02 18:56:26
***************
*** 1383,1388 ****
--- 1383,1390 ----
/* point to name and search for leading blanks */
nameP= FontP->FontFileName.data.nameP;
namelen = FontP->FontFileName.len;
+ if (namelen > (128-1) ) /* prevent getting out of filename[] */
+ namelen = (128-1);
while (nameP[0] == ' ') {
nameP++;
namelen--;
*** t1io.c 2000/01/02 18:55:56 1.1
--- t1io.c 2000/01/02 18:56:32
***************
*** 54,59 ****
--- 54,62 ----
/* Our single FILE structure and buffer for this package */
STATIC F_FILE TheFile;
STATIC unsigned char TheBuffer[F_BUFSIZ];
+
+ /* the size of the file we read */
+ int T1FileSize;
/* Our routines */
F_FILE *T1Open(), *T1Eexec();
***************
*** 87,92 ****
--- 90,96 ----
of->flags = 0;
of->error = 0;
haveextrach = 0;
+ T1FileSize = 0;
return &TheFile;
} /* end Open */
***************
*** 165,171 ****
--- 169,181 ----
int T1Close(f) /* Close the file */
F_FILE *f; /* Stream descriptor */
{
+ int rc;
+
if (f->b_base == NULL) return 0; /* already closed */
+
+ while ( (rc = read(f->fd, f->b_base, F_BUFSIZ)) >0)
+ T1FileSize += rc; /* count the rest of the file */
+
f->b_base = NULL; /* no valid stream */
return close(f->fd);
} /* end Close */
***************
*** 289,294 ****
--- 299,305 ----
}
}
f->b_ptr = f->b_base;
+ T1FileSize += rc; /* remember how many bytes we have */
if (Decrypt) rc = T1Decrypt(f->b_base, rc);
return rc;
} /* end Fill */
*** type1.c 2000/01/02 18:55:56 1.1
--- type1.c 2000/01/02 18:56:27
***************
*** 365,378 ****
/* ADJUST STEM WIDTHS */
/**********************/
! widthdiff = 0.0;
/* Find standard stem with smallest width difference from this stem */
if (stems[stemno].vertical) { /* vertical stem */
if (blues->StdVW != 0) /* there is an entry for StdVW */
widthdiff = blues->StdVW - stemwidth;
for (i = 0; i < blues->numStemSnapV; ++i) { /* now look at StemSnapV */
! if (blues->StemSnapV[i] - stemwidth < widthdiff)
/* this standard width is the best match so far for this stem */
widthdiff = blues->StemSnapV[i] - stemwidth;
}
--- 365,380 ----
/* ADJUST STEM WIDTHS */
/**********************/
! /* a big value to not compete with StemSnap */
! /* if there is no StemSnap it will be caught later */
! widthdiff = onepixel*2;
/* Find standard stem with smallest width difference from this stem */
if (stems[stemno].vertical) { /* vertical stem */
if (blues->StdVW != 0) /* there is an entry for StdVW */
widthdiff = blues->StdVW - stemwidth;
for (i = 0; i < blues->numStemSnapV; ++i) { /* now look at StemSnapV */
! if ( FABS(blues->StemSnapV[i] - stemwidth) < FABS(widthdiff) )
/* this standard width is the best match so far for this stem */
widthdiff = blues->StemSnapV[i] - stemwidth;
}
***************
*** 380,386 ****
if (blues->StdHW != 0) /* there is an entry for StdHW */
widthdiff = blues->StdHW - stemwidth;
for (i = 0; i < blues->numStemSnapH; ++i) { /* now look at StemSnapH */
! if (blues->StemSnapH[i] - stemwidth < widthdiff)
/* this standard width is the best match so far for this stem */
widthdiff = blues->StemSnapH[i] - stemwidth;
}
--- 382,388 ----
if (blues->StdHW != 0) /* there is an entry for StdHW */
widthdiff = blues->StdHW - stemwidth;
for (i = 0; i < blues->numStemSnapH; ++i) { /* now look at StemSnapH */
! if ( FABS(blues->StemSnapH[i] - stemwidth) < FABS(widthdiff) )
/* this standard width is the best match so far for this stem */
widthdiff = blues->StemSnapH[i] - stemwidth;
}
ttf2ufm-3.4.4~r2.orig/app/netscape/ 0000755 0001750 0001750 00000000000 11620174065 016422 5 ustar ondrej ondrej ttf2ufm-3.4.4~r2.orig/app/netscape/fontsz.cf 0000644 0001750 0001750 00000000244 11474170642 020263 0 ustar ondrej ondrej fixed-koi8-r 150
prop-koi8-r 150
fixed-iso-8859-5 150
prop-iso-8859-5 150
fixed-iso-8859-1 150
prop-iso-8859-1 150
fixed-x-user-defined 150
prop-x-user-defined 150
ttf2ufm-3.4.4~r2.orig/app/netscape/nsfilter 0000644 0001750 0001750 00000000744 11474170642 020204 0 ustar ondrej ondrej #!/bin/sh
CONFLOCAL=$HOME/.netscape/psfonts.cf
CONFGLOBAL=/usr/local/etc/nspsfonts.cf
if [ -r "$CONFLOCAL" ]
then
CONF="$CONFLOCAL"
else
CONF="$CONFGLOBAL"
fi
grep -v "^#" <$CONF | grep -v "^$" | while :
do {
read nsname base afm pfa x
[ -z "$nsname" ] && break;
fname=`awk '/^FontName/ {print $2;}' <$base$afm`
cat $base$pfa
echo "/$nsname /$fname findfont definefont"
} done
grep -v "^ /Encoding isolatin1encoding def$" | egrep -v '^newpath .* closepath clip newpath$'
ttf2ufm-3.4.4~r2.orig/app/netscape/notscape 0000644 0001750 0001750 00000001053 11474170642 020164 0 ustar ondrej ondrej #!/bin/sh
NDIR=$HOME/.netscape
PFILE=$NDIR/preferences.js
CFFILE=$NDIR/fontsz.cf
TMPFILE=$NDIR/fontsz.sed
die() {
echo "notscape: can't $*" >&2
exit 1
}
[ -r $CFFILE ] && {
awk '{ printf("/intl.font_spec_list/s/-[^-]*-\\([^-]*\\)-%s,/-%s-\\1-%s,/\n", \
$1, $2, $1); }' <$CFFILE >$TMPFILE
cp $PFILE $PFILE.old || die "save old pref file"
sed -f $TMPFILE <$PFILE.old >$PFILE.new || die "create new pref file"
[ -s $PFILE.new ] || die "create new pref file"
mv $PFILE.new $PFILE || die "install new pref file"
}
exec netscape -no-about-splash "$@"
ttf2ufm-3.4.4~r2.orig/app/netscape/nsprint 0000644 0001750 0001750 00000000144 11474170642 020045 0 ustar ondrej ondrej #!/bin/sh
if uname -s | grep -i bsd >/dev/null
then
LPR=lpr
else
LPR=lp
fi
nsfilter | $LPR "$@"
ttf2ufm-3.4.4~r2.orig/app/netscape/nsfix.c 0000644 0001750 0001750 00000027060 11474170642 017726 0 ustar ondrej ondrej /*
* Fix the Netscape executable for specified font widths
*
* (c) 1999 Copyright by Sergey Babkin
* see COPYRIGHT
*/
#include
#include
#include
#include
#include
/************************** DEFINES *************************/
#undef DEBUG
/* we can handle at most this many fonts */
#define MAXFONTS 20
/* maximal line buffer size */
#define MAXLINE 512
/* there may be multiple strings with the same contents */
#define MAXDUPS 10
/* file read buffer size */
#define FILEBF 40960
/* bits in the hardware page offset */
#define BITSPERPAGE 12
/* size of page in bytes */
#define PAGESIZE (1< \n");
}
/************************** readconfig **********************/
void
readconfig(fn)
char *fn;
{
char s[MAXLINE];
char afmsuffix[MAXLINE], pfasuffix[MAXLINE];
int lineno=0;
FILE *f;
if(( f=fopen(fn, "r") )==NULL) {
sprintf(msg,"nsfix: open %s",fn);
perror(msg);
exit(1);
}
while( fgets(s, MAXLINE, f) ) {
lineno++;
if(s[0]=='#' || s[0]=='\n')
continue;
if(nfonts>=MAXFONTS) {
fprintf(stderr, "nsfix: only %d fonts are supported at once\n",
MAXFONTS);
exit(1);
}
if( sscanf(s, "%s %s %s %s", font[nfonts].nsname,
font[nfonts].afmname, afmsuffix, pfasuffix) != 4 ) {
fprintf(stderr, "nsfix: syntax error at line %d of %s\n",
lineno, fn);
exit(1);
}
strcpy(font[nfonts].pfaname, font[nfonts].afmname);
strcat(font[nfonts].afmname, afmsuffix);
strcat(font[nfonts].pfaname, pfasuffix);
nfonts++;
}
if(nfonts==0) {
fprintf(stderr, "nsfix: no fonts are defined in %s\n", fn);
exit(1);
}
fclose(f);
}
/************************** readmetrics *********************/
void
readmetrics(void)
{
int i;
char s[MAXLINE];
FILE *f;
int n;
int lineno;
int code, width, llx, lly, urx, ury;
char gn[MAXLINE];
struct glyphmetrics *gm;
for(i=0; i=32 && code<=255) {
font[i].metrics.glyphs[code].width=width;
font[i].metrics.glyphs[code].bbox.llx=llx;
font[i].metrics.glyphs[code].bbox.lly=lly;
font[i].metrics.glyphs[code].bbox.urx=urx;
font[i].metrics.glyphs[code].bbox.ury=ury;
}
}
}
fclose(f);
}
#ifdef DEBUG
for(i=0; iwidth,
gm->bbox.llx, gm->bbox.lly, gm->bbox.urx, gm->bbox.ury);
printf(" w=0x%04x [0x%04x 0x%04x 0x%04x 0x%04x]\n", gm->width & 0xffff,
gm->bbox.llx & 0xffff, gm->bbox.lly & 0xffff, gm->bbox.urx & 0xffff, gm->bbox.ury & 0xffff);
}
}
exit(0);
#endif
}
/************************** replacefonts ********************/
void
replacefonts(fn)
char *fn;
{
int f; /* don't use stdio */
char bf[FILEBF];
char *bfend, *p;
int len;
off_t pos;
off_t zerooff[MAXFONTS*MAXDUPS]; /* offset of zero strings */
tptr nameaddr[MAXFONTS*MAXDUPS]; /* name pointers before these zero strings */
int zeroid[MAXFONTS*MAXDUPS]; /* font number for this zero block */
int nzeroes;
short matched[MAXFONTS]; /* counters how many matches we have for each requested font */
struct fontmetrics *fp;
struct {
int noff;
int nz;
off_t off[MAXDUPS]; /* there may be multiple strings with the same contents */
} o[MAXFONTS];
int maxnlen;
int i, j, k, n;
static struct glyphmetrics gm[32]; /* 0-initialized */
if(( f=open(fn, O_RDWR) )<0) {
sprintf(msg,"nsfix: open %s",fn);
perror(msg);
exit(1);
}
/* get the maximal font name length */
maxnlen=0;
for(i=0; imaxnlen)
maxnlen=len;
}
/* fprintf(stderr,"maxnlen= 0x%x\n", maxnlen); /* */
/* try to find the literal strings of the font names */
pos=0; bfend=bf;
while(( len=read(f, bfend, FILEBF-(bfend-bf)) )>=0 ) {
/* fprintf(stderr,"looking at 0x%lx\n", (long)pos); /* */
/* the last position to check */
if(len>=maxnlen)
/* leave the rest with the next block */
bfend+= len-maxnlen;
else {
/* we are very near to the end of file, check
* up to the very last byte */
bfend+= len-2;
memset(bfend+2, 0, maxnlen);
}
for(p=bf; p<=bfend; p++)
for(i=0; i pos + PAGESIZE/2) { /* bad */
fprintf(stderr, "eliminated %s at 0x%lx\n", font[j].nsname, (long)o[j].off[k] );
for(n=k+1; n=0 ) {
/* fprintf(stderr,"looking at 0x%lx\n", (long)pos); /* */
/* the last position to check */
bfend+= len-maxnlen; /* don't look beyond the EOF */
for(p=bf; p<=bfend; p+=4 /* 4-byte aligned */ ) {
fp=(struct fontmetrics *)p;
if(fp->name==0)
continue;
if( memcmp(gm, fp->glyphs, sizeof gm) )
continue;
/* OK, looks like it, see if we can match it to any name */
n= fp->name & PAGEMASK;
for(i=0; iname;
zeroid[nzeroes]=i;
o[i].nz++;
fprintf(stderr, "matched %s at 0x%lx\n",
font[i].nsname, (long) zerooff[nzeroes]);
nzeroes++;
matched[i]++;
break;
}
}
}
if(len==0)
break;
memmove(bf, bfend, maxnlen);
pos+= (bfend-bf);
bfend= (bf+maxnlen);
}
if(len<0) {
sprintf(msg,"nsfix: read %s",fn);
perror(msg);
exit(1);
}
fprintf(stderr,"---\n");
/* make sure that all the fonts got one match */
k=0; /* flag: have non-matched fonts */ n=0; /* flag: have ambiguities */
for(i=0; i1)
n=1;
if(k) {
fprintf(stderr,"nsfix: can't find match for some of the fonts\n");
fprintf(stderr,"nsfix: maybe wrong byte order, aborting\n");
exit(1);
}
if(n) {
fprintf(stderr,"nsfix: got multiple matches for some of the fonts\n");
fprintf(stderr,"nsfix: can't resolve, aborting\n");
exit(1);
}
/* now finally write the updated tables */
for(i=0; i
Installing the fonts in Netscape Navigator
Installing the fonts in Netscape Navigator
by Sergey Babkin
<babkin@bellatlantic.net>, <sab123@hotmail.com>
This is a collection of supplements to Netscape 4.x on
Unix. Probably they will also work with Netscape 3.x,
possilby with minor modifications.
Makefile
nsfix.c
psfonts.cf
This is a program that allows to substitute the font metrics
of any PostScript font in Netscape.
When Netscape prints the files to PostScript format it uses a
built-in table of character widths. It prints all the fixed-width
characters in the typeface "Courier" and all the variable-width
characters in the typeface "Times". And if the PostScript printer
has these fonts by Adobe then everything goes fine because
the tables inside Netscape are generated from the Adobe fonts.
But if the fonts are different (say, those supplied with Ghostscripts
or the fonts with non-latin characters) then the result is quite
ugly. This program allows to replace the width tables inside
the Netscape executable with the tables for any given font.
The only problem is that Netscape can hold only one set of tables
at once. So if you want to print with different fonts (say,
for different languages or encodings) you will have to make
multiple copies of the executable, tune each of them for its
font and then run them separately.
I tried to make the program as machine-independent as possible.
But because it patches the binary files it still has the dependencies
on hardware. The default version as supplied was designed for
Intel x86 machines but it should work OK on any machine
with 32-bit CPU and 4Kbyte (or less) page size. If it can't
find the tables matching the font names on some other architecture
the first thing to try would be reduce the `PAGEBITS' definition
in the source code. On the machines with non-page-aligned structure
of executables it won't work at all. I don't know whether would
it work on the 64-bit machines. This may depend on whether the
Netscape executable was compiled in 32-bit or 64-bit mode. For
the 64-bit executables it may be neccessary to change the definition
of the type `tptr' to an 8-byte integer type (probably `long'
or `long long'). Also must be re-compiled for patching of the
Netscape binary for each particular machine architecture because
it assumes the byte order of the current machine.
It might be possible to create a program that would patch
a running Netscape binary on the fly, that would allow
changing the printing fonts as neccessary when Netscape is
running. But this would be even more platform-dependent,
so I don't feel any enthusiasm about doing that.
I have tested the program on the Intel machines, Netscape
4.08 and 4.7, OS FreeBSD (both a.out and ELF formats of the
Netscape binary) and UnixWare.
After all these scary issues are resolved the compiling
is easy: just run `make'.
To command to patch the Netscape is:
./nsfix <netscape-binary> <config-file>
Please make a copy of the original Netscape binary before
patching in case anything goes wrong. Patch the copy, test
that it works OK and only then install it. The configuration
file describes the fonts that are to be used. An example
is provided in the file psfonts.cf.
Each line in the configuration file consists of 4
columns:
<PS_font_name> <font_base_file> <suffix_afm> <suffix_font>
For example, the following line from my configuration file:
Courier /usr/lib/X11/fonts/ttf/cokoi8n.koi8-r .afm .pfa
says that the font `Courier' will be replaced with the
font taken from the file `/usr/lib/X11/fonts/ttf/cokoi8n.koi8-r.pfa'
and the metrics for that font will be taken from the file
`/usr/lib/X11/fonts/ttf/cokoi8n.koi8-r.afm' .
One more caveat: the new font must have a proper encoding
table. Some fonts contain characters for multiple encodings
hoping that the program wil re-encode them as neccessary.
This won't work in this case, only the primary encoding table
of the font will be used.
nsfilter
nsprint
psfonts.cf
These are the filters for printing from Netscape.
Changing the metrics is not the end of the story. This will
provide proper placement of the characters but not the
characters themselves. There are a few ways to provide
the characters:
First, if you use GhostScript you may configure proper
aliases in the GhostScript configuration file. We will
consider this variant trivial and won't discuss it furter
except for one caveat: Netscape tries to re-encode the
fonts per the ISO Latin-1 encoding. If the primary encoding
of the font is different this cause unexpected effects.
So you still may consider using the filters (at least in a
simplified form) to solve this problem.
Second, load the fonts right into your printer. This is
very much like configuring GhostScript.
Third, use the provided filters. The script `nsfilter'
reads the output of Netscape on its standard input and
puts the result to its standard output. It uses the same
configuration file `psfonts.cf' as `nsfix'. First it
looks for the configuration file in the user's home
directory ($HOME/.netscape/psfonts.cf) and if the
file it not there then the second guess is the system-wide
configuration file /usr/local/etc/psfonts.cf. The
script inserts the fonts into the output and also
removes the Netscape's experiments with the encodings.
`nsfilter' is generally intended to be ran by user, not by the
printing subsystem. The reason is that the user may have
changed fonts in his Netscape and the printing subsystem
would have no way to access user's configuration file.
But if all the users are using the same fonts then it
may be incorporated into the printing subsystem and use
the system-wide configuration file.
The script `nsprint' is purely for convenience, to type it
as a printing command in the Netscape printing window.
It just pipelines the data through `nsfilter' to the
printing program which also gets all the arguments. Please
note that the SystemV-style and BSD-style systems use different
printing programs (although they commonly provide compatibility
with the other style too). The script tries to guess the
type of system and use its native print program, `lp' or
`lpr'. But in case it guesses wrong you may want
to change this in the script. Also if the printer does not support
PostScript directly this script may be a good place to
insert a call to GhostScript.
notscape
fontsz.cf
Netscape on Unix has a very annoying "feature", it does
not remember the desired base size of the scalable screen
fonts and always resets it to 12.0 points. Even if the size
is changed manually in its preferences file, Netscape
forgets it after it exits.
So my solution was to write a program which would change
the size to my favorite one every time right before
starting Netscape. `notscape' is exactly such a program,
it sets the font sizes an then transparently executes
netscape. It takes the font sizes from the file
`$HOME/.netscape/fontsz.cf' . An example of such file
is provided. The format of the file is quite self-explanatory,
for example the lines
fixed-koi8-r 140
prop-koi8-r 150
mean "set the size of the fixed-width screen font in the
encoding koi8-r to 14.0 points; set the size of the proportional
(variable-width) font in the encoding koi8-r to 15.0 points".
nspr
by Zvezdan Petkovic
To print from Netscape, I usually print to the Postscript file first.
Then I use this small script to change the names of Times and Courier fonts
in the file and remove `/Encoding' lines. After that the file can be
sent to printer.