[gtk-doc] db2html: simplify the jinja exports



commit 091e683e67f8a2c369a88020eefa0a9786ad5cc3
Author: Stefan Sauer <ensonic users sf net>
Date:   Thu Jan 18 19:18:15 2018 +0100

    db2html: simplify the jinja exports
    
    We now have a single convert_block() function.

 tools/db2html.py              |   11 ++++-------
 tools/templates/book.html     |    2 +-
 tools/templates/refentry.html |    4 +---
 3 files changed, 6 insertions(+), 11 deletions(-)
---
diff --git a/tools/db2html.py b/tools/db2html.py
index 472f182..a2cce67 100644
--- a/tools/db2html.py
+++ b/tools/db2html.py
@@ -467,6 +467,7 @@ convert_tags = {
     'parameter': convert_em_class,
     'phrase': convert_phrase,
     'programlisting': convert_programlisting,
+    'releaseinfo': convert_para,
     'refsect1': convert_refsect1,
     'refsect2': convert_refsect2,
     'refsect3': convert_refsect3,
@@ -484,11 +485,8 @@ convert_tags = {
 def convert(out_dir, files, node):
     """Convert the docbook chunks to a html file."""
 
-    def jinja_convert_refsect1(xml):
-        return ''.join(convert_refsect1(xml))
-
-    def jinja_convert_para(xml):
-        return ''.join(convert_para(xml))
+    def jinja_convert(xml):
+        return ''.join(convert_tags.get(xml.tag, convert__unknown)(xml))
 
     logging.info('Writing: %s', node.filename)
     with open(os.path.join(out_dir, node.filename), 'wt') as html:
@@ -504,8 +502,7 @@ def convert(out_dir, files, node):
             #     return xml.xpath(expr)
 
             template = TEMPLATES[node.name]
-            template.globals['convert_refsect1'] = jinja_convert_refsect1
-            template.globals['convert_para'] = jinja_convert_para
+            template.globals['convert_block'] = jinja_convert
             params = {
                 'xml': node.xml,
                 'title': node.title,
diff --git a/tools/templates/book.html b/tools/templates/book.html
index a38a361..58e32f3 100644
--- a/tools/templates/book.html
+++ b/tools/templates/book.html
@@ -13,7 +13,7 @@
 {{ navigation_main(title) }}
 {%- set releaseinfo=xml.find('bookinfo/releaseinfo') %}
 {%- if releaseinfo %}
-{{ convert_para(releaseinfo) }}
+{{ convert_block(releaseinfo) }}
 {%- endif %}
 <hr>
 </div>
diff --git a/tools/templates/refentry.html b/tools/templates/refentry.html
index 90bf4b1..9da4be9 100644
--- a/tools/templates/refentry.html
+++ b/tools/templates/refentry.html
@@ -20,11 +20,9 @@
     <td class="gallery_image" valign="top" align="right"></td>
   </tr></table>
 </div>
-
 {%- for sect in xml.findall('refsect1') -%}
-{{ convert_refsect1(sect) }}
+{{ convert_block(sect) }}
 {%- endfor %}
-
 </div>
 </body>
 </html>
\ No newline at end of file


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]