New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 12377 for NEMO/trunk/doc/latex/global – NEMO

Ignore:
Timestamp:
2020-02-12T15:39:06+01:00 (4 years ago)
Author:
acc
Message:

The big one. Merging all 2019 developments from the option 1 branch back onto the trunk.

This changeset reproduces 2019/dev_r11943_MERGE_2019 on the trunk using a 2-URL merge
onto a working copy of the trunk. I.e.:

svn merge --ignore-ancestry \

svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/NEMO/trunk \
svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/NEMO/branches/2019/dev_r11943_MERGE_2019 ./

The --ignore-ancestry flag avoids problems that may otherwise arise from the fact that
the merge history been trunk and branch may have been applied in a different order but
care has been taken before this step to ensure that all applicable fixes and updates
are present in the merge branch.

The trunk state just before this step has been branched to releases/release-4.0-HEAD
and that branch has been immediately tagged as releases/release-4.0.2. Any fixes
or additions in response to tickets on 4.0, 4.0.1 or 4.0.2 should be done on
releases/release-4.0-HEAD. From now on future 'point' releases (e.g. 4.0.2) will
remain unchanged with periodic releases as needs demand. Note release-4.0-HEAD is a
transitional naming convention. Future full releases, say 4.2, will have a release-4.2
branch which fulfills this role and the first point release (e.g. 4.2.0) will be made
immediately following the release branch creation.

2020 developments can be started from any trunk revision later than this one.

Location:
NEMO/trunk
Files:
6 deleted
10 edited
3 copied

Legend:

