specs: fix adjacent parameters with the same type in function prototypes

When listing multiple parameters of the same type, the first one was
often run together with the type and not shown as a parameter name,
and the type name was not shown for the second one (since it had been
listed as a K&R style definition but was being displayed as an ANSI/ISO
style prototype).

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

6 files changed, 45 insertions, 23 deletions

diff --git a/specs/List.xml b/specs/List.xml
index acf20cb..c0ff7db 100644
--- a/specs/List.xml
+++ b/specs/List.xml
@@ -657,7 +657,8 @@ To change the list that is displayed, use
   <funcdef>void<function> XawListChange</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
   <paramdef>String*<parameter> list</parameter></paramdef>
-  <paramdef>intnitems,<parameter> longest</parameter></paramdef>
+  <paramdef>int <parameter>nitems</parameter></paramdef>
+  <paramdef>int <parameter>longest</parameter></paramdef>
   <paramdef>Boolean<parameter> resize</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
diff --git a/specs/Paned.xml b/specs/Paned.xml
index e23802b..9285a1f 100644
--- a/specs/Paned.xml
+++ b/specs/Paned.xml
@@ -1033,7 +1033,8 @@ To change the minimum and maximum height settings for a pane, use
 <funcprototype>
   <funcdef>void<function> XawPanedSetMinMax</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
-  <paramdef>intmin,<parameter> max</parameter></paramdef>
+  <paramdef>int <parameter>min</parameter></paramdef>
+  <paramdef>int <parameter>max</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
 <!-- .FN -->
@@ -1086,7 +1087,8 @@ To retrieve the minimum and maximum height settings for a pane, use
 <funcprototype>
   <funcdef>void<function> XawPanedGetMinMax</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
-  <paramdef>int*min_return,<parameter> *max_return</parameter></paramdef>
+  <paramdef>int <parameter>*min_return</parameter></paramdef>
+  <paramdef>int <parameter>*max_return</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
 <!-- .FN -->
diff --git a/specs/TextFuncs.xml b/specs/TextFuncs.xml
index f566660..004381f 100644
--- a/specs/TextFuncs.xml
+++ b/specs/TextFuncs.xml
@@ -113,7 +113,8 @@ To select a piece of text, use
 <funcprototype>
   <funcdef>void<function> XawTextSetSelection</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
-  <paramdef>XawTextPositionleft,<parameter> right</parameter></paramdef>
+  <paramdef>XawTextPosition <parameter>left</parameter></paramdef>
+  <paramdef>XawTextPosition <parameter>right</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
 <!-- .FN -->
@@ -201,7 +202,8 @@ text widget use <xref linkend='XawTextGetSelectionPos' xrefstyle='select: title'
 <funcprototype>
   <funcdef>void<function> XawTextGetSelectionPos</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
-  <paramdef>XawTextPosition*begin_return,<parameter> *end_return</parameter></paramdef>
+  <paramdef>XawTextPosition <parameter>*begin_return</parameter></paramdef>
+  <paramdef>XawTextPosition <parameter>*end_return</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
 <!-- .FN -->
@@ -255,7 +257,8 @@ To modify the text in an editable Text widget use <xref linkend='XawTextReplace'
 <funcprototype>
   <funcdef>int<function> XawTextReplace</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
-  <paramdef>XawTextPositionstart,<parameter> end</parameter></paramdef>
+  <paramdef>XawTextPosition <parameter>start</parameter>></paramdef>
+  <paramdef>XawTextPosition <parameter>end</parameter></paramdef>
   <paramdef>XawTextBlock<parameter> *text</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -337,7 +340,7 @@ The text replacement was successful.
     <listitem>
       <para>
 <indexterm><primary>XawPositionError</primary></indexterm>
-The edit mode is <function>XawtextAppend</function> and <function>start</function> is not the position of
+The edit mode is <function>XawtextAppend</function> and <emphasis remap='I'>start</emphasis> is not the position of
 the last character of the source.
       </para>
     </listitem>
@@ -359,7 +362,7 @@ than the length of the Source.
 </para>
 <para>
 <!-- .LP -->
-The <xref linkend='XawTextReplace' xrefstyle='select: title'/> arguments <function>start</function> and
+The <xref linkend='XawTextReplace' xrefstyle='select: title'/> arguments <emphasis remap='I'>start</emphasis> and
 <emphasis remap='I'>end</emphasis> represent the text source character positions for the
 existing text that is to be replaced by the text in the text block.
 The characters from <emphasis remap='I'>start</emphasis> up to
@@ -441,7 +444,8 @@ To redisplay a range of characters, use <xref linkend='XawTextInvalidate' xrefst
 <funcprototype>
   <funcdef>void<function> XawTextInvalidate</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
-  <paramdef>XawTextPositionfrom,<parameter> to</parameter></paramdef>
+  <paramdef>XawTextPosition <parameter>from</parameter>></paramdef>
+  <paramdef>XawTextPosition <parameter>to</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
 <!-- .FN -->
diff --git a/specs/TextSink.xml b/specs/TextSink.xml
index 78218b2..7669b86 100644
--- a/specs/TextSink.xml
+++ b/specs/TextSink.xml
@@ -196,8 +196,10 @@ use the function <xref linkend='DisplayText' xrefstyle='select: title'/>:
 <funcprototype>
   <funcdef>void<function> DisplayText</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
-  <paramdef>Positionx,<parameter> y</parameter></paramdef>
-  <paramdef>XawTextPositionpos1,<parameter> pos2</parameter></paramdef>
+  <paramdef>Position <parameter>x</parameter></paramdef>
+  <paramdef>Position <parameter>y</parameter></paramdef>
+  <paramdef>XawTextPosition <parameter>pos1</parameter></paramdef>
+  <paramdef>XawTextPosition <parameter>pos2</parameter></paramdef>
   <paramdef>Boolean<parameter> highlight</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -287,7 +289,8 @@ widget desires to change the state of, or move the insert point.
 <funcprototype>
   <funcdef>void<function> InsertCursor</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
