Merge pull request #9 from angelgardt/angelgardt/dev

deploy 0.0.1:5
angelgardt · May 19, 2024 · 5d11263 · 5d11263
2 parents 02a9783 + e68f944
commit 5d11263
Show file tree

Hide file tree

Showing 147 changed files with 14,118 additions and 11,545 deletions.
diff --git a/book/_book/debug_chapter.html b/book/_book/debug_chapter.html
@@ -1461,8 +1461,8 @@ <h6 data-number="1.2.1.2.1.1" class="anchored" data-anchor-id="совсем-ме
 <div id="fig-rbirthplace" class="cell-output-display quarto-figure quarto-figure-center quarto-float anchored">
 <figure class="quarto-float quarto-float-fig figure">
 <div aria-describedby="fig-rbirthplace-caption-0ceaefa1-69ba-4598-a22c-09a6ac19f8ca">
-<div class="leaflet html-widget html-fill-item" id="htmlwidget-f547c61bbe56eebdc259" style="width:100%;height:464px;"></div>
-<script type="application/json" data-for="htmlwidget-f547c61bbe56eebdc259">{"x":{"options":{"crs":{"crsClass":"L.CRS.EPSG3857","code":null,"proj4def":null,"projectedBounds":null,"options":{}}},"calls":[{"method":"addProviderTiles","args":["Stadia.AlidadeSmooth",null,null,{"errorTileUrl":"","noWrap":false,"detectRetina":false}]},{"method":"addMarkers","args":[-36.852,174.768,null,null,null,{"interactive":true,"draggable":false,"keyboard":true,"title":"","alt":"","zIndexOffset":0,"opacity":1,"riseOnHover":false,"riseOffset":250},"The birthplace of R",null,null,null,null,{"interactive":false,"permanent":false,"direction":"auto","opacity":1,"offset":[0,0],"textsize":"10px","textOnly":false,"className":"","sticky":true},null]}],"limits":{"lat":[-36.852,-36.852],"lng":[174.768,174.768]}},"evals":[],"jsHooks":[]}</script>
+<div class="leaflet html-widget html-fill-item" id="htmlwidget-1e77f225aee28fd311bc" style="width:100%;height:464px;"></div>
+<script type="application/json" data-for="htmlwidget-1e77f225aee28fd311bc">{"x":{"options":{"crs":{"crsClass":"L.CRS.EPSG3857","code":null,"proj4def":null,"projectedBounds":null,"options":{}}},"calls":[{"method":"addProviderTiles","args":["Stadia.AlidadeSmooth",null,null,{"errorTileUrl":"","noWrap":false,"detectRetina":false}]},{"method":"addMarkers","args":[-36.852,174.768,null,null,null,{"interactive":true,"draggable":false,"keyboard":true,"title":"","alt":"","zIndexOffset":0,"opacity":1,"riseOnHover":false,"riseOffset":250},"The birthplace of R",null,null,null,null,{"interactive":false,"permanent":false,"direction":"auto","opacity":1,"offset":[0,0],"textsize":"10px","textOnly":false,"className":"","sticky":true},null]}],"limits":{"lat":[-36.852,-36.852],"lng":[174.768,174.768]}},"evals":[],"jsHooks":[]}</script>
 </div>
 <figcaption class="quarto-float-caption-bottom quarto-float-caption quarto-float-fig" id="fig-rbirthplace-caption-0ceaefa1-69ba-4598-a22c-09a6ac19f8ca">
 Иллюстрация&nbsp;1.5: Тут родился R

diff --git a/book/_book/debug_chapter_files/figure-html/fig-huge-chunk-1.png b/book/_book/debug_chapter_files/figure-html/fig-huge-chunk-1.png
diff --git a/book/_book/debug_quiz.html b/book/_book/debug_quiz.html
@@ -1573,8 +1573,8 @@ <h2 class="unnumbered anchored" data-anchor-id="section-19">#20</h2>
 </div>
 
 <!--- CHANGE quiz0 TO quiz<n> IN THE LINES BELOW --->
-<script type="text/javascript" src="../js/quiz0.json"></script>
-<script type="text/javascript" src="../js/quiz.js"></script>
+<script type="text/javascript" src="./js/quiz0.json"></script>
+<script type="text/javascript" src="./js/quiz.js"></script>
 
 
 </section></form>

diff --git a/book/_book/debug_sheet.html b/book/_book/debug_sheet.html
@@ -1724,8 +1724,8 @@ <h2 class="unnumbered anchored" data-anchor-id="section-29">#30</h2>
 <p>References &amp; Attribution</p>
 <hr>
 <!--- CHANGE sheet0 TO sheet<n> IN THE LINES BELOW--->
-<script type="text/javascript" src="../js/sheet0.json"></script>
-<script type="text/javascript" src="../js/sheet.js"></script>
+<script type="text/javascript" src="./js/sheet0.json"></script>
+<script type="text/javascript" src="./js/sheet.js"></script>
 
 
 </section>

