summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvipdfmx/src/fontmap.c
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-05-24 16:50:54 +0000
committerKarl Berry <karl@freefriends.org>2008-05-24 16:50:54 +0000
commitbae50404b950f4bf0c8728e806a438bcdd2ba2f0 (patch)
treee21232976fce3b27b56de44069f798f9e0fa8bc0 /Build/source/texk/dvipdfmx/src/fontmap.c
parentfdfc1c7792088e2a3e0544ffb1f4869467da521a (diff)
dvipdfmx 20080524
git-svn-id: svn://tug.org/texlive/trunk@8322 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipdfmx/src/fontmap.c')
-rw-r--r--Build/source/texk/dvipdfmx/src/fontmap.c32
1 files changed, 6 insertions, 26 deletions
diff --git a/Build/source/texk/dvipdfmx/src/fontmap.c b/Build/source/texk/dvipdfmx/src/fontmap.c
index 9b573419a03..2076eaedb97 100644
--- a/Build/source/texk/dvipdfmx/src/fontmap.c
+++ b/Build/source/texk/dvipdfmx/src/fontmap.c
@@ -1,4 +1,4 @@
-/* $Header: /home/cvsroot/dvipdfmx/src/fontmap.c,v 1.39 2008/05/18 08:09:09 chofchof Exp $
+/* $Header: /home/cvsroot/dvipdfmx/src/fontmap.c,v 1.40 2008/05/22 10:08:02 matthias Exp $
This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
@@ -580,7 +580,7 @@ fontmap_parse_mapdef_dps (fontmap_rec *mrec,
case '<': /* encoding or fontfile field */
if (++p < endptr && *p == '[') p++; /*skip */
skip_blank(&p, endptr);
- if (q = parse_string_value(&p, endptr)) {
+ if ((q = parse_string_value(&p, endptr))) {
int n = strlen(q);
if (n > 4 && strncmp(q+n-4, ".enc", 4) == 0)
mrec->enc_name = q;
@@ -591,13 +591,13 @@ fontmap_parse_mapdef_dps (fontmap_rec *mrec,
break;
case '"': /* Options */
- if (q = parse_string_value(&p, endptr)) {
+ if ((q = parse_string_value(&p, endptr))) {
char *r = q, *e = q+strlen(q), *s, *t;
skip_blank(&r, e);
while (r < e) {
- if (s = parse_float_decimal(&r, e)) {
+ if ((s = parse_float_decimal(&r, e))) {
skip_blank(&r, e);
- if (t = parse_string_value(&r, e)) {
+ if ((t = parse_string_value(&r, e))) {
if (strcmp(t, "SlantFont") == 0)
mrec->opt.slant = atof(s);
else if (strcmp(r, "ExtendFont") == 0)
@@ -605,7 +605,7 @@ fontmap_parse_mapdef_dps (fontmap_rec *mrec,
RELEASE(t);
}
RELEASE(s);
- } else if (s = parse_string_value(&r, e)) { /* skip */
+ } else if ((s = parse_string_value(&r, e))) { /* skip */
RELEASE(s);
}
skip_blank(&r, e);
@@ -946,26 +946,6 @@ is_pdfm_mapline (const char *mline) /* NULL terminated. */
return (n == 2 ? 0 : 1);
}
-static void
-delete_records (FILE *fp, long num_lines)
-{
- char *q, *p;
-
- while (num_lines-- > 0 &&
- (p = readline(work_buffer, WORK_BUFFER_SIZE, fp)) != NULL) {
- skip_blank(&p, p + strlen(p));
- if (*p == 0)
- continue;
- q = parse_string_value(&p, p + strlen(p));
- if (q) {
- WARN("Deleting fontmap record for \"%s\"", q);
- pdf_remove_fontmap_record(q);
- RELEASE(q);
- }
- }
- return;
-}
-
int
pdf_load_fontmap_file (const char *filename, int mode)
{