Commit graph

1125 commits

Author SHA1 Message Date
Derk-Jan Hartman 633b18a1fc Fix Lua comment blocks and string blocks.
- Match comments non-greedily instead of greedily
- Re-add support for block strings (similar to heredoc)

Bug: 73281
Change-Id: Ib7f6eeb2df17434740fb85cee955d76762b56fe5
2014-11-13 22:39:24 +01:00
jenkins-bot 88fc1cbb8c Merge "Update GeSHi to 1.0.8.12 release" 2014-11-11 13:40:07 +00:00
Kunal Mehta f798181948 Don't overwrite existing value of $wgSyntaxHighlightModels
Currently extensions that want to add their model to $wgSyntaxHighlightModels
must do so in an extension function since they don't want to assume
that their extension is loaded after SyntaxHighlight GeSHi is.
But by not overwriting the array during initialization, extensions
don't have to worry about load order.

Also require a minimum of MW 1.24 which removed support for
register_globals.

Change-Id: I15c56690d156e90991aa86a3d79dbeaeb18dd6fd
2014-11-10 15:07:04 -08:00
Reedy eed20b9af3 Update GeSHi to 1.0.8.12 release
d9cfd3e0cc

Already updated to 1 commit behind 1.0.8.12 release,
so this just tidies it up and brings it into line.

Change-Id: I2e8c4bc39844baf397547d824d7419fa25506f37
2014-11-06 21:08:30 +00:00
jenkins-bot 46e2435b9d Merge "Update GeSHi from upstream" 2014-11-02 14:03:13 +00:00
Translation updater bot eac73fbee5 Localisation updates from https://translatewiki.net.
Change-Id: I68868c5c74f833d2f3b7d5419e1cb572f06fa19e
2014-10-29 22:07:46 +01:00
Reedy c918679022 Update GeSHi from upstream
Import e89ac0019e

e89ac0019e

Bug: 52509
Change-Id: Ibff6c89e919230a952b0c9cd840ce6ce3e2bb02a
2014-10-29 17:56:35 +00:00
Translation updater bot 83c54385ef Localisation updates from https://translatewiki.net.
Change-Id: I93f28765a1bfa972b0d8e7c7f83a2e2c8fcd6740
2014-10-27 20:19:04 +01:00
Kunal Mehta 53e1b42012 Check $wgUseSiteCss inside ResourceLoaderGeSHiLocalModule
This way the module is always loaded, but will be empty or not
depending on the config setting.

Change-Id: Id4f18c58f62c530fbf7d81ff0880281684296b7d
2014-10-13 16:35:49 -07:00
jenkins-bot 8b566a3d95 Merge "Implement 'ApiFormatHighlight' hook" 2014-10-13 23:24:13 +00:00
Brad Jorsch 8dde10991c Implement 'ApiFormatHighlight' hook
Core change I04b1a3842 adds a hook to allow extensions to
syntax-highlight the pretty-printed output from the API.

Change-Id: If0413a1d922ff8a47afc355e0a2cc276cf54b400
2014-10-13 16:22:59 -07:00
Translation updater bot 0282d4a65f Localisation updates from https://translatewiki.net.
Change-Id: I2258531e714742812b3b87fe9bf434b9ccacd253
2014-09-24 22:19:31 +02:00
Kunal Mehta da41c89fb7 Fix incorrect casing of "ContentHandler" class name
Change-Id: I502c4d2f401f655153976ddce5c3d08e469b050f
2014-09-14 21:50:20 -07:00
Translation updater bot 20444ef26c Localisation updates from https://translatewiki.net.
Change-Id: Ie5e969d13489ab352b86c64a30da52d0203d6db9
2014-09-02 22:17:59 +02:00
jenkins-bot cd8fa98aea Merge "Parse page content using the standard parser first for link tables" 2014-07-30 22:52:50 +00:00
Reedy 6941a4fb69 Remove out of date information from README
Change-Id: I27b6afcdc1fdab7677d51106fd1e3b2096d9b616
2014-07-30 20:25:55 +01:00
Bartosz Dziewoński 9d69259b13 Parse page content using the standard parser first for link tables
We could do this using TextContent::fillParserOutput(), but alas it is
'protected', so we have to duplicate a tiny bit of code from there.

Bug: 68757
Change-Id: I7d98fa0f97fb195d23caa3d7448a15c3bbe430ca
2014-07-30 21:09:05 +02:00
Bartosz Dziewoński d7b87ac836 Use ContentGetParserOutput hook instead of ShowRawCssJs
Depends on I58679856 in core MediaWiki.

