diff options
| author | Sébastien Dailly <sebastien@chimrod.com> | 2020-12-01 21:32:20 +0100 | 
|---|---|---|
| committer | Sébastien Dailly <sebastien@chimrod.com> | 2020-12-03 17:33:35 +0100 | 
| commit | b6bebdc03066e513efbbb5ff9424681bbcceff0c (patch) | |
| tree | ad58ccc072efbfdeabe4d9b4b20b79acc8fd19b3 | |
| parent | 02b663b21099cdb62cef7b363cae46a56d7aae5f (diff) | |
Added a new model, and did some factorisation
61 files changed, 639 insertions, 538 deletions
| @@ -1,4 +1,4 @@ -SUBDIRS := $(wildcard model*/.) +SUBDIRS := $(wildcard model*/. example*/.)  all: $(SUBDIRS) diff --git a/common/10_icons.tex b/common/10_icons.tex new file mode 100755 index 0000000..c5ea5b4 --- /dev/null +++ b/common/10_icons.tex @@ -0,0 +1,14 @@ +\usepackage{tikz} +\usepackage{xcolor} + +% Background color for the frame. +\definecolor{DUStyle@lightGray}{RGB}{245, 245, 245} + +% arg1 : The dot content +\newcommand{\iconBox}[1]{% +      \tikz[baseline]{% +        \node[circle,fill=altColor,inner sep=3pt,anchor=base] at (0, 0)% +        {\color{backsidecolor}#1}; +      }% +} + diff --git a/example_1/resources/10_language.tex b/common/10_language.tex index 7cc0990..861d1a3 100755 --- a/example_1/resources/10_language.tex +++ b/common/10_language.tex @@ -1,8 +1,8 @@ -\RequirePackage[french]{babel}
 -
 -%\frenchbsetup{ItemLabeli=\color{fondetsection}\ding{251}}
 -
 -\selectlanguage{french}
 -\frenchspacing
 -\FrenchFootnotes
 -
 +\RequirePackage[french]{babel} + +%\frenchbsetup{ItemLabeli=\color{fondetsection}\ding{251}} + +\selectlanguage{french} +\frenchspacing +\FrenchFootnotes + diff --git a/model_1/resources/10_levels.tex b/common/10_levels.tex index d2c8682..1cafe83 100755 --- a/model_1/resources/10_levels.tex +++ b/common/10_levels.tex @@ -1,73 +1,91 @@ -\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}{textsidecolor}
 -}
 -
 -\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}
 -  }
 -}
 -
 -
 -
 +\ifdefinedcolor{sidecolor}{% +  \colorlet{patterncolor}{sidecolor} +}{% +  \colorlet{patterncolor}{textsidecolor} +} + +\ifdefinedcolor{altColor}{% +  \colorlet{patterncolor}{altColor} +}{} + + +\ifdefinedcolor{backsidecolor}{% +  \colorlet{emptycolor}{backsidecolor} +}{% +  \colorlet{emptycolor}{white} +} + +\newcommand{\DUrolelevel}[1]{% +  \resizebox{\linewidth}{!}{% +  \begin{tikzpicture} +    \draw (0,0) -- (5,0); +    \fill(#1,-.1) rectangle ($ (#1,0) + (0.1, .1) $); +  \end{tikzpicture} +  } +} + +\newcommand{\DUrolelevelbox}[1]{% +  \resizebox{\linewidth}{0.5cm}{% +  \begin{tikzpicture} +    \draw (0,-0.1) rectangle (5,0.1); +    \fill [fill=patterncolor](0, -.1) rectangle (#1,0.1); +  \end{tikzpicture} +  } +} + + +\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_1/resources/10_lists.tex b/common/10_lists.tex index b87845a..b87845a 100755 --- a/model_1/resources/10_lists.tex +++ b/common/10_lists.tex diff --git a/model_1/resources/10_nowidows.tex b/common/10_nowidows.tex index e04cb18..e04cb18 100755 --- a/model_1/resources/10_nowidows.tex +++ b/common/10_nowidows.tex diff --git a/model_1/resources/90_ref.tex b/common/90_ref.tex index 96edd79..96edd79 100755 --- a/model_1/resources/90_ref.tex +++ b/common/90_ref.tex diff --git a/model_1/resources/99_sidebar.tex b/common/99_sidebar.tex index 470f4c2..ab599a0 100755 --- a/model_1/resources/99_sidebar.tex +++ b/common/99_sidebar.tex @@ -3,18 +3,16 @@  \def\changemargin#1#2{\list{}{\rightmargin#2\leftmargin#1}\item[]}  \let\endchangemargin=\endlist  -% Une commande dédiée pour les notes de marge -\setlength{\columnsep}{0.25cm} -\columnratio{0.25} -  \ifdefinedcolor{backsidecolor}{%    \backgroundcolor{c[0]}{backsidecolor}  }{} +% Une commande dédiée pour les notes de marge  \newcommand{\DUsidebar}[1]{%    \switchcolumn[0] -  \begin{changemargin}{0.7cm}{0.7cm}  -  \LibertineFont\selectfont +  \begin{changemargin}{0.7cm}{0.7cm} +  % Sélectionne la police alternative +  \AltFont\selectfont    \ifdefinedcolor{textsidecolor}{\color{textsidecolor}}{}    #1    \end{changemargin} @@ -23,9 +21,6 @@    \ifdefinedcolor{textsidecolor}{\color{black}}{}  } -\AtBeginDocument{% -  \begin{paracol}{2} -}  \AtEndDocument{%    % Make the column go to the bottom    \flushpage diff --git a/common/Parmenides.jpg b/common/Parmenides.jpgBinary files differ new file mode 100644 index 0000000..e9e64fa --- /dev/null +++ b/common/Parmenides.jpg diff --git a/example_1/resources/00_preamble.tex b/example_1/resources/00_preamble.tex index 3aa9b50..f73935c 100755 --- a/example_1/resources/00_preamble.tex +++ b/example_1/resources/00_preamble.tex @@ -31,3 +31,5 @@  	\@ifundefinedcolor{#1}{#3}{#2}  }  \makeatother + +\input{../common/10_language.tex} diff --git a/example_1/resources/99_sidebar.tex b/example_1/resources/99_sidebar.tex index 2b41d2a..83c9ea8 100755 --- a/example_1/resources/99_sidebar.tex +++ b/example_1/resources/99_sidebar.tex @@ -14,7 +14,6 @@  \newcommand{\DUsidebar}[1]{%    \switchcolumn[0]    \begin{changemargin}{0.7cm}{0.7cm}  -  %\LibertineFont\selectfont    \ifdefinedcolor{textsidecolor}{\color{textsidecolor}}{}    #1    \end{changemargin} diff --git a/model_1/example.pdf b/model_1/example.pdfBinary files differ index 9520951..1b21296 100644 --- a/model_1/example.pdf +++ b/model_1/example.pdf diff --git a/model_1/resources/00_colors.tex b/model_1/resources/00_colors.tex index 376b77b..567d01b 100755 --- a/model_1/resources/00_colors.tex +++ b/model_1/resources/00_colors.tex @@ -9,3 +9,4 @@  % Couleur utilisée pour le texte du bandeau
  \definecolor{textsidecolor}{RGB}{255,255,255}
 +\definecolor{altColor}{RGB}{255,255,255}
 diff --git a/model_1/resources/00_length.tex b/model_1/resources/00_length.tex new file mode 100755 index 0000000..36dd81a --- /dev/null +++ b/model_1/resources/00_length.tex @@ -0,0 +1,6 @@ +% Distance de la colonne +\setlength{\columnsep}{0.25cm} + + +% Occupation de la colonne  +\columnratio{0.25} diff --git a/model_1/resources/00_preamble.tex b/model_1/resources/00_preamble.tex index c5f02fc..99d4658 100755 --- a/model_1/resources/00_preamble.tex +++ b/model_1/resources/00_preamble.tex @@ -4,21 +4,6 @@  \pagestyle{empty}  \pagenumbering{gobble} -\usepackage{fontspec} -\defaultfontfeatures{Ligatures={Common, Required, Contextual}} -\setmainfont{EB Garamond} - -\newcommand{\DUtitletitle}[1]{% -    {\begin{center}\textbf{\textsc{#1}}\end{center}} - } - -% Change the font for bold text -\let\bf\textbf -\renewcommand{\textbf}[1]{{\LibertineFont\selectfont\bf{#1}}} - -\setmonofont{Latin Modern Mono Light} - -  \newcommand{\DUrolelatex}[1]{#1}  % Supprime l'indentation pour les listes de définitions @@ -31,3 +16,11 @@  	\@ifundefinedcolor{#1}{#3}{#2}  }  \makeatother + + +\input{../common/10_language.tex} +\input{../common/10_lists.tex} +\input{../common/10_icons.tex} +\input{../common/10_nowidows.tex} +\input{../common/10_levels.tex} +\input{../common/99_sidebar.tex} diff --git a/model_1/resources/10_fonts.tex b/model_1/resources/10_fonts.tex index cdd96f7..24f6cfc 100755 --- a/model_1/resources/10_fonts.tex +++ b/model_1/resources/10_fonts.tex @@ -1,11 +1,29 @@ -\newfontfamily\EBGaramond{EB Garamond}[
 -    Mapping=tex-text,
 -    Ligatures={Common, Required, Contextual}
 -]
 -\newfontfamily\EBLigatures{EB Garamond}[
 -    Mapping=tex-text,
 -    Ligatures={Common, Required, Contextual, Historic}
 -]
 -\newfontfamily\LibertineFont[Mapping=tex-text]{Linux Libertine O}
 +\usepackage{fontspec}
 +\defaultfontfeatures{Ligatures={Common, Required, Contextual}}
 +\setmainfont{EB Garamond}
 +
 +\newcommand{\DUtitletitle}[1]{%
 +    {\begin{center}\textbf{\textsc{#1}}\end{center}}
 + }
 +
 +% Change the font for bold text
 +\let\bf\textbf
 +\renewcommand{\textbf}[1]{{\AltFont\selectfont\bf{#1}}}
 +
 +\setmonofont{Latin Modern Mono Light}
 +\newfontfamily\EBGaramond 
 +  {EB Garamond}
 +  [ Mapping=tex-text ]
 +
 +\newfontfamily\EBLigatures 
 +  {EB Garamond}
 +  [ Mapping = tex-text
 +  , Ligatures = 
 +    { Common
 +    , Required
 +    , Contextual
 +    , Historic } ]
 +
 +\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}
 diff --git a/model_1/resources/10_language.tex b/model_1/resources/10_language.tex deleted file mode 100755 index 7cc0990..0000000 --- a/model_1/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_1/resources/10_title_style.tex b/model_1/resources/10_title_style.tex index f1fdc16..e784ecb 100755 --- a/model_1/resources/10_title_style.tex +++ b/model_1/resources/10_title_style.tex @@ -1,13 +1,11 @@  \usepackage{titlesec}
  \providecommand{\DUdocumentsubtitle}[1]{%
 -  %\begin{nthcolumn}{1}
    \color{black}
    \em
    \EBLigatures\selectfont
    \Large
    #1
 -  %\end{nthcolumn}
  }
  \makeatletter
 diff --git a/model_1/resources/99_begin.tex b/model_1/resources/99_begin.tex new file mode 100755 index 0000000..7b7a793 --- /dev/null +++ b/model_1/resources/99_begin.tex @@ -0,0 +1,7 @@ +\input{../common/90_ref.tex} + +% On charge les colonnes dès le début du document. +\AtBeginDocument{% +  \begin{paracol}{2} +} + diff --git a/model_2/example.pdf b/model_2/example.pdfBinary files differ index 394d11f..ea9db9f 100644 --- a/model_2/example.pdf +++ b/model_2/example.pdf diff --git a/model_2/resources/00_length.tex b/model_2/resources/00_length.tex new file mode 100755 index 0000000..5b1a80d --- /dev/null +++ b/model_2/resources/00_length.tex @@ -0,0 +1,6 @@ +% Distance de la colonne +\setlength{\columnsep}{0.5cm} + + +% Occupation de la colonne  +\columnratio{0.29} diff --git a/model_2/resources/00_preamble.tex b/model_2/resources/00_preamble.tex index d949922..89cb0c4 100755 --- a/model_2/resources/00_preamble.tex +++ b/model_2/resources/00_preamble.tex @@ -2,15 +2,6 @@  \pagestyle{empty}  \pagenumbering{gobble} -\usepackage{fontspec} -\defaultfontfeatures{Ligatures={Common, Required, Contextual}} -\setmainfont{EB Garamond} - -% Change the font for bold text -\let\bf\textbf -\renewcommand{\textbf}[1]{{\LibertineFont\selectfont\bf{#1}}} - -\setmonofont{Latin Modern Mono Light}  \newcommand{\DUrolelatex}[1]{#1} @@ -25,3 +16,9 @@  	\@ifundefinedcolor{#1}{#3}{#2}  }  \makeatother + +\input{../common/10_language.tex} +\input{../common/10_lists.tex} +\input{../common/10_nowidows.tex} +\input{../common/10_levels.tex} +\input{../common/99_sidebar.tex} diff --git a/model_2/resources/10_fonts.tex b/model_2/resources/10_fonts.tex index e229582..928f801 100755 --- a/model_2/resources/10_fonts.tex +++ b/model_2/resources/10_fonts.tex @@ -1,8 +1,17 @@ +\usepackage{fontspec}
 +\defaultfontfeatures{Ligatures={Common, Required, Contextual}}
 +\setmainfont{EB Garamond}
 +
 +% Change the font for bold text
 +\let\bf\textbf
 +\renewcommand{\textbf}[1]{{\AltFont\selectfont\bf{#1}}}
 +
 +\setmonofont{Latin Modern Mono Light}
  \newfontfamily\EBLigatures{EB Garamond}[
      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}
 diff --git a/model_2/resources/10_language.tex b/model_2/resources/10_language.tex deleted file mode 100755 index 7cc0990..0000000 --- a/model_2/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_2/resources/10_levels.tex b/model_2/resources/10_levels.tex deleted file mode 100755 index 7660b1d..0000000 --- a/model_2/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_2/resources/10_lists.tex b/model_2/resources/10_lists.tex deleted file mode 100755 index b87845a..0000000 --- a/model_2/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_2/resources/10_nowidows.tex b/model_2/resources/10_nowidows.tex deleted file mode 100755 index 3b96931..0000000 --- a/model_2/resources/10_nowidows.tex +++ /dev/null @@ -1,2 +0,0 @@ -\widowpenalty=1000 -\clubpenalty=500 diff --git a/model_2/resources/10_title_style.tex b/model_2/resources/10_title_style.tex index 3f57a84..f391417 100755 --- a/model_2/resources/10_title_style.tex +++ b/model_2/resources/10_title_style.tex @@ -1,4 +1,5 @@  \usepackage{titlesec}
 +\usepackage[many]{tcolorbox}
  \providecommand*{\DUdocumentsubtitle}[1]{{\EBLigatures\selectfont\em\LARGE\begin{flushright}#1\end{flushright}}}
 @@ -44,3 +45,19 @@    {2em}
    {}
    {}
 +
 +\newcommand{\DUtitletitle}[1]{%
 +  \begin{tcolorbox}[colback=sidecolor, sharp corners]%
 +  \begin{center}%
 +  \begin{CaviarDreamsBoldFont}%
 +      {\textbf\selectfont\color{white}{\scriptsize\uppercase{#1}}}%
 +  \end{CaviarDreamsBoldFont}%
 +  \end{center}
 +  \end{tcolorbox}
 + }
 +
 +\let\oldtitle\maketitle
 +\renewcommand{\maketitle}{%
 +  {\oldtitle}
 +  \begin{paracol}{2}
 +}
 diff --git a/model_2/resources/99_sidebar.tex b/model_2/resources/99_sidebar.tex deleted file mode 100755 index a415a9f..0000000 --- a/model_2/resources/99_sidebar.tex +++ /dev/null @@ -1,48 +0,0 @@ -\usepackage{eso-pic} -\usetikzlibrary{calc} - -\newlength{\notesep} - -\newlength{\sideBottomMargin} -\setlength{\sideBottomMargin}{0.2cm} - -\def\changemargin#1#2{\list{}{\rightmargin#2\leftmargin#1}\item[]} -\let\endchangemargin=\endlist  - -% Une commande dédiée pour les notes de marge -\setlength{\columnsep}{0.5cm} -\columnratio{0.29} - -\ifdefinedcolor{backsidecolor}{% -  \backgroundcolor{c[0]}{backsidecolor} -}{} - -\newcommand{\DUsidebar}[1]{% -	\switchcolumn[0] -	\begin{changemargin}{0.7cm}{0.7cm} -        \LibertineFont\selectfont -        \ifdefinedcolor{textsidecolor}{\color{textsidecolor}}{} -	#1 -	\end{changemargin} -        \vspace{\notesep} -	\switchcolumn -} -\usepackage[many]{tcolorbox} - -\newcommand{\DUtitletitle}[1]{% -    \begin{tcolorbox}[colback=sidecolor, sharp corners]% -    \begin{center}% -        \begin{CaviarDreamsBoldFont}% -        {\textbf\selectfont\color{white}{\scriptsize\uppercase{#1}}}% -        \end{CaviarDreamsBoldFont}% -  \end{center} -    \end{tcolorbox} - } - - -\AtEndDocument{ -  \flushpage -  \end{paracol} -} -\let\oldtitle\maketitle -\renewcommand{\maketitle}{{\oldtitle}\begin{paracol}{2}} diff --git a/model_3/example.pdf b/model_3/example.pdfBinary files differ index 58c22c8..7ba424f 100644 --- a/model_3/example.pdf +++ b/model_3/example.pdf 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}% -} diff --git a/model_4/example.pdf b/model_4/example.pdfBinary files differ index bd59a6b..8a69b93 100644 --- a/model_4/example.pdf +++ b/model_4/example.pdf diff --git a/model_4/resources/00_length.tex b/model_4/resources/00_length.tex new file mode 100755 index 0000000..97560df --- /dev/null +++ b/model_4/resources/00_length.tex @@ -0,0 +1,5 @@ +% Distance de la colonne +%\setlength{\columnsep}{0.25cm} + +% Occupation de la colonne  +\columnratio{0.25} diff --git a/model_4/resources/00_preamble.tex b/model_4/resources/00_preamble.tex index d9c52c5..c92dc33 100755 --- a/model_4/resources/00_preamble.tex +++ b/model_4/resources/00_preamble.tex @@ -4,15 +4,6 @@  \pagestyle{empty}  \pagenumbering{gobble} -\usepackage{fontspec} -\defaultfontfeatures{Ligatures={Common, Required, Contextual}} -\setmainfont{EB Garamond} - -% Change the font for bold text -\let\bf\textbf -\renewcommand{\textbf}[1]{{\LibertineFont\selectfont\bf{#1}}} - -\setmonofont{Latin Modern Mono Light}  \newcommand{\DUrolelatex}[1]{#1} @@ -27,3 +18,8 @@  	\@ifundefinedcolor{#1}{#3}{#2}  }  \makeatother + +\input{../common/10_language.tex} +\input{../common/10_lists.tex} +\input{../common/10_nowidows.tex} +\input{../common/10_levels.tex} diff --git a/model_4/resources/10_fonts.tex b/model_4/resources/10_fonts.tex index 2f53033..424bb0e 100755 --- a/model_4/resources/10_fonts.tex +++ b/model_4/resources/10_fonts.tex @@ -1,12 +1,15 @@ -\newfontfamily\EBGaramond{EB Garamond}[
 -    Mapping=tex-text,
 -    Ligatures={Common, Required, Contextual}
 -]
 -\newfontfamily\EBLigatures{EB Garamond}[
 -    Mapping=tex-text,
 -    Ligatures={Common, Required, Contextual, Historic}
 -]
 -\newfontfamily\LibertineFont[Mapping=tex-text]{Linux Libertine O}
 +\usepackage{fontspec}
 +
 +\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}
  \newfontfamily\BeatrixFont[Path=../fonts/,Mapping=tex-text]{Beatrix}
 +
 +\defaultfontfeatures{Ligatures={Common, Required, Contextual}}
 +\setmainfont{EB Garamond}
 +
 +% Change the font for bold text
 +\let\bf\textbf
 +\renewcommand{\textbf}[1]{{\AltFont\selectfont\bf{#1}}}
 +
 +\setmonofont{Latin Modern Mono Light}
 diff --git a/model_4/resources/10_language.tex b/model_4/resources/10_language.tex deleted file mode 100755 index 7cc0990..0000000 --- a/model_4/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_4/resources/10_levels.tex b/model_4/resources/10_levels.tex deleted file mode 100755 index d2c8682..0000000 --- a/model_4/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}{textsidecolor}
 -}
 -
 -\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_4/resources/10_lists.tex b/model_4/resources/10_lists.tex deleted file mode 100755 index b87845a..0000000 --- a/model_4/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_4/resources/10_nowidows.tex b/model_4/resources/10_nowidows.tex deleted file mode 100755 index 3b96931..0000000 --- a/model_4/resources/10_nowidows.tex +++ /dev/null @@ -1,2 +0,0 @@ -\widowpenalty=1000 -\clubpenalty=500 diff --git a/model_4/resources/99_sidebar.tex b/model_4/resources/99_sidebar.tex index 52dc735..36bc102 100755 --- a/model_4/resources/99_sidebar.tex +++ b/model_4/resources/99_sidebar.tex @@ -3,18 +3,15 @@  \def\changemargin#1#2{\list{}{\rightmargin#2\leftmargin#1}\item[]}  \let\endchangemargin=\endlist  -% Une commande dédiée pour les notes de marge -%\setlength{\columnsep}{0.25cm} -\columnratio{0.25} -  \ifdefinedcolor{backsidecolor}{%    \backgroundcolor{c[1]}{backsidecolor}  }{} +% Une commande dédiée pour les notes de marge  \newcommand{\DUsidebar}[1]{%    \switchcolumn[0]    \begin{changemargin}{0.5cm}{1cm}  -  \LibertineFont\selectfont +  \AltFont\selectfont    \ifdefinedcolor{textsidecolor}{\color{textsidecolor}}{}    #1    \end{changemargin} diff --git a/model_5/Makefile b/model_5/Makefile new file mode 100755 index 0000000..c02fab5 --- /dev/null +++ b/model_5/Makefile @@ -0,0 +1,46 @@ +TEX=xelatex +SOURCE=. + +SRC  =$(wildcard *.rst) +SVG  =$(wildcard content/*.svg) + +PDFS = $(SRC:.rst=.pdf) +INCLUDED_PDF = $(SVG:.svg=.pdf) + +all: $(PDFS) + +BIBS =$(wildcard *.bib) + +DIR = $(sort $(shell find $(SOURCE) -name '*.rst' -print)) +SOURCES = $(sort $(wildcard resources/*.tex) ) + +null  := +space := $(null) # +comma := , +TEX_STYLE := $(subst $(space),$(comma),$(strip $(SOURCES))) +TEX_BIBS := $(subst $(space),$(comma),$(strip $(BIBS))) + +PACK = $(shell sed -e 's/\#.*$$//' -e '/^$$/d' resources/modules) +PACKAGES := $(subst $(space),$(comma),$(strip $(PACK))) + +tmp: +	mkdir tmp + +# Generate the latex file from rst +tmp/%.tex: %.rst $(INCLUDED_PDF) $(SOURCES)| tmp +	$$(command -v rst2latex rst2latex.py | head -n 1)  --no-section-subtitles --table-style=borderless --use-latex-citations --use-latex-docinfo --documentclass=extarticle --documentoption=12pt,A4,table --syntax-highlight=short --stylesheet=$(PACKAGES),$(TEX_STYLE) $< $@ +	sed -i -e 's/continued on next page/suite sur la page suivante/;s|^%$$||' $@ +	sed -i -e 's/admonition-/admonition/g' $@ + +# Generate each pdf with latex +tmp/%.pdf: tmp/%.tex $(BIBS) | tmp +	$(TEX) -output-directory tmp $< +	#bibtex tmp/$*.aux && $(TEX) -output-directory tmp $< || echo "no bib" +	while grep 'Rerun to get ' tmp/$*.log ; do $(TEX) -output-directory tmp $< ; done + +# Put the pdf in the right place +%.pdf: tmp/%.pdf | tmp +	cp $< $@ + +clean: +	rm -r tmp diff --git a/model_5/example.pdf b/model_5/example.pdfBinary files differ new file mode 100644 index 0000000..f8afd80 --- /dev/null +++ b/model_5/example.pdf diff --git a/model_5/example.rst b/model_5/example.rst new file mode 100755 index 0000000..ff5716a --- /dev/null +++ b/model_5/example.rst @@ -0,0 +1,155 @@ +.. -*- mode: rst -*- +.. -*-  coding: utf-8 -*- + + +.. role:: latex(raw) +   :format: latex + +.. role:: level +.. role:: levelbox +.. role:: star + +.. default-role:: latex + +.. raw:: latex + + +  \setstretch{1.4} + +  % Espacement entre chaque note de marge +  \setlength{\notesep}{0cm} + +  \renewcommand{\labelitemi}{} + + +.. role:: smallcaps +.. role:: smallemph + +.. |phoneicon|    replace::   `\renewcommand{\labelitemi}{\iconBox{\faPhone}}` +.. |mailicon|     replace::   `\renewcommand{\labelitemi}{\iconBox{\faEnvelope}}` +.. |noicon|       replace::   `\renewcommand{\labelitemi}{}` + +============= +Nom et Prénom +============= + +-------------- +Petite légende +-------------- + +.. sidebar:: \ + +  .. image:: ../common/Parmenides.jpg +    :width: 100% + + +.. sidebar:: Informations + +  * 17 allée des cerisiers +  * 75001 Paris |phoneicon| +  * 01 23 45 67 89 |mailicon| +  * email@example |noicon| +  * 01/02/1980 +  * Permis B + +.. sidebar:: Compétences + +  .. class:: checklist + +  * Conception +  * Esprit de synthèse +  * Écoute |noicon| +  * \ + +.. sidebar:: Niveaux + +  Autre + +  :star:`4.5` + +  Anglais + +  :levelbox:`5` + +  Bureautique + +  :level:`3` + + + +Expériences +=========== + +`\renewcommand{\labelitemi}{$\bullet$}` + +:Actuellement: + +  **Poste actuel** — *Entreprise* — Adresse. + +  :latex:`\lipsum[1-3][4-7]` + +  - :latex:`\lipsum[1-3][1]` +  - :latex:`\lipsum[1-3][2]` +  - :latex:`\lipsum[1-3][3]` + + +:2011 — 2018: + +  **Poste occupé** — *Entreprise* — Adresse. + +  :latex:`\lipsum[1-3][5-10]` + +  :latex:`\lipsum[4-7][5-10]` + +:2010 — 2011: + +  **Poste occupé** — *Entreprise* — Adresse. + +  :latex:`\lipsum[1-3][10-15]` + + +:2008 — 2010: + +  **Poste occupé** — *Entreprise* — Adresse. + +  :latex:`\lipsum[1-3][15-21]` + + +Réalisations +============ + +Description +----------- + +:latex:`\lipsum[4-7][10-15]` + +:latex:`\lipsum[4-7][15-20]` + +Description +----------- + +:latex:`\lipsum[7-10][10-15]` + +:latex:`\lipsum[7-10][15-20]` + + +Formations +========== + +:Année: + +    **Niveau M1** — *Université de Paris* + + +:Année: + +    **Licence** — *Université de Paris* + +    Mention + + +:Année: + +    **Baccalauréat Scientifique** — *Lycée* – Ville + +    Spécialité diff --git a/model_5/resources/00_colors.tex b/model_5/resources/00_colors.tex new file mode 100755 index 0000000..3afc69c --- /dev/null +++ b/model_5/resources/00_colors.tex @@ -0,0 +1,13 @@ +\usepackage{xcolor} + +% Couleur utilisée pour le bandeau +\definecolor{backsidecolor}{RGB}{255,255,255} + +% Couleur utilisée pour les éléments du bandeau +%\definecolor{sidecolor}{RGB}{36,63,96} +%\definecolor{sidecolor}{RGB}{101,114,131} + +% Couleur utilisée pour le texte du bandeau +\definecolor{textsidecolor}{RGB}{0,0,0} + +\definecolor{altColor}{HTML}{5e81ac} diff --git a/model_5/resources/00_length.tex b/model_5/resources/00_length.tex new file mode 100755 index 0000000..3e0ee3d --- /dev/null +++ b/model_5/resources/00_length.tex @@ -0,0 +1,5 @@ +% Distance de la colonne +\setlength{\columnsep}{0.25cm} + +% Occupation de la colonne  +\columnratio{0.25} diff --git a/model_5/resources/00_preamble.tex b/model_5/resources/00_preamble.tex new file mode 100755 index 0000000..eb1b7a5 --- /dev/null +++ b/model_5/resources/00_preamble.tex @@ -0,0 +1,25 @@ +\usepackage{calc} + +\usepackage[a4paper, top=0.5cm, bottom=0.5cm, outer=0.5cm, inner=0.5cm]{geometry} +\pagestyle{empty} +\pagenumbering{gobble} + +\newcommand{\DUrolelatex}[1]{#1} + +% Supprime l'indentation pour les listes de définitions +\newenvironment{DUfieldlist}% +  {\description[align=left,labelwidth=1.0cm,leftmargin=.5cm]} +  {\enddescription} + +\makeatletter +\newcommand{\ifdefinedcolor}[3]{% +	\@ifundefinedcolor{#1}{#3}{#2} +} +\makeatother + +\input{../common/10_language.tex} +\input{../common/10_lists.tex} +\input{../common/10_nowidows.tex} +\input{../common/10_levels.tex} +\input{../common/10_icons.tex} +\input{../common/99_sidebar.tex} diff --git a/model_5/resources/10_fonts.tex b/model_5/resources/10_fonts.tex new file mode 100755 index 0000000..befadd5 --- /dev/null +++ b/model_5/resources/10_fonts.tex @@ -0,0 +1,13 @@ +\usepackage{fontspec} +\setmainfont{Linux Libertine O} + +\newcommand{\DUtitletitle}[1]{% +    {\begin{center}\textbf{\textsc{#1}}\end{center}} + } + +\setmonofont{Latin Modern Mono Light} +\newfontfamily\TitleFont +  {EB Garamond} +  [ Mapping=tex-text ] + +\newfontfamily\AltFont[Mapping=tex-text]{Linux Libertine O} diff --git a/model_5/resources/10_title_style.tex b/model_5/resources/10_title_style.tex new file mode 100755 index 0000000..eb62129 --- /dev/null +++ b/model_5/resources/10_title_style.tex @@ -0,0 +1,60 @@ +\usepackage[explicit]{titlesec} +\usepackage{pgfplots} +\pgfplotsset{compat=newest} + +\providecommand{\DUdocumentsubtitle}[1]{% +  %\begin{nthcolumn}{1} +  \color{black} +  \em +  \TitleFont\selectfont +  \Large +  #1 +  %\end{nthcolumn} +} + +\makeatletter + +\def\@maketitle{% +  \vspace*{1cm} +  \begin{nthcolumn*}{0}% +  \textcolor{altColor}{% +    \huge \@title +  } +  \end{nthcolumn*} +} +\makeatother + +\newcommand\SecTitle[1]{% +\begin{tikzpicture} + +  \node (A) at (0,0) +      {\Large{\textsf{[ #1 ]}}}; + +  \draw [line width=0.2mm] +    (-7,0) -- (A.west); + +  \draw [line width=0.2mm] +    (A.east) -- (7,0); +\end{tikzpicture}} + +% Titre de niveau 1 +\titleformat{\section} +  {\centering} +  {\thesection} +  {} +  {\SecTitle{#1}} + +% Titre de niveau 2 +\titleformat{\subsection} +  {\large} +  {\thesubsection} +  {} +  {\textcolor{altColor}{\Large \bf {#1}}} + +% Titre de niveau 3 +\titleformat{\subsubsection} +  {\bfseries\normalsize} +  {\thesubsubsection} +  {2em} +  {} +  {} diff --git a/model_5/resources/99_begin.tex b/model_5/resources/99_begin.tex new file mode 100755 index 0000000..7b7a793 --- /dev/null +++ b/model_5/resources/99_begin.tex @@ -0,0 +1,7 @@ +\input{../common/90_ref.tex} + +% On charge les colonnes dès le début du document. +\AtBeginDocument{% +  \begin{paracol}{2} +} + diff --git a/model_5/resources/modules b/model_5/resources/modules new file mode 100755 index 0000000..079c678 --- /dev/null +++ b/model_5/resources/modules @@ -0,0 +1,13 @@ +tikz +parskip # Ne pas indenter la premiere ligne d'un paragraphe +setspace + +# Polices mathematiques. +amsmath  +amsfonts +amssymb + +DUsmallcaps +pgfornament +paracol +lipsum @@ -16,6 +16,12 @@ Pré-requis  La compilation des fichiers en PDF requiert python et docutils. Il faut bien  sûr latex pour générer le pdf. +compilation +----------- + +Tous les modèles peuvent être générés en une seule commande en lançant `make -j +4` dans le répertoire principal. +  Organisation  ============ @@ -38,6 +44,8 @@ Model 1  Model 2  ------- +Le bandeau du titre occupe la totalité de la largeur : +  .. image:: /latex_template.git/plain/snapshots/model2.png    :width: 400px @@ -48,6 +56,8 @@ Model 2  Model 3  ------- +Ce modèle inverse la colonne en la faisant passer à droite : +  .. image:: /latex_template.git/plain/snapshots/model3.png    :width: 400px @@ -55,6 +65,20 @@ Model 3  .. __: /latex_template.git/plain/model_3/example.pdf +Model 5 +------- + +Une version inspirée par le `CV Rambo`__ + +.. __: https://gitlab.com/benoit.vaillant/tscvng/-/tree/master/CVs/rambo + +.. image:: /latex_template.git/plain/snapshots/model5.png +  :width: 400px + +`[Version PDF]`__ + +.. __: /latex_template.git/plain/model_5/example.pdf +  La syntaxe  ========== diff --git a/snapshots/model5.png b/snapshots/model5.pngBinary files differ new file mode 100644 index 0000000..c80eb6f --- /dev/null +++ b/snapshots/model5.png | 
