diff --git a/analyse-I.tex b/BA1 - Analyse/BA1 - Analyse I.tex similarity index 99% rename from analyse-I.tex rename to BA1 - Analyse/BA1 - Analyse I.tex index 6f9eaf4..7146253 100644 --- a/analyse-I.tex +++ b/BA1 - Analyse/BA1 - Analyse I.tex @@ -1,7 +1,7 @@ \documentclass[a4paper,10pt]{article} %\documentclass[a4paper,10pt]{scrartcl} -\input{common.tex} +\input{../Common.tex} \begin{document} diff --git a/physique-I.tex b/BA1 - Physique I/BA1 - Physique I.tex similarity index 98% rename from physique-I.tex rename to BA1 - Physique I/BA1 - Physique I.tex index c4425db..2d8afa3 100644 --- a/physique-I.tex +++ b/BA1 - Physique I/BA1 - Physique I.tex @@ -1,7 +1,7 @@ \documentclass[a4paper,10pt]{article} %\documentclass[a4paper,10pt]{scrartcl} -\input{common.tex} +\input{../Common.tex} \begin{document} @@ -88,7 +88,7 @@ $ M = \dot{L} $ \newline & \textbf{} \newline - \includegraphics[width=0.25\textwidth,keepaspectratio=true]{./sys_coord.png} \newline + \includegraphics[width=0.25\textwidth,keepaspectratio=true]{./Systèmes de coordonnées.png} \newline \\ \hline \textbf{Ressort / Pendule} \newline @@ -154,9 +154,10 @@ $ \sum \vec{p} = cte $ \newline $ E_i - E_f = 0 $ \newline & -\textbf{Signes} \newline - $ r, v, a, \omega, \alpha, F $ \hfill avec \newline - $ M, L, p $ \hfill sans \newline +\textbf{} \newline +% \textbf{Signes} \newline +% $ r, v, a, \omega, \alpha, F $ \hfill avec \newline +% $ M, L, p $ \hfill sans \newline & \textbf{Angles} \newline $ \cos(\pi \pm \alpha) = - \cos(\alpha) $ \newline diff --git a/sys_coord.png b/BA1 - Physique I/Systèmes de coordonnées.png similarity index 100% rename from sys_coord.png rename to BA1 - Physique I/Systèmes de coordonnées.png diff --git a/chimie.tex b/BA2 - Chimie/BA2 - Chimie.tex similarity index 95% rename from chimie.tex rename to BA2 - Chimie/BA2 - Chimie.tex index 3df3854..4a24849 100644 --- a/chimie.tex +++ b/BA2 - Chimie/BA2 - Chimie.tex @@ -1,7 +1,7 @@ \documentclass[a4paper,10pt]{article} %\documentclass[a4paper,10pt]{scrartcl} -\input{common.tex} +\input{../Common.tex} \begin{document} @@ -140,34 +140,34 @@ \hline \textbf{Rayon atomique} \newline\newline - \includegraphics[width=0.45\textwidth,keepaspectratio=true]{./rayon.png} \newline + \includegraphics[width=0.45\textwidth,keepaspectratio=true]{./Rayon atomique.png} \newline & \textbf{Électronégativité} \newline\newline - \includegraphics[width=0.45\textwidth,keepaspectratio=true]{./electronegativite.png} \newline + \includegraphics[width=0.45\textwidth,keepaspectratio=true]{./Électronégativité.png} \newline \\ \hline \textbf{Pouvoir oxydant} \newline\newline - \includegraphics[width=0.45\textwidth,keepaspectratio=true]{./oxydant.png} \newline + \includegraphics[width=0.45\textwidth,keepaspectratio=true]{./Pouvoir oxydant.png} \newline & \textbf{Énergie de ionisation} \newline\newline - \includegraphics[width=0.45\textwidth,keepaspectratio=true]{./ionisation.png} \newline + \includegraphics[width=0.45\textwidth,keepaspectratio=true]{./Énergie de ionisation.png} \newline \\ \hline \textbf{Caractère métallique} \newline\newline - \includegraphics[width=0.45\textwidth,keepaspectratio=true]{./metallique.png} \newline + \includegraphics[width=0.45\textwidth,keepaspectratio=true]{./Caractère métallique.png} \newline & \textbf{Résumé} \newline\newline - \includegraphics[width=0.45\textwidth,keepaspectratio=true]{./relations.png} \newline + \includegraphics[width=0.45\textwidth,keepaspectratio=true]{./Résumé.png} \newline \\ \hline \textbf{Géométrie} \newline\newline - \includegraphics[width=0.45\textwidth,keepaspectratio=true]{./geometrie.png} \newline + \includegraphics[width=0.45\textwidth,keepaspectratio=true]{./Géométrie.png} \newline & \textbf{Titrage} \newline\newline { \begin{tabularx}{\textwidth}{cc} - \includegraphics[width=0.22\textwidth,keepaspectratio=true]{./titrage-fort.png} \newline & - \includegraphics[width=0.22\textwidth,keepaspectratio=true]{./titrage-faible.png} \newline + \includegraphics[width=0.22\textwidth,keepaspectratio=true]{./Titrage acide fort.png} \newline & + \includegraphics[width=0.22\textwidth,keepaspectratio=true]{./Titrage acide faible.png} \newline \end{tabularx} } \\ \hline diff --git a/metallique.png b/BA2 - Chimie/Caractère métallique.png similarity index 100% rename from metallique.png rename to BA2 - Chimie/Caractère métallique.png diff --git a/geometrie.png b/BA2 - Chimie/Géométrie.png similarity index 100% rename from geometrie.png rename to BA2 - Chimie/Géométrie.png diff --git a/ph.png b/BA2 - Chimie/PH.png similarity index 100% rename from ph.png rename to BA2 - Chimie/PH.png diff --git a/oxydant.png b/BA2 - Chimie/Pouvoir oxydant.png similarity index 100% rename from oxydant.png rename to BA2 - Chimie/Pouvoir oxydant.png diff --git a/rayon.png b/BA2 - Chimie/Rayon atomique.png similarity index 100% rename from rayon.png rename to BA2 - Chimie/Rayon atomique.png diff --git a/relations.png b/BA2 - Chimie/Résumé.png similarity index 100% rename from relations.png rename to BA2 - Chimie/Résumé.png diff --git a/titrage-faible.png b/BA2 - Chimie/Titrage acide faible.png similarity index 100% rename from titrage-faible.png rename to BA2 - Chimie/Titrage acide faible.png diff --git a/titrage-fort.png b/BA2 - Chimie/Titrage acide fort.png similarity index 100% rename from titrage-fort.png rename to BA2 - Chimie/Titrage acide fort.png diff --git a/electronegativite.png b/BA2 - Chimie/Électronégativité.png similarity index 100% rename from electronegativite.png rename to BA2 - Chimie/Électronégativité.png diff --git a/ionisation.png b/BA2 - Chimie/Énergie de ionisation.png similarity index 100% rename from ionisation.png rename to BA2 - Chimie/Énergie de ionisation.png diff --git a/physique-II.tex b/BA2 - Physique II/BA2 - Physique II.tex similarity index 94% rename from physique-II.tex rename to BA2 - Physique II/BA2 - Physique II.tex index 964ef1a..f8130c2 100644 --- a/physique-II.tex +++ b/BA2 - Physique II/BA2 - Physique II.tex @@ -1,7 +1,7 @@ \documentclass[a4paper,10pt]{article} %\documentclass[a4paper,10pt]{scrartcl} -\input{common.tex} +\input{../Common.tex} \begin{document} @@ -89,7 +89,7 @@ $ E = \varepsilon_0 \cdot \left( \left( \frac{r_0}{r} \right)^{12} - 2 \cdot \left( \frac{r_0}{r} \right)^6 \right) $ \newline & \textbf{Lennard-Jones II} \newline - \includegraphics[width=0.2\textwidth,keepaspectratio=true]{./lennard-jones.png} \newline + \includegraphics[width=0.2\textwidth,keepaspectratio=true]{./Potentiel de Lennard-Jones.png} \newline \\ \hline \end{tabularx} @@ -98,13 +98,13 @@ \begin{tabularx}{\textwidth}{ |X|X|X| } \textbf{Diagramme de phase} \newline\newline - \includegraphics[width=0.3\textwidth,keepaspectratio=true]{./diagramme-phase.png} \newline + \includegraphics[width=0.3\textwidth,keepaspectratio=true]{./Diagramme de phase.png} \newline & \textbf{Diagramme P-V} \newline\newline - \includegraphics[width=0.3\textwidth,keepaspectratio=true]{./diagramme-PV.png} \newline + \includegraphics[width=0.3\textwidth,keepaspectratio=true]{./Diagramme P-V.png} \newline & \textbf{Diagramme P-T} \newline\newline - \includegraphics[width=0.3\textwidth,keepaspectratio=true]{./diagramme-PT.png} \newline + \includegraphics[width=0.3\textwidth,keepaspectratio=true]{./Diagramme P-T.png} \newline \\\hline \end{tabularx} diff --git a/diagramme-PT.png b/BA2 - Physique II/Diagramme P-T.png similarity index 100% rename from diagramme-PT.png rename to BA2 - Physique II/Diagramme P-T.png diff --git a/diagramme-PV.png b/BA2 - Physique II/Diagramme P-V.png similarity index 100% rename from diagramme-PV.png rename to BA2 - Physique II/Diagramme P-V.png diff --git a/diagramme-phase.png b/BA2 - Physique II/Diagramme de phase.png similarity index 100% rename from diagramme-phase.png rename to BA2 - Physique II/Diagramme de phase.png diff --git a/lennard-jones.png b/BA2 - Physique II/Potentiel de Lennard-Jones.png similarity index 100% rename from lennard-jones.png rename to BA2 - Physique II/Potentiel de Lennard-Jones.png diff --git a/common.tex b/Common.tex similarity index 79% rename from common.tex rename to Common.tex index 66d4edf..2de6ce8 100644 --- a/common.tex +++ b/Common.tex @@ -5,7 +5,12 @@ \usepackage{tabularx} \usepackage{siunitx} \usepackage{unicode-math} +\usepackage[space]{grffile} +\usepackage{pdfpages} +\usepackage{multicol} +\usepackage[european,siunitx,betterproportions]{circuitikz} \usepackage[top=13pt, bottom=12pt, left=13pt, right=12pt]{geometry} + % \setromanfont[Mapping=tex-text]{Linux Libertine O} % \setsansfont[Mapping=tex-text]{DejaVu Sans} % \setmonofont[Mapping=tex-text]{DejaVu Sans Mono} @@ -27,10 +32,12 @@ % \renewcommand{\ddot}[1]{\frac{\mathrm{d^2}#1}{\mathrm{d}t^2}} % \renewcommand{\frac}[2]{#1 / #2} \newcommand{\cdotbis}{ } - \newcommand{\dif}{\mathrm{d}} +\newcommand{\ul}{\underline} + \setlength{\parindent}{0pt} \setlength{\parskip}{0pt} +\setlength{\columnsep}{0pt} % \everymath{\displaystyle} \ No newline at end of file diff --git a/Draft.tex b/Draft.tex new file mode 100644 index 0000000..44f9cf7 --- /dev/null +++ b/Draft.tex @@ -0,0 +1,4 @@ +\usepackage{draftwatermark} +\SetWatermarkText{\textsc{Draft}} +\SetWatermarkScale{1} +\SetWatermarkColor[gray]{0.9} \ No newline at end of file