Changeset 1840120

Timestamp:

03/14/2018 03:13:20 PM (8 years ago)

Author:

frankverhoeven

Message:

push 2.1.2

Location:

fv-code-highlighter

Files:

• tags/2.1.2 (copied) (copied from fv-code-highlighter/trunk)
• tags/2.1.2/config (copied) (copied from fv-code-highlighter/trunk/config)
• tags/2.1.2/config/default.config.php (copied) (copied from fv-code-highlighter/trunk/config/default.config.php) (1 diff)
• tags/2.1.2/fv-code-highlighter.php (copied) (copied from fv-code-highlighter/trunk/fv-code-highlighter.php) (1 diff)
• tags/2.1.2/public/css/fvch-styles-dark.min.css (copied) (copied from fv-code-highlighter/trunk/public/css/fvch-styles-dark.min.css) (1 diff)
• tags/2.1.2/public/css/fvch-styles-dark.scss (copied) (copied from fv-code-highlighter/trunk/public/css/fvch-styles-dark.scss) (1 diff)
• tags/2.1.2/public/css/fvch-styles.min.css (copied) (copied from fv-code-highlighter/trunk/public/css/fvch-styles.min.css) (1 diff)
• tags/2.1.2/public/css/fvch-styles.scss (copied) (copied from fv-code-highlighter/trunk/public/css/fvch-styles.scss) (1 diff)
• tags/2.1.2/public/images/copy-icon.svg (deleted)
• tags/2.1.2/public/images/select-icon.png (deleted)
• tags/2.1.2/readme.txt (copied) (copied from fv-code-highlighter/trunk/readme.txt) (2 diffs)
• tags/2.1.2/screenshot-1.png (copied) (copied from fv-code-highlighter/trunk/screenshot-1.png)
• tags/2.1.2/screenshot-2.png (copied) (copied from fv-code-highlighter/trunk/screenshot-2.png)
• tags/2.1.2/screenshot-3.png (copied) (copied from fv-code-highlighter/trunk/screenshot-3.png)
• tags/2.1.2/screenshot-4.png (copied) (copied from fv-code-highlighter/trunk/screenshot-4.png)
• tags/2.1.2/screenshot-5.png (copied) (copied from fv-code-highlighter/trunk/screenshot-5.png)
• tags/2.1.2/screenshot-6.png (copied) (copied from fv-code-highlighter/trunk/screenshot-6.png)
• tags/2.1.2/screenshot-7.png (copied) (copied from fv-code-highlighter/trunk/screenshot-7.png)
• tags/2.1.2/screenshot-8.png (copied) (copied from fv-code-highlighter/trunk/screenshot-8.png)
• tags/2.1.2/src/Admin/Admin.php (copied) (copied from fv-code-highlighter/trunk/src/Admin/Admin.php)
• tags/2.1.2/src/Admin/Options.php (copied) (copied from fv-code-highlighter/trunk/src/Admin/Options.php)
• tags/2.1.2/src/Application (deleted)
• tags/2.1.2/src/Autoloader.php (copied) (copied from fv-code-highlighter/trunk/src/Autoloader.php)
• tags/2.1.2/src/Bootstrap.php (copied) (copied from fv-code-highlighter/trunk/src/Bootstrap.php)
• tags/2.1.2/src/Cache.php (copied) (copied from fv-code-highlighter/trunk/src/Cache.php)
• tags/2.1.2/src/Config.php (copied) (copied from fv-code-highlighter/trunk/src/Config.php)
• tags/2.1.2/src/Container/Container.php (copied) (copied from fv-code-highlighter/trunk/src/Container/Container.php)
• tags/2.1.2/src/Container/FactoryInterface.php (copied) (copied from fv-code-highlighter/trunk/src/Container/FactoryInterface.php)
• tags/2.1.2/src/Container/InvokableFactory.php (copied) (copied from fv-code-highlighter/trunk/src/Container/InvokableFactory.php)
• tags/2.1.2/src/Diagnostics.php (copied) (copied from fv-code-highlighter/trunk/src/Diagnostics.php)
• tags/2.1.2/src/Filter/HtmlSpecialCharsDecode.php (copied) (copied from fv-code-highlighter/trunk/src/Filter/HtmlSpecialCharsDecode.php)
• tags/2.1.2/src/Highlighter/AbstractHighlighter.php (modified) (3 diffs)
• tags/2.1.2/src/Highlighter/Bash/Factory.php (copied) (copied from fv-code-highlighter/trunk/src/Highlighter/Bash/Factory.php)
• tags/2.1.2/src/Highlighter/Css/Css.php (copied) (copied from fv-code-highlighter/trunk/src/Highlighter/Css/Css.php) (1 diff)
• tags/2.1.2/src/Highlighter/Css/Factory.php (copied) (copied from fv-code-highlighter/trunk/src/Highlighter/Css/Factory.php)
• tags/2.1.2/src/Highlighter/General/Factory.php (copied) (copied from fv-code-highlighter/trunk/src/Highlighter/General/Factory.php)
• tags/2.1.2/src/Highlighter/HighlighterInterface.php (modified) (3 diffs)
• tags/2.1.2/src/Highlighter/Html/Factory.php (copied) (copied from fv-code-highlighter/trunk/src/Highlighter/Html/Factory.php)
• tags/2.1.2/src/Highlighter/Html/Html.php (copied) (copied from fv-code-highlighter/trunk/src/Highlighter/Html/Html.php) (1 diff)
• tags/2.1.2/src/Highlighter/Javascript/Factory.php (copied) (copied from fv-code-highlighter/trunk/src/Highlighter/Javascript/Factory.php)
• tags/2.1.2/src/Highlighter/Php/Factory.php (copied) (copied from fv-code-highlighter/trunk/src/Highlighter/Php/Factory.php)
• tags/2.1.2/src/Highlighter/Php/Php.php (modified) (1 diff)
• tags/2.1.2/src/Highlighter/Xml/Factory.php (copied) (copied from fv-code-highlighter/trunk/src/Highlighter/Xml/Factory.php)
• tags/2.1.2/src/Installer.php (copied) (copied from fv-code-highlighter/trunk/src/Installer.php)
• tags/2.1.2/src/Options.php (deleted)
• tags/2.1.2/src/Output/Header.php (copied) (copied from fv-code-highlighter/trunk/src/Output/Header.php)
• tags/2.1.2/src/Output/Highlighter.php (copied) (copied from fv-code-highlighter/trunk/src/Output/Highlighter.php) (1 diff)
• tags/2.1.2/src/Output/Scripts.php (copied) (copied from fv-code-highlighter/trunk/src/Output/Scripts.php)
• tags/2.1.2/src/Parser/Element/Block.php (copied) (copied from fv-code-highlighter/trunk/src/Parser/Element/Block.php)
• tags/2.1.2/src/Parser/Parser.php (copied) (copied from fv-code-highlighter/trunk/src/Parser/Parser.php)
• tags/2.1.2/src/Version.php (copied) (copied from fv-code-highlighter/trunk/src/Version.php)
• trunk/config/default.config.php (modified) (1 diff)
• trunk/fv-code-highlighter.php (modified) (1 diff)
• trunk/public/css/fvch-styles-dark.min.css (modified) (1 diff)
• trunk/public/css/fvch-styles-dark.scss (modified) (1 diff)
• trunk/public/css/fvch-styles.min.css (modified) (1 diff)
• trunk/public/css/fvch-styles.scss (modified) (1 diff)
• trunk/readme.txt (modified) (2 diffs)
• trunk/src/Highlighter/AbstractHighlighter.php (modified) (3 diffs)
• trunk/src/Highlighter/Css/Css.php (modified) (1 diff)
• trunk/src/Highlighter/HighlighterInterface.php (modified) (3 diffs)
• trunk/src/Highlighter/Html/Html.php (modified) (1 diff)
• trunk/src/Highlighter/Php/Php.php (modified) (1 diff)
• trunk/src/Output/Highlighter.php (modified) (1 diff)

