diff --git a/README b/README --- a/README +++ b/README @@ -379,6 +379,10 @@ user data directory (see `--data-dir`, below). If it is not found there, sensible defaults will be used. +`--epub-cover-image=`*FILE* +: Use the specified image as the EPUB cover. It is recommended + that the image be less than 1000px in width and height. + `--epub-metadata=`*FILE* : Look in the specified XML file for metadata for the EPUB. The file should contain a series of Dublin Core elements, @@ -431,6 +435,12 @@ user data directory (see `--data-dir`), or, if that is not present, the Chicago author-date style. +`--natbib` +: Use natbib for citations in LaTeX output. + +`--biblatex` +: Use biblatex for citations in LaTeX output. + `--data-dir=`*DIRECTORY* : Specify the user data directory to search for pandoc data files. If this option is not specified, the default user data directory @@ -1981,7 +1991,7 @@ [groff man]: http://developer.apple.com/DOCUMENTATION/Darwin/Reference/ManPages/man7/groff_man.7.html [Haskell]: http://www.haskell.org/ [GNU Texinfo]: http://www.gnu.org/software/texinfo/ -[Emacs Org-Mode]: http://org-mode.org +[Emacs Org-Mode]: http://orgmode.org [EPUB]: http://www.idpf.org/ [GPL]: http://www.gnu.org/copyleft/gpl.html "GNU General Public License" diff --git a/changelog b/changelog --- a/changelog +++ b/changelog @@ -1,3 +1,104 @@ +pandoc (1.8.1.2) + + * Added `--epub-cover-image` option. + + * Documented `--biblatex` and `--natbib` options. + + * Allow `--section-divs` with slidy output. Resolves Issue #296. + + * Disallow notes within notes in reST and markdown. + These previously caused infinite looping and stack overflows. + For example: + + [^1] + + [^1]: See [^1] + + Note references are allowed in reST notes, so this isn't a full + implementation of reST. That can come later. For now we need to + prevent the stack overflows. Partially resolves Issue #297. + + * EPUB writer: Allow non-plain math methods. + + * Forbid ()s in citation item keys. Resolves Issue #304: problems with + `(@item1; @item2)` because the final paren was being parsed as part of + the item key. + + * Changed URI parser so it doesn't include trailing punctuation. + So, in RST, `http://google.com.` should be parsed as a link followed by a + period. The parser is smart enough to recognize balanced parentheses, as + often occur in wikipedia links: `http://foo.bar/baz_(bam)`. + + * Markdown+lhs reader: Require space after inverse bird tracks, so that + HTML tags can be used freely at the left margin of a markdown+lhs document. + Thanks to Conal Elliot for the suggestion. + + * Markdown reader: Fixed bug in footnote order (reported by CircleCode). + + * RST reader: + + Fixed bug in in field lists with multi-line items at the + end of the list. + + Added parentheses to RST `specialChars`, so + `(http://google.com)` will be parsed as a link in parens. + Resolves Issue #291. + + Allow `|` followed by newline in RST line block. + + * LaTeX reader: + + Support `\dots`. + + Gobble option & space after linebreak `\\[10pt]`. + + * Textile reader: + + Make it possible to have colons after links. (qerub) + + Make it possible to have colons after links. (Christoffer Sawicki) + + * HTML reader: + + Skip spaces after ``, ``, etc. + + Handle tbody, thead in simple tables. Closes #274. + + Implicit `Para`s instead of `Plains` in some contexts. + + * OpenDocument writer: Use special `First paragraph` style for + first paragraph after most non-paragraph blocks. This allows users to + specify e.g. that only paragraphs after the first paragraph of a block are + to be indented. Thanks to Andrea Rossato for the patch. Closes #20. + + * LaTeX writer: use `deVerb` on table and picture captions. + Otherwise LaTeX complains about `\verb` inside command argument. + Thanks to bbanier for reporting the bug. + + * Markdown writer: Insert HTML comment btw list and indented code block. + This prevents the code block from being interpreted as part of the list. + + * EPUB writer: Add a meta element specify the cover. + Some EPUB e-readers, such as the Nook, require a meta element inside the + OPF metadata block to ensure the cover image is properly displayed. + (Kelsey Hightower) + + * HTML writer: Use embed tag for images with non-image extensions. + (e.g. PDFs). Closes #264. + + * LaTeX writer: Improved tables. + + + More space between lines, top-align cells. + + Use ctable package, which allows footnotes and + provides additional options. + + Made cell alignments work in multiline tables. + + Closes #271, #272. + + * Un-URI-escape image filenames in LaTeX, ConTeXt, RTF, Texinfo. + Also do this when copying image files into EPUBs and ODTs. + Closes #263. + + * Changed to github issue tracker. + + * Added failing emph/strong markdown test case due to Perry Wagle. + + * Slidy improvements: + + Updated to use Slidy2. + + Fixed bug, unclosed div tag. + + Added `duration` variable in template. + Setting this activates the timer. + + Use 'titlepage' instead of 'cover' for title div. + pandoc (1.8.1.1) * `markdown2pdf`: Removed some debugging lines accidentally included diff --git a/man/man1/pandoc.1 b/man/man1/pandoc.1 --- a/man/man1/pandoc.1 +++ b/man/man1/pandoc.1 @@ -475,6 +475,13 @@ .RS .RE .TP +.B \f[C]--epub-cover-image=\f[]\f[I]FILE\f[] +Use the specified image as the EPUB cover. +It is recommended that the image be less than 1000px in width and +height. +.RS +.RE +.TP .B \f[C]--epub-metadata=\f[]\f[I]FILE\f[] Look in the specified XML file for metadata for the EPUB. The file should contain a series of Dublin Core elements, as documented @@ -549,6 +556,16 @@ style: either \f[C]default.csl\f[] in the user data directory (see \f[C]--data-dir\f[]), or, if that is not present, the Chicago author-date style. +.RE +.TP +.B \f[C]--natbib\f[] +Use natbib for citations in LaTeX output. +.RS +.RE +.TP +.B \f[C]--biblatex\f[] +Use biblatex for citations in LaTeX output. +.RS .RE .TP .B \f[C]--data-dir=\f[]\f[I]DIRECTORY\f[] diff --git a/pandoc.cabal b/pandoc.cabal --- a/pandoc.cabal +++ b/pandoc.cabal @@ -1,5 +1,5 @@ Name: pandoc -Version: 1.8.1.1 +Version: 1.8.1.2 Cabal-Version: >= 1.6 Build-Type: Custom License: GPL @@ -7,7 +7,7 @@ Copyright: (c) 2006-2011 John MacFarlane Author: John MacFarlane Maintainer: John MacFarlane -Bug-Reports: http://code.google.com/p/pandoc/issues/list +Bug-Reports: https://github.com/jgm/pandoc/issues Stability: alpha Homepage: http://johnmacfarlane.net/pandoc Category: Text diff --git a/reference.odt b/reference.odt Binary files a/reference.odt and b/reference.odt differ diff --git a/slidy/slidy.min.css b/slidy/slidy.min.css --- a/slidy/slidy.min.css +++ b/slidy/slidy.min.css @@ -1,1 +1,1 @@ -body{margin:0;padding:0;width:100%;height:100%;color:black;background-color:white;font-family:"Gill Sans MT","Gill Sans",GillSans,sans-serif;font-size:14pt;}.hidden{display:none;visibility:hidden;}div.toolbar{position:fixed;z-index:200;top:auto;bottom:0;left:0;right:0;height:1.2em;text-align:right;padding-left:1em;padding-right:1em;font-size:60%;color:red;background:#f0f0f0;}div.background{display:none;}div.handout{margin-left:20px;margin-right:20px;}div.slide.titlepage{text-align:center;}div.slide.titlepage.h1{padding-top:40%;}div.slide{z-index:20;margin:0;padding-top:0;padding-bottom:0;padding-left:20px;padding-right:20px;border-width:0;clear:both;top:0;bottom:0;left:0;right:0;line-height:120%;background-color:transparent;}div.slide+div[class].slide{page-break-before:always;}div.slide h1{padding-left:0;padding-right:20pt;padding-top:4pt;padding-bottom:4pt;margin-top:0;margin-left:0;margin-right:60pt;margin-bottom:.5em;display:block;font-size:160%;line-height:1.2em;background:transparent;}div.toc{position:absolute;top:auto;bottom:4em;left:4em;right:auto;width:60%;max-width:30em;height:30em;border:solid thin black;padding:1em;background:#f0f0f0;color:black;z-index:300;overflow:auto;display:block;visibility:visible;}div.toc-heading{width:100%;border-bottom:solid 1px #b4b4b4;margin-bottom:1em;text-align:center;}pre{font-size:80%;font-weight:bold;line-height:120%;padding-top:.2em;padding-bottom:.2em;padding-left:1em;padding-right:1em;border-style:solid;border-left-width:1em;border-top-width:thin;border-right-width:thin;border-bottom-width:thin;border-color:#95ABD0;color:#00428C;background-color:#E4E5E7;}li pre{margin-left:0;}@media print{div.slide{display:block;visibility:visible;position:relative;border-top-style:solid;border-top-width:thin;border-top-color:black;}div.slide pre{font-size:60%;padding-left:.5em;}div.handout{display:block;visibility:visible;}}blockquote{font-style:italic;}img{background-color:transparent;}p.copyright{font-size:smaller;}.center{text-align:center;}.footnote{font-size:smaller;margin-left:2em;}a img{border-width:0;border-style:none;}a:visited{color:navy;}a:link{color:navy;}a:hover{color:red;text-decoration:underline;}a:active{color:red;text-decoration:underline;}a{text-decoration:none;}.navbar a:link{color:white;}.navbar a:visited{color:yellow;}.navbar a:active{color:red;}.navbar a:hover{color:red;}ul{list-style-type:square;}ul ul{list-style-type:disc;}ul ul ul{list-style-type:circle;}ul ul ul ul{list-style-type:disc;}li{margin-left:.5em;margin-top:.5em;}li li{font-size:85%;font-style:italic;}li li li{font-size:85%;font-style:normal;}div dt{margin-left:0;margin-top:1em;margin-bottom:.5em;font-weight:bold;}div dd{margin-left:2em;margin-bottom:.5em;}p,pre,ul,ol,blockquote,h2,h3,h4,h5,h6,dl,table{margin-left:1em;margin-right:1em;}p.subhead{font-weight:bold;margin-top:2em;}.smaller{font-size:smaller;}.bigger{font-size:130%;}td,th{padding:.2em;}ul{margin:.5em 1.5em .5em 1.5em;padding:0;}ol{margin:.5em 1.5em .5em 1.5em;padding:0;}ul{list-style-type:square;}ul ul{list-style-type:disc;}ul ul ul{list-style-type:circle;}ul ul ul ul{list-style-type:disc;}ul li{list-style:square;margin:.1em 0 .6em 0;padding:0;line-height:140%;}ol li{margin:.1em 0 .6em 1.5em;padding:0;line-height:140%;list-style-type:decimal;}li ul li{font-size:85%;font-style:italic;list-style-type:disc;background:transparent;padding:0;}li li ul li{font-size:85%;font-style:normal;list-style-type:circle;background:transparent;padding:0;}li li li ul li{list-style-type:disc;background:transparent;padding:0;}li ol li{list-style-type:decimal;}li li ol li{list-style-type:decimal;}ol.outline li:hover{cursor:pointer;}ol.outline li.nofold:hover{cursor:default;}ul.outline li:hover{cursor:pointer;}ul.outline li.nofold:hover{cursor:default;}ol.outline{list-style:decimal;}ol.outline ol{list-style-type:lower-alpha;}ol.outline li.nofold{padding:0 0 0 20px;background:transparent url(nofold-dim.gif) no-repeat 0 .5em;}ol.outline li.unfolded{padding:0 0 0 20px;background:transparent url(fold-dim.gif) no-repeat 0 .5em;}ol.outline li.folded{padding:0 0 0 20px;background:transparent url(unfold-dim.gif) no-repeat 0 .5em;}ol.outline li.unfolded:hover{padding:0 0 0 20px;background:transparent url(fold.gif) no-repeat 0 .5em;}ol.outline li.folded:hover{padding:0 0 0 20px;background:transparent url(unfold.gif) no-repeat 0 .5em;}ul.outline li.nofold{padding:0 0 0 20px;background:transparent url(nofold-dim.gif) no-repeat 0 .5em;}ul.outline li.unfolded{padding:0 0 0 20px;background:transparent url(fold-dim.gif) no-repeat 0 .5em;}ul.outline li.folded{padding:0 0 0 20px;background:transparent url(unfold-dim.gif) no-repeat 0 .5em;}ul.outline li.unfolded:hover{padding:0 0 0 20px;background:transparent url(fold.gif) no-repeat 0 .5em;}ul.outline li.folded:hover{padding:0 0 0 20px;background:transparent url(unfold.gif) no-repeat 0 .5em;}a.titleslide{font-weight:bold;font-style:italic;} +body{margin:0;padding:0;width:100%;height:100%;color:black;background-color:white;font-family:"Gill Sans MT","Gill Sans",GillSans,sans-serif;font-size:14pt}div.toolbar{position:fixed;z-index:200;top:auto;bottom:0;left:0;right:0;height:1.2em;text-align:right;padding-left:1em;padding-right:1em;font-size:60%;color:red;background-color:#f0f0f0;border-top:solid 1px #b4b4b4}div.toolbar span.copyright{color:black;margin-left:.5em}div.initial_prompt{position:absolute;z-index:1000;bottom:1.2em;width:100%;background-color:#c8c8c8;opacity:.35;background-color:rgb(200,200,200,0.35);cursor:pointer}div.initial_prompt p.help{text-align:center}div.initial_prompt p.close{text-align:right;font-style:italic}div.slidy_toc{position:absolute;z-index:300;width:60%;max-width:30em;height:30em;overflow:auto;top:auto;right:auto;left:4em;bottom:4em;padding:1em;background:#f0f0f0;border-style:solid;border-width:2px;font-size:60%}div.slidy_toc .toc_heading{text-align:center;width:100%;margin:0;margin-bottom:1em;border-bottom-style:solid;border-bottom-color:#b4b4b4;border-bottom-width:1px}div.slide{z-index:20;margin:0;padding-top:0;padding-bottom:0;padding-left:20px;padding-right:20px;border-width:0;clear:both;top:0;bottom:0;left:0;right:0;line-height:120%;background-color:transparent}div.background{display:none}div.handout{margin-left:20px;margin-right:20px}div.slide.titlepage{text-align:center}div.slide.titlepage.h1{padding-top:10%}div.slide h1{padding-left:0;padding-right:20pt;padding-top:4pt;padding-bottom:4pt;margin-top:0;margin-left:0;margin-right:60pt;margin-bottom:.5em;display:block;font-size:160%;line-height:1.2em;background:transparent}div.toc{position:absolute;top:auto;bottom:4em;left:4em;right:auto;width:60%;max-width:30em;height:30em;border:solid thin black;padding:1em;background:#f0f0f0;color:black;z-index:300;overflow:auto;display:block;visibility:visible}div.toc-heading{width:100%;border-bottom:solid 1px #b4b4b4;margin-bottom:1em;text-align:center}pre{font-size:80%;font-weight:bold;line-height:120%;padding-top:.2em;padding-bottom:.2em;padding-left:1em;padding-right:1em;border-style:solid;border-left-width:1em;border-top-width:thin;border-right-width:thin;border-bottom-width:thin;border-color:#95abd0;color:#00428c;background-color:#e4e5e7}li pre{margin-left:0}blockquote{font-style:italic}img{background-color:transparent}p.copyright{font-size:smaller}.center{text-align:center}.footnote{font-size:smaller;margin-left:2em}a img{border-width:0;border-style:none}a:visited{color:navy}a:link{color:navy}a:hover{color:red;text-decoration:underline}a:active{color:red;text-decoration:underline}a{text-decoration:none}.navbar a:link{color:white}.navbar a:visited{color:yellow}.navbar a:active{color:red}.navbar a:hover{color:red}ul{list-style-type:square}ul ul{list-style-type:disc}ul ul ul{list-style-type:circle}ul ul ul ul{list-style-type:disc}li{margin-left:.5em;margin-top:.5em}li li{font-size:85%;font-style:italic}li li li{font-size:85%;font-style:normal}div dt{margin-left:0;margin-top:1em;margin-bottom:.5em;font-weight:bold}div dd{margin-left:2em;margin-bottom:.5em}p,pre,ul,ol,blockquote,h2,h3,h4,h5,h6,dl,table{margin-left:1em;margin-right:1em}p.subhead{font-weight:bold;margin-top:2em}.smaller{font-size:smaller}.bigger{font-size:130%}td,th{padding:.2em}ul{margin:.5em 1.5em .5em 1.5em;padding:0}ol{margin:.5em 1.5em .5em 1.5em;padding:0}ul{list-style-type:square}ul ul{list-style-type:disc}ul ul ul{list-style-type:circle}ul ul ul ul{list-style-type:disc}ul li{list-style:square;margin:.1em 0 .6em 0;padding:0;line-height:140%}ol li{margin:.1em 0 .6em 1.5em;padding:0;line-height:140%;list-style-type:decimal}li ul li{font-size:85%;font-style:italic;list-style-type:disc;background:transparent;padding:0}li li ul li{font-size:85%;font-style:normal;list-style-type:circle;background:transparent;padding:0}li li li ul li{list-style-type:disc;background:transparent;padding:0}li ol li{list-style-type:decimal}li li ol li{list-style-type:decimal}ol.outline li:hover{cursor:pointer}ol.outline li.nofold:hover{cursor:default}ul.outline li:hover{cursor:pointer}ul.outline li.nofold:hover{cursor:default}ol.outline{list-style:decimal}ol.outline ol{list-style-type:lower-alpha}ol.outline li.nofold{padding:0 0 0 20px;background:transparent url(../graphics/nofold-dim.gif) no-repeat 0 .5em}ol.outline li.unfolded{padding:0 0 0 20px;background:transparent url(../graphics/fold-dim.gif) no-repeat 0 .5em}ol.outline li.folded{padding:0 0 0 20px;background:transparent url(../graphics/unfold-dim.gif) no-repeat 0 .5em}ol.outline li.unfolded:hover{padding:0 0 0 20px;background:transparent url(../graphics/fold.gif) no-repeat 0 .5em}ol.outline li.folded:hover{padding:0 0 0 20px;background:transparent url(../graphics/unfold.gif) no-repeat 0 .5em}ul.outline li.nofold{padding:0 0 0 20px;background:transparent url(../graphics/nofold-dim.gif) no-repeat 0 .5em}ul.outline li.unfolded{padding:0 0 0 20px;background:transparent url(../graphics/fold-dim.gif) no-repeat 0 .5em}ul.outline li.folded{padding:0 0 0 20px;background:transparent url(../graphics/unfold-dim.gif) no-repeat 0 .5em}ul.outline li.unfolded:hover{padding:0 0 0 20px;background:transparent url(../graphics/fold.gif) no-repeat 0 .5em}ul.outline li.folded:hover{padding:0 0 0 20px;background:transparent url(../graphics/unfold.gif) no-repeat 0 .5em}a.titleslide{font-weight:bold;font-style:italic}img.hidden{display:none;visibility:hidden}div.initial_prompt{display:none;visibility:hidden}div.slide{visibility:visible;position:inherit}div.handout{border-top-style:solid;border-top-width:thin;border-top-color:black}@media screen{.hidden{display:none;visibility:visible}div.slide.hidden{display:block;visibility:visible}div.handout.hidden{display:block;visibility:visible}div.background{display:none;visibility:hidden}body.single_slide div.initial_prompt{display:block;visibility:visible}body.single_slide div.background{display:block;visibility:visible}body.single_slide div.background.hidden{display:none;visibility:hidden}body.single_slide .invisible{visibility:hidden}body.single_slide .hidden{display:none;visibility:hidden}body.single_slide div.slide{position:absolute}body.single_slide div.handout{display:none;visibility:hidden}}@media print{.hidden{display:block;visibility:visible}div.slide pre{font-size:60%;padding-left:.5em}div.toolbar{display:none;visibility:hidden}div.slidy_toc{display:none;visibility:hidden}div.background{display:none;visibility:hidden}div.slide{page-break-before:always}div.slide.first-slide{page-break-before:avoid}} diff --git a/slidy/slidy.min.js b/slidy/slidy.min.js --- a/slidy/slidy.min.js +++ b/slidy/slidy.min.js @@ -1,1 +1,1 @@ -var ns_pos=(typeof window.pageYOffset!="undefined");var khtml=((navigator.userAgent).indexOf("KHTML")>=0?true:false);var opera=((navigator.userAgent).indexOf("Opera")>=0?true:false);var ie=(typeof document.all!="undefined"&&!opera);var ie7=(!ns_pos&&navigator.userAgent.indexOf("MSIE 7")!=-1);var ie8=(!ns_pos&&navigator.userAgent.indexOf("MSIE 8")!=-1);var slidy_started=false;if(ie&&!ie8){document.write("")}if(typeof beforePrint!="undefined"){window.onbeforeprint=beforePrint;window.onafterprint=afterPrint}if(ie){setTimeout(ieSlidyInit,100)}else{if(document.addEventListener){document.addEventListener("DOMContentLoaded",startup,false)}}function ieSlidyInit(){if(document.readyState=="complete"||document.readyState=="loaded"){startup()}else{setTimeout(ieSlidyInit,100)}}setTimeout(hideSlides,50);function hideSlides(){if(document.body){document.body.style.visibility="hidden"}else{setTimeout(hideSlides,50)}}var slidenum=0;var slides;var slideNumElement;var notes;var backgrounds;var toolbar;var title;var lastShown=null;var eos=null;var toc=null;var outline=null;var selectedTextLen;var viewAll=0;var wantToolbar=1;var mouseClickEnabled=true;var scrollhack=0;var key_wanted=false;var helpAnchor;var helpPage="http://www.w3.org/Talks/Tools/Slidy/help.html";var helpText="Navigate with mouse click, space bar, Cursor Left/Right, or Pg Up and Pg Dn. Use S and B to change font size.";var sizeIndex=0;var sizeAdjustment=0;var sizes=new Array("10pt","12pt","14pt","16pt","18pt","20pt","22pt","24pt","26pt","28pt","30pt","32pt");var okayForIncremental=incrementalElementList();var lastWidth=0;var lastHeight=0;var objects;var lang="en";var strings_es={slide:"pág.","help?":"Ayuda","contents?":"Índice","table of contents":"tabla de contenidos","Table of Contents":"Tabla de Contenidos","restart presentation":"Reiniciar presentación","restart?":"Inicio"};strings_es[helpText]="Utilice el ratón, barra espaciadora, teclas Izda/Dcha, o Re pág y Av pág. Use S y B para cambiar el tamaño de fuente.";var strings_ca={slide:"pàg..","help?":"Ajuda","contents?":"Índex","table of contents":"taula de continguts","Table of Contents":"Taula de Continguts","restart presentation":"Reiniciar presentació","restart?":"Inici"};strings_ca[helpText]="Utilitzi el ratolí, barra espaiadora, tecles Esq./Dta. o Re pàg y Av pàg. Usi S i B per canviar grandària de font.";var strings_nl={slide:"pagina","help?":"Help?","contents?":"Inhoud?","table of contents":"inhoudsopgave","Table of Contents":"Inhoudsopgave","restart presentation":"herstart presentatie","restart?":"Herstart?"};strings_nl[helpText]="Navigeer d.m.v. het muis, spatiebar, Links/Rechts toetsen, of PgUp en PgDn. Gebruik S en B om de karaktergrootte te veranderen.";var strings_de={slide:"Seite","help?":"Hilfe","contents?":"Übersicht","table of contents":"Inhaltsverzeichnis","Table of Contents":"Inhaltsverzeichnis","restart presentation":"Präsentation neu starten","restart?":"Neustart"};strings_de[helpText]="Benutzen Sie die Maus, Leerschlag, die Cursortasten links/rechts oder Page up/Page Down zum Wechseln der Seiten und S und B für die Schriftgrösse.";var strings_pl={slide:"slajd","help?":"pomoc?","contents?":"spis treści?","table of contents":"spis treści","Table of Contents":"Spis Treści","restart presentation":"Restartuj prezentację","restart?":"restart?"};strings_pl[helpText]="Zmieniaj slajdy klikając myszą, naciskając spację, strzałki lewo/prawolub PgUp / PgDn. Użyj klawiszy S i B, aby zmienić rozmiar czczionki.";var strings_fr={slide:"page","help?":"Aide","contents?":"Index","table of contents":"table des matières","Table of Contents":"Table des matières","restart presentation":"Recommencer l'exposé","restart?":"Début"};strings_fr[helpText]="Naviguez avec la souris, la barre d'espace, les flèches gauche/droite ou les touches Pg Up, Pg Dn. Utilisez les touches S et B pour modifier la taille de la police.";var strings_hu={slide:"oldal","help?":"segítség","contents?":"tartalom","table of contents":"tartalomjegyzék","Table of Contents":"Tartalomjegyzék","restart presentation":"bemutató újraindítása","restart?":"újraindítás"};strings_hu[helpText]="Az oldalak közti lépkedéshez kattintson az egérrel, vagy használja a szóköz, a bal, vagy a jobb nyíl, illetve a Page Down, Page Up billentyűket. Az S és a B billentyűkkel változtathatja a szöveg méretét.";var strings_it={slide:"pag.","help?":"Aiuto","contents?":"Indice","table of contents":"indice","Table of Contents":"Indice","restart presentation":"Ricominciare la presentazione","restart?":"Inizio"};strings_it[helpText]="Navigare con mouse, barra spazio, frecce sinistra/destra o PgUp e PgDn. Usare S e B per cambiare la dimensione dei caratteri.";var strings_el={slide:"σελίδα","help?":"βοήθεια;","contents?":"περιεχόμενα;","table of contents":"πίνακας περιεχομένων","Table of Contents":"Πίνακας Περιεχομένων","restart presentation":"επανεκκίνηση παρουσίασης","restart?":"επανεκκίνηση;"};strings_el[helpText]="Πλοηγηθείτε με το κλίκ του ποντικιού, το space, τα βέλη αριστερά/δεξιά, ή Page Up και Page Down. Χρησιμοποιήστε τα πλήκτρα S και B για να αλλάξετε το μέγεθος της γραμματοσειράς.";var strings_ja={slide:"スライド","help?":"ヘルプ","contents?":"目次","table of contents":"目次を表示","Table of Contents":"目次","restart presentation":"最初から再生","restart?":"最初から"};strings_ja[helpText]="マウス左クリック ・ スペース ・ 左右キー または Page Up ・ Page Downで操作， S ・ Bでフォントサイズ変更";var strings_zh={slide:"幻灯片","help?":"帮助?","contents?":"内容?","table of contents":"目录","Table of Contents":"目录","restart presentation":"重新启动展示","restart?":"重新启动?"};strings_zh[helpText]="用鼠标点击, 空格条, 左右箭头, Pg Up 和 Pg Dn 导航. 用 S, B 改变字体大小.";var strings_ru={slide:"слайд","help?":"помощь?","contents?":"содержание?","table of contents":"оглавление","Table of Contents":"Оглавление","restart presentation":"перезапустить презентацию","restart?":"перезапуск?"};strings_ru[helpText]="Перемещайтесь кликая мышкой, используя клавишу пробел, стрелкивлево/вправо или Pg Up и Pg Dn. Клавиши S и B меняют размер шрифта.";var strings_sv={slide:"sida","help?":"hjälp","contents?":"innehåll","table of contents":"innehållsförteckning","Table of Contents":"Innehållsförteckning","restart presentation":"visa presentationen från början","restart?":"börja om"};strings_sv[helpText]="Bläddra med ett klick med vänstra musknappen, mellanslagstangenten, vänster- och högerpiltangenterna eller tangenterna Pg Up, Pg Dn. Använd tangenterna S och B för att ändra textens storlek.";var localize={es:strings_es,ca:strings_ca,nl:strings_nl,de:strings_de,pl:strings_pl,fr:strings_fr,hu:strings_hu,it:strings_it,el:strings_el,jp:strings_ja,zh:strings_zh,ru:strings_ru,sv:strings_sv};function startup(){if(slidy_started){alert("already started");return}slidy_started=true;lang=document.body.parentNode.getAttribute("lang");if(!lang){lang=document.body.parentNode.getAttribute("xml:lang")}if(!lang){lang="en"}document.body.style.visibility="visible";title=document.title;toolbar=addToolbar();wrapImplicitSlides();slides=collectSlides();notes=collectNotes();objects=document.body.getElementsByTagName("object");backgrounds=collectBackgrounds();patchAnchors();slidenum=findSlideNumber(location.href);window.offscreenbuffering=true;sizeAdjustment=findSizeAdjust();hideImageToolbar();initOutliner();if(slides.length>0){var slide=slides[slidenum];slide.style.position="absolute";if(slidenum>0){setVisibilityAllIncremental("visible");lastShown=previousIncrementalItem(null);setEosStatus(true)}else{lastShown=null;setVisibilityAllIncremental("hidden");setEosStatus(!nextIncrementalItem(lastShown))}setLocation()}toc=tableOfContents();hideTableOfContents();document.onclick=mouseButtonClick;document.onmouseup=mouseButtonUp;document.onkeydown=keyDown;if(opera){document.onkeypress=keyPress}window.onresize=resized;window.onscroll=scrolled;window.onunload=unloaded;singleSlideView();setLocation();resized();if(ie7){setTimeout("ieHack()",100)}showToolbar();setInterval("checkLocation()",200)}String.prototype.localize=function(){if(this==""){return this}var s,lookup=localize[lang];if(lookup){s=lookup[this];if(s){return s}}var lg=lang.split("-");if(lg.length>1){lookup=localize[lg[0]];if(lookup){s=lookup[this];if(s){return s}}}return this};function hideImageToolbar(){if(!ns_pos){var images=document.getElementsByTagName("IMG");for(var i=0;i=0?true:false)}function resized(){var width=0;if(typeof(window.innerWidth)=="number"){width=window.innerWidth}else{if(document.documentElement&&document.documentElement.clientWidth){width=document.documentElement.clientWidth}else{if(document.body&&document.body.clientWidth){width=document.body.clientWidth}}}var height=0;if(typeof(window.innerHeight)=="number"){height=window.innerHeight}else{if(document.documentElement&&document.documentElement.clientHeight){height=document.documentElement.clientHeight}else{if(document.body&&document.body.clientHeight){height=document.body.clientHeight}}}if(height&&(width/height>1.05*1024/768)){width=height*1024/768}if(width!=lastWidth||height!=lastHeight){if(width>=1100){sizeIndex=5}else{if(width>=1000){sizeIndex=4}else{if(width>=800){sizeIndex=3}else{if(width>=600){sizeIndex=2}else{if(width){sizeIndex=0}}}}}if(0<=sizeIndex+sizeAdjustment&&sizeIndex+sizeAdjustmentoh?sh:oh)}return 0}function smaller(){if(sizeIndex>0){--sizeIndex}toolbar.style.display="none";document.body.style.fontSize=sizes[sizeIndex];var slide=slides[slidenum];hideSlide(slide);showSlide(slide);setTimeout(showToolbar,300)}function bigger(){if(sizeIndex0){stopPropagation(e);e.cancel=true;e.returnValue=false;return false}hideTableOfContents();if(mouseClickEnabled&&leftclick&&target.nodeName!="EMBED"&&target.nodeName!="OBJECT"&&target.nodeName!="VIDEO"&&target.nodeName!="INPUT"&&target.nodeName!="TEXTAREA"&&target.nodeName!="SELECT"&&target.nodeName!="OPTION"){nextSlide(true);stopPropagation(e);e.cancel=true;e.returnValue=false}}function previousSlide(incremental){if(!viewAll){var slide;if((incremental||slidenum==0)&&lastShown!=null){lastShown=hidePreviousItem(lastShown);setEosStatus(false)}else{if(slidenum>0){slide=slides[slidenum];hideSlide(slide);slidenum=slidenum-1;slide=slides[slidenum];setVisibilityAllIncremental("visible");lastShown=previousIncrementalItem(null);setEosStatus(true);showSlide(slide)}}setLocation();if(!ns_pos){refreshToolbar(200)}}}function nextSlide(incremental){if(!viewAll){var slide,last=lastShown;if(incremental||slidenum==slides.length-1){lastShown=revealNextItem(lastShown)}if((!incremental||lastShown==null)&&slidenum0&&(hash==""||hash=="#")){gotoSlide(0)}else{if(hash.length>2&&hash!="#("+(slidenum+1)+")"){var num=parseInt(location.hash.substr(2));if(!isNaN(num)){gotoSlide(num-1)}}}}function setLocation(){var uri=pageAddress(location.href);var hash="#("+(slidenum+1)+")";if(slidenum>=0){uri=uri+hash}if(ie&&!ie8){pushHash(hash)}if(uri!=location.href){location.href=uri}if(khtml){hash="("+(slidenum+1)+")"}if(!ie&&location.hash!=hash&&location.hash!=""){location.hash=hash}document.title=title+" ("+(slidenum+1)+")";showSlideNumber()}function onFrameLoaded(hash){location.hash=hash;var uri=pageAddress(location.href);location.href=uri+hash}function pushHash(hash){if(hash==""){hash="#(1)"}window.location.hash=hash;var doc=document.getElementById("historyFrame").contentWindow.document;doc.open("javascript:''");doc.write(' $else$ - $endif$ +$if(duration)$ + +$endif$ $for(include-before)$ $include-before$ $endfor$ $if(title)$ -
+

