Replace `markdownextradata` with `macros` custom macros support

diff --git a/docs/php/apps.md b/docs/php/apps.md
index 0dc009c48706070f22a77bf0db54b199ff1c2492..9540d5f9f2280c6f8c63f061fcf98690921127c0 100644 (file)
--- a/docs/php/apps.md
+++ b/docs/php/apps.md
@@ -83,5 +83,5 @@ the app identifier (`com.example.foo -> foo`) will be used instead.
 
 ### Minimum Required Files
 
-An example project with the [source code can be found on GitHub]({jinja{ repo_url }}tree/{jinja{ edit_uri.split("/")[1] }}/snippets/tutorial/basic-app/),
+An example project with the [source code can be found on GitHub]({jinja{ config.repo_url }}tree/{jinja{ config.edit_uri.split("/")[1] }}/snippets/tutorial/basic-app/),
 it includes everything that is required for a basic app.

diff --git a/docs/tutorial/series/part_1.md b/docs/tutorial/series/part_1.md
index 55e77c6810f21a25e2cf064ceea06e1193da588b..66c3eee8af3ded14fe3324d82ffdd8887a4308c3 100644 (file)
--- a/docs/tutorial/series/part_1.md
+++ b/docs/tutorial/series/part_1.md
@@ -360,4 +360,4 @@ As the menu item package installation plugin validates the given page and throws
 
 This concludes the first part of our tutorial series after which you now have a working simple package with which you can manage people in the ACP and show the visitors of your website a simple list of all created people in the front end.
 
-The complete source code of this part can be found on [GitHub]({jinja{ repo_url }}tree/{jinja{ edit_uri.split("/")[1] }}/snippets/tutorial/tutorial-series/part-1).
+The complete source code of this part can be found on [GitHub]({jinja{ config.repo_url }}tree/{jinja{ config.edit_uri.split("/")[1] }}/snippets/tutorial/tutorial-series/part-1).

diff --git a/docs/tutorial/series/part_2.md b/docs/tutorial/series/part_2.md
index 38a13c8382f47bc943a6197eb6cdb734af686955..5cc3bef007ef5f0aedea2a510ee981bc6a40dc4e 100644 (file)
--- a/docs/tutorial/series/part_2.md
+++ b/docs/tutorial/series/part_2.md
@@ -192,4 +192,4 @@ The only relevant difference between the `package.xml` file of the base page fro
 
 This concludes the second part of our tutorial series after which you now have extended the base package using event listeners and template listeners that allow you to enter the birthday of the people.
 
-The complete source code of this part can be found on [GitHub]({jinja{ repo_url }}tree/{jinja{ edit_uri.split("/")[1] }}/snippets/tutorial/tutorial-series/part-2).
+The complete source code of this part can be found on [GitHub]({jinja{ config.repo_url }}tree/{jinja{ config.edit_uri.split("/")[1] }}/snippets/tutorial/tutorial-series/part-2).

