X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgroff-font.c;h=5df16f43f0084f080f7f249e51681d398aa27e58;hb=47106fcdfb1a24d0fff77dc0323c3c4d4a30daa4;hp=2510b894769c285cac1c8761dd3601d7f92319e8;hpb=4944c86a9318bc5b5578ab145a95c116ffd2c9fd;p=pspp diff --git a/src/groff-font.c b/src/groff-font.c index 2510b89476..5df16f43f0 100644 --- a/src/groff-font.c +++ b/src/groff-font.c @@ -14,11 +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 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. */ #include -#include +#include "font.h" +#include "error.h" #include #include #include @@ -27,18 +28,21 @@ #include "alloc.h" #include "error.h" #include "filename.h" -#include "font.h" +#include "getline.h" #include "hash.h" #include "pool.h" #include "str.h" #include "version.h" +#include "gettext.h" +#define _(msgid) gettext (msgid) + int font_number_to_index (int); int space_index; static int font_msg (int, const char *,...) - __attribute__ ((format (printf, 2, 3))); + PRINTF_FORMAT (2, 3); static void scan_badchars (char *, int); static void dup_char_metric (struct font_desc * font, int dest, int src); static void add_char_metric (struct font_desc * font, struct char_metrics *metrics, @@ -48,13 +52,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"; -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 @@ -68,7 +66,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 - 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) @@ -92,7 +90,7 @@ groff_read_font (const char *fn) char *key; /* 0=kernpairs section, 1=charset section. */ - int charset; + int charset = 0; /* Index for previous line. */ int prev_index = -1; @@ -100,7 +98,7 @@ groff_read_font (const char *fn) /* Current location in file, used for error reporting. */ struct file_locator where; -#if unix +#ifdef unix fn = fn_tilde_expand (fn); #endif @@ -130,8 +128,7 @@ groff_read_font (const char *fn) font->metric_size = 0; font->metric_used = 0; font->kern = NULL; - font->kern_size = 0; - font->kern_size_p = hsh_next_prime (64); + font->kern_size = 8; font->kern_used = 0; font->kern_max_used = 0; @@ -356,7 +353,7 @@ groff_read_font (const char *fn) goto file_lossage; } free (line); -#if unix +#ifdef unix free ((char *) fn); #endif @@ -379,9 +376,10 @@ file_lossage: /* Come here on any error. */ lose: - fclose (f); + if (f != NULL) + fclose (f); pool_destroy (font_pool); -#if unix +#ifdef unix free ((char *) fn); #endif err_pop_file_locator (&where); @@ -394,10 +392,15 @@ lose: static int font_msg (int class, const char *format,...) { + struct error error; va_list args; + error.class = class; + err_location (&error.where); + error.title = _("installation error: Groff font error: "); + va_start (args, format); - tmsg (class, format, args, _("installation error: Groff font error: ")); + err_vmsg (&error, format, args); va_end (args); return 0; @@ -408,7 +411,7 @@ font_msg (int class, const char *format,...) static void scan_badchars (char *line, int len) { - unsigned char *cp = line; + char *cp = line; /* Same bad characters as Groff. */ static unsigned char badchars[32] = @@ -419,12 +422,15 @@ scan_badchars (char *line, int len) 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; - for (; len--; cp++) - if (badchars[*cp >> 3] & (1 << (*cp & 7))) - { - font_msg (SE, _("Bad character \\%3o."), *cp); - *cp = ' '; - } + for (; len--; cp++) + { + int c = (unsigned char) *cp; + if (badchars[c >> 3] & (1 << (c & 7))) + { + font_msg (SE, _("Bad character \\%3o."), *cp); + *cp = ' '; + } + } } /* Character name hashing. */ @@ -439,16 +445,28 @@ struct index_hash /* Character index hash table. */ static struct { - int size; /* Size of table. */ - int *size_p; /* Next larger table size. */ + int size; /* Size of table (must be power of 2). */ int used; /* Number of full entries. */ - int max_used; /* # used entries where we enlarge & rehash. */ int next_index; /* Next index to allocate. */ struct index_hash *tab; /* Hash table proper. */ struct pool *ar; /* Pool for names. */ } 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. */ @@ -471,18 +489,16 @@ font_char_name_to_index (const char *name) if (!hash.tab) { - hash.size_p = hsh_next_prime (128); - hash.size = *hash.size_p++; + hash.size = 128; hash.used = 0; - hash.max_used = hash.size / 2; hash.next_index = 256; - hash.tab = xmalloc (sizeof *hash.tab * hash.size); + hash.tab = xnmalloc (hash.size, sizeof *hash.tab); hash.ar = pool_create (); for (i = 0; i < hash.size; i++) hash.tab[i].name = NULL; } - for (i = hashpjw (name) % hash.size; hash.tab[i].name;) + for (i = hsh_hash_string (name) & (hash.size - 1); hash.tab[i].name; ) { if (!strcmp (hash.tab[i].name, name)) return hash.tab[i].index; @@ -491,21 +507,21 @@ font_char_name_to_index (const char *name) } hash.used++; - if (hash.used >= hash.max_used) + if (hash.used >= hash.size / 2) { struct index_hash *old_tab = hash.tab; int old_size = hash.size; int i, j; - hash.size = *hash.size_p++; - hash.max_used = hash.size / 2; - hash.tab = xmalloc (sizeof *hash.tab * hash.size); + hash.size *= 2; + hash.tab = xnmalloc (hash.size, sizeof *hash.tab); for (i = 0; i < hash.size; i++) hash.tab[i].name = NULL; for (i = 0; i < old_size; i++) if (old_tab[i].name) { - for (j = hashpjw (old_tab[i].name) % hash.size; hash.tab[j].name;) + for (j = hsh_hash_string (old_tab[i].name) & (hash.size - 1); + hash.tab[j].name;) if (++j >= hash.size) j = 0; hash.tab[j] = old_tab[i]; @@ -546,8 +562,8 @@ check_deref_space (struct font_desc *font, int min_size) font->deref_size = min_size + 16; if (font->deref_size < 256) font->deref_size = 256; - font->deref = pool_realloc (font->owner, font->deref, - sizeof *font->deref * font->deref_size); + font->deref = pool_nrealloc (font->owner, font->deref, + font->deref_size, sizeof *font->deref); for (; i < font->deref_size; i++) font->deref[i] = -1; } @@ -561,8 +577,8 @@ add_char_metric (struct font_desc *font, struct char_metrics *metrics, int code) if (font->metric_used >= font->metric_size) { font->metric_size += 64; - font->metric = pool_realloc (font->owner, font->metric, - sizeof *font->metric * font->metric_size); + font->metric = pool_nrealloc (font->owner, font->metric, + font->metric_size, sizeof *font->metric); } font->metric[font->metric_used] = metrics; font->deref[code] = font->metric_used++; @@ -597,29 +613,33 @@ add_kern (struct font_desc *font, int ch1, int ch2, int adjust) int old_kern_size = font->kern_size; int j; - font->kern_size = *font->kern_size_p++; + font->kern_size *= 2; font->kern_max_used = font->kern_size / 2; - font->kern = pool_malloc (font->owner, - sizeof *font->kern * font->kern_size); + font->kern = pool_nmalloc (font->owner, + font->kern_size, sizeof *font->kern); for (i = 0; i < font->kern_size; i++) font->kern[i].ch1 = -1; - for (i = 0; i < old_kern_size; i++) - { - if (old_kern[i].ch1 == -1) - continue; - - j = hash_kern (old_kern[i].ch1, old_kern[i].ch2) % font->kern_size; - while (font->kern[j].ch1 != -1) - if (0 == j--) - j = font->kern_size - 1; - font->kern[j] = old_kern[i]; - } if (old_kern) - pool_free (font->owner, old_kern); + { + for (i = 0; i < old_kern_size; i++) + { + if (old_kern[i].ch1 == -1) + continue; + + j = (hash_kern (old_kern[i].ch1, old_kern[i].ch2) + & (font->kern_size - 1)); + while (font->kern[j].ch1 != -1) + if (0 == j--) + j = font->kern_size - 1; + font->kern[j] = old_kern[i]; + } + pool_free (font->owner, old_kern); + } } - for (i = hash_kern (ch1, ch2) % font->kern_size; font->kern[i].ch1 != -1;) + for (i = hash_kern (ch1, ch2) & (font->kern_size - 1); + font->kern[i].ch1 != -1; ) if (0 == i--) i = font->kern_size - 1; font->kern[i].ch1 = ch1; @@ -799,8 +819,8 @@ groff_read_DESC (const char *dev_name, struct groff_device_info * dev) if (dev->n_sizes + 2 >= m_sizes) { m_sizes += 1; - dev->sizes = xrealloc (dev->sizes, - m_sizes * sizeof *dev->sizes); + dev->sizes = xnrealloc (dev->sizes, + m_sizes, sizeof *dev->sizes); } dev->sizes[dev->n_sizes++][0] = lower; dev->sizes[dev->n_sizes][1] = upper; @@ -964,7 +984,8 @@ font_get_kern_adjust (const struct font_desc *font, int ch1, int ch2) if (!font->kern) return 0; - for (i = hash_kern (ch1, ch2) % font->kern_size; font->kern[i].ch1 != -1;) + for (i = hash_kern (ch1, ch2) & (font->kern_size - 1); + font->kern[i].ch1 != -1;) { if (font->kern[i].ch1 == ch1 && font->kern[i].ch2 == ch2) return font->kern[i].adjust; @@ -1002,8 +1023,7 @@ default_font (void) font->metric_size = 0; font->metric_used = 0; font->kern = NULL; - font->kern_size = 0; - font->kern_size_p = hsh_next_prime (64); + font->kern_size = 8; font->kern_used = 0; font->kern_max_used = 0; return font;