diff --git a/composer.lock b/composer.lock new file mode 100644 index 0000000..aeae751 --- /dev/null +++ b/composer.lock @@ -0,0 +1,18 @@ +{ + "_readme": [ + "This file locks the dependencies of your project to a known state", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", + "This file is @generated automatically" + ], + "content-hash": "a2163a654f7f9ac85e2a3600011ed45b", + "packages": [], + "packages-dev": [], + "aliases": [], + "minimum-stability": "stable", + "stability-flags": [], + "prefer-stable": false, + "prefer-lowest": false, + "platform": [], + "platform-dev": [], + "plugin-api-version": "2.1.0" +} diff --git a/package-lock.json b/package-lock.json index 97407c3..e74c584 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "syntaxhighlighter", - "version": "3.6.0", + "version": "3.6.1", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -4426,6 +4426,14 @@ "pify": "^3.0.0" } }, + "map-age-cleaner": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz", + "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==", + "requires": { + "p-defer": "^1.0.0" + } + }, "map-cache": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", @@ -4454,14 +4462,6 @@ "safe-buffer": "^5.1.2" } }, - "mem": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz", - "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", - "requires": { - "mimic-fn": "^1.0.0" - } - }, "memory-fs": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz", @@ -5032,11 +5032,21 @@ "os-tmpdir": "^1.0.0" } }, + "p-defer": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz", + "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=" + }, "p-finally": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=" }, + "p-is-promise": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz", + "integrity": "sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=" + }, "p-limit": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", @@ -6872,6 +6882,18 @@ "execa": "^0.7.0", "lcid": "^1.0.0", "mem": "^1.1.0" + }, + "dependencies": { + "mem": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/mem/-/mem-4.0.0.tgz", + "integrity": "sha512-WQxG/5xYc3tMbYLXoXPm81ET2WDULiU5FxbuIoNbJqLOOI8zehXFdZuiUEgfdrU2mVB1pxBZUGlYORSrpuJreA==", + "requires": { + "map-age-cleaner": "^0.1.1", + "mimic-fn": "^1.0.0", + "p-is-promise": "^1.1.0" + } + } } }, "path-type": { diff --git a/package.json b/package.json index 62e5867..381719e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "syntaxhighlighter", - "version": "3.6.0", + "version": "3.6.1", "description": "Easily post syntax-highlighted code to your WordPress site without having to modify the code at all.", "homepage": "https://alex.blog/wordpress-plugins/syntaxhighlighter/", "author": "Alex Mills (Viper007Bond)", diff --git a/readme.txt b/readme.txt index c7d03d4..d9d9e6d 100644 --- a/readme.txt +++ b/readme.txt @@ -2,9 +2,9 @@ Contributors: Viper007Bond, automattic, donncha Donate link: https://alex.blog/2019/03/13/in-memory-of-alex-donation-link-update/ Tags: code, source, sourcecode, php, syntax highlighting, syntax, highlight, highlighting, highlighter, WordPress.com -Requires at least: 5.2 -Tested up to: 5.7 -Stable tag: 3.6.0 +Requires at least: 5.6 +Tested up to: 5.8 +Stable tag: 3.6.1 Easily post syntax-highlighted code to your site without having to modify the code at all. As seen on WordPress.com. @@ -40,6 +40,15 @@ Try excluding this plugin's Javascript from any performance optimizations your s == ChangeLog == += Version 3.6.1 = + +* New: Set code block language when pasting into editor. #215 +* New: Add syntax highlight for Haskell. #210 +* New: Display the list of available brushes. #221 +* Fix: Line alignment for bootstrap themes. #222 +* Fix: Add space around code. #223 +* Fix: XML brush - use the last occurrence of the tag. #225 + = Version 3.6.0 = * New: Add ```language shortcut. #180 diff --git a/syntaxhighlighter.php b/syntaxhighlighter.php index 54abb05..6a84c41 100644 --- a/syntaxhighlighter.php +++ b/syntaxhighlighter.php @@ -4,22 +4,22 @@ Plugin Name: SyntaxHighlighter Evolved Plugin URI: https://alex.blog/wordpress-plugins/syntaxhighlighter/ -Version: 3.6.0 +Version: 3.6.1 Description: Easily post syntax-highlighted code to your site without having to modify the code at all. Uses Alex Gorbatchev's SyntaxHighlighter. Includes a new editor block. Author: Alex Mills (Viper007Bond) Author URI: https://alex.blog/ Text Domain: syntaxhighlighter License: GPL2 License URI: https://www.gnu.org/licenses/gpl-2.0.html -Requires at least: 5.2 -Tested up to: 5.7 +Requires at least: 5.6 +Tested up to: 5.8 Requires PHP: 7.0 **************************************************************************/ class SyntaxHighlighter { // All of these variables are private. Filters are provided for things that can be modified. - public $pluginver = '3.6.0'; // Plugin version + public $pluginver = '3.6.1'; // Plugin version public $agshver = false; // Alex Gorbatchev's SyntaxHighlighter version (dynamically set below due to v2 vs v3) public $shfolder = false; // Controls what subfolder to load SyntaxHighlighter from (v2 or v3) public $settings = array(); // Contains the user's settings