projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(render_strip) Fix bug that sometimes caused joined text in joined
[pspp]
/
src
/
output.c
diff --git
a/src/output.c
b/src/output.c
index 370ad5910cf6b2241d13bc8d1b2aa38592863c5f..b804978d6d1d4567be2f56b4938ea1a94e8951f7 100644
(file)
--- a/
src/output.c
+++ b/
src/output.c
@@
-18,6
+18,7
@@
02111-1307, USA. */
#include <config.h>
02111-1307, USA. */
#include <config.h>
+#include "output.h"
#include <assert.h>
#include <stdlib.h>
#include <stdio.h>
#include <assert.h>
#include <stdlib.h>
#include <stdio.h>
@@
-25,11
+26,12
@@
#include <ctype.h>
#include "alloc.h"
#include "approx.h"
#include <ctype.h>
#include "alloc.h"
#include "approx.h"
+#include "devind.h"
#include "error.h"
#include "filename.h"
#include "error.h"
#include "filename.h"
+#include "htmlP.h"
#include "lexer.h"
#include "misc.h"
#include "lexer.h"
#include "misc.h"
-#include "output.h"
#include "settings.h"
#include "str.h"
#include "settings.h"
#include "str.h"
@@
-194,7
+196,7
@@
expand_name (char *bp, char *ep)
/* Looks for a macro with key KEY, and returns the corresponding value
if found, or NULL if not. */
/* Looks for a macro with key KEY, and returns the corresponding value
if found, or NULL if not. */
-const char *
+
static
const char *
find_defn_value (const char *key)
{
static char buf[INT_DIGITS + 1];
find_defn_value (const char *key)
{
static char buf[INT_DIGITS + 1];
@@
-226,9
+228,8
@@
outp_init (void)
extern struct outp_class postscript_class;
extern struct outp_class epsf_class;
#endif
extern struct outp_class postscript_class;
extern struct outp_class epsf_class;
#endif
-#if !NO_HTML
extern struct outp_class html_class;
extern struct outp_class html_class;
-#endif
+ extern struct outp_class devind_class;
char def[] = "default";
char def[] = "default";
@@
-239,6
+240,7
@@
outp_init (void)
add_class (&epsf_class);
add_class (&postscript_class);
#endif
add_class (&epsf_class);
add_class (&postscript_class);
#endif
+ add_class (&devind_class);
add_class (&ascii_class);
add_name (def, &def[strlen (def)], OUTP_S_INIT_FILE);
add_class (&ascii_class);
add_name (def, &def[strlen (def)], OUTP_S_INIT_FILE);
@@
-423,7
+425,7
@@
outp_configure_macro (char *bp)
/* Destroys all the drivers in driver list *DL and sets *DL to
NULL. */
/* Destroys all the drivers in driver list *DL and sets *DL to
NULL. */
-void
+
static
void
destroy_list (struct outp_driver ** dl)
{
struct outp_driver *d, *next;
destroy_list (struct outp_driver ** dl)
{
struct outp_driver *d, *next;