Differences

This shows you the differences between two versions of the page.

--- wiki:syntax [2016/11/04 16:42] – vidschofelix
+++ wiki:syntax [2016/11/04 17:11] – vidschofelix
@@ Line 120: / Line 120: @@
 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://php.net/images/php.gif?200x50}}
   Real size:                        {{wiki:dokuwiki-128.png}}
   Resize to given width:            {{wiki:dokuwiki-128.png?50}}
   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://php.net/images/php.gif?200x50}}
@@ Line 235: / Line 235: @@
   * FIXME %%  FIXME %%
   * DELETEME %% DELETEME %%
-==== Text to HTML Conversions ====
-Typography: [[DokuWiki]] can convert simple text characters to their typographically correct entities. Here is an example of recognized characters.
--> <- <-> => <= <=> >> << -- --- 640x480 (c) (tm) (r)
-"He thought 'It's a man's world'..."
-<code>
--> <- <-> => <= <=> >> << -- --- 640x480 (c) (tm) (r)
-"He thought 'It's a man's world'..."
-</code>
-The same can be done to produce any kind of HTML, it just needs to be added to the [[doku>entities|pattern file]].
-There are three exceptions which do not come from that pattern file: multiplication entity (640x480), 'single' and "double quotes". They can be turned off through a [[doku>config:typography|config option]].
-===== Quoting =====
-Some times you want to mark some text to show it's a reply or comment. You can use the following syntax:
-<code>
-I think we should do it
-> No we shouldn't
->> Well, I say we should
-> Really?
->> Yes!
->>> Then lets do it!
-</code>
-I think we should do it
-> No we shouldn't
->> Well, I say we should
-> Really?
->> Yes!
->>> Then lets do it!
 ===== Tables =====
@@ Line 418: / Line 372: @@
 If you don't want any highlighting but want a downloadable file, specify a dash (''-'') as the language code: ''%%<code - myfile.foo>%%''.
+===== Embedding HTML and PHP =====
+You can embed raw HTML or PHP code into your documents by using the ''%%<html>%%'' or ''%%<php>%%'' tags. (Use uppercase tags if you need to enclose block level elements.)
+HTML example:
+<code>
+<html>
+This is some <span style="color:red;font-size:150%;">inline HTML</span>
+</html>
+<HTML>
+<p style="border:2px dashed red;">And this is some block HTML</p>
+</HTML>
+</code>
+<html>
+This is some <span style="color:red;font-size:150%;">inline HTML</span>
+</html>
+<HTML>
+<p style="border:2px dashed red;">And this is some block HTML</p>
+</HTML>
+PHP example:
+<code>
+<php>
+echo 'The PHP version: ';
+echo phpversion();
+echo ' (generated inline HTML)';
+</php>
+<PHP>
+echo '<table class="inline"><tr><td>The same, but inside a block level element:</td>';
+echo '<td>'.phpversion().'</td>';
+echo '</tr></table>';
+</PHP>
+</code>
+<php>
+echo 'The PHP version: ';
+echo phpversion();
+echo ' (inline HTML)';
+</php>
+<PHP>
+echo '<table class="inline"><tr><td>The same, but inside a block level element:</td>';
+echo '<td>'.phpversion().'</td>';
+echo '</tr></table>';
+</PHP>
+**Please Note**: HTML and PHP embedding is disabled by default in the configuration. If disabled, the code is displayed instead of executed.
 ===== RSS/ATOM Feed Aggregation =====