aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile7
-rwxr-xr-xmodel_1/resources/10_title_style.tex15
-rwxr-xr-xmodel_4/resources/10_title_style.tex14
-rwxr-xr-xmodel_4/resources/99_sidebar.tex6
4 files changed, 27 insertions, 15 deletions
diff --git a/Makefile b/Makefile
index f91a599..6ce2b93 100644
--- a/Makefile
+++ b/Makefile
@@ -5,4 +5,11 @@ all: $(SUBDIRS)
$(SUBDIRS):
$(MAKE) -C $@
+clean:
+ for dir in $(SUBDIRS); do \
+ $(MAKE) -C $$dir clean; \
+ done
+
+
.PHONY: all $(SUBDIRS)
+
diff --git a/model_1/resources/10_title_style.tex b/model_1/resources/10_title_style.tex
index df636f6..93bcf12 100755
--- a/model_1/resources/10_title_style.tex
+++ b/model_1/resources/10_title_style.tex
@@ -1,10 +1,12 @@
\usepackage{titlesec}
\providecommand{\DUdocumentsubtitle}[1]{%
- \color{black}
- \EBLigatures\selectfont
- \Large
- #1\switchcolumn[1]* % Synchronise the column at this position
+ \begin{nthcolumn*}{1}
+ \color{black}
+ \EBLigatures\selectfont
+ \Large
+ #1
+ \end{nthcolumn*}
}
\makeatletter
@@ -12,7 +14,10 @@
\def\@maketitle{%
\switchcolumn[1]%
\vspace*{1cm}
- \textcolor{orange}{\fontsize{1.2cm}{2cm}\CaviarDreamsFont\selectfont \@title}
+ \raggedright
+ \textcolor{orange}{%
+ \fontsize{1.2cm}{2cm}\CaviarDreamsFont\selectfont \@title
+ }
}
\makeatother
diff --git a/model_4/resources/10_title_style.tex b/model_4/resources/10_title_style.tex
index 5adc081..c281f7e 100755
--- a/model_4/resources/10_title_style.tex
+++ b/model_4/resources/10_title_style.tex
@@ -1,13 +1,13 @@
\usepackage{titlesec}
\providecommand{\DUdocumentsubtitle}[1]{%
+ \begin{nthcolumn}{1}
\color{black}
\CaviarDreamsFont\selectfont
\Large
\raggedleft
#1
- %\end{flushright}
- %\switchcolumn[1]* % Synchronise the column at this position
+ \end{nthcolumn}
}
\makeatletter
@@ -45,20 +45,20 @@
% La commande attend deux paramètres, la couleur, et le texte à afficher,
% le texte correspond à celui de la section et est fourni par titlesec en
% paramètre de manière implicite.
-\newcommand{\colorsection}[3]{%
+\newcommand{\colorsection}[4]{%
\centering
\colorbox{#1}{%
\parbox{#2}{%
- \centering\textcolor{white}{#3}}%
+ \centering\textcolor{#3}{#4}}%
}
}
% Titre de niveau 1
\titleformat{\section}[block]
- {\CaviarDreamsFont\selectfont\Large}
+ {\CaviarDreamsFont\selectfont\large}
{\thesection}
{0em}
- {\centering}
+ {\colorsection{white}{.7\linewidth}{black}}
% Titre de niveau 2
\titleformat{\subsection}
@@ -76,6 +76,6 @@
{}
\newcommand{\DUtitletitle}[1]{%
- \stepcounter{mySection}\colorsection{title[\modulo{\the\value{mySection}}{\colorsDim}]}{\linewidth}{#1}
+ \stepcounter{mySection}\colorsection{title[\modulo{\the\value{mySection}}{\colorsDim}]}{\linewidth}{white}{#1}
}
diff --git a/model_4/resources/99_sidebar.tex b/model_4/resources/99_sidebar.tex
index 3ee6dca..52dc735 100755
--- a/model_4/resources/99_sidebar.tex
+++ b/model_4/resources/99_sidebar.tex
@@ -4,8 +4,8 @@
\let\endchangemargin=\endlist
% Une commande dédiée pour les notes de marge
-\setlength{\columnsep}{0.25cm}
-\columnratio{0.28}
+%\setlength{\columnsep}{0.25cm}
+\columnratio{0.25}
\ifdefinedcolor{backsidecolor}{%
\backgroundcolor{c[1]}{backsidecolor}
@@ -13,7 +13,7 @@
\newcommand{\DUsidebar}[1]{%
\switchcolumn[0]
- \begin{changemargin}{0.7cm}{1.5cm}
+ \begin{changemargin}{0.5cm}{1cm}
\LibertineFont\selectfont
\ifdefinedcolor{textsidecolor}{\color{textsidecolor}}{}
#1