doctool: Rebrand mallardwriter as docwriter

We eventually want to stop using Mallard as a documentation language.
Rationale incoming when I convert all templates back to DocBook.

3 files changed, 11 insertions, 11 deletions

diff --git a/Makefile-giscanner.am b/Makefile-giscanner.am
index 02bb3ec6..b2fad457 100644
--- a/Makefile-giscanner.am
+++ b/Makefile-giscanner.am
@@ -34,6 +34,7 @@ pkgpyexec_PYTHON =		\
 	giscanner/cachestore.py		\
 	giscanner/codegen.py		\
 	giscanner/docmain.py	\
+	giscanner/docwriter.py		\
 	giscanner/dumper.py		\
 	giscanner/introspectablepass.py	\
 	giscanner/girparser.py		\
@@ -41,7 +42,6 @@ pkgpyexec_PYTHON =		\
 	giscanner/gdumpparser.py 	\
 	giscanner/libtoolimporter.py	\
 	giscanner/odict.py		\
-	giscanner/mallardwriter.py	\
 	giscanner/maintransformer.py	\
 	giscanner/message.py		\
 	giscanner/shlibs.py		\
diff --git a/giscanner/docmain.py b/giscanner/docmain.py
index 8089a6b3..8919eabb 100644
--- a/giscanner/docmain.py
+++ b/giscanner/docmain.py
@@ -21,7 +21,7 @@
 import os
 import optparse
 
-from .mallardwriter import MallardWriter
+from .docwriter import DocWriter
 from .transformer import Transformer
 
 def doc_main(args):
@@ -52,7 +52,7 @@ def doc_main(args):
         extra_include_dirs = []
     transformer = Transformer.parse_from_gir(args[1], extra_include_dirs)
 
-    writer = MallardWriter(transformer, options.language)
+    writer = DocWriter(transformer, options.language)
     writer.write(options.output)
 
     return 0
diff --git a/giscanner/mallardwriter.py b/giscanner/docwriter.py
index a4e9c073..2b9cb0fc 100644
--- a/giscanner/mallardwriter.py
+++ b/giscanner/docwriter.py
@@ -161,7 +161,7 @@ class DocstringScanner(TemplatedScanner):
 
         super(DocstringScanner, self).__init__(specs)
 
-class MallardFormatter(object):
+class DocFormatter(object):
     def __init__(self, transformer):
         self._transformer = transformer
         self._scanner = DocstringScanner()
@@ -350,7 +350,7 @@ class MallardFormatter(object):
         parent_chain.reverse()
         return parent_chain
 
-class MallardFormatterC(MallardFormatter):
+class DocFormatterC(DocFormatter):
     language = "C"
     mime_type = "text/x-csrc"
 
@@ -374,7 +374,7 @@ class MallardFormatterC(MallardFormatter):
         else:
             return func.name
 
-class MallardFormatterPython(MallardFormatter):
+class DocFormatterPython(DocFormatter):
     language = "Python"
     mime_type = "text/python"
 
@@ -450,7 +450,7 @@ class MallardFormatterPython(MallardFormatter):
         else:
             return func.name
 
-class MallardFormatterGjs(MallardFormatter):
+class DocFormatterGjs(DocFormatter):
     language = "Gjs"
     mime_type = "text/x-gjs"
 
@@ -521,12 +521,12 @@ class MallardFormatterGjs(MallardFormatter):
             return func.name
 
 LANGUAGES = {
-    "c": MallardFormatterC,
-    "python": MallardFormatterPython,
-    "gjs": MallardFormatterGjs,
+    "c": DocFormatterC,
+    "python": DocFormatterPython,
+    "gjs": DocFormatterGjs,
 }
 
-class MallardWriter(object):
+class DocWriter(object):
     def __init__(self, transformer, language):
         self._transformer = transformer