Skip to content

Commit

Permalink
fix mainfont for html
Browse files Browse the repository at this point in the history
  • Loading branch information
wjschne committed Nov 22, 2024
1 parent ad5f1f3 commit ad5175f
Show file tree
Hide file tree
Showing 14 changed files with 95 additions and 65 deletions.
4 changes: 2 additions & 2 deletions _extensions/apaquarto/_extension.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
title: My Document in APA Style, Seventh Edition
author: W. Joel Schneider
version: 4.3.5
version: 4.3.6
quarto-required: ">=1.4.549"
contributes:
formats:
Expand Down Expand Up @@ -111,11 +111,11 @@ contributes:
anchor-sections: false
fig-cap-location: top
html-math-method: katex
mainfont: Times, Times New Roman, serif
grid:
body-width: "7in"
css: apa.css
theme:
- litera
- apa.scss
template-partials:
- title-block.html
Expand Down
3 changes: 0 additions & 3 deletions _extensions/apaquarto/apa.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,13 @@
$body-bg: white;
$body-color: #303030;
$link-color: #75AADB;
$font-family-serif: Times, "Times New Roman", serif;
$font-family-sans-serif: Times, "Times New Roman", serif;
$font-size-root: 12pt;
$bs-body-font-size: 1rem;
$h1-font-size: $font-size-root !default;
$h2-font-size: $font-size-root !default;
$h3-font-size: $font-size-root !default;
$h4-font-size: $font-size-root !default;
$h5-font-size: $font-size-root !default;
$headings-font-family: Times, "Times New Roman", serif;
$table-striped-bg: #FFFFFF;
// Code blocks
$code-block-bg-alpha: -.8;
Expand Down
8 changes: 8 additions & 0 deletions changelog.qmd
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,14 @@ engine: knitr
* Full language option support


# Version 4.3.6 (2024-11-22)

