From a1c636a05557b1faa207828c9e7102391bdde5c9 Mon Sep 17 00:00:00 2001 From: Waylan Limberg Date: Wed, 3 Sep 2008 13:30:04 -0400 Subject: Replaced indentation with linebreaks only. At least its more consistant - and it better matches other markdown implementations. Also updated tests. --- tests/markdown-test/amps-and-angle-encoding.html | 2 +- tests/markdown-test/angle-links-and-img.html | 11 +- tests/markdown-test/auto-links.html | 23 ++--- tests/markdown-test/backlash-escapes.html | 48 +++------ .../blockquotes-with-code-blocks.html | 8 +- tests/markdown-test/links-inline.html | 12 +-- .../markdown-documentation-basics.html | 3 +- tests/markdown-test/markdown-syntax.html | 111 +++++++-------------- .../markdown-test/ordered-and-unordered-list.html | 2 +- tests/markdown-test/strong-and-em-together.html | 20 +--- tests/markdown-test/tabs.html | 12 +-- 11 files changed, 85 insertions(+), 167 deletions(-) (limited to 'tests/markdown-test') diff --git a/tests/markdown-test/amps-and-angle-encoding.html b/tests/markdown-test/amps-and-angle-encoding.html index fc1b2c3..2c466c1 100644 --- a/tests/markdown-test/amps-and-angle-encoding.html +++ b/tests/markdown-test/amps-and-angle-encoding.html @@ -6,4 +6,4 @@

Here's a link with an ampersand in the URL.

Here's a link with an amersand in the link text: AT&T.

Here's an inline link.

-

Here's an inline link.

+

Here's an inline link.

\ No newline at end of file diff --git a/tests/markdown-test/angle-links-and-img.html b/tests/markdown-test/angle-links-and-img.html index e32b6e6..1ca3b0b 100644 --- a/tests/markdown-test/angle-links-and-img.html +++ b/tests/markdown-test/angle-links-and-img.html @@ -1,7 +1,4 @@ -

- link - image - link - image -

- +

link +image +link +image

\ No newline at end of file diff --git a/tests/markdown-test/auto-links.html b/tests/markdown-test/auto-links.html index 913e1a4..7481fe2 100644 --- a/tests/markdown-test/auto-links.html +++ b/tests/markdown-test/auto-links.html @@ -1,22 +1,15 @@

Link: http://example.com/.

-

Https link: https://example.com -

-

Ftp link: ftp://example.com -

-

With an ampersand: http://example.com/?foo=1&bar=2 -

+

Https link: https://example.com

+

Ftp link: ftp://example.com

+

With an ampersand: http://example.com/?foo=1&bar=2

-

Blockquoted: http://example.com/ -

+

Blockquoted: http://example.com/

-

Auto-links should not occur here: <http://example.com/> -

+

Auto-links should not occur here: <http://example.com/>

or here: <http://example.com/>
\ No newline at end of file diff --git a/tests/markdown-test/backlash-escapes.html b/tests/markdown-test/backlash-escapes.html index 18a67cc..876775f 100644 --- a/tests/markdown-test/backlash-escapes.html +++ b/tests/markdown-test/backlash-escapes.html @@ -49,35 +49,19 @@ Plus: \+ Minus: \-

Nor should these, which occur in code spans:

-

Backslash: \\ -

-

