Skip to content
Snippets Groups Projects
Commit 11b3bf12 authored by David Dorchies's avatar David Dorchies :zany_face:
Browse files

refactor(docs): factoring latex preamble into a single source 

Refs #656
parent abaf6009
No related branches found
No related tags found
2 merge requests!252release: version 4.18.0,!251Resolve "Documentation PDF: erreurs à la compilation"
Pipeline #163892 passed
Stage: install
    Stage: build
      Stage: clean-stale-branches
        Stage: deploy-dev
          This commit is part of merge request !251. Comments created here will be created in the context of that merge request.
          Hide whitespace changes
          Inline Side-by-side
          docs/latex/cassiopee_doc_en.tex
          + 3
          − 75
          View file @ 11b3bf12
          ......@@ -42,82 +42,10 @@
          \newcommand{\website}{\url{www.g-eau.fr}\\\url{www.inrae.fr}}
          % ******************* FOR PANDOC V2+ *************************
          \usepackage{fancyvrb}
          \newcommand{\VerbBar}{|}
          \newcommand{\VERB}{\Verb[commandchars=\\\{\}]}
          \DefineVerbatimEnvironment{Highlighting}{Verbatim}{commandchars=\\\{\}}
          % Add ',fontsize=\small' for more characters per line
          \newenvironment{Shaded}{}{}
          \newcommand{\AlertTok}[1]{\textcolor[rgb]{1.00,0.00,0.00}{\textbf{#1}}}
          \newcommand{\AnnotationTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textbf{\textit{#1}}}}
          \newcommand{\AttributeTok}[1]{\textcolor[rgb]{0.49,0.56,0.16}{#1}}
          \newcommand{\BaseNTok}[1]{\textcolor[rgb]{0.25,0.63,0.44}{#1}}
          \newcommand{\BuiltInTok}[1]{#1}
          \newcommand{\CharTok}[1]{\textcolor[rgb]{0.25,0.44,0.63}{#1}}
          \newcommand{\CommentTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textit{#1}}}
          \newcommand{\CommentVarTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textbf{\textit{#1}}}}
          \newcommand{\ConstantTok}[1]{\textcolor[rgb]{0.53,0.00,0.00}{#1}}
          \newcommand{\ControlFlowTok}[1]{\textcolor[rgb]{0.00,0.44,0.13}{\textbf{#1}}}
          \newcommand{\DataTypeTok}[1]{\textcolor[rgb]{0.56,0.13,0.00}{#1}}
          \newcommand{\DecValTok}[1]{\textcolor[rgb]{0.25,0.63,0.44}{#1}}
          \newcommand{\DocumentationTok}[1]{\textcolor[rgb]{0.73,0.13,0.13}{\textit{#1}}}
          \newcommand{\ErrorTok}[1]{\textcolor[rgb]{1.00,0.00,0.00}{\textbf{#1}}}
          \newcommand{\ExtensionTok}[1]{#1}
          \newcommand{\FloatTok}[1]{\textcolor[rgb]{0.25,0.63,0.44}{#1}}
          \newcommand{\FunctionTok}[1]{\textcolor[rgb]{0.02,0.16,0.49}{#1}}
          \newcommand{\ImportTok}[1]{#1}
          \newcommand{\InformationTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textbf{\textit{#1}}}}
          \newcommand{\KeywordTok}[1]{\textcolor[rgb]{0.00,0.44,0.13}{\textbf{#1}}}
          \newcommand{\NormalTok}[1]{#1}
          \newcommand{\OperatorTok}[1]{\textcolor[rgb]{0.40,0.40,0.40}{#1}}
          \newcommand{\OtherTok}[1]{\textcolor[rgb]{0.00,0.44,0.13}{#1}}
          \newcommand{\PreprocessorTok}[1]{\textcolor[rgb]{0.74,0.48,0.00}{#1}}
          \newcommand{\RegionMarkerTok}[1]{#1}
          \newcommand{\SpecialCharTok}[1]{\textcolor[rgb]{0.25,0.44,0.63}{#1}}
          \newcommand{\SpecialStringTok}[1]{\textcolor[rgb]{0.73,0.40,0.53}{#1}}
          \newcommand{\StringTok}[1]{\textcolor[rgb]{0.25,0.44,0.63}{#1}}
          \newcommand{\VariableTok}[1]{\textcolor[rgb]{0.10,0.09,0.49}{#1}}
          \newcommand{\VerbatimStringTok}[1]{\textcolor[rgb]{0.25,0.44,0.63}{#1}}
          \newcommand{\WarningTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textbf{\textit{#1}}}}
          % https://github.com/jgm/pandoc-templates/blob/bc7a16b590122a2dc99d1f17f222b72152acc1e7/default.latex#L310
          \providecommand{\tightlist}{\setlength{\itemsep}{0pt}\setlength{\parskip}{0pt}}
          %*******************************************************************************
          % degree also in math mode https://tex.stackexchange.com/a/84471
          \usepackage{gensymb}
          \DeclareUnicodeCharacter{00B0}{\degree}
          % Other unicode characters
          \usepackage{newunicodechar}
          \newunicodechar{α}{\ensuremath{\alpha}}
          \newunicodechar{α}{\ensuremath{\alpha}}
          \newunicodechar{β}{\ensuremath{\beta}}
          \newunicodechar{μ}{\ensuremath{\mu}}
          \newunicodechar{Δ}{\ensuremath{\Delta}}
          \newunicodechar{☰}{\ensuremath{\equiv}}
          \newunicodechar{≈}{\ensuremath{\approx}}
          \newunicodechar{ϵ}{\ensuremath{\in}}
          \newunicodechar{↵}{\ensuremath{\hookleftarrow}}
          \newunicodechar{≤}{\ensuremath{\leq}}
          \begin{document}
          %Supprime les veuves et orphelines
          \widowpenalty=10000
          \clubpenalty=10000
          \raggedbottom
          % Integre la page de garde
          %\input{title.tex}
          \input{rapport_inrae/cover_inrae}
          \input{rapport/headfoot_content}
          \cleardoublepage
          % Table des matières
          \cleardoublepage
          \tableofcontents
          % Preamble common for all languages
          %*******************************************************************************
          \input{cassiopee_preamble.tex}
          %*******************************************************************************
          ......
          docs/latex/cassiopee_doc_fr.tex
          + 3
          − 59
          View file @ 11b3bf12
          ......@@ -42,66 +42,10 @@
          \newcommand{\website}{\url{www.g-eau.fr}\\\url{www.inrae.fr}}
          % ******************* FOR PANDOC V2+ *************************
          \usepackage{fancyvrb}
          \newcommand{\VerbBar}{|}
          \newcommand{\VERB}{\Verb[commandchars=\\\{\}]}
          \DefineVerbatimEnvironment{Highlighting}{Verbatim}{commandchars=\\\{\}}
          % Add ',fontsize=\small' for more characters per line
          \newenvironment{Shaded}{}{}
          \newcommand{\AlertTok}[1]{\textcolor[rgb]{1.00,0.00,0.00}{\textbf{#1}}}
          \newcommand{\AnnotationTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textbf{\textit{#1}}}}
          \newcommand{\AttributeTok}[1]{\textcolor[rgb]{0.49,0.56,0.16}{#1}}
          \newcommand{\BaseNTok}[1]{\textcolor[rgb]{0.25,0.63,0.44}{#1}}
          \newcommand{\BuiltInTok}[1]{#1}
          \newcommand{\CharTok}[1]{\textcolor[rgb]{0.25,0.44,0.63}{#1}}
          \newcommand{\CommentTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textit{#1}}}
          \newcommand{\CommentVarTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textbf{\textit{#1}}}}
          \newcommand{\ConstantTok}[1]{\textcolor[rgb]{0.53,0.00,0.00}{#1}}
          \newcommand{\ControlFlowTok}[1]{\textcolor[rgb]{0.00,0.44,0.13}{\textbf{#1}}}
          \newcommand{\DataTypeTok}[1]{\textcolor[rgb]{0.56,0.13,0.00}{#1}}
          \newcommand{\DecValTok}[1]{\textcolor[rgb]{0.25,0.63,0.44}{#1}}
          \newcommand{\DocumentationTok}[1]{\textcolor[rgb]{0.73,0.13,0.13}{\textit{#1}}}
          \newcommand{\ErrorTok}[1]{\textcolor[rgb]{1.00,0.00,0.00}{\textbf{#1}}}
          \newcommand{\ExtensionTok}[1]{#1}
          \newcommand{\FloatTok}[1]{\textcolor[rgb]{0.25,0.63,0.44}{#1}}
          \newcommand{\FunctionTok}[1]{\textcolor[rgb]{0.02,0.16,0.49}{#1}}
          \newcommand{\ImportTok}[1]{#1}
          \newcommand{\InformationTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textbf{\textit{#1}}}}
          \newcommand{\KeywordTok}[1]{\textcolor[rgb]{0.00,0.44,0.13}{\textbf{#1}}}
          \newcommand{\NormalTok}[1]{#1}
          \newcommand{\OperatorTok}[1]{\textcolor[rgb]{0.40,0.40,0.40}{#1}}
          \newcommand{\OtherTok}[1]{\textcolor[rgb]{0.00,0.44,0.13}{#1}}
          \newcommand{\PreprocessorTok}[1]{\textcolor[rgb]{0.74,0.48,0.00}{#1}}
          \newcommand{\RegionMarkerTok}[1]{#1}
          \newcommand{\SpecialCharTok}[1]{\textcolor[rgb]{0.25,0.44,0.63}{#1}}
          \newcommand{\SpecialStringTok}[1]{\textcolor[rgb]{0.73,0.40,0.53}{#1}}
          \newcommand{\StringTok}[1]{\textcolor[rgb]{0.25,0.44,0.63}{#1}}
          \newcommand{\VariableTok}[1]{\textcolor[rgb]{0.10,0.09,0.49}{#1}}
          \newcommand{\VerbatimStringTok}[1]{\textcolor[rgb]{0.25,0.44,0.63}{#1}}
          \newcommand{\WarningTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textbf{\textit{#1}}}}
          % https://github.com/jgm/pandoc-templates/blob/bc7a16b590122a2dc99d1f17f222b72152acc1e7/default.latex#L310
          \providecommand{\tightlist}{\setlength{\itemsep}{0pt}\setlength{\parskip}{0pt}}
          %*******************************************************************************
          \begin{document}
          %Supprime les veuves et orphelines
          \widowpenalty=10000
          \clubpenalty=10000
          \raggedbottom
          % Integre la page de garde
          %\input{title.tex}
          \input{rapport_inrae/cover_inrae}
          \input{rapport/headfoot_content}
          \cleardoublepage
          % Table des matières
          \cleardoublepage
          \tableofcontents
          % Preamble common for all languages
          %*******************************************************************************
          \input{cassiopee_preamble.tex}
          %*******************************************************************************
          ......
          docs/latex/cassiopee_preamble.tex 0 → 100644
          + 76
          − 0
          View file @ 11b3bf12
          % ******************* FOR PANDOC V2+ *************************
          \usepackage{fancyvrb}
          \newcommand{\VerbBar}{|}
          \newcommand{\VERB}{\Verb[commandchars=\\\{\}]}
          \DefineVerbatimEnvironment{Highlighting}{Verbatim}{commandchars=\\\{\}}
          % Add ',fontsize=\small' for more characters per line
          \newenvironment{Shaded}{}{}
          \newcommand{\AlertTok}[1]{\textcolor[rgb]{1.00,0.00,0.00}{\textbf{#1}}}
          \newcommand{\AnnotationTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textbf{\textit{#1}}}}
          \newcommand{\AttributeTok}[1]{\textcolor[rgb]{0.49,0.56,0.16}{#1}}
          \newcommand{\BaseNTok}[1]{\textcolor[rgb]{0.25,0.63,0.44}{#1}}
          \newcommand{\BuiltInTok}[1]{#1}
          \newcommand{\CharTok}[1]{\textcolor[rgb]{0.25,0.44,0.63}{#1}}
          \newcommand{\CommentTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textit{#1}}}
          \newcommand{\CommentVarTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textbf{\textit{#1}}}}
          \newcommand{\ConstantTok}[1]{\textcolor[rgb]{0.53,0.00,0.00}{#1}}
          \newcommand{\ControlFlowTok}[1]{\textcolor[rgb]{0.00,0.44,0.13}{\textbf{#1}}}
          \newcommand{\DataTypeTok}[1]{\textcolor[rgb]{0.56,0.13,0.00}{#1}}
          \newcommand{\DecValTok}[1]{\textcolor[rgb]{0.25,0.63,0.44}{#1}}
          \newcommand{\DocumentationTok}[1]{\textcolor[rgb]{0.73,0.13,0.13}{\textit{#1}}}
          \newcommand{\ErrorTok}[1]{\textcolor[rgb]{1.00,0.00,0.00}{\textbf{#1}}}
          \newcommand{\ExtensionTok}[1]{#1}
          \newcommand{\FloatTok}[1]{\textcolor[rgb]{0.25,0.63,0.44}{#1}}
          \newcommand{\FunctionTok}[1]{\textcolor[rgb]{0.02,0.16,0.49}{#1}}
          \newcommand{\ImportTok}[1]{#1}
          \newcommand{\InformationTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textbf{\textit{#1}}}}
          \newcommand{\KeywordTok}[1]{\textcolor[rgb]{0.00,0.44,0.13}{\textbf{#1}}}
          \newcommand{\NormalTok}[1]{#1}
          \newcommand{\OperatorTok}[1]{\textcolor[rgb]{0.40,0.40,0.40}{#1}}
          \newcommand{\OtherTok}[1]{\textcolor[rgb]{0.00,0.44,0.13}{#1}}
          \newcommand{\PreprocessorTok}[1]{\textcolor[rgb]{0.74,0.48,0.00}{#1}}
          \newcommand{\RegionMarkerTok}[1]{#1}
          \newcommand{\SpecialCharTok}[1]{\textcolor[rgb]{0.25,0.44,0.63}{#1}}
          \newcommand{\SpecialStringTok}[1]{\textcolor[rgb]{0.73,0.40,0.53}{#1}}
          \newcommand{\StringTok}[1]{\textcolor[rgb]{0.25,0.44,0.63}{#1}}
          \newcommand{\VariableTok}[1]{\textcolor[rgb]{0.10,0.09,0.49}{#1}}
          \newcommand{\VerbatimStringTok}[1]{\textcolor[rgb]{0.25,0.44,0.63}{#1}}
          \newcommand{\WarningTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textbf{\textit{#1}}}}
          % https://github.com/jgm/pandoc-templates/blob/bc7a16b590122a2dc99d1f17f222b72152acc1e7/default.latex#L310
          \providecommand{\tightlist}{\setlength{\itemsep}{0pt}\setlength{\parskip}{0pt}}
          %*******************************************************************************
          % degree also in math mode https://tex.stackexchange.com/a/84471
          \usepackage{gensymb}
          \DeclareUnicodeCharacter{00B0}{\degree}
          % Other unicode characters
          \usepackage{newunicodechar}
          \newunicodechar{α}{\ensuremath{\alpha}}
          \newunicodechar{α}{\ensuremath{\alpha}}
          \newunicodechar{β}{\ensuremath{\beta}}
          \newunicodechar{μ}{\ensuremath{\mu}}
          \newunicodechar{Δ}{\ensuremath{\Delta}}
          \newunicodechar{☰}{\ensuremath{\equiv}}
          \newunicodechar{≈}{\ensuremath{\approx}}
          \newunicodechar{ϵ}{\ensuremath{\in}}
          \newunicodechar{↵}{\ensuremath{\hookleftarrow}}
          \newunicodechar{≤}{\ensuremath{\leq}}
          \begin{document}
          %Supprime les veuves et orphelines
          \widowpenalty=10000
          \clubpenalty=10000
          \raggedbottom
          % Integre la page de garde
          %\input{title.tex}
          \input{rapport_inrae/cover_inrae}
          \input{rapport/headfoot_content}
          \cleardoublepage
          % Table des matières
          \cleardoublepage
          \tableofcontents
          scripts/mkdocs2pdf.py
          + 2
          − 3
          View file @ 11b3bf12
          ......@@ -174,9 +174,8 @@ def injectContentIntoModel(mergedDocFilenameTex, lang):
          os.chdir(modelDir)
          relPathToMergedTexDoc = os.path.join('..', mergedDocFilenameTex)
          createLink(relPathToMergedTexDoc)
          latexTemplate = filenamePrefix + lang + '.tex'
          relPathToLatexTemplate = os.path.join(latexSourceDir, latexTemplate)
          createLink(relPathToLatexTemplate)
          createLink(os.path.join(latexSourceDir, filenamePrefix + lang + '.tex'))
          createLink(os.path.join(latexSourceDir, "cassiopee_preamble.tex"))
          createLink(os.path.join(latexSourceDir, 'logo_pole.png'))
          createLink('{}/schema_rugosite_fond.png'.format(os.path.join(baseDir, 'docs', lang, 'calculators', 'pam')))
          createLink('{}/bloc_cylindre.png'.format(os.path.join(baseDir, 'docs', lang, 'calculators', 'pam')))
          ......
          0% or .
          You are about to add 0 people to the discussion. Proceed with caution.
          Finish editing this message first!
          Please register or to comment