diff --git a/autotests/folding/highlight.cmake.fold b/autotests/folding/highlight.cmake.fold --- a/autotests/folding/highlight.cmake.fold +++ b/autotests/folding/highlight.cmake.fold @@ -65,14 +65,10 @@ ) #[=======================================================================[.rst: -.. cmake:command:: my_fun +.. cmake:command:: my_fun -*RST* documentation ``can`` refer to :cmake:command:`any_commands` or -:cmake:variable:`variables`... (but this require updated RST higlighter ;-) - -.. seealso:: - - * `RST improvement MR `_ +*RST* documentation ``can`` refer to :cmake:command:`any_commands` or +:cmake:variable:`variables`... .. code-block:: cmake :caption: **Synopsys** diff --git a/autotests/folding/highlight.rst.fold b/autotests/folding/highlight.rst.fold new file mode 100644 --- /dev/null +++ b/autotests/folding/highlight.rst.fold @@ -0,0 +1,65 @@ +A heading +######### + +:field: A field + On another line, *with inline* **markup**. +:py:field: A field with a colon (not handled correctly, currently) +:and space: + +.. comment + +text + +.. multi-line + comment + +text again + +.. + also multiline comment +.. + +.. directive:: argument another + :option: value + + Directive content. + +.. py:function:: a directive with a colon + :py:option: an option with a colon (not handled correctly, currently) + :option a: an option with a space + +.. code-block:: + + A code block + +.. code:: + + But this is a code block, too. + +Inline ``code``, :ref:`interpreted role`, `trailing`:ref:, +:py:ref:`role with a colon`. The `default interpreted role`. + +A reference_, `link `_ Plain link: https://kde.org. A footnote +reference [1]_. + +.. [1] Footnote content + +A text block. + + Block quote + + -- attribution + +- A list +- Another item + + - Sub item + - More + +1. Ordered +2. list + +Definition title + Definition description +Definition title + Definition description diff --git a/autotests/html/highlight.cmake.html b/autotests/html/highlight.cmake.html --- a/autotests/html/highlight.cmake.html +++ b/autotests/html/highlight.cmake.html @@ -71,14 +71,10 @@ ) #[=======================================================================[.rst: -.. cmake:command:: my_fun +.. cmake:command:: my_fun -*RST* documentation ``can`` refer to :cmake:command:`any_commands` or -:cmake:variable:`variables`... (but this require updated RST higlighter ;-) - -.. seealso:: - - * `RST improvement MR <https://phabricator.kde.org/D7245>`_ +*RST* documentation ``can`` refer to :cmake:command:`any_commands` or +:cmake:variable:`variables`... .. code-block:: cmake :caption: **Synopsys** diff --git a/autotests/html/highlight.rst.html b/autotests/html/highlight.rst.html new file mode 100644 --- /dev/null +++ b/autotests/html/highlight.rst.html @@ -0,0 +1,72 @@ + + + +highlight.rst + +
+A heading
+#########
+
+:field:     A field
+    On another line, *with inline* **markup**.
+:py:field:  A field with a colon (not handled correctly, currently)
+:and space:
+
+.. comment
+
+text
+
+.. multi-line
+    comment
+
+text again
+
+..
+    also multiline comment
+..
+
+.. directive:: argument another
+    :option: value
+
+    Directive content.
+
+.. py:function:: a directive with a colon
+    :py:option: an option with a colon (not handled correctly, currently)
+    :option a: an option with a space
+
+.. code-block::
+
+    A code block
+
+.. code::
+
+    But this is a code block, too.
+
+Inline ``code``, :ref:`interpreted role`, `trailing`:ref:,
+:py:ref:`role with a colon`. The `default interpreted role`.
+
+A reference_, `link <https://kde.org>`_ Plain link: https://kde.org. A footnote
+reference [1]_.
+
+.. [1] Footnote content
+
+A text block.
+
+    Block quote
+
+    -- attribution
+
+-   A list
+-   Another item
+
+    -   Sub item
+    -   More
+
+1.  Ordered
+2.  list
+
+Definition title
+    Definition description
+Definition title
+    Definition description
+
diff --git a/autotests/input/highlight.cmake b/autotests/input/highlight.cmake --- a/autotests/input/highlight.cmake +++ b/autotests/input/highlight.cmake @@ -68,11 +68,7 @@ .. cmake:command:: my_fun *RST* documentation ``can`` refer to :cmake:command:`any_commands` or -:cmake:variable:`variables`... (but this require updated RST higlighter ;-) - -.. seealso:: - - * `RST improvement MR `_ +:cmake:variable:`variables`... .. code-block:: cmake :caption: **Synopsys** diff --git a/autotests/input/highlight.rst b/autotests/input/highlight.rst new file mode 100644 --- /dev/null +++ b/autotests/input/highlight.rst @@ -0,0 +1,65 @@ +A heading +######### + +:field: A field + On another line, *with inline* **markup**. +:py:field: A field with a colon (not handled correctly, currently) +:and space: + +.. comment + +text + +.. multi-line + comment + +text again + +.. + also multiline comment +.. + +.. directive:: argument another + :option: value + + Directive content. + +.. py:function:: a directive with a colon + :py:option: an option with a colon (not handled correctly, currently) + :option a: an option with a space + +.. code-block:: + + A code block + +.. code:: + + But this is a code block, too. + +Inline ``code``, :ref:`interpreted role`, `trailing`:ref:, +:py:ref:`role with a colon`. The `default interpreted role`. + +A reference_, `link `_ Plain link: https://kde.org. A footnote +reference [1]_. + +.. [1] Footnote content + +A text block. + + Block quote + + -- attribution + +- A list +- Another item + + - Sub item + - More + +1. Ordered +2. list + +Definition title + Definition description +Definition title + Definition description diff --git a/autotests/reference/highlight.cmake.ref b/autotests/reference/highlight.cmake.ref --- a/autotests/reference/highlight.cmake.ref +++ b/autotests/reference/highlight.cmake.ref @@ -65,14 +65,10 @@ )

