Update to Syntaxhighlighter 3.0.90

New brushes: Haxe, TAP, TypeScript
crazy-max · Jun 18, 2016 · 467e209 · 467e209
1 parent 09a3c2b
commit 467e209
Show file tree

Hide file tree

Showing 165 changed files with 11,336 additions and 12,283 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 2016/06/19
+
+* Update to Syntaxhighlighter 3.0.90
+* New brushes: Haxe, TAP, TypeScript
+
 ## 2016/06/18
 
 * Defaults configuration can be overrided in the Config Manager (Issue #11)

diff --git a/README.md b/README.md
@@ -21,7 +21,9 @@
 
 ## About
 
-This plugin is an alternative to GeSHi server-side code highlighting of DokuWiki with client-side [SyntaxHighlighter](http://alexgorbatchev.com/wiki/SyntaxHighlighter) by Alex Gorbatchev with copy to clipboard functionality based on [SyntaxHighlighter Plugin by David Shin](https://www.dokuwiki.org/plugin:syntaxhighlighter2). The subfolder `sxh3` contains a complete (and untouched) distribution of SyntaxHighlighter 3.0.83.<br />
+This plugin is an alternative to GeSHi server-side code highlighting of DokuWiki with client-side [SyntaxHighlighter](http://alexgorbatchev.com/wiki/SyntaxHighlighter) by Alex Gorbatchev with copy to clipboard functionality based on [SyntaxHighlighter DokuWiki Plugin by David Shin](https://www.dokuwiki.org/plugin:syntaxhighlighter2).<br />
+
+The subfolder `sxh3` contains an untouched build of [SyntaxHighlighter 3.0.90](https://github.com/syntaxhighlighter/syntaxhighlighter/releases/tag/v3.0.90).<br />
 
 For compatibility and conflicts with others plugins, please refer to the official [DokuWiki SyntaxHighlighter3 plugin page](http://www.dokuwiki.org/plugin:syntaxhighlighter3). 
 

diff --git a/syntaxhighlighter3/action/action.php b/syntaxhighlighter3/action/action.php
@@ -26,25 +26,25 @@ public function _hooksh(Doku_Event &$event, $param) {
         // Add SyntaxHighlighter stylesheets. At least two, shCore.css and a theme.
         $event->data['link'][] = array( 'rel'   => 'stylesheet',
             'type'  => 'text/css',
-            'href'  => DOKU_BASE.'lib/plugins/syntaxhighlighter3/sxh3/styles/shCore.css',
+            'href'  => DOKU_BASE.'lib/plugins/syntaxhighlighter3/sxh3/pkg/styles/shCore.css',
             );
         $event->data['link'][] = array( 'rel'   => 'stylesheet',
             'type'  => 'text/css',
-            'href'  => DOKU_BASE.'lib/plugins/syntaxhighlighter3/sxh3/styles/'.$this->getConf('theme'),
+            'href'  => DOKU_BASE.'lib/plugins/syntaxhighlighter3/sxh3/pkg/styles/'.$this->getConf('theme'),
             );
 
         // Register core brush and autoloader.
         $event->data["script"][] = array ("type"   => "text/javascript",
-            "src"   => DOKU_BASE."lib/plugins/syntaxhighlighter3/sxh3/scripts/shCore.js",
+            "src"   => DOKU_BASE."lib/plugins/syntaxhighlighter3/sxh3/pkg/scripts/shCore.min.js",
             "_data" => ""
             );
         $event->data["script"][] = array ("type"   => "text/javascript",
-            "src"   => DOKU_BASE."lib/plugins/syntaxhighlighter3/sxh3/scripts/shAutoloader.js",
+            "src"   => DOKU_BASE."lib/plugins/syntaxhighlighter3/sxh3/pkg/scripts/shAutoloader.js",
             "_data" => ""
             );
         // Always load XML brush, needed for the option html-script.
         $event->data["script"][] = array ("type"   => "text/javascript",
-            "src"   => DOKU_BASE."lib/plugins/syntaxhighlighter3/sxh3/scripts/shBrushXml.js",
+            "src"   => DOKU_BASE."lib/plugins/syntaxhighlighter3/sxh3/pkg/scripts/shBrushXml.js",
             "_data" => ""
             );
 
@@ -72,14 +72,14 @@ public function _hookjsprocessing(Doku_Event &$event, $param) {
             $brush_split = explode(' ', $brush);
             $brush_script = array_pop($brush_split);
             $brush_alias = strtolower(implode(' ', $brush_split));
-            ptln("    '".$brush_alias." ".DOKU_BASE."lib/plugins/syntaxhighlighter3/sxh3/scripts/".$brush_script."',");
+            ptln("    '".$brush_alias." ".DOKU_BASE."lib/plugins/syntaxhighlighter3/sxh3/pkg/scripts/".$brush_script."',");
         }
 
         // Last brush, no comma at the end of the line.
         $brush_split = explode(' ', $lastbrush);
         $brush_script = array_pop($brush_split);
         $brush_alias = strtolower(implode(' ', $brush_split));
-        ptln("    '".$brush_alias." ".DOKU_BASE."lib/plugins/syntaxhighlighter3/sxh3/scripts/".$brush_script."'");
+        ptln("    '".$brush_alias." ".DOKU_BASE."lib/plugins/syntaxhighlighter3/sxh3/pkg/scripts/".$brush_script."'");
         ptln("  );");
         ptln("  SyntaxHighlighter.defaults['auto-links'] = " . ($this->getConf('auto-links') == 1 ? 'true' : 'false') . ";");
         ptln("  SyntaxHighlighter.defaults['collapse'] = " . ($this->getConf('collapse') == 1 ? 'true' : 'false') . ";");

diff --git a/syntaxhighlighter3/conf/default.php b/syntaxhighlighter3/conf/default.php
@@ -6,7 +6,7 @@
  */
 
 $conf['theme'] = 'shThemeDefault.css';
-$conf['brushes'] = 'applescript shBrushAppleScript.js,actionscript3 as3 shBrushAS3.js,bash shell shBrushBash.js,coldfusion cf shBrushColdFusion.js,cpp c shBrushCpp.js,c# c-sharp csharp shBrushCSharp.js,css shBrushCss.js,delphi pascal shBrushDelphi.js,diff patch pas shBrushDiff.js,erl erlang shBrushErlang.js,groovy shBrushGroovy.js,java shBrushJava.js,jfx javafx shBrushJavaFX.js,js jscript javascript shBrushJScript.js,perl pl shBrushPerl.js,php shBrushPhp.js,text plain shBrushPlain.js,ps powershell shBrushPowerShell.js,py python shBrushPython.js,ruby rails ror rb shBrushRuby.js,sass scss shBrushSass.js,scala shBrushScala.js,sql shBrushSql.js,vb vbnet shBrushVb.js,xml xhtml xslt html shBrushXml.js';
+$conf['brushes'] = 'applescript shBrushAppleScript.js,actionscript3 as3 shBrushAS3.js,bash shell shBrushBash.js,coldfusion cf shBrushColdFusion.js,cpp c shBrushCpp.js,c# c-sharp csharp shBrushCSharp.js,css shBrushCss.js,delphi pascal shBrushDelphi.js,diff patch pas shBrushDiff.js,erl erlang shBrushErlang.js,groovy shBrushGroovy.js,haxe hx shBrushHaxe.js,java shBrushJava.js,jfx javafx shBrushJavaFX.js,js jscript javascript shBrushJScript.js,perl pl shBrushPerl.js,php shBrushPhp.js,text plain shBrushPlain.js,ps powershell shBrushPowerShell.js,py python shBrushPython.js,ruby rails ror rb shBrushRuby.js,sass scss shBrushSass.js,scala shBrushScala.js,sql shBrushSql.js,tap Tap TAP shBrushTAP.js,ts typescript shBrushTypeScript.js,vb vbnet shBrushVb.js,xml xhtml xslt html shBrushXml.js';
 
 // defaults
 $conf['auto-links'] = 1;

diff --git a/syntaxhighlighter3/plugin.info.txt b/syntaxhighlighter3/plugin.info.txt
@@ -1,7 +1,7 @@
 base   syntaxhighlighter3
 author Cr@zy (fork of Daniel Lindgren's syntaxhighlighter3 plugin).
 email  [email protected]
-date   2016-06-18
+date   2016-06-19
 name   syntaxhighlighter3 plugin
-desc   Alternative to GeSHi server-side code highlighting with client-side SyntaxHighlighter 3.0.83 by Alex Gorbatchev. SyntaxHighlighter can be found at http://alexgorbatchev.com/wiki/SyntaxHighlighter.
+desc   Alternative to GeSHi server-side code highlighting with client-side SyntaxHighlighter. More info: https://github.com/crazy-max/dokuwiki-plugin-syntaxhighlighter3
 url    http://www.dokuwiki.org/plugin:syntaxhighlighter3
diff --git a/syntaxhighlighter3/sxh3/.bowerrc b/syntaxhighlighter3/sxh3/.bowerrc
@@ -0,0 +1,3 @@
+{
+  "directory": "./components"
+}