fv-code-highlighter/tags/2.1.2/config/default.config.php

@@ -22 +22 @@
      * @var string CSS font-size (em)
      */
-    'fvch-font-size' => '1',
+    'fvch-font-size' => '0.8',
 
     /**

fv-code-highlighter/tags/2.1.2/fv-code-highlighter.php

@@ -7 +7 @@
  * Author:      Frank Verhoeven
  * Author URI:  https://frankverhoeven.me/
- * Version:     2.1.1
+ * Version:     2.1.2
  */
 

fv-code-highlighter/tags/2.1.2/public/css/fvch-styles-dark.min.css

@@ -1 @@
-.fvch-hide-if-no-js{display:none !important}.fvch-codeblock{background:#2e2e2d;border:1px solid #1e1e1d;padding:0 !important;margin:0 0 1em;border-radius:3px;overflow-x:auto;position:relative}.fvch-codeblock table,.fvch-codeblock tbody,.fvch-codeblock tr,.fvch-codeblock td,.fvch-codeblock pre{padding:0;margin:0;border:none}.fvch-codeblock pre{white-space:pre;padding-left:.5em;font-family:"Monaco", "Courier New", Courier, monospace;border:none !important;background:none !important;color:#f8f8f2 !important}.fvch-toolbox{position:absolute;top:0;right:0;display:none;border-left:1px solid #3e3e3d;border-bottom:1px solid #3e3e3d;border-bottom-left-radius:3px;border-top-right-radius:3px;background:#2e2e2d;padding:3px 6px 0}.fvch-codeblock:hover .fvch-toolbox{display:block}.fvch-toolbox .fvch-toolbox-icon{border:none !important;background:none !important;cursor:pointer !important;margin:0 !important;padding:2px !important;height:20px}.fvch-toolbox .fvch-toolbox-icon path{fill:#6e6e6d}.fvch-toolbox .fvch-toolbox-icon:active path{fill:#4e4e4d}td.fvch-line-number{text-align:right;color:#5e5e5d;width:1%;min-width:30px;padding:0 .7em;background:#2e2e2d;border-right:1px solid #3e3e3d;user-select:none}td.fvch-line-number:before{content:attr(data-line-number)}table.fvch-code tr:first-child td{padding-top:5px}table.fvch-code tr:last-child td{padding-bottom:5px}.general{color:#f8f8f2;font-weight:normal}.general-number{color:#ae81ff}.general-operator{color:#f8f8f2}.general-brackets{color:#f8f8f2}.general-string{color:#a6e22e}.bash{color:#000}.bash-comment{color:#008312}.bash-number{color:#2934d4}.bash-operator{color:#000}.bash-brackets{color:#009}.bash-command{color:#b833a1}.bash-string{color:#cf3125}.css{color:#f8f8f2}.css-import{color:#f8f8f2;font-weight:bold}.css-media{color:#f8f8f2;font-weight:bold}.css-comment{color:#708090}.css-important{color:#f92672;font-weight:bold}.css-property{color:#e6db74}.css-selector{color:#f8f8f2}.css-string{color:#a6e22e;font-weight:normal}.css-value{color:#a6e22e}.css-rest{color:#f8f8f2;font-weight:bold}.html{font-weight:normal;color:#f8f8f2}.html-anchor-element{color:#e6db74}.html-attribute{color:#a6e22e}.html-comment{color:#708090}.html-form-element{color:#e6db74}.html-image-element{color:#e6db74}.html-object-element{color:#e6db74}.html-other-element{color:#e6db74}.html-script-element{color:#e6db74}.html-special-char{color:#f8f8f2;font-weight:bold}.html-style-element{color:#e6db74}.html-table-element{color:#e6db74}.html-text{color:#f8f8f2}.php{color:#f8f8f2;font-weight:normal}.php-script-tag{color:#66d9ef;font-weight:bold}.php-comment{color:#708090}.php-comment-phpdoc{color:#708090;font-weight:bold}.php-constant{color:#f92672}.php-function{color:#e6db74}.php-method{color:#e6db74}.php-class{color:#f8f8f2}.php-number{color:#ae81ff}.php-operator{color:#f8f8f2}.php-brackets{color:#f8f8f2}.php-keyword{color:#66d9ef}.php-string{color:#a6e22e}.php-var-type{color:#ae81ff}.php-var{color:#f8f8f2}.xml{color:#f8f8f2}.xml-string{color:#a6e22e}.xml-comment,.xml-comment span{color:#708090}.xml-number{color:#ae81ff}.xml-element{color:#e6db74}.xml-text{color:#f8f8f2}.javascript{color:#f8f8f2}.js-string{color:#a6e22e}.js-bracket{color:#f8f8f2}.js-client-keyword{color:#e6db74}.js-comment{color:#708090}.js-function-keyword{color:#66d9ef}.js-native-keyword{color:#e6db74}.js-number{color:#ae81ff}.js-operator{color:#f8f8f2}.js-regexp{color:#a6e22e}.js-reserved-keyword{color:#66d9ef}
+.fvch-hide-if-no-js{display:none !important}.fvch-codeblock{background:#2e2e2d;border:1px solid #1e1e1d;padding:0 !important;margin:0 0 1em;border-radius:3px;overflow-x:auto;position:relative}.fvch-codeblock table,.fvch-codeblock tbody,.fvch-codeblock tr,.fvch-codeblock td,.fvch-codeblock pre{padding:0;margin:0;border:none}.fvch-codeblock pre{white-space:pre;padding-left:.5em;font-family:"Monaco", "Courier New", Courier, monospace;border:none !important;background:none !important;color:#f8f8f2 !important}.fvch-toolbox{position:absolute;top:0;right:0;display:none;border-left:1px solid #3e3e3d;border-bottom:1px solid #3e3e3d;border-bottom-left-radius:3px;border-top-right-radius:3px;background:#2e2e2d;padding:3px 6px 0}.fvch-codeblock:hover .fvch-toolbox{display:block}.fvch-toolbox .fvch-toolbox-icon{border:none !important;background:none !important;cursor:pointer !important;margin:0 !important;padding:2px !important;height:20px}.fvch-toolbox .fvch-toolbox-icon path{fill:#6e6e6d}.fvch-toolbox .fvch-toolbox-icon:active path{fill:#4e4e4d}td.fvch-line-number{text-align:right;color:#5e5e5d;width:1%;min-width:30px;padding:0 .7em !important;background:#2e2e2d;border-right:1px solid #3e3e3d;user-select:none}td.fvch-line-number:before{content:attr(data-line-number)}table.fvch-code tr:first-child td{padding-top:5px}table.fvch-code tr:last-child td{padding-bottom:5px}.general{color:#f8f8f2;font-weight:normal}.general-number{color:#ae81ff}.general-operator{color:#f8f8f2}.general-brackets{color:#f8f8f2}.general-string{color:#a6e22e}.bash{color:#000}.bash-comment{color:#008312}.bash-number{color:#2934d4}.bash-operator{color:#000}.bash-brackets{color:#009}.bash-command{color:#b833a1}.bash-string{color:#cf3125}.css{color:#f8f8f2}.css-import{color:#f8f8f2;font-weight:bold}.css-media{color:#f8f8f2;font-weight:bold}.css-comment{color:#708090}.css-important{color:#f92672;font-weight:bold}.css-property{color:#e6db74}.css-selector{color:#f8f8f2}.css-string{color:#a6e22e;font-weight:normal}.css-value{color:#a6e22e}.css-rest{color:#f8f8f2;font-weight:bold}.html{font-weight:normal;color:#f8f8f2}.html-anchor-element{color:#e6db74}.html-attribute{color:#a6e22e}.html-comment{color:#708090}.html-form-element{color:#e6db74}.html-image-element{color:#e6db74}.html-object-element{color:#e6db74}.html-other-element{color:#e6db74}.html-script-element{color:#e6db74}.html-special-char{color:#f8f8f2;font-weight:bold}.html-style-element{color:#e6db74}.html-table-element{color:#e6db74}.html-text{color:#f8f8f2}.php{color:#f8f8f2;font-weight:normal}.php-script-tag{color:#66d9ef;font-weight:bold}.php-comment{color:#708090}.php-comment-phpdoc{color:#708090;font-weight:bold}.php-constant{color:#f92672}.php-function{color:#e6db74}.php-method{color:#e6db74}.php-class{color:#f8f8f2}.php-number{color:#ae81ff}.php-operator{color:#f8f8f2}.php-brackets{color:#f8f8f2}.php-keyword{color:#66d9ef}.php-string{color:#a6e22e}.php-var-type{color:#ae81ff}.php-var{color:#f8f8f2}.xml{color:#f8f8f2}.xml-string{color:#a6e22e}.xml-comment,.xml-comment span{color:#708090}.xml-number{color:#ae81ff}.xml-element{color:#e6db74}.xml-text{color:#f8f8f2}.javascript{color:#f8f8f2}.js-string{color:#a6e22e}.js-bracket{color:#f8f8f2}.js-client-keyword{color:#e6db74}.js-comment{color:#708090}.js-function-keyword{color:#66d9ef}.js-native-keyword{color:#e6db74}.js-number{color:#ae81ff}.js-operator{color:#f8f8f2}.js-regexp{color:#a6e22e}.js-reserved-keyword{color:#66d9ef}

fv-code-highlighter/tags/2.1.2/public/css/fvch-styles-dark.scss

@@ -73 +73 @@
     width: 1%;
     min-width: 30px;
-    padding: 0 .7em;
+    padding: 0 .7em !important;
     background: #2e2e2d;
     border-right: 1px solid #3e3e3d;

fv-code-highlighter/tags/2.1.2/public/css/fvch-styles.min.css

@@ -1 @@
-.fvch-hide-if-no-js{display:none !important}.fvch-codeblock{background:url(../images/notepaper.png) top left repeat;border:1px solid #d2d2d2;padding:0 !important;margin:0 0 1em;border-radius:3px;overflow-x:auto;position:relative}.fvch-codeblock table,.fvch-codeblock tbody,.fvch-codeblock tr,.fvch-codeblock td,.fvch-codeblock pre{padding:0;margin:0;border:none}.fvch-codeblock pre{white-space:pre;padding-left:.5em;font-family:"Monaco", "Courier New", Courier, monospace;border:none !important;background:none !important;color:inherit !important}.fvch-toolbox{position:absolute;top:0;right:0;display:none;border-left:1px solid #d2d2d2;border-bottom:1px solid #d2d2d2;border-bottom-left-radius:3px;border-top-right-radius:3px;background:#fff;padding:3px 6px 0}.fvch-codeblock:hover .fvch-toolbox{display:block}.fvch-toolbox .fvch-toolbox-icon{border:none !important;background:none !important;cursor:pointer !important;margin:0 !important;padding:2px !important;height:20px}.fvch-toolbox .fvch-toolbox-icon path{fill:#666}.fvch-toolbox .fvch-toolbox-icon:active path{fill:#000}td.fvch-line-number{text-align:right;color:#666;width:1%;min-width:30px;padding:0 .7em;background:#e2e2e2;border-right:1px solid #d2d2d2;user-select:none}td.fvch-line-number:before{content:attr(data-line-number)}table.fvch-code tr:first-child td{padding-top:5px}table.fvch-code tr:last-child td{padding-bottom:5px}.general{color:#000;font-weight:normal}.general-number{color:#2934d4}.general-operator{color:#000}.general-brackets{color:#009}.general-string{color:#cf3125}.bash{color:#000}.bash-comment{color:#008312}.bash-number{color:#2934d4}.bash-operator{color:#000}.bash-brackets{color:#009}.bash-command{color:#b833a1}.bash-string{color:#cf3125}.css{color:#f0f}.css-background{background-color:#fff}.css-import{color:#099;font-weight:bold}.css-media{color:#900;font-weight:bold}.css-comment{color:#999}.css-important{color:#f00;font-weight:bold}.css-property{color:#009}.css-selector{color:#f0f}.css-string{color:#060;font-weight:normal}.css-value{color:#00f}.css-rest{color:#f0f;font-weight:bold}.html{font-weight:normal;color:#000}.html-anchor-element{color:#060}.html-attribute{color:#00f}.html-comment{color:#999}.html-form-element{color:#f90}.html-image-element{color:#909}.html-object-element{color:#900}.html-other-element{color:#009}.html-script-element{color:#900}.html-special-char{color:#000;font-weight:bold}.html-style-element{color:#909}.html-table-element{color:#099}.html-text{color:#000}.php{color:#000;font-weight:normal}.php-script-tag{color:#d00;font-weight:bold}.php-comment{color:#f90}.php-comment-phpdoc{color:#e68a00}.php-constant{color:#520}.php-function{color:#000}.php-method{color:#000}.php-class{color:#000}.php-number{color:#f00}.php-operator{color:#00f}.php-brackets{color:#009}.php-keyword{color:#006600}.php-string{color:#c00}.php-var-type{color:#099}.php-var{color:#06f}.xml{color:#000}.xml-string{color:#060}.xml-comment,.xml-comment span{color:#999}.xml-number{color:#f00}.xml-element{color:#009}.xml-text{color:#000}.javascript{color:#000}.js-string{color:#00f}.js-bracket{color:#009;font-weight:bold}.js-client-keyword{color:#909}.js-comment{color:#999}.js-function-keyword{color:#000;font-weight:bold}.js-native-keyword{color:#099}.js-number{color:#f00}.js-operator{color:#00f}.js-regexp{color:#060}.js-reserved-keyword{color:#009;font-weight:bold}.js-string{color:#00f}
+.fvch-hide-if-no-js{display:none !important}.fvch-codeblock{background:url(../images/notepaper.png) top left repeat;border:1px solid #d2d2d2;padding:0 !important;margin:0 0 1em;border-radius:3px;overflow-x:auto;position:relative}.fvch-codeblock table,.fvch-codeblock tbody,.fvch-codeblock tr,.fvch-codeblock td,.fvch-codeblock pre{padding:0;margin:0;border:none}.fvch-codeblock pre{white-space:pre;padding-left:.5em;font-family:"Monaco", "Courier New", Courier, monospace;border:none !important;background:none !important;color:inherit !important}.fvch-toolbox{position:absolute;top:0;right:0;display:none;border-left:1px solid #d2d2d2;border-bottom:1px solid #d2d2d2;border-bottom-left-radius:3px;border-top-right-radius:3px;background:#fff;padding:3px 6px 0}.fvch-codeblock:hover .fvch-toolbox{display:block}.fvch-toolbox .fvch-toolbox-icon{border:none !important;background:none !important;cursor:pointer !important;margin:0 !important;padding:2px !important;height:20px}.fvch-toolbox .fvch-toolbox-icon path{fill:#666}.fvch-toolbox .fvch-toolbox-icon:active path{fill:#000}td.fvch-line-number{text-align:right;color:#666;width:1%;min-width:30px;padding:0 .7em !important;background:#e2e2e2;border-right:1px solid #d2d2d2;user-select:none}td.fvch-line-number:before{content:attr(data-line-number)}table.fvch-code tr:first-child td{padding-top:5px}table.fvch-code tr:last-child td{padding-bottom:5px}.general{color:#000;font-weight:normal}.general-number{color:#2934d4}.general-operator{color:#000}.general-brackets{color:#009}.general-string{color:#cf3125}.bash{color:#000}.bash-comment{color:#008312}.bash-number{color:#2934d4}.bash-operator{color:#000}.bash-brackets{color:#009}.bash-command{color:#b833a1}.bash-string{color:#cf3125}.css{color:#f0f}.css-background{background-color:#fff}.css-import{color:#099;font-weight:bold}.css-media{color:#900;font-weight:bold}.css-comment{color:#999}.css-important{color:#f00;font-weight:bold}.css-property{color:#009}.css-selector{color:#f0f}.css-string{color:#060;font-weight:normal}.css-value{color:#00f}.css-rest{color:#f0f;font-weight:bold}.html{font-weight:normal;color:#000}.html-anchor-element{color:#060}.html-attribute{color:#00f}.html-comment{color:#999}.html-form-element{color:#f90}.html-image-element{color:#909}.html-object-element{color:#900}.html-other-element{color:#009}.html-script-element{color:#900}.html-special-char{color:#000;font-weight:bold}.html-style-element{color:#909}.html-table-element{color:#099}.html-text{color:#000}.php{color:#000;font-weight:normal}.php-script-tag{color:#d00;font-weight:bold}.php-comment{color:#f90}.php-comment-phpdoc{color:#e68a00}.php-constant{color:#520}.php-function{color:#000}.php-method{color:#000}.php-class{color:#000}.php-number{color:#f00}.php-operator{color:#00f}.php-brackets{color:#009}.php-keyword{color:#006600}.php-string{color:#c00}.php-var-type{color:#099}.php-var{color:#06f}.xml{color:#000}.xml-string{color:#060}.xml-comment,.xml-comment span{color:#999}.xml-number{color:#f00}.xml-element{color:#009}.xml-text{color:#000}.javascript{color:#000}.js-string{color:#00f}.js-bracket{color:#009;font-weight:bold}.js-client-keyword{color:#909}.js-comment{color:#999}.js-function-keyword{color:#000;font-weight:bold}.js-native-keyword{color:#099}.js-number{color:#f00}.js-operator{color:#00f}.js-regexp{color:#060}.js-reserved-keyword{color:#009;font-weight:bold}.js-string{color:#00f}

fv-code-highlighter/tags/2.1.2/public/css/fvch-styles.scss

@@ -82 +82 @@
     width: 1%;
     min-width: 30px;
-    padding: 0 .7em;
+    padding: 0 .7em !important;
     background: #e2e2e2;
     border-right: 1px solid #d2d2d2;

fv-code-highlighter/tags/2.1.2/readme.txt

@@ -6 +6 @@
 Requires at least:  3.2
 Tested up to:       4.9
-Stable tag:         2.1.1
+Stable tag:         2.1.2
 
 Highlight your code with beautiful highlighters.
@@ -86 +86 @@
 For more details on changes, please visit the [WordPress Trac](http://plugins.trac.wordpress.org/log/fv-code-highlighter/ "FV Code Highlighter on WordPress Trac").
 
+
+= 2.1.2 =
+
+* Improvement: PHP Code is no longer required to start with PHP tags to be highlighted.
+
+
 = 2.1.1 =
 

fv-code-highlighter/tags/2.1.2/src/Highlighter/AbstractHighlighter.php

@@ -78 +78 @@
      * @return string
      */
-    public function highlight($code)
+    public function highlight(string $code): string
     {
         if (null === $this->parser) {
@@ -84 +84 @@
         }
 
+        $code = $this->preProcess($code);
         $code = $this->parser->parse($code);
         $code = $this->postProcess($code);
 
+        return $code;
+    }
+
+    /**
+     * Code pre processing
+     *
+     * @param string $code
+     * @return string
+     */
+    public function preProcess(string $code): string
+    {
         return $code;
     }
@@ -96 +108 @@
      * @return string
      */
-    public function postProcess($code)
+    public function postProcess(string $code): string
     {
         return $code;

fv-code-highlighter/tags/2.1.2/src/Highlighter/Css/Css.php

@@ -94 +94 @@
     ];
 
-    public function postProcess($code)
+    public function postProcess(string $code): string
     {
         // Fixes

fv-code-highlighter/tags/2.1.2/src/Highlighter/HighlighterInterface.php

@@ -17 +17 @@
 
     /**
+     * Code pre processing
+     *
+     * @param string $code
+     * @return string
+     */
+    public function preProcess(string $code): string;
+
+    /**
      * Code post processing
      *
@@ -22 +30 @@
      * @return string
      */
-    public function postProcess($code);
+    public function postProcess(string $code): string;
 
     /**
@@ -30 +38 @@
      * @return string
      */
-    public function highlight($code);
+    public function highlight(string $code): string;
 }

fv-code-highlighter/tags/2.1.2/src/Highlighter/Html/Html.php

@@ -27 +27 @@
      * @return string
      */
-    public function postProcess($code)
+    public function postProcess(string $code): string
     {
         \preg_match_all('/&lt;style(.*?)&gt;<\/span>(?<code>.*?)<span class="html-style-element">&lt;\/style&gt;/msi', $code, $cssCode);

fv-code-highlighter/tags/2.1.2/src/Highlighter/Php/Php.php

@@ -383 +383 @@
     ];
 
+    /**
+     * @var bool
+     */
+    private $prefixed = false;
+
     public function __construct(array $elements)
     {
         $this->elements = $elements;
     }
+
+    /**
+     * Prefix code with php tag if needed
+     *
+     * @param string $code
+     * @return string
+     */
+    public function preProcess(string $code): string
+    {
+        if (!\strstr($code, '<?')) {
+            $code = '<?php' . \PHP_EOL . $code;
+            $this->prefixed = true;
+        } else {
+            $this->prefixed = false;
+        }
+
+        return $code;
+    }
+
+    /**
+     * Strip prefixed php tag if needed
+     *
+     * @param string $code
+     * @return string
+     */
+    public function postProcess(string $code): string
+    {
+        if ($this->prefixed) {
+            $code = \explode(\PHP_EOL, $code, 2)[1];
+        }
+
+        return $code;
+    }
 }

fv-code-highlighter/tags/2.1.2/src/Output/Highlighter.php

@@ -89 +89 @@
                 $classname = \ucfirst(\strtolower($settings['type']));
                 if ('Php' == $classname) {
-                    $classname = 'Html'; // @todo: hack, fix
+                    //$classname = 'Html'; // @todo: hack, fix
                 }
                 $class = 'FvCodeHighlighter\\Highlighter\\' . $classname . '\\' . $classname;

fv-code-highlighter/trunk/config/default.config.php

@@ -22 +22 @@
      * @var string CSS font-size (em)
      */
-    'fvch-font-size' => '1',
+    'fvch-font-size' => '0.8',
 
     /**

fv-code-highlighter/trunk/fv-code-highlighter.php

@@ -7 +7 @@
  * Author:      Frank Verhoeven
  * Author URI:  https://frankverhoeven.me/
- * Version:     2.1.1
+ * Version:     2.1.2
  */
 

fv-code-highlighter/trunk/public/css/fvch-styles-dark.min.css

@@ -1 @@
-.fvch-hide-if-no-js{display:none !important}.fvch-codeblock{background:#2e2e2d;border:1px solid #1e1e1d;padding:0 !important;margin:0 0 1em;border-radius:3px;overflow-x:auto;position:relative}.fvch-codeblock table,.fvch-codeblock tbody,.fvch-codeblock tr,.fvch-codeblock td,.fvch-codeblock pre{padding:0;margin:0;border:none}.fvch-codeblock pre{white-space:pre;padding-left:.5em;font-family:"Monaco", "Courier New", Courier, monospace;border:none !important;background:none !important;color:#f8f8f2 !important}.fvch-toolbox{position:absolute;top:0;right:0;display:none;border-left:1px solid #3e3e3d;border-bottom:1px solid #3e3e3d;border-bottom-left-radius:3px;border-top-right-radius:3px;background:#2e2e2d;padding:3px 6px 0}.fvch-codeblock:hover .fvch-toolbox{display:block}.fvch-toolbox .fvch-toolbox-icon{border:none !important;background:none !important;cursor:pointer !important;margin:0 !important;padding:2px !important;height:20px}.fvch-toolbox .fvch-toolbox-icon path{fill:#6e6e6d}.fvch-toolbox .fvch-toolbox-icon:active path{fill:#4e4e4d}td.fvch-line-number{text-align:right;color:#5e5e5d;width:1%;min-width:30px;padding:0 .7em;background:#2e2e2d;border-right:1px solid #3e3e3d;user-select:none}td.fvch-line-number:before{content:attr(data-line-number)}table.fvch-code tr:first-child td{padding-top:5px}table.fvch-code tr:last-child td{padding-bottom:5px}.general{color:#f8f8f2;font-weight:normal}.general-number{color:#ae81ff}.general-operator{color:#f8f8f2}.general-brackets{color:#f8f8f2}.general-string{color:#a6e22e}.bash{color:#000}.bash-comment{color:#008312}.bash-number{color:#2934d4}.bash-operator{color:#000}.bash-brackets{color:#009}.bash-command{color:#b833a1}.bash-string{color:#cf3125}.css{color:#f8f8f2}.css-import{color:#f8f8f2;font-weight:bold}.css-media{color:#f8f8f2;font-weight:bold}.css-comment{color:#708090}.css-important{color:#f92672;font-weight:bold}.css-property{color:#e6db74}.css-selector{color:#f8f8f2}.css-string{color:#a6e22e;font-weight:normal}.css-value{color:#a6e22e}.css-rest{color:#f8f8f2;font-weight:bold}.html{font-weight:normal;color:#f8f8f2}.html-anchor-element{color:#e6db74}.html-attribute{color:#a6e22e}.html-comment{color:#708090}.html-form-element{color:#e6db74}.html-image-element{color:#e6db74}.html-object-element{color:#e6db74}.html-other-element{color:#e6db74}.html-script-element{color:#e6db74}.html-special-char{color:#f8f8f2;font-weight:bold}.html-style-element{color:#e6db74}.html-table-element{color:#e6db74}.html-text{color:#f8f8f2}.php{color:#f8f8f2;font-weight:normal}.php-script-tag{color:#66d9ef;font-weight:bold}.php-comment{color:#708090}.php-comment-phpdoc{color:#708090;font-weight:bold}.php-constant{color:#f92672}.php-function{color:#e6db74}.php-method{color:#e6db74}.php-class{color:#f8f8f2}.php-number{color:#ae81ff}.php-operator{color:#f8f8f2}.php-brackets{color:#f8f8f2}.php-keyword{color:#66d9ef}.php-string{color:#a6e22e}.php-var-type{color:#ae81ff}.php-var{color:#f8f8f2}.xml{color:#f8f8f2}.xml-string{color:#a6e22e}.xml-comment,.xml-comment span{color:#708090}.xml-number{color:#ae81ff}.xml-element{color:#e6db74}.xml-text{color:#f8f8f2}.javascript{color:#f8f8f2}.js-string{color:#a6e22e}.js-bracket{color:#f8f8f2}.js-client-keyword{color:#e6db74}.js-comment{color:#708090}.js-function-keyword{color:#66d9ef}.js-native-keyword{color:#e6db74}.js-number{color:#ae81ff}.js-operator{color:#f8f8f2}.js-regexp{color:#a6e22e}.js-reserved-keyword{color:#66d9ef}
+.fvch-hide-if-no-js{display:none !important}.fvch-codeblock{background:#2e2e2d;border:1px solid #1e1e1d;padding:0 !important;margin:0 0 1em;border-radius:3px;overflow-x:auto;position:relative}.fvch-codeblock table,.fvch-codeblock tbody,.fvch-codeblock tr,.fvch-codeblock td,.fvch-codeblock pre{padding:0;margin:0;border:none}.fvch-codeblock pre{white-space:pre;padding-left:.5em;font-family:"Monaco", "Courier New", Courier, monospace;border:none !important;background:none !important;color:#f8f8f2 !important}.fvch-toolbox{position:absolute;top:0;right:0;display:none;border-left:1px solid #3e3e3d;border-bottom:1px solid #3e3e3d;border-bottom-left-radius:3px;border-top-right-radius:3px;background:#2e2e2d;padding:3px 6px 0}.fvch-codeblock:hover .fvch-toolbox{display:block}.fvch-toolbox .fvch-toolbox-icon{border:none !important;background:none !important;cursor:pointer !important;margin:0 !important;padding:2px !important;height:20px}.fvch-toolbox .fvch-toolbox-icon path{fill:#6e6e6d}.fvch-toolbox .fvch-toolbox-icon:active path{fill:#4e4e4d}td.fvch-line-number{text-align:right;color:#5e5e5d;width:1%;min-width:30px;padding:0 .7em !important;background:#2e2e2d;border-right:1px solid #3e3e3d;user-select:none}td.fvch-line-number:before{content:attr(data-line-number)}table.fvch-code tr:first-child td{padding-top:5px}table.fvch-code tr:last-child td{padding-bottom:5px}.general{color:#f8f8f2;font-weight:normal}.general-number{color:#ae81ff}.general-operator{color:#f8f8f2}.general-brackets{color:#f8f8f2}.general-string{color:#a6e22e}.bash{color:#000}.bash-comment{color:#008312}.bash-number{color:#2934d4}.bash-operator{color:#000}.bash-brackets{color:#009}.bash-command{color:#b833a1}.bash-string{color:#cf3125}.css{color:#f8f8f2}.css-import{color:#f8f8f2;font-weight:bold}.css-media{color:#f8f8f2;font-weight:bold}.css-comment{color:#708090}.css-important{color:#f92672;font-weight:bold}.css-property{color:#e6db74}.css-selector{color:#f8f8f2}.css-string{color:#a6e22e;font-weight:normal}.css-value{color:#a6e22e}.css-rest{color:#f8f8f2;font-weight:bold}.html{font-weight:normal;color:#f8f8f2}.html-anchor-element{color:#e6db74}.html-attribute{color:#a6e22e}.html-comment{color:#708090}.html-form-element{color:#e6db74}.html-image-element{color:#e6db74}.html-object-element{color:#e6db74}.html-other-element{color:#e6db74}.html-script-element{color:#e6db74}.html-special-char{color:#f8f8f2;font-weight:bold}.html-style-element{color:#e6db74}.html-table-element{color:#e6db74}.html-text{color:#f8f8f2}.php{color:#f8f8f2;font-weight:normal}.php-script-tag{color:#66d9ef;font-weight:bold}.php-comment{color:#708090}.php-comment-phpdoc{color:#708090;font-weight:bold}.php-constant{color:#f92672}.php-function{color:#e6db74}.php-method{color:#e6db74}.php-class{color:#f8f8f2}.php-number{color:#ae81ff}.php-operator{color:#f8f8f2}.php-brackets{color:#f8f8f2}.php-keyword{color:#66d9ef}.php-string{color:#a6e22e}.php-var-type{color:#ae81ff}.php-var{color:#f8f8f2}.xml{color:#f8f8f2}.xml-string{color:#a6e22e}.xml-comment,.xml-comment span{color:#708090}.xml-number{color:#ae81ff}.xml-element{color:#e6db74}.xml-text{color:#f8f8f2}.javascript{color:#f8f8f2}.js-string{color:#a6e22e}.js-bracket{color:#f8f8f2}.js-client-keyword{color:#e6db74}.js-comment{color:#708090}.js-function-keyword{color:#66d9ef}.js-native-keyword{color:#e6db74}.js-number{color:#ae81ff}.js-operator{color:#f8f8f2}.js-regexp{color:#a6e22e}.js-reserved-keyword{color:#66d9ef}

fv-code-highlighter/trunk/public/css/fvch-styles-dark.scss

@@ -73 +73 @@
     width: 1%;
     min-width: 30px;
-    padding: 0 .7em;
+    padding: 0 .7em !important;
     background: #2e2e2d;
     border-right: 1px solid #3e3e3d;

fv-code-highlighter/trunk/public/css/fvch-styles.min.css

@@ -1 @@
-.fvch-hide-if-no-js{display:none !important}.fvch-codeblock{background:url(../images/notepaper.png) top left repeat;border:1px solid #d2d2d2;padding:0 !important;margin:0 0 1em;border-radius:3px;overflow-x:auto;position:relative}.fvch-codeblock table,.fvch-codeblock tbody,.fvch-codeblock tr,.fvch-codeblock td,.fvch-codeblock pre{padding:0;margin:0;border:none}.fvch-codeblock pre{white-space:pre;padding-left:.5em;font-family:"Monaco", "Courier New", Courier, monospace;border:none !important;background:none !important;color:inherit !important}.fvch-toolbox{position:absolute;top:0;right:0;display:none;border-left:1px solid #d2d2d2;border-bottom:1px solid #d2d2d2;border-bottom-left-radius:3px;border-top-right-radius:3px;background:#fff;padding:3px 6px 0}.fvch-codeblock:hover .fvch-toolbox{display:block}.fvch-toolbox .fvch-toolbox-icon{border:none !important;background:none !important;cursor:pointer !important;margin:0 !important;padding:2px !important;height:20px}.fvch-toolbox .fvch-toolbox-icon path{fill:#666}.fvch-toolbox .fvch-toolbox-icon:active path{fill:#000}td.fvch-line-number{text-align:right;color:#666;width:1%;min-width:30px;padding:0 .7em;background:#e2e2e2;border-right:1px solid #d2d2d2;user-select:none}td.fvch-line-number:before{content:attr(data-line-number)}table.fvch-code tr:first-child td{padding-top:5px}table.fvch-code tr:last-child td{padding-bottom:5px}.general{color:#000;font-weight:normal}.general-number{color:#2934d4}.general-operator{color:#000}.general-brackets{color:#009}.general-string{color:#cf3125}.bash{color:#000}.bash-comment{color:#008312}.bash-number{color:#2934d4}.bash-operator{color:#000}.bash-brackets{color:#009}.bash-command{color:#b833a1}.bash-string{color:#cf3125}.css{color:#f0f}.css-background{background-color:#fff}.css-import{color:#099;font-weight:bold}.css-media{color:#900;font-weight:bold}.css-comment{color:#999}.css-important{color:#f00;font-weight:bold}.css-property{color:#009}.css-selector{color:#f0f}.css-string{color:#060;font-weight:normal}.css-value{color:#00f}.css-rest{color:#f0f;font-weight:bold}.html{font-weight:normal;color:#000}.html-anchor-element{color:#060}.html-attribute{color:#00f}.html-comment{color:#999}.html-form-element{color:#f90}.html-image-element{color:#909}.html-object-element{color:#900}.html-other-element{color:#009}.html-script-element{color:#900}.html-special-char{color:#000;font-weight:bold}.html-style-element{color:#909}.html-table-element{color:#099}.html-text{color:#000}.php{color:#000;font-weight:normal}.php-script-tag{color:#d00;font-weight:bold}.php-comment{color:#f90}.php-comment-phpdoc{color:#e68a00}.php-constant{color:#520}.php-function{color:#000}.php-method{color:#000}.php-class{color:#000}.php-number{color:#f00}.php-operator{color:#00f}.php-brackets{color:#009}.php-keyword{color:#006600}.php-string{color:#c00}.php-var-type{color:#099}.php-var{color:#06f}.xml{color:#000}.xml-string{color:#060}.xml-comment,.xml-comment span{color:#999}.xml-number{color:#f00}.xml-element{color:#009}.xml-text{color:#000}.javascript{color:#000}.js-string{color:#00f}.js-bracket{color:#009;font-weight:bold}.js-client-keyword{color:#909}.js-comment{color:#999}.js-function-keyword{color:#000;font-weight:bold}.js-native-keyword{color:#099}.js-number{color:#f00}.js-operator{color:#00f}.js-regexp{color:#060}.js-reserved-keyword{color:#009;font-weight:bold}.js-string{color:#00f}
+.fvch-hide-if-no-js{display:none !important}.fvch-codeblock{background:url(../images/notepaper.png) top left repeat;border:1px solid #d2d2d2;padding:0 !important;margin:0 0 1em;border-radius:3px;overflow-x:auto;position:relative}.fvch-codeblock table,.fvch-codeblock tbody,.fvch-codeblock tr,.fvch-codeblock td,.fvch-codeblock pre{padding:0;margin:0;border:none}.fvch-codeblock pre{white-space:pre;padding-left:.5em;font-family:"Monaco", "Courier New", Courier, monospace;border:none !important;background:none !important;color:inherit !important}.fvch-toolbox{position:absolute;top:0;right:0;display:none;border-left:1px solid #d2d2d2;border-bottom:1px solid #d2d2d2;border-bottom-left-radius:3px;border-top-right-radius:3px;background:#fff;padding:3px 6px 0}.fvch-codeblock:hover .fvch-toolbox{display:block}.fvch-toolbox .fvch-toolbox-icon{border:none !important;background:none !important;cursor:pointer !important;margin:0 !important;padding:2px !important;height:20px}.fvch-toolbox .fvch-toolbox-icon path{fill:#666}.fvch-toolbox .fvch-toolbox-icon:active path{fill:#000}td.fvch-line-number{text-align:right;color:#666;width:1%;min-width:30px;padding:0 .7em !important;background:#e2e2e2;border-right:1px solid #d2d2d2;user-select:none}td.fvch-line-number:before{content:attr(data-line-number)}table.fvch-code tr:first-child td{padding-top:5px}table.fvch-code tr:last-child td{padding-bottom:5px}.general{color:#000;font-weight:normal}.general-number{color:#2934d4}.general-operator{color:#000}.general-brackets{color:#009}.general-string{color:#cf3125}.bash{color:#000}.bash-comment{color:#008312}.bash-number{color:#2934d4}.bash-operator{color:#000}.bash-brackets{color:#009}.bash-command{color:#b833a1}.bash-string{color:#cf3125}.css{color:#f0f}.css-background{background-color:#fff}.css-import{color:#099;font-weight:bold}.css-media{color:#900;font-weight:bold}.css-comment{color:#999}.css-important{color:#f00;font-weight:bold}.css-property{color:#009}.css-selector{color:#f0f}.css-string{color:#060;font-weight:normal}.css-value{color:#00f}.css-rest{color:#f0f;font-weight:bold}.html{font-weight:normal;color:#000}.html-anchor-element{color:#060}.html-attribute{color:#00f}.html-comment{color:#999}.html-form-element{color:#f90}.html-image-element{color:#909}.html-object-element{color:#900}.html-other-element{color:#009}.html-script-element{color:#900}.html-special-char{color:#000;font-weight:bold}.html-style-element{color:#909}.html-table-element{color:#099}.html-text{color:#000}.php{color:#000;font-weight:normal}.php-script-tag{color:#d00;font-weight:bold}.php-comment{color:#f90}.php-comment-phpdoc{color:#e68a00}.php-constant{color:#520}.php-function{color:#000}.php-method{color:#000}.php-class{color:#000}.php-number{color:#f00}.php-operator{color:#00f}.php-brackets{color:#009}.php-keyword{color:#006600}.php-string{color:#c00}.php-var-type{color:#099}.php-var{color:#06f}.xml{color:#000}.xml-string{color:#060}.xml-comment,.xml-comment span{color:#999}.xml-number{color:#f00}.xml-element{color:#009}.xml-text{color:#000}.javascript{color:#000}.js-string{color:#00f}.js-bracket{color:#009;font-weight:bold}.js-client-keyword{color:#909}.js-comment{color:#999}.js-function-keyword{color:#000;font-weight:bold}.js-native-keyword{color:#099}.js-number{color:#f00}.js-operator{color:#00f}.js-regexp{color:#060}.js-reserved-keyword{color:#009;font-weight:bold}.js-string{color:#00f}

fv-code-highlighter/trunk/public/css/fvch-styles.scss

@@ -82 +82 @@
     width: 1%;
     min-width: 30px;
-    padding: 0 .7em;
+    padding: 0 .7em !important;
     background: #e2e2e2;
     border-right: 1px solid #d2d2d2;

fv-code-highlighter/trunk/readme.txt

@@ -6 +6 @@
 Requires at least:  3.2
 Tested up to:       4.9
-Stable tag:         2.1.1
+Stable tag:         2.1.2
 
 Highlight your code with beautiful highlighters.
@@ -86 +86 @@
 For more details on changes, please visit the [WordPress Trac](http://plugins.trac.wordpress.org/log/fv-code-highlighter/ "FV Code Highlighter on WordPress Trac").
 
+
+= 2.1.2 =
+
+* Improvement: PHP Code is no longer required to start with PHP tags to be highlighted.
+
+
 = 2.1.1 =
 

fv-code-highlighter/trunk/src/Highlighter/AbstractHighlighter.php

@@ -78 +78 @@
      * @return string
      */
-    public function highlight($code)
+    public function highlight(string $code): string
     {
         if (null === $this->parser) {
@@ -84 +84 @@
         }
 
+        $code = $this->preProcess($code);
         $code = $this->parser->parse($code);
         $code = $this->postProcess($code);
 
+        return $code;
+    }
+
+    /**
+     * Code pre processing
+     *
+     * @param string $code
+     * @return string
+     */
+    public function preProcess(string $code): string
+    {
         return $code;
     }
@@ -96 +108 @@
      * @return string
      */
-    public function postProcess($code)
+    public function postProcess(string $code): string
     {
         return $code;

fv-code-highlighter/trunk/src/Highlighter/Css/Css.php

@@ -94 +94 @@
     ];
 
-    public function postProcess($code)
+    public function postProcess(string $code): string
     {
         // Fixes

fv-code-highlighter/trunk/src/Highlighter/HighlighterInterface.php

@@ -17 +17 @@
 
     /**
+     * Code pre processing
+     *
+     * @param string $code
+     * @return string
+     */
+    public function preProcess(string $code): string;
+
+    /**
      * Code post processing
      *
@@ -22 +30 @@
      * @return string
      */
-    public function postProcess($code);
+    public function postProcess(string $code): string;
 
     /**
@@ -30 +38 @@
      * @return string
      */
-    public function highlight($code);
+    public function highlight(string $code): string;
 }

fv-code-highlighter/trunk/src/Highlighter/Html/Html.php

@@ -27 +27 @@
      * @return string
      */
-    public function postProcess($code)
+    public function postProcess(string $code): string
     {
         \preg_match_all('/&lt;style(.*?)&gt;<\/span>(?<code>.*?)<span class="html-style-element">&lt;\/style&gt;/msi', $code, $cssCode);

fv-code-highlighter/trunk/src/Highlighter/Php/Php.php

@@ -383 +383 @@
     ];
 
+    /**
+     * @var bool
+     */
+    private $prefixed = false;
+
     public function __construct(array $elements)
     {
         $this->elements = $elements;
     }
+
+    /**
+     * Prefix code with php tag if needed
+     *
+     * @param string $code
+     * @return string
+     */
+    public function preProcess(string $code): string
+    {
+        if (!\strstr($code, '<?')) {
+            $code = '<?php' . \PHP_EOL . $code;
+            $this->prefixed = true;
+        } else {
+            $this->prefixed = false;
+        }
+
+        return $code;
+    }
+
+    /**
+     * Strip prefixed php tag if needed
+     *
+     * @param string $code
+     * @return string
+     */
+    public function postProcess(string $code): string
+    {
+        if ($this->prefixed) {
+            $code = \explode(\PHP_EOL, $code, 2)[1];
+        }
+
+        return $code;
+    }
 }

fv-code-highlighter/trunk/src/Output/Highlighter.php

@@ -89 +89 @@
                 $classname = \ucfirst(\strtolower($settings['type']));
                 if ('Php' == $classname) {
-                    $classname = 'Html'; // @todo: hack, fix
+                    //$classname = 'Html'; // @todo: hack, fix
                 }
                 $class = 'FvCodeHighlighter\\Highlighter\\' . $classname . '\\' . $classname;