[TWiki-Dev] [SVN] PeterThoeny r29935 - in twiki/branches/TWikiRelease06x00/SyntaxHighlightingPlugin: data/TWiki lib/TWiki/Plugins

[<de...@de...>]

Author: PeterThoeny
Date: 2016-01-22 08:08:33 +0000 (Fri, 22 Jan 2016)
New Revision: 29935
Trac url: http://develop.twiki.org/trac/changeset/29935

Modified:
   twiki/branches/TWikiRelease06x00/SyntaxHighlightingPlugin/data/TWiki/SyntaxHighlightingPlugin.txt
   twiki/branches/TWikiRelease06x00/SyntaxHighlightingPlugin/lib/TWiki/Plugins/SyntaxHighlightingPlugin.pm
Log:
Item7708: Switch to GPL 3; copyright update to 2016

Modified: twiki/branches/TWikiRelease06x00/SyntaxHighlightingPlugin/data/TWiki/SyntaxHighlightingPlugin.txt
===================================================================
--- twiki/branches/TWikiRelease06x00/SyntaxHighlightingPlugin/data/TWiki/SyntaxHighlightingPlugin.txt	2016-01-22 08:08:14 UTC (rev 29934)
+++ twiki/branches/TWikiRelease06x00/SyntaxHighlightingPlugin/data/TWiki/SyntaxHighlightingPlugin.txt	2016-01-22 08:08:33 UTC (rev 29935)
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="TWikiContributor" date="1386807946" format="1.1" version="$Rev$"}%
+%META:TOPICINFO{author="TWikiContributor" date="1453450194" format="1.1" version="$Rev$"}%
 %META:TOPICPARENT{name="TWikiPreferences"}%
 ---+!! Syntax Highlighting Plugin
 <!--
@@ -157,14 +157,17 @@
 %TABLE{ tablewidth="100%" columnwidths="170," }%
 |  Plugin Author: | TWiki:Main.AndrewRJones |
 |  Previous Authors: | TWiki:Main.NicolasTisserand, TWiki:Main.NicolasBurrus, Perceval Anichini |
+|  Copyright: | &copy; 2002-2016 Peter Thoeny, [[http://twiki.org/][TWiki.org]] %BR% &copy; 2002-2016 TWiki:TWiki.TWikiContributor |
 |  License: | GPL ([[http://www.gnu.org/copyleft/gpl.html][GNU General Public License]]) |
-|  Plugin Version: | 2013-12-11 |
+|  Plugin Version: | 2016-01-22 |
 %TWISTY{
  mode="div"
  showlink="Show Change History %ICONURL{toggleopen}%"
  hidelink="Hide Change History %ICONURL{toggleclose}%"
 }%
 %TABLE{ tablewidth="100%" columnwidths="170," }%
+|  2016-01-22: | TWikibug:Item7708: Switch to GPL 3; copyright update to 2016 |
+|  2014-03-26: | TWikibug:Item7470: SyntaxHighlightingPlugin may fail to recognize enscript supporting languages |
 |  2013-12-11: | TWikibug:Item7399: Auto-detect supported languages -- TWiki:Main.PeterThoeny |
 |  2013-04-04: | TWikibug:Item7211: Add Scala support -- TWiki:Main.HideyoImazu |
 |  2013-02-14: | TWikibug:Item7091: Show source code of undefined or unsupported language, but warn user; use configure settings for defaults; rename numstep parameter to step & make numstep undocumented; add VarCODE variable documentation -- TWiki:Main.PeterThoeny |

Modified: twiki/branches/TWikiRelease06x00/SyntaxHighlightingPlugin/lib/TWiki/Plugins/SyntaxHighlightingPlugin.pm
===================================================================
--- twiki/branches/TWikiRelease06x00/SyntaxHighlightingPlugin/lib/TWiki/Plugins/SyntaxHighlightingPlugin.pm	2016-01-22 08:08:14 UTC (rev 29934)
+++ twiki/branches/TWikiRelease06x00/SyntaxHighlightingPlugin/lib/TWiki/Plugins/SyntaxHighlightingPlugin.pm	2016-01-22 08:08:33 UTC (rev 29935)
@@ -2,12 +2,12 @@
 #
 # Copyright (C) 2008 Andrew Jones, and...@gm...
 # Copyright (C) 2000-2001 Andrea Sterbini, a.s...@fl...
-# Copyright (C) 2001-2014 Peter Thoeny, Peter[at]Thoeny.org
-# Copyright (C) 2008-2014 TWiki Contributors
+# Copyright (C) 2001-2016 Peter Thoeny, Peter[at]Thoeny.org
+# Copyright (C) 2008-2016 TWiki Contributors
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
+# as published by the Free Software Foundation; either version 3
 # of the License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -49,7 +49,7 @@
            );
 
 $VERSION = '$Rev';
-$RELEASE = '2013-12-11';
+$RELEASE = '2016-01-22';
 $SHORTDESCRIPTION = 'Highlight source code fragments for many languages';
 $NO_PREFS_IN_TOPIC = 1;
 %extraMapping = (
@@ -195,8 +195,8 @@
     };
     if( $ret ) {
         %languages =
-          map { /^Name: *(.*)/; (lc($1), lc($1)); }
-          grep { /^Name: / }
+          map { /^Name[ \t]*: *(.*)/; (lc($1), lc($1)); }
+          grep { /^Name[ \t]*: / }
           split( /[\n\r]+/, $out );
         @languages{keys %extraMapping} = values %extraMapping;