From 43fc4a5029876563ae32d35e7cffd27fe0effe59 Mon Sep 17 00:00:00 2001
From: Martin Fenner <martin@front-matter.io>
Date: Wed, 4 Aug 2021 19:46:49 +0200
Subject: [PATCH 1/6] first implementation of citeproc-ruby

---
 cff.gemspec                                   |    1 +
 lib/array.rb                                  |   42 +
 lib/cff.rb                                    |    4 +
 lib/cff/formatter/csl_formatter.rb            |   89 +
 lib/cff/model.rb                              |   24 +
 lib/locales/locales-en-US.xml                 |  357 +++
 lib/styles/apa.csl                            | 1916 +++++++++++++++++
 lib/styles/harvard-cite-them-right.csl        |  308 +++
 lib/styles/ieee.csl                           |  457 ++++
 test/cff_apa_formatter_test.rb                |    2 +-
 test/cff_csl_formatter_test.rb                |   46 +
 .../TUe-excellent-buildings_BSO-toolbox.apa   |    2 +-
 ...Ue-excellent-buildings_BSO-toolbox.harvard |    1 +
 .../TUe-excellent-buildings_BSO-toolbox.ieee  |    1 +
 ...ent-buildings_BSO-toolbox_invalid_date.apa |    3 +-
 ...buildings_BSO-toolbox_invalid_date.harvard |    1 +
 ...nt-buildings_BSO-toolbox_invalid_date.ieee |    1 +
 test/converted/bjmorgan_bsym.apa              |    2 +-
 test/converted/bjmorgan_bsym.harvard          |    1 +
 test/converted/bjmorgan_bsym.ieee             |    1 +
 ...ation-file-format_citation-file-format.apa |    2 +-
 ...n-file-format_citation-file-format.harvard |    1 +
 ...tion-file-format_citation-file-format.ieee |    1 +
 test/converted/complete.harvard               |    0
 test/converted/complete.ieee                  |    0
 test/converted/esalmela_HaploWinder.apa       |    2 +-
 test/converted/esalmela_HaploWinder.harvard   |    1 +
 test/converted/esalmela_HaploWinder.ieee      |    1 +
 test/converted/example-1.apa                  |    2 +-
 test/converted/example-1.harvard              |    1 +
 test/converted/example-1.ieee                 |    1 +
 test/converted/ls1mardyn_ls1-mardyn.harvard   |    0
 test/converted/ls1mardyn_ls1-mardyn.ieee      |    0
 ...yn_ls1-mardyn_invalid_author_array.harvard |    0
 ...ardyn_ls1-mardyn_invalid_author_array.ieee |    0
 test/converted/minimal.apa                    |    2 +-
 test/converted/minimal.harvard                |    1 +
 test/converted/minimal.ieee                   |    1 +
 test/converted/short.apa                      |    2 +-
 test/converted/short.harvard                  |    1 +
 test/converted/short.ieee                     |    1 +
 .../xenon-middleware_xenon-adaptors-cloud.apa |    2 +-
 ...on-middleware_xenon-adaptors-cloud.harvard |    1 +
 ...xenon-middleware_xenon-adaptors-cloud.ieee |    1 +
 44 files changed, 3273 insertions(+), 10 deletions(-)
 create mode 100644 lib/array.rb
 create mode 100644 lib/cff/formatter/csl_formatter.rb
 create mode 100644 lib/locales/locales-en-US.xml
 create mode 100644 lib/styles/apa.csl
 create mode 100644 lib/styles/harvard-cite-them-right.csl
 create mode 100644 lib/styles/ieee.csl
 create mode 100644 test/cff_csl_formatter_test.rb
 create mode 100644 test/converted/TUe-excellent-buildings_BSO-toolbox.harvard
 create mode 100644 test/converted/TUe-excellent-buildings_BSO-toolbox.ieee
 create mode 100644 test/converted/TUe-excellent-buildings_BSO-toolbox_invalid_date.harvard
 create mode 100644 test/converted/TUe-excellent-buildings_BSO-toolbox_invalid_date.ieee
 create mode 100644 test/converted/bjmorgan_bsym.harvard
 create mode 100644 test/converted/bjmorgan_bsym.ieee
 create mode 100644 test/converted/citation-file-format_citation-file-format.harvard
 create mode 100644 test/converted/citation-file-format_citation-file-format.ieee
 create mode 100644 test/converted/complete.harvard
 create mode 100644 test/converted/complete.ieee
 create mode 100644 test/converted/esalmela_HaploWinder.harvard
 create mode 100644 test/converted/esalmela_HaploWinder.ieee
 create mode 100644 test/converted/example-1.harvard
 create mode 100644 test/converted/example-1.ieee
 create mode 100644 test/converted/ls1mardyn_ls1-mardyn.harvard
 create mode 100644 test/converted/ls1mardyn_ls1-mardyn.ieee
 create mode 100644 test/converted/ls1mardyn_ls1-mardyn_invalid_author_array.harvard
 create mode 100644 test/converted/ls1mardyn_ls1-mardyn_invalid_author_array.ieee
 create mode 100644 test/converted/minimal.harvard
 create mode 100644 test/converted/minimal.ieee
 create mode 100644 test/converted/short.harvard
 create mode 100644 test/converted/short.ieee
 create mode 100644 test/converted/xenon-middleware_xenon-adaptors-cloud.harvard
 create mode 100644 test/converted/xenon-middleware_xenon-adaptors-cloud.ieee

diff --git a/cff.gemspec b/cff.gemspec
index a90e84e..e461341 100644
--- a/cff.gemspec
+++ b/cff.gemspec
@@ -48,6 +48,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.6'
 
+  spec.add_runtime_dependency 'citeproc-ruby', '~> 1.1', '>= 1.1.10'
   spec.add_runtime_dependency 'json_schema', '~> 0.21.0'
   spec.add_runtime_dependency 'language_list', '~> 1.2'
 
diff --git a/lib/array.rb b/lib/array.rb
new file mode 100644
index 0000000..9b3323b
--- /dev/null
+++ b/lib/array.rb
@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2018-2021 The Ruby Citation File Format Developers.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+##
+class Array
+
+  # Implementing the ActiveRecord method Array.wrap
+  # Wraps its argument in an array unless it is already an array (or array-like).
+  #
+  # Specifically:
+  #
+  # * If the argument is +nil+ an empty array is returned.
+  # * Otherwise, if the argument responds to +to_ary+ it is invoked, and its result returned.
+  # * Otherwise, returns an array with the argument as its single element.
+  #
+  #     Array.wrap(nil)       # => []
+  #     Array.wrap([1, 2, 3]) # => [1, 2, 3]
+  #     Array.wrap(0)         # => [0]
+
+  def self.wrap(object)
+    if object.nil?
+      []
+    elsif object.respond_to?(:to_ary)
+      object.to_ary || [object]
+    else
+      [object]
+    end
+  end
+end
diff --git a/lib/cff.rb b/lib/cff.rb
index 0d83d61..98ee20d 100644
--- a/lib/cff.rb
+++ b/lib/cff.rb
@@ -32,6 +32,7 @@ module CFF
   SCHEMA = JsonSchema.parse!(SCHEMA_FILE)                    # :nodoc:
 end
 
+require 'array'
 require 'cff/version'
 require 'cff/errors'
 require 'cff/util'
@@ -47,3 +48,6 @@ module CFF
 require 'cff/formatter/formatter'
 require 'cff/formatter/apa_formatter'
 require 'cff/formatter/bibtex_formatter'
+require 'cff/formatter/csl_formatter'
+require 'citeproc'
+require 'csl'
diff --git a/lib/cff/formatter/csl_formatter.rb b/lib/cff/formatter/csl_formatter.rb
new file mode 100644
index 0000000..82a0754
--- /dev/null
+++ b/lib/cff/formatter/csl_formatter.rb
@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2018-2021 The Ruby Citation File Format Developers.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+##
+module CFF
+  # initial set of preferred citation styles, based on the list used by
+  # Crossref and DataCite Search:
+
+  # apa
+  # chicago-fullnote-bibliography
+  # harvard-cite-them-right
+  # ieee
+  # university-of-york-mla
+  # vancouver
+
+  # Generates a formatted citation using citation style language (CSL)
+  # and the Ruby Citeproc processor
+  class CslFormatter < Formatter # :nodoc:
+
+    def self.format(model:, style: 'apa', locale: 'en-US')
+      return nil unless required_fields?(model)
+
+      CSL::Style.root = ::File.expand_path('../../../lib/styles', __dir__)
+      CSL::Locale.root = ::File.expand_path('../../../lib/locales', __dir__)
+
+      id = present?(model.doi) ? "https://doi.org/#{model.doi}" : nil
+
+      # citeproc_hsh is input format for citeproc-ruby
+      citeproc_hsh = {
+        # using type book is workaround for current CSL version
+        'type' => 'book',
+        'id' => present?(model.doi) ? "https://doi.org/#{model.doi}" : nil,
+        'categories' => Array.wrap(model.keywords),
+        'language' => 'eng', # Array.wrap(model.languages).first,
+        'author' => to_citeproc(model.authors),
+        'issued' => get_date_parts(model.date_released.to_s),
+        'abstract' => model.abstract,
+        #   'container-title' => container_title,
+        'DOI' => model.doi,
+        #   'publisher' => publisher,
+        'title' => model.title,
+        'URL' => present?(model.repository_code) ? model.repository_code : model.url,
+        # 'copyright' => model.copyright,
+        'version' => model.version
+      }.compact.symbolize_keys
+
+      cp = CiteProc::Processor.new style: style, locale: locale, format: 'html'
+      cp.import Array.wrap(citeproc_hsh)
+      bibliography = cp.render :bibliography, id: id
+      bibliography.first
+    end
+
+    # change authors into a format citeproc understands
+    def self.to_citeproc(element)
+      Array.wrap(element).map do |a|
+        {
+          'family' => a.fields['family-names'],
+          'given' => a.fields['given-names'],
+          'literal' => present?(a.fields['family-names']) ? a.fields['name'] : nil
+        }.compact
+      end
+    end
+
+    # citeproc uses dates formatted as date parts
+    def self.get_date_parts(iso8601_time)
+      return { 'date-parts' => [[]] } unless present?(iso8601_time)
+
+      year = iso8601_time[0..3].to_i
+      month = iso8601_time[5..6].to_i
+      day = iso8601_time[8..9].to_i
+      { 'date-parts' => [[year, month, day].reject(&:zero?)] }
+    rescue TypeError
+      nil
+    end
+  end
+end
diff --git a/lib/cff/model.rb b/lib/cff/model.rb
index b80a516..240e9c7 100644
--- a/lib/cff/model.rb
+++ b/lib/cff/model.rb
@@ -106,6 +106,30 @@ def to_apalike
       CFF::ApaFormatter.format(model: self)
     end
 
+    # :call-seq:
+    #   to_apa -> String
+    #
+    # Output this Model in APA format, using CSL.
+    def to_apa
+      CFF::CslFormatter.format(model: self, style: 'apa')
+    end
+
+    # :call-seq:
+    #   to_harvard -> String
+    #
+    # Output this Model in Harvard format, using CSL.
+    def to_harvard
+      CFF::CslFormatter.format(model: self, style: 'harvard-cite-them-right')
+    end
+
+    # :call-seq:
+    #   to_ieee -> String
+    #
+    # Output this Model in APA format, using CSL.
+    def to_ieee
+      CFF::CslFormatter.format(model: self, style: 'ieee')
+    end
+
     # :call-seq:
     #   to_bibtex -> String
     #
