jacow (8apr19)

git-svn-id: svn://tug.org/texlive/trunk@50870 c570f23f-e606-0410-a88d-b1316a301751

15 files changed, 384 insertions, 255 deletions

diff --git a/Master/texmf-dist/doc/latex/jacow/JACoW_A4_LaTeX.pdf b/Master/texmf-dist/doc/latex/jacow/JACoW_A4_LaTeX.pdf
deleted file mode 100644
index 34ad36e5d86..00000000000
--- a/Master/texmf-dist/doc/latex/jacow/JACoW_A4_LaTeX.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/jacow/JACoW_LaTeX_A4.pdf b/Master/texmf-dist/doc/latex/jacow/JACoW_LaTeX_A4.pdf
new file mode 100644
index 00000000000..daf5300703c
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/jacow/JACoW_LaTeX_A4.pdf
diff --git a/Master/texmf-dist/doc/latex/jacow/JACoW_A4_LaTeX.tex b/Master/texmf-dist/doc/latex/jacow/JACoW_LaTeX_A4.tex
index f6d8fd234c9..4dee33ef9d3 100644
--- a/Master/texmf-dist/doc/latex/jacow/JACoW_A4_LaTeX.tex
+++ b/Master/texmf-dist/doc/latex/jacow/JACoW_LaTeX_A4.tex
@@ -1,3 +1,13 @@
+% !TeX spellcheck = en_GB
+% !TeX program = lualatex
+%
+% v 2.3  Feb 2019   Volker RW Schaa
+%		# changes in the collaboration therefore updated file "jacow-collaboration.tex"
+%		# all References with DOIs have their period/full stop before the DOI (after pp. or year)
+%		# in the author/affiliation block all ZIP codes in square brackets removed as it was not %         understood as optional parameter and ZIP codes had bin put in brackets
+%       # References to the current IPAC are changed to "IPAC'19, Melbourne, Australia"
+%       # font for ‘url’ style changed to ‘newtxtt’ as it is easier to distinguish "O" and "0"
+%
 \documentclass[a4paper,
                %boxit,        % check whether paper is inside correct margins
                %titlepage,    % separate title page
@@ -39,7 +49,6 @@
 
 \usepackage[USenglish]{babel}
 
-
 %
 % if BibLaTeX is used
 %
@@ -60,9 +69,9 @@
 
 \title{preparation OF papers for \NoCaseChange{JACoW} conferences\thanks{Work supported by ...}}
 
-\author{A. N. Author\thanks{email address}, H. Coauthor, Name of Institute or Affiliation, [Postal Code] City, Country \\
-		P. Contributor\textsuperscript{1}, Name of Institute or Affiliation, [Postal Code] City, Country \\
-		\textsuperscript{1}also at Name of Secondary Institute or Affiliation, [Postal Code] City, Country}
+\author{A. N. Author\thanks{email address}, H. Coauthor, Name of Institute or Affiliation, City, Country \\
+		P. Contributor\textsuperscript{1}, Name of Institute or Affiliation, City, Country \\
+		\textsuperscript{1}also at Name of Secondary Institute or Affiliation, City, Country}
 	
 \maketitle
 
@@ -78,11 +87,11 @@
    submission, etc. It is not intended that this should
    be a tutorial in word processing; the aim is to explain the
    particular requirements for electronic publication at
-   www.JACoW.org. The abstract itself is to act as a standalone
+   www.JACoW.org. The abstract itself is to act as a stand-alone
    entity and, as such, should not include citations. Any acronyms 
    should be expanded on their first occurrence, both in the 
    abstract and in the rest of the paper. 
-   The abstract itself is to act as a standalone entity and, 
+   The abstract itself is to act as a stand-alone entity and, 
    as such, should not include citations. Any acronyms should 
    be expanded on their first occurrence, both in the abstract 
    and in the rest of the paper.
@@ -124,14 +133,14 @@ requirements. Manuscripts should have:
            Right       & \SI{20}{mm} (\SI{0.79}{in})            & \SI{1.02}{in} (\SI{26}{mm})        \\
        \bottomrule
    \end{tabular}
-   \label{l2ea4-t1}
+   \label{tab:margins}
 \end{table}
 
 \subsection{Fonts}
 
 In order to produce good Adobe Acrobat PDF files, authors
 using the `jacow' \LaTeX{} template are asked to use only the fonts
-defined in the ‘jacow’ class file (v2.2 of 2018/02/23) in standard, 
+defined in the ‘jacow’ class file (v2.3 of 2019/01/15) in standard, 
 bold (i.\,e., \verb|\textbf|) or italic (i.\,e., \verb|\textit|) form and
 symbols from the standard set of fonts. In Word use only
 Symbol and, depending on your platform, Times or Times New Roman
@@ -143,8 +152,7 @@ be the width of the full page. Tables and figures may span
 the whole \SI{170}{mm} page width, if desired (see Fig.~\ref{fig:jacow_team}), but
 if they span both columns, they should be placed at either
 the top or bottom of a page to ensure proper flow of the
-text (which should flow from top to bottom in each column 
-and the numbering should be in sequence).
+text (which should flow from top to bottom in each column).
 
 \begin{figure}[!htb]
    \centering
@@ -155,10 +163,10 @@ and the numbering should be in sequence).
 
 \begin{figure*}[!tbh]
     \centering
-    \includegraphics*[width=\textwidth]{jacow2017}
+    \includegraphics*[width=\textwidth]{JACpic2}
 
     \caption{Example of a full-width figure showing the JACoW Team at their annual
-    	     meeting in November 2017. This figure has a multi-line caption that has to be
+    	     meeting in December 2018. This figure has a multi-line caption that has to be
     	     justified rather than centred.}
     \label{fig:jacow_team}
 \end{figure*}
@@ -166,7 +174,8 @@ and the numbering should be in sequence).
 \subsection{Title and Author List}
 
 The title should use \SI{14}{pt} bold uppercase letters and be centred on the page.
-Individual letters may be lowercased to avoid misinterpretation (e.\,g., mW, GeV, SPRing-8, SwissFEL).
+Individual letters may be lowercased to avoid misinterpretation (e.\,g., mW, GeV, 
+SPring-8, SwissFEL).
 To include a funding support statement, put an asterisk after the title and
 the support text at the bottom of the first column on page~1---in Word,
 use a text box; in \LaTeX, use $\backslash$\texttt{thanks}. See also the
@@ -230,7 +239,7 @@ captions are placed above tables.
 Figure captions are formatted as shown in Figs.~\ref{fig:paper_layout} and \ref{fig:jacow_team},
 while table captions take the form of a heading,
 with initial letters of principle words, capitalized, and
-without a period at the end (see Tables~\ref{eq:units} and \ref{tab:styles}).
+without a period at the end (see Tables~\ref{tab:margins} and~\ref{tab:styles}).
 Any reference to the contents of the table should be made from
 the body of the paper rather than from within the table
 caption itself.
@@ -251,19 +260,20 @@ If a displayed equation needs a number (i.\,e., it will be
 referenced), place it in parentheses, and flush with the
 right margin of the column. The equation itself should be
 indented and centred, as far as is possible:
-\begin{equation}\label{eq:units}
+\begin{equation}\label{eq:label}
     C_B=\frac{q^3}{3\epsilon_{0} mc}=\SI{3.54}{\micro eV/T}
 \end{equation}
 
 When referencing a numbered equation, use the word
 “Equation” at the start of a sentence, and the abbreviated
 form, “Eq.”, if in the text. The equation number is placed
-in parentheses [e.g., Eq. (1)].
+in parentheses [e.\,g., Eq.~\eqref{eq:label}], which can be 
+achieved in \LaTeX{} using \verb|\eqref{eq:label}|.
 
 \subsection{Units}
 	
 Units should be written using the standard, roman font,
-not the italic font, as shown in Eq.~(\ref{eq:units}).
+not the italic font, as shown in Eq.~\eqref{eq:label}.
 An unbreakable space should precede a unit (in \LaTeX{} use a “\verb|\,|”,
 the template uses the ‘siunitx’ package to format units).
 Some examples are: \SI{3}{keV},
@@ -286,15 +296,19 @@ with ranges where appropriate~[1--4, 10].
 
 A URL or DOI may be included as part of a reference, but its
 hyperlink should NOT be added. The usual practice is to
-use a monospace font for the URL so as to help distinguish
-it from normal text. In \LaTeX{} the ‘url’ package is used.
+use a monospaced font for the URL so as to help distinguish
+it from normal text. In \LaTeX{} the ‘url’ package is used with its 
+default font now being switched to ``newtxtt'' which offers
+a better distinction between ``\texttt{O}'' and ``\texttt{0}''.
 
 For authors to properly cite the resources used when researching
 their papers is an obligation. In the interest of
 promoting uniformity and complete citations, the IEEE
 Editorial Style for Transactions and Journals, which itself 
-adheres to the Chicago Manual of Style, has been
-adopted~\cite{IEEE}. Please consult the appended material, \textbf{ANNEX~B},
+adheres to the Chicago Manual of Style, has been adopted~\cite{IEEE}. 
+When citing a periodical, the official abbreviation of the journal 
+should be used\cite{journal-abbreviations}.
+Please consult the appended material, \textbf{ANNEX~B},
 for details. The onus is on authors to pay attention to
 the details of the said style to ensure complete, accurate
 and properly formatted references.
@@ -454,15 +468,18 @@ this should be the last section of the paper.
 		\textit{IEEE Editorial Style Manual},
 		IEEE Periodicals, Piscataway,
 		NJ, USA, Oct. 2014, pp. 34--52.
-	\end{thebibliography}
 
+	\bibitem{journal-abbreviations}
+	\url{https://woodward.library.ubc.ca/researchhelp/journal-abbreviations/}
+
+	\end{thebibliography}
 } % end \ifboolexpr
 %
 % for use as JACoW template the inclusion of the ANNEX parts have been commented out
 % to generate the complete documentation please remove the "%" of the next two commands
 % 
-%\newpage
+%%%\newpage
 
-%\include{annexes-A4}
+%%%\include{annexes-A4}
 
 \end{document}
diff --git a/Master/texmf-dist/doc/latex/jacow/JACoW_LaTeX_Letter.pdf b/Master/texmf-dist/doc/latex/jacow/JACoW_LaTeX_Letter.pdf
new file mode 100644
index 00000000000..50dab6fe47a
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/jacow/JACoW_LaTeX_Letter.pdf
diff --git a/Master/texmf-dist/doc/latex/jacow/JACoW_US_LaTeX.tex b/Master/texmf-dist/doc/latex/jacow/JACoW_LaTeX_Letter.tex
index b3caa0b512c..1513cfabaea 100644
--- a/Master/texmf-dist/doc/latex/jacow/JACoW_US_LaTeX.tex
+++ b/Master/texmf-dist/doc/latex/jacow/JACoW_LaTeX_Letter.tex
@@ -1,4 +1,15 @@
-\documentclass[letter,		  %
+% !TeX spellcheck = en_US
+%
+%
+% v 2.3  Feb 2019   Volker RW Schaa
+%		# changes in the collaboration therefore updated file "jacow-collaboration.tex"
+%		# all References with DOIs have their period/full stop before the DOI (after pp. or year)
+%		# in the author/affiliation block all ZIP codes in square brackets removed as it was not 
+%         understood as optional parameter and ZIP codes had bin put in brackets
+%       # References to the current IPAC are changed to "IPAC'19, Melbourne, Australia"
+%       # font for "url" style changed to "newtxtt" as it is easier to distinguish "O" and "0"
+%
+\documentclass[letter,
                %boxit,        % check whether paper is inside correct margins
                %titlepage,    % separate title page
                %refpage       % separate references
@@ -60,9 +71,9 @@
 
 \title{preparation OF papers for \NoCaseChange{JACoW} conferences\thanks{Work supported by ...}}
 
-\author{A. N. Author\thanks{email address}, H. Coauthor, Name of Institute or Affiliation, [Postal Code] City, Country \\
-		P. Contributor\textsuperscript{1}, Name of Institute or Affiliation, [Postal Code] City, Country \\
-		\textsuperscript{1}also at Name of Secondary Institute or Affiliation, [Postal Code] City, Country}
+\author{A. N. Author\thanks{email address}, H. Coauthor, Name of Institute or Affiliation, City, Country \\
+		P. Contributor\textsuperscript{1}, Name of Institute or Affiliation, City, Country \\
+		\textsuperscript{1}also at Name of Secondary Institute or Affiliation, City, Country}
 	
 \maketitle
 
@@ -78,11 +89,11 @@
    submission, etc. It is not intended that this should
    be a tutorial in word processing; the aim is to explain the
    particular requirements for electronic publication at
-   www.JACoW.org. The abstract itself is to act as a standalone
+   www.JACoW.org. The abstract itself is to act as a stand-alone
    entity and, as such, should not include citations. Any acronyms 
    should be expanded on their first occurrence, both in the 
    abstract and in the rest of the paper. 
-   The abstract itself is to act as a standalone entity and, 
+   The abstract itself is to act as a stand-alone entity and, 
    as such, should not include citations. Any acronyms should 
    be expanded on their first occurrence, both in the abstract 
    and in the rest of the paper.
@@ -109,10 +120,9 @@ requirements. Manuscripts should have:
     \item  Single-spaced text in two columns of \SI{82.5}{mm} (\SI{3.25}{in}) with \SI{5.3}{mm}
            (\SI{0.2}{in}) separation. More recent versions of Microsoft Word have a default spacing of 1.5 lines;
            authors must change this to 1 line.
-    \item  The text located within the margins specified in Table~\ref{l2ea4-t1}.
+    \item  The text located within the margins specified in Table~\ref{tab:margins}.
 \end{Itemize}
 \begin{table}[!hbt]
-%   \vspace*{-.5\baselineskip}
    \centering
    \caption{Margin Specifications}
    \begin{tabular}{lcc}
@@ -125,28 +135,26 @@ requirements. Manuscripts should have:
            Right       & \SI{20}{mm} (\SI{0.79}{in})            & \SI{1.02}{in} (\SI{26}{mm})        \\
        \bottomrule
    \end{tabular}
-   \label{l2ea4-t1}
-%   \vspace*{-\baselineskip}
+   \label{tab:margins}
 \end{table}
 
 \subsection{Fonts}
 
 In order to produce good Adobe Acrobat PDF files, authors
 using the `jacow' \LaTeX{} template are asked to use only the fonts
-defined in the ‘jacow’ class file (v2.2 of 2018/02/23) in standard, 
+defined in the `jacow' class file (v2.3 of 2019/01/15) in standard, 
 bold (i.\,e., \verb|\textbf|) or italic (i.\,e., \verb|\textit|) form and
 symbols from the standard set of fonts. In Word use only
 Symbol and, depending on your platform, Times or Times New Roman
 fonts in standard, bold or italic form.
 
 The layout of the text on the page is illustrated in
-Fig.~\ref{fig:paper_layout}. Note that the paper’s title and the author list should
+Fig.~\ref{fig:paper_layout}. Note that the paper's title and the author list should
 be the width of the full page. Tables and figures may span
 the whole \SI{170}{mm} page width, if desired (see Fig.~\ref{fig:jacow_team}), but
 if they span both columns, they should be placed at either
 the top or bottom of a page to ensure proper flow of the
-text (which should flow from top to bottom in each column 
-and the numbering should be in sequence).
+text (which should flow from top to bottom in each column).
 
 \begin{figure}[!htb]
    \centering
@@ -157,18 +165,19 @@ and the numbering should be in sequence).
 
 \begin{figure*}[!tbh]
     \centering
-    \includegraphics*[width=\textwidth]{jacow2017}
+    \includegraphics*[width=\textwidth]{JACpic2}
 
     \caption{Example of a full-width figure showing the JACoW Team at their annual
-    	     meeting in November 2017. This figure has a multi-line caption that has to be
-    	     justified rather than centered.}
+    	     meeting in December 2018. This figure has a multi-line caption that has to be
+    	     justified rather than centred.} %US
     \label{fig:jacow_team}
 \end{figure*}
 
 \subsection{Title and Author List}
 
-The title should use \SI{14}{pt} bold uppercase letters and be centered on the page.
-Individual letters may be lowercased to avoid misinterpretation (e.\,g., mW, GeV, SPRing-8, SwissFEL).
+The title should use \SI{14}{pt} bold uppercase letters and be centred on the page.
+Individual letters may be lowercased to avoid misinterpretation (e.\,g., mW, GeV, 
+SPring-8, SwissFEL).
 To include a funding support statement, put an asterisk after the title and
 the support text at the bottom of the first column on page~1---in Word,
 use a text box; in \LaTeX, use $\backslash$\texttt{thanks}. See also the
@@ -232,14 +241,14 @@ captions are placed above tables.
 Figure captions are formatted as shown in Figs.~\ref{fig:paper_layout} and \ref{fig:jacow_team},
 while table captions take the form of a heading,
 with initial letters of principle words, capitalized, and
-without a period at the end (see Tables~\ref{eq:units} and \ref{tab:styles}).
+without a period at the end (see Tables~\ref{tab:margins} and~\ref{tab:styles}).
 Any reference to the contents of the table should be made from
 the body of the paper rather than from within the table
 caption itself.
 
 Single-line captions are centered in the column, while captions
 that span more than one line should be justified.
-The \LaTeX{} template uses the ‘booktabs’ package to
+The \LaTeX{} template uses the “booktabs” package to
 format tables.
 
 When referring to a figure from within the text, the
@@ -253,25 +262,26 @@ If a displayed equation needs a number (i.\,e., it will be
 referenced), place it in parentheses, and flush with the
 right margin of the column. The equation itself should be
 indented and centered, as far as is possible:
-\begin{equation}\label{eq:units}
+\begin{equation}\label{eq:label}
     C_B=\frac{q^3}{3\epsilon_{0} mc}=\SI{3.54}{\micro eV/T}
 \end{equation}
 
 When referencing a numbered equation, use the word
 “Equation” at the start of a sentence, and the abbreviated
 form, “Eq.”, if in the text. The equation number is placed
-in parentheses [e.g., Eq. (1)].
+in parentheses [e.\,g., Eq.~\eqref{eq:label}], which can be 
+achieved in \LaTeX{} using \verb|\eqref{eq:label}|.
 
 \subsection{Units}
 	
 Units should be written using the standard, roman font,
-not the italic font, as shown in Eq.~(\ref{eq:units}).
+not the italic font, as shown in Eq.~\eqref{eq:label}.
 An unbreakable space should precede a unit (in \LaTeX{} use a “\verb|\,|”,
-the template uses the ‘siunitx’ package to format units).
+the template uses the “siunitx” package to format units).
 Some examples are: \SI{3}{keV},
 \SI{100}{kW}, \SI{7}{µm}. When a unit appears in a hyphenated,
 compound adjective that precedes a noun, it takes on the
-singular form, e.\,g., the 3.8-metre long undulator.
+singular form, e.\,g., the 3.8-meter long undulator.
 
 \subsection{References}
 %
@@ -288,15 +298,19 @@ with ranges where appropriate~[1--4, 10].
 
 A URL or DOI may be included as part of a reference, but its
 hyperlink should NOT be added. The usual practice is to
-use a monospace font for the URL so as to help distinguish
-it from normal text. In \LaTeX{} the ‘url’ package is used.
+use a monospaced font for the URL so as to help distinguish
+it from normal text. In \LaTeX{} the “url” package is used with its 
+default font now being switched to ``newtxtt'' which offers
+a better distinction between ``\texttt{O}'' and ``\texttt{0}''.
 
 For authors to properly cite the resources used when researching
 their papers is an obligation. In the interest of
 promoting uniformity and complete citations, the IEEE
 Editorial Style for Transactions and Journals, which itself 
-adheres to the Chicago Manual of Style, has been
-adopted~\cite{IEEE}. Please consult the appended material, \textbf{ANNEX~B},
+adheres to the Chicago Manual of Style, has been adopted~\cite{IEEE}. 
+When citing a periodical, the official abbreviation of the journal 
+should be used\cite{journal-abbreviations}.
+Please consult the appended material, \textbf{ANNEX~B},
 for details. The onus is on authors to pay attention to
 the details of the said style to ensure complete, accurate
 and properly formatted references.
@@ -306,7 +320,6 @@ and properly formatted references.
 	\centering
 	\caption{Summary of Styles}
 	\label{tab:styles}
-	%    \begin{tabular}{p{60pt}p{90pt}cc}
 	\begin{tabular}{llcc}
 		\toprule
 		\textbf{Style} & \textbf{Font}               & \textbf{Space}  & \textbf{Space} \\
@@ -358,7 +371,7 @@ and properly formatted references.
 
 \subsection{Footnotes}
 
-Footnotes on the title and author lines may be used for acknowledgements
+Footnotes on the title and author lines may be used for acknowledgments
 and e-mail addresses. A non-numeric sequence of characters (*, \#,
 \dag, \ddag, \P) should be used to indicate the footnote.
 These “pseudo footnotes” should only
@@ -378,7 +391,7 @@ both in the abstract and in the rest of the paper.
 
 Table~\ref{tab:styles} summarizes the fonts and spacing used in the styles of
 a JACoW template. In \LaTeX, these 
-are implemented in the ‘jacow’ class file.
+are implemented in the “jacow” class file.
 
 \section{PAGE NUMBERS}
 
@@ -425,10 +438,10 @@ Please also check the list of common oversights which can be found in \textbf{AN
 \section{CONCLUSION}
 
 Any conclusions should be in a separate section directly preceding
-the \textbf{ACKNOWLEDGEMENTS}, \textbf{APPENDIX}, or \textbf{REFERENCES} sections, in that
+the \textbf{ACKNOWLEDGMENTS}, \textbf{APPENDIX}, or \textbf{REFERENCES} sections, in that
 order.
 
-\section{ACKNOWLEDGEMENTS}
+\section{ACKNOWLEDGMENTS}
 Any acknowledgement should be in a separate section directly preceding
 the \textbf{REFERENCES} or \textbf{APPENDIX} section.
 
@@ -438,7 +451,9 @@ Any appendix should be in a separate section directly preceding
 the \textbf{REFERENCES} section. If there is no \textbf{REFERENCES} section,
 this should be the last section of the paper.
 
+%
 % only for "biblatex"
+%
 \ifboolexpr{bool{jacowbiblatex}}%
 	{\printbibliography}%
 	{%
@@ -455,16 +470,19 @@ this should be the last section of the paper.
 		\textit{IEEE Editorial Style Manual},
 		IEEE Periodicals, Piscataway,
 		NJ, USA, Oct. 2014, pp. 34--52.
+
+	\bibitem{journal-abbreviations}
+	\url{https://woodward.library.ubc.ca/researchhelp/journal-abbreviations/}
+
 	\end{thebibliography}
-	
 } % end \ifboolexpr
 
 %
 % for use as JACoW template the inclusion of the ANNEX parts have been commented out
 % to generate the complete documentation please remove the "%" of the next two commands
 % 
-%\newpage
+%%%%\newpage
 
-%\include{annexes-A4}
+%%%%\include{annexes-Letter}
 
 \end{document}
diff --git a/Master/texmf-dist/doc/latex/jacow/JACoW_US_LaTeX.pdf b/Master/texmf-dist/doc/latex/jacow/JACoW_US_LaTeX.pdf
deleted file mode 100644
index c646826d525..00000000000
--- a/Master/texmf-dist/doc/latex/jacow/JACoW_US_LaTeX.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/jacow/JACpic2.jpg b/Master/texmf-dist/doc/latex/jacow/JACpic2.jpg
new file mode 100644
index 00000000000..dc611f79181
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/jacow/JACpic2.jpg
diff --git a/Master/texmf-dist/doc/latex/jacow/README b/Master/texmf-dist/doc/latex/jacow/README
index b93f8a7a2b7..1680a414472 100644
--- a/Master/texmf-dist/doc/latex/jacow/README
+++ b/Master/texmf-dist/doc/latex/jacow/README
@@ -6,9 +6,9 @@ Class File: jacow.cls
 Authors:    John Jowett (CERN), Michel Goossens (CERN), 
             Martin Comyn (TRIUMF), John Poole (CERN), Todd Satogata (BNL), 
             Ulrike Fischer, Volker RW Schaa (GSI)
-Version:    2.2
-Date:       22 Februar 2018
-Copyright:  1996-2018 by JACoW, Geneva, Switzerland
+Version:    2.4
+Date:       01 April 2019
+Copyright:  1996-2019 by JACoW, Geneva, Switzerland
 Homepage:   http://www.jacow.org
 License:    LPPL 1.3c
 Status:     Maintained
@@ -32,35 +32,34 @@ particular requirements for electronic publication at www.JACoW.org.
 
 The package consists of the following files
   class file
-    jacow.cls             	JACoW class file v2.2 of 2018/02/23
+    jacow.cls               JACoW class file v2.4 of 2019/04/01
 
   templates
-    JACoW_A4_LaTeX.tex    	basic A4/letter templates to demonstrate the
-    JACoW_US_LaTeX.tex  	use and explain the various parameters
+    JACoW_LaTeX_A4.tex      basic A4/letter templates to demonstrate the
+    JACoW_LaTeX_Letter.tex  use and explain the various parameters
                             and settings for a submission to a
                             JACoW conference proceedings.
-							
-    JACoW_A4_LaTeX.pdf    	PDF with JACoW class file documentation and examples for  
-							A4 with "en_uk" and Letter with en_us specific formatting.
                             
-    JACoW_US_LaTeX.pdf	  	template in format "letter" and American formatting
+    JACoW_LaTeX_A4.pdf      PDF with JACoW class file documentation and examples for  
+                            A4 with "en_uk" and Letter with en_us specific formatting.
+                            
+    JACoW_LaTeX_Letter.pdf  template in format "letter" and American formatting
 
-							To generate the complete PDF for documentation
-							please remove the "%" of the last two commands
-							in "JACoW_xx_LaTeX.tex" which include the 
-							Annexes A-C of "annexes-xx.tex"
+                            To generate the complete PDF for documentation
+                            please remove the "%" of the last two commands
+                            in "JACoW_LaTeX_A4/Letter.tex" which include the 
+                            Annexes A-C of "annexes-A4/Letter.tex"
 
-	annexes-A4.tex			Annexes A-C which are included in "JACoW_A4_LaTeX.tex"
-	annexes-US.tex			Annexes A-C which are included in "JACoW_US_LaTeX.tex"
-							
+    annexes-A4.tex          Annexes A-C which are included in "JACoW_LaTeX_A4.tex"
+    annexes-Letter.tex      Annexes A-C which are included in "JACoW_LaTeX_Letter.tex"
+                            
 
   figures/includes
-    JACpic_mc.pdf         	a graphic showing the JACoW page format 
-							(being the smaller side of A4 and letter respectively)
-    jacow2017.jpg         	a graphic for a full width figure (spanning
+    JACpic_mc.pdf           a graphic showing the JACoW page format 
+                            (being the smaller side of A4 and letter respectively)
+    JACpic2.jpg             a graphic for a full width figure (spanning
                             the two columns and multiline caption) showing
-							the participants of the 2017 JACoW Team Meeting
-
-    jacow-collaboration-2018.tex  	an example title page showing the JACoW Collaboration. 
-    jacow-collaboration-2018.pdf  	The PDF is later included in ANNEX A.
+                            the participants of the 2017 JACoW Team Meeting
 
+   jacow-collaboration.tex  (an example) title page showing the JACoW Collaboration. 
+   jacow-collaboration.pdf  This PDF is included in Annex A.
diff --git a/Master/texmf-dist/doc/latex/jacow/annexes-A4.tex b/Master/texmf-dist/doc/latex/jacow/annexes-A4.tex
index 28e45f81d7f..8c2a72cbd45 100644
--- a/Master/texmf-dist/doc/latex/jacow/annexes-A4.tex
+++ b/Master/texmf-dist/doc/latex/jacow/annexes-A4.tex
@@ -1,3 +1,6 @@
+%
+% !TeX spellcheck = en_GB
+%
 \twocolumn[\vspace*{-1.8ex}\section{ANNEX A:\endgraf FORMATTING OF AUTHORS AND AFFILIATIONS}\vspace*{\baselineskip}]
 
 \flushcolsend
@@ -34,14 +37,14 @@ For manuscripts submitted by large collaborations with
 potentially many tens of authors and where, additionally,
 there may be page number limitations, a format consisting
 of the principle author’s name and institute, followed by
-“on behalf of the … collaboration”, is preferred.
+“on behalf of the \ldots\ collaboration”, is preferred.
 
 
 \clearpage
 %
 % Include the title/author page of the JACoW Coolaboration
 %
-\includepdf[pages=-, noautoscale, pagecommand={}]{jacow-collaboration-2018.pdf}{}
+\includepdf[pages=-, noautoscale, pagecommand={}]{jacow-collaboration.pdf}{}
 
 \clearpage
 
@@ -50,7 +53,7 @@ of the principle author’s name and institute, followed by
 \subsection{Referencing JACoW Proceedings}
 
 The format for published JACoW proceedings papers is detailed in the following 
-and can also be readily deduced from Refs. [1-3]. At the very minimum, sufficient 
+and can also be readily deduced from Refs.~[1-3]. At the very minimum, sufficient 
 information should be given to enable readers to clearly identify the paper and 
 to facilitate its import into digital databases.
 \vspace*{-.6\baselineskip}
@@ -64,13 +67,13 @@ of authors becomes large (e.g., $>$6).
 \vspace*{-.6\baselineskip}
 
 \subsubsection{Paper Title} As is modern practice in references, the title
-of the paper is written in sentence case, i.e., only the
+of the paper is written in sentence case, i.\,e., only the
 initial letter of the first word in the title is capitalized.
 Proper nouns, however, also have a capital. Capital letters
 appearing in acronyms likewise remain unaltered
 \vspace*{-.6\baselineskip}
 
-\subsubsection{Conference Proceedings} The proceedings title is
+\subsubsection{Conference Proceedings} The title of the proceedings is
 written in title case in italics using standard abbreviations,
 such as \emph{Int.} and \emph{Conf.} The preposition, ``in'', in normal
 font, precedes the proceedings title. The location,
@@ -80,9 +83,15 @@ the conference took place, is then listed. Finally, details
 pertaining to the paper itself, such as the conference paper
 ID, mandatory page numbers, and the digital object
 identifier (DOI), if existing, are listed in the given order.
-A monospace font for the DOI is used so as to help
+A monospaced font for the DOI is used so as to help
 distinguish it from normal text. In \LaTeX{}
-the ‘url’ package is used. The conference
+the ‘url’ package is used. The Word template uses the Liberation
+Mono TrueType font (size 8 pt), or Lucida Sans Typewriter
+font (size 7.5 pt) in earlier Word versions where the Liberation
+Mono font may not be available. In LaTeX, the ‘url’
+package is used with its default font now being switched to 
+``newtxtt'' which offers a better distinction between 
+``\texttt{O}'' and ``\texttt{0}''. The conference
 paper ID is optional and may be included in the absence
 of a DOI to facilitate a search through internet search
 engines. DOIs have been assigned to all JACoW
@@ -113,10 +122,11 @@ conference should be written as shown in [5]; the wording
 The IEEE style is also shown for periodicals [6-11],
 online sources [12], books [13, 14], internal reports [15],
 theses [16], manuals or handbooks [17], patents [18] and
-unpublished material [19, 20]. Examples of correctly
-formatted references can also be found at the JACoW website,
-under ‘Formatting Citations’ which is reached through the
-‘for Authors’ link.
+unpublished material [19, 20]. When citing a periodical,
+only the official abbreviation of the journal should be used
+[21]. Examples of correctly formatted references can also be 
+found at the JACoW website, under ‘Formatting Citations’ which 
+is reached through the ‘for Authors’ link.
 
 \subsection{Alignment of References}
 
@@ -147,25 +157,24 @@ references is ten or more.
 	
 	\bibitem{item:1-1}
 	A.~Alpha and B.~T.~Beta, “Novel techniques for future TeV electron accelerators”,
-	in \textit{Proc. 8th Int. Particle Accelerator Conf. (IPAC’17)},
-	Copenhagen, Denmark, May 2017, 
-	pp. 567-569, \url{doi:10.18429/JACoW-IPAC2017-PAPERID}
+	in \textit{Proc.\ 9th Int.\ Particle Accelerator Conf.\ (IPAC’18)},
+	Vancouver, BC, Canada, Apr.-May 2018.
+	pp. 567-569. \url{doi:10.18429/JACoW-IPAC2017-PAPERID}
 	\CCom{jgreen}{Conference Proceedings, two authors; DOI encouraged}
 
 	\bibitem{item:1-2}
 	A.~Alpha \emph{et al.},
-	“A new 12\,GHz electron linear accelerator”,
-	in \emph{Proc. 28th Linear Accelerator Conf. (LINAC’16)},
-	East Lansing, MI, USA, Sep. 2016, pp. 27-31, \newline
-	\url{doi:10.18429/JACoW-LINAC2016-PAPERID}
+	“A novel injector”, in \emph{Proc.\ 29th Linear Accelerator Conf.\ (LINAC’18)},
+	Shanghai, China, Sep.\ 2018, pp.\ 27-31. %\newline
+	\url{doi:10.18429/JACoW-LINAC2018-PAPERID}
 	\CCom{jgreen}{Conference Proceedings, for six or more authors use \emph{et al.};	
 		 DOI encouraged}
 	
 	\bibitem{item:1-3}	
 	A.~Alpha, B.~T.~Beta, C.~Gamma, and D.~Delta,
 	“An overview of control systems”,
-	in \emph{Proc. 13th Int. Conf. on Accelerator and Large Experimental Physics Control Systems (ICALEPCS’11)}, Grenoble, France, Oct. 2011,
-	paper TUP014, pp. 89--91.
+	in \emph{Proc.\ 13th Int.\ Conf.\ on Accelerator and Large Experimental Physics Control Systems (ICALEPCS’11)}, Grenoble, France, Oct.\ 2011,
+	paper TUP014, pp.\ 89--91.
 	\CCom{jgreen}{Conference Proceedings, four authors; optional paper ID
 	in the absence of a DOI}
 \end{thebibliography}
@@ -176,25 +185,23 @@ references is ten or more.
 \begin{thebibliography}{9} % Use for 1-9 references
 	\bibitem{item:2-1}
 	A.~Alpha and B.~T.~Beta, “Novel techniques for future TeV electron accelerators”,
-	in \textit{Proc. IPAC’17}, Copenhagen, Denmark, May 2017, 
-	pp. 567-569, \newline
-	\url{doi:10.18429/JACoW-IPAC2017-PAPERID}
+	in \textit{Proc.\ IPAC’18}, 	Vancouver, BC, Canada, Apr.-May 2018,
+	pp.\ 567-569. %\newline
+	\url{doi:10.18429/JACoW-IPAC2018-PAPERID}
 	\CCom{jgreen}{Conference Proceedings, two authors; DOI encouraged}
 	
 	\bibitem{item:2-2}
 	A.~Alpha \emph{et al.},
-	“A new 12\,GHz electron linear accelerator”,
-	in \emph{Proc. LINAC’16},
-	East Lansing, MI, USA, Sep. 2016, pp.\,27-31, 
-	\url{doi:10.18429/JACoW-LINAC2016-PAPERID}
-	\CCom{jgreen}{Conference Proceedings, for six or more authors use \emph{et al.};	
-		 		  DOI encouraged}
+	“A novel injector”, in \emph{Proc.\ LINAC’18},
+	Shanghai, China, Sep.\ 2018, pp.\ 27-31. %\newline
+	\url{doi:10.18429/JACoW-LINAC2018-PAPERID}
+	\CCom{jgreen}{Conference Proceedings, for six or more authors use \emph{et al.}; DOI encouraged}
 	
 	\bibitem{item:2-3}	
 	A.~Alpha, B.~T.~Beta, C.~Gamma, and D.~Delta,
 	“An overview of control systems”,
-	in \emph{Proc. ICALEPCS’11}, Grenoble, France, Oct. 2011,
-	paper TUP014, pp. 89--91.
+	in \emph{Proc.\ ICALEPCS’11}, Grenoble, France, Oct.\ 2011,
+	paper TUP014, pp.\ 89--91.
 	\CCom{jgreen}{Conference Proceedings, four authors; optional paper ID
 				  in the absence of a DOI}
 \end{thebibliography}
@@ -208,8 +215,8 @@ references is ten or more.
  \bibitem{item:41}
 	A.~Alpha and B.~T.~Beta,
 	“An interesting talk but paper not submitted”,
-	presented at the 5th Int. Particle Accelerator Conf. (IPAC’14),
-	Dresden, Germany, Jun. 2014, paper MOAX01, unpublished.
+	presented at the 5th Int.\ Particle Accelerator Conf.\ (IPAC’14),
+	Dresden, Germany, Jun.\ 2014, paper MOAX01, unpublished.
 	\CCom{jred}{Unpublished paper; conference name in normal font; paper
 	ID may only be given if material supplementing the proceedings
 	exists on the JACoW website, e.\,g., PDF of talk}
@@ -223,7 +230,7 @@ references is ten or more.
 	A.~Alpha and B.~T.~Beta,
 	“An interesting talk but paper not submitted”,
 	presented at IPAC’14,
-	Dresden, Germany, Jun. 2014, paper MOAX01, unpublished.
+	Dresden, Germany, Jun.\ 2014, paper MOAX01, unpublished.
 	\CCom{jred}{Unpublished paper; conference name in normal font; paper
 	ID may only be given if material supplementing the proceedings
 	exists on the JACoW website, e.\,g., PDF of talk}
@@ -239,8 +246,8 @@ references is ten or more.
  \bibitem{item:51}
 	A.~Alpha and B.~T.~Beta,
 	“An interesting talk at this conference”,
-	presented at the 9th Int. Particle Accelerator
-	Conf. (IPAC’18), Vancouver, Canada, Apr.-May 2018, 
+	presented at the 10th Int.\ Particle Accelerator
+	Conf.\ (IPAC’19), Melbourne, Australia, May 2019, 
 	paper MOAB01, this conference.
 	\CCom{jgrepc}{Current conference; conference name in normal font; 
 				  the wording “this conference” is optional}
@@ -252,7 +259,7 @@ references is ten or more.
 \setcounter{enumi}{4}
 	\bibitem{item:52}
 	“An interesting talk at this conference”,
-	presented at IPAC’18, Vancouver, Canada, Apr.-May 2018, 
+	presented at IPAC’19, Melbourne, Australia, May 2019, 
 	paper MOAB01, this conference.
 	\CCom{jgrepc}{Current conference; conference name in normal font; 
 				  the wording “this conference” is optional}
@@ -267,39 +274,39 @@ references is ten or more.
 	\bibitem{item:6}
 		P.~Mercury \emph{et al.},
 		“Title of paper published in journal”,
-		\emph{Phy.~Rev.~	Lett.}, vol. 114, no. 5,
-		p. 050511, Feb. 2014,
+		\emph{Phy.\ Rev.\ Lett.}, vol.\ 114, no.\ 5,
+		p.\ 050511, Feb.\ 2014.
 		\url{doi:10.1103/PhysRevLett.114.050511}
-	\CCom{jblue}{Periodical, Phys. Rev. Lett.;
-		             issue no. and month may be omitted}
+	\CCom{jblue}{Periodical, Phys.\ Rev.\ Lett.;
+		             issue no.\ and month may be omitted}
 
 	\bibitem{item:7}
 		P.~Venus \emph{et al.},
 		“New techniques in laser wakefield accelerators”,
-		\emph{Phys. Rev. ST Accel. Beams}, vol. 18,
-		p. 120198, Dec.~2015, \newline
+		\emph{Phys.\ Rev.\ ST Accel.\ Beams}, vol.\ 18,
+		p.\ 120198, Dec.~2015. %\newline
 		\url{doi:10.1103/PhysRevAccelBeams.18.120198} 
-	\CCom{jblue}{Periodical, Phys. Rev. ST Accel. Beams;
+	\CCom{jblue}{Periodical, Phys.\ Rev.\ ST Accel.\ Beams;
 			              month may be omitted}
 
 	\bibitem{item:8}
 		T.~Earth \emph{et al.},
 		“Low dose irradiation impact on modern silicon detectors”,
-		\emph{Nucl. Instr. Meth.}, vol. 692, pp. 256--280, 2014,
+		\emph{Nucl.\ Instr.\ Meth.}, vol.\ 692, pp.\ 256--280, 2014.
 		\url{doi:10.1016/j.nima.2014.11.022}
 	\CCom{jblue}{Periodical, Nucl. Instr. Method.}
 	
 	\bibitem{item:9}
 		T.~Earth, L.~Moon, and A.~Belt,
 		“Temporal correlations of x-ray free electron lasers”,
-		\emph{Optics Express}, vol. 20, pp. 11396--11404, 2012,
+		\emph{Optics Express}, vol.\ 20, pp.\ 11396--11404, 2012.
 		\url{doi:10.1364/OE.20.11396}
 	\CCom{jblue}{Periodical, Optics Express}
 
 	\bibitem{item:10}
 		J.~B.~Good,
 		“A paper accepted for publication”,
-		\emph{Phys. Rev. Lett.}, to be published.
+		\emph{Phys.\ Rev.\ Lett.}, to be published.
 	\CCom{jblue}{Periodical, paper accepted for publication
 		              by Phys. Rev. Lett.}
 
@@ -318,15 +325,13 @@ references is ten or more.
   \setcounter{enumi}{11}
 	\bibitem{item:121}
 		JACoW, \url{http://www.jacow.org} 
-		\CCom{jvio}{online source; no hyperlink, no period at end of URL unless there is a
-					trailing “/” as shown below. A monospace font should be used, this is
-					achieved using the ‘url’ package in \LaTeX}
+		\CCom{jvio}{online source; no hyperlink, no period at end of URL unless there is a trailing “/” as shown below. A monospaced font should be used, this is achieved using the ‘url’ package in \LaTeX}
 
   \setcounter{enumi}{11}
 	\bibitem{item:122}
 		JACoW, \url{http://www.jacow.org/}.  
-		\CCom{jvio}{online source; no hyperlink, period after traling “/” in
-					URL allowed. A monospace font should be used, this is
+		\CCom{jvio}{online source; no hyperlink, period after trailing “/” in URL
+					if optionally preferred. A monospaced font should be used, this is
 					achieved using the ‘url’ package in \LaTeX}
 
 \end{thebibliography}
@@ -338,8 +343,8 @@ references is ten or more.
 	\bibitem{item:13}
 		T.~Earth and L.~Moon,
 		“Title of chapter in the book”,
-		in \emph{Title of Book}, R Mars, Ed. New York, NY, USA:
-		Wiley, 1994, pp.~42--48. 
+		in \emph{Title of Book}, R Mars, Ed.\ New York, NY, USA:
+		Wiley, 1994, pp.\ 42--48. 
 	\CCom{jbook}{Chapter in book}
 	
 	\bibitem{item:14}
@@ -355,12 +360,12 @@ references is ten or more.
 	\bibitem{item:15}
 		G. Jupiter \emph{et al.},
 		“Title of report”, CERN, Geneva, Switzerland,
-		Rep. CERN-2012-333, Oct. 2012.
+		Rep.\ CERN-2012-333, Oct.\ 2012.
 	\CCom{jrept}{Report}
 
 	\bibitem{item:16}
 		A.~Student, “Title of thesis”,
-		Ph.D. thesis, Phys. Dept.,
+		Ph.D.\ thesis, Phys.\ Dept.,
 		Karlsruher Institut für Technologie, Karlsruhe,
 		Germany, 2014.
 	\CCom{jrept}{Thesis}
@@ -373,7 +378,7 @@ references is ten or more.
 	\bibitem{item:17}
 		\emph{IEEE Editorial Style Manual},
 		IEEE Periodicals,
-		Piscataway, NJ, USA, Oct. 2014, pp. 34-52;
+		Piscataway, NJ, USA, Oct.\ 2014, pp.\ 34-52;
 		\url{http://www.ieee.org/documents/style_manual.pdf} 
 	\CCom{jmanu}{Handbook/Manual, no hyperlink, no period after URL}
 \end{thebibliography}
@@ -385,7 +390,7 @@ references is ten or more.
 		\bibitem{item:18}
 		A.~N.~Inventor,
 		“Title of patent”,
-		Patent Authority and No., Jan. 20, 2016.
+		Patent Authority and No., Jan.\ 20, 2016.
 
 \end{thebibliography}
 
@@ -398,8 +403,18 @@ references is ten or more.
 	\CCom{junpu}{Unpublished}
 	
 	\bibitem{item:20}
-	P.~Uranus, private communication, Jun. 2015.
+	P.~Uranus, private communication, Jun.\ 2015.
 	\CCom{junpu}{Private communication}
+\end{thebibliography}
+
+\newpage
+
+\section{JOURNAL ABBREVIATIONS}
+
+\begin{thebibliography}{99} % Use for 1-9 references
+	\setcounter{enumi}{20}
+	\bibitem{item:21}
+		\url{https://woodward.library.ubc.ca/researchhelp/journal-abbreviations/}
 
 \end{thebibliography}
 
@@ -462,20 +477,27 @@ more lines:
 	Figure 2: A lengthy figure caption that spans
 	two lines is justified.
 \end{justify}
+
 Note the colon “:” after the figure number and the period
 “.” at the end of the caption.
 
-
 When referring to a figure from within the text, the
 convention is to use the abbreviated form, i.\,e., Fig.~1,
 \emph{unless} the reference to the figure is at the start of the sentence:
 \begin{quote}
-	Figure 1 shows a schematic view of...
+	Figure 1 shows a schematic view of\ldots
 	
-	... as shown in Fig.~1.
+	\ldots as shown in Fig.~1.
 \end{quote}
 
+% if set as \subsection, the title will appear at the top
+% of the column followed by "Table captions ... lines:", 
+% then follows the text above after the justify till end of quote
+\iffalse
 \subsection{Table Headings}
+\else
+\noindent\textit{\vspace{1em}\large Table Headings}
+\fi
 
 Table captions should be placed \emph{above} the table and
 centred if on one line, but justified if spanning two or
@@ -483,12 +505,13 @@ more lines:
 \begin{center}
 	Table 1: Table Heading
 \end{center}
+
 \begin{justify}
 	Table 2: A Particularly Long Table Heading
 	Spanning Two Lines
 \end{justify}
 
-Note the colon ":" after the table number, that the initial
+Note the colon “:” after the table number, that the initial
 letters of the principle words in the table heading are
 capitalized, and the absence of a period at the end of the
 caption.
@@ -506,7 +529,7 @@ placed flush with the right margin of the column.
 An unbreakable space should always precede a unit. In \LaTeX{} use
 a “\verb|\,|” or the ‘siunitx’ package to format units.
 Examples are:
-\SI{3}{keV}, \SI{4}{GeV}, \SI{100}{kW}, \SI{7}{µm}.
+\SI{3}{keV}, \SI{4}{GeV}, \SI{100}{kW}, \SI{7}{\micro m}.
 
 \subsection{References}
 
diff --git a/Master/texmf-dist/doc/latex/jacow/annexes-US.tex b/Master/texmf-dist/doc/latex/jacow/annexes-Letter.tex
index 290e098dc3f..d4a29962fc6 100644
--- a/Master/texmf-dist/doc/latex/jacow/annexes-US.tex
+++ b/Master/texmf-dist/doc/latex/jacow/annexes-Letter.tex
@@ -1,3 +1,6 @@
+%
+% !TeX spellcheck = en_US
+%
 \twocolumn[\vspace*{-1.8ex}\section{ANNEX A:\endgraf FORMATTING OF AUTHORS AND AFFILIATIONS}\vspace*{\baselineskip}]
 
 \flushcolsend
@@ -21,7 +24,7 @@ indicated with a superscript, as shown in the following.
 
 
 Footnotes on the title and author lines may be used for
-acknowledgements and e-mail addresses, using a non-numeric
+acknowledgments and e-mail addresses, using a non-numeric
 sequence of characters (\textsuperscript{*}, \textsuperscript{†},
 \textsuperscript{‡}, \textsuperscript{§}, \textsuperscript{\P}
 as generated by \LaTeX's \verb|\footnote| command).
@@ -34,14 +37,14 @@ For manuscripts submitted by large collaborations with
 potentially many tens of authors and where, additionally,
 there may be page number limitations, a format consisting
 of the principle author’s name and institute, followed by
-“on behalf of the … collaboration”, is preferred.
+“on behalf of the \ldots\ collaboration”, is preferred.
 
 
 \clearpage
 %
 % Include the title/author page of the JACoW Coolaboration
 %
-\includepdf[pages=-, noautoscale, pagecommand={}]{jacow-collaboration-2018.pdf}{}
+\includepdf[pages=-, noautoscale, pagecommand={}]{jacow-collaboration.pdf}{}
 
 \clearpage
 
@@ -50,7 +53,7 @@ of the principle author’s name and institute, followed by
 \subsection{Referencing JACoW Proceedings}
 
 The format for published JACoW proceedings papers is detailed in the following 
-and can also be readily deduced from Refs. [1-3]. At the very minimum, sufficient 
+and can also be readily deduced from Refs.~[1-3]. At the very minimum, sufficient 
 information should be given to enable readers to clearly identify the paper and 
 to facilitate its import into digital databases.
 \vspace*{-.6\baselineskip}
@@ -64,13 +67,13 @@ of authors becomes large (e.g., $>$6).
 \vspace*{-.6\baselineskip}
 
 \subsubsection{Paper Title} As is modern practice in references, the title
-of the paper is written in sentence case, i.e., only the
+of the paper is written in sentence case, i.\,e., only the
 initial letter of the first word in the title is capitalized.
 Proper nouns, however, also have a capital. Capital letters
 appearing in acronyms likewise remain unaltered
 \vspace*{-.6\baselineskip}
 
-\subsubsection{Conference Proceedings} The proceedings title is
+\subsubsection{Conference Proceedings} The title of the proceedings is
 written in title case in italics using standard abbreviations,
 such as \emph{Int.} and \emph{Conf.} The preposition, ``in'', in normal
 font, precedes the proceedings title. The location,
@@ -80,9 +83,15 @@ the conference took place, is then listed. Finally, details
 pertaining to the paper itself, such as the conference paper
 ID, mandatory page numbers, and the digital object
 identifier (DOI), if existing, are listed in the given order.
-A monospace font for the DOI is used so as to help
+A monospaced font for the DOI is used so as to help
 distinguish it from normal text. In \LaTeX{}
-the ‘url’ package is used. The conference
+the ‘url’ package is used. The Word template uses the Liberation
+Mono TrueType font (size 8 pt), or Lucida Sans Typewriter
+font (size 7.5 pt) in earlier Word versions where the Liberation
+Mono font may not be available. In LaTeX, the ‘url’
+package is used with its default font now being switched to 
+``newtxtt'' which offers a better distinction between 
+``\texttt{O}'' and ``\texttt{0}''. The conference
 paper ID is optional and may be included in the absence
 of a DOI to facilitate a search through internet search
 engines. DOIs have been assigned to all JACoW
@@ -113,10 +122,11 @@ conference should be written as shown in [5]; the wording
 The IEEE style is also shown for periodicals [6-11],
 online sources [12], books [13, 14], internal reports [15],
 theses [16], manuals or handbooks [17], patents [18] and
-unpublished material [19, 20]. Examples of correctly
-formatted references can also be found at the JACoW website,
-under ‘Formatting Citations’ which is reached through the
-‘for Authors’ link.
+unpublished material [19, 20]. When citing a periodical,
+only the official abbreviation of the journal should be used
+[21]. Examples of correctly formatted references can also be 
+found at the JACoW website, under ‘Formatting Citations’ which 
+is reached through the ‘for Authors’ link.
 
 \subsection{Alignment of References}
 
@@ -147,25 +157,24 @@ references is ten or more.
 	
 	\bibitem{item:1-1}
 	A.~Alpha and B.~T.~Beta, “Novel techniques for future TeV electron accelerators,”
-	in \textit{Proc. 8th Int. Particle Accelerator Conf. (IPAC’17)},
-	Copenhagen, Denmark, May 2017, 
-	pp. 567-569, \url{doi:10.18429/JACoW-IPAC2017-PAPERID}
+	in \textit{Proc.\ 9th Int.\ Particle Accelerator Conf.\ (IPAC’18)},
+	Vancouver, BC, Canada, Apr.-May 2018.
+	pp. 567-569. \url{doi:10.18429/JACoW-IPAC2017-PAPERID}
 	\CCom{jgreen}{Conference Proceedings, two authors; DOI encouraged}
 
 	\bibitem{item:1-2}
 	A.~Alpha \emph{et al.},
-	“A new 12\,GHz electron linear accelerator,”
-	in \emph{Proc. 28th Linear Accelerator Conf. (LINAC’16)},
-	East Lansing, MI, USA, Sep. 2016, pp. 27-31, \newline
-	\url{doi:10.18429/JACoW-LINAC2016-PAPERID}
+	“A novel injector,” in \emph{Proc.\ 29th Linear Accelerator Conf.\ (LINAC’18)},
+	Shanghai, China, Sep.\ 2018, pp.\ 27-31. %\newline
+	\url{doi:10.18429/JACoW-LINAC2018-PAPERID}
 	\CCom{jgreen}{Conference Proceedings, for six or more authors use \emph{et al.};	
 		 DOI encouraged}
 	
 	\bibitem{item:1-3}	
 	A.~Alpha, B.~T.~Beta, C.~Gamma, and D.~Delta,
 	“An overview of control systems,”
-	in \emph{Proc. 13th Int. Conf. on Accelerator and Large Experimental Physics Control Systems (ICALEPCS’11)}, Grenoble, France, Oct. 2011,
-	paper TUP014, pp. 89--91.
+	in \emph{Proc.\ 13th Int.\ Conf.\ on Accelerator and Large Experimental Physics Control Systems (ICALEPCS’11)}, Grenoble, France, Oct.\ 2011,
+	paper TUP014, pp.\ 89--91.
 	\CCom{jgreen}{Conference Proceedings, four authors; optional paper ID
 	in the absence of a DOI}
 \end{thebibliography}
@@ -176,25 +185,23 @@ references is ten or more.
 \begin{thebibliography}{9} % Use for 1-9 references
 	\bibitem{item:2-1}
 	A.~Alpha and B.~T.~Beta, “Novel techniques for future TeV electron accelerators,”
-	in \textit{Proc. IPAC’17}, Copenhagen, Denmark, May 2017, 
-	pp. 567-569, \newline
-	\url{doi:10.18429/JACoW-IPAC2017-PAPERID}
+	in \textit{Proc.\ IPAC’18}, Vancouver, BC, Canada, Apr.-May 2018,
+	pp.\ 567-569. %\newline
+	\url{doi:10.18429/JACoW-IPAC2018-PAPERID}
 	\CCom{jgreen}{Conference Proceedings, two authors; DOI encouraged}
 	
 	\bibitem{item:2-2}
 	A.~Alpha \emph{et al.},
-	“A new 12\,GHz electron linear accelerator,”
-	in \emph{Proc. LINAC’16},
-	East Lansing, MI, USA, Sep. 2016, pp.\,27-31, 
-	\url{doi:10.18429/JACoW-LINAC2016-PAPERID}
-	\CCom{jgreen}{Conference Proceedings, for six or more authors use \emph{et al.};	
-		 		  DOI encouraged}
+	“A novel injector,” in \emph{Proc.\ LINAC’18},
+	Shanghai, China, Sep.\ 2018, pp.\ 27-31. %\newline
+	\url{doi:10.18429/JACoW-LINAC2018-PAPERID}
+	\CCom{jgreen}{Conference Proceedings, for six or more authors use \emph{et al.}; DOI encouraged}
 	
 	\bibitem{item:2-3}	
 	A.~Alpha, B.~T.~Beta, C.~Gamma, and D.~Delta,
 	“An overview of control systems,”
-	in \emph{Proc. ICALEPCS’11}, Grenoble, France, Oct. 2011,
-	paper TUP014, pp. 89--91.
+	in \emph{Proc.\ ICALEPCS’11}, Grenoble, France, Oct.\ 2011,
+	paper TUP014, pp.\ 89--91.
 	\CCom{jgreen}{Conference Proceedings, four authors; optional paper ID
 				  in the absence of a DOI}
 \end{thebibliography}
@@ -209,8 +216,8 @@ references is ten or more.
  \bibitem{item:41}
 	A.~Alpha and B.~T.~Beta,
 	“An interesting talk but paper not submitted,”
-	presented at the 5th Int. Particle Accelerator Conf. (IPAC’14),
-	Dresden, Germany, Jun. 2014, paper MOAX01, unpublished.
+	presented at the 5th Int.\ Particle Accelerator Conf.\ (IPAC’14),
+	Dresden, Germany, Jun.\ 2014, paper MOAX01, unpublished.
 	\CCom{jred}{Unpublished paper; conference name in normal font; paper
 	ID may only be given if material supplementing the proceedings
 	exists on the JACoW website, e.\,g., PDF of talk}
@@ -224,7 +231,7 @@ references is ten or more.
 	A.~Alpha and B.~T.~Beta,
 	“An interesting talk but paper not submitted,”
 	presented at IPAC’14,
-	Dresden, Germany, Jun. 2014, paper MOAX01, unpublished.
+	Dresden, Germany, Jun.\ 2014, paper MOAX01, unpublished.
 	\CCom{jred}{Unpublished paper; conference name in normal font; paper
 	ID may only be given if material supplementing the proceedings
 	exists on the JACoW website, e.\,g., PDF of talk}
@@ -240,8 +247,8 @@ references is ten or more.
  \bibitem{item:51}
 	A.~Alpha and B.~T.~Beta,
 	“An interesting talk at this conference,”
-	presented at the 9th Int. Particle Accelerator
-	Conf. (IPAC’18), Vancouver, Canada, Apr.-May 2018, 
+	presented at the 10th Int.\ Particle Accelerator
+	Conf.\ (IPAC’19), Melbourne, Australia, May 2019, 
 	paper MOAB01, this conference.
 	\CCom{jgrepc}{Current conference; conference name in normal font; 
 				  the wording “this conference” is optional}
@@ -253,7 +260,7 @@ references is ten or more.
 \setcounter{enumi}{4}
 	\bibitem{item:52}
 	“An interesting talk at this conference,”
-	presented at IPAC’18, Vancouver, Canada, Apr.-May 2018, 
+	presented at IPAC’19, Melbourne, Australia, May 2019, 
 	paper MOAB01, this conference.
 	\CCom{jgrepc}{Current conference; conference name in normal font; 
 				  the wording “this conference” is optional}
@@ -268,39 +275,39 @@ references is ten or more.
 	\bibitem{item:6}
 		P.~Mercury \emph{et al.},
 		“Title of paper published in journal,”
-		\emph{Phy.~Rev.~	Lett.}, vol. 114, no. 5,
-		p. 050511, Feb. 2014,
+		\emph{Phy.\ Rev.\ Lett.}, vol.\ 114, no.\ 5,
+		p.\ 050511, Feb.\ 2014.
 		\url{doi:10.1103/PhysRevLett.114.050511}
-	\CCom{jblue}{Periodical, Phys. Rev. Lett.;
-		             issue no. and month may be omitted}
+	\CCom{jblue}{Periodical, Phys.\ Rev.\ Lett.;
+		             issue no.\ and month may be omitted}
 
 	\bibitem{item:7}
 		P.~Venus \emph{et al.},
 		“New techniques in laser wakefield accelerators,”
-		\emph{Phys. Rev. ST Accel. Beams}, vol. 18,
-		p. 120198, Dec.~2015, \newline
+		\emph{Phys.\ Rev.\ ST Accel.\ Beams}, vol.\ 18,
+		p.\ 120198, Dec.~2015. %\newline
 		\url{doi:10.1103/PhysRevAccelBeams.18.120198} 
-	\CCom{jblue}{Periodical, Phys. Rev. ST Accel. Beams;
+	\CCom{jblue}{Periodical, Phys.\ Rev.\ ST Accel.\ Beams;
 			              month may be omitted}
 
 	\bibitem{item:8}
 		T.~Earth \emph{et al.},
 		“Low dose irradiation impact on modern silicon detectors,”
-		\emph{Nucl. Instr. Meth.}, vol. 692, pp. 256--280, 2014,
+		\emph{Nucl.\ Instr.\ Meth.}, vol.\ 692, pp.\ 256--280, 2014.
 		\url{doi:10.1016/j.nima.2014.11.022}
 	\CCom{jblue}{Periodical, Nucl. Instr. Method.}
 	
 	\bibitem{item:9}
 		T.~Earth, L.~Moon, and A.~Belt,
 		“Temporal correlations of x-ray free electron lasers,”
-		\emph{Optics Express}, vol. 20, pp. 11396--11404, 2012,
+		\emph{Optics Express}, vol.\ 20, pp.\ 11396--11404, 2012.
 		\url{doi:10.1364/OE.20.11396}
 	\CCom{jblue}{Periodical, Optics Express}
 
 	\bibitem{item:10}
 		J.~B.~Good,
 		“A paper accepted for publication,”
-		\emph{Phys. Rev. Lett.}, to be published.
+		\emph{Phys.\ Rev.\ Lett.}, to be published.
 	\CCom{jblue}{Periodical, paper accepted for publication
 		              by Phys. Rev. Lett.}
 
@@ -319,15 +326,13 @@ references is ten or more.
   \setcounter{enumi}{11}
 	\bibitem{item:121}
 		JACoW, \url{http://www.jacow.org} 
-		\CCom{jvio}{online source; no hyperlink, no period at end of URL unless there is a
-					trailing “/” as shown below. A monospace font should be used, this is
-					achieved using the ‘url’ package in \LaTeX}
+		\CCom{jvio}{online source; no hyperlink, no period at end of URL unless there is a trailing “/” as shown below. A monospaced font should be used, this is achieved using the ‘url’ package in \LaTeX}
 
   \setcounter{enumi}{11}
 	\bibitem{item:122}
 		JACoW, \url{http://www.jacow.org/}.  
-		\CCom{jvio}{online source; no hyperlink, period after traling “/” in
-					URL allowed. A monospace font should be used, this is
+		\CCom{jvio}{online source; no hyperlink, period after trailing “/” in URL
+					if optionally preferred. A monospaced font should be used, this is
 					achieved using the ‘url’ package in \LaTeX}
 
 \end{thebibliography}
@@ -339,8 +344,8 @@ references is ten or more.
 	\bibitem{item:13}
 		T.~Earth and L.~Moon,
 		“Title of chapter in the book,”
-		in \emph{Title of Book}, R Mars, Ed. New York, NY, USA:
-		Wiley, 1994, pp.~42--48. 
+		in \emph{Title of Book}, R Mars, Ed.\ New York, NY, USA:
+		Wiley, 1994, pp.\ 42--48. 
 	\CCom{jbook}{Chapter in book}
 	
 	\bibitem{item:14}
@@ -356,12 +361,12 @@ references is ten or more.
 	\bibitem{item:15}
 		G. Jupiter \emph{et al.},
 		“Title of report,” CERN, Geneva, Switzerland,
-		Rep. CERN-2012-333, Oct. 2012.
+		Rep.\ CERN-2012-333, Oct.\ 2012.
 	\CCom{jrept}{Report}
 
 	\bibitem{item:16}
 		A.~Student, “Title of thesis,”
-		Ph.D. thesis, Phys. Dept.,
+		Ph.D.\ thesis, Phys.\ Dept.,
 		Karlsruher Institut für Technologie, Karlsruhe,
 		Germany, 2014.
 	\CCom{jrept}{Thesis}
@@ -374,7 +379,7 @@ references is ten or more.
 	\bibitem{item:17}
 		\emph{IEEE Editorial Style Manual},
 		IEEE Periodicals,
-		Piscataway, NJ, USA, Oct. 2014, pp. 34-52;
+		Piscataway, NJ, USA, Oct.\ 2014, pp.\ 34-52;
 		\url{http://www.ieee.org/documents/style_manual.pdf} 
 	\CCom{jmanu}{Handbook/Manual, no hyperlink, no period after URL}
 \end{thebibliography}
@@ -386,7 +391,7 @@ references is ten or more.
 		\bibitem{item:18}
 		A.~N.~Inventor,
 		“Title of patent,”
-		Patent Authority and No., Jan. 20, 2016.
+		Patent Authority and No., Jan.\ 20, 2016.
 
 \end{thebibliography}
 
@@ -399,8 +404,18 @@ references is ten or more.
 	\CCom{junpu}{Unpublished}
 	
 	\bibitem{item:20}
-	P.~Uranus, private communication, Jun. 2015.
+	P.~Uranus, private communication, Jun.\ 2015.
 	\CCom{junpu}{Private communication}
+\end{thebibliography}
+
+\newpage
+
+\section{JOURNAL ABBREVIATIONS}
+
+\begin{thebibliography}{99} % Use for 1-9 references
+	\setcounter{enumi}{20}
+	\bibitem{item:21}
+		\url{https://woodward.library.ubc.ca/researchhelp/journal-abbreviations/}
 
 \end{thebibliography}
 
@@ -470,12 +485,19 @@ When referring to a figure from within the text, the
 convention is to use the abbreviated form, i.\,e., Fig.~1,
 \emph{unless} the reference to the figure is at the start of the sentence:
 \begin{quote}
-	Figure 1 shows a schematic view of...
+	Figure 1 shows a schematic view of\ldots
 	
-	... as shown in Fig.~1.
+	\ldots as shown in Fig.~1.
 \end{quote}
 
+% if set as \subsection, the title will appear at the top
+% of the column followed by "Table captions ... lines:", 
+% then follows the text above after the justify till end of quote
+\iffalse
 \subsection{Table Headings}
+\else
+\noindent\textit{\vspace{1em}\large Table Headings}
+\fi
 
 Table captions should be placed \emph{above} the table and
 centred if on one line, but justified if spanning two or
@@ -488,7 +510,7 @@ more lines:
 	Spanning Two Lines
 \end{justify}
 
-Note the colon ":" after the table number, that the initial
+Note the colon “:” after the table number, that the initial
 letters of the principle words in the table heading are
 capitalized, and the absence of a period at the end of the
 caption.
@@ -506,7 +528,7 @@ placed flush with the right margin of the column.
 An unbreakable space should always precede a unit. In \LaTeX{} use
 a “\verb|\,|” or the ‘siunitx’ package to format units.
 Examples are:
-\SI{3}{keV}, \SI{4}{GeV}, \SI{100}{kW}, \SI{7}{µm}.
+\SI{3}{keV}, \SI{4}{GeV}, \SI{100}{kW}, \SI{7}{\micro m}.
 
 \subsection{References}
 
diff --git a/Master/texmf-dist/doc/latex/jacow/jacow-collaboration-2018.pdf b/Master/texmf-dist/doc/latex/jacow/jacow-collaboration-2018.pdf
deleted file mode 100644
index cc6a978852e..00000000000
--- a/Master/texmf-dist/doc/latex/jacow/jacow-collaboration-2018.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/jacow/jacow-collaboration.pdf b/Master/texmf-dist/doc/latex/jacow/jacow-collaboration.pdf
new file mode 100644
index 00000000000..64c13de3b26
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/jacow/jacow-collaboration.pdf
diff --git a/Master/texmf-dist/doc/latex/jacow/jacow-collaboration-2018.tex b/Master/texmf-dist/doc/latex/jacow/jacow-collaboration.tex
index fdd6fc3b5ec..eb8d533a883 100644
--- a/Master/texmf-dist/doc/latex/jacow/jacow-collaboration-2018.tex
+++ b/Master/texmf-dist/doc/latex/jacow/jacow-collaboration.tex
@@ -1,34 +1,53 @@
 % !TeX program = lualatex
 % !TeX encoding = utf8
 %
+%  in v 2.3  Feb 2019  Volker RW Schaa
+%            - JACoW Collaboration updated to the TM 2018
+%
 \documentclass[a4paper,
-				%boxit,
-				%titlepage,   % separate title page
-				%refpage      % separate references
-				]{jacow}
+               %boxit,        % check whether paper is inside correct margins
+               %titlepage,    % separate title page
+               %refpage       % separate references
+               %biblatex,     % biblatex is used
+               keeplastbox,   % flushend option: not to un-indent last line in References
+               %nospread,     % flushend option: do not fill with whitespace to balance columns
+               %hyphens,      % allow \url to hyphenate at "-" (hyphens)
+               %xetex,        % use XeLaTeX to process the file
+                luatex,       % use LuaLaTeX to process the file
+               ]{jacow}
 
 \usepackage[USenglish]{babel}
-\renewcommand{\baselinestretch}{0.9535417264123889}
+%\renewcommand{\baselinestretch}{0.9535417264123889}   % -v2.2
+\renewcommand{\baselinestretch}{0.95}                  % v2.3
+% CHECK FOR XeTeX/LuaTeX BEFORE DEFINING AN INPUT ENCODING
+% --------------------------------------------------------
+%   utf8  is default for XeTeX/LuaTeX
+%   utf8  in LaTeX only realises a small portion of codes
+%
+\ifboolexpr{bool{xetex} or bool{luatex}} % test for XeTeX/LuaTeX
+ {}                                      % input encoding is utf8 by default
+ {\usepackage[utf8]{inputenc}}           % switch to utf8
+
+
 %%
 %%   Lengths for the spaces in the title
-\setlength\titleblockstartskip{0pt}  %before title, default 3pt
-%\setlength\titleblockmiddleskip{.3\baselineskip} %between title + author, default 1em
-%\setlength\titleblockendskip{.0\baselineskip}    %afterauthor, default 1em
+\setlength\titleblockstartskip{2pt}  %before title, default 3pt
+%\setlength\titleblockmiddleskip{.3em} %between title + author, default 1em
+\setlength\titleblockendskip{.3em}    %afterauthor, default 1em
 
 
 \begin{document}
-	\title{THE \NoCaseChange{JACoW} COLLABORATION\thanks{\mbox{As of Nov 2017, JACoW Collaboration Team Meeting Templates are managed by the collaboration and implemented by:}}}
+	\title{THE \NoCaseChange{JACoW} COLLABORATION\thanks{{As of Dec. 2018, JACoW Collaboration Team Meeting. \newline
+	Templates are managed by the collaboration and implemented by:}}}
 
 	\author{C. Petit-Jean-Genaz, J. Poole\textsuperscript{1}, T. Baron, R. Billen, 
 			P. Ferreira, N. Juszka, M. Kołodziejski,\\
-			A. Mönnich, M. Vidal, CERN, 1211 Geneva 23, Switzerland \\
-		C. E. Eyberger, M. Power, Argonne National Laboratory, Lemont, IL 60439, USA \\
-		I. Costa, ALBA Synchrotron, 08290 Cerdanyola del Vallès, Barcelona, Spain \\
+			A. Mönnich, P. Poulopoulou, M. Vidal, CERN, 1211 Geneva 23, Switzerland \\
+		C. E. Eyberger, K. Jaje, Y. Jaski, Argonne National Laboratory, Lemont, IL 60439, USA \\
 		D. Button, M. Hewes, ANSTO, Lucas Heights NSW 2234, Australia \\
-		R. Dowd, K. Riches, N. White, ANSTO, Clayton VIC 3168, Australia \\
-		R. Picoreti, J. Piton, L. Sanfelici\\
-		 Brazilian Synchrontron Light Laboratory, 13083-970 Campinas, Brazil \\
-		C. Hoffman, Brookhaven National Laboratory, Upton, NY 11973, USA \\
+		R. Dowd, K. Riches, E. Tan, N. White, ANSTO, Clayton VIC 3168, Australia \\
+		R. Picoreti, S. Marques, Brazilian Synchrontron Light Laboratory, 13083-970 Campinas, Brazil \\
+		P. Dyer, C. Hoffman, Brookhaven National Laboratory, Upton, NY 11973, USA \\
 		M. V. Kuzin, Budker Institute of Nuclear Physics, 630090 Novosibirsk, Russia \\
 		L. Serani, Centre d’Etudes Nucléaires de Bordeaux Gradignan, \\
 		Université de Bordeaux/IN2P3/CNRS, 33175 Gradignan, France  \\
@@ -37,23 +56,27 @@
 				  S. Deiuri, Elettra Sincrotrone Trieste, 34149 Basovizza, Italy \\
 		J. Olander, G. Trahern, European Spallation Source, 221 00 Lund, Sweden \\
 		M. Arena, Fermilab, Batavia IL 60510, USA \\
-		K. Turzo, Grand Accélérateur National d'Ions Lourds, 14076 Caen, France \\
+		F. Chautard, Grand Accélérateur National d'Ions Lourds, 14076 Caen, France \\
 		R. Müller, V. R. W. Schaa\thanks{v.r.w.schaa@gsi.de (\LaTeX)} \\
 		GSI Helmholtzzentrum für Schwerionenforschung, 64291 Darmstadt, Germany \\
-		Y.-Y Li, Hong Kong University of Science and Technology, Kowloon, Hong Kong \\
+		M. McAteer, Helmholtz-Zentrum Berlin, 14109 Berlin, Germany \\
+		P. Neumann, Helmholtz-Zentrum Dresden-Rossendorf, 01328 Dresden, Germany \\
+		Y.-Y Li, Hong Kong University of Science and Technology, Hong Kong, P. R. China \\
 		P. Pisciotta, INFN-LNS, 95123 Catania, Italy \\
 		N. Zhao, Institute of High Energy Physics, Beijing 100049, P. R. China \\
 		L. Li, Institute of Modern Physics, Lanzhou 730000, P. R. China \\
 		J. G. de Villiers, J. Mira, iThemba Labs, P.O. Box 722, Somerset West 7130, South Africa \\
 		Y. H. Chin, K. Furukawa, T. Kosuge, A. Shirakawa, 
 		KEK, Tsukuba, Ibaraki 305-0801, Japan \\
+		P. Snopok, Illinois Institute of Technology, Chicago, IL 60616, USA \\
+		R. Apsimon, Cockcroft Institute, Lancaster University, Lancaster LA1 4YW, UK \\
 		K. A. Bishofberger, Los Alamos National Laboratory, Los Alamos, NM 87545, USA \\
 		V. G. Mitts, CAMD, Louisiana State University, Baton Rouge, LA 70806, USA \\ 
 		K. Makino, A. McCausey, Michigan State University, East Lansing, MI 48824, USA \\
 %		A. McCausey, FRIB, Michigan State University, East Lansing, MI 48824, USA \\
 		T. Tanaka, LEBRA, Nihon University, Funabashi 274-8501, Japan \\
 		C. Horak, Oak Ridge National Laboratory, Oak Ridge, TN 37831, USA \\
-		Y.-S. Cheng  \\
+		Y.-S. Cheng \\
 		National Synchrotron Radiation Research Center, Hsinchu 30076, Taiwan, Republic of China \\ 
 		J. Chrin\thanks{jan.chrin@psi.ch (MS Word)}, Paul Scherrer Institut, 5232 Villigen PSI, Switzerland \\
 		D.-E. Kim, G.-H. Kim, K.-S. Kim, N.-Y. Kim, E.-H. Lee \\
@@ -62,7 +85,7 @@
 		H. Chen, X. Han, W. Qi, Shanghai Institute of Applied Physics, Shanghai 201800, P. R. China \\
 		M. Montes-Loera, SLAC National Accelerator Laboratory, Menlo Park, CA 94025, USA \\
 		S. Waller, STFC Daresbury Laboratory, Warrington, WA4 4AD, UK \\
-		M. Tilmont, Synchrotron Soleil, Saint-Aubin, 91192 Gif-sur-Yvette, France \\
+		K. Tavakoli, Synchrotron Soleil, Saint-Aubin, 91192 Gif-sur-Yvette, France \\
 		E. Akers, A. Cuffe, T. Satogata\thanks{todd.satogata@jlab.org (MS Word for Mac)} \\
 		Thomas Jefferson National Accelerator Facility, Newport News, VA 23606, USA \\
 		J. Thomson, TRIUMF, Vancouver, BC V6T 2A3, Canada \\
@@ -70,6 +93,6 @@
 
 	\maketitle
 
-\raggedend
+%\raggedend
 
 \end{document}
diff --git a/Master/texmf-dist/doc/latex/jacow/jacow2017.jpg b/Master/texmf-dist/doc/latex/jacow/jacow2017.jpg
deleted file mode 100644
index 64c5a42ec4b..00000000000
--- a/Master/texmf-dist/doc/latex/jacow/jacow2017.jpg
+++ /dev/null
diff --git a/Master/texmf-dist/tex/latex/jacow/jacow.cls b/Master/texmf-dist/tex/latex/jacow/jacow.cls
index 4a314fe3c66..36df55ad00d 100644
--- a/Master/texmf-dist/tex/latex/jacow/jacow.cls
+++ b/Master/texmf-dist/tex/latex/jacow/jacow.cls
@@ -22,40 +22,44 @@
 %% 
 %% This work consists of the following files
 %%    jacow.cls               this class file
-%%    LaTeX-A4-JACoW.tex      A4/letter templates to demonstrate the 
-%%    LaTeX-Letter-JACoW.tex  .. use and explain the various parameters
+%%    JACoW_LaTeX_A4.tex      A4/letter templates to demonstrate the 
+%%    JACoW_LaTeX_Letter.tex  .. use and explain the various parameters
 %%                            .. and settings for a submission to
 %%                            .. a JACoW conference proceedings
-%%    LaTeX-A4-JACoW.pdf      template in format A4 and European 
+%%    JACoW_LaTeX_A4.pdf      template in format A4 and European 
 %%                            settings (citation and hyphenation)
-%%    LaTeX-Letter-JACoW.pdf  template in format letter and American
+%%    JACoW_LaTeX_Letter.pdf  template in format letter and American
 %%                            setting (citation and hyphenation)
+%%    annexes-A4.tex          Annexes A-C which are included in "JACoW_LaTeX_A4.tex"
+%%    annexes-Letter.tex      Annexes A-C which are included in "JACoW_LaTeX_Letter.tex"
+%%
 %%    JACpic_mc.pdf           a graphic showing the JACoW page format
-%%    JACpic2v5.png           a graphic for a full width figure and
+%%    JACpic2.jpg             a graphic for a full width figure and
 %%                            multiline caption
-%%    jacow-collaboration-2016.tex  an example title page showing the
-%%    jacow-collaboration-2016.pdf  JACoW Colloaboration, the responsible
-%%                                  editors for the various platform
+%%    jacow-collaboration.tex  an example title page showing the
+%%    jacow-collaboration.pdf  JACoW Colloaboration, the responsible
+%%                             editors for the various platform
 %%                            dependent templates (LaTeX, Word on PC and
 %%                            Mac, ODF). The PDF is included in the template
 %% 
-%  v0.1-1.3
+%
+%  v0.1 to 1.3 : JAC2000.cls
 %  Special thanks to John Jowett and Michel Goossens from CERN and
 %  Martin Comyn at TRIUMF for their significant contributions to
 %  this class file over the period 1996 to 2000.
 %                                                 John Poole
 %                                                 March 2000
-%  v1.4
+%  v1.4 : JAC2001.cls
 %  JAC2001.cls is a modified version of JAC2000.cls to produce indented
 %  first paragraphs after section, subsection and subsubsection headings.
 %                                                 Martin Comyn  April 2001
 %
-%  v1.5
+%  v1.5 : JAC2003.cls
 %  This is a modified version of JAC2003.cls to adjust space around
 %  section and subsection headers to be more consistent with JACoW Word
 %  templates.                                     Todd Satogata  March 2011
 %
-% v 1.6
+% v 1.6 : jacow.cls
 % This is a complectly rewritten version of JAC2003.cls which needs a current
 % TeX-System to run.
 %                                                 Ulrike Fischer, November 2013
@@ -121,22 +125,33 @@
 %   graphic records, the following changes to Heine's version have been made:
 %   + doi field allowed
 %   + url field allowed
-%
+%                                                 Volker RW Schaa, 02 May 2014
 % v2.1 new options introduced
 % flushend: new: keeplastbox
 % siunitx:  new: binary-units=true
 % BibLaTeX: changed: style=ieee => bibstyle=ieee, citestyle=numeric-comp
 %           new: dashed=false
 %           removed: doi=false
+%                                                 Volker RW Schaa, 02 May 2014
 %
 % v2.2
 % - adapted to the changes of template version 2018-02
 % - made this one official
 %                                                  Volker RW Schaa, 23 Feb 2018
 %
-\def\fileversion{2.2}
-\def\filedate{2018/02/23}
-\def\docdate {2018/02/23}
+% v2.3
+% - font for tt switched to newtxtt with option zerostyle=d (dotted 0)
+%                                                  Volker RW Schaa, 15 Jan 2019
+%
+% v2.4
+% - version 2.3 did not work for XeTeX/LuaTeX, therefore font change using
+%   \def\UrlFont and switching the fontencoding to T1 (suggested by Ulrike Fischer)
+% - package amsmath included to provide 
+%                                                  Volker RW Schaa, 01 Apr 2019
+%
+\def\fileversion{2.4}
+\def\filedate{2019/04/01}
+\def\docdate {2019/04/01}
 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{jacow}[\filedate\space Version \fileversion]
@@ -179,7 +194,7 @@
 
 \ExecuteOptions{aca4}
 \ProcessOptions
-\RequirePackage{cmap}
+
 \RequirePackage{fix-cm}
 \LoadClass[10pt,twocolumn]{article}
 \RequirePackage[keeplastbox]{flushend} %% modified
@@ -187,8 +202,8 @@
 \RequirePackage{etoolbox}
 \RequirePackage{ifxetex}
 \RequirePackage{ifluatex}
-\RequirePackage{textcase}%
-
+\RequirePackage{textcase}
+%
 %Add thanks to the list of "\@nonchangecase"-commands from textcase:
 \def\@uclcnotmath#1#2#3#4{\begingroup
       #1%
@@ -213,7 +228,7 @@
 \RequirePackage{booktabs}
 \RequirePackage[figureposition=bottom,tableposition=top,skip=5pt]{caption}
 \RequirePackage{xcolor}
-\RequirePackage{url}
+\RequirePackage{amsmath}
 \AtEndPreamble{\RequirePackage[autostyle]{csquotes}}
 
 
@@ -237,6 +252,14 @@
 
 \pagestyle{empty}
 
+\RequirePackage{url}
+%
+% redefine the default Typewriter Font to newtxtt with dotted zeros (v2.3)
+%
+\RequirePackage[zerostyle=d]{newtxtt}
+\newcommand\urlZDtxt{\fontencoding{T1}\fontfamily{newtxtt}\selectfont}
+\def\UrlFont{\urlZDtxt}
+
 \ifboolexpr{bool{xetex} or bool{luatex}}
  {}
  { \catcode`\^^^=9
@@ -260,9 +283,13 @@
   \RequirePackage{lmodern}
   \RequirePackage{tgtermes}
   \RequirePackage{newtxmath}
+  \input{glyphtounicode}
+  \pdfgentounicode=1
+%  \RequirePackage{cmap}
  }
 
 \RequirePackage{microtype}
+
 %Lists
 
 \RequirePackage{enumitem}