document no-ampersand-parenthetical

wjschne · May 16, 2024 · 6c545e7 · 6c545e7
1 parent 0d9f35a
commit 6c545e7
Show file tree

Hide file tree

Showing 8 changed files with 201 additions and 125 deletions.
diff --git a/docs/changelog.html b/docs/changelog.html
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head>
 
 <meta charset="utf-8">
-<meta name="generator" content="quarto-1.5.33">
+<meta name="generator" content="quarto-1.5.36">
 
 <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
 
@@ -163,6 +163,7 @@ <h2 id="toc-title">On this page</h2>
 
   <ul>
   <li><a href="#future-version-wishlist" id="toc-future-version-wishlist" class="nav-link active" data-scroll-target="#future-version-wishlist">Future Version Wishlist</a></li>
+  <li><a href="#version-4.2.0-2024-05-16" id="toc-version-4.2.0-2024-05-16" class="nav-link" data-scroll-target="#version-4.2.0-2024-05-16">Version 4.2.0 (2024-05-16)</a></li>
   <li><a href="#version-4.1.0-2024-05-13" id="toc-version-4.1.0-2024-05-13" class="nav-link" data-scroll-target="#version-4.1.0-2024-05-13">Version 4.1.0 (2024-05-13)</a></li>
   <li><a href="#version-4.0.3-2024-05-11" id="toc-version-4.0.3-2024-05-11" class="nav-link" data-scroll-target="#version-4.0.3-2024-05-11">Version 4.0.3 (2024-05-11)</a></li>
   <li><a href="#version-4.0.2-2024-05-01" id="toc-version-4.0.2-2024-05-01" class="nav-link" data-scroll-target="#version-4.0.2-2024-05-01">Version 4.0.2 (2024-05-01)</a></li>
@@ -234,6 +235,7 @@ <h1>Future Version Wishlist</h1>
 <ul>
 <li>Create landscape pages for wide figures and tables.</li>
 <li>Tables in .pdf jou mode should fit automatically.</li>
+<li>An appendix that consists solely of a table or figure should be called by the appendix title (not, for example, Figure A1).</li>
 <li>Implement missing Typst features
 <ul>
 <li>Journal format</li>
@@ -242,10 +244,16 @@ <h1>Future Version Wishlist</h1>
 </ul></li>
 </ul>
 </section>
+<section id="version-4.2.0-2024-05-16" class="level1">
+<h1>Version 4.2.0 (2024-05-16)</h1>
+<ul>
+<li><a href="https://github.com/wjschne/apaquarto/issues/67">#67</a> Setting <code>no-ampersand-parenthetical: true</code> will replace the ampersand in both parenthetical and narrative (in text) citations.</li>
+</ul>
+</section>
 <section id="version-4.1.0-2024-05-13" class="level1">
 <h1>Version 4.1.0 (2024-05-13)</h1>
 <ul>
-<li>Enable selective suppression of most elements of the title page and abstract page. See</li>
+<li><a href="https://github.com/wjschne/apaquarto/issues/68">#68</a> Enable selective suppression of most elements of the title page and abstract page.</li>
 </ul>
 </section>
 <section id="version-4.0.3-2024-05-11" class="level1">
@@ -328,7 +336,7 @@ <h1>Version 3.4.9 (2024-04-09)</h1>
 <li>I removed the <code>apaquarto.Rproj</code> file, <code>references.bib</code>, and <code>img</code> folder from being included by the <code>quarto use template</code> command.</li>
 </ul></li>
 <li>Fixed mainfont problem not loading fontspec package in time for .pdf <a href="https://github.com/wjschne/apaquarto/issues/40">#40</a></li>
-<li>Fixed bug assocated with <code></code> <a href="https://github.com/wjschne/apaquarto/issues/41">#41</a></li>
+<li>Fixed bug associated with <code></code> <a href="https://github.com/wjschne/apaquarto/issues/41">#41</a></li>
 <li>Fixed bug that occurs when no author note is included.</li>
 <li>Fixed figure numbering bug for markdown figures.</li>
 </ul>

diff --git a/docs/index.html b/docs/index.html
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head>
 
 <meta charset="utf-8">
