2cd049a · typeable/pandoc

git.iko.soy/typeable/pandoc

Txt2Tags reader: Header is now parsed only if standalone flag is set

commit2cd049a1bf66f486e7110449854ceb253268fff7 authormpickering <matthewtpickering@gmail.com> dateWed 20 Aug 2014, 18:11 (12 years ago) parent27ea344

4 files changed+7−3

compare with master

unifiedsplit

src/Text/Pandoc/Readers/Txt2Tags.hs+4−1 tests/Tests/Old.hs+1−1 tests/Tests/Readers/Txt2Tags.hs+1−1 tests/txt2tags.native+1

src/Text/Pandoc/Readers/Txt2Tags.hs+4−1

@@ -91,7 +91,10 @@ readTxt2TagsNoMacros = readTxt2Tags def

9191

9292parseT2T :: T2T Pandoc

9393parseT2T = do

94− _ <- (Nothing <$ try blankline) <|> (Just <$> (count 3 anyLine))

94+ -- Parse header if standalone flag is set

95+ optional ((readerStandalone . stateOptions <$> getState)

96+ >>= guard

97+ >> (() <$ (try blankline) <|> () <$ (count 3 anyLine)))

9598 config <- manyTill setting (notFollowedBy setting)

9699 -- TODO: Handle settings better

97100 let settings = foldr (\(k,v) -> B.setMeta k (MetaString v)) nullMeta config

tests/Tests/Old.hs+1−1

@@ -141,7 +141,7 @@ tests = [ testGroup "markdown"

141141 "haddock-reader.haddock" "haddock-reader.native"

142142 ]

143143 , testGroup "txt2tags"

144− [ test "reader" ["-r", "t2t", "-w", "native"]

144+ [ test "reader" ["-r", "t2t", "-w", "native", "-s"]

145145 "txt2tags.t2t" "txt2tags.native" ]

146146 , testGroup "epub" [

147147 test "features" ["-r", "epub", "-w", "native"]

tests/Tests/Readers/Txt2Tags.hs+1−1

@@ -12,7 +12,7 @@ import Data.Monoid (mempty, mconcat)

1212import Text.Pandoc.Readers.Txt2Tags

1313

1414t2t :: String -> Pandoc

15−t2t s = readTxt2Tags (T2TMeta "date" "mtime" "in" "out") def ('\n' : s)

15+t2t s = readTxt2Tags (T2TMeta "date" "mtime" "in" "out") def s

1616

1717infix 4 =:

1818(=:) :: ToString c

tests/txt2tags.native+1

@@ -1,3 +1,4 @@

1+Pandoc (Meta {unMeta = fromList []})

12[Para [Str "This",Space,Str "document",Space,Str "describes",Space,Str "all",Space,Str "the",Space,Str "details",Space,Str "about",Space,Str "each",Space,Str "txt2tags",Space,Str "mark.",Space,Str "The",Space,Str "target",Space,Str "audience",Space,Str "are",Space,Strong [Str "experienced"],Space,Str "users.",Space,Str "You",Space,Str "may",Space,Str "find",Space,Str "it",Space,Str "useful",Space,Str "if",Space,Str "you",Space,Str "want",Space,Str "to",Space,Str "master",Space,Str "the",Space,Str "marks",Space,Str "or",Space,Str "solve",Space,Str "a",Space,Str "specific",Space,Str "problem",Space,Str "about",Space,Str "a",Space,Str "mark."]

23,Para [Str "If",Space,Str "you",Space,Str "are",Space,Str "new",Space,Str "to",Space,Str "txt2tags",Space,Str "or",Space,Str "just",Space,Str "want",Space,Str "to",Space,Str "know",Space,Str "which",Space,Str "are",Space,Str "the",Space,Str "available",Space,Str "marks,",Space,Str "please",Space,Str "read",Space,Str "the",Space,Link [Str "Markup",Space,Str "Demo"] ("MARKUPDEMO",""),Str "."]

34,Para [Str "Note",Space,Str "1:",Space,Str "This",Space,Str "document",Space,Str "is",Space,Str "generated",Space,Str "directly",Space,Str "from",Space,Str "the",Space,Str "txt2tags",Space,Str "test-suite.",Space,Str "All",Space,Str "the",Space,Str "rules",Space,Str "mentioned",Space,Str "here",Space,Str "are",Space,Str "100%",Space,Str "in",Space,Str "sync",Space,Str "with",Space,Str "the",Space,Str "current",Space,Str "program",Space,Str "code."]