Draft: cleanup frontend and prepare support for multipage rendering

src/common/texlive_provider.c

@@ -121,7 +121,7 @@ static struct cell *lookup(struct table *table, const char *key)
 static void grow(struct table *table)
 {
   if (LOG)
-    printf("growing table\n");
+    fprintf(stderr, "growing table\n");
   struct cell *ocells = table->hash.cells;
   int count = cell_count(table);
 
@@ -156,14 +156,14 @@ static const char *find(struct table *table, const char *key)
   if (c->offset == 0)
   {
     if (LOG)
-      printf("find: %s not found\n", key);
+      fprintf(stderr, "find: %s not found\n", key);
     return NULL;
   }
   const char *p = &table->entries.buffer[c->offset];
   while (p[-1] != '\0')
     p--;
   if (LOG)
-    printf("find: %s found\n", key);
+    fprintf(stderr, "find: %s found\n", key);
   return p;
 }
 
@@ -274,7 +274,7 @@ static void add(struct table *table,
   if (!has_dot)
   {
     if (0)
-      printf("add: skipping %s/%s/%s\n  (no dot: assuming it is a directory)\n",
+      fprintf(stderr, "add: skipping %s/%s/%s\n  (no dot: assuming it is a directory)\n",
              root, dir, name);
     return;
   }
@@ -286,12 +286,12 @@ static void add(struct table *table,
     while (p[-1])
       p -= 1;
     if (rank(p, root, dir))
-      printf("add: %s/%s/%s shadows previous binding\n  (already having: %s)\n",
+      fprintf(stderr, "add: %s/%s/%s shadows previous binding\n  (already having: %s)\n",
              root, dir, name, p);
     else
     {
       if (LOG)
-        printf("add: skipping %s/%s/%s\n  (already having: %s)\n", root, dir,
+        fprintf(stderr, "add: skipping %s/%s/%s\n  (already having: %s)\n", root, dir,
                name, p);
       return;
     }
@@ -300,7 +300,7 @@ static void add(struct table *table,
   {
     table->hash.count += 1;
     if (LOG)
-      printf("add: adding %s\n", name);
+      fprintf(stderr, "add: adding %s\n", name);
   }
 
   int rlen = strlen(root);
@@ -312,7 +312,7 @@ static void add(struct table *table,
   if (table->entries.cap < tlen)
   {
     if (LOG)
-      printf("add: growing buffer\n");
+      fprintf(stderr, "add: growing buffer\n");
     while (table->entries.cap < tlen)
       table->entries.cap *= 2;
     table->entries.buffer = realloc(table->entries.buffer, table->entries.cap);
@@ -351,7 +351,7 @@ static void process_line(struct table *table, char *path)
   if (!f)
   {
     perror("Cannot open file");
-    printf("File: %s\n", path);
+    fprintf(stderr, "File: %s\n", path);
     return;
   }
 
@@ -449,7 +449,7 @@ static bool list_texlive_files(void)
   {
     if (LOG)
     {
-      printf("Retrieved line of length %zd:\n", len);
+      fprintf(stderr, "Retrieved line of length %zd:\n", len);
       fwrite(line, len, 1, stdout);
     }
 
@@ -469,7 +469,7 @@ static bool list_texlive_files(void)
   if (ret == -1)
     perror("pclose");
   else if (ret > 0)
-    printf("Exit code: %d\n", ret);
+    fprintf(stderr, "Exit code: %d\n", ret);
   else
     loaded = 1;
 

src/dvi/dvi_context.c

@@ -24,12 +24,12 @@
 
 #include "mydvi.h"
 
-dvi_context *dvi_context_new(fz_context *ctx, dvi_reshooks hooks)
+dvi_context *dvi_context_new(fz_context *ctx, dvi_resloader loader)
 {
   dvi_context *dc = fz_malloc_struct(ctx, dvi_context);
 
   dc->dev = NULL;
-  dc->resmanager = dvi_resmanager_new(ctx, hooks);
+  dc->resmanager = dvi_resmanager_new(ctx, loader);
   dvi_scratch_init(&dc->scratch);
 
   dvi_state *st = &dc->root;

src/dvi/dvi_resmanager.c

@@ -70,7 +70,7 @@ struct cell_image {
 };
 
 struct dvi_resmanager {
-  dvi_reshooks hooks;
+  dvi_resloader loader;
   cell_dvi_font *first_dvi_font;
   cell_tex_enc  *first_tex_enc;
   cell_pdf_doc  *first_pdf_doc;
@@ -233,10 +233,10 @@ tectonic_hooks_open_file(fz_context *ctx, void *env, dvi_reskind kind, const cha
   return result;
 }
 
-dvi_reshooks dvi_tectonic_hooks(fz_context *ctx, const char *document_dir)
+dvi_resloader dvi_tectonic_loader(fz_context *ctx, const char *document_dir)
 {
   char *path = fz_strdup(ctx, document_dir ? document_dir : "");
-  return (dvi_reshooks){
+  return (dvi_resloader){
     .env = path,
     .free_env = default_hooks_free_env,
     .open_file = tectonic_hooks_open_file,
@@ -282,7 +282,7 @@ texlive_hooks_open_file(fz_context *ctx, void *env, dvi_reskind kind, const char
       break;
 
     case RES_FONT:
-      if (name[0] == '/' || name[0] == '.')
+      if (strchr(name, '/'))
       {
         path = (char *)name;
         break;
@@ -375,29 +375,29 @@ texlive_hooks_open_file(fz_context *ctx, void *env, dvi_reskind kind, const char
   return result;
 }
 
-dvi_reshooks dvi_texlive_hooks(fz_context *ctx, const char *document_dir)
+dvi_resloader dvi_texlive_loader(fz_context *ctx, const char *document_dir)
 {
   char *path = fz_strdup(ctx, document_dir ? document_dir : "");
-  return (dvi_reshooks){
+  return (dvi_resloader){
     .env = path,
     .free_env = default_hooks_free_env,
     .open_file = texlive_hooks_open_file,
   };
 }
 
-void dvi_free_hooks(fz_context *ctx, const dvi_reshooks *hooks)
+void dvi_free_loader(fz_context *ctx, const dvi_resloader *loader)
 {
-  if (hooks->free_env)
-    hooks->free_env(ctx, hooks->env);
+  if (loader->free_env)
+    loader->free_env(ctx, loader->env);
 }
 
 
 static fz_stream *dvi_resmanager_open_file(fz_context *ctx, dvi_resmanager *rm, dvi_reskind kind, const char *path)
 {
-  if (!rm->hooks.open_file)
+  if (!rm->loader.open_file)
     return NULL;
 
-  return rm->hooks.open_file(ctx, rm->hooks.env, kind, path);
+  return rm->loader.open_file(ctx, rm->loader.env, kind, path);
 }
 
 static void load_fontmap(fz_context *ctx, dvi_resmanager *rm)
@@ -428,15 +428,15 @@ static void load_fontmap(fz_context *ctx, dvi_resmanager *rm)
   fz_try_rethrow(ctx);
 }
 
-dvi_resmanager *dvi_resmanager_new(fz_context *ctx, dvi_reshooks hooks)
+dvi_resmanager *dvi_resmanager_new(fz_context *ctx, dvi_resloader loader)
 {
   dvi_resmanager *rm = fz_malloc_struct(ctx, dvi_resmanager);
   rm->first_dvi_font = NULL;
   rm->first_tex_enc = NULL;
   rm->first_pdf_doc = NULL;
   rm->first_fz_font = NULL;
   rm->first_image = NULL;
-  rm->hooks = hooks;
+  rm->loader = loader;
 
   load_fontmap(ctx, rm);
 
@@ -445,7 +445,7 @@ dvi_resmanager *dvi_resmanager_new(fz_context *ctx, dvi_reshooks hooks)
 
 void dvi_resmanager_free(fz_context *ctx, dvi_resmanager *rm)
 {
-  dvi_free_hooks(ctx, &rm->hooks);
+  dvi_free_loader(ctx, &rm->loader);
 
   if (rm->map)
   {