#[=======================================================================[.rst:
-.. cmake:command:: my_fun
+.. cmake:command:: my_fun

-*RST* documentation ``can`` refer to :cmake:command:`any_commands` or
-:cmake:variable:`variables`... (but this require updated RST higlighter ;-)
-
-.. seealso::
-
- * `RST improvement MR `_
+*RST* documentation ``can`` refer to :cmake:command:`any_commands` or
+:cmake:variable:`variables`...

.. code-block:: cmake
:caption: **Synopsys**
diff --git a/autotests/reference/highlight.rst.ref b/autotests/reference/highlight.rst.ref new file mode 100644 --- /dev/null +++ b/autotests/reference/highlight.rst.ref @@ -0,0 +1,65 @@ +A heading
+#########
+
+:field: A field
+ On another line, *with inline* **markup**.
+:py:field: A field with a colon (not handled correctly, currently)
+:and space:
+
+.. comment
+
+text
+
+.. multi-line
+ comment
+
+text again
+
+..
+ also multiline comment
+..
+
+.. directive:: argument another
+ :option: value
+
+ Directive content.
+
+.. py:function:: a directive with a colon
+ :py:option: an option with a colon (not handled correctly, currently)
+ :option a: an option with a space
+
+.. code-block::
+
+ A code block
+
+.. code::
+
+ But this is a code block, too.
+
+Inline ``code``, :ref:`interpreted role`, `trailing`:ref:,
+:py:ref:`role with a colon`. The `default interpreted role`.
+
+A reference_, `link `_ Plain link: https://kde.org. A footnote
+reference [1]_.
+
+.. [1] Footnote content
+
+A text block.
+
+ Block quote
+
+ -- attribution
+
+- A list
+- Another item
+
+ - Sub item
+ - More
+
+1. Ordered
+2. list
+
+Definition title
+ Definition description
+Definition title
+ Definition description
diff --git a/data/syntax/rest.xml b/data/syntax/rest.xml --- a/data/syntax/rest.xml +++ b/data/syntax/rest.xml @@ -11,7 +11,7 @@ Copyright 2010 Matt Williams (matt@milliams.com) Copyright 2014 Matthew Woehlke (mw_triad@users.sourceforge.net) --> - + @@ -24,11 +24,12 @@ - + + - + @@ -37,8 +38,8 @@ - - + +