Support the \W{...}\i\c{...} combination used in the NASM manual.

[sgt/halibut] / bk_ps.c

diff --git a/bk_ps.c b/bk_ps.c
index 8fe61c4..c9f4223 100644 (file)
--- a/bk_ps.c
+++ b/bk_ps.c
@@ -6,6 +6,8 @@
 #include "halibut.h"
 #include "paper.h"
 
+static void ps_versionid(FILE *fp, word *words);
+
 paragraph *ps_config_filename(char *filename)
 {
     paragraph *p;
@@ -50,7 +52,6 @@ void ps_backend(paragraph *sourceform, keywordlist *keywords,
 
     filename = dupstr("output.ps");
     for (p = sourceform; p; p = p->next) {
-       p->private_data = NULL;
        if (p->type == para_Config && p->parent) {
            if (!ustricmp(p->keyword, L"ps-filename")) {
                sfree(filename);
@@ -75,6 +76,14 @@ void ps_backend(paragraph *sourceform, keywordlist *keywords,
     fprintf(fp, "%%%%EndProlog\n");
 
     fprintf(fp, "%%%%BeginSetup\n");
+
+    /*
+     * This is as good a place as any to put version IDs.
+     */
+    for (p = sourceform; p; p = p->next)
+       if (p->type == para_VersionID)
+           ps_versionid(fp, p->words);
+
     /*
      * Re-encode and re-metric the fonts.
      */
@@ -106,17 +115,45 @@ void ps_backend(paragraph *sourceform, keywordlist *keywords,
     fprintf(fp, "%%%%EndSetup\n");
 
     /*
-     * Output the text.
+     * Output the text and graphics.
      */
     pageno = 0;
     for (page = doc->pages; page; page = page->next) {
        text_fragment *frag;
+       rect *r;
 
        pageno++;
        fprintf(fp, "%%%%Page: %d %d\n", pageno, pageno);
        fprintf(fp, "%%%%BeginPageSetup\n");
        fprintf(fp, "%%%%EndPageSetup\n");
 
+#if 0
+       {
+           xref *xr;
+           /*
+            * I used this diagnostic briefly to ensure that
+            * cross-reference rectangles were being put where they
+            * should be.
+            */
+           for (xr = page->first_xref; xr; xr = xr->next) {
+               fprintf(fp, "gsave 0.7 setgray %g %g moveto",
+                       xr->lx/4096.0, xr->ty/4096.0);
+               fprintf(fp, " %g %g lineto %g %g lineto",
+                       xr->lx/4096.0, xr->by/4096.0,
+                       xr->rx/4096.0, xr->by/4096.0);
+               fprintf(fp, " %g %g lineto closepath fill grestore\n",
+                       xr->rx/4096.0, xr->ty/4096.0);
+           }
+       }
+#endif
+
+       for (r = page->first_rect; r; r = r->next) {
+           fprintf(fp, "%g %g moveto %g 0 rlineto 0 %g rlineto "
+                   "-%g 0 rlineto closepath fill\n",
+                   r->x / 4096.0, r->y / 4096.0, r->w / 4096.0,
+                   r->h / 4096.0, r->w / 4096.0);
+       }
+
        for (frag = page->first_text; frag; frag = frag->next) {
            char *c;
 
@@ -142,3 +179,42 @@ void ps_backend(paragraph *sourceform, keywordlist *keywords,
 
     sfree(filename);
 }
+
+static void ps_versionid(FILE *fp, word *words)
+{
+    fprintf(fp, "%% ");
+
+    for (; words; words = words->next) {
+       char *text;
+       int type;
+
+       switch (words->type) {
+         case word_HyperLink:
+         case word_HyperEnd:
+         case word_UpperXref:
+         case word_LowerXref:
+         case word_XrefEnd:
+         case word_IndexRef:
+           continue;
+       }
+
+       type = removeattr(words->type);
+
+       switch (type) {
+         case word_Normal:
+           text = utoa_dup(words->text);
+           break;
+         case word_WhiteSpace:
+           text = dupstr(" ");
+           break;
+         case word_Quote:
+           text = dupstr("'");
+           break;
+       }
+
+       fputs(text, fp);
+       sfree(text);
+    }
+
+    fprintf(fp, "\n");
+}