-  <paramdef>Positionx,<parameter> y</parameter></paramdef>
+  <paramdef>Position <parameter>x</parameter></paramdef>
+  <paramdef>Position <parameter>y</parameter></paramdef>
   <paramdef>XawTextInsertState<parameter> state</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -358,8 +361,10 @@ This behavior will be used if you specify
 <funcprototype>
   <funcdef>void<function> ClearToBackground</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
-  <paramdef>Positionx,<parameter> y</parameter></paramdef>
-  <paramdef>Dimensionwidth,<parameter> height</parameter></paramdef>
+  <paramdef>Position <parameter>x</parameter></paramdef>
+  <paramdef>Position <parameter>y</parameter></paramdef>
+  <paramdef>Dimension <parameter>width</parameter></paramdef>
+  <paramdef>Dimension <parameter>height</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
 <!-- .FN -->
@@ -433,10 +438,12 @@ location the Text widget uses the function <xref linkend='FindPosition' xrefstyl
   <funcdef>void<function> FindPosition</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
   <paramdef>XawTextPosition<parameter> fromPos</parameter></paramdef>
-  <paramdef>intfromX,<parameter> width</parameter></paramdef>
+  <paramdef>int <parameter>fromX</parameter></paramdef>
+  <paramdef>int <parameter>width</parameter></paramdef>
   <paramdef>Boolean<parameter> stopAtWordBreak</parameter></paramdef>
   <paramdef>XawTextPosition<parameter> *pos_return</parameter></paramdef>
-  <paramdef>int*width_return,<parameter> *height_return</parameter></paramdef>
+  <paramdef>int <parameter>*width_return</parameter></paramdef>
+  <paramdef>int <parameter>*height_return</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
 <!-- .FN -->
@@ -547,7 +554,8 @@ function:
   <funcdef>void<function> Resolve</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
   <paramdef>XawTextPosition<parameter> fromPos</parameter></paramdef>
-  <paramdef>intfromX,<parameter> width</parameter></paramdef>
+  <paramdef>int <parameter>fromX</parameter></paramdef>
+  <paramdef>int <parameter>width</parameter></paramdef>
   <paramdef>XawTextPosition<parameter> *pos_return</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -631,10 +639,12 @@ line use the function <xref linkend='FindDistance' xrefstyle='select: title'/>.
 <funcprototype>
   <funcdef>void<function> FindDistance</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
-  <paramdef>XawTextPositionfromPos,<parameter> toPos</parameter></paramdef>
+  <paramdef>XawTextPosition <parameter>fromPos</parameter></paramdef>
+  <paramdef>XawTextPosition <parameter>toPos</parameter></paramdef>
   <paramdef>int<parameter> fromX</parameter></paramdef>
   <paramdef>XawTextPosition<parameter> *pos_return</parameter></paramdef>
-  <paramdef>int*width_return,<parameter> *height_return</parameter></paramdef>
+  <paramdef>int <parameter>*width_return</parameter></paramdef>
+  <paramdef>int <parameter>*height_return</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
 <!-- .FN -->
@@ -825,7 +835,8 @@ pixels to be the number of characters times the figure width of
 <funcprototype>
   <funcdef>void<function> SetTabs</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
-  <paramdef>inttab_count,<parameter> *tabs</parameter></paramdef>
+  <paramdef>int <parameter>tab_count</parameter></paramdef>
+  <paramdef>int <parameter>*tabs</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
 <!-- .FN -->
diff --git a/specs/TextSource.xml b/specs/TextSource.xml
index 4c49720..9e6170f 100644
--- a/specs/TextSource.xml
+++ b/specs/TextSource.xml
@@ -470,7 +470,9 @@ conversion.
 <funcprototype>
   <funcdef>Boolean<function> ConvertSelections</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
-  <paramdef>Atom*selection,*target,<parameter> *type</parameter></paramdef>
+  <paramdef>Atom <parameter>*selection</parameter></paramdef>
+  <paramdef>Atom <parameter>*target</parameter></paramdef>
+  <paramdef>Atom <parameter>*type</parameter></paramdef>
   <paramdef>caddr_t<parameter> *value_return</parameter></paramdef>
   <paramdef>unsignedlong<parameter> *length_return</parameter></paramdef>
   <paramdef>int<parameter> *format_return</parameter></paramdef>
@@ -575,7 +577,8 @@ should define a <xref linkend='SetSelection' xrefstyle='select: title'/> procedu
 <funcprototype>
   <funcdef>void<function> SetSelection</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
-  <paramdef>XawTextPositionstart,<parameter> end</parameter></paramdef>
+  <paramdef>XawTextPosition <parameter>start</parameter></paramdef>
+  <paramdef>XawTextPosition <parameter>end</parameter></paramdef>
   <paramdef>Atom<parameter> selection</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
diff --git a/specs/Toggle.xml b/specs/Toggle.xml
index a7944fa..0bdcd87 100644
--- a/specs/Toggle.xml
+++ b/specs/Toggle.xml
@@ -611,7 +611,8 @@ the Toggle to a radio group, or remove the Toggle from a radio group, use
 <funcsynopsis id='XawToggleChangeRadioGroup'>
 <funcprototype>
   <funcdef>void<function> XawToggleChangeRadioGroup</function></funcdef>
-  <paramdef>Widgetw,<parameter> radio_group</parameter></paramdef>
+  <paramdef>Widget <parameter>wp</parameter></paramdef>
+  <paramdef>Widget <parameter> radio_group</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>