pandoc-crossref 0.3.7.0 → 0.3.8.0

raw patch · 11 files changed

+71/−49 lines, 11 filesPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

API changes (from Hackage documentation)

Files

• CHANGELOG.md +12/−0
• lib/Text/Pandoc/CrossRef/References/Blocks.hs +19/−9
• pandoc-crossref.cabal +3/−3
• test/m2m/delim/expect.tex +4/−4
• test/m2m/equations-auto/expect.tex +8/−8
• test/m2m/equations-tables-auto/expect.tex +8/−8
• test/m2m/equations-tables/expect.tex +4/−4
• test/m2m/equations/expect.tex +4/−4
• test/m2m/links-names/expect.tex +4/−4
• test/m2m/links/expect.tex +4/−4
• test/test-pandoc-crossref.hs +1/−1

@@ -1,3 +1,15 @@+## 0.3.8.0++-   [LaTeX] Move hypertarget inside equation environment++    Fixes spacing issues in LaTeX/pdf output++-   [DOCX] Center equation number vertically with tableEqns++## 0.3.7.0++-  Support for pandoc-2.10+ ## 0.3.6.4  -   Last version to support pandoc 2.9

@@ -270,7 +270,16 @@     (eq', idx) <- replaceEqn opts attrs eq     replaceNoRecurse $ Div attrs [       simpleTable [AlignCenter, AlignRight] [ColWidth 0.9, ColWidth 0.09]-       [[[Plain [Math DisplayMath eq']], [Plain [Math DisplayMath $ "(" <> idx <> ")"]]]]]+       [[[Plain [Math DisplayMath eq']], [eqnNumber idx]]]]+  where+  eqnNumber idx+    | outFormat opts == Just (Format "docx")+    = Div nullAttr [+        RawBlock (Format "openxml") "<w:tcPr><w:vAlign w:val=\"center\"/></w:tcPr>"+      , mathIdx+      ]+    | otherwise = mathIdx+    where mathIdx = Plain [Math DisplayMath $ "(" <> idx <> ")"] replaceBlock _ _ = noReplaceRecurse  replaceEqn :: Options -> Attr -> T.Text -> WS (T.Text, T.Text)@@ -283,22 +292,23 @@       idxTxt = stringify idxStr   return (eq', idxTxt) -replaceInline :: Options -> Inline -> WS (ReplacedResult Inline)-replaceInline opts (Span attrs@(label,_,_) [Math DisplayMath eq])+replaceInline :: Options -> [Inline] -> WS (ReplacedResult [Inline])+replaceInline opts (Span attrs@(label,_,_) [Math DisplayMath eq]:xs)   | "eq:" `T.isPrefixOf` label || T.null label && autoEqnLabels opts-  = replaceNoRecurse . Span attrs . (:[]) =<< case outFormat opts of+  = replaceNoRecurse . (<>xs) =<< case outFormat opts of       f | isLatexFormat f ->-        pure . RawInline (Format "latex")-        $ "\\begin{equation}"<>eq<>mkLaTeXLabel label<>"\\end{equation}"-      _ -> Math DisplayMath . fst <$> replaceEqn opts attrs eq-replaceInline opts (Image attr@(label,_,attrs) alt img@(_, tit))+        pure [RawInline (Format "latex") "\\begin{equation}"+        , Span attrs [RawInline (Format "latex") eq]+        , RawInline (Format "latex") $ mkLaTeXLabel label <> "\\end{equation}"]+      _ -> pure . Span attrs . (:[]) . Math DisplayMath . fst <$> replaceEqn opts attrs eq+replaceInline opts (Image attr@(label,_,attrs) alt img@(_, tit):xs)   | "fig:" `T.isPrefixOf` label && "fig:" `T.isPrefixOf` tit   = do     idxStr <- replaceAttr opts (Right label) (lookup "label" attrs) alt imgRefs     let alt' = case outFormat opts of           f | isLatexFormat f -> alt           _  -> applyTemplate idxStr alt $ figureTemplate opts-    replaceNoRecurse $ Image attr alt' img+    replaceNoRecurse $ Image attr alt' img:xs replaceInline _ _ = noReplaceRecurse  replaceSubfigs :: Options -> [Inline] -> WS (ReplacedResult [Inline])

@@ -1,13 +1,13 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.34.2.+-- This file has been generated from package.yaml by hpack version 0.33.0. -- -- see: https://github.com/sol/hpack ----- hash: 232423e0b6a509d19ce5c9a2f9de39e0e1a56b2021f29f1ddec8cd41f4a15db8+-- hash: 16b94461d13008e2ca6ada6c83e8f56a855b54be95bc2d50ee6c0a4367bd1232  name:           pandoc-crossref-version:        0.3.7.0+version:        0.3.8.0 synopsis:       Pandoc filter for cross-references description:    pandoc-crossref is a pandoc filter for numbering figures, equations, tables and cross-references to them. category:       Text

@@ -13,20 +13,20 @@ Some of those can be labelled:  This is a test file with some referenced equations, line-\protect\hypertarget{eq:0}{}{\begin{equation} this \label{eq:0}\end{equation}}+\begin{equation}\protect\hypertarget{eq:0}{}{ this }\label{eq:0}\end{equation}  Some equations might be inside of text,-\protect\hypertarget{eq:1}{}{\begin{equation} for example \label{eq:1}\end{equation}}+\begin{equation}\protect\hypertarget{eq:1}{}{ for example }\label{eq:1}\end{equation} this one.  Some equations might be on start of paragraphs: -\protect\hypertarget{eq:2}{}{\begin{equation} start \label{eq:2}\end{equation}}+\begin{equation}\protect\hypertarget{eq:2}{}{ start }\label{eq:2}\end{equation} of paragraph.  Other might be on separate paragraphs of their own: -\protect\hypertarget{eq:3}{}{\begin{equation} separate \label{eq:3}\end{equation}}+\begin{equation}\protect\hypertarget{eq:3}{}{ separate }\label{eq:3}\end{equation}  Then they can be referenced: 

@@ -1,34 +1,34 @@ This is a test file with some referenced equations, line-{\begin{equation} this \end{equation}}+\begin{equation}{ this }\end{equation}  Some equations might be inside of text,-{\begin{equation} for example \end{equation}} this one.+\begin{equation}{ for example }\end{equation} this one.  Some equations might be on start of paragraphs: -{\begin{equation} start \end{equation}} of paragraph.+\begin{equation}{ start }\end{equation} of paragraph.  Other might be on separate paragraphs of their own: -{\begin{equation} separate \end{equation}}+\begin{equation}{ separate }\end{equation}  Some of those can be labelled:  This is a test file with some referenced equations, line-\protect\hypertarget{eq:0}{}{\begin{equation} this \label{eq:0}\end{equation}}+\begin{equation}\protect\hypertarget{eq:0}{}{ this }\label{eq:0}\end{equation}  Some equations might be inside of text,-\protect\hypertarget{eq:1}{}{\begin{equation} for example \label{eq:1}\end{equation}}+\begin{equation}\protect\hypertarget{eq:1}{}{ for example }\label{eq:1}\end{equation} this one.  Some equations might be on start of paragraphs: -\protect\hypertarget{eq:2}{}{\begin{equation} start \label{eq:2}\end{equation}}+\begin{equation}\protect\hypertarget{eq:2}{}{ start }\label{eq:2}\end{equation} of paragraph.  Other might be on separate paragraphs of their own: -\protect\hypertarget{eq:3}{}{\begin{equation} separate \label{eq:3}\end{equation}}+\begin{equation}\protect\hypertarget{eq:3}{}{ separate }\label{eq:3}\end{equation}  Then they can be referenced: 

@@ -1,34 +1,34 @@ This is a test file with some referenced equations, line-{\begin{equation} this \end{equation}}+\begin{equation}{ this }\end{equation}  Some equations might be inside of text,-{\begin{equation} for example \end{equation}} this one.+\begin{equation}{ for example }\end{equation} this one.  Some equations might be on start of paragraphs: -{\begin{equation} start \end{equation}} of paragraph.+\begin{equation}{ start }\end{equation} of paragraph.  Other might be on separate paragraphs of their own: -{\begin{equation} separate \end{equation}}+\begin{equation}{ separate }\end{equation}  Some of those can be labelled:  This is a test file with some referenced equations, line-\protect\hypertarget{eq:0}{}{\begin{equation} this \label{eq:0}\end{equation}}+\begin{equation}\protect\hypertarget{eq:0}{}{ this }\label{eq:0}\end{equation}  Some equations might be inside of text,-\protect\hypertarget{eq:1}{}{\begin{equation} for example \label{eq:1}\end{equation}}+\begin{equation}\protect\hypertarget{eq:1}{}{ for example }\label{eq:1}\end{equation} this one.  Some equations might be on start of paragraphs: -\protect\hypertarget{eq:2}{}{\begin{equation} start \label{eq:2}\end{equation}}+\begin{equation}\protect\hypertarget{eq:2}{}{ start }\label{eq:2}\end{equation} of paragraph.  Other might be on separate paragraphs of their own: -\protect\hypertarget{eq:3}{}{\begin{equation} separate \label{eq:3}\end{equation}}+\begin{equation}\protect\hypertarget{eq:3}{}{ separate }\label{eq:3}\end{equation}  Then they can be referenced: 

@@ -13,20 +13,20 @@ Some of those can be labelled:  This is a test file with some referenced equations, line-\protect\hypertarget{eq:0}{}{\begin{equation} this \label{eq:0}\end{equation}}+\begin{equation}\protect\hypertarget{eq:0}{}{ this }\label{eq:0}\end{equation}  Some equations might be inside of text,-\protect\hypertarget{eq:1}{}{\begin{equation} for example \label{eq:1}\end{equation}}+\begin{equation}\protect\hypertarget{eq:1}{}{ for example }\label{eq:1}\end{equation} this one.  Some equations might be on start of paragraphs: -\protect\hypertarget{eq:2}{}{\begin{equation} start \label{eq:2}\end{equation}}+\begin{equation}\protect\hypertarget{eq:2}{}{ start }\label{eq:2}\end{equation} of paragraph.  Other might be on separate paragraphs of their own: -\protect\hypertarget{eq:3}{}{\begin{equation} separate \label{eq:3}\end{equation}}+\begin{equation}\protect\hypertarget{eq:3}{}{ separate }\label{eq:3}\end{equation}  Then they can be referenced: 

@@ -13,20 +13,20 @@ Some of those can be labelled:  This is a test file with some referenced equations, line-\protect\hypertarget{eq:0}{}{\begin{equation} this \label{eq:0}\end{equation}}+\begin{equation}\protect\hypertarget{eq:0}{}{ this }\label{eq:0}\end{equation}  Some equations might be inside of text,-\protect\hypertarget{eq:1}{}{\begin{equation} for example \label{eq:1}\end{equation}}+\begin{equation}\protect\hypertarget{eq:1}{}{ for example }\label{eq:1}\end{equation} this one.  Some equations might be on start of paragraphs: -\protect\hypertarget{eq:2}{}{\begin{equation} start \label{eq:2}\end{equation}}+\begin{equation}\protect\hypertarget{eq:2}{}{ start }\label{eq:2}\end{equation} of paragraph.  Other might be on separate paragraphs of their own: -\protect\hypertarget{eq:3}{}{\begin{equation} separate \label{eq:3}\end{equation}}+\begin{equation}\protect\hypertarget{eq:3}{}{ separate }\label{eq:3}\end{equation}  Then they can be referenced: 

@@ -13,20 +13,20 @@ Some of those can be labelled:  This is a test file with some referenced equations, line-\protect\hypertarget{eq:0}{}{\begin{equation} this \label{eq:0}\end{equation}}+\begin{equation}\protect\hypertarget{eq:0}{}{ this }\label{eq:0}\end{equation}  Some equations might be inside of text,-\protect\hypertarget{eq:1}{}{\begin{equation} for example \label{eq:1}\end{equation}}+\begin{equation}\protect\hypertarget{eq:1}{}{ for example }\label{eq:1}\end{equation} this one.  Some equations might be on start of paragraphs: -\protect\hypertarget{eq:2}{}{\begin{equation} start \label{eq:2}\end{equation}}+\begin{equation}\protect\hypertarget{eq:2}{}{ start }\label{eq:2}\end{equation} of paragraph.  Other might be on separate paragraphs of their own: -\protect\hypertarget{eq:3}{}{\begin{equation} separate \label{eq:3}\end{equation}}+\begin{equation}\protect\hypertarget{eq:3}{}{ separate }\label{eq:3}\end{equation}  Then they can be referenced: 

@@ -13,20 +13,20 @@ Some of those can be labelled:  This is a test file with some referenced equations, line-\protect\hypertarget{eq:0}{}{\begin{equation} this \label{eq:0}\end{equation}}+\begin{equation}\protect\hypertarget{eq:0}{}{ this }\label{eq:0}\end{equation}  Some equations might be inside of text,-\protect\hypertarget{eq:1}{}{\begin{equation} for example \label{eq:1}\end{equation}}+\begin{equation}\protect\hypertarget{eq:1}{}{ for example }\label{eq:1}\end{equation} this one.  Some equations might be on start of paragraphs: -\protect\hypertarget{eq:2}{}{\begin{equation} start \label{eq:2}\end{equation}}+\begin{equation}\protect\hypertarget{eq:2}{}{ start }\label{eq:2}\end{equation} of paragraph.  Other might be on separate paragraphs of their own: -\protect\hypertarget{eq:3}{}{\begin{equation} separate \label{eq:3}\end{equation}}+\begin{equation}\protect\hypertarget{eq:3}{}{ separate }\label{eq:3}\end{equation}  Then they can be referenced: 

@@ -307,7 +307,7 @@         it "Eqn labels" $           equation "x^2" "some_equation1"             <> para (citeGen "eq:some_equation" [1])-            `test` "\\protect\\hypertarget{eq:some_equation1}{}{\\begin{equation}x^2\\label{eq:some_equation1}\\end{equation}}\n\neq.~\\ref{eq:some_equation1}"+            `test` "\\begin{equation}\\protect\\hypertarget{eq:some_equation1}{}{x^2}\\label{eq:some_equation1}\\end{equation}\n\neq.~\\ref{eq:some_equation1}"  #ifdef FLAKY         it "Tbl labels" $