Merge branch 'main' of https://github.com/yanntrividic/pandoc

Author: yanntrividic

MANUAL.txt

@@ -1505,11 +1505,10 @@ header when requesting a document from a URL:
     order they appear on the command line.  For more
     information, see the section on [Citations].
 
-    Note: if your target format is `markdown`, `org`, or `typst`,
-    you will need to disable the `citations` extension (e.g., `-t
-    markdown-citations`) to see the rendered citations and
-    bibliography. Otherwise the format's own citation syntax will
-    be used.
+    Note: if this option is specified, the `citations` extension
+    will be disabled automatically in the writer, to ensure that
+    the citeproc-generated citations will be rendered instead of
+    the format's own citation syntax.
 
 `--bibliography=`*FILE*
 

src/Text/Pandoc/App/OutputSettings.hs

@@ -38,6 +38,7 @@ import System.FilePath
 import System.IO (stdout)
 import Text.Pandoc.Chunks (PathTemplate(..))
 import Text.Pandoc
+import Text.Pandoc.Filter (Filter(CiteprocFilter))
 import Text.Pandoc.App.Opt (Opt (..))
 import Text.Pandoc.App.CommandLineOptions (engines)
 import Text.Pandoc.Format (FlavoredFormat (..), applyExtensionsDiff,
@@ -121,7 +122,7 @@ optToOutputSettings scriptingEngine opts = do
                      then getAndCompile (tp <.> T.unpack format)
                      else throwError e)
 
-  (writer, writerExts, mtemplate) <-
+  (writer, writerExts', mtemplate) <-
     if "lua" `T.isSuffixOf` format
     then do
       let path = T.unpack format
@@ -150,6 +151,10 @@ optToOutputSettings scriptingEngine opts = do
         tmpl <- processCustomTemplate (compileDefaultTemplate format)
         return (w, wexts, tmpl)
 
+  -- see #10662:
+  let writerExts = if CiteprocFilter `elem` optFilters opts
+                      then disableExtension Ext_citations writerExts'
+                      else writerExts'
 
   let addSyntaxMap existingmap f = do
         res <- liftIO (parseSyntaxDefinition f)

src/Text/Pandoc/Filter.hs

@@ -41,7 +41,7 @@ import Control.Monad (foldM, when)
 data Filter = LuaFilter FilePath
             | JSONFilter FilePath
             | CiteprocFilter -- built-in citeproc
-            deriving (Show, Generic)
+            deriving (Show, Generic, Eq)
 
 instance FromJSON Filter where
  parseJSON node =

src/Text/Pandoc/Readers/LaTeX.hs

@@ -386,20 +386,18 @@ inlineCommands = M.unions
     , ("lowercase", makeLowercase <$> tok)
     , ("thanks", skipopts >> note <$> grouped block)
     , ("footnote", skipopts >> footnote)
+    , ("newline", pure B.linebreak)
+    , ("linebreak", pure B.linebreak)
     , ("passthrough", fixPassthroughEscapes <$> tok)
     -- \passthrough macro used by latex writer
                            -- for listings
     , ("includegraphics", do options <- option [] keyvals
-                             src <- braced
-                             mkImage options .
-                               unescapeURL .
-                               removeDoubleQuotes $ untokenize src)
+                             src <- bracedFilename
+                             mkImage options . unescapeURL $ src)
     -- svg
     , ("includesvg",      do options <- option [] keyvals
-                             src <- braced
-                             mkImage options .
-                               unescapeURL .
-                               removeDoubleQuotes $ untokenize src)
+                             src <- bracedFilename
+                             mkImage options . unescapeURL $ src)
     -- hyperref
     , ("url", (\url -> linkWith ("",["uri"],[]) url "" (str url))
                         . unescapeURL . untokenize <$> bracedUrl)
@@ -438,6 +436,14 @@ inlineCommands = M.unions
     , ("today", today)
     ]
 
+bracedFilename :: PandocMonad m => LP m Text
+bracedFilename =
+  removeDoubleQuotes . T.strip . untokenize . filter (not . isComment) <$> braced
+
+isComment :: Tok -> Bool
+isComment (Tok _ Comment _) = True
+isComment _ = False
+
 today :: PandocMonad m => LP m Inlines
 today =
   text . T.pack . showGregorian . localDay . zonedTimeToLocalTime
@@ -719,7 +725,7 @@ rawBlockOr name fallback = do
 doSubfile :: PandocMonad m => LP m Blocks
 doSubfile = do
   skipMany opt
-  f <- T.unpack . removeDoubleQuotes . T.strip . untokenize <$> braced
+  f <- T.unpack <$> bracedFilename
   oldToks <- getInput
   setInput $ TokStream False []
   insertIncluded (ensureExtension (/= "") ".tex" f)
@@ -737,15 +743,15 @@ include name = do
           _ -> const False
   skipMany opt
   fs <- map (T.unpack . removeDoubleQuotes . T.strip) . T.splitOn "," .
