latex-veryshortguide (21may20)

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

15 files changed, 1396 insertions, 1303 deletions

diff --git a/Master/texmf-dist/doc/latex/latex-veryshortguide/MANIFEST b/Master/texmf-dist/doc/latex/latex-veryshortguide/MANIFEST
index 954e96f210a..434366a6f3b 100644
--- a/Master/texmf-dist/doc/latex/latex-veryshortguide/MANIFEST
+++ b/Master/texmf-dist/doc/latex/latex-veryshortguide/MANIFEST
@@ -1,11 +1,10 @@
-README.md
 MANIFEST
-vsg.dtx
-vsg.ins
-vsg.pdf
-veryshortguide.tex
-veryshortguide.bib
-veryshortguide.pdf
+menno-a.jpg
+README.md
+VERSION
 veryshortguide-A4-imposed.pdf
-veryshortguide-Legal-imposed.pdf
-menno-a.png
+veryshortguide.dtx
+veryshortguide.ins
+veryshortguide.pdf
+vsg.bib
+vsg.tex
diff --git a/Master/texmf-dist/doc/latex/latex-veryshortguide/README.md b/Master/texmf-dist/doc/latex/latex-veryshortguide/README.md
index c8f95f67353..34ece73ba11 100644
--- a/Master/texmf-dist/doc/latex/latex-veryshortguide/README.md
+++ b/Master/texmf-dist/doc/latex/latex-veryshortguide/README.md
@@ -1,108 +1,169 @@
 
-#vsg
+[//]: # (veryshortguide LaTeX class)
 
-This is the README.md file for the vsg LaTeX class.
+# veryshortguide
 
-##Summary
+This is the README.md file for the veryshortguide LaTeX class v0.7 (2020-04-16)
+generated by ClassPack v.1.19 (2020-05-19) on 21 May 2020 at 11:55:35 
 
-This is a document class derived from the original Very Short Guide to LaTeX, a 4pp folder designed as an aide-mémoire for people who have just done a course in LaTeX and need something by them on their desk the next day to refresh their memories. It is __not__ intended as a substitute for full documentation.
+## Summary
 
-This class is designed for this document only, but adds parameterisation to allow reformatting tweaks for different paper sizes (A4 and Legal) to allow it to be printed two-sided as a 4pp folder.
+This is the document class originally designed for the _Very Short Guide
+to LaTeX_, a 4pp folder designed as an aide-mémoire for people who have
+just done a course in LaTeX and need something by them on their desk the
+next day to refresh their memories. It is _not_ intended as a substitute
+for full documentation.
 
-Please do not complain that there is no math here. It won't fit. Someone else can do a math leaflet. IANAM.
+Please do not complain that there is no math here. It won't fit. Someone
+else can do a math leaflet. IANAM.
 
 
-##Normal installation
+## Automated installation
 
-This class is distributed from CTAN in a zip file which allows it to be installed automatically by the TeX Live update manager _tlmgr_ and similar automated installers. If you are using automated package installation, no further action is required.
+If this class is distributed from CTAN, it should be in a zip file which
+allows it to be installed automatically by the TeX Live Manager (tlmgr)
+and similar automated installers.
 
+If you are using automated LaTeX package installation, no further action
+is required: the package will be installed the first time you use it in
+a LaTeX document.
 
-##TDS installation
+If you are using the TeX Live Manager (_tlmgr_) program manually, you
+can install this package with the command:
 
-This class is also available as a `.tds.zip` file. TDS is the TeX Directory Structure, the standard layout for a modern TeX installation. This enables the class to be unzipped directly into your Personal TeX Directory (see below for what this is and how to create one on your system).
 
-  *  Install it on any TDS-compliant personal system (laptop, desktop, workstation, table, smartphone, PDA, etc) by unzipping it straight into your Personal TeX Directory (folder). This will put all the files into the right places, so you can start using them immediately.
+## TDS installation
 
-  *  If you haven't yet created a personal TeX directory, see below for details of what one is, and how to create it.
+This class is also available as a TeX Directory System (TDS) zip file
+(`.tds.zip`). This is the standard directory layout for a modern TeX
+installation which enables the class to be unzipped directly into your
+Personal TeX Directory without the need to use _tlmgr_. If you haven’t
+yet created a Personal TeX Directory, see below for details of what one
+is, and how to create it.
+  *  You can install this class on any TDS-compliant personal system (laptop,
+desktop, workstation, table, smartphone, PDA, etc) by unzipping it
+straight into your Personal TeX Directory. This will put all the files
+into the right places, so you can start using them immediately.
+  *  On a shared (multiuser) system like a server, the administrator can
+unzip it into the `$TEXMFLOCAL` directory instead (see below), and run
+your TeX directory-indexing program (eg _texhash_, _mktexlsr_, etc) so
+that everyone can use it.
+  *  If you are using an old non-TDS-compliant system, see below under Manual
+Installation.
 
-  *  On a shared (multiuser) system like a server, unzip it into the $TEXMFLOCAL directory instead (see below), and run your TeX directory-indexing program (eg _texhash__mktexlsr_, etc) so that everyone can use it.
+### Your Personal TeX Directory
 
-  *  If you are using an old non-TDS-compliant system, see below under Manual Installation.
+This is a directory (folder) where you should put all local manual
+modifications (updates, additions such as new or updated classes,
+packages, and fonts) that are _not_ handled automatically by _tlmgr_.
+The name and location are fixed (for all practical purposes):
+  *  Apple Mac OS X
 
-###Your Personal TeX Directory
+    ~/Library/texmf
+  *  Unix and GNU/Linux
 
-This is a directory (folder) on single-user systems where you should put all your local manual modifications (updates, and additions such as new or updated classes, packages, and fonts) that are __not__ handled automatically by the TeX Live update manager (_tlmgr_). The name and location are fixed:
+    ~/texmf
+  *  MS-Windows 95/XP/NT
 
-<dl>
-  <dt>Apple Mac OS X</dt>
-  <dd>`~/Library/texmf`</dd>
-  <dt>Unix and GNU/Linux</dt>
-  <dd>`~/texmf`</dd>
-  <dt>MS-Windows 95/XP</dt>
-  <dd>`C:\texmf`</dd>
-  <dt>MS-Windows 2007 and above</dt>
-  <dd>`Computer\System\YOURNAME\texmf`</dd>
-</dl>
+    C:\texmf
+  *  MS-Windows 2007 and above
 
-Create that folder now if it does not already exist. Put (or unzip) all additions to your system that are not handled by _tlmgr_ into this directory, following __exactly__ the subdirectory structure that is used in your main TeX distribution (unzipping a TDS file does this for you). This is what enables LaTeX to find stuff automatically.
+    Computer\System\YOURNAME\texmf
 
-> #### If you are a Windows user running _MiKTeX_ ####
-> 
-> When you create the folder, you must add it to _MiKTeX_'s list of supported folders. Run the _MiKTeX Maintenance/Settings_ program, select the `Roots` tab, and add the folder. You only have to do this once.
-> 
-> Each time you add or remove software in your personal TeX folder, you __must__ also click on the `Update FNDB` button in the `General` tab.
+Create that folder now if it does not already exist. Put (or unzip) all
+additions to your system that are _not_ handled by _tlmgr_ into this
+directory, following _exactly_ the subdirectory structure that is used
+in your main TeX distribution (unzipping a TDS file does this for you).
+This is what enables LaTeX to find stuff automatically.
+
+
+> ####  If you are a Windows user running _MiKTeX_
+> When you create the folder for your Personal TeX Directory, you MUST add it to _MiKTeX_ ’s list of supported folders. Run the _MiKTeX Maintenance/Settings_ program, select the `Roots` tab, and add the folder. You only have to do this once.
+> > Each time you add or remove software in your Personal TeX Directory, you MUST then click on the `Update FNDB` button in the `General` tab of the _MiKTeX Maintenance/Settings_ program, otherwise _MiKTeX_ will not find them and nothing will work!
 > 
 
-Unix (Mac and GNU/Linux) users do not need to (indeed, should not) run their filename database indexer (_mktexlsr_ or _texhash_) for files put in your personal TeX directory.
+Unix (Mac and GNU/Linux) users do not need to (indeed, should not) run
+their filename database indexer program (_mktexlsr_ or _texhash_) for
+files put into a personal TeX directory.
 
 
-##Installation on shared systems
+## Installation on shared systems
 
-On multi-user systems (Unix-based), identify the shared local directory tree with the command
+On multi-user systems (Unix-based), identify the shared local directory
+tree with the command
 
-    kpsewhich -expand-var
-          '$TEXMFLOCAL'
+    kpsewhich -expand-var '$TEXMFLOCAL'
 
-This will give you the location of the shared `texmf` directory into which you must install these files.
+This will give you the location of the shared `texmf` directory into
+which you must unzip these files.
 
-Do not forget to run the _texhash_ or _mktexlsr_ (filename indexer) program after installation, otherwise the files will not be found by LaTeX and nothing will work!
+Do not forget to run your local TeX filename database indexer program
+(_texhash_ or _mktexlsr_) after installation, otherwise the files will
+not be found by LaTeX and nothing will work!
 
 
-##Manual installation (non-TDS systems)
+## Manual installation (non-TDS systems)
 
-To install this software manually, unzip the zip file into a temporary directory and move the `vsg.cls` file from the `tex/latex/veryshortguide` directory to a location (directory/folder) where LaTeX will find it on your system. This is referred to in some documentation as “the TEXINPUTS directory”, although it may be called something else on your system.
+To install this software manually, download and unzip the _non-_TDS zip
+file into a temporary directory and move the class and/or package
+file[s] and other files to the proper locations where LaTeX will find
+them on your system. This is referred to in some documentation as “the
+`TEXINPUTS` directory”, although it may be called something else on your
+system.
 
-__It is your responsibility to know where this location is.__ See the question in the TeX FAQ at http://www.tex.ac.uk/cgi-bin/texfaq2html?label=inst-wlcf for more information. If you do not know, or cannot find it, or do not have access to it, your TeX system may be out of date and need replacing.
+_It is your responsibility to know where this location is._ See the
+question in the TeX FAQ at https://texfaq.org/FAQ-inst-wlcf.html for
+more information. If you do not know, or cannot find it, or do not have
+access to it, your TeX system may be out of date and may need replacing.
 
 
-##Last resort
 
-In an emergency, or as a last resort on unmanageable systems, it is possible simply to put the `vsg.cls` file in your current working directory (the same folder as your `.tex` file[s]).
+## Online systems and “last resort” systems
 
-While this may work, it is not supported, and may lead to other resources (packages, fonts, etc) not being found.
+Some online LaTeX systems use CTAN, so a package from there should be
+available on demand. For other online LaTeX systems where you do not
+have access to the file system, unzip the _non-_TDS zip file into a
+temporary directory and upload the files to the online system. Follow
+their instructions for where to put them.
 
+In an emergency, or as a last resort on unmanageable systems, it is
+possible simply to put the class and/or package file[s] into your
+current working directory (the same folder as your `.tex` file[s]).
 
-##Usage
+While this may work, it is not supported, and may lead to other
+resources (packages, fonts, images etc) not being found.
 
-Make this the first line of your LaTeX document:
 
-    \documentclass[options]{vsg}
+## Usage
 
-Read the documentation for the options available. The documentation is distributed as a PDF document in the zip file. You can also regenerate it by typesetting the `vsg.dtx` file with LaTeX (and BibTeX/_biber_ and _makeindex_) in the normal way.
+Include the line shown below in the Preamble of your LaTeX document; a
+`\documentclass` line should be at the top; a `\usepackage` command
+normally goes anywhere in the Preamble:
 
+    \documentclass[options]{veryshortguide}
 
-##Bugs and TODO
+(similarly for other classes or packages if more than one is supplied
+with this package). Read the documentation for the options available, if
+any. The documentation is distributed as a PDF document in the zip file.
+You can also regenerate it by typesetting the `veryshortguide.dtx` file
+with `xelatex` (and `` and _makeindex_) in the normal way.
+
+
+## Bugs and TODO
 
 No outstanding reported bugs at the time of this version.
 
+For TODO items, see the PDF documentation.
 
-##Copyright
+
+## Copyright
 
 The following statement is included in the source code:
 
-     Transformed from vsg.xml by ClassPack db2dtx.xsl
-     version 16.00 (Makefile with XeLaTeX) on Friday 12 August 2016 at 10:42:12
-     vsg.cls is copyright © 2009-2016 by Peter Flynn <peter@silmaril.ie>
+     Transformed from veryshortguide.xml by ClassPack db2dtx.xsl
+     version 1.19 (2020-05-19) on Thursday 21 May 2020 at 11:55:35
+    
+     veryshortguide.cls is copyright © 2009-2020 by Peter Flynn <peter@silmaril.ie>
     
      This work may be distributed and/or modified under the
      conditions of the LaTeX Project Public License, either
@@ -114,12 +175,12 @@ The following statement is included in the source code:
      and version 1.3 or later is part of all distributions of
      LaTeX version 2005/12/01 or later.
     
-     This work has the LPPL maintenance status `maintained'.
+     This work has the LPPL maintenance status ‘maintained’.
      
      The current maintainer of this work is Peter Flynn <peter@silmaril.ie>
     
-     This work consists of the files vsg.dtx and vsg.ins,
-     the derived file vsg.cls, and any ancillary files listed
-     in the MANIFEST.
+     This work consists of the files veryshortguide.dtx and veryshortguide.ins,
+     the derived file , 
+     and any other ancillary files listed in the MANIFEST.
     
 
diff --git a/Master/texmf-dist/doc/latex/latex-veryshortguide/VERSION b/Master/texmf-dist/doc/latex/latex-veryshortguide/VERSION
new file mode 100644
index 00000000000..e84fd2e00f0
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/latex-veryshortguide/VERSION
@@ -0,0 +1 @@
+Date of most recent change is 2020-04-16
diff --git a/Master/texmf-dist/doc/latex/latex-veryshortguide/menno-a.jpg b/Master/texmf-dist/doc/latex/latex-veryshortguide/menno-a.jpg
new file mode 100644
index 00000000000..43a6d2685af
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/latex-veryshortguide/menno-a.jpg
diff --git a/Master/texmf-dist/doc/latex/latex-veryshortguide/menno-a.png b/Master/texmf-dist/doc/latex/latex-veryshortguide/menno-a.png
deleted file mode 100644
index 62be297167d..00000000000
--- a/Master/texmf-dist/doc/latex/latex-veryshortguide/menno-a.png
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/latex-veryshortguide/veryshortguide-A4-imposed.pdf b/Master/texmf-dist/doc/latex/latex-veryshortguide/veryshortguide-A4-imposed.pdf
index 32f1a8d6a99..74ab2186243 100644
--- a/Master/texmf-dist/doc/latex/latex-veryshortguide/veryshortguide-A4-imposed.pdf
+++ b/Master/texmf-dist/doc/latex/latex-veryshortguide/veryshortguide-A4-imposed.pdf
diff --git a/Master/texmf-dist/doc/latex/latex-veryshortguide/veryshortguide-Legal-imposed.pdf b/Master/texmf-dist/doc/latex/latex-veryshortguide/veryshortguide-Legal-imposed.pdf
deleted file mode 100644
index 91c859a7d46..00000000000
--- a/Master/texmf-dist/doc/latex/latex-veryshortguide/veryshortguide-Legal-imposed.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/latex-veryshortguide/vsg.cls b/Master/texmf-dist/doc/latex/latex-veryshortguide/veryshortguide.cls
index 5193104c894..b8a94c23c60 100644
--- a/Master/texmf-dist/doc/latex/latex-veryshortguide/vsg.cls
+++ b/Master/texmf-dist/doc/latex/latex-veryshortguide/veryshortguide.cls
@@ -1,127 +1,146 @@
 %%
-%% This is file `vsg.cls',
+%% This is file `veryshortguide.cls',
 %% generated with the docstrip utility.
 %%
 %% The original source files were:
 %%
-%% vsg.dtx  (with options: `class')
+%% veryshortguide.dtx  (with options: `class')
+%% 
+%% This is a generated file.
+%% 
+%% Copyright © 2006 by Silmaril Consultants
+%% 
 %% This file was generated from an XML master source.
 %% Amendments and corrections should be notified to the
 %% maintainer for inclusion in future versions.
+%% 
 \NeedsTeXFormat{LaTeX2e}[2015/01/01]
-\ProvidesClass{vsg}[2016/08/12 v0.6
- The Very Short Guide to LaTeX]
+\ProvidesClass{veryshortguide}[2020/04/16 v0.7
+  The Very Short Guide to LaTeX]
 \RequirePackage{fix-cm}
-\PassOptionsToPackage{svgnames}{xcolor}
-\PassOptionsToPackage{hyphens}{url}
-\newif\iflegal
-\newif\ifafive
-\afivetrue
-\gdef\VSG@papersize{a5paper}
-\gdef\VSG@margins{margin=12mm,bottom=10mm}
-\DeclareOption{a5paper}{%
-  \gdef\VSG@papersize{a5paper}%
-  \gdef\VSG@margins{margin=12mm,bottom=10mm}
-  \afivetrue\legalfalse}
-\DeclareOption{legalpaper}{%
-  \gdef\VSG@papersize{papersize={7in,8.5in}}%
-  \gdef\VSG@margins{margin=15mm,bottom=15mm}
-  \legaltrue\afivefalse}
+  \PassOptionsToPackage{svgnames}{xcolor}
+%%
+%% ******************************************************************
+%%
+%% Load the document base class
 \DeclareOption*{%
   \PassOptionsToClass{%
-    \CurrentOption}{article}}
+    \CurrentOption}{report}}
 \ProcessOptions\relax
-\LoadClass{article}
+\LoadClass[oneside]{report}
 %%
-%% Packages required
+%% Packages required for the class or package
 %%
 %% Package for establishing margins and text area.
-\RequirePackage[nohead,\VSG@papersize,
-  \VSG@margins]{geometry}
+\RequirePackage[margin=12mm,top=10mm,
+  bottom=10mm,nohead]{geometry}%
 %% Font specification setup for use with \XeLaTeX{}.
-\RequirePackage{fontspec}
-%% Caladea family of fonts, designed by Carolina Giovagnoli and Andres Torresi of the Huerta Tipografica foundry and adopted by Google for ChromeOS as a font-metric compatible replacement for Cambria.
-\RequirePackage{caladea}
-%% The current Raleway family is an extension of the original Raleway Thin by Matt McInerney. The family has been extended by Impallari, for more information see the impallari website http://www.impallari.com/projects/overview/matt-mcinerneys-raleway-family.
-\RequirePackage[scale=.9]{raleway}
+\RequirePackage{fontspec}%
+%% Linux Libertine and Biolinum fonts
+\RequirePackage{libertine}%
 %% Provide for graphics (PNG, JPG, or PDF format (only) for pdflatex; EPS format (only) for standard \LaTeX{}).
-\RequirePackage{graphicx}
+\RequirePackage{graphicx}%
 %% Handling of URI formatting.
-\RequirePackage{url}
+\RequirePackage{url}%
 %% This provides round-cornered and drop-shadow boxes.
-\RequirePackage{fancybox}
+\RequirePackage{fancybox}%
 %% List variants: inline and compact. Note that this replaces the earlier defaults of paralist and mdwlist.
-\RequirePackage[inline]{enumitem}
+\RequirePackage[inline]{enumitem}%
   \setlist[description]{style=unboxed}
+  \setlist[itemize]{leftmargin=2em}
+  \setlist[enumerate]{leftmargin=2em}
+  \newlist{inlineenum}{enumerate*}{1}
+  \setlist[inlineenum,1]{label=\emph{\alph*}),
+    itemjoin={{; }},itemjoin*={{; and }}}
 %% Allow infinitely-variable font scaling.
-\RequirePackage{fix-cm}
+\RequirePackage{fix-cm}%
 %% Provides multi-column typesetting.
-\RequirePackage{multicol}
+\RequirePackage{multicol}%
 %% Slanted fractions, even in math mode.
-\RequirePackage{nicefrac}
+\RequirePackage{nicefrac}%
 %% Add more robust verbatim facilities.
-\RequirePackage{fancyvrb}
+\RequirePackage{fancyvrb}%
 %% Karel Horak's dingbats symbols.
-\RequirePackage{bbding}
+\RequirePackage{bbding}%
 %% Creates paragraphs separated by white-space with no indentation.
-\RequirePackage{parskip}
+\RequirePackage{parskip}%
 %% Allow hyphenation in ragged setting.
-\RequirePackage{ragged2e}
+\RequirePackage{ragged2e}%
 %% Required for calculations involving lengths or counters, such as changes to widths for margin adjustment.
-\RequirePackage{calc}
+\RequirePackage{calc}%
 %% Package to enable if--then--else conditional processing.
-\RequirePackage{ifthen}
+\RequirePackage{ifthen}%
 %% Additional commands for common symbols and punctuation.
-\RequirePackage{textcomp}
-%% Additional column formatting for tables.
-\RequirePackage{array}
+\RequirePackage{textcomp}%
+%% Additional column formatting types for tables.
+\RequirePackage{array}%
 %% Provides size-relative font size changes (smaller, larger, etc).
-\RequirePackage{relsize}
+\RequirePackage{relsize}%
 %% Provides a more sophisticated casing function than the default.
-\RequirePackage{textcase}
+\RequirePackage{textcase}%
 %% Allows user-programmable changes to the positioning of letters in the \TeX{}-related logos on a per-font basis.
-\RequirePackage{flexlogo}
+\RequirePackage{flexlogo}%
 %% Underlining as an option (not automatically replacing italics).
-\RequirePackage[normalem]{ulem}
+\RequirePackage[normalem]{ulem}%
 %% Provide color.
-\RequirePackage{xcolor}
+\RequirePackage{xcolor}%
   \@ifundefined{T}{%
-    \newcommand{\T}[2]{{\fontencoding{T1}\selectfont#2}}}{}
+    \newcommand{\T}[2]{{\fontencoding{T1}%
+      \selectfont#2}}}{}
 %% Add language, cultural changes, and H\&J support for many languages.
-\RequirePackage[british]{babel}
+\RequirePackage[british]{babel}%
 %% Use biblatex instead of \BibTeX{}
 \RequirePackage[backend=biber,doi=true,
-  isbn=true,url=true,uniquename=false,style=apa]{biblatex}
-  \AtBeginDocument{\setlength{\bibitemsep}{1ex}
-  \defbibheading{shortbib}[Bibliography]{\section{#1}}}
-    \@ifpackagewith{babel}{british}{%
-    \DeclareLanguageMapping{british}{british-apa}}{\relax}
+  isbn=true,url=true,uniquename=false,style=apa]{biblatex}%
+  \AtBeginDocument{%
+    \setlength{\bibitemsep}{1ex}%
+    \setlength{\bibnamesep}{1.5\itemsep}%
+    \defbibheading{shortbib}[References]%
+      {\section{#1}}}
+  \@ifpackagewith{babel}{british}{%
+    \DeclareLanguageMapping{british}%
+      {british-apa}}{\relax}
+  \providetoggle{blx@skipbiblist}
 %% Adds correct curly quotes for cited titles when using biblatex
-\RequirePackage{csquotes}
+\RequirePackage{csquotes}%
 %% Graphical representations of menus, directories, and keys.
-\RequirePackage{menukeys}
+\RequirePackage{menukeys}%
   \renewmenumacro{\menu}[>]{roundedmenus}
   \renewmenumacro{\directory}[/]{hyphenatepathswithfolder}
   \renewmenumacro{\keys}{shadowedroundedkeys}
+%%
+%% ******************************************************************
+%%
+%% Font loading
+\setmainfont{Linux Libertine O}
+\setsansfont[Scale=MatchLowercase]{Raleway}
 \setmonofont[Scale=MatchLowercase]{zcoN}
+%%
+%% ******************************************************************
+%%
+%% Changes to package defaults
 \renewcommand{\labelitemi}{%
   \raisebox{-.5ex}{\textcolor{Purple}{\PencilRight}}}
-\setlength{\leftmargini}{18pt}% don't waste margin space in lists
+\setlength{\leftmargini}{18pt}% don't waste margin space
 \newcommand{\example}{%
-  \color{DarkGreen}\textsf{\bfseries Example:} \color{MediumBlue}}
+    \color{DarkGreen}\textsf{\bfseries Example:}
+    \color{MediumBlue}}
 \def\endexample{\color{black}}
 \newcommand{\gives}[1]{%
   \thinspace\color{DarkGreen}\raisebox{-.4ex}
     {\ArrowBoldRightStrobe}~\color{DarkRed}{\rmfamily
      #1}\color{black}}
-\newcommand{\nobox}{~\raisebox{-.25ex}{%
-  \footnotesize\Square\llap\XSolidBrush}}
-\newcommand{\yesbox}{~\raisebox{-.25ex}{%
-  \footnotesize\Square\llap\CheckmarkBold}}
-\newcommand{\comment}[1]{\ifthenelse{\equal{#1}{ }}{}{#1}\normalfont
-  \itshape\footnotesize\color{DarkRed}}
+\newcommand{\nobox}{~\raisebox{-.25ex}{\footnotesize
+    \Square\llap\XSolidBrush}}
+\newcommand{\yesbox}{~\raisebox{-.25ex}{\footnotesize
+    \Square\llap\CheckmarkBold}}
+\newcommand{\comment}[1]{%
+    \ifthenelse{\equal{#1}{ }}{}{#1}\normalfont
+    \itshape\footnotesize\color{DarkRed}}
 \newcommand{\added}{\color{MediumBlue}}
 \newcommand{\revert}{\ttfamily\upshape\color{black}}
+\newenvironment{note}{\begingroup\small\textbf{\sffamily Note:}}
+    {\par\endgroup}
 \newcommand{\monthdate}{\ifcase\month\or January\or
   February\or March\or April\or May\or June\or July\or August\or
   September\or October\or November\or December\fi\space\number\year}
@@ -147,8 +166,8 @@
   {1pt \@plus .2ex}%
   {\sffamily\large\bfseries}}
 \renewcommand\subsubsection{\@startsection{subsubsection}{3}{\z@}%
-  {-.5ex\@plus -1ex \@minus -.2ex}%
-  {.25ex \@plus .2ex}%
+  {-0pt\@plus -1ex \@minus -.2ex}%
+  {1pt \@plus .2ex}%
   {\sffamily\normalsize\bfseries}}
 \renewcommand\paragraph{\@startsection{paragraph}{4}{\z@}%
   {1ex \@plus1ex \@minus.2ex}%
@@ -169,13 +188,11 @@
 \renewcommand{\footnoterule}{\kern-3pt
   \hrule height.2pt width.25\columnwidth\kern 2.8pt}
 \pagestyle{empty}
-\spaceskip=4pt plus4pt minus3pt
+\spaceskip=4pt plus3pt minus2pt
 \renewcommand{\textsc}[1]{{\smaller\MakeTextUppercase{#1}}}
 \newcommand{\ff}[2][T1]{\fontencoding{#1}\fontfamily{#2}\selectfont}
-\renewcommand{\descriptionlabel}[1]{%
-  \hspace\labelsep{\sffamily\bfseries #1}}
-\newenvironment{note}{\small\textbf{Note.}\quad}{\par}
+\renewcommand{\descriptionlabel}[1]{\hspace\labelsep{\sffamily\bfseries #1}}
 
 \endinput
 %%
-%% End of file `vsg.cls'.
+%% End of file `veryshortguide.cls'.
diff --git a/Master/texmf-dist/doc/latex/latex-veryshortguide/vsg.dtx b/Master/texmf-dist/doc/latex/latex-veryshortguide/veryshortguide.dtx
index 995766a0665..e4e96d588bf 100644
--- a/Master/texmf-dist/doc/latex/latex-veryshortguide/vsg.dtx
+++ b/Master/texmf-dist/doc/latex/latex-veryshortguide/veryshortguide.dtx
@@ -1,8 +1,9 @@
 % \iffalse meta-comment
 %
-% Transformed from vsg.xml by ClassPack db2dtx.xsl
-% version 16.00 (Makefile with XeLaTeX) on Friday 12 August 2016 at 10:42:12
-% vsg.dtx is copyright © 2009-2016 by Peter Flynn <peter@silmaril.ie>
+% Transformed from veryshortguide.xml by ClassPack db2dtx.xsl
+% version 1.19 (2020-05-19) on Thursday 21 May 2020 at 11:55:35
+%
+% veryshortguide.dtx is copyright © 2009-2020 by Peter Flynn <peter@silmaril.ie>
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either
@@ -14,31 +15,30 @@
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
-% This work has the LPPL maintenance status `maintained'.
+% This work has the LPPL maintenance status ‘maintained’.
 % 
 % The current maintainer of this work is Peter Flynn <peter@silmaril.ie>
 %
-% This work consists of the files vsg.dtx and vsg.ins,
-% the derived file vsg.cls, and any ancillary files listed
-% in the MANIFEST.
+% This work consists of the files veryshortguide.dtx and veryshortguide.ins,
+% the derived file , 
+% and any other ancillary files listed in the MANIFEST.
 %
 % \fi
 % \iffalse
 %<*driver>
-\ProvidesFile{vsg.dtx}
+\ProvidesFile{veryshortguide.dtx}
 %</driver>
 %<class>\NeedsTeXFormat{LaTeX2e}[2015/01/01]
-%<class>\ProvidesClass{vsg}[2016/08/12 v0.6
-%<class> The Very Short Guide to LaTeX]
+%<class>\ProvidesClass{veryshortguide}[2020/04/16 v0.7
+%<class>  The Very Short Guide to LaTeX]
 %<*driver>
 \RequirePackage{fix-cm}% included by default.
-\PassOptionsToPackage{svgnames}{xcolor}% xcolor or hyperref in use
-\PassOptionsToPackage{hyphens}{url}% url, hyperref, biblatex, or metadata detected
+\PassOptionsToPackage{svgnames}{xcolor}% xcolor/dox/hyperref implied
 \documentclass[12pt]{ltxdoc}
 %%
 %% Packages added for documentation
 %%
-\usepackage{dox}% included by default. (0)
+\usepackage{dox}% used by default. (0)%
   \makeatletter
   \doxitem[idxtype=attribute]{Attribute}{CPK@attribute}{attributes}
   \makeatother
@@ -67,6 +67,15 @@
   \doxitem[idxtype=error]{Error}{CPK@error}{errors}
   \makeatother
   \makeatletter
+  \doxitem[idxtype=field]{Field}{CPK@field}{fields}
+  \makeatother
+  \makeatletter
+  \doxitem[idxtype=file]{File}{CPK@file}{files}
+  \makeatother
+  \makeatletter
+  \doxitem[idxtype=font]{Font}{CPK@font}{fonts}
+  \makeatother
+  \makeatletter
   \doxitem[idxtype=function]{Function}{CPK@function}{functions}
   \makeatother
   \makeatletter
@@ -85,6 +94,12 @@
   \doxitem[idxtype=package]{Package}{CPK@package}{packages}
   \makeatother
   \makeatletter
+  \doxitem[idxtype=variable]{Variable}{CPK@variable}{variables}
+  \makeatother
+  \makeatletter
+  \doxitem[idxtype=parameter]{Parameter}{CPK@parameter}{parameters}
+  \makeatother
+  \makeatletter
   \doxitem[macrolike,idxtype=switch]{Switch}{CPK@switch}{switches}
   \makeatother
   \makeatletter
@@ -94,11 +109,11 @@
   \doxitem[idxtype=typeface]{Typeface}{CPK@typeface}{typefaces}
   \makeatother
   \makeatletter
-  \doxitem[idxtype=font]{Font}{CPK@font}{fonts}
+  \doxitem[macrolike,idxtype=box]{Box}{CPK@box}{boxes}
   \makeatother
   \newcommand{\LabelFont}[2][\relax]{\strut
     {\fontencoding\encodingdefault
-     \fontfamily{lmtt}\fontseries{lc}#1\selectfont#2}\space}
+	    \fontfamily{lmtt}\fontseries{lc}#1\selectfont#2}\space}
   \makeatletter
   \let\CPK@macro\macro\let\CPK@endmacro\endmacro
   \makeatother
@@ -126,27 +141,52 @@
   \def\PrintPackageName#1{\LabelFont[\fontfamily{lmss}]{#1}}
   \def\PrintSwitchName#1{\LabelFont{#1}}
   \def\PrintTemplateName#1{\LabelFont[\bfseries]{#1}}
-%% inputenc omitted: conflicts with fontspec (3)
-%% fontenc omitted: conflicts with fontspec (5)
-\usepackage{fontspec}% a part/@conformance='xelatex' was detected. (6)
-\usepackage{mflogo}% included by default. (28)
-\usepackage[british]{babel}% included by default. (33)
-\usepackage{array}% use of 'tgroup' was detected (37)
-\usepackage{calc}% included by default. (39)
-\usepackage{ccaption}% included by default. (41)
+  \def\PrintVariableName#1{\LabelFont[\ttfamily]{#1}}
+  \def\PrintParameterName#1{\LabelFont[\ttfamily]{#1}}
+  \def\PrintFieldName#1{\LabelFont[\ttfamily]{#1}}
+%% fontenc omit: conflict: fontspec (3)
+%% inputenc omit: conflict: fontspec (6)
+\usepackage{fontspec}% part/@conformance=xelatex detected. (7)%
+\usepackage{mflogo}% used by default. (35)%
+\usepackage[british]{babel}% used by default. (40)%
+\usepackage{array}% use of 'tgroup' detected (46)%
+\usepackage{calc}% used by default. (49)%
+  \makeatletter
+  {\scriptsize
+	    \global\advance\@totalleftmargin by1em
+	    \global\advance\MacroIndent by.5em}
+  \makeatother
+\usepackage{ccaption}% used by default. (52)%
   \captionnamefont{\bfseries}
   \captionstyle{\raggedright}
-\usepackage[inline]{enumitem}% use of 'variablelist' was detected (45)
+\usepackage[inline]{enumitem}% use of 'variablelist' detected (56)%
   \setlist[description]{style=unboxed}
-\usepackage{fancybox}% use of 'note' was detected (46)
-\usepackage{fancyvrb}% use of 'bibliography' was detected (49)
-\usepackage{textcase}% included by default. (55)
+  \setlist[itemize]{leftmargin=2em}
+  \setlist[enumerate]{leftmargin=2em}
+  \newlist{inlineenum}{enumerate*}{1}
+  \setlist[inlineenum,1]{label=\emph{\alph*}),
+	    itemjoin={{; }},itemjoin*={{; and }}}
+\usepackage{fancybox}% use of 'note' detected (57)%
+\usepackage{fancyvrb}% use of 'bibliography' detected (60)%
+\usepackage{relsize}% use of 'acronym' detected (64)%
+\usepackage{textcase}% used by default. (67)%
+\usepackage{float}% used by default. (69)%
+  \renewcommand{\topfraction}{.85}
+  \renewcommand{\bottomfraction}{.7}
+  \renewcommand{\textfraction}{.15}
+  \renewcommand{\floatpagefraction}{.66}
+  \renewcommand{\dbltopfraction}{.66}
+  \renewcommand{\dblfloatpagefraction}{.66}
+  \setcounter{topnumber}{9}
+  \setcounter{bottomnumber}{9}
+  \setcounter{totalnumber}{20}
+  \setcounter{dbltopnumber}{9}
 \usepackage[a4paper,left=30mm,top=25mm,
-  textwidth=150mm,textheight=225mm]{geometry}% included by default. (58)
-\usepackage{listings}% use of 'programlisting' was detected (67)
+  textwidth=150mm,textheight=225mm,headheight=15pt]{geometry}% used by default. (71)%
+\usepackage{graphicx}% part/@conformance=xelatex detected. (76)%
+\usepackage{listings}% use of 'programlisting' detected (83)%
   \lstdefinelanguage{dummy}
 	    {morekeywords={dummy}}
-	  
   \lstdefinelanguage{Makefile}
 	  {otherkeywords={.PHONY,.DEFAULT},%
 	    morekeywords={PHONY,DEFAULT,shell,ifeq,else,endif},%
@@ -177,7 +217,8 @@
   \lstdefinelanguage{bash}
 	    {morestring=[s]{[]},morekeywords={exit,logout,yes,no,@,
 	    password,ssh,URL,cd,dvips,latex,ls,makeindex,man,mkdir,
-	    pdflatex,sudo,texconfig,texdoc,updmap,xelatex}} 
+	    pdflatex,sudo,texconfig,texdoc,updmap,xelatex,biber,
+	    latexmk,bibtex}} 
 	  
   \makeatother
   \lstdefinelanguage{APA}[]{XML}
@@ -264,6 +305,7 @@
 	    rulecolor=\color{LightSteelBlue},framerule=1pt}
 	  
   \lstloadlanguages{LaTeXe,DocBook,XML,XSLT2,bash}
