From 946b53ac23458b07870de6f743bb8286a027c640 Mon Sep 17 00:00:00 2001 From: Gregory Trolliet Date: Mon, 30 Sep 2019 21:22:17 +0200 Subject: [PATCH] First usable version of the code --- CHANGELOG.md | 8 +++++++ formationTitle.sty | 58 +++++++++++++++++++++++++++++++++++++++++----- plan.tex | 19 ++++++++++++--- 3 files changed, 76 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7373ccc..accf326 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ## [Unreleased] +## [0.1.0] - 2019-09-30 +### Changed + * formationTitle.sty, add new command for the array defining the steps + of the formation, `\steptable`. + * formationTitle.sty, add a new command `\dumblang` which allow to switch + between english(#1) and french(#2) + * plan.tex, now use `\steptable` + ## [0.0.1] - 2019-09-30 ### Added * CHANGELOG file to follow the changes of this code diff --git a/formationTitle.sty b/formationTitle.sty index 86df7f4..d713c05 100644 --- a/formationTitle.sty +++ b/formationTitle.sty @@ -1,8 +1,17 @@ % Copyright note: This package define a formation title \ProvidesPackage{formationTitle}[2019/09/30 v.01 a formation title Gregory Trolliet] + +%Set the actual language, #1 for english and #2 for french +\newcommand{\dumblang}[2]{{#1}} +\usepackage[\dumblang{english}{french}]{babel} + \RequirePackage{graphicx} -\usepackage{booktabs} +\RequirePackage{booktabs} + +\RequirePackage{array} +\RequirePackage{longtable} +\RequirePackage{makecell} \newcommand*{\logo}[1]{\gdef\@logo{#1}% } @@ -19,8 +28,8 @@ not set, please fix this.} } \newcommand*{\supervisor}[1]{\gdef\@supervisor{#1}% } -\newcommand*{\@supervisor}{\texttt{\string\supervisor} currently -not set, please fix this.} +%\newcommand*{\@supervisor}{\texttt{\string\supervisor} currently +%not set, please fix this.} \newcommand*{\messages}[1]{\gdef\@messages{#1}% } @@ -58,9 +67,6 @@ not set, please fix this.} \vspace{1cm} {\Large\itshape\@author\unskip\strut\par} \vspace{1cm} -%\vfill -%supervised by\par -%\@supervisor\unskip\strut\par \begin{tabular}{p{.5\textwidth}|p{.5\textwidth}} \toprule @@ -70,7 +76,47 @@ not set, please fix this.} \end{tabular} \vfill + +\ifx\@supervisor\undefined +\else +{ +\dumblang{supervised by}{supervisé par}\par +\@supervisor\unskip\strut\par} +\vfill +\fi + {\large \@date\par} \end{titlepage} } +\newcommand{\steptable}[1] +{ +\setlength\LTleft{0pt} +\setlength\LTright{0pt} +\begin{longtable}{@{\extracolsep{\fill}}p{.6cm}p{4cm}p{4cm}p{4cm}p{4cm}} +\makecell[l]{ + \textbf{\dumblang{Hour}{Heure}} \\ + (\dumblang{Time}{Temps}) +} & +\makecell[l]{ + \textbf{\dumblang{Theme, content}{Thème, contenu}} \\ + (\dumblang{What}{Quoi}?) +} & +\makecell[l]{ + \textbf{\dumblang{Style, method}{Forme, méthode}} \\ + (\dumblang{How}{Comment}?) +} & +\makecell[l]{ + \textbf{\dumblang{Teaching methods}{Moyens didactiques}} \\ + (\dumblang{With what}{Avec quoi}?) +} & +\makecell[l]{ +\textbf{\dumblang{Method of assessing}{Méthode d'évaluation}} \\ +\textbf{\dumblang{learning outcomes}{des acquis}} \\ +(\dumblang{How}{Comment}?) +} \\ +\endhead +\toprule +#1 +\end{longtable} +} \endinput diff --git a/plan.tex b/plan.tex index 2bd1492..4914c1e 100644 --- a/plan.tex +++ b/plan.tex @@ -2,15 +2,14 @@ \usepackage[a4paper, landscape]{geometry} +\usepackage{formationTitle} + \usepackage[utf8]{inputenc} \usepackage[T1]{fontenc} -\usepackage[french]{babel} \usepackage{enumerate} \usepackage{numprint} \usepackage{graphicx} -\usepackage{formationTitle} - \newenvironment{boxed} { \begin{center} @@ -27,6 +26,7 @@ \title{Formation plan} \subject{My wonderful formation} \author{Gregory Trolliet} +\supervisor{Jean Dupont} \logo{logo.pdf} \objectives{\textbf{Objectives} \begin{itemize} @@ -43,5 +43,18 @@ \begin{document} \maketitle +\steptable{ +10h00 (5') & +Welcome & +Lecture style & +Orally & +-- \\ +\hline +10h05 (5') & +Organization presentation & +Lecture style & +Orally & +-- \\ +} \end{document}