$title$

$for(author)$$author$$sep$
$endfor$

$if(date)$ -

$date$

+

$date$

$endif$
$endif$ diff --git a/tests/html-reader.html b/tests/html-reader.html --- a/tests/html-reader.html +++ b/tests/html-reader.html @@ -298,40 +298,6 @@
Low-voiced stringed instrument.
-

HTML Blocks

-

Simple block on one line:

-foo

And nested without indentation:

-foobar

Interpreted markdown in a table:

-This is emphasized. And this is strong

Here's a simple block:

-foo

This should be a code block, though:

-
<div>
-    foo
-</div>
-
-

As should this:

-
<div>foo</div>
-
-

Now, nested:

-foo

This should just be an HTML comment:

-

Multiline:

-

Code block:

-
<!-- Comment -->
-
-

Just plain comment, with trailing spaces on the line:

-

Code:

-
<hr />
-
-

Hr's:

-
-
-
-
-
-
-
-
-
-

Inline Markup

This is emphasized, and so is this.

This is strong, and so is this.

diff --git a/tests/html-reader.native b/tests/html-reader.native --- a/tests/html-reader.native +++ b/tests/html-reader.native @@ -183,39 +183,6 @@ ,([Str "Cello",LineBreak,Str "Violoncello"], [[Plain [Str "Low",Str "-",Str "voiced",Space,Str "stringed",Space,Str "instrument",Str "."]]])] ,HorizontalRule -,Header 1 [Str "HTML",Space,Str "Blocks"] -,Para [Str "Simple",Space,Str "block",Space,Str "on",Space,Str "one",Space,Str "line:"] -,Plain [Str "foo"] -,Para [Str "And",Space,Str "nested",Space,Str "without",Space,Str "indentation:"] -,Plain [Str "foobar"] -,Para [Str "Interpreted",Space,Str "markdown",Space,Str "in",Space,Str "a",Space,Str "table:"] -,Plain [Str "This",Space,Str "is",Space,Emph [Str "emphasized"],Str ".",Space,Str "And",Space,Str "this",Space,Str "is",Space,Strong [Str "strong"]] -,Para [Str "Here",Str "'",Str "s",Space,Str "a",Space,Str "simple",Space,Str "block:"] -,Plain [Str "foo"] -,Para [Str "This",Space,Str "should",Space,Str "be",Space,Str "a",Space,Str "code",Space,Str "block,",Space,Str "though:"] -,CodeBlock ("",[],[]) "
\n foo\n
" -,Para [Str "As",Space,Str "should",Space,Str "this:"] -,CodeBlock ("",[],[]) "
foo
" -,Para [Str "Now,",Space,Str "nested:"] -,Plain [Str "foo"] -,Para [Str "This",Space,Str "should",Space,Str "just",Space,Str "be",Space,Str "an",Space,Str "HTML",Space,Str "comment:"] -,Para [Str "Multiline:"] -,Para [Str "Code",Space,Str "block:"] -,CodeBlock ("",[],[]) "" -,Para [Str "Just",Space,Str "plain",Space,Str "comment,",Space,Str "with",Space,Str "trailing",Space,Str "spaces",Space,Str "on",Space,Str "the",Space,Str "line:"] -,Para [Str "Code:"] -,CodeBlock ("",[],[]) "
" -,Para [Str "Hr",Str "'",Str "s:"] -,HorizontalRule -,HorizontalRule -,HorizontalRule -,HorizontalRule -,HorizontalRule -,HorizontalRule -,HorizontalRule -,HorizontalRule -,HorizontalRule -,HorizontalRule ,Header 1 [Str "Inline",Space,Str "Markup"] ,Para [Str "This",Space,Str "is",Space,Emph [Str "emphasized"],Str ",",Space,Str "and",Space,Str "so",Space,Emph [Str "is",Space,Str "this"],Str "."] ,Para [Str "This",Space,Str "is",Space,Strong [Str "strong"],Str ",",Space,Str "and",Space,Str "so",Space,Strong [Str "is",Space,Str "this"],Str "."] @@ -293,7 +260,7 @@ ,Para [Link [Str "URL",Space,Str "and",Space,Str "title"] ("/url/","title preceded by a tab"),Str "."] ,Para [Link [Str "URL",Space,Str "and",Space,Str "title"] ("/url/","title with \"quotes\" in it")] ,Para [Link [Str "URL",Space,Str "and",Space,Str "title"] ("/url/","title with single quotes")] -,Plain [Str "Email",Space,Str "link",Space,Str "(nobody",Space,Str "[at]",Space,Str "nowhere",Str ".",Str "net)"] +,Para [Str "Email",Space,Str "link",Space,Str "(nobody",Space,Str "[at]",Space,Str "nowhere",Str ".",Str "net)"] ,Para [Link [Str "Empty"] ("",""),Str "."] ,Header 2 [Str "Reference"] ,Para [Str "Foo",Space,Link [Str "bar"] ("/url/",""),Str "."] @@ -319,7 +286,7 @@ [[Plain [Str "In",Space,Str "a",Space,Str "list?"]] ,[Plain [Link [Str "http://example",Str ".",Str "com/"] ("http://example.com/","")]] ,[Plain [Str "It",Space,Str "should",Str "."]]] -,Plain [Str "An",Space,Str "e",Str "-",Str "mail",Space,Str "address:",Space,Str "nobody",Space,Str "[at]",Space,Str "nowhere",Str ".",Str "net"] +,Para [Str "An",Space,Str "e",Str "-",Str "mail",Space,Str "address:",Space,Str "nobody",Space,Str "[at]",Space,Str "nowhere",Str ".",Str "net"] ,BlockQuote [Para [Str "Blockquoted:",Space,Link [Str "http://example",Str ".",Str "com/"] ("http://example.com/","")]] ,Para [Str "Auto",Str "-",Str "links",Space,Str "should",Space,Str "not",Space,Str "occur",Space,Str "here:",Space,Code ("",[],[]) ""] diff --git a/tests/lhs-test.nohl.html b/tests/lhs-test.nohl.html --- a/tests/lhs-test.nohl.html +++ b/tests/lhs-test.nohl.html @@ -4,30 +4,14 @@ -

