~mdw
/
sgt
/
halibut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More careful context hash calculation which doesn't depend on size
[sgt/halibut]
/
paper.h
diff --git
a/paper.h
b/paper.h
index
160bff5
..
d6f34b9
100644
(file)
--- a/
paper.h
+++ b/
paper.h
@@
-149,10
+149,20
@@
struct para_data_Tag {
RECT_NONE, RECT_CHAPTER_UNDERLINE, RECT_RULE
} rect_type;
/*
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 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 {
};
struct line_data_Tag {
@@
-179,6
+189,7
@@
struct line_data_Tag {
word *end;
int xpos;
int hshortfall, nspaces; /* for justifying paragraphs */
word *end;
int xpos;
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
/*
* Auxiliary text: a section number in a margin, or a list item
* bullet or number. Also mention where to display this text
@@
-205,9
+216,9
@@
struct line_data_Tag {
/*
* These fields are used in the page breaking algorithm.
*/
/*
* These fields are used in the page breaking algorithm.
*/
- int bestcost;
- int
vshortfall, 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
/*
* After page breaking, we can assign an actual y-coordinate on
* the page to each line. Also we store a pointer back to the
@@
-250,6
+261,10
@@
struct page_data_Tag {
rect *first_rect;
rect *last_rect;
/*
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;
* This spare pointer field is for use by the client backends.
*/
void *spare;
@@
-261,6
+276,7
@@
struct text_fragment_Tag {
font_encoding *fe;
int fontsize;
char *text;
font_encoding *fe;
int fontsize;
char *text;
+ int width;
};
struct xref_dest_Tag {
};
struct xref_dest_Tag {