Merge pull request #1099 from hdevalence/master
Minor HLint-suggested changes
This commit is contained in:
John MacFarlane
commit
3c4aa01664
23 changed files with 69 additions and 69 deletions
|
|
@ -656,7 +656,7 @@ options =
|
|||
(ReqArg
|
||||
(\arg opt -> do
|
||||
let b = takeBaseName arg
|
||||
if (b == "pdflatex" || b == "lualatex" || b == "xelatex")
|
||||
if b `elem` ["pdflatex", "lualatex", "xelatex"]
|
||||
then return opt { optLaTeXEngine = arg }
|
||||
else err 45 "latex-engine must be pdflatex, lualatex, or xelatex.")
|
||||
"PROGRAM")
|
||||
|
|
@ -1034,12 +1034,10 @@ main = do
|
|||
|
||||
variables' <- case mathMethod of
|
||||
LaTeXMathML Nothing -> do
|
||||
s <- readDataFileUTF8 datadir
|
||||
("LaTeXMathML.js")
|
||||
s <- readDataFileUTF8 datadir "LaTeXMathML.js"
|
||||
return $ ("mathml-script", s) : variables
|
||||
MathML Nothing -> do
|
||||
s <- readDataFileUTF8 datadir
|
||||
("MathMLinHTML.js")
|
||||
s <- readDataFileUTF8 datadir "MathMLinHTML.js"
|
||||
return $ ("mathml-script", s) : variables
|
||||
_ -> return variables
|
||||
|
||||
|
|
|
|||
|
|
@ -41,6 +41,7 @@ import System.Directory
|
|||
import System.Environment
|
||||
import Control.Monad (unless)
|
||||
import Data.List (isInfixOf)
|
||||
import Data.Maybe (fromMaybe)
|
||||
import qualified Data.ByteString.Base64 as B64
|
||||
import qualified Text.Pandoc.UTF8 as UTF8
|
||||
import Text.Pandoc.Definition
|
||||
|
|
@ -87,7 +88,7 @@ handleImage' baseURL tmpdir (Image ils (src,tit)) = do
|
|||
res <- fetchItem baseURL src
|
||||
case res of
|
||||
Right (contents, Just mime) -> do
|
||||
let ext = maybe (takeExtension src) id $
|
||||
let ext = fromMaybe (takeExtension src) $
|
||||
extensionFromMimeType mime
|
||||
let basename = UTF8.toString $ B64.encode $ UTF8.fromString src
|
||||
let fname = tmpdir </> basename <.> ext
|
||||
|
|
|
|||
|
|
@ -271,7 +271,7 @@ spaceChar = satisfy $ \c -> c == ' ' || c == '\t'
|
|||
|
||||
-- | Parses a nonspace, nonnewline character.
|
||||
nonspaceChar :: Parser [Char] st Char
|
||||
nonspaceChar = satisfy $ \x -> x /= '\t' && x /= '\n' && x /= ' ' && x /= '\r'
|
||||
nonspaceChar = satisfy $ flip notElem ['\t', '\n', ' ', '\r']
|
||||
|
||||
-- | Skips zero or more spaces or tabs.
|
||||
skipSpaces :: Parser [Char] st ()
|
||||
|
|
@ -1062,7 +1062,7 @@ doubleQuoteStart :: Parser [Char] ParserState ()
|
|||
doubleQuoteStart = do
|
||||
failIfInQuoteContext InDoubleQuote
|
||||
try $ do charOrRef "\"\8220\147"
|
||||
notFollowedBy (satisfy (\c -> c == ' ' || c == '\t' || c == '\n'))
|
||||
notFollowedBy . satisfy $ flip elem [' ', '\t', '\n']
|
||||
|
||||
doubleQuoteEnd :: Parser [Char] st ()
|
||||
doubleQuoteEnd = do
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ import Data.Char (isSpace)
|
|||
import Control.Monad.State
|
||||
import Control.Applicative ((<$>))
|
||||
import Data.List (intersperse)
|
||||
import Data.Maybe (fromMaybe)
|
||||
|
||||
{-
|
||||
|
||||
|
|
@ -683,7 +684,7 @@ parseBlock (Elem e) =
|
|||
"lowerroman" -> LowerRoman
|
||||
"upperroman" -> UpperRoman
|
||||
_ -> Decimal
|
||||
let start = maybe 1 id $
|
||||
let start = fromMaybe 1 $
|
||||
(attrValue "override" <$> filterElement (named "listitem") e)
|
||||
>>= safeRead
|
||||
orderedListWith (start,listStyle,DefaultDelim)
|
||||
|
|
@ -779,7 +780,7 @@ parseBlock (Elem e) =
|
|||
caption <- case filterChild isCaption e of
|
||||
Just t -> getInlines t
|
||||
Nothing -> return mempty
|
||||
let e' = maybe e id $ filterChild (named "tgroup") e
|
||||
let e' = fromMaybe e $ filterChild (named "tgroup") e
|
||||
let isColspec x = named "colspec" x || named "col" x
|
||||
let colspecs = case filterChild (named "colgroup") e' of
|
||||
Just c -> filterChildren isColspec c
|
||||
|
|
@ -801,7 +802,7 @@ parseBlock (Elem e) =
|
|||
Just "center" -> AlignCenter
|
||||
_ -> AlignDefault
|
||||
let toWidth c = case findAttr (unqual "colwidth") c of
|
||||
Just w -> maybe 0 id
|
||||
Just w -> fromMaybe 0
|
||||
$ safeRead $ '0': filter (\x ->
|
||||
(x >= '0' && x <= '9')
|
||||
|| x == '.') w
|
||||
|
|
|
|||
|
|
@ -207,7 +207,7 @@ pHeader = try $ do
|
|||
let bodyTitle = TagOpen tagtype attr ~== TagOpen "h1" [("class","title")]
|
||||
let level = read (drop 1 tagtype)
|
||||
contents <- liftM concat $ manyTill inline (pCloses tagtype <|> eof)
|
||||
let ident = maybe "" id $ lookup "id" attr
|
||||
let ident = fromMaybe "" $ lookup "id" attr
|
||||
let classes = maybe [] words $ lookup "class" attr
|
||||
let keyvals = [(k,v) | (k,v) <- attr, k /= "class", k /= "id"]
|
||||
return $ if bodyTitle
|
||||
|
|
@ -257,7 +257,7 @@ pCol = try $ do
|
|||
skipMany pBlank
|
||||
return $ case lookup "width" attribs of
|
||||
Just x | not (null x) && last x == '%' ->
|
||||
maybe 0.0 id $ safeRead ('0':'.':init x)
|
||||
fromMaybe 0.0 $ safeRead ('0':'.':init x)
|
||||
_ -> 0.0
|
||||
|
||||
pColgroup :: TagParser [Double]
|
||||
|
|
|
|||
|
|
@ -874,9 +874,8 @@ verbatimEnv = do
|
|||
(_,r) <- withRaw $ do
|
||||
controlSeq "begin"
|
||||
name <- braced
|
||||
guard $ name == "verbatim" || name == "Verbatim" ||
|
||||
name == "lstlisting" || name == "minted" ||
|
||||
name == "alltt"
|
||||
guard $ name `elem` ["verbatim", "Verbatim", "lstlisting",
|
||||
"minted", "alltt"]
|
||||
verbEnv name
|
||||
rest <- getInput
|
||||
return (r,rest)
|
||||
|
|
|
|||
|
|
@ -730,7 +730,7 @@ listStart = bulletListStart <|> (anyOrderedListStart >> return ())
|
|||
listLine :: MarkdownParser String
|
||||
listLine = try $ do
|
||||
notFollowedBy' (do indentSpaces
|
||||
many (spaceChar)
|
||||
many spaceChar
|
||||
listStart)
|
||||
notFollowedBy' $ htmlTag (~== TagClose "div")
|
||||
chunks <- manyTill
|
||||
|
|
@ -789,8 +789,8 @@ listItem start = try $ do
|
|||
orderedList :: MarkdownParser (F Blocks)
|
||||
orderedList = try $ do
|
||||
(start, style, delim) <- lookAhead anyOrderedListStart
|
||||
unless ((style == DefaultStyle || style == Decimal || style == Example) &&
|
||||
(delim == DefaultDelim || delim == Period)) $
|
||||
unless (style `elem` [DefaultStyle, Decimal, Example] &&
|
||||
delim `elem` [DefaultDelim, Period]) $
|
||||
guardEnabled Ext_fancy_lists
|
||||
when (style == Example) $ guardEnabled Ext_example_lists
|
||||
items <- fmap sequence $ many1 $ listItem
|
||||
|
|
@ -925,8 +925,8 @@ strictHtmlBlock = htmlInBalanced (not . isInlineTag)
|
|||
|
||||
rawVerbatimBlock :: MarkdownParser String
|
||||
rawVerbatimBlock = try $ do
|
||||
(TagOpen tag _, open) <- htmlTag (tagOpen (\t ->
|
||||
t == "pre" || t == "style" || t == "script")
|
||||
(TagOpen tag _, open) <- htmlTag (tagOpen (flip elem
|
||||
["pre", "style", "script"])
|
||||
(const True))
|
||||
contents <- manyTill anyChar (htmlTag (~== TagClose tag))
|
||||
return $ open ++ contents ++ renderTags [TagClose tag]
|
||||
|
|
@ -1722,7 +1722,7 @@ spanHtml = try $ do
|
|||
guardEnabled Ext_markdown_in_html_blocks
|
||||
(TagOpen _ attrs, _) <- htmlTag (~== TagOpen "span" [])
|
||||
contents <- mconcat <$> manyTill inline (htmlTag (~== TagClose "span"))
|
||||
let ident = maybe "" id $ lookup "id" attrs
|
||||
let ident = fromMaybe "" $ lookup "id" attrs
|
||||
let classes = maybe [] words $ lookup "class" attrs
|
||||
let keyvals = [(k,v) | (k,v) <- attrs, k /= "id" && k /= "class"]
|
||||
return $ B.spanWith (ident, classes, keyvals) <$> contents
|
||||
|
|
@ -1732,7 +1732,7 @@ divHtml = try $ do
|
|||
guardEnabled Ext_markdown_in_html_blocks
|
||||
(TagOpen _ attrs, _) <- htmlTag (~== TagOpen "div" [])
|
||||
contents <- mconcat <$> manyTill block (htmlTag (~== TagClose "div"))
|
||||
let ident = maybe "" id $ lookup "id" attrs
|
||||
let ident = fromMaybe "" $ lookup "id" attrs
|
||||
let classes = maybe [] words $ lookup "class" attrs
|
||||
let keyvals = [(k,v) | (k,v) <- attrs, k /= "id" && k /= "class"]
|
||||
return $ B.divWith (ident, classes, keyvals) <$> contents
|
||||
|
|
|
|||
|
|
@ -54,6 +54,7 @@ import Data.Sequence (viewl, ViewL(..), (<|))
|
|||
import qualified Data.Foldable as F
|
||||
import qualified Data.Map as M
|
||||
import Data.Char (isDigit, isSpace)
|
||||
import Data.Maybe (fromMaybe)
|
||||
|
||||
-- | Read mediawiki from an input string and return a Pandoc document.
|
||||
readMediaWiki :: ReaderOptions -- ^ Reader options
|
||||
|
|
@ -204,7 +205,7 @@ table = do
|
|||
tableStart
|
||||
styles <- option [] parseAttrs <* blankline
|
||||
let tableWidth = case lookup "width" styles of
|
||||
Just w -> maybe 1.0 id $ parseWidth w
|
||||
Just w -> fromMaybe 1.0 $ parseWidth w
|
||||
Nothing -> 1.0
|
||||
caption <- option mempty tableCaption
|
||||
optional rowsep
|
||||
|
|
@ -285,7 +286,7 @@ tableCell = try $ do
|
|||
Just "center" -> AlignCenter
|
||||
_ -> AlignDefault
|
||||
let width = case lookup "width" attrs of
|
||||
Just xs -> maybe 0.0 id $ parseWidth xs
|
||||
Just xs -> fromMaybe 0.0 $ parseWidth xs
|
||||
Nothing -> 0.0
|
||||
return ((align, width), bs)
|
||||
|
||||
|
|
@ -387,7 +388,7 @@ orderedList =
|
|||
spaces
|
||||
items <- many (listItem '#' <|> li)
|
||||
optional (htmlTag (~== TagClose "ol"))
|
||||
let start = maybe 1 id $ safeRead $ fromAttrib "start" tag
|
||||
let start = fromMaybe 1 $ safeRead $ fromAttrib "start" tag
|
||||
return $ B.orderedListWith (start, DefaultStyle, DefaultDelim) items
|
||||
|
||||
definitionList :: MWParser Blocks
|
||||
|
|
|
|||
|
|
@ -594,7 +594,7 @@ surrounded border = enclosed (border *> notFollowedBy (oneOf " \t\n\r")) (try bo
|
|||
simpleInline :: Parser [Char] ParserState t -- ^ surrounding parser
|
||||
-> ([Inline] -> Inline) -- ^ Inline constructor
|
||||
-> Parser [Char] ParserState Inline -- ^ content parser (to be used repeatedly)
|
||||
simpleInline border construct = surrounded border (inlineWithAttribute) >>=
|
||||
simpleInline border construct = surrounded border inlineWithAttribute >>=
|
||||
return . construct . normalizeSpaces
|
||||
where inlineWithAttribute = (try $ optional attributes) >> inline
|
||||
|
||||
|
|
|
|||
|
|
@ -532,7 +532,7 @@ headerShift n = walk shift
|
|||
|
||||
-- | Detect if a list is tight.
|
||||
isTightList :: [[Block]] -> Bool
|
||||
isTightList = and . map firstIsPlain
|
||||
isTightList = all firstIsPlain
|
||||
where firstIsPlain (Plain _ : _) = True
|
||||
firstIsPlain _ = False
|
||||
|
||||
|
|
@ -564,14 +564,10 @@ makeMeta title authors date =
|
|||
-- | Render HTML tags.
|
||||
renderTags' :: [Tag String] -> String
|
||||
renderTags' = renderTagsOptions
|
||||
renderOptions{ optMinimize = \x ->
|
||||
let y = map toLower x
|
||||
in y == "hr" || y == "br" ||
|
||||
y == "img" || y == "meta" ||
|
||||
y == "link"
|
||||
, optRawTag = \x ->
|
||||
let y = map toLower x
|
||||
in y == "script" || y == "style" }
|
||||
renderOptions{ optMinimize = matchTags ["hr", "br", "img",
|
||||
"meta", "link"]
|
||||
, optRawTag = matchTags ["script", "style"] }
|
||||
where matchTags = \tags -> flip elem tags . map toLower
|
||||
|
||||
--
|
||||
-- File handling
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|||
Conversion of 'Pandoc' documents to docx.
|
||||
-}
|
||||
module Text.Pandoc.Writers.Docx ( writeDocx ) where
|
||||
import Data.Maybe (fromMaybe)
|
||||
import Data.List ( intercalate, groupBy )
|
||||
import qualified Data.ByteString as B
|
||||
import qualified Data.ByteString.Lazy as BL
|
||||
|
|
@ -130,7 +131,8 @@ writeDocx opts doc@(Pandoc meta _) = do
|
|||
let mkOverrideNode (part', contentType') = mknode "Override"
|
||||
[("PartName",part'),("ContentType",contentType')] ()
|
||||
let mkImageOverride (_, imgpath, mbMimeType, _, _) =
|
||||
mkOverrideNode ("/word/" ++ imgpath, maybe "application/octet-stream" id mbMimeType)
|
||||
mkOverrideNode ("/word/" ++ imgpath,
|
||||
fromMaybe "application/octet-stream" mbMimeType)
|
||||
let overrides = map mkOverrideNode
|
||||
[("/word/webSettings.xml",
|
||||
"application/vnd.openxmlformats-officedocument.wordprocessingml.webSettings+xml")
|
||||
|
|
@ -322,7 +324,7 @@ mkNum markers marker numid =
|
|||
NumberMarker _ _ start ->
|
||||
map (\lvl -> mknode "w:lvlOverride" [("w:ilvl",show (lvl :: Int))]
|
||||
$ mknode "w:startOverride" [("w:val",show start)] ()) [0..6]
|
||||
where absnumid = maybe 0 id $ M.lookup marker markers
|
||||
where absnumid = fromMaybe 0 $ M.lookup marker markers
|
||||
|
||||
mkAbstractNum :: (ListMarker,Int) -> IO Element
|
||||
mkAbstractNum (marker,numid) = do
|
||||
|
|
|
|||
|
|
@ -176,8 +176,8 @@ addMetadataFromXML e@(Element (QName name _ (Just "dc")) attrs _ _) md
|
|||
, titleFileAs = getAttr "file-as"
|
||||
, titleType = getAttr "type"
|
||||
} : epubTitle md }
|
||||
| name == "date" = md{ epubDate = maybe "" id $ normalizeDate'
|
||||
$ strContent e }
|
||||
| name == "date" = md{ epubDate = fromMaybe "" $ normalizeDate'
|
||||
$ strContent e }
|
||||
| name == "language" = md{ epubLanguage = strContent e }
|
||||
| name == "creator" = md{ epubCreator =
|
||||
Creator{ creatorText = strContent e
|
||||
|
|
@ -271,7 +271,7 @@ metadataFromMeta opts meta = EPUBMetadata{
|
|||
}
|
||||
where identifiers = getIdentifier meta
|
||||
titles = getTitle meta
|
||||
date = maybe "" id $
|
||||
date = fromMaybe "" $
|
||||
(metaValueToString <$> lookupMeta "date" meta) >>= normalizeDate'
|
||||
language = maybe "" metaValueToString $
|
||||
lookupMeta "language" meta `mplus` lookupMeta "lang" meta
|
||||
|
|
@ -297,7 +297,7 @@ writeEPUB :: WriterOptions -- ^ Writer options
|
|||
-> Pandoc -- ^ Document to convert
|
||||
-> IO B.ByteString
|
||||
writeEPUB opts doc@(Pandoc meta _) = do
|
||||
let version = maybe EPUB2 id (writerEpubVersion opts)
|
||||
let version = fromMaybe EPUB2 (writerEpubVersion opts)
|
||||
let epub3 = version == EPUB3
|
||||
epochtime <- floor `fmap` getPOSIXTime
|
||||
let mkEntry path content = toEntry path epochtime content
|
||||
|
|
@ -401,7 +401,7 @@ writeEPUB opts doc@(Pandoc meta _) = do
|
|||
chapToEntry num (Chapter mbnum bs) = mkEntry (showChapter num)
|
||||
$ renderHtml
|
||||
$ writeHtml opts'{ writerNumberOffset =
|
||||
maybe [] id mbnum }
|
||||
fromMaybe [] mbnum }
|
||||
$ case bs of
|
||||
(Header _ _ xs : _) ->
|
||||
Pandoc (setMeta "title" (fromList xs) nullMeta) bs
|
||||
|
|
@ -436,7 +436,7 @@ writeEPUB opts doc@(Pandoc meta _) = do
|
|||
let fontNode ent = unode "item" !
|
||||
[("id", takeBaseName $ eRelativePath ent),
|
||||
("href", eRelativePath ent),
|
||||
("media-type", maybe "" id $ getMimeType $ eRelativePath ent)] $ ()
|
||||
("media-type", fromMaybe "" $ getMimeType $ eRelativePath ent)] $ ()
|
||||
let plainTitle = case docTitle meta of
|
||||
[] -> case epubTitle metadata of
|
||||
[] -> "UNTITLED"
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ import Numeric ( showHex )
|
|||
import Data.Char ( ord, toLower )
|
||||
import Data.List ( isPrefixOf, intersperse )
|
||||
import Data.String ( fromString )
|
||||
import Data.Maybe ( catMaybes )
|
||||
import Data.Maybe ( catMaybes, fromMaybe )
|
||||
import Control.Monad.State
|
||||
import Text.Blaze.Html hiding(contents)
|
||||
import Text.Blaze.Internal(preEscapedString)
|
||||
|
|
@ -118,7 +118,7 @@ pandocToHtml opts (Pandoc meta blocks) = do
|
|||
let stringifyHTML = escapeStringForXML . stringify
|
||||
let authsMeta = map stringifyHTML $ docAuthors meta
|
||||
let dateMeta = stringifyHTML $ docDate meta
|
||||
let slideLevel = maybe (getSlideLevel blocks) id $ writerSlideLevel opts
|
||||
let slideLevel = fromMaybe (getSlideLevel blocks) $ writerSlideLevel opts
|
||||
let sects = hierarchicalize $
|
||||
if writerSlideVariant opts == NoSlides
|
||||
then blocks
|
||||
|
|
@ -524,7 +524,7 @@ blockToHtml opts (DefinitionList lst) = do
|
|||
contents <- mapM (\(term, defs) ->
|
||||
do term' <- if null term
|
||||
then return mempty
|
||||
else liftM (H.dt) $ inlineListToHtml opts term
|
||||
else liftM H.dt $ inlineListToHtml opts term
|
||||
defs' <- mapM ((liftM (\x -> H.dd $ (x >> nl opts))) .
|
||||
blockListToHtml opts) defs
|
||||
return $ mconcat $ nl opts : term' : nl opts :
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@ import Network.URI ( isURI, unEscapeString )
|
|||
import Data.List ( (\\), isSuffixOf, isInfixOf,
|
||||
isPrefixOf, intercalate, intersperse )
|
||||
import Data.Char ( toLower, isPunctuation, isAscii, isLetter, isDigit, ord )
|
||||
import Data.Maybe ( fromMaybe )
|
||||
import Control.Applicative ((<|>))
|
||||
import Control.Monad.State
|
||||
import Text.Pandoc.Pretty
|
||||
|
|
@ -190,7 +191,7 @@ stringToLaTeX _ [] = return ""
|
|||
stringToLaTeX ctx (x:xs) = do
|
||||
opts <- gets stOptions
|
||||
rest <- stringToLaTeX ctx xs
|
||||
let ligatures = writerTeXLigatures opts && not (ctx == CodeString)
|
||||
let ligatures = writerTeXLigatures opts && (ctx /= CodeString)
|
||||
let isUrl = ctx == URLString
|
||||
when (x == '€') $
|
||||
modify $ \st -> st{ stUsesEuro = True }
|
||||
|
|
@ -240,7 +241,7 @@ inCmd cmd contents = char '\\' <> text cmd <> braces contents
|
|||
toSlides :: [Block] -> State WriterState [Block]
|
||||
toSlides bs = do
|
||||
opts <- gets stOptions
|
||||
let slideLevel = maybe (getSlideLevel bs) id $ writerSlideLevel opts
|
||||
let slideLevel = fromMaybe (getSlideLevel bs) $ writerSlideLevel opts
|
||||
let bs' = prepSlides slideLevel bs
|
||||
concat `fmap` (mapM (elementToBeamer slideLevel) $ hierarchicalize bs')
|
||||
|
||||
|
|
@ -443,7 +444,7 @@ blockToLaTeX (DefinitionList lst) = do
|
|||
incremental <- gets stIncremental
|
||||
let inc = if incremental then "[<+->]" else ""
|
||||
items <- mapM defListItemToLaTeX lst
|
||||
let spacing = if and $ map isTightList (map snd lst)
|
||||
let spacing = if all isTightList (map snd lst)
|
||||
then text "\\itemsep1pt\\parskip0pt\\parsep0pt"
|
||||
else empty
|
||||
return $ text ("\\begin{description}" ++ inc) $$ spacing $$ vcat items $$
|
||||
|
|
@ -764,9 +765,9 @@ citationsToNatbib cits
|
|||
| noPrefix (tail cits) && noSuffix (init cits) && ismode NormalCitation cits
|
||||
= citeCommand "citep" p s ks
|
||||
where
|
||||
noPrefix = and . map (null . citationPrefix)
|
||||
noSuffix = and . map (null . citationSuffix)
|
||||
ismode m = and . map (((==) m) . citationMode)
|
||||
noPrefix = all (null . citationPrefix)
|
||||
noSuffix = all (null . citationSuffix)
|
||||
ismode m = all (((==) m) . citationMode)
|
||||
p = citationPrefix $ head $ cits
|
||||
s = citationSuffix $ last $ cits
|
||||
ks = intercalate ", " $ map citationId cits
|
||||
|
|
|
|||
|
|
@ -338,7 +338,7 @@ blockToMarkdown opts (RawBlock f str)
|
|||
else return $ if isEnabled Ext_markdown_attribute opts
|
||||
then text (addMarkdownAttribute str) <> text "\n"
|
||||
else text str <> text "\n"
|
||||
| f == "latex" || f == "tex" || f == "markdown" = do
|
||||
| f `elem` ["latex", "tex", "markdown"] = do
|
||||
st <- get
|
||||
if stPlain st
|
||||
then return empty
|
||||
|
|
@ -628,10 +628,11 @@ getReference label (src, tit) = do
|
|||
Nothing -> do
|
||||
let label' = case find ((== label) . fst) (stRefs st) of
|
||||
Just _ -> -- label is used; generate numerical label
|
||||
case find (\n -> not (any (== [Str (show n)])
|
||||
(map fst (stRefs st)))) [1..(10000 :: Integer)] of
|
||||
Just x -> [Str (show x)]
|
||||
Nothing -> error "no unique label"
|
||||
case find (\n -> notElem [Str (show n)]
|
||||
(map fst (stRefs st)))
|
||||
[1..(10000 :: Integer)] of
|
||||
Just x -> [Str (show x)]
|
||||
Nothing -> error "no unique label"
|
||||
Nothing -> label
|
||||
modify (\s -> s{ stRefs = (label', (src,tit)) : stRefs st })
|
||||
return label'
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ data WriterState = WriterState {
|
|||
writeMediaWiki :: WriterOptions -> Pandoc -> String
|
||||
writeMediaWiki opts document =
|
||||
evalState (pandocToMediaWiki opts document)
|
||||
(WriterState { stNotes = False, stListLevel = [], stUseTags = False })
|
||||
WriterState { stNotes = False, stListLevel = [], stUseTags = False }
|
||||
|
||||
-- | Return MediaWiki representation of document.
|
||||
pandocToMediaWiki :: WriterOptions -> Pandoc -> State WriterState String
|
||||
|
|
|
|||
|
|
@ -31,6 +31,7 @@ Conversion of 'Pandoc' documents to ODT.
|
|||
module Text.Pandoc.Writers.ODT ( writeODT ) where
|
||||
import Data.IORef
|
||||
import Data.List ( isPrefixOf )
|
||||
import Data.Maybe ( fromMaybe )
|
||||
import qualified Data.ByteString.Lazy as B
|
||||
import Text.Pandoc.UTF8 ( fromStringLazy )
|
||||
import Codec.Archive.Zip
|
||||
|
|
@ -127,7 +128,7 @@ transformPic opts entriesRef (Image lab (src,_)) = do
|
|||
return $ Emph lab
|
||||
Right (img, _) -> do
|
||||
let size = imageSize img
|
||||
let (w,h) = maybe (0,0) id $ sizeInPoints `fmap` size
|
||||
let (w,h) = fromMaybe (0,0) $ sizeInPoints `fmap` size
|
||||
let tit' = show w ++ "x" ++ show h
|
||||
entries <- readIORef entriesRef
|
||||
let newsrc = "Pictures/" ++ show (length entries) ++ takeExtension src
|
||||
|
|
|
|||
|
|
@ -129,7 +129,7 @@ blockToOrg (Para inlines) = do
|
|||
blockToOrg (RawBlock "html" str) =
|
||||
return $ blankline $$ "#+BEGIN_HTML" $$
|
||||
nest 2 (text str) $$ "#+END_HTML" $$ blankline
|
||||
blockToOrg (RawBlock f str) | f == "org" || f == "latex" || f == "tex" =
|
||||
blockToOrg (RawBlock f str) | f `elem` ["org", "latex", "tex"] =
|
||||
return $ text str
|
||||
blockToOrg (RawBlock _ _) = return empty
|
||||
blockToOrg HorizontalRule = return $ blankline $$ "--------------" $$ blankline
|
||||
|
|
|
|||
|
|
@ -65,8 +65,7 @@ metaToJSON opts blockWriter inlineWriter (Meta metamap)
|
|||
renderedMap <- Traversable.mapM
|
||||
(metaValueToJSON blockWriter inlineWriter)
|
||||
metamap
|
||||
return $ M.foldWithKey (\key val obj -> defField key val obj)
|
||||
baseContext renderedMap
|
||||
return $ M.foldWithKey defField baseContext renderedMap
|
||||
| otherwise = return (Object H.empty)
|
||||
|
||||
metaValueToJSON :: Monad m
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ data WriterState = WriterState {
|
|||
writeTextile :: WriterOptions -> Pandoc -> String
|
||||
writeTextile opts document =
|
||||
evalState (pandocToTextile opts document)
|
||||
(WriterState { stNotes = [], stListLevel = [], stUseTags = False })
|
||||
WriterState { stNotes = [], stListLevel = [], stUseTags = False }
|
||||
|
||||
-- | Return Textile representation of document.
|
||||
pandocToTextile :: WriterOptions -> Pandoc -> State WriterState String
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ tests = [ testGroup "basic"
|
|||
[ "simple" =:
|
||||
"word" =?> para "word"
|
||||
, "space" =:
|
||||
"some text" =?> para ("some text")
|
||||
"some text" =?> para "some text"
|
||||
, "emphasized" =:
|
||||
"\\emph{emphasized}" =?> para (emph "emphasized")
|
||||
]
|
||||
|
|
|
|||
|
|
@ -171,13 +171,13 @@ tests = [ testGroup "inline code"
|
|||
, testGroup "smart punctuation"
|
||||
[ test markdownSmart "quote before ellipses"
|
||||
("'...hi'"
|
||||
=?> para (singleQuoted ("…hi")))
|
||||
=?> para (singleQuoted "…hi"))
|
||||
, test markdownSmart "apostrophe before emph"
|
||||
("D'oh! A l'*aide*!"
|
||||
=?> para ("D’oh! A l’" <> emph "aide" <> "!"))
|
||||
, test markdownSmart "apostrophe in French"
|
||||
("À l'arrivée de la guerre, le thème de l'«impossibilité du socialisme»"
|
||||
=?> para ("À l’arrivée de la guerre, le thème de l’«impossibilité du socialisme»"))
|
||||
=?> para "À l’arrivée de la guerre, le thème de l’«impossibilité du socialisme»")
|
||||
]
|
||||
, testGroup "mixed emphasis and strong"
|
||||
[ "emph and strong emph alternating" =:
|
||||
|
|
|
|||
|
|
@ -21,11 +21,11 @@ tests = [ testGroup "Walk"
|
|||
|
||||
p_walk :: (Typeable a, Walkable a Pandoc)
|
||||
=> (a -> a) -> Pandoc -> Bool
|
||||
p_walk f = (\(d :: Pandoc) -> everywhere (mkT f) d == walk f d)
|
||||
p_walk f d = everywhere (mkT f) d == walk f d
|
||||
|
||||
p_query :: (Eq a, Typeable a1, Monoid a, Walkable a1 Pandoc)
|
||||
=> (a1 -> a) -> Pandoc -> Bool
|
||||
p_query f = (\(d :: Pandoc) -> everything mappend (mempty `mkQ` f) d == query f d)
|
||||
p_query f d = everything mappend (mempty `mkQ` f) d == query f d
|
||||
|
||||
inlineTrans :: Inline -> Inline
|
||||
inlineTrans (Str xs) = Str $ map toUpper xs
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue