diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2016-10-25 16:12:45 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2016-10-25 16:12:45 +0000 |
| commit | 6db6db4b7f38f7760b90ec861a39b5ccb9df5ba9 (patch) | |
| tree | 4c2c4a63a90dbcb77b7e6860bb662b5ddecdedf5 /troff/troff.d/dpost.d | |
| parent | ab1717bb35d85041e0184f79daa1313a1306dc01 (diff) | |
| download | src-6db6db4b7f38f7760b90ec861a39b5ccb9df5ba9.tar.gz src-6db6db4b7f38f7760b90ec861a39b5ccb9df5ba9.zip | |
Import heirloom doctools snapshot 20161025vendor/heirloom-doctools/20161025
Notes
Notes:
svn path=/vendor/heirloom-doctools/dist/; revision=307921
svn path=/vendor/heirloom-doctools/20161025/; revision=307922; tag=vendor/heirloom-doctools/20161025
Diffstat (limited to 'troff/troff.d/dpost.d')
| -rw-r--r-- | troff/troff.d/dpost.d/Makefile.mk | 4 | ||||
| -rw-r--r-- | troff/troff.d/dpost.d/dpost.c | 4 | ||||
| -rw-r--r-- | troff/troff.d/dpost.d/ps_include.c | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/troff/troff.d/dpost.d/Makefile.mk b/troff/troff.d/dpost.d/Makefile.mk index d3d161638b4c..b2594b800192 100644 --- a/troff/troff.d/dpost.d/Makefile.mk +++ b/troff/troff.d/dpost.d/Makefile.mk @@ -8,12 +8,12 @@ FLAGS = -I. -I.. -DFNTDIR='"$(FNTDIR)"' -DPSTDIR='"$(PSTDIR)"' $(EUC) \ $(DEFINES) -I../../../include -I.. -I$(BST) .c.o: - $(CC) $(CFLAGS) $(WARN) $(CPPFLAGS) $(FLAGS) -c $< + $(CC) $(_CFLAGS) $(FLAGS) -c $< all: dpost dpost: $(OBJ) - $(CC) $(CFLAGS) $(LDFLAGS) $(OBJ) $(LIBS) -o dpost + $(CC) $(_CFLAGS) $(_LDFLAGS) $(OBJ) $(LIBS) -o dpost install: $(INSTALL) -c dpost $(ROOT)$(BINDIR)/dpost diff --git a/troff/troff.d/dpost.d/dpost.c b/troff/troff.d/dpost.d/dpost.c index dd5c5465721b..60c0b210fa42 100644 --- a/troff/troff.d/dpost.d/dpost.c +++ b/troff/troff.d/dpost.d/dpost.c @@ -2419,7 +2419,7 @@ t_supply(char *fnt) /* supply a font */ while (*fnt == ' ' || *fnt == '\t') fnt++; - for (np = font; *np && *np != ' ' && *np != '\t' && *np != '\n'; np++); + for (np = fnt; *np && *np != ' ' && *np != '\t' && *np != '\n'; np++); if (*np == '\0' || *np == '\n') return; *np = '\0'; @@ -3303,7 +3303,7 @@ t_sf(int forceflush) fprintf(tf, "%d %g changefont\n", fontname[font].fontslant, (fontname[font].fontheight != 0) ? (double)fontname[font].fontheight : (double)fractsize); } - if (tracked < 0 || tracked > 0 && forceflush) + if (tracked < 0 || (tracked > 0 && forceflush)) t_strack(); } /* End of t_sf */ diff --git a/troff/troff.d/dpost.d/ps_include.c b/troff/troff.d/dpost.d/ps_include.c index 3b463daf29d9..bd65398f2672 100644 --- a/troff/troff.d/dpost.d/ps_include.c +++ b/troff/troff.d/dpost.d/ps_include.c @@ -167,6 +167,8 @@ ps_include( break; case DOCUMENTNEEDEDRESOURCES: goto needres; + case NORMAL: /* TODO: case is not in original code */ + break; } continue; } else |