Unmodified
Added
Removed
  • NEMO/trunk

    • Property svn:externals
      •  

        old new  
        33^/utils/build/mk@HEAD         mk 
        44^/utils/tools@HEAD            tools 
        5 ^/vendors/AGRIF/dev@HEAD      ext/AGRIF 
         5^/vendors/AGRIF/dev_r11615_ENHANCE-04_namelists_as_internalfiles_agrif@HEAD      ext/AGRIF 
        66^/vendors/FCM@HEAD            ext/FCM 
        77^/vendors/IOIPSL@HEAD         ext/IOIPSL 
  • NEMO/trunk/doc/latex/global

    • Property svn:ignore set to
      *.aux
  • NEMO/trunk/doc/latex/global/document.tex

    r11693 r12377  
    11 
    2 %% ================================================================================================= 
    3 %% Template structure for reference manuals 
    4 %% ================================================================================================= 
     2%% ============================================================================== 
     3%% Template structure for reference manual 
     4%% ============================================================================== 
    55 
    66%% NEMO release version 
    7 \def \version{trunk} 
     7\def \version{4.0rc~} 
    88 
    99%% Preamble 
    10 %% ================================================================================================= 
     10%% ============================================================================== 
    1111 
    1212%% Document layout 
    13 \documentclass[fontsize = 10pt, twoside, abstract]{scrreprt} 
     13\documentclass[draft]{scrreprt} 
    1414 
    15 %% Load manual configuration 
    16 \input{../../global/prologue} 
     15%% Load the configuration of the manual 
     16\input{../main/definitions} 
     17 
     18%% Load global *.tex files 
     19\input{../../global/preamble} 
     20 
     21\dominitoc 
     22 
     23%% Launch the creation of the indexes 
     24\input{../../global/indexes} 
     25 
    1726 
    1827%% End of common preamble between main and sub-files 
    1928%% Override custom cmds for full manual compilation 
    20 \newcommand{\subinc}[1]{#1} 
    21 \newcommand{\subexc}[1]{} 
     29\newcommand{\onlyinsubfile}[1]{#1} 
     30\newcommand{\notinsubfile}[1]{} 
    2231 
    2332\begin{document} 
    2433 
    25 \renewcommand{\subinc}[1]{} 
    26 \renewcommand{\subexc}[1]{#1} 
     34\renewcommand{\onlyinsubfile}[1]{} 
     35\renewcommand{\notinsubfile}[1]{#1} 
     36 
     37\renewcommand{\biblio}{} 
     38\renewcommand{\pindex}{} 
    2739 
    2840 
    2941%% Frontmatter 
    30 %% ================================================================================================= 
     42%% ============================================================================== 
    3143 
    32 \pagenumbering{gobble}   %% Disable page numbering temporarily 
     44\pagenumbering{gobble} 
    3345 
    3446%% Title page 
    3547\input{../../global/frontpage} 
    3648 
    37 %% Footer for introductory parts (no header by cleaning default) 
    38 \ofoot[]{\engine\ Reference Manual} \ifoot[]{\pagemark} 
     49\maketitle 
     50\emptythanks 
    3951 
    4052%% Information page (2nd page) 
    4153\input{../../global/info_page} 
    4254 
    43 \listoffigures 
    44 \listoflistings 
    45 \listoftables 
    46  
    47 \clearpage 
    48  
     55%% Foreword 
     56%\frontmatter   %% Chapter numbering off and Roman numerals for page numbers 
    4957\pagenumbering{roman} 
    50 \ofoot[]{\engine\ Reference Manual} \ifoot[]{\pagemark} 
    51  
    52 \input{introduction} 
     58\input{foreword} 
    5359 
    5460%% Table of Contents 
    5561\tableofcontents 
     62\listoffigures 
     63\listoftables 
     64\listoflistings 
    5665 
    5766\clearpage 
     67%\end{document} 
    5868 
    5969 
    6070%% Mainmatter 
    61 %% ================================================================================================= 
     71%% ============================================================================== 
    6272 
    63 %% Headings for document body 
     73%\mainmatter   %% Chapter numbering on, page numbering is reset with Arabic numerals 
    6474\pagenumbering{arabic} 
    65 \lohead{Chap.\ \thechapter\ \leftmark} \rehead{Sect.\ \thesection\ \rightmark} 
    66 \ifoot[]{Page\ \pagemark\ of \pageref*{LastPage}} 
    6775 
    6876\include{chapters} 
     
    7078 
    7179%% Appendix 
    72 %% ================================================================================================= 
     80%% ============================================================================== 
    7381 
    74 \appendix   %% Chapter numbering with letters by now 
    75 \lohead{Apdx\ \thechapter\ \leftmark} 
     82%% Chapter numbering is reset with letters now 
     83\appendix    
     84 
    7685\include{appendices} 
    77  
    78 %% Append coding rules for every manual 
    79 \input{../../global/coding_rules} 
    8086 
    8187 
    8288%% Backmatter 
    83 %% ================================================================================================= 
     89%% ============================================================================== 
    8490 
    85 %% Bibliography and indexes 
    86 \input{../../global/epilogue} 
     91%\backmatter   %% Chapter numbering off 
     92 
     93%% Bibliography 
     94\phantomsection 
     95\addcontentsline{toc}{chapter}{Bibliography} 
     96\bibliography{../main/bibliography} 
     97 
     98%% Index 
     99\clearpage 
     100\phantomsection 
     101\addcontentsline{toc}{chapter}{Indexes} 
     102\printindex[keys] 
     103\printindex[modules] 
     104\printindex[blocks] 
     105\printindex[parameters] 
     106\printindex[subroutines] 
    87107 
    88108\end{document} 
     109 
  • NEMO/trunk/doc/latex/global/frontpage.tex

    r11688 r12377  
    11 
    2 \begin{titlepage} 
    3 %  \newgeometry{hmargin = 1.5cm, vmargin = 3cm} 
    4   \setlength{\parindent}{0pt} 
     2\title{\heading} 
     3\author{\firstauthor \and \secondauthor\thanks{\protect\input{thanks}}} 
     4\date{\today} 
    55 
     6\pretitle{ 
    67  \begin{center} 
    7     \begin{minipage}{0.3\textwidth} 
    8       \includegraphics[height=1.5cm]{logos/NEMO_grey} 
    9     \end{minipage}\begin{minipage}{0.6\textwidth} 
    10       \begin{center} 
    11       \Large\slshape 
    12       \textbf{N}ucleus for \textbf{E}uropean \textbf{M}odelling of the \textbf{O}cean \\ 
    13       \medskip 
    14       \hyperref[resources]{\textcolor{black}{ 
    15           \faWordpress \hspace{0.75cm} \faCodeFork      \hspace{0.75cm} 
    16           \faGithub    \hspace{0.75cm} \faCloudDownload \hspace{0.75cm} \faEnvelope 
    17         } 
    18       } 
    19       \end{center} 
    20     \end{minipage} 
     8\begin{figure}[H] 
     9  \begin{minipage}[c]{0.35\textwidth} 
     10    \href{http://www.nemo-ocean.eu}{\includegraphics[width=0.7\textwidth]{logos/NEMO_grey}} 
     11  \end{minipage} 
     12  \hfill 
     13  \begin{minipage}[c]{0.65\textwidth} 
     14    \centering 
     15    \large{\em{{N}ucleus for {E}uropean {M}odelling of the {O}cean}} 
     16  \end{minipage} 
     17\end{figure} 
     18\vfill 
     19    \Huge 
     20} 
     21\posttitle{\par\end{center}\vskip 0.5em} 
     22\preauthor{\begin{center}\Large\lineskip0.5em\begin{tabular}[t]{c}} 
     23\postauthor{\end{tabular}\par\end{center}} 
     24\predate{ 
     25  \vfill 
     26  \begin{center} 
     27    \large Version \version --- 
     28} 
     29\postdate{ 
     30    \par~\\ 
     31    \href{http://doi.org/10.5281/zenodo.\zid}{\includegraphics{{badges/zenodo.\zid}.pdf}} 
    2132  \end{center} 
     33  \vfill 
     34  \begin{center} 
     35    \href{http://www.cmcc.it}{          \includegraphics[height=0.055\textheight]{logos/CMCC}} 
     36    \hspace{0.5em} 
     37    \href{http://www.cnrs.fr}{          \includegraphics[height=0.055\textheight]{logos/CNRS}} 
     38    \hspace{0.9em} 
     39    \href{http://www.mercator-ocean.fr}{\includegraphics[height=0.055\textheight]{logos/MOI} } 
     40    \hspace{0.45em} 
     41    \href{http://www.metoffice.gov.uk}{ \includegraphics[height=0.055\textheight]{logos/UKMO}} 
     42    \hspace{0.5em} 
     43    \href{http://nerc.ukri.org}{        \includegraphics[height=0.055\textheight]{logos/NERC}} \\ 
     44    \large{{\em{C}ommunity \hspace{1.5em} {O}cean \hspace{1.5em} {M}odel}} 
     45  \end{center} 
     46} 
    2247 
    23   \spacetop 
    24   \textcolor{white}{\fontsize{0.8cm}{0.8cm}\selectfont\textbf{\heading}} 
    25   \ifdef{\subheading}{ 
    26     \medskip 
    27     \par 
    28     \textcolor{white}{\Huge \subheading} 
    29   }{} 
    30   \spacedown 
     48\thanksmarkseries{fnsymbol} 
    3149 
    32   \begin{center} 
    33     \LARGE Version \version\ -\ \today \\ 
    34     \medskip 
    35     \href{http://doi.org/10.5281/zenodo.\zid}{ \includegraphics{badges/zenodo.\zid} } 
    36   \end{center} 
    37  
    38   \vfill 
    39  
    40   \begin{minipage}{\authorswidth} 
    41     \raggedleft 
    42     \input{authors} 
    43   \end{minipage}\hspace{15pt}\begin{minipage}{0.02\linewidth} 
    44     \rule{1pt}{\rulelenght} 
    45   \end{minipage}\hspace{ 5pt}\begin{minipage}{\abstractwidth} 
    46     \begin{abstract} 
    47       \input{abstract} 
    48     \end{abstract} 
    49   \end{minipage} 
    50  
    51   \vfill 
    52  
    53   \begin{center} 
    54     \Large 
    55     \href{http://www.cmcc.it          }{ \includegraphics[height=1cm]{logos/CMCC} } \hspace{0.25cm} 
    56     \href{http://www.cnrs.fr          }{ \includegraphics[height=1cm]{logos/CNRS} } \hspace{0.25cm} 
    57     \href{http://www.mercator-ocean.fr}{ \includegraphics[height=1cm]{logos/MOI}  } \hspace{0.25cm} 
    58     \href{http://www.metoffice.gov.uk }{ \includegraphics[height=1cm]{logos/UKMO} } \hspace{0.25cm} 
    59     \href{http://nerc.ukri.org        }{ \includegraphics[height=1cm]{logos/NERC} } \\ 
    60     \medskip 
    61     \slshape 
    62     {C}ommunity \hspace{1.5em} {O}cean \hspace{1.5em} {M}odel \\ 
    63   \end{center} 
    64  
    65 \end{titlepage} 
    66  
    67 \restoregeometry 
  • NEMO/trunk/doc/latex/global/highlighting.tex

    r11572 r12377  
    22%% ============================================================================== 
    33 
    4 \usepackage[outputdir=../build, chapter, newfloat]{minted} 
     4\usepackage[outputdir=../build]{minted} 
    55 
    66%% Global highlighting style 
    77\definecolor{bg}{HTML}{f8f8f8} 
    88\usemintedstyle{emacs} 
    9 \setminted{bgcolor=bg, fontsize=\scriptsize, breaklines} 
     9\setminted{bgcolor=bg, fontsize=\scriptsize, breaklines, frame=leftline} 
    1010\setminted[xml]{style=borland} %% Specific per language 
    1111 
     
    2222 
    2323%% File 
    24 \newmintedfile[forfile]{fortran}{} 
     24\newmintedfile[forfile]{fortran}{}   % \forfile{../namelists/nam...} 
    2525 
    2626%% Inline 
    27 \newmintinline[forcode]{fortran}{bgcolor=, fontsize=auto}   % \forcode{...} 
    28 \newmintinline[xmlcode]{xml}{    bgcolor=, fontsize=auto}   % \xmlcode{...} 
    29 \newmintinline[snippet]{console}{bgcolor=, fontsize=auto}   % \snippet{...} 
     27\newmintinline[forcode]{fortran}{fontsize=auto, frame=lines}   % \forcode{...} 
     28\newmintinline[xmlcode]{xml}{    fontsize=auto, frame=lines}   % \xmlcode{...} 
     29\newmintinline[snippet]{console}{fontsize=auto, frame=lines}   % \snippet{...} 
    3030 
    3131%% Namelists inclusion 
    3232\newcommand{\nlst}[1]{\forfile{../../../namelists/#1}} 
     33 
  • NEMO/trunk/doc/latex/global/index.ist

    r11584 r12377  
    11headings_flag 1 
    2 heading_prefix "\\medskip\\hfill\\textnormal{" 
    3 heading_suffix "}\\hfill\\smallskip\n" 
     2heading_prefix "{\\medskip\\hfill\\large\\textsf{\\textbf{" 
     3heading_suffix "}}\\hfill}\\medskip\\nopagebreak\n" 
     4 
    45delim_0 "\\dotfill~" 
     6delim_1 "\\dotfill~" 
     7delim_2 "\\dotfill~" 
     8 
  • NEMO/trunk/doc/latex/global/info_page.tex

    r11515 r12377  
    22\thispagestyle{plain} 
    33 
    4 %% ================================================================ 
    5 %% Disclaimer 
    6 %% ================================================================ 
     4% ================================================================ 
     5% Disclaimer 
     6% ================================================================ 
    77\subsubsection*{Disclaimer} 
    88 
    99Like all components of the modelling framework, 
    10 the \engine\ core engine is developed under the \href{http://www.cecill.info}{CECILL license}, 
    11 which is a French adaptation of the GNU GPL (\textbf{G}eneral \textbf{P}ublic \textbf{L}icense). 
     10the \engine~core engine is developed under the \href{http://www.cecill.info}{CECILL license}, 
     11which is a French adaptation of the GNU GPL (General Public License). 
    1212Anyone may use it freely for research purposes, and is encouraged to 
    13 communicate back to the development team its own developments and improvements. 
     13communicate back to the NEMO team its own developments and improvements. 
    1414 
    1515The model and the present document have been made available as a service to the community. 
     
    1818Users are encouraged to bring them to our attention. 
    1919 
    20 The authors assume no responsibility for problems, errors, or incorrect usage of \NEMO. 
     20The authors assume no responsibility for problems, errors, or incorrect usage of NEMO. 
    2121 
    22 %% ================================================================ 
    23 %% External resources 
    24 %% ================================================================ 
     22% ================================================================ 
     23% External resources 
     24% ================================================================ 
    2525\subsubsection*{Other resources} 
    26 \label{resources} 
    2726 
    2827Additional information can be found on: 
    2928\begin{itemize} 
    30 \item \faWordpress\ the \href{http://www.nemo-ocean.eu}{website} of the project detailing several 
     29\item the \href{http://www.nemo-ocean.eu}{website} of the project detailing several 
    3130  associated applications and an exhaustive users bibliography 
    32 \item \faCodeFork\ the \href{http://forge.ipsl.jussieu.fr/nemo}{development platform} of 
    33   the model with the code repository for the shared reference and some main resources 
    34   (wiki, ticket system, forums, \ldots) \\ 
    35   \faGithub\ the \href{http://github.com/NEMO-ocean/NEMO-examples} 
    36   {repository of the demonstration cases} for research or training 
    37 \item \faCloudDownload\ the \href{http://zenodo.org/communities/nemo-ocean}{online archive} 
    38   delivering the publications issued by the consortium (manuals, reports, datasets, \ldots) 
    39 \item \faEnvelope\ two mailing lists: 
     31\item the \href{http://forge.ipsl.jussieu.fr/nemo}{development platform} of the model with 
     32  the code repository and some main resources (wiki, ticket system, forums, \ldots) 
     33\item the \href{http://zenodo.org/communities/nemo-ocean}{online archive} 
     34  delivering the publications issued by the consortium 
     35\item two mailing lists: 
    4036  the \href{http://listes.ipsl.fr/sympa/info/nemo-newsletter}{newsletter} for 
    4137  top-down communications from the project 
     
    4541\end{itemize} 
    4642 
    47 %% ================================================================ 
    48 %% Citation 
    49 %% ================================================================ 
     43% ================================================================ 
     44% Citation 
     45% ================================================================ 
    5046\subsubsection*{Citation} 
    5147 
    5248Reference for papers and other publications is as follows: 
    5349 
    54 \medskip 
     50\vspace{0.5cm} 
    5551 
    56 \begin{sloppypar} 
    57   ``{\bfseries \heading}\ifdef{\subheading}{ -- \subheading}{}'', 
    58   {\em Scientific Notes of Climate Modelling Center}, \textbf{\ipslnum} --- ISSN 1288-1619, 
    59   Institut Pierre-Simon Laplace (IPSL), 
    60   \href{https://doi.org/10.5281/zenodo.\zid}{doi:10.5281/zenodo.\zid} 
    61 \end{sloppypar} 
     52%% \sloppy: workaround for breaking DOI URL 
     53\sloppy 
     54``{\bfseries \heading}'',  
     55\firstauthor and \secondauthor,  
     56{\em Scientific Notes of Climate Modelling Center}, \textbf{\ipslnum} --- ISSN 1288-1619,  
     57Institut Pierre-Simon Laplace (IPSL),  
     58\href{https://doi.org/10.5281/zenodo.\zid}{doi:10.5281/zenodo.\zid} 
    6259 
    6360\begin{figure}[b] 
    64   \begin{minipage}[c]{0.7\textwidth} 
    65     \small 
    66     \ttfamily{ 
    67       Scientific Notes of Climate Modelling Center \\ 
    68       ISSN 1288-1619                               \\ 
     61  \begin{minipage}[c]{0.72\textwidth} 
     62    \small\ttfamily{Scientific Notes of Climate Modelling Center \\ 
     63      ISSN 1288-1619                                             \\ 
    6964      Institut Pierre-Simon Laplace (IPSL) 
    7065    } 
     
    7570  \end{minipage} 
    7671\end{figure} 
     72 
  • NEMO/trunk/doc/latex/global/new_cmds.tex

    r11693 r12377  
    22%% ============================================================================== 
    33 
    4 %% Same slanted font for NEMO and its core engines 
    5 \newcommand{\NEMO  }{\textsl{NEMO}} 
    6 \newcommand{\OPA   }{\textsl{OPA}} 
    7 \newcommand{\SIcube}{\textsl{SI$^3$}} 
    8 \newcommand{\TOP   }{\textsl{TOP}} 
    9 \newcommand{\PISCES}{\textsl{PISCES}} 
    10 \newcommand{\NEMOVAR}{\textsl{NEMOVAR}} 
     4%% Include references and index for compilation of single subfile  
     5\newcommand{\mtoc}{\minitoc} 
     6\newcommand{\biblio}{\bibliography{../main/bibliography}} 
     7\newcommand{\pindex}{\printindex} 
    118 
    12 %% Links for external components 
    13 \newcommand{\AGRIF}{\href{http://agrif.imag.fr}{AGRIF}} 
    14 \newcommand{\CICE }{\href{http://github.com/CICE-Consortium/CICE}{CICE}} 
    15 \newcommand{\OASIS}{\href{http://portal.enes.org/oasis}{OASIS}} 
    16 \newcommand{\XIOS }{\href{http://forge.ipsl.jussieu.fr/ioserver}{XIOS}} 
    17  
    18 %% Fortran in small capitals 
    19 \newcommand{\fortran}{\textsc{Fortran}} 
    20 \newcommand{\fninety}{\textsc{Fortran 90}} 
     9%% NEMO and Fortran in small capitals 
     10\newcommand{\NEMO}{\textsc{nemo}~} 
     11\newcommand{\fortran}{\textsc{Fortran}~} 
     12\newcommand{\fninety}{\textsc{Fortran 90}~} 
    2113 
    2214%% Common aliases 
     
    2618\newcommand{\ztilde}{\ensuremath{\tilde z}} 
    2719\newcommand{\stilde}{\ensuremath{\tilde s}} 
    28 \newcommand{\ie}{\ensuremath{i.e.}} 
    29 \newcommand{\eg}{\ensuremath{e.g.}} 
     20\newcommand{\ie}{\ensuremath{i.e.}~} 
     21\newcommand{\eg}{\ensuremath{e.g.}~} 
    3022 
    3123%% Inline maths 
     
    3325\newcommand{\rdt}{\Delta t} 
    3426 
    35 %% Gurvan's comments 
    36 \newcommand{\cmtgm}[1]{} 
     27%% Text env. for Gurvan 
     28\newcommand{\gmcomment}[1]{} 
    3729 
    3830%% Maths 
    3931\newcommand{\lt}{\left} 
    4032\newcommand{\rt}{\right} 
    41 \newcommand{\vect}[1]{\ensuremath{ \mathbf{#1} }} 
     33\newcommand{\vect}[1]{\ensuremath{\mathbf{#1}}} 
    4234\newcommand{\pd}[2][]{\ensuremath{\frac{\partial #1}{\partial #2}}} 
    4335 
    44 %% Convert chapter/section headings to lowercase 
    45 \renewcommand{\chaptermark}[1]{\markboth{#1}{}} 
    46 \renewcommand{\sectionmark}[1]{\markright{#1}{}} 
    47  
    48 %% Retrieve month name 
    49 \renewcommand{\today}{ 
    50   \ifcase \month\or January\or February\or March\or 
    51                     April\or   May\or      June\or 
    52                     July\or    August\or   September\or 
    53                     October\or November\or December 
    54   \fi, \number \year 
    55 } 
    56  
    57 %% Link to orcid profile 
    58 \newcommand{\orcid}[1]{\href{http://orcid.org/#1}{\textcolor{orcidcolor}\aiOrcidSquare}} 
    59  
    60 %% Workaround for \listoffigures 
    61 \DeclareRobustCommand{\triad}[6][]{\ensuremath{ {}_{#2}^{#3} { \mathbb{#4}_{#1} }_{#5}^{\,#6} }} 
    62  
    63 %% New command for ToC 
    64 \newcommand{\chaptertoc}[1][Table of contents]{% 
    65   \thispagestyle{empty} 
    66   \etocsettocstyle{\addsec*{#1}}{}% 
    67   \localtableofcontents% 
    68   \vfill 
    69 } 
     36%% Workaround for issue with \listoffigures 
     37\DeclareRobustCommand{\triad}[6][]{\ensuremath{{}_{#2}^{#3}{\mathbb{#4}_{#1}}_{#5}^{\,#6}}} 
  • NEMO/trunk/doc/latex/global/packages.tex

    r11702 r12377  
    33%% ============================================================================== 
    44 
    5 %% 'hyperref' pkg is loaded at the end of the preamble for higher compatibility 
     5\usepackage{natbib}                      %% bib 
     6\usepackage{caption}                     %% caption 
     7\usepackage{xcolor}                      %% color 
     8\usepackage{times}                       %% font 
     9\usepackage{enumitem}                    %% list 
     10\usepackage{amsmath}                     %% maths 
     11%\usepackage{fancyhdr}                    %% page 
     12\usepackage{minitoc}                     %% toc 
     13\usepackage{subfiles}                    %% subdocs 
     14\usepackage{draftwatermark}              %% watermark 
     15\usepackage{titling}                     %% titlepage 
    616 
    7 %% KOMA-script 
    8 \usepackage[footsepline=0.25pt, headsepline=0.25pt]{scrlayer-scrpage} 
    9  
    10 %% customization (layout, header/footer styles & contents, background) 
    11 \usepackage{draftwatermark} 
    12 \usepackage[margin = 2cm]{geometry} 
    13 \usepackage[pages = some]{background}   %% 'some' for title page 
    14 \usepackage[Bjornstrup]{fncychap} 
    15  
    16 %% Fonts 
    17 \usepackage{fontspec} 
    18 %% Issue with fontawesome pkg: path to FontAwesome.otf has to be hard-coded 
    19 \defaultfontfeatures{ 
    20     Path = /usr/local/texlive/2019/texmf-dist/fonts/opentype/public/fontawesome/ 
    21 } 
    22 \usepackage{academicons, fontawesome, newtxtext} 
    23  
    24 %% Formatting 
    25 \usepackage[inline]{enumitem} 
    26 \usepackage{etoc, tabularx, xcolor} 
    27  
    28 %% Graphics 
    29 \usepackage{caption, graphicx, grffile} 
    30  
    31 %% Labels 
    32 \usepackage{lastpage, natbib} 
    33  
    34 %% Mathematics 
    35 \usepackage{amsmath, amssymb, mathtools} 
    36  
    37 %% Versatility 
    38 \usepackage{subfiles} 
     17%% Extensions in bundle package 
     18\usepackage{amssymb, graphicx, tabularx, textcomp} 
     19\usepackage[utf8]{inputenc}              %% input encoding 
    3920 
    4021%% Configuration 
    41 \graphicspath{ {../../../} {../figures/} } 
     22\graphicspath{ {../../figures/} {../../figures/\engine/} } 
     23%\captionsetup{margin=10pt, font={small}, labelsep=colon, labelfont={bf}} 
     24\renewcommand{\bibfont}{\small} 
     25%\renewcommand{\bibsep}{3pt} 
    4226 
    43 %% Missing utmr8a font 
    44 \usepackage{times} 
  • NEMO/trunk/doc/latex/global/styles.tex

    r11687 r12377  
    33%% ============================================================================== 
    44 
    5 %% Colors 
    6 \setmanualcolor 
    7 \colorlet{manualcolorshaded}{manualcolor!60} 
    8 \definecolor{orcidcolor}{HTML}{A6CE39} 
     5%\pagestyle{fancy} 
     6\bibliographystyle{../../global/ametsoc} 
     7\renewcommand{\bibpreamble}{\begin{multicols}{2}} 
     8\renewcommand{\bibpostamble}{\end{multicols}} 
     9 
     10%% Additional fonts 
     11\DeclareMathAlphabet{\mathpzc}{OT1}{pzc}{m}{it} 
    912 
    1013%% Page layout 
    11 \pagestyle{scrheadings} 
    12 \addtokomafont{pagehead}{  \sffamily              } 
    13 \addtokomafont{pagefoot}{  \sffamily \footnotesize} 
    14 \addtokomafont{pagenumber}{\sffamily \slshape     } 
    15 \addtokomafont{chapter}{\color{white}} 
    16 \ohead{} \ofoot{}   %% Clear defaults 
     14%\fancyhf{} 
     15%\fancyhead[LE,RO]{\bfseries\thepage} 
     16%\fancyhead[LO]{\bfseries\hspace{-0em}\rightmark} 
     17%\renewcommand{\sectionmark}[1]{\markright{\thesection.\ #1}} 
     18%\fancyhead[RE]{\bfseries\leftmark} 
     19%\renewcommand{\chaptermark}[1]{\markboth{#1}{}} 
     20%\renewcommand{\headrulewidth}{0.5pt} 
     21%\renewcommand{\footrulewidth}{0pt  } 
     22%\addtolength{\headheight}{2.6pt} 
    1723 
    18 %% Caption 
    19 \captionsetup{font = footnotesize, justification = justified} 
    20  
    21 %% Footnote 
    22 \renewcommand{\thefootnote}{\fnsymbol{footnote}} 
    23  
    24 %% Bibliography 
    25 \bibliographystyle{../../global/ametsoc} 
    26 \renewcommand{\bibfont}{\small} 
    27 \renewcommand{\bibpreamble }{\begin{multicols}{2}} 
    28 \renewcommand{\bibpostamble}{  \end{multicols}   } 
    2924 
    3025%% Catcodes 
    31 \makeatletter 
     26%\makeatletter 
     27%\def\LigneVerticale{\vrule height 5cm depth 2cm\hspace{0.1cm}\relax} 
     28%\def\LignesVerticales{\let\LV\LigneVerticale\LV\LV\LV\LV\LV\LV\LV\LV\LV\LV} 
     29%\def\GrosCarreAvecUnChiffre#1{ 
     30%  \rlap{\vrule height 0.8cm width 1cm depth 0.2cm} 
     31%  \rlap{\hbox to 1cm{\hss\mbox{\color{white} #1}\hss}} 
     32%  \vrule height 0pt width 1cm depth 0pt 
     33%} 
     34%\def\@makechapterhead#1{ 
     35%  \hbox{ 
     36%     \huge\LignesVerticales\hspace{-0.5cm} 
     37%     \GrosCarreAvecUnChiffre{\thechapter}\hspace{0.2cm} 
     38%     \hbox{#1} 
     39%  } 
     40%  \par\vskip 
     41%1cm 
     42%} 
     43%\def\@makeschapterhead#1{ 
     44%  \hbox{ 
     45%     \huge\LignesVerticales 
     46%     \hbox{#1} 
     47%  } 
     48%  \par\vskip 
     49%2cm 
     50%} 
     51%\def\cleardoublepage{\clearpage\if@twoside \ifodd\c@page\else 
     52%  \hbox{} 
     53%  \vspace*{\fill} 
     54%  \vspace{\fill} 
     55%  \thispagestyle{empty} 
     56%  \newpage 
     57%  \if@twocolumn\hbox{}\newpage\fi\fi\fi} 
     58%\def\@seccntformat#1{\protect\makebox[0pt][r]{\csname the#1\endcsname\quad}} 
     59%\makeatother 
    3260 
    33 %% Prevent error with tikz and namelist inclusion 
    34 \global\let\tikz@ensure@dollar@catcode=\relax 
    3561 
    36 %% First page 
    37 \backgroundsetup{ 
    38   firstpage = true, 
    39   scale = 1, angle = 0, opacity = 1, 
    40   contents = { 
    41     \begin{tikzpicture}[remember picture, overlay] 
    42       \path [fill = manualcolor] (-0.5\paperwidth, 7) rectangle (0.5\paperwidth, 10); 
    43     \end{tikzpicture} 
    44   } 
    45 } 
    46  
    47 %% Apply engine color for chapter headings: tweaking snippets from fncychap.sty 
    48 \renewcommand{\DOCH}{% 
    49   \settowidth{\py}{\CNoV\thechapter} 
    50   \addtolength{\py}{-10pt}      % Amount of space by which the 
    51 %                                  % number is shifted right 
    52   \fboxsep=0pt% 
    53   \colorbox{manualcolor}{\rule{0pt}{40pt}\parbox[b]{\textwidth}{\hfill}}% 
    54   \kern-\py\raise20pt% 
    55   \hbox{\color{manualcolorshaded}\CNoV\thechapter}\\% 
    56 } 
    57 \renewcommand{\DOTI}[1]{% 
    58   \nointerlineskip\raggedright% 
    59   \fboxsep=\myhi% 
    60   \vskip-1ex% 
    61   \colorbox{manualcolor}{\parbox[t]{\mylen}{\color{white}\CTV\FmTi{#1}}}\par\nobreak% 
    62   \vskip 40\p@% 
    63 } 
    64 \renewcommand{\DOTIS}[1]{% 
    65   \fboxsep=0pt 
    66   \colorbox{manualcolor}{\rule{0pt}{40pt}\parbox[b]{\textwidth}{\hfill}}\\% 
    67   \nointerlineskip\raggedright% 
    68   \fboxsep=\myhi% 
    69   \vskip-1ex% Remove white 1pt line 
    70   \colorbox{manualcolor}{\parbox[t]{\mylen}{\color{white}\CTV\FmTi{#1}}}\par\nobreak% 
    71   \vskip 40\p@% 
    72 } 
    73  
    74 %% Temporary fix 
    75 \def\set@curr@file#1{% 
    76   \begingroup 
    77     \escapechar\m@ne 
    78     \xdef\@curr@file{\expandafter\string\csname #1\endcsname}% 
    79   \endgroup 
    80 } 
    81 \def\quote@name#1{"\quote@@name#1\@gobble""} 
    82 \def\quote@@name#1"{#1\quote@@name} 
    83 \def\unquote@name#1{\quote@@name#1\@gobble"} 
    84  
    85 \makeatother 
Note: See TracChangeset for help on using the changeset viewer.