Merge previous changes.
This commit is contained in:
@@ -37,7 +37,7 @@
|
|||||||
Extension = .ttf,
|
Extension = .ttf,
|
||||||
UprightFont = *-Light,
|
UprightFont = *-Light,
|
||||||
BoldFont = *-SemiBold,
|
BoldFont = *-SemiBold,
|
||||||
ItalicFont = *-Italic,
|
ItalicFont = *-LightItalic,
|
||||||
BoldItalicFont = *-SemiBoldItalic,
|
BoldItalicFont = *-SemiBoldItalic,
|
||||||
]
|
]
|
||||||
% Headings & Titles font: Roboto Slab
|
% Headings & Titles font: Roboto Slab
|
||||||
@@ -75,7 +75,7 @@
|
|||||||
|
|
||||||
% Color import and definition
|
% Color import and definition
|
||||||
%#region
|
%#region
|
||||||
\RequirePackage[RGB]{xcolor}
|
\RequirePackage{xcolor}
|
||||||
\definecolor{PrimeBlue}{RGB}{25,45,145}
|
\definecolor{PrimeBlue}{RGB}{25,45,145}
|
||||||
%#endregion
|
%#endregion
|
||||||
|
|
||||||
@@ -85,12 +85,14 @@
|
|||||||
\hypersetup{colorlinks=true, allcolors=PrimeBlue}
|
\hypersetup{colorlinks=true, allcolors=PrimeBlue}
|
||||||
%#endregion
|
%#endregion
|
||||||
|
|
||||||
% Graphics packages for including images
|
% Graphics package for including images
|
||||||
%#region
|
%#region
|
||||||
\RequirePackage{graphicx}
|
\RequirePackage{graphicx}
|
||||||
\RequirePackage{calc}
|
\RequirePackage{calc}
|
||||||
|
|
||||||
\newcommand{\ig}[2][0.5in]{\includegraphics[keepaspectratio,width=#1]{graphics/#2}}
|
\newcommand{\ig}[2][0.5in]{
|
||||||
|
\includegraphics[keepaspectratio,width=#1]{graphics/#2}
|
||||||
|
}
|
||||||
%#endregion
|
%#endregion
|
||||||
|
|
||||||
% Define custom title page.
|
% Define custom title page.
|
||||||
@@ -158,14 +160,8 @@
|
|||||||
% Margin Note formatting.
|
% Margin Note formatting.
|
||||||
%#region
|
%#region
|
||||||
\RequirePackage{marginnote}
|
\RequirePackage{marginnote}
|
||||||
% -38pt seems to be just the right vertical adjustment to align margin notes
|
|
||||||
% with the reference in the text.
|
|
||||||
%\renewcommand{\marginnotevadjust}{-38pt}
|
|
||||||
\renewcommand{\marginfont}{\small\color{PrimeBlue}}
|
\renewcommand{\marginfont}{\small\color{PrimeBlue}}
|
||||||
|
|
||||||
% Title formatting for margin notes.
|
|
||||||
\newcommand{\margintitle}[1]{\paragraph{\textbf{#1}}}
|
|
||||||
|
|
||||||
% Put a glossary definition in a margin note.
|
% Put a glossary definition in a margin note.
|
||||||
% Optional parameter is vertical adjustment of the note.
|
% Optional parameter is vertical adjustment of the note.
|
||||||
\newcommand{\margindef}[2][0pt]{%
|
\newcommand{\margindef}[2][0pt]{%
|
||||||
@@ -175,12 +171,26 @@
|
|||||||
\textsf{\textbf{
|
\textsf{\textbf{
|
||||||
\Glsentryname{#2}:% Create the title of the margin note.
|
\Glsentryname{#2}:% Create the title of the margin note.
|
||||||
}}
|
}}
|
||||||
\glsdesc*{#2}}[#1]% Create the text of the margin note.
|
\glsdesc*{#2}
|
||||||
|
}[#1]% Create the text of the margin note.
|
||||||
}
|
}
|
||||||
|
|
||||||
% Put a footnote in a margin note.
|
% Put a footnote in a margin note.
|
||||||
% Optional parameter is vertical adjustment of the note.
|
% Optional parameter is vertical adjustment of the note.
|
||||||
\newcommand{\mnote}[2][0pt]{\footnotemark\marginnote{\footnotemark[\value{footnote}]#2}[#1]}
|
\newcommand{\mnote}[2][0pt]{%
|
||||||
|
\footnotemark
|
||||||
|
\marginnote{
|
||||||
|
\footnotemark[\value{footnote}]#2}[#1]
|
||||||
|
}
|
||||||
|
|
||||||
|
\RequirePackage[hypcap=true]{caption}
|
||||||
|
\newcommand{\marginfig}[2]{%
|
||||||
|
\marginnote{
|
||||||
|
\captionsetup{type=figure}%
|
||||||
|
{\centering\includegraphics{#1}\par}
|
||||||
|
\captionof{figure}{#2}
|
||||||
|
}
|
||||||
|
}
|
||||||
%#endregion
|
%#endregion
|
||||||
|
|
||||||
% Cross references
|
% Cross references
|
||||||
@@ -214,6 +224,7 @@
|
|||||||
}
|
}
|
||||||
\newcommand{\lblTable}[2][]{
|
\newcommand{\lblTable}[2][]{
|
||||||
\textbf{\lblGeneral[#1]{#2}{\caption}{tbl}}
|
\textbf{\lblGeneral[#1]{#2}{\caption}{tbl}}
|
||||||
|
\smallskip
|
||||||
}
|
}
|
||||||
\newcommand{\lblFigure}[2][]{
|
\newcommand{\lblFigure}[2][]{
|
||||||
\textbf{\lblGeneral[#1]{#2}{\caption}{fig}}
|
\textbf{\lblGeneral[#1]{#2}{\caption}{fig}}
|
||||||
|
|||||||
Reference in New Issue
Block a user