From d30ca13783f9269aae5442e82b209002ca2aa353 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 26 May 2025 21:50:47 +0200 Subject: [PATCH 01/10] back off settings --- cnam.marc/thesis/topic/main.tex | 26 +++++----- cnam.marc/thesis/topic/settings.tex | 78 ----------------------------- 2 files changed, 12 insertions(+), 92 deletions(-) delete mode 100644 cnam.marc/thesis/topic/settings.tex diff --git a/cnam.marc/thesis/topic/main.tex b/cnam.marc/thesis/topic/main.tex index 4393c1a..fb52a97 100644 --- a/cnam.marc/thesis/topic/main.tex +++ b/cnam.marc/thesis/topic/main.tex @@ -1,23 +1,21 @@ \documentclass[10pt]{article} -%\usepackage{fontspec} -%\usepackage[a4paper,portrait, -%bmargin=10mm,lmargin=15mm,rmargin=15mm,tmargin=10mm]{geometry} +\usepackage{fontspec} +\usepackage[a4paper,portrait, +bmargin=10mm,lmargin=15mm,rmargin=15mm,tmargin=10mm]{geometry} -%\pagenumbering{gobble} -%\setlength{\parindent}{0em} -%\setlength{\parskip}{0em} -%\setmainfont{DejaVu Sans} +\pagenumbering{gobble} +\setlength{\parindent}{0em} +\setlength{\parskip}{0em} +\setmainfont{DejaVu Sans} -%\newcommand{\hr}{\rule{\textwidth}{1pt}} +\newcommand{\hr}{\rule{\textwidth}{1pt}} -%\newenvironment{itmz}{\begin{itemize} -%\setlength{\itemsep}{0em} -%}{\end{itemize}} +\newenvironment{itmz}{\begin{itemize} +\setlength{\itemsep}{0em} +}{\end{itemize}} -%\begin{document} - -\input{../settings} +\begin{document} CNAM / UAMM91 \hfill Mémoire ingénieur / Sujet \hfill IRSM ↔ CYC9104A diff --git a/cnam.marc/thesis/topic/settings.tex b/cnam.marc/thesis/topic/settings.tex deleted file mode 100644 index 7986231..0000000 --- a/cnam.marc/thesis/topic/settings.tex +++ /dev/null @@ -1,78 +0,0 @@ -% variables -\def\first{\ml{First}{Prénom}} -\def\last{\ml{LAST}{NOM}} -\def\org{\ml{Organization}{Organisme}} -\def\role{\ml{Role}{Fonction}} -\def\tt{\ml{Title}{Civilité}} - -% acronyms, glossary -\usepackage[acronym,toc]{glossaries} -\makeglossaries - -% tune table of contents -\usepackage{tocloft} -\setcounter{secnumdepth}{3} -\setcounter{tocdepth}{3} - -% links -\hypersetup{ -pdfinfo={ -Title={\titlelong\ - \titlesub}, -Author={\authorlong}, -Creator={XeLaTeX / report}, -}, -colorlinks, -citecolor=blue, -filecolor=blue, -linkcolor=blue, -urlcolor=blue, -} - -% adjust chapter titles -\usepackage{etoolbox} -\makeatletter -\patchcmd{\@makechapterhead}{50\p@}{0pt}{}{} -\patchcmd{\@makeschapterhead}{50\p@}{0pt}{}{} -\makeatother - -% set paper geometry -\usepackage{geometry} -\geometry{a4paper,portrait,top=20mm,bottom=20mm,left=20mm,right=20mm} - -% images -\usepackage{graphicx} - -% set fonts -\usepackage{fontspec} -% set relative sizes -\usepackage{relsize} -\setlength{\parindent}{0em} -\setlength{\parskip}{1em} -\setmainfont{DejaVu Sans} -\setmonofont{DejaVu Sans Mono} - -% set spacings -\usepackage{setspace} - -% lists of figures, tables -\usepackage{tocbibind} - -% references after polyglossia -\usepackage[sorting=anyt]{biblatex} -\bibliography{\name} - -% commands - -\newcommand{\cnam}{\includegraphics[height=1in]{../../cnam}} - -\newcommand{\hr}{\rule{\textwidth}{1pt}} - -\newcommand{\hrq}{\rule{.25\textwidth}{1pt}} - -% environments - -\newenvironment{itmz}{\begin{itemize} -%\setlength{\itemsep}{0em} -%\setlength{\parsep}{0em} -%\setlength{\parskip}{0em} -}{\end{itemize}} From 52d5e03f9b241e3edb7f69be5be65972450f030a Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 26 May 2025 21:56:13 +0200 Subject: [PATCH 02/10] languages --- cnam.marc/thesis/topic/main.tex | 34 +++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/cnam.marc/thesis/topic/main.tex b/cnam.marc/thesis/topic/main.tex index fb52a97..f008564 100644 --- a/cnam.marc/thesis/topic/main.tex +++ b/cnam.marc/thesis/topic/main.tex @@ -1,5 +1,39 @@ \documentclass[10pt]{article} +% manage languages ───────────────────────────────────────────────────────────── + +% use package +\usepackage{polyglossia} +% use recommended package +\usepackage{csquotes} + +% set main +\setmainlanguage{\mainlanguage} +% set others +\setotherlanguages{\otherlanguages} + +% expand function ifstrequal +\newcommand{\ifstreq}[4]{\expandafter\ifstrequal\expandafter{#1}{#2}{#3}{#4}} +% return text, according to variable mainlanguage +% 1: english text +% 2: french text +\newcommand{\ml}[2]{% +\ifstreq{\mainlanguage}{english}{\ifstrempty{#1}{\todo}{#1}}{% +\ifstreq{\mainlanguage}{french}{\ifstrempty{#2}{\todo}{#2}}{% +ERROR% +}}% +} + +% return text as english +% 1: text +\newcommand{\en}[1]{\textenglish{#1}} + +% return text as french +% 1: text +\newcommand{\fr}[1]{\textfrench{#1}} + +% + \usepackage{fontspec} \usepackage[a4paper,portrait, bmargin=10mm,lmargin=15mm,rmargin=15mm,tmargin=10mm]{geometry} From 85c98c2308d25b33a2251b49617bedb8251fabf9 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 26 May 2025 22:56:10 +0200 Subject: [PATCH 03/10] en/begin --- cnam.marc/thesis/topic/main.tex | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/cnam.marc/thesis/topic/main.tex b/cnam.marc/thesis/topic/main.tex index f008564..87f2b4d 100644 --- a/cnam.marc/thesis/topic/main.tex +++ b/cnam.marc/thesis/topic/main.tex @@ -51,16 +51,21 @@ bmargin=10mm,lmargin=15mm,rmargin=15mm,tmargin=10mm]{geometry} \begin{document} -CNAM / UAMM91 \hfill Mémoire ingénieur / Sujet \hfill IRSM ↔ CYC9104A +CNAM / UAMM91 \hfill \ml{Master’s thesis}{Mémoire ingénieur} / \ml{Topic}{Sujet} \hfill IRSM ↔ CYC9104A Marc Beninca \hfill \textbf{\ml{Incremental Live Operating System}{Système d’exploitation autonome incrémental}} \hfill 2020 → 2021 \hr -\section{Problématique : maintenance des systèmes d’exploitation} +\ml +{\section{Problem Statement: Operating Systems maintenance}} +{\section{Problématique : maintenance des systèmes d’exploitation}} -En fonction des cas d’utilisation, maintenir des systèmes d’exploitation peut nécessiter de penser :\\ -mises à jour, indisponibilité, sauvegardes, tests, instantanés, restaurations, recettes de configuration. +\ml +{Depending on use cases, maintaining operating systems can require thinking about:\\ +updates, downtime, backups, testing, snapshots, restorations, configuration scripts.} +{En fonction des cas d’utilisation, maintenir des systèmes d’exploitation peut nécessiter de penser :\\ +mises à jour, indisponibilité, sauvegardes, tests, instantanés, restaurations, scripts de configuration.} \subsection{Systèmes de fichiers, installés sur partitions, avec accès en écriture} From 1e13d504fe78f290fd9ae1e03ab080d7b4aa0a5d Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 26 May 2025 22:57:32 +0200 Subject: [PATCH 04/10] subject --- cnam.marc/thesis/build.py | 2 +- cnam.marc/thesis/topic/main.tex | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cnam.marc/thesis/build.py b/cnam.marc/thesis/build.py index 8a7d815..8bf7709 100755 --- a/cnam.marc/thesis/build.py +++ b/cnam.marc/thesis/build.py @@ -13,7 +13,7 @@ FRENCH = 'french' LANGUAGES = [ENGLISH, FRENCH] DOCUMENTS = [ - {ENGLISH: 'topic', FRENCH: 'sujet'}, + {ENGLISH: 'subject', FRENCH: 'sujet'}, {ENGLISH: 'thesis', FRENCH: 'mémoire'}, # {ENGLISH: 'presentation', FRENCH: 'présentation'}, ] diff --git a/cnam.marc/thesis/topic/main.tex b/cnam.marc/thesis/topic/main.tex index 87f2b4d..a354d47 100644 --- a/cnam.marc/thesis/topic/main.tex +++ b/cnam.marc/thesis/topic/main.tex @@ -51,7 +51,7 @@ bmargin=10mm,lmargin=15mm,rmargin=15mm,tmargin=10mm]{geometry} \begin{document} -CNAM / UAMM91 \hfill \ml{Master’s thesis}{Mémoire ingénieur} / \ml{Topic}{Sujet} \hfill IRSM ↔ CYC9104A +CNAM / UAMM91 \hfill \ml{Master’s thesis}{Mémoire ingénieur} / \ml{Subject}{Sujet} \hfill IRSM ↔ CYC9104A Marc Beninca \hfill \textbf{\ml{Incremental Live Operating System}{Système d’exploitation autonome incrémental}} \hfill 2020 → 2021 From a3b73bb67e4380e83219fb088c81c6584e9c8b13 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 26 May 2025 22:57:51 +0200 Subject: [PATCH 05/10] subject --- cnam.marc/thesis/{topic => subject}/main.tex | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename cnam.marc/thesis/{topic => subject}/main.tex (100%) diff --git a/cnam.marc/thesis/topic/main.tex b/cnam.marc/thesis/subject/main.tex similarity index 100% rename from cnam.marc/thesis/topic/main.tex rename to cnam.marc/thesis/subject/main.tex From f4304f1b6257dc9b6c890a2aebafadbb31a25b90 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 26 May 2025 23:06:56 +0200 Subject: [PATCH 06/10] lf --- cnam.marc/thesis/subject/main.tex | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/cnam.marc/thesis/subject/main.tex b/cnam.marc/thesis/subject/main.tex index a354d47..369d615 100644 --- a/cnam.marc/thesis/subject/main.tex +++ b/cnam.marc/thesis/subject/main.tex @@ -51,9 +51,21 @@ bmargin=10mm,lmargin=15mm,rmargin=15mm,tmargin=10mm]{geometry} \begin{document} -CNAM / UAMM91 \hfill \ml{Master’s thesis}{Mémoire ingénieur} / \ml{Subject}{Sujet} \hfill IRSM ↔ CYC9104A +CNAM / UAMM91 +\hfill +\ml +{Master’s thesis / Subject} +{Mémoire ingénieur / Sujet} +\hfill +IRSM ↔ CYC9104A -Marc Beninca \hfill \textbf{\ml{Incremental Live Operating System}{Système d’exploitation autonome incrémental}} \hfill 2020 → 2021 +Marc Beninca +\hfill +\textbf{\ml +{Incremental Live Operating System} +{Système d’exploitation autonome incrémental}} +\hfill +2020 → 2021 \hr From d25575cbcbbf854028bb2038d1c7a50c8f3b9b8a Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 26 May 2025 23:10:29 +0200 Subject: [PATCH 07/10] fs --- cnam.marc/thesis/subject/main.tex | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cnam.marc/thesis/subject/main.tex b/cnam.marc/thesis/subject/main.tex index 369d615..717006e 100644 --- a/cnam.marc/thesis/subject/main.tex +++ b/cnam.marc/thesis/subject/main.tex @@ -79,7 +79,9 @@ updates, downtime, backups, testing, snapshots, restorations, configuration scri {En fonction des cas d’utilisation, maintenir des systèmes d’exploitation peut nécessiter de penser :\\ mises à jour, indisponibilité, sauvegardes, tests, instantanés, restaurations, scripts de configuration.} -\subsection{Systèmes de fichiers, installés sur partitions, avec accès en écriture} +\ml +{\subsection{File Systems, installed on partitions, with write access}} +{\subsection{Systèmes de fichiers, installés sur partitions, avec accès en écriture}} \subsubsection{Système de fichiers conventionnel : ext2, ext3, ext4, jfs, xfs} From d08a488edbff8273adffcaf557e139c1986601d4 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 26 May 2025 23:13:27 +0200 Subject: [PATCH 08/10] subject/rst --- cnam.marc/thesis/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cnam.marc/thesis/index.rst b/cnam.marc/thesis/index.rst index 86eeccd..07a2c5b 100644 --- a/cnam.marc/thesis/index.rst +++ b/cnam.marc/thesis/index.rst @@ -10,7 +10,7 @@ Mémoire | +---------------------------------------------+-------------------------------------------------+ | | :download:`Présentation ` | :download:`Présentation ` | +----------+---------------------------------------------+-------------------------------------------------+ -| | :download:`Topic ` | :download:`Topic ` | +| | :download:`Subject ` | :download:`Subject ` | | +---------------------------------------------+-------------------------------------------------+ | English | :download:`Thesis ` | :download:`Thesis ` | | +---------------------------------------------+-------------------------------------------------+ From 82f32728ee6c78be041949a0a2afa8bd6105cf43 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 26 May 2025 23:14:25 +0200 Subject: [PATCH 09/10] fs/conventional --- cnam.marc/thesis/subject/main.tex | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cnam.marc/thesis/subject/main.tex b/cnam.marc/thesis/subject/main.tex index 717006e..4f31256 100644 --- a/cnam.marc/thesis/subject/main.tex +++ b/cnam.marc/thesis/subject/main.tex @@ -83,7 +83,11 @@ mises à jour, indisponibilité, sauvegardes, tests, instantanés, restaurations {\subsection{File Systems, installed on partitions, with write access}} {\subsection{Systèmes de fichiers, installés sur partitions, avec accès en écriture}} -\subsubsection{Système de fichiers conventionnel : ext2, ext3, ext4, jfs, xfs} +\ml +{\subsubsection{Conventional File Systems: ext2, ext3, ext4, jfs, xfs}} +{\subsubsection{Système de fichiers conventionnel : ext2, ext3, ext4, jfs, xfs}} + +\hr \begin{itmz} \item{\textbf{avantages} : instantanéité de toutes les modifications apportées aux fichiers du système} From 0fee26372306aac7476116c17cb42229fd985dbd Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 26 May 2025 23:20:10 +0200 Subject: [PATCH 10/10] sep --- cnam.marc/thesis/subject/main.tex | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cnam.marc/thesis/subject/main.tex b/cnam.marc/thesis/subject/main.tex index 4f31256..18e5055 100644 --- a/cnam.marc/thesis/subject/main.tex +++ b/cnam.marc/thesis/subject/main.tex @@ -87,7 +87,9 @@ mises à jour, indisponibilité, sauvegardes, tests, instantanés, restaurations {\subsubsection{Conventional File Systems: ext2, ext3, ext4, jfs, xfs}} {\subsubsection{Système de fichiers conventionnel : ext2, ext3, ext4, jfs, xfs}} -\hr +\textbf{↑ Done\\ +\hr\\ +↓ ToDo: French → English} \begin{itmz} \item{\textbf{avantages} : instantanéité de toutes les modifications apportées aux fichiers du système}