projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(cmd_file_handle) Fix msg() bug found by -Wformat.
[pspp]
/
src
/
groff-font.c
diff --git
a/src/groff-font.c
b/src/groff-font.c
index e4df2cff7c94788222323fc06eab5d610b251750..9427089d3009f330e1e5997a6c59aab56583862e 100644
(file)
--- a/
src/groff-font.c
+++ b/
src/groff-font.c
@@
-14,12
+14,12
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 5
9 Temple Place - Suite 330
, Boston, MA
- 0211
1-1307
, USA. */
+ Foundation, Inc., 5
1 Franklin Street, Fifth Floor
, Boston, MA
+ 0211
0-1301
, USA. */
#include <config.h>
#include "font.h"
#include <config.h>
#include "font.h"
-#include
<assert.h>
+#include
"error.h"
#include <stdio.h>
#include <errno.h>
#include <stdlib.h>
#include <stdio.h>
#include <errno.h>
#include <stdlib.h>
@@
-48,13
+48,7
@@
static void add_kern (struct font_desc * font, int ch1, int ch2, int adjust);
/* Typical whitespace characters for tokenizing. */
static const char whitespace[] = " \t\n\r\v";
/* Typical whitespace characters for tokenizing. */
static const char whitespace[] = " \t\n\r\v";
-void
-groff_init (void)
-{
- space_index = font_char_name_to_index ("space");
-}
-
-/* Some notes on the groff_font(8) manpage:
+/* Some notes on the groff_font manpage:
DESC file format: A typical PostScript `res' would be 72000, with
`hor' and `vert' set to 1 to indicate that all those positions are
DESC file format: A typical PostScript `res' would be 72000, with
`hor' and `vert' set to 1 to indicate that all those positions are
@@
-68,7
+62,7
@@
groff_init (void)
/* Reads a Groff font description file and converts it to a usable
binary format in memory. Installs the binary format in the global
/* Reads a Groff font description file and converts it to a usable
binary format in memory. Installs the binary format in the global
- font table. See groff_font
(8)
for a description of the font
+ font table. See groff_font for a description of the font
description format supported. Returns nonzero on success. */
struct font_desc *
groff_read_font (const char *fn)
description format supported. Returns nonzero on success. */
struct font_desc *
groff_read_font (const char *fn)
@@
-92,7
+86,7
@@
groff_read_font (const char *fn)
char *key;
/* 0=kernpairs section, 1=charset section. */
char *key;
/* 0=kernpairs section, 1=charset section. */
- int charset;
+ int charset
= 0
;
/* Index for previous line. */
int prev_index = -1;
/* Index for previous line. */
int prev_index = -1;
@@
-447,6
+441,20
@@
static struct
}
hash;
}
hash;
+void
+groff_init (void)
+{
+ space_index = font_char_name_to_index ("space");
+}
+
+void
+groff_done (void)
+{
+ free (hash.tab) ;
+ pool_destroy(hash.ar);
+}
+
+
/* Searches for NAME in the global character code table, returns the
index if found; otherwise inserts NAME and returns the new
index. */
/* Searches for NAME in the global character code table, returns the
index if found; otherwise inserts NAME and returns the new
index. */