Merge branch 'master' of github.com:jgm/pandoc

11 files changed, 35 insertions, 1374 deletions

diff --git a/tests/Tests/Old.hs b/tests/Tests/Old.hs
index 8609781d0..01e4403fb 100644
--- a/tests/Tests/Old.hs
+++ b/tests/Tests/Old.hs
@@ -63,7 +63,10 @@ tests = [ testGroup "markdown"
               "markdown-reader-more.txt" "markdown-reader-more.native"
             , lhsReaderTest "markdown+lhs"
             ]
-          , testGroup "citations" markdownCitationTests
+          , testGroup "citations"
+            [ test "citations" ["-r", "markdown", "-w", "native"]
+              "markdown-citations.txt" "markdown-citations.native"
+            ]
           ]
         , testGroup "rst"
           [ testGroup "writer" (writerTests "rst" ++ lhsWriterTests "rst")
@@ -190,19 +193,6 @@ fb2WriterTest title opts inputfile normfile =
     ignoreBinary = unlines . filter (not . startsWith "<binary ") . lines
     startsWith tag str = all (uncurry (==)) $ zip tag str
 
-markdownCitationTests :: [Test]
-markdownCitationTests
-  =  map styleToTest ["chicago-author-date","ieee","mhra"]
-     ++ [test "natbib" wopts "markdown-citations.txt"
-         "markdown-citations.txt"]
-  where
-    ropts             = ["-r", "markdown", "-w", "markdown-citations", "--bibliography",
-                         "biblio.bib", "--no-wrap"]
-    wopts             = ["-r", "markdown", "-w", "markdown", "--no-wrap", "--natbib"]
-    styleToTest style = test style (ropts ++ ["--csl", style ++ ".csl"])
-                        "markdown-citations.txt"
-                        ("markdown-citations." ++ style ++ ".txt")
-
 -- | Run a test without normalize function, return True if test passed.
 test :: String    -- ^ Title of test
      -> [String]  -- ^ Options to pass to pandoc
diff --git a/tests/Tests/Readers/LaTeX.hs b/tests/Tests/Readers/LaTeX.hs
index 88029b7c2..dff6e4537 100644
--- a/tests/Tests/Readers/LaTeX.hs
+++ b/tests/Tests/Readers/LaTeX.hs
@@ -55,6 +55,13 @@ tests = [ testGroup "basic"
             "hi % this is a comment\nthere\n" =?> para "hi there"
           ]
 
+        , testGroup "code blocks"
+          [ "identifier" =:
+            "\\begin{lstlisting}[label=test]\\end{lstlisting}" =?> codeBlockWith ("test", [], [("label","test")]) ""
+          , "no identifier" =:
+            "\\begin{lstlisting}\\end{lstlisting}" =?> codeBlock ""
+          ]
+
         , testGroup "citations"
           [ natbibCitations
           , biblatexCitations
diff --git a/tests/Tests/Writers/LaTeX.hs b/tests/Tests/Writers/LaTeX.hs
index ebde5b97c..5f702a85d 100644
--- a/tests/Tests/Writers/LaTeX.hs
+++ b/tests/Tests/Writers/LaTeX.hs
@@ -10,6 +10,9 @@ import Tests.Arbitrary()
 latex :: (ToString a, ToPandoc a) => a -> String
 latex = writeLaTeX def . toPandoc
 
+latexListing :: (ToString a, ToPandoc a) => a -> String
+latexListing = writeLaTeX def{ writerListings = True } . toPandoc
+
 {-
   "my test" =: X =?> Y
 
@@ -31,6 +34,10 @@ tests :: [Test]
 tests = [ testGroup "code blocks"
           [ "in footnotes" =: note (para "hi" <> codeBlock "hi") =?>
             "\\footnote{hi\n\n\\begin{Verbatim}\nhi\n\\end{Verbatim}\n}"
+          , test latexListing "identifier" $ codeBlockWith ("id",[],[]) "hi" =?>
+            ("\\begin{lstlisting}[label=id]\nhi\n\\end{lstlisting}" :: String)
+          , test latexListing "no identifier" $ codeBlock "hi" =?>
+            ("\\begin{lstlisting}\nhi\n\\end{lstlisting}" :: String)
           ]
         , testGroup "math"
           [ "escape |" =: para (math "\\sigma|_{\\{x\\}}") =?>
diff --git a/tests/biblio.bib b/tests/biblio.bib
deleted file mode 100644
index 4eb2ba0d0..000000000
--- a/tests/biblio.bib
+++ /dev/null
@@ -1,26 +0,0 @@
-@Book{item1,
-author="John Doe",
-title="First Book",
-year="2005",
-address="Cambridge",
-publisher="Cambridge University Press"
-}
-
-@Article{item2,
-author="John Doe",
-title="Article",
-year="2006",
-journal="Journal of Generic Studies",
-volume="6",
-pages="33-34"
-}
-
-@InCollection{пункт3,
-author="John Doe and Jenny Roe",
-title="Why Water Is Wet",
-booktitle="Third Book",
-editor="Sam Smith",
-publisher="Oxford University Press",
-address="Oxford",
-year="2007"
-}
diff --git a/tests/chicago-author-date.csl b/tests/chicago-author-date.csl
deleted file mode 100644
index 83a70d0b5..000000000
--- a/tests/chicago-author-date.csl
+++ /dev/null
@@ -1,458 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="never">
-  <info>
-    <title>Chicago Manual of Style (author-date)</title>
-    <id>http://www.zotero.org/styles/chicago-author-date</id>
-    <link href="http://www.zotero.org/styles/chicago-author-date" rel="self"/>
-    <link href="http://www.chicagomanualofstyle.org/tools_citationguide.html" rel="documentation"/>
-    <author>
-      <name>Julian Onions</name>
-      <email>julian.onions@gmail.com</email>
-    </author>
-    <contributor>
-      <name>Sebastian Karcher</name>
-    </contributor>
-    <contributor>
-      <name>Richard Karnesky</name>
-      <email>karnesky+zotero@gmail.com</email>
-      <uri>http://arc.nucapt.northwestern.edu/Richard_Karnesky</uri>
-    </contributor>
-    <category citation-format="author-date"/>
-    <category field="generic-base"/>
-    <summary>The author-date variant of the Chicago style</summary>
-    <updated>2013-03-28T05:37:10+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</rights>
-  </info>
-  <locale>
-    <terms>
-      <term name="editor" form="verb-short">ed.</term>
-      <term name="container-author" form="verb">by</term>
-      <term name="translator" form="verb-short">trans.</term>
-      <term name="translator" form="short">trans.</term>
-    </terms>
-  </locale>
-  <macro name="secondary-contributors">
-    <choose>
-      <if type="chapter paper-conference" match="none">
-        <group delimiter=". ">
-          <names variable="editor translator">
-            <label form="verb" text-case="capitalize-first" suffix=" " plural="never"/>
-            <name and="text" delimiter=", "/>
-          </names>
-        </group>
-      </if>
-    </choose>
-  </macro>
-  <macro name="container-contributors">
-    <choose>
-      <if type="chapter paper-conference" match="any">
-        <group prefix=", " delimiter=", ">
-          <names variable="container-author editor" delimiter=", ">
-            <label form="verb" suffix=" " plural="never"/>
-            <name and="text" delimiter=", "/>
-          </names>
-        </group>
-      </if>
-    </choose>
-  </macro>
-  <macro name="editor">
-    <names variable="editor">
-      <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=", "/>
-    </names>
-  </macro>
-  <macro name="translator">
-    <names variable="translator">
-      <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=", " plural="never"/>
-    </names>
-  </macro>
-  <macro name="recipient">
-    <choose>
-      <if type="personal_communication">
-        <choose>
-          <if variable="genre">
-            <text variable="genre" text-case="capitalize-first"/>
-          </if>
-          <else>
-            <text term="letter" text-case="capitalize-first"/>
-          </else>
-        </choose>
-      </if>
-    </choose>
-    <names variable="recipient" delimiter=", ">
-      <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
-      <name and="text" delimiter=", "/>
-    </names>
-  </macro>
-  <macro name="contributors">
-    <names variable="author">
-      <name and="text" name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" plural="never" prefix=", "/>
-      <substitute>
-        <names variable="editor"/>
-        <names variable="translator"/>
-        <text macro="title"/>
-      </substitute>
-    </names>
-    <text macro="recipient"/>
-  </macro>
-  <macro name="contributors-short">
-    <names variable="author">
-      <name form="short" and="text" delimiter=", " initialize-with=". "/>
-      <substitute>
-        <names variable="editor"/>
-        <names variable="translator"/>
-        <text macro="title"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="interviewer">
-    <names variable="interviewer" delimiter=", ">
-      <label form="verb" prefix=" " text-case="capitalize-first" suffix=" "/>
-      <name and="text" delimiter=", "/>
-    </names>
-  </macro>
-  <macro name="archive">
-    <group delimiter=". ">
-      <text variable="archive_location" text-case="capitalize-first"/>
-      <text variable="archive"/>
-      <text variable="archive-place"/>
-    </group>
-  </macro>
-  <macro name="access">
-    <group delimiter=". ">
-      <choose>
-        <if type="graphic report" match="any">
-          <text macro="archive"/>
-        </if>
-        <else-if type="article-magazine article-newspaper bill book chapter graphic legal_case legislation motion_picture paper-conference report song thesis" match="none">
-          <text macro="archive"/>
-        </else-if>
-      </choose>
-      <text variable="DOI" prefix="doi:"/>
-      <choose>
-        <if variable="DOI issued" match="none">
-          <choose>
-            <if variable="URL accessed" match="all">
-              <group delimiter=" ">
-                <text term="accessed" text-case="capitalize-first"/>
-                <date variable="accessed" delimiter=" ">
-                  <date-part name="month"/>
-                  <date-part name="day"/>
-                </date>
-              </group>
-            </if>
-          </choose>
-        </if>
-        <else-if type="webpage">
-          <date variable="issued" delimiter=" ">
-            <date-part name="month"/>
-            <date-part name="day"/>
-          </date>
-        </else-if>
-      </choose>
-      <choose>
-        <if type="legal_case" match="none">
-          <text variable="URL"/>
-        </if>
-      </choose>
-    </group>
-  </macro>
-  <macro name="title">
-    <choose>
-      <if variable="title" match="none">
-        <choose>
-          <if type="personal_communication" match="none">
-            <text variable="genre" text-case="capitalize-first"/>
-          </if>
-        </choose>
-      </if>
-      <else-if type="bill book graphic legal_case legislation motion_picture song" match="any">
-        <text variable="title" text-case="title" font-style="italic"/>
-      </else-if>
-      <else>
-        <text variable="title" text-case="title" quotes="true"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="edition">
-    <choose>
-      <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-        <choose>
-          <if is-numeric="edition">
-            <group delimiter=" " prefix=". ">
-              <number variable="edition" form="ordinal"/>
-              <text term="edition" form="short" strip-periods="true"/>
-            </group>
-          </if>
-          <else>
-            <text variable="edition" prefix=". "/>
-          </else>
-        </choose>
-      </if>
-      <else-if type="chapter  paper-conference" match="any">
-        <choose>
-          <if is-numeric="edition">
-            <group delimiter=" " prefix=", ">
-              <number variable="edition" form="ordinal"/>
-              <text term="edition" form="short"/>
-            </group>
-          </if>
-          <else>
-            <text variable="edition" prefix=", "/>
-          </else>
-        </choose>
-      </else-if>
-    </choose>
-  </macro>
-  <macro name="locators">
-    <choose>
-      <if type="article-journal">
-        <text variable="volume" prefix=" "/>
-        <text variable="issue" prefix=" (" suffix=")"/>
-      </if>
-      <else-if type="legal_case">
-        <text variable="volume" prefix=", "/>
-        <text variable="container-title" prefix=" "/>
-        <text variable="page" prefix=" "/>
-      </else-if>
-      <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-        <group prefix=". " delimiter=". ">
-          <group>
-            <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
-            <number variable="volume" form="numeric"/>
-          </group>
-          <group>
-            <number variable="number-of-volumes" form="numeric"/>
-            <text term="volume" form="short" prefix=" " plural="true"/>
-          </group>
-        </group>
-      </else-if>
-      <else-if type="chapter paper-conference" match="any">
-        <choose>
-          <if variable="page" match="none">
-            <group prefix=". ">
-              <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
-              <number variable="volume" form="numeric"/>
-            </group>
-          </if>
-        </choose>
-      </else-if>
-    </choose>
-  </macro>
-  <macro name="locators-chapter">
-    <choose>
-      <if type="chapter paper-conference" match="any">
-        <choose>
-          <if variable="page">
-            <group prefix=", ">
-              <text variable="volume" suffix=":"/>
-              <text variable="page"/>
-            </group>
-          </if>
-        </choose>
-      </if>
-    </choose>
-  </macro>
-  <macro name="locators-article">
-    <choose>
-      <if type="article-newspaper">
-        <group prefix=", " delimiter=", ">
-          <group>
-            <text variable="edition" suffix=" "/>
-            <text term="edition" prefix=" "/>
-          </group>
-          <group>
-            <text term="section" form="short" suffix=" "/>
-            <text variable="section"/>
-          </group>
-        </group>
-      </if>
-      <else-if type="article-journal">
-        <text variable="page" prefix=": "/>
-      </else-if>
-    </choose>
-  </macro>
-  <macro name="point-locators">
-    <choose>
-      <if variable="locator">
-        <choose>
-          <if locator="page" match="none">
-            <choose>
-              <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-                <choose>
-                  <if variable="volume">
-                    <group>
-                      <text term="volume" form="short" suffix=" "/>
-                      <number variable="volume" form="numeric"/>
-                      <label variable="locator" form="short" prefix=", " suffix=" "/>
-                    </group>
-                  </if>
-                  <else>
-                    <label variable="locator" form="short" suffix=" "/>
-                  </else>
-                </choose>
-              </if>
-              <else>
-                <label variable="locator" form="short" suffix=" "/>
-              </else>
-            </choose>
-          </if>
-          <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-            <number variable="volume" form="numeric" suffix=":"/>
-          </else-if>
-        </choose>
-        <text variable="locator"/>
-      </if>
-    </choose>
-  </macro>
-  <macro name="container-prefix">
-    <text term="in" text-case="capitalize-first"/>
-  </macro>
-  <macro name="container-title">
-    <choose>
-      <if type="chapter paper-conference" match="any">
-        <text macro="container-prefix" suffix=" "/>
-      </if>
-    </choose>
-    <choose>
-      <if type="legal_case" match="none">
-        <text variable="container-title" text-case="title" font-style="italic"/>
-      </if>
-    </choose>
-  </macro>
-  <macro name="publisher">
-    <group delimiter=": ">
-      <text variable="publisher-place"/>
-      <text variable="publisher"/>
-    </group>
-  </macro>
-  <macro name="date">
-    <choose>
-      <if variable="issued">
-        <date variable="issued">
-          <date-part name="year"/>
-        </date>
-      </if>
-      <else-if variable="accessed">
-        <date variable="accessed">
-          <date-part name="year"/>
-        </date>
-      </else-if>
-    </choose>
-  </macro>
-  <macro name="day-month">
-    <date variable="issued">
-      <date-part name="month"/>
-      <date-part name="day" prefix=" "/>
-    </date>
-  </macro>
-  <macro name="collection-title">
-    <text variable="collection-title" text-case="title"/>
-    <text variable="collection-number" prefix=" "/>
-  </macro>
-  <macro name="event">
-    <group>
-      <text term="presented at" suffix=" "/>
-      <text variable="event"/>
-    </group>
-  </macro>
-  <macro name="description">
-    <choose>
-      <if type="interview">
-        <group delimiter=". ">
-          <text macro="interviewer"/>
-          <text variable="medium" text-case="capitalize-first"/>
-        </group>
-      </if>
-      <else>
-        <text variable="medium" text-case="capitalize-first" prefix=". "/>
-      </else>
-    </choose>
-    <choose>
-      <if variable="title" match="none"/>
-      <else-if type="thesis"/>
-      <else>
-        <group delimiter=" " prefix=". ">
-          <text variable="genre" text-case="capitalize-first"/>
-          <choose>
-            <if type="report">
-              <text variable="number"/>
-            </if>
-          </choose>
-        </group>
-      </else>
-    </choose>
-    <!--This is for computer programs only. Localization new to 1.0.1, so may be missing in many locales-->
-    <group delimiter=" " prefix=" (" suffix=")">
-      <text term="version"/>
-      <text variable="version"/>
-    </group>
-  </macro>
-  <macro name="issue">
-    <choose>
-      <if type="article-journal">
-        <text macro="day-month" prefix=" (" suffix=")"/>
-      </if>
-      <else-if type="legal_case">
-        <text variable="authority" prefix=". "/>
-      </else-if>
-      <else-if type="speech">
-        <group prefix=" " delimiter=", ">
-          <text macro="event"/>
-          <text macro="day-month"/>
-          <text variable="event-place"/>
-        </group>
-      </else-if>
-      <else-if type="article-newspaper article-magazine" match="any">
-        <text macro="day-month" prefix=", "/>
-      </else-if>
-      <else>
-        <group prefix=". " delimiter=", ">
-          <choose>
-            <if type="thesis">
-              <text variable="genre" text-case="capitalize-first"/>
-            </if>
-          </choose>
-          <text macro="publisher"/>
-        </group>
-      </else>
-    </choose>
-  </macro>
-  <citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" givenname-disambiguation-rule="primary-name">
-    <layout prefix="(" suffix=")" delimiter="; ">
-      <group delimiter=", ">
-        <group delimiter=" ">
-          <text macro="contributors-short"/>
-          <text macro="date"/>
-        </group>
-        <text macro="point-locators"/>
-      </group>
-    </layout>
-  </citation>
-  <bibliography hanging-indent="true" et-al-min="11" et-al-use-first="7" subsequent-author-substitute="&#8212;&#8212;&#8212;" entry-spacing="0">
-    <sort>
-      <key macro="contributors"/>
-      <key variable="issued"/>
-    </sort>
-    <layout suffix=".">
-      <group delimiter=". ">
-        <text macro="contributors"/>
-        <text macro="date"/>
-        <text macro="title"/>
-      </group>
-      <text macro="description"/>
-      <text macro="secondary-contributors" prefix=". "/>
-      <text macro="container-title" prefix=". "/>
-      <text macro="container-contributors"/>
-      <text macro="edition"/>
-      <text macro="locators-chapter"/>
-      <text macro="locators"/>
-      <text macro="collection-title" prefix=". "/>
-      <text macro="issue"/>
-      <text macro="locators-article"/>
-      <text macro="access" prefix=". "/>
-    </layout>
-  </bibliography>
-</style>
diff --git a/tests/ieee.csl b/tests/ieee.csl
deleted file mode 100644
index cd7ba4943..000000000
--- a/tests/ieee.csl
+++ /dev/null
@@ -1,302 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only">
-  <info>
-    <title>IEEE</title>
-    <id>http://www.zotero.org/styles/ieee</id>
-    <link href="http://www.zotero.org/styles/ieee" rel="self"/>
-    <author>
-      <name>Michael Berkowitz</name>
-      <email>mberkowi@gmu.edu</email>
-    </author>
-    <contributor>
-      <name>Julian Onions</name>
-      <email>julian.onions@gmail.com</email>
-    </contributor>
-    <contributor>
-      <name>Rintze Zelle</name>
-      <uri>http://twitter.com/rintzezelle</uri>
-    </contributor>
-    <contributor>
-      <name>Stephen Frank</name>
-      <uri>http://www.zotero.org/sfrank</uri>
-    </contributor>
-    <contributor>
-      <name>Sebastian Karcher</name>
-    </contributor>
-    <category field="engineering"/>
-    <category field="generic-base"/>
-    <category citation-format="numeric"/>
-    <updated>2011-09-15T07:01:02+00:00</updated>
-    <rights>
-      This work is licensed under a Creative Commons Attribution-Share Alike 3.0 License:
-      http://creativecommons.org/licenses/by-sa/3.0/
-    </rights>
-    <link href="http://www.ieee.org/portal/cms_docs_iportals/iportals/publications/authors/transjnl/stylemanual.pdf" rel="documentation"/>
-    <link href="http://www.ieee.org/documents/auinfo07.pdf" rel="documentation"/>
-  </info>
-  <!-- Macros -->
-  <macro name="edition">
-    <choose>
-      <if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
-	<choose>
-	  <if is-numeric="edition">
-	    <group delimiter=" ">
-	      <number variable="edition" form="ordinal"/>
-	      <text term="edition" form="short" suffix="." strip-periods="true"/>
-	    </group>
-	  </if>
-	  <else>
-	    <text variable="edition" text-case="capitalize-first" suffix="."/>
-	  </else>
-	</choose>
-      </if>
-    </choose>
-  </macro>
-  <macro name="issued">
-    <choose>
-      <if type="article-journal report" match="any">
-	<date variable="issued">
-	  <date-part name="month" form="short" suffix=" "/>
-	  <date-part name="year" form="long"/>
-	</date>
-      </if>
-      <else-if type="bill book graphic legal_case motion_picture  song thesis chapter paper-conference" match="any">
-	<date variable="issued">
-	  <date-part name="year" form="long"/>
-	</date>
-      </else-if>
-      <else>
-	<date variable="issued">
-	  <date-part name="day" form="numeric-leading-zeros" suffix="-"/>
-	  <date-part name="month" form="short" suffix="-" strip-periods="true"/>
-	  <date-part name="year" form="long"/>
-	</date>
-      </else>
-    </choose>
-  </macro>
-  <macro name="author">
-    <names variable="author">
-      <name initialize-with=". " delimiter=", " and="text"/>
-      <label form="short" prefix=", " text-case="capitalize-first" suffix="." strip-periods="true"/>
-      <substitute>
-	<names variable="editor"/>
-	<names variable="translator"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="editor">
-    <names variable="editor">
-      <name initialize-with=". " delimiter=", " and="text"/>
-      <label form="short" prefix=", " text-case="capitalize-first" suffix="." strip-periods="true"/>
-    </names>
-  </macro>
-  <macro name="locators">
-    <group delimiter=", ">
-      <text macro="edition"/>
-      <group delimiter=" ">
-	<text term="volume" form="short" suffix="." strip-periods="true"/>
-	<number variable="volume" form="numeric"/>
-      </group>
-      <group delimiter=" ">
-	<number variable="number-of-volumes" form="numeric"/>
-	<text term="volume" form="short" suffix="." plural="true" strip-periods="true"/>
-      </group>
-      <group delimiter=" ">
-	<text term="issue" form="short" suffix="." strip-periods="true"/>
-	<number variable="issue" form="numeric"/>
-      </group>
-    </group>
-  </macro>
-  <macro name="title">
-    <choose>
-      <if type="bill book graphic legal_case motion_picture song" match="any">
-	<text variable="title" font-style="italic"/>
-      </if>
-      <else>
-	<text variable="title" quotes="true"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="publisher">
-    <choose>
-      <if type="bill book graphic legal_case motion_picture  song chapter paper-conference" match="any">
-	<text variable="publisher-place" suffix=": "/>
-	<text variable="publisher"/>
-      </if>
-      <else>
-	<group delimiter=", ">
-	  <text variable="publisher"/>
-	  <text variable="publisher-place"/>
-	</group>
-      </else>
-    </choose>
-  </macro>
-  <macro name="event">
-    <choose>
-      <if type="paper-conference">
-	<choose>
-	  <!-- Published Conference Paper -->
-	  <if variable="container-title">
-	    <group delimiter=", ">
-	      <text variable="container-title" prefix="in " font-style="italic"/>
-	      <text variable="event-place"/>
-	    </group>
-	  </if>
-	  <!-- Unpublished Conference Paper -->
-	  <else>
-	    <group delimiter=", ">
-	      <text variable="event" prefix="presented at the "/>
-	      <text variable="event-place"/>
-	    </group>
-	  </else>
-	</choose>
-      </if>
-    </choose>
-  </macro>
-  <macro name="access">
-    <choose>
-      <if type="webpage">
-	<choose>
-	  <if variable="URL">
-	    <group delimiter=". ">
-	      <text value="[Online]"/>
-	      <text variable="URL" prefix="Available: "/>
-	      <group prefix="[" suffix="]">
-		<date variable="accessed" prefix="Accessed: ">
-		  <date-part name="day" form="numeric-leading-zeros" suffix="-"/>
-		  <date-part name="month" form="short" suffix="-" strip-periods="true"/>
-		  <date-part name="year" form="long"/>
-		</date>
-	      </group>
-	    </group>
-	  </if>
-	</choose>
-      </if>
-    </choose>
-  </macro>
-  <macro name="page">
-    <group>
-      <label variable="page" form="short" suffix=". " strip-periods="true"/>
-      <text variable="page"/>
-    </group>
-  </macro>
-  <!-- Citation -->
-  <citation  collapse="citation-number">
-    <sort>
-      <key variable="citation-number"/>
-    </sort>
-    <layout prefix="[" suffix="]" delimiter="], [">
-      <text variable="citation-number"/>
-    </layout>
-  </citation>
-  <!-- Bibliography -->
-  <bibliography entry-spacing="0" second-field-align="flush">
-    <layout suffix=".">
-      <!-- Citation Number -->
-      <text variable="citation-number" prefix="[" suffix="]"/>
-      <!-- Author(s) -->
-      <text macro="author" prefix=" " suffix=", "/>
-      <!-- Rest of Citation -->
-      <choose>
-	<!-- Specific Formats -->
-	<if type="article-journal">
-	  <group delimiter=", ">
-	    <text macro="title"/>
-	    <text variable="container-title" font-style="italic" form="short"/>
-	    <text macro="locators"/>
-	    <text macro="page"/>
-	    <text macro="issued"/>
-	  </group>
-	</if>
-	<else-if type="paper-conference">
-	  <group delimiter=", ">
-	    <text macro="title"/>
-	    <text macro="event"/>
-	    <text macro="issued"/>
-	    <text macro="locators"/>
-	    <text macro="page"/>
-	  </group>
-	</else-if>
-	<else-if type="report">
-	  <group delimiter=", "> 
-	    <text macro="title"/>
-	    <text macro="publisher"/>
-	    <group delimiter=" ">
-	      <text variable="genre"/>
-	      <text variable="number"/>
-	    </group>
-	    <text macro="issued"/>
-	  </group>
-	</else-if>
-	<else-if type="thesis">
-	  <group delimiter=", ">
-	    <text macro="title"/>
-	    <text variable="genre"/>
-	    <text macro="publisher"/>
-	    <text macro="issued"/>
-	  </group>
-	</else-if>
-	<else-if type="webpage">
-	  <group delimiter=", " suffix=". ">
-	    <text macro="title"/>
-	    <text variable="container-title" font-style="italic"/>
-	    <text macro="issued"/>
-	  </group>
-	  <text macro="access"/>
-	</else-if>
-	<else-if type="patent">
-	  <text macro="title" suffix=", "/>
-	  <text variable="number" prefix="U.S. Patent "/>
-	  <text macro="issued"/>
-	</else-if>
-	<!-- Generic/Fallback Formats -->
-	<else-if type="bill book graphic legal_case motion_picture report song" match="any">
-	  <group delimiter=", " suffix=". ">
-	    <text macro="title"/>
-	    <text macro="locators"/>
-	  </group>
-	  <group delimiter=", ">
-	    <text macro="publisher"/>
-	    <text macro="issued"/>
-	    <text macro="page"/>
-	  </group>
-	</else-if>
-	<else-if type="article-magazine article-newspaper broadcast interview manuscript map patent personal_communication song speech thesis webpage" match="any">
-	  <group delimiter=", ">
-	    <text macro="title"/>
-	    <text variable="container-title" font-style="italic"/>
-	    <text macro="locators"/>
-	    <text macro="publisher"/>
-	    <text macro="page"/>
-	    <text macro="issued"/>
-	  </group>
-	</else-if>
-	<else-if type="chapter paper-conference" match="any">
-	  <group delimiter=", " suffix=", ">
-	    <text macro="title"/>
-	    <text variable="container-title" prefix="in " font-style="italic"/>
-	    <text macro="locators"/>
-	  </group>
-	  <text macro="editor" suffix=" "/>
-	  <group delimiter=", ">
-	    <text macro="publisher"/>
-	    <text macro="issued"/>
-	    <text macro="page"/>
-	  </group>
-	</else-if>
-	<else>
-	  <group delimiter=", " suffix=". ">
-	    <text macro="title"/>
-	    <text variable="container-title" font-style="italic"/>
-	    <text macro="locators"/>
-	  </group>
-	  <group delimiter=", ">
-	    <text macro="publisher"/>
-	    <text macro="page"/>
-	    <text macro="issued"/>
-	  </group>
-	</else>
-      </choose>
-    </layout>
-  </bibliography>
-</style>
\ No newline at end of file
diff --git a/tests/markdown-citations.chicago-author-date.txt b/tests/markdown-citations.chicago-author-date.txt
deleted file mode 100644
index 81d7482cb..000000000
--- a/tests/markdown-citations.chicago-author-date.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-Pandoc with citeproc-hs
-=======================
-
--   ([CSL BIBLIOGRAPHIC DATA ERROR: reference "nonexistent" not found.])
-
--    ([CSL BIBLIOGRAPHIC DATA ERROR: reference "nonexistent" not found.])
-
--   Doe (2005) says blah.
-
--   Doe (2005, 30) says blah.
-
--   Doe (2005, 30, with suffix) says blah.
-
--   Doe (2005; 2006, 30; see also Doe and Roe 2007) says blah.
-
--   In a note.[^1]
-
--   A citation group (see Doe 2005, chap. 3; also Doe and Roe 2007, 34–35).
-
--   Another one (see Doe 2005, 34–35).
-
--   And another one in a note.[^2]
-
--   Citation with a suffix and locator (Doe 2005, 33, 35–37, and nowhere else).
-
--   Citation with suffix only (Doe 2005 and nowhere else).
-
--   Now some modifiers.[^3]
-
--   With some markup (*see* Doe 2005, 32).
-
-<div class="references">
-
-References
-==========
-
-“Nonexistent Not Found!”
-
-Doe, John. 2005. *First Book*. Cambridge: Cambridge University Press.
-
-———. 2006. “Article.” *Journal of Generic Studies* 6: 33–34.
-
-Doe, John, and Jenny Roe. 2007. “Why Water Is Wet.” In *Third Book*, edited by Sam Smith. Oxford: Oxford University Press.
-
-</div>
-
-[^1]: Doe and Roe (2007, 12) and a citation without locators (Doe and Roe 2007).
-
-[^2]: Some citations (see Doe 2005, chap. 3; Doe and Roe 2007; Doe 2006).
-
-[^3]: Like a citation without author: (2005), and now Doe with a locator (2006, 44).
diff --git a/tests/markdown-citations.ieee.txt b/tests/markdown-citations.ieee.txt
deleted file mode 100644
index 4085a7c63..000000000
--- a/tests/markdown-citations.ieee.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-Pandoc with citeproc-hs
-=======================
-
--   []
-
--   
-
--   Reference 2 says blah.
-
--   Reference 2 says blah.
-
--   Reference 2 says blah.
-
--   Reference 2 [4] says blah.
-
--   In a note.[^1]
-
--   A citation group [2], [4].
-
--   Another one [2].
-
--   And another one in a note.[^2]
-
--   Citation with a suffix and locator [2].
-
--   Citation with suffix only [2].
-
--   Now some modifiers.[^3]
-
--   With some markup [2].
-
-<div class="references">
-
-References
-==========
-
-[1]“nonexistent not found!” .
-
-[2] J. Doe, *First Book*. Cambridge: Cambridge University Press, 2005.
-
-[3] J. Doe, “Article,” *Journal of Generic Studies*, vol. 6, pp. 33–34, 2006.
-
-[4] J. Doe and J. Roe, “Why Water Is Wet,” in *Third Book*, S. Smith, Ed. Oxford: Oxford University Press, 2007.
-
-</div>
-
-[^1]: Reference 4 and a citation without locators [4].
-
-[^2]: Some citations [2–4].
-
-[^3]: Like a citation without author: [2], and now Doe with a locator [3].
diff --git a/tests/markdown-citations.mhra.txt b/tests/markdown-citations.mhra.txt
deleted file mode 100644
index 01d9c45ca..000000000
--- a/tests/markdown-citations.mhra.txt
+++ /dev/null
@@ -1,73 +0,0 @@
-Pandoc with citeproc-hs
-=======================
-
--   [^1]
-
--   [^2]
-
--   John Doe[^3] says blah.
-
--   Doe[^4] says blah.
-
--   Doe[^5] says blah.
-
--   Doe[^6] says blah.
-
--   In a note.[^7]
-
--   A citation group.[^8]
-
--   Another one.[^9]
-
--   And another one in a note.[^10]
-
--   Citation with a suffix and locator.[^11]
-
--   Citation with suffix only.[^12]
-
--   Now some modifiers.[^13]
-
--   With some markup.[^14]
-
-<div class="references">
-
-References
-==========
-
-Doe, John, ‘Article’, *Journal of Generic Studies*, 6 (2006), 33–34.
-
----, *First Book* (Cambridge: Cambridge University Press, 2005).
-
-Doe, John, and Jenny Roe, ‘Why Water Is Wet’, in *Third Book*, ed. by Sam Smith (Oxford: Oxford University Press, 2007).
-
-‘Nonexistent Not Found!’.
-
-</div>
-
-[^1]: [CSL BIBLIOGRAPHIC DATA ERROR: reference "nonexistent" not found.].
-
-[^2]: [CSL STYLE ERROR: reference with no printed form.].
-
-[^3]: *First Book* (Cambridge: Cambridge University Press, 2005).
-
-[^4]: *First Book*, p. 30.
-
-[^5]: *First Book*, p. 30, with suffix.
-
-[^6]: *First Book*; ‘Article’, *Journal of Generic Studies*, 6 (2006), 33–34 (p. 30); see also John Doe and Jenny Roe, ‘Why Water Is Wet’, in *Third Book*, ed. by Sam Smith (Oxford: Oxford University Press, 2007).
-
-[^7]: Doe and Roe, p. 12 and a citation without locators Doe and Roe.
-
-[^8]: See Doe, *First Book*, chap. 3; also Doe and Roe, pp. 34–35.
-
-[^9]: See Doe, *First Book*, pp. 34–35.
-
-[^10]: Some citations see Doe, *First Book*, chap. 3; Doe and Roe; Doe, ‘Article’, 33–34.
-
-[^11]: Doe, *First Book*, pp. 33, 35–37, and nowhere else.
-
-[^12]: Doe, *First Book* and nowhere else.
-
-[^13]: Like a citation without author: *First Book*, and now Doe with a locator ‘Article’, 33–34 (p. 44).
-
-[^14]: *See* Doe, *First Book*, p. 32.
diff --git a/tests/markdown-citations.native b/tests/markdown-citations.native
new file mode 100644
index 000000000..1cd4bd035
--- /dev/null
+++ b/tests/markdown-citations.native
@@ -0,0 +1,17 @@
+[Header 1 ("pandoc-with-citeproc-hs",[],[]) [Str "Pandoc",Space,Str "with",Space,Str "citeproc-hs"]
+,BulletList
+ [[Para [Cite [Citation {citationId = "nonexistent", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0}] [Str "???"]]]
+ ,[Para [Cite [Citation {citationId = "nonexistent", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 0}] [Str "???"]]]
+ ,[Para [Cite [Citation {citationId = "item1", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 0}] [Str "???"],Space,Str "says",Space,Str "blah."]]
+ ,[Para [Cite [Citation {citationId = "item1", citationPrefix = [], citationSuffix = [Str "p.",Space,Str "30"], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 0}] [Str "???"],Space,Str "says",Space,Str "blah."]]
+ ,[Para [Cite [Citation {citationId = "item1", citationPrefix = [], citationSuffix = [Str "p.",Space,Str "30,",Space,Str "with",Space,Str "suffix"], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 0}] [Str "???"],Space,Str "says",Space,Str "blah."]]
+ ,[Para [Cite [Citation {citationId = "item1", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 0},Citation {citationId = "item2", citationPrefix = [], citationSuffix = [Space,Str "p.",Space,Str "30"], citationMode = SuppressAuthor, citationNoteNum = 0, citationHash = 0},Citation {citationId = "\1087\1091\1085\1082\1090\&3", citationPrefix = [Str "see",Space,Str "also"], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0}] [Str "???"],Space,Str "says",Space,Str "blah."]]
+ ,[Para [Str "In",Space,Str "a",Space,Str "note.",Note [Para [Cite [Citation {citationId = "\1087\1091\1085\1082\1090\&3", citationPrefix = [], citationSuffix = [Str "p.",Space,Str "12"], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 0}] [Str "???"],Space,Str "and",Space,Str "a",Space,Str "citation",Space,Str "without",Space,Str "locators",Space,Cite [Citation {citationId = "\1087\1091\1085\1082\1090\&3", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0}] [Str "???"],Str "."]]]]
+ ,[Para [Str "A",Space,Str "citation",Space,Str "group",Space,Cite [Citation {citationId = "item1", citationPrefix = [Str "see"], citationSuffix = [Space,Str "chap.",Space,Str "3"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0},Citation {citationId = "\1087\1091\1085\1082\1090\&3", citationPrefix = [Str "also"], citationSuffix = [Space,Str "p.",Space,Str "34-35"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0}] [Str "???"],Str "."]]
+ ,[Para [Str "Another",Space,Str "one",Space,Cite [Citation {citationId = "item1", citationPrefix = [Str "see"], citationSuffix = [Space,Str "p.",Space,Str "34-35"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0}] [Str "???"],Str "."]]
+ ,[Para [Str "And",Space,Str "another",Space,Str "one",Space,Str "in",Space,Str "a",Space,Str "note.",Note [Para [Str "Some",Space,Str "citations",Space,Cite [Citation {citationId = "item1", citationPrefix = [Str "see"], citationSuffix = [Space,Str "chap.",Space,Str "3"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0},Citation {citationId = "\1087\1091\1085\1082\1090\&3", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0},Citation {citationId = "item2", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0}] [Str "???"],Str "."]]]]
+ ,[Para [Str "Citation",Space,Str "with",Space,Str "a",Space,Str "suffix",Space,Str "and",Space,Str "locator",Space,Cite [Citation {citationId = "item1", citationPrefix = [], citationSuffix = [Space,Str "pp.",Space,Str "33,",Space,Str "35-37,",Space,Str "and",Space,Str "nowhere",Space,Str "else"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0}] [Str "???"],Str "."]]
+ ,[Para [Str "Citation",Space,Str "with",Space,Str "suffix",Space,Str "only",Space,Cite [Citation {citationId = "item1", citationPrefix = [], citationSuffix = [Space,Str "and",Space,Str "nowhere",Space,Str "else"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0}] [Str "???"],Str "."]]
+ ,[Para [Str "Now",Space,Str "some",Space,Str "modifiers.",Note [Para [Str "Like",Space,Str "a",Space,Str "citation",Space,Str "without",Space,Str "author:",Space,Cite [Citation {citationId = "item1", citationPrefix = [], citationSuffix = [], citationMode = SuppressAuthor, citationNoteNum = 0, citationHash = 0}] [Str "???"],Str ",",Space,Str "and",Space,Str "now",Space,Str "Doe",Space,Str "with",Space,Str "a",Space,Str "locator",Space,Cite [Citation {citationId = "item2", citationPrefix = [], citationSuffix = [Space,Str "p.",Space,Str "44"], citationMode = SuppressAuthor, citationNoteNum = 0, citationHash = 0}] [Str "???"],Str "."]]]]
+ ,[Para [Str "With",Space,Str "some",Space,Str "markup",Space,Cite [Citation {citationId = "item1", citationPrefix = [Emph [Str "see"]], citationSuffix = [Space,Str "p.",Space,Strong [Str "32"]], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0}] [Str "???"],Str "."]]]
+,Header 1 ("references",[],[]) [Str "References"]]
diff --git a/tests/mhra.csl b/tests/mhra.csl
deleted file mode 100644
index fe34c8f84..000000000
--- a/tests/mhra.csl
+++ /dev/null
@@ -1,399 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" demote-non-dropping-particle="sort-only">
-  <info>
-    <title>Modern Humanities Research Association (Note with Bibliography)</title>
-    <id>http://www.zotero.org/styles/mhra</id>
-    <link href="http://www.zotero.org/styles/mhra" rel="self"/>
-    <link href="http://www.mhra.org.uk/Publications/Books/StyleGuide/download.shtml" rel="documentation"/>
-    <author>
-      <name>Rintze Zelle</name>
-      <uri>http://twitter.com/rintzezelle</uri>
-    </author>
-    <contributor>
-      <name>Sebastian Karcher</name>
-    </contributor>
-    <summary>MHRA format with full notes and bibliography</summary>
-    <category field="generic-base"/>
-    <category citation-format="note"/>
-    <updated>2011-08-18T16:08:33+00:00</updated>
-    <rights>This work is licensed under a Creative Commons Attribution-Share Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
-  </info>
-  <locale xml:lang="en">
-    <terms>
-      <term name="et-al">and others</term>
-      <term name="editor" form="verb-short">ed. by</term>
-      <term name="edition" form="short">edn</term>
-      <term name="translator" form="verb-short">trans. by</term>
-    </terms>
-  </locale>
-  <macro name="author">
-    <names variable="author">
-      <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=", " suffix="."/>
-      <substitute>
-	<names variable="editor"/>
-	<names variable="translator"/>
-	<text macro="title-note"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="contributors-note">
-    <names variable="author">
-      <name and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="never"/>
-    </names>
-    <text macro="recipient-note"/>
-  </macro>
-  <macro name="title-note">
-    <choose>
-      <if type="bill book graphic legal_case motion_picture report song" match="any">
-	<text variable="title" font-style="italic" text-case="title"/>
-      </if>
-      <else>
-	<text variable="title" prefix="‘" suffix="’" text-case="title"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="title-short">
-    <choose>
-      <if disambiguate="true">
-	<choose>
-	  <if type="bill book graphic legal_case motion_picture report song" match="any">
-	    <text variable="title" font-style="italic" text-case="title" form="short"/>
-	  </if>
-	  <else>
-	    <text variable="title" prefix="‘" suffix="’" text-case="title" form="short"/>
-	  </else>
-	</choose>
-      </if>
-    </choose>
-  </macro>
-  <macro name="editor-translator">
-    <group delimiter=", ">
-      <names variable="editor" delimiter=", ">
-	<label form="verb-short" text-case="lowercase" suffix=" "/>
-	<name and="text" delimiter=", " delimiter-precedes-last="never"/>
-      </names>
-      <choose>
-	<if variable="author editor" match="any">
-	  <names variable="translator" delimiter=", ">
-	    <label form="verb-short" text-case="lowercase" suffix=" "/>
-	    <name and="text" delimiter=", " delimiter-precedes-last="never"/>
-	  </names>
-	</if>
-      </choose>
-    </group>
-  </macro>
-  <macro name="collection-title">
-    <text variable="collection-title" text-case="title"/>
-    <text variable="collection-number" prefix=", "/>
-  </macro>
-  <macro name="locators-note">
-    <choose>
-      <if type="article-journal">
-	<text variable="volume"/>
-      </if>
-      <else-if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
-	<group delimiter=", ">
-	  <text macro="edition-note"/>
-	  <group>
-	    <number variable="number-of-volumes" form="numeric"/>
-	    <text term="volume" form="short" prefix=" " plural="true"/>
-	  </group>
-	</group>
-      </else-if>
-    </choose>
-  </macro>
-  <macro name="volume">
-    <choose>
-      <if type="article-journal">
-	<text variable="volume"/>
-      </if>
-      <else-if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
-	<group delimiter=", ">
-	  <text macro="edition-note"/>
-	  <group>
-	    <number variable="number-of-volumes" form="numeric"/>
-	    <text term="volume" form="short" prefix=" " plural="true"/>
-	  </group>
-	</group>
-      </else-if>
-    </choose>
-  </macro>
-  <macro name="issue-note">
-    <choose>
-      <if type="article-journal">
-	<choose>
-	  <if variable="volume">
-	    <text macro="issued" prefix=" (" suffix=")"/>
-	  </if>
-	  <else>
-	    <text macro="issued" prefix=", "/>
-	  </else>
-	</choose>
-      </if>
-      <else-if variable="publisher-place publisher" match="any">
-	<group prefix=" (" suffix=")" delimiter=", ">
-	  <group delimiter=" ">
-	    <choose>
-	      <if variable="title" match="none"/>
-	      <else-if type="thesis speech" match="any">
-		<text variable="genre" prefix="unpublished "/>
-	      </else-if>
-	    </choose>
-	    <text macro="event"/>
-	  </group>
-	  <text macro="publisher"/>
-	  <text macro="issued"/>
-	</group>
-      </else-if>
-      <else>
-	<text macro="issued" prefix=", "/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="locators-specific-note">
-    <choose>
-      <if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
-	<choose>
-	  <if is-numeric="volume">
-	    <number variable="volume" form="roman" font-variant="small-caps"/>
-	  </if>
-	</choose>
-      </if>
-    </choose>
-  </macro>
-  <macro name="container-title-note">
-    <choose>
-      <if type="chapter paper-conference" match="any">
-	<text term="in" text-case="lowercase" suffix=" "/>
-      </if>
-    </choose>
-    <text variable="container-title" font-style="italic" text-case="title"/>
-  </macro>
-  <macro name="edition-note">
-    <choose>
-      <if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
-	<choose>
-	  <if is-numeric="edition">
-	    <group delimiter=" ">
-	      <number variable="edition" form="ordinal"/>
-	      <text term="edition" form="short"/>
-	    </group>
-	  </if>
-	  <else>
-	    <text variable="edition"/>
-	  </else>
-	</choose>
-      </if>
-    </choose>
-  </macro>
-  <macro name="editor-note">
-    <names variable="editor">
-      <name and="text" sort-separator=", " delimiter=", "/>
-      <label form="short" prefix=", " suffix="."/>
-    </names>
-  </macro>
-  <macro name="translator-note">
-    <names variable="translator">
-      <name and="text" sort-separator=", " delimiter=", "/>
-      <label form="verb-short" prefix=", " suffix="."/>
-    </names>
-  </macro>
-  <macro name="recipient-note">
-    <names variable="recipient" delimiter=", ">
-      <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
-      <name and="text" delimiter=", "/>
-    </names>
-  </macro>
-  <macro name="recipient-short">
-    <names variable="recipient">
-      <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
-      <name form="short" and="text" delimiter=", "/>
-    </names>
-  </macro>
-  <macro name="contributors-short">
-    <names variable="author">
-      <name form="short" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="never"/>
-      <substitute>
-	<names variable="editor"/>
-	<names variable="translator"/>
-      </substitute>
-    </names>
-    <text macro="recipient-short"/>
-  </macro>
-  <macro name="interviewer-note">
-    <names variable="interviewer" delimiter=", ">
-      <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
-      <name and="text" delimiter=", "/>
-    </names>
-  </macro>
-  <macro name="locators-newspaper">
-    <choose>
-      <if type="article-newspaper">
-	<group delimiter=", ">
-	  <group>
-	    <text variable="edition" suffix=" "/>
-	    <text term="edition" prefix=" "/>
-	  </group>
-	  <group>
-	    <text term="section" suffix=" "/>
-	    <text variable="section"/>
-	  </group>
-	</group>
-      </if>
-    </choose>
-  </macro>
-  <macro name="event">
-    <group>
-      <text term="presented at" suffix=" "/>
-      <text variable="event"/>
-    </group>
-  </macro>
-  <macro name="publisher">
-    <group delimiter=": ">
-      <text variable="publisher-place"/>
-      <text variable="publisher"/>
-    </group>
-  </macro>
-  <macro name="issued">
-    <choose>
-      <if type="graphic report article-newspaper" match="any">
-	<date variable="issued">
-	  <date-part name="day" suffix=" "/>
-	  <date-part name="month" suffix=" "/>
-	  <date-part name="year"/>
-	</date>
-      </if>
-      <else-if type="bill book graphic legal_case motion_picture report song thesis chapter paper-conference" match="any">
-	<date variable="issued">
-	  <date-part name="year"/>
-	</date>
-      </else-if>
-      <else>
-	<date variable="issued">
-	  <date-part name="year"/>
-	</date>
-      </else>
-    </choose>
-  </macro>
-  <macro name="pages">
-    <choose>
-      <if type="article-journal">
-	<text variable="page" prefix=", "/>
-      </if>
-      <else>
-	<choose>
-	  <if variable="volume">
-	    <text variable="page" prefix=", "/>
-	  </if>
-	  <else>
-	    <label variable="page" form="short" prefix=", " suffix=" "/>
-	    <text variable="page"/>
-	  </else>
-	</choose>
-      </else>
-    </choose>
-  </macro>
-  <macro name="point-locators">
-    <text macro="pages"/>
-    <choose>
-      <if variable="page">
-	<group prefix=" (" suffix=")">
-	  <label variable="locator" form="short" suffix=" "/>
-	  <text variable="locator"/>
-	</group>
-      </if>
-      <else>
-	<label variable="locator" form="short" prefix=", " suffix=" "/>
-	<text variable="locator"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="archive-note">
-    <group delimiter=", ">
-      <text variable="archive_location"/>
-      <text variable="archive"/>
-      <text variable="archive-place"/>
-    </group>
-  </macro>
-  <macro name="access-note">
-    <group delimiter=", ">
-      <choose>
-	<if type="graphic report" match="any">
-	  <text macro="archive-note" prefix=", "/>
-	</if>
-	<else-if type="bill book graphic legal_case motion_picture report song article-journal article-magazine article-newspaper thesis chapter paper-conference" match="none">
-	  <text macro="archive-note" prefix=", "/>
-	</else-if>
-      </choose>
-    </group>
-    <choose>
-      <if variable="DOI">
-	<text variable="DOI" prefix=" &lt;doi:" suffix="&gt;"/>
-      </if>
-      <else>
-	<choose>
-	  <if variable="URL">
-	    <text variable="URL" prefix=" &lt;" suffix="&gt;"/>
-	    <group prefix=" [" suffix="]">
-	      <text term="accessed" text-case="lowercase"/>
-	      <date variable="accessed">
-		<date-part name="day" prefix=" "/>
-		<date-part name="month" prefix=" "/>
-		<date-part name="year" prefix=" "/>
-	      </date>
-	    </group>
-	  </if>
-	</choose>
-      </else>
-    </choose>
-  </macro>
-  <citation et-al-min="4" et-al-use-first="1" et-al-subsequent-min="4" et-al-subsequent-use-first="1" disambiguate-add-names="true" disambiguate-add-givenname="true">
-    <layout prefix="" suffix="." delimiter="; ">
-      <choose>
-	<if position="subsequent">
-	  <text macro="contributors-short"/>
-	  <text macro="title-short" prefix=", "/>
-	  <text macro="locators-specific-note" prefix=", "/>
-	  <text macro="point-locators"/>
-	</if>
-	<else>
-	  <group delimiter=", ">
-	    <text macro="contributors-note"/>
-	    <text macro="title-note"/>
-	    <text macro="container-title-note"/>
-	    <text macro="editor-translator"/>
-	    <text macro="collection-title"/>
-	    <text macro="locators-note"/>
-	  </group>
-	  <text macro="issue-note"/>
-	  <text macro="locators-specific-note" prefix=", "/>
-	  <text macro="locators-newspaper" prefix=", "/>
-	  <text macro="point-locators"/>
-	  <text macro="access-note"/>
-	</else>
-      </choose>
-    </layout>
-  </citation>
-  <bibliography hanging-indent="true" et-al-min="6" et-al-use-first="6" subsequent-author-substitute="---">
-    <sort>
-      <key macro="author"/>
-      <key variable="title"/>
-    </sort>
-    <layout suffix=".">
-      <group delimiter=", ">
-	<text macro="author"/>
-	<text macro="title-note"/>
-	<text macro="container-title-note"/>
-	<text macro="editor-translator"/>
-	<text macro="collection-title"/>
-	<text macro="volume"/>
-      </group>
-      <text macro="issue-note"/>
-      <text macro="locators-specific-note" prefix=", "/>
-      <text macro="locators-newspaper" prefix=", "/>
-      <text macro="pages"/>
-      <text macro="access-note"/>
-    </layout>
-  </bibliography>
-</style>
\ No newline at end of file