universa (29aug19)

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

2 files changed, 474 insertions, 397 deletions

diff --git a/Master/texmf-dist/source/fonts/universa/uni.dtx b/Master/texmf-dist/source/fonts/universa/universa.dtx
index e17f68a4434..b90c69e5172 100644
--- a/Master/texmf-dist/source/fonts/universa/uni.dtx
+++ b/Master/texmf-dist/source/fonts/universa/universa.dtx
@@ -1,14 +1,18 @@
-%\iffalse
+% \iffalse
+%<*(package|oml|oms|ot1|t1|u)>
+\def\unifileversion{v2.1}
+\def\unifiledate{2019/08/26}
+%</(package|oml|oms|ot1|t1|u)>
+% \fi
+% \iffalse
 %<*driver>
 \documentclass{ltxdoc}
 \usepackage{unidoc,latexsym}
-%\OnlyDescription %For short description of font and package.
-\AlsoImplementation %For full description of font and package.
-\title{The \universal{} Font\\ \normalsize{Version 2.0}}
-\author{Christian Holm\thanks{Niels Bohr Institute of Physics, 
-  Institute of Philosophy, Rethorics, and Education; University
-   of Copenhagen; Denmark; E--mail: \texttt{<cholm@nbi.dk>}}}
-\date{August 1 1998}
+\OnlyDescription %For short description of font and package.
+% \AlsoImplementation %For full description of font and package.
+\title{The \universal{} Font\\ \normalsize{Version \unifileversion}}
+\author{Christian Holm\thanks{E--mail: \texttt{<cholmcc@gmail.com>}}}
+\date{\unifiledate}
 \begin{document}
 \maketitle
 \begin{abstract}
@@ -20,7 +24,251 @@
   and also the source code for the characters of the font.
 \end{abstract}
 \tableofcontents
