Update shortcodes to use pipe-separated syntax

The shortcodes package now uses pipes to separate attributes, allowing for better attribute naming etc.

.github/workflows/ci.yml

@@ -30,7 +30,7 @@ jobs:
     - name: Set up TeXLive
       uses: teatimeguest/setup-texlive-action@v2
       with:
-        packages: scheme-basic latexmk listings
+        packages: scheme-basic latexmk listings float
 
     - name: Install
       run: |

composer.json

@@ -13,7 +13,7 @@
         "league/flysystem": "^1.0",
         "myclabs/php-enum": "^1.5",
         "samwilson/commonmark-latex": "^0.3",
-        "samwilson/commonmark-shortcodes": "^0.2",
+        "samwilson/commonmark-shortcodes": "^0.3",
         "samwilson/phpflickr": "^4.13",
         "symfony/console": "^5.0",
         "symfony/filesystem": "^5.4",

docs/content/content.md

@@ -45,17 +45,17 @@ see [the *Assets* section](index.html) of the documentation overview.
 ## Shortcodes
 
 This section documents 'shortcodes', which are what we call specific replacable parts in a Markdown document.
-They are inline phrases or blocks of text such as `{foo}` or `{{{bar id=123}}}` which get replaced
+They are inline phrases or blocks of text such as `{foo}` or `{{{bar|id=123}}}` which get replaced
 by the contents of templates such as `templates/shortcodes/foo.html.twig` or `templates/shortcodes/bar.tex.twig`.
 
 * Inline shortcodes are delimited by single braces and can contain any number of attributes, e.g.:
   * Lorem `{foo}` ipsum with no parameters.
-  * Lorem `{foo bar=baz bif="foo bar"}` ipsum with two parameters, the second of which contains a space.
+  * Lorem `{foo | bar=baz|bif="foo bar"}` ipsum with two parameters, the second of which contains a space.
   * Lorem `{foo bif}` ipsum with a parameter with no value.
 * Block shortcodes are delimited by triple braces at the beggining of lines, e.g.:
   * A block of one line, with one parameter:
     ```
-    {{{quotation cite="Author name"
+    {{{quotation | cite="Author name"
     Lorem ipsum
     }}}
     ```
@@ -73,11 +73,11 @@ which has a [similar function](https://codex.wordpress.org/shortcode).
 Shortcodes are a simple way to include images, videos, and summaries of other web pages.
 For example, this is a photo from Wikimedia Commons:
 
-{{{commons file=Co-Op,_Post_Office,_Courthouse.jpg }}}
+{{{commons|Co-Op,_Post_Office,_Courthouse.jpg}}}
 
 It is added to the source Markdown with this:
 
-    {{{commons file=Co-Op,_Post_Office,_Courthouse.jpg }}}
+    {{{commons|Co-Op,_Post_Office,_Courthouse.jpg}}}
 
 All of the other information (image URL, caption, etc.) is retrieved from the Commons API when the Markdown is rendered.
 
@@ -93,7 +93,8 @@ The file `templates/shortcodes/<shortcode-name>.<format>.twig` to contain the HT
 The following variables are available in shortcode templates:
 
 * `shortcode.name`: the name of the shortcode, which will always be the same as the template's name.
-* `shortcode.attr('foo')`: fetches an attribute by name.
+* `shortcode.attrs.foo`: fetches an attribute by name.
+* `shortcode.attrs.1`: fetches an unnamed attribute by number (starting from 1).
 * `shortcode.body`: for block shortcodes, fetches the entire body text.
 
 ### Example: Wikimedia Commons
@@ -122,11 +123,11 @@ Note that this is also using the `commons()` Twig function, which is [documented
 
 In any Markdown file:
 
-    {{{flickr id=123456}}}
+    {{{flickr|id=123456}}}
 
 In `templates/shortcodes/flickr.html.twig`:
 
-    {% set flickr = flickr(shortcode.attr('id')) %}
+    {% set flickr = flickr(shortcode.attrs.id) %}
 
     <figure itemscope itemtype="http://schema.org/ImageObject">
         <a href="{{ flickr.urls.photopage }}"><img alt="An image from Flickr." src="{{ flickr.urls.medium_image }}" /></a>
@@ -145,4 +146,3 @@ In `templates/shortcodes/flickr.html.twig`:
             </span>
         </figcaption>
     </figure>
-

docs/templates/pdf.tex.twig

@@ -1,7 +1,12 @@
 {% autoescape 'tex' %}
 \documentclass[a4paper]{article}
 
-\usepackage{graphicx, url, listings}
+\usepackage{graphicx, url, listings, float}
+
+\lstset{
+    basicstyle=\normalsize\fontencoding{T1}\ttfamily,
+    showstringspaces=true
+}
 
 \title{Basildon}
 

docs/templates/shortcodes/commons.html.twig

@@ -1,4 +1,4 @@
-{% set commons = commons(shortcode.attr('file')) %}
+{% set commons = commons(shortcode.attrs.1) %}
 
 <figure itemscope itemtype="http://schema.org/ImageObject">
     <a href="{{ commons.imageinfo.0.descriptionurl }}">

docs/templates/shortcodes/commons.tex.twig

@@ -1,6 +1,6 @@
 {% autoescape 'tex' %}
-{% set commons = commons( shortcode.attrs.file ) %}
-\begin{figure}
+{% set commons = commons( shortcode.attrs.1 ) %}
+\begin{figure}[H]
   \begin{center}
     \includegraphics[width=\linewidth]{{ '{' }}{{ tex_url( commons.imageinfo.0.thumburl )|raw }}{{ '}' }}
     \caption{ {{ commons.labels.en.value }} }

example/content/2020/0116_lorem.txt

@@ -12,4 +12,4 @@ This is a second post in January.
 
 With a goat!
 
-{{{commons file=RoveZiege_00037.jpg}}}
+{{{commons|file=RoveZiege_00037.jpg}}}

tests/test_site/content/shortcodes.txt

@@ -1,3 +1,3 @@
 Test shortcodes. A file from Wikimedia Commons:
 
-{{{commons file=Test.png}}}
+{{{commons |file=Test.png }}}

tests/test_site/templates/shortcodes/commons.html.twig

@@ -1,3 +1,3 @@
 <figure>
-This is Commons file {{shortcode.attr('file')}}
+This is Commons file {{shortcode.attrs.file}}
 </figure>