diff options
| author | Matt Dew <marcoz@osource.org> | 2011-11-07 22:53:48 -0700 |
|---|---|---|
| committer | Matt Dew <marcoz@osource.org> | 2011-11-07 22:53:48 -0700 |
| commit | d97b7c1402c9843d3b038f8aa665ef48e4443be2 (patch) | |
| tree | 537ee76e716b6139432364401f482195a6a0a60e | |
| parent | 5faf445d5de3a63dd1c5525bbacc1a58fdbc5ba6 (diff) | |
more cleanup.
allow smart table breaks.
fixed table overflow
| -rwxr-xr-x | specs/CH04.xml | 10 | ||||
| -rwxr-xr-x | specs/CH09.xml | 18 | ||||
| -rwxr-xr-x | specs/CH11.xml | 56 | ||||
| -rwxr-xr-x | specs/appA.xml | 2 | ||||
| -rwxr-xr-x | specs/appB.xml | 18 | ||||
| -rwxr-xr-x | specs/appD.xml | 4 | ||||
| -rwxr-xr-x | specs/intrinsics.xml | 2 |
7 files changed, 70 insertions, 40 deletions
diff --git a/specs/CH04.xml b/specs/CH04.xml index 5f1840e..17f386f 100755 --- a/specs/CH04.xml +++ b/specs/CH04.xml @@ -314,7 +314,7 @@ Shell. </para> <informaltable frame='topbot'> - <?dbfo keep-together="always" ?> + <?dbfo keep-together="auto" ?> <tgroup cols='2' align='left' colsep='0' rowsep='0'> <colspec colwidth='1.0*' colname='c1'/> <colspec colwidth='1.0*' colname='c2'/> @@ -1149,7 +1149,7 @@ initialize procedures) are: <colspec colwidth='1.0*' colname='c1'/> <colspec colwidth='1.0*' colname='c2'/> <thead> - <row> + <row rowsep='1'> <entry>Field</entry> <entry>Default Value</entry> </row> @@ -1307,12 +1307,12 @@ and its subclasses are: </para> <informaltable frame='topbot'> - <?dbfo keep-together="always" ?> + <?dbfo keep-together="auto" ?> <tgroup cols='2' align='left' colsep='0' rowsep='0'> <colspec colwidth='1.0*' colname='c1'/> <colspec colwidth='1.0*' colname='c2'/> <thead> - <row rowsep='0'> + <row rowsep='1'> <entry>Field</entry> <entry>Default Value</entry> </row> @@ -1600,7 +1600,7 @@ shells have the following additional resource: <colspec colwidth='1.0*' colname='c1'/> <colspec colwidth='1.0*' colname='c2'/> <thead> - <row> + <row rowsep='1'> <entry>Field</entry> <entry>Replacement</entry> </row> diff --git a/specs/CH09.xml b/specs/CH09.xml index f6ef59c..c24a6d2 100755 --- a/specs/CH09.xml +++ b/specs/CH09.xml @@ -166,7 +166,7 @@ The Intrinsics define the following resource types: </para> <informaltable frame='topbot'> - <?dbfo keep-together="always" ?> + <?dbfo keep-together="auto" ?> <tgroup cols='2' align='left' colsep='0' rowsep='0'> <colspec colwidth='1.0*' colname='c1'/> <colspec colwidth='1.0*' colname='c2'/> @@ -1312,7 +1312,7 @@ input values of representation type </para> <informaltable frame='topbot'> - <?dbfo keep-together="always" ?> + <?dbfo keep-together="auto" ?> <tgroup cols='3' align='left' rowsep='0' colsep='0'> <colspec colwidth='0.8*' colname='c1'/> <colspec colwidth='1.0*' colname='c2'/> @@ -1615,13 +1615,13 @@ an input value of representation type </para> <informaltable frame='topbot'> - <?dbfo keep-together="always" ?> + <?dbfo keep-together="auto" ?> <tgroup cols='3' align='left' rowsep='0' colsep='0'> <colspec colwidth='1.0*' colname='c1'/> <colspec colwidth='1.0*' colname='c2'/> <colspec colwidth='1.0*' colname='c3'/> <thead> - <row> + <row rowsep='1'> <entry>Target Representation</entry> <entry>Converter Name</entry> <entry>Additional Args</entry> @@ -1643,13 +1643,13 @@ input values of representation type </para> <informaltable frame='topbot'> - <?dbfo keep-together="always" ?> + <?dbfo keep-together="auto" ?> <tgroup cols='3' align='left' rowsep='0' colsep='0'> <colspec colwidth='1.0*' colname='c1'/> <colspec colwidth='1.0*' colname='c2'/> <colspec colwidth='1.0*' colname='c3'/> <thead> - <row> + <row rowsep='1'> <entry>Target Representation</entry> <entry>Converter Name</entry> <entry>Additional Args</entry> @@ -1712,20 +1712,20 @@ an input value of representation type </para> <informaltable frame='topbot'> - <?dbfo keep-together="always" ?> + <?dbfo keep-together="auto" ?> <tgroup cols='3' align='left' rowsep='0' colsep='0'> <colspec colwidth='1.0*' colname='c1'/> <colspec colwidth='1.0*' colname='c2'/> <colspec colwidth='1.0*' colname='c3'/> <thead> - <row> + <row rowsep='1'> <entry>Target Representation</entry> <entry>Converter Name</entry> <entry>Additional Args</entry> </row> </thead> <tbody> - <row rowsep='1'> + <row> <entry><function>XtRColor</function></entry> <entry><function>XtCvtPixelToColor</function></entry> </row> diff --git a/specs/CH11.xml b/specs/CH11.xml index b14373d..2237a94 100755 --- a/specs/CH11.xml +++ b/specs/CH11.xml @@ -4298,7 +4298,7 @@ Refer to Section 4.1.8 in the <emphasis remap='I'>Inter-Client Communication Con the semantics of the <emphasis role='bold'>WM_COLORMAP_WINDOWS</emphasis> property. </para> </sect1> - +<!-- FIXME: --> <sect1 id="Finding_File_Names"> <title>Finding File Names</title> <para> @@ -4582,6 +4582,7 @@ and the Intrinsics make no interpretation of the parts other than to use them in substitutions as described below. </para> + <para> <xref linkend='XtResolvePathname' xrefstyle='select: title'/> calls @@ -4590,10 +4591,14 @@ with the following substitutions in addition to any passed by the caller and returns the value returned by <xref linkend='XtFindFile' xrefstyle='select: title'/>: </para> +<!-- PROBLEM BELOW HERE --> -<variablelist spacing='compact'> + +<variablelist> <varlistentry> - <term>%N</term> + <term> +%N + </term> <listitem> <para> The value of the <emphasis remap='I'>filename</emphasis> parameter, or the application's @@ -4602,7 +4607,9 @@ class name if <emphasis remap='I'>filename</emphasis> is NULL. </listitem> </varlistentry> <varlistentry> - <term>%T</term> + <term> +%T + </term> <listitem> <para> The value of the <emphasis remap='I'>type</emphasis> parameter. @@ -4610,7 +4617,9 @@ The value of the <emphasis remap='I'>type</emphasis> parameter. </listitem> </varlistentry> <varlistentry> - <term>%S</term> + <term> +%S + </term> <listitem> <para> The value of the <emphasis remap='I'>suffix</emphasis> parameter. @@ -4618,7 +4627,9 @@ The value of the <emphasis remap='I'>suffix</emphasis> parameter. </listitem> </varlistentry> <varlistentry> - <term>%L</term> + <term> +%L + </term> <listitem> <para> The language string associated with the specified display. @@ -4626,7 +4637,9 @@ The language string associated with the specified display. </listitem> </varlistentry> <varlistentry> - <term>%l</term> + <term> +%l + </term> <listitem> <para> The language part of the display's language string. @@ -4634,7 +4647,9 @@ The language part of the display's language string. </listitem> </varlistentry> <varlistentry> - <term>%t</term> + <term> +%t + </term> <listitem> <para> The territory part of the display's language string. @@ -4642,7 +4657,9 @@ The territory part of the display's language string. </listitem> </varlistentry> <varlistentry> - <term>%c</term> + <term> +%c + </term> <listitem> <para> The codeset part of the display's language string. @@ -4650,7 +4667,9 @@ The codeset part of the display's language string. </listitem> </varlistentry> <varlistentry> - <term>%C</term> + <term> +%C + </term> <listitem> <para> The customization string retrieved from the resource @@ -4659,7 +4678,9 @@ database associated with <emphasis remap='I'>display</emphasis>. </listitem> </varlistentry> <varlistentry> - <term>%D</term> + <term> +%D + </term> <listitem> <para> The value of the implementation-specific default path. @@ -4668,6 +4689,8 @@ The value of the implementation-specific default path. </varlistentry> </variablelist> + +<!-- PROBLEM ABOVE HERE --> <para> If a path is passed to <xref linkend='XtResolvePathname' xrefstyle='select: title'/>, @@ -4677,13 +4700,15 @@ If the <emphasis remap='I'>path</emphasis> argument is NULL, the value of the <emphasis role='bold'>XFILESEARCHPATH</emphasis> environment variable is passed to <xref linkend='XtFindFile' xrefstyle='select: title'/>. -If -<emphasis role='bold'>XFILESEARCHPATH</emphasis> +If <emphasis role='bold'>XFILESEARCHPATH</emphasis> is not defined, an implementation-specific default path is used that contains at least six entries. These entries must contain the following substitutions: </para> + +<!-- OK PAST HERE --> + <literallayout> 1. %C, %N, %S, %T, %L or %C, %N, %S, %T, %l, %t, %c 2. %C, %N, %S, %T, %l @@ -4763,8 +4788,10 @@ It is the responsibility of the caller to free the returned string using <xref linkend='XtFree' xrefstyle='select: title'/> when it is no longer needed. </para> -</sect1> + +</sect1> +<!-- END OF FIXME --> <sect1 id="Hooks_for_External_Agents"> <title>Hooks for External Agents</title> <para> @@ -5452,4 +5479,5 @@ the list of displays, use </para> </sect2> </sect1> + </chapter> diff --git a/specs/appA.xml b/specs/appA.xml index 6cf0d5f..daf40eb 100755 --- a/specs/appA.xml +++ b/specs/appA.xml @@ -15,7 +15,7 @@ for convenience only. <informaltable frame='none'> <?dbfo keep-together="always" ?> <tgroup cols='2' align='left' colsep='0' rowsep='0'> - <colspec colwidth='0.2*' colname='c1'/> + <colspec colwidth='0.3*' colname='c1'/> <colspec colwidth='1.0*' colname='c2'/> <tbody> <row> diff --git a/specs/appB.xml b/specs/appB.xml index 34e9d14..05787ca 100755 --- a/specs/appB.xml +++ b/specs/appB.xml @@ -7,7 +7,7 @@ Syntax is specified in EBNF notation with the following conventions: </para> <informaltable frame='none'> - <?dbfo keep-together="always" ?> + <?dbfo keep-together="auto" ?> <tgroup cols='2' align='left' colsep='0' rowsep='0'> <colspec colwidth='0.1*' colname='c1'/> <colspec colwidth='1.0*' colname='c2'/> @@ -40,7 +40,7 @@ Syntax <para>The syntax of a translation table is</para> <informaltable frame='none'> - <?dbfo keep-together="always" ?> + <?dbfo keep-together="auto" ?> <tgroup cols='2' align='left' colsep='0' rowsep='0'> <colspec colwidth='0.2*' colname='c1'/> <colspec colwidth='1.0*' colname='c2'/> @@ -250,7 +250,7 @@ of an exclamation point with no modifers. </para> <informaltable frame='topbot'> - <?dbfo keep-together="always" ?> + <?dbfo keep-together="auto" ?> <tgroup cols='3' align='left' colsep='0' rowsep='0'> <colspec colwidth='1.0*' colname='c1'/> <colspec colwidth='1.0*' colname='c2'/> @@ -421,7 +421,7 @@ are defined: </para> <informaltable frame='topbot'> - <?dbfo keep-together="always" ?> + <?dbfo keep-together="auto" ?> <tgroup cols='2' align='left' colsep='0' rowsep='0'> <colspec colwidth='1.0*' colname='c1'/> <colspec colwidth='1.0*' colname='c2'/> @@ -591,13 +591,13 @@ are defined: <para>The supported abbreviations are:</para> <informaltable frame='topbot'> - <?dbfo keep-together="always" ?> + <?dbfo keep-together="auto" ?> <tgroup cols='3' align='left' rowsep='0' colsep='0'> <colspec colwidth='1.0*' colname='c1'/> <colspec colwidth='1.0*' colname='c2'/> <colspec colwidth='1.0*' colname='c3'/> <thead> - <row> + <row rowsep='1'> <entry>Abbreviation</entry> <entry>Event Type</entry> <entry>Including</entry> @@ -711,7 +711,7 @@ The detail field is supported for the following event types: </para> <informaltable frame='none'> - <?dbfo keep-together="always" ?> + <?dbfo keep-together="auto" ?> <tgroup cols='2' align='left' rowsep='0' colsep='0'> <colspec colwidth='0.5*' colname='c1'/> <colspec colwidth='1.0*' colname='c2'/> @@ -843,7 +843,7 @@ The canonical representation of a translation table is (see also </para> <informaltable frame='none'> - <?dbfo keep-together="always" ?> + <?dbfo keep-together="auto" ?> <tgroup cols='2' align='left' colsep='0' rowsep='0'> <colspec colwidth='0.2*' colname='c1'/> <colspec colwidth='1.0*' colname='c2'/> @@ -950,7 +950,7 @@ The canonical representation of a translation table is (see also <para>The canonical event types are</para> <informaltable frame='none'> - <?dbfo keep-together="always" ?> + <?dbfo keep-together="auto" ?> <tgroup cols='2' align='left' colsep='0' rowsep='0'> <colspec colwidth='1.0*' colname='c1'/> <colspec colwidth='1.0*' colname='c2'/> diff --git a/specs/appD.xml b/specs/appD.xml index 88be1c0..7b9db94 100755 --- a/specs/appD.xml +++ b/specs/appD.xml @@ -11,7 +11,7 @@ Error Messages </para> <informaltable frame='topbot'> - <?dbfo keep-together="always" ?> + <?dbfo keep-together="auto" ?> <tgroup cols='3' align='left' rowsep='0' colsep='0'> <colspec colwidth='1.0*' colname='c1'/> <colspec colwidth='1.0*' colname='c2'/> @@ -266,7 +266,7 @@ Error Messages <para><emphasis role='bold'>Warning Messages</emphasis></para> <informaltable frame='topbot'> - <?dbfo keep-together="always" ?> + <?dbfo keep-together="auto" ?> <tgroup cols='3' align='left' colsep='0' rowsep='0'> <colspec colwidth='1.0*' colname='c1'/> <colspec colwidth='1.0*' colname='c2'/> diff --git a/specs/intrinsics.xml b/specs/intrinsics.xml index 2d192eb..5df21ce 100755 --- a/specs/intrinsics.xml +++ b/specs/intrinsics.xml @@ -96,6 +96,7 @@ It is provided "as is" without express or implied warranty. </bookinfo> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="acknowledgement.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="preface.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="CH01.xml"/> @@ -111,6 +112,7 @@ It is provided "as is" without express or implied warranty. <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="CH11.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="CH12.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="CH13.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appA.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appB.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appC.xml"/> |