- [#98](https://github.com/wjschne/apaquarto/issues/98) The `mainfont` option now works for apaquarto-html.

# Version 4.3.5 (2024-11-22)

- [#97](https://github.com/wjschne/apaquarto/issues/97) Added a `draft-date` option.

# Version 4.3.4 (2024-09-01)

- [#85](https://github.com/wjschne/apaquarto/issues/85) Fixed longtable counter problem.
Expand Down
16 changes: 15 additions & 1 deletion docs/changelog.html
Original file line number Diff line number Diff line change
Expand Up @@ -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.6.6">
<meta name="generator" content="quarto-1.5.57">

<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">

Expand Down Expand Up @@ -163,6 +163,8 @@ <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.3.6-2024-11-22" id="toc-version-4.3.6-2024-11-22" class="nav-link" data-scroll-target="#version-4.3.6-2024-11-22">Version 4.3.6 (2024-11-22)</a></li>
<li><a href="#version-4.3.5-2024-11-22" id="toc-version-4.3.5-2024-11-22" class="nav-link" data-scroll-target="#version-4.3.5-2024-11-22">Version 4.3.5 (2024-11-22)</a></li>
<li><a href="#version-4.3.4-2024-09-01" id="toc-version-4.3.4-2024-09-01" class="nav-link" data-scroll-target="#version-4.3.4-2024-09-01">Version 4.3.4 (2024-09-01)</a></li>
<li><a href="#version-4.3.3-2024-07-04" id="toc-version-4.3.3-2024-07-04" class="nav-link" data-scroll-target="#version-4.3.3-2024-07-04">Version 4.3.3 (2024-07-04)</a></li>
<li><a href="#version-4.3.2-2024-06-19" id="toc-version-4.3.2-2024-06-19" class="nav-link" data-scroll-target="#version-4.3.2-2024-06-19">Version 4.3.2 (2024-06-19)</a></li>
Expand Down Expand Up @@ -249,6 +251,18 @@ <h1>Future Version Wishlist</h1>
</ul></li>
</ul>
</section>
<section id="version-4.3.6-2024-11-22" class="level1">
<h1>Version 4.3.6 (2024-11-22)</h1>
<ul>
<li><a href="https://github.com/wjschne/apaquarto/issues/98">#98</a> The <code>mainfont</code> option now works for apaquarto-html.</li>
</ul>
</section>
<section id="version-4.3.5-2024-11-22" class="level1">
<h1>Version 4.3.5 (2024-11-22)</h1>
<ul>
<li><a href="https://github.com/wjschne/apaquarto/issues/97">#97</a> Added a <code>draft-date</code> option.</li>
</ul>
</section>
<section id="version-4.3.4-2024-09-01" class="level1">
<h1>Version 4.3.4 (2024-09-01)</h1>
<ul>
Expand Down
2 changes: 1 addition & 1 deletion docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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.6.6">
<meta name="generator" content="quarto-1.5.57">

<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">

Expand Down
4 changes: 2 additions & 2 deletions docs/installation.html
Original file line number Diff line number Diff line change
Expand Up @@ -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.6.6">
<meta name="generator" content="quarto-1.5.57">

<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">

Expand Down Expand Up @@ -1020,7 +1020,7 @@ <h4 class="anchored" data-anchor-id="an-existing-file">An existing file</h4>
});
</script>
</div> <!-- /content -->
<script>var lightboxQuarto = GLightbox({"closeEffect":"zoom","openEffect":"zoom","selector":".lightbox","loop":false,"descPosition":"bottom"});
<script>var lightboxQuarto = GLightbox({"selector":".lightbox","loop":false,"closeEffect":"zoom","openEffect":"zoom","descPosition":"bottom"});
(function() {
let previousOnload = window.onload;
window.onload = () => {
Expand Down
2 changes: 1 addition & 1 deletion docs/options.html
Original file line number Diff line number Diff line change
Expand Up @@ -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.6.6">
<meta name="generator" content="quarto-1.5.57">

<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">

Expand Down
2 changes: 1 addition & 1 deletion docs/resources.html
Original file line number Diff line number Diff line change
Expand Up @@ -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.6.6">
<meta name="generator" content="quarto-1.5.57">

<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">

Expand Down
13 changes: 12 additions & 1 deletion docs/site_libs/tabwid-1.1.3/tabwid.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,16 @@ document.addEventListener("DOMContentLoaded", function(event) {
fantome.appendChild(tabwid_link.cloneNode(true));
}
});
});

const shadowHosts = document.querySelectorAll('.flextable-shadow-host:not(:has(div > table.no-shadow-dom))');
shadowHosts.forEach(host => {
if (host.shadowRoot) {
const spanElements = host.shadowRoot.querySelector('div > table > caption > span[id]');
if (spanElements) {
const id = spanElements.getAttribute("id");
host.setAttribute("id", id);
}
}
});

});
10 changes: 5 additions & 5 deletions docs/writing.html
Original file line number Diff line number Diff line change
Expand Up @@ -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.6.6">
<meta name="generator" content="quarto-1.5.57">

<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">

