Merge branch 'release/4.2.3'

CHANGELOG.md

@@ -1,3 +1,11 @@
+# v4.2.3
+## 04/27/2020
+
+1. [](#improved)
+    * Configuration option to exclude default shortcodes [#86](https://github.com/getgrav/grav-plugin-shortcode-core/issues/86)
+    * Add support for `style` attribute in `[span]` shortcode [#88](https://github.com/getgrav/grav-plugin-shortcode-core/issues/88)  
+    * Fix typos [#91](https://github.com/getgrav/grav-plugin-shortcode-core/issues/91) 
+
 # v4.2.2
 ## 03/04/2020
 

README.md

@@ -46,6 +46,7 @@ active: true
 active_admin: true
 admin_pages_only: true
 parser: regex
+include_default_shortcodes: true
 custom_shortcodes:
 load_fontawesome: false
 ```
@@ -54,7 +55,8 @@ load_fontawesome: false
 * `active: true|false` toggles if shortcodes will be enabled site-wide or not
 * `active_admin: true|false` toggles if shortcodes will be processed in the admin plugin
 * `admin_pages_only: true|false` toggles if admin should only process shortcodes for Grav pages
-* `parser: wordpress|regex|regular` let's you configure the parser to use.
+* `parser: wordpress|regex|regular` let's you configure the parser to use
+* `include_default_shortcodes: true|false` toggle the inclusion of shortcodes provided by this plugin
 * `custom_shortcodes:` the path to a directory where you can put your custom shortcodes (e.g. `/user/custom/shortcodes`)
 * `load_fontawesome: true|false` toggles if the fontawesome icon library should be loaded or not
 
@@ -312,7 +314,7 @@ Figure elements are the recommended way to add self-contained units of flow cont
 
 The HTML `<mark></mark>` tag is extremely useful to highlight text in your pages, and serves like a highlighter pen.  However, as we know that markdown inside of HTML is not processed, using this HTML is often not convenient as it means markdown inside will not be processed.
 
-Another important usecase is trying to highlight code in a markdown text block, again the HTML tag doesn't work becuase the result is escaped and treated like any other code and simply displayed.
+Another important usecase is trying to highlight code in a markdown text block, again the HTML tag doesn't work because the result is escaped and treated like any other code and simply displayed.
 
 The solution is simple, just use the shortcode version instead:
 

blueprints.yaml

@@ -1,5 +1,7 @@
 name: Shortcode Core
-version: 4.2.2
+slug: shortcode-core
+type: plugin
+version: 4.2.3
 description: "This plugin provides the core functionality for shortcode plugins"
 icon: code
 author:

classes/shortcodes/SpanShortcode.php

@@ -10,11 +10,13 @@ public function init()
         $this->shortcode->getHandlers()->add('span', static function(ShortcodeInterface $sc) {
             $id = $sc->getParameter('id');
             $class = $sc->getParameter('class');
+            $style = $sc->getParameter('style');
 
             $id_output = $id ? 'id="' . $id . '" ': '';
             $class_output = $class ? 'class="' . $class . '"' : '';
+            $style_output = $style ? 'style="' . $style . '"' : '';
 
-            return '<span ' . $id_output . ' ' . $class_output . '>' . $sc->getContent() . '</span>';
+            return '<span ' . $id_output . ' ' . $class_output . ' ' . $style_output . '>' . $sc->getContent() . '</span>';
         });
     }
-}
+}

shortcode-core.php

@@ -208,7 +208,10 @@ public function onPageContent(Event $event)
      */
     public function onShortcodeHandlers()
     {
-        $this->shortcodes->registerAllShortcodes(__DIR__ . '/classes/shortcodes', ['ignore' => ['Shortcode', 'ShortcodeObject']]);
+        $include_default_shortcodes = $this->config->get('plugins.shortcode-core.include_default_shortcodes', true);
+        if ($include_default_shortcodes) {
+            $this->shortcodes->registerAllShortcodes(__DIR__ . '/classes/shortcodes', ['ignore' => ['Shortcode', 'ShortcodeObject']]);
+        }
 
         // Add custom shortcodes directory if provided
         $custom_shortcodes = $this->config->get('plugins.shortcode-core.custom_shortcodes');

shortcode-core.yaml

@@ -3,6 +3,7 @@ active: true
 active_admin: true
 admin_pages_only: true
 parser: regular
+include_default_shortcodes: true
 custom_shortcodes:
 fontawesome:
   load: true