lhs test

unsplit is an arrow that takes a pair of values and combines them to return a single value:

-
unsplit :: (Arrow a) => (b -> c -> d) -> a (b, c) d
unsplit = arr . uncurry       
          -- arr (\op (x,y) -> x `op` y)
+
unsplit :: (Arrow a) => (b -> c -> d) -> a (b, c) d
+unsplit = arr . uncurry       
+          -- arr (\op (x,y) -> x `op` y) 
+

(***) combines two arrows into a new arrow by running the two arrows on a pair of values (one arrow on the first item of the pair and one arrow on the second item of the pair).

f *** g = first f >>> second g
diff --git a/tests/lhs-test.nohl.html+lhs b/tests/lhs-test.nohl.html+lhs --- a/tests/lhs-test.nohl.html+lhs +++ b/tests/lhs-test.nohl.html+lhs @@ -4,30 +4,14 @@ -

lhs test

unsplit is an arrow that takes a pair of values and combines them to return a single value:

-
> unsplit :: (Arrow a) => (b -> c -> d) -> a (b, c) d
> unsplit = arr . uncurry       
>           -- arr (\op (x,y) -> x `op` y)
+
> unsplit :: (Arrow a) => (b -> c -> d) -> a (b, c) d
+> unsplit = arr . uncurry       
+>           -- arr (\op (x,y) -> x `op` y) 
+