-<meta name="generator" content="quarto-1.5.33">
+<meta name="generator" content="quarto-1.5.36">
 
 <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
 

diff --git a/docs/installation.html b/docs/installation.html
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head>
 
 <meta charset="utf-8">
-<meta name="generator" content="quarto-1.5.33">
+<meta name="generator" content="quarto-1.5.36">
 
 <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
 
@@ -1015,7 +1015,7 @@ <h4 class="anchored" data-anchor-id="an-existing-file">An existing file</h4>
 });
 </script>
 </div> <!-- /content -->
-<script>var lightboxQuarto = GLightbox({"selector":".lightbox","loop":false,"openEffect":"zoom","descPosition":"bottom","closeEffect":"zoom"});
+<script>var lightboxQuarto = GLightbox({"openEffect":"zoom","selector":".lightbox","closeEffect":"zoom","loop":false,"descPosition":"bottom"});
 window.onload = () => {
   lightboxQuarto.on('slide_before_load', (data) => {
     const { slideIndex, slideNode, slideConfig, player, trigger } = data;

diff --git a/docs/options.html b/docs/options.html
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head>
 
 <meta charset="utf-8">
-<meta name="generator" content="quarto-1.5.33">
+<meta name="generator" content="quarto-1.5.36">
 
 <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
 
@@ -372,6 +372,10 @@ <h1>General Options</h1>
 <td style="text-align: left;"><code>meta-analysis</code></td>
 <td style="text-align: left;">By default, all studies listed in the <code>nocite</code> field will be marked with asterisks in the References section. If this behavior is unwanted, set <code>meta-analysis</code> to false.</td>
 </tr>
+<tr class="even">
+<td style="text-align: left;"><code>no-ampersand-parenthetical</code></td>
+<td style="text-align: left;">APA style uses ampersands in parenthetical citations (e.g., Schneider &amp; McGrew, 2018) but not in narrative (i.e., in-text) citations: Schneider and McGrew (2018). You can replace ampersands with “and” in parenthetical citations (e.g., Schneider and McGrew, 2018) by setting the <code>no-ampersand-parenthetical</code> option to <code>true</code>. A different replacement word other than “and” can be set in the <code>citation-last-author-separator</code> field in the <code>language</code> options.</td>
+</tr>
 </tbody>
 </table>
 <section id="authors" class="level2">

diff --git a/docs/resources.html b/docs/resources.html
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head>
 
 <meta charset="utf-8">
-<meta name="generator" content="quarto-1.5.33">
+<meta name="generator" content="quarto-1.5.36">
 
 <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
 
@@ -162,7 +162,8 @@
     <h2 id="toc-title">On this page</h2>
 
   <ul>
-  <li><a href="#apa-style-books" id="toc-apa-style-books" class="nav-link active" data-scroll-target="#apa-style-books">APA-Style Books</a></li>
+  <li><a href="#apa-style-online" id="toc-apa-style-online" class="nav-link active" data-scroll-target="#apa-style-online">APA-Style Online</a></li>
+  <li><a href="#apa-style-books" id="toc-apa-style-books" class="nav-link" data-scroll-target="#apa-style-books">APA-Style Books</a></li>
   <li><a href="#apa-style-helper-functions-in-r" id="toc-apa-style-helper-functions-in-r" class="nav-link" data-scroll-target="#apa-style-helper-functions-in-r">APA-Style Helper Functions in R</a></li>
   <li><a href="#alternatives-to-apaquarto" id="toc-alternatives-to-apaquarto" class="nav-link" data-scroll-target="#alternatives-to-apaquarto">Alternatives to apaquarto</a>
   <ul class="collapse">
@@ -199,6 +200,13 @@ <h1 class="title">Resources</h1>
 </header>
 
 
+<section id="apa-style-online" class="level2">
+<h2 class="anchored" data-anchor-id="apa-style-online">APA-Style Online</h2>
+<ul>
+<li><a href="https://apastyle.apa.org/">APA Style (apa.org)</a></li>
+<li><a href="https://apastyle.apa.org/blog">APA Style Blog</a></li>
+</ul>
+</section>
 <section id="apa-style-books" class="level2">
 <h2 class="anchored" data-anchor-id="apa-style-books">APA-Style Books</h2>
 <ul>

diff --git a/docs/search.json b/docs/search.json
@@ -39,14 +39,21 @@
     "href": "resources.html",
     "title": "Resources",
     "section": "",
-    "text": "American Psychological Association (2020). Publication manual of the American Psychological Association (7th ed.). Author. https://doi.org/10.1037/0000173-000\nAmerican Psychological Association (2020). Concise guide to APA Style: The official APA Style guide for students (7th ed.). Author. https://doi.org/10.1037/0000173-000\nAmerican Psychological Association (2021). Mastering APA Style student workbook. Author. https://doi.org/10.1037/0000271-000"
+    "text": "APA Style (apa.org)\nAPA Style Blog"
+  },
+  {
+    "objectID": "resources.html#apa-style-online",
+    "href": "resources.html#apa-style-online",
+    "title": "Resources",
+    "section": "",
+    "text": "APA Style (apa.org)\nAPA Style Blog"
   },
   {
     "objectID": "resources.html#apa-style-books",
     "href": "resources.html#apa-style-books",
     "title": "Resources",
-    "section": "",
-    "text": "American Psychological Association (2020). Publication manual of the American Psychological Association (7th ed.). Author. https://doi.org/10.1037/0000173-000\nAmerican Psychological Association (2020). Concise guide to APA Style: The official APA Style guide for students (7th ed.). Author. https://doi.org/10.1037/0000173-000\nAmerican Psychological Association (2021). Mastering APA Style student workbook. Author. https://doi.org/10.1037/0000271-000"
+    "section": "APA-Style Books",
+    "text": "APA-Style Books\n\nAmerican Psychological Association (2020). Publication manual of the American Psychological Association (7th ed.). Author. https://doi.org/10.1037/0000173-000\nAmerican Psychological Association (2020). Concise guide to APA Style: The official APA Style guide for students (7th ed.). Author. https://doi.org/10.1037/0000173-000\nAmerican Psychological Association (2021). Mastering APA Style student workbook. Author. https://doi.org/10.1037/0000271-000"
   },
   {
     "objectID": "resources.html#apa-style-helper-functions-in-r",
@@ -102,7 +109,7 @@
     "href": "changelog.html",
     "title": "Changelog",
     "section": "",
-    "text": "Create landscape pages for wide figures and tables.\nTables in .pdf jou mode should fit automatically.\nImplement missing Typst features\n\nJournal format\nLine numbering\nFull language option support"
+    "text": "Create landscape pages for wide figures and tables.\nTables in .pdf jou mode should fit automatically.\nAn appendix that consists solely of a table or figure should be called by the appendix title (not, for example, Figure A1).\nImplement missing Typst features\n\nJournal format\nLine numbering\nFull language option support"
   },
   {
     "objectID": "changelog.html#breaking-changes",

diff --git a/docs/writing.html b/docs/writing.html
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head>
 
 <meta charset="utf-8">
-<meta name="generator" content="quarto-1.5.33">
+<meta name="generator" content="quarto-1.5.36">
 
 <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
 
@@ -694,7 +694,7 @@ <h2 data-anchor-id="importing-figures-with-markdown">Importing Figures with Mark
 <span id="cb11-4"><a href="#cb11-4" aria-hidden="true" tabindex="-1"></a>  fig-alt="A mediation model in which A causes B, and B causes C." </span>
 <span id="cb11-5"><a href="#cb11-5" aria-hidden="true" tabindex="-1"></a>  apa-note="Variable A indirectly causes Variable C."</span>
 <span id="cb11-6"><a href="#cb11-6" aria-hidden="true" tabindex="-1"></a>  }</span></code><button title="Copy to Clipboard" class="code-copy-button"><i class="bi"></i></button></pre></div>
-<div id="fig-myimportedimage" class="quarto-float quarto-figure quarto-figure-center FigureWithNote" alt="A path diagram in which A causes B, and B causes C." data-apa-note="Variable A indirectly causes Variable C." data-custom-style="FigureWithNote">
+<div id="fig-myimportedimage" class="quarto-float quarto-figure quarto-figure-center FigureWithNote" data-apa-note="Variable A indirectly causes Variable C." alt="A path diagram in which A causes B, and B causes C." data-custom-style="FigureWithNote">
 <figure class="quarto-float quarto-float-fig figure">
 <figcaption class="quarto-float-caption-top quarto-float-caption quarto-float-fig" id="fig-myimportedimage-caption-0ceaefa1-69ba-4598-a22c-09a6ac19f8ca">
 <div class="FigureTitle" data-custom-style="FigureTitle">
@@ -751,7 +751,7 @@ <h1>Tables in Code Chunks</h1>
 </figcaption>
 <div aria-describedby="tbl-mytable-caption-0ceaefa1-69ba-4598-a22c-09a6ac19f8ca">
 <div class="cell-output-display">
-<div class="tabwid tabwid_left"><style>.cl-7fede8b8{}.cl-7fe54abe{font-family:'Times New Roman';font-size:11pt;font-weight:normal;font-style:normal;text-decoration:none;color:rgba(0, 0, 0, 1.00);background-color:transparent;}.cl-7fe88efe{margin:0;text-align:center;border-bottom: 0 solid rgba(0, 0, 0, 1.00);border-top: 0 solid rgba(0, 0, 0, 1.00);border-left: 0 solid rgba(0, 0, 0, 1.00);border-right: 0 solid rgba(0, 0, 0, 1.00);padding-bottom:5pt;padding-top:5pt;padding-left:5pt;padding-right:5pt;line-height: 2;background-color:transparent;}.cl-7fe8a844{width:0.75in;background-color:transparent;vertical-align: middle;border-bottom: 0.75pt solid rgba(0, 0, 0, 1.00);border-top: 0.75pt solid rgba(0, 0, 0, 1.00);border-left: 0 solid rgba(0, 0, 0, 1.00);border-right: 0 solid rgba(0, 0, 0, 1.00);margin-bottom:0;margin-top:0;margin-left:0;margin-right:0;}.cl-7fe8a84e{width:0.75in;background-color:transparent;vertical-align: middle;border-bottom: 0 solid rgba(0, 0, 0, 1.00);border-top: 0 solid rgba(0, 0, 0, 1.00);border-left: 0 solid rgba(0, 0, 0, 1.00);border-right: 0 solid rgba(0, 0, 0, 1.00);margin-bottom:0;margin-top:0;margin-left:0;margin-right:0;}.cl-7fe8a84f{width:0.75in;background-color:transparent;vertical-align: middle;border-bottom: 0.75pt solid rgba(0, 0, 0, 1.00);border-top: 0 solid rgba(0, 0, 0, 1.00);border-left: 0 solid rgba(0, 0, 0, 1.00);border-right: 0 solid rgba(0, 0, 0, 1.00);margin-bottom:0;margin-top:0;margin-left:0;margin-right:0;}</style><table data-quarto-disable-processing="true" class="cl-7fede8b8"><thead><tr style="overflow-wrap:break-word;"><th class="cl-7fe8a844"><p class="cl-7fe88efe"><span class="cl-7fe54abe">Letters</span></p></th><th class="cl-7fe8a844"><p class="cl-7fe88efe"><span class="cl-7fe54abe">Numbers</span></p></th></tr></thead><tbody><tr style="overflow-wrap:break-word;"><td class="cl-7fe8a84e"><p class="cl-7fe88efe"><span class="cl-7fe54abe">A</span></p></td><td class="cl-7fe8a84e"><p class="cl-7fe88efe"><span class="cl-7fe54abe">1</span></p></td></tr><tr style="overflow-wrap:break-word;"><td class="cl-7fe8a84e"><p class="cl-7fe88efe"><span class="cl-7fe54abe">B</span></p></td><td class="cl-7fe8a84e"><p class="cl-7fe88efe"><span class="cl-7fe54abe">2</span></p></td></tr><tr style="overflow-wrap:break-word;"><td class="cl-7fe8a84f"><p class="cl-7fe88efe"><span class="cl-7fe54abe">C</span></p></td><td class="cl-7fe8a84f"><p class="cl-7fe88efe"><span class="cl-7fe54abe">3</span></p></td></tr></tbody></table></div>
+<div class="tabwid tabwid_left"><style>.cl-6e7d0854{}.cl-6e73b2fe{font-family:'Times New Roman';font-size:11pt;font-weight:normal;font-style:normal;text-decoration:none;color:rgba(0, 0, 0, 1.00);background-color:transparent;}.cl-6e774e14{margin:0;text-align:center;border-bottom: 0 solid rgba(0, 0, 0, 1.00);border-top: 0 solid rgba(0, 0, 0, 1.00);border-left: 0 solid rgba(0, 0, 0, 1.00);border-right: 0 solid rgba(0, 0, 0, 1.00);padding-bottom:5pt;padding-top:5pt;padding-left:5pt;padding-right:5pt;line-height: 2;background-color:transparent;}.cl-6e776e8a{width:0.75in;background-color:transparent;vertical-align: middle;border-bottom: 0.75pt solid rgba(0, 0, 0, 1.00);border-top: 0.75pt solid rgba(0, 0, 0, 1.00);border-left: 0 solid rgba(0, 0, 0, 1.00);border-right: 0 solid rgba(0, 0, 0, 1.00);margin-bottom:0;margin-top:0;margin-left:0;margin-right:0;}.cl-6e776e8b{width:0.75in;background-color:transparent;vertical-align: middle;border-bottom: 0 solid rgba(0, 0, 0, 1.00);border-top: 0 solid rgba(0, 0, 0, 1.00);border-left: 0 solid rgba(0, 0, 0, 1.00);border-right: 0 solid rgba(0, 0, 0, 1.00);margin-bottom:0;margin-top:0;margin-left:0;margin-right:0;}.cl-6e776e94{width:0.75in;background-color:transparent;vertical-align: middle;border-bottom: 0.75pt solid rgba(0, 0, 0, 1.00);border-top: 0 solid rgba(0, 0, 0, 1.00);border-left: 0 solid rgba(0, 0, 0, 1.00);border-right: 0 solid rgba(0, 0, 0, 1.00);margin-bottom:0;margin-top:0;margin-left:0;margin-right:0;}</style><table data-quarto-disable-processing="true" class="cl-6e7d0854"><thead><tr style="overflow-wrap:break-word;"><th class="cl-6e776e8a"><p class="cl-6e774e14"><span class="cl-6e73b2fe">Letters</span></p></th><th class="cl-6e776e8a"><p class="cl-6e774e14"><span class="cl-6e73b2fe">Numbers</span></p></th></tr></thead><tbody><tr style="overflow-wrap:break-word;"><td class="cl-6e776e8b"><p class="cl-6e774e14"><span class="cl-6e73b2fe">A</span></p></td><td class="cl-6e776e8b"><p class="cl-6e774e14"><span class="cl-6e73b2fe">1</span></p></td></tr><tr style="overflow-wrap:break-word;"><td class="cl-6e776e8b"><p class="cl-6e774e14"><span class="cl-6e73b2fe">B</span></p></td><td class="cl-6e776e8b"><p class="cl-6e774e14"><span class="cl-6e73b2fe">2</span></p></td></tr><tr style="overflow-wrap:break-word;"><td class="cl-6e776e94"><p class="cl-6e774e14"><span class="cl-6e73b2fe">C</span></p></td><td class="cl-6e776e94"><p class="cl-6e774e14"><span class="cl-6e73b2fe">3</span></p></td></tr></tbody></table></div>
 </div>
 </div>
 </figure>
@@ -1392,7 +1392,7 @@ <h1>Appendices</h1>
 });
 </script>
 </div> <!-- /content -->
-<script>var lightboxQuarto = GLightbox({"openEffect":"zoom","closeEffect":"zoom","selector":".lightbox","descPosition":"bottom","loop":false});
+<script>var lightboxQuarto = GLightbox({"closeEffect":"zoom","loop":false,"selector":".lightbox","descPosition":"bottom","openEffect":"zoom"});
 window.onload = () => {
   lightboxQuarto.on('slide_before_load', (data) => {
     const { slideIndex, slideNode, slideConfig, player, trigger } = data;