[docmaker] Don't output a block multiple times.

This bug was hidden by not processing all lines of `<Order>' blocks.

* src/tools/docmaker/formatter.py (Formatter::section_dump): Filter
out field names.
This commit is contained in:
Werner Lemberg 2014-12-01 10:07:52 +01:00
parent 0dbad7632b
commit 80bfeb1c3b
2 changed files with 20 additions and 0 deletions

View File

@ -1,3 +1,12 @@
2014-11-29 Werner Lemberg <wl@gnu.org>
[docmaker] Don't output a block multiple times.
This bug was hidden by not processing all lines of `<Order>' blocks.
* src/tools/docmaker/formatter.py (Formatter::section_dump): Filter
out field names.
2014-11-29 Werner Lemberg <wl@gnu.org>
[docmaker] Use field values as HTML link targets where possible.

View File

@ -182,7 +182,18 @@ class Formatter:
self.section_enter( section )
for name in section.block_names:
skip_entry = 0
block = self.identifiers[name]
# `block_names' can contain field names also, which we filter out
for markup in block.markups:
if markup.tag == 'values':
for field in markup.fields:
if field.name == name:
skip_entry = 1
if skip_entry:
continue;
self.block_enter( block )
for markup in block.markups[1:]: # always ignore first markup!