This breaks compatibility with MW < 1.24.

Bug: 64859
Change-Id: Idf4ad4397101a4d19be2ac773cd4bad52188d903
2014-06-20 19:57:59 +00:00
Kunal Mehta 0138535793 Rename one more occurrence of HighlightGeSHilocal
Change-Id: Ie173b17db586491455b3182d227f73ba21859323
Follows-Up: I018c1a4ea290ec914f7605d402c297d0c6fe113f
2014-06-16 00:47:13 -07:00
Reedy 5cdceae3c3 Update comments
Add a couple of GPL headers

Change-Id: I55acc3bf4e45ae62e41ffe16f081073111171779
2014-06-15 17:22:00 -07:00
Reedy 13dfba4f9a Rename hook subscriber
Swap global function for closure

Change-Id: I41a17461546ac76e223db1c2dc5b2be1ff093af8
2014-06-16 00:20:08 +00:00
Reedy 33ab38abe5 Rename HighlightGeSHilocal to ResourceLoaderGeSHiLocalModule
Change-Id: I018c1a4ea290ec914f7605d402c297d0c6fe113f
2014-06-01 18:57:10 +01:00
Translation updater bot 7ae613d999 Localisation updates from https://translatewiki.net.
Change-Id: I7f567d0f8b9f987e2dcfc938231f10bde43541d9
2014-05-24 15:23:40 +00:00
Bartosz Dziewoński 44177a6b13 Make sure font size in GeSHi output is not too small
Follow-up to I7bbdcc0a, see it for details.

Also cleared up the comment describing this here.

Bug: 26204
Change-Id: I103a6d5c3e1f91cf74e244756c2ad318e429a78e
2014-05-06 01:50:04 +02:00
Bartosz Dziewoński 79b37aa109 Remove unused backwards-compatibility code
Change-Id: Iffa42d7579d882cd119851a075b6e63f670c02bc
2014-05-05 12:32:56 +02:00
Bartosz Dziewoński b6d8b1a5b9 Use ResourceLoader modules for style loading
We want to be able to track what styles were added to be able to deliver
this information to MediaWiki's live preview functionality (in order
to solve bug 24134).

This required moving some code in SyntaxHighlight_GeSHi class around.

The old way still works and is used for MediaWiki 1.20 and lower.

Bug: 24134
Change-Id: Iafd91de8922be55688fedef4e43a8e7f54d4e1cc
2014-05-04 20:46:21 +02:00
Translation updater bot 49592712fe Update i18n shim
A performance issue was fixed in the shim(s) generated by
generateJsonI18n.php, so it needed to be updated.

Change-Id: I68764e4b5e5a2bff2a433edadf343707f544172f
2014-04-22 13:47:29 +00:00
Translation updater bot 5c3eb066b8 Localisation updates from https://translatewiki.net.
Change-Id: I2f504948ec2352005c7a473d107f0a61526b1425
2014-04-16 15:54:08 +00:00
Translation updater bot 63c98eaaae Localisation updates from https://translatewiki.net.
Change-Id: I3d15d0f0baa9296a1931c9c66c0f2937e9dd330d
2014-04-15 20:11:43 +00:00
Translation updater bot d639f00b51 Localisation updates from https://translatewiki.net.
Change-Id: Ice835c44174f9764da1f14a2c8842acd664ccc84
2014-04-01 19:51:53 +00:00
Siebrand Mazeland 5835d5f052 Migrate to JSON i18n
Procedure per https://www.mediawiki.org/wiki/Manual:GenerateJsonI18n.php
with shim.

Change-Id: I28967ff1b8fc990bb5bcc88cd49a73c681dcfc91
2014-03-28 22:39:14 +01:00
Translation updater bot d97a1c340b Localisation updates from https://translatewiki.net.
Change-Id: Id70fbfcac65708f0a68c9b441e38e4862a4e040b
2014-03-28 19:40:05 +00:00
Translation updater bot a946631e15 Localisation updates from https://translatewiki.net.
Change-Id: Ice456dd6992b30aca3452e09ccc60503165e027f
2014-03-27 20:32:21 +00:00
Translation updater bot 69337ceac0 Localisation updates from https://translatewiki.net.
Change-Id: Iefc521355e8e3d748a8e5a806e579995af118e84
2014-02-26 22:03:46 +00:00
Translation updater bot 73a000ea22 Localisation updates from https://translatewiki.net.
Change-Id: I0d2526005c4891b4598bdc14d65219db4fc504f1
2014-02-14 20:21:33 +00:00
Translation updater bot 96540df9d2 Localisation updates from https://translatewiki.net.
Change-Id: I950a9a1e8fc633e020c09b3aaab45e06872b8311
2014-02-01 19:46:36 +00:00
jenkins-bot 6898dfd82e Merge "Remove old username" 2014-01-23 01:32:33 +00:00
Reedy f22a190ce6 Add COPYING
Change-Id: I861c0d58cf2ced32a1cd887186fc2272011af147
2014-01-22 19:44:32 +00:00
helderwiki 69360a1b60 Remove old username
My current user name is already in the list.

