[libsoup/wip/pgriffis/markdown-docs] WIP: Try using markdown for docs
- From: Patrick Griffis <pgriffis src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libsoup/wip/pgriffis/markdown-docs] WIP: Try using markdown for docs
- Date: Tue, 3 Nov 2020 23:19:25 +0000 (UTC)
commit b07c7ba4e55fbe29c5511bb9f937005be2208326
Author: Patrick Griffis <pgriffis igalia com>
Date: Tue Nov 3 17:19:06 2020 -0600
WIP: Try using markdown for docs
docs/reference/client-howto.md | 45 +++
docs/reference/client-howto.xml | 548 ------------------------------
docs/reference/gtk-markdown-to-docbook.py | 201 +++++++++++
docs/reference/meson.build | 33 +-
4 files changed, 274 insertions(+), 553 deletions(-)
---
diff --git a/docs/reference/client-howto.md b/docs/reference/client-howto.md
new file mode 100644
index 00000000..431b667c
--- /dev/null
+++ b/docs/reference/client-howto.md
@@ -0,0 +1,45 @@
+# libsoup Client Basics {#libsoup-client-howto}
+
+This section explains how to use libsoup as an HTTP client using several new APIs introduced in version 2.42.
+If you want to be compatible with older versions of libsoup, consult the documentation for that version.
+
+
+## Creating a SoupSession
+
+The first step in using the client API is to create a #SoupSession.
+The session object encapsulates all of the state that libsoup
+is keeping on behalf of your program; cached HTTP connections,
+authentication information, etc.
+
+When you create the session with soup_session_new_with_options(),
+you can specify various additional options:
+
+- ["max-conns"](#SoupSession:max-conns)
+
+ Allows you to set the maximum total number of connections
+ the session will have open at one time. (Once it reaches
+ this limit, it will either close idle connections, or
+ wait for existing connections to free up before starting
+ new requests.) The default value is `10`.
+
+- ["max-conns-per-host"](#SoupSession:max-conns-per-host)
+
+ Allows you to set the maximum total number of connections
+ the session will have open *to a single host* at one time.
+ The default value is `2`.
+
+- ["user-agent"](#SoupSession:user-agent)
+
+ Allows you to set a User-Agent string that will be sent
+ on all outgoing requests.
+
+Other properties are also available; see the #SoupSession documentation
+for more details.
+
+If you don't need to specify any options, you can just use soup_session_new(),
+which takes no arguments.
+
+## Session features
+
+Additional session functionality is provided as #SoupSessionFeature<!-- -->s,
+which can be added to a session...
\ No newline at end of file
diff --git a/docs/reference/gtk-markdown-to-docbook.py b/docs/reference/gtk-markdown-to-docbook.py
new file mode 100755
index 00000000..25274116
--- /dev/null
+++ b/docs/reference/gtk-markdown-to-docbook.py
@@ -0,0 +1,201 @@
+#!/usr/bin/python3
+#
+# Call pandoc to convert markdown to docbook, then expand gtk-doc
+# abbreviations (|[ ]|, function(), #object, %constant, etc)
+
+# Upstream: https://gitlab.gnome.org/GNOME/gtk/-/blob/master/docs/reference/gtk/gtk-markdown-to-docbook
+
+import sys
+import re
+import tempfile
+import os.path
+import subprocess
+
+# The following code is taken from gtk-doc
+
+def ExpandAbbreviations(symbol, text):
+ # Hack!
+ # Strip xlink namespace from hrefs since pandoc insists on
+ # inserting them, and namespace setup doesn't transfer across
+ # xi:include.
+ # Yay for XML!
+ text = re.sub('xlink:href', 'href', text)
+
+ # Convert '@param()'
+ text = re.sub(r'(\A|[^\\])\@(\w+((\.|->)\w+)*)\s*\(\)', r'\1<parameter>\2()</parameter>', text)
+
+ # Convert 'function()' or 'macro()'.
+ # if there is abc_*_def() we don't want to make a link to _def()
+ # FIXME: also handle abc(def(....)) : but that would need to be done recursively :/
+ def f1(m):
+ return m.group(1) + MakeXRef(m.group(2), tagify(m.group(2) + "()", "function"))
+ text = re.sub(r'([^\*.\w])(\w+)\s*\(\)', f1, text)
+ # handle #Object.func()
+ text = re.sub(r'(\A|[^\\])#([\w\-:\.]+[\w]+)\s*\(\)', f1, text)
+
+ # Convert '@param', but not '\@param'.
+ text = re.sub(r'(\A|[^\\])\@(\w+((\.|->)\w+)*)', r'\1<parameter>\2</parameter>', text)
+ text = re.sub(r'/\\\@', r'\@', text)
+
+ # Convert '%constant', but not '\%constant'.
+ # Also allow negative numbers, e.g. %-1.
+ def f2(m):
+ return m.group(1) + MakeXRef(m.group(2), tagify(m.group(2), "literal"))
+
+ text = re.sub(r'(\A|[^\\])\%(-?\w+)', f2, text)
+ text = re.sub(r'\\\%', r'\%', text)
+
+ # Convert '#symbol', but not '\#symbol'.
+
+ # Only convert #foo after a space to avoid interfering with
+ # fragment identifiers in urls
+ def f3(m):
+ return m.group(1) + MakeHashXRef(m.group(2), "type")
+
+ text = re.sub(r'(\A|[ ])#([\w\-:\.]+[\w]+)', f3, text)
+ text = re.sub(r'\\#', '#', text)
+
+ return text
+
+# Standard C preprocessor directives, which we ignore for '#' abbreviations.
+PreProcessorDirectives = {
+ 'assert', 'define', 'elif', 'else', 'endif', 'error', 'if', 'ifdef', 'ifndef',
+ 'include', 'line', 'pragma', 'unassert', 'undef', 'warning'
+}
+
+def MakeHashXRef(symbol, tag):
+ text = symbol
+
+ # Check for things like '#include', '#define', and skip them.
+ if symbol in PreProcessorDirectives:
+ return "#%s" % symbol
+
+ # Get rid of special suffixes ('-struct','-enum').
+ text = re.sub(r'-struct$', '', text)
+ text = re.sub(r'-enum$', '', text)
+
+ # If the symbol is in the form "Object::signal", then change the symbol to
+ # "Object-signal" and use "signal" as the text.
+ if '::' in symbol:
+ o, s = symbol.split('::', 1)
+ symbol = '%s-%s' % (o, s)
+ text = u'“' + s + u'”'
+
+ # If the symbol is in the form "Object:property", then change the symbol to
+ # "Object--property" and use "property" as the text.
+ if ':' in symbol:
+ o, p = symbol.split(':', 1)
+ symbol = '%s--%s' % (o, p)
+ text = u'“' + p + u'”'
+
+ if tag != '':
+ text = tagify(text, tag)
+
+ return MakeXRef(symbol, text)
+
+def MakeXRef(symbol, text=None):
+ """This returns a cross-reference link to the given symbol.
+
+ Though it doesn't try to do this for a few standard C types that it knows
+ won't be in the documentation.
+
+ Args:
+ symbol (str): the symbol to try to create a XRef to.
+ text (str): text to put inside the XRef, defaults to symbol
+
+ Returns:
+ str: a docbook link
+ """
+ symbol = symbol.strip()
+ if not text:
+ text = symbol
+
+ # Get rid of special suffixes ('-struct','-enum').
+ text = re.sub(r'-struct$', '', text)
+ text = re.sub(r'-enum$', '', text)
+
+ if ' ' in symbol:
+ return text
+
+ symbol_id = CreateValidSGMLID(symbol)
+ return "<link linkend=\"%s\">%s</link>" % (symbol_id, text)
+
+def CreateValidSGMLID(xml_id):
+ """Creates a valid SGML 'id' from the given string.
+
+ According to http://www.w3.org/TR/html4/types.html#type-id "ID and NAME
+ tokens must begin with a letter ([A-Za-z]) and may be followed by any number
+ of letters, digits ([0-9]), hyphens ("-"), underscores ("_"), colons (":"),
+ and periods (".")."
+
+ When creating SGML IDS, we append ":CAPS" to all all-caps identifiers to
+ prevent name clashes (SGML ids are case-insensitive). (It basically never is
+ the case that mixed-case identifiers would collide.)
+
+ Args:
+ id (str): The text to be converted into a valid SGML id.
+
+ Returns:
+ str: The converted id.
+ """
+
+ # Special case, '_' would end up as '' so we use 'gettext-macro' instead.
+ if xml_id == '_':
+ return "gettext-macro"
+
+ xml_id = re.sub(r'[,;]', '', xml_id)
+ xml_id = re.sub(r'[_ ]', '-', xml_id)
+ xml_id = re.sub(r'^-+', '', xml_id)
+ xml_id = xml_id.replace('::', '-')
+ xml_id = xml_id.replace(':', '--')
+
+ # Append ":CAPS" to all all-caps identifiers
+ # FIXME: there are some inconsistencies here, we have index files containing e.g. TRUE--CAPS
+ if xml_id.isupper() and not xml_id.endswith('-CAPS'):
+ xml_id += ':CAPS'
+
+ return xml_id
+
+def tagify(text, elem):
+ # Adds a tag around some text.
+ # e.g tagify("Text", "literal") => "<literal>Text</literal>".
+ return '<' + elem + '>' + text + '</' + elem + '>'
+
+# End of gtk-doc excerpts
+
+MarkdownExtensions = {
+ '-auto_identifiers', # we use explicit identifiers where needed
+ '+header_attributes', # for explicit identifiers
+ '+blank_before_header', # helps with gtk-doc #Object abbreviations
+ '+compact_definition_lists', # to replace <variablelist>
+ '+pipe_tables',
+ '+backtick_code_blocks', # to replace |[ ]|
+ '+fenced_code_attributes', # to add language annotations
+ '-raw_html', # to escape literal tags like <child> in input
+ '+startnum', # to have interrupted lists in the q&a part
+}
+
+def ConvertToDocbook(infile, outfile):
+ basename = os.path.basename(infile)
+ if basename.startswith('section'):
+ division='section'
+ else:
+ division='chapter'
+ input_format = "markdown" + "".join(MarkdownExtensions)
+ output_format = "docbook4"
+ subprocess.check_call(["pandoc", infile, "-o", outfile,
+ "--from=" + input_format,
+ "--to=" + output_format,
+ "--top-level-division=" + division])
+
+def ExpandGtkDocAbbreviations(infile, outfile):
+ contents = open(infile, 'r', encoding='utf-8').read()
+ with open(outfile, 'w', encoding='utf-8') as out:
+ out.write(ExpandAbbreviations("file", contents))
+
+
+if __name__ == '__main__':
+ tmp = tempfile.mktemp()
+ ConvertToDocbook(sys.argv[1], tmp)
+ ExpandGtkDocAbbreviations(tmp, sys.argv[2])
+ os.remove(tmp)
diff --git a/docs/reference/meson.build b/docs/reference/meson.build
index a7463352..f528bedd 100644
--- a/docs/reference/meson.build
+++ b/docs/reference/meson.build
@@ -1,3 +1,5 @@
+fs = import('fs')
+
ignore_headers = [
'gconstructor.h',
'soup.h',
@@ -48,6 +50,31 @@ scan_args = [
glib_prefix = glib_dep.get_pkgconfig_variable('prefix')
glib_docpath = glib_prefix / 'share' / 'gtk-doc' / 'html'
+content_files = [
+ 'build-howto.xml',
+ 'server-howto.xml',
+]
+
+expand_content_md_files = [
+ 'client-howto.md',
+]
+
+# Needed for gtk-markdown-to-docbook.py
+pandoc = find_program('pandoc', required: true)
+expand_md = find_program('gtk-markdown-to-docbook.py')
+expand_md_targets = []
+foreach t : expand_content_md_files
+ content_files += custom_target(t,
+ input : [ t ],
+ output : [ fs.replace_suffix(t, '.xml') ],
+ command : [ expand_md, '@INPUT@', '@OUTPUT@'],
+ # At least in meson 0.55.3 this target wouldn't build even though its
+ # listed in the content_files
+ build_by_default : true,
+ )
+endforeach
+
+
gnome.gtkdoc('libsoup-3.0',
main_xml : 'libsoup-3.0-docs.xml',
src_dir : srcdir,
@@ -63,9 +90,5 @@ gnome.gtkdoc('libsoup-3.0',
],
dependencies : libsoup_dep,
install : true,
- content_files: [
- 'build-howto.xml',
- 'client-howto.xml',
- 'server-howto.xml'
- ]
+ content_files : content_files,
)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]