diff --git a/ivoa.cls b/ivoa.cls deleted file mode 100755 index 6d503ba..0000000 --- a/ivoa.cls +++ /dev/null @@ -1,342 +0,0 @@ -\ProvidesClass{ivoa} -\LoadClassWithOptions{article} - -\NeedsTeXFormat{LaTeX2e} - -\RequirePackage{calc} -\RequirePackage{graphicx} -\RequirePackage{xcolor} -\RequirePackage{ifthen} -\RequirePackage{doc} -\RequirePackage{paralist} -\RequirePackage{url} -\RequirePackage[labelfont=it]{caption} -\RequirePackage[T1]{fontenc} -\RequirePackage[utf8]{inputenc} - -\definecolor{ivoacolor}{rgb}{0.0,0.318,0.612} -\definecolor{linkcolor}{rgb}{0.318,0,0.318} - -\RequirePackage[colorlinks, - linkcolor=linkcolor, - anchorcolor=linkcolor, - citecolor=linkcolor, - urlcolor=linkcolor, - breaklinks=true]{hyperref} - -\RequirePackage{natbib} -\bibliographystyle{ivoatex/ivoa} - -\renewcommand{\topfraction}{0.9} -\renewcommand{\bottomfraction}{0.7} -\renewcommand{\textfraction}{0.1} -\renewcommand{\floatpagefraction}{0.8} - -\setlength{\parskip}{1pt plus 2pt} - -\makeatletter - -%%%%%%%%%%%%%%%%%%% Metadata definition macros - -\newcommand{\ivoagroup}[1]{\def\ivo@group{#1}} - -% these are accumulators for sequences -\def\previ@usversions{} -\def\@uthors{} -\def\@ditors{} - -\renewcommand{\author}[2][0]{% - \ifthenelse{\equal{\@uthors}{}}{} - {\g@addto@macro\@uthors{, }} - \ifthenelse{\equal{#1}{0}} - {\g@addto@macro\@uthors{#2}} - {\g@addto@macro\@uthors{\href{#1}{#2}}}} -\newcommand{\editor}[2][0]{% - \ifthenelse{\equal{\@ditors}{}}{} - {\g@addto@macro\@ditors{, }} - \ifthenelse{\equal{#1}{0}} - {\g@addto@macro\@ditors{#2}} - {\g@addto@macro\@ditors{\href{#1}{#2}}}} -\newcommand{\previousversion}[2][0]{ - \ifthenelse{\equal{#1}{0}} - {\g@addto@macro\previ@usversions{\item #2}} - {\g@addto@macro\previ@usversions{\item \href{#1}{#2}}}} - -\def\vcsR@vision{unknown} -\def\vcsD@te{unknown} -\def\vcs@RL{unknown} -\newcommand{\vcsrevision}[1]{\gdef\vcsR@vision{#1}} -\newcommand{\vcsdate}[1]{\gdef\vcsD@te{#1}} -\newcommand{\vcsurl}[1]{\gdef\vcs@RL{#1}} - -\def\SVN$#1: #2 ${% - \ifthenelse{\equal{#1}{Date}} - {\vcsdate{#2}}{% - \ifthenelse{\equal{#1}{Rev}} - {\vcsrevision{#2}}{% - \ifthenelse{\equal{#1}{URL}} - {\vcsurl{#2}}{% - \message{Invalid SVN key /#1/}} -}}} - -%%%%%%%%%%%%%%%%%% Tools for formatting the titlepage - -\newcommand*\bigdescriptionlabel[1]{% - \parbox[b]{\labelwidth}{\makebox[0pt][l]{\color{ivoacolor}#1}\\\mbox{}}} -\newenvironment{bigdescription}% - {\begin{list}{}{% - \setlength{\leftmargin}{4em} - \setlength{\labelwidth}{4em} - \setlength{\labelsep}{0pt} - \setlength{\listparindent}{0pt} - \setlength{\itemsep}{0pt} - \let\makelabel\bigdescriptionlabel} - \let\term\item - }{% - \end{list}} - -\newcommand*\longtermslabel[1]{% - \parbox[b]{\labelwidth}{\makebox[0pt][l]{#1}\\\mbox{}}} -\newenvironment{longtermsdescription}% - {\begin{list}{}{% - \setlength{\leftmargin}{4em} - \setlength{\labelwidth}{4em} - \setlength{\labelsep}{0pt} - \setlength{\listparindent}{0pt} - \setlength{\itemsep}{3pt} - \let\makelabel\longtermslabel} - \let\term\item - }{% - \end{list}} - -\newcommand\titlehe@d[1]{\bigbreak{\noindent - \Large\color{ivoacolor}\sffamily\bfseries #1}\nobreak\par\nobreak} - -\renewcommand\maketitle{ - \let\footnotesize\small - \let\footnoterule\relax - \let \footnote \thanks - \mbox{} - \vskip -2cm - \noindent\mbox{% - \includegraphics[width=6cm]{ivoatex/IVOA.jpg}% - \raisebox{1.5cm}{\parbox{5cm}{ - \Large\color{ivoacolor}\textsl{\textsf{\textbf{I}nternational}} \\ - \Large\color{ivoacolor}\quad\textsl{\textsf{\textbf{V}irtual}} \\ - \Large\color{ivoacolor}\quad\textsl{\textsf{\textbf{O}bservatory}} \\ - \Large\color{ivoacolor}\textsl{\textsf{\textbf{A}lliance}}}}\hfil} - - \vskip 1.4cm - \begin{sloppypar}\raggedright - \LARGE\color{ivoacolor}\sffamily\bfseries \@title\par - \end{sloppypar} - - \bigskip - \noindent{\LARGE\color{ivoacolor}\sffamily\bfseries - Version \ivoaDocversion} - \medskip - \titlehe@d{\expandedDoctype{\ivoaDoctype} \ivoaDocdate}% - - - \begin{bigdescription} - \item[Working group] - \ivo@group - - \item[This version] - \currentDocURL - - \item[Latest version] - \latestDocURL - - \item[Previous versions] - \begin{compactenum}[] - \previ@usversions - \end{compactenum} - - \item[Author(s)] - \begin{compactenum}[] - \@uthors - \end{compactenum} - - \item[Editor(s)] - \begin{compactenum}[] - \@ditors - \end{compactenum} - - \ifthenelse{\equal{\vcsR@vision}{unknown}}{\relax}{ - \item[Version Control] - Revision \vcsR@vision - \ifthenelse{\equal{\vcsD@te}{unknown}}{\relax}{, - \vcsD@te} - \ifthenelse{\equal{\vcs@RL}{unknown}}{\relax} - {\\\strut\tiny\url{\vcs@RL}}} - - \end{bigdescription} - \@thanks - \vfill\null - \setcounter{footnote}{0}% -} - - - -\renewenvironment{abstract}{% - \thispagestyle{empty} - \maketitle - \@beginparpenalty\@lowpenalty - \titlehe@d{\abstractname} - \medskip - \@endparpenalty\@M} - {\par - \bigskip - \titlehe@d{Status of This Document} - - \medskip - \docstatusDeclaration{\ivoaDoctype} - \tableofcontents} - -\newenvironment{generated}{% - \list{}{\rightmargin 0mm\leftmargin 5mm}\item[]} - {\endlist} - -\newcommand\expandedDoctype[1] % "Proposed Recommendation" for PR and such - {\ifthenelse{\equal{#1}{NOTE}} - {IVOA Note} - {\ifthenelse{\equal{#1}{WD}} - {IVOA Working Draft} - {\ifthenelse{\equal{#1}{PR}} - {IVOA Proposed Recommendation} - {\ifthenelse{\equal{#1}{REC}} - {IVOA Recommendation} - {\ifthenelse{\equal{#1}{DERR}} - {Draft Erratum} - {UNKNOWN DOCUMENT (fix DOCTYPE)}}}}}} - -\newcommand\docstatusDeclaration[1] - {\ifthenelse{\equal{#1}{NOTE}} - {This is an IVOA Note expressing suggestions from and - opinions of the authors. It is intended to share best - practices, possible approaches, or other perspectives on - interoperability with the Virtual Observatory. It should - not be referenced or otherwise interpreted as a standard - specification.} - {\ifthenelse{\equal{#1}{WD}} - {This is an IVOA Working Draft for review by IVOA members - and other interested parties. It is a draft document and - may be updated, replaced, or obsoleted by other documents - at any time. It is inappropriate to use IVOA Working Drafts - as reference materials or to cite them as other than ``work - in progress''.} - {\ifthenelse{\equal{#1}{PR}} - {This is an IVOA Proposed Recommendation made available for - public review. It is appropriate to reference this document - only as a recommended standard that is under review and - which may be changed before it is accepted as a full - Recommendation.} - {\ifthenelse{\equal{#1}{DERR}} - {This is a draft for an erratum to an IVOA recommendation made - available for public review. Interested parties are invited - to evaluate the erratum's validity and impact, but at this stage - the erratum does not yet change the normative content of the - recommendation.} - {\ifthenelse{\equal{#1}{REC}} - {This document has been reviewed by IVOA Members and other - interested parties, and has been endorsed by the IVOA - Executive Committee as an IVOA Recommendation. It is a - stable document and may be used as reference material or - cited as a normative reference from another document. - IVOA's role in making the Recommendation is to draw - attention to the specification and to promote its - widespread deployment. This enhances the functionality and - interoperability inside the Astronomical Community.} - {UNKNOWN DOCUMENT (fix DOCTYPE)}}}}}\par - A list of current IVOA Recommendations and other technical documents - can be found at \href{http://www.ivoa.net/Documents/ - }{http://www.ivoa.net/Documents/}.} - - -\newcommand\currentDocURL % URL of this document's landing page - {\href{http://www.ivoa.net/documents/\ivoaDocname/\ivoaDocdatecode} - {http://www.ivoa.net/documents/\ivoaDocname/\ivoaDocdatecode}} -\newcommand\latestDocURL - % URL of a potential successor to the document's landing page - {\href{http://www.ivoa.net/documents/\ivoaDocname} - {http://www.ivoa.net/documents/\ivoaDocname}} - - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Styling various item - -\renewcommand\section{\@startsection {section}{1}{\z@}% - {-3.5ex \@plus -1ex \@minus -.2ex}% - {2.3ex \@plus.2ex}% - {\raggedright\normalfont\Large - \color{ivoacolor}\bfseries\sffamily}} -\renewcommand\subsection{\@startsection{subsection}{2}{\z@}% - {-3.25ex\@plus -1ex \@minus -.2ex}% - {1.5ex \@plus .2ex}% - {\raggedright\normalfont\large - \color{ivoacolor}\bfseries\sffamily}} -\renewcommand\subsubsection{\@startsection{subsubsection}{3}{\z@}% - {-3.25ex\@plus -1ex \@minus -.2ex}% - {1.5ex \@plus .2ex}% - {\normalfont\normalsize - \color{ivoacolor}\bfseries\sffamily}} -\renewcommand\paragraph{\@startsection{paragraph}{4}{\z@}% - {3.25ex \@plus1ex \@minus.2ex}% - {-1em}% - {\normalfont\normalsize - \color{ivoacolor}\bfseries\sffamily}} -\renewcommand\subparagraph{\@startsection{subparagraph}{5}{\parindent}% - {3.25ex \@plus1ex \@minus .2ex}% - {-1em}% - {\normalfont\normalsize\bfseries}} - - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Various utilities for writing IVOA docs - -\newenvironment{admonition}[1]{ % a simple admonition box - \begin{table} %% TBD: use a different sort of insertion env? - \hskip -0.75cm - \begin{minipage}[r]{0.75\columnwidth}% - {\color{lightgray}\hrule} - \medskip - \hfil - \begin{minipage}[c]{0.9\columnwidth} - \small - \makebox[\columnwidth][l]{\sffamily\bfseries\color{ivoacolor}#1}% - \par\smallskip - \noindent\raggedright\ignorespaces - }% - {% - \end{minipage} - \hfil - \medskip - {\color{lightgray}\hrule} - \end{minipage}% - \end{table} - }% - - -\newenvironment{inlinetable}{\vskip 1ex\vfil\penalty8000\vfilneg% - \hbox to\hsize\bgroup\hss} - {\hss\egroup\vspace{8pt}} - -% customcss only relevant for tth output, not LaTeX -\newcommand{\customcss}[1]{\relax} - -\newcommand{\xmlel}[1]{{\ttfamily\itshape #1}} -\newcommand{\vorent}[1]{\textsc{#1}} - -\newcommand{\sptablerule}{\noalign{\vspace{2pt}}\hline\noalign{\vspace{2pt}}} - -\newcommand{\ivoatex}{\mbox{\textsc{Ivoa}\TeX}} - -\chardef\dquote'042 - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Changing LaTeX defaults - -\renewcommand*\descriptionlabel[1] - {\hspace{\labelsep}\itshape #1} - -\makeatother - -\input ivoatexmeta.tex diff --git a/ivoatex b/ivoatex index 32ef905..c5c7e22 160000 --- a/ivoatex +++ b/ivoatex @@ -1 +1 @@ -Subproject commit 32ef905325659abe9a355c4029718bdea1b6e62b +Subproject commit c5c7e224a01eb3c5586563529317148c919dafb3 diff --git a/moc.bib b/moc.bib index 290f1f0..fb20844 100644 --- a/moc.bib +++ b/moc.bib @@ -1,25 +1,3 @@ -@MISC{2021ivoa.spec.1101D, - author = {{Dowler}, Patrick and {Evans}, Janet and {Arviset}, Christophe and {Gaudet}, Severin and {Technical Coordination Group}}, - title = "{IVOA Architecture Version 2.0}", - howpublished = {IVOA Endorsed Note 01 November 2021}, - year = 2021, - month = nov, - pages = {1101}, - adsurl = {https://ui.adsabs.harvard.edu/abs/2021ivoa.spec.1101D}, - adsnote = {Provided by the SAO/NASA Astrophysics Data System} -} - -@MISC{2021ivoa.spec.1102D, - author = {{Demleitner}, Markus and {Plante}, Raymond and {St{\'e}b{\'e}}, Aur{\'E}lien and {Benson}, Kevin and {Dowler}, Patrick and {Graham}, Matthew and {Greene}, Gretchen and {Harrison}, Pul and {Lemson}, Gerard and {Linde}, Tony and {Rixon}, Guy}, - title = "{VODataService: A VOResource Schema Extension for Describing Collections, Services Version 1.2}", - howpublished = {IVOA Recommendation 02 November 2021}, - year = 2021, - month = nov, - pages = {1102}, - adsurl = {https://ui.adsabs.harvard.edu/abs/2021ivoa.spec.1102D}, - adsnote = {Provided by the SAO/NASA Astrophysics Data System} -} - @misc{note:VOARCH, year=2010, month=nov, diff --git a/moc.tex b/moc.tex index 6ff7fd6..595d77c 100644 --- a/moc.tex +++ b/moc.tex @@ -27,10 +27,10 @@ \iftth \newcommand{\BibTeX}{BibTeX} \fi -\newcommand\apj{The Astrophysical Journal} -\newcommand\jcap{Journal of Cosmology and Astroparticle Physics} -\newcommand\prd{Physical Review D} -\newcommand\aap{Astronomy \& Astrophysics } +\renewcommand\apj{The Astrophysical Journal} +\renewcommand\jcap{Journal of Cosmology and Astroparticle Physics} +\renewcommand\prd{Physical Review D} +\renewcommand\aap{Astronomy \& Astrophysics } \iftth \newcommand{\comicstuff}[1]{