diff --git a/docs/tutorial/series/part_3.md b/docs/tutorial/series/part_3.md
index b1888625e377a08d2556c30c003a83e98b75678e..be81774896c08f6e0b098cdc1c317a570a964d1e 100644 (file)
--- a/docs/tutorial/series/part_3.md
+++ b/docs/tutorial/series/part_3.md
@@ -71,7 +71,7 @@ The complete package will have the following file structure (including the files
 └── userGroupOption.xml
 ```
 
-!!! warning "We will not mention every code change between the first part and this part, as we only want to focus on the important, new parts of the code. For example, there is a new `Person::getLink()` method and new language items have been added. For all changes, please refer to the [source code on GitHub]({jinja{ repo_url }}tree/{jinja{ edit_uri.split("/")[1] }}/snippets/tutorial/tutorial-series/part-3)."
+!!! warning "We will not mention every code change between the first part and this part, as we only want to focus on the important, new parts of the code. For example, there is a new `Person::getLink()` method and new language items have been added. For all changes, please refer to the [source code on GitHub]({jinja{ config.repo_url }}tree/{jinja{ config.edit_uri.split("/")[1] }}/snippets/tutorial/tutorial-series/part-3)."
 
 
 ## Runtime Cache
@@ -187,5 +187,5 @@ The `IOnlineLocationPageHandler` interface requires two methods to be implemente
 
 This concludes the third part of our tutorial series after which each person has a dedicated page on which people can comment on the person.
 
-The complete source code of this part can be found on [GitHub]({jinja{ repo_url }}tree/{jinja{ edit_uri.split("/")[1] }}/snippets/tutorial/tutorial-series/part-3).
+The complete source code of this part can be found on [GitHub]({jinja{ config.repo_url }}tree/{jinja{ config.edit_uri.split("/")[1] }}/snippets/tutorial/tutorial-series/part-3).
 

diff --git a/docs/tutorial/series/part_4.md b/docs/tutorial/series/part_4.md
index 31fb74ace5cfdc664677dc851cb8a3c5b5ab42a0..4b8de6c29b91b7df95d47bb447bf312fbf472c8f 100644 (file)
--- a/docs/tutorial/series/part_4.md
+++ b/docs/tutorial/series/part_4.md
@@ -39,7 +39,7 @@ The complete package will have the following file structure (_excluding_ unchang
     └── boxPersonList.tpl
 ```
 
-For all changes, please refer to the [source code on GitHub]({jinja{ repo_url }}tree/{jinja{ edit_uri.split("/")[1] }}/snippets/tutorial/tutorial-series/part-4).
+For all changes, please refer to the [source code on GitHub]({jinja{ config.repo_url }}tree/{jinja{ config.edit_uri.split("/")[1] }}/snippets/tutorial/tutorial-series/part-4).
 
 
 ## Box Controller

diff --git a/docs/tutorial/series/part_5.md b/docs/tutorial/series/part_5.md
index eb7532600f61d3e4a94cc92cb6315ae621dea176..62e1be42dd1ed3d2d6ce9f8fc3e74438de37e67d 100644 (file)
--- a/docs/tutorial/series/part_5.md
+++ b/docs/tutorial/series/part_5.md
@@ -56,7 +56,7 @@ The package will have the following file structure _excluding_ unchanged files f
 └── userGroupOption.xml
 ```
 
-For all changes, please refer to the [source code on GitHub]({jinja{ repo_url }}tree/{jinja{ edit_uri.split("/")[1] }}/snippets/tutorial/tutorial-series/part-5).
+For all changes, please refer to the [source code on GitHub]({jinja{ config.repo_url }}tree/{jinja{ config.edit_uri.split("/")[1] }}/snippets/tutorial/tutorial-series/part-5).
 
 
 ## Miscellaneous

diff --git a/mkdocs.yml b/mkdocs.yml
index 1b8aff2210abdb3563a92000cd9ff1af088434b1..9ad0dc8c95c82ec2b92c86af84de0ffe08efdb82 100644 (file)
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -140,11 +140,9 @@ nav:
 plugins:
   - git-revision-date
   - search
-  - markdownextradata:
-      jinja_options:
-        block_start_string: "{jinja%"
-        comment_start_string: "{jinja#"
-        variable_start_string: "{jinja{"
+  - macros:
+      j2_comment_start_string: "{jinja#"
+      j2_variable_start_string: "{jinja{"
 
 markdown_extensions:
   - toc:

diff --git a/requirements.txt b/requirements.txt
index bf95042e90fe843d330da2a8176d541d82fcc768..0079d1f79098690c715e41238d5266ecd4e0c605 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 Markdown==3.3.4
 mike==1.0.0
 mkdocs-git-revision-date-plugin==0.3.1
-mkdocs-markdownextradata-plugin==0.2.4
+mkdocs-macros-plugin==0.5.5 
 mkdocs-material==7.1.2
 mkdocs==1.1.2