mirror of
https://gitlab.com/upRootNutrition/obsidian.git
synced 2025-06-15 22:35:12 -05:00
feat: 5/10/24 update
This commit is contained in:
Nick
parent
e22bd788fe
commit
da37ce527c
32 changed files with 1130 additions and 45001 deletions
|
|
@ -1,6 +1,6 @@
|
|||
%%
|
||||
% Copyright (c) 2017 - 2021, Pascal Wagler;
|
||||
% Copyright (c) 2014 - 2021, John MacFarlane
|
||||
% Copyright (c) 2017 - 2023, Pascal Wagler;
|
||||
% Copyright (c) 2014 - 2023, John MacFarlane
|
||||
%
|
||||
% All rights reserved.
|
||||
%
|
||||
|
|
@ -78,9 +78,11 @@ $if(background-image)$
|
|||
\usebackgroundtemplate{%
|
||||
\includegraphics[width=\paperwidth]{$background-image$}%
|
||||
}
|
||||
% In beamer background-image does not work well when other images are used, so this is the workaround
|
||||
\pgfdeclareimage[width=\paperwidth,height=\paperheight]{background}{$background-image$}
|
||||
\usebackgroundtemplate{\pgfuseimage{background}}
|
||||
$endif$
|
||||
|
||||
|
||||
\usepackage{pgfpages}
|
||||
\setbeamertemplate{caption}[numbered]
|
||||
\setbeamertemplate{caption label separator}{: }
|
||||
\setbeamercolor{caption name}{fg=normal text.fg}
|
||||
|
|
@ -213,6 +215,12 @@ $if(CJKmainfont)$
|
|||
\ifXeTeX
|
||||
\usepackage{xeCJK}
|
||||
\setCJKmainfont[$for(CJKoptions)$$CJKoptions$$sep$,$endfor$]{$CJKmainfont$}
|
||||
$if(CJKsansfont)$
|
||||
\setCJKsansfont[$for(CJKoptions)$$CJKoptions$$sep$,$endfor$]{$CJKsansfont$}
|
||||
$endif$
|
||||
$if(CJKmonofont)$
|
||||
\setCJKmonofont[$for(CJKoptions)$$CJKoptions$$sep$,$endfor$]{$CJKmonofont$}
|
||||
$endif$
|
||||
\fi
|
||||
$endif$
|
||||
$if(luatexjapresetoptions)$
|
||||
|
|
@ -298,7 +306,10 @@ $else$
|
|||
\usepackage[margin=2.5cm,includehead=true,includefoot=true,centering,$for(geometry)$$geometry$$sep$,$endfor$]{geometry}
|
||||
$endif$
|
||||
$endif$
|
||||
|
||||
$if(titlepage-logo)$
|
||||
\usepackage[export]{adjustbox}
|
||||
\usepackage{graphicx}
|
||||
$endif$
|
||||
$if(beamer)$
|
||||
\newif\ifbibliography
|
||||
$endif$
|
||||
|
|
@ -361,16 +372,21 @@ $endif$
|
|||
$if(graphics)$
|
||||
\usepackage{graphicx}
|
||||
\makeatletter
|
||||
\def\maxwidth{\ifdim\Gin@nat@width>\linewidth\linewidth\else\Gin@nat@width\fi}
|
||||
\def\maxheight{\ifdim\Gin@nat@height>\textheight\textheight\else\Gin@nat@height\fi}
|
||||
\makeatother
|
||||
% Scale images if necessary, so that they will not overflow the page
|
||||
% margins by default, and it is still possible to overwrite the defaults
|
||||
% using explicit options in \includegraphics[width, height, ...]{}
|
||||
\setkeys{Gin}{width=\maxwidth,height=\maxheight,keepaspectratio}
|
||||
\newsavebox\pandoc@box
|
||||
\newcommand*\pandocbounded[1]{% scales image to fit in text height/width
|
||||
\sbox\pandoc@box{#1}%
|
||||
\Gscale@div\@tempa{\textheight}{\dimexpr\ht\pandoc@box+\dp\pandoc@box\relax}%
|
||||
\Gscale@div\@tempb{\linewidth}{\wd\pandoc@box}%
|
||||
\ifdim\@tempb\p@<\@tempa\p@\let\@tempa\@tempb\fi% select the smaller of both
|
||||
\ifdim\@tempa\p@<\p@\scalebox{\@tempa}{\usebox\pandoc@box}%
|
||||
\else\usebox{\pandoc@box}%
|
||||
\fi%
|
||||
}
|
||||
% Set default figure placement to htbp
|
||||
\makeatletter
|
||||
\def\fps@figure{htbp}
|
||||
% Make use of float-package and set default placement for figures to H.
|
||||
% The option H means 'PUT IT HERE' (as opposed to the standard h option which means 'You may put it here if you like').
|
||||
\usepackage{float}
|
||||
\floatplacement{figure}{$if(float-placement-figure)$$float-placement-figure$$else$H$endif$}
|
||||
\makeatother
|
||||
$endif$
|
||||
$if(svg)$
|
||||
|
|
@ -378,7 +394,19 @@ $if(svg)$
|
|||
$endif$
|
||||
$if(strikeout)$
|
||||
$-- also used for underline
|
||||
\ifLuaTeX
|
||||
\usepackage{luacolor}
|
||||
\usepackage[soul]{lua-ul}
|
||||
\else
|
||||
\usepackage{soul}
|
||||
$if(CJKmainfont)$
|
||||
\ifXeTeX
|
||||
% soul's \st doesn't work for CJK:
|
||||
\usepackage{xeCJKfntef}
|
||||
\renewcommand{\st}[1]{\sout{#1}}
|
||||
\fi
|
||||
$endif$
|
||||
\fi
|
||||
$endif$
|
||||
\setlength{\emergencystretch}{3em} % prevent overfull lines
|
||||
\providecommand{\tightlist}{%
|
||||
|
|
@ -388,6 +416,9 @@ $if(numbersections)$
|
|||
$else$
|
||||
\setcounter{secnumdepth}{-\maxdimen} % remove section numbering
|
||||
$endif$
|
||||
$if(subfigure)$
|
||||
\usepackage{subcaption}
|
||||
$endif$
|
||||
$if(beamer)$
|
||||
$else$
|
||||
$if(block-headings)$
|
||||
|
|
@ -406,28 +437,38 @@ $if(pagestyle)$
|
|||
\pagestyle{$pagestyle$}
|
||||
$endif$
|
||||
$if(csl-refs)$
|
||||
% definitions for citeproc citations
|
||||
\NewDocumentCommand\citeproctext{}{}
|
||||
\NewDocumentCommand\citeproc{mm}{%
|
||||
\begingroup\def\citeproctext{#2}\cite{#1}\endgroup}
|
||||
\makeatletter
|
||||
% allow citations to break across lines
|
||||
\let\@cite@ofmt\@firstofone
|
||||
% avoid brackets around text for \cite:
|
||||
\def\@biblabel#1{}
|
||||
\def\@cite#1#2{{#1\if@tempswa , #2\fi}}
|
||||
\makeatother
|
||||
\newlength{\cslhangindent}
|
||||
\setlength{\cslhangindent}{1.5em}
|
||||
\newlength{\csllabelwidth}
|
||||
\setlength{\csllabelwidth}{3em}
|
||||
\newlength{\cslentryspacingunit} % times entry-spacing
|
||||
\setlength{\cslentryspacingunit}{\parskip}
|
||||
\newenvironment{CSLReferences}[2] % #1 hanging-ident, #2 entry spacing
|
||||
{% don't indent paragraphs
|
||||
\setlength{\parindent}{0pt}
|
||||
% turn on hanging indent if param 1 is 1
|
||||
\ifodd #1
|
||||
\let\oldpar\par
|
||||
\def\par{\hangindent=\cslhangindent\oldpar}
|
||||
\fi
|
||||
% set entry spacing
|
||||
\setlength{\parskip}{#2\cslentryspacingunit}
|
||||
}%
|
||||
{}
|
||||
\newenvironment{CSLReferences}[2] % #1 hanging-indent, #2 entry-spacing
|
||||
{\begin{list}{}{%
|
||||
\setlength{\itemindent}{0pt}
|
||||
\setlength{\leftmargin}{0pt}
|
||||
\setlength{\parsep}{0pt}
|
||||
% turn on hanging indent if param 1 is 1
|
||||
\ifodd #1
|
||||
\setlength{\leftmargin}{\cslhangindent}
|
||||
\setlength{\itemindent}{-1\cslhangindent}
|
||||
\fi
|
||||
% set entry spacing
|
||||
\setlength{\itemsep}{#2\baselineskip}}}
|
||||
{\end{list}}
|
||||
\usepackage{calc}
|
||||
\newcommand{\CSLBlock}[1]{#1\hfill\break}
|
||||
\newcommand{\CSLLeftMargin}[1]{\parbox[t]{\csllabelwidth}{#1}}
|
||||
\newcommand{\CSLRightInline}[1]{\parbox[t]{\linewidth - \csllabelwidth}{#1}\break}
|
||||
\newcommand{\CSLBlock}[1]{\hfill\break\parbox[t]{\linewidth}{\strut\ignorespaces#1\strut}}
|
||||
\newcommand{\CSLLeftMargin}[1]{\parbox[t]{\csllabelwidth}{\strut#1\strut}}
|
||||
\newcommand{\CSLRightInline}[1]{\parbox[t]{\linewidth - \csllabelwidth}{\strut#1\strut}}
|
||||
\newcommand{\CSLIndent}[1]{\hspace{\cslhangindent}#1}
|
||||
$endif$
|
||||
$if(lang)$
|
||||
|
|
@ -438,10 +479,19 @@ $if(lang)$
|
|||
\fi
|
||||
$if(babel-lang)$
|
||||
\babelprovide[main,import]{$babel-lang$}
|
||||
$if(mainfont)$
|
||||
\ifPDFTeX
|
||||
\else
|
||||
\babelfont{rm}[$for(mainfontoptions)$$mainfontoptions$$sep$,$endfor$]{$mainfont$}
|
||||
\fi
|
||||
$endif$
|
||||
$endif$
|
||||
$for(babel-otherlangs)$
|
||||
\babelprovide[import]{$babel-otherlangs$}
|
||||
$endfor$
|
||||
$for(babelfonts/pairs)$
|
||||
\babelfont[$babelfonts.key$]{rm}{$babelfonts.value$}
|
||||
$endfor$
|
||||
% get rid of language-specific shorthands (see #6817):
|
||||
\let\LanguageShortHands\languageshorthands
|
||||
\def\languageshorthands#1{}
|
||||
|
|
@ -695,18 +745,16 @@ $if(table-use-row-colors)$
|
|||
% \end{longtable}
|
||||
%
|
||||
% https://en.wikibooks.org/wiki/LaTeX/Tables#.40-expressions
|
||||
\let\oldlongtable\longtable
|
||||
\let\endoldlongtable\endlongtable
|
||||
\renewenvironment{longtable}{
|
||||
\rowcolors{3}{}{table-row-color!100} % row color
|
||||
\oldlongtable} {
|
||||
\endoldlongtable
|
||||
\global\rownum=0\relax}
|
||||
\usepackage{etoolbox}
|
||||
\AtBeginEnvironment{longtable}{\rowcolors{2}{}{table-row-color!100}}
|
||||
\preto{\toprule}{\hiderowcolors}{}{}
|
||||
\appto{\endhead}{\showrowcolors}{}{}
|
||||
\appto{\endfirsthead}{\showrowcolors}{}{}
|
||||
$endif$
|
||||
$endif$
|
||||
|
||||
%
|
||||
% remove paragraph indention
|
||||
% remove paragraph indentation
|
||||
%
|
||||
\setlength{\parindent}{0pt}
|
||||
\setlength{\parskip}{6pt plus 2pt minus 1pt}
|
||||
|
|
@ -772,8 +820,8 @@ $endif$
|
|||
literate =
|
||||
{á}{{\'a}}1 {é}{{\'e}}1 {í}{{\'i}}1 {ó}{{\'o}}1 {ú}{{\'u}}1
|
||||
{Á}{{\'A}}1 {É}{{\'E}}1 {Í}{{\'I}}1 {Ó}{{\'O}}1 {Ú}{{\'U}}1
|
||||
{à}{{\`a}}1 {è}{{\'e}}1 {ì}{{\`i}}1 {ò}{{\`o}}1 {ù}{{\`u}}1
|
||||
{À}{{\`A}}1 {È}{{\'E}}1 {Ì}{{\`I}}1 {Ò}{{\`O}}1 {Ù}{{\`U}}1
|
||||
{à}{{\`a}}1 {è}{{\`e}}1 {ì}{{\`i}}1 {ò}{{\`o}}1 {ù}{{\`u}}1
|
||||
{À}{{\`A}}1 {È}{{\`E}}1 {Ì}{{\`I}}1 {Ò}{{\`O}}1 {Ù}{{\`U}}1
|
||||
{ä}{{\"a}}1 {ë}{{\"e}}1 {ï}{{\"i}}1 {ö}{{\"o}}1 {ü}{{\"u}}1
|
||||
{Ä}{{\"A}}1 {Ë}{{\"E}}1 {Ï}{{\"I}}1 {Ö}{{\"O}}1 {Ü}{{\"U}}1
|
||||
{â}{{\^a}}1 {ê}{{\^e}}1 {î}{{\^i}}1 {ô}{{\^o}}1 {û}{{\^u}}1
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue