From 713ff93560cb3eed02b2550df326b9a7e29ec71e Mon Sep 17 00:00:00 2001 From: zaikoslorandaf Date: Fri, 13 Sep 2024 10:01:04 -0400 Subject: everything sorta works --- document.sty | 38 ++++++++++++++++++++------------------ french.sty | 28 ---------------------------- main.tex | 25 +++++++++++++------------ tools/bibliography.sty | 5 ----- tools/engineering.sty | 20 -------------------- tools/french.sty | 28 ---------------------------- tools/toolbox.sty | 33 --------------------------------- 7 files changed, 33 insertions(+), 144 deletions(-) delete mode 100644 french.sty delete mode 100644 tools/bibliography.sty delete mode 100644 tools/engineering.sty delete mode 100644 tools/french.sty delete mode 100644 tools/toolbox.sty diff --git a/document.sty b/document.sty index ffc8c7c..08ab8ed 100644 --- a/document.sty +++ b/document.sty @@ -13,13 +13,16 @@ \usepackage{titlesec} % Font sizes for sections/subsection \RequirePackage{setspace} % Line spacing \RequirePackage{pdfpages} % Allow to add pdf documents to your latex file -\RequirePackage{hyperref} % Allow references and hyperlinks +% \RequirePackage{hyperref} % Allow references and hyperlinks % Useful packages for engineering students \RequirePackage{amsmath} % Mathematics environments \RequirePackage{amssymb} % Mathematical symbols -\RequirePackage{siunitx} % SI Units -\RequirePackage{cleveref} % To make eqation reference better +% \RequirePackage{siunitx} % SI Units +% \RequirePackage{cleveref} % To make eqation reference better +\RequirePackage{inputenc} +\RequirePackage{csquotes} + % Allows the creations of appendices \RequirePackage[title,toc,titletoc,page]{appendix} @@ -31,24 +34,24 @@ % Number equation with section number (ex: First equation in section 3 is 3.1) \numberwithin{equation}{section} % Use french commas when writing numbers -\sisetup{locale=FR} +% \sisetup{locale=FR} %~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~% % Hyperlinks management % %~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~% -\let\oldhref\href -\renewcommand{\href}[2]{\oldhref{#1}{\bfseries#2}} +% \let\oldhref\href +% \enewcommand{\href}[2]{\oldhref{#1}{\bfseries#2}} -\hypersetup{ - colorlinks=true, - linkcolor=black, - filecolor=black, - urlcolor=gray, - pdfpagemode=FullScreen, - } +% \hypersetup{ +% colorlinks=true, +% linkcolor=black, +% filecolor=black, +% urlcolor=gray, +% pdfpagemode=FullScreen, +% } @@ -93,7 +96,6 @@ \renewcommand{\thefigure}{\thesection-\arabic{figure}} \renewcommand{\thetable}{\thesection-\arabic{table}} -\usepackage{csquotes} \usepackage[style=numeric,backend=biber,sorting=nty]{biblatex} \DeclareNameAlias{author}{family-given} % Display the Bibliography as: Surename, Name \addbibresource{references.bib} @@ -113,7 +115,7 @@ %~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~% \RequirePackage[title,toc,titletoc,page]{appendix} -\addto\captionsfrench{% - \renewcommand\appendixname{Annexe} - \renewcommand\appendixpagename{Annexe} -} +% \addto\captionsfrench{ +% \renewcommand\appendixname{Annexe} +% \renewcommand\appendixpagename{Annexe} +% } diff --git a/french.sty b/french.sty deleted file mode 100644 index 9e67a50..0000000 --- a/french.sty +++ /dev/null @@ -1,28 +0,0 @@ -\ProvidesPackage{french} -%~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~% -% Packages % -%~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~% - -\RequirePackage[utf8]{inputenc} % Sensible text encoding -\RequirePackage[T1]{fontenc} % French compatibility -\RequirePackage[french]{babel} % French document environment -\RequirePackage[french]{cleveref} % To make eqation reference better - - - - -%~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~% -% French Table Naming % -%~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~% -% Sets the "Table - xx" to "Tableau - xx" -\renewcommand{\frenchtablename}{Tableau} -\renewcommand{\thetable}{\thesection-\arabic{table}} - -%~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~% -% French Table Naming % -%~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~% -% Sets "Appendix" to "Annexe" -\addto\captionsfrench{ - \renewcommand\appendixname{Annexe} - \renewcommand\appendixpagename{Annexe} -} diff --git a/main.tex b/main.tex index b7b052a..06f19cc 100644 --- a/main.tex +++ b/main.tex @@ -1,13 +1,12 @@ -\documentclass[a11paper, 11pt]{article} +\documentclass[a4paper, 11pt]{article} \usepackage{document} \usepackage{titlepage} -\usepackage[T1]{fontenc} -\usepackage[french]{babel} % Optional packages and tools (Uncomment to your needs) \usepackage{toolbox} -\usepackage{french} +\usepackage{frca} + % Image insertion template: % @@ -68,15 +67,17 @@ This is some more text! \subsubsection{You probably guessed whthat this is a subsubsection} -\begin{table}[h!] - \begin{tabular}{c c c} - \hline - item 1 & item 2 & item 3 \\ \hline \hline - item 1 & item 2 & item 3 \\ - item 1 & item 2 & item 3 \\ - \end{tabular} -\end{table} +% \begin{table}[h!] +% \begin{tabular}{c c c} +% \hline +% item 1 & item 2 & item 3 \\ \hline \hline +% item 1 & item 2 & item 3 \\ +% item 1 & item 2 & item 3 \\ +% \end{tabular} +% \end{table} % \newpage + + % \printbibliography[heading=bibintoc] \end{document} diff --git a/tools/bibliography.sty b/tools/bibliography.sty deleted file mode 100644 index 4022162..0000000 --- a/tools/bibliography.sty +++ /dev/null @@ -1,5 +0,0 @@ - -\ProvidesPackage{bibliography} -%~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~% -% Packages % -%~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~% diff --git a/tools/engineering.sty b/tools/engineering.sty deleted file mode 100644 index 74d5b62..0000000 --- a/tools/engineering.sty +++ /dev/null @@ -1,20 +0,0 @@ -\ProvidesPackage{engineering} -%~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~% -% Packages % -%~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~% -% Useful packages for engineering students -\RequirePackage{amsmath} % Mathematics environments -\RequirePackage{amssymb} % Mathematical symbols -\RequirePackage{siunitx} % SI Units -\RequirePackage[french]{cleveref} % To make eqation reference better - - - -%~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~% -% Equations/Math % -%~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~% -% Number equation with section number (ex: First equation in section 3 is 3.1) -\numberwithin{equation}{section} -% Use french commas when writing numbers -\sisetup{locale=FR} - diff --git a/tools/french.sty b/tools/french.sty deleted file mode 100644 index 9e67a50..0000000 --- a/tools/french.sty +++ /dev/null @@ -1,28 +0,0 @@ -\ProvidesPackage{french} -%~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~% -% Packages % -%~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~% - -\RequirePackage[utf8]{inputenc} % Sensible text encoding -\RequirePackage[T1]{fontenc} % French compatibility -\RequirePackage[french]{babel} % French document environment -\RequirePackage[french]{cleveref} % To make eqation reference better - - - - -%~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~% -% French Table Naming % -%~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~% -% Sets the "Table - xx" to "Tableau - xx" -\renewcommand{\frenchtablename}{Tableau} -\renewcommand{\thetable}{\thesection-\arabic{table}} - -%~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~% -% French Table Naming % -%~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~% -% Sets "Appendix" to "Annexe" -\addto\captionsfrench{ - \renewcommand\appendixname{Annexe} - \renewcommand\appendixpagename{Annexe} -} diff --git a/tools/toolbox.sty b/tools/toolbox.sty deleted file mode 100644 index 9231c82..0000000 --- a/tools/toolbox.sty +++ /dev/null @@ -1,33 +0,0 @@ - -\ProvidesPackage{toolbox} -%~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~% -% Required Packages for the Module % -%~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~% -\RequirePackage{xcolor} % Addition of colors and color boxes - -%~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~% -% Useful Functions for Team Work % -%~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~% -% The following should NEVER apprear in a final document. -% -% Their goal is to provide a better team work experience by adding -% colorful/highlighted keywords into the pdfdocument. - - -%% Usage (These function require a user input) -% \todo{Something to be done...} -% \note{A note to communicate to your team} -% \fixme{An error you wish to higlight for later fix} - -\newcommand{\todo}[1]{\colorbox{red}{\textbf{TODO}:}#1} -\newcommand{\note}[1]{\colorbox{orange}{\textbf{NOTE}:}#1} -\newcommand{\fixme}[1]{\colorbox{purple}{\textbf{FIXME}:}#1} - -%% Usage (These function DON'T require a user input) -% \addref --> Displays "addref" highlighted in magenta -% \addcite --> Displays "addcite" highlighted in magenta -% \addimg --> Displays "addimg" highlighted in cyan -\newcommand{\addref}{\colorbox{magenta}{add ref}} -\newcommand{\addcite}{\colorbox{magenta}{add citation}} -\newcommand{\addimg}{\colorbox{cyan}{add image!}} - -- cgit v1.2.3