Expand Down Expand Up @@ -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" 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">
<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">
<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">
Expand Down Expand Up @@ -739,7 +739,7 @@ <h1>Tables in Code Chunks</h1>
<span id="cb12-11"><a href="#cb12-11" aria-hidden="true" tabindex="-1"></a><span class="in"> flextable() %&gt;% </span></span>
<span id="cb12-12"><a href="#cb12-12" aria-hidden="true" tabindex="-1"></a><span class="in"> theme_apa() </span></span>
<span id="cb12-13"><a href="#cb12-13" aria-hidden="true" tabindex="-1"></a><span class="in">```</span></span></code><button title="Copy to Clipboard" class="code-copy-button"><i class="bi"></i></button></pre></div>
<div id="tbl-mytable" class="cell quarto-float quarto-figure quarto-figure-center" data-ft.align="left" data-apa-note="A note below table">
<div id="tbl-mytable" class="cell quarto-float quarto-figure quarto-figure-center" data-apa-note="A note below table" data-ft.align="left">
<figure class="quarto-float quarto-float-tbl figure">
<figcaption class="quarto-float-caption-top quarto-float-caption quarto-float-tbl" id="tbl-mytable-caption-0ceaefa1-69ba-4598-a22c-09a6ac19f8ca">
<div class="FigureTitle" data-custom-style="FigureTitle">
Expand All @@ -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-0a458d46{}.cl-0a3c5f32{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-0a400cfe{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-0a402cc0{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-0a402cca{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-0a402ccb{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-0a458d46"><thead><tr style="overflow-wrap:break-word;"><th class="cl-0a402cc0"><p class="cl-0a400cfe"><span class="cl-0a3c5f32">Letters</span></p></th><th class="cl-0a402cc0"><p class="cl-0a400cfe"><span class="cl-0a3c5f32">Numbers</span></p></th></tr></thead><tbody><tr style="overflow-wrap:break-word;"><td class="cl-0a402cca"><p class="cl-0a400cfe"><span class="cl-0a3c5f32">A</span></p></td><td class="cl-0a402cca"><p class="cl-0a400cfe"><span class="cl-0a3c5f32">1</span></p></td></tr><tr style="overflow-wrap:break-word;"><td class="cl-0a402cca"><p class="cl-0a400cfe"><span class="cl-0a3c5f32">B</span></p></td><td class="cl-0a402cca"><p class="cl-0a400cfe"><span class="cl-0a3c5f32">2</span></p></td></tr><tr style="overflow-wrap:break-word;"><td class="cl-0a402ccb"><p class="cl-0a400cfe"><span class="cl-0a3c5f32">C</span></p></td><td class="cl-0a402ccb"><p class="cl-0a400cfe"><span class="cl-0a3c5f32">3</span></p></td></tr></tbody></table></div>
<div class="tabwid tabwid_left"><style>.cl-b487aada{}.cl-b47f19a6{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-b4826336{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-b4828226{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-b4828230{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-b4828231{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-b487aada"><thead><tr style="overflow-wrap:break-word;"><th class="cl-b4828226"><p class="cl-b4826336"><span class="cl-b47f19a6">Letters</span></p></th><th class="cl-b4828226"><p class="cl-b4826336"><span class="cl-b47f19a6">Numbers</span></p></th></tr></thead><tbody><tr style="overflow-wrap:break-word;"><td class="cl-b4828230"><p class="cl-b4826336"><span class="cl-b47f19a6">A</span></p></td><td class="cl-b4828230"><p class="cl-b4826336"><span class="cl-b47f19a6">1</span></p></td></tr><tr style="overflow-wrap:break-word;"><td class="cl-b4828230"><p class="cl-b4826336"><span class="cl-b47f19a6">B</span></p></td><td class="cl-b4828230"><p class="cl-b4826336"><span class="cl-b47f19a6">2</span></p></td></tr><tr style="overflow-wrap:break-word;"><td class="cl-b4828231"><p class="cl-b4826336"><span class="cl-b47f19a6">C</span></p></td><td class="cl-b4828231"><p class="cl-b4826336"><span class="cl-b47f19a6">3</span></p></td></tr></tbody></table></div>
</div>
</div>
</figure>
Expand Down Expand Up @@ -1392,7 +1392,7 @@ <h1>Appendices</h1>
});
</script>
</div> <!-- /content -->
<script>var lightboxQuarto = GLightbox({"loop":false,"selector":".lightbox","closeEffect":"zoom","descPosition":"bottom","openEffect":"zoom"});
<script>var lightboxQuarto = GLightbox({"closeEffect":"zoom","loop":false,"openEffect":"zoom","selector":".lightbox","descPosition":"bottom"});
(function() {
let previousOnload = window.onload;
window.onload = () => {
Expand Down
Binary file modified docs/writing_files/figure-html/fig-myplot-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/writing_files/figure-html/fig-myplot2-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/writing_files/figure-html/fig-myplot3-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit ad5175f

Please sign in to comment.