diff --git a/deploy/backup/js/quiz.js → book/_book/js/quiz.js b/deploy/backup/js/quiz.js → book/_book/js/quiz.js
diff --git a/deploy/backup/js/quiz0.json → book/_book/js/quiz0.json b/deploy/backup/js/quiz0.json → book/_book/js/quiz0.json
diff --git a/deploy/backup/js/sheet.js → book/_book/js/sheet.js b/deploy/backup/js/sheet.js → book/_book/js/sheet.js
diff --git a/deploy/backup/js/sheet0.json → book/_book/js/sheet0.json b/deploy/backup/js/sheet0.json → book/_book/js/sheet0.json
diff --git a/book/_book/r-intro.html b/book/_book/r-intro.html
@@ -54,7 +54,27 @@
 @media screen {
 pre > code.sourceCode > span > a:first-child::before { text-decoration: underline; }
 }
-</style>
+/* CSS for citations */
+div.csl-bib-body { }
+div.csl-entry {
+  clear: both;
+  margin-bottom: 0em;
+}
+.hanging-indent div.csl-entry {
+  margin-left:2em;
+  text-indent:-2em;
+}
+div.csl-left-margin {
+  min-width:2em;
+  float:left;
+}
+div.csl-right-inline {
+  margin-left:2em;
+  padding-left:1em;
+}
+div.csl-indent {
+  margin-left: 2em;
+}</style>
 
 
 <script src="site_libs/quarto-nav/quarto-nav.js"></script>
@@ -1079,7 +1099,7 @@ <h2 data-number="2.7" class="anchored" data-anchor-id="r-intro-citation"><span c
 <div class="lab-junior">
 
 </div>
-<p>На R, как и на любые ресурсы, используемые при написании статьи или отчета, следует ссылаться — цитировать в разделе References. Для этого существует удобная команда:</p>
+<p>На R <span class="citation" data-cites="r-core-team">(<a href="references.html#ref-r-core-team" role="doc-biblioref">R Core Team, 2023</a>)</span>, как и на любые ресурсы, используемые при написании статьи или отчета, следует ссылаться — цитировать в разделе References. Для этого существует удобная команда:</p>
 <div class="cell">
 <div class="sourceCode cell-code" id="cb3"><pre class="sourceCode r code-with-copy"><code class="sourceCode r"><span id="cb3-1"><a href="#cb3-1" aria-hidden="true" tabindex="-1"></a><span class="fu">citation</span>()</span></code><button title="Копировать" class="code-copy-button"><i class="bi"></i></button></pre></div>
 <div class="cell-output cell-output-stdout">
@@ -1106,27 +1126,39 @@ <h2 data-number="2.7" class="anchored" data-anchor-id="r-intro-citation"><span c
 </div>
 </div>
 <p>В аутпуте есть вариант ссылки в форматах APA и BibTeх. Второй вам пригодится, если вы пишете отчеты в <span class="math inline">\(\LaTeX\)</span> или R Markdown и Quarto, первый — в других случаях. Если вы копируете APA-цитату в текстовый редактор, добавьте курсивное форматирование на текст, заключенный между андерскорами (нижними подчеркиваниями<a href="#fn4" class="footnote-ref" id="fnref4" role="doc-noteref"><sup>4</sup></a>, <code>_</code>) , а сами андерскоры удалите<a href="#fn5" class="footnote-ref" id="fnref5" role="doc-noteref"><sup>5</sup></a>.</p>
-<p>Кроме базового R, мы будем активно использовать разные дополнительные пакеты для расширения его возможностей. На использованные в работе пакеты также необходимо ссылаться. Чтобы получить цитирование конкретного пакета<a href="#fn6" class="footnote-ref" id="fnref6" role="doc-noteref"><sup>6</sup></a>, надо передать его название внутрь функции <code>citation()</code>. Ниже приведен пример для пакета <code>ggplot2</code>, которые мы будем использоваться для построения визуализаций:</p>
+<p>Хорошим тоном будет сослаться и на RStudio <span class="citation" data-cites="rstudio-core-team">(<a href="references.html#ref-rstudio-core-team" role="doc-biblioref">Posit team, 2024</a>)</span>:</p>
 <div class="cell">
-<div class="sourceCode cell-code" id="cb5"><pre class="sourceCode r code-with-copy"><code class="sourceCode r"><span id="cb5-1"><a href="#cb5-1" aria-hidden="true" tabindex="-1"></a><span class="fu">citation</span>(<span class="st">"ggplot2"</span>)</span></code><button title="Копировать" class="code-copy-button"><i class="bi"></i></button></pre></div>
-<div class="cell-output cell-output-stdout">
-<pre><code>To cite ggplot2 in publications, please use
+<div class="sourceCode cell-code" id="cb5"><pre class="sourceCode r code-with-copy"><code class="sourceCode r"><span id="cb5-1"><a href="#cb5-1" aria-hidden="true" tabindex="-1"></a><span class="fu">RStudio.Version</span>()</span></code><button title="Копировать" class="code-copy-button"><i class="bi"></i></button></pre></div>
+</div>
+<pre><code>$citation
+To cite RStudio in publications use:
 
