Changes to Texinfo writer:

+ No space between paragraph and following @verbatim (provides more
  pleasing appearance in text formats)
+ Blank line consistently after list environments.
+ Removed deVerb.
+ Use @code instead of @verb for inline code (this solves the character
  escaping problem for texi2dvi and texi2pdf).
+ Modified test suite accordingly.
+ Added Peter Wang to copyright statement (for Texinfo.hs).
+ Added news of Texinfo writer to README.
+ Added Texinfo to list of formats in man page, and removed extra 'groff'.
+ Updated macports with Texinfo format.
+ Updated FreeBSD pkg-descr with Texinfo format.
+ Updated web page with Texinfo writer.
+ Added demos for Texinfo writer.
+ Added Texinfo to package description in debian/control.
+ Added texi & texinfo extensions to Main.hs, and fixed bug in determining
  default output extension.
+ Changed from texinfo to texi extension in web demo.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1244 788f1e2b-df1e-0410-8736-df70ead52e1b

1 files changed, 29 insertions, 18 deletions

diff --git a/tests/writer.texinfo b/tests/writer.texinfo
index 787e067d5..adf7edb69 100644
--- a/tests/writer.texinfo
+++ b/tests/writer.texinfo
@@ -139,7 +139,6 @@ This is a block quote. It is pretty short.
 @end quotation
 @quotation
 Code in a block quote:
