git.iko.soy/typeable/pandoc
on master help sign in
Allow multi-line titles and authors in meta block.

Based on a patch by Justin Bogner. Titles may span multiple lines, provided continuation lines begin with a space character. Separate authors may be put on multiple lines, provided each line after the first begins with a space character. Each author must fit on one line. Multiple authors on a single line may still be separated by a semicolon. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1854 788f1e2b-df1e-0410-8736-df70ead52e1b

commit77ba3429e2616a95535706f5c79fe7bc85e5b4b1 authorfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> dateSun 28 Feb 2010, 11:21 (17 years ago) parent36675bd
4 files changed+64−26
compare with master
unifiedsplit
README+46−22 src/Text/Pandoc/Readers/Markdown.hs+11−3 tests/markdown-reader-more.native+1−1 tests/markdown-reader-more.txt+6
README+46−22
@@ -905,32 +905,56 @@ Title blocks
905905
906906If the file begins with a title block
907907
908− % title
909− % author(s) (separated by semicolons)
910− % date
908+ % title
909+ % author(s) (separated by semicolons)
910+ % date
911911
912912it will be parsed as bibliographic information, not regular text. (It
913913will be used, for example, in the title of standalone LaTeX or HTML
914914output.) The block may contain just a title, a title and an author,
915−or all three lines. Each must begin with a % and fit on one line.
916−The title may contain standard inline formatting. If you want to
917−include an author but no title, or a title and a date but no author,
918−you need a blank line:
919−
920− % My title
921− %
922− % June 15, 2006
923−
924−Titles will be written only when the `--standalone` (`-s`) option is
925−chosen. In HTML output, titles will appear twice: once in the
926−document head -- this is the title that will appear at the top of the
927−window in a browser -- and once at the beginning of the document body.
928−The title in the document head can have an optional prefix attached
929−(`--title-prefix` or `-T` option). The title in the body appears as
930−an H1 element with class "title", so it can be suppressed or
931−reformatted with CSS. If a title prefix is specified with `-T` and no
932−title block appears in the document, the title prefix will be used by
933−itself as the HTML title.
915+or all three elements. If you want to include an author but no
916+title, or a title and a date but no author, you need a blank line:
917+
918+ %
919+ % Author
920+
921+ % My title
922+ %
923+ % June 15, 2006
924+
925+The title may occupy multiple lines, but continuation lines must
926+begin with leading space, thus:
927+
928+ % My title
929+ on multiple lines
930+
931+If a document has multiple authors, the authors may be put on
932+separate lines with leading space, or separated by semicolons, or
933+both. So, all of the following are equivalent:
934+
935+ % Author One
936+ Author Two
937+
938+ % Author One; Author Two
939+
940+ % Author One;
941+ Author Two
942+
943+The date must fit on one line.
944+
945+All three metadata fields may contain standard inline formatting
946+(italics, links, footnotes, etc.).
947+
948+Title blocks will always be parsed, but they will affect the output only
949+when the `--standalone` (`-s`) option is chosen. In HTML output, titles
950+will appear twice: once in the document head -- this is the title that
951+will appear at the top of the window in a browser -- and once at the
952+beginning of the document body. The title in the document head can have
953+an optional prefix attached (`--title-prefix` or `-T` option). The title
954+in the body appears as an H1 element with class "title", so it can be
955+suppressed or reformatted with CSS. If a title prefix is specified with
956+`-T` and no title block appears in the document, the title prefix will
957+be used by itself as the HTML title.
934958
935959The man page writer extracts a title, man page section number, and
936960other header and footer information from the title line. The title
src/Text/Pandoc/Readers/Markdown.hs+11−3
@@ -133,15 +133,23 @@ inlinesInBalancedBrackets parser = try $ do
133133--
134134
135135titleLine :: GenParser Char ParserState [Inline]
136−titleLine = try $ char '%' >> skipSpaces >> manyTill inline newline
136+titleLine = try $ do
137+ char '%'
138+ skipSpaces
139+ res <- many $ (notFollowedBy newline >> inline)
140+ <|> try (endline >> whitespace)
141+ newline
142+ return $ normalizeSpaces res
137143
138144authorsLine :: GenParser Char ParserState [[Inline]]
139145authorsLine = try $ do
140146 char '%'
141147 skipSpaces
142− authors <- sepEndBy (many1 (notFollowedBy (oneOf ";\n") >> inline)) (oneOf ";")
148+ authors <- sepEndBy (many (notFollowedBy (oneOf ";\n") >> inline))
149+ (char ';' <|>
150+ try (newline >> notFollowedBy blankline >> spaceChar))
143151 newline
144− return $ map normalizeSpaces authors
152+ return $ filter (not . null) $ map normalizeSpaces authors
145153
146154dateLine :: GenParser Char ParserState [Inline]
147155dateLine = try $ do
tests/markdown-reader-more.native+1−1
@@ -1,4 +1,4 @@
1−Pandoc (Meta {docTitle = [], docAuthors = [], docDate = []})
1+Pandoc (Meta {docTitle = [Str "Title",Space,Str "spanning",Space,Str "multiple",Space,Str "lines"], docAuthors = [[Str "Author",Space,Str "One"],[Str "Author",Space,Str "Two"],[Str "Author",Space,Str "Three"],[Str "Author",Space,Str "Four"]], docDate = []})
22[ Header 1 [Str "Additional",Space,Str "markdown",Space,Str "reader",Space,Str "tests"]
33, Header 2 [Str "Blank",Space,Str "line",Space,Str "before",Space,Str "URL",Space,Str "in",Space,Str "link",Space,Str "reference"]
44, Para [Link [Str "foo"] ("/url",""),Space,Str "and",Space,Link [Str "bar"] ("/url","title")]
tests/markdown-reader-more.txt+6
@@ -1,3 +1,9 @@
1+% Title
2+ spanning multiple lines
3+% Author One
4+ Author Two; Author Three;
5+ Author Four
6+
17# Additional markdown reader tests
28
39## Blank line before URL in link reference