Merge pull request #94 from myint/sphinx-integration-rework

sphinx integration rework

README.rst

@@ -246,7 +246,7 @@ constraint is >=4.0 because of Sphinx's open upper constraints on jinja2 and mar
 which result in import errors if not pinned below version 3 and 2 respectively. This happend
 in Sphinx version 4.0.
 
-You can also add Sphinx by yourself but the installed Sphinx version must be at least 1.5.
+You can also add Sphinx by yourself but the installed Sphinx version must be at least 2.0.
 
 To check that Sphinx support is enabled
 
@@ -372,6 +372,17 @@ History
 (next version)
 --------------
 
+- Fix inability to ignore ``code``, ``code-block`` and ``sourcecode`` directives (#79)
+- Fix ``code-block`` options recognition (#62)
+
+.. _beaking_changes_v6:
+
+BREAKING CHANGES
+~~~~~~~~~~~~~~~~
+
+- Drop support for sphinx < 2.0
+- Drop default values for directves and roles for sphinx (#65)
+
 
 5.0.0 (2022-04-17)
 ------------------

examples/bad/bad_bash.rst

@@ -2,6 +2,6 @@
 Test
 ====
 
-.. code-block:: bash
+.. code:: bash
 
     {

examples/bad/bad_code.rst

@@ -2,8 +2,6 @@
 Test
 ====
 
-``code`` rather than ``code-block``.
-
 .. code:: python
 
     print(

examples/bad/bad_cpp.rst

@@ -2,7 +2,7 @@
 Test
 ====
 
-.. code-block:: cpp
+.. code:: cpp
 
     int main()
     {

examples/bad/bad_python.rst

@@ -2,6 +2,6 @@
 Test
 ====
 
-.. code-block:: python
+.. code:: python
 
     print(

examples/bad/bad_rst_in_rst.rst

@@ -2,7 +2,7 @@
 Test
 ====
 
-.. code-block:: rst
+.. code:: rst
 
     Testing
     ===

examples/good/good.rst

@@ -2,14 +2,14 @@
 Test
 ====
 
-.. code-block:: bash
+.. code:: bash
 
     if [ "$x" == 'y' ]
     then
         exit 1
     fi
 
-.. code-block:: c
+.. code:: c
 
     float foo(int n)
     {
@@ -19,7 +19,7 @@ Test
         return x[0];
     }
 
-.. code-block:: cpp
+.. code:: cpp
 
     #include <iostream>
 
@@ -29,20 +29,20 @@ Test
         return x;
     }
 
-.. code-block:: python
+.. code:: python
 
     print(1)
 
 Run more tests for checking performance.
 
-.. code-block:: bash
+.. code:: bash
 
     if [ "$x" == 'y' ]
     then
         exit 1
     fi
 
-.. code-block:: c
+.. code:: c
 
     float foo(int n)
     {
@@ -52,7 +52,7 @@ Run more tests for checking performance.
         return x[0];
     }
 
-.. code-block:: cpp
+.. code:: cpp
 
     #include <iostream>
 
@@ -62,18 +62,18 @@ Run more tests for checking performance.
         return x;
     }
 
-.. code-block:: python
+.. code:: python
 
     print(1)
 
-.. code-block:: bash
+.. code:: bash
 
     if [ "$x" == 'y' ]
     then
         exit 1
     fi
 
-.. code-block:: c
+.. code:: c
 
     float foo(int n)
     {
@@ -83,7 +83,7 @@ Run more tests for checking performance.
         return x[0];
     }
 
-.. code-block:: cpp
+.. code:: cpp
 
     #include <iostream>
 
@@ -93,18 +93,18 @@ Run more tests for checking performance.
         return x;
     }
 
-.. code-block:: python
+.. code:: python
 
     print(1)
 
-.. code-block:: bash
+.. code:: bash
 
     if [ "$x" == 'y' ]
     then
         exit 1
     fi
 
-.. code-block:: c
+.. code:: c
 
     float foo(int n)
     {
@@ -114,7 +114,7 @@ Run more tests for checking performance.
         return x[0];
     }
 
-.. code-block:: cpp
+.. code:: cpp
 
     #include <iostream>
 
@@ -124,18 +124,18 @@ Run more tests for checking performance.
         return x;
     }
 
-.. code-block:: python
+.. code:: python
 
     print(1)
 
-.. code-block:: bash
+.. code:: bash
 
     if [ "$x" == 'y' ]
     then
         exit 1
     fi
 
-.. code-block:: c
+.. code:: c
 
     float foo(int n)
     {
@@ -145,7 +145,7 @@ Run more tests for checking performance.
         return x[0];
     }
 
-.. code-block:: cpp
+.. code:: cpp
 
     #include <iostream>
 
@@ -155,7 +155,7 @@ Run more tests for checking performance.
         return x;
     }
 
-.. code-block:: python
+.. code:: python
 
     # ¬∆˚ß∂ƒß∂ƒ˚¬∆
     print(1)

examples/good/good_cpp_with_local_include.rst

@@ -2,7 +2,7 @@
 Test
 ====
 
-.. code-block:: cpp
+.. code:: cpp
 
     #include "foo.h"
 

examples/good/good_markdown.rst

@@ -2,6 +2,6 @@
 Test
 ====
 
-.. code-block:: markdown
+.. code:: markdown
 
     [Markdown-style Link](https://www.example.com/)

examples/good/unicode.rst

@@ -2,11 +2,11 @@
 Тест
 ====
 
-.. code-block:: python
+.. code:: python
 
    print("Привет!")
 
-.. code-block:: bash
+.. code:: bash
 
     $ echo 'Привет' >> pipe.txt
     $ echo 'файловая труба!' >> pipe.txt

examples/with_configuration/bad.rst

@@ -3,7 +3,7 @@
 
 :some-custom-thing:`testing`
 
-.. code-block:: cpp
+.. code:: cpp
 
     int main()
     {

examples/with_configuration/good.rst

@@ -3,7 +3,7 @@
 
 :some-custom-thing:`testing`
 
-.. code-block:: cpp
+.. code:: cpp
 
     int main()
     {

examples/without_configuration/good.rst

@@ -3,7 +3,7 @@
 
 :some-custom-thing:`testing`
 
-.. code-block:: cpp
+.. code:: cpp
 
     int main()
     {