Menu
▾
▴
[phpwiki-checkins] SF.net SVN: phpwiki:[8957] trunk
|
From: <var...@us...> - 2014-07-07 12:15:02
|
Revision: 8957
http://sourceforge.net/p/phpwiki/code/8957
Author: vargenau
Date: 2014-07-07 12:14:56 +0000 (Mon, 07 Jul 2014)
Log Message:
-----------
Update doc for SyntaxHighlighterPlugin
Modified Paths:
--------------
trunk/config/config-dist.ini
trunk/configurator.php
trunk/pgsrc/Help%2FPluginManagerPlugin
trunk/pgsrc/Help%2FSyntaxHighlighterPlugin
trunk/pgsrc/ReleaseNotes
Removed Paths:
-------------
trunk/themes/default/highlight.css
Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini 2014-07-07 08:52:53 UTC (rev 8956)
+++ trunk/config/config-dist.ini 2014-07-07 12:14:56 UTC (rev 8957)
@@ -1275,11 +1275,6 @@
; http://sourceforge.net/projects/phpweather/
;PHPWEATHER_BASE_DIR =
-; SyntaxHighlight plugin
-; http://www.andre-simon.de/doku/highlight/highlight.html
-;HIGHLIGHT_EXE = /usr/local/bin/highlight
-;HIGHLIGHT_DATA_DIR = /usr/share/highlight
-
;===========================================================================
; Part Eight: PLUGINCACHED Pear/Cache Settings
;===========================================================================
Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php 2014-07-07 08:52:53 UTC (rev 8956)
+++ trunk/configurator.php 2014-07-07 12:14:56 UTC (rev 8957)
@@ -1660,10 +1660,6 @@
new _define_commented_optional('MY_JABBER_ID'); //
$properties["PHPWEATHER_BASE_DIR"] =
new _define_commented_optional('PHPWEATHER_BASE_DIR'); //
-$properties["HIGHLIGHT_EXE"] =
- new _define_commented_optional('HIGHLIGHT_EXE'); // /usr/local/bin/highlight
-$properties["HIGHLIGHT_DATA_DIR"] =
- new _define_commented_optional('HIGHLIGHT_DATA_DIR'); // /usr/share/highlight
$properties["Part Eight"] =
new part('_part8', $SEPARATOR . "\n", "
Modified: trunk/pgsrc/Help%2FPluginManagerPlugin
===================================================================
--- trunk/pgsrc/Help%2FPluginManagerPlugin 2014-07-07 08:52:53 UTC (rev 8956)
+++ trunk/pgsrc/Help%2FPluginManagerPlugin 2014-07-07 12:14:56 UTC (rev 8957)
@@ -57,7 +57,6 @@
* [[http://graphviz.org/ | graphviz]] for the [[Help:GraphVizPlugin|GraphViz]] plugin and [[Help:VisualWikiPlugin|VisualWiki]] plugin,
* [[http://ploticus.sourceforge.net/ | ploticus]] for the [[Help:PloticusPlugin|Ploticus]] plugin,
* [[http://phpweather.sf.net | phpweather]] for the [[Help:PhpWeatherPlugin|PhpWeather]] plugin,
-* [[http://www.andre-simon.de/ | highlight]] for the [[Help:SyntaxHighlighterPlugin|SyntaxHighlighter]] plugin,
* USE_DB_SESSION = true (default for the peardb, adodb or dba backends) for the [[Help:WhoIsOnlinePlugin|WhoIsOnline]] plugin,
* --with-xml support (with expat or libxml2) for the [[Help:RssFeedPlugin|RssFeed]] plugin (~ProjectSummary, ~RecentReleases) and ~HtmlParser support (~ImportHtml, ~HtmlAreaEditing),
* PHP Mail functionality (php.ini: SMTP + sendmail_from on Windows or sendmail_path) for email PhpWiki:PageChangeNotifications and ModeratedPage's,
Modified: trunk/pgsrc/Help%2FSyntaxHighlighterPlugin
===================================================================
--- trunk/pgsrc/Help%2FSyntaxHighlighterPlugin 2014-07-07 08:52:53 UTC (rev 8956)
+++ trunk/pgsrc/Help%2FSyntaxHighlighterPlugin 2014-07-07 12:14:56 UTC (rev 8957)
@@ -1,4 +1,4 @@
-Date: Fri, 7 Dec 2012 14:58:45 +0000
+Date: Mon, 7 Jul 2014 14:09:37 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FSyntaxHighlighterPlugin;
@@ -6,11 +6,56 @@
charset=UTF-8
Content-Transfer-Encoding: binary
-The **~SyntaxHighlighter** [[Help:WikiPlugin|plugin]] passes all its arguments through a C++
-highlighter called "highlight" (available at [[http://www.andre-simon.de]]).
+The **~SyntaxHighlighter** [[Help:WikiPlugin|plugin]] will highlight source
+code in a variety of languages.
+Highlighting is done in Javascript with [[http://highlightjs.org/]].
+
+Recognized languages are the following:
+| Apache | Bash | C# | C++
+| CSS | CoffeeScript | Diff | HTML, XML
+| HTTP | Ini | JSON | Java
+| JavaScript | Makefile | Markdown | Nginx
+| Objective C | PHP | Perl | Python
+| Ruby | SQL
+
== Arguments ==
+None.
+
+The source code is put between {{{<<SyntaxHighlighter}}} and {{{>>}}}.
+
+== Example ==
+
+{{{
+<<SyntaxHighlighter
+ #include <stdio.h>
+
+ int main() {
+ printf("Lalala\n");
+ }
+>>
+}}}
+
+will give:
+
+<<SyntaxHighlighter
+ #include <stdio.h>
+
+ int main() {
+ printf("Lalala\n");
+ }
+>>
+
+== History ==
+
+The first implementation of this plugin passed all its arguments through a C++
+highlighter called "highlight" (available at [[http://www.andre-simon.de]]).
+
+This implementation allowed the following arguments, which are now ignored.
+
+=== Former Arguments ===
+
{| class="bordered"
|-
! Argument
@@ -38,39 +83,11 @@
| 0 (optional)
|}
-== Example ==
-
-{{{
-<<SyntaxHighlighter syntax=c style=kr color=bright
- #include <stdio.h>
-
- int main() {
- printf("Lalala\n");
- }
->>
-}}}
-
-will give:
-
-<<SyntaxHighlighter syntax=c style=kr color=bright
- #include <stdio.h>
-
- int main() {
- printf("Lalala\n");
- }
->>
-
-I did not use beautifier, because it used up more than 8M of memory on
-my system and PHP killed it. I'm not sure whether this is a problem
-with my integration, or with beautifier itself.
-
== Authors ==
* alecthomas
-* Fixes by [[Help:Reini Urban|Reini Urban]]:
-** support options: syntax, style, color,
-** php version switch,
-** HIGHLIGHT_DATA_DIR, HIGHLIGHT_EXE constants,
+* Fixes by [[Help:Reini Urban|Reini Urban]]
+* Re-implementation with [[http://highlightjs.org/]] by Alain Peyrat and Marc-Etienne Vargenau, Alcatel-Lucent
<noinclude>
----
Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes 2014-07-07 08:52:53 UTC (rev 8956)
+++ trunk/pgsrc/ReleaseNotes 2014-07-07 12:14:56 UTC (rev 8957)
@@ -1,4 +1,4 @@
-Date: Wed, 30 Jan 2013 14:39:50 +0000
+Date: Mon, 7 Jul 2014 14:09:37 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
Content-Type: application/x-phpwiki;
pagename=ReleaseNotes;
@@ -8,12 +8,19 @@
<<CreateToc with_toclink||=1 headers||=1,2,3>>
-== 1.4.0 2013-??-?? Reini Urban, Marc-Etienne Vargenau, Sabri Labbenes, Sébastien Le Callonnec ==
+== 1.5.0 2014-??-?? Marc-Etienne Vargenau ==
+~PhpWiki 1.5.0 needs at least PHP 5.3. It is compatible with PHP 5.3, 5.4 and 5.5.
+
* Fix bad display in Toolbox menu (Sidebar and Monobook themes) reported by Harold Hallikainen
* Fix Captcha problem reported by Harold Hallikainen
* Merge OldTextFormattingRules into TextFormattingRules
+* ~SyntaxHighlighter plugin is now implemented with [[http://highlightjs.org/]] instead of [[http://www.andre-simon.de]].
+== 1.4.0 2014-??-?? Reini Urban, Marc-Etienne Vargenau, Sabri Labbenes, Sébastien Le Callonnec ==
+
+~PhpWiki 1.4.0 is the same as ~PhpWiki 1.4.0RC1. It is the last release compatible with PHP 4.
+
== 1.4.0RC1 2010-09-17 Reini Urban, Marc-Etienne Vargenau, Sabri Labbenes, Sébastien Le Callonnec ==
This is a new major release, where everything changed from 1.2, and lots of changes since 1.3.14.
Deleted: trunk/themes/default/highlight.css
===================================================================
--- trunk/themes/default/highlight.css 2014-07-07 08:52:53 UTC (rev 8956)
+++ trunk/themes/default/highlight.css 2014-07-07 12:14:56 UTC (rev 8957)
@@ -1,64 +0,0 @@
-/* CSS definition file generated by highlight 2.0-22, http://www.andre-simon.de/ */
-
-/* Highlighting theme definition: */
-
-/* Used abbreviations: */
-/* key: Keywords */
-/* typ: Types and type modifiers */
-/* str: Strings */
-/* num: Numbers */
-/* com: Comments */
-/* esc: Escape characters */
-/* dir: Directive lines */
-/* dstr: Strings within directive lines */
-/* sym: Symbols */
-/* line: Line numbers */
-
-pre {
- color: #000000;
- background-color: #ffffff;
- font-size: 10pt;
- font-family: Courier, monospace;
-}
-
-.key {
- color: #000000;
- font-weight: bold;
-}
-
-.num {
- color: #2928ff;
-}
-
-.typ {
- color: #830000;
-}
-
-.esc {
- color: #ff00ff;
-}
-
-.str {
- color: #ff0000;
-}
-
-.dstr {
- color: #818100;
-}
-
-.com {
- color: #838183;
- font-style: italic;
-}
-
-.dir {
- color: #008200;
-}
-
-.sym {
- color: #000000;
-}
-
-.line {
- color: #555555;
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
