summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Tatham <anakin@pobox.com>1999-11-12 15:01:47 +0000
committerSimon Tatham <anakin@pobox.com>1999-11-12 15:01:47 +0000
commit95454a1a55874e1e3071c6363541493394f44eaf (patch)
tree124e2239ff8f03c73360e214ef41e578203deea5
parentb28dd9a135da2d62073840d05de430ec8dd8a58d (diff)
downloadhalibut-95454a1a55874e1e3071c6363541493394f44eaf.zip
halibut-95454a1a55874e1e3071c6363541493394f44eaf.tar.gz
halibut-95454a1a55874e1e3071c6363541493394f44eaf.tar.bz2
halibut-95454a1a55874e1e3071c6363541493394f44eaf.tar.xz
Daft error in input.c was causing messy aux fields and misgenerated emphasis
in text output. Now all aux fields are carefully zeroed when not used [originally from svn r307]
-rw-r--r--input.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/input.c b/input.c
index 6b71d4e..105f715 100644
--- a/input.c
+++ b/input.c
@@ -749,6 +749,7 @@ static void read_file(paragraph ***ret, input *in, index *idx) {
wd.text = NULL;
wd.type = spcstyle;
wd.alt = NULL;
+ wd.aux = 0;
wd.fpos = t.pos;
wd.breaks = FALSE;
if (indexing)
@@ -764,6 +765,7 @@ static void read_file(paragraph ***ret, input *in, index *idx) {
rdadds(&indexstr, t.text);
wd.type = style;
wd.alt = NULL;
+ wd.aux = 0;
wd.fpos = t.pos;
wd.breaks = t.aux;
if (!indexing || index_visible) {
@@ -808,6 +810,7 @@ static void read_file(paragraph ***ret, input *in, index *idx) {
wd.text = NULL;
wd.type = word_HyperEnd;
wd.alt = NULL;
+ wd.aux = 0;
wd.fpos = t.pos;
wd.breaks = FALSE;
if (!indexing || index_visible)
@@ -944,6 +947,7 @@ static void read_file(paragraph ***ret, input *in, index *idx) {
}
}
wd.alt = NULL;
+ wd.aux = 0;
if (!indexing || index_visible) {
wd.text = ustrdup(wdtext);
addword(wd, &whptr);
@@ -1050,6 +1054,7 @@ static void read_file(paragraph ***ret, input *in, index *idx) {
wd.type = word_IndexRef;
wd.text = NULL;
wd.alt = NULL;
+ wd.aux = 0;
wd.breaks = FALSE;
indexword = addword(wd, &whptr);
/* Set up a rdstring to read the index text */
@@ -1070,6 +1075,7 @@ static void read_file(paragraph ***ret, input *in, index *idx) {
wd.type = style;
wd.breaks = FALSE;
wd.alt = NULL;
+ wd.aux = 0;
wd.fpos = t.pos;
if (!indexing || index_visible) {
wd.text = ustrdup(utext);