Changeset 67184 in spip-zone


Ignore:
Timestamp:
Oct 26, 2012, 8:39:17 PM (7 years ago)
Author:
joseph@…
Message:

mise à jour des styles CSL

Location:
_plugins_/zotspip
Files:
44 edited

Legend:

Unmodified
Added
Removed
  • _plugins_/zotspip/branches/v1/csl/ama.csl

    r59617 r67184  
    55    <id>http://www.zotero.org/styles/american-medical-association</id>
    66    <link href="http://www.zotero.org/styles/american-medical-association" rel="self"/>
     7    <link href="http://www.samford.edu/schools/pharmacy/dic/amaquickref07.pdf" rel="documentation"/>
    78    <author>
    89      <name>Julian Onions</name>
     
    1112    <category citation-format="numeric"/>
    1213    <category field="medicine"/>
    13     <updated>2012-02-07T01:46:04+00:00</updated>
    1414    <summary>The American Medical Association style as used in JAMA.</summary>
    15     <link href="http://www.samford.edu/schools/pharmacy/dic/amaquickref07.pdf" rel="documentation"/>
    16     <rights>This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
     15    <updated>2012-10-01T03:10:36+00:00</updated>
     16    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
    1717  </info>
    1818  <macro name="editor">
    1919    <names variable="editor">
    2020      <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
    21       <label form="short" prefix=", " text-case="lowercase" suffix="." strip-periods="true"/>
     21      <label form="short" prefix=", "/>
    2222    </names>
    23   </macro>
    24   <macro name="anon">
    25     <text term="anonymous" form="short" text-case="capitalize-first" strip-periods="true"/>
    2623  </macro>
    2724  <macro name="author">
     
    2926      <names variable="author">
    3027        <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
    31         <label form="short" prefix=" " suffix="" text-case="lowercase" strip-periods="true"/>
     28        <label form="short" prefix=", "/>
    3229        <substitute>
    3330          <names variable="editor"/>
    34           <text macro="anon"/>
     31          <text macro="title"/>
    3532        </substitute>
    3633      </names>
     
    4340        <names variable="editor"/>
    4441        <names variable="translator"/>
    45         <text macro="anon"/>
    4642      </substitute>
    4743    </names>
     
    7167  <macro name="title">
    7268    <choose>
    73       <if type="bill book graphic legal_case motion_picture report song" match="any">
     69      <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
    7470        <text variable="title" font-style="italic"/>
    7571      </if>
     
    104100        <group delimiter=" ">
    105101          <number variable="edition" form="ordinal"/>
    106           <text term="edition" form="short" suffix="." strip-periods="true"/>
     102          <text term="edition" form="short"/>
    107103        </group>
    108104      </if>
     
    130126      <text macro="title" prefix=" " suffix="."/>
    131127      <choose>
    132         <if type="bill book graphic legal_case motion_picture report song" match="any">
     128        <if type="bill book graphic legislation motion_picture report song" match="any">
    133129          <group suffix="." prefix=" " delimiter=" ">
    134130            <text macro="edition"/>
     
    199195          </choose>
    200196        </else-if>
     197        <else-if type="legal_case">
     198          <group suffix="," prefix=" " delimiter=" ">
     199            <text macro="editor" prefix="(" suffix=")"/>
     200          </group>
     201          <group prefix=" " delimiter=" ">
     202            <text variable="container-title"/>
     203            <text variable="volume"/>
     204          </group>
     205          <text variable="page" prefix=", " suffix=" "/>
     206          <group prefix="(" suffix=")." delimiter=" ">
     207            <text variable="authority"/>
     208            <date variable="issued">
     209              <date-part name="year"/>
     210            </date>
     211          </group>
     212        </else-if>
    201213        <else>
    202214          <text macro="editor" prefix=" " suffix="."/>
  • _plugins_/zotspip/branches/v1/csl/apa.csl

    r59617 r67184  
    11<?xml version="1.0" encoding="utf-8"?>
    22<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="never">
     3  <!-- This style was edited with the Visual CSL Editor (http://steveridout.com/csl/visualEditor/) -->
    34  <info>
    45    <title>American Psychological Association 6th Edition</title>
     
    2425      <name>Sebastian Karcher</name>
    2526    </contributor>
     27    <category citation-format="author-date"/>
    2628    <category field="psychology"/>
    2729    <category field="generic-base"/>
    28     <category citation-format="author-date"/>
    29     <updated>2012-03-01T23:01:02+00:00</updated>
    30     <rights>This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
     30    <updated>2012-09-28T02:06:38+00:00</updated>
     31    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
    3132  </info>
    3233  <locale xml:lang="en">
    3334    <terms>
     35      <term name="editortranslator" form="short">
     36        <single>ed. &amp; trans.</single>
     37        <multiple>eds. &amp; trans.</multiple>
     38      </term>
    3439      <term name="translator" form="short">
    3540        <single>trans.</single>
     
    4146    <choose>
    4247      <if type="chapter paper-conference" match="any">
    43         <text term="in" text-case="capitalize-first" suffix=" "/>
    44         <names variable="editor" delimiter=", " suffix=", ">
     48        <names variable="editor translator" delimiter=", " suffix=", ">
    4549          <name and="symbol" initialize-with=". " delimiter=", "/>
    46           <label form="short" prefix=" (" text-case="capitalize-first" suffix=")"/>
    47           <substitute>
    48             <names variable="translator"/>
    49           </substitute>
     50          <label form="short" prefix=" (" text-case="title" suffix=")"/>
    5051        </names>
    5152      </if>
     
    5556    <choose>
    5657      <if type="chapter paper-conference" match="none">
    57         <names variable="translator" delimiter=", " prefix=" (" suffix=")">
     58        <names variable="translator editor" delimiter=", " prefix=" (" suffix=")">
    5859          <name and="symbol" initialize-with=". " delimiter=", "/>
    59           <label form="short" prefix=", " text-case="capitalize-first" suffix=""/>
    60           <substitute>
    61             <names variable="editor"/>
    62           </substitute>
     60          <label form="short" prefix=", " text-case="title" suffix=""/>
    6361        </names>
    6462      </if>
     
    6866    <names variable="author">
    6967      <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
    70       <label form="short" prefix=" (" suffix=".)" text-case="capitalize-first" strip-periods="true"/>
     68      <label form="short" prefix=" (" suffix=")" text-case="capitalize-first"/>
    7169      <substitute>
    7270        <names variable="editor"/>
     
    9593            <text variable="title" form="short" font-style="italic"/>
    9694          </if>
    97           <else-if type="bill book graphic legal_case motion_picture song" match="any">
     95          <else-if type="bill book graphic legal_case legislation motion_picture song" match="any">
    9896            <text variable="title" form="short" font-style="italic"/>
    9997          </else-if>
     
    164162      <if type="report thesis" match="any">
    165163        <text variable="title" font-style="italic"/>
    166         <group prefix=" (" suffix=")">
     164        <group prefix=" (" suffix=")" delimiter=" ">
    167165          <text variable="genre"/>
    168           <text variable="number" prefix=" No. "/>
     166          <text variable="number" prefix="No. "/>
    169167        </group>
    170168      </if>
     
    198196            </if>
    199197          </choose>
    200           <group delimiter=": ">
    201             <text variable="publisher-place"/>
    202             <text variable="publisher"/>
    203           </group>
     198          <choose>
     199            <if type="article-journal article-magazine" match="none">
     200              <group delimiter=": ">
     201                <text variable="publisher-place"/>
     202                <text variable="publisher"/>
     203              </group>
     204            </if>
     205          </choose>
    204206        </group>
    205207      </else>
     
    227229  <macro name="issued">
    228230    <choose>
    229       <if type="legal_case bill" match="none">
    230         <choose>
    231           <if variable="issued">
    232             <group prefix=" (" suffix=").">
    233               <date variable="issued">
    234                 <date-part name="year"/>
    235               </date>
    236               <text variable="year-suffix"/>
    237               <choose>
    238                 <if type="bill book graphic legal_case motion_picture report song article-journal chapter paper-conference" match="none">
    239                   <date variable="issued">
    240                     <date-part prefix=", " name="month"/>
    241                     <date-part prefix=" " name="day"/>
    242                   </date>
    243                 </if>
    244               </choose>
    245             </group>
    246           </if>
    247           <else>
    248             <group prefix=" (" suffix=").">
    249               <text term="no date" form="short"/>
    250               <text variable="year-suffix" prefix="-"/>
    251             </group>
    252           </else>
    253         </choose>
     231      <if type="bill legal_case legislation" match="none">
     232        <choose>
     233          <if variable="issued">
     234            <group prefix=" (" suffix=")">
     235              <date variable="issued">
     236                <date-part name="year"/>
     237              </date>
     238              <text variable="year-suffix"/>
     239              <choose>
     240                <if type="article-journal bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="none">
     241                  <date variable="issued">
     242                    <date-part prefix=", " name="month"/>
     243                    <date-part prefix=" " name="day"/>
     244                  </date>
     245                </if>
     246              </choose>
     247            </group>
     248          </if>
     249          <else>
     250            <group prefix=" (" suffix=")">
     251              <text term="no date" form="short"/>
     252              <text variable="year-suffix" prefix="-"/>
     253            </group>
     254          </else>
     255        </choose>
    254256      </if>
    255257    </choose>
     
    257259  <macro name="issued-sort">
    258260    <choose>
    259       <if type="bill book graphic legal_case motion_picture report song article-journal chapter paper-conference" match="none">
     261      <if type="article-journal bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="none">
    260262        <date variable="issued">
    261263          <date-part name="year"/>
    262           <date-part prefix=", " name="month"/>
    263           <date-part prefix=" " name="day"/>
     264          <date-part name="month"/>
     265          <date-part name="day"/>
    264266        </date>
    265267      </if>
     
    290292        <group delimiter=" ">
    291293          <number variable="edition" form="ordinal"/>
    292           <text term="edition" form="short" suffix="." strip-periods="true"/>
     294          <text term="edition" form="short"/>
    293295        </group>
    294296      </if>
     
    319321          <text macro="edition"/>
    320322          <group>
    321             <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=". " strip-periods="true"/>
     323            <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
    322324            <number variable="number-of-volumes" form="numeric" prefix="1-"/>
    323325          </group>
    324326          <group>
    325             <text term="volume" form="short" text-case="capitalize-first" suffix=". " strip-periods="true"/>
     327            <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
    326328            <number variable="volume" form="numeric"/>
    327329          </group>
     
    333335      </else-if>
    334336      <else-if type="legal_case">
    335         <group prefix=" (" suffix=")" delimiter=" ">
    336           <text variable="authority"/>
    337           <date variable="issued" delimiter=" ">
    338             <date-part name="month" form="short"/>
    339             <date-part name="day" suffix=","/>
    340             <date-part name="year"/>
    341           </date>
    342         </group>
    343       </else-if>
    344       <else-if type="bill">
    345         <date variable="issued" prefix=" (" suffix=")" >
    346           <date-part name="year"/>
    347         </date>
     337        <group prefix=" (" suffix=")" delimiter=" ">
     338          <text variable="authority"/>
     339          <date variable="issued" delimiter=" ">
     340            <date-part name="month" form="short"/>
     341            <date-part name="day" suffix=","/>
     342            <date-part name="year"/>
     343          </date>
     344        </group>
     345      </else-if>
     346      <else-if type="bill legislation">
     347        <date variable="issued" prefix=" (" suffix=")">
     348          <date-part name="year"/>
     349        </date>
    348350      </else-if>
    349351    </choose>
     
    356358  </macro>
    357359  <macro name="container">
    358     <choose>
    359       <if type="legal_case bill" match="none">
    360         <text variable="container-title" font-style="italic"/>
    361       </if>
    362       <else>
    363         <group delimiter=" " prefix=", ">
    364           <choose>
    365             <if variable="container-title">
    366               <text variable="volume"/>
    367               <text variable="container-title"/>
    368               <group delimiter=" ">
    369                 <!--change to label variable="section" as that becomes available -->
    370                 <text term="section" form="symbol"/>
    371                 <text variable="section"/>
    372               </group>
    373               <text variable="page"/>
    374             </if>
    375             <else>
    376               <choose>
    377                 <if type="legal_case">
    378                   <text variable ="number" prefix="No. "/>
    379                 </if>
    380                 <else>
    381                   <text variable ="number" prefix="Pub. L. No. "/>
    382                   <group delimiter=" ">
    383                     <!--change to label variable="section" as that becomes available -->
    384                     <text term="section" form="symbol"/>
    385                     <text variable="section"/>
    386                   </group>
    387                 </else>
    388               </choose>
    389             </else>
    390           </choose>
    391         </group>
     360    <group>
     361      <choose>
     362        <if type="chapter paper-conference entry-encyclopedia" match="any">
     363          <text term="in" text-case="capitalize-first" suffix=" "/>
     364        </if>
     365      </choose>
     366      <text macro="container-contributors"/>
     367      <text macro="secondary-contributors"/>
     368      <text macro="container-title"/>
     369    </group>
     370  </macro>
     371  <macro name="container-title">
     372    <choose>
     373      <if type="bill legal_case legislation" match="none">
     374        <choose>
     375          <if type="article-journal article-newspaper article-magazine">
     376            <text variable="container-title" font-style="italic"/>
     377          </if>
     378          <else>
     379            <!--Book Title and other containers should be Title Cased in APA. We're not title-casing periodicals because proper names can be tricky-->
     380            <text variable="container-title" font-style="italic" text-case="title"/>
     381          </else>
     382        </choose>
     383      </if>
     384      <else>
     385        <group delimiter=" " prefix=", ">
     386          <choose>
     387            <if variable="container-title">
     388              <text variable="volume"/>
     389              <text variable="container-title"/>
     390              <group delimiter=" ">
     391                <!--change to label variable="section" as that becomes available -->
     392                <text term="section" form="symbol"/>
     393                <text variable="section"/>
     394              </group>
     395              <text variable="page"/>
     396            </if>
     397            <else>
     398              <choose>
     399                <if type="legal_case">
     400                  <text variable="number" prefix="No. "/>
     401                </if>
     402                <else>
     403                  <text variable="number" prefix="Pub. L. No. "/>
     404                  <group delimiter=" ">
     405                    <!--change to label variable="section" as that becomes available -->
     406                    <text term="section" form="symbol"/>
     407                    <text variable="section"/>
     408                  </group>
     409                </else>
     410              </choose>
     411            </else>
     412          </choose>
     413        </group>
    392414      </else>
    393415    </choose>
     
    406428    </layout>
    407429  </citation>
    408   <bibliography hanging-indent="true" et-al-min="8" et-al-use-first="7" entry-spacing="0" line-spacing="2">
     430  <bibliography hanging-indent="true" et-al-min="8" et-al-use-first="6" et-al-use-last="true" entry-spacing="0" line-spacing="2">
    409431    <sort>
    410432      <key macro="author"/>
     
    413435    <layout>
    414436      <group suffix=".">
    415         <group delimiter=". ">
    416           <text macro="author"/>
    417           <text macro="issued" />
    418         </group>
    419437        <group delimiter=". ">
     438          <text macro="author"/>
     439          <text macro="issued"/>
    420440          <text macro="title" prefix=" "/>
    421           <group>
    422             <text macro="container-contributors"/>
    423             <text macro="secondary-contributors"/>
    424             <group delimiter=", ">
    425               <text macro="container" />
    426               <text variable="collection-title"/>
    427             </group>
    428           </group>
     441          <text macro="container"/>
    429442        </group>
    430443        <text macro="locators"/>
  • _plugins_/zotspip/branches/v1/csl/apsa.csl

    r59617 r67184  
    11<?xml version="1.0" encoding="utf-8"?>
    2 <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only">
     2<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" page-range-format="chicago" demote-non-dropping-particle="sort-only">
     3  <!-- This style was edited with the Visual CSL Editor (http://steveridout.com/csl/visualEditor/) -->
    34  <info>
    45    <title>American Political Science Association</title>
    56    <id>http://www.zotero.org/styles/apsa</id>
    67    <link href="http://www.zotero.org/styles/apsa" rel="self"/>
     8    <link href="http://www.apsanet.org/media/PDFs/Publications/APSAStyleManual2006.pdf" rel="documentation"/>
    79    <author>
    810      <name>Julian Onions</name>
     
    1416    <category citation-format="author-date"/>
    1517    <category field="political_science"/>
    16     <updated>2012-02-07T01:46:04+00:00</updated>
    1718    <summary>The American Political Science Association style.</summary>
    18     <link href="http://www.ipsonet.org/data/files/APSAStyleManual2006.pdf" rel="documentation"/>
    19     <rights>This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
     19    <updated>2012-09-15T02:11:27+00:00</updated>
     20    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
    2021  </info>
     22  <locale xml:lang="en-US">
     23    <date form="text">
     24      <date-part name="month" suffix=" "/>
     25      <date-part name="day" suffix=", "/>
     26      <date-part name="year"/>
     27    </date>
     28  </locale>
     29  <locale xml:lang="nb-NO">
     30    <date form="text">
     31      <date-part name="day" suffix=" "/>
     32      <date-part name="month" suffix=" "/>
     33      <date-part name="year"/>
     34    </date>
     35  </locale>
     36  <locale xml:lang="nn-NO">
     37    <date form="text">
     38      <date-part name="day" suffix=" "/>
     39      <date-part name="month" suffix=" "/>
     40      <date-part name="year"/>
     41    </date>
     42  </locale>
    2143  <macro name="editor">
    2244    <names variable="editor" delimiter=", ">
     
    5375              <text variable="URL"/>
    5476              <group prefix="(" suffix=")">
    55                 <text term="accessed" text-case="capitalize-first" suffix=" "/>
    56                 <date variable="accessed">
    57                   <date-part name="month" suffix=" "/>
    58                   <date-part name="day" suffix=", "/>
    59                   <date-part name="year"/>
    60                 </date>
     77                <date variable="accessed" form="text"/>
    6178              </group>
    6279            </group>
     
    6885  <macro name="title">
    6986    <choose>
    70       <if type="bill book graphic legal_case motion_picture report song" match="any">
    71         <text variable="title" font-style="italic"/>
    72       </if>
    73       <else>
    74         <text variable="title" quotes="true"/>
     87      <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
     88        <text variable="title" font-style="italic" text-case="title"/>
     89      </if>
     90      <else>
     91        <text variable="title" quotes="true" text-case="title"/>
    7592      </else>
    7693    </choose>
     
    8097      <text variable="volume"/>
    8198      <text variable="container-title"/>
    82       <text variable="page"/>
    8399    </group>
    84100    <text variable="authority" prefix=" (" suffix=")"/>
     
    139155    </choose>
    140156  </macro>
    141   <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">
     157  <citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" givenname-disambiguation-rule="primary-name" collapse="year">
    142158    <sort>
    143159      <key macro="author-short"/>
     
    154170    </layout>
    155171  </citation>
    156   <bibliography hanging-indent="true" et-al-min="4" et-al-use-first="1" subsequent-author-substitute="———">
     172  <bibliography hanging-indent="true" subsequent-author-substitute="&#8212;&#8212;&#8212;">
    157173    <sort>
    158174      <key macro="author"/>
     
    166182      </date>
    167183      <choose>
    168         <if type="bill book graphic legal_case motion_picture report song manuscript thesis" match="any">
     184        <if type="bill book graphic legal_case legislation manuscript motion_picture report song thesis" match="any">
    169185          <text macro="legal_case"/>
    170186          <group prefix=" " delimiter=" ">
     
    184200            <group suffix=".">
    185201              <text macro="publisher"/>
    186               <group prefix=", ">
    187                 <text variable="page" prefix="p. "/>
    188               </group>
     202              <text variable="page" prefix=", "/>
    189203            </group>
    190204          </group>
     
    195209            <text macro="editor"/>
    196210          </group>
     211          <choose>
     212            <if type="speech">
     213              <group prefix=" " delimiter=" " suffix=".">
     214                <text term="presented at" text-case="capitalize-first"/>
     215                <group delimiter=", ">
     216                  <text variable="event"/>
     217                  <text variable="event-place"/>
     218                </group>
     219              </group>
     220            </if>
     221          </choose>
    197222          <group prefix=" " suffix=".">
    198223            <text variable="container-title" font-style="italic"/>
  • _plugins_/zotspip/branches/v1/csl/asa.csl

    r59617 r67184  
    11<?xml version="1.0" encoding="utf-8"?>
    2 <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only">
     2<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" page-range-format="chicago">
    33  <info>
    44    <title>American Sociological Association</title>
    55    <id>http://www.zotero.org/styles/asa</id>
    66    <link href="http://www.zotero.org/styles/asa" rel="self"/>
     7    <link href="http://www.asanet.org/Quick%20Style%20Guide.pdf" rel="documentation"/>
    78    <author>
    89      <name>Julian Onions</name>
     
    1112    <category citation-format="author-date"/>
    1213    <category field="sociology"/>
    13     <updated>2012-02-07T01:46:04+00:00</updated>
    1414    <summary>The ASA style.</summary>
    15     <link href="http://www.asanet.org/Quick%20Style%20Guide.pdf" rel="documentation"/>
    16     <rights>This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
     15    <updated>2012-09-28T02:06:38+00:00</updated>
     16    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
    1717  </info>
    1818  <macro name="editor">
    1919    <names variable="editor">
    20       <label form="verb" text-case="lowercase" suffix=" "/>
     20      <label form="verb" suffix=" "/>
    2121      <name and="text" delimiter=", "/>
    2222    </names>
     
    2424  <macro name="series-editor">
    2525    <names variable="original-author">
    26       <label form="short" text-case="capitalize-first" suffix=". " strip-periods="true"/>
     26      <label form="short" text-case="capitalize-first" suffix=" "/>
    2727      <name and="text" delimiter=", "/>
    2828    </names>
     
    3333  <macro name="author">
    3434    <names variable="author">
    35       <name and="text" name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
    36       <label form="short" prefix=", " suffix="." text-case="lowercase" strip-periods="true"/>
     35      <name and="text" name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="always" initialize="false" initialize-with=". "/>
     36      <label form="short" prefix=", "/>
    3737      <substitute>
    3838        <names variable="editor"/>
    3939        <names variable="translator"/>
     40        <choose>
     41          <if type="report">
     42            <text variable="publisher"/>
     43          </if>
     44        </choose>
    4045        <text macro="anon"/>
    4146      </substitute>
     
    4853        <names variable="editor"/>
    4954        <names variable="translator"/>
     55        <choose>
     56          <if type="report">
     57            <text variable="publisher"/>
     58          </if>
     59        </choose>
    5060        <text macro="anon"/>
    5161      </substitute>
     
    5464  <macro name="access">
    5565    <group>
    56       <text term="retrieved" text-case="capitalize-first" suffix=" "/>
    57       <date variable="accessed">
    58         <date-part name="month" suffix=" "/>
    59         <date-part name="day" suffix=", "/>
    60         <date-part name="year"/>
    61       </date>
    62       <group prefix=" (" suffix=")">
    63         <text variable="URL"/>
    64       </group>
     66      <choose>
     67        <if variable="URL">
     68          <text term="retrieved" text-case="capitalize-first" suffix=" "/>
     69          <date variable="accessed">
     70            <date-part name="month" suffix=" "/>
     71            <date-part name="day" suffix=", "/>
     72            <date-part name="year"/>
     73          </date>
     74          <group prefix=" (" suffix=")">
     75            <text variable="URL"/>
     76          </group>
     77        </if>
     78      </choose>
    6579    </group>
    6680  </macro>
     
    7084        <text variable="title"/>
    7185      </if>
    72       <else-if type="bill book graphic legal_case motion_picture report song" match="any">
     86      <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
    7387        <text variable="title" font-style="italic"/>
    7488      </else-if>
     
    103117  </macro>
    104118  <macro name="pages">
    105     <label variable="page" form="short" suffix=". " text-case="capitalize-first" strip-periods="true"/>
     119    <label variable="page" form="short" suffix=" " text-case="capitalize-first"/>
    106120    <text variable="page"/>
    107121  </macro>
     
    111125        <group delimiter=" ">
    112126          <number variable="edition" form="ordinal"/>
    113           <text term="edition" form="short" suffix="." strip-periods="true"/>
     127          <text term="edition" form="short"/>
    114128        </group>
    115129      </if>
     
    120134  </macro>
    121135  <citation et-al-min="4" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" collapse="year">
     136    <sort>
     137      <key macro="author-short"/>
     138      <key macro="year-date"/>
     139    </sort>
    122140    <layout prefix="(" suffix=")" delimiter="; ">
    123141      <group delimiter=":">
     
    133151    <sort>
    134152      <key macro="author"/>
     153      <key macro="year-date"/>
    135154      <key variable="title"/>
    136155    </sort>
     
    161180          </group>
    162181        </else-if>
    163         <else-if type="bill book graphic legal_case motion_picture report song" match="any">
     182        <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
    164183          <group delimiter=" ">
    165184            <text macro="title" prefix=" " suffix="."/>
     
    202221        </else>
    203222      </choose>
    204       <text prefix=" " macro="access" suffix="."/>
     223      <text prefix=". " macro="access"/>
    205224    </layout>
    206225  </bibliography>
  • _plugins_/zotspip/branches/v1/csl/chicago-author-date.csl

    r60191 r67184  
    55    <id>http://www.zotero.org/styles/chicago-author-date</id>
    66    <link href="http://www.zotero.org/styles/chicago-author-date" rel="self"/>
     7    <link href="http://www.chicagomanualofstyle.org/tools_citationguide.html" rel="documentation"/>
    78    <author>
    89      <name>Julian Onions</name>
     
    1213      <name>Sebastian Karcher</name>
    1314    </contributor>
     15    <contributor>
     16      <name>Richard Karnesky</name>
     17      <email>karnesky+zotero@gmail.com</email>
     18      <uri>http://arc.nucapt.northwestern.edu/Richard_Karnesky</uri>
     19    </contributor>
    1420    <category citation-format="author-date"/>
    1521    <category field="generic-base"/>
    16     <updated>2012-04-03T13:46:03+00:00</updated>
    1722    <summary>The author-date variant of the Chicago style</summary>
    18     <link href="http://www.chicagomanualofstyle.org/tools_citationguide.html" rel="documentation"/>
    19     <rights>This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
     23    <updated>2012-10-26T01:15:26+00:00</updated>
     24    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
    2025  </info>
     26  <locale>
     27    <terms>
     28      <term name="editor" form="verb-short">ed.</term>
     29      <term name="translator" form="verb-short">trans.</term>
     30    </terms>
     31  </locale>
    2132  <macro name="secondary-contributors">
    2233    <choose>
     
    2637            <if variable="author">
    2738              <names variable="editor">
    28                 <label form="verb-short" text-case="capitalize-first" suffix=". " strip-periods="true"/>
     39                <label form="short" text-case="capitalize-first" suffix=" " plural="never"/>
    2940                <name and="text" delimiter=", "/>
    3041              </names>
     
    3445            <if variable="author editor" match="any">
    3546              <names variable="translator">
    36                 <label form="verb-short" text-case="capitalize-first" suffix=". " strip-periods="true"/>
     47                <label form="short" text-case="capitalize-first" suffix=" " plural="never"/>
    3748                <name and="text" delimiter=", "/>
    3849              </names>
     
    4657    <choose>
    4758      <if type="chapter paper-conference" match="any">
    48         <group prefix="," delimiter=", ">
     59        <group prefix=", " delimiter=", ">
    4960          <choose>
    5061            <if variable="author">
    5162              <names variable="editor">
    52                 <label form="verb-short" prefix=" " text-case="lowercase" suffix=". " strip-periods="true"/>
     63                <label form="short" suffix=" " plural="never"/>
    5364                <name and="text" delimiter=", "/>
    5465              </names>
     
    5768                  <group>
    5869                    <names variable="container-author">
    59                       <label form="verb-short" prefix=" " text-case="lowercase" suffix=" " strip-periods="true"/>
     70                      <label form="verb-short" suffix=" " strip-periods="true"/>
    6071                      <name and="text" delimiter=", "/>
    6172                    </names>
     
    6879            <if variable="author editor" match="any">
    6980              <names variable="translator">
    70                 <label form="verb-short" prefix=" " text-case="lowercase" suffix=". " strip-periods="true"/>
     81                <label form="short" plural="never" suffix=" "/>
    7182                <name and="text" delimiter=", "/>
    7283              </names>
     
    7687      </if>
    7788    </choose>
    78   </macro>
    79   <macro name="anon">
    80     <text term="anonymous" form="short" text-case="capitalize-first" suffix="." strip-periods="true"/>
    8189  </macro>
    8290  <macro name="editor">
    8391    <names variable="editor">
    8492      <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
    85       <label form="short" prefix=", " suffix="." strip-periods="true"/>
     93      <label form="short" prefix=", "/>
    8694    </names>
    8795  </macro>
     
    8997    <names variable="translator">
    9098      <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
    91       <label form="verb-short" prefix=", " suffix="." strip-periods="true"/>
     99      <label form="short" prefix=", " plural="never"/>
    92100    </names>
    93101  </macro>
     
    113121    <names variable="author">
    114122      <name and="text" name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
    115       <label form="verb-short" prefix=", " suffix="." text-case="lowercase" strip-periods="true"/>
     123      <label form="short" plural="never" prefix=", "/>
    116124      <substitute>
    117         <text macro="editor"/>
    118         <text macro="translator"/>
    119         <text macro="anon"/>
     125        <names variable="editor"/>
     126        <names variable="translator"/>
     127        <text macro="title"/>
    120128      </substitute>
    121129    </names>
     
    128136        <names variable="editor"/>
    129137        <names variable="translator"/>
    130         <text macro="anon"/>
     138        <text macro="title"/>
    131139      </substitute>
    132140    </names>
     
    157165      <text variable="DOI" prefix="doi:"/>
    158166      <choose>
     167        <if variable="DOI issued" match="none">
     168          <choose>
     169            <if variable="URL accessed" match="all">
     170              <group delimiter=" ">
     171                <text term="accessed" text-case="capitalize-first"/>
     172                <date variable="accessed" delimiter=" ">
     173                  <date-part name="month"/>
     174                  <date-part name="day"/>
     175                </date>
     176              </group>
     177            </if>
     178          </choose>
     179        </if>
     180      </choose>
     181      <choose>
    159182        <if type="legal_case" match="none">
    160183          <text variable="URL"/>
     
    211234        <group prefix=". " delimiter=". ">
    212235          <group>
    213             <text term="volume" form="short" text-case="capitalize-first" suffix=". " strip-periods="true"/>
     236            <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
    214237            <number variable="volume" form="numeric"/>
    215238          </group>
    216239          <group>
    217240            <number variable="number-of-volumes" form="numeric"/>
    218             <text term="volume" form="short" prefix=" " suffix="." plural="true" strip-periods="true"/>
     241            <text term="volume" form="short" prefix=" " plural="true"/>
    219242          </group>
    220243        </group>
     
    224247          <if variable="page" match="none">
    225248            <group prefix=". ">
    226               <text term="volume" form="short" text-case="capitalize-first" suffix=". " strip-periods="true"/>
     249              <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
    227250              <number variable="volume" form="numeric"/>
    228251            </group>
     
    255278          </group>
    256279          <group>
    257             <text term="section" form="short" suffix=". " strip-periods="true"/>
     280            <text term="section" form="short" suffix=" "/>
    258281            <text variable="section"/>
    259282          </group>
     
    275298                  <if variable="volume">
    276299                    <group>
    277                       <text term="volume" form="short" text-case="lowercase" suffix=". " strip-periods="true"/>
     300                      <text term="volume" form="short" suffix=" "/>
    278301                      <number variable="volume" form="numeric"/>
    279302                      <label variable="locator" form="short" prefix=", " suffix=" "/>
     
    320343  </macro>
    321344  <macro name="date">
    322     <date variable="issued">
    323       <date-part name="year"/>
    324     </date>
     345    <choose>
     346      <if variable="issued">
     347        <date variable="issued">
     348          <date-part name="year"/>
     349        </date>
     350      </if>
     351      <else-if variable="accessed">
     352        <date variable="accessed">
     353          <date-part name="year"/>
     354        </date>
     355      </else-if>
     356    </choose>
    325357  </macro>
    326358  <macro name="day-month">
     
    359391      </else>
    360392    </choose>
     393    <!--This is for computer programs only. Localization new to 1.0.1, so may be missing in many locales-->
     394    <group delimiter=" " prefix=" (" suffix=")">
     395      <text term="version"/>
     396      <text variable="version"/>
     397    </group>
    361398  </macro>
    362399  <macro name="issue">
     
    401438    </layout>
    402439  </citation>
    403   <bibliography hanging-indent="true" et-al-min="11" et-al-use-first="7" subsequent-author-substitute="———" entry-spacing="0">
     440  <bibliography hanging-indent="true" et-al-min="11" et-al-use-first="7" subsequent-author-substitute="&#8212;&#8212;&#8212;" entry-spacing="0">
    404441    <sort>
    405442      <key macro="contributors"/>
     
    407444    </sort>
    408445    <layout suffix=".">
    409       <text macro="contributors" suffix=". "/>
    410       <text macro="date" suffix=". "/>
    411       <text macro="title"/>
     446      <group delimiter=". ">
     447        <text macro="contributors"/>
     448        <text macro="date"/>
     449        <text macro="title"/>
     450      </group>
    412451      <text macro="description"/>
    413452      <text macro="secondary-contributors" prefix=". "/>
  • _plugins_/zotspip/branches/v1/csl/chicago-fullnote-bibliography.csl

    r59617 r67184  
    1919    </contributor>
    2020    <contributor>
    21       <name>Sebastian Karcher</name>
     21      <name>Frank Bennett</name>
     22      <email>biercenator@gmail.com</email>
    2223    </contributor>
     24    <category citation-format="note"/>
     25    <category field="generic-base"/>
    2326    <summary>Chicago format with full notes and bibliography</summary>
    24     <category field="generic-base"/>
    25     <category citation-format="note"/>
    26     <updated>2012-02-07T01:46:04+00:00</updated>
    27     <rights>This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
     27    <updated>2012-10-26T01:15:26+00:00</updated>
     28    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
    2829  </info>
    2930  <locale xml:lang="en">
     
    3738        <multiple> Translated and edited by</multiple>
    3839      </term>
     40      <term name="editor" form="verb-short">ed.</term>
     41      <term name="translator" form="verb-short">trans.</term>
    3942    </terms>
    4043  </locale>
     
    4346      <choose>
    4447        <if variable="author">
    45           <choose>
    46             <if variable="container-author">
    47               <group>
    48                 <names variable="container-author">
    49                   <label form="verb-short" prefix=" " text-case="lowercase" suffix=" "/>
    50                   <name and="text" delimiter=", "/>
    51                 </names>
    52               </group>
    53             </if>
    54           </choose>
     48          <group delimiter=" ">
     49            <choose>
     50              <if variable="container-author">
     51                <group>
     52                  <names variable="container-author">
     53                    <label form="verb-short" text-case="lowercase" suffix=" "/>
     54                    <name and="text" delimiter=", "/>
     55                  </names>
     56                </group>
     57              </if>
     58            </choose>
     59          </group>
    5560          <names variable="editor translator" delimiter=", ">
    5661            <label form="verb-short" text-case="lowercase" suffix=" "/>
     
    99104              <choose>
    100105                <if variable="container-author">
    101                   <group>
    102                     <names variable="container-author">
    103                       <label form="verb-short" prefix=" " text-case="lowercase" suffix=" "/>
    104                       <name and="text" delimiter=", "/>
    105                     </names>
    106                   </group>
     106                  <names variable="container-author">
     107                    <label form="verb-short" text-case="lowercase" suffix=" "/>
     108                    <name and="text" delimiter=", "/>
     109                  </names>
    107110                </if>
    108111              </choose>
     
    133136  <macro name="recipient-note">
    134137    <names variable="recipient" delimiter=", ">
    135       <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
     138      <label form="verb" text-case="lowercase" suffix=" "/>
    136139      <name and="text" delimiter=", "/>
    137140    </names>
    138141  </macro>
    139142  <macro name="contributors-note">
     143    <group delimiter=" ">
     144      <names variable="author">
     145        <name and="text" sort-separator=", " delimiter=", "/>
     146        <label form="short" prefix=", "/>
     147        <substitute>
     148          <names variable="editor"/>
     149          <names variable="translator"/>
     150        </substitute>
     151      </names>
     152      <text macro="recipient-note"/>
     153    </group>
     154  </macro>
     155  <macro name="editor">
     156    <names variable="editor">
     157      <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
     158      <label form="short" prefix=", "/>
     159    </names>
     160  </macro>
     161  <macro name="translator">
     162    <names variable="translator">
     163      <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
     164      <label form="verb-short" prefix=", "/>
     165    </names>
     166  </macro>
     167  <macro name="recipient">
     168    <group delimiter=" ">
     169      <choose>
     170        <if type="personal_communication">
     171          <choose>
     172            <if variable="genre">
     173              <text variable="genre" text-case="capitalize-first"/>
     174            </if>
     175            <else>
     176              <text term="letter" text-case="capitalize-first"/>
     177            </else>
     178          </choose>
     179        </if>
     180      </choose>
     181      <text macro="recipient-note"/>
     182    </group>
     183  </macro>
     184  <macro name="contributors">
     185    <group delimiter=". ">
     186      <names variable="author">
     187        <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
     188        <substitute>
     189          <text macro="editor"/>
     190          <text macro="translator"/>
     191        </substitute>
     192      </names>
     193      <text macro="recipient"/>
     194    </group>
     195  </macro>
     196  <macro name="recipient-short">
     197    <names variable="recipient">
     198      <label form="verb" text-case="lowercase" suffix=" "/>
     199      <name form="short" and="text" delimiter=", "/>
     200    </names>
     201  </macro>
     202  <macro name="contributors-short">
     203    <group delimiter=" ">
     204      <names variable="author">
     205        <name form="short" and="text" delimiter=", "/>
     206        <substitute>
     207          <names variable="editor"/>
     208          <names variable="translator"/>
     209        </substitute>
     210      </names>
     211      <text macro="recipient-short"/>
     212    </group>
     213  </macro>
     214  <macro name="contributors-sort">
    140215    <names variable="author">
    141       <name and="text" sort-separator=", " delimiter=", "/>
    142       <label form="short" prefix=", "/>
     216      <name name-as-sort-order="all" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
    143217      <substitute>
    144218        <names variable="editor"/>
     
    146220      </substitute>
    147221    </names>
    148     <text macro="recipient-note"/>
    149   </macro>
    150   <macro name="editor">
    151     <names variable="editor">
    152       <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
    153       <label form="short" prefix=", "/>
    154     </names>
    155   </macro>
    156   <macro name="translator">
    157     <names variable="translator">
    158       <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
    159       <label form="verb-short" prefix=", "/>
    160     </names>
    161   </macro>
    162   <macro name="recipient">
    163     <choose>
    164       <if type="personal_communication">
    165         <choose>
    166           <if variable="genre">
    167             <text variable="genre" text-case="capitalize-first"/>
    168           </if>
    169           <else>
    170             <text term="letter" text-case="capitalize-first"/>
    171           </else>
    172         </choose>
    173       </if>
    174     </choose>
    175     <text macro="recipient-note" prefix=" "/>
    176   </macro>
    177   <macro name="contributors">
    178     <names variable="author">
    179       <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
    180       <substitute>
    181         <text macro="editor"/>
    182         <text macro="translator"/>
    183       </substitute>
    184     </names>
    185     <text macro="recipient" prefix=". "/>
    186   </macro>
    187   <macro name="recipient-short">
    188     <names variable="recipient">
    189       <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
    190       <name form="short" and="text" delimiter=", "/>
    191     </names>
    192   </macro>
    193   <macro name="contributors-short">
    194     <names variable="author">
    195       <name form="short" and="text" delimiter=", "/>
    196       <substitute>
    197         <names variable="editor"/>
    198         <names variable="translator"/>
    199       </substitute>
    200     </names>
    201     <text macro="recipient-short"/>
    202   </macro>
    203   <macro name="contributors-sort">
    204     <names variable="author">
    205       <name name-as-sort-order="all" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
    206       <label form="verb-short" prefix=", "/>
    207       <substitute>
    208         <names variable="editor"/>
    209         <names variable="translator"/>
    210       </substitute>
    211     </names>
    212222  </macro>
    213223  <macro name="interviewer-note">
    214224    <names variable="interviewer" delimiter=", ">
    215       <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
     225      <label form="verb" text-case="lowercase" suffix=" "/>
    216226      <name and="text" delimiter=", "/>
    217227    </names>
     
    219229  <macro name="interviewer">
    220230    <names variable="interviewer" delimiter=", ">
    221       <label form="verb" prefix=" " text-case="capitalize-first" suffix=" "/>
     231      <label form="verb" text-case="capitalize-first" suffix=" "/>
    222232      <name and="text" delimiter=", "/>
    223233    </names>
     
    228238        <text variable="genre"/>
    229239      </if>
    230       <else-if type="bill book graphic legal_case motion_picture report song" match="any">
     240      <else-if type="bill book graphic  legislation motion_picture report song" match="any">
    231241        <text variable="title" text-case="title" font-style="italic"/>
     242        <text variable="version" prefix=" , version " suffix=""/>
     243        <!--This isn't localized because we don't have a version term. While not ideal, it should work for many languages and is better than not including a term.-->
     244      </else-if>
     245      <else-if type="legal_case">
     246        <text variable="title"/>
    232247      </else-if>
    233248      <else>
     
    245260        </choose>
    246261      </if>
    247       <else-if type="bill book graphic legal_case motion_picture report song" match="any">
     262      <else-if type="bill book graphic legislation motion_picture report song" match="any">
    248263        <text variable="title" text-case="title" font-style="italic"/>
     264        <text variable="version" prefix=" (version " suffix=")"/>
     265      </else-if>
     266      <else-if type="legal_case">
     267        <text variable="title"/>
    249268      </else-if>
    250269      <else>
     
    268287        </choose>
    269288      </if>
    270       <else-if type="bill book graphic legal_case motion_picture report song" match="any">
     289      <else-if type="bill book graphic legislation motion_picture report song" match="any">
    271290        <text variable="title" text-case="title" form="short" font-style="italic"/>
     291      </else-if>
     292      <else-if type="legal_case">
     293        <text variable="title"/>
    272294      </else-if>
    273295      <else>
     
    305327  </macro>
    306328  <macro name="container-title-note">
    307     <choose>
    308       <if type="chapter paper-conference" match="any">
    309         <text term="in" text-case="lowercase" suffix=" "/>
    310       </if>
    311     </choose>
    312     <choose>
    313       <if type="legal_case" match="none">
    314         <text variable="container-title" text-case="title" font-style="italic"/>
    315       </if>
    316     </choose>
     329    <group delimiter=" ">
     330      <choose>
     331        <if type="chapter paper-conference" match="any">
     332          <text term="in" text-case="lowercase"/>
     333        </if>
     334      </choose>
     335      <choose>
     336        <if type="legal_case" match="none">
     337          <text variable="container-title" text-case="title" font-style="italic"/>
     338        </if>
     339      </choose>
     340    </group>
    317341  </macro>
    318342  <macro name="container-title">
    319     <choose>
    320       <if type="chapter paper-conference" match="any">
    321         <text term="in" text-case="capitalize-first" suffix=" "/>
    322       </if>
    323     </choose>
    324     <choose>
    325       <if type="legal_case" match="none">
    326         <text variable="container-title" text-case="title" font-style="italic"/>
    327       </if>
    328     </choose>
     343    <group delimiter=" ">
     344      <choose>
     345        <if type="chapter paper-conference" match="any">
     346          <text term="in" text-case="capitalize-first"/>
     347        </if>
     348      </choose>
     349      <choose>
     350        <if type="legal_case" match="none">
     351          <text variable="container-title" text-case="title" font-style="italic"/>
     352        </if>
     353      </choose>
     354    </group>
    329355  </macro>
    330356  <macro name="collection-title">
    331     <text variable="collection-title" text-case="title"/>
    332     <text variable="collection-number" prefix=" "/>
     357    <group delimiter=" ">
     358      <text variable="collection-title" text-case="title"/>
     359      <text variable="collection-number"/>
     360    </group>
    333361  </macro>
    334362  <macro name="edition-note">
    335363    <choose>
    336       <if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
     364      <if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
    337365        <choose>
    338366          <if is-numeric="edition">
     
    343371          </if>
    344372          <else>
    345             <text variable="edition" suffix="."/>
     373            <number variable="edition" suffix="."/>
    346374          </else>
    347375        </choose>
     
    351379  <macro name="edition">
    352380    <choose>
    353       <if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
     381      <if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
    354382        <choose>
    355383          <if is-numeric="edition">
     
    360388          </if>
    361389          <else>
    362             <text variable="edition" text-case="capitalize-first" suffix="."/>
     390            <number variable="edition" text-case="capitalize-first" suffix="."/>
    363391          </else>
    364392        </choose>
     
    366394    </choose>
    367395  </macro>
     396  <macro name="locators-note-join-with-space">
     397    <choose>
     398      <if type="article-journal">
     399        <text macro="locators-note"/>
     400      </if>
     401    </choose>
     402  </macro>
     403  <macro name="locators-note-join-with-comma">
     404    <choose>
     405      <if type="article-journal" match="none">
     406        <text macro="locators-note"/>
     407      </if>
     408    </choose>
     409  </macro>
    368410  <macro name="locators-note">
    369411    <choose>
    370412      <if type="article-journal">
    371         <text variable="volume" prefix=" "/>
    372         <group prefix=", ">
    373           <text term="issue" form="short" suffix=" "/>
    374           <number variable="issue"/>
     413        <group delimiter=", ">
     414          <number variable="volume"/>
     415          <group delimiter=" ">
     416            <text term="issue" form="short"/>
     417            <number variable="issue"/>
     418          </group>
    375419        </group>
    376420      </if>
    377421      <else-if type="legal_case">
    378         <text variable="volume" prefix=", "/>
    379         <text variable="container-title" prefix=" "/>
    380         <text variable="page" prefix=" "/>
    381         <text variable="locator" prefix=", "/>
    382       </else-if>
    383       <else-if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
    384         <group prefix=", " delimiter=", ">
    385           <group>
    386             <text term="volume" form="short" suffix=" "/>
     422        <group delimiter=", ">
     423          <group delimiter=" ">
     424            <number variable="volume"/>
     425            <text variable="container-title"/>
     426            <text variable="page"/>
     427          </group>
     428          <text variable="locator"/>
     429        </group>
     430      </else-if>
     431      <else-if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
     432        <group delimiter=", ">
     433          <group delimiter=" ">
     434            <text term="volume" form="short"/>
    387435            <number variable="volume" form="numeric"/>
    388436          </group>
    389437          <choose>
    390438            <if variable="locator" match="none">
    391               <group>
     439              <group delimiter=" ">
    392440                <number variable="number-of-volumes" form="numeric"/>
    393                 <text term="volume" form="short" prefix=" " plural="true"/>
     441                <text term="volume" form="short" plural="true"/>
    394442              </group>
    395443            </if>
     
    400448    </choose>
    401449  </macro>
     450  <macro name="locators-join-with-space">
     451    <choose>
     452      <if type="article-journal">
     453        <text macro="locators"/>
     454      </if>
     455    </choose>
     456  </macro>
     457  <macro name="locators-join-with-comma">
     458    <choose>
     459      <if type="legal_case">
     460        <text macro="locators"/>
     461      </if>
     462    </choose>
     463  </macro>
     464  <macro name="locators-join-with-period">
     465    <choose>
     466      <if type="legal_case article-journal" match="none">
     467        <text macro="locators"/>
     468      </if>
     469    </choose>
     470  </macro>
    402471  <macro name="locators">
    403472    <choose>
    404473      <if type="article-journal">
    405         <text variable="volume" prefix=" "/>
    406         <group prefix=", ">
    407           <text term="issue" form="short" suffix=" "/>
    408           <number variable="issue"/>
     474        <group delimiter=", ">
     475          <number variable="volume"/>
     476          <group delimiter=" ">
     477            <text term="issue" form="short"/>
     478            <number variable="issue"/>
     479          </group>
    409480        </group>
    410481      </if>
    411482      <else-if type="legal_case">
    412         <text variable="volume" prefix=", "/>
    413         <text variable="container-title" prefix=" "/>
    414         <text variable="page" prefix=" "/>
    415       </else-if>
    416       <else-if type="bill book graphic legal_case motion_picture report song" match="any">
    417         <group prefix=". " delimiter=". ">
    418           <group>
    419             <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
     483        <group delimiter=" ">
     484          <number variable="volume"/>
     485          <text variable="container-title"/>
     486          <text variable="page"/>
     487        </group>
     488      </else-if>
     489      <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
     490        <group delimiter=". ">
     491          <group delimiter=" ">
     492            <text term="volume" form="short" text-case="capitalize-first"/>
    420493            <number variable="volume" form="numeric"/>
    421494          </group>
    422           <group>
     495          <group delimiter=" ">
    423496            <number variable="number-of-volumes" form="numeric"/>
    424             <text term="volume" form="short" prefix=" " plural="true"/>
     497            <text term="volume" form="short" plural="true"/>
    425498          </group>
    426499          <text macro="edition"/>
     
    428501      </else-if>
    429502      <else-if type="chapter paper-conference" match="any">
    430         <group prefix=". " delimiter=". ">
     503        <group delimiter=". ">
    431504          <choose>
    432505            <if variable="page" match="none">
    433               <group>
    434                 <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
     506              <group delimiter=" ">
     507                <text term="volume" form="short" text-case="capitalize-first"/>
    435508                <number variable="volume" form="numeric"/>
    436509              </group>
     
    446519      <if type="article-newspaper">
    447520        <group delimiter=", ">
    448           <group>
    449             <text variable="edition" suffix=" "/>
    450             <text term="edition" prefix=" "/>
    451           </group>
    452           <group>
    453             <text term="section" form="short" suffix=" "/>
     521          <group delimiter=" ">
     522            <number variable="edition"/>
     523            <text term="edition"/>
     524          </group>
     525          <group delimiter=" ">
     526            <text term="section" form="short"/>
    454527            <text variable="section"/>
    455528          </group>
     
    459532  </macro>
    460533  <macro name="event">
    461     <group>
    462       <text term="presented at" suffix=" "/>
     534    <group delimiter=" ">
     535      <text term="presented at"/>
    463536      <text variable="event"/>
    464537    </group>
     
    489562          </if>
    490563          <else-if type="legal_case">
    491             <text variable="authority" suffix=" "/>
    492             <date variable="issued">
    493               <date-part name="year"/>
    494             </date>
     564            <group delimiter=" ">
     565              <text variable="authority"/>
     566              <date variable="issued">
     567                <date-part name="year"/>
     568              </date>
     569            </group>
    495570          </else-if>
    496           <else-if type="bill book graphic legal_case motion_picture report song thesis chapter paper-conference" match="any">
     571          <else-if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song thesis" match="any">
    497572            <date variable="issued">
    498573              <date-part name="year"/>
     
    508583        </choose>
    509584      </if>
     585      <else-if variable="accessed URL" match="all">
     586      </else-if>
    510587      <else>
    511588        <text term="no date" form="short"/>
     
    514591  </macro>
    515592  <macro name="point-locators-subsequent">
    516     <group>
    517       <choose>
    518         <if locator="page" match="none">
    519           <choose>
    520             <if type="bill book graphic legal_case motion_picture report song" match="any">
     593    <choose>
     594      <if variable="locator">
     595        <choose>
     596          <if locator="page" match="none">
     597            <group delimiter=" ">
    521598              <choose>
    522                 <if variable="volume">
    523                   <group>
    524                     <text term="volume" form="short" text-case="lowercase" suffix=" "/>
    525                     <number variable="volume" form="numeric"/>
    526                     <label variable="locator" form="short" prefix=", " suffix=" "/>
    527                   </group>
     599                <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
     600                  <choose>
     601                    <if variable="volume">
     602                      <group delimiter=", ">
     603                        <group delimiter=" ">
     604                          <text term="volume" form="short" text-case="lowercase"/>
     605                          <number variable="volume" form="numeric"/>
     606                        </group>
     607                        <label variable="locator" form="short"/>
     608                      </group>
     609                    </if>
     610                    <else>
     611                      <label variable="locator" form="short"/>
     612                    </else>
     613                  </choose>
    528614                </if>
    529615                <else>
    530                   <label variable="locator" form="short" suffix=" "/>
     616                  <label variable="locator" form="short"/>
    531617                </else>
    532618              </choose>
    533             </if>
    534             <else>
    535               <label variable="locator" form="short" suffix=" "/>
    536             </else>
    537           </choose>
    538         </if>
    539         <else-if type="bill book graphic legal_case motion_picture report song" match="any">
    540           <number variable="volume" form="numeric" suffix=":"/>
    541         </else-if>
    542       </choose>
    543       <text variable="locator"/>
    544     </group>
     619              <text variable="locator"/>
     620            </group>
     621          </if>
     622          <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
     623            <group delimiter=":">
     624              <number variable="volume" form="numeric"/>
     625              <text variable="locator"/>
     626            </group>
     627          </else-if>
     628          <else>
     629            <text variable="locator"/>
     630          </else>
     631        </choose>
     632      </if>
     633    </choose>
     634  </macro>
     635  <macro name="point-locators-join-with-colon">
     636    <choose>
     637      <if type="article-journal">
     638        <choose>
     639          <if variable="locator page" match="any">
     640            <text macro="point-locators"/>
     641          </if>
     642        </choose>
     643      </if>
     644    </choose>
     645  </macro>
     646  <macro name="point-locators-join-with-comma">
     647    <choose>
     648      <if type="article-journal" match="none">
     649        <text macro="point-locators"/>
     650      </if>
     651    </choose>
    545652  </macro>
    546653  <macro name="point-locators">
    547654    <choose>
    548655      <if variable="locator" match="none">
    549         <text macro="pages"/>
     656        <choose>
     657          <if type="article-journal chapter paper-conference" match="any">
     658            <text variable="page"/>
     659          </if>
     660        </choose>
    550661      </if>
    551662      <else-if type="article-journal">
    552         <group delimiter=" " prefix=": ">
     663        <group delimiter=" ">
    553664          <choose>
    554665            <if locator="page" match="none">
     
    561672      <else-if type="legal_case"/>
    562673      <else>
    563         <group prefix=", ">
     674        <group delimiter=" ">
    564675          <choose>
    565676            <if locator="page" match="none">
    566               <label variable="locator" form="short" suffix=" "/>
     677              <label variable="locator" form="short"/>
    567678            </if>
    568679          </choose>
     
    572683    </choose>
    573684  </macro>
    574   <macro name="pages">
    575     <choose>
    576       <if type="article-journal">
    577         <text variable="page" prefix=": "/>
    578       </if>
    579       <else-if type="chapter paper-conference" match="any">
    580         <text variable="page" prefix=", "/>
    581       </else-if>
    582     </choose>
    583   </macro>
    584685  <macro name="locators-chapter">
    585686    <choose>
    586687      <if type="chapter paper-conference" match="any">
    587688        <choose>
    588           <!--If author and container-author are present, page numbers are in macro container-contributor. Leave them out here-->
    589           <if variable="author container-author" match="all">
    590           </if>
    591           <else>
    592             <choose>
    593               <if variable="page">
    594                 <text variable="volume" suffix=":"/>
    595                 <text variable="page"/>
    596               </if>
    597             </choose>
    598           </else>
     689          <if variable="page">
     690            <number variable="volume" suffix=":"/>
     691            <text variable="page"/>
     692          </if>
    599693        </choose>
    600694      </if>
     
    604698    <choose>
    605699      <if type="article-journal">
    606         <text variable="page" prefix=": "/>
     700        <text variable="page"/>
    607701      </if>
    608702    </choose>
     
    642736    </choose>
    643737  </macro>
     738  <macro name="issue-note-join-with-space">
     739    <choose>
     740      <if type="article-journal legal_case" variable="publisher-place publisher" match="any">
     741        <text macro="issue-note"/>
     742      </if>
     743    </choose>
     744  </macro>
     745  <macro name="issue-note-join-with-comma">
     746    <choose>
     747      <if type="article-journal legal_case" variable="publisher-place publisher" match="none">
     748        <text macro="issue-note"/>
     749      </if>
     750    </choose>
     751  </macro>
    644752  <macro name="issue-note">
    645753    <choose>
    646754      <if type="article-journal legal_case" match="any">
    647         <text macro="issued" prefix=" (" suffix=")"/>
     755        <text macro="issued" prefix="(" suffix=")"/>
    648756      </if>
    649757      <else-if variable="publisher-place publisher" match="any">
    650         <group prefix=" (" suffix=")" delimiter=", ">
     758        <group prefix="(" suffix=")" delimiter=", ">
    651759          <group delimiter=" ">
    652760            <choose>
     
    663771      </else-if>
    664772      <else>
    665         <text macro="issued" prefix=", "/>
     773        <text macro="issued"/>
    666774      </else>
    667775    </choose>
    668776  </macro>
     777  <macro name="issue-join-with-space">
     778    <choose>
     779      <if type="article-journal legal_case">
     780        <text macro="issue"/>
     781      </if>
     782    </choose>
     783  </macro>
     784  <macro name="issue-join-with-period">
     785    <choose>
     786      <if type="article-journal legal_case" match="none">
     787        <choose>
     788          <if type="speech" variable="publisher publisher-place" match="any">
     789            <text macro="issue"/>
     790          </if>
     791        </choose>
     792      </if>
     793    </choose>
     794  </macro>
     795  <macro name="issue-join-with-comma">
     796    <choose>
     797      <if type="article-journal legal_case" match="none">
     798        <choose>
     799          <if type="speech" variable="publisher publisher-place" match="none">
     800            <text macro="issue"/>
     801          </if>
     802        </choose>
     803      </if>
     804    </choose>
     805  </macro>
    669806  <macro name="issue">
    670807    <choose>
    671808      <if type="article-journal legal_case" match="any">
    672         <text macro="issued" prefix=" (" suffix=")"/>
     809        <text macro="issued" prefix="(" suffix=")"/>
    673810      </if>
    674811      <else-if type="speech">
    675         <choose>
    676           <if variable="title" match="none"/>
    677           <else>
    678             <text variable="genre" text-case="capitalize-first" prefix=". "/>
    679           </else>
    680         </choose>
    681         <text macro="event" prefix=" "/>
    682         <text variable="event-place" prefix=", "/>
    683         <text macro="issued" prefix=", "/>
     812        <group delimiter=", ">
     813          <group delimiter=" ">
     814            <choose>
     815              <if variable="title" match="none"/>
     816              <else>
     817                <text variable="genre" text-case="capitalize-first"/>
     818              </else>
     819            </choose>
     820            <text macro="event"/>
     821          </group>
     822          <text variable="event-place"/>
     823          <text macro="issued"/>
     824        </group>
    684825      </else-if>
    685826      <else-if variable="publisher-place publisher" match="any">
    686         <group prefix=". " delimiter=", ">
     827        <group delimiter=", ">
    687828          <choose>
    688829            <if type="thesis">
     
    695836      </else-if>
    696837      <else>
    697         <text macro="issued" prefix=", "/>
     838        <text macro="issued"/>
    698839      </else>
    699840    </choose>
     
    705846          <text macro="archive-note"/>
    706847        </if>
    707         <else-if type="bill book graphic legal_case motion_picture report song article-journal article-magazine article-newspaper chapter paper-conference" match="none">
     848        <else-if type="article-journal article-magazine article-newspaper bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="none">
    708849          <text macro="archive-note"/>
    709850        </else-if>
    710851      </choose>
    711852      <choose>
     853        <if variable="issued" match="none">
     854          <group delimiter=" ">
     855            <text term="accessed"/>
     856            <date variable="accessed">
     857              <date-part name="month" suffix=" "/>
     858              <date-part name="day" suffix=", "/>
     859              <date-part name="year"/>
     860            </date>
     861          </group>
     862        </if>
     863      </choose>
     864      <choose>
    712865        <if type="legal_case" match="none">
    713           <text variable="URL"/>
     866          <choose>
     867            <if variable="DOI">
     868              <text variable="DOI" prefix="doi:"/>
     869            </if>
     870            <else>
     871              <text variable="URL"/>
     872            </else>
     873          </choose>
    714874        </if>
    715875      </choose>
     
    722882          <text macro="archive"/>
    723883        </if>
    724         <else-if type="bill book graphic legal_case motion_picture report song article-journal article-magazine article-newspaper  chapter paper-conference" match="none">
     884        <else-if type="article-journal article-magazine article-newspaper bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="none">
    725885          <text macro="archive"/>
    726886        </else-if>
    727887      </choose>
    728888      <choose>
     889        <if variable="issued" match="none">
     890          <group delimiter=" ">
     891            <text term="accessed" text-case="capitalize-first"/>
     892            <date variable="accessed">
     893              <date-part name="month" suffix=" "/>
     894              <date-part name="day" suffix=", "/>
     895              <date-part name="year"/>
     896            </date>
     897          </group>
     898        </if>
     899      </choose>
     900      <choose>
    729901        <if type="legal_case" match="none">
    730           <text variable="URL"/>
    731         </if>
    732       </choose>
    733     </group>
    734   </macro>
    735   <macro name="sort-key">
    736     <text macro="contributors-sort" suffix=" "/>
    737     <text variable="title" suffix=" "/>
    738     <text variable="genre"/>
     902          <choose>
     903            <if variable="DOI">
     904              <text variable="DOI" prefix="doi:"/>
     905            </if>
     906            <else>
     907              <text variable="URL"/>
     908            </else>
     909          </choose>
     910        </if>
     911      </choose>
     912    </group>
     913  </macro>
     914  <macro name="case-locator-subsequent">
     915    <choose>
     916      <if type="legal_case">
     917        <text macro="locators-note"/>
     918      </if>
     919    </choose>
     920  </macro>
     921  <macro name="case-issue-subsequent">
     922    <choose>
     923      <if type="legal_case">
     924        <text macro="issue"/>
     925      </if>
     926    </choose>
    739927  </macro>
    740928  <citation et-al-min="4" et-al-use-first="1" disambiguate-add-names="true">
    741     <layout prefix="" suffix="." delimiter="; ">
     929    <layout suffix="." delimiter="; ">
    742930      <choose>
    743931        <if position="ibid-with-locator">
     
    753941          <group delimiter=", ">
    754942            <text macro="contributors-short"/>
    755             <text macro="title-short"/>
     943            <group delimiter=" ">
     944              <group delimiter=", ">
     945                <text macro="title-short"/>
     946                <text macro="case-locator-subsequent"/>
     947              </group>
     948              <text macro="case-issue-subsequent"/>
     949            </group>
    756950            <text macro="point-locators-subsequent"/>
    757951          </group>
     
    759953        <else>
    760954          <group delimiter=", ">
    761             <text macro="contributors-note"/>
    762             <text macro="title-note"/>
    763             <text macro="description-note"/>
    764             <text macro="secondary-contributors-note"/>
    765             <text macro="container-title-note"/>
    766             <text macro="container-contributors-note"/>
    767           </group>
    768           <text macro="locators-note"/>
    769           <text macro="collection-title" prefix=", "/>
    770           <text macro="issue-note"/>
    771           <text macro="locators-newspaper" prefix=", "/>
    772           <text macro="point-locators"/>
    773           <text macro="access-note" prefix=", "/>
     955            <group delimiter=": ">
     956              <group delimiter=", ">
     957                <group delimiter=" ">
     958                  <group delimiter=", ">
     959                    <group delimiter=" ">
     960                      <group delimiter=", ">
     961                        <group delimiter=" ">
     962                          <group delimiter=", ">
     963                            <text macro="contributors-note"/>
     964                            <text macro="title-note"/>
     965                          </group>
     966                          <text macro="description-note"/>
     967                        </group>
     968                        <text macro="secondary-contributors-note"/>
     969                        <text macro="container-title-note"/>
     970                        <text macro="container-contributors-note"/>
     971                      </group>
     972                      <text macro="locators-note-join-with-space"/>
     973                    </group>
     974                    <text macro="locators-note-join-with-comma"/>
     975                    <text macro="collection-title"/>
     976                    <text macro="issue-note-join-with-comma"/>
     977                  </group>
     978                  <text macro="issue-note-join-with-space"/>
     979                </group>
     980                <text macro="locators-newspaper"/>
     981                <text macro="point-locators-join-with-comma"/>
     982              </group>
     983              <text macro="point-locators-join-with-colon"/>
     984            </group>
     985            <text macro="access-note"/>
     986          </group>
    774987        </else>
    775988      </choose>
    776989    </layout>
    777990  </citation>
    778   <bibliography hanging-indent="true" et-al-min="11" et-al-use-first="7" subsequent-author-substitute="———" entry-spacing="0">
     991  <bibliography hanging-indent="true" et-al-min="11" et-al-use-first="7" subsequent-author-substitute="&#8212;&#8212;&#8212;" entry-spacing="0">
    779992    <sort>
    780       <key macro="sort-key"/>
     993      <key macro="contributors-sort"/>
     994      <key variable="title"/>
     995      <key variable="genre"/>
    781996      <key variable="issued"/>
    782997    </sort>
    783998    <layout suffix=".">
    784999      <group delimiter=". ">
    785         <text macro="contributors"/>
    786         <text macro="title"/>
    787         <text macro="description"/>
    788         <text macro="secondary-contributors"/>
    789         <group delimiter=", ">
    790           <text macro="container-title"/>
    791           <text macro="container-contributors"/>
    792           <text macro="locators-chapter"/>
    793         </group>
     1000        <group delimiter=": ">
     1001          <group delimiter=", ">
     1002            <group delimiter=" ">
     1003              <group delimiter=". ">
     1004                <group delimiter=" ">
     1005                  <group delimiter=", ">
     1006                    <group delimiter=". ">
     1007                      <group delimiter=" ">
     1008                        <group delimiter=". ">
     1009                          <text macro="contributors"/>
     1010                          <text macro="title"/>
     1011                        </group>
     1012                        <text macro="description"/>
     1013                      </group>
     1014                      <text macro="secondary-contributors"/>
     1015                      <group delimiter=", ">
     1016                        <text macro="container-title"/>
     1017                        <text macro="container-contributors"/>
     1018                        <text macro="locators-chapter"/>
     1019                      </group>
     1020                      <text macro="locators-join-with-period"/>
     1021                    </group>
     1022                    <text macro="locators-join-with-comma"/>
     1023                  </group>
     1024                  <text macro="locators-join-with-space"/>
     1025                </group>
     1026                <text macro="collection-title"/>
     1027                <text macro="issue-join-with-period"/>
     1028              </group>
     1029              <text macro="issue-join-with-space"/>
     1030            </group>
     1031            <text macro="issue-join-with-comma"/>
     1032            <text macro="locators-newspaper"/>
     1033          </group>
     1034          <text macro="locators-journal"/>
     1035        </group>
     1036        <text macro="access"/>
    7941037      </group>
    795       <text macro="locators"/>
    796       <text macro="collection-title" prefix=". "/>
    797       <text macro="issue"/>
    798       <text macro="locators-newspaper" prefix=", "/>
    799       <text macro="locators-journal"/>
    800       <text macro="access" prefix=". "/>
    8011038    </layout>
    8021039  </bibliography>
  • _plugins_/zotspip/branches/v1/csl/chicago-note.csl

    r59617 r67184  
    77    <category citation-format="note"/>
    88    <category field="generic-base"/>
    9     <updated>2012-02-07T01:46:04+00:00</updated>
    109    <summary>An independent style with this ID formerly shipped with Zotero. However, style variants without a bibliography are unnecessary, as one can use a bibliography style and choose not to include a bibliography.</summary>
    11     <rights>This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
     10    <updated>2012-09-28T02:06:38+00:00</updated>
     11    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
    1212  </info>
    1313</style>
  • _plugins_/zotspip/branches/v1/csl/french3.csl

    r59617 r67184  
    1414    </contributor>
    1515    <category citation-format="numeric"/>
    16     <updated>2012-02-07T01:46:04+00:00</updated>
    1716    <summary>Style Zotero respectant les normes bibliographiques françaises : NF Z44-005  et NF ISO 690-2</summary>
    18     <rights>This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
     17    <updated>2012-09-28T02:06:38+00:00</updated>
     18    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
    1919  </info>
    2020  <macro name="author">
     
    6262      </if>
    6363      <else>
    64         <text value="[s.l.] : "/>
     64        <text value="[s.l.]&#160;: "/>
    6565      </else>
    6666    </choose>
     
    154154        </if>
    155155        <else>
    156           <text variable="title" prefix="« " suffix=" »."/>
     156          <text variable="title" quotes="true" suffix="."/>
    157157        </else>
    158158      </choose>
     
    186186    <text variable="volume" prefix=" Vol. " suffix=","/>
    187187    <text variable="issue" prefix=" n°" suffix=","/>
    188     <text variable="page" prefix=" p. " suffix="."/>
     188    <text variable="page" prefix=" p.&#160;" suffix="."/>
    189189  </macro>
    190190  <citation disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true">
     
    209209          <text variable="number-of-pages" suffix=" p."/>
    210210        </if>
    211         <else-if type="bill book graphic legal_case motion_picture report song" match="any">
     211        <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
    212212          <text macro="edition"/>
    213213          <text macro="publisher" prefix=""/>
     
    250250      <text macro="accessed-date" prefix=" "/>
    251251      <choose>
    252         <if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
    253           <text variable="ISBN" prefix="ISBN : " suffix="."/>
     252        <if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
     253          <text variable="ISBN" prefix="ISBN&#160;: " suffix="."/>
    254254        </if>
    255255      </choose>
  • _plugins_/zotspip/branches/v1/csl/harvard1.csl

    r59617 r67184  
    55    <id>http://www.zotero.org/styles/harvard1</id>
    66    <link href="http://www.zotero.org/styles/harvard1" rel="self"/>
     7    <link href="http://libweb.anglia.ac.uk/referencing/harvard.htm" rel="documentation"/>
    78    <author>
    89      <name>Julian Onions</name>
     
    1112    <category citation-format="author-date"/>
    1213    <category field="generic-base"/>
    13     <updated>2012-02-07T01:46:04+00:00</updated>
    1414    <summary>The Harvard author-date style</summary>
    15     <link href="http://libweb.anglia.ac.uk/referencing/harvard.htm" rel="documentation"/>
    16     <rights>This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
     15    <updated>2012-09-28T02:06:38+00:00</updated>
     16    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
    1717  </info>
    1818  <macro name="editor">
     
    6363  <macro name="title">
    6464    <choose>
    65       <if type="bill book graphic legal_case motion_picture report song thesis" match="any">
     65      <if type="bill book graphic legal_case legislation motion_picture report song thesis" match="any">
    6666        <text variable="title" font-style="italic"/>
    6767      </if>
     
    133133      </date>
    134134      <choose>
    135         <if type="bill book graphic legal_case motion_picture report song" match="any">
     135        <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
    136136          <group prefix=" " delimiter=" " suffix=",">
    137137            <text macro="title"/>
  • _plugins_/zotspip/branches/v1/csl/harvard3.csl

    r59617 r67184  
    55    <id>http://www.zotero.org/styles/harvard3</id>
    66    <link href="http://www.zotero.org/styles/harvard3" rel="self"/>
     7    <link href="http://www.lib.monash.edu.au/tutorials/citing/harvard.html" rel="documentation"/>
     8    <link href="http://www.swinburne.edu.au/lib/researchhelp/harvard_system.htm" rel="documentation"/>
    79    <author>
    810      <name>Julian Onions</name>
     
    1416    <category citation-format="author-date"/>
    1517    <category field="generic-base"/>
    16     <updated>2012-02-07T01:46:04+00:00</updated>
    1718    <summary>The Australian version of the Harvard author-date style</summary>
    18     <link href="http://www.lib.monash.edu.au/tutorials/citing/harvard.html" rel="documentation"/>
    19     <link href="http://www.swinburne.edu.au/lib/researchhelp/harvard_system.htm" rel="documentation"/>
    20     <rights>This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
     19    <updated>2012-09-28T02:06:38+00:00</updated>
     20    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
    2121  </info>
    2222  <locale xml:lang="en-GB">
     
    6666  <macro name="title">
    6767    <choose>
    68       <if type="bill book thesis graphic legal_case motion_picture report song" match="any">
     68      <if type="bill book graphic legal_case legislation motion_picture report song thesis" match="any">
    6969        <text variable="title" font-style="italic"/>
    7070      </if>
  • _plugins_/zotspip/branches/v1/csl/ieee.csl

    r59617 r67184  
    55    <id>http://www.zotero.org/styles/ieee</id>
    66    <link href="http://www.zotero.org/styles/ieee" rel="self"/>
     7    <link href="http://www.ieee.org/portal/cms_docs_iportals/iportals/publications/authors/transjnl/stylemanual.pdf" rel="documentation"/>
     8    <link href="http://www.ieee.org/documents/auinfo07.pdf" rel="documentation"/>
    79    <author>
    810      <name>Michael Berkowitz</name>
     
    2426      <name>Sebastian Karcher</name>
    2527    </contributor>
     28    <category citation-format="numeric"/>
    2629    <category field="engineering"/>
    2730    <category field="generic-base"/>
    28     <category citation-format="numeric"/>
    29     <updated>2012-02-07T01:46:04+00:00</updated>
    30     <rights>This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
    31     <link href="http://www.ieee.org/portal/cms_docs_iportals/iportals/publications/authors/transjnl/stylemanual.pdf" rel="documentation"/>
    32     <link href="http://www.ieee.org/documents/auinfo07.pdf" rel="documentation"/>
     31    <updated>2012-10-19T02:38:43+00:00</updated>
     32    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
    3333  </info>
    3434  <!-- Macros -->
    3535  <macro name="edition">
    3636    <choose>
    37       <if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
     37      <if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
    3838        <choose>
    3939          <if is-numeric="edition">
    4040            <group delimiter=" ">
    4141              <number variable="edition" form="ordinal"/>
    42               <text term="edition" form="short" suffix="." strip-periods="true"/>
     42              <text term="edition" form="short"/>
    4343            </group>
    4444          </if>
     
    5858        </date>
    5959      </if>
    60       <else-if type="bill book graphic legal_case motion_picture  song thesis chapter paper-conference" match="any">
     60      <else-if type=" bill book chapter graphic legal_case legislation motion_picture paper-conference song thesis" match="any">
    6161        <date variable="issued">
    6262          <date-part name="year" form="long"/>
     
    7575    <names variable="author">
    7676      <name initialize-with=". " delimiter=", " and="text"/>
    77       <label form="short" prefix=", " text-case="capitalize-first" suffix="." strip-periods="true"/>
     77      <label form="short" prefix=", " text-case="capitalize-first"/>
    7878      <substitute>
    7979        <names variable="editor"/>
     
    8585    <names variable="editor">
    8686      <name initialize-with=". " delimiter=", " and="text"/>
    87       <label form="short" prefix=", " text-case="capitalize-first" suffix="." strip-periods="true"/>
     87      <label form="short" prefix=", " text-case="capitalize-first"/>
    8888    </names>
    8989  </macro>
     
    9292      <text macro="edition"/>
    9393      <group delimiter=" ">
    94         <text term="volume" form="short" suffix="." strip-periods="true"/>
     94        <text term="volume" form="short"/>
    9595        <number variable="volume" form="numeric"/>
    9696      </group>
    9797      <group delimiter=" ">
    9898        <number variable="number-of-volumes" form="numeric"/>
    99         <text term="volume" form="short" suffix="." plural="true" strip-periods="true"/>
     99        <text term="volume" form="short" plural="true"/>
    100100      </group>
    101101      <group delimiter=" ">
    102         <text term="issue" form="short" suffix="." strip-periods="true"/>
     102        <text term="issue" form="short"/>
    103103        <number variable="issue" form="numeric"/>
    104104      </group>
     
    107107  <macro name="title">
    108108    <choose>
    109       <if type="bill book graphic legal_case motion_picture song" match="any">
     109      <if type="bill book graphic legal_case legislation motion_picture song" match="any">
    110110        <text variable="title" font-style="italic"/>
    111111      </if>
     
    117117  <macro name="publisher">
    118118    <choose>
    119       <if type="bill book graphic legal_case motion_picture  song chapter paper-conference" match="any">
     119      <if type=" bill book chapter graphic legal_case legislation motion_picture paper-conference song" match="any">
    120120        <text variable="publisher-place" suffix=": "/>
    121121        <text variable="publisher"/>
     
    174174  <macro name="page">
    175175    <group>
    176       <label variable="page" form="short" suffix=". " strip-periods="true"/>
     176      <label variable="page" form="short" suffix=" "/>
    177177      <text variable="page"/>
    178178    </group>
     
    183183      <key variable="citation-number"/>
    184184    </sort>
    185     <layout prefix="[" suffix="]" delimiter="], [">
    186       <text variable="citation-number"/>
     185    <layout delimiter=", ">
     186      <text variable="citation-number" prefix="[" suffix="]"/>
    187187    </layout>
    188188  </citation>
     
    248248        </else-if>
    249249        <!-- Generic/Fallback Formats -->
    250         <else-if type="bill book graphic legal_case motion_picture report song" match="any">
     250        <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
    251251          <group delimiter=", " suffix=". ">
    252252            <text macro="title"/>
  • _plugins_/zotspip/branches/v1/csl/invisu.csl

    r59617 r67184  
    1818      <email>juliette.hueber@inha.fr</email>
    1919    </contributor>
     20    <category citation-format="note"/>
    2021    <category field="humanities"/>
    2122    <category field="generic-base"/>
    22     <category citation-format="note"/>
    23     <updated>2012-02-07T01:46:04+00:00</updated>
    2423    <summary>Le style Invisu a été conçu à partir de nombreux emprunts aux styles français sur le forum francophone de Zotero, en particulier le style EHESS de Franziska Heimburger.</summary>
    25     <rights>This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
     24    <updated>2012-09-28T02:06:38+00:00</updated>
     25    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
    2626  </info>
    2727  <locale xml:lang="fr">
    2828    <terms>
    29       <term name="ordinal-01"></term>
    30       <term name="ordinal-02"></term>
    31       <term name="ordinal-03"></term>
    32       <term name="ordinal-04"></term>
    33       <term name="cited">op. cit.</term>
     29      <term name="ordinal-01">&#7497;</term>
     30      <term name="ordinal-02">&#7497;</term>
     31      <term name="ordinal-03">&#7497;</term>
     32      <term name="ordinal-04">&#7497;</term>
     33      <term name="cited">op.&#160;cit.</term>
    3434      <term name="page" form="short">
    3535        <single>p.</single>
     
    5656            <name-part name="family" font-variant="small-caps"/>
    5757          </name>
    58           <label form="short" prefix=" (" suffix=".)"/>
     58          <label form="short" prefix="&#160;(" suffix=".)"/>
    5959        </names>
    6060      </else-if>
     
    7575            <name-part name="family" font-variant="small-caps"/>
    7676          </name>
    77           <label form="short" prefix=" (" suffix=".)"/>
     77          <label form="short" prefix="&#160;(" suffix=".)"/>
    7878        </names>
    7979      </else-if>
     
    8585        <name-part name="family" font-variant="small-caps"/>
    8686      </name>
    87       <label form="short" prefix=" (" suffix=".)"/>
     87      <label form="short" prefix="&#160;(" suffix=".)"/>
    8888    </names>
    8989  </macro>
     
    111111      <else-if type="article-journal article-magazine article-newspaper" match="any">
    112112        <group delimiter=", ">
    113           <text variable="title" text-case="capitalize-first" prefix="« " suffix=" »" font-style="normal"/>
     113          <text variable="title" text-case="capitalize-first" quotes="true" font-style="normal"/>
    114114          <text variable="container-title" font-style="italic"/>
    115115        </group>
     
    133133      <else-if type="manuscript" match="any">
    134134        <group delimiter="">
    135           <text variable="title" text-case="capitalize-first" prefix="« " suffix=" »," font-style="normal"/>
     135          <group suffix=",">
     136            <text variable="title" text-case="capitalize-first" quotes="true" font-style="normal"/>
     137          </group>
    136138          <text variable="genre" prefix=" "/>
    137139        </group>
     
    139141      <else-if type="entry-dictionary entry-encyclopedia paper-conference chapter" match="any">
    140142        <group delimiter="">
    141           <text variable="title" text-case="capitalize-first" prefix="« " suffix=" »,"/>
     143          <group suffix=",">
     144            <text variable="title" text-case="capitalize-first" quotes="true"/>
     145          </group>
    142146          <text value="in" font-style="italic" suffix=" " prefix=" "/>
    143147          <text macro="editor" suffix=", "/>
     
    147151      <else-if type="webpage" match="any">
    148152        <group delimiter=", ">
    149           <text variable="title" text-case="capitalize-first" prefix="« " suffix=" »" font-style="normal"/>
     153          <text variable="title" text-case="capitalize-first" quotes="true" font-style="normal"/>
    150154          <text variable="genre"/>
    151155          <text variable="container-title" font-style="italic"/>
     
    265269        <choose>
    266270          <if variable="publisher-place">
    267             <text variable="publisher-place" prefix=", " suffix=" : "/>
     271            <text variable="publisher-place" prefix=", " suffix="&#160;: "/>
    268272          </if>
    269273          <else>
    270             <text value="[s.l.]" prefix=", " suffix=" : "/>
     274            <text value="[s.l.]" prefix=", " suffix="&#160;: "/>
    271275          </else>
    272276        </choose>
     
    297301        <group prefix=" (" suffix=")">
    298302          <group delimiter=", ">
    299             <text variable="collection-title" prefix="« " suffix=" »"/>
     303            <text variable="collection-title" quotes="true"/>
    300304            <text macro="volume"/>
    301             <text variable="collection-number" prefix="n° "/>
     305            <text variable="collection-number" prefix="n°&#160;"/>
    302306          </group>
    303307        </group>
     
    328332          <choose>
    329333            <if variable="locator" match="any">
    330               <text variable="locator" prefix=", p. "/>
     334              <text variable="locator" prefix=", p.&#160;"/>
    331335            </if>
    332336            <else-if variable="locator" match="none">
    333               <text variable="number-of-pages" prefix=", " suffix=" p."/>
     337              <text variable="number-of-pages" prefix=", " suffix="&#160;p."/>
    334338            </else-if>
    335339          </choose>
     
    341345          <choose>
    342346            <if variable="locator" match="any">
    343               <text variable="locator" prefix="p. "/>
     347              <text variable="locator" prefix="p.&#160;"/>
    344348            </if>
    345349            <else-if variable="locator" match="none">
    346               <text variable="number-of-pages" prefix=", " suffix=" p"/>
     350              <text variable="number-of-pages" prefix=", " suffix="&#160;p"/>
    347351            </else-if>
    348352          </choose>
     
    355359          <choose>
    356360            <if variable="locator" match="any">
    357               <group delimiter=" " prefix=", " suffix=".">
     361              <group delimiter="&#160;" prefix=", " suffix=".">
    358362                <label variable="page" form="short"/>
    359363                <text variable="locator"/>
     
    361365            </if>
    362366            <else-if variable="locator" match="none">
    363               <group delimiter=" " prefix=", ">
     367              <group delimiter="&#160;" prefix=", ">
    364368                <label variable="page" form="short"/>
    365369                <text variable="page"/>
     
    374378          <choose>
    375379            <if variable="locator" match="any">
    376               <group delimiter=" ">
     380              <group delimiter="&#160;">
    377381                <label variable="page" form="short"/>
    378382                <text variable="locator"/>
     
    380384            </if>
    381385            <else-if variable="locator" match="none">
    382               <group delimiter=" ">
     386              <group delimiter="&#160;">
    383387                <label variable="page" form="short"/>
    384388                <text variable="page"/>
     
    393397          <choose>
    394398            <if variable="locator" match="any">
    395               <text variable="locator" prefix="p. "/>
     399              <text variable="locator" prefix="p.&#160;"/>
    396400            </if>
    397401            <else-if variable="locator" match="none">
    398               <text variable="number-of-pages" suffix=" p"/>
     402              <text variable="number-of-pages" suffix="&#160;p"/>
    399403            </else-if>
    400404          </choose>
     
    408412        <group>
    409413          <text macro="date"/>
    410           <text variable="number-of-pages" prefix=", " suffix=" p."/>
     414          <text variable="number-of-pages" prefix=", " suffix="&#160;p."/>
    411415        </group>
    412416      </if>
     
    414418        <group>
    415419          <text macro="date" suffix="."/>
    416           <text variable="number-of-pages" prefix=", " suffix=" p"/>
     420          <text variable="number-of-pages" prefix=", " suffix="&#160;p"/>
    417421        </group>
    418422      </else-if>
     
    420424        <group>
    421425          <text macro="date"/>
    422           <group delimiter=" " prefix=", " suffix=".">
     426          <group delimiter="&#160;" prefix=", " suffix=".">
    423427            <label variable="page" form="short"/>
    424428            <text variable="page"/>
     
    429433      <else-if type="article-journal article-magazine" match="any">
    430434        <group delimiter=" " font-style="normal" prefix=", ">
    431           <group delimiter=" " suffix=".">
     435          <group delimiter="&#160;" suffix=".">
    432436            <label variable="page" form="short"/>
    433437            <text variable="page"/>
     
    439443          <text macro="newspaper-edition"/>
    440444          <text macro="date"/>
    441           <group delimiter=" " prefix=", ">
     445          <group delimiter="&#160;" prefix=", ">
    442446            <label variable="page" form="short"/>
    443447            <text variable="page"/>
     
    451455        <group>
    452456          <text macro="date"/>
    453           <text variable="number-of-pages" prefix=", " suffix=" p."/>
     457          <text variable="number-of-pages" prefix=", " suffix="&#160;p."/>
    454458        </group>
    455459      </else>
     
    457461  </macro>
    458462  <macro name="ISBN">
    459     <text variable="ISBN" prefix=" ISBN : " suffix="."/>
     463    <text variable="ISBN" prefix=" ISBN&#160;: " suffix="."/>
    460464  </macro>
    461465  <macro name="archive">
     
    471475    <choose>
    472476      <if is-numeric="volume">
    473         <text term="volume" form="short" suffix=". "/>
     477        <text term="volume" form="short" suffix=".&#160;"/>
    474478        <text variable="volume"/>
    475479        <text variable="number-of-volumes" prefix="/"/>
     
    484488    <choose>
    485489      <if is-numeric="number">
    486         <text variable="number" prefix="n° "/>
     490        <text variable="number" prefix="n°&#160;"/>
    487491      </if>
    488492      <else>
     
    494498    <choose>
    495499      <if is-numeric="issue">
    496         <text term="issue" form="short" suffix=" "/>
     500        <text term="issue" form="short" suffix="&#160;"/>
    497501        <text variable="issue"/>
    498502      </if>
     
    516520      <choose>
    517521        <if type="graphic personal_communication interview" match="any">
    518           <text variable="URL" text-decoration="none" prefix=" URL : " suffix="."/>
     522          <text variable="URL" text-decoration="none" prefix=" URL&#160;: " suffix="."/>
    519523        </if>
    520524        <else>
    521           <text variable="URL" text-decoration="none" prefix=". URL : " suffix="."/>
     525          <text variable="URL" text-decoration="none" prefix=". URL&#160;: " suffix="."/>
    522526        </else>
    523527      </choose>
     
    533537  </macro>
    534538  <citation et-al-min="3" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1">
    535     <layout prefix="" suffix="." delimiter=" ; ">
     539    <layout prefix="" suffix="." delimiter="&#160;; ">
    536540      <choose>
    537541        <if position="ibid-with-locator">
     
    552556              </if>
    553557              <else>
    554                 <text variable="title" text-case="capitalize-first" form="short" prefix="« " suffix=" »" font-style="normal"/>
     558                <text variable="title" text-case="capitalize-first" form="short" quotes="true" font-style="normal"/>
    555559              </else>
    556560            </choose>
    557561            <text term="cited" font-style="italic" suffix="."/>
    558             <group delimiter=" ">
     562            <group delimiter="&#160;">
    559563              <label variable="page" form="short"/>
    560564              <text variable="locator"/>
  • _plugins_/zotspip/branches/v1/csl/iso690-author-date-en.csl

    r59617 r67184  
    1919    <category citation-format="author-date"/>
    2020    <category field="generic-base"/>
    21     <updated>2012-02-07T01:46:04+00:00</updated>
    2221    <summary>Style based on ISO 690:2010(E), V1</summary>
    23     <rights>This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
     22    <updated>2012-09-28T02:06:38+00:00</updated>
     23    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
    2424  </info>
    2525  <locale>
     
    244244  <macro name="issue">
    245245    <group delimiter=", ">
    246       <text variable="volume" prefix="Vol. "/>
    247       <text variable="issue" prefix="no. "/>
    248       <text variable="page" prefix="pp. "/>
     246      <text variable="volume" prefix="Vol.&#160;"/>
     247      <text variable="issue" prefix="no.&#160;"/>
     248      <text variable="page" prefix="pp.&#160;"/>
    249249    </group>
    250250  </macro>
     
    276276          <text term="accessed" text-case="capitalize-first"/>
    277277          <date variable="accessed">
    278             <date-part name="day" prefix=" "/>
    279             <date-part name="month" prefix=" "/>
    280             <date-part name="year" prefix=" "/>
     278            <date-part name="day" prefix="&#160;"/>
     279            <date-part name="month" prefix="&#160;"/>
     280            <date-part name="year" prefix="&#160;"/>
    281281          </date>
    282282        </group>
     
    293293    <choose>
    294294      <if type="book thesis manuscript" match="any">
    295         <text variable="number-of-pages" suffix=" p"/>
     295        <text variable="number-of-pages" suffix="&#160;p"/>
    296296      </if>
    297297      <else-if type="chapter paper-conference article-newspaper" match="any">
    298         <text variable="page" prefix="pp. "/>
     298        <text variable="page" prefix="pp.&#160;"/>
    299299      </else-if>
    300300      <else-if type="report patent" match="any">
    301         <text variable="page" suffix=" p"/>
     301        <text variable="page" suffix="&#160;p"/>
    302302      </else-if>
    303303    </choose>
    304304  </macro>
    305305  <macro name="isbn">
    306     <text variable="ISBN" prefix="ISBN "/>
     306    <text variable="ISBN" prefix="ISBN&#160;"/>
    307307  </macro>
    308308  <macro name="doi">
    309     <text variable="DOI" prefix="DOI "/>
     309    <text variable="DOI" prefix="DOI&#160;"/>
    310310  </macro>
    311311  <macro name="url">
     
    324324    <choose>
    325325      <if variable="archive_location">
    326         <text value=": "/>
     326        <text value=":&#160;"/>
    327327      </if>
    328328    </choose>
  • _plugins_/zotspip/branches/v1/csl/iso690-author-date-fr.csl

    r59617 r67184  
    1919    <category citation-format="author-date"/>
    2020    <category field="generic-base"/>
    21     <updated>2012-02-07T01:46:04+00:00</updated>
    2221    <summary>Style based on ISO 690:2010(F), V1</summary>
    23     <rights>This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
     22    <updated>2012-09-28T02:06:38+00:00</updated>
     23    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
    2424  </info>
    2525  <locale>
     
    2828      <term name="no date">[sans date]</term>
    2929      <term name="in">in</term>
    30       <term name="online">en ligne</term>
    31       <term name="accessed">consulté le</term>
     30      <term name="online">en&#160;ligne</term>
     31      <term name="accessed">consulté&#160;le</term>
    3232      <term name="retrieved">disponible</term>
    3333      <term name="from">à l'adresse</term>
     
    147147      <else-if type="paper-conference speech chapter article-journal article-magazine article-newspaper post-weblog post webpage broadcast" match="any">
    148148        <text variable="title" suffix=". "/>
    149         <text term="in" text-case="capitalize-first" suffix=" : "/>
     149        <text term="in" text-case="capitalize-first" suffix="&#160;: "/>
    150150        <choose>
    151151          <if variable="container-author editor translator" match="any">
     
    168168      </else-if>
    169169      <else-if type="report">
    170         <text variable="number" suffix=" : "/>
     170        <text variable="number" suffix="&#160;: "/>
    171171        <text variable="title" font-style="italic"/>
    172172      </else-if>
     
    244244  <macro name="issue">
    245245    <group delimiter=", ">
    246       <text variable="volume" prefix="Vol. "/>
    247       <text variable="issue" prefix="n° "/>
    248       <text variable="page" prefix="pp. "/>
     246      <text variable="volume" prefix="Vol.&#160;"/>
     247      <text variable="issue" prefix="n°&#160;"/>
     248      <text variable="page" prefix="pp.&#160;"/>
    249249    </group>
    250250  </macro>
     
    276276          <text term="accessed" text-case="capitalize-first"/>
    277277          <date variable="accessed">
    278             <date-part name="day" prefix=" "/>
    279             <date-part name="month" prefix=" "/>
    280             <date-part name="year" prefix=" "/>
     278            <date-part name="day" prefix="&#160;"/>
     279            <date-part name="month" prefix="&#160;"/>
     280            <date-part name="year" prefix="&#160;"/>
    281281          </date>
    282282        </group>
     
    293293    <choose>
    294294      <if type="book thesis manuscript" match="any">
    295         <text variable="number-of-pages" suffix=" p"/>
     295        <text variable="number-of-pages" suffix="&#160;p"/>
    296296      </if>
    297297      <else-if type="chapter paper-conference article-newspaper" match="any">
    298         <text variable="page" prefix="pp. "/>
     298        <text variable="page" prefix="pp.&#160;"/>
    299299      </else-if>
    300300      <else-if type="report patent" match="any">
    301         <text variable="page" suffix=" p"/>
     301        <text variable="page" suffix="&#160;p"/>
    302302      </else-if>
    303303    </choose>
    304304  </macro>
    305305  <macro name="isbn">
    306     <text variable="ISBN" prefix="ISBN "/>
     306    <text variable="ISBN" prefix="ISBN&#160;"/>
    307307  </macro>
    308308  <macro name="doi">
    309     <text variable="DOI" prefix="DOI "/>
     309    <text variable="DOI" prefix="DOI&#160;"/>
    310310  </macro>
    311311  <macro name="url">
     
    314314        <group>
    315315          <text term="retrieved" suffix=" " text-case="capitalize-first"/>
    316           <text term="from" suffix=" : "/>
     316          <text term="from" suffix="&#160;: "/>
    317317          <text variable="URL"/>
    318318        </group>
     
    324324    <choose>
    325325      <if variable="archive_location">
    326         <text value=" : "/>
     326        <text value="&#160;:&#160;"/>
    327327      </if>
    328328    </choose>
     
    370370            <text macro="genre" suffix=". "/>
    371371            <text macro="edition" suffix=". "/>
    372             <text macro="publisher-place" suffix=" : "/>
     372            <text macro="publisher-place" suffix="&#160;: "/>
    373373            <text macro="publisher" suffix=". "/>
    374374            <text macro="accessed" suffix=". "/>
     
    410410            <text macro="title" font-style="normal" suffix=". "/>
    411411            <text macro="edition" suffix=". "/>
    412             <text macro="publisher-place" suffix=" : "/>
     412            <text macro="publisher-place" suffix="&#160;: "/>
    413413            <text macro="publisher" suffix=". "/>
    414414            <text macro="collection" suffix=". "/>
     
    438438            <text macro="title" suffix=". "/>
    439439            <text macro="genre" suffix=". "/>
    440             <text macro="publisher-place" suffix=" : "/>
     440            <text macro="publisher-place" suffix="&#160;: "/>
    441441            <text macro="publisher" suffix=". "/>
    442442            <text macro="date" suffix=". "/>
     
    452452            <text macro="title" suffix=". "/>
    453453            <text macro="genre" suffix=". "/>
    454             <text macro="publisher-place" suffix=" : "/>
     454            <text macro="publisher-place" suffix="&#160;: "/>
    455455            <text macro="publisher" suffix=". "/>
    456456            <text macro="accessed" suffix=". "/>
     
    474474            <text macro="title" suffix=". "/>
    475475            <text macro="medium" suffix=". "/>
    476             <text macro="publisher-place" suffix=" : "/>
     476            <text macro="publisher-place" suffix="&#160;: "/>
    477477            <text macro="publisher" suffix=". "/>
    478478            <text macro="date" suffix=". "/>
     
    532532            <text macro="date" suffix=". "/>
    533533            <text macro="edition" suffix=". "/>
    534             <text macro="publisher-place" suffix=" : "/>
     534            <text macro="publisher-place" suffix="&#160;: "/>
    535535            <text macro="publisher" suffix=". "/>
    536536            <text macro="accessed" suffix=". "/>
  • _plugins_/zotspip/branches/v1/csl/iso690-numeric-en.csl

    r59617 r67184  
    1919    <category citation-format="numeric"/>
    2020    <category field="generic-base"/>
    21     <updated>2012-02-07T01:46:04+00:00</updated>
    2221    <summary>Style based on ISO 690:2010(E), V1</summary>
    23     <rights>This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
     22    <updated>2012-09-28T02:06:38+00:00</updated>
     23    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
    2424  </info>
    2525  <locale>
     
    222222  <macro name="issue">
    223223    <group delimiter=", ">
    224       <text variable="volume" prefix="Vol. "/>
    225       <text variable="issue" prefix="no. "/>
    226       <text variable="page" prefix="pp. "/>
     224      <text variable="volume" prefix="Vol.&#160;"/>
     225      <text variable="issue" prefix="no.&#160;"/>
     226      <text variable="page" prefix="pp.&#160;"/>
    227227    </group>
    228228  </macro>
     
    254254          <text term="accessed" text-case="capitalize-first"/>
    255255          <date variable="accessed">
    256             <date-part name="day" prefix=" "/>
    257             <date-part name="month" prefix=" "/>
    258             <date-part name="year" prefix=" "/>
     256            <date-part name="day" prefix="&#160;"/>
     257            <date-part name="month" prefix="&#160;"/>
     258            <date-part name="year" prefix="&#160;"/>
    259259          </date>
    260260        </group>
     
    271271    <choose>
    272272      <if type="book thesis manuscript" match="any">
    273         <text variable="number-of-pages" suffix=" p"/>
     273        <text variable="number-of-pages" suffix="&#160;p"/>
    274274      </if>
    275275      <else-if type="chapter paper-conference article-newspaper" match="any">
    276         <text variable="page" prefix="pp. "/>
     276        <text variable="page" prefix="pp.&#160;"/>
    277277      </else-if>
    278278      <else-if type="report patent" match="any">
    279         <text variable="page" suffix=" p"/>
     279        <text variable="page" suffix="&#160;p"/>
    280280      </else-if>
    281281    </choose>
    282282  </macro>
    283283  <macro name="isbn">
    284     <text variable="ISBN" prefix="ISBN "/>
     284    <text variable="ISBN" prefix="ISBN&#160;"/>
    285285  </macro>
    286286  <macro name="doi">
    287     <text variable="DOI" prefix="DOI "/>
     287    <text variable="DOI" prefix="DOI&#160;"/>
    288288  </macro>
    289289  <macro name="url">
     
    302302    <choose>
    303303      <if variable="archive_location">
    304         <text value=": "/>
     304        <text value=":&#160;"/>
    305305      </if>
    306306    </choose>
  • _plugins_/zotspip/branches/v1/csl/iso690-numeric-fr.csl

    r59617 r67184  
    1919    <category citation-format="numeric"/>
    2020    <category field="generic-base"/>
    21     <updated>2012-02-07T01:46:04+00:00</updated>
    2221    <summary>Style based on ISO 690:2010(F), V1</summary>
    23     <rights>This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
     22    <updated>2012-09-28T02:06:38+00:00</updated>
     23    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
    2424  </info>
    2525  <locale>
     
    2727      <term name="no date">[sans date]</term>
    2828      <term name="in">in</term>
    29       <term name="online">en ligne</term>
    30       <term name="accessed">consulté le</term>
     29      <term name="online">en&#160;ligne</term>
     30      <term name="accessed">consulté&#160;le</term>
    3131      <term name="retrieved">disponible</term>
    3232      <term name="from">à l'adresse</term>
     
    124124      <else-if type="paper-conference speech chapter article-journal article-magazine article-newspaper post-weblog post webpage broadcast" match="any">
    125125        <text variable="title" suffix=". "/>
    126         <text term="in" text-case="capitalize-first" suffix=" : "/>
     126        <text term="in" text-case="capitalize-first" suffix="&#160;: "/>
    127127        <choose>
    128128          <if variable="container-author editor translator" match="any">
     
    145145      </else-if>
    146146      <else-if type="report">
    147         <text variable="number" suffix=" : "/>
     147        <text variable="number" suffix="&#160;: "/>
    148148        <text variable="title" font-style="italic"/>
    149149      </else-if>
     
    221221  <macro name="issue">
    222222    <group delimiter=", ">
    223       <text variable="volume" prefix="Vol. "/>
    224       <text variable="issue" prefix="n° "/>
    225       <text variable="page" prefix="pp. "/>
     223      <text variable="volume" prefix="Vol.&#160;"/>
     224      <text variable="issue" prefix="n°&#160;"/>
     225      <text variable="page" prefix="pp.&#160;"/>
    226226    </group>
    227227  </macro>
     
    253253          <text term="accessed" text-case="capitalize-first"/>
    254254          <date variable="accessed">
    255             <date-part name="day" prefix=" "/>
    256             <date-part name="month" prefix=" "/>
    257             <date-part name="year" prefix=" "/>
     255            <date-part name="day" prefix="&#160;"/>
     256            <date-part name="month" prefix="&#160;"/>
     257            <date-part name="year" prefix="&#160;"/>
    258258          </date>
    259259        </group>
     
    270270    <choose>
    271271      <if type="book thesis manuscript" match="any">
    272         <text variable="number-of-pages" suffix=" p"/>
     272        <text variable="number-of-pages" suffix="&#160;p"/>
    273273      </if>
    274274      <else-if type="chapter paper-conference article-newspaper" match="any">
    275         <text variable="page" prefix="pp. "/>
     275        <text variable="page" prefix="pp.&#160;"/>
    276276      </else-if>
    277277      <else-if type="report patent" match="any">
    278         <text variable="page" suffix=" p"/>
     278        <text variable="page" suffix="&#160;p"/>
    279279      </else-if>
    280280    </choose>
    281281  </macro>
    282282  <macro name="isbn">
    283     <text variable="ISBN" prefix="ISBN "/>
     283    <text variable="ISBN" prefix="ISBN&#160;"/>
    284284  </macro>
    285285  <macro name="doi">
    286     <text variable="DOI" prefix="DOI "/>
     286    <text variable="DOI" prefix="DOI&#160;"/>
    287287  </macro>
    288288  <macro name="url">
     
    291291        <group>
    292292          <text term="retrieved" suffix=" " text-case="capitalize-first"/>
    293           <text term="from" suffix=" : "/>
     293          <text term="from" suffix="&#160;: "/>
    294294          <text variable="URL"/>
    295295        </group>
     
    301301    <choose>
    302302      <if variable="archive_location">
    303         <text value=" : "/>
     303        <text value="&#160;:&#160;"/>
    304304      </if>
    305305    </choose>
     
    343343            <text macro="genre" suffix=". "/>
    344344            <text macro="edition" suffix=". "/>
    345             <text macro="publisher-place" suffix=" : "/>
     345            <text macro="publisher-place" suffix="&#160;: "/>
    346346            <text macro="publisher" suffix=", "/>
    347347            <text macro="year-date" suffix=". "/>
     
    381381            <text macro="title" font-style="normal" suffix=". "/>
    382382            <text macro="edition" suffix=". "/>
    383             <text macro="publisher-place" suffix=" : "/>
     383            <text macro="publisher-place" suffix="&#160;: "/>
    384384            <text macro="publisher" suffix=", "/>
    385385            <text macro="year-date" suffix=". "/>
     
    408408            <text macro="title" suffix=". "/>
    409409            <text macro="genre" suffix=". "/>
    410             <text macro="publisher-place" suffix=" : "/>
     410            <text macro="publisher-place" suffix="&#160;: "/>
    411411            <text macro="publisher" suffix=", "/>
    412412            <text macro="date" suffix=". "/>
     
    421421            <text macro="title" suffix=". "/>
    422422            <text macro="genre" suffix=". "/>
    423             <text macro="publisher-place" suffix=" : "/>
     423            <text macro="publisher-place" suffix="&#160;: "/>
    424424            <text macro="publisher" suffix=", "/>
    425425            <text macro="year-date" suffix=". "/>
     
    442442            <text macro="title" suffix=". "/>
    443443            <text macro="medium" suffix=". "/>
    444             <text macro="publisher-place" suffix=" : "/>
     444            <text macro="publisher-place" suffix="&#160;: "/>
    445445            <text macro="publisher" suffix=". "/>
    446446            <text macro="date" suffix=". "/>
     
    498498            <text macro="date" suffix=". "/>
    499499            <text macro="edition" suffix=". "/>
    500             <text macro="publisher-place" suffix=" : "/>
     500            <text macro="publisher-place" suffix="&#160;: "/>
    501501            <text macro="publisher" suffix=". "/>
    502502            <text macro="accessed" suffix=". "/>
  • _plugins_/zotspip/branches/v1/csl/lancet.csl

    r59617 r67184  
    66    <link href="http://www.zotero.org/styles/lancet" rel="self"/>
    77    <link href="http://www.zotero.org/styles/bmj" rel="template"/>
     8    <link href="http://download.thelancet.com/flatcontentassets/authors/lancet-information-for-authors.pdf" rel="documentation"/>
    89    <author>
    910      <name>Sebastian Karcher</name>
    1011    </author>
     12    <category citation-format="numeric"/>
    1113    <category field="medicine"/>
    12     <category citation-format="numeric"/>
    13     <updated>2012-02-07T01:46:04+00:00</updated>
    1414    <summary>
    1515      Vancouver style adapted for The Lancet
    1616    </summary>
    17     <link href="http://download.thelancet.com/flatcontentassets/authors/lancet-information-for-authors.pdf" rel="documentation"/>
    18     <rights>This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
     17    <updated>2012-09-28T02:06:38+00:00</updated>
     18    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
    1919  </info>
    2020  <macro name="author">
     
    116116      <text macro="title" suffix=". "/>
    117117      <choose>
    118         <if type="bill book graphic legal_case motion_picture report song" match="any">
     118        <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
    119119          <group prefix=" " delimiter=" ">
    120120            <text macro="publisher"/>
  • _plugins_/zotspip/branches/v1/csl/lettres-et-sciences-humaines-fr.csl

    r59617 r67184  
    55    <id>http://www.zotero.org/styles/lettres-et-sciences-humaines-fr</id>
    66    <link href="http://www.zotero.org/styles/lettres-et-sciences-humaines-fr" rel="self"/>
    7     <updated>2012-02-07T01:46:04+00:00</updated>
    87    <author>
    98      <name>Alexandre Pinlou</name>
    109      <email>alexandre.pinlou@univ-montp3.fr</email>
    1110    </author>
     11    <category citation-format="note"/>
    1212    <category field="humanities"/>
    1313    <category field="literature"/>
    14     <category citation-format="note"/>
    15     <rights>This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
     14    <updated>2012-09-28T02:06:38+00:00</updated>
     15    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
    1616  </info>
    1717  <locale xml:lang="fr">
     
    2525      <term name="translator" form="short">traduction</term>
    2626      <term name="interviewer" form="verb">entretien réalisé par</term>
    27       <term name="in">in </term>
     27      <term name="in">in&#160;</term>
    2828      <term name="edition">édition</term>
    2929      <term name="accessed">consulté le</term>
    30       <term name="at">disponible sur :</term>
     30      <term name="at">disponible sur&#160;:</term>
    3131      <term name="et-al">[et al.]</term>
    3232      <term name="ibid">ibidem</term>
     
    7171  <macro name="contributors-sort">
    7272    <names variable="author">
    73       <name name-as-sort-order="all" form="long" delimiter=", " delimiter-precedes-last="always" sort-separator=" ">
    74         <name-part name="family" text-case="uppercase"/>
    75       </name>
    76       <label form="short" prefix=", (" suffix=".)"/>
     73      <name name-as-sort-order="all" form="long" delimiter=", " delimiter-precedes-last="always" sort-separator=" "/>
    7774      <substitute>
    7875        <text macro="title"/>
     
    151148      </if>
    152149      <else>
    153         <text variable="title" text-case="capitalize-first" prefix="« " suffix=" »"/>
     150        <text variable="title" text-case="capitalize-first" quotes="true"/>
    154151      </else>
    155152    </choose>
     
    157154  <macro name="enligne">
    158155    <choose>
    159       <if variable="URL DOI" match="any">
     156      <if variable="URL" match="any">
    160157        <text value="en ligne : " prefix=" [" text-case="capitalize-first"/>
    161158        <text variable="URL" suffix="]"/>
     
    190187    <choose>
    191188      <if variable="number-of-pages">
    192         <text variable="number-of-pages" prefix=", " suffix=" p."/>
     189        <text variable="number-of-pages" prefix=", " suffix="&#160;p."/>
    193190      </if>
    194191      <else-if variable="page">
    195         <text variable="page" prefix=", p. "/>
     192        <text variable="page" prefix=", p.&#160;"/>
    196193      </else-if>
    197194    </choose>
     
    211208    <choose>
    212209      <if variable="number-of-pages">
    213         <text variable="number-of-pages" prefix=", " suffix=" p."/>
     210        <text variable="number-of-pages" prefix=", " suffix="&#160;p."/>
    214211      </if>
    215212      <else>
     
    217214          <if variable="number-of-volumes">
    218215            <group>
    219               <text variable="number-of-volumes" prefix=". " suffix=" "/>
     216              <text variable="number-of-volumes" prefix=". " suffix="&#160;"/>
    220217              <text term="volume" form="short" suffix="."/>
    221218            </group>
     
    232229    <choose>
    233230      <if variable="number-of-pages">
    234         <text variable="number-of-pages" prefix=", " suffix=" p."/>
     231        <text variable="number-of-pages" prefix=", " suffix="&#160;p."/>
    235232      </if>
    236233      <else>
     
    238235          <if variable="number-of-volumes">
    239236            <group>
    240               <text variable="number-of-volumes" prefix=". " suffix=" "/>
     237              <text variable="number-of-volumes" prefix=". " suffix="&#160;"/>
    241238              <text term="volume" form="short" suffix="."/>
    242239            </group>
     
    255252    <choose>
    256253      <if variable="number-of-pages">
    257         <text variable="number-of-pages" prefix=", " suffix=" p."/>
     254        <text variable="number-of-pages" prefix=", " suffix="&#160;p."/>
    258255      </if>
    259256      <else>
     
    261258          <if variable="number-of-volumes">
    262259            <group>
    263               <text variable="number-of-volumes" prefix=". " suffix=" "/>
     260              <text variable="number-of-volumes" prefix=". " suffix="&#160;"/>
    264261              <text term="volume" form="short" suffix="."/>
    265262            </group>
     
    277274    <choose>
    278275      <if variable="number-of-pages">
    279         <text variable="number-of-pages" prefix=", " suffix=" p."/>
     276        <text variable="number-of-pages" prefix=", " suffix="&#160;p."/>
    280277      </if>
    281278      <else>
     
    283280          <if variable="number-of-volumes">
    284281            <group>
    285               <text variable="number-of-volumes" prefix=". " suffix=" "/>
     282              <text variable="number-of-volumes" prefix=". " suffix="&#160;"/>
    286283              <text term="volume" form="short" suffix="."/>
    287284            </group>
     
    310307    <choose>
    311308      <if is-numeric="volume">
    312         <text term="volume" form="short" suffix=". "/>
     309        <text term="volume" form="short" suffix=".&#160;"/>
    313310        <text variable="volume"/>
    314311      </if>
     
    321318    <choose>
    322319      <if is-numeric="volume">
    323         <text term="volume" form="short" suffix=". "/>
     320        <text term="volume" form="short" suffix=".&#160;"/>
    324321        <text variable="volume"/>
    325322        <choose>
    326323          <if variable="issue" match="any">
    327             <text variable="issue" prefix=" / "/>
     324            <text variable="issue" prefix="&#160;/&#160;"/>
    328325          </if>
    329326        </choose>
     
    337334    <choose>
    338335      <if is-numeric="issue">
    339         <text term="issue" form="short" suffix=" "/>
     336        <text term="issue" form="short" suffix="&#160;"/>
    340337        <text variable="issue"/>
    341338      </if>
     
    357354      <text macro="volume"/>
    358355      <text macro="issue"/>
    359       <text variable="page" prefix="p. "/>
     356      <text variable="page" prefix="p.&#160;"/>
    360357    </group>
    361358  </macro>
     
    390387  <macro name="collection">
    391388    <group>
    392       <text variable="collection-title" text-case="capitalize-first" prefix="(« " suffix=" »"/>
    393       <text variable="collection-number" prefix=", "/>
    394       <text value=")"/>
     389      <group delimiter=", " prefix="(" suffix=")">
     390        <text variable="collection-title" text-case="capitalize-first" quotes="true"/>
     391        <text variable="collection-number"/>
     392      </group>
    395393    </group>
    396394  </macro>
     
    438436                <text macro="publisher-book-magazine-newspaper"/>
    439437                <text macro="collection"/>
    440                 <text variable="page" prefix="p. "/>
     438                <text variable="page" prefix="p.&#160;"/>
    441439              </group>
    442440            </else-if>
     
    451449                <text macro="publisher-book-journal"/>
    452450                <text macro="collection"/>
    453                 <text variable="page" prefix="p. "/>
     451                <text variable="page" prefix="p.&#160;"/>
    454452              </group>
    455453            </else-if>
     
    471469                <text macro="publisher-book"/>
    472470                <text macro="collection"/>
    473                 <text variable="page" prefix="p. "/>
     471                <text variable="page" prefix="p.&#160;"/>
    474472              </group>
    475473            </else-if>
     
    484482                <text macro="publisher-book"/>
    485483                <text macro="collection"/>
    486                 <text variable="page" prefix="p. "/>
     484                <text variable="page" prefix="p.&#160;"/>
    487485              </group>
    488486            </else>
     
    490488          <group>
    491489            <label variable="locator" form="short" prefix=", "/>
    492             <text variable="locator" prefix=" "/>
     490            <text variable="locator" prefix="&#160;"/>
    493491          </group>
    494492        </if>
     
    498496            <group>
    499497              <label variable="locator" form="short" prefix=", "/>
    500               <text variable="locator" prefix=" "/>
     498              <text variable="locator" prefix="&#160;"/>
    501499            </group>
    502500          </group>
     
    508506          <group>
    509507            <text macro="contributors-notes" font-variant="normal" suffix=", "/>
    510             <text value="op. cit." font-style="italic"/>
     508            <text value="op.&#160;cit." font-style="italic"/>
    511509          </group>
    512510          <group>
    513511            <label variable="locator" form="short" prefix=", "/>
    514             <text variable="locator" prefix=" "/>
     512            <text variable="locator" prefix="&#160;"/>
    515513          </group>
    516514        </else-if>
     
    551549            <text macro="publisher-book"/>
    552550            <text macro="collection"/>
    553             <text variable="page" prefix="p. "/>
     551            <text variable="page" prefix="p.&#160;"/>
    554552          </group>
    555553        </else-if>
     
    564562            <text macro="publisher-book-magazine-newspaper"/>
    565563            <text macro="collection"/>
    566             <text variable="page" prefix="p. "/>
     564            <text variable="page" prefix="p.&#160;"/>
    567565          </group>
    568566        </else-if>
     
    577575            <text macro="publisher-book-journal"/>
    578576            <text macro="collection"/>
    579             <text variable="page" prefix="p. "/>
     577            <text variable="page" prefix="p.&#160;"/>
    580578          </group>
    581579        </else-if>
     
    590588            <text macro="publisher-book"/>
    591589            <text macro="collection"/>
    592             <text variable="page" prefix="p. "/>
     590            <text variable="page" prefix="p.&#160;"/>
    593591          </group>
    594592        </else>
     
    596594      <choose>
    597595        <if type="webpage">
    598           <text macro="enligne"/>
     596          <group delimiter=". ">
     597            <text macro="enligne"/>
     598            <text macro="access"/>
     599          </group>
    599600        </if>
    600601        <else>
     
    602603        </else>
    603604      </choose>
    604       <group prefix=". ">
    605         <text macro="access"/>
    606       </group>
    607605    </layout>
    608606  </bibliography>
  • _plugins_/zotspip/branches/v1/csl/mla.csl

    r59617 r67184  
    55    <id>http://www.zotero.org/styles/mla</id>
    66    <link href="http://www.zotero.org/styles/mla" rel="self"/>
     7    <link href="http://owl.english.purdue.edu/owl/section/2/11/" rel="documentation"/>
    78    <author>
    89      <name>Ilouise S. Bradford</name>
     
    2930      <email>thejamesjohnston@gmail.com</email>
    3031    </contributor>
     32    <category citation-format="author"/>
    3133    <category field="generic-base"/>
    32     <category citation-format="author"/>
    33     <link href="http://owl.english.purdue.edu/owl/section/2/11/" rel="documentation"/>
    34     <updated>2012-02-07T01:46:04+00:00</updated>
    3534    <summary>This style adheres to the MLA 7th edition handbook and contains modifications to these types of sources: e-mail, forum posts, interviews, manuscripts, maps, presentations, TV broadcasts, and web pages.</summary>
    36     <rights>This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
     35    <updated>2012-10-26T01:15:26+00:00</updated>
     36    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
    3737  </info>
    3838  <locale xml:lang="en">
     
    5555      </term>
    5656      <term name="edition" form="short">ed</term>
     57      <term name="editor" form="verb-short">ed.</term>
     58      <term name="translator" form="verb-short">trans.</term>
    5759    </terms>
    5860  </locale>
     
    153155  <macro name="title">
    154156    <choose>
    155       <if type="bill book graphic legal_case manuscript motion_picture report song" match="any">
     157      <if type="bill book graphic legal_case legislation manuscript motion_picture report song" match="any">
    156158        <text variable="title" font-style="italic" text-case="title"/>
    157159      </if>
     
    166168  <macro name="title-short">
    167169    <choose>
    168       <if type="bill book graphic legal_case manuscript motion_picture report song" match="any">
     170      <if type="bill book graphic legal_case legislation manuscript motion_picture report song" match="any">
    169171        <text variable="title" text-case="title" form="short" font-style="italic"/>
    170172      </if>
     
    274276      <text macro="title" prefix=" " suffix="."/>
    275277      <choose>
    276         <if type="bill book graphic legal_case motion_picture report song" match="any">
     278        <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
    277279          <text macro="edition" prefix=" " suffix="."/>
    278280          <text macro="editor-translator" prefix=" " suffix="."/>
  • _plugins_/zotspip/branches/v1/csl/nature.csl

    r59617 r67184  
    1010      <email>mberkowi@gmu.edu</email>
    1111    </author>
     12    <category citation-format="numeric"/>
    1213    <category field="science"/>
    1314    <category field="generic-base"/>
    14     <category citation-format="numeric"/>
    1515    <issn>0028-0836</issn>
    1616    <issn>1476-4687</issn>
    17     <updated>2012-02-07T01:46:04+00:00</updated>
    18     <rights>This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
     17    <updated>2012-09-28T02:06:38+00:00</updated>
     18    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
    1919  </info>
     20  <locale xml:lang="en">
     21    <terms>
     22      <term name="editor" form="short">
     23        <single>ed.</single>
     24        <multiple>eds</multiple>
     25      </term>
     26    </terms>
     27  </locale>
    2028  <macro name="title">
    2129    <choose>
    22       <if type="bill book graphic legal_case motion_picture report song" match="any">
     30      <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
    2331        <text variable="title" font-style="italic"/>
    2432      </if>
     33      <else-if type="chapter" match="any"/>
    2534      <else>
    2635        <text variable="title"/>
     
    3140    <names variable="author">
    3241      <name sort-separator=", " delimiter=", " and="symbol" initialize-with=". " delimiter-precedes-last="never" name-as-sort-order="all"/>
     42      <label form="short" prefix=", "/>
    3343      <et-al font-style="italic"/>
    3444    </names>
     
    4858  <macro name="issuance">
    4959    <choose>
    50       <if type="bill book graphic legal_case motion_picture report song" match="any">
    51         <group prefix=" (" suffix=").">
    52           <text variable="publisher" suffix=": "/>
    53           <text variable="publisher-place" suffix=", "/>
     60      <if type="bill book graphic legal_case legislation motion_picture report song chapter paper-conference" match="any">
     61        <group delimiter=", " prefix=" (" suffix=").">
     62          <text variable="publisher" form="long"/>
    5463          <date variable="issued">
    5564            <date-part name="year"/>
     
    6271        </date>
    6372      </else>
     73    </choose>
     74  </macro>
     75  <macro name="editor">
     76    <choose>
     77      <if type="chapter paper-conference" match="any">
     78        <names variable="editor" prefix="(" suffix=") ">
     79          <name and="symbol" delimiter-precedes-last="never" initialize-with=". " name-as-sort-order="all"/>
     80        </names>
     81      </if>
    6482    </choose>
    6583  </macro>
     
    7795      <text macro="author"/>
    7896      <text macro="title" prefix=" " suffix=". "/>
    79       <text variable="container-title" font-style="italic" suffix=" " form="short"/>
     97      <group delimiter=" ">
     98        <choose>
     99          <if type="chapter paper-conference" match="any">
     100            <text term="in" form="long" plural="false"/>
     101          </if>
     102        </choose>
     103        <text variable="container-title" font-style="italic" suffix=" " form="short"/>
     104      </group>
     105      <text macro="editor"/>
    80106      <text variable="volume" suffix=", " font-weight="bold"/>
    81107      <text variable="page"/>
  • _plugins_/zotspip/branches/v1/csl/science.csl

    r59617 r67184  
    55    <id>http://www.zotero.org/styles/science</id>
    66    <link href="http://www.zotero.org/styles/science" rel="self"/>
     7    <link href="http://www.sciencemag.org/about/authors/prep/res/refs.dtl" rel="documentation"/>
    78    <author>
    89      <name>Julian Onions</name>
     
    1920    <issn>0036-8075</issn>
    2021    <issn>1095-9203</issn>
    21     <updated>2012-02-07T01:46:04+00:00</updated>
    2222    <summary>The Science journal style.</summary>
    23     <link href="http://www.sciencemag.org/about/authors/prep/res/refs.dtl" rel="documentation"/>
    24     <rights>This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
     23    <updated>2012-09-28T02:06:38+00:00</updated>
     24    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
    2525  </info>
    2626  <macro name="editor">
     
    5959  <macro name="title">
    6060    <choose>
    61       <if type="bill book graphic legal_case motion_picture report song" match="any">
     61      <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
    6262        <text variable="title" font-style="italic"/>
    6363      </if>
     
    116116          <text macro="issued" prefix=" (" suffix=")"/>
    117117        </if>
    118         <else-if type="bill book graphic legal_case motion_picture report song" match="any">
     118        <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
    119119          <group>
    120120            <text macro="title" prefix=" "/>
  • _plugins_/zotspip/branches/v1/plugin.xml

    r67073 r67184  
    44        <auteur>[Joseph Larmarange->http://contrib.spip.net/Joseph]</auteur>
    55        <licence>GPL v3</licence>
    6         <version>1.3.3</version>
     6        <version>1.3.4</version>
    77        <version_base>0.2</version_base>
    88        <etat>test</etat>
  • _plugins_/zotspip/trunk/csl/ama.csl

    r59617 r67184  
    55    <id>http://www.zotero.org/styles/american-medical-association</id>
    66    <link href="http://www.zotero.org/styles/american-medical-association" rel="self"/>
     7    <link href="http://www.samford.edu/schools/pharmacy/dic/amaquickref07.pdf" rel="documentation"/>
    78    <author>
    89      <name>Julian Onions</name>
     
    1112    <category citation-format="numeric"/>
    1213    <category field="medicine"/>
    13     <updated>2012-02-07T01:46:04+00:00</updated>
    1414    <summary>The American Medical Association style as used in JAMA.</summary>
    15     <link href="http://www.samford.edu/schools/pharmacy/dic/amaquickref07.pdf" rel="documentation"/>
    16     <rights>This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
     15    <updated>2012-10-01T03:10:36+00:00</updated>
     16    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
    1717  </info>
    1818  <macro name="editor">
    1919    <names variable="editor">
    2020      <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
    21       <label form="short" prefix=", " text-case="lowercase" suffix="." strip-periods="true"/>
     21      <label form="short" prefix=", "/>
    2222    </names>
    23   </macro>
    24   <macro name="anon">
    25     <text term="anonymous" form="short" text-case="capitalize-first" strip-periods="true"/>
    2623  </macro>
    2724  <macro name="author">
     
    2926      <names variable="author">
    3027        <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
    31         <label form="short" prefix=" " suffix="" text-case="lowercase" strip-periods="true"/>
     28        <label form="short" prefix=", "/>
    3229        <substitute>
    3330          <names variable="editor"/>
    34           <text macro="anon"/>
     31          <text macro="title"/>
    3532        </substitute>
    3633      </names>
     
    4340        <names variable="editor"/>
    4441        <names variable="translator"/>
    45         <text macro="anon"/>
    4642      </substitute>
    4743    </names>
     
    7167  <macro name="title">
    7268    <choose>
    73       <if type="bill book graphic legal_case motion_picture report song" match="any">
     69      <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
    7470        <text variable="title" font-style="italic"/>
    7571      </if>
     
    104100        <group delimiter=" ">
    105101          <number variable="edition" form="ordinal"/>
    106           <text term="edition" form="short" suffix="." strip-periods="true"/>
     102          <text term="edition" form="short"/>
    107103        </group>
    108104      </if>
     
    130126      <text macro="title" prefix=" " suffix="."/>
    131127      <choose>
    132         <if type="bill book graphic legal_case motion_picture report song" match="any">
     128        <if type="bill book graphic legislation motion_picture report song" match="any">
    133129          <group suffix="." prefix=" " delimiter=" ">
    134130            <text macro="edition"/>
     
    199195          </choose>
    200196        </else-if>
     197        <else-if type="legal_case">
     198          <group suffix="," prefix=" " delimiter=" ">
     199            <text macro="editor" prefix="(" suffix=")"/>
     200          </group>
     201          <group prefix=" " delimiter=" ">
     202            <text variable="container-title"/>
     203            <text variable="volume"/>
     204          </group>
     205          <text variable="page" prefix=", " suffix=" "/>
     206          <group prefix="(" suffix=")." delimiter=" ">
     207            <text variable="authority"/>
     208            <date variable="issued">
     209              <date-part name="year"/>
     210            </date>
     211          </group>
     212        </else-if>
    201213        <else>
    202214          <text macro="editor" prefix=" " suffix="."/>
  • _plugins_/zotspip/trunk/csl/apa.csl

    r59617 r67184  
    11<?xml version="1.0" encoding="utf-8"?>
    22<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="never">
     3  <!-- This style was edited with the Visual CSL Editor (http://steveridout.com/csl/visualEditor/) -->
    34  <info>
    45    <title>American Psychological Association 6th Edition</title>
     
    2425      <name>Sebastian Karcher</name>
    2526    </contributor>
     27    <category citation-format="author-date"/>
    2628    <category field="psychology"/>
    2729    <category field="generic-base"/>
    28     <category citation-format="author-date"/>
    29     <updated>2012-03-01T23:01:02+00:00</updated>
    30     <rights>This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
     30    <updated>2012-09-28T02:06:38+00:00</updated>
     31    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
    3132  </info>
    3233  <locale xml:lang="en">
    3334    <terms>
     35      <term name="editortranslator" form="short">
     36        <single>ed. &amp; trans.</single>
     37        <multiple>eds. &amp; trans.</multiple>
     38      </term>
    3439      <term name="translator" form="short">
    3540        <single>trans.</single>
     
    4146    <choose>
    4247      <if type="chapter paper-conference" match="any">
    43         <text term="in" text-case="capitalize-first" suffix=" "/>
    44         <names variable="editor" delimiter=", " suffix=", ">
     48        <names variable="editor translator" delimiter=", " suffix=", ">
    4549          <name and="symbol" initialize-with=". " delimiter=", "/>
    46           <label form="short" prefix=" (" text-case="capitalize-first" suffix=")"/>
    47           <substitute>
    48             <names variable="translator"/>
    49           </substitute>
     50          <label form="short" prefix=" (" text-case="title" suffix=")"/>
    5051        </names>
    5152      </if>
     
    5556    <choose>
    5657      <if type="chapter paper-conference" match="none">
    57         <names variable="translator" delimiter=", " prefix=" (" suffix=")">
     58        <names variable="translator editor" delimiter=", " prefix=" (" suffix=")">
    5859          <name and="symbol" initialize-with=". " delimiter=", "/>
    59           <label form="short" prefix=", " text-case="capitalize-first" suffix=""/>
    60           <substitute>
    61             <names variable="editor"/>
    62           </substitute>
     60          <label form="short" prefix=", " text-case="title" suffix=""/>
    6361        </names>
    6462      </if>
     
    6866    <names variable="author">
    6967      <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
    70       <label form="short" prefix=" (" suffix=".)" text-case="capitalize-first" strip-periods="true"/>
     68      <label form="short" prefix=" (" suffix=")" text-case="capitalize-first"/>
    7169      <substitute>
    7270        <names variable="editor"/>
     
    9593            <text variable="title" form="short" font-style="italic"/>
    9694          </if>
    97           <else-if type="bill book graphic legal_case motion_picture song" match="any">
     95          <else-if type="bill book graphic legal_case legislation motion_picture song" match="any">
    9896            <text variable="title" form="short" font-style="italic"/>
    9997          </else-if>
     
    164162      <if type="report thesis" match="any">
    165163        <text variable="title" font-style="italic"/>
    166         <group prefix=" (" suffix=")">
     164        <group prefix=" (" suffix=")" delimiter=" ">
    167165          <text variable="genre"/>
    168           <text variable="number" prefix=" No. "/>
     166          <text variable="number" prefix="No. "/>
    169167        </group>
    170168      </if>
     
    198196            </if>
    199197          </choose>
    200           <group delimiter=": ">
    201             <text variable="publisher-place"/>
    202             <text variable="publisher"/>
    203           </group>
     198          <choose>
     199            <if type="article-journal article-magazine" match="none">
     200              <group delimiter=": ">
     201                <text variable="publisher-place"/>
     202                <text variable="publisher"/>
     203              </group>
     204            </if>
     205          </choose>
    204206        </group>
    205207      </else>
     
    227229  <macro name="issued">
    228230    <choose>
    229       <if type="legal_case bill" match="none">
    230         <choose>
    231           <if variable="issued">
    232             <group prefix=" (" suffix=").">
    233               <date variable="issued">
    234                 <date-part name="year"/>
    235               </date>
    236               <text variable="year-suffix"/>
    237               <choose>
    238                 <if type="bill book graphic legal_case motion_picture report song article-journal chapter paper-conference" match="none">
    239                   <date variable="issued">
    240                     <date-part prefix=", " name="month"/>
    241                     <date-part prefix=" " name="day"/>
    242                   </date>
    243                 </if>
    244               </choose>
    245             </group>
    246           </if>
    247           <else>
    248             <group prefix=" (" suffix=").">
    249               <text term="no date" form="short"/>
    250               <text variable="year-suffix" prefix="-"/>
    251             </group>
    252           </else>
    253         </choose>
     231      <if type="bill legal_case legislation" match="none">
     232        <choose>
     233          <if variable="issued">
     234            <group prefix=" (" suffix=")">
     235              <date variable="issued">
     236                <date-part name="year"/>
     237              </date>
     238              <text variable="year-suffix"/>
     239              <choose>
     240                <if type="article-journal bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="none">
     241                  <date variable="issued">
     242                    <date-part prefix=", " name="month"/>
     243                    <date-part prefix=" " name="day"/>
     244                  </date>
     245                </if>
     246              </choose>
     247            </group>
     248          </if>
     249          <else>
     250            <group prefix=" (" suffix=")">
     251              <text term="no date" form="short"/>
     252              <text variable="year-suffix" prefix="-"/>
     253            </group>
     254          </else>
     255        </choose>
    254256      </if>
    255257    </choose>
     
    257259  <macro name="issued-sort">
    258260    <choose>
    259       <if type="bill book graphic legal_case motion_picture report song article-journal chapter paper-conference" match="none">
     261      <if type="article-journal bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="none">
    260262        <date variable="issued">
    261263          <date-part name="year"/>
    262           <date-part prefix=", " name="month"/>
    263           <date-part prefix=" " name="day"/>
     264          <date-part name="month"/>
     265          <date-part name="day"/>
    264266        </date>
    265267      </if>
     
    290292        <group delimiter=" ">
    291293          <number variable="edition" form="ordinal"/>
    292           <text term="edition" form="short" suffix="." strip-periods="true"/>
     294          <text term="edition" form="short"/>
    293295        </group>
    294296      </if>
     
    319321          <text macro="edition"/>
    320322          <group>
    321             <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=". " strip-periods="true"/>
     323            <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
    322324            <number variable="number-of-volumes" form="numeric" prefix="1-"/>
    323325          </group>
    324326          <group>
    325             <text term="volume" form="short" text-case="capitalize-first" suffix=". " strip-periods="true"/>
     327            <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
    326328            <number variable="volume" form="numeric"/>
    327329          </group>
     
    333335      </else-if>
    334336      <else-if type="legal_case">
    335         <group prefix=" (" suffix=")" delimiter=" ">
    336           <text variable="authority"/>
    337           <date variable="issued" delimiter=" ">
    338             <date-part name="month" form="short"/>
    339             <date-part name="day" suffix=","/>
    340             <date-part name="year"/>
    341           </date>
    342         </group>
    343       </else-if>
    344       <else-if type="bill">
    345         <date variable="issued" prefix=" (" suffix=")" >
    346           <date-part name="year"/>
    347         </date>
     337        <group prefix=" (" suffix=")" delimiter=" ">
     338          <text variable="authority"/>
     339          <date variable="issued" delimiter=" ">
     340            <date-part name="month" form="short"/>
     341            <date-part name="day" suffix=","/>
     342            <date-part name="year"/>
     343          </date>
     344        </group>
     345      </else-if>
     346      <else-if type="bill legislation">
     347        <date variable="issued" prefix=" (" suffix=")">
     348          <date-part name="year"/>
     349        </date>
    348350      </else-if>
    349351    </choose>
     
    356358  </macro>
    357359  <macro name="container">
    358     <choose>
    359       <if type="legal_case bill" match="none">
    360         <text variable="container-title" font-style="italic"/>
    361       </if>
    362       <else>
    363         <group delimiter=" " prefix=", ">
    364           <choose>
    365             <if variable="container-title">
    366               <text variable="volume"/>
    367               <text variable="container-title"/>
    368               <group delimiter=" ">
    369                 <!--change to label variable="section" as that becomes available -->
    370                 <text term="section" form="symbol"/>
    371                 <text variable="section"/>
    372               </group>
    373               <text variable="page"/>
    374             </if>
    375             <else>
    376               <choose>
    377                 <if type="legal_case">
    378                   <text variable ="number" prefix="No. "/>
    379                 </if>
    380                 <else>
    381                   <text variable ="number" prefix="Pub. L. No. "/>
    382                   <group delimiter=" ">
    383                     <!--change to label variable="section" as that becomes available -->
    384                     <text term="section" form="symbol"/>
    385                     <text variable="section"/>
    386                   </group>
    387                 </else>
    388               </choose>
    389             </else>
    390           </choose>
    391         </group>
     360    <group>
     361      <choose>
     362        <if type="chapter paper-conference entry-encyclopedia" match="any">
     363          <text term="in" text-case="capitalize-first" suffix=" "/>
     364        </if>
     365      </choose>
     366      <text macro="container-contributors"/>
     367      <text macro="secondary-contributors"/>
     368      <text macro="container-title"/>
     369    </group>
     370  </macro>
     371  <macro name="container-title">
     372    <choose>
     373      <if type="bill legal_case legislation" match="none">
     374        <choose>
     375          <if type="article-journal article-newspaper article-magazine">
     376            <text variable="container-title" font-style="italic"/>
     377          </if>
     378          <else>
     379            <!--Book Title and other containers should be Title Cased in APA. We're not title-casing periodicals because proper names can be tricky-->
     380            <text variable="container-title" font-style="italic" text-case="title"/>
     381          </else>
     382        </choose>
     383      </if>
     384      <else>
     385        <group delimiter=" " prefix=", ">
     386          <choose>
     387            <if variable="container-title">
     388              <text variable="volume"/>
     389              <text variable="container-title"/>
     390              <group delimiter=" ">
     391                <!--change to label variable="section" as that becomes available -->
     392                <text term="section" form="symbol"/>
     393                <text variable="section"/>
     394              </group>
     395              <text variable="page"/>
     396            </if>
     397            <else>
     398              <choose>
     399                <if type="legal_case">
     400                  <text variable="number" prefix="No. "/>
     401                </if>
     402                <else>
     403                  <text variable="number" prefix="Pub. L. No. "/>
     404                  <group delimiter=" ">
     405                    <!--change to label variable="section" as that becomes available -->
     406                    <text term="section" form="symbol"/>
     407                    <text variable="section"/>
     408                  </group>
     409                </else>
     410              </choose>
     411            </else>
     412          </choose>
     413        </group>
    392414      </else>
    393415    </choose>
     
    406428    </layout>
    407429  </citation>
    408   <bibliography hanging-indent="true" et-al-min="8" et-al-use-first="7" entry-spacing="0" line-spacing="2">
     430  <bibliography hanging-indent="true" et-al-min="8" et-al-use-first="6" et-al-use-last="true" entry-spacing="0" line-spacing="2">
    409431    <sort>
    410432      <key macro="author"/>
     
    413435    <layout>
    414436      <group suffix=".">
    415         <group delimiter=". ">
    416           <text macro="author"/>
    417           <text macro="issued" />
    418         </group>
    419437        <group delimiter=". ">
     438          <text macro="author"/>
     439          <text macro="issued"/>
    420440          <text macro="title" prefix=" "/>
    421           <group>
    422             <text macro="container-contributors"/>
    423             <text macro="secondary-contributors"/>
    424             <group delimiter=", ">
    425               <text macro="container" />
    426               <text variable="collection-title"/>
    427             </group>
    428           </group>
     441          <text macro="container"/>
    429442        </group>
    430443        <text macro="locators"/>
  • _plugins_/zotspip/trunk/csl/apsa.csl

    r59617 r67184  
    11<?xml version="1.0" encoding="utf-8"?>
    2 <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only">
     2<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" page-range-format="chicago" demote-non-dropping-particle="sort-only">
     3  <!-- This style was edited with the Visual CSL Editor (http://steveridout.com/csl/visualEditor/) -->
    34  <info>
    45    <title>American Political Science Association</title>
    56    <id>http://www.zotero.org/styles/apsa</id>
    67    <link href="http://www.zotero.org/styles/apsa" rel="self"/>
     8    <link href="http://www.apsanet.org/media/PDFs/Publications/APSAStyleManual2006.pdf" rel="documentation"/>
    79    <author>
    810      <name>Julian Onions</name>
     
    1416    <category citation-format="author-date"/>
    1517    <category field="political_science"/>
    16     <updated>2012-02-07T01:46:04+00:00</updated>
    1718    <summary>The American Political Science Association style.</summary>
    18     <link href="http://www.ipsonet.org/data/files/APSAStyleManual2006.pdf" rel="documentation"/>
    19     <rights>This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
     19    <updated>2012-09-15T02:11:27+00:00</updated>
     20    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
    2021  </info>
     22  <locale xml:lang="en-US">
     23    <date form="text">
     24      <date-part name="month" suffix=" "/>
     25      <date-part name="day" suffix=", "/>
     26      <date-part name="year"/>
     27    </date>
     28  </locale>
     29  <locale xml:lang="nb-NO">
     30    <date form="text">
     31      <date-part name="day" suffix=" "/>
     32      <date-part name="month" suffix=" "/>
     33      <date-part name="year"/>
     34    </date>
     35  </locale>
     36  <locale xml:lang="nn-NO">
     37    <date form="text">
     38      <date-part name="day" suffix=" "/>
     39      <date-part name="month" suffix=" "/>
     40      <date-part name="year"/>
     41    </date>
     42  </locale>
    2143  <macro name="editor">
    2244    <names variable="editor" delimiter=", ">
     
    5375              <text variable="URL"/>
    5476              <group prefix="(" suffix=")">
    55                 <text term="accessed" text-case="capitalize-first" suffix=" "/>
    56                 <date variable="accessed">
    57                   <date-part name="month" suffix=" "/>
    58                   <date-part name="day" suffix=", "/>
    59                   <date-part name="year"/>
    60                 </date>
     77                <date variable="accessed" form="text"/>
    6178              </group>
    6279            </group>
     
    6885  <macro name="title">
    6986    <choose>
    70       <if type="bill book graphic legal_case motion_picture report song" match="any">
    71         <text variable="title" font-style="italic"/>
    72       </if>
    73       <else>
    74         <text variable="title" quotes="true"/>
     87      <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
     88        <text variable="title" font-style="italic" text-case="title"/>
     89      </if>
     90      <else>
     91        <text variable="title" quotes="true" text-case="title"/>
    7592      </else>
    7693    </choose>
     
    8097      <text variable="volume"/>
    8198      <text variable="container-title"/>
    82       <text variable="page"/>
    8399    </group>
    84100    <text variable="authority" prefix=" (" suffix=")"/>
     
    139155    </choose>
    140156  </macro>
    141   <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">
     157  <citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" givenname-disambiguation-rule="primary-name" collapse="year">
    142158    <sort>
    143159      <key macro="author-short"/>
     
    154170    </layout>
    155171  </citation>
    156   <bibliography hanging-indent="true" et-al-min="4" et-al-use-first="1" subsequent-author-substitute="———">
     172  <bibliography hanging-indent="true" subsequent-author-substitute="&#8212;&#8212;&#8212;">
    157173    <sort>
    158174      <key macro="author"/>
     
    166182      </date>
    167183      <choose>
    168         <if type="bill book graphic legal_case motion_picture report song manuscript thesis" match="any">
     184        <if type="bill book graphic legal_case legislation manuscript motion_picture report song thesis" match="any">
    169185          <text macro="legal_case"/>
    170186          <group prefix=" " delimiter=" ">
     
    184200            <group suffix=".">
    185201              <text macro="publisher"/>
    186               <group prefix=", ">
    187                 <text variable="page" prefix="p. "/>
    188               </group>
     202              <text variable="page" prefix=", "/>
    189203            </group>
    190204          </group>
     
    195209            <text macro="editor"/>
    196210          </group>
     211          <choose>
     212            <if type="speech">
     213              <group prefix=" " delimiter=" " suffix=".">
     214                <text term="presented at" text-case="capitalize-first"/>
     215                <group delimiter=", ">
     216                  <text variable="event"/>
     217                  <text variable="event-place"/>
     218                </group>
     219              </group>
     220            </if>
     221          </choose>
    197222          <group prefix=" " suffix=".">
    198223            <text variable="container-title" font-style="italic"/>
  • _plugins_/zotspip/trunk/csl/asa.csl

    r59617 r67184  
    11<?xml version="1.0" encoding="utf-8"?>
    2 <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only">
     2<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" page-range-format="chicago">
    33  <info>
    44    <title>American Sociological Association</title>
    55    <id>http://www.zotero.org/styles/asa</id>
    66    <link href="http://www.zotero.org/styles/asa" rel="self"/>
     7    <link href="http://www.asanet.org/Quick%20Style%20Guide.pdf" rel="documentation"/>
    78    <author>
    89      <name>Julian Onions</name>
     
    1112    <category citation-format="author-date"/>
    1213    <category field="sociology"/>
    13     <updated>2012-02-07T01:46:04+00:00</updated>
    1414    <summary>The ASA style.</summary>
    15     <link href="http://www.asanet.org/Quick%20Style%20Guide.pdf" rel="documentation"/>
    16     <rights>This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
     15    <updated>2012-09-28T02:06:38+00:00</updated>
     16    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
    1717  </info>
    1818  <macro name="editor">
    1919    <names variable="editor">
    20       <label form="verb" text-case="lowercase" suffix=" "/>
     20      <label form="verb" suffix=" "/>
    2121      <name and="text" delimiter=", "/>
    2222    </names>
     
    2424  <macro name="series-editor">
    2525    <names variable="original-author">
    26       <label form="short" text-case="capitalize-first" suffix=". " strip-periods="true"/>
     26      <label form="short" text-case="capitalize-first" suffix=" "/>
    2727      <name and="text" delimiter=", "/>
    2828    </names>
     
    3333  <macro name="author">
    3434    <names variable="author">
    35       <name and="text" name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
    36       <label form="short" prefix=", " suffix="." text-case="lowercase" strip-periods="true"/>
     35      <name and="text" name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="always" initialize="false" initialize-with=". "/>
     36      <label form="short" prefix=", "/>
    3737      <substitute>
    3838        <names variable="editor"/>
    3939        <names variable="translator"/>
     40        <choose>
     41          <if type="report">
     42            <text variable="publisher"/>
     43          </if>
     44        </choose>
    4045        <text macro="anon"/>
    4146      </substitute>
     
    4853        <names variable="editor"/>
    4954        <names variable="translator"/>
     55        <choose>
     56          <if type="report">
     57            <text variable="publisher"/>
     58          </if>
     59        </choose>
    5060        <text macro="anon"/>
    5161      </substitute>
     
    5464  <macro name="access">
    5565    <group>
    56       <text term="retrieved" text-case="capitalize-first" suffix=" "/>
    57       <date variable="accessed">
    58         <date-part name="month" suffix=" "/>
    59         <date-part name="day" suffix=", "/>
    60         <date-part name="year"/>
    61       </date>
    62       <group prefix=" (" suffix=")">
    63         <text variable="URL"/>
    64       </group>
     66      <choose>
     67        <if variable="URL">
     68          <text term="retrieved" text-case="capitalize-first" suffix=" "/>
     69          <date variable="accessed">
     70            <date-part name="month" suffix=" "/>
     71            <date-part name="day" suffix=", "/>
     72            <date-part name="year"/>
     73          </date>
     74          <group prefix=" (" suffix=")">
     75            <text variable="URL"/>
     76          </group>
     77        </if>
     78      </choose>
    6579    </group>
    6680  </macro>
     
    7084        <text variable="title"/>
    7185      </if>
    72       <else-if type="bill book graphic legal_case motion_picture report song" match="any">
     86      <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
    7387        <text variable="title" font-style="italic"/>
    7488      </else-if>
     
    103117  </macro>
    104118  <macro name="pages">
    105     <label variable="page" form="short" suffix=". " text-case="capitalize-first" strip-periods="true"/>
     119    <label variable="page" form="short" suffix=" " text-case="capitalize-first"/>
    106120    <text variable="page"/>
    107121  </macro>
     
    111125        <group delimiter=" ">
    112126          <number variable="edition" form="ordinal"/>
    113           <text term="edition" form="short" suffix="." strip-periods="true"/>
     127          <text term="edition" form="short"/>
    114128        </group>
    115129      </if>
     
    120134  </macro>
    121135  <citation et-al-min="4" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" collapse="year">
     136    <sort>
     137      <key macro="author-short"/>
     138      <key macro="year-date"/>
     139    </sort>
    122140    <layout prefix="(" suffix=")" delimiter="; ">
    123141      <group delimiter=":">
     
    133151    <sort>
    134152      <key macro="author"/>
     153      <key macro="year-date"/>
    135154      <key variable="title"/>
    136155    </sort>
     
    161180          </group>
    162181        </else-if>
    163         <else-if type="bill book graphic legal_case motion_picture report song" match="any">
     182        <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
    164183          <group delimiter=" ">
    165184            <text macro="title" prefix=" " suffix="."/>
     
    202221        </else>
    203222      </choose>
    204       <text prefix=" " macro="access" suffix="."/>
     223      <text prefix=". " macro="access"/>
    205224    </layout>
    206225  </bibliography>
  • _plugins_/zotspip/trunk/csl/chicago-author-date.csl

    r60191 r67184  
    55    <id>http://www.zotero.org/styles/chicago-author-date</id>
    66    <link href="http://www.zotero.org/styles/chicago-author-date" rel="self"/>
     7    <link href="http://www.chicagomanualofstyle.org/tools_citationguide.html" rel="documentation"/>
    78    <author>
    89      <name>Julian Onions</name>
     
    1213      <name>Sebastian Karcher</name>
    1314    </contributor>
     15    <contributor>
     16      <name>Richard Karnesky</name>
     17      <email>karnesky+zotero@gmail.com</email>
     18      <uri>http://arc.nucapt.northwestern.edu/Richard_Karnesky</uri>
     19    </contributor>
    1420    <category citation-format="author-date"/>
    1521    <category field="generic-base"/>
    16     <updated>2012-04-03T13:46:03+00:00</updated>
    1722    <summary>The author-date variant of the Chicago style</summary>
    18     <link href="http://www.chicagomanualofstyle.org/tools_citationguide.html" rel="documentation"/>
    19     <rights>This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
     23    <updated>2012-10-26T01:15:26+00:00</updated>
     24    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
    2025  </info>
     26  <locale>
     27    <terms>
     28      <term name="editor" form="verb-short">ed.</term>
     29      <term name="translator" form="verb-short">trans.</term>
     30    </terms>
     31  </locale>
    2132  <macro name="secondary-contributors">
    2233    <choose>
     
    2637            <if variable="author">
    2738              <names variable="editor">
    28                 <label form="verb-short" text-case="capitalize-first" suffix=". " strip-periods="true"/>
     39                <label form="short" text-case="capitalize-first" suffix=" " plural="never"/>
    2940                <name and="text" delimiter=", "/>
    3041              </names>
     
    3445            <if variable="author editor" match="any">
    3546              <names variable="translator">
    36                 <label form="verb-short" text-case="capitalize-first" suffix=". " strip-periods="true"/>
     47                <label form="short" text-case="capitalize-first" suffix=" " plural="never"/>
    3748                <name and="text" delimiter=", "/>
    3849              </names>
     
    4657    <choose>
    4758      <if type="chapter paper-conference" match="any">
    48         <group prefix="," delimiter=", ">
     59        <group prefix=", " delimiter=", ">
    4960          <choose>
    5061            <if variable="author">
    5162              <names variable="editor">
    52                 <label form="verb-short" prefix=" " text-case="lowercase" suffix=". " strip-periods="true"/>
     63                <label form="short" suffix=" " plural="never"/>
    5364                <name and="text" delimiter=", "/>
    5465              </names>
     
    5768                  <group>
    5869                    <names variable="container-author">
    59                       <label form="verb-short" prefix=" " text-case="lowercase" suffix=" " strip-periods="true"/>
     70                      <label form="verb-short" suffix=" " strip-periods="true"/>
    6071                      <name and="text" delimiter=", "/>
    6172                    </names>
     
    6879            <if variable="author editor" match="any">
    6980              <names variable="translator">
    70                 <label form="verb-short" prefix=" " text-case="lowercase" suffix=". " strip-periods="true"/>
     81                <label form="short" plural="never" suffix=" "/>
    7182                <name and="text" delimiter=", "/>
    7283              </names>
     
    7687      </if>
    7788    </choose>
    78   </macro>
    79   <macro name="anon">
    80     <text term="anonymous" form="short" text-case="capitalize-first" suffix="." strip-periods="true"/>
    8189  </macro>
    8290  <macro name="editor">
    8391    <names variable="editor">
    8492      <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
    85       <label form="short" prefix=", " suffix="." strip-periods="true"/>
     93      <label form="short" prefix=", "/>
    8694    </names>
    8795  </macro>
     
    8997    <names variable="translator">
    9098      <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
    91       <label form="verb-short" prefix=", " suffix="." strip-periods="true"/>
     99      <label form="short" prefix=", " plural="never"/>
    92100    </names>
    93101  </macro>
     
    113121    <names variable="author">
    114122      <name and="text" name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
    115       <label form="verb-short" prefix=", " suffix="." text-case="lowercase" strip-periods="true"/>
     123      <label form="short" plural="never" prefix=", "/>
    116124      <substitute>
    117         <text macro="editor"/>
    118         <text macro="translator"/>
    119         <text macro="anon"/>
     125        <names variable="editor"/>
     126        <names variable="translator"/>
     127        <text macro="title"/>
    120128      </substitute>
    121129    </names>
     
    128136        <names variable="editor"/>
    129137        <names variable="translator"/>
    130         <text macro="anon"/>
     138        <text macro="title"/>
    131139      </substitute>
    132140    </names>
     
    157165      <text variable="DOI" prefix="doi:"/>
    158166      <choose>
     167        <if variable="DOI issued" match="none">
     168          <choose>
     169            <if variable="URL accessed" match="all">
     170              <group delimiter=" ">
     171                <text term="accessed" text-case="capitalize-first"/>
     172                <date variable="accessed" delimiter=" ">
     173                  <date-part name="month"/>
     174                  <date-part name="day"/>
     175                </date>
     176              </group>
     177            </if>
     178          </choose>
     179        </if>
     180      </choose>
     181      <choose>
    159182        <if type="legal_case" match="none">
    160183          <text variable="URL"/>
     
    211234        <group prefix=". " delimiter=". ">
    212235          <group>
    213             <text term="volume" form="short" text-case="capitalize-first" suffix=". " strip-periods="true"/>
     236            <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
    214237            <number variable="volume" form="numeric"/>
    215238          </group>
    216239          <group>
    217240            <number variable="number-of-volumes" form="numeric"/>
    218             <text term="volume" form="short" prefix=" " suffix="." plural="true" strip-periods="true"/>
     241            <text term="volume" form="short" prefix=" " plural="true"/>
    219242          </group>
    220243        </group>
     
    224247          <if variable="page" match="none">
    225248            <group prefix=". ">
    226               <text term="volume" form="short" text-case="capitalize-first" suffix=". " strip-periods="true"/>
     249              <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
    227250              <number variable="volume" form="numeric"/>
    228251            </group>
     
    255278          </group>
    256279          <group>
    257             <text term="section" form="short" suffix=". " strip-periods="true"/>
     280            <text term="section" form="short" suffix=" "/>
    258281            <text variable="section"/>
    259282          </group>
     
    275298                  <if variable="volume">
    276299                    <group>
    277                       <text term="volume" form="short" text-case="lowercase" suffix=". " strip-periods="true"/>
     300                      <text term="volume" form="short" suffix=" "/>
    278301                      <number variable="volume" form="numeric"/>
    279302                      <label variable="locator" form="short" prefix=", " suffix=" "/>
     
    320343  </macro>
    321344  <macro name="date">
    322     <date variable="issued">
    323       <date-part name="year"/>
    324     </date>
     345    <choose>
     346      <if variable="issued">
     347        <date variable="issued">
     348          <date-part name="year"/>
     349        </date>
     350      </if>
     351      <else-if variable="accessed">
     352        <date variable="accessed">
     353          <date-part name="year"/>
     354        </date>
     355      </else-if>
     356    </choose>
    325357  </macro>
    326358  <macro name="day-month">
     
    359391      </else>
    360392    </choose>
     393    <!--This is for computer programs only. Localization new to 1.0.1, so may be missing in many locales-->
     394    <group delimiter=" " prefix=" (" suffix=")">
     395      <text term="version"/>
     396      <text variable="version"/>
     397    </group>
    361398  </macro>
    362399  <macro name="issue">
     
    401438    </layout>
    402439  </citation>
    403   <bibliography hanging-indent="true" et-al-min="11" et-al-use-first="7" subsequent-author-substitute="———" entry-spacing="0">
     440  <bibliography hanging-indent="true" et-al-min="11" et-al-use-first="7" subsequent-author-substitute="&#8212;&#8212;&#8212;" entry-spacing="0">
    404441    <sort>
    405442      <key macro="contributors"/>
     
    407444    </sort>
    408445    <layout suffix=".">
    409       <text macro="contributors" suffix=". "/>
    410       <text macro="date" suffix=". "/>
    411       <text macro="title"/>
     446      <group delimiter=". ">
     447        <text macro="contributors"/>
     448        <text macro="date"/>
     449        <text macro="title"/>
     450      </group>
    412451      <text macro="description"/>
    413452      <text macro="secondary-contributors" prefix=". "/>
  • _plugins_/zotspip/trunk/csl/chicago-fullnote-bibliography.csl

    r59617 r67184  
    1919    </contributor>
    2020    <contributor>
    21       <name>Sebastian Karcher</name>
     21      <name>Frank Bennett</name>
     22      <email>biercenator@gmail.com</email>
    2223    </contributor>
     24    <category citation-format="note"/>
     25    <category field="generic-base"/>
    2326    <summary>Chicago format with full notes and bibliography</summary>
    24     <category field="generic-base"/>
    25     <category citation-format="note"/>
    26     <updated>2012-02-07T01:46:04+00:00</updated>
    27     <rights>This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
     27    <updated>2012-10-26T01:15:26+00:00</updated>
     28    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
    2829  </info>
    2930  <locale xml:lang="en">
     
    3738        <multiple> Translated and edited by</multiple>
    3839      </term>
     40      <term name="editor" form="verb-short">ed.</term>
     41      <term name="translator" form="verb-short">trans.</term>
    3942    </terms>
    4043  </locale>
     
    4346      <choose>
    4447        <if variable="author">
    45           <choose>
    46             <if variable="container-author">
    47               <group>
    48                 <names variable="container-author">
    49                   <label form="verb-short" prefix=" " text-case="lowercase" suffix=" "/>
    50                   <name and="text" delimiter=", "/>
    51                 </names>
    52               </group>
    53             </if>
    54           </choose>
     48          <group delimiter=" ">
     49            <choose>
     50              <if variable="container-author">
     51                <group>
     52                  <names variable="container-author">
     53                    <label form="verb-short" text-case="lowercase" suffix=" "/>
     54                    <name and="text" delimiter=", "/>
     55                  </names>
     56                </group>
     57              </if>
     58            </choose>
     59          </group>
    5560          <names variable="editor translator" delimiter=", ">
    5661            <label form="verb-short" text-case="lowercase" suffix=" "/>
     
    99104              <choose>
    100105                <if variable="container-author">
    101                   <group>
    102                     <names variable="container-author">
    103                       <label form="verb-short" prefix=" " text-case="lowercase" suffix=" "/>
    104                       <name and="text" delimiter=", "/>
    105                     </names>
    106                   </group>
     106                  <names variable="container-author">
     107                    <label form="verb-short" text-case="lowercase" suffix=" "/>
     108                    <name and="text" delimiter=", "/>
     109                  </names>
    107110                </if>
    108111              </choose>
     
    133136  <macro name="recipient-note">
    134137    <names variable="recipient" delimiter=", ">
    135       <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
     138      <label form="verb" text-case="lowercase" suffix=" "/>
    136139      <name and="text" delimiter=", "/>
    137140    </names>
    138141  </macro>
    139142  <macro name="contributors-note">
     143    <group delimiter=" ">
     144      <names variable="author">
     145        <name and="text" sort-separator=", " delimiter=", "/>
     146        <label form="short" prefix=", "/>
     147        <substitute>
     148          <names variable="editor"/>
     149          <names variable="translator"/>
     150        </substitute>
     151      </names>
     152      <text macro="recipient-note"/>
     153    </group>
     154  </macro>
     155  <macro name="editor">
     156    <names variable="editor">
     157      <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
     158      <label form="short" prefix=", "/>
     159    </names>
     160  </macro>
     161  <macro name="translator">
     162    <names variable="translator">
     163      <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
     164      <label form="verb-short" prefix=", "/>
     165    </names>
     166  </macro>
     167  <macro name="recipient">
     168    <group delimiter=" ">
     169      <choose>
     170        <if type="personal_communication">
     171          <choose>
     172            <if variable="genre">
     173              <text variable="genre" text-case="capitalize-first"/>
     174            </if>
     175            <else>
     176              <text term="letter" text-case="capitalize-first"/>
     177            </else>
     178          </choose>
     179        </if>
     180      </choose>
     181      <text macro="recipient-note"/>
     182    </group>
     183  </macro>
     184  <macro name="contributors">
     185    <group delimiter=". ">
     186      <names variable="author">
     187        <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
     188        <substitute>
     189          <text macro="editor"/>
     190          <text macro="translator"/>
     191        </substitute>
     192      </names>
     193      <text macro="recipient"/>
     194    </group>
     195  </macro>
     196  <macro name="recipient-short">
     197    <names variable="recipient">
     198      <label form="verb" text-case="lowercase" suffix=" "/>
     199      <name form="short" and="text" delimiter=", "/>
     200    </names>
     201  </macro>
     202  <macro name="contributors-short">
     203    <group delimiter=" ">
     204      <names variable="author">
     205        <name form="short" and="text" delimiter=", "/>
     206        <substitute>
     207          <names variable="editor"/>
     208          <names variable="translator"/>
     209        </substitute>
     210      </names>
     211      <text macro="recipient-short"/>
     212    </group>
     213  </macro>
     214  <macro name="contributors-sort">
    140215    <names variable="author">
    141       <name and="text" sort-separator=", " delimiter=", "/>
    142       <label form="short" prefix=", "/>
     216      <name name-as-sort-order="all" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
    143217      <substitute>
    144218        <names variable="editor"/>
     
    146220      </substitute>
    147221    </names>
    148     <text macro="recipient-note"/>
    149   </macro>
    150   <macro name="editor">
    151     <names variable="editor">
    152       <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
    153       <label form="short" prefix=", "/>
    154     </names>
    155   </macro>
    156   <macro name="translator">
    157     <names variable="translator">
    158       <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
    159       <label form="verb-short" prefix=", "/>
    160     </names>
    161   </macro>
    162   <macro name="recipient">
    163     <choose>
    164       <if type="personal_communication">
    165         <choose>
    166           <if variable="genre">
    167             <text variable="genre" text-case="capitalize-first"/>
    168           </if>
    169           <else>
    170             <text term="letter" text-case="capitalize-first"/>
    171           </else>
    172         </choose>
    173       </if>
    174     </choose>
    175     <text macro="recipient-note" prefix=" "/>
    176   </macro>
    177   <macro name="contributors">
    178     <names variable="author">
    179       <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
    180       <substitute>
    181         <text macro="editor"/>
    182         <text macro="translator"/>
    183       </substitute>
    184     </names>
    185     <text macro="recipient" prefix=". "/>
    186   </macro>
    187   <macro name="recipient-short">
    188     <names variable="recipient">
    189       <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
    190       <name form="short" and="text" delimiter=", "/>
    191     </names>
    192   </macro>
    193   <macro name="contributors-short">
    194     <names variable="author">
    195       <name form="short" and="text" delimiter=", "/>
    196       <substitute>
    197         <names variable="editor"/>
    198         <names variable="translator"/>
    199       </substitute>
    200     </names>
    201     <text macro="recipient-short"/>
    202   </macro>
    203   <macro name="contributors-sort">
    204     <names variable="author">
    205       <name name-as-sort-order="all" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
    206       <label form="verb-short" prefix=", "/>
    207       <substitute>
    208         <names variable="editor"/>
    209         <names variable="translator"/>
    210       </substitute>
    211     </names>
    212222  </macro>
    213223  <macro name="interviewer-note">
    214224    <names variable="interviewer" delimiter=", ">
    215       <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
     225      <label form="verb" text-case="lowercase" suffix=" "/>
    216226      <name and="text" delimiter=", "/>
    217227    </names>
     
    219229  <macro name="interviewer">
    220230    <names variable="interviewer" delimiter=", ">
    221       <label form="verb" prefix=" " text-case="capitalize-first" suffix=" "/>
     231      <label form="verb" text-case="capitalize-first" suffix=" "/>
    222232      <name and="text" delimiter=", "/>
    223233    </names>
     
    228238        <text variable="genre"/>
    229239      </if>
    230       <else-if type="bill book graphic legal_case motion_picture report song" match="any">
     240      <else-if type="bill book graphic  legislation motion_picture report song" match="any">
    231241        <text variable="title" text-case="title" font-style="italic"/>
     242        <text variable="version" prefix=" , version " suffix=""/>
     243        <!--This isn't localized because we don't have a version term. While not ideal, it should work for many languages and is better than not including a term.-->
     244      </else-if>
     245      <else-if type="legal_case">
     246        <text variable="title"/>
    232247      </else-if>
    233248      <else>
     
    245260        </choose>
    246261      </if>
    247       <else-if type="bill book graphic legal_case motion_picture report song" match="any">
     262      <else-if type="bill book graphic legislation motion_picture report song" match="any">
    248263        <text variable="title" text-case="title" font-style="italic"/>
     264        <text variable="version" prefix=" (version " suffix=")"/>
     265      </else-if>
     266      <else-if type="legal_case">
     267        <text variable="title"/>
    249268      </else-if>
    250269      <else>
     
    268287        </choose>
    269288      </if>
    270       <else-if type="bill book graphic legal_case motion_picture report song" match="any">
     289      <else-if type="bill book graphic legislation motion_picture report song" match="any">
    271290        <text variable="title" text-case="title" form="short" font-style="italic"/>
     291      </else-if>
     292      <else-if type="legal_case">
     293        <text variable="title"/>
    272294      </else-if>
    273295      <else>
     
    305327  </macro>
    306328  <macro name="container-title-note">
    307     <choose>
    308       <if type="chapter paper-conference" match="any">
    309         <text term="in" text-case="lowercase" suffix=" "/>
    310       </if>
    311     </choose>
    312     <choose>
    313       <if type="legal_case" match="none">
    314         <text variable="container-title" text-case="title" font-style="italic"/>
    315       </if>
    316     </choose>
     329    <group delimiter=" ">
     330      <choose>
     331        <if type="chapter paper-conference" match="any">
     332          <text term="in" text-case="lowercase"/>
     333        </if>
     334      </choose>
     335      <choose>
     336        <if type="legal_case" match="none">
     337          <text variable="container-title" text-case="title" font-style="italic"/>
     338        </if>
     339      </choose>
     340    </group>
    317341  </macro>
    318342  <macro name="container-title">
    319     <choose>
    320       <if type="chapter paper-conference" match="any">
    321         <text term="in" text-case="capitalize-first" suffix=" "/>
    322       </if>
    323     </choose>
    324     <choose>
    325       <if type="legal_case" match="none">
    326         <text variable="container-title" text-case="title" font-style="italic"/>
    327       </if>
    328     </choose>
     343    <group delimiter=" ">
     344      <choose>
     345        <if type="chapter paper-conference" match="any">
     346          <text term="in" text-case="capitalize-first"/>
     347        </if>
     348      </choose>
     349      <choose>
     350        <if type="legal_case" match="none">
     351          <text variable="container-title" text-case="title" font-style="italic"/>
     352        </if>
     353      </choose>
     354    </group>
    329355  </macro>
    330356  <macro name="collection-title">
    331     <text variable="collection-title" text-case="title"/>
    332     <text variable="collection-number" prefix=" "/>
     357    <group delimiter=" ">
     358      <text variable="collection-title" text-case="title"/>
     359      <text variable="collection-number"/>
     360    </group>
    333361  </macro>
    334362  <macro name="edition-note">
    335363    <choose>
    336       <if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
     364      <if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
    337365        <choose>
    338366          <if is-numeric="edition">
     
    343371          </if>
    344372          <else>
    345             <text variable="edition" suffix="."/>
     373            <number variable="edition" suffix="."/>
    346374          </else>
    347375        </choose>
     
    351379  <macro name="edition">
    352380    <choose>
    353       <if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
     381      <if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
    354382        <choose>
    355383          <if is-numeric="edition">
     
    360388          </if>
    361389          <else>
    362             <text variable="edition" text-case="capitalize-first" suffix="."/>
     390            <number variable="edition" text-case="capitalize-first" suffix="."/>
    363391          </else>
    364392        </choose>
     
    366394    </choose>
    367395  </macro>