-         untokenize <$> braced
+         untokenize . filter (not . isComment) <$> braced
   mapM_ (insertIncluded . ensureExtension isAllowed ".tex") fs
   return mempty
 
 usepackage :: (PandocMonad m, Monoid a) => LP m a
 usepackage = do
   skipMany opt
   fs <- map (T.unpack . removeDoubleQuotes . T.strip) . T.splitOn "," .
-         untokenize <$> braced
+           untokenize . filter (not . isComment) <$> braced
   let parsePackage f = do
         TokStream _ ts <- getIncludedToks (ensureExtension (== ".sty") ".sty" f)
         parseFromToks (do _ <- blocks

src/Text/Pandoc/Readers/LaTeX/Parsing.hs

@@ -934,6 +934,7 @@ withRaw parser = do
 
 keyval :: PandocMonad m => LP m (Text, Text)
 keyval = try $ do
+  sp
   key <- untokenize <$> many1 (notFollowedBy (symbol '=') >>
                          (symbol '-' <|> symbol '_' <|> satisfyTok isWordTok))
   sp
@@ -952,6 +953,7 @@ keyval = try $ do
                                 Tok _ Symbol "{" -> False
                                 Tok _ Symbol "}" -> False
                                 _                -> True)))))
+  sp
   optional (symbol ',')
   sp
   return (key, T.strip val)

src/Text/Pandoc/Writers/Typst.hs

@@ -85,6 +85,7 @@ pandocToTypst options (Pandoc meta blocks) = do
                         Right l ->
                           resetField "lang" (langLanguage l) .
                           maybe id (resetField "region") (langRegion l))
+              $ defField "csl" (lookupMetaString "citation-style" meta) -- #10661
               $ defField "smart" (isEnabled Ext_smart options)
               $ defField "toc-depth" (tshow $ writerTOCDepth options)
               $ defField "figure-caption-position"

test/command/10659.md

@@ -0,0 +1,45 @@
+```
+% pandoc -f latex -t native
+\includegraphics[
+width=5cm,
+]{abc.jpg}
+^D
+[ Para
+    [ Image
+        ( "" , [] , [ ( "width" , "5cm" ) ] )
+        [ Str "image" ]
+        ( "abc.jpg" , "" )
+    ]
+]
+```
+
+```
+% pandoc -f latex -t native
+\includegraphics[%
+width=5cm,%
+]{abc.jpg}
+^D
+[ Para
+    [ Image
+        ( "" , [] , [ ( "width" , "5cm" ) ] )
+        [ Str "image" ]
+        ( "abc.jpg" , "" )
+    ]
+]
+```
+
+```
+% pandoc -f latex -t native
+\includegraphics[width=5cm]{%
+abc.jpg%
+}
+^D
+[ Para
+    [ Image
+        ( "" , [] , [ ( "width" , "5cm" ) ] )
+        [ Str "image" ]
+        ( "abc.jpg" , "" )
+    ]
+]
+```
+

test/command/7329.md

@@ -27,7 +27,12 @@
 % pandoc -f markdown -t org -C --bibliography command/biblio.bib
 - [@item1]
 ^D
-- [cite:@item1]
+- (Doe 2005)
+
+<<refs>>
+
+<<ref-item1>>
+Doe, John. 2005. /First Book/. Cambridge: Cambridge University Press.
 ```
 
 

test/docx/definition_list.docx

@@ -1,7 +1,33 @@
-[DefinitionList
- [([Str "Term",Space,Str "1"],
-   [[Para [Str "Definition",Space,Str "1"]]])
- ,([Str "Term",Space,Str "2",Space,Str "with",Space,Emph [Str "inline",Space,Str "markup"]],
-   [[Para [Str "Definition",Space,Str "2"]
-    ,CodeBlock ("",[],[]) "{ some code, part of Definition 2 }"
-    ,Para [Str "Third",Space,Str "paragraph",Space,Str "of",Space,Str "definition",Space,Str "2."]]])]]
+[ DefinitionList
+    [ ( [ Str "Term" , Space , Str "1" ]
+      , [ [ Para [ Str "Definition" , Space , Str "1" ] ] ]
+      )
+    , ( [ Str "Term"
+        , Space
+        , Str "2"
+        , Space
+        , Str "with"
+        , Space
+        , Emph [ Str "inline" , Space , Str "markup" ]
+        ]
+      , [ [ Para [ Str "Definition" , Space , Str "2" ]
+          , Para
+              [ Code
+                  ( "" , [] , [] ) "{ some code, part of Definition 2 }"
+              ]
+          , Para
+              [ Str "Third"
+              , Space
+              , Str "paragraph"
+              , Space
+              , Str "of"
+              , Space
+              , Str "definition"
+              , Space
+              , Str "2."
+              ]
+          ]
+        ]
+      )
+    ]
+]