diff options
author | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2022-05-09 13:32:47 +0200 |
---|---|---|
committer | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2022-05-09 23:52:29 +0200 |
commit | 9fdeebaacd06d57c479cd69e9937c4bfe5d0a286 (patch) | |
tree | 012e6194ad6e25a81a9c99b4d0bd0852bc9a12af /tex/src | |
parent | 480184b3da399fab11b50e67f01d2efa6bea0e3e (diff) | |
parent | f51b5e2e500dd6450a5a3425e85df78245fc5c5c (diff) |
Imported recent updates in Maneage, conflicts fixed
Until now, Maneage had undergone some updates.
With this commit, those updates have been imported and the conflicts that
resulted were fixed. They were all cosmetic and had no effect on the
analysis. The most significant one was about the change in the format of
'INPUTS.conf'.
In the process, I also noticed that the IEEEtran LaTeX package is now
called 'ieeetran' (the 'tlmgr' of TeXLive 2022 was failing).
Diffstat (limited to 'tex/src')
-rw-r--r-- | tex/src/IEEEtran_openaccess.bst | 2 | ||||
-rw-r--r-- | tex/src/appendix-existing-solutions.tex | 6 | ||||
-rw-r--r-- | tex/src/appendix-existing-tools.tex | 6 | ||||
-rw-r--r-- | tex/src/appendix-necessity.tex | 4 | ||||
-rw-r--r-- | tex/src/figure-project-outline.tex | 2 | ||||
-rw-r--r-- | tex/src/figure-src-inputconf.tex | 7 | ||||
-rw-r--r-- | tex/src/preamble-maneage.tex | 2 | ||||
-rw-r--r-- | tex/src/preamble-pgfplots.tex | 19 | ||||
-rw-r--r-- | tex/src/preamble-project.tex | 6 | ||||
-rw-r--r-- | tex/src/references.tex | 2 | ||||
-rw-r--r-- | tex/src/supplement.tex | 4 |
11 files changed, 28 insertions, 32 deletions
diff --git a/tex/src/IEEEtran_openaccess.bst b/tex/src/IEEEtran_openaccess.bst index ace8724..d77fbb3 100644 --- a/tex/src/IEEEtran_openaccess.bst +++ b/tex/src/IEEEtran_openaccess.bst @@ -2,7 +2,7 @@ %% IEEEtran_openaccess.bst %% BibTeX Bibliography Style file for IEEE Journals and Conferences (unsorted) %% Copyright (c) 2003-2015 Michael Shell -%% Copyright (c) 2020-2021 Boud Roukema for additions of \eprint and \doi rules. +%% Copyright (c) 2020-2022 Boud Roukema for additions of \eprint and \doi rules. %% Based on IEEEtran.bst Version 1.14 (2015/08/26). %% %% WARNING: 2020-05-24: The \eprint and \doi rules are not quite right; diff --git a/tex/src/appendix-existing-solutions.tex b/tex/src/appendix-existing-solutions.tex index 2113377..9a9e2a6 100644 --- a/tex/src/appendix-existing-solutions.tex +++ b/tex/src/appendix-existing-solutions.tex @@ -2,9 +2,9 @@ %% file is loaded by the project's 'paper.tex' or 'tex/src/supplement.tex', %% it should not be run independently. % -%% Copyright (C) 2020-2021 Mohammad Akhlaghi <mohammad@akhlaghi.org> -%% Copyright (C) 2021 Raúl Infante-Sainz <infantesainz@gmail.com> -%% Copyright (C) 2021 Boudewijn F. Roukema <boud@astro.uni.torun.pl> +%% Copyright (C) 2020-2022 Mohammad Akhlaghi <mohammad@akhlaghi.org> +%% Copyright (C) 2021-2022 Raúl Infante-Sainz <infantesainz@gmail.com> +%% Copyright (C) 2021-2022 Boudewijn F. Roukema <boud@astro.uni.torun.pl> % %% This file is free software: you can redistribute it and/or modify it %% under the terms of the GNU General Public License as published by the diff --git a/tex/src/appendix-existing-tools.tex b/tex/src/appendix-existing-tools.tex index 885de8b..dcedd78 100644 --- a/tex/src/appendix-existing-tools.tex +++ b/tex/src/appendix-existing-tools.tex @@ -3,9 +3,9 @@ %% project's 'paper.tex' or 'tex/src/supplement.tex', it should not be run %% independently. % -%% Copyright (C) 2020-2021 Mohammad Akhlaghi <mohammad@akhlaghi.org> -%% Copyright (C) 2021 Raúl Infante-Sainz <infantesainz@gmail.com> -%% Copyright (C) 2021 Boudewijn F. Roukema <boud@astro.uni.torun.pl> +%% Copyright (C) 2020-2022 Mohammad Akhlaghi <mohammad@akhlaghi.org> +%% Copyright (C) 2021-2022 Raúl Infante-Sainz <infantesainz@gmail.com> +%% Copyright (C) 2021-2022 Boudewijn F. Roukema <boud@astro.uni.torun.pl> % %% This file is free software: you can redistribute it and/or modify it %% under the terms of the GNU General Public License as published by the diff --git a/tex/src/appendix-necessity.tex b/tex/src/appendix-necessity.tex index 452aa0f..591a0a5 100644 --- a/tex/src/appendix-necessity.tex +++ b/tex/src/appendix-necessity.tex @@ -2,8 +2,8 @@ %% papers. This file is loaded by the project's 'paper.tex' or %% 'tex/src/supplement.tex', it should not be run independently. % -%% Copyright (C) 2020-2021 Mohammad Akhlaghi <mohammad@akhlaghi.org> -%% Copyright (C) 2021 Raúl Infante-Sainz <infantesainz@gmail.com> +%% Copyright (C) 2020-2022 Mohammad Akhlaghi <mohammad@akhlaghi.org> +%% Copyright (C) 2021-2022 Raúl Infante-Sainz <infantesainz@gmail.com> % %% This file is free software: you can redistribute it and/or modify it %% under the terms of the GNU General Public License as published by the diff --git a/tex/src/figure-project-outline.tex b/tex/src/figure-project-outline.tex index eaaf14f..dbf281c 100644 --- a/tex/src/figure-project-outline.tex +++ b/tex/src/figure-project-outline.tex @@ -1,4 +1,4 @@ -% Copyright (C) 2018-2021 Mohammad Akhlaghi <mohammad@akhlaghi.org> +% Copyright (C) 2018-2022 Mohammad Akhlaghi <mohammad@akhlaghi.org> % % This LaTeX source is free software: you can redistribute it and/or % modify it under the terms of the GNU General Public License as diff --git a/tex/src/figure-src-inputconf.tex b/tex/src/figure-src-inputconf.tex index 4d75e24..33742df 100644 --- a/tex/src/figure-src-inputconf.tex +++ b/tex/src/figure-src-inputconf.tex @@ -1,8 +1,7 @@ \begin{tcolorbox}[title=\inlinecode{\textcolor{white}{INPUT.conf}}] \footnotesize - \texttt{\mkvar{MK20DATA} = \menketwentyxlsxname}\\ - \texttt{\mkvar{MK20MD5}{ } = \menketwentychecksum}\\ - \texttt{\mkvar{MK20SIZE} = \menketwentybytesize}\\ - \texttt{\mkvar{MK20URL}{ } = {\scriptsize \menketwentyurl}}\\ + \texttt{\mkvar{INPUT-{\menketwentyxlsxname}-sha256} = \menketwentychecksum}\\ + \texttt{\mkvar{INPUT-{\menketwentyxlsxname}-size} = \menketwentybytesize}\\ + \texttt{\mkvar{INPUT-{\menketwentyxlsxname}-url} = {\scriptsize \menketwentyurl}}\\ \vspace{-3mm} \end{tcolorbox} diff --git a/tex/src/preamble-maneage.tex b/tex/src/preamble-maneage.tex index 2f2b393..6875e37 100644 --- a/tex/src/preamble-maneage.tex +++ b/tex/src/preamble-maneage.tex @@ -1,6 +1,6 @@ %% Preamble for Maneage-related features. % -%% Copyright (C) 2020-2021 Mohammad Akhlaghi <mohammad@akhlaghi.org> +%% Copyright (C) 2020-2022 Mohammad Akhlaghi <mohammad@akhlaghi.org> % %% This LaTeX file is part of Maneage. Maneage is free software: you can %% redistribute it and/or modify it under the terms of the GNU General diff --git a/tex/src/preamble-pgfplots.tex b/tex/src/preamble-pgfplots.tex index 188b5a9..6c8ed5b 100644 --- a/tex/src/preamble-pgfplots.tex +++ b/tex/src/preamble-pgfplots.tex @@ -4,7 +4,7 @@ %% PGFPLOTS is a package in (La)TeX for making plots internally. It fits %% nicely with the purpose of a reproducible project. But it isn't %% mandatory. Therefore if you don't need it, just comment/delete the line -%% that includes this file in the top LaTeX source (`paper.tex'). +%% that includes this file in the top LaTeX source ('paper.tex'). % %% However, TiKZ and PGFPlots are the recommended way to include figures %% and plots in your paper. There are two main reasons: 1) it follows the @@ -29,18 +29,18 @@ %% %% USAGE: % -%% - All plots are made within a `tikz' directory (that must already be +%% - All plots are made within a 'tikz' directory (that must already be %% present in the location LaTeX is run). % -%% - Use `\includetikz{XXXX}' to make/use the figure. If a `makepdf' LaTeX -%% macro is not defined, then \includetikz will assume a `XXXX.pdf' file -%% exists in `tex/tikz' and simply import it. If `makepdf' is defined, +%% - Use '\includetikz{XXXX}' to make/use the figure. If a 'makepdf' LaTeX +%% macro is not defined, then \includetikz will assume a 'XXXX.pdf' file +%% exists in 'tex/tikz' and simply import it. If 'makepdf' is defined, %% then TiKZ/PGFPlot will be called to (possibly) build the plot based -%% on `tex/XXXX.tex'. Note that if the contents of `tex/src/XXXX.tex' +%% on 'tex/XXXX.tex'. Note that if the contents of 'tex/src/XXXX.tex' %% hasn't changed since the last build. TiKZ/PGFPlots won't rebuild the %% plot. % -%% Copyright (C) 2018-2021 Mohammad Akhlaghi <mohammad@akhlaghi.org> +%% Copyright (C) 2018-2022 Mohammad Akhlaghi <mohammad@akhlaghi.org> % %% This LaTeX file is part of Maneage. Maneage is free software: you can %% redistribute it and/or modify it under the terms of the GNU General @@ -92,8 +92,9 @@ -%% Uncomment the following lines for TiKZ external images to be saved as -%% EPS and PS images. +%% Uncomment the following lines for EPS and PS images. Note that you still +%% have to use the 'pdflatex' executable and also add a '[dvips]' option to +%% graphicx. \tikzset{ external/system call={ rm -f "\image".eps "\image".ps "\image".dvi; diff --git a/tex/src/preamble-project.tex b/tex/src/preamble-project.tex index 7fabca1..d5a30af 100644 --- a/tex/src/preamble-project.tex +++ b/tex/src/preamble-project.tex @@ -4,7 +4,7 @@ %% LaTeX usages. However, if any are not needed in your work, please feel %% free to remove them. % -%% Copyright (C) 2018-2021 Mohammad Akhlaghi <mohammad@akhlaghi.org> +%% Copyright (C) 2018-2022 Mohammad Akhlaghi <mohammad@akhlaghi.org> %% Copyright (C) YYYY Your Name <your@email.address> % %% This file is free software: you can redistribute it and/or modify it @@ -40,10 +40,6 @@ %% For the `\url' command. \usepackage{url} -%% No need to load xcolor, its included by others below (it conflicts with -%% the listings package. -%\usepackage{xcolor} - %% To have links. \usepackage[ colorlinks, diff --git a/tex/src/references.tex b/tex/src/references.tex index bf99d1d..4f6af2a 100644 --- a/tex/src/references.tex +++ b/tex/src/references.tex @@ -3,7 +3,7 @@ % %% [[[BibTeX 0.99d complains with the at-character, even when its in a %% comment line! So ::at:: is used instead in the email address]]]. -%% Copyright (C) 2018-2021 Mohammad Akhlaghi <mohammad::at::akhlaghi.org> +%% Copyright (C) 2018-2022 Mohammad Akhlaghi <mohammad::at::akhlaghi.org> % %% Copying and distribution of this file, with or without modification, %% are permitted in any medium without royalty provided the copyright diff --git a/tex/src/supplement.tex b/tex/src/supplement.tex index 9524705..362f304 100644 --- a/tex/src/supplement.tex +++ b/tex/src/supplement.tex @@ -1,8 +1,8 @@ %% The top-level file to build the separate supplement that contains the %% appendices (to be published as a separate PDF file). % -%% Copyright (C) 2020-2021 Mohammad Akhlaghi <mohammad@akhlaghi.org> -%% Copyright (C) 2020-2021 Boudewijn F. Roukema <boud@astro.uni.torun.pl> +%% Copyright (C) 2020-2022 Mohammad Akhlaghi <mohammad@akhlaghi.org> +%% Copyright (C) 2020-2022 Boudewijn F. Roukema <boud@astro.uni.torun.pl> % %% This file is free software: you can redistribute it and/or modify it %% under the terms of the GNU General Public License as published by the |