diff --git a/.claude/skills/mxl-compile/scripts/mxl-compile.ps1 b/.claude/skills/mxl-compile/scripts/mxl-compile.ps1 index fd076e82..217485c7 100644 --- a/.claude/skills/mxl-compile/scripts/mxl-compile.ps1 +++ b/.claude/skills/mxl-compile/scripts/mxl-compile.ps1 @@ -1,4 +1,4 @@ -# mxl-compile v1.26 — Compile 1C spreadsheet from JSON +# mxl-compile v1.27 — Compile 1C spreadsheet from JSON # Source: https://github.com/Nikolay-Shirokov/cc-1c-skills param( [Parameter(Mandatory)] @@ -870,6 +870,35 @@ $merges = @() $namedItems = @() $totalRowCount = 0 +# Копилка подряд идущих одинаковых пустых строк — пишется одним rowsItem с indexTo. +$pendingGap = $null +function Add-GapRow { + param([string]$key, [int]$row, [string]$columnSet, [int]$formatIdx) + $gap = $script:pendingGap + # -ceq: ключ несёт GUID раскладки, а обычное -eq в PowerShell регистр не различает. + if ($gap -and $gap.Key -ceq $key -and $gap.End -eq ($row - 1)) { + $gap.End = $row + return + } + Flush-Gap + $script:pendingGap = @{ Key = $key; Start = $row; End = $row + ColumnSet = $columnSet; FormatIdx = $formatIdx } +} +function Flush-Gap { + if (-not $script:pendingGap) { return } + $gap = $script:pendingGap + $script:pendingGap = $null + X "`t" + X "`t`t$($gap.Start)" + if ($gap.End -gt $gap.Start) { X "`t`t$($gap.End)" } + X "`t`t" + if ($gap.ColumnSet) { X "`t`t`t$($gap.ColumnSet)" } + if ($gap.FormatIdx -gt 0) { X "`t`t`t$($gap.FormatIdx)" } + X "`t`t`ttrue" + X "`t`t" + X "`t" +} + foreach ($area in $def.areas) { $areaStartRow = $globalRow $areaName = $area.name @@ -904,12 +933,7 @@ foreach ($area in $def.areas) { if ($row.empty) { $count = [int]$row.empty for ($ei = 0; $ei -lt $count; $ei++) { - X "`t" - X "`t`t$globalRow" - X "`t`t" - X "`t`t`ttrue" - X "`t`t" - X "`t" + Add-GapRow -key '|0' -row $globalRow -columnSet '' -formatIdx 0 $globalRow++; $localRow++ } continue @@ -1071,7 +1095,19 @@ foreach ($area in $def.areas) { } } - # Emit rowsItem + # Emit rowsItem. + # Подряд идущие ОДИНАКОВЫЕ пустые строки платформа хранит одним элементом с indexTo; + # непустые не схлопывает, даже когда они совпадают. Поэтому пустую строку не пишем + # сразу, а копим в пробеле и сбрасываем, когда он оборвался. + if (-not $rowHasContent) { + Add-GapRow -key "$areaColumnSet|$rowFormatIdx" -row $globalRow ` + -columnSet $areaColumnSet -formatIdx $rowFormatIdx + $localRow++ + $globalRow++ + continue + } + Flush-Gap + X "`t" X "`t`t$globalRow" X "`t`t" @@ -1084,31 +1120,34 @@ foreach ($area in $def.areas) { X "`t`t`t$rowFormatIdx" } - if (-not $rowHasContent) { - X "`t`t`ttrue" - } else { - foreach ($cellInfo in $rowCells) { - X "`t`t`t" + # Номер колонки платформа пишет только при разрыве: подряд идущая ячейка его не + # несёт, читатель ведёт счётчик сам. Начальное значение счётчика -1, то есть у + # ячейки в колонке 0 номера тоже нет. + $prevCol = -1 + foreach ($cellInfo in $rowCells) { + X "`t`t`t" + if ($cellInfo.Col -ne ($prevCol + 1)) { X "`t`t`t`t$($cellInfo.Col)" - X "`t`t`t`t" - X "`t`t`t`t`t$($cellInfo.FormatIdx)" - - if ($cellInfo.Param) { - X "`t`t`t`t`t$($cellInfo.Param)" - if ($cellInfo.Detail) { - X "`t`t`t`t`t$($cellInfo.Detail)" - } - } - - # Проверяем НАЛИЧИЕ ключа, а не истинность: пустая строка — это текст, платформа - # такие ячейки пишет с пустым , и по истинности он терялся. - if ($null -ne $cellInfo.Text) { Emit-CellText $cellInfo.Text } - - if ($null -ne $cellInfo.Template) { Emit-CellText $cellInfo.Template } - - X "`t`t`t`t" - X "`t`t`t" } + $prevCol = $cellInfo.Col + X "`t`t`t`t" + X "`t`t`t`t`t$($cellInfo.FormatIdx)" + + if ($cellInfo.Param) { + X "`t`t`t`t`t$($cellInfo.Param)" + if ($cellInfo.Detail) { + X "`t`t`t`t`t$($cellInfo.Detail)" + } + } + + # Проверяем НАЛИЧИЕ ключа, а не истинность: пустая строка — это текст, платформа + # такие ячейки пишет с пустым , и по истинности он терялся. + if ($null -ne $cellInfo.Text) { Emit-CellText $cellInfo.Text } + + if ($null -ne $cellInfo.Template) { Emit-CellText $cellInfo.Template } + + X "`t`t`t`t" + X "`t`t`t" } X "`t`t" @@ -1132,6 +1171,7 @@ foreach ($area in $def.areas) { } } } +Flush-Gap $totalRowCount = $globalRow diff --git a/.claude/skills/mxl-compile/scripts/mxl-compile.py b/.claude/skills/mxl-compile/scripts/mxl-compile.py index 1328071f..f822cab5 100644 --- a/.claude/skills/mxl-compile/scripts/mxl-compile.py +++ b/.claude/skills/mxl-compile/scripts/mxl-compile.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# mxl-compile v1.26 — Compile 1C spreadsheet from JSON +# mxl-compile v1.27 — Compile 1C spreadsheet from JSON # Source: https://github.com/Nikolay-Shirokov/cc-1c-skills import argparse import hashlib @@ -882,6 +882,36 @@ def main(): named_items = [] active_rowspans = [] # list of {ColStart, ColEnd, StartLocalRow, EndLocalRow} + # Копилка подряд идущих одинаковых пустых строк — пишется одним rowsItem с indexTo. + pending_gap = [None] + + def flush_gap(): + gap = pending_gap[0] + if gap is None: + return + pending_gap[0] = None + lines.append('\t') + lines.append(f'\t\t{gap["Start"]}') + if gap['End'] > gap['Start']: + lines.append(f'\t\t{gap["End"]}') + lines.append('\t\t') + if gap['ColumnSet']: + lines.append(f'\t\t\t{gap["ColumnSet"]}') + if gap['FormatIdx'] > 0: + lines.append(f'\t\t\t{gap["FormatIdx"]}') + lines.append('\t\t\ttrue') + lines.append('\t\t') + lines.append('\t') + + def add_gap_row(key, row, column_set, format_idx): + gap = pending_gap[0] + if gap is not None and gap['Key'] == key and gap['End'] == row - 1: + gap['End'] = row + return + flush_gap() + pending_gap[0] = {'Key': key, 'Start': row, 'End': row, + 'ColumnSet': column_set, 'FormatIdx': format_idx} + for area in defn['areas']: area_start_row = global_row area_name = area.get('name', '') @@ -914,12 +944,7 @@ def main(): if row.get('empty'): count = int(row['empty']) for ei in range(count): - lines.append('\t') - lines.append(f'\t\t{global_row}') - lines.append('\t\t') - lines.append('\t\t\ttrue') - lines.append('\t\t') - lines.append('\t') + add_gap_row('|0', global_row, '', 0) global_row += 1 local_row += 1 continue @@ -1052,7 +1077,18 @@ def main(): 'Template': None, }) - # Emit rowsItem + # Emit rowsItem. + # Подряд идущие ОДИНАКОВЫЕ пустые строки платформа хранит одним элементом с indexTo; + # непустые не схлопывает, даже когда они совпадают. Поэтому пустую строку не пишем + # сразу, а копим в пробеле и сбрасываем, когда он оборвался. + if not row_has_content: + add_gap_row(f'{area_column_set}|{row_format_idx}', global_row, + area_column_set, row_format_idx) + local_row += 1 + global_row += 1 + continue + flush_gap() + lines.append('\t') lines.append(f'\t\t{global_row}') lines.append('\t\t') @@ -1063,30 +1099,33 @@ def main(): if row_format_idx > 0: lines.append(f'\t\t\t{row_format_idx}') - if not row_has_content: - lines.append('\t\t\ttrue') - else: - for cell_info in row_cells: - lines.append('\t\t\t') + # Номер колонки платформа пишет только при разрыве: подряд идущая ячейка его не + # несёт, читатель ведёт счётчик сам. Начальное значение счётчика -1, то есть у + # ячейки в колонке 0 номера тоже нет. + prev_col = -1 + for cell_info in row_cells: + lines.append('\t\t\t') + if cell_info['Col'] != prev_col + 1: lines.append(f'\t\t\t\t{cell_info["Col"]}') - lines.append('\t\t\t\t') - lines.append(f'\t\t\t\t\t{cell_info["FormatIdx"]}') + prev_col = cell_info['Col'] + lines.append('\t\t\t\t') + lines.append(f'\t\t\t\t\t{cell_info["FormatIdx"]}') - if cell_info['Param']: - lines.append(f'\t\t\t\t\t{cell_info["Param"]}') - if cell_info['Detail']: - lines.append(f'\t\t\t\t\t{cell_info["Detail"]}') + if cell_info['Param']: + lines.append(f'\t\t\t\t\t{cell_info["Param"]}') + if cell_info['Detail']: + lines.append(f'\t\t\t\t\t{cell_info["Detail"]}') - # Проверяем НАЛИЧИЕ ключа, а не истинность: пустая строка — это текст, - # платформа такие ячейки пишет с пустым , и по истинности он терялся. - if cell_info['Text'] is not None: - emit_cell_text(lines, cell_info['Text']) + # Проверяем НАЛИЧИЕ ключа, а не истинность: пустая строка — это текст, + # платформа такие ячейки пишет с пустым , и по истинности он терялся. + if cell_info['Text'] is not None: + emit_cell_text(lines, cell_info['Text']) - if cell_info['Template'] is not None: - emit_cell_text(lines, cell_info['Template']) + if cell_info['Template'] is not None: + emit_cell_text(lines, cell_info['Template']) - lines.append('\t\t\t\t') - lines.append('\t\t\t') + lines.append('\t\t\t\t') + lines.append('\t\t\t') lines.append('\t\t') lines.append('\t') @@ -1107,6 +1146,8 @@ def main(): 'EndCol': -1, }) + flush_gap() + total_row_count = global_row # 7d-bis. Именованные области, заданные координатами (namedAreas). diff --git a/tests/skills/cases/mxl-compile/snapshots/column-sets/Template.xml b/tests/skills/cases/mxl-compile/snapshots/column-sets/Template.xml index cb052440..406c81ee 100644 --- a/tests/skills/cases/mxl-compile/snapshots/column-sets/Template.xml +++ b/tests/skills/cases/mxl-compile/snapshots/column-sets/Template.xml @@ -56,7 +56,6 @@ 0 - 0 1 @@ -68,7 +67,6 @@ - 1 1 @@ -80,7 +78,6 @@ - 2 1 @@ -98,21 +95,18 @@ 12320174-2b07-3806-9f7f-ec3834007fdb - 0 4 Товар - 1 4 Кол - 2 4 Сумма diff --git a/tests/skills/cases/mxl-compile/snapshots/column-widths/Template.xml b/tests/skills/cases/mxl-compile/snapshots/column-widths/Template.xml index b238d5e8..845bd39d 100644 --- a/tests/skills/cases/mxl-compile/snapshots/column-widths/Template.xml +++ b/tests/skills/cases/mxl-compile/snapshots/column-widths/Template.xml @@ -52,7 +52,6 @@ 0 - 0 5 @@ -64,7 +63,6 @@ - 1 5 @@ -76,7 +74,6 @@ - 2 5 @@ -88,7 +85,6 @@ - 3 5 @@ -100,7 +96,6 @@ - 4 5 @@ -112,7 +107,6 @@ - 5 5 diff --git a/tests/skills/cases/mxl-compile/snapshots/empty-rows/Template.xml b/tests/skills/cases/mxl-compile/snapshots/empty-rows/Template.xml index 07a6c8ab..2da85557 100644 --- a/tests/skills/cases/mxl-compile/snapshots/empty-rows/Template.xml +++ b/tests/skills/cases/mxl-compile/snapshots/empty-rows/Template.xml @@ -16,7 +16,6 @@ 0 - 0 2 @@ -31,12 +30,7 @@ 1 - - true - - - - 2 + 2 true @@ -45,21 +39,18 @@ 3 - 0 4 Код - 1 4 Имя - 2 4 Значение diff --git a/tests/skills/cases/mxl-compile/snapshots/font-fractional-size/Template.xml b/tests/skills/cases/mxl-compile/snapshots/font-fractional-size/Template.xml index f7cf7835..301c29a4 100644 --- a/tests/skills/cases/mxl-compile/snapshots/font-fractional-size/Template.xml +++ b/tests/skills/cases/mxl-compile/snapshots/font-fractional-size/Template.xml @@ -16,7 +16,6 @@ 0 - 0 2 @@ -28,7 +27,6 @@ - 1 3 diff --git a/tests/skills/cases/mxl-compile/snapshots/format-strings/Template.xml b/tests/skills/cases/mxl-compile/snapshots/format-strings/Template.xml index 5c165820..008edd6b 100644 --- a/tests/skills/cases/mxl-compile/snapshots/format-strings/Template.xml +++ b/tests/skills/cases/mxl-compile/snapshots/format-strings/Template.xml @@ -16,7 +16,6 @@ 0 - 0 2 @@ -28,7 +27,6 @@ - 1 2 @@ -40,7 +38,6 @@ - 2 2 @@ -52,7 +49,6 @@ - 3 2 @@ -69,28 +65,24 @@ 1 - 0 4 Дата - 1 5 Товар - 2 6 Количество - 3 6 Цена diff --git a/tests/skills/cases/mxl-compile/snapshots/guard-allow-external/print-forms/Демо/Templates/Макет/Ext/Template.xml b/tests/skills/cases/mxl-compile/snapshots/guard-allow-external/print-forms/Демо/Templates/Макет/Ext/Template.xml index 1b911f97..b7224cf3 100644 --- a/tests/skills/cases/mxl-compile/snapshots/guard-allow-external/print-forms/Демо/Templates/Макет/Ext/Template.xml +++ b/tests/skills/cases/mxl-compile/snapshots/guard-allow-external/print-forms/Демо/Templates/Макет/Ext/Template.xml @@ -16,7 +16,6 @@ 0 - 0 1 diff --git a/tests/skills/cases/mxl-compile/snapshots/lenient-implicit-cols/Template.xml b/tests/skills/cases/mxl-compile/snapshots/lenient-implicit-cols/Template.xml index b50b38f4..011f8c59 100644 --- a/tests/skills/cases/mxl-compile/snapshots/lenient-implicit-cols/Template.xml +++ b/tests/skills/cases/mxl-compile/snapshots/lenient-implicit-cols/Template.xml @@ -16,7 +16,6 @@ 0 - 0 1 @@ -28,7 +27,6 @@ - 1 1 @@ -40,7 +38,6 @@ - 2 1 @@ -57,7 +54,6 @@ 1 - 0 1 @@ -69,7 +65,6 @@ - 1 1 @@ -81,7 +76,6 @@ - 2 1 @@ -110,7 +104,6 @@ - 2 1 @@ -127,7 +120,6 @@ 3 - 0 1 diff --git a/tests/skills/cases/mxl-compile/snapshots/lenient-key-case/Template.xml b/tests/skills/cases/mxl-compile/snapshots/lenient-key-case/Template.xml index 1a078e22..b9f4ad0f 100644 --- a/tests/skills/cases/mxl-compile/snapshots/lenient-key-case/Template.xml +++ b/tests/skills/cases/mxl-compile/snapshots/lenient-key-case/Template.xml @@ -16,7 +16,6 @@ 0 - 0 1 @@ -28,7 +27,6 @@ - 1 1 @@ -40,7 +38,6 @@ - 2 1 diff --git a/tests/skills/cases/mxl-compile/snapshots/merged-cells/Template.xml b/tests/skills/cases/mxl-compile/snapshots/merged-cells/Template.xml index 412cf046..350e36d1 100644 --- a/tests/skills/cases/mxl-compile/snapshots/merged-cells/Template.xml +++ b/tests/skills/cases/mxl-compile/snapshots/merged-cells/Template.xml @@ -16,7 +16,6 @@ 0 - 0 3 @@ -28,7 +27,6 @@ - 1 3 @@ -69,7 +67,6 @@ - 2 4 @@ -86,28 +83,24 @@ 2 - 0 5 Номер - 1 6 Наименование - 2 6 Артикул - 3 6 Итого diff --git a/tests/skills/cases/mxl-compile/snapshots/minimal/Template.xml b/tests/skills/cases/mxl-compile/snapshots/minimal/Template.xml index c71879cb..03bd77c5 100644 --- a/tests/skills/cases/mxl-compile/snapshots/minimal/Template.xml +++ b/tests/skills/cases/mxl-compile/snapshots/minimal/Template.xml @@ -16,7 +16,6 @@ 0 - 0 1 diff --git a/tests/skills/cases/mxl-compile/snapshots/multiple-areas/Template.xml b/tests/skills/cases/mxl-compile/snapshots/multiple-areas/Template.xml index e159efe9..f420b0b1 100644 --- a/tests/skills/cases/mxl-compile/snapshots/multiple-areas/Template.xml +++ b/tests/skills/cases/mxl-compile/snapshots/multiple-areas/Template.xml @@ -17,7 +17,6 @@ 2 - 0 3 ТекстЗаголовка @@ -29,7 +28,6 @@ 1 - 0 4 @@ -41,7 +39,6 @@ - 1 4 @@ -53,7 +50,6 @@ - 2 4 @@ -65,7 +61,6 @@ - 3 4 @@ -82,14 +77,12 @@ 2 - 0 5 НомерСтроки - 1 5 Товар @@ -97,14 +90,12 @@ - 2 6 Количество - 3 6 Сумма @@ -128,7 +119,6 @@ - 3 8 Всего diff --git a/tests/skills/cases/mxl-compile/snapshots/named-areas-coords/Template.xml b/tests/skills/cases/mxl-compile/snapshots/named-areas-coords/Template.xml index 531e5a58..2f9994ac 100644 --- a/tests/skills/cases/mxl-compile/snapshots/named-areas-coords/Template.xml +++ b/tests/skills/cases/mxl-compile/snapshots/named-areas-coords/Template.xml @@ -16,7 +16,6 @@ 0 - 0 1 @@ -28,7 +27,6 @@ - 1 1 @@ -40,7 +38,6 @@ - 2 1 @@ -52,7 +49,6 @@ - 3 1 @@ -69,28 +65,24 @@ 1 - 0 2 П1 - 1 2 П2 - 2 2 П3 - 3 2 П4 diff --git a/tests/skills/cases/mxl-compile/snapshots/nested-output-dir/Templates/Макет/Ext/Template.xml b/tests/skills/cases/mxl-compile/snapshots/nested-output-dir/Templates/Макет/Ext/Template.xml index b92dc3ea..91f8a0d7 100644 --- a/tests/skills/cases/mxl-compile/snapshots/nested-output-dir/Templates/Макет/Ext/Template.xml +++ b/tests/skills/cases/mxl-compile/snapshots/nested-output-dir/Templates/Макет/Ext/Template.xml @@ -16,7 +16,6 @@ 0 - 0 1 diff --git a/tests/skills/cases/mxl-compile/snapshots/page-a4-landscape/Template.xml b/tests/skills/cases/mxl-compile/snapshots/page-a4-landscape/Template.xml index 9c9e8b9e..342e4ac8 100644 --- a/tests/skills/cases/mxl-compile/snapshots/page-a4-landscape/Template.xml +++ b/tests/skills/cases/mxl-compile/snapshots/page-a4-landscape/Template.xml @@ -46,7 +46,6 @@ 0 - 0 3 @@ -58,7 +57,6 @@ - 1 3 @@ -70,7 +68,6 @@ - 2 3 @@ -82,7 +79,6 @@ - 3 3 @@ -94,7 +90,6 @@ - 4 3 @@ -111,35 +106,30 @@ 1 - 0 5 Номер - 1 6 Описание - 2 5 ЕдИзм - 3 5 Количество - 4 6 Сумма diff --git a/tests/skills/cases/mxl-compile/snapshots/parameters-and-templates/Template.xml b/tests/skills/cases/mxl-compile/snapshots/parameters-and-templates/Template.xml index 4d365bee..bcc193b4 100644 --- a/tests/skills/cases/mxl-compile/snapshots/parameters-and-templates/Template.xml +++ b/tests/skills/cases/mxl-compile/snapshots/parameters-and-templates/Template.xml @@ -16,7 +16,6 @@ 0 - 0 2 @@ -28,7 +27,6 @@ - 1 3 @@ -45,7 +43,6 @@ 1 - 0 2 @@ -57,7 +54,6 @@ - 1 3 @@ -74,21 +70,18 @@ 2 - 0 5 Позиция - 1 5 Товар - 2 5 Цена diff --git a/tests/skills/cases/mxl-compile/snapshots/print-form/Template.xml b/tests/skills/cases/mxl-compile/snapshots/print-form/Template.xml index 513fc806..e5e92593 100644 --- a/tests/skills/cases/mxl-compile/snapshots/print-form/Template.xml +++ b/tests/skills/cases/mxl-compile/snapshots/print-form/Template.xml @@ -77,7 +77,6 @@ 2 - 0 3 ТекстЗаголовка @@ -95,7 +94,6 @@ 2 - 0 4 @@ -119,7 +117,6 @@ 3 - 0 4 @@ -143,7 +140,6 @@ 4 - 0 7 @@ -155,7 +151,6 @@ - 1 7 @@ -179,7 +174,6 @@ - 7 7 @@ -191,7 +185,6 @@ - 8 7 @@ -203,7 +196,6 @@ - 9 7 @@ -220,14 +212,12 @@ 5 - 0 8 НомерСтроки - 1 9 Товар @@ -242,21 +232,18 @@ - 7 10 Количество - 8 10 Цена - 9 10 Сумма @@ -314,12 +301,7 @@ 8 - - true - - - - 9 + 9 true @@ -328,7 +310,6 @@ 10 - 0 4 @@ -375,7 +356,6 @@ 13 - 0 4 diff --git a/tests/skills/cases/mxl-compile/snapshots/shorthand-merges/Template.xml b/tests/skills/cases/mxl-compile/snapshots/shorthand-merges/Template.xml index fa72f75d..c3cd9ec9 100644 --- a/tests/skills/cases/mxl-compile/snapshots/shorthand-merges/Template.xml +++ b/tests/skills/cases/mxl-compile/snapshots/shorthand-merges/Template.xml @@ -16,7 +16,6 @@ 0 - 0 1 @@ -28,7 +27,6 @@ - 1 1 @@ -69,7 +67,6 @@ - 2 1 @@ -86,28 +83,24 @@ 2 - 0 2 Вид - 1 2 Нач - 2 2 Кон - 3 2 Итог diff --git a/tests/skills/cases/mxl-compile/snapshots/shorthand-rows/Template.xml b/tests/skills/cases/mxl-compile/snapshots/shorthand-rows/Template.xml index a8085475..1d4a7e4f 100644 --- a/tests/skills/cases/mxl-compile/snapshots/shorthand-rows/Template.xml +++ b/tests/skills/cases/mxl-compile/snapshots/shorthand-rows/Template.xml @@ -16,7 +16,6 @@ 0 - 0 1 @@ -28,7 +27,6 @@ - 1 1 @@ -40,7 +38,6 @@ - 2 1 @@ -52,7 +49,6 @@ - 3 1 @@ -69,14 +65,12 @@ 1 - 0 2 Товар - 1 2 Кол diff --git a/tests/skills/cases/mxl-compile/snapshots/simple-template/Template.xml b/tests/skills/cases/mxl-compile/snapshots/simple-template/Template.xml index 1a078e22..b9f4ad0f 100644 --- a/tests/skills/cases/mxl-compile/snapshots/simple-template/Template.xml +++ b/tests/skills/cases/mxl-compile/snapshots/simple-template/Template.xml @@ -16,7 +16,6 @@ 0 - 0 1 @@ -28,7 +27,6 @@ - 1 1 @@ -40,7 +38,6 @@ - 2 1 diff --git a/tests/skills/cases/mxl-compile/snapshots/styles-fonts-borders/Template.xml b/tests/skills/cases/mxl-compile/snapshots/styles-fonts-borders/Template.xml index 00733052..84a9ecba 100644 --- a/tests/skills/cases/mxl-compile/snapshots/styles-fonts-borders/Template.xml +++ b/tests/skills/cases/mxl-compile/snapshots/styles-fonts-borders/Template.xml @@ -17,7 +17,6 @@ 2 - 0 3 @@ -34,7 +33,6 @@ 1 - 0 4 @@ -58,7 +56,6 @@ 2 - 0 6 @@ -70,7 +67,6 @@ - 1 6 @@ -82,7 +78,6 @@ - 2 6 @@ -94,7 +89,6 @@ - 3 6 @@ -106,7 +100,6 @@ - 4 6 @@ -123,35 +116,30 @@ 3 - 0 8 НомерСтроки - 1 9 Товар - 2 10 Количество - 3 10 Цена - 4 10 Сумма @@ -175,7 +163,6 @@ - 4 12 Всего @@ -187,7 +174,6 @@ 5 - 0 13 diff --git a/tests/skills/cases/mxl-compile/snapshots/text-languages/Template.xml b/tests/skills/cases/mxl-compile/snapshots/text-languages/Template.xml index da2fb112..ee6b34ac 100644 --- a/tests/skills/cases/mxl-compile/snapshots/text-languages/Template.xml +++ b/tests/skills/cases/mxl-compile/snapshots/text-languages/Template.xml @@ -16,7 +16,6 @@ 0 - 0 1 @@ -32,7 +31,6 @@ - 1 1 diff --git a/tests/skills/cases/mxl-compile/snapshots/text-multilang/Template.xml b/tests/skills/cases/mxl-compile/snapshots/text-multilang/Template.xml index cd9f3567..842b89dd 100644 --- a/tests/skills/cases/mxl-compile/snapshots/text-multilang/Template.xml +++ b/tests/skills/cases/mxl-compile/snapshots/text-multilang/Template.xml @@ -16,7 +16,6 @@ 0 - 0 1 @@ -28,7 +27,6 @@ - 1 1 @@ -44,7 +42,6 @@ - 2 2 diff --git a/tests/skills/cases/mxl-compile/snapshots/unnamed-blocks/Template.xml b/tests/skills/cases/mxl-compile/snapshots/unnamed-blocks/Template.xml index 99652405..b0158545 100644 --- a/tests/skills/cases/mxl-compile/snapshots/unnamed-blocks/Template.xml +++ b/tests/skills/cases/mxl-compile/snapshots/unnamed-blocks/Template.xml @@ -16,7 +16,6 @@ 0 - 0 1 @@ -28,7 +27,6 @@ - 1 1 @@ -40,7 +38,6 @@ - 2 1 @@ -57,7 +54,6 @@ 1 - 0 1 @@ -74,21 +70,18 @@ 2 - 0 2 П1 - 1 2 П2 - 2 2 П3