(***) combines two arrows into a new arrow by running the two arrows on a pair of values (one arrow on the first item of the pair and one arrow on the second item of the pair).

f *** g = first f >>> second g
diff --git a/tests/rst-reader.native b/tests/rst-reader.native --- a/tests/rst-reader.native +++ b/tests/rst-reader.native @@ -222,7 +222,7 @@ ,Para [Str "But",Space,Str "not",Space,Str "here",Str ":"] ,CodeBlock ("",[],[]) "http://example.com/" ,Header 1 [Str "Images"] -,Para [Str "From",Space,Quoted DoubleQuote [Str "Voyage",Space,Str "dans",Space,Str "la",Space,Str "Lune"],Space,Str "by",Space,Str "Georges",Space,Str "Melies",Space,Str "(1902)",Str ":"] +,Para [Str "From",Space,Quoted DoubleQuote [Str "Voyage",Space,Str "dans",Space,Str "la",Space,Str "Lune"],Space,Str "by",Space,Str "Georges",Space,Str "Melies",Space,Str "(",Str "1902",Str ")",Str ":"] ,Plain [Image [Str "image"] ("lalune.jpg","")] ,Plain [Image [Str "Voyage dans la Lune"] ("lalune.jpg","")] ,Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "movie",Space,Image [Str "movie"] ("movie.jpg",""),Space,Str "icon",Str "."] diff --git a/tests/s5.basic.html b/tests/s5.basic.html --- a/tests/s5.basic.html +++ b/tests/s5.basic.html @@ -35,16 +35,13 @@

