From 7ec35b0b1464c4d8eee45ac866015ad4d281ebe6 Mon Sep 17 00:00:00 2001
From: Benjamin Bohard <bbohard@cadoles.com>
Date: Mon, 19 Jul 2021 12:10:23 +0200
Subject: [PATCH 1/2] =?UTF-8?q?R=C3=A9vision=20du=20plan=20des=20programme?=
 =?UTF-8?q?s=20de=20formation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/programme.tex | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/templates/programme.tex b/templates/programme.tex
index a7981cf..8ed259a 100644
--- a/templates/programme.tex
+++ b/templates/programme.tex
@@ -42,15 +42,14 @@
 \input{./programme/objectifs.tex}
 \section{Durée de la formation}
 \input{./programme/duree.tex}
+\IfFileExists{./programme/moyens.tex}{%
+\section{Moyens pédagogiques, techniques et d'encadrement}
+\input{./programme/moyens.tex}
+}{}
 \section{Évaluation des acquis}
 \input{./programme/evaluation.tex}
 \newpage
 \section{Contenu de la formation}
 \input{./programme/contenu.tex}
-\IfFileExists{./programme/moyens.tex}{%
-\section{Moyens pédagogiques, techniques et d'encadrement}
-\input{./programme/moyens.tex}
-\section{Évaluation des acquis}
-}{}
 \end{document}
 

From ea89dd29714d5a7295df29355d00eb092e0c5ba8 Mon Sep 17 00:00:00 2001
From: Benjamin Bohard <bbohard@cadoles.com>
Date: Mon, 19 Jul 2021 12:16:50 +0200
Subject: [PATCH 2/2] Ajuster le nombre de niveau de titre dans le plan

---
 setup_main_tex_file.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/setup_main_tex_file.py b/setup_main_tex_file.py
index 854bb37..35d2381 100755
--- a/setup_main_tex_file.py
+++ b/setup_main_tex_file.py
@@ -321,7 +321,7 @@ def main():
                 else:
                     return []
 
-        def filter_outlines(headers_list, max_level=None):
+        def filter_outlines(headers_list, max_level=0):
             filtered_outlines = []
             default_max_level = max([hl[1] for hl in headers_list])
             if not max_level:
@@ -379,6 +379,8 @@ def main():
         part_re = re.compile(r'\\part\{(?P<name>.*?)}')
         subsection_re = re.compile(r'\\subsection\{(?P<name>.*?)\}')
         master_file = path.join('presentations', args.directory, 'diaporama.tex')
+        max_level = args.levels
+
         with open(master_file, 'r') as master_tex:
             master = master_tex.read()
         skbconfig = SKBCONFIG_RE.search(master)
@@ -392,7 +394,7 @@ def main():
         sections_list = [(section.start(), section_level, section.group('name')) for section in sections]
         includes_list = [element for skbinput in includes for element in outline_from_include(file_path_from_skbinput(skbinput, master_file, skbconfig), skbinput.start(), document_class)]
         subsections_list = [(subsection.start(), subsection_level, subsection.group('name')) for subsection in subsections]
-        structured_outline = structure_outline(filter_outlines(reorder_lists(parts_list, sections_list, includes_list, subsections_list)))
+        structured_outline = structure_outline(filter_outlines(reorder_lists(parts_list, sections_list, includes_list, subsections_list), max_level=max_level))
         content_file = path.join(path.dirname(path.abspath(master_file)), 'programme', 'contenu.tex')
         with open(content_file, 'w') as content_fh:
             content_fh.write(structured_outline.render())
@@ -427,6 +429,7 @@ def main():
     
     parser_outline = subparsers.add_parser('outline', help="Création du programme à partir du fichier maître")
     parser_outline.add_argument('-d', '--directory', help="Sous-répertoires contenant le diaporama", required=True)
+    parser_outline.add_argument('-l', '--levels', help="Niveaux de titre à inclure dans le plan", type=int, default=0)
     parser_outline.set_defaults(func=outline)
     
     if subprocess.check_output(['rubber', '--version']):