-\DocInput{uni.dtx}
+\DocInput{universa.dtx}
+\appendix
+
+\section{Solution to the \Lcs{bauhausforms} problem}
+\label{app:solu}
+
+\subsection{The Problem}
+This I owe to Joseph Collins \texttt{<collins@ARL.MIL>}.
+
+During the preperation of version~1.0 of this font, I was loosing
+sleep over what I chose to call `The \Lcs{bauhausforms}
+problem', after the problems the symbol \textuni{\bauforms} gave
+me. 
+
+As can be seen from the symbol, the idea is to make a figure out of
+a circle, a square, and a triangle. From these three figures you can
+ofcourse make infinitly many figures, even though the sizes are
+limited. The particular combination of the three figures I was
+looking, first seemed simple\footnote{And after having seen Mr.\
+Collins solution, it did again.}, but turned out to be
+difficult. What I wanted to do was (see also
+figure~\ref{fig:bauforms}):
+\begin{quote}
+  Take a circle of some radius (e.g., 1). Inside this circle draw a
+  isosceles triangle $\bigtriangleup ABC$, with all vertices on the
+  circle, The singular vertice $A$ placed on the horizontal line
+  traveling left from the center of the circle.
+
+  Now draw a square $\Box PQRS$ inside of the circle, having two
+  vertices on the circle, and two on the triangle.
+
+  The wanted triangle and square are such that, the opposing side of
+  the singular vertice $|BC|$ should divede the square into to equal
+  oblongs, i.e., intersect $|PQ|$ midway between $P$ and $Q$.
+\end{quote}
+
+\begin{figure}[htbp]
+  \centering
+  \beginillu
+    \setlength{\unitlength}{.05\textwidth}
+    \begin{picture}(10,10)
+      \thinlines
+      \put(-1,5){\line(1,0){12}}
+      \put(5,-1){\line(0,1){12}}
+      \thicklines
+      \put(5,5){\circle{10}}
+      \put(0,5){\line(100,74){6.521}}
+      \put(0,5){\line(100,-74){6.521}}
+      \put(6.4330,0.2097){\line(0,1){9.5805}}
+      \put(3.6873,7.7457){\line(1,0){5.4914}}
+      \put(3.6873,2.2543){\line(1,0){5.4914}}
+      \put(3.6873,2.2543){\line(0,1){5.4914}}
+      \put(9.1787,2.2543){\line(0,1){5.4914}}
+      \put(0,5){\mbox{$A$}}
+      \put(6.4330,0.2097){\mbox{$B$}}
+      \put(6.4330,5){\mbox{$B^\prime$}}
+      \put(6.4330,9.7903){\mbox{$C$}}
+      \put(3.6873,2.2543){\mbox{$P$}}
+      \put(3.6873,5){\mbox{$P^\prime$}}
+      \put(9.1787,2.2543){\mbox{$Q$}}
+      \put(9.1787,5){\mbox{$Q^\prime$}}
+      \put(9.1787,7.7457){\mbox{$R$}}
+      \put(3.6873,7.7457){\mbox{$S$}}
+      \put(5,5){\mbox{$O$}}
+      \put(0,5){\arc{1}{0}{0.6401}}
+      \put(0,4.5){\mbox{$\varphi$}}
+    \end{picture}
+  \illuother
+    \begin{tabular}{%
+    @{\vline\extracolsep{1em}\space}%
+    p{.8\textwidth}%
+    @{\space\vline}}
+      \hline
+      Since you are processing this document without the
+      \textsf{eepic} package, you will not see the illustration
+      otherwise here. To compensate, I will give you a short
+      description on how to draw the figure yourself.
+      
+      Take out some paper, a pencil, compasses, and a ruler. Now
+      draw a circle of some radius $r$, with its center in origo of
+      a Cartisean coordinate system. In the next subsection, you
+      will find the coordinates for points $A,B,C,O,P,Q,R,$ and $S$
+      expressed in terms of $x,y,$ and $h$. You will also find the
+      correct values for $x,y,h$ in that section. Multiply those
+      values with $r$, and plot the points above in the coordinate
+      system. Draw the triangle $\bigtriangleup ABC$, and the square
+      $\Box PQRS$, and --- voila, you have the  illustration.\\
+      \hline
+    \end{tabular}
+  \endillu
+  \caption{The \Lcs{bauforms} problem.}\label{fig:bauforms}
+\end{figure}
+
+This shouldn't be to difficult, should it. Well I didn't think so,
+but after many late evenings with pen, paper, ruler, compasses, and
+heavy use of trigonometric relations, I found out that the half
+$\varphi$ of the singular vertice should obey:
+\begin{eqnarray}
+0 &=& \sin \left( \cos^{-1} \left( \frac{\cos2\varphi}{\sqrt{2}}
+        \right) \right) - \frac{\cos2\varphi}{\sqrt{2}}\nonumber\\
+& & - 2\sqrt{2}
+      \frac{\cos\varphi^2\sin\varphi}{\cos\varphi+\sin\varphi}
+      \nonumber  
+\end{eqnarray}
+Now I dare you to find the exact solution to that.
+
+Using numerical methodes (Newton's method), was ofcourse no
+problem, and gave satesfactory resualt. If the expression on the
+right above is labelled $f$, $f^\prime$ is:
+\begin{eqnarray}
+f^\prime &=& \frac{\sin4\varphi}{2\sqrt{\frac{3-\cos4\varphi}{4}}}
+   + \sqrt{2}\sin2\varphi\nonumber\\
+& & - \frac{2\sqrt{2}\cos\varphi}{\cos\varphi+\sin\varphi^2}
+      \left( \left( \cos\varphi+\sin\varphi \right)
+         \left( \cos^2\varphi-2\sin^22\varphi \right)\right. \nonumber\\ 
+& & - \quad \left.\left( \cos\varphi-\sin\varphi \right)
+         \cos^2\varphi\sin\varphi \right) \nonumber
+\end{eqnarray}
+Using these expressions for $f$ and $f^\prime$ in a \textsf{Fortran}
+program, I reached resaults close to what Mr.\ Collins found.
+
+\subsection{Joseph Collins' Solution}
+
+In Mr.\ Collins notation, the points on figure~\ref{fig:bauforms}
+has the following coordinates:
+\begin{eqnarray*}
+  A = (0,-1)  & B^\prime = (x,0)   & C = (x,y)\\
+  O = (0,0)   & P^\prime = (x-h,0) & Q^\prime = (x+h,0)\\
+  R = (x+h,h) & S = (x-h,h) & \\
+\end{eqnarray*}
+Below is what Mr.\ Collins wrote me --- thank you very much.
+
+On the unit circle
+\begin{equation}\label{eq:uc}
+  x^2 + y^2 = 1
+\end{equation}
+we have the vertices of a triangle at $(-1,0)$, $(x,y)$, and
+$(x,-y)$. A square has four vertices $(x \pm h, \pm h)$, where the
+two points $(x-h, \pm h)$ lie on the triangle (constraint A) and the
+two points $(x+h, \pm h)$ lie on the circle (constraint B).  Thus,
+the vertical side of the triangle bisects the square.  From
+constraint A, upon consideration of similar triangles, we have
+$$\frac{y}{1+x} = \frac{h}{1+x-h}, \quad \mbox{so that}\quad
+  h =  \frac{(1+x) y }{1+x+y}.$$
+By (\ref{eq:uc}), this is
+\begin{equation} \label{eq:b1}
+  h = \frac{(1+x)\sqrt{1-x^2}}{1+x+\sqrt{1-x^2}} .
+\end{equation}
+From constraint B, we get
+\begin{equation} \label{eq:b2}
+  (x+h)^2 + h^2 = 1  .
+\end{equation}
+Any simultaneous solution of (\ref{eq:b1}) and (\ref{eq:b2}) is also a
+solution of
+\begin{equation}\label{eq:eqn}
+  8x^3 - 4x^2 - 3x + 1 = 0,
+\end{equation}
+the relevant solution being
+\begin{equation}  \label{eq:sol}
+  x = \frac16 + \sqrt{\frac{11}{18}} \sin
+  \left[ \frac{\pi}{6}
+    - \frac13 \arctan\left(\frac{3\sqrt{237}}{23}\right) \right].
+\end{equation}
+Equation (\ref{eq:eqn}) and solution (\ref{eq:sol}) courtesy of
+Mathematica. We get $y$ and $h$ from (\ref{eq:uc}) and
+(\ref{eq:b1}), respectively. The angle at $(-1,0)$ is $\varphi = 2
+\arctan\bigl(y/(1+x)\bigr)$. 
+
+Approximate values are
+\begin{eqnarray*}
+  x &\simeq& 0.2865914\\
+  y &\simeq&  0.9580529\\
+  h &\simeq& 0.5491394 \\
+  \varphi &\simeq&  1.280129 \ ( \simeq  73.346^o)
+\end{eqnarray*}
+
+\section{Copyrights --- GNU General Public Lisence}
+\label{app:ggpl}
+
+This \MF{} implementation of the ``universal'' font and the \LaTeX{}
+support package ``uni'' copyright \copyright{} 1998  Christian Holm.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version. 
+
+This program is distributed in the hope that it will be useful, but
+\textsc{without any warranty}; without even the implied warranty 
+of \textsc{merchantability} or \textsc{fitness for a particular
+purpose}. See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to
+\begin{quote}
+  The Free Software Foundation, Inc.\\
+  675 Mass Ave\\
+  Cambridge\\
+  MA 02139\\
+  USA
+\end{quote}
+
+See the file \texttt{copyright} in the distribution for the complete
+GNU General Public License.
+
+\section{Wishlist}
+
+Below is a list of things I would like to do with the font and
+package. If anyone has any suggestions, ready--made code, or new
+ideas, please let me know.
+
+If you would like to take on one or more of the tasks presented
+below, please do so, but send me a note so that I may coordinate
+with my own efforts, and perhaps have a constructive dicourse.
+
+I should however instruct you to read the \emph{complete}
+documentation of the package and font, since this may give some
+reasons why I have chosen a particular approach.
+
+\begin{itemize}
+\item Make the font an 8--bit encoded (256 characters) font,
+  conforming somewhat to the \texttt{T1} encoding of the Cork fonts.
+\item Making a package (perhaps \textsf{mfdoc}), to make
+  documentation of \MF{} sources, just like \textsf{doc} is fore
+  \LaTeX{} sources. This is ofcourse a independent project, and I
+  will proberly not work on it.
+\end{itemize}
+\clearpage
+\section{Font Charts}
+\label{app:charts}
+
+Below are some charts of the \universal{} font in different series
+and shapes (medium upright, slanted, small-caps, and strict, as well
+as bold upright, slanted, small caps, and strict), all in size \texttt{8pt}.
+
+\FontChart{fulmr8.mf}{medium, upright}
+\FontChart{fulmo8.mf}{medium, oblique}
+\FontChart{fulmc8.mf}{medium, small-caps}
+\FontChart{fulmst8.mf}{medium, strict}
+\FontChart{fulbr8.mf}{bold, upright}
+\FontChart{fulbo8.mf}{bold, oblique}
+\FontChart{fulbc8.mf}{bold, small-caps}
+\FontChart{fulbst8.mf}{bold, strict}
+
+\clearpage
 \end{document}
 %</driver>
 %<*copyright>
@@ -366,41 +614,8 @@ Public License instead of this License.
 
 %</copyright>
 %\fi
-% \CheckSum{1207}
-% \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         \~}
-
-% \CheckSum{1207}
-% \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         \~}
-% \def\fileversion{v2.0}
-% \def\filedate{98/08/01}
+% \def\fileversion{v2.1}
+% \def\filedate{2019/08/26}
 % \section{Introduction}
 % \changes{v1.0}{1997/17/24}{Creation of the \universal{} font}
 %
@@ -416,7 +631,7 @@ Public License instead of this License.
 % pages actually. Most of it is the programs for the characters for
 % this font, so if you don't know the \MF{} language, or don't care
 % how the charcters are created, you should insert
-% \Lcs{OnlyDescription} into the preamble of \texttt{uni.dtx}.
+% \Lcs{OnlyDescription} into the preamble of \texttt{universa.dtx}.
 %
 % Notice, that \MF{} macros are \emph{not} indexed in this
 % documentation. This is because it would take a \emph{major} rewrite
@@ -656,7 +871,7 @@ Public License instead of this License.
 % Below is a sample of each series/shape combination avaliable in this
 % implementation of the font, along with the \LaTeX{} commands that
 % drive them: 
-% 
+%
 % \begin{description}
 %   \item[\rm Medium upright (\Lcs{textuni}):]
 %     \textuni{The dazed brown fox quickly gave 1234-567890 jumps!} 
@@ -1235,14 +1450,26 @@ Public License instead of this License.
 % 
 % \subsubsection{Intilalizing}
 %
-% First we need to identify the package, its version and release 
-% date, etc.
+% First we need to identify the package, its version and release date,
+% etc.
+%
 %    \begin{macrocode}
-\def\fileversion{v2.0}
-\def\filedate{98/08/01}
-\ProvidesPackage{uni}[\filedate\space\fileversion\space universal
+\ProvidesPackage{uni}[\unifiledate\space\unifileversion\space universal
                           package.]
 %    \end{macrocode}
+%
+% \begin{macro}{\if@uni}
+% \begin{macro}{\@unifalse}
+% \begin{macro}{\@unitrue}
+% \begin{macro}{\if@strict}
+% \begin{macro}{\@strictfalse}
+% \begin{macro}{\@stricttrue}
+% \begin{macro}{\ifdef@ult}
+% \begin{macro}{\def@ultfalse}
+% \begin{macro}{\def@ulttrue}
+% \begin{macro}{\ifm@dium}
+% \begin{macro}{\m@diumfalse}
+% \begin{macro}{\m@diumtrue}
 % Then we setup some new \Lcs{if} commands, to help in different 
 % sitations, depending on options passed to the package etc.
 %    \begin{macrocode}
@@ -1250,9 +1477,20 @@ Public License instead of this License.
 \newif\ifstri@t\stri@tfalse
 \newif\ifdef@ult\def@ultfalse
 \newif\ifm@dium\m@diumfalse
-
 %    \end{macrocode}
-%
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% 
 % \subsubsection{Options}
 %    
 % We define some options that can be passed to the package.
@@ -1277,10 +1515,12 @@ Public License instead of this License.
 %
 % \begin{macro}{\uni@init}
 % \begin{macro}{\DeclareUniChar}
-% \Newestchanges{v2.0}{98/08/01}{Added for faster and more stable
+% \Newestchanges{v2.1}{2018/08/26}{Prevent expansion of as-of-yet not
+% defined arguments. Thanks to Scott Pakin.}
+% \changes{v2.0}{98/08/01}{Added for faster and more stable
 % loading of special charactes.}
 % \begin{macro}{\DeclareUniCommand}
-% \Newestchanges{v2.0}{98/08/01}{Added for faster and more stable
+% \changes{v2.0}{98/08/01}{Added for faster and more stable
 % decleration of \universal{} commands.}
 % \begin{macro}{\Declare@Uni}
 % \begin{macro}{\DeclareUni@xarg}
@@ -1377,7 +1617,7 @@ Public License instead of this License.
   \@ifundefined{\temp@}{%
     \edef\temp@c{{%
         \noexpand\if@uni\noexpand\aftergroup\temp@a\noexpand%
-        \else\noexpand\UniError{#1}\noexpand\fi}}}{%
+        \else\noexpand\UniError{\noexpand#1}\noexpand\fi}}}{%
     \edef\temp@b{\csname no@uni@\temp@\endcsname}
     \edef\temp@c{{%
       \noexpand\if@uni\noexpand\aftergroup\temp@a\noexpand%
@@ -1752,7 +1992,14 @@ Public License instead of this License.
 % \end{macro}
 % \end{macro}
 %
-% \paragraph{\texttt{default} Option Font} 
+% \paragraph{\texttt{default} Option Font}
+%
+% \begin{macro}{\ifdef@ult}
+% \begin{macro}{\def@ulttrue}
+% \begin{macro}{\def@ultfalse}
+% \begin{macro}{\ifm@dium}
+% \begin{macro}{\m@diumtrue}
+% \begin{macro}{\m@diumfalse}
 % Now if you gave the \texttt{default} option to the package,
 % \Lcs{ifdef@ult} evaluates to true, and so we setup the default font
 % to be \universal{}, in the medium or bold version, depending
@@ -1764,6 +2011,13 @@ Public License instead of this License.
   \else\renewcommand{\seriesdefault}{b}\fi
   \renewcommand{\itdefault}{sl}
 %    \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% 
 % \begin{macro}{\cmrfamily}
 % \begin{macro}{\cmrdefault}
 % \begin{macro}{\textcmr}
@@ -1816,7 +2070,7 @@ Public License instead of this License.
 %\fi
 %    \begin{macrocode}
 \ProvidesFile{omluni.fd}
-        [1998/08/01 v2.0 Non Standard LaTeX font definitions]
+  [\unifiledate\space\unifileversion\space Non Standard LaTeX font definitions]
 \DeclareFontFamily{OML}{uni}{\skewchar\font127 }
 \DeclareFontShape{OML}{uni}{m}{n}{<-> ssub * cmm/m/it}{}
 \DeclareFontShape{OML}{uni}{m}{it}{<-> ssub * cmm/m/it}{}
@@ -1841,7 +2095,7 @@ Public License instead of this License.
 %\fi
 %    \begin{macrocode}
 \ProvidesFile{omsuni.fd}
-        [1998/08/01 v2.0 Non Standard LaTeX font definitions]
+  [\unifiledate\space\unifileversion\space Non Standard LaTeX font definitions]
 \DeclareFontFamily{OMS}{uni}{\skewchar\font48 }
 \DeclareFontShape{OMS}{uni}{m}{n}{<-> ssub * cmsy/m/n}{}
 \DeclareFontShape{OMS}{uni}{m}{it}{<-> ssub * cmsy/m/n}{}
@@ -1868,7 +2122,7 @@ Public License instead of this License.
 %\fi
 %    \begin{macrocode}
 \ProvidesFile{ot1uni.fd}%
-  [1998/08/01 v2.0 Non standard LaTeX font definitions]
+  [\unifiledate\space\unifileversion\space Non Standard LaTeX font definitions]
 \DeclareFontFamily{OT1}{uni}{\hyphenchar\font45 }
   
 %    \end{macrocode}
@@ -2002,7 +2256,7 @@ Public License instead of this License.
 %\fi
 %    \begin{macrocode}
 \ProvidesFile{t1uni.fd}
-        [1998/08/01 v2.0 Non Standard LaTeX font definitions]
+  [\unifiledate\space\unifileversion\space Non Standard LaTeX font definitions]
 \typeout{WARNING: universal font not avaliable in t1 definition.}
 \typeout{WARNING: exiting, correct your source.}
 \stop
@@ -2019,7 +2273,7 @@ Public License instead of this License.
 %\fi
 %    \begin{macrocode}
 \ProvidesFile{uuni.fd}
-        [1998/08/01 v2.0 Non Standard LaTeX font definitions]
+  [\unifiledate\space\unifileversion\space Non Standard LaTeX font definitions]
 \DeclareFontFamiliy{U}{uni}{\hyphenchar\font45}
 \DeclareFontShape{U}{uni}{m}{n}{
   <5><6><7><8>fulmr8
@@ -2357,8 +2611,13 @@ enddef ;
 % or \textunibf{''}, since we make these up of two \textunibf{`} or
 % \textunibf{'}. This gives us two more slots we can put other
 % characters into.
+%
+% Note, we preface the definition by \texttt{inner bye} so that we can
+% use this macro inside other macros (Kudo's to \TeX{}Live
+% developers).
+% 
 %    \begin{macrocode}
-inner bye;  % so we can use it inside a macro
+inner bye;     
 def end_font =
   ligtable "u" : "h" kern u# ;
   ligtable "f" : "f" kern 0 , "l" kern 0 , "i" kern 0 ;
@@ -2376,7 +2635,7 @@ def end_font =
     "l" kern -3c_d#*cosd(15)-p_t#*sind(15)-l_s#-r_s# ,
     "L" kern -3c_d#*cosd(15)-p_t#*sind(15)-l_s#-r_s# ;
   bye
-enddef;
+enddef ;
 
 %    \end{macrocode}
 % \end{fontmacro}
@@ -5124,23 +5383,48 @@ end_font;
 % First we need to identify the package, its version and release 
 % date, etc.
 %    \begin{macrocode}
-\def\fileversion{v2.0}
-\def\filedate{98/08/01}
-\ProvidesPackage{unidoc}[\filedate\space\fileversion\space universal
-                         documenation package.]
+\ProvidesPackage{unidoc}
+  [\unifiledate\space\unifileversion\space universal documenation package.]
 %    \end{macrocode}
+%
+% \begin{macro}{\ifeepic}
+% \begin{macro}{\eepictrue}
+% \begin{macro}{\eepicfalse}
+%
+% In case we can load the package \textsf{eepic}, we will set
+% \cs{eepictrue}, and make a plot of the shapes problem.
+%
+%    \begin{macrocode}
+\newif\ifeepic\eepicfalse
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
 % Then we load some pacakges needed. \textsf{doc} is ofcourse needed
 % to do all the actual typesetting of macros etc., while \textsf{uni}
 % is needed for the fonts\footnote{This means ofcourse, that you
 % needed to have all the \MF{} sources ready, or in other words, you
-% should have run \texttt{uni.ins} through \LaTeX{}.}, and finally
-% \textsf{mflogo} is needed for the \MF{} logo.
+% should have run \texttt{universa.ins} through \LaTeX{}.}, and
+% finally \textsf{mflogo} is needed for the \MF{} logo.
+% 
 %    \begin{macrocode}
