More careful context hash calculation which doesn't depend on size

[sgt/halibut] / paper.h

diff --git a/paper.h b/paper.h
index 6a4e353..d6f34b9 100644 (file)
--- a/paper.h
+++ b/paper.h
@@ -17,6 +17,10 @@ typedef struct line_data_Tag line_data;
 typedef struct page_data_Tag page_data;
 typedef struct subfont_map_entry_Tag subfont_map_entry;
 typedef struct text_fragment_Tag text_fragment;
+typedef struct xref_Tag xref;
+typedef struct xref_dest_Tag xref_dest;
+typedef struct rect_Tag rect;
+typedef struct outline_element_Tag outline_element;
 
 /*
  * This data structure represents the overall document, in the form
@@ -26,6 +30,8 @@ struct document_Tag {
     int paper_width, paper_height;
     font_list *fonts;
     page_data *pages;
+    outline_element *outline_elements;
+    int n_outline_elements;
 };
 
 /*
@@ -117,6 +123,7 @@ enum {
  */
 
 struct para_data_Tag {
+    para_data *next;
     /*
      * Data about the fonts used in this paragraph. Indices are the
      * FONT_* constants defined above.
@@ -134,6 +141,28 @@ struct para_data_Tag {
      */
     line_data *first;                 /* first line in paragraph */
     line_data *last;                  /* last line in paragraph */
+    /*
+     * Some paragraphs have associated graphics; currently this is
+     * nothing more complex than a single black rectangle.
+     */
+    enum {
+       RECT_NONE, RECT_CHAPTER_UNDERLINE, RECT_RULE
+    } rect_type;
+    /*
+     * We left- and right-justify in special circumstances.
+     */
+    enum {
+       JUST, LEFT, RIGHT
+    } justification;
+    /*
+     * For constructing the page outline.
+     */
+    int outline_level;                /* 0=title 1=C 2=H 3=S 4=S2... */
+    wchar_t *outline_title;
+    /*
+     * For adding the page number of a contents entry afterwards.
+     */
+    paragraph *contents_entry;
 };
 
 struct line_data_Tag {
@@ -151,18 +180,23 @@ struct line_data_Tag {
      * its starting x position, and by how much the width of spaces
      * needs to be adjusted for paragraph justification.
      * 
-     * (`last' may be NULL if it's more convenient.)
+     * (Unlike most of the `last' pointers defined in this file,
+     * this `end' pointer points to the word _after_ the last one
+     * that should be displayed on the line. This is how it's
+     * returned from wrap_para().)
      */
     word *first;
-    word *last;
+    word *end;
     int xpos;
-    int space_adjust;                 /* for justifying paragraphs */
+    int hshortfall, nspaces;          /* for justifying paragraphs */
+    int real_shortfall;
     /*
      * Auxiliary text: a section number in a margin, or a list item
      * bullet or number. Also mention where to display this text
      * relative to the left margin.
      */
     word *aux_text;
+    word *aux_text_2;
     int aux_left_indent;
     /*
      * This line might have a non-negotiable page break before it.
@@ -176,11 +210,15 @@ struct line_data_Tag {
     int space_after;
     int line_height;
     /*
+     * Penalties for page breaking before or after this line.
+     */
+    int penalty_before, penalty_after;
+    /*
      * These fields are used in the page breaking algorithm.
      */
-    int bestcost;
-    int shortfall, text, space;
-    line_data *page_last;             /* last line on a page starting here */
+    int *bestcost;
+    int *vshortfall, *text, *space;
+    line_data **page_last;            /* last line on a page starting here */
     /*
      * After page breaking, we can assign an actual y-coordinate on
      * the page to each line. Also we store a pointer back to the
@@ -212,6 +250,21 @@ struct page_data_Tag {
     text_fragment *first_text;
     text_fragment *last_text;
     /*
+     * Cross-references.
+     */
+    xref *first_xref;
+    xref *last_xref;
+    /*
+     * Rectangles to be drawn. (These are currently only used for
+     * underlining chapter titles and drawing horizontal rules.)
+     */
+    rect *first_rect;
+    rect *last_rect;
+    /*
+     * The page number, as a string.
+     */
+    wchar_t *number;
+    /*
      * This spare pointer field is for use by the client backends.
      */
     void *spare;
@@ -223,6 +276,29 @@ struct text_fragment_Tag {
     font_encoding *fe;
     int fontsize;
     char *text;
+    int width;
+};
+
+struct xref_dest_Tag {
+    enum { NONE, PAGE, URL } type;
+    page_data *page;
+    char *url;
+};
+
+struct xref_Tag {
+    xref *next;
+    int lx, rx, ty, by;
+    xref_dest dest;
+};
+
+struct rect_Tag {
+    rect *next;
+    int x, y, w, h;
+};
+
+struct outline_element_Tag {
+    int level;                        /* 0=title 1=C 2=H 3=S 4=S2... */
+    para_data *pdata;
 };
 
 /*