<
From version < 4.1 >
edited by Admin
on 2010/11/24
To version < 5.1 >
edited by Vincent Massol
on 2011/10/05
>
Change comment: Imported from XAR

Summary

Details

Page properties
Author
... ... @@ -1,1 +1,1 @@
1 -XWiki.Admin
1 +XWiki.VincentMassol
Content
... ... @@ -1,19 +1,29 @@
1 -{{box cssClass="floatinginfobox" title="**Contents**"}}{{toc depth="1"/}}{{/box}}
1 +{{velocity}}$xwiki.get('ssx').use($doc.getFullName()){{/velocity}}
2 2  
3 -Starting with XWiki Enterprise version 1.7 and above we've introduced a new wiki syntax. So we're now naming the current syntax the //XWiki Syntax v1.0// and the new syntax is logically called the //XWiki Syntax v2.0//. The main reasons for introducing the new syntax were:
4 -* Fix the limitations and ambiguities of the XWiki 1.0 syntax (which was inspired by both Radeox - the underlying rendering engine - and TWiki).
3 +{{box cssClass="floatinginfobox" title="**Contents**"}}
4 +{{toc depth="1"/}}
5 +{{/box}}
6 +
7 +Starting with XWiki Enterprise version 1.7 we've introduced a new wiki syntax. We've named the old syntax the //XWiki Syntax 1.0// and the new syntax was logically called the //XWiki Syntax 2.0//. The main reasons for introducing the new syntax were:
8 +* Fix the limitations and ambiguities of the XWiki Syntax 1.0 (which was inspired by both Radeox - the underlying rendering engine - and TWiki).
5 5  ** Not optimal symbols. For example the symbol for bold was single stars. This was causing trouble when users were entering text containing stars since that text was mistakenly considered to be bold when it wasn't. Hence we've rationalized the syntax by using at least double characters everywhere.
6 6  ** Ambiguities. For example there was an ambiguity between a bold item starting a line and a bulletted list. Resolving the ambiguities was required in order to rewrite the WYSIWYG editor so that it could be deterministic.
7 7  * Be closer to the [[Creole 1.0 syntax>>http://www.wikicreole.org/]] which is becoming a standard for wiki syntax. In addition the Creole community has taken the time to analyze all the existing wiki syntaxes before deciding on symbols. The choices made are thus very good.
8 8  
9 -In addition to these 2 XWiki syntaxes we've also changed our underlying rendering engine (was Radeox previously) in favor of our own engine which is superset wrapper around [[Wikimodel>>http://code.google.com/p/wikimodel/]] and [[Doxia>>http://maven.apache.org/doxia/]] (and possibly others in the future). This has allowed us to provide other syntaxes in the wiki: [[MediaWiki, Confluence, JSPWiki, Creole, TWiki and more>>#syntaxes]]
13 +Since the introduction of XWiki Syntax 2.0 a few shortcomings of this syntax have been found. To fix these a new, as of now //experimental//, XWiki Syntax 2.1 was introduced in XWiki Enterprise version 3.0. Some reason for the development of this new syntax are:
14 +* Homogenize the link and image syntax for better clarity, consistency and extensibility.
15 +* Added ability to display icons, to link to files using the UNC notation and to link to relative URLs.
10 10  
17 +{{info}}Since XWiki Syntax 2.1 is based on XWiki Syntax 2.0 all syntax from XWiki Syntax 2.0 is valid unless the 2.1 specifications suggest differently.{{/info}}
18 +
19 +In addition to these XWiki-specific syntaxes we've also changed our underlying rendering engine in XWiki Enterprise version 1.7 (was Radeox previously) in favor of our own engine which is superset wrapper around [[Wikimodel>>http://code.google.com/p/wikimodel/]] and [[Doxia>>http://maven.apache.org/doxia/]] (and possibly others in the future). This has allowed us to provide other syntaxes in the wiki: [[MediaWiki, Confluence, JSPWiki, Creole, TWiki and more>>#syntaxes]].
20 +
11 11  = General Remarks =
12 12  
13 -XWiki Syntax v2.0 corrects some errors or ambiguous syntax entered by the user as shown in the examples in the table below.
23 +XWiki Syntax 2.0 corrects some errors or ambiguous syntax entered by the user as shown in the examples in the table below.
14 14  
15 15  |=Description|=Example of invalid or ambiguous syntax|=Fixed XWiki Syntax 2.0
16 -|Not closed tet styles|{{{**bold}}}|{{{**bold**}}}
26 +|Unclosed text styles|{{{**bold}}}|{{{**bold**}}}
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
... ... @@ -24,11 +24,11 @@
24 24  Paragraphs are text elements separated by 2 or more new lines.
25 25  
26 26  {{info}}
27 -In XWiki Syntax 2.0 new lines are honored which is not the case in XWiki Syntax 1.0 and in Creole syntax.
37 +In XWiki Syntax 2.0 new lines are honored which is not the case in XWiki Syntax 1.0 and in Creole Syntax.
28 28  {{/info}}
29 29  
30 30  (% style="width:100%" %)
31 -|=Feature|=XWiki Syntax 1.0|=XWiki Syntax 2.0|=Result XWiki Syntax 1.0|=Result XWiki Syntax 1.2
41 +|=Feature|=XWiki Syntax 1.0|=XWiki Syntax 2.0|=Result XWiki Syntax 1.0|=Result XWiki Syntax 2.0
32 32  |Simple paragraph|This is a paragraph|This is a paragraph|This is a paragraph|This is a paragraph
33 33  |Paragraph on multiple lines|Paragraph on{{{\\}}}\\multiple lines|Paragraph on\\multiple lines|Paragraph on\\multiple lines|Paragraph on\\multiple lines
34 34  |Two paragraphs|Paragraph one\\\\Paragraph two|Paragraph one\\\\Paragraph two|Paragraph one\\\\Paragraph two|Paragraph one\\\\Paragraph two
... ... @@ -61,15 +61,15 @@
61 61  {{html}}
62 62  <h1 id="Hheading" style="color:blue"><span>heading</span></h1>
63 63  {{/html}})))
64 -|Headings with wiki syntax|1.1.1 Heading with *bold*|{{{=== Heading with **bold** ===}}}|(((=== Heading with **bold** ===)))
74 +|Headings with XWiki Syntax|1.1.1 Heading with *bold*|{{{=== Heading with **bold** ===}}}|(((=== Heading with **bold** ===)))
65 65  
66 66  = Text Formatting =
67 67  
68 68  {{info}}
69 69  New in XWiki Syntax 2.0 over XWiki Syntax 1.0:
70 -* Spaces are allowed just after the syntax symbols (for example in XWiki Syntax 1.0, this was not * bold *).
80 +* Spaces are allowed just after the syntax symbols (for example in XWiki Syntax 1.0, this was not possible: * bold *).
71 71  * Use double symbols when there was only a single symbol in XWiki Syntax 1.0 so that it's less likely that the user will mistakenly use them in text.
72 -* Ability to span several lines (wasn't the case in XWiki Syntax 1.0).
82 +* Ability to span several lines (wasn't possible in XWiki Syntax 1.0).
73 73  {{/info}}
74 74  
75 75  (% style="width:100%" %)
... ... @@ -90,8 +90,8 @@
90 90  
91 91  (% style="width:100%" %)
92 92  |=Feature|=XWiki Syntax 1.0|=XWiki Syntax 2.0|=Result
93 -|Simple Horizontal Line|{{{----}}}|{{{----}}}|(((----)))
94 -|Parametrized Horizontal Line|<hr style="color:blue"/>|((({{{
103 +|Simple horizontal line|{{{----}}}|{{{----}}}|(((----)))
104 +|Parametrized horizontal line|<hr style="color:blue"/>|((({{{
95 95  (% style="color:blue" %)
96 96  ----
97 97  }}})))|(((
... ... @@ -101,6 +101,8 @@
101 101  
102 102  = Lists =
103 103  
114 +{{info}}Some of the mentioned styles do not work on all browsers. For a comprehensive list follow [[this link>>http://www.quirksmode.org/css/lists.html]].{{/info}}
115 +
104 104  (% style="width:100%" %)
105 105  |=Feature|=XWiki Syntax 1.0|=XWiki Syntax 2.0|=Result
106 106  |Bulleted list|((({{{
... ... @@ -165,8 +165,8 @@
165 165  )))
166 166  |Disc list|(((
167 167  <ul style="list-style-type: disc">
168 - <li>item1</li>
169 - <li>item2</li>
180 + <li>item 1</li>
181 + <li>item 2</li>
170 170  </ul>
171 171  )))|((({{{
172 172  (% style="list-style-type: disc" %)
... ... @@ -182,12 +182,12 @@
182 182  a. item 2
183 183  }}})))|((({{{
184 184  (% style="list-style-type: lower-alpha" %)
185 -* item1
186 -* item2
197 +* item 1
198 +* item 2
187 187  }}})))|(((
188 188  (% style="list-style-type: lower-alpha" %)
189 -* item1
190 -* item2
201 +* item 1
202 +* item 2
191 191  )))
192 192  |Uppercase Alphabetical list|((({{{
193 193  A. item 1
... ... @@ -194,12 +194,12 @@
194 194  A. item 2
195 195  }}})))|((({{{
196 196  (% style="list-style-type: upper-alpha" %)
197 -* item1
198 -* item2
209 +* item 1
210 +* item 2
199 199  }}})))|(((
200 200  (% style="list-style-type: upper-alpha" %)
201 -* item1
202 -* item2
213 +* item 1
214 +* item 2
203 203  )))
204 204  |Lowercase Roman list|((({{{
205 205  i. item 1
... ... @@ -206,12 +206,12 @@
206 206  i. item 2
207 207  }}})))|((({{{
208 208  (% style="list-style-type: lower-roman" %)
209 -* item1
210 -* item2
221 +* item 1
222 +* item 2
211 211  }}})))|(((
212 212  (% style="list-style-type: lower-roman" %)
213 -* item1
214 -* item2
225 +* item 1
226 +* item 2
215 215  )))
216 216  |Uppercase Roman list|((({{{
217 217  I. item 1
... ... @@ -218,12 +218,12 @@
218 218  I. item 2
219 219  }}})))|((({{{
220 220  (% style="list-style-type: upper-roman" %)
221 -* item1
222 -* item2
233 +* item 1
234 +* item 2
223 223  }}})))|(((
224 224  (% style="list-style-type: upper-roman" %)
225 -* item1
226 -* item2
237 +* item 1
238 +* item 2
227 227  )))
228 228  |Lowercase Greek list|((({{{
229 229  g. item 1
... ... @@ -230,12 +230,12 @@
230 230  g. item 2
231 231  }}})))|((({{{
232 232  (% style="list-style-type: lower-greek" %)
233 -* item1
234 -* item2
245 +* item 1
246 +* item 2
235 235  }}})))|(((
236 236  (% style="list-style-type: lower-greek" %)
237 -* item1
238 -* item2
249 +* item 1
250 +* item 2
239 239  )))
240 240  |Uppercase Greek list|((({{{
241 241  G. item 1
... ... @@ -242,12 +242,12 @@
242 242  G. item 2
243 243  }}})))|((({{{
244 244  (% style="list-style-type: upper-greek" %)
245 -* item1
246 -* item2
257 +* item 1
258 +* item 2
247 247  }}})))|(((
248 248  (% style="list-style-type: upper-greek" %)
249 -* item1
250 -* item2
261 +* item 1
262 +* item 2
251 251  )))
252 252  |Hiragana list|((({{{
253 253  h. item 1
... ... @@ -254,12 +254,12 @@
254 254  h. item 2
255 255  }}})))|((({{{
256 256  (% style="list-style-type: hiragana" %)
257 -* item1
258 -* item2
269 +* item 1
270 +* item 2
259 259  }}})))|(((
260 260  (% style="list-style-type: hiragana" %)
261 -* item1
262 -* item2
273 +* item 1
274 +* item 2
263 263  )))
264 264  |Hiragana Iroah list|((({{{
265 265  H. item 1
... ... @@ -266,12 +266,12 @@
266 266  H. item 2
267 267  }}})))|((({{{
268 268  (% style="list-style-type: hiragana-iroha" %)
269 -* item1
270 -* item2
281 +* item 1
282 +* item 2
271 271  }}})))|(((
272 272  (% style="list-style-type: hiragana-iroha" %)
273 -* item1
274 -* item2
285 +* item 1
286 +* item 2
275 275  )))
276 276  |Katakana list|((({{{
277 277  k. item 1
... ... @@ -278,12 +278,12 @@
278 278  k. item 2
279 279  }}})))|((({{{
280 280  (% style="list-style-type: katakana" %)
281 -* item1
282 -* item2
293 +* item 1
294 +* item 2
283 283  }}})))|(((
284 284  (% style="list-style-type: katakana" %)
285 -* item1
286 -* item2
297 +* item 1
298 +* item 2
287 287  )))
288 288  |Katakana Iroha list|((({{{
289 289  K. item 1
... ... @@ -290,66 +290,66 @@
290 290  K. item 2
291 291  }}})))|((({{{
292 292  (% style="list-style-type: katakana-iroha" %)
293 -* item1
294 -* item2
305 +* item 1
306 +* item 2
295 295  }}})))|(((
296 296  (% style="list-style-type: katakana-iroha" %)
297 -* item1
298 -* item2
309 +* item 1
310 +* item 2
299 299  )))
300 300  |Armenian list|((({{{
301 301  <ul style="list-style-type: armenian">
302 - <li>item1</li>
303 - <li>item2</li>
314 + <li>item 1</li>
315 + <li>item 2</li>
304 304  </ul>
305 305  }}})))|((({{{
306 306  (% style="list-style-type: armenian" %)
307 -* item1
308 -* item2
319 +* item 1
320 +* item 2
309 309  }}})))|(((
310 310  (% style="list-style-type: armenian" %)
311 -* item1
312 -* item2
323 +* item 1
324 +* item 2
313 313  )))
314 314  |Hebrew list|((({{{
315 -j. item1
316 -j. item2
327 +j. item 1
328 +j. item 2
317 317  }}})))|((({{{
318 318  (% style="list-style-type: hebrew" %)
319 -* item1
320 -* item2
331 +* item 1
332 +* item 2
321 321  }}})))|(((
322 322  (% style="list-style-type: hebrew" %)
323 -* item1
324 -* item2
335 +* item 1
336 +* item 2
325 325  )))
326 326  |Georgian list|((({{{
327 327  <ul style="list-style-type: georgian">
328 - <li>item1</li>
329 - <li>item2</li>
340 + <li>item 1</li>
341 + <li>item 2</li>
330 330  </ul>
331 331  }}})))|((({{{
332 332  (% style="list-style-type: georgian" %)
333 -* item1
334 -* item2
345 +* item 1
346 +* item 2
335 335  }}})))|(((
336 336  (% style="list-style-type: georgian" %)
337 -* item1
338 -* item2
349 +* item 1
350 +* item 2
339 339  )))
340 340  |CJK ideographic list|((({{{
341 341  <ul style="list-style-type: cjk-ideographic">
342 - <li>item1</li>
343 - <li>item2</li>
354 + <li>item 1</li>
355 + <li>item 2</li>
344 344  </ul>
345 345  }}})))|((({{{
346 346  (% style="list-style-type: cjk-ideographic" %)
347 -* item1
348 -* item2
359 +* item 1
360 +* item 2
349 349  }}})))|(((
350 350  (% style="list-style-type: cjk-ideographic" %)
351 -* item1
352 -* item2
363 +* item 1
364 +* item 2
353 353  )))
354 354  
355 355  = Definition Lists =
... ... @@ -370,24 +370,24 @@
370 370  )))
371 371  |Nested definitions|((({{{
372 372  <dl>
373 - <dt>term1</dt>
374 - <dd>definition1
385 + <dt>term 1</dt>
386 + <dd>definition 1
375 375   <dl>
376 - <dt>term2</dt>
377 - <dd>definition2</dd>
388 + <dt>term 2</dt>
389 + <dd>definition 2</dd>
378 378   </dl>
379 379   </dd>
380 380  </dl>
381 381  }}})))|((({{{
382 -; term1
383 -: definition1
384 -:; term2
385 -:: definition2
394 +; term 1
395 +: definition 1
396 +:; term 2
397 +:: definition 2
386 386  }}})))|(((
387 -; term1
388 -: definition1
389 -:; term2
390 -:: definition2
399 +; term 1
400 +: definition 1
401 +:; term 2
402 +:: definition 2
391 391  )))
392 392  |Parametrized definition|((({{{
393 393  <dl style="color:blue">
... ... @@ -409,7 +409,7 @@
409 409  A new line is a carriage return. A line break is a forced new line that can appear anywhere in the text.
410 410  
411 411  {{info}}
412 -In XWiki Syntax 2.0 new lines are honored which is not the case in XWiki Syntax 1.0 and in Creole syntax.
424 +In XWiki Syntax 2.0 new lines are honored which is not the case in XWiki Syntax 1.0 and in Creole Syntax.
413 413  {{/info}}
414 414  
415 415  (% style="width:100%" %)
... ... @@ -419,63 +419,132 @@
419 419  
420 420  = Links =
421 421  
422 -(% style="width:100%" %)
423 -|=Feature|=XWiki Syntax 1.0|=XWiki Syntax 2.0|=Result XWiki Syntax 1.0|=Result XWiki Syntax 2.0
434 +(% style="width:100%;table-layout:fixed;overflow:hidden;word-wrap:break-word" %)
435 +|=(% style="width:10%" %)Feature|=XWiki Syntax 1.0|=XWiki Syntax 2.0|=(% style="width:15%" %)Result XWiki Syntax 1.0|=(% style="width:15%" %)Result XWiki Syntax 2.0
424 424  |Link to a page in the current Space|{{{[WebHome]}}}|{{{[[WebHome]]}}}|[[Web Home>>WebHome]]|[[WebHome]]
425 -|Link with a label|{{{[label>WebHome]}}}|{{{[[label>>WebHome]]}}}|[[label>>WebHome]]|[[label>>WebHome]]
437 +|Link with a label|{{{[label>WebHome]}}}|(((
438 +{{{[[label>>WebHome]]}}}
439 +{{info}}XWiki Syntax is supported inside link labels.{{/info}}
440 +)))|[[label>>WebHome]]|[[label>>WebHome]]
441 +|Link with XWiki Syntax in the label|{{{<a href="$xwiki.getURL("WebHome")"><strong>bold label</strong></a>}}}|{{{[[**bold label**>>WebHome]]}}}|[[**bold label**>>WebHome]]|[[**bold label**>>WebHome]]
426 426  |Link to a page with the space specified|{{{[Main.WebHome]}}}|{{{[[Main.WebHome]]}}}|[[Web Home>>Main.WebHome]]|[[Main.WebHome]]
427 427  |Link to a subwiki|{{{[subwiki:Main.WebHome]}}}|{{{[[subwiki:Main.WebHome]]}}}|[[Web Home>>xwiki:Main.WebHome]]|[[xwiki:Main.WebHome]]
428 -|Link that opens in a new page|{{{[label>WebHome>_blank]}}}|{{{[[label>>WebHome||rel="__blank"]]}}}|[[label>>WebHome||rel="__blank"]]|[[label>>WebHome||rel="__blank"]]
444 +|Link that opens in a new window|{{{[label>WebHome>_blank]}}}|{{{[[label>>WebHome||rel="__blank"]]}}}|[[label>>WebHome||rel="__blank"]]|[[label>>WebHome||rel="__blank"]]
429 429  |Link to a URL directly in the text|{{{This is a URL: http://xwiki.org}}}|{{{This is a URL: http://xwiki.org}}}|This is a URL: http://xwiki.org|This is a URL: http://xwiki.org
430 430  |Link to a URL|{{{[http://xwiki.org]}}}|{{{[[http://xwiki.org]]}}}|[[http://xwiki.org]]|[[http://xwiki.org]]
431 431  |Link to a URL with a label|{{{[XWiki>http://xwiki.org]}}}|{{{[[XWiki>>http://xwiki.org]]}}}|[[XWiki>>http://xwiki.org]]|[[XWiki>>http://xwiki.org]]
432 -|Link to an email|{{{[john@smith.net>mailto:john@smith.net]}}}|{{{[[john@smith.net>>mailto:john@smith.net]]}}}|[[john@smith.net>>mailto:john@smith.net]]|[[john@smith.net>>mailto:john@smith.net]]
433 -|Image Link|{{{<a href="$xwiki.getURL("Space1.Page1")">{image:img.png|document=Space2.Page2}</a>}}}|(((
434 -{{{[[image:Space2.Page2@img.png>>Space1.Page1]]}}}
435 -{{info}}Wiki syntax is supported inside link labels{{/info}}
436 -)))|[[image:img.png>>Main.WebHome]]|[[image:img.png>>Main.WebHome]]
437 -|Link to an attachment in the current page|(((
438 -{{info}}See [[Attach Macro>>http://code.xwiki.org/xwiki/bin/view/Macros/AttachMacro]] for details{{/info}}
448 +|Link to an email address|{{{[john@smith.net>mailto:john@smith.net]}}}|{{{[[john@smith.net>>mailto:john@smith.net]]}}}|[[john@smith.net>>mailto:john@smith.net]]|[[john@smith.net>>mailto:john@smith.net]]
449 +|Image Link|{{{<a href="$xwiki.getURL("Space1.Page1")">{image:img.png|document=Space2.Page2}</a>}}}|{{{[[image:Space2.Page2@img.png>>Space1.Page1]]}}}|[[image:img.png>>Main.WebHome]]|[[image:img.png>>Main.WebHome]]
450 +|Image Link with image parameters|{{{<a href="$xwiki.getURL("Space1.Page1")">{image:img.png|document=Space2.Page2|width=26|height=26}</a>}}}|{{{[[[[image:Space2.Page2@img.png||width="26" height="26"]]>>Space1.Page1]]}}}|[[[[image:img.png||width="26" height="26"]]>>Main.WebHome]]|[[[[image:img.png||width="26" height="26"]]>>Main.WebHome]]
451 +|Link to an attachment on the current page|(((
452 +{{info}}See [[Attach Macro>>http://extensions.xwiki.org/xwiki/bin/view/Extension/Attach+Macro+%28Radeox%29]] for details{{/info}}
439 439  {{{{attach:text|file=img.png}}}}
440 440  )))|{{{[[text>>attach:img.png]]}}}|[[text>>attach:img.png]]|[[text>>attach:img.png]]
441 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}}
456 +{{info}}See [[Attach Macro>>http://extensions.xwiki.org/xwiki/bin/view/Extension/Attach+Macro+%28Radeox%29]] for details{{/info}}
443 443  {{{{attach:text|document=Space.Page|file=img.png}}}}
444 444  )))|{{{[[text>>attach:Space.Page@img.png]]}}}|[[text>>attach:XWiki.XWikiSyntax@img.png]]|[[text>>attach:XWiki.XWikiSyntax@img.png]]
445 445  
446 446  == XWiki Syntax 1.0 Link Specification ==
447 447  
448 -The full format of a link is ##(alias[|&gt;])+(link)(@interWikiAlias)+([|&gt;]target)+##
449 -* ##alias##: An optional string which will be displayed to the user as the link name when rendered. Example: "My Page".
450 -* ##link##: The full link reference using the following syntax: ##(virtualWikiAlias:)+(space.)+(reference)(?queryString)+(#anchor)+##
451 -* Note that either the ##link## or the ##alias## must be specified.
452 -** ##virtualWikiAlias##: An optional string containing the name of a virtual wiki. The link will point to a page inside that virtual wiki. Example: "mywiki".
453 -** ##space##: An optional Wiki Space name. If not space is specified the current space is used. Example: "Main".
454 -** ##reference##: The link reference. This can be either a URI in the form ##{{{protocol:path}}}## (example: {{{"http://xwiki.org"}}}, {{{"mailto:john@smith.com"}}}) or a wiki page name (example: "WebHome").
455 -** ##queryString##: An optional query string for specifying parameters that will be used in the rendered URL. Example: {{{"mydata1=5&amp;mydata2=Hello"}}}.
456 -** ##anchor##: An optional anchor name pointing to an anchor defined in the referenced link. Note that in XWiki anchors are automatically created for titles. Example: "TableOfContentAnchor".
457 -* ##interWikiAlias##: An optional [[Inter Wiki>>http://en.wikipedia.org/wiki/InterWiki]] alias as defined in the InterWiki Map (see the [[Admin Guide>>http://platform.xwiki.org/xwiki/bin/view/AdminGuide/]]). Example: "wikipedia"
458 -* ##target##: An optional string corresponding to the HTML ##target## attribute for a HTML ##A## link element. This element is used when rendering the link. It defaults to opening the link in the current page. Examples: "_self", "_blank"
462 +{{info}}
463 +Part in ##( )## is required, parts in ##[ ]## are optional and one of the two chars in ##{ }## needs to be added if optional parts are being used.
464 +{{/info}}
459 459  
466 +The full format of a link is **##[label {> or |}] (resource) [@interWikiAlias] [{> or |} target]##**
467 +
468 +* **##label##**: An optional string which will be displayed to the user as the link name when rendered. Example: ##My Page##
469 +* **##resource##**: The full link reference using the following syntax: **##(reference) [?queryString] [#anchor]##**
470 +** **##reference##**: The link reference. This can be either
471 +*** **A URI** in the form **##protocol:path##** (examples: ##http:~/~/xwiki.org##, ##mailto~:john@smith.com##), or
472 +*** **A wiki page** reference in the form **##~[~[wikiName:] space.] (page)##**. Examples: ##WebHome##, ##Main.WebHome##, ##mywiki:Main.WebHome##
473 +**** **##wikiName##**: An optional string containing the name of a virtual wiki. The link will point to a page inside that virtual wiki. Example: ##mywiki##
474 +**** **##space##**: An optional wiki Space name. If no space is specified the current space is used. Example: ##Main##
475 +**** **##page##**: A required string containing the name of the linked wiki page. Example: ##WebHome##
476 +** **##queryString##**: An optional query string for specifying parameters that will be used in the rendered URL. Example: ##mydata1=5&mydata2=Hello##
477 +** **##anchor##**: An optional anchor name pointing to an anchor defined in the referenced link. Note that in XWiki anchors are automatically created for headings. Example: ##HTableOfContents##
478 +* **##interWikiAlias##**: An optional [[Inter Wiki>>http://en.wikipedia.org/wiki/InterWiki]] alias as defined in the InterWiki Map (see the [[Admin Guide>>http://platform.xwiki.org/xwiki/bin/view/AdminGuide/]]). This is only valid for wiki page names. Example: ##wikipedia##
479 +* **##target##**: An optional string corresponding to the HTML ##target## attribute for a HTML ##A## link element. This element is used when rendering the link. It defaults to opening the link in the current window. Examples: ##_self##, ##_blank##
480 +
460 460  == XWiki Syntax 2.0 Link Specification ==
461 461  
462 -The full format of a link is ##(label>>)?(link)(||parameters)*##
463 -* ##label##: the link label, can contain wiki syntax
464 -* ##link##: the link target, i.e. where to go when the link is clicked. It has a similar format than in the XWiki 1.0 syntax and it can also contain 2 types of URIs: ##mailto:## and ##attach:## for linking to an email and linking to an attachment respectively.
465 -* ##parameters##: An optional list of parameters passed to the link.
483 +{{info}}
484 +The part in ##( )## is required, while the parts in ##[ ]## are optional.
485 +{{/info}}
466 466  
487 +The full format of a link is **##[label>>] (resource) [@interWikiAlias] [||parameters]##**
488 +
489 +* **##label##**: An optional string which will be displayed to the user as the link name when rendered. The label may contain XWiki Syntax. If no label is specified a default label will be generated. The generation pattern can be changed, see the [[Admin Guide>>http://platform.xwiki.org/xwiki/bin/view/AdminGuide/]]. Example: ##My Page##
490 +* **##resource##**: The full link reference using the following syntax: **##(reference) [?queryString] [#anchor]##**
491 +** **##reference##**: The link reference in one of the following forms:
492 +*** **URL**: Any URL in the form of **##protocol:~/~/path##**. Examples: ##http:~/~/xwiki.org##, ##https:~/~/svn.xwiki.org/##
493 +*** **Wiki page name** reference in the form **##~[~[wikiName:] space.] (page)##**. Examples: ##WebHome##, ##Main.WebHome##, ##mywiki:Main.WebHome##
494 +**** **##wikiName##**: An optional string containing the name of a virtual wiki. The link will point to a page inside that virtual wiki. Example: ##mywiki##
495 +**** **##space##**: An optional wiki Space name. If no space is specified the current space is used. Example: ##Main##
496 +**** **##page##**: A required string containing the name of the linked wiki page. Example: ##WebHome##
497 +*** **Attachment** reference in the form **##attach~: [wikiPageName@] (attachmentName)##**. Examples: ##attach~:img.png##, ##attach~:mywiki:Main.WebHome@img.png##
498 +**** **##attach~:##**: A required string identifying the resource as attachment.
499 +**** **##wikiPageName##**: An optional string referencing the document that holds the attachment, see "Wiki page name" above.
500 +**** **##attachmentName##**: Name of the attachment as it is stored in the wiki.
501 +*** **Email address** in the form **##mailto~: (emailAddress)##** (###anchor## is not valid). Example: ##mailto~:john@smith.com##
502 +**** **##mailto~:##**: A required string identifying the resource as email.
503 +**** **##emailAddress##**: Targeted email address. Example: "##john@smith.com##"
504 +** **##queryString##**: An optional query string for specifying parameters that will be used in the rendered URL. Example: ##mydata1=5&mydata2=Hello##
505 +** **##anchor##**: An optional anchor name pointing to an anchor defined in the referenced link. Note that in XWiki anchors are automatically created for headings. Example: ##HTableOfContents##
506 +* **##interWikiAlias##**: An optional [[Inter Wiki>>http://en.wikipedia.org/wiki/InterWiki]] alias as defined in the InterWiki Map (see the [[Admin Guide>>http://platform.xwiki.org/xwiki/bin/view/AdminGuide/]]). This is only valid for wiki page names. Example: ##wikipedia##
507 +* **##parameters##**: An optional list of parameters passed to the link. Example: ##rel="~_~_blank"## (open in new window)
508 +
509 +== XWiki Syntax 2.1 Link Specification ==
510 +
511 +{{info}}
512 +The part in ##( )## is required, while the parts in ##[ ]## are optional.
513 +{{/info}}
514 +
515 +The full format of a link is **##[label>>] (resource) [||parameters]##**
516 +
517 +* **##label##**: An optional string which will be displayed to the user as the link name when rendered. The label may contain XWiki Syntax. If no label is specified a default label will be generated. The generation pattern can be changed, see the [[Admin Guide>>http://platform.xwiki.org/xwiki/bin/view/AdminGuide/]]. Example: ##My Page##
518 +* **##resource##**: A required string with the link reference in one of the following forms
519 +** **URL**: Any URL in the form of **##[url:] (protocol:~/~/path)##**. Examples: ##http:~/~/xwiki.org##, ##url:https:~/~/svn.xwiki.org/##
520 +*** **##url:##** An optional string identifying the resource as an URL.
521 +** **Wiki page name** reference in the form **##[doc:] ~[~[wikiName:] space.] (page)##**. Examples: ##WebHome##, ##Main.WebHome##, ##mywiki:Main.WebHome##
522 +*** **##doc:##** An optional string identifying the resource as an XWiki document.
523 +*** **##wikiName##**: An optional string containing the name of a virtual wiki. The link will point to a page inside that virtual wiki. Example: ##mywiki##
524 +*** **##space##**: An optional wiki Space name. If no space is specified the current space is used. Example: ##Main##
525 +*** **##page##**: A required string containing the name of the linked wiki page. Example: ##WebHome##
526 +** **InterWiki page name** reference in the form **##interwiki: {{{(interWikiAlias:)}}} (page)##**. Example: ##interwiki:wikipedia:XWiki##
527 +*** **##interwiki:##** A required string identifying the resource as an InterWiki link.
528 +*** **##interWikiAlias##**: An optional [[Inter Wiki>>http://en.wikipedia.org/wiki/InterWiki]] alias as defined in the InterWiki Map (see the [[Admin Guide>>http://platform.xwiki.org/xwiki/bin/view/AdminGuide/]]). Example: ##wikipedia##
529 +*** **##page##**: A required string containing the name of the linked page. Example: ##XWiki##
530 +** **Attachment** reference in the form **##attach~: [wikiPageName@] (attachmentName)##**. Examples: ##attach~:img.png##, ##attach~:mywiki:Main.WebHome@img.png##
531 +*** **##attach~:##**: A required string identifying the resource as attachment.
532 +*** **##wikiPageName##**: An optional string referencing the document that holds the attachment, see "Wiki page name" above.
533 +*** **##attachmentName##**: Name of the attachment as it is stored in the wiki.
534 +** **Email address** in the form **##mailto~: (emailAddress)##** (###anchor## is not valid). Example: ##mailto~:john@smith.com##
535 +*** **##mailto~:##**: A required string identifying the resource as email.
536 +*** **##emailAddress##**: Targeted email address. Example: ##john@smith.com##
537 +** **Relative path** reference on the server in the form **##path: (relPath)##**. Example: ##path:$doc.getURL('reset')## produces target address ##http:~/~/server.domain.com/xwiki/bin/reset/Space/Page## where ##/xwiki/bin/reset/Space/Page## is produced by ##$doc.getURL('reset')##.
538 +*** **##path:##** A required string identifying the resource as a relative path.
539 +*** **##relPath##**: A required string containing the relative path of the resource on the server that shall be linked.
540 +** **UNC (Windows Explorer)** reference in the form **##unc: (path)##**. The link is rendered as a ##file:~/~/## link. Examples: ##unc:C:\Windows\##, ##unc:~\~\myserver\path\img.png##, ##unc:home/user/somefile##
541 +*** **##unc:##** A required string identifying the resource as a UNC (Windows Explorer) path.
542 +*** **##path##**: A required string containing the local path of resource accessible by the user. Examples: ##C:\Windows\##, ##~\~\myserver\path\img.png##, ##home/user/somefile##
543 +* **##parameters##**: An optional list of space-separated parameters passed to the link. Example: ##queryString="mydata1=5&mydata2=Hello" anchor="HTableOfContents" rel="~_~_blank"##
544 +** **##queryString##**: An optional query string for specifying parameters that will be appended to the link target address and used in the rendered URL. Example: ##url:http:~/~/domain.com/path||queryString="mydata1=5&mydata2=Hello"## produces target address ##http:~/~/domain.com/path?mydata1=5&mydata2=Hello##
545 +** **##anchor##**: An optional anchor name pointing to an anchor defined in the referenced link. Note that in XWiki anchors are automatically created for headings. Example: ##url:http:~/~/domain.com/path||anchor="HTableOfContents"## produces target address ##http:~/~/domain.com/path#HTableOfContents##
546 +** **##rel##**: An optional parameter that allows to open link target in new window. Example: ##rel="~_~_blank"##
547 +
467 467  = Tables =
468 468  
469 -Allows to easily create content in table format. It also support parameters for table, row or cell in XWiki Syntax 2.0.
550 +Allows to easily create content in table format. Parameters for table, row or cell are also supported in XWiki Syntax 2.0.
470 470  
471 471  (% style="width:100%" %)
472 472  |=Feature|=XWiki Syntax 1.0|=XWiki Syntax 2.0|=Result
473 -|Standard table|{{{(((
554 +|Standard table|((({{{
474 474  {table}
475 475  Title 1 | Title 2
476 476  Word 1 | Word 2
477 477  {table}
478 -)))}}}|((({{{
559 +}}})))|((({{{
479 479  |=Title 1|=Title 2
480 480  |Word 1|Word 2
481 481  }}}))) or ((({{{
... ... @@ -512,80 +512,118 @@
512 512  $xwiki.jsfx.use("js/xwiki/table/tablefilterNsort.js", true)
513 513  <table id="tableid" class="grid sortable filterable doOddEven">
514 514   <tr class="sortHeader">
515 - <th>Title1</th>
516 - <th>Title2</th>
596 + <th>Title 1</th>
597 + <th>Title 2</th>
517 517   </tr>
518 518   <tr>
519 - <td>Cell11</td>
520 - <td>Cell12</td>
600 + <td>Cell 11</td>
601 + <td>Cell 12</td>
521 521   </tr>
522 522   <tr>
523 - <td>Cell21</td>
524 - <td>Cell22</td>
604 + <td>Cell 21</td>
605 + <td>Cell 22</td>
525 525   </tr>
526 526  </table>
527 -}}})))|((({{{
608 +}}}
609 +
610 +{{info}}For improved features see the [[Livetable Macro>>http://extensions.xwiki.org/xwiki/bin/view/Extension/Livetable+Macro]].{{/info}}
611 +)))|((({{{
528 528  {{velocity}}
529 529  $xwiki.ssfx.use("js/xwiki/table/table.css")
530 530  $xwiki.jsfx.use("js/xwiki/table/tablefilterNsort.js", true)
531 531  {{/velocity}}
532 532  
533 -{{html}}
534 -<table id="tableid" class="grid sortable filterable doOddEven">
535 - <tr class="sortHeader">
536 - <th>Title1</th>
537 - <th>Title2</th>
538 - </tr>
539 - <tr>
540 - <td>Cell11</td>
541 - <td>Cell12</td>
542 - </tr>
543 - <tr>
544 - <td>Cell21</td>
545 - <td>Cell22</td>
546 - </tr>
547 -</table>
548 -{{/html}}}}})))|(((
617 +(% class="grid sortable filterable doOddEven" id="tableid" %)
618 +(% class="sortHeader" %)|=Title 1|=Title 2
619 +|Cell 11|Cell 12
620 +|Cell 21|Cell 22
621 +}}}
622 +
623 +{{info}}For improved features see the [[Livetable Macro>>http://extensions.xwiki.org/xwiki/bin/view/Extension/Livetable+Macro]].{{/info}}
624 +)))|(((
549 549  {{velocity}}
550 550  $xwiki.ssfx.use("js/xwiki/table/table.css")
551 551  $xwiki.jsfx.use("js/xwiki/table/tablefilterNsort.js", true)
552 552  {{/velocity}}
553 553  
554 -{{html}}
555 -<table id="tableid" class="grid sortable filterable doOddEven">
556 - <tr class="sortHeader">
557 - <th>Title1</th>
558 - <th>Title2</th>
559 - </tr>
560 - <tr>
561 - <td>Cell11</td>
562 - <td>Cell12</td>
563 - </tr>
564 - <tr>
565 - <td>Cell21</td>
566 - <td>Cell22</td>
567 - </tr>
568 -</table>
569 -{{/html}})))
630 +(% class="grid sortable filterable doOddEven" id="tableid" %)
631 +(% class="sortHeader" %)|=Title 1|=Title 2
632 +|Cell 11|Cell 12
633 +|Cell 21|Cell 22
634 +)))
570 570  
571 571  = Images =
572 572  
573 573  (% style="width:100%" %)
574 574  |=Feature|=XWiki Syntax 1.0|=XWiki Syntax 2.0|=Result
575 -|Image from attachment in current page|(((
576 -{{info}}See [[Image Macro>>http://code.xwiki.org/xwiki/bin/view/Macros/ImageMacro]] for details{{/info}}
640 +|Image from attachment on current page|(((
641 +{{info}}See [[Image Macro>>http://extensions.xwiki.org/xwiki/bin/view/Extension/Image+Macro+%28Radeox%29]] for details{{/info}}
577 577  {{{{image:img.png}}}}
578 578  )))|{{{image:img.png}}}|image:img.png
579 -|Image from attachment in another document|{{{{image:img.png|document=Space.Page}}}}|{{{image:Space.Page@img.png}}}|image:img.png
644 +|Image from attachment on another page|{{{{image:img.png|document=Space.Page}}}}|{{{image:Space.Page@img.png}}}|image:img.png
580 580  |Image with parameters|{{{{image:img.png|width=25|height=25}}}}|{{{[[image:img.png||width="25" height="25"]]}}}|[[image:img.png||width="25" height="25"]]
581 581  |Images located at URL|{{{http://some/url/img.png}}}|{{{image:http://some/url/img.png}}}|image:img.png
582 582  
648 +== XWiki Syntax 2.0 Image Specification ==
649 +
650 +{{info}}
651 +The part in ##( )## is required, while the parts in ##{ }## are optional.
652 +{{/info}}
653 +
654 +The full format of an image is either **##image~: (reference)##** or **##~[~[image~: (reference) {||parameters}]]##**
655 +
656 +* **##image~:##** A required string identifying the resource as image.
657 +* **##reference##**: The reference to the image that shall be displayed in one of the following forms:
658 +** **URL**: Any URL to an image in the form of **##http:~/~/path/imageName##**. Example: ##http:~/~/domain.org/path/img.png##
659 +** **Attachment** reference in the form **##~{~{~{wikiName:} space.} page@} (imageName)##**
660 +*** **##wikiName##**: An optional string containing the name of a virtual wiki. The image reference will point to an image attached to a page inside that virtual wiki. Example: mywiki
661 +*** **##space##**: An optional wiki Space name. If no space is specified the current space is used. Example: Main
662 +*** **##page##**: An optional string containing the name of the wiki page to which the referenced image is attached. Example: WebHome
663 +*** **##imageName##**: A required string containing the name of the image attached to a page as it is stored in the wiki.
664 +* **##parameters##**: An optional list of space-separated parameters passed to the image. Example: ##width="800" height="600" alt="img.png" title="My nice image"##
665 +** **HTML attributes**: All attributes defined by the HTML standard will be added to the rendered HTML ##<img>## tag.
666 +*** **##style##**: CSS style information that should be applied to the image. Examples: ##style="float:right;height:50"## (image on right side, height 50 px), ##style="style="display:block;margin-left:auto;margin-right:auto;width:80%"## (image centered, width 80% of block width), ##style="vertical-align:bottom"## (text starts at bottom of picture)
667 +*** **##height##**: A parameter that defines the height of the displayed image. The value should be presented either in pixel (example: ##height="80"##) or in pixel related to the height of the block containing the image (example: ##height="40%"##).
668 +*** **##width##**: A parameter that defines the width of the displayed image. The value should be presented either in pixel (example: ##width="80"##) or in pixel related to the width of the block containing the image (example: ##width="40%"##).
669 +*** **##title##**: A parameter that defines the title the displayed image which will be visible when hovering the mouse trigger over the image, for instance. Example: ##title="My nice image"##
670 +*** **##alt##**: A parameter that defines which text should be displayed if the browser is not able to display the image. Since this is a required HTML attribute XWiki will use the file name instead if the ##alt## parameter is not defined. Example: ##alt="img.png"##
671 +*** **More**: A more in depth explanation on the HTML ##<img>## tag including more attributes can be reviewed [[on w3.org>>http://www.w3.org/TR/html4/struct/objects.html#h-13.2]].
672 +
673 +== XWiki Syntax 2.1 Image Specification ==
674 +
675 +{{info}}
676 +The part in ##( )## is required, while the parts in ##{ }## are optional.
677 +{{/info}}
678 +
679 +The full format of an image is either **##image~: (reference)##** or **##~[~[image~: (reference) {||parameters}]]##**
680 +
681 +* **##image~:##** A required string identifying the resource as image.
682 +* **##reference##**: The reference to the image that shall be displayed in one of the following forms:
683 +** **URL**: Any URL to an image in the form of **##protocol:~/~/path/imageName##**. Example: ##http:~/~/domain.org/path/img.png##
684 +** **Attachment** reference in the form **##~{~{~{wikiName:} space.} page@} (imageName)##**
685 +*** **##wikiName##**: An optional string containing the name of a virtual wiki. The image reference will point to an image attached to a page inside that virtual wiki. Example: mywiki
686 +*** **##space##**: An optional wiki Space name. If no space is specified the current space is used. Example: Main
687 +*** **##page##**: An optional string containing the name of the wiki page to which the referenced image is attached. Example: WebHome
688 +*** **##imageName##**: A required string containing the name of the image attached to a page as it is stored in the wiki.
689 +** **Icon** reference in the form **##{{{(icon:)}}} (iconName)##**. Example: **##icon:accept##**
690 +*** **##icon:##** A required string identifying the image reference as an icon from the [[XWiki Icon Set>>http://www.famfamfam.com/lab/icons/silk/previews/index_abc.png]].
691 +*** **##iconName##**: A required string identifying the icon referenced. Example: ##accept##
692 +* **##parameters##**: An optional list of space-separated parameters passed to the image. Example: ##width="800" height="600" alt="img.png" title="My nice image"##
693 +** **HTML attributes**: All attributes defined by the HTML standard will be added to the rendered HTML ##<img>## tag.
694 +*** **##style##**: CSS style information that should be applied to the image. Examples: ##style="float:right;height:50"## (image on right side, height 50 px), ##style="style="display:block;margin-left:auto;margin-right:auto;width:80%"## (image centered, width 80% of block width), ##style="vertical-align:bottom"## (text starts at bottom of picture)
695 +*** **##height##**: A parameter that defines the height of the displayed image. The value should be presented either in pixel (example: ##height="80"##) or in pixel related to the height of the block containing the image (example: ##height="40%"##).
696 +*** **##width##**: A parameter that defines the width of the displayed image. The value should be presented either in pixel (example: ##width="80"##) or in pixel related to the width of the block containing the image (example: ##width="40%"##).
697 +*** **##title##**: A parameter that defines the title the displayed image which will be visible when hovering the mouse trigger over the image, for instance. Example: ##title="My nice image"##
698 +*** **##alt##**: A parameter that defines which text should be displayed if the browser is not able to display the image. Since this is a required HTML attribute XWiki will use the file name instead if the ##alt## parameter is not defined. Example: ##alt="img.png"##
699 +*** **More**: A more in depth explanation on the HTML ##<img>## tag including more attributes can be reviewed [[on w3.org>>http://www.w3.org/TR/html4/struct/objects.html#h-13.2]].
700 +** **##queryString##**: Allows queries to be passed to the server when creating the download link for the referenced image. Example: ##queryString="width=100&height=800&keepAspectRatio=true"## (**##keepAspectRatio=true## will fail if the ##width## and ##height## parameters are specified in addition to ##queryString##!**)
701 +
583 583  = Verbatim =
584 584  
585 -Allow to enter content that will not be formatted (in other words the wiki syntax will not be taken into account).
704 +Allow to enter content that will not be formatted (in other words the XWiki Syntax will not be taken into account).
586 586  
587 587  {{info}}
588 -In XWiki Syntax 1.0 the [[Pre macro>>http://code.xwiki.org/xwiki/bin/view/Macros/PreMacro]] only preserves wiki syntax and Radeox macros. However HTML snippets and Groovy/Velocity scripts are still executed.
707 +In XWiki Syntax 1.0 the [[Pre macro>>http://extensions.xwiki.org/xwiki/bin/view/Extension/Pre+Macro+%28Radeox%29]] only preserves XWiki Syntax and Radeox macros. However HTML snippets and Groovy/Velocity scripts are still executed.
589 589  {{/info}}
590 590  
591 591  (% style="width:100%" %)
... ... @@ -598,7 +598,7 @@
598 598  content
599 599  {/pre}
600 600  }}}
601 -{{info}}It's also possible to use the [[Code macro>>http://code.xwiki.org/xwiki/bin/view/Macros/CodeMacro]] but it displays its content in a box by default.{{/info}}
720 +{{info}}It's also possible to use the [[Code macro>>http://extensions.xwiki.org/xwiki/bin/view/Extension/Code+Macro+%28Radeox%29]] but it displays its content in a box by default.{{/info}}
602 602  )))|((({{{
603 603  {{{
604 604  multi line
... ... @@ -652,10 +652,10 @@
652 652  
653 653  (% style="width:100%" %)
654 654  |=XWiki Syntax 1.0|=XWiki Syntax 2.0|=Result
655 -|{{info}}This feature doesn't exist in XWiki syntax 1.0. You'd have to use pure HTML to achieve the result.{{/info}}|((({{{
774 +|{{info}}This feature doesn't exist in XWiki Syntax 1.0. You'd have to use pure HTML to achieve the result.{{/info}}|((({{{
656 656  |=Header 1|=Header 2|=Header 3
657 657  |Cell One|(((
658 -= Embedded document
777 += Embedded document =
659 659  
660 660  Some embedded paragraph.
661 661  
... ... @@ -684,6 +684,8 @@
684 684  
685 685  = Escapes =
686 686  
806 +Allows to escape XWiki Syntax.
807 +
687 687  (% style="width:100%" %)
688 688  |=Feature|=XWiki Syntax 1.0|=XWiki Syntax 2.0|=Result XWiki Syntax 1.0|=Result XWiki Syntax 2.0
689 689  |Escape a character|{{{This is not a \[link\]}}}|(((
... ... @@ -693,7 +693,7 @@
693 693  
694 694  = Macros =
695 695  
696 -There are 2 kinds of macros in XWiki syntax 1.0:
817 +There are 2 kinds of macros in XWiki Syntax 1.0:
697 697  * Velocity macros (called using the ###macroname(param1 ... paramN)## syntax)
698 698  * Radeox macros (called using the ##{macroname:param1=value1|...|paramN=valueN}## syntax)
699 699  
... ... @@ -703,19 +703,16 @@
703 703  
704 704  {{info}}The Radeox macros cannot be used in XWiki Syntax 2.0. Thus they have been rewritten as XWiki macros.{{/info}}
705 705  
706 -{{info}}For the full list of available macros check the [[Macro Reference page>>http://code.xwiki.org/xwiki/bin/view/Macros/]].{{/info}}
827 +{{info}}For the full list of available macros check the [[Extensions wiki>>http://extensions.xwiki.org/]].{{/info}}
707 707  
708 708  (% style="width:100%" %)
709 709  |=Feature|=XWiki Syntax 1.0|=XWiki Syntax 2.0
710 710  |Velocity Macro|((({{{#info("Some text")}}})))|((({{{
711 -{{velocity}}{{html}}
712 -#info("some text")
713 -{{/html}}{{/velocity}}}}}
714 -{{info}}We're using the HTML macro in the example since the ###info## macro returns HTML content.{{/info}}
715 -
716 -{{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}}
717 -)))
718 -|Radeox Macro/XWiki Macros|((({{{
832 +{{info}}
833 +Some text
834 +{{/info}}
835 +}}})))
836 +|Radeox Macro/XWiki Macro|((({{{
719 719  {code:java}
720 720  java content
721 721  {code}
... ... @@ -733,7 +733,7 @@
733 733  |=XWiki Syntax 1.0|=XWiki Syntax 2.0|=Result
734 734  |<b>bold</b>|{{{{{html}}<b>bold</b>{{/html}}}}}|{{html}}<b>bold</b>{{/html}}
735 735  
736 -{{info}}In XWiki Syntax 2.0, by default the HTML macro does not understands wiki syntax (other macros included since it's wiki syntax too). To enable it, use {{{{{html wiki="true"}}}}}.{{/info}}
854 +{{info}}In XWiki Syntax 2.0, by default the HTML macro does not understands XWiki Syntax (other macros included since it's XWiki Syntax too). To enable it, use {{{{{html wiki="true"}}}}}.{{/info}}
737 737  
738 738  = Velocity/Groovy Scripts =
739 739  
XWiki.StyleSheetExtension[0]
Caching policy
... ... @@ -1,0 +1,1 @@
1 +long
Code
... ... @@ -1,0 +1,4 @@
1 +/* Firefox panics when it has an overflowing table but the content is pre-formatted. */
2 +tbody>tr>td>tt {
3 + white-space: normal !important;
4 +}
Name
... ... @@ -1,0 +1,1 @@
1 +FF_table_fix
Use this extension
... ... @@ -1,0 +1,1 @@
1 +onDemand

Get Connected