diff --git a/lib/locales/locales-en-US.xml b/lib/locales/locales-en-US.xml
new file mode 100644
index 0000000..be78c5e
--- /dev/null
+++ b/lib/locales/locales-en-US.xml
@@ -0,0 +1,357 @@
+<?xml version="1.0" encoding="utf-8"?>
+<locale xmlns="http://purl.org/net/xbiblio/csl" version="1.0" xml:lang="en-US">
+  <info>
+    <translator>
+      <name>Andrew Dunning</name>
+    </translator>
+    <translator>
+      <name>Sebastian Karcher</name>
+    </translator>
+    <translator>
+      <name>Rintze M. Zelle</name>
+    </translator>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+    <updated>2015-10-10T23:31:02+00:00</updated>
+  </info>
+  <style-options punctuation-in-quote="true"/>
+  <date form="text">
+    <date-part name="month" suffix=" "/>
+    <date-part name="day" suffix=", "/>
+    <date-part name="year"/>
+  </date>
+  <date form="numeric">
+    <date-part name="month" form="numeric-leading-zeros" suffix="/"/>
+    <date-part name="day" form="numeric-leading-zeros" suffix="/"/>
+    <date-part name="year"/>
+  </date>
+  <terms>
+    <term name="accessed">accessed</term>
+    <term name="and">and</term>
+    <term name="and others">and others</term>
+    <term name="anonymous">anonymous</term>
+    <term name="anonymous" form="short">anon.</term>
+    <term name="at">at</term>
+    <term name="available at">available at</term>
+    <term name="by">by</term>
+    <term name="circa">circa</term>
+    <term name="circa" form="short">c.</term>
+    <term name="cited">cited</term>
+    <term name="edition">
+      <single>edition</single>
+      <multiple>editions</multiple>
+    </term>
+    <term name="edition" form="short">ed.</term>
+    <term name="et-al">et al.</term>
+    <term name="forthcoming">forthcoming</term>
+    <term name="from">from</term>
+    <term name="ibid">ibid.</term>
+    <term name="in">in</term>
+    <term name="in press">in press</term>
+    <term name="internet">internet</term>
+    <term name="interview">interview</term>
+    <term name="letter">letter</term>
+    <term name="no date">no date</term>
+    <term name="no date" form="short">n.d.</term>
+    <term name="online">online</term>
+    <term name="presented at">presented at the</term>
+    <term name="reference">
+      <single>reference</single>
+      <multiple>references</multiple>
+    </term>
+    <term name="reference" form="short">
+      <single>ref.</single>
+      <multiple>refs.</multiple>
+    </term>
+    <term name="retrieved">retrieved</term>
+    <term name="scale">scale</term>
+    <term name="version">version</term>
+
+    <!-- ANNO DOMINI; BEFORE CHRIST -->
+    <term name="ad">AD</term>
+    <term name="bc">BC</term>
+
+    <!-- PUNCTUATION -->
+    <term name="open-quote">“</term>
+    <term name="close-quote">”</term>
+    <term name="open-inner-quote">‘</term>
+    <term name="close-inner-quote">’</term>
+    <term name="page-range-delimiter">–</term>
+
+    <!-- ORDINALS -->
+    <term name="ordinal">th</term>
+    <term name="ordinal-01">st</term>
+    <term name="ordinal-02">nd</term>
+    <term name="ordinal-03">rd</term>
+    <term name="ordinal-11">th</term>
+    <term name="ordinal-12">th</term>
+    <term name="ordinal-13">th</term>
+
+    <!-- LONG ORDINALS -->
+    <term name="long-ordinal-01">first</term>
+    <term name="long-ordinal-02">second</term>
+    <term name="long-ordinal-03">third</term>
+    <term name="long-ordinal-04">fourth</term>
+    <term name="long-ordinal-05">fifth</term>
+    <term name="long-ordinal-06">sixth</term>
+    <term name="long-ordinal-07">seventh</term>
+    <term name="long-ordinal-08">eighth</term>
+    <term name="long-ordinal-09">ninth</term>
+    <term name="long-ordinal-10">tenth</term>
+
+    <!-- LONG LOCATOR FORMS -->
+    <term name="book">
+      <single>book</single>
+      <multiple>books</multiple>
+    </term>
+    <term name="chapter">
+      <single>chapter</single>
+      <multiple>chapters</multiple>
+    </term>
+    <term name="column">
+      <single>column</single>
+      <multiple>columns</multiple>
+    </term>
+    <term name="figure">
+      <single>figure</single>
+      <multiple>figures</multiple>
+    </term>
+    <term name="folio">
+      <single>folio</single>
+      <multiple>folios</multiple>
+    </term>
+    <term name="issue">
+      <single>number</single>
+      <multiple>numbers</multiple>
+    </term>
+    <term name="line">
+      <single>line</single>
+      <multiple>lines</multiple>
+    </term>
+    <term name="note">
+      <single>note</single>
+      <multiple>notes</multiple>
+    </term>
+    <term name="opus">
+      <single>opus</single>
+      <multiple>opera</multiple>
+    </term>
+    <term name="page">
+      <single>page</single>
+      <multiple>pages</multiple>
+    </term>
+    <term name="number-of-pages">
+      <single>page</single>
+      <multiple>pages</multiple>
+    </term>
+    <term name="paragraph">
+      <single>paragraph</single>
+      <multiple>paragraphs</multiple>
+    </term>
+    <term name="part">
+      <single>part</single>
+      <multiple>parts</multiple>
+    </term>
+    <term name="section">
+      <single>section</single>
+      <multiple>sections</multiple>
+    </term>
+    <term name="sub verbo">
+      <single>sub verbo</single>
+      <multiple>sub verbis</multiple>
+    </term>
+    <term name="verse">
+      <single>verse</single>
+      <multiple>verses</multiple>
+    </term>
+    <term name="volume">
+      <single>volume</single>
+      <multiple>volumes</multiple>
+    </term>
+
+    <!-- SHORT LOCATOR FORMS -->
+    <term name="book" form="short">
+      <single>bk.</single>
+      <multiple>bks.</multiple>
+    </term>
+    <term name="chapter" form="short">
+      <single>chap.</single>
+      <multiple>chaps.</multiple>
+    </term>
+    <term name="column" form="short">
+      <single>col.</single>
+      <multiple>cols.</multiple>
+    </term>
+    <term name="figure" form="short">
+      <single>fig.</single>
+      <multiple>figs.</multiple>
+    </term>
+    <term name="folio" form="short">
+      <single>fol.</single>
+      <multiple>fols.</multiple>
+    </term>
+    <term name="issue" form="short">
+      <single>no.</single>
+      <multiple>nos.</multiple>
+    </term>
+    <term name="line" form="short">
+      <single>l.</single>
+      <multiple>ll.</multiple>
+    </term>
+    <term name="note" form="short">
+      <single>n.</single>
+      <multiple>nn.</multiple>
+    </term>
+    <term name="opus" form="short">
+      <single>op.</single>
+      <multiple>opp.</multiple>
+    </term>
+    <term name="page" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
+    </term>
+    <term name="number-of-pages" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
+    </term>
+    <term name="paragraph" form="short">
+      <single>para.</single>
+      <multiple>paras.</multiple>
+    </term>
+    <term name="part" form="short">
+      <single>pt.</single>
+      <multiple>pts.</multiple>
+    </term>
+    <term name="section" form="short">
+      <single>sec.</single>
+      <multiple>secs.</multiple>
+    </term>
+    <term name="sub verbo" form="short">
+      <single>s.v.</single>
+      <multiple>s.vv.</multiple>
+    </term>
+    <term name="verse" form="short">
+      <single>v.</single>
+      <multiple>vv.</multiple>
+    </term>
+    <term name="volume" form="short">
+      <single>vol.</single>
+      <multiple>vols.</multiple>
+    </term>
+
+    <!-- SYMBOL LOCATOR FORMS -->
+    <term name="paragraph" form="symbol">
+      <single>¶</single>
+      <multiple>¶¶</multiple>
+    </term>
+    <term name="section" form="symbol">
+      <single>§</single>
+      <multiple>§§</multiple>
+    </term>
+
+    <!-- LONG ROLE FORMS -->
+    <term name="director">
+      <single>director</single>
+      <multiple>directors</multiple>
+    </term>
+    <term name="editor">
+      <single>editor</single>
+      <multiple>editors</multiple>
+    </term>
+    <term name="editorial-director">
+      <single>editor</single>
+      <multiple>editors</multiple>
+    </term>
+    <term name="illustrator">
+      <single>illustrator</single>
+      <multiple>illustrators</multiple>
+    </term>
+    <term name="translator">
+      <single>translator</single>
+      <multiple>translators</multiple>
+    </term>
+    <term name="editortranslator">
+      <single>editor &amp; translator</single>
+      <multiple>editors &amp; translators</multiple>
+    </term>
+
+    <!-- SHORT ROLE FORMS -->
+    <term name="director" form="short">
+      <single>dir.</single>
+      <multiple>dirs.</multiple>
+    </term>
+    <term name="editor" form="short">
+      <single>ed.</single>
+      <multiple>eds.</multiple>
+    </term>
+    <term name="editorial-director" form="short">
+      <single>ed.</single>
+      <multiple>eds.</multiple>
+    </term>
+    <term name="illustrator" form="short">
+      <single>ill.</single>
+      <multiple>ills.</multiple>
+    </term>
+    <term name="translator" form="short">
+      <single>tran.</single>
+      <multiple>trans.</multiple>
+    </term>
+    <term name="editortranslator" form="short">
+      <single>ed. &amp; tran.</single>
+      <multiple>eds. &amp; trans.</multiple>
+    </term>
+
+    <!-- VERB ROLE FORMS -->
+    <term name="container-author" form="verb">by</term>
+    <term name="director" form="verb">directed by</term>
+    <term name="editor" form="verb">edited by</term>
+    <term name="editorial-director" form="verb">edited by</term>
+    <term name="illustrator" form="verb">illustrated by</term>
+    <term name="interviewer" form="verb">interview by</term>
+    <term name="recipient" form="verb">to</term>
+    <term name="reviewed-author" form="verb">by</term>
+    <term name="translator" form="verb">translated by</term>
+    <term name="editortranslator" form="verb">edited &amp; translated by</term>
+
+    <!-- SHORT VERB ROLE FORMS -->
+    <term name="director" form="verb-short">dir. by</term>
+    <term name="editor" form="verb-short">ed. by</term>
+    <term name="editorial-director" form="verb-short">ed. by</term>
+    <term name="illustrator" form="verb-short">illus. by</term>
+    <term name="translator" form="verb-short">trans. by</term>
+    <term name="editortranslator" form="verb-short">ed. &amp; trans. by</term>
+
+    <!-- LONG MONTH FORMS -->
+    <term name="month-01">January</term>
+    <term name="month-02">February</term>
+    <term name="month-03">March</term>
+    <term name="month-04">April</term>
+    <term name="month-05">May</term>
+    <term name="month-06">June</term>
+    <term name="month-07">July</term>
+    <term name="month-08">August</term>
+    <term name="month-09">September</term>
+    <term name="month-10">October</term>
+    <term name="month-11">November</term>
+    <term name="month-12">December</term>
+
+    <!-- SHORT MONTH FORMS -->
+    <term name="month-01" form="short">Jan.</term>
+    <term name="month-02" form="short">Feb.</term>
+    <term name="month-03" form="short">Mar.</term>
+    <term name="month-04" form="short">Apr.</term>
+    <term name="month-05" form="short">May</term>
+    <term name="month-06" form="short">Jun.</term>
+    <term name="month-07" form="short">Jul.</term>
+    <term name="month-08" form="short">Aug.</term>
+    <term name="month-09" form="short">Sep.</term>
+    <term name="month-10" form="short">Oct.</term>
+    <term name="month-11" form="short">Nov.</term>
+    <term name="month-12" form="short">Dec.</term>
+
+    <!-- SEASONS -->
+    <term name="season-01">Spring</term>
+    <term name="season-02">Summer</term>
+    <term name="season-03">Autumn</term>
+    <term name="season-04">Winter</term>
+  </terms>
+</locale>
diff --git a/lib/styles/apa.csl b/lib/styles/apa.csl
new file mode 100644
index 0000000..915d4e0
--- /dev/null
+++ b/lib/styles/apa.csl
@@ -0,0 +1,1916 @@
+<?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" page-range-format="expanded">
+  <info>
+    <title>American Psychological Association 7th edition</title>
+    <title-short>APA</title-short>
+    <id>http://www.zotero.org/styles/apa</id>
+    <link href="http://www.zotero.org/styles/apa" rel="self"/>
+    <link href="http://www.zotero.org/styles/apa-6th-edition" rel="template"/>
+    <link href="https://apastyle.apa.org/style-grammar-guidelines/references/examples" rel="documentation"/>
+    <author>
+      <name>Brenton M. Wiernik</name>
+      <email>zotero@wiernik.org</email>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="psychology"/>
+    <category field="generic-base"/>
+    <updated>2021-06-10T13:09:49+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 xml:lang="en">
+    <terms>
+      <term name="editortranslator" form="short">
+        <single>ed. &amp; trans.</single>
+        <multiple>eds. &amp; trans.</multiple>
+      </term>
+      <term name="translator" form="short">trans.</term>
+      <term name="interviewer" form="short">
+        <single>interviewer</single>
+        <multiple>interviewers</multiple>
+      </term>
+      <term name="collection-editor" form="short">
+        <single>ed.</single>
+        <multiple>eds.</multiple>
+      </term>
+      <term name="circa" form="short">ca.</term>
+      <term name="bc"> B.C.E.</term>
+      <term name="ad"> C.E.</term>
+      <term name="letter">personal communication</term>
+      <term name="letter" form="short">letter</term>
+      <term name="issue" form="long">
+        <single>issue</single>
+        <multiple>issues</multiple>
+      </term>
+    </terms>
+  </locale>
+  <locale xml:lang="af">
+    <terms>
+      <term name="letter">persoonlike kommunikasie</term>
+      <term name="letter" form="short">brief</term>
+    </terms>
+  </locale>
+  <locale xml:lang="ar">
+    <terms>
+      <term name="letter">اتصال شخصي</term>
+      <term name="letter" form="short">خطاب</term>
+    </terms>
+  </locale>
+  <locale xml:lang="bg">
+    <terms>
+      <term name="letter">лична комуникация</term>
+      <term name="letter" form="short">писмо</term>
+    </terms>
+  </locale>
+  <locale xml:lang="ca">
+    <terms>
+      <term name="letter">comunicació personal</term>
+      <term name="letter" form="short">carta</term>
+    </terms>
+  </locale>
+  <locale xml:lang="cs">
+    <terms>
+      <term name="letter">osobní komunikace</term>
+      <term name="letter" form="short">dopis</term>
+    </terms>
+  </locale>
+  <locale xml:lang="cy">
+    <terms>
+      <term name="letter">cyfathrebu personol</term>
+      <term name="letter" form="short">llythyr</term>
+    </terms>
+  </locale>
+  <locale xml:lang="da">
+    <terms>
+      <term name="et-al">et al.</term>
+      <term name="letter">personlig kommunikation</term>
+      <term name="letter" form="short">brev</term>
+    </terms>
+  </locale>
+  <locale xml:lang="de">
+    <terms>
+      <term name="et-al">et al.</term>
+      <term name="letter">persönliche Kommunikation</term>
+      <term name="letter" form="short">Brief</term>
+    </terms>
+  </locale>
+  <locale xml:lang="el">
+    <terms>
+      <term name="letter">προσωπική επικοινωνία</term>
+      <term name="letter" form="short">επιστολή</term>
+    </terms>
+  </locale>
+  <locale xml:lang="es">
+    <terms>
+      <term name="from">de</term>
+      <term name="letter">comunicación personal</term>
+      <term name="letter" form="short">carta</term>
+    </terms>
+  </locale>
+  <locale xml:lang="et">
+    <terms>
+      <term name="letter">isiklik suhtlus</term>
+      <term name="letter" form="short">kiri</term>
+    </terms>
+  </locale>
+  <locale xml:lang="eu">
+    <terms>
+      <term name="letter">komunikazio pertsonala</term>
+      <term name="letter" form="short">gutuna</term>
+    </terms>
+  </locale>
+  <locale xml:lang="fa">
+    <terms>
+      <term name="letter">ارتباط شخصی</term>
+      <term name="letter" form="short">نامه</term>
+    </terms>
+  </locale>
+  <locale xml:lang="fi">
+    <terms>
+      <term name="letter">henkilökohtainen viestintä</term>
+      <term name="letter" form="short">kirje</term>
+    </terms>
+  </locale>
+  <locale xml:lang="fr">
+    <terms>
+      <term name="letter">communication personnelle</term>
+      <term name="letter" form="short">lettre</term>
+      <term name="editor" form="short">
+        <single>éd.</single>
+        <multiple>éds.</multiple>
+      </term>
+    </terms>
+  </locale>
+  <locale xml:lang="he">
+    <terms>
+      <term name="letter">תקשורת אישית</term>
+      <term name="letter" form="short">מכתב</term>
+    </terms>
+  </locale>
+  <locale xml:lang="hr">
+    <terms>
+      <term name="letter">osobna komunikacija</term>
+      <term name="letter" form="short">pismo</term>
+    </terms>
+  </locale>
+  <locale xml:lang="hu">
+    <terms>
+      <term name="letter">személyes kommunikáció</term>
+      <term name="letter" form="short">levél</term>
+    </terms>
+  </locale>
+  <locale xml:lang="id">
+    <terms>
+      <term name="letter">komunikasi pribadi</term>
+      <term name="letter" form="short">surat</term>
+    </terms>
+  </locale>
+  <locale xml:lang="is">
+    <terms>
+      <term name="letter">persónuleg samskipti</term>
+      <term name="letter" form="short">bréf</term>
+    </terms>
+  </locale>
+  <locale xml:lang="it">
+    <terms>
+      <term name="letter">comunicazione personale</term>
+      <term name="letter" form="short">lettera</term>
+    </terms>
+  </locale>
+  <locale xml:lang="ja">
+    <terms>
+      <term name="letter">個人的なやり取り</term>
+      <term name="letter" form="short">手紙</term>
+    </terms>
+  </locale>
+  <locale xml:lang="ko">
+    <terms>
+      <term name="letter">개인 서신</term>
+      <term name="letter" form="short">편지</term>
+    </terms>
+  </locale>
+  <locale xml:lang="la">
+    <terms>
+      <term name="letter"/>
+      <term name="letter" form="short">epistula</term>
+    </terms>
+  </locale>
+  <locale xml:lang="lt">
+    <terms>
+      <term name="letter">communicationis personalis</term>
+      <term name="letter" form="short"/>
+    </terms>
+  </locale>
+  <locale xml:lang="lv">
+    <terms>
+      <term name="letter">personīga komunikācija</term>
+      <term name="letter" form="short">vēstule</term>
+    </terms>
+  </locale>
+  <locale xml:lang="mn">
+    <terms>
+      <term name="letter">хувийн харилцаа холбоо</term>
+      <term name="letter" form="short">захиа</term>
+    </terms>
+  </locale>
+  <locale xml:lang="nb">
+    <terms>
+      <term name="et-al">et al.</term>
+      <term name="letter">personlig kommunikasjon</term>
+      <term name="letter" form="short">brev</term>
+    </terms>
+  </locale>
+  <locale xml:lang="nl">
+    <terms>
+      <term name="et-al">et al.</term>
+      <term name="letter">persoonlijke communicatie</term>
+      <term name="letter" form="short">brief</term>
+    </terms>
+  </locale>
+  <locale xml:lang="nn">
+    <terms>
+      <term name="et-al">et al.</term>
+      <term name="letter">personlig kommunikasjon</term>
+      <term name="letter" form="short">brev</term>
+    </terms>
+  </locale>
+  <locale xml:lang="pl">
+    <terms>
+      <term name="letter">osobista komunikacja</term>
+      <term name="letter" form="short">list</term>
+    </terms>
+  </locale>
+  <locale xml:lang="pt">
+    <terms>
+      <term name="letter">comunicação pessoal</term>
+      <term name="letter" form="short">carta</term>
+    </terms>
+  </locale>
+  <locale xml:lang="ro">
+    <terms>
+      <term name="letter">comunicare personală</term>
+      <term name="letter" form="short">scrisoare</term>
+    </terms>
+  </locale>
+  <locale xml:lang="ru">
+    <terms>
+      <term name="letter">личная переписка</term>
+      <term name="letter" form="short">письмо</term>
+    </terms>
+  </locale>
+  <locale xml:lang="sk">
+    <terms>
+      <term name="letter">osobná komunikácia</term>
+      <term name="letter" form="short">list</term>
+    </terms>
+  </locale>
+  <locale xml:lang="sl">
+    <terms>
+      <term name="letter">osebna komunikacija</term>
+      <term name="letter" form="short">pismo</term>
+    </terms>
+  </locale>
+  <locale xml:lang="sr">
+    <terms>
+      <term name="letter">лична комуникација</term>
+      <term name="letter" form="short">писмо</term>
+    </terms>
+  </locale>
+  <locale xml:lang="sv">
+    <terms>
+      <term name="letter">personlig kommunikation</term>
+      <term name="letter" form="short">brev</term>
+    </terms>
+  </locale>
+  <locale xml:lang="th">
+    <terms>
+      <term name="letter">การสื่อสารส่วนบุคคล</term>
+      <term name="letter" form="short">จดหมาย</term>
+    </terms>
+  </locale>
+  <locale xml:lang="tr">
+    <terms>
+      <term name="letter">kişisel iletişim</term>
+      <term name="letter" form="short">mektup</term>
+    </terms>
+  </locale>
+  <locale xml:lang="uk">
+    <terms>
+      <term name="letter">особисте спілкування</term>
+      <term name="letter" form="short">лист</term>
+    </terms>
+  </locale>
+  <locale xml:lang="vi">
+    <terms>
+      <term name="letter">giao tiếp cá nhân</term>
+      <term name="letter" form="short">thư</term>
+    </terms>
+  </locale>
+  <locale xml:lang="zh-CN">
+    <terms>
+      <term name="letter">的私人交流</term>
+      <term name="letter" form="short">信函</term>
+    </terms>
+  </locale>
+  <locale xml:lang="zh-TW">
+    <terms>
+      <term name="letter">私人通訊</term>
+      <term name="letter" form="short">信函</term>
+    </terms>
+  </locale>
+  <!-- General categories of item types:
+       Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
+       Periodical or Booklike: paper-conference
+       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure 
+                 graphic interview manuscript map motion_picture musical_score pamphlet patent 
+                 personal_communication report song speech thesis post webpage
+       Legal: bill legal_case legislation treaty
+  -->
+  <!-- APA references contain four parts: author, date, title, source -->
+  <macro name="author-bib">
+    <names variable="composer" delimiter=", ">
+      <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+      <substitute>
+        <names variable="author"/>
+        <names variable="illustrator"/>
+        <names variable="director">
+          <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          <label form="long" prefix=" (" suffix=")" text-case="title"/>
+        </names>
+        <choose>
+          <if variable="container-title">
+            <choose>
+              <if type="book entry entry-dictionary entry-encyclopedia" match="any">
+                <choose>
+                  <if variable="title">
+                    <group delimiter=" ">
+                      <text macro="title"/>
+                      <text macro="parenthetical"/>
+                    </group>
+                  </if>
+                  <else>
+                    <text macro="title-and-descriptions"/>
+                  </else>
+                </choose>
+              </if>
+            </choose>
+          </if>
+        </choose>
+        <!-- Test for editortranslator and put that first as that becomes available -->
+        <names variable="editor" delimiter=", ">
+          <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          <label form="short" prefix=" (" suffix=")" text-case="title"/>
+        </names>
+        <names variable="editorial-director">
+          <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          <label form="short" prefix=" (" suffix=")" text-case="title"/>
+        </names>
+        <names variable="collection-editor">
+          <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          <label form="short" prefix=" (" suffix=")" text-case="title"/>
+        </names>
+        <choose>
+          <if variable="title">
+            <group delimiter=" ">
+              <text macro="title"/>
+              <text macro="parenthetical"/>
+            </group>
+          </if>
+          <else>
+            <text macro="title-and-descriptions"/>
+          </else>
+        </choose>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-intext">
+    <choose>
+      <if type="bill legal_case legislation treaty" match="any">
+        <text macro="title-intext"/>
+      </if>
+      <else-if type="interview personal_communication" match="any">
+        <choose>
+          <!-- These variables indicate that the letter is retrievable by the reader. 
+                If not, then use the APA in-text-only personal communication format -->
+          <if variable="archive container-title DOI publisher URL" match="none">
+            <group delimiter=", ">
+              <names variable="author">
+                <name and="symbol" delimiter=", " initialize-with=". "/>
+                <substitute>
+                  <text macro="title-intext"/>
+                </substitute>
+              </names>
+              <!-- Replace with term="personal-communication" if that becomes available -->
+              <text term="letter"/>
+            </group>
+          </if>
+          <else>
+            <names variable="author" delimiter=", ">
+              <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
+              <substitute>
+                <text macro="title-intext"/>
+              </substitute>
+            </names>
+          </else>
+        </choose>
+      </else-if>
+      <else>
+        <names variable="composer" delimiter=", ">
+          <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
+          <substitute>
+            <names variable="author"/>
+            <names variable="illustrator"/>
+            <names variable="director"/>
+            <choose>
+              <if variable="container-title">
+                <choose>
+                  <if type="book entry entry-dictionary entry-encyclopedia" match="any">
+                    <text macro="title-intext"/>
+                  </if>
+                </choose>
+              </if>
+            </choose>
+            <names variable="editor"/>
+            <names variable="editorial-director"/>
+            <text macro="title-intext"/>
+          </substitute>
+        </names>
+      </else>
+    </choose>
+  </macro>
+  <macro name="date-bib">
+    <group delimiter=" " prefix="(" suffix=")">
+      <choose>
+        <if is-uncertain-date="issued">
+          <text term="circa" form="short"/>
+        </if>
+      </choose>
+      <group>
+        <choose>
+          <if variable="issued">
+            <date variable="issued">
+              <date-part name="year"/>
+            </date>
+            <text variable="year-suffix"/>
+            <choose>
+              <if type="article-magazine article-newspaper broadcast interview motion_picture pamphlet personal_communication post post-weblog song speech webpage" match="any">
+                <!-- Many video and audio examples in manual give full dates. Err on the side of too much information. -->
+                <date variable="issued">
+                  <date-part prefix=", " name="month"/>
+                  <date-part prefix=" " name="day"/>
+                </date>
+              </if>
+              <else-if type="paper-conference">
+                <!-- Capture 'speech' stored as 'paper-conference' -->
+                <choose>
+                  <if variable="collection-editor editor editorial-director issue page volume" match="none">
+                    <date variable="issued">
+                      <date-part prefix=", " name="month"/>
+                      <date-part prefix=" " name="day"/>
+                    </date>
+                  </if>
+                </choose>
+              </else-if>
+              <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic 
+                   manuscript map musical_score paper-conference[published] patent report review review-book thesis -->
+            </choose>
+          </if>
+          <else-if variable="status">
+            <group>
+              <text variable="status" text-case="lowercase"/>
+              <text variable="year-suffix" prefix="-"/>
+            </group>
+          </else-if>
+          <else>
+            <group>
+              <text term="no date" form="short"/>
+              <text variable="year-suffix" prefix="-"/>
+            </group>
+          </else>
+        </choose>
+      </group>
+    </group>
+  </macro>
+  <macro name="date-sort-group">
+    <choose>
+      <if variable="issued">
+        <text value="1"/>
+      </if>
+      <else-if variable="status">
+        <text value="2"/>
+      </else-if>
+      <else>
+        <text value="0"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="date-sort-date">
+    <choose>
+      <if type="article-magazine article-newspaper broadcast interview pamphlet personal_communication post post-weblog speech treaty webpage" match="any">
+        <date variable="issued" form="numeric"/>
+      </if>
+      <else-if type="paper-conference">
+        <!-- Capture 'speech' stored as 'paper-conference' -->
+        <choose>
+          <if variable="collection-editor editor editorial-director issue page volume" match="none">
+            <date variable="issued" form="numeric"/>
+          </if>
+        </choose>
+      </else-if>
+      <else>
+        <date variable="issued" form="numeric"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="date-intext">
+    <choose>
+      <if variable="issued">
+        <group delimiter="/">
+          <group delimiter=" ">
+            <choose>
+              <if is-uncertain-date="original-date">
+                <text term="circa" form="short"/>
+              </if>
+            </choose>
+            <date variable="original-date">
+              <date-part name="year"/>
+            </date>
+          </group>
+          <group delimiter=" ">
+            <choose>
+              <if is-uncertain-date="issued">
+                <text term="circa" form="short"/>
+              </if>
+            </choose>
+            <group>
+              <choose>
+                <if type="interview personal_communication" match="any">
+                  <choose>
+                    <if variable="archive container-title DOI publisher URL" match="none">
+                      <!-- These variables indicate that the communication is retrievable by the reader. 
+                           If not, then use the in-text-only personal communication format -->
+                      <date variable="issued" form="text"/>
+                    </if>
+                    <else>
+                      <date variable="issued">
+                        <date-part name="year"/>
+                      </date>
+                    </else>
+                  </choose>
+                </if>
+                <else>
+                  <date variable="issued">
+                    <date-part name="year"/>
+                  </date>
+                </else>
+              </choose>
+              <text variable="year-suffix"/>
+            </group>
+          </group>
+        </group>
+      </if>
+      <else-if variable="status">
+        <text variable="status" text-case="lowercase"/>
+        <text variable="year-suffix" prefix="-"/>
+      </else-if>
+      <else>
+        <text term="no date" form="short"/>
+        <text variable="year-suffix" prefix="-"/>
+      </else>
+    </choose>
+  </macro>
+  <!-- APA has two description elements following the title:
+       title (parenthetical) [bracketed]  -->
+  <macro name="title-and-descriptions">
+    <choose>
+      <if variable="title">
+        <group delimiter=" ">
+          <text macro="title"/>
+          <text macro="parenthetical"/>
+          <text macro="bracketed"/>
+        </group>
+      </if>
+      <else>
+        <group delimiter=" ">
+          <text macro="bracketed"/>
+          <text macro="parenthetical"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="post webpage" match="any">
+        <!-- Webpages are always italicized -->
+        <text variable="title" font-style="italic"/>
+      </if>
+      <else-if variable="container-title" match="any">
+        <!-- Other types are italicized based on presence of container-title.
+             Assume that review and review-book are published in periodicals/blogs,
+             not just on a web page (ex. 69) -->
+        <text variable="title"/>
+      </else-if>
+      <else>
+        <choose>
+          <if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">
+            <text variable="title" font-style="italic"/>
+          </if>
+          <else-if type="paper-conference">
+            <choose>
+              <if variable="collection-editor editor editorial-director" match="any">
+                <group delimiter=": " font-style="italic">
+                  <text variable="title"/>
+                  <!-- Replace with volume-title as that becomes available -->
+                  <choose>
+                    <if is-numeric="volume" match="none">
+                      <group delimiter=" ">
+                        <label variable="volume" form="short" text-case="capitalize-first"/>
+                        <text variable="volume"/>
+                      </group>
+                    </if>
+                  </choose>
+                </group>
+              </if>
+              <else>
+                <text variable="title" font-style="italic"/>
+              </else>
+            </choose>
+          </else-if>
+          <else>
+            <group delimiter=": " font-style="italic">
+              <text variable="title"/>
+              <!-- Replace with volume-title as that becomes available -->
+              <choose>
+                <if is-numeric="volume" match="none">
+                  <group delimiter=" ">
+                    <label variable="volume" form="short" text-case="capitalize-first"/>
+                    <text variable="volume"/>
+                  </group>
+                </if>
+              </choose>
+            </group>
+          </else>
+        </choose>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title-intext">
+    <choose>
+      <if variable="title" match="none">
+        <text macro="bracketed-intext" prefix="[" suffix="]"/>
+      </if>
+      <else-if type="bill">
+        <!-- If a bill has no number or container-title, assume it is a hearing; italic -->
+        <choose>
+          <if variable="number container-title" match="none">
+            <text variable="title" form="short" font-style="italic" text-case="title"/>
+          </if>
+          <else-if variable="title">
+            <text variable="title" form="short" text-case="title"/>
+          </else-if>
+          <else>
+            <group delimiter=" ">
+              <text variable="genre"/>
+              <group delimiter=" ">
+                <choose>
+                  <if variable="chapter-number container-title" match="none">
+                    <!-- Replace with label variable="number" as that becomes available -->
+                    <text term="issue" form="short"/>
+                  </if>
+                </choose>
+                <text variable="number"/>
+              </group>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="legal_case" match="any">
+        <!-- Cases are italicized -->
+        <text variable="title" font-style="italic"/>
+      </else-if>
+      <else-if type="legislation treaty" match="any">
+        <!-- Legislation and treaties not italicized or quoted -->
+        <text variable="title" form="short" text-case="title"/>
+      </else-if>
+      <else-if type="post webpage" match="any">
+        <!-- Webpages are always italicized -->
+        <text variable="title" form="short" font-style="italic" text-case="title"/>
+      </else-if>
+      <else-if variable="container-title" match="any">
+        <!-- Other types are italicized or quoted based on presence of container-title. As in title macro. -->
+        <text variable="title" form="short" quotes="true" text-case="title"/>
+      </else-if>
+      <else>
+        <text variable="title" form="short" font-style="italic" text-case="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="parenthetical">
+    <!-- (Secondary contributors; Database location; Genre no. 123; Report Series 123, Version, Edition, Volume, Page) -->
+    <group prefix="(" suffix=")">
+      <choose>
+        <if type="patent">
+          <!-- authority: U.S. ; genre: patent ; number: 123,445 -->
+          <group delimiter=" ">
+            <text variable="authority" form="short"/>
+            <choose>
+              <if variable="genre">
+                <text variable="genre" text-case="capitalize-first"/>
+              </if>
+              <else>
+                <!-- This should be localized -->
+                <text value="patent" text-case="capitalize-first"/>
+              </else>
+            </choose>
+            <group delimiter=" ">
+              <!-- Replace with label variable="number" if that becomes available -->
+              <text term="issue" form="short" text-case="capitalize-first"/>
+              <text variable="number"/>
+            </group>
+          </group>
+        </if>
+        <else-if type="post webpage" match="any">
+          <!-- For post webpage, container-title is treated as publisher -->
+          <group delimiter="; ">
+            <text macro="secondary-contributors"/>
+            <text macro="database-location"/>
+            <text macro="number"/>
+            <text macro="locators-booklike"/>
+          </group>
+        </else-if>
+        <else-if variable="container-title">
+          <group delimiter="; ">
+            <text macro="secondary-contributors"/>
+            <choose>
+              <if type="broadcast graphic map motion_picture song" match="any">
+                <!-- For audiovisual media, number information comes after title, not container-title -->
+                <text macro="number"/>
+              </if>
+            </choose>
+          </group>
+        </else-if>
+        <else>
+          <group delimiter="; ">
+            <text macro="secondary-contributors"/>
+            <text macro="database-location"/>
+            <text macro="number"/>
+            <text macro="locators-booklike"/>
+          </group>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="parenthetical-container">
+    <choose>
+      <if variable="container-title" match="any">
+        <group prefix="(" suffix=")">
+          <group delimiter="; ">
+            <text macro="database-location"/>
+            <choose>
+              <if type="broadcast graphic map motion_picture song" match="none">
+                <!-- For audiovisual media, number information comes after title, not container-title -->
+                <text macro="number"/>
+              </if>
+            </choose>
+            <text macro="locators-booklike"/>
+          </group>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="bracketed">
+    <!-- [Descriptive information] -->
+    <!-- If there is a number, genre is already printed in macro="number" -->
+    <group prefix="[" suffix="]">
+      <choose>
+        <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+          <!-- Reviewed item -->
+          <group delimiter="; ">
+            <group delimiter=", ">
+              <group delimiter=" ">
+                <!-- Assume that genre is entered as 'Review of the book' or similar -->
+                <choose>
+                  <if variable="number" match="none">
+                    <choose>
+                      <if variable="genre">
+                        <text variable="genre" text-case="capitalize-first"/>
+                      </if>
+                      <else-if variable="medium">
+                        <text variable="medium" text-case="capitalize-first"/>
+                      </else-if>
+                      <else>
+                        <!-- Replace with term="review" as that becomes available -->
+                        <text value="Review of"/>
+                      </else>
+                    </choose>
+                  </if>
+                  <else>
+                    <choose>
+                      <if variable="medium">
+                        <text variable="medium" text-case="capitalize-first"/>
+                      </if>
+                      <else>
+                        <!-- Replace with term="review" as that becomes available -->
+                        <text value="Review of"/>
+                      </else>
+                    </choose>
+                  </else>
+                </choose>
+                <text macro="reviewed-title"/>
+              </group>
+              <names variable="reviewed-author">
+                <label form="verb-short" suffix=" "/>
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+              </names>
+            </group>
+            <choose>
+              <if variable="genre" match="any">
+                <choose>
+                  <if variable="number" match="none">
+                    <text variable="medium" text-case="capitalize-first"/>
+                  </if>
+                </choose>
+              </if>
+            </choose>
+          </group>
+        </if>
+        <else-if type="thesis">
+          <!-- Thesis type and institution -->
+          <group delimiter="; ">
+            <choose>
+              <if variable="number" match="none">
+                <group delimiter=", ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <choose>
+                    <if variable="archive DOI URL" match="any">
+                      <!-- Include the university in brackets if thesis is published -->
+                      <text variable="publisher"/>
+                    </if>
+                  </choose>
+                </group>
+              </if>
+            </choose>
+            <text variable="medium" text-case="capitalize-first"/>
+          </group>
+        </else-if>
+        <else-if variable="interviewer" type="interview" match="any">
+          <!-- Interview information -->
+          <choose>
+            <if variable="title">
+              <text macro="format"/>
+            </if>
+            <else-if variable="genre">
+              <group delimiter="; ">
+                <group delimiter=" ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <group delimiter=" ">
+                    <text term="author" form="verb"/>
+                    <names variable="interviewer">
+                      <name and="symbol" initialize-with=". " delimiter=", "/>
+                    </names>
+                  </group>
+                </group>
+              </group>
+            </else-if>
+            <else-if variable="interviewer">
+              <group delimiter="; ">
+                <names variable="interviewer">
+                  <label form="verb" suffix=" " text-case="capitalize-first"/>
+                  <name and="symbol" initialize-with=". " delimiter=", "/>
+                </names>
+                <text variable="medium" text-case="capitalize-first"/>
+              </group>
+            </else-if>
+            <else>
+              <text macro="format"/>
+            </else>
+          </choose>
+        </else-if>
+        <else-if type="personal_communication">
+          <!-- Letter information -->
+          <choose>
+            <if variable="recipient">
+              <group delimiter="; ">
+                <group delimiter=" ">
+                  <choose>
+                    <if variable="number" match="none">
+                      <choose>
+                        <if variable="genre">
+                          <text variable="genre" text-case="capitalize-first"/>
+                        </if>
+                        <else-if variable="medium">
+                          <text variable="medium" text-case="capitalize-first"/>
+                        </else-if>
+                        <else>
+                          <text term="letter" form="short" text-case="capitalize-first"/>
+                        </else>
+                      </choose>
+                    </if>
+                    <else>
+                      <choose>
+                        <if variable="medium">
+                          <text variable="medium" text-case="capitalize-first"/>
+                        </if>
+                        <else>
+                          <text term="letter" form="short" text-case="capitalize-first"/>
+                        </else>
+                      </choose>
+                    </else>
+                  </choose>
+                  <names variable="recipient" delimiter=", ">
+                    <label form="verb" suffix=" "/>
+                    <name and="symbol" delimiter=", "/>
+                  </names>
+                </group>
+                <choose>
+                  <if variable="genre" match="any">
+                    <choose>
+                      <if variable="number" match="none">
+                        <text variable="medium" text-case="capitalize-first"/>
+                      </if>
+                    </choose>
+                  </if>
+                </choose>
+              </group>
+            </if>
+            <else>
+              <text macro="format"/>
+            </else>
+          </choose>
+        </else-if>
+        <else-if variable="composer" type="song" match="all">
+          <!-- Performer of classical music works -->
+          <group delimiter="; ">
+            <choose>
+              <if variable="number" match="none">
+                <group delimiter=" ">
+                  <choose>
+                    <if variable="genre">
+                      <text variable="genre" text-case="capitalize-first"/>
+                      <!-- Replace prefix with performer label as that becomes available -->
+                      <names variable="author" prefix="recorded by ">
+                        <name and="symbol" initialize-with=". " delimiter=", "/>
+                      </names>
+                    </if>
+                    <else-if variable="medium">
+                      <text variable="medium" text-case="capitalize-first"/>
+                      <!-- Replace prefix with performer label as that becomes available -->
+                      <names variable="author" prefix="recorded by ">
+                        <name and="symbol" initialize-with=". " delimiter=", "/>
+                      </names>
+                    </else-if>
+                    <else>
+                      <!-- Replace prefix with performer label as that becomes available -->
+                      <names variable="author" prefix="Recorded by ">
+                        <name and="symbol" initialize-with=". " delimiter=", "/>
+                      </names>
+                    </else>
+                  </choose>
+                </group>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <choose>
+                    <if variable="medium">
+                      <text variable="medium" text-case="capitalize-first"/>
+                      <!-- Replace prefix with performer label as that becomes available -->
+                      <names variable="author" prefix="recorded by ">
+                        <name and="symbol" initialize-with=". " delimiter=", "/>
+                      </names>
+                    </if>
+                    <else>
+                      <!-- Replace prefix with performer label as that becomes available -->
+                      <names variable="author" prefix="Recorded by ">
+                        <name and="symbol" initialize-with=". " delimiter=", "/>
+                      </names>
+                    </else>
+                  </choose>
+                </group>
+              </else>
+            </choose>
+            <choose>
+              <if variable="genre" match="any">
+                <choose>
+                  <if variable="number" match="none">
+                    <text variable="medium" text-case="capitalize-first"/>
+                  </if>
+                </choose>
+              </if>
+            </choose>
+          </group>
+        </else-if>
+        <else-if variable="container-title" match="none">
+          <!-- Other description -->
+          <text macro="format"/>
+        </else-if>
+        <else>
+          <!-- For conference presentations, chapters in reports, software, place bracketed after the container title -->
+          <choose>
+            <if type="paper-conference speech" match="any">
+              <choose>
+                <if variable="collection-editor editor editorial-director issue page volume" match="any">
+                  <text macro="format"/>
+                </if>
+              </choose>
+            </if>
+            <else-if type="book">
+              <choose>
+                <if variable="version" match="none">
+                  <text macro="format"/>
+                </if>
+              </choose>
+            </else-if>
+            <else-if type="report" match="none">
+              <text macro="format"/>
+            </else-if>
+          </choose>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="bracketed-intext">
+    <group prefix="[" suffix="]">
+      <choose>
+        <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+          <!-- This should be localized -->
+          <text macro="reviewed-title-intext" prefix="Review of "/>
+        </if>
+        <else-if variable="interviewer" type="interview" match="any">
+          <names variable="interviewer">
+            <label form="verb" suffix=" " text-case="capitalize-first"/>
+            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <substitute>
+              <text macro="format-intext"/>
+            </substitute>
+          </names>
+        </else-if>
+        <else-if type="personal_communication">
+          <!-- Letter information -->
+          <choose>
+            <if variable="recipient">
+              <group delimiter=" ">
+                <choose>
+                  <if variable="number" match="none">
+                    <text variable="genre" text-case="capitalize-first"/>
+                  </if>
+                  <else>
+                    <text term="letter" form="short" text-case="capitalize-first"/>
+                  </else>
+                </choose>
+                <names variable="recipient" delimiter=", ">
+                  <label form="verb" suffix=" "/>
+                  <name and="symbol" delimiter=", "/>
+                </names>
+              </group>
+            </if>
+            <else>
+              <text macro="format-intext"/>
+            </else>
+          </choose>
+        </else-if>
+        <else>
+          <text macro="format-intext"/>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="bracketed-container">
+    <group prefix="[" suffix="]">
+      <choose>
+        <if type="paper-conference speech" match="any">
+          <!-- Conference presentations should describe the session [container] in bracketed unless published in a proceedings -->
+          <choose>
+            <if variable="collection-editor editor editorial-director issue page volume" match="none">
+              <text macro="format"/>
+            </if>
+          </choose>
+        </if>
+        <else-if type="book" variable="version" match="all">
+          <!-- For entries in mobile app reference works, place bracketed after the container-title -->
+          <text macro="format"/>
+        </else-if>
+        <else-if type="report">
+          <!-- For chapters in reports, place bracketed after the container title -->
+          <text macro="format"/>
+        </else-if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="secondary-contributors">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">
+        <text macro="secondary-contributors-periodical"/>
+      </if>
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="collection-editor editor editorial-director" match="any">
+            <text macro="secondary-contributors-booklike"/>
+          </if>
+          <else>
+            <text macro="secondary-contributors-periodical"/>
+          </else>
+        </choose>
+      </else-if>
+      <else>
+        <text macro="secondary-contributors-booklike"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="secondary-contributors-periodical">
+    <group delimiter="; ">
+      <choose>
+        <if variable="title">
+          <names variable="interviewer" delimiter="; ">
+            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <label form="short" prefix=", " text-case="title"/>
+          </names>
+        </if>
+      </choose>
+      <names variable="translator" delimiter="; ">
+        <name and="symbol" initialize-with=". " delimiter=", "/>
+        <label form="short" prefix=", " text-case="title"/>
+      </names>
+    </group>
+  </macro>
+  <macro name="secondary-contributors-booklike">
+    <group delimiter="; ">
+      <choose>
+        <if variable="title">
+          <names variable="interviewer">
+            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <label form="short" prefix=", " text-case="title"/>
+          </names>
+        </if>
+      </choose>
+      <!-- When editortranslator becomes available, add a test: variable="editortranslator" match="none"; then print translator -->
+      <choose>
+        <if type="post webpage" match="none">
+          <!-- Webpages treat container-title like publisher -->
+          <choose>
+            <if variable="container-title" match="none">
+              <group delimiter="; ">
+                <names variable="container-author">
+                  <label form="verb-short" suffix=" " text-case="title"/>
+                  <name and="symbol" initialize-with=". " delimiter=", "/>
+                </names>
+                <names variable="editor translator" delimiter="; ">
+                  <name and="symbol" initialize-with=". " delimiter=", "/>
+                  <label form="short" prefix=", " text-case="title"/>
+                </names>
+              </group>
+            </if>
+          </choose>
+        </if>
+        <else>
+          <group delimiter="; ">
+            <names variable="container-author">
+              <label form="verb-short" suffix=" " text-case="title"/>
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+            </names>
+            <names variable="editor translator" delimiter="; ">
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+              <label form="short" prefix=", " text-case="title"/>
+            </names>
+          </group>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="database-location">
+    <choose>
+      <if variable="archive-place" match="none">
+        <!-- With `archive-place`: physical archives. Without: online archives. -->
+        <!-- Add archive_collection as that becomes available -->
+        <text variable="archive_location"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="number">
+    <choose>
+      <if variable="number">
+        <group delimiter=", ">
+          <group delimiter=" ">
+            <text variable="genre" text-case="title"/>
+            <choose>
+              <if is-numeric="number">
+                <!-- Replace with label variable="number" if that becomes available -->
+                <text term="issue" form="short" text-case="capitalize-first"/>
+                <text variable="number"/>
+              </if>
+              <else>
+                <text variable="number"/>
+              </else>
+            </choose>
+          </group>
+          <choose>
+            <if type="thesis">
+              <choose>
+                <!-- Include the university in brackets if thesis is published -->
+                <if variable="archive DOI URL" match="any">
+                  <text variable="publisher"/>
+                </if>
+              </choose>
+            </if>
+          </choose>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="locators-booklike">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper broadcast interview patent post post-weblog review review-book speech webpage" match="any"/>
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="collection-editor editor editorial-director" match="any">
+            <group delimiter=", ">
+              <text macro="version"/>
+              <text macro="edition"/>
+              <text macro="volume-booklike"/>
+            </group>
+          </if>
+        </choose>
+      </else-if>
+      <else>
+        <group delimiter=", ">
+          <text macro="version"/>
+          <text macro="edition"/>
+          <text macro="volume-booklike"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="version">
+    <choose>
+      <if is-numeric="version">
+        <group delimiter=" ">
+          <!-- replace with label variable="version" if that becomes available -->
+          <text term="version" text-case="capitalize-first"/>
+          <text variable="version"/>
+        </group>
+      </if>
+      <else>
+        <text variable="version"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <label variable="edition" form="short"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="volume-booklike">
+    <group delimiter=", ">
+      <!-- Report series [ex. 52] -->
+      <choose>
+        <if type="report">
+          <group delimiter=" ">
+            <text variable="collection-title" text-case="title"/>
+            <text variable="collection-number"/>
+          </group>
+        </if>
+      </choose>
+      <choose>
+        <if variable="volume" match="any">
+          <choose>
+            <!-- Non-numeric volumes are already printed as part of the book title -->
+            <if is-numeric="volume" match="none"/>
+            <else>
+              <group delimiter=" ">
+                <label variable="volume" form="short" text-case="capitalize-first"/>
+                <number variable="volume" form="numeric"/>
+              </group>
+            </else>
+          </choose>
+        </if>
+        <else>
+          <group>
+            <!-- Replace with label variable="number-of-volumes" if that becomes available -->
+            <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+            <text term="page-range-delimiter" prefix="1"/>
+            <number variable="number-of-volumes" form="numeric"/>
+          </group>
+        </else>
+      </choose>
+      <group delimiter=" ">
+        <label variable="issue" text-case="capitalize-first"/>
+        <text variable="issue"/>
+      </group>
+      <group delimiter=" ">
+        <label variable="page" form="short" suffix=" "/>
+        <text variable="page"/>
+      </group>
+    </group>
+  </macro>
+  <macro name="reviewed-title">
+    <choose>
+      <if variable="reviewed-title">
+        <!-- Not possible to distinguish TV series episode from other reviewed 
+              works [Ex. 69] -->
+        <text variable="reviewed-title" font-style="italic"/>
+      </if>
+      <else>
+        <!-- Assume title is title of reviewed work -->
+        <text variable="title" font-style="italic"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="reviewed-title-intext">
+    <choose>
+      <if variable="reviewed-title">
+        <!-- Not possible to distinguish TV series episode from other reviewed works [Ex. 69] -->
+        <text variable="reviewed-title" form="short" font-style="italic" text-case="title"/>
+      </if>
+      <else>
+        <!-- Assume title is title of reviewed work -->
+        <text variable="title" form="short" font-style="italic" text-case="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="format">
+    <choose>
+      <if variable="genre medium" match="any">
+        <group delimiter="; ">
+          <choose>
+            <if variable="number" match="none">
+              <text variable="genre" text-case="capitalize-first"/>
+            </if>
+          </choose>
+          <text variable="medium" text-case="capitalize-first"/>
+        </group>
+      </if>
+      <!-- Generic labels for specific types -->
+      <!-- These should be localized when possible -->
+      <else-if type="dataset">
+        <text value="Data set"/>
+      </else-if>
+      <else-if type="book" variable="version" match="all">
+        <!-- Replace with type="software" and term="software" as that becomes available -->
+        <text value="Computer software"/>
+      </else-if>
+      <else-if type="interview personal_communication" match="any">
+        <choose>
+          <if variable="archive container-title DOI publisher URL" match="none">
+            <text term="letter" text-case="capitalize-first"/>
+          </if>
+          <else-if type="interview">
+            <text term="interview" text-case="capitalize-first"/>
+          </else-if>
+        </choose>
+      </else-if>
+      <else-if type="map">
+        <text value="Map"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="format-intext">
+    <choose>
+      <if variable="genre" match="any">
+        <text variable="genre" text-case="capitalize-first"/>
+      </if>
+      <else-if variable="medium">
+        <text variable="medium" text-case="capitalize-first"/>
+      </else-if>
+      <!-- Generic labels for specific types -->
+      <!-- These should be localized when possible -->
+      <else-if type="dataset">
+        <text value="Data set"/>
+      </else-if>
+      <else-if type="book" variable="version" match="all">
+        <!-- Replace with type="software" and term="software" as that becomes available -->
+        <text value="Computer software"/>
+      </else-if>
+      <else-if type="interview personal_communication" match="any">
+        <choose>
+          <if variable="archive container-title DOI publisher URL" match="none">
+            <text term="letter" text-case="capitalize-first"/>
+          </if>
+          <else-if type="interview">
+            <text term="interview" text-case="capitalize-first"/>
+          </else-if>
+        </choose>
+      </else-if>
+      <else-if type="map">
+        <text value="Map"/>
+      </else-if>
+    </choose>
+  </macro>
+  <!-- APA 'source' element contains four parts:
+       container, event, publisher, access -->
+  <macro name="container">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">
+        <!-- Periodical items -->
+        <text macro="container-periodical"/>
+      </if>
+      <else-if type="paper-conference">
+        <!-- Determine if paper-conference is a periodical or booklike -->
+        <choose>
+          <if variable="editor editorial-director collection-editor container-author" match="any">
+            <text macro="container-booklike"/>
+          </if>
+          <else>
+            <text macro="container-periodical"/>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="post webpage" match="none">
+        <!-- post and webpage treat container-title like publisher -->
+        <text macro="container-booklike"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="container-periodical">
+    <group delimiter=". ">
+      <group delimiter=", ">
+        <text variable="container-title" font-style="italic" text-case="title"/>
+        <choose>
+          <if variable="volume">
+            <group>
+              <text variable="volume" font-style="italic"/>
+              <text variable="issue" prefix="(" suffix=")"/>
+            </group>
+          </if>
+          <else>
+            <text variable="issue" font-style="italic"/>
+          </else>
+        </choose>
+        <choose>
+          <if variable="page">
+            <text variable="page"/>
+          </if>
+          <else>
+            <!-- Ex. 6: Journal article with article number or eLocator -->
+            <!-- This should be localized -->
+            <text variable="number" prefix="Article "/>
+          </else>
+        </choose>
+      </group>
+      <choose>
+        <if variable="issued">
+          <choose>
+            <if variable="issue page volume" match="none">
+              <text variable="status" text-case="capitalize-first"/>
+            </if>
+          </choose>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="container-booklike">
+    <choose>
+      <if variable="container-title" match="any">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first"/>
+          <group delimiter=", ">
+            <names variable="editor translator" delimiter=", &amp; ">
+              <!-- Change to editortranslator and move editor to substitute as that becomes available -->
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+              <label form="short" text-case="title" prefix=" (" suffix=")"/>
+              <substitute>
+                <names variable="editorial-director"/>
+                <names variable="collection-editor"/>
+                <names variable="container-author"/>
+              </substitute>
+            </names>
+            <group delimiter=": " font-style="italic">
+              <text variable="container-title"/>
+              <!-- Replace with volume-title as that becomes available -->
+              <choose>
+                <if is-numeric="volume" match="none">
+                  <group delimiter=" ">
+                    <label variable="volume" form="short" text-case="capitalize-first"/>
+                    <text variable="volume"/>
+                  </group>
+                </if>
+              </choose>
+            </group>
+          </group>
+          <text macro="parenthetical-container"/>
+          <text macro="bracketed-container"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter="; ">
+      <choose>
+        <if type="thesis">
+          <choose>
+            <if variable="archive DOI URL" match="none">
+              <text variable="publisher"/>
+            </if>
+          </choose>
+        </if>
+        <else-if type="post webpage" match="any">
+          <!-- For websites, treat container title like publisher -->
+          <group delimiter="; ">
+            <text variable="container-title" text-case="title"/>
+            <text variable="publisher"/>
+          </group>
+        </else-if>
+        <else-if type="paper-conference">
+          <!-- For paper-conference, don't print publisher if in a journal-like proceedings -->
+          <choose>
+            <if variable="collection-editor editor editorial-director" match="any">
+              <text variable="publisher"/>
+            </if>
+          </choose>
+        </else-if>
+        <else-if type="article-journal article-magazine article-newspaper post-weblog" match="none">
+          <text variable="publisher"/>
+        </else-if>
+      </choose>
+      <group delimiter=", ">
+        <choose>
+          <if variable="archive-place">
+            <!-- With `archive-place`: physical archives. Without: online archives. -->
+            <!-- For physical archives, print the location before the archive name.
+                For electronic archives, these are printed in macro="description". -->
+            <!-- Split "archive_location" into "archive_collection" and "archive_location" as that becomes available -->
+            <!-- Must test for archive_collection:
+                With collection: archive_collection (archive_location), archive, archive-place
+                No collection: archive (archive_location), archive-place
+            -->
+            <text variable="archive_location"/>
+          </if>
+        </choose>
+        <text variable="archive"/>
+        <text variable="archive-place"/>
+      </group>
+    </group>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if variable="DOI" match="any">
+        <text variable="DOI" prefix="https://doi.org/"/>
+      </if>
+      <else-if variable="URL">
+        <group delimiter=" ">
+          <choose>
+            <if variable="issued status" match="none">
+              <group delimiter=" ">
+                <text term="retrieved" text-case="capitalize-first"/>
+                <date variable="accessed" form="text" suffix=","/>
+                <text term="from"/>
+              </group>
+            </if>
+          </choose>
+          <text variable="URL"/>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="event">
+    <choose>
+      <if variable="event">
+        <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
+             both publisher-place and event-place. Remove this 'choose' when that is changed. -->
+        <choose>
+          <if variable="collection-editor editor editorial-director issue page volume" match="none">
+            <!-- Don't print event info if published in a proceedings -->
+            <group delimiter=", ">
+              <text variable="event"/>
+              <text variable="event-place"/>
+            </group>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <!-- After 'source', APA also prints publication history (original publication, reprint info, retraction info) -->
+  <macro name="publication-history">
+    <choose>
+      <if type="patent" match="none">
+        <group prefix="(" suffix=")">
+          <choose>
+            <if variable="references">
+              <!-- This provides the option for more elaborate description 
+                   of publication history, such as full "reprinted" references
+                   (examples 11, 43, 44) or retracted references -->
+              <text variable="references"/>
+            </if>
+            <else>
+              <group delimiter=" ">
+                <text value="Original work published"/>
+                <choose>
+                  <if is-uncertain-date="original-date">
+                    <text term="circa" form="short"/>
+                  </if>
+                </choose>
+                <date variable="original-date">
+                  <date-part name="year"/>
+                </date>
+              </group>
+            </else>
+          </choose>
+        </group>
+      </if>
+      <else>
+        <text variable="references" prefix="(" suffix=")"/>
+      </else>
+    </choose>
+  </macro>
+  <!-- Legal citations have their own rules -->
+  <macro name="legal-cites">
+    <choose>
+      <if type="legal_case">
+        <group delimiter=". ">
+          <group delimiter=", ">
+            <text variable="title"/>
+            <group delimiter=" ">
+              <text macro="container-legal"/>
+              <text macro="date-legal"/>
+            </group>
+            <text variable="references"/>
+          </group>
+          <text macro="access"/>
+        </group>
+      </if>
+      <else-if type="bill">
+        <!-- Currently designed to handle bills, resolutions, hearings, rederal reports. -->
+        <group delimiter=". ">
+          <group delimiter=", ">
+            <choose>
+              <if variable="number container-title" match="none">
+                <!-- If no number or container-title, then assume it is a hearing -->
+                <text variable="title" font-style="italic"/>
+              </if>
+              <else>
+                <text variable="title"/>
+              </else>
+            </choose>
+            <group delimiter=" ">
+              <text macro="container-legal"/>
+              <text macro="date-legal"/>
+              <choose>
+                <if variable="number container-title" match="none">
+                  <!-- If no number or container-title, then assume it is a hearing -->
+                  <names variable="author" prefix="(testimony of " suffix=")">
+                    <name and="symbol" delimiter=", "/>
+                  </names>
+                </if>
+                <else>
+                  <text variable="status" prefix="(" suffix=")"/>
+                </else>
+              </choose>
+            </group>
+            <text variable="references"/>
+          </group>
+          <text macro="access"/>
+        </group>
+      </else-if>
+      <else-if type="legislation">
+        <!-- Currently designed to handle statutes, codified regulations, executive orders.
+             For uncodified regulations, assume future code section is in status. -->
+        <group delimiter=". ">
+          <group delimiter=", ">
+            <text variable="title"/>
+            <group delimiter=" ">
+              <text macro="container-legal"/>
+              <text macro="date-legal"/>
+              <text variable="status" prefix="(" suffix=")"/>
+            </group>
+            <text variable="references"/>
+          </group>
+          <text macro="access"/>
+        </group>
+      </else-if>
+      <else-if type="treaty">
+        <!-- APA generally defers to Bluebook for legal citations, but diverges without
+             explanation for treaty items. The Bluebook format that was used in APA 6th
+             ed. is used here. -->
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <names variable="author">
+            <name initialize-with="." form="short" delimiter="-"/>
+          </names>
+          <text macro="date-legal"/>
+          <text macro="container-legal"/>
+          <text macro="access"/>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="date-legal">
+    <choose>
+      <if type="legal_case">
+        <group prefix="(" suffix=")" delimiter=" ">
+          <text variable="authority"/>
+          <choose>
+            <if variable="container-title" match="any">
+              <!-- Print only year for cases published in reporters-->
+              <date variable="issued" form="numeric" date-parts="year"/>
+            </if>
+            <else>
+              <date variable="issued" form="text"/>
+            </else>
+          </choose>
+        </group>
+      </if>
+      <else-if type="bill legislation" match="any">
+        <group prefix="(" suffix=")" delimiter=" ">
+          <group delimiter=" ">
+            <date variable="original-date">
+              <date-part name="year"/>
+            </date>
+            <text term="and" form="symbol"/>
+          </group>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+        </group>
+      </else-if>
+      <else-if type="treaty">
+        <date variable="issued" form="text"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="container-legal">
+    <!-- Expect legal item container-titles to be stored in short form -->
+    <choose>
+      <if type="legal_case">
+        <group delimiter=" ">
+          <choose>
+            <if variable="container-title">
+              <group delimiter=" ">
+                <text variable="volume"/>
+                <text variable="container-title"/>
+                <group delimiter=" ">
+                  <!-- Change to label variable="section" as that becomes available -->
+                  <text term="section" form="symbol"/>
+                  <text variable="section"/>
+                </group>
+                <choose>
+                  <if variable="page page-first" match="any">
+                    <text variable="page-first"/>
+                  </if>
+                  <else>
+                    <text value="___"/>
+                  </else>
+                </choose>
+              </group>
+            </if>
+            <else>
+              <group delimiter=" ">
+                <choose>
+                  <if is-numeric="number">
+                    <!-- Replace with label variable="number" if that becomes available -->
+                    <text term="issue" form="short" text-case="capitalize-first"/>
+                  </if>
+                </choose>
+                <text variable="number"/>
+              </group>
+            </else>
+          </choose>
+        </group>
+      </if>
+      <else-if type="bill">
+        <group delimiter=", ">
+          <group delimiter=" ">
+            <text variable="genre"/>
+            <group delimiter=" ">
+              <choose>
+                <if variable="chapter-number container-title" match="none">
+                  <!-- Replace with label variable="number" as that becomes available -->
+                  <text term="issue" form="short"/>
+                </if>
+              </choose>
+              <text variable="number"/>
+            </group>
+          </group>
+          <text variable="authority"/>
+          <text variable="chapter-number"/>
+          <group delimiter=" ">
+            <text variable="volume"/>
+            <text variable="container-title"/>
+            <text variable="page-first"/>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="legislation">
+        <choose>
+          <if variable="number">
+            <!--There's a public law number-->
+            <group delimiter=", ">
+              <text variable="number" prefix="Pub. L. No. "/>
+              <group delimiter=" ">
+                <text variable="volume"/>
+                <text variable="container-title"/>
+                <text variable="page-first"/>
+              </group>
+            </group>
+          </if>
+          <else>
+            <group delimiter=" ">
+              <text variable="volume"/>
+              <text variable="container-title"/>
+              <choose>
+                <if variable="section">
+                  <group delimiter=" ">
+                    <!-- Change to label variable="section" as that becomes available -->
+                    <text term="section" form="symbol"/>
+                    <text variable="section"/>
+                  </group>
+                </if>
+                <else>
+                  <text variable="page-first"/>
+                </else>
+              </choose>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="treaty">
+        <group delimiter=" ">
+          <number variable="volume"/>
+          <text variable="container-title"/>
+          <choose>
+            <if variable="page page-first" match="any">
+              <text variable="page-first"/>
+            </if>
+            <else>
+              <group delimiter=" ">
+                <!-- Replace with label variable="number" if that becomes available -->
+                <text term="issue" form="short" text-case="capitalize-first"/>
+                <text variable="number"/>
+              </group>
+            </else>
+          </choose>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="citation-locator">
+    <group delimiter=" ">
+      <choose>
+        <if locator="chapter">
+          <label variable="locator" text-case="capitalize-first"/>
+        </if>
+        <else>
+          <label variable="locator" form="short"/>
+        </else>
+      </choose>
+      <text variable="locator"/>
+    </group>
+  </macro>
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" collapse="year" givenname-disambiguation-rule="primary-name-with-initials">
+    <sort>
+      <key macro="author-bib" names-min="3" names-use-first="1"/>
+      <key macro="date-sort-group"/>
+      <key macro="date-sort-date" sort="ascending"/>
+      <key variable="status"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+        <text macro="author-intext"/>
+        <text macro="date-intext"/>
+        <text macro="citation-locator"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="true" et-al-min="21" et-al-use-first="19" et-al-use-last="true" entry-spacing="0" line-spacing="2">
+    <sort>
+      <key macro="author-bib"/>
+      <key macro="date-sort-group"/>
+      <key macro="date-sort-date" sort="ascending"/>
+      <key variable="status"/>
+      <key macro="title"/>
+    </sort>
+    <layout>
+      <choose>
+        <if type="bill legal_case legislation treaty" match="any">
+          <!-- Legal items have different orders and delimiters -->
+          <choose>
+            <if variable="DOI URL" match="any">
+              <text macro="legal-cites"/>
+            </if>
+            <else>
+              <text macro="legal-cites" suffix="."/>
+            </else>
+          </choose>
+        </if>
+        <else>
+          <group delimiter=" ">
+            <group delimiter=". " suffix=".">
+              <text macro="author-bib"/>
+              <text macro="date-bib"/>
+              <text macro="title-and-descriptions"/>
+              <text macro="container"/>
+              <text macro="event"/>
+              <text macro="publisher"/>
+            </group>
+            <text macro="access"/>
+            <text macro="publication-history"/>
+          </group>
+        </else>
+      </choose>
+    </layout>
+  </bibliography>
+</style>
diff --git a/lib/styles/harvard-cite-them-right.csl b/lib/styles/harvard-cite-them-right.csl
new file mode 100644
index 0000000..d7fb56c
--- /dev/null
+++ b/lib/styles/harvard-cite-them-right.csl
@@ -0,0 +1,308 @@
+<?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" default-locale="en-GB">
+  <info>
+    <title>Cite Them Right 10th edition - Harvard</title>
+    <id>http://www.zotero.org/styles/harvard-cite-them-right</id>
+    <link href="http://www.zotero.org/styles/harvard-cite-them-right" rel="self"/>
+    <link href="http://www.zotero.org/styles/harvard-university-of-greenwich" rel="template"/>
+    <link href="http://www.citethemrightonline.com/" rel="documentation"/>
+    <author>
+      <name>Sebastian Karcher</name>
+    </author>
+    <contributor>
+      <name>Scott Wagstaff</name>
+      <uri>http://www.mendeley.com/profiles/scott-wagstaff/</uri>
+    </contributor>
+    <category citation-format="author-date"/>
+    <category field="generic-base"/>
+    <summary>Harvard according to Cite Them Right, 10th edition.</summary>
+    <updated>2017-05-17T00:00:00+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 xml:lang="en-GB">
+    <terms>
+      <term name="editor" form="short">
+        <single>ed.</single>
+        <multiple>eds</multiple>
+      </term>
+      <term name="editortranslator" form="verb">edited and translated by</term>
+      <term name="edition" form="short">edn.</term>
+    </terms>
+  </locale>
+  <macro name="editor">
+    <choose>
+      <if type="chapter paper-conference" match="any">
+        <names variable="container-author" delimiter=", " suffix=", ">
+          <name and="text" initialize-with=". " delimiter=", " sort-separator=", " name-as-sort-order="all"/>
+        </names>
+        <choose>
+          <if variable="container-author" match="none">
+            <names variable="editor translator" delimiter=", ">
+              <name and="text" initialize-with=". " delimiter=", " sort-separator=", " name-as-sort-order="all"/>
+              <label form="short" prefix=" (" suffix=")"/>
+            </names>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="secondary-contributors">
+    <choose>
+      <if type="chapter paper-conference" match="none">
+        <names variable="editor translator" delimiter=". ">
+          <label form="verb" text-case="capitalize-first" suffix=" "/>
+          <name and="text" initialize-with=". " delimiter=", "/>
+        </names>
+      </if>
+      <else-if variable="container-author" match="any">
+        <names variable="editor translator" delimiter=". ">
+          <label form="verb" text-case="capitalize-first" suffix=" "/>
+          <name and="text" initialize-with=". " delimiter=", "/>
+        </names>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name and="text" delimiter-precedes-last="never" initialize-with=". " name-as-sort-order="all"/>
+      <label form="short" prefix=" (" suffix=")"/>
+      <et-al font-style="italic"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <choose>
+          <if type="article-newspaper article-magazine" match="any">
+            <text variable="container-title" text-case="title" font-style="italic"/>
+          </if>
+          <else>
+            <text macro="title"/>
+          </else>
+        </choose>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" and="text" delimiter=", " delimiter-precedes-last="never" initialize-with=". "/>
+      <et-al font-style="italic"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <choose>
+          <if type="article-newspaper article-magazine" match="any">
+            <text variable="container-title" text-case="title" font-style="italic"/>
+          </if>
+          <else>
+            <text macro="title"/>
+          </else>
+        </choose>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if variable="DOI">
+        <text variable="DOI" prefix="doi: "/>
+      </if>
+      <else-if variable="URL">
+        <text term="available at" suffix=": " text-case="capitalize-first"/>
+        <text variable="URL"/>
+        <group prefix=" (" delimiter=": " suffix=")">
+          <text term="accessed" text-case="capitalize-first"/>
+          <date form="text" variable="accessed">
+            <date-part name="day"/>
+            <date-part name="month"/>
+            <date-part name="year"/>
+          </date>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="number-volumes">
+    <choose>
+      <if variable="volume" match="none">
+        <group delimiter=" " prefix="(" suffix=")">
+          <text variable="number-of-volumes"/>
+          <label variable="volume" form="short" strip-periods="true"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="bill book graphic legal_case legislation motion_picture report song thesis webpage" match="any">
+        <group delimiter=". ">
+          <group delimiter=" ">
+            <text variable="title" font-style="italic"/>
+            <text macro="number-volumes"/>
+          </group>
+          <text macro="edition"/>
+        </group>
+      </if>
+      <else>
+        <text variable="title" form="long" quotes="true"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <choose>
+      <if type="thesis">
+        <group delimiter=". ">
+          <text variable="genre"/>
+          <text variable="publisher"/>
+        </group>
+      </if>
+      <else-if type="report">
+        <group delimiter=". ">
+          <group delimiter=" ">
+            <text variable="genre"/>
+            <text variable="number"/>
+          </group>
+          <group delimiter=": ">
+            <text variable="publisher-place"/>
+            <text variable="publisher"/>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="article-journal article-newspaper article-magazine" match="none">
+        <group delimiter=" ">
+          <group delimiter=", ">
+            <choose>
+              <if type="speech" variable="event" match="any">
+                <text variable="event" font-style="italic"/>
+              </if>
+            </choose>
+            <group delimiter=": ">
+              <text variable="publisher-place"/>
+              <text variable="publisher"/>
+            </group>
+          </group>
+          <group prefix="(" suffix=")" delimiter=", ">
+            <text variable="collection-title"/>
+            <text variable="collection-number"/>
+          </group>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="year-date">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+        <text variable="year-suffix"/>
+      </if>
+      <else>
+        <text term="no date"/>
+        <text variable="year-suffix" prefix=" "/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="locator">
+    <choose>
+      <if type="article-journal">
+        <text variable="volume"/>
+        <text variable="issue" prefix="(" suffix=")"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="published-date">
+    <choose>
+      <if type="article-newspaper article-magazine post-weblog speech" match="any">
+        <date variable="issued">
+          <date-part name="day" suffix=" "/>
+          <date-part name="month" form="long"/>
+        </date>
+      </if>
+    </choose>
+  </macro>
+  <macro name="pages">
+    <choose>
+      <if type="chapter paper-conference article-journal article article-magazine article-newspaper book review review-book report" match="any">
+        <group delimiter=" ">
+          <label variable="page" form="short"/>
+          <text variable="page"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="container-title">
+    <choose>
+      <if variable="container-title">
+        <group delimiter=". ">
+          <text variable="container-title" font-style="italic"/>
+          <text macro="edition"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short" strip-periods="true"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="container-prefix">
+    <choose>
+      <if type="chapter paper-conference" match="any">
+        <text term="in"/>
+      </if>
+    </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" collapse="year">
+    <sort>
+      <key macro="year-date"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+        <group delimiter=", ">
+          <text macro="author-short"/>
+          <text macro="year-date"/>
+        </group>
+        <group>
+          <label variable="locator" form="short" suffix=" "/>
+          <text variable="locator"/>
+        </group>
+      </group>
+    </layout>
+  </citation>
+  <bibliography and="text" et-al-min="4" et-al-use-first="1">
+    <sort>
+      <key macro="author"/>
+      <key macro="year-date"/>
+      <key variable="title"/>
+    </sort>
+    <layout suffix=".">
+      <group delimiter=". ">
+        <group delimiter=" ">
+          <text macro="author"/>
+          <text macro="year-date" prefix="(" suffix=")"/>
+          <group delimiter=", ">
+            <text macro="title"/>
+            <group delimiter=" ">
+              <text macro="container-prefix"/>
+              <text macro="editor"/>
+              <text macro="container-title"/>
+            </group>
+          </group>
+        </group>
+        <text macro="secondary-contributors"/>
+        <text macro="publisher"/>
+      </group>
+      <group delimiter=", " prefix=", ">
+        <text macro="locator"/>
+        <text macro="published-date"/>
+        <text macro="pages"/>
+      </group>
+      <text macro="access" prefix=". "/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/lib/styles/ieee.csl b/lib/styles/ieee.csl
new file mode 100644
index 0000000..2cc6f62
--- /dev/null
+++ b/lib/styles/ieee.csl
@@ -0,0 +1,457 @@
+<?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"/>
+    <!-- <link href="https://ieeeauthorcenter.ieee.org/wp-content/uploads/IEEE-Reference-Guide.pdf" rel="documentation"/> - 2018 guidelines -->
+    <link href="http://journals.ieeeauthorcenter.ieee.org/wp-content/uploads/sites/7/IEEE_Reference_Guide.pdf" rel="documentation"/>
+    <link href="https://journals.ieeeauthorcenter.ieee.org/your-role-in-article-production/ieee-editorial-style-manual/" rel="documentation"/>
+    <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>
+    <contributor>
+      <name>Giuseppe Silano</name>
+      <email>g.silano89@gmail.com</email>
+      <uri>http://giuseppesilano.net</uri>
+    </contributor>
+    <contributor>
+      <name>Patrick O'Brien</name>
+    </contributor>
+    <contributor>
+      <name>Brenton M. Wiernik</name>
+    </contributor>
+    <contributor>
+      <name>Oliver Couch</name>
+      <email>oliver.couch@gmail.com</email>
+    </contributor>
+    <category citation-format="numeric"/>
+    <category field="engineering"/>
+    <category field="generic-base"/>
+    <summary>IEEE style as per the 2021 guidelines, V 01.29.2021.</summary>
+    <updated>2021-05-07T00:52:46+10: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 xml:lang="en">
+    <terms>
+      <term name="chapter" form="short">ch.</term>
+      <term name="presented at">presented at the</term>
+      <term name="available at">available</term>
+    </terms>
+  </locale>
+  <!-- Macros -->
+  <macro name="status">
+    <choose>
+      <if variable="page issue volume" match="none">
+        <text variable="status" text-case="capitalize-first" suffix="" font-weight="bold"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" 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" 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 chapter graphic legal_case legislation song thesis" match="any">
+        <date variable="issued">
+          <date-part name="year" form="long"/>
+        </date>
+      </else-if>
+      <else-if type="paper-conference" match="any">
+        <date variable="issued">
+          <date-part name="month" form="short"/>
+          <date-part name="year" prefix=" "/>
+        </date>
+      </else-if>
+      <else-if type="motion_picture" match="any">
+        <date variable="issued" prefix="(" suffix=")">
+          <date-part name="month" form="short" suffix=" "/>
+          <date-part name="day" form="numeric-leading-zeros" suffix=", "/>
+          <date-part name="year"/>
+        </date>
+      </else-if>
+      <else>
+        <date variable="issued">
+          <date-part name="month" form="short" suffix=" "/>
+          <date-part name="day" form="numeric-leading-zeros" suffix=", "/>
+          <date-part name="year"/>
+        </date>
+      </else>
+    </choose>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name and="text" et-al-min="7" et-al-use-first="1" initialize-with=". "/>
+      <label form="short" prefix=", " text-case="capitalize-first"/>
+      <et-al font-style="italic"/>
+      <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"/>
+    </names>
+  </macro>
+  <macro name="locators">
+    <group delimiter=", ">
+      <text macro="edition"/>
+      <group delimiter=" ">
+        <text term="volume" form="short"/>
+        <number variable="volume" form="numeric"/>
+      </group>
+      <group delimiter=" ">
+        <number variable="number-of-volumes" form="numeric"/>
+        <text term="volume" form="short" plural="true"/>
+      </group>
+      <group delimiter=" ">
+        <text term="issue" form="short"/>
+        <number variable="issue" form="numeric"/>
+      </group>
+    </group>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="bill book graphic legal_case legislation 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 chapter graphic legal_case legislation motion_picture paper-conference song" match="any">
+        <group delimiter=": ">
+          <text variable="publisher-place"/>
+          <text variable="publisher"/>
+        </group>
+      </if>
+      <else>
+        <group delimiter=", ">
+          <text variable="publisher"/>
+          <text variable="publisher-place"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="event">
+    <choose>
+      <if type="paper-conference speech" match="any">
+        <choose>
+          <!-- Published Conference Paper -->
+          <if variable="collection-editor editor editorial-director issue page volume" match="any">
+            <group delimiter=", ">
+              <group delimiter=" ">
+                <text term="in"/>
+                <text variable="container-title" font-style="italic"/>
+              </group>
+              <text variable="event-place"/>
+            </group>
+          </if>
+          <!-- Unpublished Conference Paper -->
+          <else>
+            <group delimiter=", ">
+              <group delimiter=" ">
+                <text term="presented at"/>
+                <text variable="event"/>
+              </group>
+              <text variable="event-place"/>
+            </group>
+          </else>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if type="webpage post post-weblog" match="any">
+        <!-- https://url.com/ (accessed Mon. DD, YYYY). -->
+        <choose>
+          <if variable="URL">
+            <group prefix=" " delimiter=" ">
+              <text variable="URL"/>
+              <group delimiter=" " prefix="(" suffix=").">
+                <text term="accessed"/>
+                <date variable="accessed">
+                  <date-part name="month" form="short"/>
+                  <date-part name="day" form="numeric-leading-zeros" prefix=" " suffix=", "/>
+                  <date-part name="year" form="long"/>
+                </date>
+              </group>
+            </group>
+          </if>
+        </choose>
+      </if>
+      <else-if match="any" variable="DOI">
+        <!-- doi: 10.1000/xyz123. -->
+        <text variable="DOI" prefix=" doi: " suffix="."/>
+      </else-if>
+      <else-if variable="URL">
+        <!-- Accessed: Mon. DD, YYYY. [Medium]. Available: https://URL.com/ -->
+        <group delimiter=". " prefix=" " suffix=". ">
+          <!-- Accessed: Mon. DD, YYYY. -->
+          <group delimiter=": ">
+            <text term="accessed" text-case="capitalize-first"/>
+            <date variable="accessed">
+              <date-part name="month" form="short" suffix=" "/>
+              <date-part name="day" form="numeric-leading-zeros" suffix=", "/>
+              <date-part name="year"/>
+              </date>
+          </group>
+          <!-- [Online Video]. -->
+          <group prefix="[" suffix="]" delimiter=" ">
+            <text term="online" text-case="capitalize-first"/>
+            <choose>
+              <if type="motion_picture">
+                <text value="video" text-case="capitalize-first"/>
+              </if>
+            </choose>
+          </group>
+        </group>
+        <!-- Available: https://URL.com/ -->
+        <group delimiter=": ">
+          <text term="available at" text-case="capitalize-first"/>
+          <text variable="URL"/>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="page">
+    <choose>
+      <if type="article-journal" variable="number" match="all">
+        <group delimiter=" ">
+          <text value="Art."/>
+          <text term="issue" form="short"/>
+          <text variable="number"/>
+        </group>
+      </if>
+      <else>
+        <group delimiter=" ">
+          <label variable="page" form="short"/>
+          <text variable="page"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="citation-locator">
+    <group delimiter=" ">
+      <choose>
+        <if locator="page">
+          <label variable="locator" form="short"/>
+        </if>
+        <else>
+          <label variable="locator" form="short" text-case="capitalize-first"/>
+        </else>
+      </choose>
+      <text variable="locator"/>
+    </group>
+  </macro>
+  <macro name="geographic-location">
+    <group delimiter=", " suffix=".">
+      <choose>
+        <if variable="publisher-place">
+          <text variable="publisher-place" text-case="title"/>
+        </if>
+        <else-if variable="event-place">
+          <text variable="event-place" text-case="title"/>
+        </else-if>
+      </choose>
+    </group>
+  </macro>
+  <!-- Citation -->
+  <citation collapse="citation-number">
+    <sort>
+      <key variable="citation-number"/>
+    </sort>
+    <layout delimiter=", ">
+      <group prefix="[" suffix="]" delimiter=", ">
+        <text variable="citation-number"/>
+        <text macro="citation-locator"/>
+      </group>
+    </layout>
+  </citation>
+  <!-- Bibliography -->
+  <bibliography entry-spacing="0" second-field-align="flush">
+    <layout>
+      <!-- Citation Number -->
+      <text variable="citation-number" prefix="[" suffix="]"/>
+      <!-- Author(s) -->
+      <text macro="author" 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"/>
+            <text macro="status"/>
+          </group>
+          <choose>
+          <if variable="URL DOI" match="none">
+            <text value="." />
+          </if>
+          <else>
+            <text value="," />
+          </else>
+        </choose>
+          <text macro="access"/>
+        </if>
+        <else-if type="paper-conference speech" match="any">
+          <group delimiter=", " suffix=".">
+            <text macro="title"/>
+            <text macro="event"/>
+            <text macro="issued"/>
+            <text macro="locators"/>
+            <text macro="page"/>
+            <text macro="status"/>
+          </group>
+          <text macro="access"/>
+        </else-if>
+        <else-if type="report">
+            <group delimiter=", " suffix=".">
+              <text macro="title"/>
+              <text macro="publisher"/>
+              <group delimiter=" ">
+                <text variable="genre"/>
+                <text variable="number"/>
+              </group>
+              <text macro="issued"/>
+            </group>
+            <text macro="access"/>
+        </else-if>
+        <else-if type="thesis">
+          <group delimiter=", " suffix=".">
+            <text macro="title"/>
+            <text variable="genre"/>
+            <text macro="publisher"/>
+            <text macro="issued"/>
+          </group>
+          <text macro="access"/>
+        </else-if>
+        <else-if type="webpage post-weblog post" match="any">
+          <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">
+          <group delimiter=", ">
+            <text macro="title"/>
+            <text variable="number"/>
+            <text macro="issued"/>
+          </group>
+          <text macro="access"/>
+        </else-if>
+		    <!-- Online Video -->
+        <else-if type="motion_picture">
+          <text macro="geographic-location" suffix=". "/>
+          <group delimiter=", " suffix=".">
+            <text macro="title"/>
+            <text macro="issued"/>
+          </group>
+          <text macro="access"/>
+        </else-if>
+        <!-- Generic/Fallback Formats -->
+        <else-if type="bill book graphic legal_case legislation report song" match="any">
+          <group delimiter=", " suffix=". ">
+            <text macro="title"/>
+            <text macro="locators"/>
+          </group>
+          <group delimiter=", " suffix=".">
+            <text macro="publisher"/>
+            <text macro="issued"/>
+            <text macro="page"/>
+          </group>
+          <text macro="access"/>
+        </else-if>
+        <else-if type="article-magazine article-newspaper broadcast interview manuscript map patent personal_communication song speech thesis webpage" match="any">
+          <group delimiter=", " suffix=".">
+            <text macro="title"/>
+            <text variable="container-title" font-style="italic"/>
+            <text macro="locators"/>
+            <text macro="publisher"/>
+            <text macro="page"/>
+            <text macro="issued"/>
+          </group>
+          <text macro="access"/>
+        </else-if>
+        <else-if type="chapter paper-conference" match="any">
+          <group delimiter=", " suffix=", ">
+            <text macro="title"/>
+            <group delimiter=" ">
+              <text term="in"/>
+              <text variable="container-title" font-style="italic"/>
+            </group>
+            <text macro="locators"/>
+          </group>
+          <text macro="editor" suffix=" "/>
+          <group delimiter=", " suffix=".">
+            <text macro="publisher"/>
+            <text macro="issued"/>
+            <text macro="page"/>
+          </group>
+          <text macro="access"/>
+        </else-if>
+        <else>
+          <group delimiter=", " suffix=". ">
+            <text macro="title"/>
+            <text variable="container-title" font-style="italic"/>
+            <text macro="locators"/>
+          </group>
+          <group delimiter=", " suffix=".">
+            <text macro="publisher"/>
+            <text macro="page"/>
+            <text macro="issued"/>
+          </group>
+          <text macro="access"/>
+        </else>
+      </choose>
+    </layout>
+  </bibliography>
+</style>
diff --git a/test/cff_apa_formatter_test.rb b/test/cff_apa_formatter_test.rb
index 55f5c5a..315b018 100644
--- a/test/cff_apa_formatter_test.rb
+++ b/test/cff_apa_formatter_test.rb
@@ -8,7 +8,7 @@ class CFFApaFormatterTest < Minitest::Test
 
   describe 'all apa fixtures' do
     Dir[::File.join(FILES_DIR, '*.cff')].each do |input_file|
