[bootlin/training-materials updates] master: agenda: use variables in .inc files for lecture/lab ratio (837b2bdc)
Thomas Petazzoni
thomas.petazzoni at bootlin.com
Thu Jan 5 23:56:51 CET 2023
Repository : https://github.com/bootlin/training-materials
On branch : master
Link : https://github.com/bootlin/training-materials/commit/837b2bdc5f336ed5a035ba72efcc1e8d02e04d0d
>---------------------------------------------------------------
commit 837b2bdc5f336ed5a035ba72efcc1e8d02e04d0d
Author: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
Date: Thu Jan 5 23:56:51 2023 +0100
agenda: use variables in .inc files for lecture/lab ratio
Signed-off-by: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
>---------------------------------------------------------------
837b2bdc5f336ed5a035ba72efcc1e8d02e04d0d
agenda/autotools-agenda.tex | 2 +-
agenda/autotools.inc | 4 ++++
agenda/boot-time-agenda.tex | 2 +-
agenda/boot-time-fr-agenda.tex | 2 +-
agenda/boot-time.inc | 4 ++++
agenda/buildroot-agenda.tex | 2 +-
agenda/buildroot-fr-agenda.tex | 2 +-
agenda/buildroot.inc | 4 ++++
agenda/debugging-agenda.tex | 2 +-
agenda/debugging-fr-agenda.tex | 2 +-
agenda/debugging.inc | 4 ++++
agenda/embedded-linux-agenda.tex | 2 +-
agenda/embedded-linux-fr-agenda.tex | 2 +-
agenda/embedded-linux.inc | 4 ++++
agenda/git-agenda.tex | 2 +-
agenda/git.inc | 4 ++++
agenda/graphics-agenda.tex | 2 +-
agenda/graphics-fr-agenda.tex | 2 +-
agenda/graphics.inc | 4 ++++
agenda/linux-kernel-agenda.tex | 2 +-
agenda/linux-kernel-fr-agenda.tex | 2 +-
agenda/linux-kernel.inc | 4 ++++
agenda/preempt-rt-agenda.tex | 2 +-
agenda/preempt-rt-fr-agenda.tex | 2 +-
agenda/preempt-rt.inc | 4 ++++
agenda/yocto-agenda.tex | 2 +-
agenda/yocto-fr-agenda.tex | 2 +-
agenda/yocto.inc | 4 ++++
common/agenda.sty | 14 +++++++-------
29 files changed, 65 insertions(+), 25 deletions(-)
diff --git a/agenda/autotools-agenda.tex b/agenda/autotools-agenda.tex
index 3071f867..2ba2c877 100644
--- a/agenda/autotools-agenda.tex
+++ b/agenda/autotools-agenda.tex
@@ -20,7 +20,7 @@
\feagendasummaryitem{Duration}{
\feshowduration{}
}
-\onsitepedagogics{40}{60}
+\onsitepedagogics
\feagendasummaryitem{Trainer}{
\trainers{}
}
diff --git a/agenda/autotools.inc b/agenda/autotools.inc
index 91e66626..93c565fa 100644
--- a/agenda/autotools.inc
+++ b/agenda/autotools.inc
@@ -48,3 +48,7 @@
gained a good knowledge of {\em autoconf}, {\em automake} and {\em
libtool}.
}
+
+% Time ratio
+\def \onsitelecturetimeratio{40}
+\def \onsitelabtimeratio{60}
diff --git a/agenda/boot-time-agenda.tex b/agenda/boot-time-agenda.tex
index d3ec4089..aebdb0d0 100644
--- a/agenda/boot-time-agenda.tex
+++ b/agenda/boot-time-agenda.tex
@@ -20,7 +20,7 @@
\feagendasummaryitem{Duration}{
\feshowduration{}
}
-\onsitepedagogics{40}{60}
+\onsitepedagogics
\feagendasummaryitem{Trainer}{
\trainers{}
}
diff --git a/agenda/boot-time-fr-agenda.tex b/agenda/boot-time-fr-agenda.tex
index 5f3c707f..5f22a874 100644
--- a/agenda/boot-time-fr-agenda.tex
+++ b/agenda/boot-time-fr-agenda.tex
@@ -20,7 +20,7 @@
\feagendasummaryitem{Durée}{
\feshowduration{}
}
-\onsitepedagogics{40}{60}
+\onsitepedagogics
\feagendasummaryitem{Formateur}{
\trainers{}
}
diff --git a/agenda/boot-time.inc b/agenda/boot-time.inc
index 87a2921a..a90449f4 100644
--- a/agenda/boot-time.inc
+++ b/agenda/boot-time.inc
@@ -69,3 +69,7 @@
\newline People supporting embedded Linux system developers.
}
}
+
+% Time ratio
+\def \onsitelecturetimeratio{40}
+\def \onsitelabtimeratio{60}
diff --git a/agenda/buildroot-agenda.tex b/agenda/buildroot-agenda.tex
index dc10e773..d01f6e73 100644
--- a/agenda/buildroot-agenda.tex
+++ b/agenda/buildroot-agenda.tex
@@ -20,7 +20,7 @@
\feagendasummaryitem{Duration}{
\feshowduration{}
}
-\onsitepedagogics{40}{60}
+\onsitepedagogics
\feagendasummaryitem{Trainer}{
\trainers{}
}
diff --git a/agenda/buildroot-fr-agenda.tex b/agenda/buildroot-fr-agenda.tex
index 7703699f..b8ab89eb 100644
--- a/agenda/buildroot-fr-agenda.tex
+++ b/agenda/buildroot-fr-agenda.tex
@@ -20,7 +20,7 @@
\feagendasummaryitem{Durée}{
\feshowduration{}
}
-\onsitepedagogics{40}{60}
+\onsitepedagogics
\feagendasummaryitem{Formateur}{
\trainers{}
}
diff --git a/agenda/buildroot.inc b/agenda/buildroot.inc
index a9899f25..b6a8de48 100644
--- a/agenda/buildroot.inc
+++ b/agenda/buildroot.inc
@@ -91,3 +91,7 @@
Buildroot to build their embedded Linux systems.
}
}
+
+% Time ratio
+\def \onsitelecturetimeratio{40}
+\def \onsitelabtimeratio{60}
diff --git a/agenda/debugging-agenda.tex b/agenda/debugging-agenda.tex
index be84a5ce..4af827ae 100644
--- a/agenda/debugging-agenda.tex
+++ b/agenda/debugging-agenda.tex
@@ -20,7 +20,7 @@
\feagendasummaryitem{Duration}{
\feshowduration{}
}
-\onsitepedagogics{40}{60}
+\onsitepedagogics
\feagendasummaryitem{Trainer}{
\trainers{}
}
diff --git a/agenda/debugging-fr-agenda.tex b/agenda/debugging-fr-agenda.tex
index c2016b2c..8a1b86f0 100644
--- a/agenda/debugging-fr-agenda.tex
+++ b/agenda/debugging-fr-agenda.tex
@@ -20,7 +20,7 @@
\feagendasummaryitem{Durée}{
\feshowduration{}
}
-\onsitepedagogics{40}{60}
+\onsitepedagogics
\feagendasummaryitem{Formateur}{
\trainers{}
}
diff --git a/agenda/debugging.inc b/agenda/debugging.inc
index 35e06f95..e814f1f8 100644
--- a/agenda/debugging.inc
+++ b/agenda/debugging.inc
@@ -105,3 +105,7 @@
% Ubuntu version
\def \ubuntuversion{22.04}
+
+% Time ratio
+\def \onsitelecturetimeratio{40}
+\def \onsitelabtimeratio{60}
diff --git a/agenda/embedded-linux-agenda.tex b/agenda/embedded-linux-agenda.tex
index 26fff2e1..2abe8ca9 100644
--- a/agenda/embedded-linux-agenda.tex
+++ b/agenda/embedded-linux-agenda.tex
@@ -20,7 +20,7 @@
\feagendasummaryitem{Duration}{
\feshowduration{}
}
-\onsitepedagogics{50}{50}
+\onsitepedagogics
\feagendasummaryitem{Trainer}{
\trainers{}
}
diff --git a/agenda/embedded-linux-fr-agenda.tex b/agenda/embedded-linux-fr-agenda.tex
index 31ff8476..19bb811a 100644
--- a/agenda/embedded-linux-fr-agenda.tex
+++ b/agenda/embedded-linux-fr-agenda.tex
@@ -20,7 +20,7 @@
\feagendasummaryitem{Durée}{
\feshowduration{}
}
-\onsitepedagogics{50}{50}
+\onsitepedagogics
\feagendasummaryitem{Formateur}{
\trainers{}
}
diff --git a/agenda/embedded-linux.inc b/agenda/embedded-linux.inc
index 76ed3200..5ebff187 100644
--- a/agenda/embedded-linux.inc
+++ b/agenda/embedded-linux.inc
@@ -107,3 +107,7 @@
% Ubuntu version
\def \ubuntuversion{22.04}
+
+% Time ratio
+\def \onsitelecturetimeratio{50}
+\def \onsitelabtimeratio{50}
diff --git a/agenda/git-agenda.tex b/agenda/git-agenda.tex
index e239ba35..64404c97 100644
--- a/agenda/git-agenda.tex
+++ b/agenda/git-agenda.tex
@@ -20,7 +20,7 @@
\feagendasummaryitem{Duration}{
\feshowduration{}
}
-\onsitepedagogics{40}{60}
+\onsitepedagogics
\feagendasummaryitem{Language}{
\traininglanguages{}
}
diff --git a/agenda/git.inc b/agenda/git.inc
index a9573067..21c43f7b 100644
--- a/agenda/git.inc
+++ b/agenda/git.inc
@@ -35,3 +35,7 @@
Companies already using or interested in using
Git to manage their source code.
}
+
+% Time ratio
+\def \onsitelecturetimeratio{40}
+\def \onsitelabtimeratio{60}
diff --git a/agenda/graphics-agenda.tex b/agenda/graphics-agenda.tex
index dc8bfa71..0f73fcd5 100644
--- a/agenda/graphics-agenda.tex
+++ b/agenda/graphics-agenda.tex
@@ -20,7 +20,7 @@
\feagendasummaryitem{Duration}{
\feshowduration{}
}
-\onsitepedagogics{75}{25}
+\onsitepedagogics
\feagendasummaryitem{Trainer}{
\trainers{}
}
diff --git a/agenda/graphics-fr-agenda.tex b/agenda/graphics-fr-agenda.tex
index c3a50b4e..294582c7 100644
--- a/agenda/graphics-fr-agenda.tex
+++ b/agenda/graphics-fr-agenda.tex
@@ -20,7 +20,7 @@
\feagendasummaryitem{Durée}{
\feshowduration{}
}
-\onsitepedagogics{75}{25}
+\onsitepedagogics
\feagendasummaryitem{Formateur}{
\trainers{}
}
diff --git a/agenda/graphics.inc b/agenda/graphics.inc
index 973b7b40..3fc3e120 100644
--- a/agenda/graphics.inc
+++ b/agenda/graphics.inc
@@ -95,3 +95,7 @@
% No labs in graphics course
\def \haslabs{false}
+
+% Time ratio
+\def \onsitelecturetimeratio{75}
+\def \onsitedemotimeratio{25}
diff --git a/agenda/linux-kernel-agenda.tex b/agenda/linux-kernel-agenda.tex
index cac62f71..6ef1fc92 100644
--- a/agenda/linux-kernel-agenda.tex
+++ b/agenda/linux-kernel-agenda.tex
@@ -20,7 +20,7 @@
\feagendasummaryitem{Duration}{
\feshowduration{}
}
-\onsitepedagogics{50}{50}
+\onsitepedagogics
\feagendasummaryitem{Trainer}{
\trainers{}
}
diff --git a/agenda/linux-kernel-fr-agenda.tex b/agenda/linux-kernel-fr-agenda.tex
index 8ad3cf7f..f9801326 100644
--- a/agenda/linux-kernel-fr-agenda.tex
+++ b/agenda/linux-kernel-fr-agenda.tex
@@ -19,7 +19,7 @@
\feagendasummaryitem{Durée}{
\feshowduration{}
}
-\onsitepedagogics{50}{50}
+\onsitepedagogics
\feagendasummaryitem{Formateur}{
\trainers{}
}
diff --git a/agenda/linux-kernel.inc b/agenda/linux-kernel.inc
index d1989084..56799139 100644
--- a/agenda/linux-kernel.inc
+++ b/agenda/linux-kernel.inc
@@ -96,3 +96,7 @@
\newline People supporting embedded Linux system developers.
}
}
+
+% Time ratio
+\def \onsitelecturetimeratio{50}
+\def \onsitelabtimeratio{50}
diff --git a/agenda/preempt-rt-agenda.tex b/agenda/preempt-rt-agenda.tex
index 9354fddc..6548aee1 100644
--- a/agenda/preempt-rt-agenda.tex
+++ b/agenda/preempt-rt-agenda.tex
@@ -20,7 +20,7 @@
\feagendasummaryitem{Duration}{
\feshowduration{}
}
-\onsitepedagogics{50}{50}
+\onsitepedagogics
\feagendasummaryitem{Trainer}{
\trainers{}
}
diff --git a/agenda/preempt-rt-fr-agenda.tex b/agenda/preempt-rt-fr-agenda.tex
index bbbb3620..aeb2a3b1 100644
--- a/agenda/preempt-rt-fr-agenda.tex
+++ b/agenda/preempt-rt-fr-agenda.tex
@@ -20,7 +20,7 @@
\feagendasummaryitem{Duration}{
\feshowduration{}
}
-\onsitepedagogics{50}{50}
+\onsitepedagogics
\feagendasummaryitem{Formateur}{
\trainers{}
}
diff --git a/agenda/preempt-rt.inc b/agenda/preempt-rt.inc
index 6b02ffe8..9e8dab90 100644
--- a/agenda/preempt-rt.inc
+++ b/agenda/preempt-rt.inc
@@ -79,3 +79,7 @@
Maxime Chevallier
\newline \url{https://bootlin.com/company/staff/maxime-chevallier/}
}
+
+% Time ratio
+\def \onsitelecturetimeratio{50}
+\def \onsitelabtimeratio{50}
diff --git a/agenda/yocto-agenda.tex b/agenda/yocto-agenda.tex
index 7246333a..982fe287 100644
--- a/agenda/yocto-agenda.tex
+++ b/agenda/yocto-agenda.tex
@@ -20,7 +20,7 @@
\feagendasummaryitem{Duration}{
\feshowduration{}
}
-\onsitepedagogics{40}{60}
+\onsitepedagogics
\feagendasummaryitem{Trainer}{
\trainers{}
}
diff --git a/agenda/yocto-fr-agenda.tex b/agenda/yocto-fr-agenda.tex
index fc87dc89..c6995a61 100644
--- a/agenda/yocto-fr-agenda.tex
+++ b/agenda/yocto-fr-agenda.tex
@@ -20,7 +20,7 @@
\feagendasummaryitem{Durée}{
\feshowduration{}
}
-\onsitepedagogics{40}{60}
+\onsitepedagogics
\feagendasummaryitem{Formateur}{
\trainers{}
}
diff --git a/agenda/yocto.inc b/agenda/yocto.inc
index 61cee279..a100f7c5 100644
--- a/agenda/yocto.inc
+++ b/agenda/yocto.inc
@@ -79,3 +79,7 @@
build their embedded Linux system.
}
}
+
+% Time ratio
+\def \onsitelecturetimeratio{40}
+\def \onsitelabtimeratio{60}
diff --git a/common/agenda.sty b/common/agenda.sty
index bf481a33..85684af3 100644
--- a/common/agenda.sty
+++ b/common/agenda.sty
@@ -420,17 +420,17 @@
% Argument1: percentage of time spent in lectures
% Argument2: percentage of time spent in practical labs
-\newcommand \onsitepedagogics[2]{
+\newcommand \onsitepedagogics {
\ifthenelse{\equal{\agendalanguage}{french}}{
\feagendasummaryitem{Méthodes\newline pédagogiques}{
\begin{itemize}
\vspace{-0.5cm}
- \item Présentations animées par le formateur: #1\% de la durée de formation
+ \item Présentations animées par le formateur: \onsitelecturetimeratio{}\% de la durée de formation
\ifthenelse{\equal{\haslabs}{false}}{
- \item Démonstrations pratiques réalisées par le formateur: #2\% de
+ \item Démonstrations pratiques réalisées par le formateur: \onsitedemotimeratio{}\% de
la durée de formation
}{
- \item Travaux pratiques réalisés par les participants: #2\% de la durée de formation
+ \item Travaux pratiques réalisés par les participants: \onsitelabtimeratio{}\% de la durée de formation
}
\item Version électroniques de supports de présentation, des
instructions et des données de travaux pratiques. Les supports
@@ -443,12 +443,12 @@
\feagendasummaryitem{Pedagogics}{
\begin{itemize}
\vspace{-0.5cm}
- \item Lectures delivered by the trainer: #1\% of the duration
+ \item Lectures delivered by the trainer: \onsitelecturetimeratio{}\% of the duration
\ifthenelse{\equal{\haslabs}{false}}{
- \item Practical demonstrations done by the trainer: #2\% of the
+ \item Practical demonstrations done by the trainer: \onsitedemotimeratio{}\% of the
duration
}{
- \item Practical labs done by participants: #2\% of the duration
+ \item Practical labs done by participants: \onsitelabtimeratio{}\% of the duration
}
\item Electronic copies of presentations, lab instructions and data
files. They are freely available at
More information about the training-materials-updates
mailing list