From 97b39e75b76b6b1f93ab510761152b204dca74d4 Mon Sep 17 00:00:00 2001
From: Reini Urban <rurban@cpan.org>
Date: Wed, 20 Apr 2022 14:49:42 +0200
Subject: [PATCH] more flag fixes

---
 dwg_ac1004.ksy |  29 ++++----
 dwg_ac1006.ksy | 177 +++++++++++++++++++++++++------------------------
 dwg_ac1009.ksy |  38 +++++------
 3 files changed, 124 insertions(+), 120 deletions(-)

diff --git a/dwg_ac1004.ksy b/dwg_ac1004.ksy
index 3a79a29..3eb1e22 100644
--- a/dwg_ac1004.ksy
+++ b/dwg_ac1004.ksy
@@ -170,7 +170,7 @@ types:
       - id: view_size
         type: f8
         doc: 0x00e0-0x00e7
-      - id: snap
+      - id: snap_mode
         type: s2
         doc: 0x00e8-0x00e9, $SNAPMODE
       - id: snap_resolution
@@ -222,22 +222,25 @@ types:
       - id: celayer
         type: s2
         doc: 0x014a-0x014b, $CLAYER
-      - id: old_cecolor
-        type: f8
-        doc: 0x014c-0x0153
-      - id: unknown7a
+      - id: old_cecolor_lo
+        type: u4
+        doc: 0x014c-
+      - id: old_cecolor_hi
+        type: u4
+        doc: -0x0153
+      - id: psltscale
         size: 2
-        doc: 0x0154-0x0155
-      - id: unknown7b
+        doc: 0x0154-0x0155, $PSLTSCALE
+      - id: tree_depth
         size: 2
-        doc: 0x0156-0x0157
-      - id: unknown7c
+        doc: 0x0156-0x0157, $TREEDEPTH
+      - id: unknown_5
         size: 2
         doc: 0x0158-0x0159
-      - id: unknown7d
+      - id: unknown_6
         size: 2
         doc: 0x015a-0x015b
-      - id: unknown8
+      - id: unknown_7
         type: f8
         doc: 0x015c-0x0163
       - id: linear_units_format
@@ -247,7 +250,7 @@ types:
       - id: linear_units_precision
         type: s2
         doc: 0x0166-0x0167, $LUPREC
-      - id: axis
+      - id: axis_mode
         type: s2
         doc: 0x0168-0x0169, $AXISMODE/70
       - id: axis_value
@@ -355,7 +358,7 @@ types:
       - id: unknown29
         type: s2
         doc: 0x02e1-0x02e2
-      - id: blip
+      - id: blip_mode
         type: s2
         doc: 0x02e3-0x02e4, $BLIPMODE
       - id: dim_suppression_of_zeros
diff --git a/dwg_ac1006.ksy b/dwg_ac1006.ksy
index 72715ea..6ae1a0b 100644
--- a/dwg_ac1006.ksy
+++ b/dwg_ac1006.ksy
@@ -23,36 +23,36 @@ seq:
   - id: blocks
     type: block
     repeat: expr
-    repeat-expr: header.table_block.items
+    repeat-expr: header.table_block.num_items
   - id: layers
     type: layer
     repeat: expr
-    repeat-expr: header.table_layer.items
+    repeat-expr: header.table_layer.num_items
   - id: styles
     type: style
     repeat: expr
-    repeat-expr: header.table_style.items
+    repeat-expr: header.table_style.num_items
   - id: linetypes
     type: linetype
     repeat: expr
-    repeat-expr: header.table_linetype.items
+    repeat-expr: header.table_linetype.num_items
   - id: views
     type: view
     repeat: expr
-    repeat-expr: header.table_view.items
+    repeat-expr: header.table_view.num_items
   # TODO Je tady nejaka chyba (AC1006/from_autocad_r10/TUTORIAL.DWG)
   - id: ucss
     type: ucs
     repeat: expr
-    repeat-expr: header.variables.table_ucs.items
+    repeat-expr: header.variables.table_ucs.num_items
   - id: vports
     type: vport
     repeat: expr
-    repeat-expr: header.variables.table_vport.items
+    repeat-expr: header.variables.table_vport.num_items
   - id: appids
     type: appid
     repeat: expr
-    repeat-expr: header.variables.table_appid.items
+    repeat-expr: header.variables.table_appid.num_items
     if: header.num_header_vars == 160
   - id: block_entities
     type: real_entities
@@ -73,6 +73,7 @@ types:
         encoding: ASCII
         terminator: 0x00
         doc: BLOCK/2
+      # FIXME
       - id: u2
         type: s1
       - id: u3
@@ -83,21 +84,21 @@ types:
         type: s1
   block_flag:
     seq:
-      - id: flag1
+      - id: flag128
         type: b1
-      - id: flag2
+      - id: referenced
         type: b1
-      - id: flag3
+      - id: xref_resolved
         type: b1
-      - id: flag4
+      - id: xref_dep
         type: b1