-      define_method("test_converter_for_#{File.basename(input_file)}") do
+      define_method("skip test_converter_for_#{File.basename(input_file)}") do
         cff = ::CFF::File.read(input_file)
         output_file = ::File.join(CONVERTED_DIR, "#{File.basename(input_file, '.*')}.apa")
 
diff --git a/test/cff_csl_formatter_test.rb b/test/cff_csl_formatter_test.rb
new file mode 100644
index 0000000..8d9ca1e
--- /dev/null
+++ b/test/cff_csl_formatter_test.rb
@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+class CFFCslFormatterTest < Minitest::Test
+
+  include ::CFF::Util
+
+  describe 'all apa fixtures' do
+    Dir[::File.join(FILES_DIR, '*.cff')].each do |input_file|
+      define_method("test_converter_for_#{File.basename(input_file)}") do
+        cff = ::CFF::File.read(input_file)
+        output_file = ::File.join(CONVERTED_DIR, "#{File.basename(input_file, '.*')}.apa")
+
+        assert_equal File.read(output_file).strip!, cff.to_apa
+      end
+    end
+  end
+
+  describe 'all harvard fixtures' do
+    Dir[::File.join(FILES_DIR, '*.cff')].each do |input_file|
+      define_method("test_converter_for_#{File.basename(input_file)}") do
+        cff = ::CFF::File.read(input_file)
+        output_file = ::File.join(CONVERTED_DIR, "#{File.basename(input_file, '.*')}.harvard")
+
+        assert_equal File.read(output_file).strip!, cff.to_harvard
+      end
+    end
+  end
+
+  describe 'all ieee fixtures' do
+    Dir[::File.join(FILES_DIR, '*.cff')].each do |input_file|
+      define_method("test_converter_for_#{File.basename(input_file)}") do
+        cff = ::CFF::File.read(input_file)
+        output_file = ::File.join(CONVERTED_DIR, "#{File.basename(input_file, '.*')}.ieee")
+
+        assert_equal File.read(output_file).strip!, cff.to_ieee
+      end
+    end
+  end
+
+  def test_can_tolerate_invalid_file
+    cff = CFF::Model.new(nil)
+    assert_nil cff.to_apalike
+  end
+end
diff --git a/test/converted/TUe-excellent-buildings_BSO-toolbox.apa b/test/converted/TUe-excellent-buildings_BSO-toolbox.apa
index b58517c..1bac582 100644
--- a/test/converted/TUe-excellent-buildings_BSO-toolbox.apa
+++ b/test/converted/TUe-excellent-buildings_BSO-toolbox.apa
@@ -1 +1 @@
-Boonstra S., Hofmeyer H. (2020). BSO Toolbox (version 1.0). DOI: https://doi.org/10.5281/zenodo.3823893 
+Boonstra, S., &amp; Hofmeyer, H. (2020). <i>BSO Toolbox</i> (Version 1.0) [Computer software]. https://doi.org/10.5281/zenodo.3823893
diff --git a/test/converted/TUe-excellent-buildings_BSO-toolbox.harvard b/test/converted/TUe-excellent-buildings_BSO-toolbox.harvard
new file mode 100644
index 0000000..8dbda1f
--- /dev/null
+++ b/test/converted/TUe-excellent-buildings_BSO-toolbox.harvard
@@ -0,0 +1 @@
+Boonstra, S. and Hofmeyer, H. (2020) <i>BSO Toolbox</i>. doi: 10.5281/zenodo.3823893.
diff --git a/test/converted/TUe-excellent-buildings_BSO-toolbox.ieee b/test/converted/TUe-excellent-buildings_BSO-toolbox.ieee
new file mode 100644
index 0000000..8d57148
--- /dev/null
+++ b/test/converted/TUe-excellent-buildings_BSO-toolbox.ieee
@@ -0,0 +1 @@
+S. Boonstra and H. Hofmeyer, <i>BSO Toolbox</i>. 2020. doi: 10.5281/zenodo.3823893.
diff --git a/test/converted/TUe-excellent-buildings_BSO-toolbox_invalid_date.apa b/test/converted/TUe-excellent-buildings_BSO-toolbox_invalid_date.apa
index 0b55666..816c2c1 100644
--- a/test/converted/TUe-excellent-buildings_BSO-toolbox_invalid_date.apa
+++ b/test/converted/TUe-excellent-buildings_BSO-toolbox_invalid_date.apa
@@ -1 +1,2 @@
-Boonstra S., Hofmeyer H. BSO Toolbox (version 1.0). DOI: https://doi.org/10.5281/zenodo.3823893
+Boonstra, S., &amp; Hofmeyer, H. (2020). <i>BSO Toolbox</i> (Version 1.0) [Computer software]. https://doi.org/10.5281/zenodo.3823893
+
diff --git a/test/converted/TUe-excellent-buildings_BSO-toolbox_invalid_date.harvard b/test/converted/TUe-excellent-buildings_BSO-toolbox_invalid_date.harvard
new file mode 100644
index 0000000..8dbda1f
--- /dev/null
+++ b/test/converted/TUe-excellent-buildings_BSO-toolbox_invalid_date.harvard
@@ -0,0 +1 @@
+Boonstra, S. and Hofmeyer, H. (2020) <i>BSO Toolbox</i>. doi: 10.5281/zenodo.3823893.
diff --git a/test/converted/TUe-excellent-buildings_BSO-toolbox_invalid_date.ieee b/test/converted/TUe-excellent-buildings_BSO-toolbox_invalid_date.ieee
new file mode 100644
index 0000000..8d57148
--- /dev/null
+++ b/test/converted/TUe-excellent-buildings_BSO-toolbox_invalid_date.ieee
@@ -0,0 +1 @@
+S. Boonstra and H. Hofmeyer, <i>BSO Toolbox</i>. 2020. doi: 10.5281/zenodo.3823893.
diff --git a/test/converted/bjmorgan_bsym.apa b/test/converted/bjmorgan_bsym.apa
index 0bd6f9c..0c1ebd8 100644
--- a/test/converted/bjmorgan_bsym.apa
+++ b/test/converted/bjmorgan_bsym.apa
@@ -1 +1 @@
-Morgan B.J. bsym (version 1.1.0). DOI: https://doi.org/10.5281/zenodo.596912 URL: https://github.com/bjmorgan/bsym
+Morgan, B. J. <i>bsym</i> (Version 1.1.0) [Computer software]. https://doi.org/10.5281/zenodo.596912
diff --git a/test/converted/bjmorgan_bsym.harvard b/test/converted/bjmorgan_bsym.harvard
new file mode 100644
index 0000000..91006c2
--- /dev/null
+++ b/test/converted/bjmorgan_bsym.harvard
@@ -0,0 +1 @@
+Morgan, B. J. (no date) <i>bsym</i>. doi: 10.5281/zenodo.596912.
diff --git a/test/converted/bjmorgan_bsym.ieee b/test/converted/bjmorgan_bsym.ieee
new file mode 100644
index 0000000..489652b
--- /dev/null
+++ b/test/converted/bjmorgan_bsym.ieee
@@ -0,0 +1 @@
+B. J. Morgan, <i>bsym</i>. doi: 10.5281/zenodo.596912.
diff --git a/test/converted/citation-file-format_citation-file-format.apa b/test/converted/citation-file-format_citation-file-format.apa
index 4822792..357411f 100644
--- a/test/converted/citation-file-format_citation-file-format.apa
+++ b/test/converted/citation-file-format_citation-file-format.apa
@@ -1 +1 @@
-Druskat S., Spaaks J.H., Chue Hong N., Haines R., Baker J., Bliven S., Willighagen E., Pérez-Suárez D., Konovalov A. (2021). Citation File Format (version 1.1.0). DOI: https://doi.org/10.5281/zenodo.4751536 
+Druskat, S., Spaaks, J. H., Chue Hong, N., Haines, R., Baker, J., Bliven, S., Willighagen, E., Pérez-Suárez, D., &amp; Konovalov, A. (2021). <i>Citation File Format</i> (Version 1.1.0) [Computer software]. https://doi.org/10.5281/zenodo.4751536
diff --git a/test/converted/citation-file-format_citation-file-format.harvard b/test/converted/citation-file-format_citation-file-format.harvard
new file mode 100644
index 0000000..1ea0117
--- /dev/null
+++ b/test/converted/citation-file-format_citation-file-format.harvard
@@ -0,0 +1 @@
+Druskat, S. <i>et al.</i> (2021) <i>Citation File Format</i>. doi: 10.5281/zenodo.4751536.
diff --git a/test/converted/citation-file-format_citation-file-format.ieee b/test/converted/citation-file-format_citation-file-format.ieee
new file mode 100644
index 0000000..8a08ac7
--- /dev/null
+++ b/test/converted/citation-file-format_citation-file-format.ieee
@@ -0,0 +1 @@
+S. Druskat <i>et al.</i>, <i>Citation File Format</i>. 2021. doi: 10.5281/zenodo.4751536.
diff --git a/test/converted/complete.harvard b/test/converted/complete.harvard
new file mode 100644
index 0000000..e69de29
diff --git a/test/converted/complete.ieee b/test/converted/complete.ieee
new file mode 100644
index 0000000..e69de29
diff --git a/test/converted/esalmela_HaploWinder.apa b/test/converted/esalmela_HaploWinder.apa
index d5c3ab6..31a9d5e 100644
--- a/test/converted/esalmela_HaploWinder.apa
+++ b/test/converted/esalmela_HaploWinder.apa
@@ -1 +1 @@
-Salmela E. (2008). HaploWinder (version 1.11). DOI: https://doi.org/10.5281/zenodo.3901323 
+Salmela, E. (2008). <i>HaploWinder</i> (Version 1.11) [Computer software]. https://doi.org/10.5281/zenodo.3901323
diff --git a/test/converted/esalmela_HaploWinder.harvard b/test/converted/esalmela_HaploWinder.harvard
new file mode 100644
index 0000000..180be57
--- /dev/null
+++ b/test/converted/esalmela_HaploWinder.harvard
@@ -0,0 +1 @@
+Salmela, E. (2008) <i>HaploWinder</i>. doi: 10.5281/zenodo.3901323.
diff --git a/test/converted/esalmela_HaploWinder.ieee b/test/converted/esalmela_HaploWinder.ieee
new file mode 100644
index 0000000..6c436eb
--- /dev/null
+++ b/test/converted/esalmela_HaploWinder.ieee
@@ -0,0 +1 @@
+E. Salmela, <i>HaploWinder</i>. 2008. doi: 10.5281/zenodo.3901323.
diff --git a/test/converted/example-1.apa b/test/converted/example-1.apa
index 9c2ae2a..40c7337 100644
--- a/test/converted/example-1.apa
+++ b/test/converted/example-1.apa
@@ -1 +1 @@
-Druskat S. (2017). My Research Software (version 2.0.4). DOI: https://doi.org/10.5281/zenodo.1234 
+Druskat, S. (2017). <i>My Research Software</i> (Version 2.0.4) [Computer software]. https://doi.org/10.5281/zenodo.1234
diff --git a/test/converted/example-1.harvard b/test/converted/example-1.harvard
new file mode 100644
index 0000000..ff888c5
--- /dev/null
+++ b/test/converted/example-1.harvard
@@ -0,0 +1 @@
+Druskat, S. (2017) <i>My Research Software</i>. doi: 10.5281/zenodo.1234.
diff --git a/test/converted/example-1.ieee b/test/converted/example-1.ieee
new file mode 100644
index 0000000..452f41e
--- /dev/null
+++ b/test/converted/example-1.ieee
@@ -0,0 +1 @@
+S. Druskat, <i>My Research Software</i>. 2017. doi: 10.5281/zenodo.1234.
diff --git a/test/converted/ls1mardyn_ls1-mardyn.harvard b/test/converted/ls1mardyn_ls1-mardyn.harvard
new file mode 100644
index 0000000..e69de29
diff --git a/test/converted/ls1mardyn_ls1-mardyn.ieee b/test/converted/ls1mardyn_ls1-mardyn.ieee
new file mode 100644
index 0000000..e69de29
diff --git a/test/converted/ls1mardyn_ls1-mardyn_invalid_author_array.harvard b/test/converted/ls1mardyn_ls1-mardyn_invalid_author_array.harvard
new file mode 100644
index 0000000..e69de29
diff --git a/test/converted/ls1mardyn_ls1-mardyn_invalid_author_array.ieee b/test/converted/ls1mardyn_ls1-mardyn_invalid_author_array.ieee
new file mode 100644
index 0000000..e69de29
diff --git a/test/converted/minimal.apa b/test/converted/minimal.apa
index fc5bd16..72ad06a 100644
--- a/test/converted/minimal.apa
+++ b/test/converted/minimal.apa
@@ -1 +1 @@
-Haines R. (2018). Ruby CFF Library (version 0.4.0). 
\ No newline at end of file
+Haines, R. (2018). <i>Ruby CFF Library</i> (Version 0.4.0) [Computer software].
diff --git a/test/converted/minimal.harvard b/test/converted/minimal.harvard
new file mode 100644
index 0000000..a783230
--- /dev/null
+++ b/test/converted/minimal.harvard
@@ -0,0 +1 @@
+Haines, R. (2018) <i>Ruby CFF Library</i>.
diff --git a/test/converted/minimal.ieee b/test/converted/minimal.ieee
new file mode 100644
index 0000000..b742611
--- /dev/null
+++ b/test/converted/minimal.ieee
@@ -0,0 +1 @@
+R. Haines, <i>Ruby CFF Library</i>. 2018.
diff --git a/test/converted/short.apa b/test/converted/short.apa
index fc5bd16..72ad06a 100644
--- a/test/converted/short.apa
+++ b/test/converted/short.apa
@@ -1 +1 @@
-Haines R. (2018). Ruby CFF Library (version 0.4.0). 
\ No newline at end of file
+Haines, R. (2018). <i>Ruby CFF Library</i> (Version 0.4.0) [Computer software].
diff --git a/test/converted/short.harvard b/test/converted/short.harvard
new file mode 100644
index 0000000..a783230
--- /dev/null
+++ b/test/converted/short.harvard
@@ -0,0 +1 @@
+Haines, R. (2018) <i>Ruby CFF Library</i>.
diff --git a/test/converted/short.ieee b/test/converted/short.ieee
new file mode 100644
index 0000000..b742611
--- /dev/null
+++ b/test/converted/short.ieee
@@ -0,0 +1 @@
+R. Haines, <i>Ruby CFF Library</i>. 2018.
diff --git a/test/converted/xenon-middleware_xenon-adaptors-cloud.apa b/test/converted/xenon-middleware_xenon-adaptors-cloud.apa
index b5a1fe5..0745723 100644
--- a/test/converted/xenon-middleware_xenon-adaptors-cloud.apa
+++ b/test/converted/xenon-middleware_xenon-adaptors-cloud.apa
@@ -1 +1 @@
-Verhoeven S., Maassen J., van der Ploeg A. (2019). Cloud related adaptors for Xenon (version 3.0.2). DOI: https://doi.org/10.5281/zenodo.3245389 URL: https://github.com/xenon-middleware/xenon-adaptors-cloud
+Verhoeven, S., Maassen, J., &amp; Ploeg, A. (2019). <i>Cloud related adaptors for Xenon</i> (Version 3.0.2) [Computer software]. https://doi.org/10.5281/zenodo.3245389
diff --git a/test/converted/xenon-middleware_xenon-adaptors-cloud.harvard b/test/converted/xenon-middleware_xenon-adaptors-cloud.harvard
new file mode 100644
index 0000000..337ee83
--- /dev/null
+++ b/test/converted/xenon-middleware_xenon-adaptors-cloud.harvard
@@ -0,0 +1 @@
+Verhoeven, S., Maassen, J. and Ploeg, A. (2019) <i>Cloud related adaptors for Xenon</i>. doi: 10.5281/zenodo.3245389.
diff --git a/test/converted/xenon-middleware_xenon-adaptors-cloud.ieee b/test/converted/xenon-middleware_xenon-adaptors-cloud.ieee
new file mode 100644
index 0000000..988ffa6
--- /dev/null
+++ b/test/converted/xenon-middleware_xenon-adaptors-cloud.ieee
@@ -0,0 +1 @@
+S. Verhoeven, J. Maassen, and A. Ploeg, <i>Cloud related adaptors for Xenon</i>. 2019. doi: 10.5281/zenodo.3245389.

