Wiki source code of XWikiSyntax
Version 33.2 by Vincent Massol on 2008/11/23
Show last authors
| author | version | line-number | content |
|---|---|---|---|
| 1 | #* Temporarily comment this out. When the new content is stabilized commit it in SVN in XE | ||
| 2 | $context.setCacheDuration(100000) | ||
| 3 | #set ($content = $xwiki.getURLContent("http://svn.xwiki.org/svnroot/xwiki/enterprise/trunk/wiki/src/main/resources/XWiki/XWikiSyntax.xml")) | ||
| 4 | |||
| 5 | #set ($newdoc = $xwiki.getDocument("Dummy")) | ||
| 6 | #set ($newdocprivate = $newdoc.getDocument()) | ||
| 7 | $newdocprivate.fromXML($content) | ||
| 8 | |||
| 9 | $xwiki.parseContent($newdoc.content) | ||
| 10 | *# | ||
| 11 | |||
| 12 | #startfloatingbox() | ||
| 13 | *Contents* | ||
| 14 | #toc ("2" "2" "") | ||
| 15 | #endfloatingbox() | ||
| 16 | |||
| 17 | 1 XWiki Syntaxes | ||
| 18 | |||
| 19 | Starting with XWiki Enterprise version 1.6 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: | ||
| 20 | * Fix the deficiencies and ambiguities of the XWiki 1.0 syntax (which was inspired by both Radeox - the underlying rendering engine - and TWiki). | ||
| 21 | ** 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. | ||
| 22 | ** 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. | ||
| 23 | * 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. | ||
| 24 | |||
| 25 | 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>#HOthersyntaxes] | ||
| 26 | |||
| 27 | 1.1 General Remarks | ||
| 28 | |||
| 29 | XWiki Syntax v2.0 corrects some errors entered by the user as shown in the examples in the table below. | ||
| 30 | |||
| 31 | <table class="wiki-table" border="1" cellspacing="0" cellpadding="2" width="80%"> | ||
| 32 | <tr> | ||
| 33 | <th>Example of invalid syntax</th> | ||
| 34 | <th>Fixed XWiki Syntax 2.0</th> | ||
| 35 | </tr> | ||
| 36 | <tr> | ||
| 37 | {pre} | ||
| 38 | <td> | ||
| 39 | **bold | ||
| 40 | </td> | ||
| 41 | <td> | ||
| 42 | **bold** | ||
| 43 | </td> | ||
| 44 | {/pre} | ||
| 45 | </tr> | ||
| 46 | <tr> | ||
| 47 | {pre} | ||
| 48 | <td> | ||
| 49 | || table cell<br/> | ||
| 50 | * list item | ||
| 51 | </td> | ||
| 52 | <td> | ||
| 53 | || table cell<br/> | ||
| 54 | <br/> | ||
| 55 | * list item | ||
| 56 | </td> | ||
| 57 | {/pre} | ||
| 58 | </tr> | ||
| 59 | <tr> | ||
| 60 | {pre} | ||
| 61 | <td> | ||
| 62 | paragraph<br/> | ||
| 63 | ----<br/> | ||
| 64 | paragraph | ||
| 65 | </td> | ||
| 66 | <td> | ||
| 67 | paragraph<br/> | ||
| 68 | <br/> | ||
| 69 | ----<br/> | ||
| 70 | <br/> | ||
| 71 | paragraph | ||
| 72 | </td> | ||
| 73 | {/pre} | ||
| 74 | </tr> | ||
| 75 | <tr> | ||
| 76 | {pre} | ||
| 77 | <td> | ||
| 78 | <new line at beginning of document><br/> | ||
| 79 | paragraph | ||
| 80 | </td> | ||
| 81 | <td> | ||
| 82 | paragraph | ||
| 83 | </td> | ||
| 84 | {/pre} | ||
| 85 | </tr> | ||
| 86 | </table> | ||
| 87 | |||
| 88 | 1.1 Paragraphs | ||
| 89 | |||
| 90 | Paragraphs are text elements separated by 2 or more new lines. | ||
| 91 | |||
| 92 | #info("In XWiki Syntax 2.0 new lines are honored which is not the case in XWiki Syntax 1.0 and in Creole syntax.") | ||
| 93 | |||
| 94 | <table class="wiki-table" border="1" cellspacing="0" cellpadding="2" width="80%"> | ||
| 95 | <tr> | ||
| 96 | <th>Feature</th> | ||
| 97 | <th>XWiki Syntax 1.0</th> | ||
| 98 | <th>XWiki Syntax 2.0</th> | ||
| 99 | <th>Result XWiki Syntax 1.0</th> | ||
| 100 | <th>Result XWiki Syntax 1.2</th> | ||
| 101 | </tr> | ||
| 102 | <tr> | ||
| 103 | {pre} | ||
| 104 | <td>Simple paragraph</td> | ||
| 105 | <td>This is a paragraph</td> | ||
| 106 | <td>This is a paragraph</td> | ||
| 107 | {/pre} | ||
| 108 | <td>This is a paragraph</td> | ||
| 109 | <td>This is a paragraph</td> | ||
| 110 | </tr> | ||
| 111 | <tr> | ||
| 112 | {pre} | ||
| 113 | <td>Paragraph on multiple lines</td> | ||
| 114 | <td>Paragraph on<br/>multiple lines</td> | ||
| 115 | <td>Paragraph on<br/>multiple lines</td> | ||
| 116 | {/pre} | ||
| 117 | <td> | ||
| 118 | Paragraph on | ||
| 119 | multiple lines | ||
| 120 | </td> | ||
| 121 | <td> | ||
| 122 | Paragraph on<br/> | ||
| 123 | multiple lines | ||
| 124 | </td> | ||
| 125 | </tr> | ||
| 126 | <tr> | ||
| 127 | {pre} | ||
| 128 | <td>Two paragraphs</td> | ||
| 129 | <td>Paragraph one<br/><br/>Paragraph two</td> | ||
| 130 | <td>Paragraph one<br/><br/>Paragraph two</td> | ||
| 131 | {/pre} | ||
| 132 | <td> | ||
| 133 | Paragraph one | ||
| 134 | |||
| 135 | Paragraph two | ||
| 136 | </td> | ||
| 137 | <td> | ||
| 138 | Paragraph one | ||
| 139 | |||
| 140 | Paragraph two | ||
| 141 | </td> | ||
| 142 | </tr> | ||
| 143 | <tr> | ||
| 144 | {pre} | ||
| 145 | <td>Parametrized paragraph</td> | ||
| 146 | <td> | ||
| 147 | <p style="text-align:center;color:blue">Centered and blue paragraph</> | ||
| 148 | </td> | ||
| 149 | <td> | ||
| 150 | (% style="text-align:center;color:blue" %)<br/> | ||
| 151 | Centered and blue paragraph | ||
| 152 | {/pre} | ||
| 153 | <td> | ||
| 154 | <p style="text-align:center;color:blue">Centered and blue paragraph</p> | ||
| 155 | </td> | ||
| 156 | <td> | ||
| 157 | <p style="text-align:center;color:blue">Centered and blue paragraph</p> | ||
| 158 | </td> | ||
| 159 | </tr> | ||
| 160 | </table> | ||
| 161 | |||
| 162 | 1.1 Headers | ||
| 163 | |||
| 164 | <table class="wiki-table" border="1" cellspacing="0" cellpadding="2" width="80%"> | ||
| 165 | <tr> | ||
| 166 | <th>Feature</th> | ||
| 167 | <th>XWiki Syntax 1.0</th> | ||
| 168 | <th>XWiki Syntax 2.0</th> | ||
| 169 | <th>Result</th> | ||
| 170 | </tr> | ||
| 171 | <tr> | ||
| 172 | {pre} | ||
| 173 | <td>Standard headers</td> | ||
| 174 | <td> | ||
| 175 | #set ($h1 = "1") | ||
| 176 | #set ($h2 = "1.1") | ||
| 177 | #set ($h3 = "1.1.1") | ||
| 178 | #set ($h4 = "1.1.1.1") | ||
| 179 | #set ($h5 = "1.1.1.1.1") | ||
| 180 | #set ($h6 = "1.1.1.1.1.1") | ||
| 181 | $h1 level 1<br/> | ||
| 182 | $h2 level 2<br/> | ||
| 183 | $h3 level 3<br/> | ||
| 184 | $h4 level 4<br/> | ||
| 185 | $h5 level 5<br/> | ||
| 186 | $h6 level 6 | ||
| 187 | </td> | ||
| 188 | <td> | ||
| 189 | = level 1<br/> | ||
| 190 | == level 2<br/> | ||
| 191 | === level 3<br/> | ||
| 192 | ==== level 4<br/> | ||
| 193 | ===== level 5<br/> | ||
| 194 | ====== level 6 | ||
| 195 | #info("Closing equal signs are optional.") | ||
| 196 | </td> | ||
| 197 | {/pre} | ||
| 198 | <td> | ||
| 199 | $h1 level 1 | ||
| 200 | $h2 level 2 | ||
| 201 | $h3 level 3 | ||
| 202 | $h4 level 4 | ||
| 203 | $h5 level 5 | ||
| 204 | $h6 level 6 | ||
| 205 | </td> | ||
| 206 | </tr> | ||
| 207 | <tr> | ||
| 208 | {pre} | ||
| 209 | <td>Parametrized headers</td> | ||
| 210 | <td> | ||
| 211 | <h2 class="heading-1"><span style="color:blue">header</span></h2> | ||
| 212 | </td> | ||
| 213 | <td> | ||
| 214 | (% style="color:blue" %)<br/> | ||
| 215 | = header | ||
| 216 | </td> | ||
| 217 | {/pre} | ||
| 218 | <td> | ||
| 219 | <h2 class="heading-1" id="Hlevel1"><span style="color:blue">header</span></h2> | ||
| 220 | </td> | ||
| 221 | </tr> | ||
| 222 | <tr> | ||
| 223 | {pre} | ||
| 224 | <td>Headers with wiki syntax</td> | ||
| 225 | <td>$h3 Header with *bold*</td> | ||
| 226 | <td>=== Header with **bold**</td> | ||
| 227 | {/pre} | ||
| 228 | <td> | ||
| 229 | $h3 Header with *bold* | ||
| 230 | </td> | ||
| 231 | </tr> | ||
| 232 | </table> | ||
| 233 | |||
| 234 | 1.1 Text Formatting | ||
| 235 | |||
| 236 | #info("New in XWiki Syntax 2.0 over XWiki Syntax 1.0: | ||
| 237 | * Spaces are allowed just after the syntax symbols (for example in XWiki Syntax 1.0, this was not * bold *). | ||
| 238 | * 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. | ||
| 239 | * Ability to span several lines (wasn't the case in XWiki Syntax 1.0).") | ||
| 240 | |||
| 241 | <table class="wiki-table" border="1" cellspacing="0" cellpadding="2" width="80%"> | ||
| 242 | <tr> | ||
| 243 | <th>Feature</th> | ||
| 244 | <th>XWiki Syntax 1.0</th> | ||
| 245 | <th>XWiki Syntax 2.0</th> | ||
| 246 | <th>Result</th> | ||
| 247 | </tr> | ||
| 248 | <tr> | ||
| 249 | {pre} | ||
| 250 | <td>Bold</td> | ||
| 251 | <td>*bold*</td> | ||
| 252 | <td>**bold**</td> | ||
| 253 | {/pre} | ||
| 254 | <td>*bold*</td> | ||
| 255 | </tr> | ||
| 256 | <tr> | ||
| 257 | {pre} | ||
| 258 | <td>Underline</td> | ||
| 259 | <td>__underline___</td> | ||
| 260 | <td>__underline__</td> | ||
| 261 | {/pre} | ||
| 262 | <td>__underline__</td> | ||
| 263 | </tr> | ||
| 264 | <tr> | ||
| 265 | {pre} | ||
| 266 | <td>Italics</td> | ||
| 267 | <td>~~italic~~</td> | ||
| 268 | <td>//italic//</td> | ||
| 269 | {/pre} | ||
| 270 | <td>~~italic~~</td> | ||
| 271 | </tr> | ||
| 272 | <tr> | ||
| 273 | {pre} | ||
| 274 | <td>Striked out</td> | ||
| 275 | <td>--strike--</td> | ||
| 276 | <td>--strike--</td> | ||
| 277 | {/pre} | ||
| 278 | <td>--strike--</td> | ||
| 279 | </tr> | ||
| 280 | <tr> | ||
| 281 | {pre} | ||
| 282 | <td>Monospace</td> | ||
| 283 | <td><tt>monospace</tt></td> | ||
| 284 | #set($dash = "#") | ||
| 285 | <td>${dash}${dash}monospace${dash}${dash}</td> | ||
| 286 | {/pre} | ||
| 287 | <td><tt>monospace</tt></td> | ||
| 288 | </tr> | ||
| 289 | <tr> | ||
| 290 | {pre} | ||
| 291 | <td>Superscript</td> | ||
| 292 | <td>some <sup>superscript</sup></td> | ||
| 293 | <td>some ^^superscript^^</td> | ||
| 294 | {/pre} | ||
| 295 | <td>some <sup>superscript</sup></td> | ||
| 296 | </tr> | ||
| 297 | <tr> | ||
| 298 | {pre} | ||
| 299 | <td>Subscript</td> | ||
| 300 | <td>some <sub>subscript</sub></td> | ||
| 301 | <td>some ,,subscript,,</td> | ||
| 302 | {/pre} | ||
| 303 | <td>some <sub>subscript</sub></td> | ||
| 304 | </tr> | ||
| 305 | </table> | ||
| 306 | |||
| 307 | 1.1 Horizontal Line | ||
| 308 | |||
| 309 | #info("There must be 4 or more dashes.") | ||
| 310 | #info("Note that this is different from Creole where exactly 4 dashes are required.") | ||
| 311 | |||
| 312 | <table class="wiki-table" border="1" cellspacing="0" cellpadding="2" width="80%"> | ||
| 313 | <tr> | ||
| 314 | <th>Feature</th> | ||
| 315 | <th>XWiki Syntax 1.0</th> | ||
| 316 | <th>XWiki Syntax 2.0</th> | ||
| 317 | <th>Result</th> | ||
| 318 | </tr> | ||
| 319 | <tr> | ||
| 320 | {pre} | ||
| 321 | <td>Simple Horizontal Line</td> | ||
| 322 | <td>----</td> | ||
| 323 | <td>----</td> | ||
| 324 | {/pre} | ||
| 325 | <td><hr/></td> | ||
| 326 | </tr> | ||
| 327 | <tr> | ||
| 328 | {pre} | ||
| 329 | <td>Parametrized Horizontal Line</td> | ||
| 330 | <td> | ||
| 331 | <hr style="color:blue"/> | ||
| 332 | </td> | ||
| 333 | <td> | ||
| 334 | (% style="color:blue" %)<br/> | ||
| 335 | ---- | ||
| 336 | </td> | ||
| 337 | {/pre} | ||
| 338 | <td><hr style="color:blue"/></td> | ||
| 339 | </tr> | ||
| 340 | </table> | ||
| 341 | |||
| 342 | 1.1 Lists | ||
| 343 | |||
| 344 | <table class="wiki-table" border="1" cellspacing="0" cellpadding="2" width="80%"> | ||
| 345 | <tr> | ||
| 346 | <th>Feature</th> | ||
| 347 | <th>XWiki Syntax 1.0</th> | ||
| 348 | <th>XWiki Syntax 2.0</th> | ||
| 349 | <th>Result</th> | ||
| 350 | </tr> | ||
| 351 | <tr> | ||
| 352 | {pre} | ||
| 353 | <td>Bulleted list</td> | ||
| 354 | <td> | ||
| 355 | * item 1<br/> | ||
| 356 | ** item 2<br/> | ||
| 357 | *** item 3<br/> | ||
| 358 | * item 4 | ||
| 359 | </td> | ||
| 360 | <td> | ||
| 361 | * item 1<br/> | ||
| 362 | ** item 2<br/> | ||
| 363 | *** item 3<br/> | ||
| 364 | * item 4 | ||
| 365 | </td> | ||
| 366 | {/pre} | ||
| 367 | <td> | ||
| 368 | * item 1 | ||
| 369 | ** item 2 | ||
| 370 | *** item 3 | ||
| 371 | * item 4 | ||
| 372 | </td> | ||
| 373 | </tr> | ||
| 374 | <tr> | ||
| 375 | {pre} | ||
| 376 | <td>Numbered list</td> | ||
| 377 | <td> | ||
| 378 | 1. item 1<br/> | ||
| 379 | 11. item 2<br/> | ||
| 380 | 111. item 3<br/> | ||
| 381 | 1. item 4 | ||
| 382 | </td> | ||
| 383 | <td> | ||
| 384 | 1. item 1<br/> | ||
| 385 | 11. item 2<br/> | ||
| 386 | 111. item 3<br/> | ||
| 387 | 1. item 4 | ||
| 388 | </td> | ||
| 389 | {/pre} | ||
| 390 | <td> | ||
| 391 | 1. item 1 | ||
| 392 | 11. item 2 | ||
| 393 | 111. item 3 | ||
| 394 | 1. item 4 | ||
| 395 | </td> | ||
| 396 | </tr> | ||
| 397 | <tr> | ||
| 398 | {pre} | ||
| 399 | <td>Mixed list</td> | ||
| 400 | <td> | ||
| 401 | 1. item 1<br/> | ||
| 402 | 1*. item 2<br/> | ||
| 403 | 1*. item 3<br/> | ||
| 404 | 1. item 4 | ||
| 405 | </td> | ||
| 406 | <td> | ||
| 407 | 1. item 1<br/> | ||
| 408 | 1*. item 2<br/> | ||
| 409 | 1*. item 3<br/> | ||
| 410 | 1. item 4 | ||
| 411 | </td> | ||
| 412 | {/pre} | ||
| 413 | <td> | ||
| 414 | 1. item 1 | ||
| 415 | 1*. item 2 | ||
| 416 | 1*. item 3 | ||
| 417 | 1. item 4 | ||
| 418 | </td> | ||
| 419 | </tr> | ||
| 420 | <tr> | ||
| 421 | {pre} | ||
| 422 | <td>Square list</td> | ||
| 423 | <td> | ||
| 424 | - item 1<br/> | ||
| 425 | - item 2<br/> | ||
| 426 | </td> | ||
| 427 | <td> | ||
| 428 | (% style="list-style-type: square" %)<br/> | ||
| 429 | * item 1<br/> | ||
| 430 | * item 2<br/> | ||
| 431 | </td> | ||
| 432 | {/pre} | ||
| 433 | <td> | ||
| 434 | - item 1 | ||
| 435 | - item 2 | ||
| 436 | </td> | ||
| 437 | </tr> | ||
| 438 | <tr> | ||
| 439 | {pre} | ||
| 440 | <td>Disc list</td> | ||
| 441 | <td> | ||
| 442 | <ul style="list-style-type: disc"><br/> | ||
| 443 | <li>item1</li><br/> | ||
| 444 | <li>item2</li><br/> | ||
| 445 | </ul> | ||
| 446 | </td> | ||
| 447 | <td> | ||
| 448 | (% style="list-style-type: disc" %)<br/> | ||
| 449 | * item 1<br/> | ||
| 450 | * item 2<br/> | ||
| 451 | </td> | ||
| 452 | {/pre} | ||
| 453 | <td> | ||
| 454 | <ul style="list-style-type: disc"> | ||
| 455 | <li>item1</li> | ||
| 456 | <li>item2</li> | ||
| 457 | </ul> | ||
| 458 | </td> | ||
| 459 | </tr> | ||
| 460 | <tr> | ||
| 461 | {pre} | ||
| 462 | <td>Lowercase Alphabetical list</td> | ||
| 463 | <td> | ||
| 464 | a. item 1<br/> | ||
| 465 | a. item 2<br/> | ||
| 466 | </td> | ||
| 467 | <td> | ||
| 468 | (% style="list-style-type: lower-alpha" %)<br/> | ||
| 469 | * item1<br/> | ||
| 470 | * item2<br/> | ||
| 471 | </td> | ||
| 472 | {/pre} | ||
| 473 | <td> | ||
| 474 | a. item 1 | ||
| 475 | a. item 2 | ||
| 476 | </td> | ||
| 477 | </tr> | ||
| 478 | <tr> | ||
| 479 | {pre} | ||
| 480 | <td>Uppercase Alphabetical list</td> | ||
| 481 | <td> | ||
| 482 | A. item 1<br/> | ||
| 483 | A. item 2<br/> | ||
| 484 | </td> | ||
| 485 | <td> | ||
| 486 | (% style="list-style-type: upper-alpha" %)<br/> | ||
| 487 | * item1<br/> | ||
| 488 | * item2<br/> | ||
| 489 | </td> | ||
| 490 | {/pre} | ||
| 491 | <td> | ||
| 492 | A. item 1 | ||
| 493 | A. item 2 | ||
| 494 | </td> | ||
| 495 | </tr> | ||
| 496 | <tr> | ||
| 497 | {pre} | ||
| 498 | <td>Lowercase Roman list</td> | ||
| 499 | <td> | ||
| 500 | i. item 1<br/> | ||
| 501 | i. item 2<br/> | ||
| 502 | </td> | ||
| 503 | <td> | ||
| 504 | (% style="list-style-type: lower-roman" %)<br/> | ||
| 505 | * item1<br/> | ||
| 506 | * item2<br/> | ||
| 507 | </td> | ||
| 508 | {/pre} | ||
| 509 | <td> | ||
| 510 | i. item 1 | ||
| 511 | i. item 2 | ||
| 512 | </td> | ||
| 513 | </tr> | ||
| 514 | <tr> | ||
| 515 | {pre} | ||
| 516 | <td>Uppercase Roman list</td> | ||
| 517 | <td> | ||
| 518 | I. item 1<br/> | ||
| 519 | I. item 2<br/> | ||
| 520 | </td> | ||
| 521 | <td> | ||
| 522 | (% style="list-style-type: upper-roman" %)<br/> | ||
| 523 | * item1<br/> | ||
| 524 | * item2<br/> | ||
| 525 | </td> | ||
| 526 | {/pre} | ||
| 527 | <td> | ||
| 528 | I. item 1 | ||
| 529 | I. item 2 | ||
| 530 | </td> | ||
| 531 | </tr> | ||
| 532 | <tr> | ||
| 533 | {pre} | ||
| 534 | <td>Lowercase Greek list</td> | ||
| 535 | <td> | ||
| 536 | g. item 1<br/> | ||
| 537 | g. item 2<br/> | ||
| 538 | </td> | ||
| 539 | <td> | ||
| 540 | (% style="list-style-type: lower-greek" %)<br/> | ||
| 541 | * item1<br/> | ||
| 542 | * item2<br/> | ||
| 543 | </td> | ||
| 544 | {/pre} | ||
| 545 | <td> | ||
| 546 | g. item 1 | ||
| 547 | g. item 2 | ||
| 548 | </td> | ||
| 549 | </tr> | ||
| 550 | <tr> | ||
| 551 | {pre} | ||
| 552 | <td>Uppercase Greek list</td> | ||
| 553 | <td> | ||
| 554 | G. item 1<br/> | ||
| 555 | G. item 2<br/> | ||
| 556 | </td> | ||
| 557 | <td> | ||
| 558 | (% style="list-style-type: upper-greek" %)<br/> | ||
| 559 | * item1<br/> | ||
| 560 | * item2<br/> | ||
| 561 | </td> | ||
| 562 | {/pre} | ||
| 563 | <td> | ||
| 564 | <ul style="list-style-type: upper-greek"> | ||
| 565 | <li>item1</li> | ||
| 566 | <li>item2</li> | ||
| 567 | </ul> | ||
| 568 | </td> | ||
| 569 | </tr> | ||
| 570 | <tr> | ||
| 571 | {pre} | ||
| 572 | <td>Hiragana list</td> | ||
| 573 | <td> | ||
| 574 | h. item 1<br/> | ||
| 575 | h. item 2<br/> | ||
| 576 | </td> | ||
| 577 | <td> | ||
| 578 | (% style="list-style-type: hiragana" %)<br/> | ||
| 579 | * item1<br/> | ||
| 580 | * item2<br/> | ||
| 581 | </td> | ||
| 582 | {/pre} | ||
| 583 | <td> | ||
| 584 | h. item 1 | ||
| 585 | h. item 2 | ||
| 586 | </td> | ||
| 587 | </tr> | ||
| 588 | <tr> | ||
| 589 | {pre} | ||
| 590 | <td>Hiragana Iroah list</td> | ||
| 591 | <td> | ||
| 592 | H. item 1<br/> | ||
| 593 | H. item 2<br/> | ||
| 594 | </td> | ||
| 595 | <td> | ||
| 596 | (% style="list-style-type: hiragana-iroha" %)<br/> | ||
| 597 | * item1<br/> | ||
| 598 | * item2<br/> | ||
| 599 | </td> | ||
| 600 | {/pre} | ||
| 601 | <td> | ||
| 602 | H. item 1 | ||
| 603 | H. item 2 | ||
| 604 | </td> | ||
| 605 | </tr> | ||
| 606 | <tr> | ||
| 607 | {pre} | ||
| 608 | <td>Katakana list</td> | ||
| 609 | <td> | ||
| 610 | k. item 1<br/> | ||
| 611 | k. item 2<br/> | ||
| 612 | </td> | ||
| 613 | <td> | ||
| 614 | |||
| 615 | (% style="list-style-type: katakana" %)<br/> | ||
| 616 | * item1<br/> | ||
| 617 | * item2<br/> | ||
| 618 | </td> | ||
| 619 | {/pre} | ||
| 620 | <td> | ||
| 621 | k. item 1 | ||
| 622 | k. item 2 | ||
| 623 | </td> | ||
| 624 | </tr> | ||
| 625 | <tr> | ||
| 626 | {pre} | ||
| 627 | <td>Katakana Iroha list</td> | ||
| 628 | <td> | ||
| 629 | K. item 1<br/> | ||
| 630 | K. item 2<br/> | ||
| 631 | </td> | ||
| 632 | <td> | ||
| 633 | (% style="list-style-type: katakana-iroha" %)<br/> | ||
| 634 | * item1<br/> | ||
| 635 | * item2<br/> | ||
| 636 | </td> | ||
| 637 | {/pre} | ||
| 638 | <td> | ||
| 639 | K. item 1 | ||
| 640 | K. item 2 | ||
| 641 | </td> | ||
| 642 | </tr> | ||
| 643 | <tr> | ||
| 644 | {pre} | ||
| 645 | <td>Armenian list</td> | ||
| 646 | <td> | ||
| 647 | <ul style="list-style-type: armenian"><br/> | ||
| 648 | <li>item1</li><br/> | ||
| 649 | <li>item2</li><br/> | ||
| 650 | </ul> | ||
| 651 | </td> | ||
| 652 | <td> | ||
| 653 | (% style="list-style-type: armenian" %)<br/> | ||
| 654 | * item1<br/> | ||
| 655 | * item2<br/> | ||
| 656 | </td> | ||
| 657 | {/pre} | ||
| 658 | <td> | ||
| 659 | <ul style="list-style-type: armenian"> | ||
| 660 | <li>item1</li> | ||
| 661 | <li>item2</li> | ||
| 662 | </ul> | ||
| 663 | </td> | ||
| 664 | </tr> | ||
| 665 | <tr> | ||
| 666 | {pre} | ||
| 667 | <td>Hebrew list</td> | ||
| 668 | <td> | ||
| 669 | j. item1<br/> | ||
| 670 | j. item2<br/> | ||
| 671 | </td> | ||
| 672 | <td> | ||
| 673 | (% style="list-style-type: hebrew" %)<br/> | ||
| 674 | * item1<br/> | ||
| 675 | * item2<br/> | ||
| 676 | </td> | ||
| 677 | {/pre} | ||
| 678 | <td> | ||
| 679 | <ul style="list-style-type: hebrew"> | ||
| 680 | <li>item1</li> | ||
| 681 | <li>item2</li> | ||
| 682 | </ul> | ||
| 683 | </td> | ||
| 684 | </tr> | ||
| 685 | <tr> | ||
| 686 | {pre} | ||
| 687 | <td>Georgian list</td> | ||
| 688 | <td> | ||
| 689 | <ul style="list-style-type: georgian"><br/> | ||
| 690 | <li>item1</li><br/> | ||
| 691 | <li>item2</li><br/> | ||
| 692 | </ul> | ||
| 693 | </td> | ||
| 694 | <td> | ||
| 695 | (% style="list-style-type: georgian" %)<br/> | ||
| 696 | * item1<br/> | ||
| 697 | * item2<br/> | ||
| 698 | </td> | ||
| 699 | {/pre} | ||
| 700 | <td> | ||
| 701 | <ul style="list-style-type: georgian"> | ||
| 702 | <li>item1</li> | ||
| 703 | <li>item2</li> | ||
| 704 | </ul> | ||
| 705 | </td> | ||
| 706 | </tr> | ||
| 707 | <tr> | ||
| 708 | {pre} | ||
| 709 | <td>CJK ideographic list</td> | ||
| 710 | <td> | ||
| 711 | <ul style="list-style-type: cjk-ideographic"><br/> | ||
| 712 | <li>item1</li><br/> | ||
| 713 | <li>item2</li><br/> | ||
| 714 | </ul> | ||
| 715 | </td> | ||
| 716 | <td> | ||
| 717 | (% style="list-style-type: cjk-ideographic" %)<br/> | ||
| 718 | * item1<br/> | ||
| 719 | * item2<br/> | ||
| 720 | </td> | ||
| 721 | {/pre} | ||
| 722 | <td> | ||
| 723 | <ul style="list-style-type: cjk-ideographic"> | ||
| 724 | <li>item1</li> | ||
| 725 | <li>item2</li> | ||
| 726 | </ul> | ||
| 727 | </td> | ||
| 728 | </tr> | ||
| 729 | </table> | ||
| 730 | |||
| 731 | 1.1 Definition Lists | ||
| 732 | |||
| 733 | <table class="wiki-table" border="1" cellspacing="0" cellpadding="2" width="80%"> | ||
| 734 | <tr> | ||
| 735 | <th>Feature</th> | ||
| 736 | <th>XWiki Syntax 1.0</th> | ||
| 737 | <th>XWiki Syntax 2.0</th> | ||
| 738 | <th>Result</th> | ||
| 739 | </tr> | ||
| 740 | <tr> | ||
| 741 | {pre} | ||
| 742 | <td>Standard definition</td> | ||
| 743 | <td> | ||
| 744 | <dl><br/> | ||
| 745 | <dt>term</dt><br/> | ||
| 746 | <dd>definition</dd><br/> | ||
| 747 | </dl> | ||
| 748 | </td> | ||
| 749 | <td> | ||
| 750 | ; term<br/> | ||
| 751 | : definition | ||
| 752 | </td> | ||
| 753 | {/pre} | ||
| 754 | <td> | ||
| 755 | <dl> | ||
| 756 | <dt>term</dt> | ||
| 757 | <dd>definition</dd> | ||
| 758 | </dl> | ||
| 759 | </td> | ||
| 760 | </tr> | ||
| 761 | <tr> | ||
| 762 | {pre} | ||
| 763 | <td>Nested definitions</td> | ||
| 764 | <td> | ||
| 765 | <dl><br/> | ||
| 766 | <dt>term1</dt><br/> | ||
| 767 | <dd>definition1<br/> | ||
| 768 | <dl><br/> | ||
| 769 | <dt>term2</dt><br/> | ||
| 770 | <dd>definition2</dd><br/> | ||
| 771 | </dl><br/> | ||
| 772 | </dd><br/> | ||
| 773 | </dl> | ||
| 774 | </td> | ||
| 775 | <td> | ||
| 776 | ; term1<br/> | ||
| 777 | : definition1<br/> | ||
| 778 | :; term2<br/> | ||
| 779 | :: definition2 | ||
| 780 | </td> | ||
| 781 | {/pre} | ||
| 782 | <td> | ||
| 783 | <dl> | ||
| 784 | <dt>term1</dt> | ||
| 785 | <dd>definition1 | ||
| 786 | <dl> | ||
| 787 | <dt>term2</dt> | ||
| 788 | <dd>definition2</dd> | ||
| 789 | </dl> | ||
| 790 | </dd> | ||
| 791 | </dl> | ||
| 792 | </td> | ||
| 793 | </tr> | ||
| 794 | <tr> | ||
| 795 | {pre} | ||
| 796 | <td>Parametrized definition</td> | ||
| 797 | <td> | ||
| 798 | <dl style="color:blue"><br/> | ||
| 799 | <dt>term</dt><br/> | ||
| 800 | <dd>definition</dd><br/> | ||
| 801 | </dl> | ||
| 802 | </td> | ||
| 803 | </td> | ||
| 804 | <td> | ||
| 805 | (% style="color:blue" %)<br/> | ||
| 806 | ; term<br/> | ||
| 807 | : definition | ||
| 808 | </td> | ||
| 809 | {/pre} | ||
| 810 | <td> | ||
| 811 | <dl style="color:blue"> | ||
| 812 | <dt>term</dt> | ||
| 813 | <dd>definition</dd> | ||
| 814 | </dl> | ||
| 815 | </td> | ||
| 816 | </tr> | ||
| 817 | </table> | ||
| 818 | |||
| 819 | 1.1 New Line/Line breaks | ||
| 820 | |||
| 821 | A new line is a carriage return. A line break is a forced new line that can appear anywhere in the text. | ||
| 822 | |||
| 823 | #info("In XWiki Syntax 2.0 new lines are honored which is not the case in XWiki Syntax 1.0 and in Creole syntax.") | ||
| 824 | |||
| 825 | <table class="wiki-table" border="1" cellspacing="0" cellpadding="2" width="80%"> | ||
| 826 | <tr> | ||
| 827 | <th>Feature</th> | ||
| 828 | <th>XWiki Syntax 1.0</th> | ||
| 829 | <th>XWiki Syntax 2.0</th> | ||
| 830 | <th>Result XWiki Syntax 1.0</th> | ||
| 831 | |||
| 832 | <th>Result XWiki Syntax 2.0</th> | ||
| 833 | </tr> | ||
| 834 | <tr> | ||
| 835 | {pre} | ||
| 836 | <td>Line break</td> | ||
| 837 | <td>Line\\New line</td> | ||
| 838 | <td>Line\\New line</td> | ||
| 839 | {/pre} | ||
| 840 | <td>Line\\New line</td> | ||
| 841 | <td>Line\\New line</td> | ||
| 842 | </tr> | ||
| 843 | <tr> | ||
| 844 | |||
| 845 | {pre} | ||
| 846 | <td>New line</td> | ||
| 847 | <td>Line<br/>New line</td> | ||
| 848 | <td>Line<br/>New line</td> | ||
| 849 | {/pre} | ||
| 850 | <td>Line New line</td> | ||
| 851 | <td>Line<br/>New line</td> | ||
| 852 | </tr> | ||
| 853 | </table> | ||
| 854 | |||
| 855 | 1.1 Links | ||
| 856 | |||
| 857 | #* | ||
| 858 | TODO: In XWiki Syntax 2.0 it's possible to configure how links are displayed when they don't have an explicit label specified. | ||
| 859 | Give a link to how to configure this feature | ||
| 860 | *# | ||
| 861 | |||
| 862 | <table class="wiki-table" border="1" cellspacing="0" cellpadding="2" width="80%"> | ||
| 863 | <tr> | ||
| 864 | <th>Feature</th> | ||
| 865 | <th>XWiki Syntax 1.0</th> | ||
| 866 | <th>XWiki Syntax 2.0</th> | ||
| 867 | <th>Result XWiki Syntax 1.0</th> | ||
| 868 | <th>Result XWiki Syntax 2.0</th> | ||
| 869 | </tr> | ||
| 870 | <tr> | ||
| 871 | {pre} | ||
| 872 | <td>Link to a page in the current Space</td> | ||
| 873 | <td>[WebHome]</td> | ||
| 874 | <td>[[WebHome]]</td> | ||
| 875 | {/pre} | ||
| 876 | <td> | ||
| 877 | <span class="wikilink"><a href="/xwiki/bin/view/Main/">Web Home</a></span> | ||
| 878 | </td> | ||
| 879 | <td> | ||
| 880 | <span class="wikilink"><a href="/xwiki/bin/view/Main/">WebHome</a></span> | ||
| 881 | </td> | ||
| 882 | </tr> | ||
| 883 | <tr> | ||
| 884 | {pre} | ||
| 885 | <td>Link with a label</td> | ||
| 886 | <td>[label>WebHome]</td> | ||
| 887 | <td>[[label>>WebHome]]</td> | ||
| 888 | {/pre} | ||
| 889 | <td> | ||
| 890 | <span class="wikilink"><a href="/xwiki/bin/view/Main/">label</a></span> | ||
| 891 | </td> | ||
| 892 | <td> | ||
| 893 | <span class="wikilink"><a href="/xwiki/bin/view/Main/">label</a></span> | ||
| 894 | </td> | ||
| 895 | </tr> | ||
| 896 | <tr> | ||
| 897 | {pre} | ||
| 898 | <td>Link to a page with the space specified</td> | ||
| 899 | <td>[Main.WebHome]</td> | ||
| 900 | <td>[[Main.WebHome]]</td> | ||
| 901 | {/pre} | ||
| 902 | <td> | ||
| 903 | <span class="wikilink"><a href="/xwiki/bin/view/Main/">Web Home</a></span> | ||
| 904 | </td> | ||
| 905 | <td> | ||
| 906 | <span class="wikilink"><a href="/xwiki/bin/view/Main/">WebHome</a></span> | ||
| 907 | </td> | ||
| 908 | </tr> | ||
| 909 | <tr> | ||
| 910 | {pre} | ||
| 911 | <td>Link to a subwiki</td> | ||
| 912 | <td>[subwiki:Main.WebHome]</td> | ||
| 913 | <td>[[subwiki:Main.WebHome]]</td> | ||
| 914 | {/pre} | ||
| 915 | <td> | ||
| 916 | <span class="wikilink"><a href="/xwiki/bin/view/Main/">Web Home</a></span> | ||
| 917 | </td> | ||
| 918 | <td> | ||
| 919 | <span class="wikilink"><a href="/xwiki/bin/view/Main/">WebHome</a></span> | ||
| 920 | </td> | ||
| 921 | </tr> | ||
| 922 | <tr> | ||
| 923 | {pre} | ||
| 924 | <td>Link that opens in a new page</td> | ||
| 925 | <td>[label>WebHome>_blank]</td> | ||
| 926 | <td>[[label>>WebHome||target="_blank"]]</td> | ||
| 927 | {/pre} | ||
| 928 | <td> | ||
| 929 | <span class="wikilink"><a href="/xwiki/bin/view/Main/" rel="__blank">label</a></span> | ||
| 930 | </td> | ||
| 931 | <td> | ||
| 932 | <span class="wikilink"><a href="/xwiki/bin/view/Main/" rel="__blank">label</a></span> | ||
| 933 | </td> | ||
| 934 | </tr> | ||
| 935 | <tr> | ||
| 936 | {pre} | ||
| 937 | <td>Link to a URL directly in the text</td> | ||
| 938 | <td>This is a URL: http://xwiki.org</td> | ||
| 939 | <td>This is a URL: http://xwiki.org</td> | ||
| 940 | {/pre} | ||
| 941 | <td> | ||
| 942 | This is a URL: <span class="wikiexternallink"><a href="http://www.xwiki.org">http://www.xwiki.org</a></span> | ||
| 943 | </td> | ||
| 944 | <td> | ||
| 945 | This is a URL: <span class="wikiexternallink"><a href="http://www.xwiki.org">http://www.xwiki.org</a></span> | ||
| 946 | </td> | ||
| 947 | </tr> | ||
| 948 | <tr> | ||
| 949 | {pre} | ||
| 950 | <td>Link to a URL</td> | ||
| 951 | <td>[http://xwiki.org]</td> | ||
| 952 | <td>[[http://xwiki.org]]</td> | ||
| 953 | {/pre} | ||
| 954 | <td> | ||
| 955 | <span class="wikiexternallink"><a href="http://www.xwiki.org">http://www.xwiki.org</a></span> | ||
| 956 | </td> | ||
| 957 | <td> | ||
| 958 | <span class="wikiexternallink"><a href="http://www.xwiki.org">http://www.xwiki.org</a></span> | ||
| 959 | </td> | ||
| 960 | </tr> | ||
| 961 | <tr> | ||
| 962 | {pre} | ||
| 963 | <td>Link to a URL with a label</td> | ||
| 964 | <td>[XWiki>http://xwiki.org]</td> | ||
| 965 | <td>[[XWiki>>http://xwiki.org]]</td> | ||
| 966 | {/pre} | ||
| 967 | <td> | ||
| 968 | <span class="wikiexternallink"><a href="http://www.xwiki.org">XWiki</a></span> | ||
| 969 | </td> | ||
| 970 | <td> | ||
| 971 | <span class="wikiexternallink"><a href="http://www.xwiki.org">XWiki</a></span> | ||
| 972 | </td> | ||
| 973 | </tr> | ||
| 974 | <tr> | ||
| 975 | {pre} | ||
| 976 | <td>Link to an email</td> | ||
| 977 | <td>[email>mailto:john@smith.net]</td> | ||
| 978 | <td>[[email>>mailto:john@smith.net]]</td> | ||
| 979 | {/pre} | ||
| 980 | <td> | ||
| 981 | <span class="wikiexternallink"><a href="mailto:john&@smith.com">email</a></span> | ||
| 982 | </td> | ||
| 983 | <td> | ||
| 984 | <span class="wikiexternallink"><a href="mailto:john&@smith.com">email</a></span> | ||
| 985 | </td> | ||
| 986 | </tr> | ||
| 987 | <tr> | ||
| 988 | {pre} | ||
| 989 | <td>Image Link</td> | ||
| 990 | <td><a href="\$xwiki.getURL("Space1.Page1")">{image:img.png|document=Space2.Page2}</a></td> | ||
| 991 | <td>[[image:Space2.Page2@img.png>>Space1.Page1]] #info("Wiki syntax is supported inside link labels")</td> | ||
| 992 | {/pre} | ||
| 993 | <td> | ||
| 994 | <a href="/xwiki/bin/view/Main/">{image:img.png}</a> | ||
| 995 | </td> | ||
| 996 | <td> | ||
| 997 | <a href="/xwiki/bin/view/Main/">{image:img.png}</a> | ||
| 998 | </td> | ||
| 999 | </tr> | ||
| 1000 | </table> | ||
| 1001 | |||
| 1002 | 1.1.1 XWiki Syntax 1.0 Link Specification | ||
| 1003 | |||
| 1004 | The full format of a link is {code}(alias[|>])+(link)(@interWikiAlias)+([|>]target)+{code} | ||
| 1005 | * <tt>alias</tt>: An optional string which will be displayed to the user as the link name when rendered. Example: "My Page". | ||
| 1006 | * <tt>link</tt>: The full link reference using the following syntax: {code}(virtualWikiAlias:)+(space.)+(reference)(?queryString)+(#anchor)+{code} | ||
| 1007 | * Note that either the <tt>link</tt> or the <tt>alias</tt> must be specified. | ||
| 1008 | ** <tt>virtualWikiAlias</tt>: An optional string containing the name of a virtual wiki. The link will point to a page inside that virtual wiki. Example: "mywiki". | ||
| 1009 | ** <tt>space</tt>: An optional Wiki Space name. If not space is specified the current space is used. Example: "Main". | ||
| 1010 | ** <tt>reference</tt>: The link reference. This can be either a URI in the form <tt>protocol:path</tt> (example: "http://xwiki.org", "mailto:john@smith.com") or a wiki page name (example: "WebHome"). | ||
| 1011 | ** <tt>queryString</tt>: An optional query string for specifying parameters that will be used in the rendered URL. Example: "mydata1=5&mydata2=Hello". | ||
| 1012 | ** <tt>anchor</tt>: 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". | ||
| 1013 | * <tt>interWikiAlias</tt>: 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" | ||
| 1014 | * <tt>target</tt>: An optional string corresponding to the HTML <tt>target</tt> attribute for a HTML <tt>a</tt> link element. This element is used when rendering the link. It defaults to opening the link in the current page. Examples: "_self", "_blank" | ||
| 1015 | |||
| 1016 | 1.1.1 XWiki Syntax 2.0 Link Specification | ||
| 1017 | |||
| 1018 | The full format of a link is {code}(alias[|>])+(link)([|>]parameters)*{code} | ||
| 1019 | * <tt>alias</tt> and <tt>link</tt> are the same in XWiki Syntax 1.0 | ||
| 1020 | * <tt>parameters</tt>: An optional list of parameters passed to the link. For example the <tt>target</tt> element from XWiki Syntax 1.0 can be passed as a parameter. | ||
| 1021 | |||
| 1022 | #warning("This is not final yet. For example we need to add parameter support for passing an image to create a link to an image.") | ||
| 1023 | |||
| 1024 | 1.1 Tables | ||
| 1025 | |||
| 1026 | Allows to easily create content in table format. It also support parameters for table, row or cell in XWiki Syntax 2.0. | ||
| 1027 | |||
| 1028 | <table class="wiki-table" border="1" cellspacing="0" cellpadding="2" width="80%"> | ||
| 1029 | <tr> | ||
| 1030 | <th>Feature</th> | ||
| 1031 | <th>XWiki Syntax 1.0</th> | ||
| 1032 | <th>XWiki Syntax 2.0</th> | ||
| 1033 | <th>Result XWiki Syntax 1.0</th> | ||
| 1034 | <th>Result XWiki Syntax 2.0</th> | ||
| 1035 | </tr> | ||
| 1036 | <tr> | ||
| 1037 | {pre} | ||
| 1038 | <td>Standard table</td> | ||
| 1039 | <td> | ||
| 1040 | {table}<br/> | ||
| 1041 | Title 1 | Title 2<br/> | ||
| 1042 | Word 1 | Word 2<br/> | ||
| 1043 | {table} | ||
| 1044 | </td> | ||
| 1045 | <td> | ||
| 1046 | ||Title 1||Title 2<br/> | ||
| 1047 | |Word 1|Word 2<br/> | ||
| 1048 | </td> | ||
| 1049 | {/pre} | ||
| 1050 | <td> | ||
| 1051 | <table class="wiki-table" border="0" cellpadding="0" cellspacing="0"><tbody><tr><th>Title 1</th><th>Title 2</th></tr><tr class="table-odd"><td>Word 1</td><td>Word 2</td></tr></tbody></table> | ||
| 1052 | </td> | ||
| 1053 | <td> | ||
| 1054 | <table><tbody><tr><th>Title 1</th><th>Title 2</th></tr><tr><td>Word 1</td><td>Word 2</td></tr></tbody></table> | ||
| 1055 | </td> | ||
| 1056 | </tr> | ||
| 1057 | <tr> | ||
| 1058 | {pre} | ||
| 1059 | <td>Parametrized table</td> | ||
| 1060 | <td> | ||
| 1061 | <table style="background-color:red;align:center"><br/> | ||
| 1062 | <tbody><br/> | ||
| 1063 | <tr><br/> | ||
| 1064 | <th>Title 1</th><br/> | ||
| 1065 | <th style="background-color:yellow">Title 2</th><br/> | ||
| 1066 | |||
| 1067 | </tr><br/> | ||
| 1068 | <tr><br/> | ||
| 1069 | <td>Word 1</td><br/> | ||
| 1070 | <td>Word 2</td><br/> | ||
| 1071 | </tr><br/> | ||
| 1072 | </tbody><br/> | ||
| 1073 | </table> | ||
| 1074 | </td> | ||
| 1075 | <td> | ||
| 1076 | (% style="background-color:red;align=center" %)<br/> | ||
| 1077 | ||Title 1||(% style="background-color:yellow" %)Title 2<br/> | ||
| 1078 | |Word 1|Word 2<br/> | ||
| 1079 | </td> | ||
| 1080 | {/pre} | ||
| 1081 | <td> | ||
| 1082 | <table style="background-color:red;align:center"><tbody><tr><th>Title 1</th><th style="background-color:yellow">Title 2</th></tr><tr><td>Word 1</td><td>Word 2</td></tr></tbody></table> | ||
| 1083 | </td> | ||
| 1084 | <td> | ||
| 1085 | <table style="background-color:red;align:center"><tbody><tr><th>Title 1</th><th style="background-color:yellow">Title 2</th></tr><tr><td>Word 1</td><td>Word 2</td></tr></tbody></table> | ||
| 1086 | </td> | ||
| 1087 | </tr> | ||
| 1088 | <tr> | ||
| 1089 | {pre} | ||
| 1090 | <td>Filterable Sortable table</td> | ||
| 1091 | <td> | ||
| 1092 | <table id="tableid" class="grid sortable filterable doOddEven"><br/> | ||
| 1093 | <tr class="sortHeader"><br/> | ||
| 1094 | <th>Title1</th><br/> | ||
| 1095 | <th>Title2</th><br/> | ||
| 1096 | </tr><br/> | ||
| 1097 | <tr><br/> | ||
| 1098 | <td>Cell11</td><br/> | ||
| 1099 | <td>Cell12</td><br/> | ||
| 1100 | </tr><br/> | ||
| 1101 | <tr><br/> | ||
| 1102 | <td>Cell21</td><br/> | ||
| 1103 | <td>Cell22</td><br/> | ||
| 1104 | </tr><br/> | ||
| 1105 | </table><br/> | ||
| 1106 | </td> | ||
| 1107 | <td> | ||
| 1108 | #warning("Not implemented yet") | ||
| 1109 | </td> | ||
| 1110 | <td> | ||
| 1111 | <table id="MovieTable" class="grid sortable filterable doOddEven"> | ||
| 1112 | <tr class="sortHeader"> | ||
| 1113 | <th>Title1</th> | ||
| 1114 | <th>Title2</th> | ||
| 1115 | </tr> | ||
| 1116 | <tr> | ||
| 1117 | <td>Cell11</td> | ||
| 1118 | <td>Cell12</td> | ||
| 1119 | </tr> | ||
| 1120 | <tr> | ||
| 1121 | <td>Cell21</td> | ||
| 1122 | <td>Cell22</td> | ||
| 1123 | </tr> | ||
| 1124 | </table> | ||
| 1125 | </td> | ||
| 1126 | <td> | ||
| 1127 | #warning("Not implemented yet") | ||
| 1128 | </td> | ||
| 1129 | {/pre} | ||
| 1130 | </tr> | ||
| 1131 | </table> | ||
| 1132 | |||
| 1133 | 1.1 Images | ||
| 1134 | |||
| 1135 | <table class="wiki-table" border="1" cellspacing="0" cellpadding="2" width="80%"> | ||
| 1136 | <tr> | ||
| 1137 | <th>Feature</th> | ||
| 1138 | <th>XWiki Syntax 1.0</th> | ||
| 1139 | <th>XWiki Syntax 2.0</th> | ||
| 1140 | <th>Result</th> | ||
| 1141 | </tr> | ||
| 1142 | <tr> | ||
| 1143 | <td>Image from attachment in current page</td> | ||
| 1144 | <td> | ||
| 1145 | #info("See [Image Macro>code:Macros.ImageMacro] for details") | ||
| 1146 | {pre} | ||
| 1147 | {image:img.png} | ||
| 1148 | </td> | ||
| 1149 | <td>image:img.png</td> | ||
| 1150 | {/pre} | ||
| 1151 | <td> | ||
| 1152 | {image:img.png} | ||
| 1153 | </td> | ||
| 1154 | </tr> | ||
| 1155 | <tr> | ||
| 1156 | <td>Image from attachment in another document</td> | ||
| 1157 | <td> | ||
| 1158 | {pre} | ||
| 1159 | {image:img.png|document=Space.Page} | ||
| 1160 | </td> | ||
| 1161 | <td>image:Space.Page@img.png</td> | ||
| 1162 | {/pre} | ||
| 1163 | <td> | ||
| 1164 | {image:img.png} | ||
| 1165 | </td> | ||
| 1166 | </tr> | ||
| 1167 | <tr> | ||
| 1168 | <td>Image with parameters</td> | ||
| 1169 | <td> | ||
| 1170 | {pre} | ||
| 1171 | {image:img.png|width=25|height=25} | ||
| 1172 | </td> | ||
| 1173 | <td>[[image:img.png||width="25" height="25"]]</td> | ||
| 1174 | {/pre} | ||
| 1175 | <td> | ||
| 1176 | {image:img.png|width=25|height=25} | ||
| 1177 | </td> | ||
| 1178 | </tr> | ||
| 1179 | <tr> | ||
| 1180 | <td>Images located at URL</td> | ||
| 1181 | <td> | ||
| 1182 | {pre} | ||
| 1183 | http://some/url/img.png | ||
| 1184 | </td> | ||
| 1185 | <td>image:http://some/url/img.png</td> | ||
| 1186 | {/pre} | ||
| 1187 | <td> | ||
| 1188 | {image:img.png} | ||
| 1189 | </td> | ||
| 1190 | </tr> | ||
| 1191 | </table> | ||
| 1192 | |||
| 1193 | 1.1 Verbatim | ||
| 1194 | |||
| 1195 | Allow to enter content that will not be formatted (in other words the wiki syntax will not be taken into account). | ||
| 1196 | |||
| 1197 | #info("In XWiki Syntax 1.0 the [Pre macro>code:Macros.PreMacro] only preserves wiki syntax and Radeox macros. However HTML snippets and Groovy/Velocity scripts are still executed.") | ||
| 1198 | |||
| 1199 | <table class="wiki-table" border="1" cellspacing="0" cellpadding="2" width="80%"> | ||
| 1200 | <tr> | ||
| 1201 | <th>Feature</th> | ||
| 1202 | <th>XWiki Syntax 1.0</th> | ||
| 1203 | <th>XWiki Syntax 2.0</th> | ||
| 1204 | <th>Result XWiki Syntax 1.0</th> | ||
| 1205 | <th>Result XWiki Syntax 2.0</th> | ||
| 1206 | </tr> | ||
| 1207 | <tr> | ||
| 1208 | <td>Verbatim inline</td> | ||
| 1209 | <td> | ||
| 1210 | Some verbatim \{pre\}\*\[not rendered\]\*\{/pre\} content | ||
| 1211 | </td> | ||
| 1212 | {pre} | ||
| 1213 | <td> | ||
| 1214 | Some verbatim {{{**[[not rendered]]**}}} content | ||
| 1215 | </td> | ||
| 1216 | {/pre} | ||
| 1217 | <td> | ||
| 1218 | Some verbatim \*\[not rendered\]\* content | ||
| 1219 | </td> | ||
| 1220 | <td> | ||
| 1221 | Some verbatim \*\*\[\[not rendered\]\]\*\* content | ||
| 1222 | </td> | ||
| 1223 | </tr> | ||
| 1224 | <tr> | ||
| 1225 | <td>Verbatim block</td> | ||
| 1226 | <td> | ||
| 1227 | \{pre\} | ||
| 1228 | multi line<br/> | ||
| 1229 | \*verbatim\*<br/> | ||
| 1230 | content<br/> | ||
| 1231 | \{/pre\} | ||
| 1232 | #info("It's also possible to use the [Code macro>code:Macros.CodeMacro] but it displays its content in a box by default.") | ||
| 1233 | </td> | ||
| 1234 | <td> | ||
| 1235 | {{{<br/> | ||
| 1236 | multi line<br/> | ||
| 1237 | \*\*verbatim\*\*<br/> | ||
| 1238 | content<br/> | ||
| 1239 | }}} | ||
| 1240 | </td> | ||
| 1241 | <td> | ||
| 1242 | multi line<br/> | ||
| 1243 | \*verbatim\*<br/> | ||
| 1244 | content | ||
| 1245 | </td> | ||
| 1246 | <td> | ||
| 1247 | multi line<br/> | ||
| 1248 | \*\*verbatim\*\*<br/> | ||
| 1249 | content | ||
| 1250 | </td> | ||
| 1251 | </tr> | ||
| 1252 | </table> | ||
| 1253 | |||
| 1254 | 1.1 Quotations | ||
| 1255 | |||
| 1256 | Allows to quote some text. | ||
| 1257 | |||
| 1258 | <table class="wiki-table" border="1" cellspacing="0" cellpadding="2" width="80%"> | ||
| 1259 | <tr> | ||
| 1260 | <th>Feature</th> | ||
| 1261 | <th>XWiki Syntax 1.0</th> | ||
| 1262 | <th>XWiki Syntax 2.0</th> | ||
| 1263 | <th>Result</th> | ||
| 1264 | </tr> | ||
| 1265 | <tr> | ||
| 1266 | {pre} | ||
| 1267 | <td>Simple quote</td> | ||
| 1268 | <td> | ||
| 1269 | <blockquote>john said this</blockquote><br/> | ||
| 1270 | I said ok | ||
| 1271 | </td> | ||
| 1272 | <td> | ||
| 1273 | > john said this<br/> | ||
| 1274 | I said ok | ||
| 1275 | </td> | ||
| 1276 | {/pre} | ||
| 1277 | <td> | ||
| 1278 | <blockquote>john said this</blockquote> | ||
| 1279 | I said ok | ||
| 1280 | </td> | ||
| 1281 | </tr> | ||
| 1282 | <tr> | ||
| 1283 | {pre} | ||
| 1284 | <td>Nested quotes</td> | ||
| 1285 | <td> | ||
| 1286 | <blockquote>john said this<br/> | ||
| 1287 | <blockquote>marie answered that</blockquote><br/> | ||
| 1288 | </blockquote> | ||
| 1289 | </td> | ||
| 1290 | <td> | ||
| 1291 | > john said this<br/> | ||
| 1292 | >> marie answered that<br/> | ||
| 1293 | I said ok | ||
| 1294 | </td> | ||
| 1295 | {/pre} | ||
| 1296 | <td> | ||
| 1297 | <blockquote>john said this<blockquote>marie answered that</blockquote></blockquote> | ||
| 1298 | I said ok | ||
| 1299 | </td> | ||
| 1300 | </tr> | ||
| 1301 | </table> | ||
| 1302 | |||
| 1303 | 1.1 Escapes | ||
| 1304 | |||
| 1305 | <table class="wiki-table" border="1" cellspacing="0" cellpadding="2" width="80%"> | ||
| 1306 | <tr> | ||
| 1307 | <th>Feature</th> | ||
| 1308 | <th>XWiki Syntax 1.0</th> | ||
| 1309 | <th>XWiki Syntax 2.0</th> | ||
| 1310 | <th>Result XWiki Syntax 1.0</th> | ||
| 1311 | <th>Result XWiki Syntax 2.0</th> | ||
| 1312 | </tr> | ||
| 1313 | <tr> | ||
| 1314 | {pre} | ||
| 1315 | <td>Escape a character</td> | ||
| 1316 | <td>This is not a \[link\]</td> | ||
| 1317 | <td> | ||
| 1318 | This is not a ~[~[link~]~] | ||
| 1319 | #info("To enter a ~ character use a double escape: ~~") | ||
| 1320 | </td> | ||
| 1321 | {/pre} | ||
| 1322 | <td>This is not a \[link\]</td> | ||
| 1323 | <td>This is not a \[\[link\]\]</td> | ||
| 1324 | </tr> | ||
| 1325 | </table> | ||
| 1326 | |||
| 1327 | 1.1 Macros | ||
| 1328 | |||
| 1329 | There are 2 kinds of macros in XWiki syntax 1.0: | ||
| 1330 | * Velocity macros (called using the <tt>\#macroname(param1 ... paramN)</tt> syntax) | ||
| 1331 | * Radeox macros (called using the <tt>\{macroname:param1=value1|...|paramN=valueN\}</tt> syntax) | ||
| 1332 | |||
| 1333 | There are also 2 kinds of macros in XWiki Syntax 2.0: | ||
| 1334 | * Velocity macros (called using the <tt>\#macroname(param1 ... paramN)</tt> syntax) | ||
| 1335 | * XWiki macros (called using the <tt>\{\{macroname param1="value1" ... paramN="valueN"\}\}</tt> syntax) | ||
| 1336 | |||
| 1337 | #info("The Radeox macros cannot be used in XWiki Syntax 2.0. Thus they have been rewritten as XWiki macros.") | ||
| 1338 | |||
| 1339 | #info("For the full list of available macros check the [Macro Reference page>code:Macros.WebHome].") | ||
| 1340 | |||
| 1341 | <table class="wiki-table" border="1" cellspacing="0" cellpadding="2" width="80%"> | ||
| 1342 | <tr> | ||
| 1343 | <th>Feature</th> | ||
| 1344 | <th>XWiki Syntax 1.0</th> | ||
| 1345 | <th>XWiki Syntax 2.0</th> | ||
| 1346 | <th>Result</th> | ||
| 1347 | </tr> | ||
| 1348 | <tr> | ||
| 1349 | <td>Velocity Macro</td> | ||
| 1350 | <td> | ||
| 1351 | \#info("Some info text") | ||
| 1352 | </td> | ||
| 1353 | <td> | ||
| 1354 | \{\{velocity\}\} | ||
| 1355 | \#info("Some info text") | ||
| 1356 | \{\{/velocity\}\} | ||
| 1357 | </td> | ||
| 1358 | <td>#info("Some info text")</td> | ||
| 1359 | </tr> | ||
| 1360 | <tr> | ||
| 1361 | <td>Radeox Macro/XWiki Macros</td> | ||
| 1362 | <td> | ||
| 1363 | \{code:java\} | ||
| 1364 | content | ||
| 1365 | \{code\} | ||
| 1366 | </td> | ||
| 1367 | <td> | ||
| 1368 | \{\{velocity context="new"\}\} | ||
| 1369 | content | ||
| 1370 | \{\{/velocity\}\} | ||
| 1371 | </td> | ||
| 1372 | <td>N/A (depends on the macro)</td> | ||
| 1373 | </tr> | ||
| 1374 | </table> | ||
| 1375 | |||
| 1376 | 1.1 HTML | ||
| 1377 | |||
| 1378 | #info("In XWiki Syntax 2.0 HTML must be entered by using either the HTML or XHTML macros whereas in XWiki Syntax 1.0 it's possible to enter HTML directly in the text") | ||
| 1379 | |||
| 1380 | <table class="wiki-table" border="1" cellspacing="0" cellpadding="2" width="80%"> | ||
| 1381 | <tr> | ||
| 1382 | <th>XWiki Syntax 1.0</th> | ||
| 1383 | <th>XWiki Syntax 2.0</th> | ||
| 1384 | <th>Result</th> | ||
| 1385 | </tr> | ||
| 1386 | <tr> | ||
| 1387 | {pre} | ||
| 1388 | <td><b>bold</b></td> | ||
| 1389 | <td> | ||
| 1390 | {{html}}<br/> | ||
| 1391 | <b>bold</b><br/> | ||
| 1392 | {{/html}} | ||
| 1393 | #info("The {{xhtml}} macro can also be used provided you enter valid XHTML.") | ||
| 1394 | </td> | ||
| 1395 | {/pre} | ||
| 1396 | <td><b>bold</b></td> | ||
| 1397 | </tr> | ||
| 1398 | </table> | ||
| 1399 | |||
| 1400 | #info("In XWiki Syntax 2.0, by default the XHTML macro understands wiki syntax. To prevent this, use {{xhtml escapeWikiSyntax=\"true\"}}") | ||
| 1401 | |||
| 1402 | 1.1 Velocity/Groovy Scripts | ||
| 1403 | |||
| 1404 | #info("In XWiki Syntax 1.0 it was possible to enter Velocity scripts anywhere directly in the page. This lead to issues for example when the user was involuntarily entering Velocity content. It was also performance hungry for pages not requiring Velocity content. There were several other technical limitations. Thus in XWiki Syntax 2.0 Velocity scripts must be entered using the <tt>velocity</tt> macro. Same goes for entering Groovy scripts.") | ||
| 1405 | |||
| 1406 | <table class="wiki-table" border="1" cellspacing="0" cellpadding="2" width="80%"> | ||
| 1407 | <tr> | ||
| 1408 | <th>Feature</th> | ||
| 1409 | <th>XWiki Syntax 1.0</th> | ||
| 1410 | <th>XWiki Syntax 2.0</th> | ||
| 1411 | </tr> | ||
| 1412 | <tr> | ||
| 1413 | <td>Velocity script</td> | ||
| 1414 | <td>\#set (\$var = "whatever")</td> | ||
| 1415 | <td> | ||
| 1416 | \{\{velocity\}\}<br/> | ||
| 1417 | \#set (\$var = "whatever")<br/> | ||
| 1418 | \{\{/velocity\}\} | ||
| 1419 | </td> | ||
| 1420 | </tr> | ||
| 1421 | <tr> | ||
| 1422 | <td>Groovy script</td> | ||
| 1423 | <td> | ||
| 1424 | \<\%<br/> | ||
| 1425 | def var = "whatever"<br/> | ||
| 1426 | \%\> | ||
| 1427 | </td> | ||
| 1428 | <td> | ||
| 1429 | #warning("Not implemented yet") | ||
| 1430 | \{\{groovy\}\}<br/> | ||
| 1431 | def var = "whatever"<br/> | ||
| 1432 | \{\{/groovy\}\} | ||
| 1433 | </td> | ||
| 1434 | </tr> | ||
| 1435 | </table> | ||
| 1436 | |||
| 1437 | 1.1 Other syntaxes | ||
| 1438 | |||
| 1439 | The following other syntaxes are implemented in XWiki Enterprise 1.6 and above: | ||
| 1440 | * [JSPWiki>http://www.jspwiki.org/wiki/TextFormattingRules] | ||
| 1441 | * [MediaWiki>http://en.wikipedia.org/wiki/Help:Editing] | ||
| 1442 | * [Confluence>http://confluence.atlassian.com/display/CONF20/Confluence+Notation+Guide+Overview] | ||
| 1443 | * [TWiki>http://twiki.org/cgi-bin/view/TWiki/WikiSyntax] | ||
| 1444 | * [Creole 1.0>http://www.wikicreole.org/wiki/Creole1.0] | ||
| 1445 | * [XHTML 1.0>http://www.w3.org/TR/xhtml1/] | ||
| 1446 | |||
| 1447 | #warning("The implementation for these syntaxes is not fully finished yet. For example support for links is not working 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. This is planned for XWiki Enterprise 1.7 and 1.8.") |
