Author: bugman
Date: Mon Oct 12 19:50:40 2015
New Revision: 28037
URL: http://svn.gna.org/viewcvs/relax?rev=28037&view=rev
Log:
Ported r28036 from trunk to allow the HTML manual to be compiled.
The command used was:
svn up; svn merge -r28035:28036 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk/
.
.....
r28036 | bugman | 2015-10-12 19:49:15 +0200 (Mon, 12 Oct 2015) | 10 lines
Redesign of the frame order parameter nesting table in the manual for
latex2html compatibility.
The table uses the tikz package, which is fatal for latex2html, even if not
used. Therefore the
table in the docs/latex/frame_order/parameter_nesting.tex file has been
converted into a standalone
LaTeX document to create a cropped postscript version of the tikz formatted
table. A compilation
script has been added as well. The resultant *.ps file is now included
into the PCS numerical
integration section, rather than this section creating the tikz table. All
tikz preamble text has
been removed to allow latex2html to run.
.....
Added:
tags/4.0.0/docs/latex/frame_order/compile_param_nesting
- copied unchanged from r28036,
trunk/docs/latex/frame_order/compile_param_nesting
tags/4.0.0/docs/latex/frame_order/parameter_nesting.ps
- copied unchanged from r28036,
trunk/docs/latex/frame_order/parameter_nesting.ps
Modified:
tags/4.0.0/docs/latex/frame_order/parameter_nesting.tex
tags/4.0.0/docs/latex/frame_order/pcs_numerical_integration.tex
tags/4.0.0/docs/latex/relax.tex
Modified: tags/4.0.0/docs/latex/frame_order/parameter_nesting.tex
URL:
http://svn.gna.org/viewcvs/relax/tags/4.0.0/docs/latex/frame_order/parameter_nesting.tex?rev=28037&r1=28036&r2=28037&view=diff
==============================================================================
--- tags/4.0.0/docs/latex/frame_order/parameter_nesting.tex (original)
+++ tags/4.0.0/docs/latex/frame_order/parameter_nesting.tex Mon Oct 12
19:50:40 2015
@@ -1,7 +1,41 @@
+\documentclass[varwidth=100cm, border=1pt]{standalone}
+
+% Good looking tables.
+\usepackage{booktabs}
+
+% Better maths.
+\usepackage{amsmath}
+\usepackage{amssymb}
+
+% Colours.
+\usepackage[svgnames]{xcolor}
+
+% Graphics for tables (after xcolor because of package clashing).
+\usepackage{tikz}
+\usetikzlibrary{calc}
+\newcommand*\sethighlight[1]{\tikz[baseline=(char.base)]{\node[shape=rectangle,draw=blue,inner
sep=2pt] (char) {#1};}}
+\newcommand{\tikzmark}[1]{\tikz[overlay,remember picture] \node (#1) {};}
+
+% Maths commands - frame order specific.
+\newcommand{\Eigenseta}{\mathfrak{E}^\alpha_\textrm{ax}}
+\newcommand{\Eigensetabc}{\mathfrak{E}_{\alpha\beta\gamma}}
+\newcommand{\Eigensetax}{\mathfrak{E}_\textrm{ax}}
+\newcommand{\Pivotsetone}{\mathfrak{p}_1}
+\newcommand{\Pivotsettwo}{\mathfrak{p}_2}
+\newcommand{\Posset}{\mathfrak{P}}
+\newcommand{\Possetred}{\mathfrak{P}'}
+\newcommand{\conesmax}{\sigma_\textrm{max}}
+\newcommand{\conesmaxtwo}{\sigma_{\textrm{max,2}}}
+\newcommand{\conetheta}{\theta}
+\newcommand{\conethetax}{\theta_x}
+\newcommand{\conethetay}{\theta_y}
+
+
+
+\begin{document}
+
\begin{table}
-\begin{center}
-\caption[Frame order parameter nesting.]{The nesting of frame order model
parameters and the resultant grid search dimensionality. The boxes highlight
parameter sets which are optimised in the initial grid search. The start of
each train of arrows are the optimised parameters which will be copied for
the more complex model and excluded from the grid search. The non-nested
gird search dimensionality is given in brackets.}
-\begin{tabular*}{\textwidth}{l @{\extracolsep{\fill}} ccccccccc}
+\begin{tabular}{lccccccccc}
% Spacing.
\\[-5pt]
@@ -124,8 +158,6 @@
\bottomrule
-\label{table: frame order parameter nesting}
-
% Arrows.
\begin{tikzpicture}[overlay,remember picture]
@@ -141,6 +173,7 @@
\draw[->,ForestGreen] (s2.center) to [out=-20,in=45](s3) to
[out=-45,in=45](s4);
\end{tikzpicture}
-\end{tabular*}
-\end{center}
+\end{tabular}
\end{table}
+
+\end{document}
Modified: tags/4.0.0/docs/latex/frame_order/pcs_numerical_integration.tex
URL:
http://svn.gna.org/viewcvs/relax/tags/4.0.0/docs/latex/frame_order/pcs_numerical_integration.tex?rev=28037&r1=28036&r2=28037&view=diff
==============================================================================
--- tags/4.0.0/docs/latex/frame_order/pcs_numerical_integration.tex
(original)
+++ tags/4.0.0/docs/latex/frame_order/pcs_numerical_integration.tex Mon
Oct 12 19:50:40 2015
@@ -232,7 +232,13 @@
% Parameter nesting.
\subsubsection{Frame order parameter nesting in the automated protocol}
-\input{frame_order/parameter_nesting}
+\begin{table}
+\begin{center}
+\caption[Frame order parameter nesting.]{The nesting of frame order model
parameters and the resultant grid search dimensionality. The boxes highlight
parameter sets which are optimised in the initial grid search. The start of
each train of arrows are the optimised parameters which will be copied for
the more complex model and excluded from the grid search. The non-nested
gird search dimensionality is given in brackets.}
+\includegraphics[width=\textwidth]{frame_order/parameter_nesting.ps}
+\label{table: frame order parameter nesting}
+\end{center}
+\end{table}
The parameter nesting used in the automated protocol is shown in
table~\ref{table: frame order parameter nesting}.
This massively collapses the dimensionality of the initial grid search.
Modified: tags/4.0.0/docs/latex/relax.tex
URL:
http://svn.gna.org/viewcvs/relax/tags/4.0.0/docs/latex/relax.tex?rev=28037&r1=28036&r2=28037&view=diff
==============================================================================
--- tags/4.0.0/docs/latex/relax.tex (original)
+++ tags/4.0.0/docs/latex/relax.tex Mon Oct 12 19:50:40 2015
@@ -80,13 +80,6 @@
tabsize=4,
upquote=true,
}
-
-% Graphics for tables (after xcolor because of package clashing).
-\usepackage{tikz}
-\usetikzlibrary{calc}
-%\newcommand*\sethighlight[1]{\tikz[baseline=(char.base)]{\node[shape=circle,draw,inner
sep=1pt] (char) {#1};}}
-\newcommand*\sethighlight[1]{\tikz[baseline=(char.base)]{\node[shape=rectangle,draw=blue,inner
sep=2pt] (char) {#1};}}
-\newcommand{\tikzmark}[1]{\tikz[overlay,remember picture] \node (#1) {};}
% Table row formatting.
\usepackage{array}
r28037 - in /tags/4.0.0/docs/latex: ./ frame_order/