Summary

• Page properties (1 modified, 0 added, 0 removed)

Details

Page properties

Content

...	...	@@ -17,7 +17,7 @@
17	17	|Two standalone elements not separated by 2 new lines|{{{| table cell}}}\\{{{* list item}}}|{{{| table cell}}}\\\\{{{* list item}}}
18	18	|Two standalone elements not separated by 2 new lines|{{{paragraph}}}\\{{{----}}}\\{{{paragraph}}}|{{{paragraph}}}\\\\{{{----}}}\\\\{{{paragraph}}}
19	19	|Ignored new line at beginning of document|<new line at beginning of document>\\paragraph|paragraph
20		-|Not closed header syntax|{{{=== header}}}|{{{=== header ===}}}
	20	+|Not closed heading syntax|{{{=== heading}}}|{{{=== heading ===}}}
21	21
22	22	= Paragraphs =
23	23
...	...	@@ -34,11 +34,11 @@
34	34	|Two paragraphs|Paragraph one\\\\Paragraph two|Paragraph one\\\\Paragraph two|Paragraph one\\\\Paragraph two|Paragraph one\\\\Paragraph two
35	35	|Parametrized paragraph|<p style="text-align:center;color:blue">Centered and blue paragraph</p>|{{{(% style="text-align:center;color:blue" %)}}}\\Centered and blue paragraph|(% style="text-align:center;color:blue" %)\\Centered and blue paragraph|(% style="text-align:center;color:blue" %)\\Centered and blue paragraph
36	36
37		-= Headers =
	37	+= Headings =
38	38
39	39	(% style="width:100%" %)
40	40	|=Feature|=XWiki Syntax 1.0|=XWiki Syntax 2.0|=Result
41		-|Standard headers|(((
	41	+|Standard headings|(((
42	42	1 level 1
43	43	1.1 level 2
44	44	1.1.1 level 3
...	...	@@ -56,14 +56,12 @@
56	56	{{html}}
57	57	<!-- Note: replace this with wiki syntax when http://jira.xwiki.org/jira/browse/XWIKI-4358 is implemented -->
58	58	<h1 id="Hlevel1"><span>level 1</span></h1><p>&nbsp;</p><h2 id="Hlevel2"><span>level 2</span></h2><h3 id="Hlevel3"><span>level 3</span></h3><h4 id="Hlevel4"><span>level 4</span></h4><h5 id="Hlevel5"><span>level 5</span></h5><h6 id="Hlevel6"><span>level 6</span></h6>
59		-{{/html}}
60		-)))
61		-|Parametrized headers|<h1><span style="color:blue">header</span></h1>|{{{(% style="color:blue" %)}}}\\= header =|(((
	59	+{{/html}})))
	60	+|Parametrized headings|<h1><span style="color:blue">heading</span></h1>|{{{(% style="color:blue" %)}}}\\= heading =|(((
62	62	{{html}}
63		-<h1 id="Hheader" style="color:blue"><span>header</span></h1>
64		-{{/html}}
65		-)))
66		-|Headers with wiki syntax|1.1.1 Header with *bold*|{{{=== Header with **bold** ===}}}|(((=== Header with **bold** ===)))
	62	+<h1 id="Hheading" style="color:blue"><span>heading</span></h1>
	63	+{{/html}})))
	64	+|Headings with wiki syntax|1.1.1 Heading with *bold*|{{{=== Heading with **bold** ===}}}|(((=== Heading with **bold** ===)))
