spec: Fix up eqn to docbook conversion

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

1 files changed, 38 insertions, 24 deletions

diff --git a/doc/xdmcp.xml b/doc/xdmcp.xml
index c910687..4342206 100644
--- a/doc/xdmcp.xml
+++ b/doc/xdmcp.xml
@@ -1,6 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-                   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
+                   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!--
+   variable names used in equation markup in the authentication chapter
+   FIXME: Replace with mathml?
+  -->
+<!ENTITY variable.D	"<emphasis role='italic'>D</emphasis>">
+<!ENTITY variable.N	"<emphasis role='italic'>N</emphasis>">
+<!ENTITY variable.T	"<emphasis role='italic'>T</emphasis>">
+<!ENTITY variable.Delta	"<emphasis role='italic'>&Delta;</emphasis>">
+<!ENTITY variable.alpha	"<emphasis role='italic'>&alpha;</emphasis>">
+<!ENTITY variable.beta	"<emphasis role='italic'>&beta;</emphasis>">
+<!ENTITY variable.kappa "<emphasis role='italic'>&kappa;</emphasis>">
+<!ENTITY variable.rho	"<emphasis role='italic'>&rho;</emphasis>">
+<!ENTITY variable.sigma	"<emphasis role='italic'>&sigma;</emphasis>">
+<!ENTITY variable.tau	"<emphasis role='italic'>&tau;</emphasis>">
+]>
 
 <book id="xdmcp">
 
@@ -3759,37 +3774,37 @@ Some definitions first:
 <itemizedlist>
   <listitem>
     <para>
-{D}= encryption of plain text D by key κ
+{&variable.D;}<superscript>&variable.kappa;</superscript> = encryption of plain text D by key &variable.kappa;
     </para>
   </listitem>
   <listitem>
     <para>
-{&#x394;}*&#x3BA; = decryption of crypto text &#x394; with key &#x3BA;
+{&variable.Delta;}*<superscript>&variable.kappa;</superscript> = decryption of crypto text &variable.Delta; with key &variable.kappa;
     </para>
   </listitem>
   <listitem>
     <para>
-&tau; = private key shared by display and manager
+&variable.tau; = private key shared by display and manager
     </para>
   </listitem>
   <listitem>
     <para>
-&rho; = 64 bit random number generated by display
+&variable.rho; = 64 bit random number generated by display
     </para>
   </listitem>
   <listitem>
     <para>
-&alpha; = authentication data in XDMCP packets
+&variable.alpha; = authentication data in XDMCP packets
     </para>
   </listitem>
   <listitem>
     <para>
-&sigma; = per-session private key, generated by manager
+&variable.sigma; = per-session private key, generated by manager
     </para>
   </listitem>
   <listitem>
     <para>
-&beta; = authorization data
+&variable.beta; = authorization data
     </para>
   </listitem>
 </itemizedlist>
@@ -3800,7 +3815,7 @@ shorter than 64 bits will be zero-filled
 on the right to 64 bits.  Blocks longer than 64 bits will use block chaining:
 </para>
 <para>
-{D}&#x3BA; = {D1 }&#x3BA; {D2 xor {D1 }&#x3BA; }&#x3BA;
+{&variable.D;}<superscript>&variable.kappa;</superscript> = {&variable.D;<subscript>1</subscript>}<superscript>&variable.kappa;</superscript> {&variable.D;<subscript>2</subscript> xor {&variable.D;<subscript>1</subscript>}<superscript>&variable.kappa;</superscript>}<superscript>&variable.kappa;</superscript>
 </para>
 
 <para>
@@ -3810,23 +3825,22 @@ packet:
 </para>
 
 <para>
-&#945;Request = {&#961;}τ
-
+&variable.alpha;<subscript>Request</subscript> = {&variable.rho;}<superscript>&variable.tau;</superscript>
 </para>
 
 <para>
 For the <function>Accept</function>
 packet, the manager decrypts the initial message and returns
-αAccept:
+&variable.alpha;<subscript>Accept</subscript>:
 
 </para>
 
 <para>
-&rho; = {&alpha; Request } *&tau;
+&variable.rho; = {&variable.alpha;<subscript>Request</subscript>}*<superscript>&variable.tau;</superscript>
 </para>
 
 <para>
-&alpha; Accept = { &rho; + 1}&tau;
+&variable.alpha;<subscript>Accept</subscript> = { &variable.rho; + 1}<superscript>&variable.tau;</superscript>
 </para>
 
 <para>
@@ -3842,7 +3856,7 @@ packet contains the authorization name
 "XDM-AUTHORIZATION-1".  The authorization data is the string:
 </para>
 <para>
-β Accept = {σ}τ
+&variable.beta;<subscript>Accept</subscript> = {&variable.sigma;}<superscript>&variable.tau;</superscript>
 </para>
 
 <para>
@@ -3851,20 +3865,20 @@ using the XDM-AUTHORIZATION-1 authorization protocol, the client computes the
 following:
 </para>
 <para>
-N mark = "X client identifier"
+&variable.N; = X client identifier
 </para>
 <para>
-T lineup = "Current time in seconds on client host (32 bits)"
+&variable.T; = Current time in seconds on client host (32 bits)
 </para>
 <para>
-β = {ρNT}σ
+&variable.beta; = {&variable.rho;&variable.N;&variable.T;}<superscript>&variable.sigma;</superscript>
 </para>
 
 <para>
-For TCP connections @N@ is 48 bits long and contains the 32-bit IPv4 address of
+For TCP connections &variable.N; is 48 bits long and contains the 32-bit IPv4 address of
 the client host followed by the 16-bit port number of the client socket.
 Formats for other connections must be registered.
-The resulting value, β, is 192 bits of authorization data that is sent
+The resulting value, &variable.beta;, is 192 bits of authorization data that is sent
 in the connection setup to the server.  The server receives the packet,
 decrypts the contents.  To accept the connection, the following must hold:
 </para>
@@ -3872,18 +3886,18 @@ decrypts the contents.  To accept the connection, the following must hold:
 <itemizedlist>
   <listitem>
     <para>
-ρ must match the value generated for the most recent XDMCP negotiation.
+&variable.rho; must match the value generated for the most recent XDMCP negotiation.
     </para>
   </listitem>
   <listitem>
     <para>
-T must be within 1200 seconds of the internally stored time.  If no time
-been received before, the current time is set to @T@.
+&variable.T; must be within 1200 seconds of the internally stored time.  If no time
+been received before, the current time is set to &variable.T;.
     </para>
   </listitem>
   <listitem>
     <para>
-No packet containing the same pair (N, T) can have been received
+No packet containing the same pair (&variable.N;, &variable.T;) can have been received
 in the last 1200 seconds (20 minutes).
     </para>
   </listitem>