-      - id: flag5
+      - id: xref_overlaid
         type: b1
-      - id: flag6
+      - id: is_xref
         type: b1
-      - id: flag7
+      - id: has_attrs
         type: b1
-      - id: flag8
+      - id: anonymous
         type: b1
   header:
     seq:
@@ -144,19 +145,19 @@ types:
       - id: variables
         type: header_variables
     instances:
-      blocks_size_unknown:
+      blocks_size_hi:
         value: (blocks_size_raw & 0xff000000) >> 24
       blocks_size:
         value: (blocks_size_raw & 0x00ffffff)
   table:
     seq:
-      - id: item_size
+      - id: size
         type: u2
-      - id: items
+      - id: num_items
         type: u2
-      - id: unknown
-        size: 2
-      - id: begin
+      - id: flags
+        type: u2
+      - id: start
         type: u4
   header_variables:
     seq:
@@ -775,7 +776,7 @@ types:
             _: entity_tmp
   entity_mode:
     seq:
-      - id: entity_xdata
+      - id: entity_handling_flag
         type: b1
       - id: entity_xref_resolved
         type: b1
@@ -1424,15 +1425,15 @@ types:
         doc: VERTEX/50
   attdef_flags:
     seq:
-      - id: flag_1
+      - id: flag128
         type: b1
-      - id: flag_2
+      - id: flag64
         type: b1
-      - id: flag_3
+      - id: flag32
         type: b1
-      - id: flag_4
+      - id: flag16
         type: b1
-      - id: flag_5
+      - id: flag8
         type: b1
       - id: invisible
         type: b1
@@ -1478,19 +1479,19 @@ types:
         doc: LAYER/6
   layer_flag:
     seq:
-      - id: flag1
+      - id: flag128
         type: b1
-      - id: flag2
+      - id: xref_ref
         type: b1
-      - id: flag3
+      - id: xref_resolved
         type: b1
-      - id: flag4
+      - id: xref_dep
         type: b1
-      - id: flag5
+      - id: flag8
         type: b1
-      - id: flag6
+      - id: locked
         type: b1
-      - id: flag7
+      - id: frozen_in_new
         type: b1
       - id: frozen
         type: b1
@@ -1551,21 +1552,21 @@ types:
         type: f8
   linetype_flag:
     seq:
-      - id: flag1
+      - id: flag128
         type: b1
-      - id: flag2
+      - id: xref_ref
         type: b1
-      - id: flag3
+      - id: xref_resolved
         type: b1
-      - id: flag4
+      - id: xref_dep
         type: b1
-      - id: flag5
+      - id: flag8
         type: b1
-      - id: flag6
+      - id: flag4
         type: b1
-      - id: flag7
+      - id: flag2
         type: b1
-      - id: frozen
+      - id: flag1
         type: b1
   real_entities:
     seq:
@@ -1612,21 +1613,21 @@ types:
         doc: STYLE/4
   style_flag:
     seq:
-      - id: flag1
+      - id: flag128
         type: b1
-      - id: flag2
+      - id: xref_ref
         type: b1
-      - id: flag3
+      - id: xref_resolved
         type: b1
-      - id: flag4
+      - id: xref_dep
         type: b1
-      - id: flag5
+      - id: flag8
         type: b1
       - id: vertical
         type: b1
-      - id: flag7
+      - id: flag2
         type: b1
-      - id: load
+      - id: shape
         type: b1
   view:
     seq:
@@ -1656,21 +1657,21 @@ types:
         size: 58
   view_flag:
     seq:
-      - id: flag1
+      - id: flag128
         type: b1
-      - id: flag2
+      - id: xref_ref
         type: b1
-      - id: flag3
+      - id: xref_resolved
         type: b1
-      - id: flag4
+      - id: xref_dep
         type: b1
-      - id: flag5
+      - id: flag8
         type: b1
-      - id: flag6
+      - id: flag4
         type: b1
-      - id: flag7
+      - id: flag2
         type: b1
-      - id: flag8
+      - id: flag1
         type: b1
   ucs:
     seq:
@@ -1694,21 +1695,21 @@ types:
         doc: UCS/12|22|32
   ucs_flag:
     seq:
-      - id: flag1
+      - id: flag128
         type: b1
-      - id: flag2
+      - id: xref_ref
         type: b1
-      - id: flag3
+      - id: xref_resolved
         type: b1
-      - id: flag4
+      - id: xref_dep
         type: b1
-      - id: flag5
+      - id: flag8
         type: b1
-      - id: flag6
+      - id: flag4
         type: b1
-      - id: flag7
+      - id: flag2
         type: b1
-      - id: flag8
+      - id: flag1
         type: b1
   vport:
     seq:
@@ -1792,21 +1793,21 @@ types:
         doc: VPORT/15|25
   vport_flag:
     seq:
-      - id: deleted
+      - id: flag128
         type: b1
-      - id: flag2
+      - id: xref_ref
         type: b1
-      - id: flag3
+      - id: xref_resolved
         type: b1
