Allow the user macros to be used outside math mode

flygenet.dtx

@@ -264,11 +264,12 @@ has been generated for details.
 % helper macro depending on the math mode we are in.
 %    \begin{macrocode}
 \def\FGXYPair#1{%
-  \mathchoice%
+  \ifmmode\mathchoice%
     {\FG@XYPair@display{#1}}%
     {\FG@XYPair@inline{#1}}%
     {\FG@XYPair@inline{#1}}%
-    {\FG@XYPair@inline{#1}}}
+    {\FG@XYPair@inline{#1}}%
+  \else\FG@XYPair@inline{#1}\fi}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -284,7 +285,7 @@ has been generated for details.
   \def\FG@argii{#2}%
   \ifx\FG@argii\empty\FGChromosome{#1}\else%
     \if\FG@argii Y\FGXYPair{#1}\else%
-      \frac{\FG@mbox{#1}}{\FG@mbox{#2}}%
+      \ensuremath{\frac{\FG@mbox{#1}}{\FG@mbox{#2}}}%
     \fi%
   \fi}
 %    \end{macrocode}
@@ -296,7 +297,7 @@ has been generated for details.
 % This macro typesets a single chromosome pair, presented as delimited
 % arguments.
 %    \begin{macrocode}
-\def\FG@printchromosome#1/#2\end{\FGChrPair{#1}{#2}}
+\def\FG@printchromosome#1/#2\end{\ensuremath{\FGChrPair{#1}{#2}}}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -329,9 +330,9 @@ has been generated for details.
 % the beginning. This is intended as an abstraction layer above the
 % |wasysym| package providing these symbols.
 %    \begin{macrocode}
-\def\female{\venus\;\genotype}
-\def\male{\mars\;\genotype}
-\def\virgin{\mercury\;\genotype}
+\def\female{\venus\,\genotype}
+\def\male{\mars\,\genotype}
+\def\virgin{\mercury\,\genotype}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -345,9 +346,9 @@ has been generated for details.
 % convention, this is used to represent several individuals of the
 % indicated genotype.
 %    \begin{macrocode}
-\def\females{\venus\venus\;\genotype}
-\def\males{\mars\mars\;\genotype}
-\def\virgins{\mercury\mercury\;\genotype}
+\def\females{\venus\venus\,\genotype}
+\def\males{\mars\mars\,\genotype}
+\def\virgins{\mercury\mercury\,\genotype}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}