diff options
| -rw-r--r-- | markdown.py | 120 | ||||
| -rw-r--r-- | tests/markdown-test/amps-and-angle-encoding.html | 4 | ||||
| -rw-r--r-- | tests/markdown-test/markdown-documentation-basics.html | 67 | ||||
| -rw-r--r-- | tests/markdown-test/markdown-syntax.html | 373 | ||||
| -rw-r--r-- | tests/markdown-test/strong-and-em-together.html | 4 | ||||
| -rw-r--r-- | tests/misc/arabic.html | 15 | ||||
| -rw-r--r-- | tests/misc/bidi.html | 12 | ||||
| -rw-r--r-- | tests/misc/blockquote.html | 19 | ||||
| -rw-r--r-- | tests/misc/funky-list.html | 13 | ||||
| -rw-r--r-- | tests/misc/japanese.html | 2 | ||||
| -rw-r--r-- | tests/misc/multi-test.html | 13 | ||||
| -rw-r--r-- | tests/misc/numeric-entity.html | 2 | ||||
| -rw-r--r-- | tests/misc/php.html | 2 | ||||
| -rw-r--r-- | tests/misc/russian.html | 3 | ||||
| -rw-r--r-- | tests/misc/underscores.html | 9 |
15 files changed, 339 insertions, 319 deletions
diff --git a/markdown.py b/markdown.py index 032e084..d1ffce6 100644 --- a/markdown.py +++ b/markdown.py @@ -151,6 +151,9 @@ EXECUTABLE_NAME_FOR_USAGE = "python markdown.py" AND_SUBSTITUTE = unichr(2) + unichr(4) + unichr(3) +INLINE_PLACEHOLDER_PREFIX = u'\u0001' +INLINE_PLACEHOLDER_SUFFIX = u'\u0002' + # a template for html placeholders HTML_PLACEHOLDER_PREFIX = "qaodmasdkwaspemas" HTML_PLACEHOLDER = HTML_PLACEHOLDER_PREFIX + "%dajkqlsmdqpakldnzsdfls" @@ -504,7 +507,7 @@ BRK = ( r'\[(' + NOBRACKET + r')\]' ) NOIMG = r'(?<!\!)' -BACKTICK_RE = r'\`([^\`]*)\`' # `e= m*c^2` +BACKTICK_RE = r'([^\\])\`([^\`]*[^\\]{0,1})\`' # `e= m*c^2` DOUBLE_BACKTICK_RE = r'\`\`(.*?)\`\`' # ``e=f("`")`` ESCAPE_RE = r'\\(.)' # \< EMPHASIS_RE = r'\*([^\*]*)\*' # *emphasis* @@ -538,13 +541,14 @@ LINE_BREAK_2_RE = r' $' # two spaces at end of text class Pattern: """Base class that inline patterns subclass. """ - def __init__ (self, pattern): + def __init__ (self, pattern, contentGroup=2): """ Create an instant of an inline pattern. Keyword arguments: * pattern: A regular expression that matches a pattern + * contentGroup: Index of group with content, that will be replaced """ self.pattern = pattern @@ -552,6 +556,7 @@ class Pattern: # Api for Markdown to pass safe_mode into instance self.safe_mode = False + self.contentGroup = contentGroup def getCompiledRegExp (self): """ Return a compiled regular expression. """ @@ -580,7 +585,10 @@ BasePattern = Pattern # for backward compatibility class SimpleTextPattern (Pattern): """ Return a simple TextNode of group(2) of a Pattern. """ def handleMatch(self, m): - return m.group(2) + text = m.group(2) + if text == INLINE_PLACEHOLDER_PREFIX: + return None + return text class SimpleTagPattern (Pattern): """ @@ -604,13 +612,13 @@ class SubstituteTagPattern (SimpleTagPattern): class BacktickPattern (Pattern): """ Return a NanoDom `<code>` Element containing the matching text. """ - def __init__ (self, pattern): - Pattern.__init__(self, pattern) + def __init__ (self, pattern, contentGroup=2): + Pattern.__init__(self, pattern, contentGroup) self.tag = "code" def handleMatch(self, m): el = etree.Element(self.tag) - el.text = m.group(2).strip() + el.text = m.group(self.contentGroup).strip() return el @@ -783,7 +791,7 @@ class AutomailPattern (Pattern): ESCAPE_PATTERN = SimpleTextPattern(ESCAPE_RE) NOT_STRONG_PATTERN = SimpleTextPattern(NOT_STRONG_RE) -BACKTICK_PATTERN = BacktickPattern(BACKTICK_RE) +BACKTICK_PATTERN = BacktickPattern(BACKTICK_RE, 3) DOUBLE_BACKTICK_PATTERN = BacktickPattern(DOUBLE_BACKTICK_RE) STRONG_PATTERN = SimpleTagPattern(STRONG_RE, 'strong') STRONG_PATTERN_2 = SimpleTagPattern(STRONG_2_RE, 'strong') @@ -1048,8 +1056,8 @@ def dequote(string): class InlineStash: def __init__(self): - self.prefix = u'\u0001' - self.suffix = u'\u0002' + self.prefix = INLINE_PLACEHOLDER_PREFIX + self.suffix = INLINE_PLACEHOLDER_SUFFIX self._nodes = {} self.phLength = 4 + len(self.prefix) + len(self.suffix) @@ -1645,6 +1653,49 @@ class Markdown: patternIndex += 1 return data + + def _applyInline(self, pattern, data, patternIndex): + """ + Given a pattern name, this function checks if the line + fits the pattern, creates the necessary elements, adds it + to InlineStash, and returns string with placeholders, + instead of ElementTree elements. + + Keyword arguments: + + * data: the text to be processed + * pattern: the pattern to be checked + * patternIndex: index of current pattern + + Returns: String with placeholders. + """ + + match = pattern.getCompiledRegExp().match(data) + + if not match: + return data, False + + node = pattern.handleMatch(match) + + if node is None: + return data, False + if not isstr(node): + if not node.tag in ["code", "pre"]: + # We need to process current node too + for child in [node] + node.getchildren(): + if not isstr(node): + if child.text: + child.text = self._handleInline(child.text, + patternIndex) + if child.tail: + child.tail = self._handleInline(child.tail, + patternIndex) + + pholder = self.inlineStash.add(node, pattern.type()) + left = "".join([match.group(i) for i in xrange(1, + pattern.contentGroup)]) + + return "%s%s%s" % (left, pholder, match.groups()[-1]), True def _processElementText(self, node, subnode, isText=True): @@ -1692,16 +1743,16 @@ class Markdown: result = [] prefix = self.inlineStash.prefix strartIndex = 0 - + while data: index = data.find(prefix, strartIndex) if index != -1: id, phEndIndex = self.inlineStash.extractId(data, index) - + if self.inlineStash.isin(id): - + node = self.inlineStash.get(id) if index > 0: @@ -1733,55 +1784,12 @@ class Markdown: strartIndex = end else: - text = data[strartIndex:].strip() + text = data[strartIndex:] linkText(text) data = "" return result - - - def _applyInline(self, pattern, data, patternIndex): - """ - Given a pattern name, this function checks if the line - fits the pattern, creates the necessary elements, adds it - to InlineStash, and returns string with placeholders, - instead of ElementTree elements. - - Keyword arguments: - - * data: the text to be processed - * pattern: the pattern to be checked - * patternIndex: index of current pattern - - Returns: String with placeholders. - """ - - match = pattern.getCompiledRegExp().match(data) - - if not match: - return data, False - - node = pattern.handleMatch(match) - - if node is None: - return data, False - if not isstr(node): - if not node.tag in ["code", "pre"]: - # We need to process current node too - for child in [node] + node.getchildren(): - if not isstr(node): - if child.text: - child.text = self._handleInline(child.text, - patternIndex) - if child.tail: - child.tail = self._handleInline(child.tail, - patternIndex) - - pholder = self.inlineStash.add(node, pattern.type()) - - return "%s%s%s" % (match.group(1), pholder, match.groups()[-1]), True - def _processTree(self, el): """ Processing ElementTree, and applying inline patterns diff --git a/tests/markdown-test/amps-and-angle-encoding.html b/tests/markdown-test/amps-and-angle-encoding.html index 9c565e5..fc1b2c3 100644 --- a/tests/markdown-test/amps-and-angle-encoding.html +++ b/tests/markdown-test/amps-and-angle-encoding.html @@ -3,7 +3,7 @@ <p>This & that.</p> <p>4 < 5.</p> <p>6 > 5.</p> -<p>Here's a <a href="http://example.com/?foo=1&bar=2">link</a>with an ampersand in the URL.</p> +<p>Here's a <a href="http://example.com/?foo=1&bar=2">link</a> with an ampersand in the URL.</p> <p>Here's a link with an amersand in the link text: <a href="http://att.com/" title="AT&T">AT&T</a>.</p> <p>Here's an inline <a href="/script?foo=1&bar=2">link</a>.</p> -<p>Here's an inline <a href="/script?foo=1&bar=2">link</a>.</p>
\ No newline at end of file +<p>Here's an inline <a href="/script?foo=1&bar=2">link</a>.</p> diff --git a/tests/markdown-test/markdown-documentation-basics.html b/tests/markdown-test/markdown-documentation-basics.html index 9c5259f..6755f77 100644 --- a/tests/markdown-test/markdown-documentation-basics.html +++ b/tests/markdown-test/markdown-documentation-basics.html @@ -8,16 +8,16 @@ </ul></p> <h2>Getting the Gist of Markdown's Formatting Syntax</h2> <p>This page offers a brief overview of what it's like to use Markdown. -The <a href="/projects/markdown/syntax" title="Markdown Syntax">syntax page</a>provides complete, detailed documentation for +The <a href="/projects/markdown/syntax" title="Markdown Syntax">syntax page</a> provides complete, detailed documentation for every feature, but Markdown should be very easy to pick up simply by looking at a few examples of it in action. The examples on this page are written in a before/after style, showing example syntax and the HTML output produced by Markdown.</p> -<p>It's also helpful to simply try Markdown out; the <a href="/projects/markdown/dingus" title="Markdown Dingus">Dingus</a>is a +<p>It's also helpful to simply try Markdown out; the <a href="/projects/markdown/dingus" title="Markdown Dingus">Dingus</a> is a web application that allows you type your own Markdown-formatted text and translate it to XHTML.</p> <p> -<strong>Note:</strong> This document is itself written using Markdown; you + <strong>Note:</strong> This document is itself written using Markdown; you can <a href="/projects/markdown/basics.text">see the source for it by adding '.text' to the URL</a>.</p> <h2>Paragraphs, Headers, Blockquotes</h2> <p>A paragraph is simply one or more consecutive lines of text, separated @@ -33,7 +33,7 @@ HTML header level.</p> <p>Blockquotes are indicated using email-style '<code>></code>' angle brackets.</p> <p>Markdown:</p> <pre> -<code>A First Level Header + <code>A First Level Header ==================== A Second Level Header @@ -57,7 +57,7 @@ dog's back. </pre> <p>Output:</p> <pre> -<code><h1>A First Level Header</h1> + <code><h1>A First Level Header</h1> <h2>A Second Level Header</h2> @@ -83,7 +83,7 @@ dog's back.</p> <p>Markdown uses asterisks and underscores to indicate spans of emphasis.</p> <p>Markdown:</p> <pre> -<code>Some of these words *are emphasized*. + <code>Some of these words *are emphasized*. Some of these words _are emphasized also_. Use two asterisks for **strong emphasis**. @@ -92,7 +92,7 @@ Or, if you prefer, __use two underscores instead__. </pre> <p>Output:</p> <pre> -<code><p>Some of these words <em>are emphasized</em>. + <code><p>Some of these words <em>are emphasized</em>. Some of these words <em>are emphasized also</em>.</p> <p>Use two asterisks for <strong>strong emphasis</strong>. @@ -104,28 +104,28 @@ Or, if you prefer, <strong>use two underscores instead</strong>.< <code>+</code>, and <code>-</code>) as list markers. These three markers are interchangable; this:</p> <pre> -<code>* Candy. + <code>* Candy. * Gum. * Booze. </code> </pre> <p>this:</p> <pre> -<code>+ Candy. + <code>+ Candy. + Gum. + Booze. </code> </pre> <p>and this:</p> <pre> -<code>- Candy. + <code>- Candy. - Gum. - Booze. </code> </pre> <p>all produce the same output:</p> <pre> -<code><ul> + <code><ul> <li>Candy.</li> <li>Gum.</li> <li>Booze.</li> @@ -135,25 +135,25 @@ interchangable; this:</p> <p>Ordered (numbered) lists use regular numbers, followed by periods, as list markers:</p> <pre> -<code>1. Red + <code>1. Red 2. Green 3. Blue </code> </pre> <p>Output:</p> <pre> -<code><ol> + <code><ol> <li>Red</li> <li>Green</li> <li>Blue</li> </ol> </code> </pre> -<p>If you put blank lines between items, you'll get <code><p></code>tags for the +<p>If you put blank lines between items, you'll get <code><p></code> tags for the list item text. You can create multi-paragraph list items by indenting the paragraphs by 4 spaces or 1 tab:</p> <pre> -<code>* A list item. + <code>* A list item. With multiple paragraphs. @@ -162,7 +162,7 @@ the paragraphs by 4 spaces or 1 tab:</p> </pre> <p>Output:</p> <pre> -<code><ul> + <code><ul> <li><p>A list item.</p> <p>With multiple paragraphs.</p></li> <li><p>Another item in the list.</p></li> @@ -176,30 +176,30 @@ text you want to turn into a link.</p> <p>Inline-style links use parentheses immediately after the link text. For example:</p> <pre> -<code>This is an [example link](http://example.com/). + <code>This is an [example link](http://example.com/). </code> </pre> <p>Output:</p> <pre> -<code><p>This is an <a href="http://example.com/"> + <code><p>This is an <a href="http://example.com/"> example link</a>.</p> </code> </pre> <p>Optionally, you may include a title attribute in the parentheses:</p> <pre> -<code>This is an [example link](http://example.com/ "With a Title"). + <code>This is an [example link](http://example.com/ "With a Title"). </code> </pre> <p>Output:</p> <pre> -<code><p>This is an <a href="http://example.com/" title="With a Title"> + <code><p>This is an <a href="http://example.com/" title="With a Title"> example link</a>.</p> </code> </pre> <p>Reference-style links allow you to refer to your links by names, which you define elsewhere in your document:</p> <pre> -<code>I get 10 times more traffic from [Google][1] than from + <code>I get 10 times more traffic from [Google][1] than from [Yahoo][2] or [MSN][3]. [1]: http://google.com/ "Google" @@ -209,16 +209,16 @@ you define elsewhere in your document:</p> </pre> <p>Output:</p> <pre> -<code><p>I get 10 times more traffic from <a href="http://google.com/" + <code><p>I get 10 times more traffic from <a href="http://google.com/" title="Google">Google</a> than from <a href="http://search.yahoo.com/" title="Yahoo Search">Yahoo</a> or <a href="http://search.msn.com/" title="MSN Search">MSN</a>.</p> </code> </pre> <p>The title attribute is optional. Link names may contain letters, -numbers and spaces, but are <em>not</em>case sensitive:</p> +numbers and spaces, but are <em>not</em> case sensitive:</p> <pre> -<code>I start my morning with a cup of coffee and + <code>I start my morning with a cup of coffee and [The New York Times][NY Times]. [ny times]: http://www.nytimes.com/ @@ -226,7 +226,7 @@ numbers and spaces, but are <em>not</em>case sensitive:</p> </pre> <p>Output:</p> <pre> -<code><p>I start my morning with a cup of coffee and + <code><p>I start my morning with a cup of coffee and <a href="http://www.nytimes.com/">The New York Times</a>.</p> </code> </pre> @@ -234,19 +234,19 @@ numbers and spaces, but are <em>not</em>case sensitive:</p> <p>Image syntax is very much like link syntax.</p> <p>Inline (titles are optional):</p> <pre> -<code> + <code> </code> </pre> <p>Reference-style:</p> <pre> -<code>![alt text][id] + <code>![alt text][id] [id]: /path/to/img.jpg "Title" </code> </pre> <p>Both of the above examples produce the same output:</p> <pre> -<code><img src="/path/to/img.jpg" alt="alt text" title="Title" /> + <code><img src="/path/to/img.jpg" alt="alt text" title="Title" /> </code> </pre> <h3>Code</h3> @@ -255,7 +255,7 @@ backtick quotes. Any ampersands (<code>&</code>) and angle brackets (<code>& <code>></code>) will automatically be translated into HTML entities. This makes it easy to use Markdown to write about HTML example code:</p> <pre> -<code>I strongly recommend against using any `<blink>` tags. + <code>I strongly recommend against using any `<blink>` tags. I wish SmartyPants used named entities like `&mdash;` instead of decimal-encoded entites like `&#8212;`. @@ -263,7 +263,7 @@ instead of decimal-encoded entites like `&#8212;`. </pre> <p>Output:</p> <pre> -<code><p>I strongly recommend against using any + <code><p>I strongly recommend against using any <code>&lt;blink&gt;</code> tags.</p> <p>I wish SmartyPants used named entities like @@ -273,10 +273,10 @@ entites like <code>&amp;#8212;</code>.</p> </pre> <p>To specify an entire block of pre-formatted code, indent every line of the block by 4 spaces or 1 tab. Just like with code spans, <code>&</code>, <code><</code>, -and <code>></code>characters will be escaped automatically.</p> +and <code>></code> characters will be escaped automatically.</p> <p>Markdown:</p> <pre> -<code>If you want your page to validate under XHTML 1.0 Strict, + <code>If you want your page to validate under XHTML 1.0 Strict, you've got to put paragraph tags in your blockquotes: <blockquote> @@ -286,7 +286,7 @@ you've got to put paragraph tags in your blockquotes: </pre> <p>Output:</p> <pre> -<code><p>If you want your page to validate under XHTML 1.0 Strict, + <code><p>If you want your page to validate under XHTML 1.0 Strict, you've got to put paragraph tags in your blockquotes:</p> <pre><code>&lt;blockquote&gt; @@ -295,3 +295,4 @@ you've got to put paragraph tags in your blockquotes:</p> </code></pre> </code> </pre> + diff --git a/tests/markdown-test/markdown-syntax.html b/tests/markdown-test/markdown-syntax.html index 84fe3bd..b3df92f 100644 --- a/tests/markdown-test/markdown-syntax.html +++ b/tests/markdown-test/markdown-syntax.html @@ -7,74 +7,74 @@ <li><a href="/projects/markdown/dingus" title="Online Markdown Web Form">Dingus</a></li> </ul></p> <ul> -<li> -<a href="#overview">Overview</a> -<ul> -<li> -<a href="#philosophy">Philosophy</a> -</li> -<li> -<a href="#html">Inline HTML</a> -</li> -<li> -<a href="#autoescape">Automatic Escaping for Special Characters</a> -</li> -</ul> -</li> -<li> -<a href="#block">Block Elements</a> -<ul> -<li> -<a href="#p">Paragraphs and Line Breaks</a> -</li> -<li> -<a href="#header">Headers</a> -</li> -<li> -<a href="#blockquote">Blockquotes</a> -</li> -<li> -<a href="#list">Lists</a> -</li> -<li> -<a href="#precode">Code Blocks</a> -</li> -<li> -<a href="#hr">Horizontal Rules</a> -</li> -</ul> -</li> -<li> -<a href="#span">Span Elements</a> -<ul> -<li> -<a href="#link">Links</a> -</li> -<li> -<a href="#em">Emphasis</a> -</li> -<li> -<a href="#code">Code</a> -</li> -<li> -<a href="#img">Images</a> -</li> -</ul> -</li> -<li> -<a href="#misc">Miscellaneous</a> -<ul> -<li> -<a href="#backslash">Backslash Escapes</a> -</li> -<li> -<a href="#autolink">Automatic Links</a> -</li> -</ul> -</li> + <li> + <a href="#overview">Overview</a> + <ul> + <li> + <a href="#philosophy">Philosophy</a> + </li> + <li> + <a href="#html">Inline HTML</a> + </li> + <li> + <a href="#autoescape">Automatic Escaping for Special Characters</a> + </li> + </ul> + </li> + <li> + <a href="#block">Block Elements</a> + <ul> + <li> + <a href="#p">Paragraphs and Line Breaks</a> + </li> + <li> + <a href="#header">Headers</a> + </li> + <li> + <a href="#blockquote">Blockquotes</a> + </li> + <li> + <a href="#list">Lists</a> + </li> + <li> + <a href="#precode">Code Blocks</a> + </li> + <li> + <a href="#hr">Horizontal Rules</a> + </li> + </ul> + </li> + <li> + <a href="#span">Span Elements</a> + <ul> + <li> + <a href="#link">Links</a> + </li> + <li> + <a href="#em">Emphasis</a> + </li> + <li> + <a href="#code">Code</a> + </li> + <li> + <a href="#img">Images</a> + </li> + </ul> + </li> + <li> + <a href="#misc">Miscellaneous</a> + <ul> + <li> + <a href="#backslash">Backslash Escapes</a> + </li> + <li> + <a href="#autolink">Automatic Links</a> + </li> + </ul> + </li> </ul> <p> -<strong>Note:</strong> This document is itself written using Markdown; you + <strong>Note:</strong> This document is itself written using Markdown; you can <a href="/projects/markdown/syntax.text">see the source for it by adding '.text' to the URL</a>.</p> <hr /> <p><h2 id="overview">Overview</h2></p> @@ -85,7 +85,7 @@ document should be publishable as-is, as plain text, without looking like it's been marked up with tags or formatting instructions. While Markdown's syntax has been influenced by several existing text-to-HTML filters -- including <a href="http://docutils.sourceforge.net/mirror/setext.html">Setext</a>, <a href="http://www.aaronsw.com/2002/atx/">atx</a>, <a href="http://textism.com/tools/textile/">Textile</a>, <a href="http://docutils.sourceforge.net/rst.html">reStructuredText</a>, -<a href="http://www.triptico.com/software/grutatxt.html">Grutatext</a>, and <a href="http://ettext.taint.org/doc/">EtText</a>-- the single biggest source of +<a href="http://www.triptico.com/software/grutatxt.html">Grutatext</a>, and <a href="http://ettext.taint.org/doc/">EtText</a> -- the single biggest source of inspiration for Markdown's syntax is the format of plain text email.</p> <p>To this end, Markdown's syntax is comprised entirely of punctuation characters, which punctuation characters have been carefully chosen so @@ -95,13 +95,14 @@ blockquotes look like quoted passages of text, assuming you've ever used email.</p> <p><h3 id="html">Inline HTML</h3></p> <p>Markdown's syntax is intended for one purpose: to be used as a -format for <em>writing</em>for the web.</p> +format for <em>writing</em> for the web.</p> <p>Markdown is not a replacement for HTML, or even close to it. Its syntax is very small, corresponding only to a very small subset of HTML tags. The idea is <em>not</em> to create a syntax that makes it easier to insert HTML tags. In my opinion, HTML tags are already easy to insert. The idea for Markdown is to make it easy to read, write, and -edit prose. HTML is a <em>publishing</em> format; Markdown is a <em>writing</em>format. Thus, Markdown's formatting syntax only addresses issues that +edit prose. HTML is a <em>publishing</em> format; Markdown is a <em>writing</em> +format. Thus, Markdown's formatting syntax only addresses issues that can be conveyed in plain text.</p> <p>For any markup that is not covered by Markdown's syntax, you simply use HTML itself. There's no need to preface it or delimit it to @@ -111,10 +112,10 @@ the tags.</p> <code><table></code>, <code><pre></code>, <code><p></code>, etc. -- must be separated from surrounding content by blank lines, and the start and end tags of the block should not be indented with tabs or spaces. Markdown is smart enough not -to add extra (unwanted) <code><p></code>tags around HTML block-level tags.</p> +to add extra (unwanted) <code><p></code> tags around HTML block-level tags.</p> <p>For example, to add an HTML table to a Markdown article:</p> <pre> -<code>This is a regular paragraph. + <code>This is a regular paragraph. <table> <tr> @@ -126,14 +127,14 @@ This is another regular paragraph. </code> </pre> <p>Note that Markdown formatting syntax is not processed within block-level -HTML tags. E.g., you can't use Markdown-style <code>*emphasis*</code>inside an +HTML tags. E.g., you can't use Markdown-style <code>*emphasis*</code> inside an HTML block.</p> <p>Span-level HTML tags -- e.g. <code><span></code>, <code><cite></code>, or <code><del></code> -- can be used anywhere in a Markdown paragraph, list item, or header. If you want, you can even use HTML tags instead of Markdown formatting; e.g. if -you'd prefer to use HTML <code><a></code> or <code><img></code>tags instead of Markdown's +you'd prefer to use HTML <code><a></code> or <code><img></code> tags instead of Markdown's link or image syntax, go right ahead.</p> -<p>Unlike block-level HTML tags, Markdown syntax <em>is</em>processed within +<p>Unlike block-level HTML tags, Markdown syntax <em>is</em> processed within span-level tags.</p> <p><h3 id="autoescape">Automatic Escaping for Special Characters</h3></p> <p>In HTML, there are two characters that demand special treatment: <code><</code> @@ -145,15 +146,15 @@ characters, you must escape them as entities, e.g. <code>&lt;</code>, and write about 'AT&T', you need to write '<code>AT&amp;T</code>'. You even need to escape ampersands within URLs. Thus, if you want to link to:</p> <pre> -<code>http://images.google.com/images?num=30&q=larry+bird + <code>http://images.google.com/images?num=30&q=larry+bird </code> </pre> <p>you need to encode the URL as:</p> <pre> -<code>http://images.google.com/images?num=30&amp;q=larry+bird + <code>http://images.google.com/images?num=30&amp;q=larry+bird </code> </pre> -<p>in your anchor tag <code>href</code>attribute. Needless to say, this is easy to +<p>in your anchor tag <code>href</code> attribute. Needless to say, this is easy to forget, and is probably the single most common source of HTML validation errors in otherwise well-marked-up web sites.</p> <p>Markdown allows you to use these characters naturally, taking care of @@ -162,36 +163,36 @@ an HTML entity, it remains unchanged; otherwise it will be translated into <code>&amp;</code>.</p> <p>So, if you want to include a copyright symbol in your article, you can write:</p> <pre> -<code>&copy; + <code>&copy; </code> </pre> <p>and Markdown will leave it alone. But if you write:</p> <pre> -<code>AT&T + <code>AT&T </code> </pre> <p>Markdown will translate it to:</p> <pre> -<code>AT&amp;T + <code>AT&amp;T </code> </pre> <p>Similarly, because Markdown supports <a href="#html">inline HTML</a>, if you use angle brackets as delimiters for HTML tags, Markdown will treat them as such. But if you write:</p> <pre> -<code>4 < 5 + <code>4 < 5 </code> </pre> <p>Markdown will translate it to:</p> <pre> -<code>4 &lt; 5 + <code>4 &lt; 5 </code> </pre> <p>However, inside Markdown code spans and blocks, angle brackets and ampersands are <em>always</em> encoded automatically. This makes it easy to use Markdown to write about HTML code. (As opposed to raw HTML, which is a terrible format for writing about HTML syntax, because every single <code><</code> -and <code>&</code>in your example code needs to be escaped.)</p> +and <code>&</code> in your example code needs to be escaped.)</p> <hr /> <p><h2 id="block">Block Elements</h2></p> <p><h3 id="p">Paragraphs and Line Breaks</h3></p> @@ -203,18 +204,19 @@ blank.) Normal paragraphs should not be intended with spaces or tabs.</p> that Markdown supports "hard-wrapped" text paragraphs. This differs significantly from most other text-to-HTML formatters (including Movable Type's "Convert Line Breaks" option) which translate every line break -character in a paragraph into a <code><br /></code>tag.</p> -<p>When you <em>do</em> want to insert a <code><br /></code>break tag using Markdown, you +character in a paragraph into a <code><br /></code> tag.</p> +<p>When you <em>do</em> want to insert a <code><br /></code> break tag using Markdown, you end a line with two or more spaces, then type return.</p> <p>Yes, this takes a tad more effort to create a <code><br /></code>, but a simplistic "every line break is a <code><br /></code>" rule wouldn't work for Markdown. -Markdown's email-style <a href="#blockquote">blockquoting</a> and multi-paragraph <a href="#list">list items</a>work best -- and look better -- when you format them with hard breaks.</p> +Markdown's email-style <a href="#blockquote">blockquoting</a> and multi-paragraph <a href="#list">list items</a> +work best -- and look better -- when you format them with hard breaks.</p> <p><h3 id="header">Headers</h3></p> -<p>Markdown supports two styles of headers, <a href="http://docutils.sourceforge.net/mirror/setext.html">Setext</a>and <a href="http://www.aaronsw.com/2002/atx/">atx</a>.</p> +<p>Markdown supports two styles of headers, <a href="http://docutils.sourceforge.net/mirror/setext.html">Setext</a> and <a href="http://www.aaronsw.com/2002/atx/">atx</a>.</p> <p>Setext-style headers are "underlined" using equal signs (for first-level headers) and dashes (for second-level headers). For example:</p> <pre> -<code>This is an H1 + <code>This is an H1 ============= This is an H2 @@ -225,7 +227,7 @@ This is an H2 <p>Atx-style headers use 1-6 hash characters at the start of the line, corresponding to header levels 1-6. For example:</p> <pre> -<code># This is an H1 + <code># This is an H1 ## This is an H2 @@ -238,7 +240,7 @@ closing hashes don't even need to match the number of hashes used to open the header. (The number of opening hashes determines the header level.) :</p> <pre> -<code># This is an H1 # + <code># This is an H1 # ## This is an H2 ## @@ -249,9 +251,9 @@ determines the header level.) :</p> <p>Markdown uses email-style <code>></code> characters for blockquoting. If you're familiar with quoting passages of text in an email message, then you know how to create a blockquote in Markdown. It looks best if you hard -wrap the text and put a <code>></code>before every line:</p> +wrap the text and put a <code>></code> before every line:</p> <pre> -<code>> This is a blockquote with two paragraphs. Lorem ipsum dolor sit amet, + <code>> This is a blockquote with two paragraphs. Lorem ipsum dolor sit amet, > consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus. > Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus. > @@ -259,10 +261,10 @@ wrap the text and put a <code>></code>before every line:</p> > id sem consectetuer libero luctus adipiscing. </code> </pre> -<p>Markdown allows you to be lazy and only put the <code>></code>before the first +<p>Markdown allows you to be lazy and only put the <code>></code> before the first line of a hard-wrapped paragraph:</p> <pre> -<code>> This is a blockquote with two paragraphs. Lorem ipsum dolor sit amet, + <code>> This is a blockquote with two paragraphs. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus. Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus. @@ -273,7 +275,7 @@ id sem consectetuer libero luctus adipiscing. <p>Blockquotes can be nested (i.e. a blockquote-in-a-blockquote) by adding additional levels of <code>></code>:</p> <pre> -<code>> This is the first level of quoting. + <code>> This is the first level of quoting. > > > This is nested blockquote. > @@ -283,7 +285,7 @@ adding additional levels of <code>></code>:</p> <p>Blockquotes can contain other Markdown elements, including headers, lists, and code blocks:</p> <pre> -<code>> ## This is a header. + <code>> ## This is a header. > > 1. This is the first list item. > 2. This is the second list item. @@ -301,28 +303,28 @@ Quote Level from the Text menu.</p> <p>Unordered lists use asterisks, pluses, and hyphens -- interchangably -- as list markers:</p> <pre> -<code>* Red + <code>* Red * Green * Blue </code> </pre> <p>is equivalent to:</p> <pre> -<code>+ Red + <code>+ Red + Green + Blue </code> </pre> <p>and:</p> <pre> -<code>- Red + <code>- Red - Green - Blue </code> </pre> <p>Ordered lists use numbers followed by periods:</p> <pre> -<code>1. Bird + <code>1. Bird 2. McHale 3. Parish </code> @@ -331,7 +333,7 @@ Quote Level from the Text menu.</p> list have no effect on the HTML output Markdown produces. The HTML Markdown produces from the above list is:</p> <pre> -<code><ol> + <code><ol> <li>Bird</li> <li>McHale</li> <li>Parish</li> @@ -340,14 +342,14 @@ Markdown produces from the above list is:</p> </pre> <p>If you instead wrote the list in Markdown like this:</p> <pre> -<code>1. Bird + <code>1. Bird 1. McHale 1. Parish </code> </pre> <p>or even:</p> <pre> -<code>3. Bird + <code>3. Bird 1. McHale 8. Parish </code> @@ -364,7 +366,7 @@ up to three spaces. List markers must be followed by one or more spaces or a tab.</p> <p>To make lists look nice, you can wrap items with hanging indents:</p> <pre> -<code>* Lorem ipsum dolor sit amet, consectetuer adipiscing elit. + <code>* Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus. Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus. * Donec sit amet nisl. Aliquam semper ipsum sit amet velit. @@ -373,7 +375,7 @@ or a tab.</p> </pre> <p>But if you want to be lazy, you don't have to:</p> <pre> -<code>* Lorem ipsum dolor sit amet, consectetuer adipiscing elit. + <code>* Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus. Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus. * Donec sit amet nisl. Aliquam semper ipsum sit amet velit. @@ -381,15 +383,15 @@ Suspendisse id sem consectetuer libero luctus adipiscing. </code> </pre> <p>If list items are separated by blank lines, Markdown will wrap the -items in <code><p></code>tags in the HTML output. For example, this input:</p> +items in <code><p></code> tags in the HTML output. For example, this input:</p> <pre> -<code>* Bird + <code>* Bird * Magic </code> </pre> <p>will turn into:</p> <pre> -<code><ul> + <code><ul> <li>Bird</li> <li>Magic</li> </ul> @@ -397,14 +399,14 @@ items in <code><p></code>tags in the HTML output. For example, this input: </pre> <p>But this:</p> <pre> -<code>* Bird + <code>* Bird * Magic </code> </pre> <p>will turn into:</p> <pre> -<code><ul> + <code><ul> <li><p>Bird</p></li> <li><p>Magic</p></li> </ul> @@ -414,7 +416,7 @@ items in <code><p></code>tags in the HTML output. For example, this input: paragraph in a list item must be intended by either 4 spaces or one tab:</p> <pre> -<code>1. This is a list item with two paragraphs. Lorem ipsum dolor + <code>1. This is a list item with two paragraphs. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus. @@ -429,7 +431,7 @@ or one tab:</p> paragraphs, but here again, Markdown will allow you to be lazy:</p> <pre> -<code>* This is a list item with two paragraphs. + <code>* This is a list item with two paragraphs. This is the second paragraph in the list item. You're only required to indent the first line. Lorem ipsum dolor @@ -438,19 +440,19 @@ sit amet, consectetuer adipiscing elit. * Another item in the same list. </code> </pre> -<p>To put a blockquote within a list item, the blockquote's -<code>></code>delimiters need to be indented:</p> +<p>To put a blockquote within a list item, the blockquote's <code>></code> +delimiters need to be indented:</p> <pre> -<code>* A list item with a blockquote: + <code>* A list item with a blockquote: > This is a blockquote > inside a list item. </code> </pre> <p>To put a code block within a list item, the code block needs -to be indented <em>twice</em>-- 8 spaces or two tabs:</p> +to be indented <em>twice</em> -- 8 spaces or two tabs:</p> <pre> -<code>* A list item with a code block: + <code>* A list item with a code block: <code goes here> </code> @@ -458,31 +460,31 @@ to be indented <em>twice</em>-- 8 spaces or two tabs:</p> <p>It's worth noting that it's possible to trigger an ordered list by accident, by writing something like this:</p> <pre> -<code>1986. What a great season. + <code>1986. What a great season. </code> </pre> -<p>In other words, a <em>number-period-space</em>sequence at the beginning of a +<p>In other words, a <em>number-period-space</em> sequence at the beginning of a line. To avoid this, you can backslash-escape the period:</p> <pre> -<code>1986\. What a great season. + <code>1986\. What a great season. </code> </pre> <p><h3 id="precode">Code Blocks</h3></p> <p>Pre-formatted code blocks are used for writing about programming or markup source code. Rather than forming normal paragraphs, the lines of a code block are interpreted literally. Markdown wraps a code block -in both <code><pre></code> and <code><code></code>tags.</p> +in both <code><pre></code> and <code><code></code> tags.</p> <p>To produce a code block in Markdown, simply indent every line of the block by at least 4 spaces or 1 tab. For example, given this input:</p> <pre> -<code>This is a normal paragraph: + <code>This is a normal paragraph: This is a code block. </code> </pre> <p>Markdown will generate:</p> <pre> -<code><p>This is a normal paragraph:</p> + <code><p>This is a normal paragraph:</p> <pre><code>This is a code block. </code></pre> @@ -491,7 +493,7 @@ block by at least 4 spaces or 1 tab. For example, given this input:</p> <p>One level of indentation -- 4 spaces or 1 tab -- is removed from each line of the code block. For example, this:</p> <pre> -<code>Here is an example of AppleScript: + <code>Here is an example of AppleScript: tell application "Foo" beep @@ -500,7 +502,7 @@ line of the code block. For example, this:</p> </pre> <p>will turn into:</p> <pre> -<code><p>Here is an example of AppleScript:</p> + <code><p>Here is an example of AppleScript:</p> <pre><code>tell application "Foo" beep @@ -516,14 +518,14 @@ easy to include example HTML source code using Markdown -- just paste it and indent it, and Markdown will handle the hassle of encoding the ampersands and angle brackets. For example, this:</p> <pre> -<code> <div class="footer"> + <code> <div class="footer"> &copy; 2004 Foo Corporation </div> </code> </pre> <p>will turn into:</p> <pre> -<code><pre><code>&lt;div class="footer"&gt; + <code><pre><code>&lt;div class="footer"&gt; &amp;copy; 2004 Foo Corporation &lt;/div&gt; </code></pre> @@ -538,7 +540,7 @@ more hyphens, asterisks, or underscores on a line by themselves. If you wish, you may use spaces between the hyphens or asterisks. Each of the following lines will produce a horizontal rule:</p> <pre> -<code>* * * + <code>* * * *** @@ -558,16 +560,17 @@ _ _ _ <p>In both styles, the link text is delimited by [square brackets].</p> <p>To create an inline link, use a set of regular parentheses immediately after the link text's closing square bracket. Inside the parentheses, -put the URL where you want the link to point, along with an <em>optional</em>title for the link, surrounded in quotes. For example:</p> +put the URL where you want the link to point, along with an <em>optional</em> +title for the link, surrounded in quotes. For example:</p> <pre> -<code>This is [an example](http://example.com/ "Title") inline link. + <code>This is [an example](http://example.com/ "Title") inline link. [This link](http://example.net/) has no title attribute. </code> </pre> <p>Will produce:</p> <pre> -<code><p>This is <a href="http://example.com/" title="Title"> + <code><p>This is <a href="http://example.com/" title="Title"> an example</a> inline link.</p> <p><a href="http://example.net/">This link</a> has no @@ -577,79 +580,79 @@ title attribute.</p> <p>If you're referring to a local resource on the same server, you can use relative paths:</p> <pre> -<code>See my [About](/about/) page for details. + <code>See my [About](/about/) page for details. </code> </pre> <p>Reference-style links use a second set of square brackets, inside which you place a label of your choosing to identify the link:</p> <pre> -<code>This is [an example][id] reference-style link. + <code>This is [an example][id] reference-style link. </code> </pre> <p>You can optionally use a space to separate the sets of brackets:</p> <pre> -<code>This is [an example] [id] reference-style link. + <code>This is [an example] [id] reference-style link. </code> </pre> <p>Then, anywhere in the document, you define your link label like this, on a line by itself:</p> <pre> -<code>[id]: http://example.com/ "Optional Title Here" + <code>[id]: http://example.com/ "Optional Title Here" </code> </pre> <p>That is:</p> <ul> -<li>Square brackets containing the link identifier (optionally + <li>Square brackets containing the link identifier (optionally indented from the left margin using up to three spaces);</li> -<li>followed by a colon;</li> -<li>followed by one or more spaces (or tabs);</li> -<li>followed by the URL for the link;</li> -<li>optionally followed by a title attribute for the link, enclosed + <li>followed by a colon;</li> + <li>followed by one or more spaces (or tabs);</li> + <li>followed by the URL for the link;</li> + <li>optionally followed by a title attribute for the link, enclosed in double or single quotes.</li> </ul> <p>The link URL may, optionally, be surrounded by angle brackets:</p> <pre> -<code>[id]: <http://example.com/> "Optional Title Here" + <code>[id]: <http://example.com/> "Optional Title Here" </code> </pre> <p>You can put the title attribute on the next line and use extra spaces or tabs for padding, which tends to look better with longer URLs:</p> <pre> -<code>[id]: http://example.com/longish/path/to/resource/here + <code>[id]: http://example.com/longish/path/to/resource/here "Optional Title Here" </code> </pre> <p>Link definitions are only used for creating links during Markdown processing, and are stripped from your document in the HTML output.</p> -<p>Link definition names may constist of letters, numbers, spaces, and punctuation -- but they are <em>not</em>case sensitive. E.g. these two links:</p> +<p>Link definition names may constist of letters, numbers, spaces, and punctuation -- but they are <em>not</em> case sensitive. E.g. these two links:</p> <pre> -<code>[link text][a] + <code>[link text][a] [link text][A] </code> </pre> <p>are equivalent.</p> -<p>The <em>implicit link name</em>shortcut allows you to omit the name of the +<p>The <em>implicit link name</em> shortcut allows you to omit the name of the link, in which case the link text itself is used as the name. Just use an empty set of square brackets -- e.g., to link the word "Google" to the google.com web site, you could simply write:</p> <pre> -<code>[Google][] + <code>[Google][] </code> </pre> <p>And then define the link:</p> <pre> -<code>[Google]: http://google.com/ + <code>[Google]: http://google.com/ </code> </pre> <p>Because link names may contain spaces, this shortcut even works for multiple words in the link text:</p> <pre> -<code>Visit [Daring Fireball][] for more information. + <code>Visit [Daring Fireball][] for more information. </code> </pre> <p>And then define the link:</p> <pre> -<code>[Daring Fireball]: http://daringfireball.net/ + <code>[Daring Fireball]: http://daringfireball.net/ </code> </pre> <p>Link definitions can be placed anywhere in your Markdown document. I @@ -658,7 +661,7 @@ used, but if you want, you can put them all at the end of your document, sort of like footnotes.</p> <p>Here's an example of reference links in action:</p> <pre> -<code>I get 10 times more traffic from [Google] [1] than from + <code>I get 10 times more traffic from [Google] [1] than from [Yahoo] [2] or [MSN] [3]. [1]: http://google.com/ "Google" @@ -668,7 +671,7 @@ document, sort of like footnotes.</p> </pre> <p>Using the implicit link name shortcut, you could instead write:</p> <pre> -<code>I get 10 times more traffic from [Google][] than from + <code>I get 10 times more traffic from [Google][] than from [Yahoo][] or [MSN][]. [google]: http://google.com/ "Google" @@ -678,7 +681,7 @@ document, sort of like footnotes.</p> </pre> <p>Both of the above examples will produce the following HTML output:</p> <pre> -<code><p>I get 10 times more traffic from <a href="http://google.com/" + <code><p>I get 10 times more traffic from <a href="http://google.com/" title="Google">Google</a> than from <a href="http://search.yahoo.com/" title="Yahoo Search">Yahoo</a> or <a href="http://search.msn.com/" title="MSN Search">MSN</a>.</p> @@ -687,7 +690,7 @@ or <a href="http://search.msn.com/" title="MSN Search">MSN</a>.</ <p>For comparison, here is the same paragraph written using Markdown's inline link style:</p> <pre> -<code>I get 10 times more traffic from [Google](http://google.com/ "Google") + <code>I get 10 times more traffic from [Google](http://google.com/ "Google") than from [Yahoo](http://search.yahoo.com/ "Yahoo Search") or [MSN](http://search.msn.com/ "MSN Search"). </code> @@ -708,9 +711,9 @@ prose.</p> <p>Markdown treats asterisks (<code>*</code>) and underscores (<code>_</code>) as indicators of emphasis. Text wrapped with one <code>*</code> or <code>_</code> will be wrapped with an HTML <code><em></code> tag; double <code>*</code>'s or <code>_</code>'s will be wrapped with an HTML -<code><strong></code>tag. E.g., this input:</p> +<code><strong></code> tag. E.g., this input:</p> <pre> -<code>*single asterisks* + <code>*single asterisks* _single underscores_ @@ -721,7 +724,7 @@ __double underscores__ </pre> <p>will produce:</p> <pre> -<code><em>single asterisks</em> + <code><em>single asterisks</em> <em>single underscores</em> @@ -734,16 +737,16 @@ __double underscores__ the same character must be used to open and close an emphasis span.</p> <p>Emphasis can be used in the middle of a word:</p> <pre> -<code>un*fucking*believable + <code>un*fucking*believable </code> </pre> -<p>But if you surround an <code>*</code> or <code>_</code>with spaces, it'll be treated as a +<p>But if you surround an <code>*</code> or <code>_</code> with spaces, it'll be treated as a literal asterisk or underscore.</p> <p>To produce a literal asterisk or underscore at a position where it would otherwise be used as an emphasis delimiter, you can backslash escape it:</p> <pre> -<code>\*this text is surrounded by literal asterisks\* + <code>\*this text is surrounded by literal asterisks\* </code> </pre> <p><h3 id="code">Code</h3></p> @@ -751,37 +754,37 @@ escape it:</p> Unlike a pre-formatted code block, a code span indicates code within a normal paragraph. For example:</p> <pre> -<code>Use the `printf()` function. + <code>Use the `printf()` function. </code> </pre> <p>will produce:</p> <pre> -<code><p>Use the <code>printf()</code> function.</p> + <code><p>Use the <code>printf()</code> function.</p> </code> </pre> <p>To include a literal backtick character within a code span, you can use multiple backticks as the opening and closing delimiters:</p> <pre> -<code>``There is a literal backtick (`) here.`` + <code>``There is a literal backtick (`) here.`` </code> </pre> <p>which will produce this:</p> <pre> -<code><p><code>There is a literal backtick (`) here.</code></p> + <code><p><code>There is a literal backtick (`) here.</code></p> </code> </pre> <p>The backtick delimiters surrounding a code span may include spaces -- one after the opening, one before the closing. This allows you to place literal backtick characters at the beginning or end of a code span:</p> <pre> -<code>A single backtick in a code span: `` ` `` + <code>A single backtick in a code span: `` ` `` A backtick-delimited string in a code span: `` `foo` `` </code> </pre> <p>will produce:</p> <pre> -<code><p>A single backtick in a code span: <code>`</code></p> + <code><p>A single backtick in a code span: <code>`</code></p> <p>A backtick-delimited string in a code span: <code>`foo`</code></p> </code> @@ -790,22 +793,22 @@ A backtick-delimited string in a code span: `` `foo` `` entities automatically, which makes it easy to include example HTML tags. Markdown will turn this:</p> <pre> -<code>Please don't use any `<blink>` tags. + <code>Please don't use any `<blink>` tags. </code> </pre> <p>into:</p> <pre> -<code><p>Please don't use any <code>&lt;blink&gt;</code> tags.</p> + <code><p>Please don't use any <code>&lt;blink&gt;</code> tags.</p> </code> </pre> <p>You can write this:</p> <pre> -<code>`&#8212;` is the decimal-encoded equivalent of `&mdash;`. + <code>`&#8212;` is the decimal-encoded equivalent of `&mdash;`. </code> </pre> <p>to produce:</p> <pre> -<code><p><code>&amp;#8212;</code> is the decimal-encoded + <code><p><code>&amp;#8212;</code> is the decimal-encoded equivalent of <code>&amp;mdash;</code>.</p> </code> </pre> @@ -816,44 +819,45 @@ placing images into a plain text document format.</p> for links, allowing for two styles: <em>inline</em> and <em>reference</em>.</p> <p>Inline image syntax looks like this:</p> <pre> -<code> + <code>  </code> </pre> <p>That is:</p> <ul> -<li>An exclamation mark: <code>!</code>;</li> -<li>followed by a set of square brackets, containing the <code>alt</code>attribute text for the image;</li> -<li>followed by a set of parentheses, containing the URL or path to -the image, and an optional <code>title</code>attribute enclosed in double + <li>An exclamation mark: <code>!</code>;</li> + <li>followed by a set of square brackets, containing the <code>alt</code> +attribute text for the image;</li> + <li>followed by a set of parentheses, containing the URL or path to +the image, and an optional <code>title</code> attribute enclosed in double or single quotes.</li> </ul> <p>Reference-style image syntax looks like this:</p> <pre> -<code>![Alt text][id] + <code>![Alt text][id] </code> </pre> <p>Where "id" is the name of a defined image reference. Image references are defined using syntax identical to link references:</p> <pre> -<code>[id]: url/to/image "Optional title attribute" + <code>[id]: url/to/image "Optional title attribute" </code> </pre> <p>As of this writing, Markdown has no syntax for specifying the dimensions of an image; if this is important to you, you can simply -use regular HTML <code><img></code>tags.</p> +use regular HTML <code><img></code> tags.</p> <hr /> <p><h2 id="misc">Miscellaneous</h2></p> <p><h3 id="autolink">Automatic Links</h3></p> <p>Markdown supports a shortcut style for creating "automatic" links for URLs and email addresses: simply surround the URL or email address with angle brackets. What this means is that if you want to show the actual text of a URL or email address, and also have it be a clickable link, you can do this:</p> <pre> -<code><http://example.com/> + <code><http://example.com/> </code> </pre> <p>Markdown will turn this into:</p> <pre> -<code><a href="http://example.com/">http://example.com/</a> + <code><a href="http://example.com/">http://example.com/</a> </code> </pre> <p>Automatic links for email addresses work similarly, except that @@ -861,12 +865,12 @@ Markdown will also perform a bit of randomized decimal and hex entity-encoding to help obscure your address from address-harvesting spambots. For example, Markdown will turn this:</p> <pre> -<code><address@example.com> + <code><address@example.com> </code> </pre> <p>into something like this:</p> <pre> -<code><a href="&#x6D;&#x61;i&#x6C;&#x74;&#x6F;:&#x61;&#x64;&#x64;&#x72;&#x65; + <code><a href="&#x6D;&#x61;i&#x6C;&#x74;&#x6F;:&#x61;&#x64;&#x64;&#x72;&#x65; &#115;&#115;&#64;&#101;&#120;&#x61;&#109;&#x70;&#x6C;e&#x2E;&#99;&#111; &#109;">&#x61;&#x64;&#x64;&#x72;&#x65;&#115;&#115;&#64;&#101;&#120;&#x61; &#109;&#x70;&#x6C;e&#x2E;&#99;&#111;&#109;</a> @@ -881,15 +885,15 @@ will probably eventually start receiving spam.)</p> <p>Markdown allows you to use backslash escapes to generate literal characters which would otherwise have special meaning in Markdown's formatting syntax. For example, if you wanted to surround a word with -literal asterisks (instead of an HTML <code><em></code>tag), you can backslashes +literal asterisks (instead of an HTML <code><em></code> tag), you can backslashes before the asterisks, like this:</p> <pre> -<code>\*literal asterisks\* + <code>\*literal asterisks\* </code> </pre> <p>Markdown provides backslash escapes for the following characters:</p> <pre> -<code>\ backslash + <code>\ backslash ` backtick * asterisk _ underscore @@ -903,3 +907,4 @@ _ underscore ! exclamation mark </code> </pre> + diff --git a/tests/markdown-test/strong-and-em-together.html b/tests/markdown-test/strong-and-em-together.html index 8a40b58..04c1850 100644 --- a/tests/markdown-test/strong-and-em-together.html +++ b/tests/markdown-test/strong-and-em-together.html @@ -5,7 +5,7 @@ </p> <p>So is <strong> <em>this</em> -</strong>word.</p> +</strong> word.</p> <p> <strong> <em>This is strong and em.</em> @@ -13,4 +13,4 @@ </p> <p>So is <strong> <em>this</em> -</strong>word.</p>
\ No newline at end of file +</strong> word.</p> diff --git a/tests/misc/arabic.html b/tests/misc/arabic.html index ab4cc13..830d62a 100644 --- a/tests/misc/arabic.html +++ b/tests/misc/arabic.html @@ -1,17 +1,17 @@ <h1>بايثون</h1> <p> -<strong>بايثون</strong>لغة برمجة حديثة بسيطة، واضحة، سريعة ، تستخدم أسلوب البرمجة الكائنية (OOP) وقابلة للتطوير بالإضافة إلى أنها مجانية و مفتوحة المصدر. صُنفت بالأساس كلغة تفسيرية ، بايثون مصممة أصلاً للأداء بعض المهام الخاصة أو المحدودة. إلا أنه يمكن استخدامها بايثون لإنجاز المشاريع الضخمه كأي لغة برمجية أخرى، غالباً ما يُنصح المبتدئين في ميدان البرمجة بتعلم هذه اللغة لأنها من بين أسهل اللغات البرمجية تعلماً.</p> + <strong>بايثون</strong> لغة برمجة حديثة بسيطة، واضحة، سريعة ، تستخدم أسلوب البرمجة الكائنية (OOP) وقابلة للتطوير بالإضافة إلى أنها مجانية و مفتوحة المصدر. صُنفت بالأساس كلغة تفسيرية ، بايثون مصممة أصلاً للأداء بعض المهام الخاصة أو المحدودة. إلا أنه يمكن استخدامها بايثون لإنجاز المشاريع الضخمه كأي لغة برمجية أخرى، غالباً ما يُنصح المبتدئين في ميدان البرمجة بتعلم هذه اللغة لأنها من بين أسهل اللغات البرمجية تعلماً.</p> <p>نشأت بايثون في مركز CWI (مركز العلوم والحاسب الآلي) بأمستردام على يد جويدو فان رُزوم. تم تطويرها بلغة C. أطلق فان رُزوم اسم "بايثون" على لغته تعبيرًا عن إعجابه بفِرقَة مسرحية هزلية شهيرة من بريطانيا، كانت تطلق على نفسها اسم مونتي بايثون Monty Python.</p> <p>تتميز بايثون بمجتمعها النشط ، كما أن لها الكثير من المكتبات البرمجية ذات الأغراض الخاصة والتي برمجها أشخاص من مجتمع هذه اللغة ، مثلاً مكتبة PyGame التي توفر مجموعه من الوظائف من اجل برمجة الالعاب. ويمكن لبايثون التعامل مع العديد من أنواع قواعد البيانات مثل MySQL وغيره.</p> <h2>أمثلة</h2> <p>مثال Hello World!</p> <pre> -<code>print "Hello World!" + <code>print "Hello World!" </code> </pre> <p>مثال لاستخراج المضروب Factorial :</p> <pre> -<code>num = 1 + <code>num = 1 x = raw_input('Insert the number please ') x = int(x) @@ -27,8 +27,9 @@ else: </pre> <h2>وصلات خارجية</h2> <ul> -<li> -<a href="http://www.python.org">الموقع الرسمي للغة بايثون</a> -</li> + <li> + <a href="http://www.python.org">الموقع الرسمي للغة بايثون</a> + </li> </ul> -<p>بذرة حاس</p> +<p> بذرة حاس </p> + diff --git a/tests/misc/bidi.html b/tests/misc/bidi.html index 1959181..e7759f1 100644 --- a/tests/misc/bidi.html +++ b/tests/misc/bidi.html @@ -1,17 +1,17 @@ <p> <strong>Python</strong>（パイソン）は、<a href="http://en.wikipedia.org/wiki/Guido_van_Rossum">Guido van Rossum</a> によって作られたオープンソースのオブジェクト指向スクリプト言語。<a href="http://ja.wikipedia.org/wiki/Perl">Perl</a>とともに欧米で広く普及している。イギリスのテレビ局 BBC が製作したコメディ番組『空飛ぶモンティ・パイソン』にちなんで名付けられた。 (Pythonには、爬虫類のニシキヘビの意味があり、Python言語のマスコットやアイコンとして使われることがある。)</p> <p>|||||||||||||||||||||||||||||THIS SHOULD BE LTR|||||||||||||||||||||||||</p> -<p dir="rtl">|||||||||||||||||||||||||||||THIS SHOULD BE RTL||||||||||||||||||||||||| </p> -<p dir="ltr">(<strong>بايثون</strong>لغة برمجة حديثة بسيطة، واضحة، سريعة ، تستخدم أسلوب البرمجة الكائنية (THIS SHOULD BE LTR ) وقابلة للتطوير بالإضافة إلى أنها مجانية و مفتوح</p> +<p dir="rtl">|||||||||||||||||||||||||||||THIS SHOULD BE RTL||||||||||||||||||||||||| </p> +<p dir="ltr">(<strong>بايثون</strong> لغة برمجة حديثة بسيطة، واضحة، سريعة ، تستخدم أسلوب البرمجة الكائنية (THIS SHOULD BE LTR ) وقابلة للتطوير بالإضافة إلى أنها مجانية و مفتوح </p> <p>پایتون زبان برنامهنویسی تفسیری و سطح بالا ، شیگرا و یک زبان برنامهنویسی تفسیری سمت سرور قدرتمند است که توسط گیدو ون روسوم در سال ۱۹۹۰ ساخته شد. این زبان در ویژگیها شبیه پرل، روبی، اسکیم، اسمالتاک و تیسیال است و از مدیریت خودکار حافظه استفاده میکند</p> <p>Python，是一种面向对象的、直譯式的计算机程序设计语言，也是一种功能强大而完善的通用型语言，已经具有十多年的发展历史，成熟且稳定。</p> <p>ބްލޫ ވޭލްގެ ދޫ މަތީގައި އެއްފަހަރާ 50 މީހުންނަށް ތިބެވިދާނެވެ. ބޮޑު މަހުގެ ދުލަކީ އެހާމެ ބޮޑު އެއްޗެކެވެ.</p> <p> - <strong>உருது</strong>13ஆம் நூற்றாண்டில் உருவான ஒரு இந்தோ-ஐரோப்பிய மொழியாகும். உருது, ஹிந்தியுடன் சேர்த்து "ஹிந்துஸ்தானி" என அழைக்கப்படுகின்றது. மண்டரின், ஆங்கிலம் ஆகியவற்றுக்கு அடுத்தபடியாக மூன்றாவது கூடிய அளவு மக்களால் புரிந்து கொள்ளப்படக்கூடியது ஹிந்துஸ்தானியேயாகும். தாய் மொழியாகப் பேசுபவர்கள் எண்ணிக்கையின் அடிப்படையில் உருது உலகின் 20 ஆவது பெரிய மொழியாகும். 6 கோடி மக்கள் இதனைத் தாய் மொழியாகக் கொண்டுள்ளார்கள். இரண்டாவது மொழியாகக் கொண்டுள்ளவர்கள் உட்பட 11 கோடிப் பேர் இதனைப் பேசுகிறார்கள். உருது பாகிஸ்தானின் அரசகரும மொழியாகவும், இந்தியாவின் அரசகரும மொழிகளுள் ஒன்றாகவும் விளங்குகிறது.</p> + <strong>உருது</strong> 13ஆம் நூற்றாண்டில் உருவான ஒரு இந்தோ-ஐரோப்பிய மொழியாகும். உருது, ஹிந்தியுடன் சேர்த்து "ஹிந்துஸ்தானி" என அழைக்கப்படுகின்றது. மண்டரின், ஆங்கிலம் ஆகியவற்றுக்கு அடுத்தபடியாக மூன்றாவது கூடிய அளவு மக்களால் புரிந்து கொள்ளப்படக்கூடியது ஹிந்துஸ்தானியேயாகும். தாய் மொழியாகப் பேசுபவர்கள் எண்ணிக்கையின் அடிப்படையில் உருது உலகின் 20 ஆவது பெரிய மொழியாகும். 6 கோடி மக்கள் இதனைத் தாய் மொழியாகக் கொண்டுள்ளார்கள். இரண்டாவது மொழியாகக் கொண்டுள்ளவர்கள் உட்பட 11 கோடிப் பேர் இதனைப் பேசுகிறார்கள். உருது பாகிஸ்தானின் அரசகரும மொழியாகவும், இந்தியாவின் அரசகரும மொழிகளுள் ஒன்றாகவும் விளங்குகிறது.</p> <p>اردو ہندوآریائی زبانوں کی ہندويورپی شاخ کی ایک زبان ہے جو تيرھويں صدی ميں بر صغير ميں پيدا ہوئی ـ اردو پاکستان کی سرکاری زبان ہے اور بھارت کی سرکاری زبانوں ميں سے ايک ہے۔ اردو بھارت ميں 5 کروڑ اور پاکستان ميں 1 کروڑ لوگوں کی مادری زبان ہے مگر اسے بھارت اور پاکستان کے تقریباً 50 کروڑ لوگ بول اور سمجھ سکتے ھیں ۔ جن میں سے تقریباً 10.5 کروڑ لوگ اسے باقاعدہ بولتے ھیں۔</p> <h1>بايثون</h1> <p> - <strong>بايثون</strong>لغة برمجة حديثة بسيطة، واضحة، سريعة ، تستخدم أسلوب البرمجة الكائنية (OOP) وقابلة للتطوير بالإضافة إلى أنها مجانية و مفتوحة المصدر. صُنفت بالأساس كلغة تفسيرية ، بايثون مصممة أصلاً للأداء بعض المهام الخاصة أو المحدودة. إلا أنه يمكن استخدامها بايثون لإنجاز المشاريع الضخمه كأي لغة برمجية أخرى، غالباً ما يُنصح المبتدئين في ميدان البرمجة بتعلم هذه اللغة لأنها من بين أسهل اللغات البرمجية تعلماً.</p> + <strong>بايثون</strong> لغة برمجة حديثة بسيطة، واضحة، سريعة ، تستخدم أسلوب البرمجة الكائنية (OOP) وقابلة للتطوير بالإضافة إلى أنها مجانية و مفتوحة المصدر. صُنفت بالأساس كلغة تفسيرية ، بايثون مصممة أصلاً للأداء بعض المهام الخاصة أو المحدودة. إلا أنه يمكن استخدامها بايثون لإنجاز المشاريع الضخمه كأي لغة برمجية أخرى، غالباً ما يُنصح المبتدئين في ميدان البرمجة بتعلم هذه اللغة لأنها من بين أسهل اللغات البرمجية تعلماً.</p> <p>|||||||||||||||||||||||||||||THIS SHOULD BE RTL|||||||||||||||||||||||||</p> <p>(نشأت بايثون في مركز CWI (مركز العلوم والحاسب الآلي) بأمستردام على يد جويدو فان رُزوم. تم تطويرها بلغة C. أطلق فان رُزوم اسم "بايثون" على لغته تعبيرًا عن إعجابه بفِرقَة مسرحية هزلية شهيرة من بريطانيا، كانت تطلق على نفسها اسم مونتي بايثون Monty Python.</p> <p>تتميز بايثون بمجتمعها النشط ، كما أن لها الكثير من المكتبات البرمجية ذات الأغراض الخاصة والتي برمجها أشخاص من مجتمع هذه اللغة ، مثلاً مكتبة PyGame التي توفر مجموعه من الوظائف من اجل برمجة الالعاب. ويمكن لبايثون التعامل مع العديد من أنواع قواعد البيانات مثل MySQL وغيره.</p> @@ -43,9 +43,9 @@ else: <a href="http://www.python.org">الموقع الرسمي للغة بايثون</a> </li> </ul> -<p>بذرة حاس</p> +<p> بذرة حاس </p> <p> - <strong>Недвард «Нед» Фландерс</strong>(Nedward «Ned» Flanders) — вымышленный персонаж мультсериала «[Симпсоны][]», озвученный Гарри Ширером. Он и его семья живут по соседству от семьи Симпсонов. Набожный христианин, Нед является одним из столпов морали Спрингфилда. В эпизоде «Alone Again, Natura-Diddily» он овдовел, его жена Мод погибла в результате несчастного случая.</p> + <strong>Недвард «Нед» Фландерс</strong> (Nedward «Ned» Flanders) — вымышленный персонаж мультсериала «[Симпсоны][]», озвученный Гарри Ширером. Он и его семья живут по соседству от семьи Симпсонов. Набожный христианин, Нед является одним из столпов морали Спрингфилда. В эпизоде «Alone Again, Natura-Diddily» он овдовел, его жена Мод погибла в результате несчастного случая. </p> <p>Нед был одним из первых персонажей в мультсериале, который не был членом семьи Симпсонов. Начиная с первых серий, он регулярно появляется в «Симпсонах». Считается, что Нед Фландерс был назван в честь улицы <em>Northeast Flanders St.</em> в <a href="http://www.portland.gov">Портленде</a>, Орегон, родном городе создателя мультсериала Мэтта Грейнинга]]. Надпись на указателе улицы <em>NE Flanders St.</em> хулиганы часто исправляли на <em>NED Flanders St.</em> </p> diff --git a/tests/misc/blockquote.html b/tests/misc/blockquote.html index 08289b4..429c6d0 100644 --- a/tests/misc/blockquote.html +++ b/tests/misc/blockquote.html @@ -1,24 +1,25 @@ <blockquote> -<p>blockquote with no whitespace before <code>></code>.</p> + <p>blockquote with no whitespace before <code>></code>.</p> </blockquote> <p>foo</p> <blockquote> -<p>blockquote with one space before the <code>></code>.</p> + <p>blockquote with one space before the <code>></code>.</p> </blockquote> <p>bar</p> <blockquote> -<p>blockquote with 2 spaces.</p> + <p>blockquote with 2 spaces.</p> </blockquote> <p>baz</p> -<p>> this has three spaces so its a paragraph.</p> +<p> > this has three spaces so its a paragraph.</p> <p>blah</p> <pre> -<code>> this one had four so it's a code block. + <code>> this one had four so it's a code block. </code> </pre> <blockquote> -<blockquote> -<p>this nested blockquote has 0 on level one and 3 (one after the first <code>></code>+ 2 more) on level 2.</p> + <blockquote> + <p>this nested blockquote has 0 on level one and 3 (one after the first <code>></code> + 2 more) on level 2.</p> + </blockquote> + <p> > and this has 4 on level 2 - another code block.</p> </blockquote> -<p>> and this has 4 on level 2 - another code block.</p> -</blockquote>
\ No newline at end of file + diff --git a/tests/misc/funky-list.html b/tests/misc/funky-list.html index a1aa372..f489d56 100644 --- a/tests/misc/funky-list.html +++ b/tests/misc/funky-list.html @@ -1,11 +1,12 @@ <ol> -<li>this starts a list <em>with</em>numbers</li> -<li>this will show as number "2"</li> -<li>this will show as number "3."</li> -<li>any number, +, -, or * will keep the list going.</li> + <li>this starts a list <em>with</em> numbers</li> + <li>this will show as number "2"</li> + <li>this will show as number "3."</li> + <li>any number, +, -, or * will keep the list going.</li> </ol> <p>aaaaaaaaaaaaaaa</p> <ul> -<li>now a normal list</li> -<li>and more</li> + <li>now a normal list</li> + <li>and more</li> </ul> + diff --git a/tests/misc/japanese.html b/tests/misc/japanese.html index 3fda1c1..ae1df5d 100644 --- a/tests/misc/japanese.html +++ b/tests/misc/japanese.html @@ -9,5 +9,5 @@ <li>オブジェクトのメンバに対するアクセスが制限されていない。（属性や専用のメソッドフックを実装することによって制限は可能。）</li> <li>モジュール、クラス、オブジェクト等の言語の要素が内部からアクセス可能であり、リフレクションを利用した記述が可能。</li> </ul> -<p>また、Pythonではインデントによりブロックを指定する構文を採用している（⇒<a href="#jklj">オフサイドルール</a>）。この構文はPythonに慣れたユーザからは称賛をもって受け入れられているが、他の言語のユーザからは批判も多い。このほかにも、大きすぎる実行ファイルや、Javaに比べて遅い処理速度などが欠点として指摘されている。しかし <strong>プロトタイピング</strong>の際にはこれらの点はさして問題とはならないことから、研究開発部門では頻繁に利用されている。</p> +<p>また、Pythonではインデントによりブロックを指定する構文を採用している（⇒<a href="#jklj">オフサイドルール</a>）。この構文はPythonに慣れたユーザからは称賛をもって受け入れられているが、他の言語のユーザからは批判も多い。このほかにも、大きすぎる実行ファイルや、Javaに比べて遅い処理速度などが欠点として指摘されている。しかし <strong>プロトタイピング</strong> の際にはこれらの点はさして問題とはならないことから、研究開発部門では頻繁に利用されている。</p> diff --git a/tests/misc/multi-test.html b/tests/misc/multi-test.html index fbb37f3..1fc7bdb 100644 --- a/tests/misc/multi-test.html +++ b/tests/misc/multi-test.html @@ -3,21 +3,22 @@ <p>Blah blah blah <a href="http://www.slashdot.org">http://www.slashdot.org</a> </p> <ul> -<li>Basic list</li> -<li>Basic list 2</li> + <li>Basic list</li> + <li>Basic list 2</li> </ul> <p>addss</p> <ul> -<li>Lazy list</li> + <li>Lazy list</li> </ul> -<p>An <a href="http://example.com" title="Title">example</a>(oops)</p> +<p>An <a href="http://example.com" title="Title">example</a> (oops)</p> <p>Now, let's use a footnote[^1]. Not bad, eh? Let's continue.</p> -<p>[^1]: Here is the text of the footnote +<p> [^1]: Here is the text of the footnote continued on several lines. some more of the footnote, etc.</p> <pre> -<code>Actually, another paragraph too. + <code>Actually, another paragraph too. </code> </pre> <p>And then there is a little bit of text.</p> + diff --git a/tests/misc/numeric-entity.html b/tests/misc/numeric-entity.html index 2fa51aa..720a601 100644 --- a/tests/misc/numeric-entity.html +++ b/tests/misc/numeric-entity.html @@ -1,4 +1,4 @@ <p> <a href="mailto:user@gmail.com">user@gmail.com</a> </p> -<p>This is an entity: ê</p>
\ No newline at end of file +<p>This is an entity: ê </p> diff --git a/tests/misc/php.html b/tests/misc/php.html index db0333c..66bc8d1 100644 --- a/tests/misc/php.html +++ b/tests/misc/php.html @@ -6,4 +6,4 @@ <!--This is a comment --></p> <p><div>This shouldn't</div></p> <p><?php echo "block_level";?></p> -<p><?php echo "not_block_level";?></p>
\ No newline at end of file +<p> <?php echo "not_block_level";?></p> diff --git a/tests/misc/russian.html b/tests/misc/russian.html index fef2ebc..06efb99 100644 --- a/tests/misc/russian.html +++ b/tests/misc/russian.html @@ -1,8 +1,9 @@ <h1>Недвард «Нед» Фландерс</h1> <p> -<strong>Недвард «Нед» Фландерс</strong>(Nedward «Ned» Flanders) — вымышленный персонаж мультсериала «[Симпсоны][]», озвученный Гарри Ширером. Он и его семья живут по соседству от семьи Симпсонов. Набожный христианин, Нед является одним из столпов морали Спрингфилда. В эпизоде «Alone Again, Natura-Diddily» он овдовел, его жена Мод погибла в результате несчастного случая.</p> + <strong>Недвард «Нед» Фландерс</strong> (Nedward «Ned» Flanders) — вымышленный персонаж мультсериала «[Симпсоны][]», озвученный Гарри Ширером. Он и его семья живут по соседству от семьи Симпсонов. Набожный христианин, Нед является одним из столпов морали Спрингфилда. В эпизоде «Alone Again, Natura-Diddily» он овдовел, его жена Мод погибла в результате несчастного случая. </p> <p>Нед был одним из первых персонажей в мультсериале, который не был членом семьи Симпсонов. Начиная с первых серий, он регулярно появляется в «Симпсонах». Считается, что Нед Фландерс был назван в честь улицы <em>Northeast Flanders St.</em> в <a href="http://www.portland.gov">Портленде</a>, Орегон, родном городе создателя мультсериала Мэтта Грейнинга]]. Надпись на указателе улицы <em>NE Flanders St.</em> хулиганы часто исправляли на <em>NED Flanders St.</em> </p> <h2>Биография</h2> <p>Нед Фландерс родился в Нью-Йорке, его родители были битниками. Его отец в точности похож на взрослого Неда, только он носил козлиную бородку. Их отказ от воспитания Неда и то, что они, в общем-то, были плохими родителями («мы ничего в этом не понимаем и не знаем как начать») привело к тому, что Нед превратился в ужасного сорванца. В конце концов они согласились на экспериментальную восьмимесячную шлепологическую терапию Миннесотского Университета (воспоминания Неда в эпизоде «Hurricane Neddy»), которая научила его подавлять чувство злости. Побочным эфектом терапии стало то, что Нед стал ненавидеть своих родителей (это одна из двух вещей которые ненавидит Фландерс, вторая — отделения почты, чьи длинные очереди, суета и угрюмый персонал раздражают его).</p> <p>У Неда есть странная привычка добавлять «дидли», «дадли» и другие бессмысленные слова в свои фразы при разговоре, например: «Hi-diddly-ho, neighbor-ino» («Приветик, соседушка»). Это результат сублимации его злости, вызванной сдерживанием гнева, который не имеет никакого другого выхода.</p> + diff --git a/tests/misc/underscores.html b/tests/misc/underscores.html index 43b488f..fa9e642 100644 --- a/tests/misc/underscores.html +++ b/tests/misc/underscores.html @@ -1,8 +1,9 @@ <p>THIS_SHOULD_STAY_AS_IS</p> <p>Here is some <em>emphasis</em>, ok?</p> -<p>Ok, at least <em>this</em>should work.</p> +<p>Ok, at least <em>this</em> should work.</p> <p>THIS<strong>SHOULD</strong>STAY</p> -<p>Here is some <strong>strong</strong>stuff.</p> +<p>Here is some <strong>strong</strong> stuff.</p> <p>THIS<strong> -<em>SHOULD</em> -</strong>STAY?</p>
\ No newline at end of file + <em>SHOULD</em> + </strong>STAY?</p> + |