diff --git a/kibot/bom/xlsx_writer.py b/kibot/bom/xlsx_writer.py index 6214e304..194e00a0 100644 --- a/kibot/bom/xlsx_writer.py +++ b/kibot/bom/xlsx_writer.py @@ -13,6 +13,7 @@ import pprint import os.path as op import sys import logging +import html from textwrap import wrap from base64 import b64decode from .columnlist import ColumnList @@ -314,6 +315,8 @@ def create_meta(workbook, name, columns, parts, fmt_head, fmt_cols, max_w, renam if not text_l: continue fmt_kind = 0 if col_l in SPECS_GENERATED else 2 + text = html.unescape(text) + logger.debugl(3, 'Spec ({},{}): `{}`'.format(r, c, text)) worksheet.write_string(r+1, c, text, fmt_cols[fmt_kind][r % 2]) if text_l > col_w[c]: if text_l > max_w: diff --git a/submodules/KiCost b/submodules/KiCost index f62c7148..44e2c0d9 160000 --- a/submodules/KiCost +++ b/submodules/KiCost @@ -1 +1 @@ -Subproject commit f62c71482f799e77c99d74dc5fa86e8b2150ac2b +Subproject commit 44e2c0d96b723dbf0f9cc8387e46d32844544630 diff --git a/tests/reference/5_1_6/KiCost/kibom-variant_2c-bom_spec.csv b/tests/reference/5_1_6/KiCost/kibom-variant_2c-bom_spec.csv index c624c067..3ccc92b9 100644 --- a/tests/reference/5_1_6/KiCost/kibom-variant_2c-bom_spec.csv +++ b/tests/reference/5_1_6/KiCost/kibom-variant_2c-bom_spec.csv @@ -1,2 +1,2 @@ References,case_package,case_package_si,packaging,pin_count,power_rating,reach_svhc_compliance,resistance,resistance_tolerance,rohs_status,size_length,size_thickness,size_width,temperature_coefficient,voltage_rating_dc -R1 R2,0603,1608,"Cut Tape (CT), Tape & Reel (TR)",2,100 mW,No SVHC,1.00 kΩ,±5%,Compliant,1.60 mm,457 µm,787 µm,-200 ppm/°C to 200 ppm/°C,50.0 V +R1 R2,0603,1608,"Cut Tape (CT), Tape & Reel (TR)",2,100 mW,No SVHC,1.00 kΩ,±5%,Compliant,1.60 mm,457 µm,787 µm,-200 ppm/°C to 200 ppm/°C,50.0 V diff --git a/tests/reference/5_1_6/KiCost/kibom-variant_2c-bom_spec_dnf.csv b/tests/reference/5_1_6/KiCost/kibom-variant_2c-bom_spec_dnf.csv index b1f2aad3..5fc6871a 100644 --- a/tests/reference/5_1_6/KiCost/kibom-variant_2c-bom_spec_dnf.csv +++ b/tests/reference/5_1_6/KiCost/kibom-variant_2c-bom_spec_dnf.csv @@ -1,2 +1,2 @@ References,capacitance,capacitance_tolerance,case_package,dielectric_characteristic,lead_free_status,mounting_style,operating_temperature,rohs_status,voltage_rating_dc -C1 C2,1.00 nF,±10%,0603,X7R,Lead Free,Surface Mount,-55.0 °C (min),Compliant,100 V +C1 C2,1.00 nF,±10%,0603,X7R,Lead Free,Surface Mount,-55.0 °C (min),Compliant,100 V