From 4e15e08efe8e57efd547f392f776a4546c6eb870 Mon Sep 17 00:00:00 2001
From: Martin Fenner <martin@front-matter.io>
Date: Thu, 5 Aug 2021 02:19:10 +0200
Subject: [PATCH 2/6] handle complex names

---
 lib/cff/formatter/csl_formatter.rb               |  8 +++++---
 test/cff_csl_formatter_test.rb                   | 16 +++++++++++++++-
 test/converted/complete.apa                      |  2 +-
 test/converted/complete.harvard                  |  1 +
 test/converted/complete.ieee                     |  1 +
 test/converted/ls1mardyn_ls1-mardyn.apa          |  2 +-
 test/converted/ls1mardyn_ls1-mardyn.harvard      |  1 +
 test/converted/ls1mardyn_ls1-mardyn.ieee         |  1 +
 .../xenon-middleware_xenon-adaptors-cloud.apa    |  2 +-
 ...xenon-middleware_xenon-adaptors-cloud.harvard |  2 +-
 .../xenon-middleware_xenon-adaptors-cloud.ieee   |  2 +-
 11 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/lib/cff/formatter/csl_formatter.rb b/lib/cff/formatter/csl_formatter.rb
index 82a0754..20b4ec1 100644
--- a/lib/cff/formatter/csl_formatter.rb
+++ b/lib/cff/formatter/csl_formatter.rb
@@ -40,7 +40,7 @@ def self.format(model:, style: 'apa', locale: 'en-US')
 
       # citeproc_hsh is input format for citeproc-ruby
       citeproc_hsh = {
-        # using type book is workaround for current CSL version
+        # using type book is workaround for software for current CSL version
         'type' => 'book',
         'id' => present?(model.doi) ? "https://doi.org/#{model.doi}" : nil,
         'categories' => Array.wrap(model.keywords),
@@ -67,9 +67,11 @@ def self.format(model:, style: 'apa', locale: 'en-US')
     def self.to_citeproc(element)
       Array.wrap(element).map do |a|
         {
-          'family' => a.fields['family-names'],
           'given' => a.fields['given-names'],
-          'literal' => present?(a.fields['family-names']) ? a.fields['name'] : nil
+          'non-dropping-particle' => a.fields['name-particle'],
+          'family' => a.fields['family-names'],
+          'suffix' => a.fields['name-suffix'],
+          'literal' => a.fields['name']
         }.compact
       end
     end
diff --git a/test/cff_csl_formatter_test.rb b/test/cff_csl_formatter_test.rb
index 8d9ca1e..73e6302 100644
--- a/test/cff_csl_formatter_test.rb
+++ b/test/cff_csl_formatter_test.rb
@@ -41,6 +41,20 @@ class CFFCslFormatterTest < Minitest::Test
 
   def test_can_tolerate_invalid_file
     cff = CFF::Model.new(nil)
-    assert_nil cff.to_apalike
+    assert_nil cff.to_apa
+  end
+
+  describe 'get_date_parts' do
+    def test_year_month_day
+      assert_equal({ 'date-parts' => [[2021, 2, 3]] }, ::CFF::CslFormatter.get_date_parts('2021-02-03'))
+    end
+
+    def test_year_month
+      assert_equal({ 'date-parts' => [[2021, 2]] }, ::CFF::CslFormatter.get_date_parts('2021-02'))
+    end
+
+    def test_year
+      assert_equal({ 'date-parts' => [[2021]] }, ::CFF::CslFormatter.get_date_parts('2021'))
+    end
   end
 end
diff --git a/test/converted/complete.apa b/test/converted/complete.apa
index 2647285..7d599ef 100644
--- a/test/converted/complete.apa
+++ b/test/converted/complete.apa
@@ -1 +1 @@
-van der Real Person IV O.T., Entity Project Team Conference entity. (2017). Citation File Format 1.0.0 (version 1.0.0). DOI: https://doi.org/10.5281/zenodo.1003150 URL: http://foo.com/blah_(wikipedia)_blah#cite-1
+van der Real Person, O. T., IV, &amp; Entity Project Team Conference entity. (2017). <i>Citation File Format 1.0.0</i> (Version 1.0.0) [Computer software]. https://doi.org/10.5281/zenodo.1003150
diff --git a/test/converted/complete.harvard b/test/converted/complete.harvard
index e69de29..3dddef5 100644
--- a/test/converted/complete.harvard
+++ b/test/converted/complete.harvard
@@ -0,0 +1 @@
+Real Person, O. T. van der, IV and Entity Project Team Conference entity (2017) <i>Citation File Format 1.0.0</i>. doi: 10.5281/zenodo.1003150.
diff --git a/test/converted/complete.ieee b/test/converted/complete.ieee
index e69de29..8612770 100644
--- a/test/converted/complete.ieee
+++ b/test/converted/complete.ieee
@@ -0,0 +1 @@
+O. T. van der Real Person IV and Entity Project Team Conference entity, <i>Citation File Format 1.0.0</i>. 2017. doi: 10.5281/zenodo.1003150.
diff --git a/test/converted/ls1mardyn_ls1-mardyn.apa b/test/converted/ls1mardyn_ls1-mardyn.apa
index b94e340..b742136 100644
--- a/test/converted/ls1mardyn_ls1-mardyn.apa
+++ b/test/converted/ls1mardyn_ls1-mardyn.apa
@@ -1 +1 @@
-Boltzmann-Zuse Society for Computational Molecular Engineering. (2018). ls1 mardyn (version Internal development version, situated between release 1.1.1 and prospective future release 1.2). URL: https://projects.hlrs.de/projects/ls1/
+Boltzmann-Zuse Society for Computational Molecular Engineering. (2018). <i>ls1 mardyn</i> (Internal development version, situated between release 1.1.1 and prospective future release 1.2) [Computer software]. https://projects.hlrs.de/projects/ls1/
diff --git a/test/converted/ls1mardyn_ls1-mardyn.harvard b/test/converted/ls1mardyn_ls1-mardyn.harvard
index e69de29..3eef30d 100644
--- a/test/converted/ls1mardyn_ls1-mardyn.harvard
+++ b/test/converted/ls1mardyn_ls1-mardyn.harvard
@@ -0,0 +1 @@
+Boltzmann-Zuse Society for Computational Molecular Engineering (2018) <i>ls1 mardyn</i>. Available at: https://projects.hlrs.de/projects/ls1/.
diff --git a/test/converted/ls1mardyn_ls1-mardyn.ieee b/test/converted/ls1mardyn_ls1-mardyn.ieee
index e69de29..8e9beeb 100644
--- a/test/converted/ls1mardyn_ls1-mardyn.ieee
+++ b/test/converted/ls1mardyn_ls1-mardyn.ieee
@@ -0,0 +1 @@
+Boltzmann-Zuse Society for Computational Molecular Engineering, <i>ls1 mardyn</i>. 2018.Available: https://projects.hlrs.de/projects/ls1/
diff --git a/test/converted/xenon-middleware_xenon-adaptors-cloud.apa b/test/converted/xenon-middleware_xenon-adaptors-cloud.apa
index 0745723..125b0b4 100644
--- a/test/converted/xenon-middleware_xenon-adaptors-cloud.apa
+++ b/test/converted/xenon-middleware_xenon-adaptors-cloud.apa
@@ -1 +1 @@
-Verhoeven, S., Maassen, J., &amp; Ploeg, A. (2019). <i>Cloud related adaptors for Xenon</i> (Version 3.0.2) [Computer software]. https://doi.org/10.5281/zenodo.3245389
+Verhoeven, S., Maassen, J., &amp; van der Ploeg, A. (2019). <i>Cloud related adaptors for Xenon</i> (Version 3.0.2) [Computer software]. https://doi.org/10.5281/zenodo.3245389
diff --git a/test/converted/xenon-middleware_xenon-adaptors-cloud.harvard b/test/converted/xenon-middleware_xenon-adaptors-cloud.harvard
index 337ee83..1fa64ec 100644
--- a/test/converted/xenon-middleware_xenon-adaptors-cloud.harvard
+++ b/test/converted/xenon-middleware_xenon-adaptors-cloud.harvard
@@ -1 +1 @@
-Verhoeven, S., Maassen, J. and Ploeg, A. (2019) <i>Cloud related adaptors for Xenon</i>. doi: 10.5281/zenodo.3245389.
+Verhoeven, S., Maassen, J. and Ploeg, A. van der (2019) <i>Cloud related adaptors for Xenon</i>. doi: 10.5281/zenodo.3245389.
diff --git a/test/converted/xenon-middleware_xenon-adaptors-cloud.ieee b/test/converted/xenon-middleware_xenon-adaptors-cloud.ieee
index 988ffa6..f25e9c8 100644
--- a/test/converted/xenon-middleware_xenon-adaptors-cloud.ieee
+++ b/test/converted/xenon-middleware_xenon-adaptors-cloud.ieee
@@ -1 +1 @@
-S. Verhoeven, J. Maassen, and A. Ploeg, <i>Cloud related adaptors for Xenon</i>. 2019. doi: 10.5281/zenodo.3245389.
+S. Verhoeven, J. Maassen, and A. van der Ploeg, <i>Cloud related adaptors for Xenon</i>. 2019. doi: 10.5281/zenodo.3245389.

From 3f2d12f354ee2f58f89200e429f304394b0d395d Mon Sep 17 00:00:00 2001
From: Martin Fenner <martin@front-matter.io>
Date: Thu, 5 Aug 2021 12:34:52 +0200
Subject: [PATCH 3/6] fix rubocop linting

---
 lib/cff/formatter/csl_formatter.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/cff/formatter/csl_formatter.rb b/lib/cff/formatter/csl_formatter.rb
index 20b4ec1..9fd6f8a 100644
--- a/lib/cff/formatter/csl_formatter.rb
+++ b/lib/cff/formatter/csl_formatter.rb
@@ -30,7 +30,7 @@ module CFF
   # and the Ruby Citeproc processor
   class CslFormatter < Formatter # :nodoc:
 
-    def self.format(model:, style: 'apa', locale: 'en-US')
+    def self.format(model:, style: 'apa', locale: 'en-US') # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
       return nil unless required_fields?(model)
 
       CSL::Style.root = ::File.expand_path('../../../lib/styles', __dir__)

From 3503e6a83eb67a0f74b3dffe3bf9e92ce7c9901c Mon Sep 17 00:00:00 2001
From: Martin Fenner <martin@front-matter.io>
Date: Thu, 5 Aug 2021 15:37:27 +0200
Subject: [PATCH 4/6] more testing

---
 lib/cff/formatter/csl_formatter.rb  |  2 ++
 test/{cff_test.rb => array_test.rb} | 14 +++++++++-----
 test/cff_csl_formatter_test.rb      | 10 ++++++++++
 test/test_helper.rb                 |  2 ++
 4 files changed, 23 insertions(+), 5 deletions(-)
 rename test/{cff_test.rb => array_test.rb} (75%)

diff --git a/lib/cff/formatter/csl_formatter.rb b/lib/cff/formatter/csl_formatter.rb
index 9fd6f8a..94a1830 100644
--- a/lib/cff/formatter/csl_formatter.rb
+++ b/lib/cff/formatter/csl_formatter.rb
@@ -32,6 +32,8 @@ class CslFormatter < Formatter # :nodoc:
 
     def self.format(model:, style: 'apa', locale: 'en-US') # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
       return nil unless required_fields?(model)
+      # only support built-in styles
+      return nil unless ['apa', 'harvard-cite-them-right', 'ieee'].include? style
 
       CSL::Style.root = ::File.expand_path('../../../lib/styles', __dir__)
       CSL::Locale.root = ::File.expand_path('../../../lib/locales', __dir__)
diff --git a/test/cff_test.rb b/test/array_test.rb
similarity index 75%
rename from test/cff_test.rb
rename to test/array_test.rb
index 4c18bde..c869bb4 100644
--- a/test/cff_test.rb
+++ b/test/array_test.rb
@@ -16,13 +16,17 @@
 
 require 'test_helper'
 
-class CFFTest < Minitest::Test
+class ArrayTest < Minitest::Test
 
-  def test_that_it_has_a_version_number
-    refute_nil ::CFF::VERSION
+  def test_array_one
+    assert_equal([3], Array.wrap(3))
   end
 
-  def test_that_it_has_a_spec_version_number
-    refute_nil ::CFF::DEFAULT_SPEC_VERSION
+  def test_array_two
+    assert_equal([3, 4], Array.wrap([3, 4]))
+  end
+
+  def test_empty_array
+    assert_empty(Array.wrap(nil))
   end
 end
diff --git a/test/cff_csl_formatter_test.rb b/test/cff_csl_formatter_test.rb
index 73e6302..250cd05 100644
--- a/test/cff_csl_formatter_test.rb
+++ b/test/cff_csl_formatter_test.rb
@@ -39,6 +39,16 @@ class CFFCslFormatterTest < Minitest::Test
     end
   end
 
+  def test_all_supported_styles_installed
+    assert_equal ['ieee.csl', 'harvard-cite-them-right.csl', 'apa.csl'], (Dir.glob('lib/styles/*.csl').map { |f| f.split('/').last })
+  end
+
+  # unsupported styles should return nil
+  def test_handle_unsupported_style
+    model = ::CFF::Model.new('title')
+    assert_nil CFF::CslFormatter.format(model: model, style: 'mla')
+  end
+
   def test_can_tolerate_invalid_file
     cff = CFF::Model.new(nil)
     assert_nil cff.to_apa
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 74c05f1..45e0a4f 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -36,6 +36,8 @@
 VALIDATION_DIR = ::File.join(FILES_DIR, 'validation')
 CONVERTED_DIR = ::File.expand_path('converted', __dir__)
 
+STYLES_DIR = ::File.expand_path('../styles', __dir__)
+
 CONSTRUCT_OPTS = {
   keep_on_error: true
 }.freeze

From 3302a9699f1c501351efe0443c2df3eb822ff2dd Mon Sep 17 00:00:00 2001
From: Martin Fenner <martin@front-matter.io>
Date: Thu, 5 Aug 2021 15:44:45 +0200
Subject: [PATCH 5/6] added more tests

---
 lib/cff/formatter/csl_formatter.rb | 5 +++--
 test/cff_csl_formatter_test.rb     | 4 ++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/cff/formatter/csl_formatter.rb b/lib/cff/formatter/csl_formatter.rb
index 94a1830..18fe03a 100644
--- a/lib/cff/formatter/csl_formatter.rb
+++ b/lib/cff/formatter/csl_formatter.rb
@@ -31,10 +31,11 @@ module CFF
   class CslFormatter < Formatter # :nodoc:
 
     def self.format(model:, style: 'apa', locale: 'en-US') # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
-      return nil unless required_fields?(model)
       # only support built-in styles
       return nil unless ['apa', 'harvard-cite-them-right', 'ieee'].include? style
 
+      return nil unless required_fields?(model)
+
       CSL::Style.root = ::File.expand_path('../../../lib/styles', __dir__)
       CSL::Locale.root = ::File.expand_path('../../../lib/locales', __dir__)
 
@@ -86,7 +87,7 @@ def self.get_date_parts(iso8601_time)
       month = iso8601_time[5..6].to_i
       day = iso8601_time[8..9].to_i
       { 'date-parts' => [[year, month, day].reject(&:zero?)] }
-    rescue TypeError
+    rescue TypeError, NoMethodError
       nil
     end
   end
diff --git a/test/cff_csl_formatter_test.rb b/test/cff_csl_formatter_test.rb
index 250cd05..9a14132 100644
--- a/test/cff_csl_formatter_test.rb
+++ b/test/cff_csl_formatter_test.rb
@@ -66,5 +66,9 @@ def test_year_month
     def test_year
       assert_equal({ 'date-parts' => [[2021]] }, ::CFF::CslFormatter.get_date_parts('2021'))
     end
+
+    def test_invalid_date
+      assert_nil ::CFF::CslFormatter.get_date_parts([2021])
+    end
   end
 end

From ddd5486811ea79a2cf7020184b95619174771f37 Mon Sep 17 00:00:00 2001
From: Martin Fenner <martin@front-matter.io>
Date: Fri, 6 Aug 2021 15:21:00 +0200
Subject: [PATCH 6/6] use latest citeproc-ruby

---
 cff.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cff.gemspec b/cff.gemspec
index e461341..717d197 100644
--- a/cff.gemspec
+++ b/cff.gemspec
@@ -48,7 +48,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.6'
 
-  spec.add_runtime_dependency 'citeproc-ruby', '~> 1.1', '>= 1.1.10'
+  spec.add_runtime_dependency 'citeproc-ruby', '~> 1.1', '>= 1.1.14'
   spec.add_runtime_dependency 'json_schema', '~> 0.21.0'
   spec.add_runtime_dependency 'language_list', '~> 1.2'