-\newif\ifeepic\eepicfalse
 \DeclareOption*{\PassOptionsToPackage{\CurrentOption}{uni}}
 \ProcessOptions\relax
 \RequirePackage{doc}
 \RequirePackage{mflogo}
+\RequirePackage[colorlinks,%
+                linkcolor=red,%
+                anchorcolor=black,%
+                citecolor=green,%
+                filecolor=black,%
+                menucolor=black,%
+                urlcolor=blue,%
+                hyperindex,%
+                linktocpage,%
+                pdfduplex=duplexFlipLongEdge,%
+                a4paper,%
+                bookmarks=true]{hyperref}
 \RequirePackage{uni}
 \IfFileExists{eepic.sty}{%
   \RequirePackage{eepic}\eepictrue}{%
@@ -5231,6 +5515,7 @@ end_font;
 % \begin{macro}{\fontcode}
 % \begin{macro}{\endfontcode}
 % \begin{macro}{\FontCodeFont}
+% \begin{macro}{\PrintFontName}
 % Next comes two environments for descriping the font programs, and
 % font macros. They are similar to the environment \texttt{macro} in
 % the \texttt{doc} package. However, some alterations is made, so that
@@ -5260,6 +5545,8 @@ end_font;
 % \end{macro}
 % \end{macro}
 % \end{macro}
+% \end{macro}
+% 
 % \begin{macro}{\fontmacro}
 % \begin{macro}{\endfontmacro}
 % This is similar to \texttt{fontcode} environment, but is used to
@@ -5281,13 +5568,19 @@ end_font;
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
+%
+% \begin{macro}{\illubegin}
+% \begin{macro}{\illuother}
+% \begin{macro}{\endillu}
 %    \begin{macrocode}
 \let\beginillu\ifeepic
 \let\illuother\else
 \let\endillu\fi
-
 %    \end{macrocode}
-%
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% 
 % \subsection{Useful Commands}
 % 
 % \begin{macro}{\Newestchanges}
@@ -5407,6 +5700,7 @@ end_font;
 
 %    \end{macrocode}
 % \end{macro}
+% 
 % \begin{macro}{\morechart}
 % This macro is called every time we need to typeset a new double line
 % of the chart.
@@ -5418,6 +5712,7 @@ end_font;
 
 %    \end{macrocode}
 % \end{macro}
+% 
 % \begin{macro}{\chartline}
 % \begin{macro}{\chartstrut}
 % \Lcs{chartline} is called every time we need to typeset a line of
@@ -5430,6 +5725,7 @@ end_font;
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
+% 
 % \begin{macro}{\:}
 % \begin{macro}{\reposition}
 % \begin{macro}{\centerlargechars}
@@ -5475,6 +5771,7 @@ end_font;
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
+%
 % Finally we get to the \emph{real} macro. This macro takes one
 % argument, the name of the \meta{font driver file}. We put the chart
 % inside a \texttt{figure} environment, so that we may refer to it
@@ -5482,15 +5779,17 @@ end_font;
 % file}. The chart is encapsulated in a group, so that the definition
 % of \Lcs{chart@font} doesn't get in the way elsewhere in the document.
 %    \begin{macrocode}
