LaTeX reader: improve treatment of cref, Cref.

Associate with `\cref` and `\Cref` the reference-type `ref+label` and
`ref+Label`.  So far we don't do anything fancy with these.
Also, associate with `\vref` `ref` instead of `ref+page`.

See #7463.

Author: jgm

src/Text/Pandoc/Readers/LaTeX.hs

@@ -114,9 +114,9 @@ parseLaTeX = do
 
 resolveRefs :: M.Map Text [Inline] -> Inline -> Inline
 resolveRefs labels x@(Link (ident,classes,kvs) _ _) =
-  case (lookup "reference-type" kvs,
+  case (T.takeWhile (/='+') <$> lookup "reference-type" kvs,
         lookup "reference" kvs) of
-        (Just "ref", Just lab) ->
+        (Just "ref", Just lab) -> -- TODO special treatment of ref+label
           case M.lookup lab labels of
                Just txt -> Link (ident,classes,kvs) txt ("#" <> lab, "")
                Nothing  -> x

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

@@ -337,11 +337,11 @@ refCommands :: PandocMonad m => M.Map Text (LP m Inlines)
 refCommands = M.fromList
   [ ("label", rawInlineOr "label" dolabel)
   , ("ref", rawInlineOr "ref" $ doref "ref")
-  , ("cref", rawInlineOr "cref" $ doref "ref")       -- from cleveref.sty
-  , ("Cref", rawInlineOr "Cref" $ doref "ref")       -- from cleveref.sty
-  , ("vref", rawInlineOr "vref" $ doref "ref+page")  -- from varioref.sty
+  , ("cref", rawInlineOr "cref" $ doref "ref+label")       -- from cleveref.sty
+  , ("Cref", rawInlineOr "Cref" $ doref "ref+Label")       -- from cleveref.sty
+  , ("vref", rawInlineOr "vref" $ doref "ref")  -- from varioref.sty
   , ("eqref", rawInlineOr "eqref" $ doref "eqref")   -- from amsmath.sty
-  , ("autoref", rawInlineOr "autoref" $ doref "autoref") -- from hyperref.sty
+  , ("autoref", rawInlineOr "autoref" $ doref "ref+label") -- from hyperref.sty
   ]
 
 acronymCommands :: PandocMonad m => M.Map Text (LP m Inlines)

test/command/1608.md

@@ -129,7 +129,7 @@ These are all pretty interesting facts.
         , Link
             ( ""
             , []
-            , [ ( "reference-type" , "ref" )
+            , [ ( "reference-type" , "ref+label" )
               , ( "reference" , "def:tri" )
               ]
             )

test/command/refs.md

@@ -28,7 +28,7 @@ Figure \cref{fig:1}
     , Link
         ( ""
         , []
-        , [ ( "reference-type" , "ref" )
+        , [ ( "reference-type" , "ref+label" )
           , ( "reference" , "fig:1" )
           ]
         )
@@ -48,7 +48,7 @@ Figure \vref{fig:1}
     , Link
         ( ""
         , []
-        , [ ( "reference-type" , "ref+page" )
+        , [ ( "reference-type" , "ref" )
           , ( "reference" , "fig:1" )
           ]
         )
@@ -66,7 +66,7 @@ Figure \vref{fig:1}
     [ Link
         ( ""
         , []
-        , [ ( "reference-type" , "autoref" )
+        , [ ( "reference-type" , "ref+label" )
           , ( "reference" , "fig:flowchart" )
           ]
         )