Front matter: remove "Contents" entry from itself. Remove list of tables

and list of figures. Reorder cross-reference bullets in "Terms and
definitions".

As requested by ISO Central Secretariat.

Author: zygoloid

source/front.tex

@@ -3,7 +3,7 @@
 % \input{cover-reg}
 
 %%--------------------------------------------------
-%% The table of contents, list of tables, and list of figures
+%% The table of contents
 \markboth{\contentsname}{}
 
 %%--------------------------------------------------
@@ -12,9 +12,11 @@
 \renewcommand\@pnumwidth{2.5em}
 \makeatother
 
-\tableofcontents
+%% Include table of contents. Do not list "Contents"
+%% within it (per ISO request) but do include a
+%% bookmark for it in the PDF.
+\phantomsection
+\pdfbookmark{\contentsname}{toctarget}
+\hypertarget{toctarget}{\tableofcontents*}
+
 \setcounter{tocdepth}{5}
-\newpage
-\listoftables
-\newpage
-\listoffigures

source/intro.tex

@@ -83,8 +83,8 @@
 for use in standardization
 at the following addresses:
 \begin{itemize}
-\item IEC Electropedia: available at \url{http://www.electropedia.org/}
 \item ISO Online browsing platform: available at \url{http://www.iso.org/obp}
+\item IEC Electropedia: available at \url{http://www.electropedia.org/}
 \end{itemize}
 
 \pnum