shithub: freetype+ttf2subf

Info  •  Files  •  Log  •  Branches

[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.

git/fs: mount .git/fs: mount/attach disallowed

--- a/ChangeLog

+++ b/ChangeLog

@@ -1,5 +1,14 @@

 2014-11-29  Werner Lemberg  <[email protected]>

+	[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  <[email protected]>

+

 	[docmaker] Use field values as HTML link targets where possible.

 	* src/tools/docmaker/tohtml.py (HtmlFormatter::make_block_url):

--- a/src/tools/docmaker/formatter.py

+++ b/src/tools/docmaker/formatter.py

@@ -182,7 +182,18 @@

         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!