Backtick: \` -

-

Asterisk: \* -

-

Underscore: \_ -

-

Left brace: \{ -

-

Right brace: \} -

-

Left bracket: \[ -

-

Right bracket: \] -

-

Left paren: \( -

-

Right paren: \) -

-

Greater-than: \> -

-

Hash: \# -

-

Period: \. -

-

Bang: \! -

-

Plus: \+ -

-

Minus: \- -

\ No newline at end of file +

Backslash: \\

+

Backtick: \`

+

Asterisk: \*

+

Underscore: \_

+

Left brace: \{

+

Right brace: \}

+

Left bracket: \[

+

Right bracket: \]

+

Left paren: \(

+

Right paren: \)

+

Greater-than: \>

+

Hash: \#

+

Period: \.

+

Bang: \!

+

Plus: \+

+

Minus: \-

\ No newline at end of file diff --git a/tests/markdown-test/blockquotes-with-code-blocks.html b/tests/markdown-test/blockquotes-with-code-blocks.html index 4b09449..5fc98b1 100644 --- a/tests/markdown-test/blockquotes-with-code-blocks.html +++ b/tests/markdown-test/blockquotes-with-code-blocks.html @@ -1,11 +1,11 @@
-

Example:

- 
sub status {
+
Example:

+
sub status {
     print "working";
 }
 

-  
Or:

-  
sub status {
+
Or:

+
sub status {
     return "working";
 }
 

diff --git a/tests/markdown-test/links-inline.html b/tests/markdown-test/links-inline.html
index e1aaf27..707937a 100644
--- a/tests/markdown-test/links-inline.html
+++ b/tests/markdown-test/links-inline.html
@@ -1,9 +1,5 @@
 
Just a URL.

-

-URL and title.

-

-URL and title.

-

-URL and title.

-

-Empty.

\ No newline at end of file
+
URL and title.

+
URL and title.

+
URL and title.

+
Empty.

\ No newline at end of file
diff --git a/tests/markdown-test/markdown-documentation-basics.html b/tests/markdown-test/markdown-documentation-basics.html
index e0edcdc..3bcaea9 100644
--- a/tests/markdown-test/markdown-documentation-basics.html
+++ b/tests/markdown-test/markdown-documentation-basics.html
@@ -17,8 +17,7 @@ HTML output produced by Markdown.

 
It's also helpful to simply try Markdown out; the Dingus is a
 web application that allows you type your own Markdown-formatted text
 and translate it to XHTML.

-

-  Note: This document is itself written using Markdown; you
+
Note: This document is itself written using Markdown; you
 can see the source for it by adding '.text' to the URL.

 
Paragraphs, Headers, Blockquotes

 
A paragraph is simply one or more consecutive lines of text, separated
diff --git a/tests/markdown-test/markdown-syntax.html b/tests/markdown-test/markdown-syntax.html
index c53c045..2f63b4b 100644
--- a/tests/markdown-test/markdown-syntax.html
+++ b/tests/markdown-test/markdown-syntax.html
@@ -8,74 +8,35 @@
 
 
 

+
Note: This document is itself written using Markdown; you
 can see the source for it by adding '.text' to the URL.

 

 
Overview

@@ -522,12 +483,12 @@ on a line by itself:

 

 
That is:

 
    
-  
  • Square brackets containing the link identifier (optionally
+
  • Square brackets containing the link identifier (optionally
 indented from the left margin using up to three spaces);
    • 
-  
  • followed by a colon;
    • 
-  
  • followed by one or more spaces (or tabs);
    • 
-  
  • followed by the URL for the link;
    • 
-  
  • optionally followed by a title attribute for the link, enclosed
+
  • followed by a colon;
    • 
+
  • followed by one or more spaces (or tabs);
    • 
+
  • followed by the URL for the link;
    • 
+
  • optionally followed by a title attribute for the link, enclosed
 in double or single quotes.
    • 
 

 
The link URL may, optionally, be surrounded by angle brackets:

@@ -697,10 +658,10 @@ for links, allowing for two styles: inline and reference.

That is:

diff --git a/tests/markdown-test/ordered-and-unordered-list.html b/tests/markdown-test/ordered-and-unordered-list.html index e96cdba..090c43c 100644 --- a/tests/markdown-test/ordered-and-unordered-list.html +++ b/tests/markdown-test/ordered-and-unordered-list.html @@ -143,4 +143,4 @@ back.

  • Third

    • - + \ No newline at end of file diff --git a/tests/markdown-test/strong-and-em-together.html b/tests/markdown-test/strong-and-em-together.html index 04c1850..7bf5163 100644 --- a/tests/markdown-test/strong-and-em-together.html +++ b/tests/markdown-test/strong-and-em-together.html @@ -1,16 +1,4 @@ -

    - -This is strong and em. - -

    -

    So is -this - word.

    -

    - -This is strong and em. - -

    -

    So is -this - word.

    +

    This is strong and em.

    +

    So is this word.

    +

    This is strong and em.

    +

    So is this word.

    \ No newline at end of file diff --git a/tests/markdown-test/tabs.html b/tests/markdown-test/tabs.html index f302d5f..b26391b 100644 --- a/tests/markdown-test/tabs.html +++ b/tests/markdown-test/tabs.html @@ -1,12 +1,12 @@

    Code:

    this code block is indented by one tab
-- 
cgit v1.2.3