Merge pull request #3719 from masatake/docs--sphinx-minor-fixes

docs(web): sphinx minor fixes

docs/_ext/lexers.py

@@ -1,12 +1,19 @@
 from ctags_optlib_highlighter import CtagsOptlibLexer
+from pygments.lexers.special import TextLexer
 import sphinx
 
-def setup(app):
+def install(app, h, name):
     v = sphinx.__version__.split('.')
     if int(v[0]) > 3:
-        c = CtagsOptlibLexer
+        c = h
     elif (int(v[0]) == 3) and (int(v[1]) > 3):
-        c = CtagsOptlibLexer
+        c = h
     else:
-        c = CtagsOptlibLexer()
-    app.add_lexer('ctags', c)
+        c = h()
+    app.add_lexer(name, c)
+
+def setup(app):
+    install(app, CtagsOptlibLexer, 'ctags')
+    # Setup stubs
+    for h in ['git', 'yacc', 'EmacsLisp', 'tags', 'Autoconf', 'SystemTap', 'RMarkdown']:
+        install(app, TextLexer, h)

docs/man/ctags-lang-sql.7.rst

@@ -29,7 +29,7 @@ is enabled.
 The SQL parser looks for a token coming after ``LANGUAGE`` keyword in
 the source code to choose a proper guest parser.
 
-.. code-block:: SQL
+.. code-block:: psql
 
    ... LANGUAGE plpythonu AS '... user-defined function ' ...
    ... AS $$ user-defined function $$ LANGUAGE plv8 ...
@@ -51,7 +51,7 @@ tagging code including a user-defined function in a string literal [GH3006]_:
 
 "input.sql"
 
-.. code-block:: SQL
+.. code-block:: psql
 
 	CREATE OR REPLACE FUNCTION fun1() RETURNS VARCHAR AS '
 	DECLARE
@@ -77,7 +77,7 @@ tagging code including a user-defined function in a dollar quote [GH3006]_:
 
 "input.sql"
 
-.. code-block:: SQL
+.. code-block:: psql
 
 	CREATE OR REPLACE FUNCTION fun2() RETURNS VARCHAR LANGUAGE plpgsql AS $$
 	DECLARE
@@ -101,7 +101,7 @@ with "--options=NONE -o - --sort=no --extras=+{guest} input.sql"
 
 tagging code including a user-defined written in JavaScript:
 
-.. code-block:: SQL
+.. code-block:: psql
 
 	-- Derived from https://github.com/plv8/plv8/blob/r3.0alpha/sql/plv8.sql
 	CREATE FUNCTION test(keys text[], vals text[]) RETURNS text AS

man/ctags-lang-sql.7.rst.in

@@ -29,7 +29,7 @@ is enabled.
 The SQL parser looks for a token coming after ``LANGUAGE`` keyword in
 the source code to choose a proper guest parser.
 
-.. code-block:: SQL
+.. code-block:: psql
 
    ... LANGUAGE plpythonu AS '... user-defined function ' ...
    ... AS $$ user-defined function $$ LANGUAGE plv8 ...
@@ -51,7 +51,7 @@ tagging code including a user-defined function in a string literal [GH3006]_:
 
 "input.sql"
 
-.. code-block:: SQL
+.. code-block:: psql
 
 	CREATE OR REPLACE FUNCTION fun1() RETURNS VARCHAR AS '
 	DECLARE
@@ -77,7 +77,7 @@ tagging code including a user-defined function in a dollar quote [GH3006]_:
 
 "input.sql"
 
-.. code-block:: SQL
+.. code-block:: psql
 
 	CREATE OR REPLACE FUNCTION fun2() RETURNS VARCHAR LANGUAGE plpgsql AS $$
 	DECLARE
@@ -101,7 +101,7 @@ with "--options=NONE -o - --sort=no --extras=+{guest} input.sql"
 
 tagging code including a user-defined written in JavaScript:
 
-.. code-block:: SQL
+.. code-block:: psql
 
 	-- Derived from https://github.com/plv8/plv8/blob/r3.0alpha/sql/plv8.sql
 	CREATE FUNCTION test(keys text[], vals text[]) RETURNS text AS