-\def\FontChart#1{
+\def\FontChart#1#2{
 %%   \marginpar{\small\raggedright Letters and symbols in \texttt{#1} 
 %%      font.} 
-  \begin{figure}
+  \begin{figure}[htbp]
     \begingroup
       \font\chart@font=#1
       \chart@font
       \chart
-   \endgroup
+      \endgroup
+    \caption{Letters and symbols in \texttt{#1} --- #2}
+    \label{fig:font:#1}
 \end{figure}}
 
 %    \end{macrocode}
@@ -5546,7 +5845,11 @@ end_font;
   \small,\smash,\space,\special@index,\SpecialMainIndex,\stop,\string,%
   \strut,\tabskip,\TeX,\TeXbook,\textit,\textsf,\textsl,\texttt,\the,%
   \thepage,\tt,\typeout,\unhbox,\universal,\upshape,\usefont,\vbox,%
-  \vcenter,\vrule,\write,\xdef,\z@}
+  \vcenter,\vrule,\write,\xdef,\z@,\PackageError,\PackageWarning,
+  \PassOptionsToPackage,\GlossaryPrologue,\',\0,\1,\bfseries,
+  \centerlargechars,\DeclareRobustCommand,\DeclareTextFontCommand,
+  \ExecuteOptions,\familydefault,\fontencoding,\fontfamily,\hex,\oct,
+  \IndexPrologue,\oddline}
 
 %    \end{macrocode}
 % And then we define the behaviour of the \textsf{doc} package, by
@@ -5559,265 +5862,37 @@ end_font;
 \RecordChanges
 \CheckModules
 \marginparwidth=54pt
+%    \end{macrocode}
+%
+% \begin{macro}{\NFSS}
+% \begin{macro}{\ftnguide}
+% \begin{macro}{\clsguide}
+% \begin{macro}{\MFbook}
+% \begin{macro}{\universal}
+%
+% Some utility macros used in the documentation.
+% 
+%    \begin{macrocode}
 \newcommand{\NFSS}{\textsf{NFSS}}
 \newcommand{\ftnguide}{\textit{\LaTeXe{} Font Selection}}
-\newcommand{\clsguide}{
-  \textit{\LaTeXe{} for Class and Packages Writers}}
-\newcommand{\TeXbook}{\TeX\textsf{book}}
+\newcommand{\clsguide}{ \textit{\LaTeXe{} for Class and Packages
+    Writers}} \newcommand{\TeXbook}{\TeX\textsf{book}}
 \newcommand{\MFbook}{\MF\textsf{book}}
 \newcommand{\universal}{\textunibf{universal}}
 
 %    \end{macrocode}
-%\iffalse
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% %\iffalse
 %</docpackage>
 %\fi
 % \Finale
-% \appendix
-%
-% \section{Solution to the \Lcs{bauhausforms} problem}
-% \label{app:solu}
-%
-% \subsection{The Problem}
-% This I owe to Joseph Collins \texttt{<collins@ARL.MIL>}.
-%
-% During the preperation of version~1.0 of this font, I was loosing
-% sleep over what I chose to call `The \Lcs{bauhausforms}
-% problem', after the problems the symbol \textuni{\bauforms} gave
-% me. 
-%
-% As can be seen from the symbol, the idea is to make a figure out of
-% a circle, a square, and a triangle. From these three figures you can
-% ofcourse make infinitly many figures, even though the sizes are
-% limited. The particular combination of the three figures I was
-% looking, first seemed simple\footnote{And after having seen Mr.\
-% Collins solution, it did again.}, but turned out to be
-% difficult. What I wanted to do was (see also
-% figure~\ref{fig:bauforms}):
-% \begin{quote}
-%   Take a circle of some radius (e.g., 1). Inside this circle draw a
-%   isosceles triangle $\bigtriangleup ABC$, with all vertices on the
-%   circle, The singular vertice $A$ placed on the horizontal line
-%   traveling left from the center of the circle.
-%
-%   Now draw a square $\Box PQRS$ inside of the circle, having two
-%   vertices on the circle, and two on the triangle.
-%
-%   The wanted triangle and square are such that, the opposing side of
-%   the singular vertice $|BC|$ should divede the square into to equal
-%   oblongs, i.e., intersect $|PQ|$ midway between $P$ and $Q$.
-% \end{quote}
-%
-% \begin{figure}[htbp]
-%   \centering
-%   \beginillu
-%     \setlength{\unitlength}{.05\textwidth}
-%     \begin{picture}(10,10)
-%       \thinlines
-%       \put(-1,5){\line(1,0){12}}
-%       \put(5,-1){\line(0,1){12}}
-%       \thicklines
-%       \put(5,5){\circle{10}}
-%       \put(0,5){\line(100,74){6.521}}
-%       \put(0,5){\line(100,-74){6.521}}
-%       \put(6.4330,0.2097){\line(0,1){9.5805}}
-%       \put(3.6873,7.7457){\line(1,0){5.4914}}
-%       \put(3.6873,2.2543){\line(1,0){5.4914}}
-%       \put(3.6873,2.2543){\line(0,1){5.4914}}
-%       \put(9.1787,2.2543){\line(0,1){5.4914}}
-%       \put(0,5){\mbox{$A$}}
-%       \put(6.4330,0.2097){\mbox{$B$}}
-%       \put(6.4330,5){\mbox{$B^\prime$}}
-%       \put(6.4330,9.7903){\mbox{$C$}}
-%       \put(3.6873,2.2543){\mbox{$P$}}
-%       \put(3.6873,5){\mbox{$P^\prime$}}
-%       \put(9.1787,2.2543){\mbox{$Q$}}
-%       \put(9.1787,5){\mbox{$Q^\prime$}}
-%       \put(9.1787,7.7457){\mbox{$R$}}
-%       \put(3.6873,7.7457){\mbox{$S$}}
-%       \put(5,5){\mbox{$O$}}
-%       \put(0,5){\arc{1}{0}{0.6401}}
-%       \put(0,4.5){\mbox{$\varphi$}}
-%     \end{picture}
-%   \illuother
-%     \begin{tabular}{%
-%     @{\vline\extracolsep{1em}\space}%
-%     p{.8\textwidth}%
-%     @{\space\vline}}
-%       \hline
-%       Since you are processing this document without the
-%       \textsf{eepic} package, you will not see the illustration
-%       otherwise here. To compensate, I will give you a short
-%       description on how to draw the figure yourself.
-%       
-%       Take out some paper, a pencil, compasses, and a ruler. Now
-%       draw a circle of some radius $r$, with its center in origo of
-%       a Cartisean coordinate system. In the next subsection, you
-%       will find the coordinates for points $A,B,C,O,P,Q,R,$ and $S$
-%       expressed in terms of $x,y,$ and $h$. You will also find the
-%       correct values for $x,y,h$ in that section. Multiply those
-%       values with $r$, and plot the points above in the coordinate
-%       system. Draw the triangle $\bigtriangleup ABC$, and the square
-%       $\Box PQRS$, and --- voila, you have the  illustration.\\
-%       \hline
-%     \end{tabular}
-%   \endillu
-%   \caption{The \Lcs{bauforms} problem.}\label{fig:bauforms}
-% \end{figure}
-% 
-% This shouldn't be to difficult, should it. Well I didn't think so,
-% but after many late evenings with pen, paper, ruler, compasses, and
-% heavy use of trigonometric relations, I found out that the half
-% $\varphi$ of the singular vertice should obey:
-% \begin{eqnarray}
-% 0 &=& \sin \left( \cos^{-1} \left( \frac{\cos2\varphi}{\sqrt{2}}
-%         \right) \right) - \frac{\cos2\varphi}{\sqrt{2}}\nonumber\\
-% & & - 2\sqrt{2}
-%       \frac{\cos\varphi^2\sin\varphi}{\cos\varphi+\sin\varphi}
-%       \nonumber  
-% \end{eqnarray}
-% Now I dare you to find the exact solution to that.
-%
-% Using numerical methodes (Newton's method), was ofcourse no
-% problem, and gave satesfactory resualt. If the expression on the
-% right above is labelled $f$, $f^\prime$ is:
-% \begin{eqnarray}
-% f^\prime &=& \frac{\sin4\varphi}{2\sqrt{\frac{3-\cos4\varphi}{4}}}
-%    + \sqrt{2}\sin2\varphi\nonumber\\
-% & & - \frac{2\sqrt{2}\cos\varphi}{\cos\varphi+\sin\varphi^2}
-%       \left( \left( \cos\varphi+\sin\varphi \right)
-%          \left( \cos^2\varphi-2\sin^22\varphi \right)\right. \nonumber\\ 
-% & & - \quad \left.\left( \cos\varphi-\sin\varphi \right)
-%          \cos^2\varphi\sin\varphi \right) \nonumber
-% \end{eqnarray}
-% Using these expressions for $f$ and $f^\prime$ in a \textsf{Fortran}
-% program, I reached resaults close to what Mr.\ Collins found.
-%
-% \subsection{Joseph Collins' Solution}
-%
-% In Mr.\ Collins notation, the points on figure~\ref{fig:bauforms}
-% has the following coordinates:
-% \begin{eqnarray*}
-%   A = (0,-1)  & B^\prime = (x,0)   & C = (x,y)\\
-%   O = (0,0)   & P^\prime = (x-h,0) & Q^\prime = (x+h,0)\\
-%   R = (x+h,h) & S = (x-h,h) & \\
-% \end{eqnarray*}
-% Below is what Mr.\ Collins wrote me --- thank you very much.
-%
-% On the unit circle
-% \begin{equation}\label{eq:uc}
-%   x^2 + y^2 = 1
-% \end{equation}
-% we have the vertices of a triangle at $(-1,0)$, $(x,y)$, and
-% $(x,-y)$. A square has four vertices $(x \pm h, \pm h)$, where the
-% two points $(x-h, \pm h)$ lie on the triangle (constraint A) and the
-% two points $(x+h, \pm h)$ lie on the circle (constraint B).  Thus,
-% the vertical side of the triangle bisects the square.  From
-% constraint A, upon consideration of similar triangles, we have
-% $$\frac{y}{1+x} = \frac{h}{1+x-h}, \quad \mbox{so that}\quad
-%   h =  \frac{(1+x) y }{1+x+y}.$$
-% By (\ref{eq:uc}), this is
-% \begin{equation} \label{eq:b1}
-%   h = \frac{(1+x)\sqrt{1-x^2}}{1+x+\sqrt{1-x^2}} .
-% \end{equation}
-% From constraint B, we get
-% \begin{equation} \label{eq:b2}
-%   (x+h)^2 + h^2 = 1  .
-% \end{equation}
-% Any simultaneous solution of (\ref{eq:b1}) and (\ref{eq:b2}) is also a
-% solution of
-% \begin{equation}\label{eq:eqn}
-%   8x^3 - 4x^2 - 3x + 1 = 0,
-% \end{equation}
-% the relevant solution being
-% \begin{equation}  \label{eq:sol}
-%   x = \frac16 + \sqrt{\frac{11}{18}} \sin
-%   \left[ \frac{\pi}{6}
-%     - \frac13 \arctan\left(\frac{3\sqrt{237}}{23}\right) \right].
-% \end{equation}
-% Equation (\ref{eq:eqn}) and solution (\ref{eq:sol}) courtesy of
-% Mathematica. We get $y$ and $h$ from (\ref{eq:uc}) and
-% (\ref{eq:b1}), respectively. The angle at $(-1,0)$ is $\varphi = 2
-% \arctan\bigl(y/(1+x)\bigr)$. 
-%
-% Approximate values are
-% \begin{eqnarray*}
-%   x &\simeq& 0.2865914\\
-%   y &\simeq&  0.9580529\\
-%   h &\simeq& 0.5491394 \\
-%   \varphi &\simeq&  1.280129 \ ( \simeq  73.346^o)
-% \end{eqnarray*}
-% 
-% \section{Copyrights --- GNU General Public Lisence}
-% \label{app:ggpl}
-%
-% This \MF{} implementation of the ``universal'' font and the \LaTeX{}
-% support package ``uni'' copyright \copyright{} 1998  Christian Holm.
-%
-% This program is free software; you can redistribute it and/or modify
-% it under the terms of the GNU General Public License as published by
-% the Free Software Foundation; either version 2 of the License, or
-% (at your option) any later version. 
-%
-% This program is distributed in the hope that it will be useful, but
-% \textsc{without any warranty}; without even the implied warranty 
-% of \textsc{merchantability} or \textsc{fitness for a particular
-% purpose}. See the GNU General Public License for more details.
 %
-% You should have received a copy of the GNU General Public License
-% along with this program; if not, write to
-% \begin{quote}
-%   The Free Software Foundation, Inc.\\
-%   675 Mass Ave\\
-%   Cambridge\\
-%   MA 02139\\
-%   USA
-% \end{quote}
-%
-% See the file \texttt{copyright} in the distribution for the complete
-% GNU General Public License.
-% 
-% You can reach the me (the copyright holder) at
-% \begin{quote}
-%   Christian Holm\\
-%   Sankt Hansgade 23, 1.\ th.\\
-%   DK--2200 Copenhagen N\\
-%   Denmark\\
-%   E--mail: \texttt{cholm@nbi.dk} or \texttt{cholm@fys.ku.dk}
-% \end{quote}
-% 
-% \section{Wishlist}
-%
-% Below is a list of things I would like to do with the font and
-% package. If anyone has any suggestions, ready--made code, or new
-% ideas, please let me know.
-%
-% If you would like to take on one or more of the tasks presented
-% below, please do so, but send me a note so that I may coordinate
-% with my own efforts, and perhaps have a constructive dicourse.
-% 
-% I should however instruct you to read the \emph{complete}
-% documentation of the package and font, since this may give some
-% reasons why I have chosen a particular approach.
-%
-% \begin{itemize}
-% \item Make the font an 8--bit encoded (256 characters) font,
-%   conforming somewhat to the \texttt{T1} encoding of the Cork fonts.
-% \item Making a package (perhaps \textsf{mfdoc}), to make
-%   documentation of \MF{} sources, just like \textsf{doc} is fore
-%   \LaTeX{} sources. This is ofcourse a independent project, and I
-%   will proberly not work on it.
-% \end{itemize}
-% \clearpage
-% \section{Font Charts}
-% \label{app:charts}
-%
-% Below are some charts of the \universal{} font in different series
-% and shapes (medium upright, bold upright, medium slanted, medium
-% small caps), all in size \texttt{8pt}.
-% 
-% \FontChart{fulmr8.mf}
-% \FontChart{fulmo8.mf}
-% \FontChart{fulmc8.mf}
-% \FontChart{fulmst8.mf}
-% \FontChart{fulbr8.mf}
-% \clearpage
+% \iffalse
+% Local Variables:
+%   mode: docTeX
+% End: 
+% \fi
diff --git a/Master/texmf-dist/source/fonts/universa/uni.ins b/Master/texmf-dist/source/fonts/universa/universa.ins
index 00771ace451..415fce1026f 100644
--- a/Master/texmf-dist/source/fonts/universa/uni.ins
+++ b/Master/texmf-dist/source/fonts/universa/universa.ins
@@ -1,5 +1,6 @@
+%% -*- mode: tex -*- 
 %%
-%% This is file `uni.ins', the installation file for the
+%% This is file `universa.ins', the installation file for the
 %% `universal' package.
 %%
 %% Copyright (C) 1998 Christian Holm.
@@ -30,8 +31,8 @@ comments have been stripped from it.  It is NOT the preferred
 form of universal for making modifications to it.
 
 Therefore you can NOT redistribute and/or modify THIS file.  
-You can however redistribute the complete source (uni.dtx 
-and uni.ins) and/or modify it under the terms of the GNU 
+You can however redistribute the complete source (universa.dtx 
+and universa.ins) and/or modify it under the terms of the GNU 
 General Public License as published by the Free Software 
 Foundation; either version 2, or (at your option) any later 
 version.
@@ -47,7 +48,7 @@ License along with this package; if not, write to the
   675 Mass Ave, Cambridge, 
   MA 02139, USA.
 
-See the file uni.dtx for further comments and documentation.
+See the file universa.dtx for further comments and documentation.
 
 \endpreamble
 
@@ -60,7 +61,8 @@ it will be useful, but WITHOUT ANY WARRANTY; without even the
 implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
 PURPOSE.  See the GNU General Public License for more details.
 
-See the file uni.dtx for further comments and documentation.
+See the file universa.dtx for further comments and documentation.
+
 
 \endpreamble
 
@@ -69,99 +71,99 @@ See the file uni.dtx for further comments and documentation.
 \Msg{***********************************************************}
 \Msg{* Generating LaTeX files}
 \Msg{***********************************************************}
-\generate{\file{uni.sty}{\from{uni.dtx}{package}}
-          \file{omluni.fd}{\from{uni.dtx}{oml}}
-          \file{omsuni.fd}{\from{uni.dtx}{oms}}
-          \file{ot1uni.fd}{\from{uni.dtx}{ot1}}
-          \file{t1uni.fd}{\from{uni.dtx}{t1}}
-          \file{uuni.fd}{\from{uni.dtx}{u}}}
+\generate{\file{uni.sty}{\from{universa.dtx}{package}}
+          \file{omluni.fd}{\from{universa.dtx}{oml}}
+          \file{omsuni.fd}{\from{universa.dtx}{oms}}
+          \file{ot1uni.fd}{\from{universa.dtx}{ot1}}
+          \file{t1uni.fd}{\from{universa.dtx}{t1}}
+          \file{uuni.fd}{\from{universa.dtx}{u}}}
 \usedir{doc/latex/universa}
 \Msg{***********************************************************}
 \Msg{* Generating Documentation files}
 \Msg{***********************************************************}
-\generate{\file{unidoc.sty}{\from{uni.dtx}{docpackage}}
-          \file{copyright}{\from{uni.dtx}{copyright}}}
+\generate{\file{unidoc.sty}{\from{universa.dtx}{docpackage}}
+          \file{copying}{\from{universa.dtx}{copyright}}}
 \usedir{fonts/source/public/universa}
 \Msg{***********************************************************}
 \Msg{* Generating METAFONT base file}
 \Msg{***********************************************************}
-\generate{\file{unibase.mf}{\from{uni.dtx}{unibase}}}
+\generate{\file{unibase.mf}{\from{universa.dtx}{unibase}}}
 \usepreamble\short
 \Msg{***********************************************************}
 \Msg{* Generating upright medium driver files}
 \Msg{***********************************************************}
-\generate{\file{fulmr8.mf}{\from{uni.dtx}{font,medium,eight}}
-          \file{fulmr9.mf}{\from{uni.dtx}{font,medium,nine}}
-          \file{fulmr10.mf}{\from{uni.dtx}{font,medium,ten}}
-          \file{fulmr12.mf}{\from{uni.dtx}{font,medium,twelve}}
-          \file{fulmr17.mf}{\from{uni.dtx}{font,medium,seventeen}}}
+\generate{\file{fulmr8.mf}{\from{universa.dtx}{font,medium,eight}}
+          \file{fulmr9.mf}{\from{universa.dtx}{font,medium,nine}}
+          \file{fulmr10.mf}{\from{universa.dtx}{font,medium,ten}}
+          \file{fulmr12.mf}{\from{universa.dtx}{font,medium,twelve}}
+          \file{fulmr17.mf}{\from{universa.dtx}{font,medium,seventeen}}}
 \Msg{***********************************************************}
 \Msg{* Generating upright bold face driver files}
 \Msg{***********************************************************}
-\generate{\file{fulbr8.mf}{\from{uni.dtx}{font,bold,eight}}
-          \file{fulbr9.mf}{\from{uni.dtx}{font,bold,nine}}
-          \file{fulbr10.mf}{\from{uni.dtx}{font,bold,ten}}
-          \file{fulbr12.mf}{\from{uni.dtx}{font,bold,twelve}}
-          \file{fulbr17.mf}{\from{uni.dtx}{font,bold,seventeen}}}
+\generate{\file{fulbr8.mf}{\from{universa.dtx}{font,bold,eight}}
+          \file{fulbr9.mf}{\from{universa.dtx}{font,bold,nine}}
+          \file{fulbr10.mf}{\from{universa.dtx}{font,bold,ten}}
+          \file{fulbr12.mf}{\from{universa.dtx}{font,bold,twelve}}
+          \file{fulbr17.mf}{\from{universa.dtx}{font,bold,seventeen}}}
 \Msg{***********************************************************}
 \Msg{* Generating slanted medium driver files}
 \Msg{***********************************************************}
-\generate{\file{fulmo8.mf}{\from{uni.dtx}{font,medium,slanted,eight}}
-          \file{fulmo9.mf}{\from{uni.dtx}{font,medium,slanted,nine}}
-          \file{fulmo10.mf}{\from{uni.dtx}{font,medium,slanted,ten}}
-          \file{fulmo12.mf}{\from{uni.dtx}{font,medium,slanted,twelve}}
-          \file{fulmo17.mf}{\from{uni.dtx}{font,medium,slanted,seventeen}}}
+\generate{\file{fulmo8.mf}{\from{universa.dtx}{font,medium,slanted,eight}}
+          \file{fulmo9.mf}{\from{universa.dtx}{font,medium,slanted,nine}}
+          \file{fulmo10.mf}{\from{universa.dtx}{font,medium,slanted,ten}}
+          \file{fulmo12.mf}{\from{universa.dtx}{font,medium,slanted,twelve}}
+          \file{fulmo17.mf}{\from{universa.dtx}{font,medium,slanted,seventeen}}}
 \Msg{***********************************************************}
 \Msg{* Generating small caps medium driver files}
 \Msg{***********************************************************}
-\generate{\file{fulmc8.mf}{\from{uni.dtx}{font,medium,caps,eight}}
-          \file{fulmc9.mf}{\from{uni.dtx}{font,medium,caps,nine}}
-          \file{fulmc10.mf}{\from{uni.dtx}{font,medium,caps,ten}}
-          \file{fulmc12.mf}{\from{uni.dtx}{font,medium,caps,twelve}}
-          \file{fulmc17.mf}{\from{uni.dtx}{font,medium,caps,seventeen}}}
+\generate{\file{fulmc8.mf}{\from{universa.dtx}{font,medium,caps,eight}}
+          \file{fulmc9.mf}{\from{universa.dtx}{font,medium,caps,nine}}
+          \file{fulmc10.mf}{\from{universa.dtx}{font,medium,caps,ten}}
+          \file{fulmc12.mf}{\from{universa.dtx}{font,medium,caps,twelve}}
+          \file{fulmc17.mf}{\from{universa.dtx}{font,medium,caps,seventeen}}}
 \Msg{***********************************************************}
 \Msg{* Generating strict medium driver files}
 \Msg{***********************************************************}
-\generate{\file{fulmst8.mf}{\from{uni.dtx}{font,medium,strict,eight}}
-          \file{fulmst9.mf}{\from{uni.dtx}{font,medium,strict,nine}}
-          \file{fulmst10.mf}{\from{uni.dtx}{font,medium,strict,ten}}
-          \file{fulmst12.mf}{\from{uni.dtx}{font,medium,strict,twelve}}
-          \file{fulmst17.mf}{\from{uni.dtx}{font,medium,strict,seventeen}}}
+\generate{\file{fulmst8.mf}{\from{universa.dtx}{font,medium,strict,eight}}
+          \file{fulmst9.mf}{\from{universa.dtx}{font,medium,strict,nine}}
+          \file{fulmst10.mf}{\from{universa.dtx}{font,medium,strict,ten}}
+          \file{fulmst12.mf}{\from{universa.dtx}{font,medium,strict,twelve}}
+          \file{fulmst17.mf}{\from{universa.dtx}{font,medium,strict,seventeen}}}
 \Msg{***********************************************************}
 \Msg{* Generating slanted bold face driver files}
 \Msg{***********************************************************}
-\generate{\file{fulbo8.mf}{\from{uni.dtx}{font,bold,slanted,eight}}
-          \file{fulbo9.mf}{\from{uni.dtx}{font,bold,slanted,nine}}
-          \file{fulbo10.mf}{\from{uni.dtx}{font,bold,slanted,ten}}
-          \file{fulbo12.mf}{\from{uni.dtx}{font,bold,slanted,twelve}}
-          \file{fulbo17.mf}{\from{uni.dtx}{font,bold,slanted,seventeen}}}
+\generate{\file{fulbo8.mf}{\from{universa.dtx}{font,bold,slanted,eight}}
+          \file{fulbo9.mf}{\from{universa.dtx}{font,bold,slanted,nine}}
+          \file{fulbo10.mf}{\from{universa.dtx}{font,bold,slanted,ten}}
+          \file{fulbo12.mf}{\from{universa.dtx}{font,bold,slanted,twelve}}
+          \file{fulbo17.mf}{\from{universa.dtx}{font,bold,slanted,seventeen}}}
 \Msg{***********************************************************}
 \Msg{* Generating small caps bold face driver files}
 \Msg{***********************************************************}
-\generate{\file{fulbc8.mf}{\from{uni.dtx}{font,bold,caps,eight}}
-          \file{fulbc9.mf}{\from{uni.dtx}{font,bold,caps,nine}}
-          \file{fulbc10.mf}{\from{uni.dtx}{font,bold,caps,ten}}
-          \file{fulbc12.mf}{\from{uni.dtx}{font,bold,caps,twelve}}
-          \file{fulbc17.mf}{\from{uni.dtx}{font,bold,caps,seventeen}}}
+\generate{\file{fulbc8.mf}{\from{universa.dtx}{font,bold,caps,eight}}
+          \file{fulbc9.mf}{\from{universa.dtx}{font,bold,caps,nine}}
+          \file{fulbc10.mf}{\from{universa.dtx}{font,bold,caps,ten}}
+          \file{fulbc12.mf}{\from{universa.dtx}{font,bold,caps,twelve}}
+          \file{fulbc17.mf}{\from{universa.dtx}{font,bold,caps,seventeen}}}
 \Msg{***********************************************************}
 \Msg{* Generating strict bold face driver files}
 \Msg{***********************************************************}
-\generate{\file{fulbst8.mf}{\from{uni.dtx}{font,bold,strict,eight}}
-          \file{fulbst9.mf}{\from{uni.dtx}{font,bold,strict,nine}}
-          \file{fulbst10.mf}{\from{uni.dtx}{font,bold,strict,ten}}
-          \file{fulbst12.mf}{\from{uni.dtx}{font,bold,strict,twelve}}
-          \file{fulbst17.mf}{\from{uni.dtx}{font,bold,strict,seventeen}}}
+\generate{\file{fulbst8.mf}{\from{universa.dtx}{font,bold,strict,eight}}
+          \file{fulbst9.mf}{\from{universa.dtx}{font,bold,strict,nine}}
+          \file{fulbst10.mf}{\from{universa.dtx}{font,bold,strict,ten}}
+          \file{fulbst12.mf}{\from{universa.dtx}{font,bold,strict,twelve}}
+          \file{fulbst17.mf}{\from{universa.dtx}{font,bold,strict,seventeen}}}
 \Msg{***********************************************************}
 \Msg{* Generating font program files}
 \Msg{***********************************************************}
-\generate{\file{uniupp.mf}{\from{uni.dtx}{upp}}
-          \file{unilow.mf}{\from{uni.dtx}{low}}
-          \file{unidig.mf}{\from{uni.dtx}{dig}}
-          \file{unispe.mf}{\from{uni.dtx}{spe}}
-          \file{unilig.mf}{\from{uni.dtx}{lig}}
-          \file{unipun.mf}{\from{uni.dtx}{pun}}
-          \file{uniacc.mf}{\from{uni.dtx}{acc}}
-          \file{uniext.mf}{\from{uni.dtx}{ext}}}
+\generate{\file{uniupp.mf}{\from{universa.dtx}{upp}}
+          \file{unilow.mf}{\from{universa.dtx}{low}}
+          \file{unidig.mf}{\from{universa.dtx}{dig}}
+          \file{unispe.mf}{\from{universa.dtx}{spe}}
+          \file{unilig.mf}{\from{universa.dtx}{lig}}
+          \file{unipun.mf}{\from{universa.dtx}{pun}}
+          \file{uniacc.mf}{\from{universa.dtx}{acc}}
+          \file{uniext.mf}{\from{universa.dtx}{ext}}}
 
 \Msg{***********************************************************}
 \Msg{* To finish the installation you have to move the files}
@@ -169,12 +171,12 @@ See the file uni.dtx for further comments and documentation.
 \Msg{* the files `*.mf' to a directory searched by Metafont.}
 \Msg{*}
 \Msg{* To produce the documentation do:}
-\Msg{*\space\space latex uni.dtx}
-\Msg{*\space\space latex uni.dtx}
-\Msg{*\space\space makeindex -s gind -o uni.ind uni.idx}
-\Msg{*\space\space makeindex -s gglo -o uni.gls uni.glo}
-\Msg{*\space\space latex uni.dtx}
-\Msg{*\space\space latex uni.dtx}
+\Msg{*\space\space latex universa.dtx}
+\Msg{*\space\space latex universa.dtx}
+\Msg{*\space\space makeindex -s gind -o universa.ind universa.idx}
+\Msg{*\space\space makeindex -s gglo -o universa.gls universa.glo}
+\Msg{*\space\space latex universa.dtx}
+\Msg{*\space\space latex universa.dtx}
 \Msg{* or whatever appropiate for your system.}
 \Msg{***********************************************************}
 \endbatchfile