pandoc-citeproc 0.10.5.1 → 0.11

raw patch · 18 files changed

+109/−275 lines, 18 filesdep ~basesetup-changedPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: base

API changes (from Hackage documentation)

Files

• Setup.hs +2/−22
• changelog +13/−0
• compat/Text/CSL/Compat/Pandoc.hs +12/−8
• pandoc-citeproc.cabal +2/−1
• pandoc-citeproc.hs +12/−6
• src/Text/CSL/Data/Embedded.hs +2/−2
• src/Text/CSL/Eval.hs +3/−1
• src/Text/CSL/Eval/Date.hs +4/−1
• src/Text/CSL/Eval/Output.hs +2/−2
• src/Text/CSL/Exception.hs +17/−0
• src/Text/CSL/Input/Bibtex.hs +6/−3
• src/Text/CSL/Input/Bibutils.hs +16/−10
• src/Text/CSL/Pandoc.hs +6/−4
• src/Text/CSL/Parser.hs +2/−1
• src/Text/CSL/Reference.hs +2/−2
• stack.yaml +7/−3
• tests/jats.csl +0/−208
• tests/test-pandoc-citeproc.hs +1/−1

@@ -1,12 +1,8 @@ {-# LANGUAGE CPP #-}  import Distribution.Simple-import Distribution.Simple.PreProcess import Distribution.PackageDescription (PackageDescription(..))-import Distribution.Simple.Program (simpleProgram, Program(..))-import Distribution.Simple.Utils ( rawSystemExitCode, findProgramVersion )-import System.Exit-import Distribution.Simple.Utils (info, notice, installOrdinaryFiles)+import Distribution.Simple.Utils (notice, installOrdinaryFiles) import Distribution.Simple.Setup import Distribution.Simple.LocalBuildInfo @@ -14,12 +10,7 @@ main :: IO () main =   defaultMainWithHooks $ simpleUserHooks {-      -- enable hsb2hs preprocessor for .hsb files-      hookedPreProcessors = [ppBlobSuffixHandler]-    , hookedPrograms = [(simpleProgram "hsb2hs"){-                           programFindVersion = \verbosity fp ->-                             findProgramVersion "--version" id verbosity fp }]-    , postCopy = installManPage+      postCopy = installManPage     }  installManPage :: Args -> CopyFlags@@ -33,14 +24,3 @@   installOrdinaryFiles verbosity mandest      [("man/man1", "pandoc-citeproc.1")] -ppBlobSuffixHandler :: PPSuffixHandler-ppBlobSuffixHandler = ("hsb", \_ _ ->-  PreProcessor {-    platformIndependent = True,-    runPreProcessor = mkSimplePreProcessor $ \infile outfile verbosity ->-      do info verbosity $ "Preprocessing " ++ infile ++ " to " ++ outfile-         ec <- rawSystemExitCode verbosity "hsb2hs" [infile, infile, outfile]-         case ec of-              ExitSuccess   -> return ()-              ExitFailure _ -> error "hsb2hs is needed to build this program"-  })

@@ -1,3 +1,16 @@+pandoc-citeproc (0.11)++  * Add Text.CSL.Exception module exporting CiteprocException [API change].+  * Throw CiteprocExceptions instead of crashing with 'error'.  This+    should lead to better error messages in pandoc when pandoc-citeproc fails.+  * Compat.Pandoc: support for pandoc 2.0 API with Text instead of String.+  * Text.CSL.Input.Bibtex - revise item parser for better error messages.+    This should give us better messages when someone uses a bad character+    in a citation key.+  * Use defConfig from aeson-pretty.  Otherwise we get an error with newer+    versions, which added a field to the Config record.+  * Removed old hsb2hs-specific stuff from Setup.hs.+ pandoc-citeproc (0.10.5.1)    * Minor tweaks for clean CI builds.

@@ -22,6 +22,7 @@ import qualified Text.Pandoc as Pandoc import qualified Text.Pandoc.Process #if MIN_VERSION_pandoc(2,0,0)+import qualified Data.Text as T import Text.Pandoc.MIME (MimeType) import Text.Pandoc.Error (PandocError) import Text.Pandoc.Class (runPure, runIO)@@ -42,25 +43,28 @@ #if MIN_VERSION_pandoc(2,0,0) readHtml = either mempty id . runPure . Pandoc.readHtml    def{ readerExtensions = extensionsFromList [Ext_native_divs,-                           Ext_native_spans, Ext_raw_html, Ext_smart] }+                           Ext_native_spans, Ext_raw_html, Ext_smart] } .+   T.pack  readMarkdown = either mempty id . runPure . Pandoc.readMarkdown-   def{ readerExtensions = pandocExtensions, readerStandalone = True }+   def{ readerExtensions = pandocExtensions, readerStandalone = True } .+   T.pack  readLaTeX = either mempty id . runPure . Pandoc.readLaTeX-   def{ readerExtensions = extensionsFromList [Ext_raw_tex, Ext_smart] }+   def{ readerExtensions = extensionsFromList [Ext_raw_tex, Ext_smart] } .+   T.pack -readNative = either mempty id . runPure . Pandoc.readNative def+readNative = either mempty id . runPure . Pandoc.readNative def . T.pack -writeMarkdown = either mempty id . runPure . Pandoc.writeMarkdown+writeMarkdown = either mempty T.unpack . runPure . Pandoc.writeMarkdown    def{ writerExtensions = disableExtension Ext_smart pandocExtensions,         writerWrapText = WrapNone } -writePlain = either mempty id . runPure . Pandoc.writePlain def+writePlain = either mempty T.unpack . runPure . Pandoc.writePlain def -writeNative = either mempty id . runPure . Pandoc.writeNative def+writeNative = either mempty T.unpack . runPure . Pandoc.writeNative def -writeHtmlString = either mempty id . runPure . Pandoc.writeHtml4String+writeHtmlString = either mempty T.unpack . runPure . Pandoc.writeHtml4String    def{ writerExtensions = extensionsFromList        [Ext_native_divs, Ext_native_spans, Ext_raw_html] } 

@@ -1,5 +1,5 @@ name:               pandoc-citeproc-version:            0.10.5.1+version:            0.11 cabal-version:      >= 1.12 synopsis:           Supports using pandoc with citeproc @@ -76,6 +76,7 @@     exposed-modules:  Text.CSL.Pandoc                       Text.CSL                       Text.CSL.Reference+                      Text.CSL.Exception                       Text.CSL.Style                       Text.CSL.Eval                       Text.CSL.Eval.Common

@@ -1,4 +1,4 @@-{-# LANGUAGE CPP #-}+{-# LANGUAGE CPP, ScopedTypeVariables #-} module Main where import Text.CSL.Input.Bibutils (readBiblioString, BibFormat(..)) import Text.CSL.Reference (Reference(refId), Literal(..))@@ -12,8 +12,10 @@ import Data.Attoparsec.ByteString.Char8 as Attoparsec import qualified Data.Text as T import Data.Text.Encoding (encodeUtf8)-import Data.Aeson.Encode.Pretty (encodePretty', Config(..), Indent(Spaces), NumberFormat(Generic))+import Data.Aeson.Encode.Pretty (encodePretty', defConfig, Config(..),+          Indent(Spaces), NumberFormat(Generic)) import System.Console.GetOpt+import Control.Exception as E import Control.Monad import System.IO import System.FilePath (takeExtension)@@ -69,10 +71,14 @@                  B8.intercalate (B.singleton 10) .                  map (unescapeTags . toByteString . (:[]))             else B8.putStrLn . unescapeUnicode . B.concat . BL.toChunks .-              encodePretty' Config{ confIndent = Spaces 2-                                  , confCompare = compare-                                  , confNumFormat = Generic }-     else toJSONFilter doCites+              encodePretty' defConfig{ confIndent = Spaces 2+                                     , confCompare = compare+                                     , confNumFormat = Generic }+     else E.catch (toJSONFilter doCites)+          (\(e :: SomeException) -> do+             UTF8.hPutStrLn stderr $+               "pandoc-citeproc: error running filter.\n" ++ show e+             exitWith (ExitFailure 1))  formatFromExtension :: FilePath -> Maybe BibFormat formatFromExtension = readFormat . dropWhile (=='.') . takeExtension

@@ -1,7 +1,7 @@ {-# LANGUAGE TemplateHaskell #-} --- to be processed using hsb2hs-module Text.CSL.Data.Embedded (localeFiles, defaultCSL, manpage, license) where+module Text.CSL.Data.Embedded (localeFiles, defaultCSL, manpage, license)+where import Data.FileEmbed import qualified Data.ByteString.Char8 as S 

@@ -22,6 +22,7 @@  import Control.Arrow import Control.Monad.State+import qualified Control.Exception as E import Data.Monoid (Any(..)) import Data.Char ( toLower, isDigit, isLetter ) import Data.Maybe@@ -31,6 +32,7 @@ import Text.Pandoc.Shared (stringify) import qualified Data.Text as T +import Text.CSL.Exception import Text.CSL.Eval.Common import Text.CSL.Eval.Output import Text.CSL.Eval.Date@@ -136,7 +138,7 @@     | Macro    s   fm       <- el = do                         ms <- gets (macros . env)                         case lookup s ms of-                             Nothing  -> error $ "Macro " ++ show s ++ " not found!"+                             Nothing  -> E.throw $ MacroNotFound (show s)                              Just els -> do                                res <- concat <$> mapM evalElement els                                if null res

@@ -16,11 +16,14 @@ module Text.CSL.Eval.Date where  import Control.Monad.State+import qualified Control.Exception as E+ import Data.Char import Data.List import Data.List.Split import Data.Maybe +import Text.CSL.Exception import Text.CSL.Eval.Common import Text.CSL.Eval.Output import Text.CSL.Style@@ -84,7 +87,7 @@       addODate xs   = [ODate xs]       splitDate a b = case split (onSublist $ diff a b dp) dp of                         [x,y,z] -> (x,y,z)-                        _       -> error "error in splitting date ranges"+                        _       -> E.throw ErrorSplittingDate       doRange   a b = let (x,y,z) = splitDate a b in                       map (formatDatePart False  a) x ++                       map (formatDatePart False  a) (init' y) ++

@@ -38,9 +38,9 @@  pRaw :: Parsec String () Inline pRaw = try $ do-  string "{{"+  _ <- string "{{"   format <- many1 letter-  string "}}"+  _ <- string "}}"   contents <- manyTill anyChar (try (string ("{{/" ++ format ++ "}}")))   return $ RawInline (Format format) contents 

@@ -0,0 +1,17 @@+{-# LANGUAGE StandaloneDeriving #-}+module Text.CSL.Exception (CiteprocException(..)) where+import Control.Exception (Exception)++data CiteprocException =+       ErrorParsingReferences String+     | CouldNotFindAbbrevFile String+     | CouldNotFindBibFile    String+     | ErrorReadingBibFile    String String+     | ErrorReadingBib        String+     | ErrorSplittingDate+     | MacroNotFound          String+     | DependentStyleHasItselfAsParent String+     deriving Show++instance Exception CiteprocException+

@@ -125,8 +125,11 @@ type BibParser = Parsec [Char] [(String, String)]  bibEntries :: BibParser [Item]-bibEntries = many (try (skipMany nonEntry >> bibItem)) <* skipMany nonEntry-  where nonEntry = bibSkip <|> bibComment <|> bibPreamble <|> bibString+bibEntries = do+  skipMany nonEntry+  items <- many (bibItem <* skipMany nonEntry)+  return items+ where nonEntry = bibSkip <|> bibComment <|> bibPreamble <|> bibString  bibSkip :: BibParser () bibSkip = skipMany1 (satisfy (/='@'))@@ -194,7 +197,7 @@   spaces   char '{'   spaces-  entid <- many (satisfy isBibtexKeyChar)+  entid <- many1 (satisfy isBibtexKeyChar)   spaces   char ','   spaces

@@ -23,14 +23,15 @@ import Text.CSL.Compat.Pandoc (readMarkdown) import Data.Char import System.FilePath ( takeExtension )+import Text.CSL.Exception import Text.CSL.Reference hiding ( Value ) import Text.CSL.Input.Bibtex import qualified Data.ByteString.Lazy as BL import qualified Data.Map as M import Data.Aeson+import qualified Control.Exception as E  #ifdef USE_BIBUTILS-import qualified Control.Exception as E import Control.Exception ( bracket, catch ) import Control.Monad.Trans ( liftIO ) import System.FilePath ( (</>), (<.>) )@@ -47,8 +48,10 @@ readBiblioFile :: FilePath -> IO [Reference] readBiblioFile f     = case getExt f of-        ".json"     -> BL.readFile f >>= either error return . eitherDecode-        ".yaml"     -> UTF8.readFile f >>= either error return . readYamlBib+        ".json"     -> BL.readFile f >>= either+                       (E.throwIO . ErrorReadingBibFile f) return . eitherDecode+        ".yaml"     -> UTF8.readFile f >>= either+                       (E.throwIO . ErrorReadingBibFile f) return . readYamlBib         ".bib"      -> readBibtex False True f         ".bibtex"   -> readBibtex True True f         ".biblatex" -> readBibtex False True f@@ -60,10 +63,9 @@         ".wos"      -> readBiblioFile' f isi_in         ".medline"  -> readBiblioFile' f medline_in         ".copac"    -> readBiblioFile' f copac_in-        _           -> error $ "citeproc: the format of the bibliographic database could not be recognized\n" ++-                              "using the file extension."+        _           -> E.throwIO $ ErrorReadingBibFile f "the format of the bibliographic database could not be recognized from the file extension" #else-        _           -> error $ "citeproc: Bibliography format not supported.\n"+        _           -> E.throwIO $ ErrorReadingBibFile f "bibliography format not supported" #endif  data BibFormat@@ -80,11 +82,14 @@     | Copac     | Mods #endif+    deriving Show  readBiblioString :: BibFormat -> String -> IO [Reference] readBiblioString b s-    | Json      <- b = either error return $ eitherDecode $ UTF8.fromStringLazy s-    | Yaml      <- b = either error return $ readYamlBib s+    | Json      <- b = either (E.throwIO . ErrorReadingBib)+                         return $ eitherDecode $ UTF8.fromStringLazy s+    | Yaml      <- b = either (E.throwIO . ErrorReadingBib)+                         return $ readYamlBib s     | Bibtex    <- b = readBibtexString True True s     | BibLatex  <- b = readBibtexString False True s #ifdef USE_BIBUTILS@@ -96,7 +101,8 @@     | Copac     <- b = go copac_in     | Mods      <- b = go mods_in #endif-    | otherwise      = error "in readBiblioString"+    | otherwise      = E.throwIO $ ErrorReadingBib $+                          "unsupported format " ++ show b #ifdef USE_BIBUTILS     where       go f = withTempDir "citeproc" $ \tdir -> do@@ -125,7 +131,7 @@                             refs <- readBibtex True False tfile                             return $! refs   where handleBibfileError :: E.SomeException -> IO [Reference]-        handleBibfileError e = error $ "Error reading " ++ fin ++ "\n" ++ show e+        handleBibfileError e = E.throwIO $ ErrorReadingBibFile fin (show e)  -- | Perform a function in a temporary directory and clean up. withTempDir :: FilePath -> (FilePath -> IO a) -> IO a

@@ -1,6 +1,7 @@ {-# LANGUAGE PatternGuards, OverloadedStrings, FlexibleInstances,     ScopedTypeVariables, CPP #-}-module Text.CSL.Pandoc (processCites, processCites') where+module Text.CSL.Pandoc (processCites, processCites')+where  import Text.Pandoc import Text.Pandoc.Walk@@ -31,6 +32,7 @@ import System.FilePath import System.Directory (getAppUserDataDirectory) import Text.CSL.Util (findFile, splitStrWhen, tr', parseRomanNumeral, trim)+import Text.CSL.Exception import System.IO.Error (isDoesNotExistError) import Data.Maybe (fromMaybe) @@ -151,7 +153,7 @@                  if isDoesNotExistError e                     then return Nothing                     else E.throwIO e-  let inlineRefError s = error $ "Error parsing references: " ++ s+  let inlineRefError s = E.throw $ ErrorParsingReferences s   let inlineRefs = either inlineRefError id                    $ convertRefs $ lookupMeta "references" meta   let cslfile = (lookupMeta "csl" meta <|> lookupMeta "citation-style" meta)@@ -189,7 +191,7 @@   let skipLeadingSpace = L.dropWhile (\s -> s == 32 || (s >= 9 && s <= 13))   abbrevs <- maybe (return (Abbreviations M.empty))              (\f -> findFile (maybe ["."] (\g -> [".", g]) mbcsldir) f >>=-                    maybe (error $ "Could not find " ++ f) return >>=+                    maybe (E.throwIO $ CouldNotFindAbbrevFile f) return >>=                L.readFile >>=                either error return . eitherDecode . skipLeadingSpace)              cslAbbrevFile@@ -209,7 +211,7 @@ getBibRefs (MetaList xs) = concat `fmap` mapM getBibRefs xs getBibRefs (MetaInlines xs) = getBibRefs (MetaString $ stringify xs) getBibRefs (MetaString s) = do-  path <- findFile ["."] s >>= maybe (error $ "Could not find " ++ s) return+  path <- findFile ["."] s >>= maybe (E.throwIO $ CouldNotFindBibFile s) return   map unescapeRefId `fmap` readBiblioFile path getBibRefs _ = return [] 

@@ -33,6 +33,7 @@ import Text.Pandoc.UTF8 (fromStringLazy) import Text.CSL.Compat.Pandoc (fetchItem) import Text.CSL.Data (getLocale)+import Text.CSL.Exception  -- | Parse a 'String' into a 'Style' (with default locale). parseCSL :: String -> Style@@ -65,7 +66,7 @@   let parentCur = cur $/ get "info" &/ pickParentCur   let parent' = concatMap (stringAttr "href") parentCur   when (parent' == src) $ do-    error $ "Dependent CSL style " ++ src ++ " specifies itself as parent."+    E.throwIO $ DependentStyleHasItselfAsParent src   case parent' of        ""  -> localizeCSL mbLocale $ parseCSLCursor cur        y   -> do

@@ -509,8 +509,8 @@ noteField :: P.Parser (Text, Aeson.Value) noteField = P.try $ do   P.spaces-  P.char '{'-  P.char ':'+  _ <- P.char '{'+  _ <- P.char ':'   k <- P.manyTill (P.letter <|> P.char '-') (P.char ':')   v <- P.manyTill P.anyChar (P.char '}')   return (T.pack k, Aeson.String (T.pack v))

@@ -9,9 +9,13 @@ - '.' - location:     git: https://github.com/jgm/pandoc.git-    commit: 55d679e382954dd458acd6233609851748522d99+    commit: ae61d5f57dc8094eb40a9e83427db7fb02afcefb   extra-dep: true extra-deps:-- xml-conduit-1.5.0+- hslua-0.8.0 - skylighting-0.3.3-resolver: lts-8.16+- cmark-gfm-0.1.1+- QuickCheck-2.10.0.1+- tasty-quickcheck-0.9.1+- haddock-library-1.4.3+resolver: lts-9.0

@@ -1,208 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" default-locale="en-US">-  <info>-    <title>Journal Article Tag Suite</title>-    <title-short>JATS</title-short>-    <id>http://www.zotero.org/styles/journal-article-tag-suite</id>-    <link href="https://github.com/MartinPaulEve/JATS-CSL/blob/master/jats.csl" rel="self"/>-    <link rel="documentation" href="http://jats.nlm.nih.gov/archiving/tag-library/1.0/index.html"/>-    <author>-      <name>Martin Paul Eve</name>-      <email>martin@martineve.com</email>-    </author>-    <category citation-format="numeric"/>-    <category field="medicine"/>-    <category field="biology"/>-    <summary>Use this style to generate bibliographic data in Journal Article Tagging Suite (JATS) 1.0 XML format</summary>-    <updated>2014-06-21T17:41:26+00:00</updated>-    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License. Originally by Martin Fenner.</rights>-  </info>-  <locale xml:lang="en">-    <terms>-        <term name="et-al">{{jats}}&lt;etal/&gt;{{/jats}}</term>-    </terms>-  </locale>-  <macro name="citation-number">-    <text variable="citation-number" prefix="{{jats}}id=&quot;ref-{{/jats}}" suffix="{{jats}}&quot;&gt;{{/jats}}"/>-  </macro>-  <macro name="author">-    <names variable="author">-        <name prefix="{{jats}}&lt;name&gt;{{/jats}}" suffix="{{jats}}&lt;/name&gt;{{/jats}}" name-as-sort-order="all" sort-separator="">-            <name-part name="family" text-case="capitalize-first" prefix="{{jats}}&lt;surname&gt;{{/jats}}" suffix="{{jats}}&lt;/surname&gt;{{/jats}}"/>-            <name-part name="given" text-case="capitalize-first" prefix="{{jats}}&lt;given-names&gt;{{/jats}}" suffix="{{jats}}&lt;/given-names&gt;{{/jats}}"/>-      </name>-      <substitute>-        <names variable="editor"/>-      </substitute>-    </names>-  </macro>--  <macro name="editor">-    <names variable="editor" prefix="{{jats}}&lt;person-group person-group-type=&quot;editor&quot;&gt;{{/jats}}" suffix="{{jats}}&lt;/person-group&gt;{{/jats}}">-      <name prefix="{{jats}}&lt;name&gt;{{/jats}}" suffix="{{jats}}&lt;/name&gt;{{/jats}}" name-as-sort-order="all" sort-separator="">-        <name-part name="family" text-case="capitalize-first" prefix="{{jats}}&lt;surname&gt;{{/jats}}" suffix="{{jats}}&lt;/surname&gt;{{/jats}}"/>-        <name-part name="given" text-case="capitalize-first" prefix="{{jats}}&lt;given-names&gt;{{/jats}}" suffix="{{jats}}&lt;/given-names&gt;{{/jats}}"/>-      </name>-      <substitute>-        <names variable="editor"/>-      </substitute>-    </names>-  </macro>--  <macro name="editor">-    <group delimiter=": ">-      <names variable="editor">-        <name prefix="{{jats}}&lt;name&gt;{{/jats}}" suffix="{{jats}}&lt;/name&gt;{{/jats}}" name-as-sort-order="all" sort-separator="">-          <name-part name="family" text-case="capitalize-first" prefix="{{jats}}&lt;surname&gt;{{/jats}}" suffix="{{jats}}&lt;/surname&gt;{{/jats}}"/>-          <name-part name="given" text-case="capitalize-first" prefix="{{jats}}&lt;given-names&gt;{{/jats}}" suffix="{{jats}}&lt;given-names&gt;{{/jats}}"/>-        </name>-      </names>-    </group>-  </macro>-  <macro name="title">-    <choose>-      <if type="book" match="any">-        <group prefix="{{jats}}&lt;source&gt;{{/jats}}" suffix="{{jats}}&lt;/source&gt;{{/jats}}">-	        <text variable="title"/>-				</group>			-			</if>-      <else>-        <group prefix="{{jats}}&lt;article-title&gt;{{/jats}}" suffix="{{jats}}&lt;/article-title&gt;{{/jats}}">-	        <text variable="title"/>-				</group>-      </else>-    </choose>-  </macro>-  <macro name="container-title">-    <text variable="container-title" form="short" prefix="{{jats}}&lt;source&gt;{{/jats}}" suffix="{{jats}}&lt;/source&gt;{{/jats}}"/>-  </macro>-  <macro name="publisher">-    <text variable="publisher" prefix="{{jats}}&lt;publisher-name&gt;{{/jats}}" suffix="{{jats}}&lt;/publisher-name&gt;{{/jats}}"/>-    <text variable="publisher-place" prefix="{{jats}}&lt;publisher-loc&gt;{{/jats}}" suffix="{{jats}}&lt;/publisher-loc&gt;{{/jats}}"/>-  </macro>-  <macro name="link">-    <choose>-      <if match="any" variable="DOI">-        <group prefix="{{jats}}&lt;pub-id pub-id-type=&quot;doi&quot;&gt;{{/jats}}" suffix="{{jats}}&lt;/pub-id&gt;{{/jats}}">-          <text variable="DOI"/>-        </group>-      </if>-    </choose>-    <choose>-      <if match="any" variable="PMID">-        <group prefix="{{jats}}&lt;ext-link ext-link-type=&quot;pmid&quot; {{/jats}}" suffix="{{jats}}&lt;/ext-link&gt;{{/jats}}">-          <text variable="PMID" prefix="{{jats}}xlink:href=&quot;http://www.ncbi.nlm.nih.gov/pubmed/{{/jats}}" suffix="{{jats}}&quot; xlink:type=&quot;simple&quot;&gt;{{/jats}}"/>-          <text variable="PMID"/>-        </group>-      </if>-    </choose>-    <choose>-      <if variable="URL" match="any">-        <group prefix="{{jats}}&lt;ext-link ext-link-type=&quot;uri&quot; {{/jats}}" suffix="{{jats}}&lt;/ext-link&gt;{{/jats}}">-          <text variable="URL" prefix="{{jats}}xlink:href=&quot;{{/jats}}" suffix="{{jats}}&quot; xlink:type=&quot;simple&quot;&gt;{{/jats}}"/>-          <text variable="URL"/>-        </group>-      </if>-    </choose>-  </macro>-  <macro name="date">-    <choose>-      <if type="article-journal article-magazine article-newspaper report patent book" match="any">-        <group prefix="{{jats}}&lt;date&gt;{{/jats}}" suffix="{{jats}}&lt;/date&gt;{{/jats}}">-          <date variable="issued">-            <date-part name="day" form="numeric-leading-zeros" prefix="{{jats}}&lt;day&gt;{{/jats}}" suffix="{{jats}}&lt;/day&gt;{{/jats}}"/>-            <date-part name="month" form="numeric-leading-zeros" prefix="{{jats}}&lt;month&gt;{{/jats}}" suffix="{{jats}}&lt;/month&gt;{{/jats}}"/>-            <date-part name="year" prefix="{{jats}}&lt;year&gt;{{/jats}}" suffix="{{jats}}&lt;/year&gt;{{/jats}}"/>-          </date>-        </group>-      </if>-      <else>-        <group prefix="{{jats}}&lt;date-in-citation content-type=&quot;access-date&quot;{{/jats}}" suffix="{{jats}}&lt;/date-in-citation&gt;{{/jats}}">-          <date variable="accessed" prefix="{{jats}} iso-8601-date=&quot;{{/jats}}" suffix="{{jats}}&quot;&gt;{{/jats}}">-            <date-part name="year"/>-            <date-part name="month" form="numeric-leading-zeros" prefix="{{jats}}-{{/jats}}"/>-            <date-part name="day" form="numeric-leading-zeros" prefix="{{jats}}-{{/jats}}"/>-          </date>-          <date variable="accessed">-            <date-part name="day" prefix="{{jats}}&lt;day&gt;{{/jats}}" suffix="{{jats}}&lt;/day&gt;{{/jats}}"/>-            <date-part name="month" form="numeric-leading-zeros" prefix="{{jats}}&lt;month&gt;{{/jats}}" suffix="{{jats}}&lt;/month&gt;{{/jats}}"/>-            <date-part name="year" prefix="{{jats}}&lt;year&gt;{{/jats}}" suffix="{{jats}}&lt;/year&gt;{{/jats}}"/>-          </date>-        </group>-      </else>-    </choose>-  </macro>-  <macro name="location">-    <choose>-      <if type="article-journal article-magazine" match="any">-        <text variable="volume" prefix="{{jats}}&lt;volume&gt;{{/jats}}" suffix="{{jats}}&lt;/volume&gt;{{/jats}}"/>-        <text variable="issue" prefix="{{jats}}&lt;issue&gt;{{/jats}}" suffix="{{jats}}&lt;/issue&gt;{{/jats}}"/>-      </if>-    </choose>-    <choose>-      <if type="article-journal article-magazine article-newspaper chapter" match="any">-        <text variable="page-first" prefix="{{jats}}&lt;fpage&gt;{{/jats}}" suffix="{{jats}}&lt;/fpage&gt;{{/jats}}"/>-      </if>-    </choose>-  </macro>-  <macro name="publication-type">-    <group prefix="{{jats}} publication-type=&quot;{{/jats}}" suffix="{{jats}}&quot;&gt;{{/jats}}">-      <choose>-        <if type="article-journal article-magazine article-newspaper" match="any">-          <text value="journal"/>-        </if>-        <else-if type="book" match="any">-          <text value="book"/>-        </else-if>-        <else-if type="chapter" match="any">-          <text value="bookchapter"/>-        </else-if>-        <else-if type="dataset" match="any">-          <text value="dataset"/>-        </else-if>-        <else-if type="patent" match="any">-          <text value="patent"/>-        </else-if>-        <else-if type="report" match="any">-          <text value="report"/>-        </else-if>-        <else-if type="review" match="any">-          <text value="review"/>-        </else-if>-        <else>-          <text value="standard"/>-        </else>-      </choose>-    </group>-  </macro>-  <citation collapse="citation-number">-    <sort>-      <key variable="citation-number"/>-    </sort>-    <layout delimiter=",">-      <group prefix="{{jats}}&lt;xref ref-type=&quot;bibr&quot; rid=&quot;{{/jats}}" suffix="{{jats}}&lt;/xref&gt;{{/jats}}">-        <text variable="citation-number" prefix="{{jats}}ref-{{/jats}}" suffix="{{jats}}&quot;&gt;{{/jats}}"/>-        <text variable="citation-number"/>-      </group>-    </layout>-  </citation>-  <bibliography sort-separator="">-    <layout>-      <group prefix="{{jats}}&lt;ref {{/jats}}" suffix="{{jats}}&lt;/ref&gt;{{/jats}}">-        <text macro="citation-number"/>-        <group prefix="{{jats}}&lt;element-citation{{/jats}}" suffix="{{jats}}&lt;/element-citation&gt;{{/jats}}">-          <text macro="publication-type"/>-          <text macro="author" prefix="{{jats}}&lt;person-group person-group-type=&quot;author&quot;&gt;{{/jats}}" suffix="{{jats}}&lt;/person-group&gt;{{/jats}}"/>-          <text macro="title" />-          <text macro="container-title"/>-          <text macro="editor"/>-          <text macro="publisher"/>-          <text macro="date"/>-          <text macro="location"/>-          <text macro="link"/>-        </group>-      </group>-    </layout>-  </bibliography>-</style>-

@@ -96,7 +96,7 @@     UTF8.writeFile actualf result     oldDir <- getCurrentDirectory     setCurrentDirectory fp-    rawSystem "diff" ["-U1","expected","actual"]+    _ <- rawSystem "diff" ["-U1","expected","actual"]     setCurrentDirectory oldDir  biblio2yamlTest :: String -> IO TestResult