67	67
68	68	= Text Formatting =
69	69
...	...	@@ -78,7 +78,7 @@
78	78	|=Feature|=XWiki Syntax 1.0|=XWiki Syntax 2.0|=Result
79	79	|Bold|{{{*bold*}}}|{{{**bold**}}}|**bold**
80	80	|Underline|{{{__underline___}}}|{{{__underline__}}}|__underline__
81		-|Italics|{{{~~italic~~}}}|{{{//italic//}}}|~~italic~~
	79	+|Italics|{{{~~italic~~}}}|{{{//italic//}}}|//italic//
82	82	|Striked out|{{{--strike--}}}|{{{--strike--}}}|--strike--
83	83	|Monospace|<tt>monospace</tt>|{{{##monospace##}}}|##monospace##
84	84	|Superscript|some <sup>superscript</sup>|{{{some ^^superscript^^}}}|some ^^superscript^^
...	...	@@ -87,6 +87,7 @@
87	87	= Horizontal Line =
88	88
89	89	{{info}}There must be 4 or more dashes.{{/info}}
	88	+
90	90	{{info}}Note that this is different from Creole where exactly 4 dashes are required.{{/info}}
91	91
92	92	(% style="width:100%" %)
...	...	@@ -435,10 +435,14 @@
435	435	{{{[[image:Space2.Page2@img.png>>Space1.Page1]]}}}
436	436	{{info}}Wiki syntax is supported inside link labels{{/info}}
437	437	)))|[[image:img.png>>Main.WebHome]]|[[image:img.png>>Main.WebHome]]
438		-|Link to attachment|(((
	437	+|Link to an attachment in the current page|(((
439	439	{{info}}See [[Attach Macro>>http://code.xwiki.org/xwiki/bin/view/Macros/AttachMacro]] for details{{/info}}
440	440	{{{{attach:text|file=img.png}}}}
441	441	)))|{{{[[text>>attach:img.png]]}}}|[[text>>attach:img.png]]|[[text>>attach:img.png]]
	441	+|Link to an attachment in a different page|(((
	442	+{{info}}See [[Attach Macro>>http://code.xwiki.org/xwiki/bin/view/Macros/AttachMacro]] for details{{/info}}
	443	+{{{{attach:text|document=Space.Page|file=img.png}}}}
	444	+)))|{{{[[text>>attach:Space.Page@img.png]]}}}|[[text>>attach:XWiki.XWikiSyntax@img.png]]|[[text>>attach:XWiki.XWikiSyntax@img.png]]
442	442
443	443	== XWiki Syntax 1.0 Link Specification ==
444	444
...	...	@@ -475,6 +475,9 @@
475	475	)))}}}|((({{{
476	476	|=Title 1|=Title 2
477	477	|Word 1|Word 2
	481	+}}}))) or ((({{{
	482	+!=Title 1!=Title 2
	483	+!!Word 1!!Word 2
478	478	}}})))|(((
479	479	|=Title 1|=Title 2
480	480	|Word 1|Word 2
...	...	@@ -523,6 +523,7 @@
523	523	$xwiki.ssfx.use("js/xwiki/table/table.css")
524	524	$xwiki.jsfx.use("js/xwiki/table/tablefilterNsort.js", true)
525	525	{{/velocity}}
	532	+
526	526	{{html}}
527	527	<table id="tableid" class="grid sortable filterable doOddEven">
528	528	<tr class="sortHeader">
...	...	@@ -538,12 +538,12 @@
538	538	<td>Cell22</td>
539	539	</tr>
540	540	</table>
541		-{{/html}}
542		-}}})))|(((
	548	+{{/html}}}}})))|(((
543	543	{{velocity}}
544	544	$xwiki.ssfx.use("js/xwiki/table/table.css")
545	545	$xwiki.jsfx.use("js/xwiki/table/tablefilterNsort.js", true)
546	546	{{/velocity}}
	553	+
547	547	{{html}}
548	548	<table id="tableid" class="grid sortable filterable doOddEven">
549	549	<tr class="sortHeader">
...	...	@@ -559,8 +559,7 @@
559	559	<td>Cell22</td>
560	560	</tr>
561	561	</table>
562		-{{/html}}
563		-)))
	569	+{{/html}})))
564	564
565	565	= Images =
566	566
...	...	@@ -704,9 +704,9 @@
704	704	|Velocity Macro|((({{{#info("Some text")}}})))|((({{{
705	705	{{velocity}}{{html}}
706	706	#info("some text")
707		-{{/html}}{{/velocity}}
708		-}}}
	713	+{{/html}}{{/velocity}}}}}
709	709	{{info}}We're using the HTML macro in the example since the ###info## macro returns HTML content.{{/info}}
	715	+
710	710	{{info}}Starting with XE 2.0 you should use the [[Message Macro>>http://code.xwiki.org/xwiki/bin/view/Macros/MessageMacro]] to implement this example.{{/info}}
711	711	)))
712	712	|Radeox Macro/XWiki Macros|((({{{
...	...	@@ -759,12 +759,12 @@
759	759	(% style="width:100%" %)
760	760	|=XWiki Syntax 1.0|=XWiki Syntax 2.0|=Generated XHTML
761	761	|((({{{
762		-<h1 class="myClass" style="myStyle" id="myId">header</h1>
	768	+<h1 class="myClass" style="myStyle" id="myId">heading</h1>
763	763	}}})))|((({{{
764	764	(% class="myClass" style="myStyle" id="myId" %)
765		-= header =
	771	+= heading =
766	766	}}})))|((({{{
767		-<h1 class="myClass" style="myStyle" id="myId">header</h1>
	773	+<h1 class="myClass" style="myStyle" id="myId">heading</h1>
768	768	}}})))
769	769
770	770	{{id name="syntaxes"/}}
...	...	@@ -779,4 +779,3 @@
779	779	* [[XHTML 1.0>>http://www.w3.org/TR/xhtml1/]]
780	780
781	781	{{warning}}The implementation for these syntaxes is not fully finished yet. For example support for links is not working perfectly yet. We also need to define if we want to extend the original syntaxes to support XWiki-specific features like ability to link to another sub-wiki.{{/warning}}
782		-