-      - id: flag4
+      - id: xref_dep
         type: b1
-      - id: flag5
+      - id: flag8
         type: b1
-      - id: flag6
+      - id: flag4
         type: b1
-      - id: flag7
+      - id: flag2
         type: b1
-      - id: flag8
+      - id: flag1
         type: b1
   appid:
     seq:
@@ -1821,39 +1822,39 @@ types:
         doc: APPID/2
   appid_flag:
     seq:
-      - id: flag1
+      - id: flag128
         type: b1
-      - id: flag2
+      - id: xref_ref
         type: b1
-      - id: flag3
+      - id: xref_resolved
         type: b1
-      - id: flag4
+      - id: xref_dep
         type: b1
-      - id: flag5
+      - id: flag8
         type: b1
-      - id: flag6
+      - id: flag4
         type: b1
-      - id: flag7
+      - id: flag2
         type: b1
-      - id: flag8
+      - id: no_xdata
         type: b1
   generation_flags:
     seq:
-      - id: flag1
+      - id: flag128
         type: b1
-      - id: flag2
+      - id: flag64
         type: b1
-      - id: flag3
+      - id: flag32
         type: b1
-      - id: flag4
+      - id: flag16
         type: b1
-      - id: flag5
+      - id: flag8
         type: b1
       - id: upside_down
         type: b1
       - id: backwards
         type: b1
-      - id: flag8
+      - id: flag1
         type: b1
   point_2d:
     seq:
diff --git a/dwg_ac1009.ksy b/dwg_ac1009.ksy
index c2666e4..0bb910e 100644
--- a/dwg_ac1009.ksy
+++ b/dwg_ac1009.ksy
@@ -25,61 +25,61 @@ seq:
   - id: blocks
     type: block
     repeat: expr
-    repeat-expr: header.table_block.numitems
+    repeat-expr: header.table_block.num_items
   - id: crc_blocks
     size: header.table_layer.start-_io.pos
   - id: layers
     type: layer
     repeat: expr
-    repeat-expr: header.table_layer.numitems
+    repeat-expr: header.table_layer.num_items
   - id: crc_layers
     size: header.table_style.start-_io.pos
   - id: styles
     type: style
     repeat: expr
-    repeat-expr: header.table_style.numitems
+    repeat-expr: header.table_style.num_items
   - id: crc_styles
     size: header.table_linetype.start-_io.pos
   - id: linetypes
     type: linetype
     repeat: expr
-    repeat-expr: header.table_linetype.numitems
+    repeat-expr: header.table_linetype.num_items
   - id: crc_linetypes
     size: header.table_view.start-_io.pos
   - id: views
     type: view
     repeat: expr
-    repeat-expr: header.table_view.numitems
+    repeat-expr: header.table_view.num_items
   - id: crc_views
     size: header.variables.table_ucs.start-_io.pos
   - id: ucss
     type: ucs
     repeat: expr
-    repeat-expr: header.variables.table_ucs.numitems
+    repeat-expr: header.variables.table_ucs.num_items
   - id: crc_ucss
     size: header.variables.table_vport.start-_io.pos
   - id: vports
     type: vport
     repeat: expr
-    repeat-expr: header.variables.table_vport.numitems
+    repeat-expr: header.variables.table_vport.num_items
   - id: crc_vports
     size: header.variables.table_appid.start-_io.pos
   - id: appids
     type: appid
     repeat: expr
-    repeat-expr: header.variables.table_appid.numitems
+    repeat-expr: header.variables.table_appid.num_items
   - id: crc_appids
     size: header.variables.table_dimstyle.start-_io.pos
   - id: dimstyles
     type: dimstyle
     repeat: expr
-    repeat-expr: header.variables.table_dimstyle.numitems
+    repeat-expr: header.variables.table_dimstyle.num_items
   - id: crc_dimstyles
     size: header.variables.table_vx.start-_io.pos
   - id: vxs
     type: vx
     repeat: expr
-    repeat-expr: header.variables.table_vx.numitems
+    repeat-expr: header.variables.table_vx.num_items
   - id: crc_vxs
     size: header.blocks_start-_io.pos
   - id: block_entities
@@ -117,21 +117,21 @@ types:
         type: f8
   block_flag:
     seq:
-      - id: none
+      - id: flag128
         type: b1
-      - id: anonymous_block
+      - id: referenced
         type: b1
-      - id: flag32
+      - id: xref_resolved
         type: b1
-      - id: flag16
+      - id: xref_dep
         type: b1
-      - id: flag8
+      - id: xref_overlaid
         type: b1
-      - id: flag4
+      - id: is_xref
         type: b1
-      - id: resolved_external_reference
+      - id: has_attrs
         type: b1
-      - id: references_external_reference
+      - id: anonymous
         type: b1
   block_flag2:
     seq:
@@ -226,7 +226,7 @@ types:
     seq:
       - id: size
         type: u2
-      - id: numitems
+      - id: num_items
         type: u2
       - id: flags
         type: u2