≪ View Page

Unterschiede

Hier werden die Unterschiede zwischen zwei Versionen angezeigt.

Link zu dieser Vergleichsansicht

Beide Seiten der vorigen RevisionVorhergehende Überarbeitung
Nächste Überarbeitung		Vorhergehende Überarbeitung
Letzte ÜberarbeitungBeide Seiten der Revision
wiki:syntax [30.11.2016 um 10:12 Uhr] – Externe Bearbeitung 127.0.0.1wiki:syntax [22.04.2021 um 08:35 Uhr] – [Tables] Lina Förster
Zeile 137: Zeile 137:
 Resize to given width and height((when the aspect ratio of the given width and height doesn't match that of the image, it will be cropped to the new ratio before resizing)): {{wiki:dokuwiki-128.png?200x50}} Resize to given width and height((when the aspect ratio of the given width and height doesn't match that of the image, it will be cropped to the new ratio before resizing)): {{wiki:dokuwiki-128.png?200x50}}
  
-Resized external image:           {{http://php.net/images/php.gif?200x50}}+Resized external image:           {{https://secure.php.net/images/php.gif?200x50}}
  
   Real size:                        {{wiki:dokuwiki-128.png}}   Real size:                        {{wiki:dokuwiki-128.png}}
   Resize to given width:            {{wiki:dokuwiki-128.png?50}}   Resize to given width:            {{wiki:dokuwiki-128.png?50}}
   Resize to given width and height: {{wiki:dokuwiki-128.png?200x50}}   Resize to given width and height: {{wiki:dokuwiki-128.png?200x50}}
-  Resized external image:           {{http://php.net/images/php.gif?200x50}}+  Resized external image:           {{https://secure.php.net/images/php.gif?200x50}}
  
  
Zeile 302: Zeile 302:
  
 DokuWiki supports a simple syntax to create tables. DokuWiki supports a simple syntax to create tables.
 +
 +^Heading 1  ^Heading 2  ^Heading 3  |
 +|Row 1 Col 1  |Row 1 Col 2  |Row 1 Col 3  |
 +|Row 2 Col 1  |some colspan (note the double pipe)||
 +|Row 3 Col 1  |Row 3 Col 2  |Row 3 Col 3  |
 +
 +Table rows have to start and end with a ''''| for normal rows or a ''''^ for headers.
 +<code>
  
 ^ Heading 1      ^ Heading 2       ^ Heading 3          ^ ^ Heading 1      ^ Heading 2       ^ Heading 3          ^
Zeile 308: Zeile 316:
 | Row 3 Col 1    | Row 3 Col 2     | Row 3 Col 3        | | Row 3 Col 1    | Row 3 Col 2     | Row 3 Col 3        |
  
-Table rows have to start and end with a ''|'' for normal rows or a ''^'' for headers. +</code>
- +
-  ^ Heading 1      ^ Heading 2       ^ Heading 3          ^ +
-  | Row 1 Col 1    | Row 1 Col 2     | Row 1 Col 3        | +
-  | Row 2 Col 1    | some colspan (note the double pipe) || +
-  | Row 3 Col 1    | Row 3 Col 2     | Row 3 Col 3        |+
  
 To connect cells horizontally, just make the next cell completely empty as shown above. Be sure to have always the same amount of cell separators! To connect cells horizontally, just make the next cell completely empty as shown above. Be sure to have always the same amount of cell separators!
Zeile 319: Zeile 322:
 Vertical tableheaders are possible, too. Vertical tableheaders are possible, too.
  
-|              ^ Heading 1            ^ Heading 2          ^+|   ^Heading 1  ^Heading 2  | 
 +^Heading 3  |Row 1 Col 2  |Row 1 Col 3  | 
 +^Heading 4  |no colspan this time|   | 
 +^Heading 5  |Row 2 Col 2  |Row 2 Col 3  | 
 + 
 +As you can see, it's the cell separator before a cell which decides about the formatting: 
 +<code> 
 + 
 +|   ^ Heading 1            ^ Heading 2          ^
 ^ Heading 3    | Row 1 Col 2          | Row 1 Col 3        | ^ Heading 3    | Row 1 Col 2          | Row 1 Col 3        |
-^ Heading 4    | no colspan this time |                    |+^ Heading 4    | no colspan this time |   |
 ^ Heading 5    | Row 2 Col 2          | Row 2 Col 3        | ^ Heading 5    | Row 2 Col 2          | Row 2 Col 3        |
  
-As you can see, it's the cell separator before a cell which decides about the formatting:+</code>
  
-  |              ^ Heading 1            ^ Heading 2          ^ +You can have rowspans (vertically connected cells) by adding ''<nowiki>:::</nowiki>'' into the cells below the one to which they should connect.
-  ^ Heading 3    | Row 1 Col 2          | Row 1 Col 3        | +
-  ^ Heading 4    | no colspan this time |                    | +
-  ^ Heading 5    | Row 2 Col 2          | Row 2 Col 3        |+
  
-You can have rowspans (vertically connected cells) by adding ''%%:::%%'' into the cells below the one to which they should connect.+^Heading 1  ^Heading 2  ^Heading 3  | 
 +|Row 1 Col 1  |this cell spans vertically|Row 1 Col 3  | 
 +|Row 2 Col 1  | ::: |Row 2 Col 3  | 
 +|Row 3 Col 1  | ::: |Row 2 Col 3  | 
 + 
 +Apart from the rowspan syntax those cells should not contain anything else. 
 +<code>
  
 ^ Heading 1      ^ Heading 2                  ^ Heading 3          ^ ^ Heading 1      ^ Heading 2                  ^ Heading 3          ^
Zeile 338: Zeile 352:
 | Row 3 Col 1    | :::                        | Row 2 Col 3        | | Row 3 Col 1    | :::                        | Row 2 Col 3        |
  
-Apart from the rowspan syntax those cells should not contain anything else. +</code>
- +
-  ^ Heading 1      ^ Heading 2                  ^ Heading 3          ^ +
-  | Row 1 Col 1    | this cell spans vertically | Row 1 Col 3        | +
-  | Row 2 Col 1    | :::                        | Row 2 Col 3        | +
-  | Row 3 Col 1    | :::                        | Row 2 Col 3        |+
  
 You can align the table contents, too. Just add at least two whitespaces at the opposite end of your text: Add two spaces on the left to align right, two spaces on the right to align left and two spaces at least at both ends for centered text. You can align the table contents, too. Just add at least two whitespaces at the opposite end of your text: Add two spaces on the left to align right, two spaces on the right to align left and two spaces at least at both ends for centered text.
 +
 +^  Table with alignment  ^^|
 +|  right|  center  |left  |
 +|left  |  right|  center  |
 +|xxxxxxxxxxxx|xxxxxxxxxxxx|xxxxxxxxxxxx|
 +
 +This is how it looks in the source:
 +<code>
  
 ^           Table with alignment           ^^^ ^           Table with alignment           ^^^
Zeile 352: Zeile 369:
 | xxxxxxxxxxxx | xxxxxxxxxxxx | xxxxxxxxxxxx | | xxxxxxxxxxxx | xxxxxxxxxxxx | xxxxxxxxxxxx |
  
-This is how it looks in the source: +</code>
- +
-  ^           Table with alignment           ^^^ +
-  |         right|    center    |left          | +
-  |left          |         right|    center    | +
-  | xxxxxxxxxxxx | xxxxxxxxxxxx | xxxxxxxxxxxx |+
  
 Note: Vertical alignment is not supported. Note: Vertical alignment is not supported.
 +
  
 ===== No Formatting ===== ===== No Formatting =====
Zeile 417: Zeile 430:
 </code> </code>
  
-The following language strings are currently recognized: //4cs, 6502acme, 6502kickass, 6502tasm, 68000devpac, abap, actionscript-french, actionscript, actionscript3, ada, algol68, apache, applescript, asm, asp, autoconf, autohotkey, autoit, avisynth, awk, bascomavr, bash, basic4gl, bf, bibtex, blitzbasic, bnf, boo, c, c_loadrunner, c_mac, caddcl, cadlisp, cfdg, cfm, chaiscript, cil, clojure, cmake, cobol, coffeescript, cpp, cpp-qt, csharp, css, cuesheet, d, dcs, delphi, diff, div, dos, dot, e, epc, ecmascript, eiffel, email, erlang, euphoria, f1, falcon, fo, fortran, freebasic, fsharp, gambas, genero, genie, gdb, glsl, gml, gnuplot, go, groovy, gettext, gwbasic, haskell, hicest, hq9plus, html, html5, icon, idl, ini, inno, intercal, io, j, java5, java, javascript, jquery, kixtart, klonec, klonecpp, latex, lb, lisp, llvm, locobasic, logtalk, lolcode, lotusformulas, lotusscript, lscript, lsl2, lua, m68k, magiksf, make, mapbasic, matlab, mirc, modula2, modula3, mmix, mpasm, mxml, mysql, newlisp, nsis, oberon2, objc, objeck, ocaml-brief, ocaml, oobas, oracle8, oracle11, oxygene, oz, pascal, pcre, perl, perl6, per, pf, php-brief, php, pike, pic16, pixelbender, pli, plsql, postgresql, povray, powerbuilder, powershell, proftpd, progress, prolog, properties, providex, purebasic, pycon, python, q, qbasic, rails, rebol, reg, robots, rpmspec, rsplus, ruby, sas, scala, scheme, scilab, sdlbasic, smalltalk, smarty, sql, systemverilog, tcl, teraterm, text, thinbasic, tsql, typoscript, unicon, uscript, vala, vbnet, vb, verilog, vhdl, vim, visualfoxpro, visualprolog, whitespace, winbatch, whois, xbasic, xml, xorg_conf, xpp, yaml, z80, zxbasic//+The following language strings are currently recognized: //4cs 6502acme 6502kickass 6502tasm 68000devpac abap actionscript3 actionscript ada aimms algol68 apache applescript apt_sources arm asm asp asymptote autoconf autohotkey autoit avisynth awk bascomavr bash basic4gl batch bf biblatex bibtex blitzbasic bnf boo caddcl cadlisp ceylon cfdg cfm chaiscript chapel cil c_loadrunner clojure c_mac cmake cobol coffeescript c cpp cpp-qt cpp-winapi csharp css cuesheet c_winapi dart dcl dcpu16 dcs delphi diff div dos dot d ecmascript eiffel email epc e erlang euphoria ezt f1 falcon fo fortran freebasic freeswitch fsharp gambas gdb genero genie gettext glsl gml gnuplot go groovy gwbasic haskell haxe hicest hq9plus html html4strict html5 icon idl ini inno intercal io ispfpanel java5 java javascript jcl j jquery julia kixtart klonec klonecpp kotlin latex lb ldif lisp llvm locobasic logtalk lolcode lotusformulas lotusscript lscript lsl2 lua m68k magiksf make mapbasic mathematica matlab mercury metapost mirc mk-61 mmix modula2 modula3 mpasm mxml mysql nagios netrexx newlisp nginx nimrod nsis oberon2 objc objeck ocaml-brief ocaml octave oobas oorexx oracle11 oracle8 oxygene oz parasail parigp pascal pcre perl6 perl per pf phix php-brief php pic16 pike pixelbender pli plsql postgresql postscript povray powerbuilder powershell proftpd progress prolog properties providex purebasic pycon pys60 python qbasic qml q racket rails rbs rebol reg rexx robots roff rpmspec rsplus ruby rust sas sass scala scheme scilab scl sdlbasic smalltalk smarty spark sparql sql sshconfig standardml stonescript swift systemverilog tclegg tcl teraterm texgraph text thinbasic tsql twig typoscript unicon upc urbi uscript vala vbnet vb vbscript vedit verilog vhdl vim visualfoxpro visualprolog whitespace whois winbatch wolfram xbasic xml xojo xorg_conf xpp yaml z80 zxbasic// 
 + 
 +There are additional [[doku>syntax_highlighting|advanced options]] available for syntax highlighting, such as highlighting lines or adding line numbers.
  
 ==== Downloadable Code Blocks ==== ==== Downloadable Code Blocks ====