July 15, 2006

-

First slide

  • first bullet
  • second bullet
-
-

Math

  • $\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$
    • diff --git a/tests/s5.fancy.html b/tests/s5.fancy.html --- a/tests/s5.fancy.html +++ b/tests/s5.fancy.html @@ -234,16 +234,13 @@

    July 15, 2006

-

First slide

  • first bullet
  • second bullet
-
-

Math

  • $\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$
    • diff --git a/tests/tables.latex b/tests/tables.latex --- a/tests/tables.latex +++ b/tests/tables.latex @@ -1,121 +1,176 @@ Simple table with caption: -\begin{table}[h] -\begin{center} -\begin{tabular}{rlcl} -Right & Left & Center & Default\\ -\hline -12 & 12 & 12 & 12\\ -123 & 123 & 123 & 123\\ -1 & 1 & 1 & 1\\ -\end{tabular} -\end{center} -\caption{Demonstration of simple table syntax.} -\end{table} +\ctable[caption = Demonstration of simple table syntax., +pos = H, center, botcap]{rlcl} +{% notes +} +{% rows +\FL +Right & Left & Center & Default +\ML +12 & 12 & 12 & 12 +\\\noalign{\medskip} +123 & 123 & 123 & 123 +\\\noalign{\medskip} +1 & 1 & 1 & 1 +\LL +} Simple table without caption: -\begin{center} -\begin{tabular}{rlcl} -Right & Left & Center & Default\\ -\hline -12 & 12 & 12 & 12\\ -123 & 123 & 123 & 123\\ -1 & 1 & 1 & 1\\ -\end{tabular} -\end{center} +\ctable[pos = H, center, botcap]{rlcl} +{% notes +} +{% rows +\FL +Right & Left & Center & Default +\ML +12 & 12 & 12 & 12 +\\\noalign{\medskip} +123 & 123 & 123 & 123 +\\\noalign{\medskip} +1 & 1 & 1 & 1 +\LL +} Simple table indented two spaces: -\begin{table}[h] -\begin{center} -\begin{tabular}{rlcl} -Right & Left & Center & Default\\ -\hline -12 & 12 & 12 & 12\\ -123 & 123 & 123 & 123\\ -1 & 1 & 1 & 1\\ -\end{tabular} -\end{center} -\caption{Demonstration of simple table syntax.} -\end{table} +\ctable[caption = Demonstration of simple table syntax., +pos = H, center, botcap]{rlcl} +{% notes +} +{% rows +\FL +Right & Left & Center & Default +\ML +12 & 12 & 12 & 12 +\\\noalign{\medskip} +123 & 123 & 123 & 123 +\\\noalign{\medskip} +1 & 1 & 1 & 1 +\LL +} Multiline table with caption: -\begin{table}[h] -\begin{center} -\begin{tabular}{>{\PBS\centering\hspace{0pt}}p{0.15\columnwidth}>{\PBS\raggedright\hspace{0pt}}p{0.14\columnwidth}>{\PBS\raggedleft\hspace{0pt}}p{0.16\columnwidth}>{\PBS\raggedright\hspace{0pt}}p{0.34\columnwidth}} -\parbox{0.15\columnwidth}{Centered Header -} & \parbox{0.14\columnwidth}{Left Aligned -} & \parbox{0.16\columnwidth}{Right Aligned -} & \parbox{0.34\columnwidth}{Default aligned -}\\ -\hline -\parbox{0.15\columnwidth}{First -} & \parbox{0.14\columnwidth}{row -} & \parbox{0.16\columnwidth}{12.0 -} & \parbox{0.34\columnwidth}{Example of a row that spans multiple lines. -}\\ -\parbox{0.15\columnwidth}{Second -} & \parbox{0.14\columnwidth}{row -} & \parbox{0.16\columnwidth}{5.0 -} & \parbox{0.34\columnwidth}{Here's another one. Note the blank line between -rows. -}\\ -\end{tabular} -\end{center} -\caption{Here's the caption. It may span multiple lines.} -\end{table} +\ctable[caption = Here's the caption. It may span multiple lines., +pos = H, center, botcap]{clrl} +{% notes +} +{% rows +\FL +\parbox[b]{0.15\columnwidth}{\centering +Centered Header +} & \parbox[b]{0.14\columnwidth}{\raggedright +Left Aligned +} & \parbox[b]{0.16\columnwidth}{\raggedleft +Right Aligned +} & \parbox[b]{0.34\columnwidth}{\raggedright +Default aligned +} +\ML +\parbox[t]{0.15\columnwidth}{\centering +First +} & \parbox[t]{0.14\columnwidth}{\raggedright +row +} & \parbox[t]{0.16\columnwidth}{\raggedleft +12.0 +} & \parbox[t]{0.34\columnwidth}{\raggedright +Example of a row that spans multiple lines. +} +\\\noalign{\medskip} +\parbox[t]{0.15\columnwidth}{\centering +Second +} & \parbox[t]{0.14\columnwidth}{\raggedright +row +} & \parbox[t]{0.16\columnwidth}{\raggedleft +5.0 +} & \parbox[t]{0.34\columnwidth}{\raggedright +Here's another one. Note the blank line between rows. +} +\LL +} Multiline table without caption: -\begin{center} -\begin{tabular}{>{\PBS\centering\hspace{0pt}}p{0.15\columnwidth}>{\PBS\raggedright\hspace{0pt}}p{0.14\columnwidth}>{\PBS\raggedleft\hspace{0pt}}p{0.16\columnwidth}>{\PBS\raggedright\hspace{0pt}}p{0.34\columnwidth}} -\parbox{0.15\columnwidth}{Centered Header -} & \parbox{0.14\columnwidth}{Left Aligned -} & \parbox{0.16\columnwidth}{Right Aligned -} & \parbox{0.34\columnwidth}{Default aligned -}\\ -\hline -\parbox{0.15\columnwidth}{First -} & \parbox{0.14\columnwidth}{row -} & \parbox{0.16\columnwidth}{12.0 -} & \parbox{0.34\columnwidth}{Example of a row that spans multiple lines. -}\\ -\parbox{0.15\columnwidth}{Second -} & \parbox{0.14\columnwidth}{row -} & \parbox{0.16\columnwidth}{5.0 -} & \parbox{0.34\columnwidth}{Here's another one. Note the blank line between -rows. -}\\ -\end{tabular} -\end{center} +\ctable[pos = H, center, botcap]{clrl} +{% notes +} +{% rows +\FL +\parbox[b]{0.15\columnwidth}{\centering +Centered Header +} & \parbox[b]{0.14\columnwidth}{\raggedright +Left Aligned +} & \parbox[b]{0.16\columnwidth}{\raggedleft +Right Aligned +} & \parbox[b]{0.34\columnwidth}{\raggedright +Default aligned +} +\ML +\parbox[t]{0.15\columnwidth}{\centering +First +} & \parbox[t]{0.14\columnwidth}{\raggedright +row +} & \parbox[t]{0.16\columnwidth}{\raggedleft +12.0 +} & \parbox[t]{0.34\columnwidth}{\raggedright +Example of a row that spans multiple lines. +} +\\\noalign{\medskip} +\parbox[t]{0.15\columnwidth}{\centering +Second +} & \parbox[t]{0.14\columnwidth}{\raggedright +row +} & \parbox[t]{0.16\columnwidth}{\raggedleft +5.0 +} & \parbox[t]{0.34\columnwidth}{\raggedright +Here's another one. Note the blank line between rows. +} +\LL +} Table without column headers: -\begin{center} -\begin{tabular}{rlcr} -12 & 12 & 12 & 12\\ -123 & 123 & 123 & 123\\ -1 & 1 & 1 & 1\\ -\end{tabular} -\end{center} +\ctable[pos = H, center, botcap]{rlcr} +{% notes +} +{% rows +\FL +12 & 12 & 12 & 12 +\\\noalign{\medskip} +123 & 123 & 123 & 123 +\\\noalign{\medskip} +1 & 1 & 1 & 1 +\LL +} Multiline table without column headers: -\begin{center} -\begin{tabular}{>{\PBS\centering\hspace{0pt}}p{0.15\columnwidth}>{\PBS\raggedright\hspace{0pt}}p{0.14\columnwidth}>{\PBS\raggedleft\hspace{0pt}}p{0.16\columnwidth}>{\PBS\raggedright\hspace{0pt}}p{0.34\columnwidth}} -\parbox{0.15\columnwidth}{First -} & \parbox{0.14\columnwidth}{row -} & \parbox{0.16\columnwidth}{12.0 -} & \parbox{0.34\columnwidth}{Example of a row that spans multiple lines. -}\\ -\parbox{0.15\columnwidth}{Second -} & \parbox{0.14\columnwidth}{row -} & \parbox{0.16\columnwidth}{5.0 -} & \parbox{0.34\columnwidth}{Here's another one. Note the blank line between -rows. -}\\ -\end{tabular} -\end{center} +\ctable[pos = H, center, botcap]{clrl} +{% notes +} +{% rows +\FL +\parbox[t]{0.15\columnwidth}{\centering +First +} & \parbox[t]{0.14\columnwidth}{\raggedright +row +} & \parbox[t]{0.16\columnwidth}{\raggedleft +12.0 +} & \parbox[t]{0.34\columnwidth}{\raggedright +Example of a row that spans multiple lines. +} +\\\noalign{\medskip} +\parbox[t]{0.15\columnwidth}{\centering +Second +} & \parbox[t]{0.14\columnwidth}{\raggedright +row +} & \parbox[t]{0.16\columnwidth}{\raggedleft +5.0 +} & \parbox[t]{0.34\columnwidth}{\raggedright +Here's another one. Note the blank line between rows. +} +\LL +} diff --git a/tests/tables.opendocument b/tests/tables.opendocument --- a/tests/tables.opendocument +++ b/tests/tables.opendocument @@ -65,7 +65,8 @@ Demonstration of simple table syntax. -Simple table without caption: +Simple table without +caption: @@ -130,7 +131,7 @@ -Simple table indented two +Simple table indented two spaces: @@ -198,7 +199,8 @@ Demonstration of simple table syntax. -Multiline table with caption: +Multiline table with +caption: @@ -253,7 +255,7 @@ Here's the caption. It may span multiple lines. -Multiline table without +Multiline table without caption: @@ -307,7 +309,8 @@ -Table without column headers: +Table without column +headers: @@ -356,7 +359,7 @@ -Multiline table without column +Multiline table without column headers: diff --git a/tests/textile-reader.native b/tests/textile-reader.native --- a/tests/textile-reader.native +++ b/tests/textile-reader.native @@ -78,6 +78,7 @@ ,Para [Str "Just",Space,Str "a",Space,Link [Str "url"] ("http://www.url.com","")] ,Para [Link [Str "Email",Space,Str "link"] ("mailto:nobody@nowhere.net","")] ,Para [Str "Automatic",Space,Str "linking",Space,Str "to",Space,Link [Str "http://www.example.com"] ("http://www.example.com",""),Space,Str "and",Space,Link [Str "foobar@example.com"] ("mailto:foobar@example.com",""),Str "."] +,Para [Link [Str "Example"] ("http://www.example.com/",""),Str ":",Space,Str "Example",Space,Str "of",Space,Str "a",Space,Str "link",Space,Str "followed",Space,Str "by",Space,Str "a",Space,Str "colon",Str "."] ,Header 1 [Str "Tables"] ,Para [Str "Textile",Space,Str "allows",Space,Str "tables",Space,Str "with",Space,Str "and",Space,Str "without",Space,Str "headers",Space,Str ":"] ,Header 2 [Str "Without",Space,Str "headers"] diff --git a/tests/textile-reader.textile b/tests/textile-reader.textile --- a/tests/textile-reader.textile +++ b/tests/textile-reader.textile @@ -141,6 +141,8 @@ Automatic linking to http://www.example.com and foobar@example.com. +"Example":http://www.example.com/: Example of a link followed by a colon. + h1. Tables Textile allows tables with and without headers : diff --git a/tests/writer.opendocument b/tests/writer.opendocument --- a/tests/writer.opendocument +++ b/tests/writer.opendocument @@ -874,12 +874,12 @@ Level 2 with emphasis Level 3 -with no blank line +with no blank line Level 2 -with no blank line +with no blank line Paragraphs -Here’s a regular +Here’s a regular paragraph. In Markdown 1.0.0 and earlier. Version 8. This line turns into a list item. Because a hard-wrapped line in the middle @@ -891,7 +891,7 @@ Block Quotes -E-mail style: +E-mail style: This is a block quote. It is pretty short. Code in a block quote: @@ -910,13 +910,13 @@ Nested block quotes: nested nested -This should not be a block quote: 2 -> 1. +This should not be a block quote: +2 > 1. And a following paragraph. Code Blocks -Code: +Code: ---- (should be four hyphens) sub status { @@ -924,14 +924,14 @@ } this code block is indented by one tab -And: +And: this code block is indented by two tabs These should not be escaped: \$ \\ \> \[ \{ Lists Unordered -Asterisks tight: +Asterisks tight: asterisk 1 @@ -943,7 +943,7 @@ asterisk 3 -Asterisks loose: +Asterisks loose: asterisk 1 @@ -955,7 +955,7 @@ asterisk 3 -Pluses tight: +Pluses tight: Plus 1 @@ -967,7 +967,7 @@ Plus 3 -Pluses loose: +Pluses loose: Plus 1 @@ -979,7 +979,7 @@ Plus 3 -Minuses tight: +Minuses tight: Minus 1 @@ -991,7 +991,7 @@ Minus 3 -Minuses loose: +Minuses loose: Minus 1 @@ -1004,7 +1004,7 @@ Ordered -Tight: +Tight: First @@ -1016,7 +1016,7 @@ Third -and: +and: One @@ -1028,7 +1028,7 @@ Three -Loose using tabs: +Loose using tabs: First @@ -1040,7 +1040,7 @@ Third -and using spaces: +and using spaces: One @@ -1052,7 +1052,7 @@ Three -Multiple paragraphs: +Multiple paragraphs: Item 1, graf one. @@ -1080,7 +1080,7 @@ -Here’s another: +Here’s another: First @@ -1103,7 +1103,7 @@ Third -Same thing but with +Same thing but with paragraphs: @@ -1176,7 +1176,7 @@ -Nesting: +Nesting: Upper Alpha @@ -1197,7 +1197,7 @@ -Autonumbering: +Autonumbering: Autonumber. @@ -1211,13 +1211,14 @@ -Should not be a list item: +Should not be a list +item: M.A. 2007 B. Williams Definition Lists -Tight using spaces: +Tight using spaces: apple red fruit orange @@ -1226,7 +1227,7 @@ banana yellow fruit -Tight using tabs: +Tight using tabs: apple red fruit orange @@ -1235,14 +1236,15 @@ banana yellow fruit -Loose: +Loose: apple red fruit orange orange fruit banana yellow fruit -Multiple blocks with italics: +Multiple blocks with +italics: apple red fruitcontains @@ -1250,7 +1252,8 @@ orange orange fruit{ orange code block }orange block quote -Multiple definitions, tight: +Multiple definitions, +tight: apple red fruit computer @@ -1258,15 +1261,16 @@ orange fruit bank -Multiple definitions, loose: +Multiple definitions, +loose: apple red fruit computer orange orange fruit bank -Blank line after term, indented marker, -alternate markers: +Blank line after term, indented +marker, alternate markers: apple red fruit computer @@ -1282,7 +1286,8 @@ HTML Blocks -Simple block on one line: +Simple block on one +line: foo And nested without indentation: @@ -1301,24 +1306,24 @@ <div> foo </div> -As should this: +As should this: <div>foo</div> -Now, nested: +Now, nested: foo This should just be an HTML comment: Multiline: Code block: <!-- Comment --> -Just plain comment, with trailing +Just plain comment, with trailing spaces on the line: Code: <hr /> -Hr’s: +Hr’s: Inline Markup -This is +This is emphasized, and so is this. @@ -1365,8 +1370,8 @@ Smart quotes, ellipses, dashes -“Hello,” said the spider. -“‘Shelob’ is my name.” +“Hello,” said the +spider. “‘Shelob’ is my name.” ‘A’, ‘B’, and ‘C’ are letters. ‘Oak,’ ‘elm,’ @@ -1413,7 +1418,8 @@ α + ω × x2. -These shouldn’t be math: +These shouldn’t be +math: To get the famous equation, write @@ -1437,11 +1443,12 @@ 23$. -Here’s a LaTeX table: +Here’s a LaTeX +table: Special Characters -Here is some unicode: +Here is some unicode: I hat: Î @@ -1459,8 +1466,8 @@ copyright: © -AT&T has an ampersand in their -name. +AT&T has an ampersand in +their name. AT&T is another way to write it. This & that. @@ -1485,7 +1492,7 @@ Links Explicit -Just a +Just a URL. URL and title. @@ -1502,7 +1509,7 @@ link Empty. Reference -Foo +Foo bar. Foo bar. @@ -1521,13 +1528,13 @@ thrice. This should [not][] be a link. [not]: /url -Foo +Foo bar. Foo biz. With ampersands -Here’s a +Here’s a link with an ampersand in the URL. Here’s a link with an amersand in @@ -1540,7 +1547,7 @@ inline link in pointy braces. Autolinks -With an ampersand: +With an ampersand: http://example.com/?foo=1&bar=2 @@ -1553,24 +1560,24 @@ It should. -An e-mail address: +An e-mail address: nobody@nowhere.net Blockquoted: http://example.com/ -Auto-links should not occur here: +Auto-links should not occur here: <http://example.com/> or here: <http://example.com/> Images -From “Voyage dans la Lune” -by Georges Melies (1902): - +From “Voyage dans la +Lune” by Georges Melies (1902): + Here is a movie - + icon. Footnotes -Here is a footnote +Here is a footnote reference,1Here is the footnote. It can go anywhere after the footnote reference. It need not be placed at the end of the document. @@ -1600,8 +1607,8 @@ list. -This paragraph should not be part of -the note, as it is not indented. +This paragraph should not be part +of the note, as it is not indented.