Author: sdumitriu
Date: 2008-02-11 00:16:09 +0100 (Mon, 11 Feb 2008)
New Revision: 7478
Modified:
xwiki-platform/core/trunk/xwiki-core/src/main/resources/radeox_markup_xwiki.properties
Log:
XWIKI-2100: Wiki rendered syntax simplification
First steps.
XWIKI-1243: Underline XWiki syntax
Replaced <span class="underline"> with <em class="underline">
XWIKI-1245: Italics XWiki syntax
Replaced <em class="italic"> with <em>
XWIKI-1248: Strong XWiki syntax
Replaced <strong class="strong"> with <strong>
Modified:
xwiki-platform/core/trunk/xwiki-core/src/main/resources/radeox_markup_xwiki.properties
===================================================================
---
xwiki-platform/core/trunk/xwiki-core/src/main/resources/radeox_markup_xwiki.properties
2008-02-10 22:40:59 UTC (rev 7477)
+++
xwiki-platform/core/trunk/xwiki-core/src/main/resources/radeox_markup_xwiki.properties
2008-02-10 23:16:09 UTC (rev 7478)
@@ -12,27 +12,27 @@
# Added *strong* markup
filter.strong.match=(?<!\\*)\\*([^\\p{Space}](?:[^*\n]*+|\\*)*?(?<=[^\\p{Space}]))\\*(?!\\*)
-filter.strong.print=<strong class=\"strong\">$1</strong>
+filter.strong.print=<strong>$1</strong>
# Added __underline__ markup
filter.underline.match=(?<!_)__([^\\p{Space}](?:[^_\n]*+|_)*?(?<=[^\\p{Space}]))__(?!_)
-filter.underline.print=<span class=\"underline\">$1</span>
+filter.underline.print=<em class=\"underline\">$1</em>
filter.strikethrough.match=(?<![-!])--([^\\p{Space}>](?:[^-\n]*+|-)*?(?<=[^\\p{Space}]))--(?!-)
filter.strikethrough.print=<del>$1</del>
filter.italic.match=(?<!~)~~([^\\p{Space}](?:[^~\n]*+|~)*?(?<=[^\\p{Space}]))~~(?!~)
-filter.italic.print=<em class=\"italic\">$1</em>
+filter.italic.print=<em>$1</em>
#Modified this filter to not filter HTML
filter.escape.match=\\\\(\\\\\\\\)|\\\\(.)
-filter.paragraph.print=<p class=\"paragraph\"/>\n
+filter.paragraph.print=<p/>\n
# Replace link syntax with ours
filter.link.match=\\[(.+?)\\]
-## This creates two backreferences (excluding \0):
+## This creates two backreferences (excluding \0, which is the whole link):
## \1 is the protocol (http)
## \2 is the URL excluding the protocol (www.xwiki.org?query)
#filter.url.match=(?<!["'=])((?:ht|f)tps?)://((?:%[\\p{Digit}A-Fa-f][\\p{Digit}A-Fa-f]|[-_.!~*';/?:@#&=+$,\\p{Alnum}])++)(?!(?i:(?:[^<]|<(?!/?a))*+</a>|(?:[^<]|<(?!/?script))*+</script>|[^<>]*+>))
_______________________________________________
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications
