combine all transclusion types

Author: kepano

src/Text/Pandoc/Readers/Markdown.hs

@@ -23,7 +23,7 @@ module Text.Pandoc.Readers.Markdown (
 import Control.Monad
 import Control.Monad.Except (throwError)
 import Data.Bifunctor (second)
-import Data.Char (isAlphaNum, isPunctuation, isSpace)
+import Data.Char (isAlphaNum, isPunctuation, isSpace, toLower)
 import Data.List (transpose, elemIndex, sortOn, foldl')
 import qualified Data.Map as M
 import Data.Maybe
@@ -1537,7 +1537,7 @@ inline = do
      '*'     -> strongOrEmph
      '^'     -> inlineNote <|> superscript <|> blockId -- in this order bc ^[link](/foo)^
      '['     -> note <|> cite <|> bracketedSpan <|> wikilink B.linkWith <|> link
-     '!'     -> image
+     '!'     -> transclusion <|> image
      '$'     -> math
      '~'     -> strikeout <|> subscript
      '='     -> mark
@@ -2042,29 +2042,9 @@ rebasePath pos path = do
              "." -> path
              d   -> T.pack d <> "/" <> path
 
-image :: PandocMonad m => MarkdownParser m (F Inlines)
-image = try $ do
+transclusion :: PandocMonad m => MarkdownParser m (F Inlines)
+transclusion = try $ do
   char '!'
-  -- First try wikilink transclusion
-  (try wikilinkTransclusion) <|>
-    -- Then try regular image parsing
-    (do (lab,raw) <- reference
-        defaultExt <- getOption readerDefaultImageExtension
-        let constructor attr' src
-              | "data:" `T.isPrefixOf` src = B.imageWith attr' src  -- see #9118
-              | otherwise =
-                 case takeExtension (T.unpack src) of
-                    "" -> B.imageWith attr' (T.pack $ addExtension (T.unpack src)
-                                                    $ T.unpack defaultExt)
-                    _  -> B.imageWith attr' src
-        regLink constructor lab <|> referenceLink constructor (lab, "!" <> raw)) <|>
-    -- Fallback: if it looks like ![[...]], create a span with literal text
-    (do try $ string "[["
-        content <- many1TillChar anyChar (try $ string "]]")
-        return $ return $ B.spanWith ("", [], []) (B.str $ "![[" <> content <> "]]"))
-
-wikilinkTransclusion :: PandocMonad m => MarkdownParser m (F Inlines)
-wikilinkTransclusion = try $ do
   string "[[" *> notFollowedBy' (char '[')
   raw <- many1TillChar anyChar (try $ string "]]")
   titleAfter <- (True <$ guardEnabled Ext_wikilinks_title_after_pipe) <|> pure False
@@ -2075,32 +2055,65 @@ wikilinkTransclusion = try $ do
           | otherwise -> (before, T.drop 1 after)
   let (url, fragment) = T.break (== '#') target'
   guard $ T.all (`notElem` ['\n','\r','\f','\t']) url
-  if T.null fragment
-     then do
-       guardEnabled Ext_wikilink_transclusions
-       currentDir <- takeDirectory . sourceName <$> getPosition
-       let filename = T.unpack url <> ".md"  -- Assume .md extension for transclusion
-       -- Support relative paths like "Folder/File" by using currentDir as base
-       insertIncludedFile parseTranscludedInlines toSources [currentDir] filename Nothing Nothing
-     else do
-       let fragmentContent = T.drop 1 fragment  -- Remove the '#' prefix
-       if T.take 1 fragmentContent == "^"
-         then do
-           -- Block ID transclusion: ![[File#^block-id]]
-           guardEnabled Ext_wikilink_block_transclusions
-           currentDir <- takeDirectory . sourceName <$> getPosition
-           let filename = T.unpack url <> ".md"  -- Assume .md extension for block transclusion
-           let blockIdText = T.drop 1 fragmentContent  -- Remove the '^' prefix
-           -- Support relative paths like "Folder/File" by using currentDir as base
-           insertIncludedFile (parseBlockTransclusion blockIdText) toSources [currentDir] filename Nothing Nothing
-         else do
-           -- Heading transclusion: ![[File#Heading]]
-           guardEnabled Ext_wikilink_heading_transclusions
-           currentDir <- takeDirectory . sourceName <$> getPosition
-           let filename = T.unpack url <> ".md"  -- Assume .md extension for heading transclusion
-           let headingText = fragmentContent
-           -- Support relative paths like "Folder/File" by using currentDir as base
-           insertIncludedFile (parseHeadingTransclusion headingText) toSources [currentDir] filename Nothing Nothing
+  
+  let urlStr = T.unpack url
+  let ext = map toLower $ takeExtension urlStr
+  let hasExtension = not (null ext)
+  let isMdFile = ext == ".md"
+  
+  -- Check if any transclusion extensions are enabled
+  hasTransclusions <- (True <$ guardEnabled Ext_wikilink_transclusions) <|>
+                     (True <$ guardEnabled Ext_wikilink_block_transclusions) <|>
+                     (True <$ guardEnabled Ext_wikilink_heading_transclusions) <|>
+                     return False
+  
+  if hasTransclusions && (not hasExtension || isMdFile)
+    then -- Handle as transclusion (no extension or .md extension)
+      if T.null fragment
+        then do
+          guardEnabled Ext_wikilink_transclusions
+          currentDir <- takeDirectory . sourceName <$> getPosition
+          -- Only add .md extension if the file doesn't already have an extension
+          let filename = if null (takeExtension urlStr)
+                           then T.unpack url <> ".md"
+                           else T.unpack url
+          -- Support relative paths like "Folder/File" by using currentDir as base
+          insertIncludedFile parseTranscludedInlines toSources [currentDir] filename Nothing Nothing
+        else do
+          let fragmentContent = T.drop 1 fragment  -- Remove the '#' prefix
+          if T.take 1 fragmentContent == "^"
+            then do
+              -- Block ID transclusion: ![[File#^block-id]]
+              guardEnabled Ext_wikilink_block_transclusions
+              currentDir <- takeDirectory . sourceName <$> getPosition
+              let filename = T.unpack url <> ".md"  -- Assume .md extension for block transclusion
+              let blockIdText = T.drop 1 fragmentContent  -- Remove the '^' prefix
+              -- Support relative paths like "Folder/File" by using currentDir as base
+              insertIncludedFile (parseBlockTransclusion blockIdText) toSources [currentDir] filename Nothing Nothing
+            else do
+              -- Heading transclusion: ![[File#Heading]]
+              guardEnabled Ext_wikilink_heading_transclusions
+              currentDir <- takeDirectory . sourceName <$> getPosition
+              let filename = T.unpack url <> ".md"  -- Assume .md extension for heading transclusion
+              let headingText = fragmentContent
+              -- Support relative paths like "Folder/File" by using currentDir as base
+              insertIncludedFile (parseHeadingTransclusion headingText) toSources [currentDir] filename Nothing Nothing
+    else -- Handle as image/embed (has non-.md extension or transclusions disabled)
+      return $ return $ B.imageWith ("", ["wikilink"], []) url "" (B.text target')
+
+image :: PandocMonad m => MarkdownParser m (F Inlines)
+image = try $ do
+  char '!'
+  (lab,raw) <- reference
+  defaultExt <- getOption readerDefaultImageExtension
+  let constructor attr' src
+        | "data:" `T.isPrefixOf` src = B.imageWith attr' src  -- see #9118
+        | otherwise =
+           case takeExtension (T.unpack src) of
+              "" -> B.imageWith attr' (T.pack $ addExtension (T.unpack src)
+                                              $ T.unpack defaultExt)
+              _  -> B.imageWith attr' src
+  regLink constructor lab <|> referenceLink constructor (lab, "!" <> raw)
 
 note :: PandocMonad m => MarkdownParser m (F Inlines)
 note = try $ do

test/command/8853.md

@@ -2,5 +2,5 @@
 % pandoc -f markdown+wikilinks_title_after_pipe --wrap=none
 [[hi]] and ![[hi.jpg]]
 ^D
-<p><a href="hi" class="wikilink">hi</a> and <img src="hi.jpg" class="wikilink" alt="hi" /></p>
+<p><a href="hi" class="wikilink">hi</a> and <img src="hi.jpg" class="wikilink" alt="hi.jpg" /></p>
 ```