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 11187 for NEMO/trunk – NEMO

Changeset 11187 for NEMO/trunk


Ignore:
Timestamp:
2019-06-26T17:56:45+02:00 (5 years ago)
Author:
nicolasmartin
Message:

Modifications and bugfixes

  • Correction of the layout standard Right: scrreprt instead of scrreport
  • Switch to 2-columns for the bibliography
  • Update svn:ignore property for list of figures and tables
  • Update LaTeX dependencies
  • Move \triad command declaration to ./global/latex/new_cmds.tex with \DeclareRobustCommand specific prefix to prevent issue with \listoffigures
  • LaTeX typos
  • Ignore todonotes.tex for time being
Location:
NEMO/trunk/doc/latex
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • NEMO/trunk/doc/latex/.svnignore

    r11154 r11187  
    88*.ilg 
    99*.ind 
     10*.lof 
    1011*.log 
     12*.lot 
    1113*.maf 
    1214*.mtc* 

  • NEMO/trunk/doc/latex/DEPS

    r11004 r11187  
    2525idxlayout 
    2626ifplatform 
     27koma-script 
    2728latex 
    2829latex-bin 
    … …  
    3940oberdiek 
    4041parskip 
     42preview 
    4143psnfss 
    4244subfiles 
    … …  
    4446times 
    4547titlesec 
     48titling 
    4649tools 
    4750upquote 
    … …  
    5255xstring 
    5356zapfchan 
     57 
     58 

  • NEMO/trunk/doc/latex/HTML_latex2html.sh

    r10146 r11187  
    11#!/bin/bash 
    22 
    3 ./inc/clean.sh 
    4 ./inc/build.sh 
     3#./inc/clean.sh 
     4#./inc/build.sh 
    55 
    6 cd tex_main 
    7 sed -i -e 's#\\documentclass#%\\documentclass#' -e '/{document}/ s/^/%/' \ 
    8    ../tex_sub/*.tex 
    9 sed -i    's#\\subfile{#\\include{#g' \ 
    10    NEMO_manual.tex 
    11 latex2html -local_icons -no_footnode -split 4 -link 2 -mkdir -dir ../html_LaTeX2HTML   \ 
    12             $*                                                                         \ 
    13    NEMO_manual 
    14 sed -i -e 's#%\\documentclass#\\documentclass#' -e '/{document}/ s/^%//' \ 
    15    ../tex_sub/*.tex 
    16 sed -i    's#\\include{#\\subfile{#g' \ 
    17    NEMO_manual.tex 
     6sed -i -e 's#utf8#latin1#'                                 \ 
     7       -e 's#\[outputdir=../build\]{minted}#\[\]{minted}#' \ 
     8       -e '/graphicspath/ s#{../#{../../#g'                \ 
     9          global/packages.tex 
     10 
     11cd ./NEMO/main 
     12sed -i -e 's#\\documentclass#%\\documentclass#' -e '/{document}/ s#^#%#'   ../subfiles/*.tex 
     13sed -i    's#\\subfile{#\\input{#'                                         chapters.tex appendices.tex 
     14 
     15#latex2html                                   -noimages -local_icons -no_footnode -split 4 -link 2 -dir ../html_LaTeX2HTML $* NEMO_manual 
     16latex2html -debug -noreuse -init_file ../../l2hconf.pm -local_icons                               -dir ../build/html               NEMO_manual 
     17 
     18sed -i -e 's#%\\documentclass#\\documentclass#' -e '/{document}/ s#^%##'   ../subfiles/*.tex 
     19sed -i    's#\\input{#\\subfile{#'                                         chapters.tex appendices.tex 
    1820cd - 
    1921 
     22sed -i -e 's#latin1#utf8#'                                 \ 
     23       -e 's#\[\]{minted}#\[outputdir=../build\]{minted}#' \ 
     24       -e '/graphicspath/ s#{../../#{../#g'                \ 
     25     global/packages.tex 
     26 
    2027exit 0 

  • NEMO/trunk/doc/latex/NEMO/build

    • Property svn:ignore

      •  

        old new  
        88*.ilg 
        99*.ind 
         10*.lof 
        1011*.log 
        1112*.lot 

  • NEMO/trunk/doc/latex/NEMO/main/appendices.tex

    r11170 r11187  
     1 
    12\subfile{../subfiles/annex_A}             %% Generalised vertical coordinate 
    23\subfile{../subfiles/annex_B}             %% Diffusive operator 
    … …  
    1011%\subfile{../subfiles/chap_conservation} 
    1112%\subfile{../subfiles/annex_E}            %% Notes on some on going staff 
     13 

  • NEMO/trunk/doc/latex/NEMO/subfiles/annex_iso.tex

    r11151 r11187  
    44\newcommand{\rML}[1][i]{\ensuremath{_{\mathrm{ML}\,#1}}} 
    55\newcommand{\rMLt}[1][i]{\tilde{r}_{\mathrm{ML}\,#1}} 
    6 \newcommand{\triad}[6][]{\ensuremath{{}_{#2}^{#3}{\mathbb{#4}_{#1}}_{#5}^{\,#6}}} 
     6%% Move to ../../global/new_cmds.tex to avoid error with \listoffigures 
     7%\newcommand{\triad}[6][]{\ensuremath{{}_{#2}^{#3}{\mathbb{#4}_{#1}}_{#5}^{\,#6}} 
    78\newcommand{\triadd}[5]{\ensuremath{{}_{#1}^{#2}{\mathbb{#3}}_{#4}^{\,#5}}} 
    89\newcommand{\triadt}[5]{\ensuremath{{}_{#1}^{#2}{\tilde{\mathbb{#3}}}_{#4}^{\,#5}}} 

  • NEMO/trunk/doc/latex/NEMO/subfiles/chap_DYN.tex

    r11179 r11187  
    829829% Explicit free surface formulation 
    830830%-------------------------------------------------------------------------------------------------------------- 
    831 \subsection[Explicit free surface (texttt{\textbf{key\_dynspg\_exp}})] 
     831\subsection[Explicit free surface (\texttt{\textbf{key\_dynspg\_exp}})] 
    832832{Explicit free surface (\protect\key{dynspg\_exp})} 
    833833\label{subsec:DYN_spg_exp} 
    … …  
    856856% Split-explict free surface formulation 
    857857%-------------------------------------------------------------------------------------------------------------- 
    858 \subsection[Split-explicit free surface (texttt{\textbf{key\_dynspg\_ts}})] 
     858\subsection[Split-explicit free surface (\texttt{\textbf{key\_dynspg\_ts}})] 
    859859{Split-explicit free surface (\protect\key{dynspg\_ts})} 
    860860\label{subsec:DYN_spg_ts} 

  • NEMO/trunk/doc/latex/global/document.tex

    r11176 r11187  
    1111 
    1212%% Document layout 
    13 \documentclass[draft]{scrreport} 
     13\documentclass[draft]{scrreprt} 
    1414 
    1515%% Load the configuration of the manual 
    … …  
    6060%% Table of Contents 
    6161\tableofcontents 
    62 %\listoffigures 
     62\listoffigures 
    6363\listoftables 
    6464 
    … …  
    7373\pagenumbering{arabic} 
    7474 
    75 \input{chapters} 
     75\include{chapters} 
    7676 
    7777 
    … …  
    8282\appendix    
    8383 
    84 \input{appendices} 
     84\include{appendices} 
    8585 
    8686 

  • NEMO/trunk/doc/latex/global/new_cmds.tex

    r11176 r11187  
    3636%% Namelists inclusion 
    3737\newcommand{\nlst}[1]{\forfile{../../../namelists/#1}} 
     38 
     39%% Workaround for issue with \listoffigures 
     40\DeclareRobustCommand{\triad}[6][]{\ensuremath{{}_{#2}^{#3}{\mathbb{#4}_{#1}}_{#5}^{\,#6}}} 

  • NEMO/trunk/doc/latex/global/packages.tex

    r11176 r11187  
     1 
    12%% LaTeX packages in use 
    23%% ============================================================================== 

  • NEMO/trunk/doc/latex/global/preamble.tex

    r11176 r11187  
    44\input{../../global/new_cmds} 
    55\input{../../global/styles} 
    6 \input{../../global/todonotes} 
     6%\input{../../global/todonotes} 
    77 

  • NEMO/trunk/doc/latex/global/styles.tex

    r11176 r11187  
     1 
    12%% Styles 
    23%% ============================================================================== 
    … …  
    45%\pagestyle{fancy} 
    56\bibliographystyle{../../global/ametsoc} 
     7\renewcommand{\bibpreamble}{\begin{multicols}{2}} 
     8\renewcommand{\bibpostamble}{\end{multicols}} 
    69 
    710%% Additionnal fonts 
    … …  
    6265%\def\@seccntformat#1{\protect\makebox[0pt][r]{\csname the#1\endcsname\quad}} 
    6366%\makeatother 
     67 
     68 

  • NEMO/trunk/doc/latex/global/todonotes.tex

    r11174 r11187  
     1\usepackage[]{todonotes} 
     2 
    13\newcounter{ubcomment} 
    24\newcommand{\ubcomment}[2][]{% 
Note: See TracChangeset for help on using the changeset viewer.