diff --git a/formationTitle.sty b/formationTitle.sty index 6d7ea7c..7ed8818 100644 --- a/formationTitle.sty +++ b/formationTitle.sty @@ -63,8 +63,6 @@ not set, please fix this.} %\newcommand*{\@supervisor}{\texttt{\string\supervisor} currently %not set, please fix this.} -\newcommand*{\hour}[1]{\gdef\@hour{#1}% -} \newcommand*{\place}[1]{\gdef\@place{#1}% } \newcommand*{\room}[1]{\gdef\@room{#1}% @@ -81,9 +79,8 @@ not set, please fix this.} \newcounter{MinuteCounter} \newcommand{\startTime}[2]{% - \gdef\startHour{#1} - \setcounter{HourCounter}{\value{\startHour}} - \addtocounter{MinuteCounter}{ 2 } + \setcounter{HourCounter}{#1} + \setcounter{MinuteCounter}{#2} } \newcommand*{\printTime}{% @@ -168,10 +165,10 @@ not set, please fix this.} \fi {\large \@date} -\ifx\@hour\undefined + \ifnum\value{HourCounter}=0 \else { -\large\itshape\@hour\unskip\strut} +\large\itshape\printTime\unskip\strut} \fi \ifx\@place\undefined \else diff --git a/plan.tex b/plan.tex index baf4dcb..1534a94 100644 --- a/plan.tex +++ b/plan.tex @@ -1,7 +1,5 @@ \documentclass{article} -\usepackage[a4paper, landscape]{geometry} - \usepackage[english]{formationTitle} \context{Super society} @@ -10,11 +8,11 @@ \author{Gregory Trolliet} \supervisor{Jean Dupont} \logo{logo.pdf} -\hour{10h00} \place{Super building, Oceania} \room{room 101} -\setcounter{HourCounter}{10} -\setcounter{MinuteCounter}{0} +\startTime{11}{23} +%\setcounter{HourCounter}{10} +%\setcounter{MinuteCounter}{0} \objectives{ \begin{itemize} @@ -35,6 +33,7 @@ \newgeometry{right=1cm, left=1cm} \steptable{ + \partCount & \partDuration{5} & Welcome @@ -42,16 +41,19 @@ & Present the association, the active learning & & Flap \\ -\hline -\pause +\hline + +\pause & \partDuration{10} & Organization presentation & Lecture style & & Orally & -- \\ + \hline + \partCount & \partDuration{5} & Organization presentation