-  H. Wickham. ggplot2: Elegant Graphics for Data Analysis.
-  Springer-Verlag New York, 2016.
+  Posit team (2024). RStudio: Integrated Development Environment for R. Posit Software,
+  PBC, Boston, MA. URL http://www.posit.co/.
 
 A BibTeX entry for LaTeX users is
 
-  @Book{,
-    author = {Hadley Wickham},
-    title = {ggplot2: Elegant Graphics for Data Analysis},
-    publisher = {Springer-Verlag New York},
-    year = {2016},
-    isbn = {978-3-319-24277-4},
-    url = {https://ggplot2.tidyverse.org},
-  }</code></pre>
-</div>
-</div>
+  @Manual{,
+    title = {RStudio: Integrated Development Environment for R},
+    author = {{Posit team}},
+    organization = {Posit Software, PBC},
+    address = {Boston, MA},
+    year = {2024},
+    url = {http://www.posit.co/},
+  }
+
+$mode
+[1] "desktop"
+
+$version
+[1] ‘2024.4.1.748’
+
+$long_version
+[1] "2024.04.1+748"
+
+$release_name
+[1] "Chocolate Cosmos"
+</code></pre>
 </section>
 <section id="r-intro-updates" class="level2" data-number="2.8">
 <h2 data-number="2.8" class="anchored" data-anchor-id="r-intro-updates"><span class="header-section-number">2.8</span> Обновления</h2>
@@ -1168,6 +1200,14 @@ <h6 class="unnumbered anchored" data-anchor-id="session_info">Session Info</h6>
 </div>
 
 
+<div id="refs" class="references csl-bib-body hanging-indent" data-entry-spacing="0" data-line-spacing="2" role="list" style="display: none">
+<div id="ref-rstudio-core-team" class="csl-entry" role="listitem">
+Posit team. (2024). <em>RStudio: Integrated development environment for r</em>. Posit Software, PBC. <a href="http://www.posit.co/">http://www.posit.co/</a>
+</div>
+<div id="ref-r-core-team" class="csl-entry" role="listitem">
+R Core Team. (2023). <em>R: A language and environment for statistical computing</em>. R Foundation for Statistical Computing. <a href="https://www.R-project.org/">https://www.R-project.org/</a>
+</div>
+</div>
 </section>
 </section>
 <section id="footnotes" class="footnotes footnotes-end-of-document" role="doc-endnotes">
@@ -1178,7 +1218,6 @@ <h6 class="unnumbered anchored" data-anchor-id="session_info">Session Info</h6>
 <li id="fn3"><p>Их мы будем обсуждать в <a href="./r-data.html#r-data-rstudio-projects">разделе о работе с данными</a>.<a href="#fnref3" class="footnote-back" role="doc-backlink">↩︎</a></p></li>
 <li id="fn4"><p>Согласно правилам современного русского литературного языка, термин «нижнее подчеркивание» является плеоназмом, так как любое подчеркивание выполняется снизу. Однако такой термин используется наряду с терминами <em>подчерк</em> и <em>underscore</em>, поэтому использую его и я.<a href="#fnref4" class="footnote-back" role="doc-backlink">↩︎</a></p></li>
 <li id="fn5"><p>Такой синтаксис используется в Markdown — в частности, R Markdown.<a href="#fnref5" class="footnote-back" role="doc-backlink">↩︎</a></p></li>
-<li id="fn6"><p>Чтобы функция <code>citation("pkgname")</code> работала, пакет <code>pkgname</code> должен быть установлен на ваш компьютер. <em>Здесь</em> <code>pkgname</code> <em>— название какого-либо дополнительного пакета.</em><a href="#fnref6" class="footnote-back" role="doc-backlink">↩︎</a></p></li>
 </ol>
 </section>
 

diff --git a/book/_book/references.html b/book/_book/references.html
@@ -795,8 +795,15 @@ <h1 class="title">Источники</h1>
 
 
 
-<div id="refs" role="list" style="display: none">
-
+<div id="refs" class="references csl-bib-body hanging-indent" data-entry-spacing="0" data-line-spacing="2" role="list">
+<div id="ref-rstudio-core-team" class="csl-entry" role="listitem">
+Posit team. (2024). <em>RStudio: Integrated development environment for
+r</em>. Posit Software, PBC. <a href="http://www.posit.co/">http://www.posit.co/</a>
+</div>
+<div id="ref-r-core-team" class="csl-entry" role="listitem">
+R Core Team. (2023). <em>R: A language and environment for statistical
+computing</em>. R Foundation for Statistical Computing. <a href="https://www.R-project.org/">https://www.R-project.org/</a>
+</div>
 </div>