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/styles.tex – 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:
3 edited

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/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.