git.iko.soy/typeable/pandoc
on master help sign in
Org reader: Resolve org includes relative to ...
b2398cdJohn MacFarlane
src/Text/Pandoc/Readers/Org/Blocks.hs+4−2
compare with master
unifiedsplit
@@ -40,7 +40,7 @@ import Data.List (foldl', intersperse)
40import Data.Maybe (fromMaybe, isJust, isNothing)
40import Data.Maybe (fromMaybe, isJust, isNothing)
41import Data.Text (Text)
41import Data.Text (Text)
42import Data.List.NonEmpty (nonEmpty)
42import Data.List.NonEmpty (nonEmpty)
43−
43+import System.FilePath
44import qualified Data.Text as T
44import qualified Data.Text as T
45import qualified Text.Pandoc.Builder as B
45import qualified Text.Pandoc.Builder as B
46import qualified Text.Pandoc.Walk as Walk
46import qualified Text.Pandoc.Walk as Walk
@@ -528,7 +528,9 @@ include = try $ do
528 _ -> nullAttr
528 _ -> nullAttr
529 return $ pure . B.codeBlockWith attr <$> parseRaw
529 return $ pure . B.codeBlockWith attr <$> parseRaw
530 _ -> return $ return . B.fromList . blockFilter params <$> blockList
530 _ -> return $ return . B.fromList . blockFilter params <$> blockList
531+ currentDir <- takeDirectory . sourceName <$> getPosition
531− insertIncludedFile blocksParser toSources ["."] filename Nothing Nothing
532+ insertIncludedFile blocksParser toSources
533+ [currentDir] filename Nothing Nothing
532 where
534 where
533 includeTarget :: PandocMonad m => OrgParser m FilePath
535 includeTarget :: PandocMonad m => OrgParser m FilePath
534 includeTarget = do
536 includeTarget = do
src/Text/Pandoc/Readers/Org/Parsing.hs+1
@@ -99,6 +99,7 @@ module Text.Pandoc.Readers.Org.Parsing
99 , getState
99 , getState
100 , updateState
100 , updateState
101 , SourcePos
101 , SourcePos
102+ , sourceName
102 , getPosition
103 , getPosition
103 ) where
104 ) where
104
105