+  \lstdefinelanguage{XMLFRAG}{tag=**[s]<>}[html]
   \lstnewenvironment{listingsdoc}
 	    {\lstset{language={[LaTeX]TeX}}}
 	    {}
@@ -294,10 +336,15 @@
 	    {ö}{{\"o}}1
 	    {ú}{{\'u}}1
 	    {ü}{{\"u}}1
+	    {¹}{{\textsuperscript1}}1
+            {²}{{\textsuperscript2}}1
+            {³}{{\textsuperscript3}}1
 	    {ı}{{\i}}1
 	    {—}{{---}}1
 	    {’}{{'}}1
 	    {…}{{\dots}}1
+	    {➝}{{$leftarrow$}}1
+            {⮠}{{$\hookleftarrow$}}1
 	    {␣}{{\textvisiblespace}}1,
 	    keywordstyle=\color{DarkGreen}\bfseries,
 	    identifierstyle=\color{DarkRed},
@@ -307,20 +354,19 @@
 	    showstringspaces=false,
 	    columns=fullflexible,
 	    keepspaces=true}
-\usepackage{makeidx}% included by default. (68)
+\usepackage{makeidx}% used by default. (85)%
   \makeindex
-\usepackage{nicefrac}% included by default. (73)
+\usepackage{nicefrac}% used by default. (91)%
   \def\textonehalf{\ensuremath{\nicefrac12}}
-\usepackage{parskip}% requested by author (75)
-\usepackage{pdfpages}% a imagedata/@format='pdf' was detected. (76)
-\usepackage{sectsty}% included by default. (78)
-  \allsectionsfont{\sffamily}
+\usepackage{parskip}% requested by author (93)%
+\usepackage{sectsty}% used by default. (96)%
+  \allsectionsfont{\sffamily\raggedright}
   \renewcommand*{\descriptionlabel}[1]{\hspace\labelsep
 	    \sffamily\bfseries #1}
-\usepackage[normalem]{ulem}% use of 'link' was detected (84)
-\usepackage{url}% use of 'ulink' was detected (85)
+\usepackage[normalem]{ulem}% use of 'link' detected (103)%
+\usepackage{url}% use of 'ulink' detected (104)%
   \AtBeginDocument{\urlstyle{tt}}
-\usepackage{varioref}% use of 'xref' was detected (88)
+\usepackage{varioref}% use of 'xref' detected (107)%
   \vrefwarning
   \labelformat{appendix}{Appendix~#1}
   \makeatletter
@@ -337,118 +383,125 @@
 	    page}
   \def\reftextafter{on the
 	    \reftextvario{next}{following} page}
-\usepackage{xcolor}% included by default. (90)
+\usepackage{xcolor}% used by default. (115)%
   \makeatletter
   \@ifundefined{T}{%
-	    \newcommand{\T}[2]{{\fontencoding{T1}\selectfont#2}}}{}
+	    \newcommand{\T}[2]{{\fontencoding{T1}%
+	      \selectfont#2}}}{}
   \makeatother
-\usepackage{menukeys}% use of 'guimenu' was detected (92)
+\usepackage{menukeys}% use of 'guimenu' detected (118)%
   \renewmenumacro{\menu}[>]{roundedmenus}
   \renewmenumacro{\directory}[/]{hyphenatepathswithfolder}
   \renewmenumacro{\keys}{shadowedroundedkeys}
-\usepackage{classpack}% included by default. (93)
+\usepackage{classpack}[2020/05/19]% used by default. (120)%
 \newcommand{\classorpackage}{class}
 %
 %%
-%% Settings for docstrip and latexdoc 
+%% Settings for docstrip and ltxdoc 
 %%
 \EnableCrossrefs
 \CodelineIndex
 \RecordChanges
 \begin{document}
-  \DocInput{vsg.dtx}
+  \DocInput{veryshortguide.dtx}
 \end{document}
 %</driver>
 % \fi
 %
-% \CheckSum{1031}
+% \CheckSum{253}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
 %   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
 %   Digits        \0\1\2\3\4\5\6\7\8\9
-%   Exclamation   \!     Double quote  \"     Hash (number) \#
-%   Dollar        \$     Percent       \%     Ampersand     \&
-%   Acute accent  \'     Left paren    \(     Right paren   \)
-%   Asterisk      \*     Plus          \+     Comma         \,
-%   Minus         \-     Point         \.     Solidus       \/
-%   Colon         \:     Semicolon     \;     Less than     \<
-%   Equals        \=     Greater than  \>     Question mark \?
-%   Commercial at \@     Left bracket  \[     Backslash     \\
-%   Right bracket \]     Circumflex    \^     Underscore    \_
-%   Grave accent  \`     Left brace    \{     Vertical bar  \|
-%   Right brace   \}     Tilde         \~}
+%   Exclamation   \!  Double quote  \"  Hash (number) \#
+%   Dollar        \$  Percent       \%  Ampersand     \&
+%   Acute accent  \'  Left paren    \(  Right paren   \)
+%   Asterisk      \*  Plus          \+  Comma         \,
+%   Minus         \-  Point         \.  Solidus       \/
+%   Colon         \:  Semicolon     \;  Less than     \<
+%   Equals        \=  Greater than  \>  Question mark \?
+%   Commercial at \@  Left bracket  \[  Backslash     \\
+%   Right bracket \]  Circumflex    \^  Underscore    \_
+%   Grave accent  \`  Left brace    \{  Vertical bar  \|
+%   Right brace   \}  Tilde         \~}
 % 
-% \changes{v0.6}{2016/08/12}{Fixed bug in imposition: Added -sPAPERSIZE to the reconversion to PDF. Thanks to Bruno Le Floch for spotting this..}
-% \changes{v0.5}{2016/08/10}{Started documenting actual text: Trying to explain why I wrote what I wrote. This is unfinished at the moment..}
+% \changes{v0.7}{2020/04/16}{Regression release: 1) Updated to ClassPack 1.19; 2) Switched all conformance attributes on revision dates to YYYY-MM-DD; 3) Fixed some minor typos.}
+% \changes{v0.6}{2020/03/20}{Maintenance release: 1) Updated to ClassPack 1.18 ready for new release; 2) Replaced all conformance attributes on revision dates with YYYY-MM-DD as per changes to ClassPack.}
+% \changes{v0.5}{2017/12/24}{Maintenance release: Updated ClassPack, changed fonts to Plex.}
 % \changes{v0.4}{2016/06/14}{Moved into ClassPack: Added parameterisation for A4 and Legal.}
 % \changes{v0.3}{2016/06/04}{Updated to \XeLaTeX{}: Changed fonts again, switched to biber.}
 % \changes{v0.2}{2013/01/22}{Reissue: Fixed typos and changed font.}
 % \changes{v0.1}{2009/10/01}{Reworked from 2006 original: Changed to 4pp A4.}
 %
-% \GetFileInfo{vsg.dtx}
+% \GetFileInfo{veryshortguide.dtx}
 %
 % \DoNotIndex{\@,\@@par,\@beginparpenalty,\@empty}
-% \DoNotIndex{\@flushglue,\@gobble,\@input}
-% \DoNotIndex{\@makefnmark,\@makeother,\@maketitle}
-% \DoNotIndex{\@namedef,\@ne,\@spaces,\@tempa}
-% \DoNotIndex{\@tempb,\@tempswafalse,\@tempswatrue}
-% \DoNotIndex{\@thanks,\@thefnmark,\@topnum}
-% \DoNotIndex{\@@,\@elt,\@forloop,\@fortmp,\@gtempa,\@totalleftmargin}
-% \DoNotIndex{\",\/,\@ifundefined,\@nil,\@verbatim,\@vobeyspaces}
-% \DoNotIndex{\|,\~,\ ,\active,\advance,\aftergroup,\begingroup,\bgroup}
-% \DoNotIndex{\mathcal,\csname,\def,\documentstyle,\dospecials,\edef}
-% \DoNotIndex{\egroup}
-% \DoNotIndex{\else,\endcsname,\endgroup,\endinput,\endtrivlist}
-% \DoNotIndex{\expandafter,\fi,\fnsymbol,\futurelet,\gdef,\global}
-% \DoNotIndex{\hbox,\hss,\if,\if@inlabel,\if@tempswa,\if@twocolumn}
-% \DoNotIndex{\ifcase}
-% \DoNotIndex{\ifcat,\iffalse,\ifx,\ignorespaces,\index,\input,\item}
-% \DoNotIndex{\jobname,\kern,\leavevmode,\leftskip,\let,\llap,\lower}
-% \DoNotIndex{\m@ne,\next,\newpage,\nobreak,\noexpand,\nonfrenchspacing}
-% \DoNotIndex{\obeylines,\or,\protect,\raggedleft,\rightskip,\rm,\sc}
-% \DoNotIndex{\setbox,\setcounter,\small,\space,\string,\strut}
-% \DoNotIndex{\strutbox}
-% \DoNotIndex{\thefootnote,\thispagestyle,\topmargin,\trivlist,\tt}
-% \DoNotIndex{\twocolumn,\typeout,\vss,\vtop,\xdef,\z@}
-% \DoNotIndex{\,,\@bsphack,\@esphack,\@noligs,\@vobeyspaces,\@xverbatim}
-% \DoNotIndex{\`,\catcode,\end,\escapechar,\frenchspacing,\glossary}
-% \DoNotIndex{\hangindent,\hfil,\hfill,\hskip,\hspace,\ht,\it,\langle}
-% \DoNotIndex{\leaders,\long,\makelabel,\marginpar,\markboth,\mathcode}
-% \DoNotIndex{\mathsurround,\mbox,\newcount,\newdimen,\newskip}
-% \DoNotIndex{\nopagebreak}
-% \DoNotIndex{\parfillskip,\parindent,\parskip,\penalty,\raise,\rangle}
-% \DoNotIndex{\section,\setlength,\TeX,\topsep,\underline,\unskip,\verb}
-% \DoNotIndex{\vskip,\vspace,\widetilde,\\,\%,\@date,\@defpar}
-% \DoNotIndex{\[,\{,\},\]}
-% \DoNotIndex{\count@,\ifnum,\loop,\today,\uppercase,\uccode}
-% \DoNotIndex{\baselineskip,\begin,\tw@}
-% \DoNotIndex{\a,\b,\c,\d,\e,\f,\g,\h,\i,\j,\k,\l,\m,\n,\o,\p,\q}
-% \DoNotIndex{\r,\s,\t,\u,\v,\w,\x,\y,\z,\A,\B,\C,\D,\E,\F,\G,\H}
-% \DoNotIndex{\I,\J,\K,\L,\M,\N,\O,\P,\Q,\R,\S,\T,\U,\V,\W,\X,\Y,\Z}
-% \DoNotIndex{\1,\2,\3,\4,\5,\6,\7,\8,\9,\0}
-% \DoNotIndex{\!,\#,\$,\&,\',\(,\),\+,\.,\:,\;,\<,\=,\>,\?,\_}
-% \DoNotIndex{\discretionary,\immediate,\makeatletter,\makeatother}
-% \DoNotIndex{\meaning,\newenvironment,\par,\relax,\renewenvironment}
-% \DoNotIndex{\repeat,\scriptsize,\selectfont,\the,\undefined}
-% \DoNotIndex{\arabic,\do,\makeindex,\null,\number,\show,\write,\@ehc}
-% \DoNotIndex{\@author,\@ehc,\@ifstar,\@sanitize,\@title,\everypar}
-% \DoNotIndex{\if@minipage,\if@restonecol,\ifeof,\ifmmode}
-% \DoNotIndex{\lccode,\newtoks,\onecolumn,\openin,\p@,\SelfDocumenting}
-% \DoNotIndex{\settowidth,\@resetonecoltrue,\@resetonecolfalse,\bf}
-% \DoNotIndex{\clearpage,\closein,\lowercase,\@inlabelfalse}
-% \DoNotIndex{\selectfont,\mathcode,\newmathalphabet,\rmdefault}
-% \DoNotIndex{\bfdefault,\DeclareRobustCommand}
+% \DoNotIndex{\@flushglue,\@gobble,\@input,\@makefnmark}
+% \DoNotIndex{\@makeother,\@maketitle,\@namedef,\@ne}
+% \DoNotIndex{\@spaces,\@tempa,\@tempb,\@tempswafalse}
+% \DoNotIndex{\@tempswatrue,\@thanks,\@thefnmark,\@topnum}
+% \DoNotIndex{\@@,\@elt,\@forloop,\@fortmp,\@gtempa}
+% \DoNotIndex{\@totalleftmargin,\",\/,\@ifundefined,\@nil}
+% \DoNotIndex{\@verbatim,\@vobeyspaces,\|,\~,\ ,\active}
+% \DoNotIndex{\advance,\aftergroup,\begingroup,\bgroup}
+% \DoNotIndex{\mathcal,\csname,\def,\documentstyle}
+% \DoNotIndex{\dospecials,\edef,\egroup,\else,\endcsname}
+% \DoNotIndex{\endgroup,\endinput,\endtrivlist}
+% \DoNotIndex{\expandafter,\fi,\fnsymbol,\futurelet,\gdef}
+% \DoNotIndex{\global,\hbox,\hss,\if,\if@inlabel}
+% \DoNotIndex{\if@tempswa,\if@twocolumn,\ifcase,\ifcat}
+% \DoNotIndex{\iffalse,\ifx,\ignorespaces,\index,\input}
+% \DoNotIndex{\item,\jobname,\kern,\leavevmode,\leftskip}
+% \DoNotIndex{\let,\llap,\lower,\m@ne,\next,\newpage}
+% \DoNotIndex{\nobreak,\noexpand,\nonfrenchspacing}
+% \DoNotIndex{\obeylines,\or,\protect,\raggedleft}
+% \DoNotIndex{\rightskip,\rm,\sc,\setbox,\setcounter}
+% \DoNotIndex{\small,\space,\string,\strut,\strutbox}
+% \DoNotIndex{\thefootnote,\thispagestyle,\topmargin}
+% \DoNotIndex{\trivlist,\tt,\twocolumn,\typeout,\vss,\vtop}
+% \DoNotIndex{\xdef,\z@,\,,\@bsphack,\@esphack,\@noligs}
+% \DoNotIndex{\@vobeyspaces,\@xverbatim,\`,\catcode,\end}
+% \DoNotIndex{\escapechar,\frenchspacing,\glossary}
+% \DoNotIndex{\hangindent,\hfil,\hfill,\hskip,\hspace,\ht}
+% \DoNotIndex{\it,\langle,\leaders,\long,\makelabel}
+% \DoNotIndex{\marginpar,\markboth,\mathcode,\mathsurround}
+% \DoNotIndex{\mbox,\newcount,\newdimen,\newskip}
+% \DoNotIndex{\nopagebreak,\parfillskip,\parindent}
+% \DoNotIndex{\parskip,\penalty,\raise,\rangle,\section}
+% \DoNotIndex{\setlength,\TeX,\topsep,\underline,\unskip}
+% \DoNotIndex{\verb,\vskip,\vspace,\widetilde,\\,\%,\@date}
+% \DoNotIndex{\@defpar,\[,\{,\},\],\count@,\ifnum,\loop}
+% \DoNotIndex{\today,\uppercase,\uccode,\baselineskip}
+% \DoNotIndex{\begin,\tw@,\a,\b,\c,\d,\e,\f,\g,\h,\i,\j,\k}
+% \DoNotIndex{\l,\m,\n,\o,\p,\q,\r,\s,\t,\u,\v,\w,\x,\y,\z}
+% \DoNotIndex{\A,\B,\C,\D,\E,\F,\G,\H,\I,\J,\K,\L,\M,\N,\O}
+% \DoNotIndex{\P,\Q,\R,\S,\T,\U,\V,\W,\X,\Y,\Z,\1,\2,\3,\4}
+% \DoNotIndex{\5,\6,\7,\8,\9,\0,\!,\#,\$,\&,\',\(,\)}
+% \DoNotIndex{\+,\.,\:,\;,\<,\=,\>,\?,\_,\discretionary}
+% \DoNotIndex{\immediate,\makeatletter,\makeatother}
+% \DoNotIndex{\meaning,\newenvironment,\par,\relax}
+% \DoNotIndex{\renewenvironment,\repeat,\scriptsize}
+% \DoNotIndex{\selectfont,\the,\undefined,\arabic,\do}
+% \DoNotIndex{\makeindex,\null,\number,\show,\write,\@ehc}
+% \DoNotIndex{\@author,\@ehc,\@ifstar,\@sanitize,\@title}
+% \DoNotIndex{\everypar,\if@minipage,\if@restonecol,\ifeof}
+% \DoNotIndex{\ifmmode,\lccode,\newtoks,\onecolumn,\openin}
+% \DoNotIndex{\p@,\SelfDocumenting,\settowidth}
+% \DoNotIndex{\@resetonecoltrue,\@resetonecolfalse,\bf}
+% \DoNotIndex{\clearpage,\closein,\lowercase}
+% \DoNotIndex{\@inlabelfalse,\selectfont,\mathcode}
+% \DoNotIndex{\newmathalphabet,\rmdefault,\bfdefault}
+% \DoNotIndex{\DeclareRobustCommand}
 % \DoNotIndex{\classorpackage}
 % \DoNotIndex{\centering}
 % \DoNotIndex{\descriptionlabel}
-% \DoNotIndex{\author}
 %
-% \def\fileversion{0.6}
-% \def\filedate{2016/08/12}
-% \title{The  \textsf{vsg} \LaTeXe\ document class\thanks{%
-% This document corresponds to \textsf{vsg}
-% \textit{v.}\ \fileversion $\beta$, dated \filedate.}
+% \def\fileversion{0.7}
+% \def\filedate{2020/04/16}
+% \title{The  \textsf{veryshortguide} \LaTeXe\ document class\thanks{%
+% This document corresponds to \textsf{veryshortguide}
+% \textit{v.}\ \fileversion p, dated \filedate.}
 % \\[1em]\Large 
 % The Very Short Guide to \LaTeX{}}
 % \author{Peter Flynn\\\normalsize Silmaril Consultants\\[-.25ex]\normalsize \\\normalsize(\url{peter@silmaril.ie})}
@@ -458,17 +511,13 @@
 % \parskip=0.5\baselineskip
 % \advance\parskip by 0pt plus 2pt
 % \parindent=0pt% \noindent
-% This is a document class derived from the original
+% This is the document class originally designed for the
 % \emph{Very Short Guide to \LaTeX{}}, a 4pp
 % folder designed as an aide-mémoire for people who have just
 % done a course in \LaTeX{} and need something by them on their
 % desk the next day to refresh their memories. It is
 % \emph{not} intended as a substitute for full
 % documentation.\par
-% This class is designed for this document only, but adds
-% parameterisation to allow reformatting tweaks for different
-% paper sizes (A4 and Legal) to allow it to be printed two-sided
-% as a 4pp folder.\par
 % Please do not complain that there is no math here. It
 % won't fit. Someone else can do a math leaflet. IANAM.\par
 % \end{abstract}
@@ -476,39 +525,42 @@
 % \tableofcontents
 % \clearpage
 % \section*{Latest changes}
-% \subsection*{v.0.6 (2016-08-12)}
-% \paragraph*{Fixed bug in imposition}
+% \subsection*{v.0.7 (2020-04-16)}
+% \paragraph*{Regression release}
 % \begin{itemize}
-% \item Added \texttt{-sPAPERSIZE} to the reconversion
-%       to \textsc{pdf}. Thanks to Bruno Le Floch for
-%       spotting this.
+% \item Updated to \emph{ClassPack}
+% 1.19\par
+% \item Switched all \texttt{@conformance} attributes on
+% revision dates to \texttt{@YYYY-MM-DD}\par
+% \item Fixed some minor typos\par
 % \end{itemize}
-% \subsection*{v.0.5 (2016-08-10)}
-% \paragraph*{Started documenting actual text}
+% \subsection*{v.0.6 (2020-03-20)}
+% \paragraph*{Maintenance release}
 % \begin{itemize}
-% \item Trying to explain why I wrote what I wrote. This
-%       is unfinished at the moment.
+% \item Updated to ClassPack 1.18 ready for new release\par
+% \item Replaced all \texttt{@conformance} attributes on
+% revision dates with \texttt{@YYYY-MM-DD} as per changes to
+% \emph{ClassPack}\par
 % \end{itemize}
-% \subsection*{v.0.4 (2016-06-14)}
-% \paragraph*{Moved into ClassPack}
+% \subsection*{v.0.5 (2017-12-24)}
+% \paragraph*{Maintenance release}
 % \begin{itemize}
-% \item Added parameterisation for A4 and Legal
+% \item Updated ClassPack, changed fonts to Plex\par
 % \end{itemize}
-% \subsection*{v.0.3 (2016-06-04)}
-% \paragraph*{Updated to \XeLaTeX{}}
+% \subsection*{v.0.4 (2016-06-14)}
+% \paragraph*{Moved into ClassPack}
 % \begin{itemize}
-% \item Changed fonts again, switched to
-% \emph{biber}
+% \item Added parameterisation for A4 and Legal\par
 % \end{itemize}
-% See p.\thinspace\pageref{changehistory} for details of earlier changes.
+% See p.\thinspace\pageref{changehistory} for earlier changes.
 % \clearpage
 % \section{Acknowledgements}
 % Thanks to all those on c.t.t whose suggestions made this
 % version more useful.\par
 % Alan Munn for the distinction between base font and font
-% package and for suggesting ``expected functionality'' packages
-% on sectioning, long tables, headers, and double spacing, and
-% links to FAQ and CTAN.\par
+% package and for suggesting `expected
+%   functionality' packages on sectioning, long tables,
+% headers, and double spacing, and links to FAQ and CTAN.\par
 % Lars Madsen, Will Robertson, Robin Fairbairns and others
 % for asking for the center environment in tables and figures to
 % be replaced with the {\ttfamily{}\textbackslash{}centering} command (I
@@ -517,257 +569,179 @@
 % Rob Felty and Domink Wass for pointing me at Winston
 % Chang's excellent \emph{LaTeX Cheat Sheet}
 % summary.\par
+% \StopEventually{\label{endcode}%
+%   \clearpage
+%   \newgeometry{left=3cm}%
+%   \addcontentsline{toc}{section}{Change History}%
+%   \label{changehistory}%
+%   \PrintChanges
+%   \clearpage
+%   \label{codeindex}%
+%   \addcontentsline{toc}{section}{Index}%
+%   \PrintIndex}
+% \addtolength{\CPKrevmarg}{\widthof{\LabelFont{descriptionlabel}}}
+% \newgeometry{left=\CPKrevmarg}
+% \message{Margin reset to \the\CPKrevmarg, to fit <descriptionlabel>}
+% \iffalse
+%<*class>
+% \fi
 % \clearpage
-% \section{Usage}
-% The document class is designed solely for the Very Short
-%       Guide, and it is not envisaged that it would be of any use for
-%       other types of document except similar short guides.\par
-% \subsection{Options}
-% The only available options are:\par
-% \begin{description}[style=unboxed]
-% \item[\textbf{\texttt{a5paper}}\thinspace:](the default) formats it as four pages of A5, suitable
-% for imposition two-up on A4 for double-sided printing.
-% \item[\textbf{\texttt{legalpaper}}\thinspace:]format it as four pages each half the size of a
-% sheet of US Legal (8.5x14in) so that the
-% same imposition can be used to print on Legal paper.
-% \end{description}
-% \par\begingroup\fboxsep1em\centering
-%   \fbox{\begin{minipage}{0.8\columnwidth}\sffamily
-%  \raggedright\parindent0pt\parskip=.5\baselineskip
-% \subsubsection*{\sffamily Warning}
-% A lot of stuff is faked up in the document, because
-%     we're combining incompatible things for the sake of showing
-%     examples which would not normally occur in a normal
-%     document, let alone one as small as this. The demands of
-%     space mean that there is far more manual adjustment needed
-%     than would be seen in a standard continuous-text document.
-%     Live with it.\par
-% \end{minipage}}\par\endgroup
-% \subsection{Printing}
-% To impose for printing, use the
-%   \emph{pdf2ps} utility to convert the
-%   \textsc{pdf} output to \textsc{ps}. Pass
-%   it through the \emph{pstops} utility to
-%   perform imposition, and then use
-%   \emph{ps2pdf} to convert the output back
-%   to \textsc{pdf}. For each format generated, this
-%   means:\par
+% \section{Implementation}\label{veryshortguide}
+% This was originally laid out for A5 pages with margins
+% optimised for a HP K8600 so that I can impose two pages per
+% A4 sheet and print double-sided. It was not tested at
+% letterpaper size (and may not fit) as it makes more sense to
+% do it for half of a Legal sheet (8.5 x 14.0 in) for the US.\par
+% WARNING: a lot of stuff is faked up in the document,
+% because we're combining incompatible things for the sake of
+% showing examples which would not normally occur in the same
+% document (eg both scientific and humanities-style
+% bibliographic references in the same document). The demands of
+% space also mean that there is far more manual adjustment
+% needed than would be seen in a normal continuous-text
+% document. Live with it.\par
+% Printing was prepared with:\par
 % \iffalse
 %<*ignore>
 % \fi
-\begin{lstlisting}[language=bash]
-pdf2ps veryshortguide.pdf - |\
-  pstops -pa4 -b \
-    "4:-3L(21cm,0mm)+0L(21cm,14.85cm),1L(21cm,0mm)+-2L(21cm,14.85cm)" |\
-  ps2pdf -sPAPERSIZE=a4 - veryshortguide-A4-imposed.pdf
-
-pdf2ps veryshortguide.pdf - |\
-  pstops -plegal -b \
-    "4:-3L(8.5in,0in)+0L(8.5in,7in),1L(8.5in,0in)+-2L(8.5in,7in)" |\
-  ps2pdf -sPAPERSIZE=legal - veryshortguide-Legal-imposed.pdf
-\end{lstlisting}
+% \begingroup\advance\hsize by-1em
+% \begin{Verbatim}[frame=single,framesep=1em,
+%  fontsize=\small]
+pdf2ps vsg.pdf - | pstops -pa4 -b \
+"4:-3L(21cm,5mm)+0L(21cm,14.35cm),1L(21cm,5mm)+-2L(21cm,14.35cm)" |\
+ps2pdf - veryshortguide-A4-imposed.pdf
+% \end{Verbatim}
+% \endgroup
 % \iffalse
 %</ignore>
 % \fi
-% Pages are referenced from zero (the first page). This
-%   outputs page 3 (p.4) and page 0 (p.1) on the first side. The
-%   21cm or 8.5in places the reference point (top left corner)
-%   at that distance \emph{up} (\(y\)-axis, the short side of a piece of
-%   landscape paper), and 0mm/0in to the
-%   \emph{right} (\(x\)-axis, the long side) for p.4, and half the
-%   paper-length (14.85mm or 7in) to the right for p.1.\par
-% The verso is produced by the second expression,
-%   outputting page 1 (p.2) and page 2 (p.3) in exactly the same
-%   way.\par
-% You may need to adjust these dimensions if your printer
-%   cannot print all the way to the edge of the sheet. Normally,
-%   there would be no horizontal adjustment, but because my
-%   printer cannot print the bottom 12mm of a sheet (the last
-%   edge to emerge from the printer), if I print 2–up A5 pages
-%   on an A4 sheet like this, I need to allow for the fact that
-%   one edge of two of the pages must have a 12mm margin, so
-%   I have to add 5mm to the horizontal offset to make it
-%   symmetrical. If your printer can bleed off the trailing
-%   edge, then you can adjust the horizontal dimensions
-%   accordingly.\par
-% When printing from Acrobat Reader, it generates the
-%   \emph{lpr}\thinspace(1) command that it
-%   will use. The example below is from my own system:\par
+% On some printers you may need to modify the positioning,
+%       eg\par
 % \iffalse
 %<*ignore>
 % \fi
-\begin{lstlisting}[language={[LaTeX]TeX}]
-lpr -P \
-  Officejet-Pro-K8600 -o PageSize=A6.SM -o PageRegion=A4 \
-  -o Duplex=DuplexTumble -o InputSlot=Auto -o ColorModel=RGB \
-  -o MediaType=Automatic -o OutputMode=Normal -o OptionDuplex=True
-\end{lstlisting}
+% \begingroup\advance\hsize by-1em
+% \begin{Verbatim}[frame=single,framesep=1em,
+%  fontsize=\small]
+pdf2ps veryshortguide.pdf - | pstops -pa4 -b \
+"4:-3L(21cm,7mm)+0L(21cm,14.35cm),1L(21cm,7mm)+-2L(21cm,14.35cm)" |\
+ps2pdf - veryshortguide-A4-imposed.pdf
+% \end{Verbatim}
+% \endgroup
 % \iffalse
 %</ignore>
 % \fi
-% \clearpage
-% \begin{figure}[p]\small\sffamily\centering
-% \caption{Effect of imposition (A4 version) above: front and
-%   back; below: inside.}\medskip
-% \includepdf[pages=1,scale=0.6,angle=270,offset=-5mm 7.2cm,frame]{veryshortguide-A4-imposed.pdf}
-% \par
-% \includepdf[pages=2,scale=0.6,angle=270,offset=-5mm -4.2cm,frame]{veryshortguide-A4-imposed.pdf}
-% \end{figure}
-% \clearpage
-% \StopEventually{\label{endcode}
-%   \clearpage
-%   \newgeometry{left=3cm}
-%   \addcontentsline{toc}{section}{Change History}
-%   \label{changehistory}
-%   \PrintChanges
-%   \clearpage
-%   \label{codeindex}
-%   \addcontentsline{toc}{section}{Index}
-%   \PrintIndex}
-% \addtolength{\revmarg}{\widthof{\LabelFont{descriptionlabel}}}
-% \newgeometry{left=\revmarg}
+% The 7mm margin was needed because my printer cannot print
+% the bottom 7mm of a sheet, so if I print 2-up A5 pages on an
+% A4 sheet, I need to allow for the fact that the trailing edge
+% must have a 7mm margin. For the HP K8600 this meant an
+% [Acrobat-generated] array of parameters:\par
 % \iffalse
-%<*class>
+%<*ignore>
 % \fi
-% \section{Auto-initialisation}
+% \begingroup\advance\hsize by-1em
+% \begin{Verbatim}[frame=single,framesep=1em,
+%  fontsize=\small]
+lpr -P OJPK8600 \
+	-o PageSize=A6.SM \
+	-o PageRegion=A4 \
+	-o Duplex=DuplexTumble \
+	-o InputSlot=Auto \
+	-o ColorModel=RGB \
+	-o MediaType=Automatic \
+	-o OutputMode=Normal \
+	-o OptionDuplex=True
+% \end{Verbatim}
+% \endgroup
+% \iffalse
+%</ignore>
+% \fi
+% \subsection{Auto-initialisation}\label{veryshortguide:autoinit}
 % This section is added automatically by \textit{ClassPack} 
-% as a preamble to all classes. The \textsf{fixltx2e}
-% package is no longer preloaded, as all its
-% features are now a part of the latest \LaTeX\ kernel.\par
+% as a preamble to all classes and style packages. 
+% The \textsf{fixltx2e} package, which used to be included
+% automatically, is no longer preloaded, as its
+% features are now a part of the latest \LaTeXe\ kernel.\par
+% The code starts with identity and requirements which are 
+% generated automatically as needed by the Doc\TeX\ system.
+% For details see the \textsf{ltxdoc} package documentation.
+% \par\smallskip
+% \begingroup\color{DarkRed}\tabcolsep3pt\footnotesize
+% \begin{tabular}{>{\refstepcounter{CodelineNo}\tiny\theCodelineNo}r@{\enspace}l}
+% &\verb`\NeedsTeXFormat{LaTeX2e}[2015/01/01]`\\
+% &\verb`\ProvidesClass{veryshortguide}[2020/04/16 v0.7`\\
+% &\verb`  The Very Short Guide to \LaTeX{}]`
+% \end{tabular}\endgroup
+% \setcounter{CodelineNo}{3}
 % \begin{CPK@package}{fix-cm}
-% Preloaded functions to override the default \LaTeX\ step-size font
-% sizes (which can still be used, but are no longer restrictions).\par
+% Preloaded functions to override the default \LaTeX\
+% step-size font sizes (which can still be used,
+% but are no longer restrictions).\par
 %    \begin{macrocode}
 \RequirePackage{fix-cm}
 %    \end{macrocode}
 % \end{CPK@package}
 % \begin{CPK@option}{svgnames}
-% Pass the \textbf{\texttt{svgnames}} option to the \textsf{xcolor}
-% package if that gets loaded later. This avoids a conflict with 
-% whatever other packages (eg \textsf{hyperref}) use as their own 
-% default is when they load \textsf{xcolor}.\par
+% Pass the \textbf{\texttt{svgnames}} option to the
+% \textsf{xcolor} package if that gets loaded later.
+% This avoids a conflict with any other packages
+% (eg \textsf{hyperref}) which use their own default
+% is when they load \textsf{xcolor}.\par
 %    \begin{macrocode}
-\PassOptionsToPackage{svgnames}{xcolor}
-\PassOptionsToPackage{hyphens}{url}
+  \PassOptionsToPackage{svgnames}{xcolor}
 %    \end{macrocode}
 % \end{CPK@option}
-% \clearpage
-% \section{Implementation}\label{imp}
-% \subsection{Define the paper-size options:}
-% \begin{CPK@switch}{\iflegal}
-% To make the selection persist so we can us it later,
-%   we define two \TeX{} conditionals, one for Legal paper;\par
-%    \begin{macrocode}
-\newif\iflegal
-%    \end{macrocode}
-% \end{CPK@switch}
-% \begin{CPK@switch}{\ifafive}
-% and
-%   one for A5:\par
-%    \begin{macrocode}
-\newif\ifafive
-%    \end{macrocode}
-% \end{CPK@switch}
-% \begin{CPK@macro}{\afivetrue}
-% and set the A5 one as the default\par
-%    \begin{macrocode}
-\afivetrue
-%    \end{macrocode}
-% \end{CPK@macro}
-% \begin{CPK@macro}{\VSG@papersize}
-% Now parameterise the options with macros to hold the
-%     paper size:\par
-%    \begin{macrocode}
-\gdef\VSG@papersize{a5paper}
-%    \end{macrocode}
-% \end{CPK@macro}
-% \begin{CPK@macro}{\VSG@margins}
-% and the appropriate margins for the
-%     \textsf{geometry} package (later):\par
-%    \begin{macrocode}
-\gdef\VSG@margins{margin=12mm,bottom=10mm}
-%    \end{macrocode}
-% \end{CPK@macro}
-% \begin{CPK@option}{a5paper}
-% Then define the A5 option to set the paper size and
-%   margins and set its switch to true (and the other to false):\par
-%    \begin{macrocode}
-\DeclareOption{a5paper}{%
-  \gdef\VSG@papersize{a5paper}%
-  \gdef\VSG@margins{margin=12mm,bottom=10mm}
-  \afivetrue\legalfalse}
-%    \end{macrocode}
-% \end{CPK@option}
-% \begin{CPK@option}{legalpaper}
-% And repeat for the Legal option:\par
-%    \begin{macrocode}
-\DeclareOption{legalpaper}{%
-  \gdef\VSG@papersize{papersize={7in,8.5in}}%
-  \gdef\VSG@margins{margin=15mm,bottom=15mm}
-  \legaltrue\afivefalse}
-%    \end{macrocode}
-% \end{CPK@option}
-% \subsection{Load the base document class}\label{classload}
+% \subsection{Load the document base class}\label{classload}
+% \iffalse
+%% 
+%% ****************************************************************** 
+%% 
+%% Load the document base class
+% \fi
 % This class is based on the standard \LaTeX{}
-%   \textsf{article} class, with no special
+%   \DescribeClass{report}\textsf{report} class, with no special
 %   options.\par
 %    \begin{macrocode}
 \DeclareOption*{%
   \PassOptionsToClass{%
-    \CurrentOption}{article}}
+    \CurrentOption}{report}}
 \ProcessOptions\relax
-\LoadClass{article}
+\LoadClass[oneside]{report}
 %    \end{macrocode}
 %\iffalse
 %%
-%% Packages required
+%% Packages required for the class or package
 %% 
 % \fi
 % \subsection{Packages required for the class}\label{clspackages}
 % \begin{CPK@package}{geometry}
 % Package for establishing margins and text area.
-% Use the paper size and margins that were specified when the relevant option was selected by the used (or the A5 default). ()
 % \iffalse
 %% Package for establishing margins and text area.
 % \fi
 %    \begin{macrocode}
-\RequirePackage[nohead,\VSG@papersize,
-  \VSG@margins]{geometry}
+\RequirePackage[margin=12mm,top=10mm,
+  bottom=10mm,nohead]{geometry}%
 %    \end{macrocode}
-%  \end{CPK@package}
+% \end{CPK@package}
 % \begin{CPK@package}{fontspec}
 % Font specification setup for use with \XeLaTeX{}.
 % \iffalse
 %% Font specification setup for use with \XeLaTeX{}.
 % \fi
 %    \begin{macrocode}
-\RequirePackage{fontspec}
+\RequirePackage{fontspec}%
 %    \end{macrocode}
-%  \end{CPK@package}
-% \begin{CPK@package}{caladea}
-% Caladea family of fonts, designed by Carolina Giovagnoli
-% and Andres Torresi of the Huerta Tipografica foundry and
-% adopted by Google for ChromeOS as a font-metric compatible
-% replacement for Cambria.
-% \iffalse
-%% Caladea family of fonts, designed by Carolina Giovagnoli and Andres Torresi of the Huerta Tipografica foundry and adopted by Google for ChromeOS as a font-metric compatible replacement for Cambria.
-% \fi
-%    \begin{macrocode}
-\RequirePackage{caladea}
-%    \end{macrocode}
-%  \end{CPK@package}
-% \begin{CPK@package}{raleway}
-% The current Raleway family is an extension of the original
-% Raleway Thin by Matt McInerney. The family has been extended
-% by Impallari, for more information see the impallari website
-% \url{http://www.impallari.com/projects/overview/matt-mcinerneys-raleway-family}.
+% \end{CPK@package}
+% \begin{CPK@package}{libertine}
+% Linux Libertine and Biolinum fonts;
 % \iffalse
-%% The current Raleway family is an extension of the original Raleway Thin by Matt McInerney. The family has been extended by Impallari, for more information see the impallari website http://www.impallari.com/projects/overview/matt-mcinerneys-raleway-family.
+%% Linux Libertine and Biolinum fonts
 % \fi
 %    \begin{macrocode}
-\RequirePackage[scale=.9]{raleway}
+\RequirePackage{libertine}%
 %    \end{macrocode}
-%  \end{CPK@package}
+% \end{CPK@package}
 % \begin{CPK@package}{graphicx}
 % Provide for graphics (PNG, JPG, or PDF format (only) for
 % pdflatex; EPS format (only) for standard \LaTeX{}).
@@ -775,84 +749,90 @@ lpr -P \
 %% Provide for graphics (PNG, JPG, or PDF format (only) for pdflatex; EPS format (only) for standard \LaTeX{}).
 % \fi
 %    \begin{macrocode}
-\RequirePackage{graphicx}
+\RequirePackage{graphicx}%
 %    \end{macrocode}
-%  \end{CPK@package}
+% \end{CPK@package}
 % \begin{CPK@package}{url}
 % Handling of URI formatting.
 % \iffalse
 %% Handling of URI formatting.
 % \fi
 %    \begin{macrocode}
-\RequirePackage{url}
+\RequirePackage{url}%
 %    \end{macrocode}
-%  \end{CPK@package}
+% \end{CPK@package}
 % \begin{CPK@package}{fancybox}
 % This provides round-cornered and drop-shadow boxes.
 % \iffalse
 %% This provides round-cornered and drop-shadow boxes.
 % \fi
 %    \begin{macrocode}
-\RequirePackage{fancybox}
+\RequirePackage{fancybox}%
 %    \end{macrocode}
-%  \end{CPK@package}
+% \end{CPK@package}
 % \begin{CPK@package}{enumitem}
-% List variants: inline and compact. Note that this replaces
-% the earlier defaults of \textsf{paralist} and
+% List variants: inline and compact.
+% Note that this replaces	the earlier defaults of
+% \textsf{paralist} and 
 % \textsf{mdwlist}.
 % \iffalse
 %% List variants: inline and compact. Note that this replaces the earlier defaults of paralist and mdwlist.
 % \fi
 %    \begin{macrocode}
-\RequirePackage[inline]{enumitem}
+\RequirePackage[inline]{enumitem}%
   \setlist[description]{style=unboxed}
+  \setlist[itemize]{leftmargin=2em}
+  \setlist[enumerate]{leftmargin=2em}
+  \newlist{inlineenum}{enumerate*}{1}
+  \setlist[inlineenum,1]{label=\emph{\alph*}),
+	    itemjoin={{; }},itemjoin*={{; and }}}
 %    \end{macrocode}
-%  \end{CPK@package}
+% \end{CPK@package}
 % \begin{CPK@package}{fix-cm}
 % Allow infinitely-variable font scaling.
 % \iffalse
 %% Allow infinitely-variable font scaling.
 % \fi
 %    \begin{macrocode}
-\RequirePackage{fix-cm}
+\RequirePackage{fix-cm}%
 %    \end{macrocode}
-%  \end{CPK@package}
+% \end{CPK@package}
 % \begin{CPK@package}{multicol}
 % Provides multi-column typesetting.
 % \iffalse
 %% Provides multi-column typesetting.
 % \fi
 %    \begin{macrocode}
-\RequirePackage{multicol}
+\RequirePackage{multicol}%
 %    \end{macrocode}
-%  \end{CPK@package}
+% \end{CPK@package}
 % \begin{CPK@package}{nicefrac}
 % Slanted fractions, even in math mode.
 % \iffalse
 %% Slanted fractions, even in math mode.
 % \fi
 %    \begin{macrocode}
-\RequirePackage{nicefrac}
+\RequirePackage{nicefrac}%
 %    \end{macrocode}
-%  \end{CPK@package}
+% \end{CPK@package}
 % \begin{CPK@package}{fancyvrb}
 % Add more robust verbatim facilities.
 % \iffalse
 %% Add more robust verbatim facilities.
 % \fi
 %    \begin{macrocode}
-\RequirePackage{fancyvrb}
+\RequirePackage{fancyvrb}%
 %    \end{macrocode}
-%  \end{CPK@package}
+% \end{CPK@package}
 % \begin{CPK@package}{bbding}
 % Karel Horak's dingbats symbols.
 % \iffalse
 %% Karel Horak's dingbats symbols.
 % \fi
 %    \begin{macrocode}
-\RequirePackage{bbding}
+\RequirePackage{bbding}%
 %    \end{macrocode}
-%  \end{CPK@package}
+% \end{CPK@package}
 % \begin{CPK@package}{parskip}
 % Creates paragraphs separated by white-space with no
 % indentation.
@@ -860,18 +840,18 @@ lpr -P \
 %% Creates paragraphs separated by white-space with no indentation.
 % \fi
 %    \begin{macrocode}
-\RequirePackage{parskip}
+\RequirePackage{parskip}%
 %    \end{macrocode}
-%  \end{CPK@package}
+% \end{CPK@package}
 % \begin{CPK@package}{ragged2e}
 % Allow hyphenation in ragged setting.
 % \iffalse
 %% Allow hyphenation in ragged setting.
 % \fi
 %    \begin{macrocode}
-\RequirePackage{ragged2e}
+\RequirePackage{ragged2e}%
 %    \end{macrocode}
-%  \end{CPK@package}
+% \end{CPK@package}
 % \begin{CPK@package}{calc}
 % Required for calculations involving lengths or counters,
 % such as changes to widths for margin adjustment.
@@ -879,9 +859,9 @@ lpr -P \
 %% Required for calculations involving lengths or counters, such as changes to widths for margin adjustment.
 % \fi
 %    \begin{macrocode}
-\RequirePackage{calc}
+\RequirePackage{calc}%
 %    \end{macrocode}
-%  \end{CPK@package}
+% \end{CPK@package}
 % \begin{CPK@package}{ifthen}
 % Package to enable if--then--else conditional
 %       processing.
@@ -889,37 +869,37 @@ lpr -P \
 %% Package to enable if--then--else conditional processing.
 % \fi
 %    \begin{macrocode}
-\RequirePackage{ifthen}
+\RequirePackage{ifthen}%
 %    \end{macrocode}
-%  \end{CPK@package}
+% \end{CPK@package}
 % \begin{CPK@package}{textcomp}
 % Additional commands for common symbols and punctuation.
 % \iffalse
 %% Additional commands for common symbols and punctuation.
 % \fi
 %    \begin{macrocode}
-\RequirePackage{textcomp}
+\RequirePackage{textcomp}%
 %    \end{macrocode}
-%  \end{CPK@package}
+% \end{CPK@package}
 % \begin{CPK@package}{array}
-% Additional column formatting for tables.
+% Additional column formatting types for tables.
 % \iffalse
-%% Additional column formatting for tables.
+%% Additional column formatting types for tables.
 % \fi
 %    \begin{macrocode}
-\RequirePackage{array}
+\RequirePackage{array}%
 %    \end{macrocode}
-%  \end{CPK@package}
+% \end{CPK@package}
 % \begin{CPK@package}{relsize}
 % Provides size-relative font size changes (smaller, larger,
-%       etc).
+% etc).
 % \iffalse
 %% Provides size-relative font size changes (smaller, larger, etc).
 % \fi
 %    \begin{macrocode}
-\RequirePackage{relsize}
+\RequirePackage{relsize}%
 %    \end{macrocode}
-%  \end{CPK@package}
+% \end{CPK@package}
 % \begin{CPK@package}{textcase}
 % Provides a more sophisticated casing function than the
 %       default.
@@ -927,9 +907,9 @@ lpr -P \
 %% Provides a more sophisticated casing function than the default.
 % \fi
 %    \begin{macrocode}
-\RequirePackage{textcase}
+\RequirePackage{textcase}%
 %    \end{macrocode}
-%  \end{CPK@package}
+% \end{CPK@package}
 % \begin{CPK@package}{flexlogo}
 % Allows user-programmable changes to the positioning of
 %       letters in the \TeX{}-related logos on a per-font basis.
@@ -937,9 +917,9 @@ lpr -P \
 %% Allows user-programmable changes to the positioning of letters in the \TeX{}-related logos on a per-font basis.
 % \fi
 %    \begin{macrocode}
-\RequirePackage{flexlogo}
+\RequirePackage{flexlogo}%
 %    \end{macrocode}
-%  \end{CPK@package}
+% \end{CPK@package}
 % \begin{CPK@package}{ulem}
 % Underlining as an option (\emph{not}
 % automatically replacing italics).
@@ -947,20 +927,27 @@ lpr -P \
 %% Underlining as an option (not automatically replacing italics).
 % \fi
 %    \begin{macrocode}
-\RequirePackage[normalem]{ulem}
+\RequirePackage[normalem]{ulem}%
 %    \end{macrocode}
-%  \end{CPK@package}
+% \end{CPK@package}
 % \begin{CPK@package}{xcolor}
 % Provide color.
 % \iffalse
 %% Provide color.
 % \fi
 %    \begin{macrocode}
-\RequirePackage{xcolor}
+\RequirePackage{xcolor}%
   \@ifundefined{T}{%
-	    \newcommand{\T}[2]{{\fontencoding{T1}\selectfont#2}}}{}
+	    \newcommand{\T}[2]{{\fontencoding{T1}%
+	      \selectfont#2}}}{}
 %    \end{macrocode}
-%  \end{CPK@package}
+% There seems to be a bug in the T1 encoding of some package
+% (unidentified, but possibly \textsf{xcolor}) which
+% uses the command {\ttfamily{}\textbackslash{}T1}, which is an
+% impossibility (no digits allowed in command names). So we fake
+% it here to stop \LaTeX{} complaining, by dropping the first
+% argument on the floor.
+% \end{CPK@package}
 % \begin{CPK@package}{babel}
 % Add language, cultural changes, and H\&J support for many
 % languages.
@@ -968,94 +955,123 @@ lpr -P \
 %% Add language, cultural changes, and H\&J support for many languages.
 % \fi
 %    \begin{macrocode}
-\RequirePackage[british]{babel}
+\RequirePackage[british]{babel}%
 %    \end{macrocode}
-%  \end{CPK@package}
+% \end{CPK@package}
 % \begin{CPK@package}{biblatex}
-% Use \textsf{biblatex} instead of \BibTeX{}
+% Use \textsf{biblatex} instead of \BibTeX{};
 % \iffalse
 %% Use biblatex instead of \BibTeX{}
 % \fi
 %    \begin{macrocode}
 \RequirePackage[backend=biber,doi=true,
-  isbn=true,url=true,uniquename=false,style=apa]{biblatex}
-  \AtBeginDocument{\setlength{\bibitemsep}{1ex}
-	  \defbibheading{shortbib}[Bibliography]{\section{#1}}}
-	    \@ifpackagewith{babel}{british}{%
-	    \DeclareLanguageMapping{british}{british-apa}}{\relax}
+  isbn=true,url=true,uniquename=false,style=apa]{biblatex}%
+  \AtBeginDocument{%
+	    \setlength{\bibitemsep}{1ex}%
+	    \setlength{\bibnamesep}{1.5\itemsep}%
+	    \defbibheading{shortbib}[References]%
+	      {\section{#1}}}
+	  \@ifpackagewith{babel}{british}{%
+	    \DeclareLanguageMapping{british}%
+	      {british-apa}}{\relax}
+  \providetoggle{blx@skipbiblist}
 %    \end{macrocode}
-%  \end{CPK@package}
+% \end{CPK@package}
 % \begin{CPK@package}{csquotes}
 % Adds correct curly quotes for cited titles when using
-% \textsf{biblatex}
+% \textsf{biblatex};
 % \iffalse
 %% Adds correct curly quotes for cited titles when using biblatex
 % \fi
 %    \begin{macrocode}
-\RequirePackage{csquotes}
+\RequirePackage{csquotes}%
 %    \end{macrocode}
-%  \end{CPK@package}
+% \end{CPK@package}
 % \begin{CPK@package}{menukeys}
 % Graphical representations of menus, directories, and keys.
 % \iffalse
 %% Graphical representations of menus, directories, and keys.
 % \fi
 %    \begin{macrocode}
-\RequirePackage{menukeys}
+\RequirePackage{menukeys}%
   \renewmenumacro{\menu}[>]{roundedmenus}
   \renewmenumacro{\directory}[/]{hyphenatepathswithfolder}
   \renewmenumacro{\keys}{shadowedroundedkeys}
 %    \end{macrocode}
-%  \end{CPK@package}
+% Graphical representations of menus, directories, and keys.
+% \end{CPK@package}
 % 
-% \subsection{Additions and changes to package defaults}\label{packagemods}
-% As we're using \XeLaTeX{}, the first thing to do is add
-% any non-package fonts, then everything else.\par
-% \begin{CPK@font}{zcoN}
-% This is the Nimbus–15 Narrow replacement for Courier.\par
+% \subsection{Font loading}\label{fontloads}
+% \iffalse
+%% 
+%% ****************************************************************** 
+%% 
+%% Font loading
+% \fi
+% The \textsf{fontspec} package provides a way
+% to scale the sans and mono fonts to match the roman.\par
 %    \begin{macrocode}
+\setmainfont{Linux Libertine O}
+\setsansfont[Scale=MatchLowercase]{Raleway}
 \setmonofont[Scale=MatchLowercase]{zcoN}
 %    \end{macrocode}
-% \end{CPK@font}
-% \begin{CPK@macro}{\labelitemi}
-% Use a pointy pencil from the bbding package for
-%     itemized lists.\par
+% \subsection{Changes to package defaults}\label{packagemods}
+% \iffalse
+%% 
+%% ****************************************************************** 
+%% 
+%% Changes to package defaults
+% \fi
+% \par
+% \begin{CPK@macro}{\labelitemi}\label{macro--labelitemi}
+% Use a pointy pencil from the \textsf{bbding}
+%     package for itemized lists.\par
 %    \begin{macrocode}
 \renewcommand{\labelitemi}{%
   \raisebox{-.5ex}{\textcolor{Purple}{\PencilRight}}}
-\setlength{\leftmargini}{18pt}% don't waste margin space in lists
+\setlength{\leftmargini}{18pt}% don't waste margin space
 %    \end{macrocode}
 % \end{CPK@macro}
-% \begin{CPK@macro}{\example}
+% \begin{CPK@macro}{\example}\label{macro--example}
 % Provide commands for distinguishing examples and their
 %     output.\par
 %    \begin{macrocode}
 \newcommand{\example}{%
-  \color{DarkGreen}\textsf{\bfseries Example:} \color{MediumBlue}}
+    \color{DarkGreen}\textsf{\bfseries Example:}
+    \color{MediumBlue}}
 \def\endexample{\color{black}}
 \newcommand{\gives}[1]{%
   \thinspace\color{DarkGreen}\raisebox{-.4ex}
     {\ArrowBoldRightStrobe}~\color{DarkRed}{\rmfamily
      #1}\color{black}}
-\newcommand{\nobox}{~\raisebox{-.25ex}{%
-  \footnotesize\Square\llap\XSolidBrush}}
-\newcommand{\yesbox}{~\raisebox{-.25ex}{%
-  \footnotesize\Square\llap\CheckmarkBold}}
+\newcommand{\nobox}{~\raisebox{-.25ex}{\footnotesize
+    \Square\llap\XSolidBrush}}
+\newcommand{\yesbox}{~\raisebox{-.25ex}{\footnotesize
+    \Square\llap\CheckmarkBold}}
 %    \end{macrocode}
 % \end{CPK@macro}
-% \begin{CPK@macro}{\comment}
-% In fancyverb's Verbatim, allow rubric embedded as
-%   marked text in red \par
+% \begin{CPK@macro}{\comment}\label{macro--comment}
+% In \textsf{fancyverb}'s Verbatim, allow
+%     rubric embedded as marked text in red \par
 %    \begin{macrocode}
-\newcommand{\comment}[1]{\ifthenelse{\equal{#1}{ }}{}{#1}\normalfont
-  \itshape\footnotesize\color{DarkRed}}
+\newcommand{\comment}[1]{%
+    \ifthenelse{\equal{#1}{ }}{}{#1}\normalfont
+    \itshape\footnotesize\color{DarkRed}}
 % Allow notification of newly-added material
 \newcommand{\added}{\color{MediumBlue}}
 % This reverts rubric back to normal, to avoid embedded spaces
 \newcommand{\revert}{\ttfamily\upshape\color{black}}
 %    \end{macrocode}
 % \end{CPK@macro}
-% \begin{CPK@macro}{\monthdate}
+% \begin{CPK@environment}{note}\label{environment--note}
+% The \texttt{note} environment is for notes which
+%     are in the page body, not footnotes.\par
+%    \begin{macrocode}
+\newenvironment{note}{\begingroup\small\textbf{\sffamily Note:}}
+    {\par\endgroup}
+%    \end{macrocode}
+% \end{CPK@environment}
+% \begin{CPK@macro}{\monthdate}\label{macro--monthdate}
 % Define a month-year date European way round.\par
 %    \begin{macrocode}
 \newcommand{\monthdate}{\ifcase\month\or January\or
@@ -1063,7 +1079,7 @@ lpr -P \
   September\or October\or November\or December\fi\space\number\year}
 %    \end{macrocode}
 % \end{CPK@macro}
-% \begin{CPK@macro}{\hyphenation}
+% \begin{CPK@macro}{\hyphenation}\label{macro--hyphenation}
 % There's something odd about the hyphenation...these
 %     were broken:\par
 %    \begin{macrocode}
@@ -1071,7 +1087,7 @@ lpr -P \
   docu-men-tation statis-ti-cal}
 %    \end{macrocode}
 % \end{CPK@macro}
-% \begin{CPK@macro}{\maketitle}
+% \begin{CPK@macro}{\maketitle}\label{macro--maketitle}
 %    \begin{macrocode}
 \renewcommand{\maketitle}{%
   \hbox to\textwidth{%
@@ -1086,7 +1102,7 @@ lpr -P \
 }
 %    \end{macrocode}
 % \end{CPK@macro}
-% \begin{CPK@macro}{\section}
+% \begin{CPK@macro}{\section}\label{macro--section}
 % Pack headings together more tightly.\par
 %    \begin{macrocode}
 \renewcommand\section{\@startsection{subsection}{1}{\z@}%
@@ -1098,8 +1114,8 @@ lpr -P \
   {1pt \@plus .2ex}%
   {\sffamily\large\bfseries}}
 \renewcommand\subsubsection{\@startsection{subsubsection}{3}{\z@}%
-  {-.5ex\@plus -1ex \@minus -.2ex}%
-  {.25ex \@plus .2ex}%
+  {-0pt\@plus -1ex \@minus -.2ex}%
+  {1pt \@plus .2ex}%
   {\sffamily\normalsize\bfseries}}
 \renewcommand\paragraph{\@startsection{paragraph}{4}{\z@}%
   {1ex \@plus1ex \@minus.2ex}%
@@ -1111,7 +1127,7 @@ lpr -P \
 \renewcommand{\thesubsubsection}{\arabic{subsubsection}}
 %    \end{macrocode}
 % \end{CPK@macro}
-% \begin{CPK@macro}{\DeclareTeXLogo}
+% \begin{CPK@macro}{\DeclareTeXLogo}\label{macro--DeclareTeXLogo}
 %    \begin{macrocode}
 \DeclareTeXLogo{Caladea(0)}{m}{n}{.1667}{.125}[.4]
 \DeclareTeXLogo{Caladea(0)}{m}{it}{.1667}{.08}[.4]
@@ -1123,75 +1139,468 @@ lpr -P \
 \DeclareLaTeXLogo{Raleway(0)}{b}{n}{.27}{.15}[.1]
 %    \end{macrocode}
 % \end{CPK@macro}
-% \begin{CPK@macro}{\footnoterule}
+% \begin{CPK@macro}{\footnoterule}\label{macro--footnoterule}
 % Adjust footnote fence.\par
 %    \begin{macrocode}
 \renewcommand{\footnoterule}{\kern-3pt
   \hrule height.2pt width.25\columnwidth\kern 2.8pt}
 %    \end{macrocode}
 % \end{CPK@macro}
-% \begin{CPK@macro}{\pagestyle}
+% \begin{CPK@macro}{\pagestyle}\label{macro--pagestyle}
 % No page numbers, we're faking it; and let text go very
 %     sloppy to fit.\par
 %    \begin{macrocode}
 \pagestyle{empty}
-\spaceskip=4pt plus4pt minus3pt
+\spaceskip=4pt plus3pt minus2pt
 %    \end{macrocode}
 % \end{CPK@macro}
-% \begin{CPK@macro}{\textsc}
+% \begin{CPK@macro}{\textsc}\label{macro--textsc}
 % Cater for some fonts not having small caps.\par
 %    \begin{macrocode}
 \renewcommand{\textsc}[1]{{\smaller\MakeTextUppercase{#1}}}
 %    \end{macrocode}
 % \end{CPK@macro}
-% \begin{CPK@macro}{\ff}
+% \begin{CPK@macro}{\ff}\label{macro--ff}
 % Abbreviate changes of font.\par
 %    \begin{macrocode}
 \newcommand{\ff}[2][T1]{\fontencoding{#1}\fontfamily{#2}\selectfont}
 %    \end{macrocode}
 % \end{CPK@macro}
-% \begin{CPK@macro}{\descriptionlabel}
+% \begin{CPK@macro}{\descriptionlabel}\label{macro--descriptionlabel}
 % Stop the {\ttfamily{}\textbackslash{}descriptionlabel}command
 %     reverting to the serif font.\par
 %    \begin{macrocode}
-\renewcommand{\descriptionlabel}[1]{%
-  \hspace\labelsep{\sffamily\bfseries #1}}
+\renewcommand{\descriptionlabel}[1]{\hspace\labelsep{\sffamily\bfseries #1}}
 %    \end{macrocode}
 % \end{CPK@macro}
-% \begin{CPK@environment}{note}
-% A trivial environment for notes\par
-%    \begin{macrocode}
-\newenvironment{note}{\small\textbf{Note.}\quad}{\par}
-%    \end{macrocode}
-% \end{CPK@environment}
 % \iffalse
 %</class>
 % \fi
 % \appendix
+% \newgeometry{left=3cm}
+% \clearpage
+% \section{The \LaTeX{} Project Public License (v\thinspace{}1.3c)}\label{LPPL}
+% \begin{quotation}\small\sffamily\parindent0pt
+%   \parskip.5\baselineskip
+%   \color{DarkBlue}\noindent
+% Everyone is allowed to distribute verbatim copies of this
+%       license document, but modification of it is not allowed.\par
+% \end{quotation}
+% \subsection{Preamble}\label{Preamble}
+% The \LaTeX{} Project Public License ({\smaller LPPL})
+%       is the primary license under which the \LaTeX{} kernel and the
+%       base \LaTeX{} packages are distributed.\par
+% You may use this license for any work of which you hold the
+%       copyright and which you wish to distribute.  This license may be
+%       particularly suitable if your work is \TeX{}-related (such as a
+%       \LaTeX{} package), but it is written in such a way that you can
+%       use it even if your work is unrelated to \TeX{}.\par
+% The section “Whether and How to Distribute Works under This
+%       License”, below, gives instructions, examples, and
+%       recommendations for authors who are considering distributing
+%       their works under this license.\par
+% This license gives conditions under which a work may be
+%       distributed and modified, as well as conditions under which
+%       modified versions of that work may be distributed.\par
+% We, the \LaTeX{3} Project, believe that the conditions below
+%       give you the freedom to make and distribute modified versions of
+%       your work that conform with whatever technical specifications
+%       you wish while maintaining the availability, integrity, and
+%       reliability of that work.  If you do not see how to achieve your
+%       goal while meeting these conditions, then read the document
+%       {\ttfamily{}cfgguide.tex} and {\ttfamily{}modguide.tex} in the base \LaTeX{}
+%       distribution for suggestions.\par
+% \subsection{Definitions}\label{Definitions}
+% In this license document the following terms are used:\par
+% \begin{description}[style=unboxed]
+% \item[Work\thinspace:]Any work being distributed under this License.\par
+% \item[Derived Work\thinspace:]Any work that under any applicable law is derived from
+%     the Work.\par
+% \item[Modification\thinspace:]Any procedure that produces a Derived Work under any
+%     applicable law~--- for example, the production of a file
+%     containing an original file associated with the Work or a
+%     significant portion of such a file, either verbatim or
+%     with modifications and/or translated into another
+%     language.\par
+% \item[Modify\thinspace:]To apply any procedure that produces a Derived Work
+%     under any applicable law.\par
+% \item[Distribution\thinspace:]Making copies of the Work available from one person to
+%     another, in whole or in part.  Distribution includes (but
+%     is not limited to) making any electronic components of the
+%     Work accessible by file transfer protocols such as
+%     {\smaller FTP} or {\smaller HTTP} or by
+%     shared file systems such as Sun's Network File System
+%     ({\smaller NFS}).\par
+% \item[Compiled Work\thinspace:]A version of the Work that has been processed into a
+%     form where it is directly usable on a computer system.
+%     This processing may include using installation facilities
+%     provided by the Work, transformations of the Work, copying
+%     of components of the Work, or other activities.  Note that
+%     modification of any installation facilities provided by
+%     the Work constitutes modification of the Work.\par
+% \item[Current Maintainer\thinspace:]A person or persons nominated as such within the Work.
+%     If there is no such explicit nomination then it is the
+%     `Copyright Holder' under any applicable
+%     law.\par
+% \item[Base Interpreter\thinspace:]A program or process that is normally needed for
+%     running or interpreting a part or the whole of the
+%     Work.\par
+% A Base Interpreter may depend on external components
+%     but these are not considered part of the Base Interpreter
+%     provided that each external component clearly identifies
+%     itself whenever it is used interactively.  Unless
+%     explicitly specified when applying the license to the
+%     Work, the only applicable Base Interpreter is a
+%     `\LaTeX{}-Format' or in the case of files
+%     belonging to the `\LaTeX{}-format' a program
+%     implementing the `\TeX{} language'.\par
+% \end{description}
+% \subsection{Conditions on Distribution and Modification}\label{Conditions}
+% \begin{enumerate}
+% \item Activities other than distribution and/or modification
+%   of the Work are not covered by this license; they are
+%   outside its scope. In particular, the act of running the
+%   Work is not restricted and no requirements are made
+%   concerning any offers of support for the Work.\par
+% \item \label{item-distribute}You may distribute a complete, unmodified copy of the
+%   Work as you received it.  Distribution of only part of the
+%   Work is considered modification of the Work, and no right to
+%   distribute such a Derived Work may be assumed under the
+%   terms of this clause.\par
+% \item You may distribute a Compiled Work that has been
+%   generated from a complete, unmodified copy of the Work as
+%   distributed under Clause~item~\ref{item-distribute} above above, as
+%   long as that Compiled Work is distributed in such a way that
+%   the recipients may install the Compiled Work on their system
+%   exactly as it would have been installed if they generated a
+%   Compiled Work directly from the Work.\par
+% \item \label{item-currmaint}If you are the Current Maintainer of the Work, you may,
+%   without restriction, modify the Work, thus creating a
+%   Derived Work.  You may also distribute the Derived Work
+%   without restriction, including Compiled Works generated from
+%   the Derived Work.  Derived Works distributed in this manner
+%   by the Current Maintainer are considered to be updated
+%   versions of the Work.\par
+% \item If you are not the Current Maintainer of the Work, you
+%   may modify your copy of the Work, thus creating a Derived
+%   Work based on the Work, and compile this Derived Work, thus
+%   creating a Compiled Work based on the Derived Work.\par
+% \item \label{item-conditions}If you are not the Current Maintainer of the Work, you
+%   may distribute a Derived Work provided the following
+%   conditions are met for every component of the Work unless
+%   that component clearly states in the copyright notice that
+%   it is exempt from that condition.  Only the Current
+%   Maintainer is allowed to add such statements of exemption to
+%   a component of the Work.\par
+% \begin{enumerate}
+% \item If a component of this Derived Work can be a direct
+%       replacement for a component of the Work when that
+%       component is used with the Base Interpreter, then,
+%       wherever this component of the Work identifies itself to
+%       the user when used interactively with that Base
+%       Interpreter, the replacement component of this Derived
+%       Work clearly and unambiguously identifies itself as a
+%       modified version of this component to the user when used
+%       interactively with that Base Interpreter.\par
+% \item Every component of the Derived Work contains
+%       prominent notices detailing the nature of the changes to
+%       that component, or a prominent reference to another file
+%       that is distributed as part of the Derived Work and that
+%       contains a complete and accurate log of the
+%       changes.\par
+% \item No information in the Derived Work implies that any
+%       persons, including (but not limited to) the authors of
+%       the original version of the Work, provide any support,
+%       including (but not limited to) the reporting and
+%       handling of errors, to recipients of the Derived Work
+%       unless those persons have stated explicitly that they do
+%       provide such support for the Derived Work.\par
+% \item You distribute at least one of the following with
+%       the Derived Work:\par
+% \begin{enumerate}
+% \item A complete, unmodified copy of the Work; if your
+%   distribution of a modified component is made by
+%   offering access to copy the modified component from
+%   a designated place, then offering equivalent access
+%   to copy the Work from the same or some similar place
+%   meets this condition, even though third parties are
+%   not compelled to copy the Work along with the
+%   modified component;\par
+% \item Information that is sufficient to obtain a
+%   complete, unmodified copy of the Work.\par
+% \end{enumerate}
+% \end{enumerate}
+% \item If you are not the Current Maintainer of the Work, you
+%   may distribute a Compiled Work generated from a Derived
+%   Work, as long as the Derived Work is distributed to all
+%   recipients of the Compiled Work, and as long as the
+%   conditions of Clause~item~\ref{item-conditions} above, above, are met
+%   with regard to the Derived Work.\par
+% \item The conditions above are not intended to prohibit, and
+%   hence do not apply to, the modification, by any method, of
+%   any component so that it becomes identical to an updated
+%   version of that component of the Work as it is distributed
+%   by the Current Maintainer under Clause~item~\ref{item-currmaint} above, above.\par
+% \item Distribution of the Work or any Derived Work in an
+%   alternative format, where the Work or that Derived Work (in
+%   whole or in part) is then produced by applying some process
+%   to that format, does not relax or nullify any sections of
+%   this license as they pertain to the results of applying that
+%   process.\par
+% \item % \begin{enumerate}
+% \item A Derived Work may be distributed under a different
+%       license provided that license itself honors the
+%       conditions listed in Clause~item~\ref{item-conditions} in the list on p.\thinspace\pageref{item-conditions} above, in
+%       regard to the Work, though it does not have to honor the
+%       rest of the conditions in this license.\par
+% \item If a Derived Work is distributed under a different
+%       license, that Derived Work must provide sufficient
+%       documentation as part of itself to allow each recipient
+%       of that Derived Work to honor the restrictions in
+%       Clause~item~\ref{item-conditions} in the list on p.\thinspace\pageref{item-conditions} above, concerning
+%       changes from the Work.\par
+% \end{enumerate}
+% \item This license places no restrictions on works that are
+%   unrelated to the Work, nor does this license place any
+%   restrictions on aggregating such works with the Work by any
+%   means.\par
+% \item Nothing in this license is intended to, or may be used
+%   to, prevent complete compliance by all parties with all
+%   applicable laws.\par
+% \end{enumerate}
+% \subsection{No Warranty}\label{Warranty}
+% There is no warranty for the Work.  Except when otherwise
+%       stated in writing, the Copyright Holder provides the Work
+%       `as is', without warranty of any kind, either
+%       expressed or implied, including, but not limited to, the implied
+%       warranties of merchantability and fitness for a particular
+%       purpose.  The entire risk as to the quality and performance of
+%       the Work is with you.  Should the Work prove defective, you
+%       assume the cost of all necessary servicing, repair, or
+%       correction.\par
+% In no event unless required by applicable law or agreed to
+%       in writing will The Copyright Holder, or any author named in the
+%       components of the Work, or any other party who may distribute
+%       and/or modify the Work as permitted above, be liable to you for
+%       damages, including any general, special, incidental or
+%       consequential damages arising out of any use of the Work or out
+%       of inability to use the Work (including, but not limited to,
+%       loss of data, data being rendered inaccurate, or losses
+%       sustained by anyone as a result of any failure of the Work to
+%       operate with any other programs), even if the Copyright Holder
+%       or said author or said other party has been advised of the
+%       possibility of such damages.\par
+% \subsection{Maintenance of The Work}\label{Maintenance}
+% The Work has the status `author-maintained'
+%       if the Copyright Holder explicitly and prominently states near
+%       the primary copyright notice in the Work that the Work can only
+%       be maintained by the Copyright Holder or simply that it is
+%       `author-maintained'.\par
+% The Work has the status `maintained' if there
+%       is a Current Maintainer who has indicated in the Work that they
+%       are willing to receive error reports for the Work (for example,
+%       by supplying a valid e-mail address). It is not required for the
+%       Current Maintainer to acknowledge or act upon these error
+%       reports.\par
+% The Work changes from status `maintained' to
+%       `unmaintained' if there is no Current Maintainer,
+%       or the person stated to be Current Maintainer of the work cannot
+%       be reached through the indicated means of communication for a
+%       period of six months, and there are no other significant signs
+%       of active maintenance.\par
+% You can become the Current Maintainer of the Work by
+%       agreement with any existing Current Maintainer to take over this
+%       role.\par
+% If the Work is unmaintained, you can become the Current
+%       Maintainer of the Work through the following steps:\par
+% \begin{enumerate}
+% \item Make a reasonable attempt to trace the Current
+%   Maintainer (and the Copyright Holder, if the two differ)
+%   through the means of an Internet or similar search.\par
+% \item If this search is successful, then enquire whether the
+%   Work is still maintained.\par
+% \begin{enumerate}
+% \item If it is being maintained, then ask the Current
+%       Maintainer to update their communication data within one
+%       month.\par
+% \item \label{item-intention}If the search is unsuccessful or no action to resume
+%       active maintenance is taken by the Current Maintainer,
+%       then announce within the pertinent community your
+%       intention to take over maintenance.  (If the Work is a
+%       \LaTeX{} work, this could be done, for example, by
+%       posting to \url{news:comp.text.tex}.)\par
+% \end{enumerate}
+% \item % \begin{enumerate}
+% \item If the Current Maintainer is reachable and agrees to
+%       pass maintenance of the Work to you, then this takes
+%       effect immediately upon announcement.\par
+% \item \label{item-announce}If the Current Maintainer is not reachable and the
+%       Copyright Holder agrees that maintenance of the Work be
+%       passed to you, then this takes effect immediately upon
+%       announcement.\par
+% \end{enumerate}
+% \item \label{item-change}If you make an `intention announcement'
+%   as described in~item~\ref{item-intention} in the list on p.\thinspace\pageref{item-intention} above and after three
+%   months your intention is challenged neither by the Current
+%   Maintainer nor by the Copyright Holder nor by other people,
+%   then you may arrange for the Work to be changed so as to
+%   name you as the (new) Current Maintainer.\par
+% \item If the previously unreachable Current Maintainer becomes
+%   reachable once more within three months of a change
+%   completed under the terms of~item~\ref{item-announce} in the list on p.\thinspace\pageref{item-announce}
+%   or~item~\ref{item-change} above, then that
+%   Current
+%   Maintainer must become or remain the Current Maintainer upon
+%   request provided they then update their communication data
+%   within one month.\par
+% \end{enumerate}
+% A change in the Current Maintainer does not, of itself,
+%       alter the fact that the Work is distributed under the
+%       {\smaller LPPL} license.\par
+% If you become the Current Maintainer of the Work, you should
+%       immediately provide, within the Work, a prominent and
+%       unambiguous statement of your status as Current Maintainer.  You
+%       should also announce your new status to the same pertinent
+%       community as in~item~\ref{item-intention} in the list on p.\thinspace\pageref{item-intention}
+%       above.\par
+% \subsection{Whether and How to Distribute Works under This
+%       License}\label{Distribute}
+% This section contains important instructions, examples, and
+%       recommendations for authors who are considering distributing
+%       their works under this license.  These authors are addressed as
+%       `you' in this section.\par
+% \subsubsection{Choosing This License or Another License}\label{Choosing}
+% If for any part of your work you want or need to use
+% \emph{distribution} conditions that differ
+% significantly from those in this license, then do not refer to
+% this license anywhere in your work but, instead, distribute
+% your work under a different license. You may use the text of
+% this license as a model for your own license, but your license
+% should not refer to the {\smaller LPPL} or otherwise
+% give the impression that your work is distributed under the
+% {\smaller LPPL}.\par
+% The document {\ttfamily{}modguide.tex} in the base \LaTeX{}
+% distribution explains the motivation behind the conditions of
+% this license.  It explains, for example, why distributing
+% \LaTeX{} under the {\smaller GNU} General Public
+% License ({\smaller GPL}) was considered inappropriate.
+% Even if your work is unrelated to \LaTeX{}, the discussion in
+% {\ttfamily{}modguide.tex} may still be
+% relevant, and authors intending to distribute their works
+% under any license are encouraged to read it.\par
+% \subsubsection{A Recommendation on Modification Without
+% Distribution}\label{WithoutDistribution}
+% It is wise never to modify a component of the Work, even
+% for your own personal use, without also meeting the above
+% conditions for distributing the modified component.  While you
+% might intend that such modifications will never be
+% distributed, often this will happen by accident~--- you may
+% forget that you have modified that component; or it may not
+% occur to you when allowing others to access the modified
+% version that you are thus distributing it and violating the
+% conditions of this license in ways that could have legal
+% implications and, worse, cause problems for the community. It
+% is therefore usually in your best interest to keep your copy
+% of the Work identical with the public one.  Many works provide
+% ways to control the behavior of that work without altering any
+% of its licensed components.\par
+% \subsubsection{How to Use This License}\label{HowTo}
+% To use this license, place in each of the components of
+% your work both an explicit copyright notice including your
+% name and the year the work was authored and/or last
+% substantially modified.  Include also a statement that the
+% distribution and/or modification of that component is
+% constrained by the conditions in this license.\par
+% Here is an example of such a notice and statement:\par
 % \iffalse
-%<*veryshortguide>
+%<*ignore>
 % \fi
-% \clearpage
-% \section{The Very Short Guide to Typesetting with \LaTeX{}}\label{veryshortguide}
+\begin{lstlisting}[language={[LaTeX]TeX}]
+%%% pig.dtx
+%%% Copyright 2005 M. Y. Name
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%% 
+%% The Current Maintainer of this work is M. Y. Name.
+%%
+%% This work consists of the files pig.dtx and pig.ins
+%% and the derived file pig.sty.
+\end{lstlisting}
 % \iffalse
-%% The Very Short Guide to Typesetting with \LaTeX{}
+%</ignore>
 % \fi
-% This is the base text for the Very Short Guide. The
-%       default layout is for A4 paper\par
-%    \begin{macrocode}
-\documentclass[a5paper]{vsg}
-%    \end{macrocode}
-% \subsection{Preamble}
-% The \BibTeX{} file is generated from \vref{vsg-bib} (a future version should probably do this
-%   via \textsc{xml} too). To save space, we compress
-%   the space between entries.\par
-%    \begin{macrocode}
-\addbibresource{veryshortguide.bib}
-\setlength{\bibnamesep}{-\itemsep}
-%    \end{macrocode}
-% Titling is standard except for the additional material
-%   in the {\ttfamily{}\textbackslash{}author}.\par
-%    \begin{macrocode}
+% Given such a notice and statement in a file, the
+% conditions given in this license document would apply, with
+% the `Work' referring to the three files
+% {\ttfamily{}pig.dtx}, {\ttfamily{}pig.ins}, and {\ttfamily{}pig.sty} (the last being generated
+% from {\ttfamily{}pig.dtx} using {\ttfamily{}pig.ins}), the `Base
+%   Interpreter' referring to any
+% `\LaTeX{}-Format', and both `Copyright
+%   Holder' and `Current Maintainer'
+% referring to the person
+% M.~Y.~Name\index{!}.\par
+% If you do not want the Maintenance section of
+% {\smaller LPPL} to apply to your Work, change
+% `maintained' above into
+% `author-maintained'. However, we recommend that
+% you use `maintained' as the Maintenance
+% section was added in order to ensure that your Work remains
+% useful to the community even when you can no longer maintain
+% and support it yourself.\par
+% \subsubsection{Derived Works That Are Not Replacements}\label{NotReplacements}
+% Several clauses of the {\smaller LPPL} specify
+% means to provide reliability and stability for the user
+% community. They therefore concern themselves with the case
+% that a Derived Work is intended to be used as a (compatible or
+% incompatible) replacement of the original Work. If this is not
+% the case (e.g., if a few lines of code are reused for a
+% completely different task), then clauses 6b and 6d shall not
+% apply.\par
+% \subsubsection{Important Recommendations}\label{Recommendations}
+% \paragraph[Defining What Constitutes the Work]{Defining What Constitutes the Work :}
+% The {\smaller LPPL} requires that distributions
+%   of the Work contain all the files of the Work.  It is
+%   therefore important that you provide a way for the licensee
+%   to determine which files constitute the Work.  This could,
+%   for example, be achieved by explicitly listing all the files
+%   of the Work near the copyright notice of each file or by
+%   using a line such as:\par
+% \iffalse
+%<*ignore>
+% \fi
+\begin{lstlisting}[language={[LaTeX]TeX}]
+%% This work consists of all files listed in manifest.txt.
+\end{lstlisting}
+% \iffalse
+%</ignore>
+% \fi
+% in that place.  In the absence of an unequivocal list it
+%   might be impossible for the licensee to determine what is
+%   considered by you to comprise the Work and, in such a case,
+%   the licensee would be entitled to make reasonable
+%   conjectures as to which files comprise the Work.\par
+% \iffalse
+%<*vsg>
+%<<COMMENT
+% !TEX TS-program = xelatex
+% !TEX encoding = UTF-8 Unicode
+% !BIB TS-program = biber
+%COMMENT
+      
+%</vsg>
+% \fi
+% \iffalse
+%<*vsg>
+\documentclass[a5paper]{veryshortguide}
+\addbibresource{vsg.bib}
 \begin{document}
 \title{The very short guide to typesetting with~\LaTeX}
 \author{Silmaril Consultants\\
@@ -1199,104 +1608,78 @@ lpr -P \
   \protect\url{http://latex.silmaril.ie}}
 \date{\monthdate}
 \maketitle
-%    \end{macrocode}
-% \subsection{Introduction on front page}
-% The introduction needs to get across  \begin{enumerate*}[label=\emph{\alph*})]
-% \item what \LaTeX{} is
-% \item what it’s for
-% \item where you can get it
-% \end{enumerate*}\par
-%    \begin{macrocode}
 \subsection*{What's this all about? What's \LaTeX?}
-\LaTeX\ is a document preparation system which uses the \TeX\
-typesetting program. It enables you to produce
-publication-quality documents with great accuracy and
-consistency. \LaTeX\ works on any computer and produces
-industry-standard PDF. It is available both in free (open-source)
-and commercial implementations. \LaTeX\ can be used for any kind
-of document, but it is especially suited to those with complex
-structures, repetitive formatting, or notations like
-mathematics\footnote{For reasons of space this guide does not
-cover details of mathematics typesetting.}; or where technical
-stability, dimensional accuracy, or a persistent and
-non-proprietary file format are needed. Install the software from
+
+\LaTeX\ is a document preparation system which uses the \TeX\ typesetting
+program. It enables you to produce publication-quality documents with
+great accuracy and consistency. \LaTeX\ works on any computer and
+produces industry-standard PDF. It is available both
+in free (open-source) and commercial implementations. \LaTeX\ can be
+used for any kind of document, but it is especially suited to those
+with complex structures, repetitive formatting, or notations like
+mathematics\footnote{For reasons of space this guide does not cover
+  details of mathematics typesetting.}; or where technical stability,
+dimensional accuracy, or a persistent and non-proprietary file format
+are needed. Install the software from
 \url{www.tug.org/texlive/} or buy a commercially-supported
-version from one of the vendors (see the list on
-p.\thinspace\pageref{comm}).
-%    \end{macrocode}
-% Summarise the process: show that it’s simple.\par
-%    \begin{macrocode}
+version from one of the vendors (see the list on p.\thinspace\pageref{comm}).
+
 \subsection*{Creating and typesetting your document}
+
 \begin{enumerate}[noitemsep]\setlength{\fboxsep}{1pt}
-   \item Create your document using any suitable plain-text
-     editor with \LaTeX\ controls, eg \textit{\TeX shop}
-     (Mac), \textit{\TeX Maker} (Win), \textit{Kile}
-     (Linux), \textit{Emacs} (all), even
-     \textit{vi}\thinspace!
+   \item Create your document using any suitable plain-text editor
+     with \LaTeX\ controls, eg \textit{\TeX shop} (Mac), \textit{\TeX
+       Maker} (Win), \textit{Kile} (Linux), \textit{Emacs} (all),
+     even \textit{vi}\thinspace!
    \item Save the file with a name ending in \verb+.tex+
      (\emph{never} use spaces in filenames!);
-   \item Use the {\small\keys{Build}} or
-     {\small\keys{Compile}} toolbar button or menu item in
-     your editor to typeset and display the
-     document;\label{typeset}
-   \item Make any changes needed in your original document
-     and repeat step \ref{typeset}.
+   \item Use the {\small\keys{Build}} or {\small\keys{Compile}}
+     toolbar button or menu item in your editor to typeset and display
+     the document;\label{typeset}
+   \item Make any changes needed in your original document and repeat
+     step \ref{typeset}. 
 \end{enumerate}
-%    \end{macrocode}
-% And summarise the syntax to demystify it.\par
-%    \begin{macrocode}
-\subsection*{Syntax (how to type \LaTeX\ commands --- these
-  are the rules)}
+
+
+\subsection*{Syntax (how to type \LaTeX\ commands --- these are the rules)}
+
 \begin{itemize}[noitemsep]
-  \item \textbf{All \LaTeX\ commands begin with a
-    backslash}.\\ \example
-    \verb+\tableofcontents+\endexample
-  \item \textbf{If a command needs text to work with, it
-    goes in curly braces}.\\ \example
-    \verb+\title{Irisches Tagebuch}\author{Heinrich Böll}+\endexample
-  \item \textbf{If options are used, they go in square
-    brackets before the curly braces}.\\ \example
-    \verb+\documentclass[a4paper,11pt]{book}+\endexample
-  \item \textbf{Spaces after commands \emph{without} braces
-    get suppressed}.\\ \example
-    \verb+Copyright \copyright␣+\texttt{\number\year}
-    \gives{Copyright ©\number\year} \nobox\\ To prevent
-    this, put empty curly braces after the
-    command:\\ \example
-    \verb+Copyright \copyright{}␣+\texttt{\number\year}
+  \item \textbf{All \LaTeX\ commands begin with a backslash}.\\
+    \example \verb+\tableofcontents+\endexample
+  \item \textbf{If a command needs text to work
+    with, it goes in curly braces}.\\
+    \example \verb+\title{Irisches Tagebuch}\author{Heinrich Böll}+\endexample
+  \item \textbf{If options are used, they go in square brackets 
+  before the curly braces}.\\
+    \example \verb+\documentclass[a4paper,11pt]{book}+\endexample
+  \item \textbf{Spaces after commands \emph{without} braces get suppressed}.\\
+    \example \verb+Copyright \copyright␣+\texttt{\number\year} 
+    \gives{Copyright ©\number\year} \nobox\\
+    To prevent this, put empty curly braces after the command:\\
+    \example \verb+Copyright \copyright{}␣+\texttt{\number\year} 
     \gives{Copyright ©~\number\year} \yesbox
-  \item \textbf{Curly braces are also used to restrict the
-    scope of effects inside them}.\\ \example
-    \verb+Some {\tiny little} word+ \gives{Some {\tiny
-        little} word}
+  \item \textbf{Curly braces are also used to restrict the scope of
+    effects inside them}.\\
+    \example \verb+Some {\tiny little} word+ \gives{Some {\tiny little} word}
 \end{itemize}
-%    \end{macrocode}
-% Point readers at sources of information. If they read
-%   nothing else but the front page, at least they now know what
-%   they’re dealing with.\par
-%    \begin{macrocode}
 \begin{note}
-This guide shows only a tiny fraction of \LaTeX's power. For
-more information, visit the \TeX\ Users Group site
-(\url{www.tug.org}). For help, see the FAQ
-(\url{www.tex.ac.uk/faq}), StackExchange
+This guide shows only a tiny fraction of \LaTeX's power. For more
+information, visit the \TeX\ Users Group site (\url{www.tug.org}). For
+help, see the FAQ (\url{www.tex.ac.uk/faq}), StackExchange
 (\url{tex.stackexchange.com}), or the Usenet newsgroup
 \url{comp.text.tex}. For packages (plugins), use CTAN, the
-Comprehensive \TeX\ Archive Network
-(\url{www.ctan.org}). For further details, see
-\citetitle{fi} \parencite{fi} and other online resources.
+Comprehensive \TeX\ Archive Network (\url{www.ctan.org}). For
+further details, see \citetitle{fi}
+\parencite{fi} and other online resources.
 \end{note}
-%    \end{macrocode}
-% \subsection{Getting started with a short document}
-% Now we start the meat: a skeleton document structure
-%   that shows the document class, Preamble, and where you put
-%   the text.\par
-%    \begin{macrocode}
+
 \begin{multicols}{2}\small\parskip4pt
 \subsection*{Writing a \LaTeX\ document}
 \subsubsection{Basic document structure}
+
 Here's the skeleton of a \LaTeX\ document. These three lines are
 \textsc{compulsory}: your document will not work without them:
+
 \begin{Verbatim}[frame=single,fontsize=\small,commandchars=!<>]
 !added\documentclass[11pt]{article}
 !comment your Preamble goes here (extra setups, if any)
@@ -1305,24 +1688,20 @@ Here's the skeleton of a \LaTeX\ document. These three lines are
 !added\end{document}
 \end{Verbatim}
 \vspace*{-.5\baselineskip}
-{\fontsize67\selectfont\sffamily New material in each example is 
-shown in {\ttfamily\added blue}; material from previous examples 
-is in black. Comments and mnemonics are in 
-\textcolor{DarkRed}{red}.\par}
-%    \end{macrocode}
-% Explain the rubrication.\par
-%    \begin{macrocode}
+{\fontsize67\selectfont\sffamily New material in each example is shown 
+in {\ttfamily\added blue}; material from previous examples is in
+black. Comments are in \textcolor{DarkRed}{red}.\par}
+
 \begin{itemize}[noitemsep]
-  \item The document class name \textsc{must} be one of the
-    standard \verb+book+, \verb+article+, or \verb+report+,
-    or one of the many others preinstalled or downloadable
-    (eg \verb+thesis+, \verb+memoir+, etc);
-  \item There are body type size options \verb+10pt+ (the
-    default), \verb+11pt+, and \verb+12pt+;
-  \item There are paper size options including
-    \verb+a4paper+ (210\thinspace mm$\times$297\thinspace
-    mm) and \verb+letterpaper+ (8½$''\times$11$''$) [see
-      below].
+  \item The document class name \textsc{must} be one of the standard
+    \verb+book+, \verb+article+, or \verb+report+, or one of the many
+    others preinstalled or downloadable (eg \verb+thesis+,
+    \verb+memoir+, etc);
+  \item There are body type size options \verb+10pt+ (the default),
+    \verb+11pt+, and \verb+12pt+;
+  \item There are paper size options including \verb+a4paper+
+    (210\thinspace mm$\times$297\thinspace mm) and \verb+letterpaper+
+    (8½$''\times$11$''$) [see below].
 \end{itemize}
 
 \subsubsection{Front matter}
@@ -1363,6 +1742,7 @@ Sections get numbered automatically in bold type, and get included in
 the Table of Contents (if you use it). Numbering can be turned off
 selectively. Section heading layout can be modified with the
 \textsf{sectsty}, \mbox{\textsf{titlesec}}, and other packages.
+%Use the \textsf{babel} package for other languages.
 
 \begin{Verbatim}[frame=single,fontsize=\small,commandchars=!<>]
 !comment (Preamble, titling, and abstract as above)
@@ -1452,23 +1832,23 @@ For help, see the links on the front and back pages. There is a
 summary of common commands at\\
 \url{www.stdout.org/~winston/latex/latexsheet.pdf}
 and a comprehensive list at
-\url{www.eeng.dcu.ie/local-docs/latex-help/}~.
+\url{www.eeng.dcu.ie/local-docs/latex-help/}~. 
 \end{minipage}}
-\columnbreak
+
 \paragraph{Tables and figures:}
 These environments \textbf{float} (to fit
 available space). They have \verb+\caption+ and \verb+\label+ commands.
 
 \begin{Verbatim}[frame=single,fontsize=\footnotesize,commandchars=!<>]
 !added\begin{figure} !comment(see below)
-\caption{Swiss and Dutch Mennonite
+\caption{Swiss and Dutch Mennonite 
  migrations of the 1700s and 1800s}
 \label{lmig}
 !added\centering !comment(centre the contents)
 !added\includegraphics[width=.8\columnwidth]
 !added {menno-a}\\ !comment(double backslash for linebreak)
-!added\scriptsize!revert Courtesy of Paul C. Adams,
- Department of Geography and the
+!added\scriptsize!revert Courtesy of Paul C. Adams, 
+ Department of Geography and the 
  Environment, University of Texas at
  Austin.
 !added\cite{adams}\end{figure}
@@ -1479,11 +1859,11 @@ or PDF for pdf\LaTeX.
 
 \begin{Verbatim}[frame=single,fontsize=\footnotesize,commandchars=!<>]
 !added\begin{table}
- !added\caption{Mean growth rate and intakes
- !added of supplement, milk, and water for 4
+ !added\caption{Mean growth rate and intakes 
+ !added of supplement, milk, and water for 4 
  !added diets (after Sherington, J, undated)}
  \label{dietgrowth}
- \centering
+ \centering 
  !added\begin{tabular}{|l|r|r|r|r|}
  !added\hline !comment(horizontal line between rows)
   !added&Growth&Supplement&Milk&Water
@@ -1491,31 +1871,34 @@ or PDF for pdf\LaTeX.
  !added Supplement&rate&intake&intake&intake
   !added\\\hline
   !added&(g/day)&(g/day)&(ml/kg$^{0.75}$)&
-  !added (ml/kg$^{0.75}$)\\\hline
- !added Lucerne &145&450&10.5&144\\\hline
- !added Sesbania&132&476& 9.2&128\\\hline
- !added Leucaena&128&364& 8.9&121\\\hline
- !added None    & 89&  0& 9.8&108\\\hline
+  !added (ml/kg$^{0.75}$)\\\hline 
+ !added Lucerne &145&450&10.5&144\\\hline 
+ !added Sesbania&132&476& 9.2&128\\\hline 
+ !added Leucaena&128&364& 8.9&121\\\hline 
+ !added None    & 89&  0& 9.8&108\\\hline 
  !added\end{tabular}
 !added\end{table}
 \end{Verbatim}
 
+% fake it
 \begin{center}\sffamily
+%  \fontencoding{T1}%
+%  \fontfamily{cmss}%
   \fontsize78\selectfont
 \setlength{\tabcolsep}{2pt}
 \setlength{\arrayrulewidth}{.2pt}
 \begin{tabular}{@{}|>{\vrule height1em width0pt}l|r|r|r|r|@{}}
-\multicolumn5l{\textbf{Table 2}: \textit{Mean growth rate and intakes
+\multicolumn5l{\textbf{Table 2}: \textit{Mean growth rate and intakes 
 of supplement,}}\\
 \multicolumn5l{\textit{milk, and water for four diets} (after
     Sherington, J, undated)}\\[6pt]\hline
 \vrule height1.1em width0pt&Growth&Supplement&Milk&Water\\[-1pt]
 Supplement&rate&intake&intake&intake\\[-1pt]
-&(g/day)&(g/day)&(ml/kg\textsuperscript{\fontsize34\selectfont 0.75})&(ml/kg\textsuperscript{\fontsize34\selectfont 0.75})\\[3pt]\hline
-Lucerne &145&450&10.5&144\\\hline
-Sesbania&132&476& 9.2&128\\\hline
-Leucaena&128&364& 8.9&121\\\hline
-None    & 89&  0& 9.8&108\\\hline
+&(g/day)&(g/day)&(ml/kg\textsuperscript{\fontsize34\selectfont 0.75})&(ml/kg\textsuperscript{\fontsize34\selectfont 0.75})\\[3pt]\hline 
+Lucerne &145&450&10.5&144\\\hline 
+Sesbania&132&476& 9.2&128\\\hline 
+Leucaena&128&364& 8.9&121\\\hline 
+None    & 89&  0& 9.8&108\\\hline 
 \end{tabular}
 \end{center}
 Packages like \textsf{longtable} and \textsf{array} can help
@@ -1524,18 +1907,18 @@ with more complex table formats.
 \end{multicols}
 
 \begin{center}\sffamily
+%  \fontencoding{T1}%
+%  \fontfamily{cmss}\selectfont
   \textbf{Figure 1}: \textit{Swiss and Dutch Mennonite migrations of the
     1700s and 1800s}\\[3pt]
-  \ifafive\includegraphics[width=.8\columnwidth]{menno-a}\fi
-  \iflegal\includegraphics[width=.7\columnwidth]{menno-a}\fi
-  \\\scriptsize
+  \includegraphics[width=.8\columnwidth]{menno-a}\\\scriptsize
   Courtesy of Paul C. Adams, Department of Geography
   and the Environment, University of Texas at Austin. [1]
 \end{center}
 
 \begin{multicols}{2}\small\parskip4pt
 \paragraph{Typefaces:}
-{\ff{lrm}\selectfont The default typeface in \LaTeX\ is Computer
+{\fontfamily{lrm}\selectfont The default typeface in \LaTeX\ is Computer
   Modern, like this.}
 
 {\footnotesize\tabcolsep4pt
@@ -1582,15 +1965,15 @@ Monospace&tt&\ttfamily\\
 \end{tabular}}
 
 \begingroup\small
-\example\verb+\textit{\textbf{\textsf+\ifafive\linebreak\fi
-\verb+{bold+ \iflegal\linebreak\fi\verb+italic sans}}}+
+\example\verb+\textit{\textbf{\textsf+\linebreak
+\verb+{bold italic sans}}}+
 \gives{\ff{cmss}\textit{\textbf{bold italic sans}}}
 \par\endgroup
 
-Sizes for titles, headings, footnotes, etc are automatic, but
-there are some step-sizes:
+Font sizing is automatic for titles, headings, and footnotes. There
+are named step-size commands if you need them:
 
-{\scriptsize\centering
+{\scriptsize
 \begin{tabular}{>{\ttfamily\char'134}lrrr}
 normalsize&10&11&12\\\hline\vrule height1.1em width0pt
 tiny&5&6&7\\
@@ -1605,10 +1988,10 @@ Huge&20\rlap*&24\rlap*&28\rlap*\\
 \end{tabular}
 \quad
 \rotatebox[origin=c]{90}{\tiny* sizes rounded here to save space}
-\par}
+}
 
 For other sizes, add the special command
-{\added\verb+\RequirePackage{fix-cm}+}\iflegal\linebreak\fi \emph{before} the
+{\added\verb+\RequirePackage{fix-cm}+} \emph{before} the 
 \verb+\documentclass+ line and use
 {\added\verb+\fontsize{+\texttt{\uline{pp}}\verb+}{+\texttt{\uline{bb}}\verb+}\selectfont+}
 for the point-size (\textit{pp}) and baseline
@@ -1622,27 +2005,29 @@ For double or 1½ line-spacing (eg in theses) use the \textsf{setspace}
 package.
 
 You can use colour palettes in the RGB, CMYK, HTML, and other
-colourspaces with \iflegal\\\fi the \textsf{xcolor} \ifafive\\\fi
-package and the\hfil 
-\smash{\raisebox{0ex}{\sffamily\bfseries\Huge\iflegal\quad\else\enspace\fi
+colourspaces with the 
+\textsf{xcolor} \\package and the\hfil 
+\smash{\raisebox{-2ex}{\sffamily\bfseries\Huge\qquad
 \textcolor[HTML]{2F50AD}{G}%
-\textcolor[HTML]{B32F17}{o}%
+\textcolor[HTML]{B32F17}{o}% 
 \textcolor[HTML]{F3C20B}{o}%
-\textcolor[HTML]{2F50AD}{g}%
+\textcolor[HTML]{2F50AD}{g}% 
 \textcolor[HTML]{48C847}{l}%
 \textcolor[HTML]{B32F17}{e}}}%
+% web colour for l was 567122
+% web colour for o2 was CAB340
 \\\verb+\color{+\texttt{\textit{name}}\verb+}+ command.
 
 For verbatim text, use the \verb+\verb+ command or the
 \textsf{verbatim} environment, or (better) the \textsf{listings} or
-\textsf{fancyvrb} packages.
+\textsf{fancyvrb} packages, which allow context-sensitive formatting.
 
-\paragraph{Footnotes:}
-You do footnotes with \iflegal\\\fi \verb+\footnote(like this}+.\footnote{Like
+\paragraph{Footnotes}\setcounter{footnote}{0} 
+You can do footnotes with \verb+\footnote(like this}+.\footnote{Like
   this.} Endnotes too.
 
 \paragraph{Cross-references:}\label{blah} Use the command
-\verb+\label{...}+ to label the target, and \verb+\ref{...}+ or
+\verb+\label{...}+ to add a label to the target, and \verb+\ref{...}+ or
 \verb+\pageref{...}+ to refer to it. Make up the labels yourself.
 
 \begingroup\small
@@ -1653,7 +2038,8 @@ You do footnotes with \iflegal\\\fi \verb+\footnote(like this}+.\footnote{Like
 
 \paragraph{Citation and reference:} Create your bibliographic database
 in BIB\TeX\ format \parencite{bibtex} using \emph{JabRef} or
-similar. Each entry \textsc{must} have a unique label (here `\verb+fi+'):
+similar. Each entry \textsc{must} have a unique label
+(here `\verb+fi+'):\par\vspace{-\parskip}
 \begin{Verbatim}[frame=single,fontsize=\scriptsize,commandchars=!<>]
 !added@book{fi,
 !added  title = {Formatting Information},
@@ -1661,13 +2047,15 @@ similar. Each entry \textsc{must} have a unique label (here `\verb+fi+'):
 !added  publisher = {Silmaril},
 !added  year = {2016}}
 \end{Verbatim}
+\par\vspace{-\parskip}
 Use the
 \textsf{biblatex} package to specify the style, and give
-the filename of your database:
+the filename of your database:\par\vspace{-\parskip}
 \begin{Verbatim}[frame=single,fontsize=\footnotesize,commandchars=!<>]
 !added\usepackage[style=apa]{biblatex}
 !added\addbibresource{myrefs.bib}
 \end{Verbatim}
+\par\vspace{-\parskip}
 To cite, use \verb+\cite{...}+ (or
 \verb+\textcite+ or \verb+\parencite+) with the relevant label:\\ \example{\verb+\textcite{fi}+}\gives{\textcite{fi}}.
 
@@ -1686,33 +2074,26 @@ Silmaril at \url{latex@silmaril.ie}
 \end{minipage}}%
 \end{multicols}
 \end{document}
-%    \end{macrocode}
-% \iffalse
-%</veryshortguide>
+      
+%</vsg>
 % \fi
 % \iffalse
-%<*vsg-bib>
-% \fi
-% \clearpage
-% \section{The bibliography for the Very Short Guide to Typesetting with \LaTeX{}}\label{vsg-bib}
-% \iffalse
-The bibliography for the Very Short Guide to Typesetting with \LaTeX{}
-% \fi
-% This is the bibliography for the Very Short Guide.\par
-%    \begin{macrocode}
+%<*docbib>
 @book{fi,
   title = {{Formatting Information}},
+  subtitle = {{Online {and} {PDF}}},
   author = {Peter Flynn},
   publisher = {Silmaril},
+  address = {Cork, Ireland},
   url = {http://latex.silmaril.ie/},
-  year = {2016}}
+  year = {2018}}
 
 @InProceedings{adams,
   author =       {Paul Adams},
   title =        {{Linguistic Chaos in Montreal}},
   booktitle =    {{Chaos and the City miniconference}},
   year =         2002,
-  month =        {Nov},
+  month =        {11},
   url =          {http://www.utexas.edu/depts/grg/adams/chaos.ppt},
   organization = {University of Texas School of Architecture}}
 
@@ -1724,7 +2105,6 @@ The bibliography for the Very Short Guide to Typesetting with \LaTeX{}
   url = {http://ftp.heanet.ie/pub/CTAN/tex/biblio/bibtex/base/btxdoc.pdf},
   year =         1988}
 
-
 @Manual{sherington,
   author =       {Sherington, J},
   title =        {{Informative Presentation of Graphs and Statistics}},
@@ -1733,417 +2113,19 @@ The bibliography for the Very Short Guide to Typesetting with \LaTeX{}
   url =          {http://www.reading.ac.uk/ssc/publications/guides/toptgs.htm},
   note =         {4.2, example table}
 }
-%    \end{macrocode}
-% \iffalse
-%</vsg-bib>
-% \fi
-% \newgeometry{left=3cm}
-% \clearpage
-% \section{The \LaTeX{} Project Public License}\label{LPPL:LPPL}
-% \begin{quotation}\small\noindent
-% Everyone is allowed to distribute verbatim copies of this
-%       license document, but modification of it is not allowed.
-% \end{quotation}
-% \subsection{Preamble}\label{LPPL:Preamble}
-% The \LaTeX{} Project Public License (\textsc{lppl})
-%       is the primary license under which the \LaTeX{} kernel and the
-%       base \LaTeX{} packages are distributed.\par
-% You may use this license for any work of which you hold the
-%       copyright and which you wish to distribute.  This license may be
-%       particularly suitable if your work is \TeX{}-related (such as a
-%       \LaTeX{} package), but it is written in such a way that you can
-%       use it even if your work is unrelated to \TeX{}.\par
-% The section \emph{Whether and How to Distribute Works under This
-%       License}, below, gives instructions, examples, and
-%       recommendations for authors who are considering distributing
-%       their works under this license.\par
-% This license gives conditions under which a work may be
-%       distributed and modified, as well as conditions under which
-%       modified versions of that work may be distributed.\par
-% We, the \LaTeX{3} Project, believe that the conditions below
-%       give you the freedom to make and distribute modified versions of
-%       your work that conform with whatever technical specifications
-%       you wish while maintaining the availability, integrity, and
-%       reliability of that work.  If you do not see how to achieve your
-%       goal while meeting these conditions, then read the document
-%       {\ttfamily{}cfgguide.tex} and {\ttfamily{}modguide.tex} in the base \LaTeX{}
-%       distribution for suggestions.\par
-% \subsection{Definitions}\label{LPPL:Definitions}
-% In this license document the following terms are used:\par
-% \begin{description}[style=unboxed]
-% \item[Work\thinspace:]Any work being distributed under this License.
-% \item[Derived Work\thinspace:]Any work that under any applicable law is derived from
-%     the Work.
-% \item[Modification\thinspace:]Any procedure that produces a Derived Work under any
-%     applicable law~--- for example, the production of a file
-%     containing an original file associated with the Work or a
-%     significant portion of such a file, either verbatim or
-%     with modifications and/or translated into another
-%     language.
-% \item[Modify\thinspace:]To apply any procedure that produces a Derived Work
-%     under any applicable law.
-% \item[Distribution\thinspace:]Making copies of the Work available from one person to
-%     another, in whole or in part.  Distribution includes (but
-%     is not limited to) making any electronic components of the
-%     Work accessible by file transfer protocols such as
-%     \textsc{ftp} or \textsc{http} or by
-%     shared file systems such as Sun's Network File System
-%     (\textsc{nfs}).
-% \item[Compiled Work\thinspace:]A version of the Work that has been processed into a
-%     form where it is directly usable on a computer system.
-%     This processing may include using installation facilities
-%     provided by the Work, transformations of the Work, copying
-%     of components of the Work, or other activities.  Note that
-%     modification of any installation facilities provided by
-%     the Work constitutes modification of the Work.
-% \item[Current Maintainer\thinspace:]A person or persons nominated as such within the Work.
-%     If there is no such explicit nomination then it is the
-%     `Copyright Holder' under any applicable
-%     law.
-% \item[Base Interpreter\thinspace:]A program or process that is normally needed for
-%     running or interpreting a part or the whole of the
-%     Work.\par
-% A Base Interpreter may depend on external components
-%     but these are not considered part of the Base Interpreter
-%     provided that each external component clearly identifies
-%     itself whenever it is used interactively.  Unless
-%     explicitly specified when applying the license to the
-%     Work, the only applicable Base Interpreter is a
-%     `\LaTeX{}-Format' or in the case of files
-%     belonging to the `\LaTeX{}-format' a program
-%     implementing the `\TeX{} language'.
-% \end{description}
-% \subsection{Conditions on Distribution and Modification}\label{LPPL:Conditions}
-% \begin{enumerate}
-% \item Activities other than distribution and/or modification
-%   of the Work are not covered by this license; they are
-%   outside its scope. In particular, the act of running the
-%   Work is not restricted and no requirements are made
-%   concerning any offers of support for the Work.
-% \item \label{LPPL:item:distribute}You may distribute a complete, unmodified copy of the
-%   Work as you received it.  Distribution of only part of the
-%   Work is considered modification of the Work, and no right to
-%   distribute such a Derived Work may be assumed under the
-%   terms of this clause.
-% \item You may distribute a Compiled Work that has been
-%   generated from a complete, unmodified copy of the Work as
-%   distributed under Clause~item~\ref{LPPL:item:distribute} above above, as
-%   long as that Compiled Work is distributed in such a way that
-%   the recipients may install the Compiled Work on their system
-%   exactly as it would have been installed if they generated a
-%   Compiled Work directly from the Work.
-% \item \label{LPPL:item:currmaint}If you are the Current Maintainer of the Work, you may,
-%   without restriction, modify the Work, thus creating a
-%   Derived Work.  You may also distribute the Derived Work
-%   without restriction, including Compiled Works generated from
-%   the Derived Work.  Derived Works distributed in this manner
-%   by the Current Maintainer are considered to be updated
-%   versions of the Work.
-% \item If you are not the Current Maintainer of the Work, you
-%   may modify your copy of the Work, thus creating a Derived
-%   Work based on the Work, and compile this Derived Work, thus
-%   creating a Compiled Work based on the Derived Work.
-% \item \label{LPPL:item:conditions}If you are not the Current Maintainer of the Work, you
-%   may distribute a Derived Work provided the following
-%   conditions are met for every component of the Work unless
-%   that component clearly states in the copyright notice that
-%   it is exempt from that condition.  Only the Current
-%   Maintainer is allowed to add such statements of exemption to
-%   a component of the Work.
-% \begin{enumerate}
-% \item If a component of this Derived Work can be a direct
-%       replacement for a component of the Work when that
-%       component is used with the Base Interpreter, then,
-%       wherever this component of the Work identifies itself to
-%       the user when used interactively with that Base
-%       Interpreter, the replacement component of this Derived
-%       Work clearly and unambiguously identifies itself as a
-%       modified version of this component to the user when used
-%       interactively with that Base Interpreter.
-% \item Every component of the Derived Work contains
-%       prominent notices detailing the nature of the changes to
-%       that component, or a prominent reference to another file
-%       that is distributed as part of the Derived Work and that
-%       contains a complete and accurate log of the
-%       changes.
-% \item No information in the Derived Work implies that any
-%       persons, including (but not limited to) the authors of
-%       the original version of the Work, provide any support,
-%       including (but not limited to) the reporting and
-%       handling of errors, to recipients of the Derived Work
-%       unless those persons have stated explicitly that they do
-%       provide such support for the Derived Work.
-% \item You distribute at least one of the following with
-%       the Derived Work:
-% \begin{enumerate}
-% \item A complete, unmodified copy of the Work; if your
-%   distribution of a modified component is made by
-%   offering access to copy the modified component from
-%   a designated place, then offering equivalent access
-%   to copy the Work from the same or some similar place
-%   meets this condition, even though third parties are
-%   not compelled to copy the Work along with the
-%   modified component;
-% \item Information that is sufficient to obtain a
-%   complete, unmodified copy of the Work.
-% \end{enumerate}
-% \end{enumerate}
-% \item If you are not the Current Maintainer of the Work, you
-%   may distribute a Compiled Work generated from a Derived
-%   Work, as long as the Derived Work is distributed to all
-%   recipients of the Compiled Work, and as long as the
-%   conditions of Clause~item~\ref{LPPL:item:conditions} above, above, are met
-%   with regard to the Derived Work.
-% \item The conditions above are not intended to prohibit, and
-%   hence do not apply to, the modification, by any method, of
-%   any component so that it becomes identical to an updated
-%   version of that component of the Work as it is distributed
-%   by the Current Maintainer under Clause~item~\ref{LPPL:item:currmaint} above, above.
-% \item Distribution of the Work or any Derived Work in an
-%   alternative format, where the Work or that Derived Work (in
-%   whole or in part) is then produced by applying some process
-%   to that format, does not relax or nullify any sections of
-%   this license as they pertain to the results of applying that
-%   process.
-% \item % \begin{enumerate}
-% \item A Derived Work may be distributed under a different
-%       license provided that license itself honors the
-%       conditions listed in Clause~item~\ref{LPPL:item:conditions} above above, in
-%       regard to the Work, though it does not have to honor the
-%       rest of the conditions in this license.
-% \item If a Derived Work is distributed under a different
-%       license, that Derived Work must provide sufficient
-%       documentation as part of itself to allow each recipient
-%       of that Derived Work to honor the restrictions in
-%       Clause~item~\ref{LPPL:item:conditions} above above, concerning
-%       changes from the Work.
-% \end{enumerate}
-% \item This license places no restrictions on works that are
-%   unrelated to the Work, nor does this license place any
-%   restrictions on aggregating such works with the Work by any
-%   means.
-% \item Nothing in this license is intended to, or may be used
-%   to, prevent complete compliance by all parties with all
-%   applicable laws.
-% \end{enumerate}
-% \subsection{No Warranty}\label{LPPL:Warranty}
-% There is no warranty for the Work.  Except when otherwise
-%       stated in writing, the Copyright Holder provides the Work
-%       `as is', without warranty of any kind, either
-%       expressed or implied, including, but not limited to, the implied
-%       warranties of merchantability and fitness for a particular
-%       purpose.  The entire risk as to the quality and performance of
-%       the Work is with you.  Should the Work prove defective, you
-%       assume the cost of all necessary servicing, repair, or
-%       correction.\par
-% In no event unless required by applicable law or agreed to
-%       in writing will The Copyright Holder, or any author named in the
-%       components of the Work, or any other party who may distribute
-%       and/or modify the Work as permitted above, be liable to you for
-%       damages, including any general, special, incidental or
-%       consequential damages arising out of any use of the Work or out
-%       of inability to use the Work (including, but not limited to,
-%       loss of data, data being rendered inaccurate, or losses
-%       sustained by anyone as a result of any failure of the Work to
-%       operate with any other programs), even if the Copyright Holder
-%       or said author or said other party has been advised of the
-%       possibility of such damages.\par
-% \subsection{Maintenance of The Work}\label{LPPL:Maintenance}
-% The Work has the status `author-maintained'
-%       if the Copyright Holder explicitly and prominently states near
-%       the primary copyright notice in the Work that the Work can only
-%       be maintained by the Copyright Holder or simply that it is
-%       `author-maintained'.\par
-% The Work has the status `maintained' if there
-%       is a Current Maintainer who has indicated in the Work that they
-%       are willing to receive error reports for the Work (for example,
-%       by supplying a valid e-mail address). It is not required for the
-%       Current Maintainer to acknowledge or act upon these error
-%       reports.\par
-% The Work changes from status `maintained' to
-%       `unmaintained' if there is no Current Maintainer,
-%       or the person stated to be Current Maintainer of the work cannot
-%       be reached through the indicated means of communication for a
-%       period of six months, and there are no other significant signs
-%       of active maintenance.\par
-% You can become the Current Maintainer of the Work by
-%       agreement with any existing Current Maintainer to take over this
-%       role.\par
-% If the Work is unmaintained, you can become the Current
-%       Maintainer of the Work through the following steps:\par
-% \begin{enumerate}
-% \item Make a reasonable attempt to trace the Current
-%   Maintainer (and the Copyright Holder, if the two differ)
-%   through the means of an Internet or similar search.
-% \item If this search is successful, then enquire whether the
-%   Work is still maintained.
-% \begin{enumerate}
-% \item If it is being maintained, then ask the Current
-%       Maintainer to update their communication data within one
-%       month.
-% \item \label{LPPL:item:intention}If the search is unsuccessful or no action to resume
-%       active maintenance is taken by the Current Maintainer,
-%       then announce within the pertinent community your
-%       intention to take over maintenance.  (If the Work is a
-%       \LaTeX{} work, this could be done, for example, by
-%       posting to \url{news:comp.text.tex}.)
-% \end{enumerate}
-% \item % \begin{enumerate}
-% \item If the Current Maintainer is reachable and agrees to
-%       pass maintenance of the Work to you, then this takes
-%       effect immediately upon announcement.
-% \item \label{LPPL:item:announce}If the Current Maintainer is not reachable and the
-%       Copyright Holder agrees that maintenance of the Work be
-%       passed to you, then this takes effect immediately upon
-%       announcement.
-% \end{enumerate}
-% \item \label{LPPL:item:change}If you make an `intention announcement'
-%   as described in~item~\ref{LPPL:item:intention} above above and after three
-%   months your intention is challenged neither by the Current
-%   Maintainer nor by the Copyright Holder nor by other people,
-%   then you may arrange for the Work to be changed so as to
-%   name you as the (new) Current Maintainer.
-% \item If the previously unreachable Current Maintainer becomes
-%   reachable once more within three months of a change
-%   completed under the terms of~item~\ref{LPPL:item:announce} above
-%   or~item~\ref{LPPL:item:change} above, then that
-%   Current
-%   Maintainer must become or remain the Current Maintainer upon
-%   request provided they then update their communication data
-%   within one month.
-% \end{enumerate}
-% A change in the Current Maintainer does not, of itself,
-%       alter the fact that the Work is distributed under the
-%       \textsc{lppl} license.\par
-% If you become the Current Maintainer of the Work, you should
-%       immediately provide, within the Work, a prominent and
-%       unambiguous statement of your status as Current Maintainer.  You
-%       should also announce your new status to the same pertinent
-%       community as in~item~\ref{LPPL:item:intention} above
-%       above.\par
-% \subsection{Whether and How to Distribute Works under This
-%       License}\label{LPPL:Distribute}
-% This section contains important instructions, examples, and
-%       recommendations for authors who are considering distributing
-%       their works under this license.  These authors are addressed as
-%       `you' in this section.\par
-% \subsubsection{Choosing This License or Another License}\label{LPPL:Choosing}
-% If for any part of your work you want or need to use
-% \emph{distribution} conditions that differ
-% significantly from those in this license, then do not refer to
-% this license anywhere in your work but, instead, distribute
-% your work under a different license. You may use the text of
-% this license as a model for your own license, but your license
-% should not refer to the \textsc{lppl} or otherwise
-% give the impression that your work is distributed under the
-% \textsc{lppl}.\par
-% The document {\ttfamily{}modguide.tex} in the base \LaTeX{}
-% distribution explains the motivation behind the conditions of
-% this license.  It explains, for example, why distributing
-% \LaTeX{} under the \textsc{gnu} General Public
-% License (\textsc{gpl}) was considered inappropriate.
-% Even if your work is unrelated to \LaTeX{}, the discussion in
-% {\ttfamily{}modguide.tex} may still be
-% relevant, and authors intending to distribute their works
-% under any license are encouraged to read it.\par
-% \subsubsection{A Recommendation on Modification Without
-% Distribution}\label{LPPL:WithoutDistribution}
-% It is wise never to modify a component of the Work, even
-% for your own personal use, without also meeting the above
-% conditions for distributing the modified component.  While you
-% might intend that such modifications will never be
-% distributed, often this will happen by accident~--- you may
-% forget that you have modified that component; or it may not
-% occur to you when allowing others to access the modified
-% version that you are thus distributing it and violating the
-% conditions of this license in ways that could have legal
-% implications and, worse, cause problems for the community. It
-% is therefore usually in your best interest to keep your copy
-% of the Work identical with the public one.  Many works provide
-% ways to control the behavior of that work without altering any
-% of its licensed components.\par
-% \subsubsection{How to Use This License}\label{LPPL:HowTo}
-% To use this license, place in each of the components of
-% your work both an explicit copyright notice including your
-% name and the year the work was authored and/or last
-% substantially modified.  Include also a statement that the
-% distribution and/or modification of that component is
-% constrained by the conditions in this license.\par
-% Here is an example of such a notice and statement:\par
-% \iffalse
-%<*ignore>
-% \fi
-\begin{lstlisting}[language={[LaTeX]TeX}]
-%%% pig.dtx
-%%% Copyright 2005 M. Y. Name
-%%
-%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
-%% of this license or (at your option) any later version.
-%% The latest version of this license is in
-%%   http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
-%%
-%% This work has the LPPL maintenance status `maintained'.
-%% 
-%% The Current Maintainer of this work is M. Y. Name.
-%%
-%% This work consists of the files pig.dtx and pig.ins
-%% and the derived file pig.sty.
-\end{lstlisting}
-% \iffalse
-%</ignore>
-% \fi
-% Given such a notice and statement in a file, the
-% conditions given in this license document would apply, with
-% the `Work' referring to the three files
-% {\ttfamily{}pig.dtx}, {\ttfamily{}pig.ins}, and {\ttfamily{}pig.sty} (the last being generated
-% from {\ttfamily{}pig.dtx} using {\ttfamily{}pig.ins}), the `Base
-%   Interpreter' referring to any
-% `\LaTeX{}-Format', and both `Copyright
-%   Holder' and `Current Maintainer'
-% referring to the person
-% M.~Y.~Name\index{!}.\par
-% If you do not want the Maintenance section of
-% \textsc{lppl} to apply to your Work, change
-% `maintained' above into
-% `author-maintained'. However, we recommend that
-% you use `maintained' as the Maintenance
-% section was added in order to ensure that your Work remains
-% useful to the community even when you can no longer maintain
-% and support it yourself.\par
-% \subsubsection{Derived Works That Are Not Replacements}\label{LPPL:NotReplacements}
-% Several clauses of the \textsc{lppl} specify
-% means to provide reliability and stability for the user
-% community. They therefore concern themselves with the case
-% that a Derived Work is intended to be used as a (compatible or
-% incompatible) replacement of the original Work. If this is not
-% the case (e.g., if a few lines of code are reused for a
-% completely different task), then clauses 6b and 6d shall not
-% apply.\par
-% \subsubsection{Important Recommendations}\label{LPPL:Recommendations}
-% \paragraph{Defining What Constitutes the Work}
-% The \textsc{lppl} requires that distributions
-%   of the Work contain all the files of the Work.  It is
-%   therefore important that you provide a way for the licensee
-%   to determine which files constitute the Work.  This could,
-%   for example, be achieved by explicitly listing all the files
-%   of the Work near the copyright notice of each file or by
-%   using a line such as:\par
-% \iffalse
-%<*ignore>
-% \fi
-\begin{lstlisting}[language={[LaTeX]TeX}]
-%% This work consists of all files listed in manifest.txt.
-\end{lstlisting}
-% \iffalse
-%</ignore>
+
+@TechReport{rfc2119,
+  author =   {Scott Bradner},
+  title =   {{Key words for use in RFCs to Indicate Requirement Levels}},
+  institution =  {Internet Engineering Task Force},
+  year =   1997,
+  number =   {RFC 2119},
+  address =   {Fremont, CA},
+  url =   {http://www.ietf.org/rfc/rfc2119.txt},
+  month =   {3}
+}
+      
+%</docbib>
 % \fi
-% in that place.  In the absence of an unequivocal list it
-%   might be impossible for the licensee to determine what is
-%   considered by you to comprise the Work and, in such a case,
-%   the licensee would be entitled to make reasonable
-%   conjectures as to which files comprise the Work.\par
 % \Finale
 
diff --git a/Master/texmf-dist/doc/latex/latex-veryshortguide/veryshortguide.ins b/Master/texmf-dist/doc/latex/latex-veryshortguide/veryshortguide.ins
new file mode 100644
index 00000000000..f49a5303955
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/latex-veryshortguide/veryshortguide.ins
@@ -0,0 +1,62 @@
+% Transformed from veryshortguide.xml by ClassPack db2dtx.xsl
+% version 1.19 (2020-05-19) on Thursday 21 May 2020 at 11:55:35
+%
+% veryshortguide.ins is copyright © 2009-2020 by Peter Flynn <peter@silmaril.ie>
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either
+% version 1.3 of this license or (at your option) any later
+% version. The latest version of this license is in:
+%
+%     http://www.latex-project.org/lppl.txt
+%
+% and version 1.3 or later is part of all distributions of
+% LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status ‘maintained’.
+% 
+% The current maintainer of this work is Peter Flynn <peter@silmaril.ie>
+%
+% This work consists of the files veryshortguide.dtx and veryshortguide.ins,
+% the derived file 
+% and any other ancillary files listed in the MANIFEST.
+%
+\input docstrip.tex
+\keepsilent
+\usedir{tex/latex/veryshortguide}
+\preamble
+
+This is a generated file.
+
+Copyright © 2006 by Silmaril Consultants
+
+This file was generated from an XML master source.
+Amendments and corrections should be notified to the
+maintainer for inclusion in future versions.
+
+\endpreamble
+\generate{\file{veryshortguide.cls}{\from{veryshortguide.dtx}{class}}
+          \usepreamble\empty\usepostamble\empty
+          \file{vsg.tex}{\from{veryshortguide.dtx}{vsg}}
+          \usepreamble\empty\usepostamble\empty
+          \file{vsg.bib}{\from{veryshortguide.dtx}{docbib}}
+}
+\obeyspaces
+\Msg{********************************************************}
+\Msg{**                                                    **}
+\Msg{** Read the documentation before using this class.    **}
+\Msg{**                                                    **}
+\Msg{** To finish the installation you have to move the    **}
+\Msg{** following files into a directory searched by TeX:  **}
+\Msg{**                                                    **}
+\Msg{**                                                    **}
+\Msg{**     vsg.tex                                       **}
+\Msg{**     vsg.bib                                       **}
+\Msg{**                                                    **}
+\Msg{** To produce the documentation run the file          **}
+\Msg{** veryshortguide.dtx through XeLaTeX and biber        **}
+\Msg{**                                                    **}
+\Msg{** Happy LaTeXing!                                    **}
+\Msg{**                                                    **}
+\Msg{********************************************************}
+\endbatchfile
diff --git a/Master/texmf-dist/doc/latex/latex-veryshortguide/veryshortguide.pdf b/Master/texmf-dist/doc/latex/latex-veryshortguide/veryshortguide.pdf
index ea7d931eeb9..e02dcbacaf1 100644
--- a/Master/texmf-dist/doc/latex/latex-veryshortguide/veryshortguide.pdf
+++ b/Master/texmf-dist/doc/latex/latex-veryshortguide/veryshortguide.pdf
diff --git a/Master/texmf-dist/doc/latex/latex-veryshortguide/veryshortguide.bib b/Master/texmf-dist/doc/latex/latex-veryshortguide/vsg.bib
index cbd4ee07e7f..3d78668a8da 100644
--- a/Master/texmf-dist/doc/latex/latex-veryshortguide/veryshortguide.bib
+++ b/Master/texmf-dist/doc/latex/latex-veryshortguide/vsg.bib
@@ -1,17 +1,18 @@
-The bibliography for the Very Short Guide to Typesetting with \LaTeX{}
 @book{fi,
   title = {{Formatting Information}},
+  subtitle = {{Online {and} {PDF}}},
   author = {Peter Flynn},
   publisher = {Silmaril},
+  address = {Cork, Ireland},
   url = {http://latex.silmaril.ie/},
-  year = {2016}}
+  year = {2018}}
 
 @InProceedings{adams,
   author =       {Paul Adams},
   title =        {{Linguistic Chaos in Montreal}},
   booktitle =    {{Chaos and the City miniconference}},
   year =         2002,
-  month =        {Nov},
+  month =        {11},
   url =          {http://www.utexas.edu/depts/grg/adams/chaos.ppt},
   organization = {University of Texas School of Architecture}}
 
@@ -32,3 +33,15 @@ The bibliography for the Very Short Guide to Typesetting with \LaTeX{}
   note =         {4.2, example table}
 }
 
+@TechReport{rfc2119,
+  author =   {Scott Bradner},
+  title =   {{Key words for use in RFCs to Indicate Requirement Levels}},
+  institution =  {Internet Engineering Task Force},
+  year =   1997,
+  number =   {RFC 2119},
+  address =   {Fremont, CA},
+  url =   {http://www.ietf.org/rfc/rfc2119.txt},
+  month =   {3}
+}
+
+
diff --git a/Master/texmf-dist/doc/latex/latex-veryshortguide/vsg.ins b/Master/texmf-dist/doc/latex/latex-veryshortguide/vsg.ins
deleted file mode 100644
index 747ffebaeba..00000000000
--- a/Master/texmf-dist/doc/latex/latex-veryshortguide/vsg.ins
+++ /dev/null
@@ -1,43 +0,0 @@
-%% Transformed from vsg.xml by ClassPack db2dtx.xsl
-% version 16.00 (Makefile with XeLaTeX) on Friday 12 August 2016 at 10:42:12
-% vsg.ins is copyright © 2009-2016 by Peter Flynn <peter@silmaril.ie>
-%
-% This work may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either
-% version 1.3 of this license or (at your option) any later
-% version. The latest version of this license is in:
-%
-%     http://www.latex-project.org/lppl.txt
-%
-% and version 1.3 or later is part of all distributions of
-% LaTeX version 2005/12/01 or later.
-%
-% This work has the LPPL maintenance status `maintained'.
-% 
-% The current maintainer of this work is Peter Flynn <peter@silmaril.ie>
-%
-% This work consists of the files vsg.dtx and vsg.ins,
-% the derived file vsg.cls, and any ancillary files listed
-% in the MANIFEST.
-%
-\input docstrip.tex
-\keepsilent
-\usedir{tex/latex/veryshortguide}
-\preamble
-This file was generated from an XML master source.
-Amendments and corrections should be notified to the
-maintainer for inclusion in future versions.
-\endpreamble
-\generate{\file{vsg.cls}{\from{vsg.dtx}{class}}
-          \usepreamble\empty\usepostamble\empty
-          \file{veryshortguide.tex}{\from{vsg.dtx}{veryshortguide}}
-          \usepreamble\empty\usepostamble\empty
-          \file{veryshortguide.bib}{\from{vsg.dtx}{vsg-bib}}
-}
-\obeyspaces
-\Msg{********************************************************}
-\Msg{**                                                    **}
-\Msg{** Read the documentation before using this class  .  **}
-\Msg{**                                                    **}
-\Msg{********************************************************}
-\endbatchfile
diff --git a/Master/texmf-dist/doc/latex/latex-veryshortguide/vsg.pdf b/Master/texmf-dist/doc/latex/latex-veryshortguide/vsg.pdf
deleted file mode 100644
index e1507e64d0c..00000000000
--- a/Master/texmf-dist/doc/latex/latex-veryshortguide/vsg.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/latex-veryshortguide/veryshortguide.tex b/Master/texmf-dist/doc/latex/latex-veryshortguide/vsg.tex
index 698e51ef644..bdeffcc9fa7 100644
--- a/Master/texmf-dist/doc/latex/latex-veryshortguide/veryshortguide.tex
+++ b/Master/texmf-dist/doc/latex/latex-veryshortguide/vsg.tex
@@ -1,7 +1,9 @@
-%% The Very Short Guide to Typesetting with \LaTeX{}
-\documentclass[a5paper]{vsg}
-\addbibresource{veryshortguide.bib}
-\setlength{\bibnamesep}{-\itemsep}
+% !TEX TS-program = xelatex
+% !TEX encoding = UTF-8 Unicode
+% !BIB TS-program = biber
+
+\documentclass[a5paper]{veryshortguide}
+\addbibresource{vsg.bib}
 \begin{document}
 \title{The very short guide to typesetting with~\LaTeX}
 \author{Silmaril Consultants\\
@@ -10,78 +12,76 @@
 \date{\monthdate}
 \maketitle
 \subsection*{What's this all about? What's \LaTeX?}
-\LaTeX\ is a document preparation system which uses the \TeX\
-typesetting program. It enables you to produce
-publication-quality documents with great accuracy and
-consistency. \LaTeX\ works on any computer and produces
-industry-standard PDF. It is available both in free (open-source)
-and commercial implementations. \LaTeX\ can be used for any kind
-of document, but it is especially suited to those with complex
-structures, repetitive formatting, or notations like
-mathematics\footnote{For reasons of space this guide does not
-cover details of mathematics typesetting.}; or where technical
-stability, dimensional accuracy, or a persistent and
-non-proprietary file format are needed. Install the software from
+
+\LaTeX\ is a document preparation system which uses the \TeX\ typesetting
+program. It enables you to produce publication-quality documents with
+great accuracy and consistency. \LaTeX\ works on any computer and
+produces industry-standard PDF. It is available both
+in free (open-source) and commercial implementations. \LaTeX\ can be
+used for any kind of document, but it is especially suited to those
+with complex structures, repetitive formatting, or notations like
+mathematics\footnote{For reasons of space this guide does not cover
+  details of mathematics typesetting.}; or where technical stability,
+dimensional accuracy, or a persistent and non-proprietary file format
+are needed. Install the software from
 \url{www.tug.org/texlive/} or buy a commercially-supported
-version from one of the vendors (see the list on
-p.\thinspace\pageref{comm}).
+version from one of the vendors (see the list on p.\thinspace\pageref{comm}).
+
 \subsection*{Creating and typesetting your document}
+
 \begin{enumerate}[noitemsep]\setlength{\fboxsep}{1pt}
-   \item Create your document using any suitable plain-text
-     editor with \LaTeX\ controls, eg \textit{\TeX shop}
-     (Mac), \textit{\TeX Maker} (Win), \textit{Kile}
-     (Linux), \textit{Emacs} (all), even
-     \textit{vi}\thinspace!
+   \item Create your document using any suitable plain-text editor
+     with \LaTeX\ controls, eg \textit{\TeX shop} (Mac), \textit{\TeX
+       Maker} (Win), \textit{Kile} (Linux), \textit{Emacs} (all),
+     even \textit{vi}\thinspace!
    \item Save the file with a name ending in \verb+.tex+
      (\emph{never} use spaces in filenames!);
-   \item Use the {\small\keys{Build}} or
-     {\small\keys{Compile}} toolbar button or menu item in
-     your editor to typeset and display the
-     document;\label{typeset}
-   \item Make any changes needed in your original document
-     and repeat step \ref{typeset}.
+   \item Use the {\small\keys{Build}} or {\small\keys{Compile}}
+     toolbar button or menu item in your editor to typeset and display
+     the document;\label{typeset}
+   \item Make any changes needed in your original document and repeat
+     step \ref{typeset}.
 \end{enumerate}
-\subsection*{Syntax (how to type \LaTeX\ commands --- these
-  are the rules)}
+
+\subsection*{Syntax (how to type \LaTeX\ commands --- these are the rules)}
+
 \begin{itemize}[noitemsep]
-  \item \textbf{All \LaTeX\ commands begin with a
-    backslash}.\\ \example
-    \verb+\tableofcontents+\endexample
-  \item \textbf{If a command needs text to work with, it
-    goes in curly braces}.\\ \example
-    \verb+\title{Irisches Tagebuch}\author{Heinrich Böll}+\endexample
-  \item \textbf{If options are used, they go in square
-    brackets before the curly braces}.\\ \example
-    \verb+\documentclass[a4paper,11pt]{book}+\endexample
-  \item \textbf{Spaces after commands \emph{without} braces
-    get suppressed}.\\ \example
-    \verb+Copyright \copyright␣+\texttt{\number\year}
-    \gives{Copyright ©\number\year} \nobox\\ To prevent
-    this, put empty curly braces after the
-    command:\\ \example
-    \verb+Copyright \copyright{}␣+\texttt{\number\year}
+  \item \textbf{All \LaTeX\ commands begin with a backslash}.\\
+    \example \verb+\tableofcontents+\endexample
+  \item \textbf{If a command needs text to work
+    with, it goes in curly braces}.\\
+    \example \verb+\title{Irisches Tagebuch}\author{Heinrich Böll}+\endexample
+  \item \textbf{If options are used, they go in square brackets
+  before the curly braces}.\\
+    \example \verb+\documentclass[a4paper,11pt]{book}+\endexample
+  \item \textbf{Spaces after commands \emph{without} braces get suppressed}.\\
+    \example \verb+Copyright \copyright␣+\texttt{\number\year}
+    \gives{Copyright ©\number\year} \nobox\\
+    To prevent this, put empty curly braces after the command:\\
+    \example \verb+Copyright \copyright{}␣+\texttt{\number\year}
     \gives{Copyright ©~\number\year} \yesbox
-  \item \textbf{Curly braces are also used to restrict the
-    scope of effects inside them}.\\ \example
-    \verb+Some {\tiny little} word+ \gives{Some {\tiny
-        little} word}
+  \item \textbf{Curly braces are also used to restrict the scope of
+    effects inside them}.\\
+    \example \verb+Some {\tiny little} word+ \gives{Some {\tiny little} word}
 \end{itemize}
 \begin{note}
-This guide shows only a tiny fraction of \LaTeX's power. For
-more information, visit the \TeX\ Users Group site
-(\url{www.tug.org}). For help, see the FAQ
-(\url{www.tex.ac.uk/faq}), StackExchange
+This guide shows only a tiny fraction of \LaTeX's power. For more
+information, visit the \TeX\ Users Group site (\url{www.tug.org}). For
+help, see the FAQ (\url{www.tex.ac.uk/faq}), StackExchange
 (\url{tex.stackexchange.com}), or the Usenet newsgroup
 \url{comp.text.tex}. For packages (plugins), use CTAN, the
-Comprehensive \TeX\ Archive Network
-(\url{www.ctan.org}). For further details, see
-\citetitle{fi} \parencite{fi} and other online resources.
+Comprehensive \TeX\ Archive Network (\url{www.ctan.org}). For
+further details, see \citetitle{fi}
+\parencite{fi} and other online resources.
 \end{note}
+
 \begin{multicols}{2}\small\parskip4pt
 \subsection*{Writing a \LaTeX\ document}
 \subsubsection{Basic document structure}
+
 Here's the skeleton of a \LaTeX\ document. These three lines are
 \textsc{compulsory}: your document will not work without them:
+
 \begin{Verbatim}[frame=single,fontsize=\small,commandchars=!<>]
 !added\documentclass[11pt]{article}
 !comment your Preamble goes here (extra setups, if any)
@@ -90,21 +90,20 @@ Here's the skeleton of a \LaTeX\ document. These three lines are
 !added\end{document}
 \end{Verbatim}
 \vspace*{-.5\baselineskip}
-{\fontsize67\selectfont\sffamily New material in each example is
-shown in {\ttfamily\added blue}; material from previous examples
-is in black. Comments and mnemonics are in
-\textcolor{DarkRed}{red}.\par}
+{\fontsize67\selectfont\sffamily New material in each example is shown
+in {\ttfamily\added blue}; material from previous examples is in
+black. Comments are in \textcolor{DarkRed}{red}.\par}
+
 \begin{itemize}[noitemsep]
-  \item The document class name \textsc{must} be one of the
-    standard \verb+book+, \verb+article+, or \verb+report+,
-    or one of the many others preinstalled or downloadable
-    (eg \verb+thesis+, \verb+memoir+, etc);
-  \item There are body type size options \verb+10pt+ (the
-    default), \verb+11pt+, and \verb+12pt+;
-  \item There are paper size options including
-    \verb+a4paper+ (210\thinspace mm$\times$297\thinspace
-    mm) and \verb+letterpaper+ (8½$''\times$11$''$) [see
-      below].
+  \item The document class name \textsc{must} be one of the standard
+    \verb+book+, \verb+article+, or \verb+report+, or one of the many
+    others preinstalled or downloadable (eg \verb+thesis+,
+    \verb+memoir+, etc);
+  \item There are body type size options \verb+10pt+ (the default),
+    \verb+11pt+, and \verb+12pt+;
+  \item There are paper size options including \verb+a4paper+
+    (210\thinspace mm$\times$297\thinspace mm) and \verb+letterpaper+
+    (8½$''\times$11$''$) [see below].
 \end{itemize}
 
 \subsubsection{Front matter}
@@ -236,7 +235,7 @@ summary of common commands at\\
 and a comprehensive list at
 \url{www.eeng.dcu.ie/local-docs/latex-help/}~.
 \end{minipage}}
-\columnbreak
+
 \paragraph{Tables and figures:}
 These environments \textbf{float} (to fit
 available space). They have \verb+\caption+ and \verb+\label+ commands.
@@ -308,16 +307,14 @@ with more complex table formats.
 \begin{center}\sffamily
   \textbf{Figure 1}: \textit{Swiss and Dutch Mennonite migrations of the
     1700s and 1800s}\\[3pt]
-  \ifafive\includegraphics[width=.8\columnwidth]{menno-a}\fi
-  \iflegal\includegraphics[width=.7\columnwidth]{menno-a}\fi
-  \\\scriptsize
+  \includegraphics[width=.8\columnwidth]{menno-a}\\\scriptsize
   Courtesy of Paul C. Adams, Department of Geography
   and the Environment, University of Texas at Austin. [1]
 \end{center}
 
 \begin{multicols}{2}\small\parskip4pt
 \paragraph{Typefaces:}
-{\ff{lrm}\selectfont The default typeface in \LaTeX\ is Computer
+{\fontfamily{lrm}\selectfont The default typeface in \LaTeX\ is Computer
   Modern, like this.}
 
 {\footnotesize\tabcolsep4pt
@@ -364,15 +361,15 @@ Monospace&tt&\ttfamily\\
 \end{tabular}}
 
 \begingroup\small
-\example\verb+\textit{\textbf{\textsf+\ifafive\linebreak\fi
-\verb+{bold+ \iflegal\linebreak\fi\verb+italic sans}}}+
+\example\verb+\textit{\textbf{\textsf+\linebreak
+\verb+{bold italic sans}}}+
 \gives{\ff{cmss}\textit{\textbf{bold italic sans}}}
 \par\endgroup
 
-Sizes for titles, headings, footnotes, etc are automatic, but
-there are some step-sizes:
+Font sizing is automatic for titles, headings, and footnotes. There
+are named step-size commands if you need them:
 
-{\scriptsize\centering
+{\scriptsize
 \begin{tabular}{>{\ttfamily\char'134}lrrr}
 normalsize&10&11&12\\\hline\vrule height1.1em width0pt
 tiny&5&6&7\\
@@ -387,10 +384,10 @@ Huge&20\rlap*&24\rlap*&28\rlap*\\
 \end{tabular}
 \quad
 \rotatebox[origin=c]{90}{\tiny* sizes rounded here to save space}
-\par}
+}
 
 For other sizes, add the special command
-{\added\verb+\RequirePackage{fix-cm}+}\iflegal\linebreak\fi \emph{before} the
+{\added\verb+\RequirePackage{fix-cm}+} \emph{before} the
 \verb+\documentclass+ line and use
 {\added\verb+\fontsize{+\texttt{\uline{pp}}\verb+}{+\texttt{\uline{bb}}\verb+}\selectfont+}
 for the point-size (\textit{pp}) and baseline
@@ -404,9 +401,9 @@ For double or 1½ line-spacing (eg in theses) use the \textsf{setspace}
 package.
 
 You can use colour palettes in the RGB, CMYK, HTML, and other
-colourspaces with \iflegal\\\fi the \textsf{xcolor} \ifafive\\\fi
-package and the\hfil
-\smash{\raisebox{0ex}{\sffamily\bfseries\Huge\iflegal\quad\else\enspace\fi
+colourspaces with the
+\textsf{xcolor} \\package and the\hfil
+\smash{\raisebox{-2ex}{\sffamily\bfseries\Huge\qquad
 \textcolor[HTML]{2F50AD}{G}%
 \textcolor[HTML]{B32F17}{o}%
 \textcolor[HTML]{F3C20B}{o}%
@@ -417,14 +414,14 @@ package and the\hfil
 
 For verbatim text, use the \verb+\verb+ command or the
 \textsf{verbatim} environment, or (better) the \textsf{listings} or
-\textsf{fancyvrb} packages.
+\textsf{fancyvrb} packages, which allow context-sensitive formatting.
 
-\paragraph{Footnotes:}
-You do footnotes with \iflegal\\\fi \verb+\footnote(like this}+.\footnote{Like
+\paragraph{Footnotes}\setcounter{footnote}{0}
+You can do footnotes with \verb+\footnote(like this}+.\footnote{Like
   this.} Endnotes too.
 
 \paragraph{Cross-references:}\label{blah} Use the command
-\verb+\label{...}+ to label the target, and \verb+\ref{...}+ or
+\verb+\label{...}+ to add a label to the target, and \verb+\ref{...}+ or
 \verb+\pageref{...}+ to refer to it. Make up the labels yourself.
 
 \begingroup\small
@@ -435,7 +432,8 @@ You do footnotes with \iflegal\\\fi \verb+\footnote(like this}+.\footnote{Like
 
 \paragraph{Citation and reference:} Create your bibliographic database
 in BIB\TeX\ format \parencite{bibtex} using \emph{JabRef} or
-similar. Each entry \textsc{must} have a unique label (here `\verb+fi+'):
+similar. Each entry \textsc{must} have a unique label
+(here `\verb+fi+'):\par\vspace{-\parskip}
 \begin{Verbatim}[frame=single,fontsize=\scriptsize,commandchars=!<>]
 !added@book{fi,
 !added  title = {Formatting Information},
@@ -443,13 +441,15 @@ similar. Each entry \textsc{must} have a unique label (here `\verb+fi+'):
 !added  publisher = {Silmaril},
 !added  year = {2016}}
 \end{Verbatim}
+\par\vspace{-\parskip}
 Use the
 \textsf{biblatex} package to specify the style, and give
-the filename of your database:
+the filename of your database:\par\vspace{-\parskip}
 \begin{Verbatim}[frame=single,fontsize=\footnotesize,commandchars=!<>]
 !added\usepackage[style=apa]{biblatex}
 !added\addbibresource{myrefs.bib}
 \end{Verbatim}
+\par\vspace{-\parskip}
 To cite, use \verb+\cite{...}+ (or
 \verb+\textcite+ or \verb+\parencite+) with the relevant label:\\ \example{\verb+\textcite{fi}+}\gives{\textcite{fi}}.
 
@@ -469,3 +469,4 @@ Silmaril at \url{latex@silmaril.ie}
 \end{multicols}
 \end{document}
 
+