-
 @verbatim
 sub status {
     print "working";
@@ -154,6 +153,7 @@ item one
 @item
 item two
 @end enumerate
+
 Nested block quotes:
 
 @quotation
@@ -179,7 +179,6 @@ And a following paragraph.
 @node Code Blocks
 @chapter Code Blocks
 Code:
-
 @verbatim
 ---- (should be four hyphens)
 
@@ -191,7 +190,6 @@ this code block is indented by one tab
 @end verbatim
 
 And:
-
 @verbatim
     this code block is indented by two tabs
 
@@ -305,6 +303,7 @@ Second
 @item
 Third
 @end enumerate
+
 and:
 
 @enumerate 
@@ -315,6 +314,7 @@ Two
 @item
 Three
 @end enumerate
+
 Loose using tabs:
 
 @enumerate 
@@ -328,6 +328,7 @@ Second
 Third
 
 @end enumerate
+
 and using spaces:
 
 @enumerate 
@@ -341,6 +342,7 @@ Two
 Three
 
 @end enumerate
+
 Multiple paragraphs:
 
 @enumerate 
@@ -357,6 +359,7 @@ Item 3.
 
 @end enumerate
 
+
 @node Nested
 @section Nested
 @itemize
@@ -393,6 +396,7 @@ Foe
 @item
 Third
 @end enumerate
+
 Same thing but with paragraphs:
 
 @enumerate 
@@ -416,6 +420,7 @@ Third
 
 @end enumerate
 
+
 @node Tabs and spaces
 @section Tabs and spaces
 @itemize
@@ -458,8 +463,11 @@ a subsublist
 @item
 a subsublist
 @end enumerate
+
 @end enumerate
+
 @end enumerate
+
 Nesting:
 
 @enumerate A
@@ -475,9 +483,13 @@ Decimal start with 6
 @item
 Lower alpha with paren
 @end enumerate
+
 @end enumerate
+
 @end enumerate
+
 @end enumerate
+
 Autonumbering:
 
 @enumerate 
@@ -489,7 +501,9 @@ More.
 @item
 Nested.
 @end enumerate
+
 @end enumerate
+
 Should not be a list item:
 
 M.A. 2007
@@ -518,6 +532,7 @@ orange fruit
 
 yellow fruit
 @end table
+
 Tight using tabs:
 
 @table @asis
@@ -531,6 +546,7 @@ orange fruit
 
 yellow fruit
 @end table
+
 Loose:
 
 @table @asis
@@ -547,6 +563,7 @@ orange fruit
 yellow fruit
 
 @end table
+
 Multiple blocks with italics:
 
 @table @asis
@@ -559,7 +576,6 @@ contains seeds@comma{} crisp@comma{} pleasant to taste
 @item @emph{orange}
 
 orange fruit
-
 @verbatim
 { orange code block }
 @end verbatim
@@ -570,6 +586,7 @@ orange block quote
 @end quotation
 @end table
 
+
 @node HTML Blocks
 @chapter HTML Blocks
 Simple block on one line:
@@ -587,7 +604,6 @@ Here's a simple block:
 
 foo
 This should be a code block@comma{} though:
-
 @verbatim
 <div>
     foo
@@ -595,7 +611,6 @@ This should be a code block@comma{} though:
 @end verbatim
 
 As should this:
-
 @verbatim
 <div>foo</div>
 @end verbatim
@@ -608,7 +623,6 @@ This should just be an HTML comment:
 Multiline:
 
 Code block:
-
 @verbatim
 <!-- Comment -->
 @end verbatim
@@ -616,7 +630,6 @@ Code block:
 Just plain comment@comma{} with trailing spaces on the line:
 
 Code:
-
 @verbatim
 <hr />
 @end verbatim
@@ -646,7 +659,7 @@ So is @strong{@emph{this}} word.
 
 So is @strong{@emph{this}} word.
 
-This is code: @verb{!>!}@comma{} @verb{!$!}@comma{} @verb{!\!}@comma{} @verb{!\$!}@comma{} @verb{!<html>!}.
+This is code: @code{>}@comma{} @code{$}@comma{} @code{\}@comma{} @code{\$}@comma{} @code{<html>}.
 
 @textstrikeout{This is @emph{strikeout}.}
 
@@ -673,7 +686,7 @@ These should not be superscripts or subscripts@comma{} because of the unescaped
 
 `He said@comma{} ``I want to go.''' Were you alive in the 70's?
 
-Here is some quoted `@verb{!code!}' and a ``@uref{http://example.com/?foo=1&bar=2,quoted link}''.
+Here is some quoted `@code{code}' and a ``@uref{http://example.com/?foo=1&bar=2,quoted link}''.
 
 Some dashes: one---two---three---four---five.
 
@@ -719,11 +732,11 @@ These shouldn't be math:
 
 @itemize
 @item
-To get the famous equation@comma{} write @verb{!$e = mc^2$!}.
+To get the famous equation@comma{} write @code{$e = mc^2$}.
 @item
 $22@comma{}000 is a @emph{lot} of money. So is $34@comma{}000. (It worked if ``lot'' is emphasized.)
 @item
-Escaped @verb{!$!}: $73 @emph{this should be emphasized} 23$.
+Escaped @code{$}: $73 @emph{this should be emphasized} 23$.
 @end itemize
 
 Here's a LaTeX table:
@@ -858,7 +871,6 @@ Indented @uref{/url,twice}.
 Indented @uref{/url,thrice}.
 
 This should [not][] be a link.
-
 @verbatim
 [not]: /url
 @end verbatim
@@ -892,14 +904,13 @@ In a list?
 It should.
 @end itemize
 
-An e-mail address: @uref{mailto:nobody@@nowhere.net,@verb{!nobody@@nowhere.net!}}
+An e-mail address: @uref{mailto:nobody@@nowhere.net,@code{nobody@@nowhere.net}}
 
 @quotation
 Blockquoted: @url{http://example.com/}
 
 @end quotation
-Auto-links should not occur here: @verb{!<http://example.com/>!}
-
+Auto-links should not occur here: @code{<http://example.com/>}
 @verbatim
 or here: <http://example.com/>
 @end verbatim
@@ -931,12 +942,11 @@ Here is a movie @image{movie,,,movie,jpg} icon.
 Here is a footnote reference@comma{}@footnote{Here is the footnote. It can go anywhere after the footnote reference. It need not be placed at the end of the document.} and another.@footnote{Here's the long note. This one contains multiple blocks.
 
 Subsequent blocks are indented to show that they belong to the footnote (as with list items).
-
 @verbatim
   { <code> }
 @end verbatim
 
-If you want@comma{} you can indent every line@comma{} but you can also be lazy and just indent the first line of each block.} This should @emph{not} be a footnote reference@comma{} because it contains a space.[^my note] Here is an inline note.@footnote{This is @emph{easier} to type. Inline notes may contain @uref{http://google.com,links} and @verb{!]!} verbatim characters@comma{} as well as [bracketed text].}
+If you want@comma{} you can indent every line@comma{} but you can also be lazy and just indent the first line of each block.} This should @emph{not} be a footnote reference@comma{} because it contains a space.[^my note] Here is an inline note.@footnote{This is @emph{easier} to type. Inline notes may contain @uref{http://google.com,links} and @code{]} verbatim characters@comma{} as well as [bracketed text].}
 
 @quotation
 Notes can go in quotes.@footnote{In quote.}
@@ -946,6 +956,7 @@ Notes can go in quotes.@footnote{In quote.}
 @item
 And in list items.@footnote{In list.}
 @end enumerate
+
 This paragraph should not be part of the note@comma{} as it is not indented.
 
 @bye