git.iko.soy/typeable/pandoc
on master help sign in
LaTeX reader: cleaned up 'input' code.
commit26dfab2e61b45722967e2a2f9330bf5e101b9f31 authorJohn MacFarlane <jgm@berkeley.edu> dateSun 20 Jan 2019, 17:35 (8 years ago) parentfb1f76d
1 file changed+5−10
src/Text/Pandoc/Readers/LaTeX.hs+5−10
src/Text/Pandoc/Readers/LaTeX.hs+5−10
@@ -1448,11 +1448,12 @@ include name = do
14481448 skipMany opt
14491449 fs <- (map (T.unpack . removeDoubleQuotes . T.strip) . T.splitOn "," .
14501450 untokenize) <$> braced
1451− let fs' = if name == "usepackage"
1452− then map (maybeAddExtension ".sty") fs
1453− else map (maybeAddExtension ".tex") fs
1451+ let addExt f = case takeExtension f of
1452+ "" | name == "usepackage" -> addExtension f ".sty"
1453+ | otherwise -> addExtension f ".tex"
1454+ _ -> f
14541455 dirs <- (splitBy (==':') . fromMaybe ".") <$> lookupEnv "TEXINPUTS"
1455− mapM_ (insertIncluded dirs) fs'
1456+ mapM_ (insertIncluded dirs) (map addExt fs)
14561457 return mempty
14571458
14581459insertIncluded :: PandocMonad m
@@ -1474,12 +1475,6 @@ insertIncluded dirs f = do
14741475 getInput >>= setInput . (tokenize f (T.pack contents) ++)
14751476 updateState dropLatestIncludeFile
14761477
1477−maybeAddExtension :: String -> FilePath -> FilePath
1478−maybeAddExtension ext fp =
1479− if null (takeExtension fp)
1480− then addExtension fp ext
1481− else fp
1482−
14831478addMeta :: PandocMonad m => ToMetaValue a => String -> a -> LP m ()
14841479addMeta field val = updateState $ \st ->
14851480 st{ sMeta = addMetaField field val $ sMeta st }