From b6bebdc03066e513efbbb5ff9424681bbcceff0c Mon Sep 17 00:00:00 2001 From: Sébastien Dailly Date: Tue, 1 Dec 2020 21:32:20 +0100 Subject: Added a new model, and did some factorisation --- model_3/example.pdf | Bin 39199 -> 59610 bytes model_3/example.rst | 8 ++++- model_3/resources/00_colors.tex | 4 +-- model_3/resources/00_length.tex | 6 ++++ model_3/resources/00_preamble.tex | 26 +++++++++----- model_3/resources/10_fonts.tex | 8 ++++- model_3/resources/10_language.tex | 8 ----- model_3/resources/10_levels.tex | 73 -------------------------------------- model_3/resources/10_lists.tex | 17 --------- model_3/resources/10_nowidows.tex | 2 -- model_3/resources/99_sidebar.tex | 25 ++++--------- 11 files changed, 46 insertions(+), 131 deletions(-) create mode 100755 model_3/resources/00_length.tex delete mode 100755 model_3/resources/10_language.tex delete mode 100755 model_3/resources/10_levels.tex delete mode 100755 model_3/resources/10_lists.tex delete mode 100755 model_3/resources/10_nowidows.tex (limited to 'model_3') diff --git a/model_3/example.pdf b/model_3/example.pdf index 58c22c8..7ba424f 100644 Binary files a/model_3/example.pdf and b/model_3/example.pdf differ diff --git a/model_3/example.rst b/model_3/example.rst index bd4d066..37d64d1 100755 --- a/model_3/example.rst +++ b/model_3/example.rst @@ -17,7 +17,7 @@ %\definecolor{orangeColor}{RGB}{255, 165, 0} % Espacement entre chaque note de marge - \setlength{\notesep}{1.3cm} + \setlength{\notesep}{0cm} \renewcommand{\labelitemi}{} @@ -48,6 +48,12 @@ Martin Durand Créateur de talent ------------------ +.. sidebar:: \ + + .. image:: ../common/Parmenides.jpg + :align: center + :width: 50% + .. sidebar:: Informations * 17 allée des cerisiers diff --git a/model_3/resources/00_colors.tex b/model_3/resources/00_colors.tex index 29e2c8c..5596d42 100755 --- a/model_3/resources/00_colors.tex +++ b/model_3/resources/00_colors.tex @@ -7,5 +7,5 @@ \definecolor{sidecolor}{RGB}{101,114,131} % Couleur utilisée pour le texte du bandeau -%\definecolor{textsidecolor}{RGB}{0,100,0} - +%\definecolor{textsidecolor}{RGB}{0,0,0} +%\definecolor{altColor}{black} diff --git a/model_3/resources/00_length.tex b/model_3/resources/00_length.tex new file mode 100755 index 0000000..8e11649 --- /dev/null +++ b/model_3/resources/00_length.tex @@ -0,0 +1,6 @@ +% Distance de la colonne +\setlength{\columnsep}{1cm} + + +% Occupation de la colonne +\columnratio{0.71} diff --git a/model_3/resources/00_preamble.tex b/model_3/resources/00_preamble.tex index c498ca9..69b2818 100755 --- a/model_3/resources/00_preamble.tex +++ b/model_3/resources/00_preamble.tex @@ -6,14 +6,6 @@ \setlength{\footskip}{12mm} -\usepackage{fontspec} -\setmainfont{Quicksand-Light}[ - Path=../fonts/, - BoldFont = Quicksand-Medium] - -\setmonofont{Latin Modern Mono Light} - - \newcommand{\DUrolelatex}[1]{#1} % Supprime l'indentation pour les listes de définitions @@ -27,3 +19,21 @@ } \makeatother +\input{../common/10_language.tex} +\input{../common/10_lists.tex} +\input{../common/10_levels.tex} +\input{../common/10_nowidows.tex} + +\newcommand{\DUtitletitle}[1]{% + \begin{CaviarDreamsFont}% + \textbf\selectfont\color{sidecolor}{\uppercase{#1}}% + \end{CaviarDreamsFont}% + } + +\let\oldtitle\maketitle +\renewcommand{\maketitle}{% + \oldtitle + \thispagestyle{fancy} + \begin{paracol}{2}% +} + diff --git a/model_3/resources/10_fonts.tex b/model_3/resources/10_fonts.tex index 480f148..d437a25 100755 --- a/model_3/resources/10_fonts.tex +++ b/model_3/resources/10_fonts.tex @@ -6,7 +6,13 @@ Mapping=tex-text, Ligatures={Common, Required, Contextual, Historic} ] -\newfontfamily\LibertineFont[Mapping=tex-text]{Linux Libertine O} +\newfontfamily\AltFont[Mapping=tex-text]{Linux Libertine O} \newfontfamily\CaviarDreamsFont[Path=../fonts/, Mapping=tex-text]{CaviarDreams} \newfontfamily\CaviarDreamsBoldFont[Path=../fonts/, Mapping=tex-text]{CaviarDreams_Bold} +\usepackage{fontspec} +\setmainfont{Quicksand-Light}[ + Path=../fonts/, + BoldFont = Quicksand-Medium] + +\setmonofont{Latin Modern Mono Light} diff --git a/model_3/resources/10_language.tex b/model_3/resources/10_language.tex deleted file mode 100755 index 7cc0990..0000000 --- a/model_3/resources/10_language.tex +++ /dev/null @@ -1,8 +0,0 @@ -\RequirePackage[french]{babel} - -%\frenchbsetup{ItemLabeli=\color{fondetsection}\ding{251}} - -\selectlanguage{french} -\frenchspacing -\FrenchFootnotes - diff --git a/model_3/resources/10_levels.tex b/model_3/resources/10_levels.tex deleted file mode 100755 index 7660b1d..0000000 --- a/model_3/resources/10_levels.tex +++ /dev/null @@ -1,73 +0,0 @@ -\newcommand{\DUrolelevel}[1]{% - \resizebox{\linewidth}{!}{% - \begin{tikzpicture} - \draw (0,0) -- (5,0); - \fill(#1,-.1) rectangle ($ (#1,0) + (0.1, .1) $); - \end{tikzpicture} - } -} - -\ifdefinedcolor{sidecolor}{% - \colorlet{patterncolor}{sidecolor} -}{% - \colorlet{patterncolor}{black} -} - -\ifdefinedcolor{backsidecolor}{% - \colorlet{emptycolor}{backsidecolor} -}{% - \colorlet{emptycolor}{white} -} - -\usetikzlibrary{shapes.geometric,calc} -\newcommand\starScore[2]{ -\pgfmathsetmacro\pgfxa{#1+1} -\tikzstyle{scorestars}=[star, star points=5, star point ratio=2.25, draw,inner sep=0.15em,anchor=outer point 3] -\begin{tikzpicture}[baseline] - \foreach \i in {1,...,#2} { - \pgfmathparse{(\i<=#1?"patterncolor":"emptycolor")} - \edef\starcolor{\pgfmathresult} - \draw (\i*1em,0) node[name=star\i,scorestars,fill=\starcolor] {}; - } - \pgfmathparse{(#1>int(#1)?int(#1+1):0} - \let\partstar=\pgfmathresult - \ifnum\partstar>0 - \pgfmathsetmacro\starpart{#1-(int(#1))} - \path [clip] ($(star\partstar.outer point 3)!(star\partstar.outer point 2)!(star\partstar.outer point 4)$) rectangle - ($(star\partstar.outer point 2 |- star\partstar.outer point 1)!\starpart!(star\partstar.outer point 1 -| star\partstar.outer point 5)$); - \fill (\partstar*1em,0) node[scorestars,fill=patterncolor] {}; - \fi - -,\end{tikzpicture} -} - - -\newcommand\roundscore[2]{ -\pgfmathsetmacro\pgfxa{#1+1} -\tikzstyle{scorestars}=[circle, draw, inner sep=0.15em,anchor=west] -\begin{tikzpicture}[baseline] - \foreach \i in {1,...,#2} { - \pgfmathparse{(\i<=#1?"blue!70":"lightgray")} - \edef\starcolor{\pgfmathresult} - \draw (\i*1em,0) node[name=star\i,scorestars,fill=\starcolor] {}; - } - \pgfmathparse{(#1>int(#1)?int(#1+1):0} - \let\partstar=\pgfmathresult - \ifnum\partstar>0 - \pgfmathsetmacro\starpart{#1-(int(#1))} - \path [clip] (star\partstar.north west) rectangle - ($(star\partstar.south west)!\starpart!(star\partstar.south east)$); - \fill (\partstar*1em,0) node[scorestars,fill=blue!70] {}; - \fi, - -\end{tikzpicture} -} - -\newcommand{\DUrolestar}[1]{% - \resizebox{\linewidth}{!}{% - \starScore{#1}{5} - } -} - - - diff --git a/model_3/resources/10_lists.tex b/model_3/resources/10_lists.tex deleted file mode 100755 index b87845a..0000000 --- a/model_3/resources/10_lists.tex +++ /dev/null @@ -1,17 +0,0 @@ -\usepackage{fontawesome} - -\newenvironment{DUCLASSdiamondlist}{\renewcommand{\labelitemi}{$\diamond$}}{} -\newenvironment{DUCLASSastlist}{\renewcommand{\labelitemi}{$\ast$}}{} -\newenvironment{DUCLASScdotlist}{\renewcommand{\labelitemi}{$\cdot$}}{} -\newenvironment{DUCLASSbulletlist}{\renewcommand{\labelitemi}{$\bullet$}}{} -\newenvironment{DUCLASSchecklist}{\renewcommand{\labelitemi}{\faCheck}}{} -\newenvironment{DUCLASSnonelist}{\renewcommand{\labelitemi}{}}{} - -\renewcommand{\labelitemi}{$\bullet$} -\renewcommand{\labelitemii}{$\cdot$} -\renewcommand{\labelitemiii}{$\diamond$} -\renewcommand{\labelitemiv}{$\ast$} - -% Réduit l'indentation pour les éléments des listes -\usepackage{enumitem} -\setlist[itemize,1]{leftmargin=.0cm} diff --git a/model_3/resources/10_nowidows.tex b/model_3/resources/10_nowidows.tex deleted file mode 100755 index 3b96931..0000000 --- a/model_3/resources/10_nowidows.tex +++ /dev/null @@ -1,2 +0,0 @@ -\widowpenalty=1000 -\clubpenalty=500 diff --git a/model_3/resources/99_sidebar.tex b/model_3/resources/99_sidebar.tex index d9fe38e..fb98c57 100755 --- a/model_3/resources/99_sidebar.tex +++ b/model_3/resources/99_sidebar.tex @@ -1,8 +1,8 @@ \newlength{\notesep} -% Une commande dédiée pour les notes de marge -\setlength{\columnsep}{1cm} -\columnratio{0.71} +\def\changemargin#1#2{\list{}{\rightmargin#2\leftmargin#1}\item[]} +\let\endchangemargin=\endlist + \ifdefinedcolor{backsidecolor}{% \backgroundcolor{c[1]}{backsidecolor} @@ -10,9 +10,7 @@ \setlength{\columnseprule}{0.2pt} -\def\changemargin#1#2{\list{}{\rightmargin#2\leftmargin#1}\item[]} -\let\endchangemargin=\endlist - +% Une commande dédiée pour les notes de marge \newcommand{\DUsidebar}[1]{% \switchcolumn[1] \begin{changemargin}{0.5cm}{0.0cm} @@ -22,22 +20,11 @@ \end{changemargin} \vspace{\notesep} \switchcolumn + \ifdefinedcolor{textsidecolor}{\color{black}}{} } -\newcommand{\DUtitletitle}[1]{% - \begin{CaviarDreamsFont}% - \textbf\selectfont\color{sidecolor}{\uppercase{#1}}% - \end{CaviarDreamsFont}% - } - \AtEndDocument{% + % Make the column go to the bottom \flushpage \end{paracol} } - -\let\oldtitle\maketitle -\renewcommand{\maketitle}{% - \oldtitle - \thispagestyle{fancy} - \begin{paracol}{2}% -} -- cgit v1.2.3