300d94a · typeable/pandoc

git.iko.soy/typeable/pandoc

Deleted whitespace at end of source lines.

commit300d94ac249e7e70fb92fb21f6426d894fce61ce authorJohn MacFarlane <jgm@berkeley.edu> dateSun 27 Nov 2016, 15:45 (10 years ago) parent23baba2

9 files changed+11−11

compare with master

unifiedsplit

pandoc.hs+1−1 src/Text/Pandoc.hs+1−1 src/Text/Pandoc/Class.hs+1−1 src/Text/Pandoc/Readers/Docx.hs+2−2 src/Text/Pandoc/Readers/Docx/Parse.hs+1−1 src/Text/Pandoc/UUID.hs+1−1 src/Text/Pandoc/Writers/CommonMark.hs+1−1 src/Text/Pandoc/Writers/EPUB.hs+2−2 src/Text/Pandoc/Writers/Texinfo.hs+1−1

pandoc.hs+1−1

@@ -1269,7 +1269,7 @@ convertWithOpts opts args = do

12691269 let laTeXInput = "latex" `isPrefixOf` readerName' ||

12701270 "beamer" `isPrefixOf` readerName'

12711271

1272−

1272+

12731273 -- disabling the custom writer for now

12741274 writer <- if ".lua" `isSuffixOf` format

12751275 -- note: use non-lowercased version writerName

src/Text/Pandoc.hs+1−1

@@ -282,7 +282,7 @@ readers = [ ("native" , StringReader $ \_ s -> return $ readNative s)

282282-- runIOorExplode $

283283-- writeEPUB o{ writerEpubVersion = Just EPUB2 } doc)

284284-- ,("epub3" , IOByteStringWriter $ \o doc ->

285−-- runIOorExplode $

285+-- runIOorExplode $

286286-- writeEPUB o{ writerEpubVersion = Just EPUB3 } doc)

287287-- ,("fb2" , IOStringWriter $ \o doc ->

288288-- runIOorExplode $ writeFB2 o doc)

src/Text/Pandoc/Class.hs+1−1

@@ -135,7 +135,7 @@ newtype PandocIO a = PandocIO {

135135 unPandocIO :: ExceptT PandocExecutionError (StateT PandocStateIO IO) a

136136 } deriving (MonadIO, Functor, Applicative, Monad, MonadError PandocExecutionError)

137137

138−instance PandocMonad PandocIO where

138+instance PandocMonad PandocIO where

139139 lookupEnv = liftIO . IO.lookupEnv

140140 getCurrentTime = liftIO IO.getCurrentTime

141141 getDefaultReferenceDocx = liftIO . IO.getDefaultReferenceDocx

src/Text/Pandoc/Readers/Docx.hs+2−2

@@ -64,7 +64,7 @@ implemented, [-] means partially implemented):

6464 - [X] Math

6565 - [X] Link (links to an arbitrary bookmark create a span with the target as

6666 id and "anchor" class)

67− - [X] Image

67+ - [X] Image

6868 - [X] Note (Footnotes and Endnotes are silently combined.)

6969-}

7070

@@ -559,7 +559,7 @@ bodyPartToBlocks (ListItem pPr numId lvl (Just levelInfo) parparts) = do

559559 ]

560560 blks <- bodyPartToBlocks (Paragraph pPr parparts)

561561 return $ divWith ("", ["list-item"], kvs) blks

562−bodyPartToBlocks (ListItem pPr _ _ _ parparts) =

562+bodyPartToBlocks (ListItem pPr _ _ _ parparts) =

563563 let pPr' = pPr {pStyle = "ListParagraph": (pStyle pPr)}

564564 in

565565 bodyPartToBlocks $ Paragraph pPr' parparts

src/Text/Pandoc/Readers/Docx/Parse.hs+1−1

@@ -690,7 +690,7 @@ elemToParPart ns element

690690 , Just drawingElem <- findChild (elemName ns "w" "drawing") element

691691 , c_ns <- "http://schemas.openxmlformats.org/drawingml/2006/chart"

692692 , Just _ <- findElement (QName "chart" (Just c_ns) (Just "c")) drawingElem

693− = return Chart

693+ = return Chart

694694elemToParPart ns element

695695 | isElem ns "w" "r" element =

696696 elemToRun ns element >>= (\r -> return $ PlainRun r)

src/Text/Pandoc/UUID.hs+1−1

@@ -64,7 +64,7 @@ instance Show UUID where

6464 printf "%02x" p

6565

6666getUUID :: RandomGen g => g -> UUID

67−getUUID gen =

67+getUUID gen =

6868 let [a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p] = take 16 $ randoms gen :: [Word8]

6969 -- set variant

7070 i' = i `setBit` 7 `clearBit` 6

src/Text/Pandoc/Writers/CommonMark.hs+1−1

@@ -51,7 +51,7 @@ writeCommonMark opts (Pandoc meta blocks) = do

5151 notes' = if null notes

5252 then []

5353 else [OrderedList (1, Decimal, Period) $ reverse notes]

54− main <- blocksToCommonMark opts (blocks' ++ notes')

54+ main <- blocksToCommonMark opts (blocks' ++ notes')

5555 metadata <- metaToJSON opts

5656 (blocksToCommonMark opts)

5757 (inlinesToCommonMark opts)

src/Text/Pandoc/Writers/EPUB.hs+2−2

@@ -347,8 +347,8 @@ writeEPUB opts doc =

347347 evalStateT (pandocToEPUB opts doc) initState

348348

349349pandocToEPUB :: PandocMonad m

350− => WriterOptions

351− -> Pandoc

350+ => WriterOptions

351+ -> Pandoc

352352 -> E m B.ByteString

353353pandocToEPUB opts doc@(Pandoc meta _) = do

354354 let version = fromMaybe EPUB2 (writerEpubVersion opts)

src/Text/Pandoc/Writers/Texinfo.hs+1−1

@@ -65,7 +65,7 @@ type TI m = StateT WriterState m

6565

6666-- | Convert Pandoc to Texinfo.

6767writeTexinfo :: PandocMonad m => WriterOptions -> Pandoc -> m String

68−writeTexinfo options document =

68+writeTexinfo options document =

6969 evalStateT (pandocToTexinfo options $ wrapTop document) $

7070 WriterState { stStrikeout = False, stSuperscript = False,

7171 stEscapeComma = False, stSubscript = False,