-\dim_new:N \l_kivi_tab_desc_dim
-\bool_new:N \l_kivi_col_desc_bool
-\bool_set_true:N \l_kivi_col_desc_bool
-
-\clist_map_inline:nn {pos, id, amount, price, pricetotal} {
- \bool_new:c {l_kivi_col_#1_bool}
- \dim_new:c {l_kivi_tab_#1_dim}
- \keys_define:nn {kivi/PricingTable} {
- #1 .choice:,
- #1 / true .code:n = \bool_set_true:c {l_kivi_col_#1_bool},
- #1 / false .code:n = \bool_set_false:c {l_kivi_col_#1_bool},
- #1 /unknown .code:n = {\bool_set_true:c {l_kivi_col_#1_bool}\dim_set:cn {g_kivi_tab_#1_dim} {##1}},
- #1 .default:n = true,
- #1 .initial:n = true,
- }
+\dim_new:N \l_kivi_tab_desc_leftskip_dim
+
+
+
+\cs_new:Nn \__kivi_set_colwidth:nn {
+ \dim_set:cn {l_kivi_tab_#1_dim} {#2}
+}
+
+
+\cs_new:Nn \__kivi_initialize_columns: {
+ \clist_map_inline:Nn \g_kivi_pricingtable_col_clist {
+ \bool_if_exist:cF {l_kivi_col_##1_bool}
+ {
+ \bool_new:c {l_kivi_col_##1_bool}
+ \dim_new:c {l_kivi_tab_##1_dim}
+ \keys_define:nn {kivi/PricingTable} {
+ ##1 .choice:,
+ ##1 / true .code:n = \bool_set_true:c {l_kivi_col_##1_bool},
+ ##1 / false .code:n = \bool_set_false:c {l_kivi_col_##1_bool},
+ ##1 / unknown .code:n = {
+ \bool_set_true:c {l_kivi_col_##1_bool}
+ \dim_set:cn {l_kivi_tab_##1_dim} {####1}
+ },
+ ##1 .default:n = true,
+ ##1 .initial:n = true,
+ ##1 / header .prop_put:c = {l_kivi_col_##1_prop},
+ ##1 / colspec .prop_put:c = {l_kivi_col_##1_prop},
+ }
+ }
+ }
+}
+
+\clist_new:N \g_kivi_pricingtable_col_clist
+
+\keys_define:nn {kivi/PricingTable} {
+ columns .code:n =
+ \clist_gset:Nn \g_kivi_pricingtable_col_clist {#1}
+ \__kivi_initialize_columns:,
+ columns .initial:n = {pos, id, desc, amount, price, pricetotal},
+ unknown .code:n = \keys_set:no {kivi/Tabular} {\l_keys_key_str=#1}