Minor improvements.

[pspp] / spv-file-format.texi

diff --git a/spv-file-format.texi b/spv-file-format.texi
index 09e620e9ae31edba4eeb2066ab6dc8bcaddc7687..6e7480ba12aca0f32cadcd6a016f3ea35ce35061 100644 (file)
--- a/spv-file-format.texi
+++ b/spv-file-format.texi
@@ -1261,24 +1261,22 @@ A ValueMod can specify special modifications to a Value.
 ValueMod @result{}
     31 i0 (i0 @math{|} i1 string[@t{subscript}])
     v1(00 (i1 @math{|} i2) 00 00 int 00 00)
 ValueMod @result{}
     31 i0 (i0 @math{|} i1 string[@t{subscript}])
     v1(00 (i1 @math{|} i2) 00 00 int 00 00)

-    v3(count(FormatString Style ValueModUnknown))
+    v3(count(FormatString
+             (31 Style | 58)
+             (31 Style2 | 58)))

   @math{|} 31 int[@t{n-refs}] int16*[@t{n-refs}] Format
   @math{|} 58
 
   @math{|} 31 int[@t{n-refs}] int16*[@t{n-refs}] Format
   @math{|} 58
 

+Format @result{} 00 00 count(FormatString Style 58)
+FormatString @result{} count((count((i0 58)?) (58 @math{|} 31 string))?)
+

 Style @result{}
 Style @result{}

-    58
-  @math{|} 31
-    bool[@t{bold}] bool[@t{italic}] bool[@t{underline}] bool
+    bool[@t{bold}] bool[@t{italic}] bool[@t{underline}] bool[@t{show}]

     string[@t{fgcolor}] string[@t{bgcolor}]
     string[@t{typeface}] byte[@t{size}]
 
     string[@t{fgcolor}] string[@t{bgcolor}]
     string[@t{typeface}] byte[@t{size}]
 

-Format @result{} 00 00 count(FormatString Style 58)
-
-FormatString @result{} count((i0 (58 @math{|} 31 string))?)
-
-ValueModUnknown @result{}
-    58
-  @math{|} 31 int[@t{halign}] int[@t{valign}] double[@t{offset}]
+Style2 @result{}
+    int[@t{halign}] int[@t{valign}] double[@t{offset}]

     int16[@t{left-margin}] int16[@t{right-margin}]
     int16[@t{top-margin}] int16[@t{bottom-margin}]
 @end format
     int16[@t{left-margin}] int16[@t{right-margin}]
     int16[@t{top-margin}] int16[@t{bottom-margin}]
 @end format


@@ -1300,8 +1298,11 @@ syntax explained previously.  It appears to be an English-language
 version of the localized format string in the Value in which the
 Format is nested.
 
 version of the localized format string in the Value in which the
 Format is nested.
 

-The Style, if present, changes the style for this individual Value.
-The @code{size} is a font size in units of 1/96 inch.
+Style and Style2, if present, change the style for this individual
+Value.  @code{bold}, @code{italic}, and @code{underline} control the
+particular style.  @code{fgcolor} and @code{bgcolor} are strings, such
+as @code{#ffffff}.  The @code{size} is a font size in units of 1/96
+inch.

 
 @code{halign} is 0 for center, 2 for left, 4 for right, 6 for decimal,
 0xffffffad for mixed.  For decimal alignment, @code{offset} is the
 
 @code{halign} is 0 for center, 2 for left, 4 for right, 6 for decimal,
 0xffffffad for mixed.  For decimal alignment, @code{offset} is the