[gobject-introspection: 2/2] Merge branch '134-output-formats' into 'master'

[Christoph Reiter <creiter src gnome org>]

commit d3efb8537a07133c2718deaa53b39a3433eef54b
Merge: 1636bb0e e85a46ea
Author: Christoph Reiter <reiter christoph gmail com>
Date:   Thu Jun 21 05:38:51 2018 +0000

    Merge branch '134-output-formats' into 'master'
    
    Resolve "Allow multiple output formats"
    
    Closes #134
    
    See merge request GNOME/gobject-introspection!4

 Makefile-giscanner.am                              | 90 +++++++++++-----------
 giscanner/docmain.py                               | 14 +++-
 .../doctemplates/{ => mallard}/C/callback.tmpl     |  0
 giscanner/doctemplates/{ => mallard}/C/class.tmpl  |  0
 .../doctemplates/{ => mallard}/C/constructor.tmpl  |  0
 .../doctemplates/{ => mallard}/C/default.tmpl      |  0
 giscanner/doctemplates/{ => mallard}/C/enum.tmpl   |  0
 giscanner/doctemplates/{ => mallard}/C/field.tmpl  |  0
 .../doctemplates/{ => mallard}/C/function.tmpl     |  0
 .../doctemplates/{ => mallard}/C/interface.tmpl    |  0
 giscanner/doctemplates/{ => mallard}/C/method.tmpl |  0
 .../doctemplates/{ => mallard}/C/namespace.tmpl    |  0
 .../doctemplates/{ => mallard}/C/property.tmpl     |  0
 giscanner/doctemplates/{ => mallard}/C/record.tmpl |  0
 giscanner/doctemplates/{ => mallard}/C/signal.tmpl |  0
 giscanner/doctemplates/{ => mallard}/C/vfunc.tmpl  |  0
 .../doctemplates/{ => mallard}/Gjs/callback.tmpl   |  0
 .../doctemplates/{ => mallard}/Gjs/class.tmpl      |  0
 .../{ => mallard}/Gjs/constructor.tmpl             |  0
 .../doctemplates/{ => mallard}/Gjs/default.tmpl    |  0
 giscanner/doctemplates/{ => mallard}/Gjs/enum.tmpl |  0
 .../doctemplates/{ => mallard}/Gjs/field.tmpl      |  0
 .../doctemplates/{ => mallard}/Gjs/function.tmpl   |  0
 .../doctemplates/{ => mallard}/Gjs/interface.tmpl  |  0
 .../doctemplates/{ => mallard}/Gjs/method.tmpl     |  0
 .../doctemplates/{ => mallard}/Gjs/namespace.tmpl  |  0
 .../doctemplates/{ => mallard}/Gjs/property.tmpl   |  0
 .../doctemplates/{ => mallard}/Gjs/record.tmpl     |  0
 .../doctemplates/{ => mallard}/Gjs/signal.tmpl     |  0
 .../doctemplates/{ => mallard}/Gjs/vfunc.tmpl      |  0
 .../{ => mallard}/Python/callback.tmpl             |  0
 .../doctemplates/{ => mallard}/Python/class.tmpl   |  0
 .../{ => mallard}/Python/constructor.tmpl          |  0
 .../doctemplates/{ => mallard}/Python/default.tmpl |  0
 .../doctemplates/{ => mallard}/Python/enum.tmpl    |  0
 .../doctemplates/{ => mallard}/Python/field.tmpl   |  0
 .../{ => mallard}/Python/function.tmpl             |  0
 .../{ => mallard}/Python/interface.tmpl            |  0
 .../doctemplates/{ => mallard}/Python/method.tmpl  |  0
 .../{ => mallard}/Python/namespace.tmpl            |  0
 .../{ => mallard}/Python/property.tmpl             |  0
 .../doctemplates/{ => mallard}/Python/record.tmpl  |  0
 .../doctemplates/{ => mallard}/Python/signal.tmpl  |  0
 .../doctemplates/{ => mallard}/Python/vfunc.tmpl   |  0
 giscanner/doctemplates/{ => mallard}/base.tmpl     |  0
 giscanner/doctemplates/{ => mallard}/class.tmpl    |  0
 .../doctemplates/{ => mallard}/namespace.tmpl      |  0
 giscanner/docwriter.py                             | 33 ++++++--
 48 files changed, 80 insertions(+), 57 deletions(-)
---