From da8559c6882d1dc641a1bbc5536b5c37ba202c19 Mon Sep 17 00:00:00 2001 From: James Ball Date: Fri, 10 Oct 2025 13:24:26 -0700 Subject: [PATCH] Limit witdth of name and description columns Signed-off-by: James Ball --- tests/norm-rule/expected/test-norm-rules.json | 4 ++-- tests/norm-rule/expected/test-norm-rules.xlsx | Bin 6677 -> 6726 bytes tests/norm-rule/test.yaml | 4 ++-- tools/create_normative_rules.rb | 6 +++++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/tests/norm-rule/expected/test-norm-rules.json b/tests/norm-rule/expected/test-norm-rules.json index ee337cd..0418e1e 100644 --- a/tests/norm-rule/expected/test-norm-rules.json +++ b/tests/norm-rule/expected/test-norm-rules.json @@ -19,7 +19,7 @@ ] }, { - "name": "paragraph", + "name": "paragraph-with-a-really-wide-rule-name", "def_filename": "tests/norm-rule/test.yaml", "chapter_name": "my-chapter_name", "description": "Here's a description.\nIt's got 2 lines.\n", @@ -39,7 +39,7 @@ "instances": [ "MY_PARAMETER" ], - "description": "Here's a one line description.", + "description": "Here's a one line description but it is very wide so should wrap within a cell.", "tags": [ { "name": "norm:note-1", diff --git a/tests/norm-rule/expected/test-norm-rules.xlsx b/tests/norm-rule/expected/test-norm-rules.xlsx index ea375f3ecb1b425356c7cc31533f85feceafbe92..a9b62f288a75c9fed232643d89b224f83e44b6bd 100644 GIT binary patch delta 1881 zcmZ7%dpy+n_BW3hF*7j+V~5FOvMA$bD9>XIhBVml~_dd;-r@D$wn#Y2RHhHsWl^zOjriCvS{>!A& zo4~|u#YWgxD>13b+U_pw;x!_-?$DBTa$!aC5XJE8K{>n+EhQG$)tEr5MtYMv93Z85 z|8jfTMP%pm+puHvS0~+%js+Q3p=mAMi4CF6vV|3M8o85v{feKbQECPGS17t?O`dK( zFP9BVEQZKEwk#y#Y%W=Q&;6jX@;Jd`H~(PRkVTT{(>pPXHEI@gt<7|%|NYyw*;<0B ziqIDe^TZY^o{8axR72^0UDN9Gn`Si}z02SH92@;Q1kb31X(j-SE0+3%o{G2JIHA=O z+WFi>kF#hZBmZjD>Tpx5@Eh3d^O*^;obgQiHhg#*{lE1R`9p*dXm5cC2~*smd*LZN zw00L^hxW-#?vl#u6<$brFa@=Yl$KczIqnb+1pp;58NHW(^4m~>@t(GIns<9B5T})< zB)l-hxa3{+vR?$-=e;YHRWY~y$&^6+=hsdo#kGRjb+4`w;U}`R_u)wIWVQuL;|YfrOjJn+%RC_m+#e!catvs>L_zi&dm|22 zK27(#8T&cD;IL1Fa<V5{fHS3q-(Tcb39oe;sN%c}2=EgJ`<%MVb5@ociMp4s6>Rg3q7~|Rca9I8Ca{qvyk3*mRMB*h-5;e|kqT%q_P* zT5io>Zp~^mw|R}|#+O7xB?uCT8sx`s$O_{1YNv4LI5i<_Jnfmd2cN*Xt^Ad3@6mUg z(b{5{(A8W=YWj+$qNCTb%t3o_#UkMdIm2V{Ctu^F5pJx{I6-gfEi}mwtVbp3)`A&TMkG zYnER^0Kg5b!{GUzJ?TTn%CFW9Z?*cz6_`07C{#+BLW!+|;Dkzjl1r4{?HR{<4U4Uq zkAO`UsdJx8g%k9InN9b|+rotf#>l!;7rN0^tq7crItoNE?+rw_+7QMEY4F0c*G+=R zZ)W1tzf%?Unxl(7TMEhJcWKmVp$wMI9x6fg7Tr$%$ggjVnD$9YZIKx?%r8y3-(&xe zVmZ(9AsfB9bI>A{3Cpp~U4EI`?2?C3#jcIP-V1}d*Y$gq=nQHp*C$Ya1@Zl_8k$pq z`y=gkFIvy%T{sqn%@OsFgqqpe{-jH5Lv3<5v9*du`0z;oK&q_3jCGiroc$ zH~;%tFZr(8MUR&>57@9fE(@w_0(oJFZ-nqVf?sPTRL;Hu$4dehe_K2LRo*T2(~fT% zm%J%-rVrOEqnUk2(dbjgOc`P0*~L9m?DGMxdoVF3lj=iMRQFzmC06mT5Ui7V!&gNH z3X$fz7wC^iSEJin%*TGyGoic=e^D_O@l>Ashlzb4Dwna=cz*RpTJ>>{0P$?;yaUI; zO6VvXO1j>F+&IPatpC%ovoR$c@xz~kKV@KaL}(G28a1CCuttt2St(SZZ9iz;8D4rt zJA6G0R()zv2Bnc2DS?EZ! zk-+DKqETQ0iU@9~DeV2*!bJdp+GoB0D*lKDGtlaw4NgHC)dh!#;K3lACP8ZT*H?f8 kfb=m^`0PF(EXV0c4SH~RXc-pF#HxV*#_f^OP?hTZ2RX+nf&c&j delta 1796 zcmYjSc{JPk7XKxdQDQ40Ap}v4c*STeo$+V~2T4UYOB!lvRZv?jHO~@KQx9#5UlWA3 zp*jfK3AIc^%UFt{6<1NB_~CsMaJC*~iQH$^Ur0hR|5OQQs~6%0?>uUO~E#Tx3P^ z?7)=+pFSHeh_!1qj>ECUBbph(9Hj*8BiF`kA1v)EjucVH-5(l5^&g_0Rv6KGQEL;} z258IW(K3sndTq9{C+{;2s)-CIx!7BE6%KxHAiDi`=O8Qg9%#NS-E-fnWO zOC0sBdcZ?)t!6J+Dvd@^{O*#OTHZ~SBu!|Z`4Tt9{AvJC z88$qoNkLVo_UNi zx_>U+dxs~v@k(caqfdZ|nwtynvSw>}+2&F@L9eK!=T8HAyro5%i{;9vae zwy|*9x(?shg3T7vDg1_j_4*k8tV@);uiTHnRJS;v3q=ye1-k_W-aHNU+XjRz zi#Ts$OVN#k4JK#3|Xk%bDLWr0$%E*?QI5y`v3meRO|k}a{q|0 z?I|JZ#lq1#`Y2vJ0qx$qR(DuD-3gG+ufzh;SutThEhtOB3E6VGd^ z{wx}{=Ldy#zYnxBD|H3Q!}i4k%|c6ZV92oZ_>-9!49c?`?a}QB=JXlWm~3TJYF;di z=z?$C8N=<2y&1&=QS7O%J@u3xyldhE7f#T~ zAv+sn{d_BPYkAzd$H}AVgRVNo+x^g^gStO6_3g`(ZJsrX5(MGrRek<7m9j|Nj6X8G z7{73;wC2)9edo_R%*0CS1V-jEFYyGja{s~NwBD|`XBX>c6595)&g7QR|JJcopxB+s zkZono#rx^;AOHXXf73wG!H3KdOSPWm)SP?^Kev%z6*_Qzyvr`fs;FN55c7Q2fC*dV z{@d>OKcV*R4o02~r}4yCs4M**lKyhtGbQy_#5%KwcYY_o)I!$awMSXi!LHd(!4wO4 zP@qV*&CIqdgOAPqqlw+oSm5E@{rto)WrJp;!l4qazI;IswJ(Yu*8iwUJ|xJ@`AGs| zkCuhg9{7&l5~iK{a0EoJI$AGkOToffhr;S9oj;oAQy+pyx?ha#4MTmTw&#SqU=ozi zCS{&Hskne?4XsE!j!yCV-TL8Jw2gy-ZQtW58ArN(`k|Zm_9Kj^3!8<#!rrEL9m)9h z0Y)Y?GV0g^^R5(nQ%EIC*-3UYG0`FHW%Lh4FCC&(3*Pa*$I!zO4cA4uTr2i#F);M~ z^VF@T4YP-%c%8|)KLgix3H+DG1SOq=X;!pr7+;mLv;KoPyKAryFm`aFso!R0j5UYv z*;*Q(YDMHCR!=gTwe^}vj)F@%-e0IiB=t|C(@C`}u_8PEl0av7Mcp zjg|&g+9*AU3;+bsLe9ilm`mS7L+ zr6v&yP?1pvIwDNB^CM7@Kfo-6ku<201QlQ}0%ag&!(CJ58zksm5(-92mDpD{T?OQ* z>;g@Zux;SC)u;dfh_AT+0^?Lcrm7AYjf6?lry@}hU66y+-!AT(Y-IsJTEEo3rY{1= akQgap1Brsh!@&-?7HFxXCcmg9#ry@T77PFY diff --git a/tests/norm-rule/test.yaml b/tests/norm-rule/test.yaml index 4b5c8fc..7840137 100644 --- a/tests/norm-rule/test.yaml +++ b/tests/norm-rule/test.yaml @@ -12,13 +12,13 @@ normative_rule_definitions: kind: extension instances: [Zicsr, ABC] tags: ["norm:inline"] - - name: paragraph + - name: paragraph-with-a-really-wide-rule-name description: | Here's a description. It's got 2 lines. tags: ["norm:para"] - name: note_with_2_tags - description: Here's a one line description. + description: Here's a one line description but it is very wide so should wrap within a cell. kind: parameter instances: [MY_PARAMETER] tags: ["norm:note-1", "norm:note-3"] diff --git a/tools/create_normative_rules.rb b/tools/create_normative_rules.rb index 56840bd..8652eba 100644 --- a/tools/create_normative_rules.rb +++ b/tools/create_normative_rules.rb @@ -597,7 +597,7 @@ def output_xlsx(filename, defs, tags) right_arrow = "\u2192" defs.norm_rule_defs.each do |d| worksheet.write(row_num, 0, d.chapter_name) - worksheet.write(row_num, 1, d.name) + worksheet.write(row_num, 1, d.name, wrap_format) worksheet.write(row_num, 2, d.summary) unless d.summary.nil? worksheet.write(row_num, 3, d.description.chomp, wrap_format) unless d.description.nil? worksheet.write(row_num, 4, d.kind) unless d.kind.nil? @@ -626,6 +626,10 @@ def output_xlsx(filename, defs, tags) # Set column widths to hold data width. worksheet.autofit + # Override autofit for really wide columns + worksheet.set_column(1, 1, 20) # name column + worksheet.set_column(3, 3, 30) # description column + workbook.close end