summaryrefslogtreecommitdiff
path: root/src/Text
Commit message (Collapse)AuthorAge
* Don't countfiddlosopher2007-08-26
| | | | | | | | | p. 27 at the beginning of a line as an ordered list start, since it's most likely a page number. git-svn-id: https://pandoc.googlecode.com/svn/trunk@900 788f1e2b-df1e-0410-8736-df70ead52e1b
* Fixed bug in LaTeX writer. When a footnote ends with a Verbatimfiddlosopher2007-08-25
| | | | | | | | | environment, the close } of the footnote needs to occur on the same line or an error occurs. Fixed by adding a newline before the close } in every footnote. git-svn-id: https://pandoc.googlecode.com/svn/trunk@897 788f1e2b-df1e-0410-8736-df70ead52e1b
* Removed incorrect "{}" around style information infiddlosopher2007-08-23
| | | | | | | | HTML tables. Adjusted test suite accordingly. Column widths now work properly in HTML. git-svn-id: https://pandoc.googlecode.com/svn/trunk@882 788f1e2b-df1e-0410-8736-df70ead52e1b
* Added new rule for enhanced markdown ordered lists: if the list markerfiddlosopher2007-08-23
| | | | | | | | | | | | | | | | | is a capital letter followed by a period (including a single-letter capital roman numeral), then it must be followed by at least two spaces. The point of this is to avoid accidentally treating people's initials as list markers: a paragraph may begin: B. Russell was an English philosopher. and this shouldn't be treated as a list. Modified Markdown reader and README documentation. Added a test case. git-svn-id: https://pandoc.googlecode.com/svn/trunk@880 788f1e2b-df1e-0410-8736-df70ead52e1b
* Added a needed 'try' to listItem in Markdown reader.fiddlosopher2007-08-22
| | | | git-svn-id: https://pandoc.googlecode.com/svn/trunk@878 788f1e2b-df1e-0410-8736-df70ead52e1b
* Code cleanup in Markdown reader.fiddlosopher2007-08-20
| | | | git-svn-id: https://pandoc.googlecode.com/svn/trunk@877 788f1e2b-df1e-0410-8736-df70ead52e1b
* Changes to Markdown reader for better conformity to thefiddlosopher2007-08-20
| | | | | | | | | | | Markdown test suite under --strict: + Removed check for a following setext header in endline. A full test is too inefficient (doubles benchmark time), and the substitute we had before is not 100% accurate. + Don't use Code elements for autolinks if --strict specified. git-svn-id: https://pandoc.googlecode.com/svn/trunk@876 788f1e2b-df1e-0410-8736-df70ead52e1b
* If --strict and not --toc, don't include identifiers in headers.fiddlosopher2007-08-20
| | | | git-svn-id: https://pandoc.googlecode.com/svn/trunk@875 788f1e2b-df1e-0410-8736-df70ead52e1b
* Refactor RST and Markdown readers using parseFromString.fiddlosopher2007-08-19
| | | | git-svn-id: https://pandoc.googlecode.com/svn/trunk@864 788f1e2b-df1e-0410-8736-df70ead52e1b
* Added a necessary "try" in definition of "para"fiddlosopher2007-08-19
| | | | | | | (HTML reader). git-svn-id: https://pandoc.googlecode.com/svn/trunk@863 788f1e2b-df1e-0410-8736-df70ead52e1b
* Bug fixes in readers:fiddlosopher2007-08-18
| | | | | | | | | | | | | | | | + LaTeX reader: skip anything after \end{document} + HTML reader: fixed bug skipping material after </html> -- previously, stuff at the end was skipped even if no </html> was present, which meant only part of the file would be parsed and no error issued + HTML reader: added new constant eitherBlockOrInline with elements that may count either as block-level or inline + Modified isInline and isBlock to take this into account + modified rawHtmlBlock to accept any tag (even an inline tag); this is innocuous, because rawHtmlBlock is tried only if a regular inline element can't be parsed. git-svn-id: https://pandoc.googlecode.com/svn/trunk@862 788f1e2b-df1e-0410-8736-df70ead52e1b
* + Fixed bug in markdown ordered list parsing. The problem wasfiddlosopher2007-08-18
| | | | | | | | | | | | that anyOrderedListStart did not check for a space following the ordered list marker. So, 'A.B. 2007' would be parsed as a list item, then fail because of the lack of space after 'A.' (required by orderedListStart). Resolves Issue #22. + Fixed a similar problem in RST reader. + Added regression test. git-svn-id: https://pandoc.googlecode.com/svn/trunk@861 788f1e2b-df1e-0410-8736-df70ead52e1b
* Fixed block quote output in markdown writer: previously,fiddlosopher2007-08-17
| | | | | | | block quotes in notes would be indented only in the first line. git-svn-id: https://pandoc.googlecode.com/svn/trunk@859 788f1e2b-df1e-0410-8736-df70ead52e1b
* Cosmetic changes.fiddlosopher2007-08-15
| | | | git-svn-id: https://pandoc.googlecode.com/svn/trunk@851 788f1e2b-df1e-0410-8736-df70ead52e1b
* LaTeX reader: parse \texttt{} as code, as long as there'sfiddlosopher2007-08-15
| | | | | | | nothing fancy inside. git-svn-id: https://pandoc.googlecode.com/svn/trunk@846 788f1e2b-df1e-0410-8736-df70ead52e1b
* Fixed bug in normalizeSpaces: Space:Str "":Spacefiddlosopher2007-08-15
| | | | | | | should compress to Space. git-svn-id: https://pandoc.googlecode.com/svn/trunk@845 788f1e2b-df1e-0410-8736-df70ead52e1b
* Allow htmlComments as rawHtmlInline in HTML reader.fiddlosopher2007-08-15
| | | | git-svn-id: https://pandoc.googlecode.com/svn/trunk@844 788f1e2b-df1e-0410-8736-df70ead52e1b
* Major code cleanup in all modules. (Removed unneeded imports,fiddlosopher2007-08-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | reformatted, etc.) More major changes are documented below: + Removed Text.Pandoc.ParserCombinators and moved all its definitions to Text.Pandoc.Shared. + In Text.Pandoc.Shared: - Removed unneeded 'try' in blanklines. - Removed endsWith function and rewrote functions to use isSuffixOf instead. - Added >>~ combinator. - Rewrote stripTrailingNewlines, removeLeadingSpaces. + Moved Text.Pandoc.Entities -> Text.Pandoc.CharacterReferences. - Removed unneeded functions charToEntity, charToNumericalEntity. - Renamed functions using proper terminology (character references, not entities). decodeEntities -> decodeCharacterReferences, characterEntity -> characterReference. - Moved escapeStringToXML to Docbook writer, which is the only thing that uses it. - Removed old entity parser in HTML and Markdown readers; replaced with new charRef parser in Text.Pandoc.Shared. + Fixed accent bug in Text.Pandoc.Readers.LaTeX: \^{} now correctly parses as a '^' character. + Text.Pandoc.ASCIIMathML is no longer an exported module. git-svn-id: https://pandoc.googlecode.com/svn/trunk@835 788f1e2b-df1e-0410-8736-df70ead52e1b
* Major change in the way ordered lists are handled:fiddlosopher2007-08-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + The changes are documented in README, under Lists. + The OrderedList block element now stores information about list number style, list number delimiter, and starting number. + The readers parse this information, when possible. + The writers use this information to style ordered lists. + Test suites have been changed accordingly. Motivation: It's often useful to start lists with numbers other than 1, and to have control over the style of the list. Added to Text.Pandoc.Shared: + camelCaseToHyphenated + toRomanNumeral + anyOrderedListMarker + orderedListMarker + orderedListMarkers Added to Text.Pandoc.ParserCombinators: + charsInBalanced' + withHorizDisplacement + romanNumeral RST writer: + Force blank line before lists, so that sublists will be handled correctly. LaTeX reader: + Fixed bug in parsing of footnotes containing multiple paragraphs, introduced by use of charsInBalanced. Fix: use charsInBalanced' instead. LaTeX header: + use mathletters option in ucs package, so that basic unicode Greek letters will work properly. git-svn-id: https://pandoc.googlecode.com/svn/trunk@834 788f1e2b-df1e-0410-8736-df70ead52e1b
* Added parsing for \url to LaTeX reader.fiddlosopher2007-08-03
| | | | git-svn-id: https://pandoc.googlecode.com/svn/trunk@833 788f1e2b-df1e-0410-8736-df70ead52e1b
* Use \url{} for autolinks in LaTeX writer.fiddlosopher2007-08-03
| | | | git-svn-id: https://pandoc.googlecode.com/svn/trunk@832 788f1e2b-df1e-0410-8736-df70ead52e1b
* Changes to Markdown reader:fiddlosopher2007-07-28
| | | | | | | | | + added try to def of indentSpaces + in def of 'reference', check to make sure it's not a note reference first. git-svn-id: https://pandoc.googlecode.com/svn/trunk@827 788f1e2b-df1e-0410-8736-df70ead52e1b
* Removed examplep specific stuff in LaTeX reader.fiddlosopher2007-07-28
| | | | git-svn-id: https://pandoc.googlecode.com/svn/trunk@826 788f1e2b-df1e-0410-8736-df70ead52e1b
* LaTeX writer:fiddlosopher2007-07-28
| | | | | | | | | | | + No longer using examplep (too many quirks, too hard to install) + Instead, using deVerb function for environments that don't support \verb + And fancyvrb for footnotes and verbatim environments in footnotes. + Add fancyvrb to header if Code inline occurs in a footnote. git-svn-id: https://pandoc.googlecode.com/svn/trunk@825 788f1e2b-df1e-0410-8736-df70ead52e1b
* Cleaned up and fixed autolinks in RST. All that's neededfiddlosopher2007-07-28
| | | | | | | | | is a bare email address or URL. This is now handled with a separate matching clause in the definition of inlineToRST, rather than with conditionals. git-svn-id: https://pandoc.googlecode.com/svn/trunk@821 788f1e2b-df1e-0410-8736-df70ead52e1b
* Don't put autolinks in typewriter font in ConTeXt, sincefiddlosopher2007-07-28
| | | | | | | ConTeXt has its own way of printing links. git-svn-id: https://pandoc.googlecode.com/svn/trunk@820 788f1e2b-df1e-0410-8736-df70ead52e1b
* Fixed problems with obfuscateLink introduced by last roundfiddlosopher2007-07-28
| | | | | | | | of changes. Changed type so that text parameter is String, not HTML, which allows easier testing for autolinks. git-svn-id: https://pandoc.googlecode.com/svn/trunk@819 788f1e2b-df1e-0410-8736-df70ead52e1b
* Changes in LaTeX reader to accommodate Pandoc's own use offiddlosopher2007-07-28
| | | | | | | examplep. git-svn-id: https://pandoc.googlecode.com/svn/trunk@818 788f1e2b-df1e-0410-8736-df70ead52e1b
* Man page writer: modified treatment of autolinks,fiddlosopher2007-07-28
| | | | | | | in accord with recent change from Str to Code. git-svn-id: https://pandoc.googlecode.com/svn/trunk@816 788f1e2b-df1e-0410-8736-df70ead52e1b
* LaTeX writer: include fancyvrb and \VerbatimFootnotesfiddlosopher2007-07-28
| | | | | | | | line in header only if absolutely needed -- that is, only if there is actually a code block in a footnote. git-svn-id: https://pandoc.googlecode.com/svn/trunk@815 788f1e2b-df1e-0410-8736-df70ead52e1b
* Simplified HTML writer's treatment of autolinks.fiddlosopher2007-07-28
| | | | | | | | There are now a few different cases for Link, and less conditional logic needed. git-svn-id: https://pandoc.googlecode.com/svn/trunk@813 788f1e2b-df1e-0410-8736-df70ead52e1b
* Make URLs and emails in autolinks appear as Code.fiddlosopher2007-07-28
| | | | git-svn-id: https://pandoc.googlecode.com/svn/trunk@810 788f1e2b-df1e-0410-8736-df70ead52e1b
* Fixed a bug in Docbook writer: email links with text were beingfiddlosopher2007-07-28
| | | | | | | incorrectly treated as autolinks. git-svn-id: https://pandoc.googlecode.com/svn/trunk@809 788f1e2b-df1e-0410-8736-df70ead52e1b
* Reinstated dependence on fancyvrb. It is compatible with examplep.fiddlosopher2007-07-28
| | | | | | | fancyvrb is needed for verbatim environments in footnotes. git-svn-id: https://pandoc.googlecode.com/svn/trunk@808 788f1e2b-df1e-0410-8736-df70ead52e1b
* Changed LaTeX writer to use the examplep package insteadfiddlosopher2007-07-28
| | | | | | | | | | | | | | | | | | of fancyvrb. examplep allows verbatim text in places where fancyvrb does not, e.g. definition list terms, and provides for line-breaking of verbatim text. + examplep code put in LaTeX header instead of being dynamically included, since it is frequently used, and people may want to customize the options. + documented dependency on examplep + added texlive-latex-extra as a "Suggested" package in debian/control + use examplep's \Q{} is now used instead of \verb: note that \Q requires backslash- escaping symbols in its scope. + modified README so that the verbatim sections will look good at shorter line lengths. git-svn-id: https://pandoc.googlecode.com/svn/trunk@807 788f1e2b-df1e-0410-8736-df70ead52e1b
* Use ` as default character for \verb in LaTeX output.fiddlosopher2007-07-27
| | | | | | | | If ` is in the content to be escaped, another symbol will be used as before. git-svn-id: https://pandoc.googlecode.com/svn/trunk@806 788f1e2b-df1e-0410-8736-df70ead52e1b
* Include empty \author{} in LaTeX preamble if nofiddlosopher2007-07-26
| | | | | | | author specified; otherwise LaTeX gives an error. git-svn-id: https://pandoc.googlecode.com/svn/trunk@803 788f1e2b-df1e-0410-8736-df70ead52e1b
* Fixes in LaTeX writer:fiddlosopher2007-07-26
| | | | | | | | | | | + put \VerbatimFootnotes right before \title block, to avoid bad interactions. + added deVerb in description list. + removed \texttt{} from deVerb, because it cannot go in description lists. git-svn-id: https://pandoc.googlecode.com/svn/trunk@802 788f1e2b-df1e-0410-8736-df70ead52e1b
* Changed how ASCIIMathML is handled:fiddlosopher2007-07-26
| | | | | | | | | | | | | + -m|--asciimathml option now takes an *optional* argument, the URL to an asciiMathML.js script. This is much better in situations where multiple files with math must be served, as the script can be cached. + If the argument is provided, a link is inserted; otherwise, the whole script is inserted as before. + Nothing is inserted unless there is inline LaTeX. git-svn-id: https://pandoc.googlecode.com/svn/trunk@799 788f1e2b-df1e-0410-8736-df70ead52e1b
* Fixed bug in TOC generation in HTML writer (regression,fiddlosopher2007-07-24
| | | | | | | introduced by the revision in the WriterState type). git-svn-id: https://pandoc.googlecode.com/svn/trunk@793 788f1e2b-df1e-0410-8736-df70ead52e1b
* LaTeX writer: Make sure \VerbatimFootnotes goes after thefiddlosopher2007-07-23
| | | | | | | | preamble; otherwise it has bad interaction effects with the other stuff in the header. git-svn-id: https://pandoc.googlecode.com/svn/trunk@791 788f1e2b-df1e-0410-8736-df70ead52e1b
* In HTML reader, filter Nulls in lists of blocks. (These canfiddlosopher2007-07-23
| | | | | | | be caused by raw HTML when the parse-raw option isn't selected.) git-svn-id: https://pandoc.googlecode.com/svn/trunk@787 788f1e2b-df1e-0410-8736-df70ead52e1b
* Fixed bug in spanStrikeout: case was not exhaustive.fiddlosopher2007-07-23
| | | | git-svn-id: https://pandoc.googlecode.com/svn/trunk@786 788f1e2b-df1e-0410-8736-df70ead52e1b
* README: Removed the statement that the RST reader doesn't parsefiddlosopher2007-07-23
| | | | | | | | | | definition lists. HTML reader: Added failIfStrict to the definitionList parser, so definition lists will be passed through as raw HTML if --strict specified. git-svn-id: https://pandoc.googlecode.com/svn/trunk@783 788f1e2b-df1e-0410-8736-df70ead52e1b
* Added support for definition lists to RST reader.fiddlosopher2007-07-23
| | | | | | | Added a relevant test to the test suite. git-svn-id: https://pandoc.googlecode.com/svn/trunk@782 788f1e2b-df1e-0410-8736-df70ead52e1b
* Added definition list support to HTML reader.fiddlosopher2007-07-23
| | | | | | | Added a test for definition lists to the html-reader test suite. git-svn-id: https://pandoc.googlecode.com/svn/trunk@781 788f1e2b-df1e-0410-8736-df70ead52e1b
* Added support for definition lists to LaTeX reader.fiddlosopher2007-07-23
| | | | git-svn-id: https://pandoc.googlecode.com/svn/trunk@780 788f1e2b-df1e-0410-8736-df70ead52e1b
* Renamed parseFromStr -> parseFromString.fiddlosopher2007-07-23
| | | | git-svn-id: https://pandoc.googlecode.com/svn/trunk@779 788f1e2b-df1e-0410-8736-df70ead52e1b
* Superscript and Subscript support for RST reader.fiddlosopher2007-07-22
| | | | git-svn-id: https://pandoc.googlecode.com/svn/trunk@777 788f1e2b-df1e-0410-8736-df70ead52e1b
* Added a "try" to the end parser in enclosed (Text.Pandoc.ParserCombinators).fiddlosopher2007-07-22
| | | | | | | | This makes errors in its use less likely. Removed some now-unneeded try's in calling code. git-svn-id: https://pandoc.googlecode.com/svn/trunk@776 788f1e2b-df1e-0410-8736-df70ead52e1b