Change-Id: Id1e4726857e65f333ebc22e12f3d719ee2859ac2
2014-01-22 15:59:22 -02:00
Translation updater bot 81dc89e9da Localisation updates from https://translatewiki.net.
Change-Id: I246b317a26bbf4490d04b1b5d540fdd24bbd18e5
2014-01-21 19:54:03 +00:00
Translation updater bot c29212de7f Localisation updates from https://translatewiki.net.
Change-Id: Iae3638bef234ceb17f26f4cdb464e830e4890da1
2013-12-28 19:32:35 +00:00
Translation updater bot a4a381877c Localisation updates from https://translatewiki.net.
Change-Id: I37b572a144dfb7deca997b2383d8f5c2b8eff015
2013-12-07 01:52:26 +00:00
Brad Jorsch 335a5e9a9c Protect tabs from HTML Tidy
HTML Tidy doesn't care for tabs, and likes to always output spaces. This
can break the syntax-highlighted output, since Tidy converts tabs to
spaces on the source-code level instead of on the rendered HTML level,
even inside <pre> tags where it really shouldn't (this is probably a bug
in Tidy).

r97300 fixed the bad indenting by converting tabs to spaces before
highlighting, which works around Tidy's bug but breaks highlighting of
languages where tabs are significant (e.g. Whitespace).

It turns out that Tidy's tab mangling occurs while it's reading the
source file, before the conversion of entities such as &#9; to tab. So
GeSHi can armor its <pre>-wrapped output against Tidy's bug by encoding
all tabs as &#9;.

Bug: 30930
Bug: 57826
Change-Id: Id541e2712bd3f94446442ccf2e1e2f214e2801ba
2013-12-02 16:43:36 +00:00
Translation updater bot fd31d07530 Localisation updates from http://translatewiki.net.
Change-Id: Ic3c6b4f62f6bfd0e7d8d78d17ffbc6175653defa
2013-11-02 20:03:21 +00:00
Adamw 2f064f4536 Merge "Haskell syntax: omit single quotes from QUOTEMARKS" 2013-10-24 05:51:03 +00:00
Translation updater bot 7fa4488622 Localisation updates from http://translatewiki.net.
Change-Id: I7841ab7af5e7c2ec280f9f1f9d3894a8d1de4c86
2013-10-21 19:40:33 +00:00
Translation updater bot dff9489b14 Merge "Localisation updates from http://translatewiki.net." 2013-10-15 19:40:43 +00:00
Translation updater bot 4bdf6861a9 Localisation updates from http://translatewiki.net.
Change-Id: I1d973d94b73b0760a0cdd6c12bc7cf574f1035e8
2013-10-15 19:32:38 +00:00
Translation updater bot af8aa7b66b Localisation updates from http://translatewiki.net.
Change-Id: I3147b110244f3854c01abdd49291880f4c3c1e21
2013-10-14 09:31:14 +00:00
Ori Livneh b4b8ff670f Haskell syntax: omit single quotes from QUOTEMARKS
Single quotes in Haskell may be used to delimit character literals, but they
can also be used in identifiers. GeSHi's syntax highlighter only recognizes the
former usage. When Haskell source uses "'" as part of an identifier, GeSHi
treats it as the start of a literal string, which screws up syntax
highlighting.

Upstream bug report and proposed patch have been ignored for more than a year,
so I am applying the proposed fix here, and changing the version identifier to
reflect a WMF modification.

Upstream bug report: <http://sourceforge.net/p/geshi/bugs/217/>
Upstream proposed patch: <http://sourceforge.net/p/geshi/bugs/219/>

Bug: 52509
Change-Id: I210832c4b272b5c03bbc4623d73fb821092e5ef4
2013-10-09 02:48:51 -07:00