--- psiconv/trunk/lib/psiconv/data.h	2003/11/21 15:39:14	162
+++ psiconv/trunk/lib/psiconv/data.h	2003/11/22 22:17:04	163
@@ -394,26 +394,28 @@
   psiconv_pictures sections;
 } *psiconv_mbm_f;
 
-/* This is a little intricated. A picture may be embedded in a larger form.
-   A form is empty, except for the picture. The form has size form_{x,y}size,
-   and the picture is at offset picture_{x,y}_offset within the form. The
-   picture itself has size picture_{x,y}size. 
+/* Read the Psiconv file format documentation for a complete discription.
+   Basic idea: a picture has a certain display size. Within it, the pixel
+   data begins at a certain offset. Around it, there is an empty form.
+   The first eight values are before magnification and cuts.
    Cuts are always <= 1.0; a cut of 0.0 cuts nothing away, a cut of 1.0
    cuts everything away. */
 typedef struct psiconv_sketch_section_s
 {
+  psiconv_u16 displayed_xsize;
+  psiconv_u16 displayed_ysize;
+  psiconv_u16 picture_data_x_offset;
+  psiconv_u16 picture_data_y_offset;
   psiconv_u16 form_xsize; 
   psiconv_u16 form_ysize;
-  psiconv_u16 picture_x_offset;
-  psiconv_u16 picture_y_offset;
-  psiconv_u16 picture_xsize;
-  psiconv_u16 picture_ysize;
-  float magnification_x; /* computed relative to first six values */
-  float magnification_y; /* computed relative to first six values */
-  float cut_left;        /* computed relative to first six values */
-  float cut_right;       /* computed relative to first six values */
-  float cut_top;         /* computed relative to first six values */
-  float cut_bottom;      /* computed relative to first six values */
+  psiconv_u16 displayed_size_x_offset;
+  psiconv_u16 displayed_size_y_offset;
+  float magnification_x; /* computed relative to first eight values */
+  float magnification_y; /* computed relative to first eight values */
+  float cut_left;        /* computed relative to first eight values */
+  float cut_right;       /* computed relative to first eight values */
+  float cut_top;         /* computed relative to first eight values */
+  float cut_bottom;      /* computed relative to first eight values */
   psiconv_paint_data_section picture;
 } *psiconv_sketch_section;