Merge branch 'release/4.1.2'

Author: rhukster

CHANGELOG.md

@@ -1,3 +1,11 @@
+# v4.1.2
+## 06/22/2019
+
+1. [](#new)
+  * Added new `h#` tags for `h1` through `h6` supporting `class` and `id` attributes
+1. [](#improved)
+  * Make `ShortcodeManager::setStates()` more flexible to accept any type of object  
+
 # v4.1.1
 ## 04/23/2019
 

README.md

@@ -158,18 +158,24 @@ or
 [/div]
 ```
 
+#### Headers
+
+Allows you to add `id` and `class` attributes to HTML `h1` through `h6` tags:
+
+```
+[h1 class="major"]This is my title[/h1]
+```
 
 #### Span
 
-Allows you to wrap markdown in an HTML `span` tag that supports both `id` and `classes` attributes
+Allows you to wrap markdown in an HTML `span` tag that supports both `id` and `class` attributes
 
 ```
 [span class="text-center"]
 This text is **centered** aligned
 [/span]
 ```
 
-
 #### Columns
 
 Take advantage of powerful CSS columns support by using this shortcode

blueprints.yaml

@@ -1,5 +1,5 @@
 name: Shortcode Core
-version: 4.1.1
+version: 4.1.2
 description: "This plugin provides the core functionality for shortcode plugins"
 icon: code
 author:

classes/ShortcodeManager.php

@@ -272,14 +272,14 @@ public function processShortcodes($str)
     }
 
     /**
-     * set a state of a particular shortcode with a hash for retrieval later
+     * set a state of a particular item with a hash for retrieval later
      * 
      * @param string             $hash      a unique hash code
-     * @param ShortcodeInterface $shortcode the shortcode to store
+     * @param object            $item  some item to store
      */
-    public function setStates($hash, ShortcodeInterface $shortcode)
+    public function setStates($hash, $item)
     {
-        $this->states[$hash][] = $shortcode;
+        $this->states[$hash][] = $item;
     }
 
     /**

shortcodes/AlignShortcode.php

@@ -2,13 +2,12 @@
 namespace Grav\Plugin\Shortcodes;
 
 use Thunder\Shortcode\Shortcode\ShortcodeInterface;
-use Thunder\Shortcode\Shortcode\ProcessedShortcode;
 
 class AlignShortcode extends Shortcode
 {
     public function init()
     {
-        $this->shortcode->getHandlers()->add('center', function(ProcessedShortcode $sc) {
+        $this->shortcode->getHandlers()->add('center', function(ShortcodeInterface $sc) {
             return '<div style="text-align: center;">'.$sc->getContent().'</div>';
         });
 

shortcodes/ColumnsShortcode.php

@@ -2,13 +2,12 @@
 namespace Grav\Plugin\Shortcodes;
 
 use Thunder\Shortcode\Shortcode\ShortcodeInterface;
-use Thunder\Shortcode\Shortcode\ProcessedShortcode;
 
 class ColumnsShortcode extends Shortcode
 {
     public function init()
     {
-        $this->shortcode->getHandlers()->add('columns', function(ProcessedShortcode $sc) {
+        $this->shortcode->getHandlers()->add('columns', function(ShortcodeInterface $sc) {
 
             $column_count = intval($sc->getParameter('count', 2));
             $column_width = $sc->getParameter('width', 'auto');

shortcodes/HShortcode.php

@@ -0,0 +1,47 @@
+<?php
+namespace Grav\Plugin\Shortcodes;
+
+use Thunder\Shortcode\Shortcode\ShortcodeInterface;
+
+class HShortcode extends Shortcode
+{
+    public function init()
+    {
+        $this->shortcode->getRawHandlers()->add('h1', function(ShortcodeInterface $sc) {
+            return $this->header(1, $sc);
+        });
+
+        $this->shortcode->getRawHandlers()->add('h2', function(ShortcodeInterface $sc) {
+            return $this->header(2, $sc);
+        });
+
+        $this->shortcode->getRawHandlers()->add('h3', function(ShortcodeInterface $sc) {
+            return $this->header(3, $sc);
+        });
+
+        $this->shortcode->getRawHandlers()->add('h4', function(ShortcodeInterface $sc) {
+            return $this->header(4, $sc);
+        });
+
+        $this->shortcode->getRawHandlers()->add('h5', function(ShortcodeInterface $sc) {
+            return $this->header(5, $sc);
+        });
+
+        $this->shortcode->getRawHandlers()->add('h6', function(ShortcodeInterface $sc) {
+            return $this->header(6, $sc);
+        });
+
+
+    }
+
+    protected function header($level, $sc)
+    {
+        $id = $sc->getParameter('id');
+        $class = $sc->getParameter('class');
+        $tag = 'h' . $level;
+
+        $id_output = $id ? ' id="' . $id . '" ': '';
+        $class_output = $class ? ' class="' . $class . '"' : '';
+        return "<{$tag}{$id_output}{$class_output}>{$sc->getContent()}</{$tag}>";
+    }
+}

shortcodes/MarkShortcode.php

@@ -2,13 +2,12 @@
 namespace Grav\Plugin\Shortcodes;
 
 use Thunder\Shortcode\Shortcode\ShortcodeInterface;
-use Thunder\Shortcode\Shortcode\ProcessedShortcode;
 
 class MarkShortcode extends Shortcode
 {
     public function init()
     {
-        $this->shortcode->getHandlers()->add('mark', function(ProcessedShortcode $sc) {
+        $this->shortcode->getHandlers()->add('mark', function(ShortcodeInterface $sc) {
             $style = $sc->getParameter('style', $this->getBbCode($sc));
             $class = $sc->getParameter('class', 'default');