Мост .xlsx → PDF: SpreadsheetML-конвейер без LibreOffice/POI #91
@@ -0,0 +1,176 @@
|
|||||||
|
package ru.pjandro.wordpdf.internal.xlsx;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Превращение {@link ColorSpec} в {@code RRGGBB} для Word: theme →
|
||||||
|
* {@link ThemeModel}, indexed → легаси-палитра Excel 97 (0..63), tint/shade —
|
||||||
|
* коррекция светлоты в HSL (как Excel, MS-OI29500 §2.3.1.6.16: luminance
|
||||||
|
* модифицируется, hue/saturation сохраняются). Ни одного источника —
|
||||||
|
* {@code null} (Word рисует auto).
|
||||||
|
*/
|
||||||
|
final class ColorResolver {
|
||||||
|
|
||||||
|
/** Легаси-палитра indexed 0..63 (Excel 97; ECMA-376 legacyColorIndex). */
|
||||||
|
private static final String[] INDEXED = {
|
||||||
|
"000000", "FFFFFF", "FF0000", "00FF00", "0000FF", "FFFF00", "FF00FF", "00FFFF",
|
||||||
|
"000000", "FFFFFF", "FF0000", "00FF00", "0000FF", "FFFF00", "FF00FF", "00FFFF",
|
||||||
|
"800000", "008000", "000080", "808000", "800080", "008080", "C0C0C0", "808080",
|
||||||
|
"9999FF", "993366", "FFFFCC", "CCFFFF", "660066", "FF8080", "0066CC", "CCCCFF",
|
||||||
|
"000080", "FF00FF", "FFFF00", "00FFFF", "800080", "800000", "008080", "0000FF",
|
||||||
|
"00CCFF", "CCFFFF", "CCFFCC", "FFFF99", "99CCFF", "FF99CC", "CC99FF", "3366FF",
|
||||||
|
"33CCCC", "99CC00", "FFCC00", "FF9900", "FF6600", "666699", "969696", "999999",
|
||||||
|
"C0C0C0", "C0C0C0", "C0C0C0", "C0C0C0", "C0C0C0", "C0C0C0",
|
||||||
|
};
|
||||||
|
|
||||||
|
/** Легаси-палитра заканчивается 61; 62/63 — системные auto; 64+ — цвета styles. */
|
||||||
|
private static final int CUSTOM_PALETTE_BASE = 64;
|
||||||
|
/** Длина RGB-hex. */
|
||||||
|
private static final int RGB_HEX_LEN = 6;
|
||||||
|
/** Длина ARGB-hex. */
|
||||||
|
private static final int ARGB_HEX_LEN = 8;
|
||||||
|
|
||||||
|
private final ThemeModel theme;
|
||||||
|
/** styles colors/indexedColors: легаси-индексы 64+n (§18.18.26). */
|
||||||
|
private final java.util.List<String> styleIndexed;
|
||||||
|
|
||||||
|
ColorResolver(ThemeModel theme, java.util.List<String> styleIndexed) {
|
||||||
|
this.theme = theme;
|
||||||
|
this.styleIndexed = styleIndexed;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** RRGGBB без «#» или null (auto / неразрешимый индекс / битый hex). */
|
||||||
|
String resolve(ColorSpec spec) {
|
||||||
|
if (spec == null || spec.isEmpty()) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
Integer rgb = baseRgb(spec);
|
||||||
|
if (rgb == null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return String.format(java.util.Locale.ROOT, "%06X", applyModulation(rgb, spec));
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Базовый RGB до tint/shade; null — не разрешился. */
|
||||||
|
private Integer baseRgb(ColorSpec spec) {
|
||||||
|
if (spec.rgb() != null) {
|
||||||
|
return parseHex(spec.rgb());
|
||||||
|
}
|
||||||
|
if (spec.theme() != null) {
|
||||||
|
String element = ThemeModel.elementForIndex(spec.theme());
|
||||||
|
String hex = element == null ? null : theme.color(element);
|
||||||
|
return hex == null ? null : parseHex(hex);
|
||||||
|
}
|
||||||
|
if (spec.indexed() != null && spec.indexed() >= 0) {
|
||||||
|
int idx = spec.indexed();
|
||||||
|
if (idx < INDEXED.length) {
|
||||||
|
return parseHex(INDEXED[idx]);
|
||||||
|
}
|
||||||
|
if (idx < CUSTOM_PALETTE_BASE) {
|
||||||
|
return null; // 62/63 — системные auto, в палитре их нет
|
||||||
|
}
|
||||||
|
String hex = idx - CUSTOM_PALETTE_BASE < styleIndexed.size()
|
||||||
|
? styleIndexed.get(idx - CUSTOM_PALETTE_BASE) : null;
|
||||||
|
return hex == null ? null : parseHex(hex);
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** ARGB (8 hex) или RGB (6 hex) → int RGB; битый — null. */
|
||||||
|
private static Integer parseHex(String hex) {
|
||||||
|
String h = hex.length() == ARGB_HEX_LEN ? hex.substring(2) : hex;
|
||||||
|
if (h.length() != RGB_HEX_LEN) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
return Integer.valueOf(h, 16);
|
||||||
|
} catch (NumberFormatException e) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Tint/shade по каналам в HSL: tint t>0 → L' = L·(1−t)+t (осветление к
|
||||||
|
* белому), shade t<0 → L' = L·(1+t) (затемнение к чёрному). Оба атрибута
|
||||||
|
* применяются последовательно (Excel делает так же).
|
||||||
|
*/
|
||||||
|
private static int applyModulation(int rgb, ColorSpec spec) {
|
||||||
|
int r = (rgb >> 16) & 0xFF;
|
||||||
|
int g = (rgb >> 8) & 0xFF;
|
||||||
|
int b = rgb & 0xFF;
|
||||||
|
if (spec.tint() != null) {
|
||||||
|
double[] hsl = toHsl(r, g, b);
|
||||||
|
hsl[2] = modulateLuminance(hsl[2], spec.tint());
|
||||||
|
int[] back = toRgb(hsl);
|
||||||
|
r = back[0];
|
||||||
|
g = back[1];
|
||||||
|
b = back[2];
|
||||||
|
}
|
||||||
|
if (spec.shade() != null) {
|
||||||
|
double[] hsl = toHsl(r, g, b);
|
||||||
|
hsl[2] = modulateLuminance(hsl[2], spec.shade());
|
||||||
|
int[] back = toRgb(hsl);
|
||||||
|
r = back[0];
|
||||||
|
g = back[1];
|
||||||
|
b = back[2];
|
||||||
|
}
|
||||||
|
return (r << 16) | (g << 8) | b;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static double modulateLuminance(double l, double t) {
|
||||||
|
double nl = t > 0 ? l * (1 - t) + t : l * (1 + t);
|
||||||
|
return Math.min(1, Math.max(0, nl));
|
||||||
|
}
|
||||||
|
|
||||||
|
private static double[] toHsl(int r, int g, int b) {
|
||||||
|
double rf = r / 255.0;
|
||||||
|
double gf = g / 255.0;
|
||||||
|
double bf = b / 255.0;
|
||||||
|
double max = Math.max(rf, Math.max(gf, bf));
|
||||||
|
double min = Math.min(rf, Math.min(gf, bf));
|
||||||
|
double l = (max + min) / 2;
|
||||||
|
double d = max - min;
|
||||||
|
double h = 0;
|
||||||
|
double s = 0;
|
||||||
|
if (d > 0) {
|
||||||
|
s = l > 0.5 ? d / (2 - max - min) : d / (max + min);
|
||||||
|
if (max == rf) {
|
||||||
|
h = ((gf - bf) / d + (gf < bf ? 6 : 0)) / 6;
|
||||||
|
} else if (max == gf) {
|
||||||
|
h = ((bf - rf) / d + 2) / 6;
|
||||||
|
} else {
|
||||||
|
h = ((rf - gf) / d + 4) / 6;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return new double[] {h, s, l};
|
||||||
|
}
|
||||||
|
|
||||||
|
private static int[] toRgb(double[] hsl) {
|
||||||
|
double h = hsl[0];
|
||||||
|
double s = hsl[1];
|
||||||
|
double l = hsl[2];
|
||||||
|
if (s <= 0) {
|
||||||
|
int v = (int) Math.round(l * 255);
|
||||||
|
return new int[] {v, v, v};
|
||||||
|
}
|
||||||
|
double q = l < 0.5 ? l * (1 + s) : l + s - l * s;
|
||||||
|
double p = 2 * l - q;
|
||||||
|
return new int[] {
|
||||||
|
(int) Math.round(hueToRgb(p, q, h + 1.0 / 3) * 255),
|
||||||
|
(int) Math.round(hueToRgb(p, q, h) * 255),
|
||||||
|
(int) Math.round(hueToRgb(p, q, h - 1.0 / 3) * 255),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
private static double hueToRgb(double p, double q, double t) {
|
||||||
|
double tt = t - Math.floor(t); // нормализация в [0,1)
|
||||||
|
if (tt < 1.0 / 6) {
|
||||||
|
return p + (q - p) * 6 * tt;
|
||||||
|
}
|
||||||
|
if (tt < 1.0 / 2) {
|
||||||
|
return q;
|
||||||
|
}
|
||||||
|
if (tt < 2.0 / 3) {
|
||||||
|
return p + (q - p) * (2.0 / 3 - tt) * 6;
|
||||||
|
}
|
||||||
|
return p;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,736 @@
|
|||||||
|
package ru.pjandro.wordpdf.internal.xlsx;
|
||||||
|
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
import java.math.RoundingMode;
|
||||||
|
import java.time.LocalDate;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import java.time.Month;
|
||||||
|
import java.time.format.TextStyle;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Locale;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Движок форматных кодов SpreadsheetML (§18.8.31; таблица встроенных id —
|
||||||
|
* §18.8.31, семантика разрядов — как Excel): секции по «;»
|
||||||
|
* (положительный/отрицательный/ноль/текст), маски {@code 0 # ?}, запятая
|
||||||
|
* группировки, хвостовые {@code ,} масштаб, {@code %}, научный {@code E+},
|
||||||
|
* даты/время ({@code d dd ddd dddd}, {@code m mmm mmmm}, {@code yy yyyy},
|
||||||
|
* {@code h hh H}, elapsed {@code [h] [mm] [ss]}, AM/PM, A/P), экранирования
|
||||||
|
* {@code "..."}, {@code \x}, {@code _x}, {@code *x} (вырезаются), валютные
|
||||||
|
* {@code [$...]}, цвета {@code [Red]} и условия {@code [>5]} — принятая
|
||||||
|
* деградация v1: печатаем без цвета/условия.
|
||||||
|
*
|
||||||
|
* <p>Дробные {@code # ?/?} (id 12/13) — General + warn один раз на код.</p>
|
||||||
|
*/
|
||||||
|
final class NumberFormats {
|
||||||
|
|
||||||
|
private static final Logger LOG = LoggerFactory.getLogger(NumberFormats.class);
|
||||||
|
|
||||||
|
/** Встроенные numFmtId → код (§18.8.31). */
|
||||||
|
private static final Map<Integer, String> BUILTIN = builtin();
|
||||||
|
|
||||||
|
// Синтаксис форматного кода (§18.8.31): именованные символы вместо
|
||||||
|
// литералов в условиях.
|
||||||
|
private static final char CH_ZERO = '0';
|
||||||
|
private static final char CH_HASH = '#';
|
||||||
|
private static final char CH_QUESTION = '?';
|
||||||
|
private static final char CH_COMMA = ',';
|
||||||
|
private static final char CH_DOT = '.';
|
||||||
|
private static final char CH_SLASH = '/';
|
||||||
|
private static final char CH_QUOTE = '"';
|
||||||
|
private static final char CH_BRACKET_OPEN = '[';
|
||||||
|
private static final char CH_PERCENT = '%';
|
||||||
|
private static final char CH_AT = '@';
|
||||||
|
private static final char KIND_DAY = 'd';
|
||||||
|
private static final char KIND_MONTH = 'm';
|
||||||
|
private static final char KIND_YEAR = 'y';
|
||||||
|
private static final char KIND_HOUR = 'h';
|
||||||
|
private static final char KIND_SECOND = 's';
|
||||||
|
private static final char KIND_AMPM = 'p';
|
||||||
|
private static final char KIND_NUMBER = 'n';
|
||||||
|
private static final char KIND_EXP = 'e';
|
||||||
|
|
||||||
|
/** Секунд в сутках (elapsed и доли дня). */
|
||||||
|
private static final long SECONDS_PER_DAY = 86_400L;
|
||||||
|
|
||||||
|
private final Map<Integer, String> custom;
|
||||||
|
private final boolean date1904;
|
||||||
|
private final Map<String, List<Section>> compiled = new HashMap<>();
|
||||||
|
|
||||||
|
NumberFormats(Map<Integer, String> custom, boolean date1904) {
|
||||||
|
this.custom = custom;
|
||||||
|
this.date1904 = date1904;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Форматирование числа (сырое {@code v}). Текстовые/boolean типы сюда не
|
||||||
|
* доходят. Битое число — сырая строка; unsupported-формат — General.
|
||||||
|
*/
|
||||||
|
String format(int numFmtId, String raw, WarnOnce warn) {
|
||||||
|
double value;
|
||||||
|
try {
|
||||||
|
value = Double.parseDouble(raw.trim());
|
||||||
|
} catch (RuntimeException e) {
|
||||||
|
return raw;
|
||||||
|
}
|
||||||
|
String code = codeFor(numFmtId);
|
||||||
|
if (code == null) {
|
||||||
|
return NumberText.general(raw);
|
||||||
|
}
|
||||||
|
List<Section> sections = compiled.computeIfAbsent(code, NumberFormats::compile);
|
||||||
|
return render(sections, value, warn, code);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Код формата: кастом (id ≥ 164) → встроенный → null (General). */
|
||||||
|
private String codeFor(int numFmtId) {
|
||||||
|
if (numFmtId == 0) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
String code = custom.get(numFmtId);
|
||||||
|
return code != null ? code : BUILTIN.get(numFmtId);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ================== модель ==================
|
||||||
|
|
||||||
|
/** Позиционный токен секции. */
|
||||||
|
private static final class FmtTok {
|
||||||
|
String lit;
|
||||||
|
char kind; // d m y h s p n e (дата/AMPM/число/E)
|
||||||
|
int count; // длина серии; для 'n' — не используется
|
||||||
|
boolean upper;
|
||||||
|
boolean elapsed; // [h] [mm] [ss]
|
||||||
|
boolean shortAmpm; // A/P
|
||||||
|
boolean decimal; // 'n': дробная часть
|
||||||
|
boolean minuteOfHour; // 'm': разрешён контекстом в минуты
|
||||||
|
String mask; // 'n': строка маски (0/#/?)
|
||||||
|
|
||||||
|
static FmtTok lit(String s) {
|
||||||
|
FmtTok t = new FmtTok();
|
||||||
|
t.lit = s;
|
||||||
|
t.kind = ' ';
|
||||||
|
return t;
|
||||||
|
}
|
||||||
|
|
||||||
|
static FmtTok date(char kind, int count, boolean upper, boolean elapsed) {
|
||||||
|
FmtTok t = new FmtTok();
|
||||||
|
t.kind = kind;
|
||||||
|
t.count = count;
|
||||||
|
t.upper = upper;
|
||||||
|
t.elapsed = elapsed;
|
||||||
|
return t;
|
||||||
|
}
|
||||||
|
|
||||||
|
static FmtTok ampm(boolean upper, boolean shortForm) {
|
||||||
|
FmtTok t = new FmtTok();
|
||||||
|
t.kind = KIND_AMPM;
|
||||||
|
t.upper = upper;
|
||||||
|
t.shortAmpm = shortForm;
|
||||||
|
return t;
|
||||||
|
}
|
||||||
|
|
||||||
|
static FmtTok exp(int digits) {
|
||||||
|
FmtTok t = new FmtTok();
|
||||||
|
t.kind = KIND_EXP;
|
||||||
|
t.count = digits;
|
||||||
|
return t;
|
||||||
|
}
|
||||||
|
|
||||||
|
static FmtTok number(String mask, boolean decimal) {
|
||||||
|
FmtTok t = new FmtTok();
|
||||||
|
t.kind = KIND_NUMBER;
|
||||||
|
t.mask = mask;
|
||||||
|
t.decimal = decimal;
|
||||||
|
return t;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Секция форматного кода. */
|
||||||
|
private static final class Section {
|
||||||
|
final List<FmtTok> toks = new ArrayList<>();
|
||||||
|
boolean date;
|
||||||
|
boolean percent;
|
||||||
|
boolean grouping;
|
||||||
|
boolean fraction;
|
||||||
|
boolean scientific;
|
||||||
|
int scaleThousands;
|
||||||
|
String integerMask;
|
||||||
|
String decimalMask;
|
||||||
|
|
||||||
|
boolean hasNumber() {
|
||||||
|
return integerMask != null || decimalMask != null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ================== компиляция ==================
|
||||||
|
|
||||||
|
private static List<Section> compile(String code) {
|
||||||
|
List<Section> sections = new ArrayList<>();
|
||||||
|
int i = 0;
|
||||||
|
StringBuilder part = new StringBuilder();
|
||||||
|
boolean quote = false;
|
||||||
|
boolean bracket = false;
|
||||||
|
while (i < code.length()) {
|
||||||
|
char ch = code.charAt(i);
|
||||||
|
if (ch == '\\' && i + 1 < code.length()) {
|
||||||
|
part.append(code, i, i + 2);
|
||||||
|
i += 2;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (!bracket && ch == '"') {
|
||||||
|
quote = !quote;
|
||||||
|
} else if (!quote && ch == '[') {
|
||||||
|
bracket = true;
|
||||||
|
} else if (!quote && ch == ']') {
|
||||||
|
bracket = false;
|
||||||
|
}
|
||||||
|
if (ch == ';' && !quote && !bracket) {
|
||||||
|
sections.add(compileSection(part.toString()));
|
||||||
|
part.setLength(0);
|
||||||
|
i++;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
part.append(ch);
|
||||||
|
i++;
|
||||||
|
}
|
||||||
|
sections.add(compileSection(part.toString()));
|
||||||
|
for (Section s : sections) {
|
||||||
|
resolveMinutes(s);
|
||||||
|
}
|
||||||
|
return List.copyOf(sections);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Нижняя {@code m} — минуты, только если рядом (через литералы) есть
|
||||||
|
* h/s/AMPM/elapsed; иначе месяц (ASCII {@code m} == {@code M}).
|
||||||
|
*/
|
||||||
|
private static void resolveMinutes(Section sec) {
|
||||||
|
for (int i = 0; i < sec.toks.size(); i++) {
|
||||||
|
FmtTok t = sec.toks.get(i);
|
||||||
|
if (t.kind == KIND_MONTH && !t.upper && !t.elapsed) {
|
||||||
|
t.minuteOfHour = neighborIsTimeUnit(sec, i, -1)
|
||||||
|
|| neighborIsTimeUnit(sec, i, 1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Цифровой плейсхолдер 0/#/?. */
|
||||||
|
private static boolean isPlaceholder(char ch) {
|
||||||
|
return ch == CH_ZERO || ch == CH_HASH || ch == CH_QUESTION;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Ближайший нетокен-литералу сосед в сторону dir — часовая/секундная единица? */
|
||||||
|
private static boolean neighborIsTimeUnit(Section sec, int from, int dir) {
|
||||||
|
for (int i = from + dir; i >= 0 && i < sec.toks.size(); i += dir) {
|
||||||
|
FmtTok n = sec.toks.get(i);
|
||||||
|
if (n.lit != null) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (n.kind == KIND_NUMBER || n.kind == KIND_EXP) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
return n.kind == KIND_HOUR || n.kind == KIND_SECOND || n.kind == KIND_AMPM
|
||||||
|
|| n.elapsed;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Section compileSection(String raw) {
|
||||||
|
Section sec = new Section();
|
||||||
|
StringBuilder lit = new StringBuilder();
|
||||||
|
int i = 0;
|
||||||
|
int digitStart = -1;
|
||||||
|
while (i < raw.length()) {
|
||||||
|
char ch = raw.charAt(i);
|
||||||
|
if (ch == CH_ZERO || ch == CH_HASH || ch == CH_QUESTION) {
|
||||||
|
if (digitStart < 0) {
|
||||||
|
flush(sec, lit);
|
||||||
|
digitStart = i;
|
||||||
|
}
|
||||||
|
i++;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (digitStart >= 0) {
|
||||||
|
int closed = closeZone(raw, sec, digitStart, i);
|
||||||
|
if (closed > i) { // зона продлена/закрыта точкой
|
||||||
|
digitStart = -1;
|
||||||
|
i = closed;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (ch == CH_COMMA) {
|
||||||
|
int k = i;
|
||||||
|
while (k < raw.length() && raw.charAt(k) == CH_COMMA) {
|
||||||
|
k++;
|
||||||
|
}
|
||||||
|
if (k < raw.length() && (raw.charAt(k) == CH_ZERO || raw.charAt(k) == CH_HASH
|
||||||
|
|| raw.charAt(k) == CH_QUESTION)) {
|
||||||
|
sec.grouping = true;
|
||||||
|
i++;
|
||||||
|
continue; // зона остаётся открытой
|
||||||
|
}
|
||||||
|
sec.scaleThousands += k - i;
|
||||||
|
digitStart = -1;
|
||||||
|
i = k;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (ch == CH_SLASH) {
|
||||||
|
sec.fraction = true;
|
||||||
|
lit.append('/');
|
||||||
|
digitStart = -1;
|
||||||
|
i++;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
digitStart = -1;
|
||||||
|
// fallthrough: обычный символ закрывает зону
|
||||||
|
}
|
||||||
|
if (ch == CH_QUOTE) {
|
||||||
|
flush(sec, lit);
|
||||||
|
StringBuilder q = new StringBuilder();
|
||||||
|
int j = i + 1;
|
||||||
|
while (j < raw.length()) {
|
||||||
|
char c = raw.charAt(j);
|
||||||
|
if (c == '\\' && j + 1 < raw.length()) {
|
||||||
|
q.append(raw.charAt(j + 1)); // в кавычках backslash экранирует
|
||||||
|
j += 2;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (c == CH_QUOTE) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
q.append(c);
|
||||||
|
j++;
|
||||||
|
}
|
||||||
|
sec.toks.add(FmtTok.lit(q.toString()));
|
||||||
|
i = j + 1;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (ch == '\\' && i + 1 < raw.length()) {
|
||||||
|
lit.append(raw.charAt(i + 1));
|
||||||
|
i += 2;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (ch == '_' && i + 1 < raw.length()) {
|
||||||
|
i += 2; // выравнивающий пробел _x — вырезается
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (ch == '*' && i + 1 < raw.length()) {
|
||||||
|
i += 2; // заполнение колонки *x — вырезается
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (ch == CH_BRACKET_OPEN) {
|
||||||
|
flush(sec, lit);
|
||||||
|
int close = raw.indexOf(']', i);
|
||||||
|
String body = raw.substring(i + 1, close < 0 ? raw.length() : close);
|
||||||
|
if (body.startsWith("$")) {
|
||||||
|
sec.toks.add(FmtTok.lit(currencyLiteral(body)));
|
||||||
|
} else if (isElapsedKind(body)) {
|
||||||
|
sec.toks.add(elapsedTok(body));
|
||||||
|
sec.date = true;
|
||||||
|
}
|
||||||
|
// цвет/условие/прочее — деградация (печатаем без них)
|
||||||
|
i = close < 0 ? raw.length() : close + 1;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if ((ch == 'A' || ch == 'a') && raw.regionMatches(true, i, "AM/PM", 0, 5)) {
|
||||||
|
flush(sec, lit);
|
||||||
|
sec.toks.add(FmtTok.ampm(Character.isUpperCase(ch), false));
|
||||||
|
sec.date = true;
|
||||||
|
i += 5;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if ((ch == 'A' || ch == 'a') && raw.regionMatches(true, i, "A/P", 0, 3)) {
|
||||||
|
flush(sec, lit);
|
||||||
|
sec.toks.add(FmtTok.ampm(Character.isUpperCase(ch), true));
|
||||||
|
sec.date = true;
|
||||||
|
i += 3;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (ch == 'E' && i + 1 < raw.length()
|
||||||
|
&& (raw.charAt(i + 1) == '+' || raw.charAt(i + 1) == '-')) {
|
||||||
|
flush(sec, lit);
|
||||||
|
int zeros = 0;
|
||||||
|
int k = i + 2;
|
||||||
|
while (k < raw.length() && raw.charAt(k) == '0') {
|
||||||
|
zeros++;
|
||||||
|
k++;
|
||||||
|
}
|
||||||
|
sec.scientific = true;
|
||||||
|
sec.toks.add(FmtTok.exp(Math.max(1, zeros)));
|
||||||
|
i = k;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (digitStart < 0 && ch == CH_DOT && i + 1 < raw.length()
|
||||||
|
&& isPlaceholder(raw.charAt(i + 1))) {
|
||||||
|
// ведущая точка: «.##» — дробная маска без целой
|
||||||
|
flush(sec, lit);
|
||||||
|
int k = i + 1;
|
||||||
|
while (k < raw.length() && isPlaceholder(raw.charAt(k))) {
|
||||||
|
k++;
|
||||||
|
}
|
||||||
|
addNumberZone(sec, raw.substring(i + 1, k), true);
|
||||||
|
i = k;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (ch == CH_PERCENT) {
|
||||||
|
sec.percent = true;
|
||||||
|
lit.append('%'); // знак печатается на своей позиции
|
||||||
|
i++;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (ch == CH_AT) {
|
||||||
|
i++; // текстовая подстановка: секция печатает текст как есть
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (isDateChar(ch)) {
|
||||||
|
flush(sec, lit);
|
||||||
|
int run = 1;
|
||||||
|
while (i + run < raw.length() && raw.charAt(i + run) == ch) {
|
||||||
|
run++;
|
||||||
|
}
|
||||||
|
char lower = Character.toLowerCase(ch);
|
||||||
|
sec.toks.add(FmtTok.date(lower, run, Character.isUpperCase(ch), false));
|
||||||
|
sec.date = true; // и «m» тоже: «m» без времени — месяц
|
||||||
|
i += run;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
lit.append(ch);
|
||||||
|
i++;
|
||||||
|
}
|
||||||
|
if (digitStart >= 0) {
|
||||||
|
closeZone(raw, sec, digitStart, raw.length());
|
||||||
|
}
|
||||||
|
flush(sec, lit);
|
||||||
|
if (sec.integerMask == null && sec.decimalMask != null) {
|
||||||
|
sec.integerMask = "";
|
||||||
|
}
|
||||||
|
return sec;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Закрытие цифровой зоны [from..i). Возвращает i+1, если зона закрыта
|
||||||
|
* точкой с последующей дробной маской (тогда добавлены оба токена),
|
||||||
|
* иначе i (зона закрыта как целая, символ обрабатывается дальше).
|
||||||
|
*/
|
||||||
|
private static int closeZone(String raw, Section sec, int from, int i) {
|
||||||
|
String mask = raw.substring(from, i);
|
||||||
|
if (i < raw.length() && raw.charAt(i) == CH_DOT) {
|
||||||
|
int k = i + 1;
|
||||||
|
while (k < raw.length() && (raw.charAt(k) == CH_ZERO || raw.charAt(k) == CH_HASH
|
||||||
|
|| raw.charAt(k) == CH_QUESTION)) {
|
||||||
|
k++;
|
||||||
|
}
|
||||||
|
if (k > i + 1) {
|
||||||
|
addNumberZone(sec, mask, false);
|
||||||
|
addNumberZone(sec, raw.substring(i + 1, k), true);
|
||||||
|
return k;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
addNumberZone(sec, mask, false);
|
||||||
|
return i;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void addNumberZone(Section sec, String mask, boolean decimal) {
|
||||||
|
sec.toks.add(FmtTok.number(mask, decimal));
|
||||||
|
if (decimal) {
|
||||||
|
sec.decimalMask = sec.decimalMask == null ? mask : sec.decimalMask + mask;
|
||||||
|
} else {
|
||||||
|
sec.integerMask = sec.integerMask == null ? mask : sec.integerMask + mask;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void flush(Section sec, StringBuilder lit) {
|
||||||
|
if (lit.length() > 0) {
|
||||||
|
sec.toks.add(FmtTok.lit(lit.toString()));
|
||||||
|
lit.setLength(0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean isDateChar(char ch) {
|
||||||
|
switch (Character.toLowerCase(ch)) {
|
||||||
|
case KIND_DAY:
|
||||||
|
case KIND_YEAR:
|
||||||
|
case KIND_HOUR:
|
||||||
|
case KIND_SECOND:
|
||||||
|
case KIND_MONTH:
|
||||||
|
return true;
|
||||||
|
default:
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private static boolean isElapsedKind(String body) {
|
||||||
|
String u = body.toLowerCase(Locale.ROOT);
|
||||||
|
return !u.isEmpty() && (u.charAt(0) == 'h' || u.charAt(0) == 'm' || u.charAt(0) == 's');
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String currencyLiteral(String body) {
|
||||||
|
int dash = body.indexOf('-');
|
||||||
|
String cur = body.substring(1, dash < 0 ? body.length() : dash);
|
||||||
|
return cur.startsWith("$") ? cur.substring(1) : cur;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** [h]/[mm]/[ss] — elapsed-токены даты/времени. */
|
||||||
|
private static FmtTok elapsedTok(String body) {
|
||||||
|
String u = body.toLowerCase(Locale.ROOT);
|
||||||
|
return FmtTok.date(u.charAt(0), Math.max(2, u.length()), false, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// ================== рендер ==================
|
||||||
|
|
||||||
|
private String render(List<Section> sections, double value, WarnOnce warn, String code) {
|
||||||
|
int idx = pickIndex(sections, value);
|
||||||
|
Section sec = sections.get(idx);
|
||||||
|
if (sec.fraction) {
|
||||||
|
warn.warn(LOG, "Дробный формат «{}» не поддерживается — General", code);
|
||||||
|
return NumberText.general(Double.toString(value));
|
||||||
|
}
|
||||||
|
if (sec.date) {
|
||||||
|
return renderDate(sec, value);
|
||||||
|
}
|
||||||
|
if (!sec.hasNumber()) {
|
||||||
|
return NumberText.general(Double.toString(value));
|
||||||
|
}
|
||||||
|
boolean forceMinus = value < 0 && sections.size() == 1;
|
||||||
|
return renderNumber(sec, Math.abs(applyScale(value, sec)), forceMinus);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static double applyScale(double value, Section sec) {
|
||||||
|
double v = sec.percent ? value * 100 : value;
|
||||||
|
if (sec.scaleThousands > 0) {
|
||||||
|
v /= Math.pow(1000, sec.scaleThousands);
|
||||||
|
}
|
||||||
|
return v;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static int pickIndex(List<Section> sections, double value) {
|
||||||
|
if (value > 0 || sections.size() == 1) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
if (value < 0) {
|
||||||
|
return sections.size() >= 2 ? 1 : 0;
|
||||||
|
}
|
||||||
|
return sections.size() >= 3 ? 2 : 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String renderNumber(Section sec, double absValue, boolean forceMinus) {
|
||||||
|
int dp = sec.decimalMask == null ? 0 : sec.decimalMask.length();
|
||||||
|
BigDecimal num = BigDecimal.valueOf(absValue).setScale(dp, RoundingMode.HALF_UP);
|
||||||
|
String plain = num.toPlainString();
|
||||||
|
int dot = plain.indexOf('.');
|
||||||
|
String intPart = dot < 0 ? plain : plain.substring(0, dot);
|
||||||
|
String fracPart = dot < 0 ? "" : plain.substring(dot + 1);
|
||||||
|
int minInt = sec.integerMask == null ? 0 : (int) sec.integerMask.chars()
|
||||||
|
.filter(c -> c == CH_ZERO).count();
|
||||||
|
StringBuilder out = new StringBuilder();
|
||||||
|
boolean numberEmitted = false;
|
||||||
|
for (FmtTok t : sec.toks) {
|
||||||
|
if (t.lit != null) {
|
||||||
|
out.append(t.lit);
|
||||||
|
} else if (t.kind == KIND_NUMBER) {
|
||||||
|
if (numberEmitted || sec.scientific) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
numberEmitted = true;
|
||||||
|
out.append(integerOf(intPart, sec, minInt));
|
||||||
|
if (dp > 0) {
|
||||||
|
out.append('.').append(trimDecimal(fracPart, sec.decimalMask));
|
||||||
|
}
|
||||||
|
} else if (t.kind == KIND_EXP) {
|
||||||
|
out.append(renderExp(absValue, t.count, dp));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (forceMinus) {
|
||||||
|
out.insert(0, '-');
|
||||||
|
}
|
||||||
|
return out.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String integerOf(String intPart, Section sec, int minInt) {
|
||||||
|
String digits;
|
||||||
|
boolean optionalOnly = sec.integerMask != null && sec.integerMask.chars()
|
||||||
|
.allMatch(c -> c == CH_HASH || c == CH_QUESTION);
|
||||||
|
if (optionalOnly && "0".equals(intPart)) {
|
||||||
|
digits = ""; // "#.##" для 0.5 → ".5"
|
||||||
|
} else {
|
||||||
|
StringBuilder sb = new StringBuilder(intPart);
|
||||||
|
while (sb.length() < minInt) {
|
||||||
|
sb.insert(0, CH_ZERO);
|
||||||
|
}
|
||||||
|
digits = sb.toString();
|
||||||
|
}
|
||||||
|
return sec.grouping ? group(digits) : digits;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String group(String digits) {
|
||||||
|
StringBuilder out = new StringBuilder();
|
||||||
|
int rem = digits.length() % 3;
|
||||||
|
for (int i = 0; i < digits.length(); i++) {
|
||||||
|
if (i > 0 && (i - rem) % 3 == 0) {
|
||||||
|
out.append(',');
|
||||||
|
}
|
||||||
|
out.append(digits.charAt(i));
|
||||||
|
}
|
||||||
|
return out.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Дробная: frac уже length == mask.length (после setScale); хвостовые
|
||||||
|
* позиции «#» с нулевым символом обрезаются, «0» остаются.
|
||||||
|
*/
|
||||||
|
private static String trimDecimal(String frac, String mask) {
|
||||||
|
int last = mask.length();
|
||||||
|
while (last > 0 && mask.charAt(last - 1) == CH_HASH && frac.charAt(last - 1) == CH_ZERO) {
|
||||||
|
last--;
|
||||||
|
}
|
||||||
|
return frac.substring(0, last);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Научный: «%.<dp>E» + знак/ширина экспоненты из кода. */
|
||||||
|
private static String renderExp(double value, int expDigits, int dp) {
|
||||||
|
String sci = String.format(Locale.ROOT, "%." + Math.max(1, dp) + "E", value);
|
||||||
|
int e = sci.indexOf('E');
|
||||||
|
int exponent = Integer.parseInt(sci.substring(e + 1));
|
||||||
|
return sci.substring(0, e) + "E" + (exponent < 0 ? "-" : "+")
|
||||||
|
+ String.format(Locale.ROOT, "%0" + expDigits + "d", Math.abs(exponent));
|
||||||
|
}
|
||||||
|
|
||||||
|
private String renderDate(Section sec, double value) {
|
||||||
|
LocalDateTime dt = toLocalDateTime(value);
|
||||||
|
if (dt == null) {
|
||||||
|
return NumberText.general(Double.toString(value));
|
||||||
|
}
|
||||||
|
StringBuilder out = new StringBuilder();
|
||||||
|
boolean hour12 = sec.toks.stream().anyMatch(t -> t.kind == KIND_AMPM);
|
||||||
|
long totalSeconds = Math.round(Math.abs(value) * SECONDS_PER_DAY);
|
||||||
|
for (FmtTok t : sec.toks) {
|
||||||
|
if (t.lit != null) {
|
||||||
|
out.append(t.lit);
|
||||||
|
} else if (t.kind == KIND_AMPM) {
|
||||||
|
out.append(renderAmpm(t, dt.getHour()));
|
||||||
|
} else {
|
||||||
|
out.append(renderDateTok(t, dt, hour12, totalSeconds));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return out.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String renderAmpm(FmtTok t, int hour) {
|
||||||
|
String full = hour < 12 ? "AM" : "PM";
|
||||||
|
String unit = t.shortAmpm ? full.substring(0, 1) : full;
|
||||||
|
return t.upper ? unit : unit.toLowerCase(Locale.ROOT);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String renderDateTok(FmtTok t, LocalDateTime dt, boolean hour12,
|
||||||
|
long totalSeconds) {
|
||||||
|
switch (t.kind) {
|
||||||
|
case KIND_DAY:
|
||||||
|
return switch (t.count) {
|
||||||
|
case 1 -> Integer.toString(dt.getDayOfMonth());
|
||||||
|
case 2 -> String.format("%02d", dt.getDayOfMonth());
|
||||||
|
case 3 -> dt.getDayOfWeek().getDisplayName(TextStyle.SHORT, Locale.ENGLISH);
|
||||||
|
default -> dt.getDayOfWeek().getDisplayName(TextStyle.FULL, Locale.ENGLISH);
|
||||||
|
};
|
||||||
|
case KIND_MONTH:
|
||||||
|
if (t.elapsed) {
|
||||||
|
return Long.toString(totalSeconds / 60);
|
||||||
|
}
|
||||||
|
if (t.minuteOfHour) {
|
||||||
|
return t.count >= 2 ? String.format("%02d", dt.getMinute())
|
||||||
|
: Integer.toString(dt.getMinute());
|
||||||
|
}
|
||||||
|
return monthName(dt.getMonthValue(), t.count);
|
||||||
|
case KIND_YEAR:
|
||||||
|
int year = dt.getYear();
|
||||||
|
return t.count >= 4 ? Integer.toString(year)
|
||||||
|
: String.format("%02d", year % 100);
|
||||||
|
case KIND_HOUR: {
|
||||||
|
if (t.elapsed) {
|
||||||
|
return Long.toString(totalSeconds / 3600);
|
||||||
|
}
|
||||||
|
int h = dt.getHour();
|
||||||
|
if (hour12) {
|
||||||
|
h = h % 12 == 0 ? 12 : h % 12;
|
||||||
|
}
|
||||||
|
return t.count >= 2 ? String.format("%02d", h) : Integer.toString(h);
|
||||||
|
}
|
||||||
|
case KIND_SECOND:
|
||||||
|
if (t.elapsed) {
|
||||||
|
return Long.toString(totalSeconds);
|
||||||
|
}
|
||||||
|
return t.count >= 2 ? String.format("%02d", dt.getSecond())
|
||||||
|
: Integer.toString(dt.getSecond());
|
||||||
|
default:
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String monthName(int month, int count) {
|
||||||
|
Month m = Month.of(month);
|
||||||
|
switch (count) {
|
||||||
|
case 1:
|
||||||
|
return Integer.toString(month);
|
||||||
|
case 2:
|
||||||
|
return String.format("%02d", month);
|
||||||
|
case 3:
|
||||||
|
return m.getDisplayName(TextStyle.SHORT, Locale.ENGLISH);
|
||||||
|
case 4:
|
||||||
|
return m.getDisplayName(TextStyle.FULL, Locale.ENGLISH);
|
||||||
|
default:
|
||||||
|
return m.getDisplayName(TextStyle.SHORT, Locale.ENGLISH).substring(0, 1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Excel-serial → LocalDateTime (1904 — база 1904-01-01; мнимый 29.02.1900 → 28.02). */
|
||||||
|
LocalDateTime toLocalDateTime(double serial) {
|
||||||
|
if (serial < 0 && !date1904) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
LocalDate base = date1904 ? LocalDate.of(1904, 1, 1) : LocalDate.of(1899, 12, 30);
|
||||||
|
long whole = (long) Math.floor(serial);
|
||||||
|
double frac = serial - whole;
|
||||||
|
if (!date1904 && whole >= 1 && whole < 60) {
|
||||||
|
whole += 1; // сериальник до фейкового 29.02.1900; сам 60 (его нет
|
||||||
|
} // в календаре) остаётся 28.02.1900 — деградация
|
||||||
|
long nano = Math.round(frac * SECONDS_PER_DAY) * 1_000_000_000L;
|
||||||
|
return base.plusDays(whole).atStartOfDay().plusNanos(nano);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Map<Integer, String> builtin() {
|
||||||
|
Map<Integer, String> m = new HashMap<>();
|
||||||
|
m.put(1, "0");
|
||||||
|
m.put(2, "0.00");
|
||||||
|
m.put(3, "#,##0");
|
||||||
|
m.put(4, "#,##0.00");
|
||||||
|
m.put(9, "0%");
|
||||||
|
m.put(10, "0.00%");
|
||||||
|
m.put(11, "0.00E+00");
|
||||||
|
m.put(12, "# ?/?");
|
||||||
|
m.put(13, "# ??/??");
|
||||||
|
m.put(14, "MM-dd-yy");
|
||||||
|
m.put(15, "d-mmm-yy");
|
||||||
|
m.put(16, "d-mmm");
|
||||||
|
m.put(17, "mmm-yy");
|
||||||
|
m.put(18, "h:mm AM/PM");
|
||||||
|
m.put(19, "h:mm:ss AM/PM");
|
||||||
|
m.put(20, "h:mm");
|
||||||
|
m.put(21, "h:mm:ss");
|
||||||
|
m.put(22, "M/d/yy h:mm");
|
||||||
|
m.put(37, "#,##0 ;(#,##0)");
|
||||||
|
m.put(38, "#,##0 ;[Red](#,##0)");
|
||||||
|
m.put(39, "#,##0.00;(#,##0.00)");
|
||||||
|
m.put(40, "#,##0.00;[Red](#,##0.00)");
|
||||||
|
m.put(45, "mm:ss");
|
||||||
|
m.put(46, "[h]:mm:ss");
|
||||||
|
m.put(47, "mmss.0");
|
||||||
|
m.put(48, "##0.0E+0");
|
||||||
|
m.put(49, "@");
|
||||||
|
return Map.copyOf(m);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -38,7 +38,7 @@ final class NumberText {
|
|||||||
return raw;
|
return raw;
|
||||||
}
|
}
|
||||||
if (value == Math.rint(value) && !Double.isInfinite(value)
|
if (value == Math.rint(value) && !Double.isInfinite(value)
|
||||||
&& Math.abs(value) < 1e15) {
|
&& Math.abs(value) < 1e10) {
|
||||||
return Long.toString((long) value);
|
return Long.toString((long) value);
|
||||||
}
|
}
|
||||||
return decimalOrScientific(value);
|
return decimalOrScientific(value);
|
||||||
@@ -63,11 +63,16 @@ final class NumberText {
|
|||||||
+ String.format(java.util.Locale.ROOT, "%02d", Math.abs(exponent));
|
+ String.format(java.util.Locale.ROOT, "%02d", Math.abs(exponent));
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Кратчайая десятичная запись double без хвостового «.0». */
|
/**
|
||||||
|
* Кратчайая десятичная запись double без хвостового «.0»;
|
||||||
|
* {@code Double.toString} уходит в E-нотацию с 1e7/1e-4 — внутри
|
||||||
|
* десятичного диапазона General разворачиваем обратно (9.9999999995E9 →
|
||||||
|
* 9999999999.5), лишние нули хвоста снимаются.
|
||||||
|
*/
|
||||||
private static String shortestRepr(double value) {
|
private static String shortestRepr(double value) {
|
||||||
String s = Double.toString(value);
|
String s = Double.toString(value);
|
||||||
if (s.indexOf('E') >= 0 || s.indexOf('e') >= 0) {
|
if (s.indexOf('E') >= 0 || s.indexOf('e') >= 0) {
|
||||||
return s;
|
return new java.math.BigDecimal(s).stripTrailingZeros().toPlainString();
|
||||||
}
|
}
|
||||||
if (s.endsWith(".0")) {
|
if (s.endsWith(".0")) {
|
||||||
return s.substring(0, s.length() - 2);
|
return s.substring(0, s.length() - 2);
|
||||||
|
|||||||
@@ -283,6 +283,9 @@ final class SheetModel {
|
|||||||
}
|
}
|
||||||
Integer r = ColorSpec.parseInt(XlsxPackage.attr(xr, "r"));
|
Integer r = ColorSpec.parseInt(XlsxPackage.attr(xr, "r"));
|
||||||
if (r == null || r < 1) {
|
if (r == null || r < 1) {
|
||||||
|
// строку обязан доедать skipElement: иначе её END оборвёт
|
||||||
|
// разбор всего sheetData по break ниже
|
||||||
|
SharedStrings.skipElement(xr);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
Double ht = ColorSpec.parseDouble(XlsxPackage.attr(xr, "ht"));
|
Double ht = ColorSpec.parseDouble(XlsxPackage.attr(xr, "ht"));
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ import ru.pjandro.wordpdf.internal.DocxPackageWriter;
|
|||||||
/**
|
/**
|
||||||
* Эмитт листа в Word-таблицу фиксированной сетки: одна {@code w:tbl} на лист
|
* Эмитт листа в Word-таблицу фиксированной сетки: одна {@code w:tbl} на лист
|
||||||
* (каркас v1 — шаг 4: значения, шрифт, jc, merge, скрытые строки/столбцы,
|
* (каркас v1 — шаг 4: значения, шрифт, jc, merge, скрытые строки/столбцы,
|
||||||
* внешние гиперссылки; полные границы/заливки/цвета/numFmt/vAlign — шаг 5,
|
* внешние гиперссылки; границы/заливки/цвета/numFmt/vAlign/indent — шаг 5,
|
||||||
* нарезка на срезы и секции — шаг 6).
|
* нарезка на срезы и секции — шаг 6).
|
||||||
*
|
*
|
||||||
* <p>Разрывы строк {@code rowBreaks/@id}: семантика Excel — id это 1-based
|
* <p>Разрывы строк {@code rowBreaks/@id}: семантика Excel — id это 1-based
|
||||||
@@ -39,7 +39,8 @@ final class SheetToTable {
|
|||||||
* (id {@code hl0…} = позиция множества)
|
* (id {@code hl0…} = позиция множества)
|
||||||
*/
|
*/
|
||||||
static String emit(SheetModel sheet, StylesModel styles, SharedStrings sst,
|
static String emit(SheetModel sheet, StylesModel styles, SharedStrings sst,
|
||||||
WorkbookModel wb, Metrics metrics, List<DocxPackageWriter.Part> parts,
|
WorkbookModel wb, Metrics metrics, NumberFormats numfmt, ColorResolver colors,
|
||||||
|
List<DocxPackageWriter.Part> parts,
|
||||||
LinkedHashSet<String> hyperlinks, WarnOnce warn) {
|
LinkedHashSet<String> hyperlinks, WarnOnce warn) {
|
||||||
int totalCols = totalColumns(sheet);
|
int totalCols = totalColumns(sheet);
|
||||||
List<Integer> visibleCols = new ArrayList<>();
|
List<Integer> visibleCols = new ArrayList<>();
|
||||||
@@ -65,8 +66,8 @@ final class SheetToTable {
|
|||||||
if (!isSignificant(sheet, row, e.getKey())) {
|
if (!isSignificant(sheet, row, e.getKey())) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
emitRow(xml, e.getKey(), row, sheet, styles, sst, metrics, visibleCols,
|
emitRow(xml, e.getKey(), row, sheet, styles, sst, metrics, numfmt, colors,
|
||||||
hyperlinks, warn);
|
visibleCols, hyperlinks, warn);
|
||||||
emittedRows++;
|
emittedRows++;
|
||||||
}
|
}
|
||||||
if (emittedRows == 0) {
|
if (emittedRows == 0) {
|
||||||
@@ -113,6 +114,7 @@ final class SheetToTable {
|
|||||||
|
|
||||||
private static void emitRow(StringBuilder xml, int rowNum1, SheetModel.RowData row,
|
private static void emitRow(StringBuilder xml, int rowNum1, SheetModel.RowData row,
|
||||||
SheetModel sheet, StylesModel styles, SharedStrings sst, Metrics metrics,
|
SheetModel sheet, StylesModel styles, SharedStrings sst, Metrics metrics,
|
||||||
|
NumberFormats numfmt, ColorResolver colors,
|
||||||
List<Integer> visibleCols, LinkedHashSet<String> hyperlinks, WarnOnce warn) {
|
List<Integer> visibleCols, LinkedHashSet<String> hyperlinks, WarnOnce warn) {
|
||||||
int r = rowNum1 - 1;
|
int r = rowNum1 - 1;
|
||||||
xml.append("<w:tr><w:trPr><w:trHeight w:val=\"")
|
xml.append("<w:tr><w:trPr><w:trHeight w:val=\"")
|
||||||
@@ -124,7 +126,7 @@ final class SheetToTable {
|
|||||||
case V_CONT -> xml.append("<w:tc><w:tcPr><w:vMerge/></w:tcPr><w:p/></w:tc>");
|
case V_CONT -> xml.append("<w:tc><w:tcPr><w:vMerge/></w:tcPr><w:p/></w:tc>");
|
||||||
case H_CONT -> xml.append("<w:tc><w:p/></w:tc>");
|
case H_CONT -> xml.append("<w:tc><w:p/></w:tc>");
|
||||||
default -> emitCell(xml, r, c, row, role, sheet, styles, sst, metrics,
|
default -> emitCell(xml, r, c, row, role, sheet, styles, sst, metrics,
|
||||||
visibleCols, hyperlinks, warn);
|
numfmt, colors, visibleCols, hyperlinks, warn);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
xml.append("</w:tr>");
|
xml.append("</w:tr>");
|
||||||
@@ -180,7 +182,8 @@ final class SheetToTable {
|
|||||||
|
|
||||||
private static void emitCell(StringBuilder xml, int r, int c, SheetModel.RowData row,
|
private static void emitCell(StringBuilder xml, int r, int c, SheetModel.RowData row,
|
||||||
MergeRole role, SheetModel sheet, StylesModel styles, SharedStrings sst,
|
MergeRole role, SheetModel sheet, StylesModel styles, SharedStrings sst,
|
||||||
Metrics metrics, List<Integer> visibleCols, LinkedHashSet<String> hyperlinks,
|
Metrics metrics, NumberFormats numfmt, ColorResolver colors,
|
||||||
|
List<Integer> visibleCols, LinkedHashSet<String> hyperlinks,
|
||||||
WarnOnce warn) {
|
WarnOnce warn) {
|
||||||
xml.append("<w:tc><w:tcPr><w:tcW w:w=\"").append(colTwips(sheet, metrics, c))
|
xml.append("<w:tc><w:tcPr><w:tcW w:w=\"").append(colTwips(sheet, metrics, c))
|
||||||
.append("\" w:type=\"dxa\"/>");
|
.append("\" w:type=\"dxa\"/>");
|
||||||
@@ -194,12 +197,16 @@ final class SheetToTable {
|
|||||||
xml.append("<w:vMerge w:val=\"restart\"/>");
|
xml.append("<w:vMerge w:val=\"restart\"/>");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
xml.append("</w:tcPr>");
|
|
||||||
SheetModel.CellData cell = contentCell(sheet, row, r, c, merge);
|
|
||||||
// стиль — физической ячейки позиции (редирект контента стиль не переносит)
|
// стиль — физической ячейки позиции (редирект контента стиль не переносит)
|
||||||
int styleIdx = resolveStyle(row.cells().get(c), row, sheet, c);
|
int styleIdx = resolveStyle(row.cells().get(c), row, sheet, c);
|
||||||
|
StylesModel.CellXf xf = styles.xf(styleIdx);
|
||||||
|
appendTcBorders(xml, styles, xf, colors);
|
||||||
|
appendShd(xml, styles, xf, colors);
|
||||||
|
appendVAlign(xml, xf);
|
||||||
|
xml.append("</w:tcPr>");
|
||||||
|
SheetModel.CellData cell = contentCell(sheet, row, r, c, merge);
|
||||||
String linkId = hyperlinkId(sheet, r, c, hyperlinks);
|
String linkId = hyperlinkId(sheet, r, c, hyperlinks);
|
||||||
emitParagraph(xml, cell, styleIdx, linkId, styles, sst, warn);
|
emitParagraph(xml, cell, xf, linkId, styles, sst, metrics, numfmt, colors, warn);
|
||||||
xml.append("</w:tc>");
|
xml.append("</w:tc>");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -211,9 +218,11 @@ final class SheetToTable {
|
|||||||
int r, int c, SheetModel.Merge merge) {
|
int r, int c, SheetModel.Merge merge) {
|
||||||
SheetModel.CellData own = row.cells().get(c);
|
SheetModel.CellData own = row.cells().get(c);
|
||||||
if (merge == null || (r == merge.row1() && c == merge.col1())
|
if (merge == null || (r == merge.row1() && c == merge.col1())
|
||||||
|| own == null || hasContent(own)) {
|
|| (own != null && hasContent(own))) {
|
||||||
return own;
|
return own;
|
||||||
}
|
}
|
||||||
|
// видимая клетка диапазона пуста ИЛИ отсутствует вовсе (в .xlsx
|
||||||
|
// неписаная клетка — норма) — тянем контент из фактического origin
|
||||||
SheetModel.RowData originRow = sheet.rows().get(merge.row1() + 1);
|
SheetModel.RowData originRow = sheet.rows().get(merge.row1() + 1);
|
||||||
if (originRow == null) {
|
if (originRow == null) {
|
||||||
return own;
|
return own;
|
||||||
@@ -285,12 +294,13 @@ final class SheetToTable {
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Абзац ячейки: pPr (spacing/jc) + раны (rich или один по стилю ячейки). */
|
/** Абзац ячейки: pPr (spacing/ind/jc) + раны (rich или один по стилю ячейки). */
|
||||||
private static void emitParagraph(StringBuilder xml, SheetModel.CellData cell, int styleIdx,
|
private static void emitParagraph(StringBuilder xml, SheetModel.CellData cell,
|
||||||
String linkId, StylesModel styles, SharedStrings sst, WarnOnce warn) {
|
StylesModel.CellXf xf, String linkId, StylesModel styles, SharedStrings sst,
|
||||||
StylesModel.CellXf xf = styles.xf(styleIdx);
|
Metrics metrics, NumberFormats numfmt, ColorResolver colors, WarnOnce warn) {
|
||||||
xml.append("<w:p><w:pPr>")
|
xml.append("<w:p><w:pPr>")
|
||||||
.append("<w:spacing w:before=\"0\" w:after=\"0\" w:line=\"240\" w:lineRule=\"auto\"/>");
|
.append("<w:spacing w:before=\"0\" w:after=\"0\" w:line=\"240\" w:lineRule=\"auto\"/>");
|
||||||
|
appendIndent(xml, xf, metrics);
|
||||||
appendJc(xml, xf.horizontal());
|
appendJc(xml, xf.horizontal());
|
||||||
xml.append("</w:pPr>");
|
xml.append("</w:pPr>");
|
||||||
if (linkId != null) {
|
if (linkId != null) {
|
||||||
@@ -298,13 +308,13 @@ final class SheetToTable {
|
|||||||
}
|
}
|
||||||
List<SharedStrings.Run> runs = cellRuns(cell, sst, warn);
|
List<SharedStrings.Run> runs = cellRuns(cell, sst, warn);
|
||||||
if (runs.isEmpty()) {
|
if (runs.isEmpty()) {
|
||||||
String text = plainText(cell);
|
String text = plainText(cell, xf.numFmtId(), numfmt, warn);
|
||||||
if (!text.isEmpty() || linkId != null) {
|
if (!text.isEmpty() || linkId != null) {
|
||||||
emitRun(xml, text, null, xf, styles);
|
emitRun(xml, text, null, xf, styles, colors);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
for (SharedStrings.Run run : runs) {
|
for (SharedStrings.Run run : runs) {
|
||||||
emitRun(xml, run.text(), run.style(), xf, styles);
|
emitRun(xml, run.text(), run.style(), xf, styles, colors);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (linkId != null) {
|
if (linkId != null) {
|
||||||
@@ -313,6 +323,103 @@ final class SheetToTable {
|
|||||||
xml.append("</w:p>");
|
xml.append("</w:p>");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Excel-отступ: 1 единица ≈ три пробела дефолтного шрифта (≈ 3 MDW),
|
||||||
|
* в twips.
|
||||||
|
*/
|
||||||
|
private static void appendIndent(StringBuilder xml, StylesModel.CellXf xf, Metrics metrics) {
|
||||||
|
if (xf.indent() <= 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
int twips = Metrics.pxToTwips(3 * xf.indent() * metrics.mdw());
|
||||||
|
if (twips > 0) {
|
||||||
|
xml.append("<w:ind w:left=\"").append(twips).append("\"/>");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** {@code w:tcBorders}: только four-side (диагонали Word-ячейке чужие). */
|
||||||
|
private static void appendTcBorders(StringBuilder xml, StylesModel styles,
|
||||||
|
StylesModel.CellXf xf, ColorResolver colors) {
|
||||||
|
StylesModel.BorderDef b = styles.border(xf.borderId());
|
||||||
|
if (b == null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
StringBuilder inner = new StringBuilder();
|
||||||
|
appendBorderSide(inner, "top", b.top(), colors);
|
||||||
|
appendBorderSide(inner, "left", b.left(), colors);
|
||||||
|
appendBorderSide(inner, "bottom", b.bottom(), colors);
|
||||||
|
appendBorderSide(inner, "right", b.right(), colors);
|
||||||
|
if (inner.length() > 0) {
|
||||||
|
xml.append("<w:tcBorders>").append(inner).append("</w:tcBorders>");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Excel-стиль границы → Word: thin — минимальная линия (single = 0.5pt,
|
||||||
|
* Excel thin ≈ 1px), hair — 0.25pt, остальные по имени; sz в восьмых
|
||||||
|
* долях пункта (§17.3.1.7).
|
||||||
|
*/
|
||||||
|
private static void appendBorderSide(StringBuilder xml, String side,
|
||||||
|
StylesModel.BorderSide bs, ColorResolver colors) {
|
||||||
|
if (bs == null || bs.style() == null || "none".equals(bs.style())) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
String[] valSz = switch (bs.style()) {
|
||||||
|
case "hair" -> new String[] {"single", "2"};
|
||||||
|
case "thin" -> new String[] {"single", "4"};
|
||||||
|
case "double" -> new String[] {"double", "6"};
|
||||||
|
case "medium" -> new String[] {"medium", "12"};
|
||||||
|
case "thick" -> new String[] {"thick", "18"};
|
||||||
|
case "dotted" -> new String[] {"dotted", "4"};
|
||||||
|
case "dashed" -> new String[] {"dashed", "4"};
|
||||||
|
case "dashDot" -> new String[] {"dashDot", "4"};
|
||||||
|
case "dashDotDot" -> new String[] {"dashDotDot", "4"};
|
||||||
|
case "mediumDashed" -> new String[] {"mediumDashed", "12"};
|
||||||
|
case "mediumDashDot" -> new String[] {"mediumDashDot", "12"};
|
||||||
|
case "mediumDashDotDot" -> new String[] {"mediumDashDotDot", "12"};
|
||||||
|
case "slantDashDot" -> new String[] {"dashDot", "4"};
|
||||||
|
default -> null;
|
||||||
|
};
|
||||||
|
if (valSz == null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
String rgb = colors.resolve(bs.color());
|
||||||
|
xml.append("<w:").append(side).append(" w:val=\"").append(valSz[0])
|
||||||
|
.append("\" w:sz=\"").append(valSz[1])
|
||||||
|
.append("\" w:space=\"0\" w:color=\"")
|
||||||
|
.append(rgb == null ? "auto" : rgb).append("\"/>");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Заливка: Word знает только solid-эффект, поэтому любой Excel-паттерн
|
||||||
|
* (кроме none/gray125 — визуального шума) рисуется его fgColor как
|
||||||
|
* сплошной; серый 12.5% без цвета — деградация «без заливы».
|
||||||
|
*/
|
||||||
|
private static void appendShd(StringBuilder xml, StylesModel styles,
|
||||||
|
StylesModel.CellXf xf, ColorResolver colors) {
|
||||||
|
StylesModel.FillDef fill = styles.fill(xf.fillId());
|
||||||
|
if (fill == null || fill.patternType() == null
|
||||||
|
|| "none".equals(fill.patternType()) || "gray125".equals(fill.patternType())) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
String rgb = colors.resolve(fill.fgColor());
|
||||||
|
if (rgb != null) {
|
||||||
|
xml.append("<w:shd w:val=\"clear\" w:color=\"auto\" w:fill=\"")
|
||||||
|
.append(rgb).append("\"/>");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** vertical Excel-дефолт — bottom (§18.8.45), Word-дефолт — top. */
|
||||||
|
private static void appendVAlign(StringBuilder xml, StylesModel.CellXf xf) {
|
||||||
|
String v = switch (xf.vertical() == null ? "bottom" : xf.vertical()) {
|
||||||
|
case "top" -> "top";
|
||||||
|
case "center" -> "center";
|
||||||
|
case "justify", "distributed" -> "both";
|
||||||
|
default -> "bottom";
|
||||||
|
};
|
||||||
|
xml.append("<w:vAlign w:val=\"").append(v).append("\"/>");
|
||||||
|
}
|
||||||
|
|
||||||
/** Excel-горизонталь → Word jc (§18.8.1 + деградации distributed/distribute). */
|
/** Excel-горизонталь → Word jc (§18.8.1 + деградации distributed/distribute). */
|
||||||
private static void appendJc(StringBuilder xml, String horizontal) {
|
private static void appendJc(StringBuilder xml, String horizontal) {
|
||||||
String jc = switch (horizontal == null ? "" : horizontal) {
|
String jc = switch (horizontal == null ? "" : horizontal) {
|
||||||
@@ -345,20 +452,30 @@ final class SheetToTable {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Текст не-rich ячейки (numFmt-движок подключается шагом 5). */
|
/**
|
||||||
private static String plainText(SheetModel.CellData cell) {
|
* Текст не-rich ячейки: число с форматным кодом — через
|
||||||
|
* {@link NumberFormats}; boolean/ошибка/кэш-формулы/General —
|
||||||
|
* {@link NumberText}.
|
||||||
|
*/
|
||||||
|
private static String plainText(SheetModel.CellData cell, int numFmtId,
|
||||||
|
NumberFormats numfmt, WarnOnce warn) {
|
||||||
if (cell == null || cell.raw() == null) {
|
if (cell == null || cell.raw() == null) {
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
return NumberText.of(cell.raw(), cell.type());
|
String type = cell.type();
|
||||||
|
boolean numeric = type == null || "n".equals(type);
|
||||||
|
if (numeric && numFmtId != 0) {
|
||||||
|
return numfmt.format(numFmtId, cell.raw(), warn);
|
||||||
|
}
|
||||||
|
return NumberText.of(cell.raw(), type);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Один {@code w:r}: rFonts/sz из шрифта ячейки (переопределения rich-рана
|
* Один {@code w:r}: rFonts/sz/цвет из шрифта ячейки (переопределения
|
||||||
* приоритетны); цвет/зачёрк/индекс — каркас шага 5.
|
* rich-рана приоритетны, включая посимвольный цвет rPr из sst).
|
||||||
*/
|
*/
|
||||||
private static void emitRun(StringBuilder xml, String text, SharedStrings.RunStyle style,
|
private static void emitRun(StringBuilder xml, String text, SharedStrings.RunStyle style,
|
||||||
StylesModel.CellXf xf, StylesModel styles) {
|
StylesModel.CellXf xf, StylesModel styles, ColorResolver colors) {
|
||||||
StylesModel.FontDef base = styles.font(xf.fontId());
|
StylesModel.FontDef base = styles.font(xf.fontId());
|
||||||
String family = style != null && style.fontName() != null ? style.fontName()
|
String family = style != null && style.fontName() != null ? style.fontName()
|
||||||
: base == null || base.name() == null ? "Calibri" : base.name();
|
: base == null || base.name() == null ? "Calibri" : base.name();
|
||||||
@@ -389,6 +506,16 @@ final class SheetToTable {
|
|||||||
if (strikeout) {
|
if (strikeout) {
|
||||||
xml.append("<w:strike/>");
|
xml.append("<w:strike/>");
|
||||||
}
|
}
|
||||||
|
ColorSpec color = style != null && style.color() != null ? style.color()
|
||||||
|
: base == null ? null : base.color();
|
||||||
|
String rgb = colors.resolve(color);
|
||||||
|
if (rgb != null) {
|
||||||
|
xml.append("<w:color w:val=\"").append(rgb).append("\"/>");
|
||||||
|
}
|
||||||
|
String vert = style == null ? null : style.vertAlign();
|
||||||
|
if ("superscript".equals(vert) || "subscript".equals(vert)) {
|
||||||
|
xml.append("<w:vertAlign w:val=\"").append(vert).append("\"/>");
|
||||||
|
}
|
||||||
xml.append("</w:rPr><w:t");
|
xml.append("</w:rPr><w:t");
|
||||||
if (!text.equals(text.strip())) {
|
if (!text.equals(text.strip())) {
|
||||||
xml.append(" xml:space=\"preserve\"");
|
xml.append(" xml:space=\"preserve\"");
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import java.io.ByteArrayInputStream;
|
|||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
@@ -58,9 +59,12 @@ final class StylesModel {
|
|||||||
private final List<CellXf> xfs;
|
private final List<CellXf> xfs;
|
||||||
/** {@code colors/indexedColors/rgbColor}: индекс 64+n. */
|
/** {@code colors/indexedColors/rgbColor}: индекс 64+n. */
|
||||||
private final List<String> indexedColors;
|
private final List<String> indexedColors;
|
||||||
|
/** {@code numFmts/numFmt}: numFmtId → formatCode (§18.8.31). */
|
||||||
|
private final Map<Integer, String> numFmts;
|
||||||
|
|
||||||
private StylesModel(List<FontDef> fonts, List<FillDef> fills, List<BorderDef> borders,
|
private StylesModel(List<FontDef> fonts, List<FillDef> fills, List<BorderDef> borders,
|
||||||
List<CellXf> xfs, List<String> indexedColors) {
|
List<CellXf> xfs, List<String> indexedColors, Map<Integer, String> numFmts) {
|
||||||
|
this.numFmts = numFmts;
|
||||||
this.fonts = fonts;
|
this.fonts = fonts;
|
||||||
this.fills = fills;
|
this.fills = fills;
|
||||||
this.borders = borders;
|
this.borders = borders;
|
||||||
@@ -93,18 +97,26 @@ final class StylesModel {
|
|||||||
return indexedColors;
|
return indexedColors;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Кастомные форматные коды (§18.8.31); id ≥ 164. */
|
||||||
|
Map<Integer, String> customFormats() {
|
||||||
|
return numFmts;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Семейство шрифта Normal-стиля (индекс 0 cellStyles) — для MDW в
|
* Семейство шрифта Normal-стиля (индекс 0 cellStyles) — для MDW в
|
||||||
* {@link Metrics}; имя (или scheme=minor при отсутствии имени).
|
* {@link Metrics}; имя (или scheme=minor при отсутствии имени).
|
||||||
*/
|
*/
|
||||||
String normalFontName() {
|
String normalFontName(ThemeModel theme) {
|
||||||
CellXf base = xfs.isEmpty() ? new CellXf(0, 0, 0, 0, null, null, false, 0) : xfs.get(0);
|
CellXf base = xfs.isEmpty() ? new CellXf(0, 0, 0, 0, null, null, false, 0) : xfs.get(0);
|
||||||
FontDef f = font(base.fontId());
|
FontDef f = font(base.fontId());
|
||||||
if (f == null || f.name() == null) {
|
if (f != null && f.name() != null) {
|
||||||
return "Calibri";
|
|
||||||
}
|
|
||||||
return f.name();
|
return f.name();
|
||||||
}
|
}
|
||||||
|
if (theme != null && theme.minorFont() != null) {
|
||||||
|
return theme.minorFont();
|
||||||
|
}
|
||||||
|
return "Calibri";
|
||||||
|
}
|
||||||
|
|
||||||
static StylesModel read(XlsxPackage pkg, WarnOnce warn) throws IOException {
|
static StylesModel read(XlsxPackage pkg, WarnOnce warn) throws IOException {
|
||||||
byte[] data = pkg.entry(STYLES_PART);
|
byte[] data = pkg.entry(STYLES_PART);
|
||||||
@@ -112,7 +124,7 @@ final class StylesModel {
|
|||||||
warn.warn(LOG, "В .xlsx нет xl/styles.xml — все ячейки дефолтным форматом");
|
warn.warn(LOG, "В .xlsx нет xl/styles.xml — все ячейки дефолтным форматом");
|
||||||
return new StylesModel(List.of(defaultFont()), List.of(noFill(), gray125()),
|
return new StylesModel(List.of(defaultFont()), List.of(noFill(), gray125()),
|
||||||
List.of(noBorder()), List.of(new CellXf(0, 0, 0, 0, null, null, false, 0)),
|
List.of(noBorder()), List.of(new CellXf(0, 0, 0, 0, null, null, false, 0)),
|
||||||
List.of());
|
List.of(), Map.of());
|
||||||
}
|
}
|
||||||
Parser p = new Parser();
|
Parser p = new Parser();
|
||||||
try {
|
try {
|
||||||
@@ -184,6 +196,8 @@ final class StylesModel {
|
|||||||
private final List<RawXf> styleXfs = new ArrayList<>();
|
private final List<RawXf> styleXfs = new ArrayList<>();
|
||||||
private final List<RawXf> cellXfs = new ArrayList<>();
|
private final List<RawXf> cellXfs = new ArrayList<>();
|
||||||
private final List<String> indexedColors = new ArrayList<>();
|
private final List<String> indexedColors = new ArrayList<>();
|
||||||
|
private final java.util.LinkedHashMap<Integer, String> numFmts =
|
||||||
|
new java.util.LinkedHashMap<>();
|
||||||
/** Текущая таблица для дочерних элементов. */
|
/** Текущая таблица для дочерних элементов. */
|
||||||
private String table;
|
private String table;
|
||||||
|
|
||||||
@@ -200,6 +214,7 @@ final class StylesModel {
|
|||||||
}
|
}
|
||||||
table = xr.getLocalName();
|
table = xr.getLocalName();
|
||||||
switch (table) {
|
switch (table) {
|
||||||
|
case "numFmts" -> parseNumFmts(xr);
|
||||||
case "fonts" -> parseFonts(xr);
|
case "fonts" -> parseFonts(xr);
|
||||||
case "fills" -> parseFills(xr);
|
case "fills" -> parseFills(xr);
|
||||||
case "borders" -> parseBorders(xr);
|
case "borders" -> parseBorders(xr);
|
||||||
@@ -233,7 +248,19 @@ final class StylesModel {
|
|||||||
xfs.add(new CellXf(0, 0, 0, 0, null, null, false, 0));
|
xfs.add(new CellXf(0, 0, 0, 0, null, null, false, 0));
|
||||||
}
|
}
|
||||||
return new StylesModel(List.copyOf(fonts), List.copyOf(fills),
|
return new StylesModel(List.copyOf(fonts), List.copyOf(fills),
|
||||||
List.copyOf(borders), List.copyOf(xfs), List.copyOf(indexedColors));
|
List.copyOf(borders), List.copyOf(xfs), List.copyOf(indexedColors),
|
||||||
|
Map.copyOf(numFmts));
|
||||||
|
}
|
||||||
|
|
||||||
|
private void parseNumFmts(XMLStreamReader xr) throws XMLStreamException {
|
||||||
|
while (nextTableItem(xr, "numFmt")) {
|
||||||
|
Integer id = ColorSpec.parseInt(XlsxPackage.attr(xr, "numFmtId"));
|
||||||
|
String code = XlsxPackage.attr(xr, "formatCode");
|
||||||
|
SharedStrings.skipElement(xr);
|
||||||
|
if (id != null && code != null) {
|
||||||
|
numFmts.putIfAbsent(id, code);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void parseFonts(XMLStreamReader xr) throws XMLStreamException {
|
private void parseFonts(XMLStreamReader xr) throws XMLStreamException {
|
||||||
@@ -367,20 +394,26 @@ final class StylesModel {
|
|||||||
return new BorderDef(left, right, top, bottom);
|
return new BorderDef(left, right, top, bottom);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Дочерний color стороны (сторона без children — просто END). */
|
/**
|
||||||
|
* Дочерний color стороны; сторона потребляется ЦЕЛИКОМ до своего END
|
||||||
|
* (досрочный return на color бросал бы END стороны на внешний цикл
|
||||||
|
* readBorder и обрывал границу на первой цветной стороне).
|
||||||
|
*/
|
||||||
private ColorSpec readSideColor(XMLStreamReader xr) throws XMLStreamException {
|
private ColorSpec readSideColor(XMLStreamReader xr) throws XMLStreamException {
|
||||||
while (xr.hasNext()) {
|
ColorSpec found = null;
|
||||||
|
int depth = 1; // стороны доедаются до её собственного END по глубине
|
||||||
|
while (xr.hasNext() && depth > 0) {
|
||||||
int ev = xr.next();
|
int ev = xr.next();
|
||||||
if (ev == XMLStreamConstants.END_ELEMENT) {
|
if (ev == XMLStreamConstants.START_ELEMENT) {
|
||||||
break;
|
depth++;
|
||||||
|
if (found == null && "color".equals(xr.getLocalName())) {
|
||||||
|
found = ColorSpec.fromColorElement(xr);
|
||||||
}
|
}
|
||||||
if (ev == XMLStreamConstants.START_ELEMENT && "color".equals(xr.getLocalName())) {
|
} else if (ev == XMLStreamConstants.END_ELEMENT) {
|
||||||
ColorSpec c = ColorSpec.fromColorElement(xr);
|
depth--;
|
||||||
SharedStrings.skipElement(xr);
|
|
||||||
return c;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return null;
|
return found;
|
||||||
}
|
}
|
||||||
|
|
||||||
private List<RawXf> parseXfs(XMLStreamReader xr) throws XMLStreamException {
|
private List<RawXf> parseXfs(XMLStreamReader xr) throws XMLStreamException {
|
||||||
|
|||||||
@@ -0,0 +1,176 @@
|
|||||||
|
package ru.pjandro.wordpdf.internal.xlsx;
|
||||||
|
|
||||||
|
import javax.xml.stream.XMLStreamConstants;
|
||||||
|
import javax.xml.stream.XMLStreamException;
|
||||||
|
import javax.xml.stream.XMLStreamReader;
|
||||||
|
import java.io.ByteArrayInputStream;
|
||||||
|
import java.util.LinkedHashMap;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Цветовая и шрифтовая схема документа из {@code xl/theme/theme1.xml}
|
||||||
|
* (ECMA-376 Part 1 §14.2.9 DrawingML theme). Часть опциональна: нет части —
|
||||||
|
* встроенная дефолтная палитра Office (§18.18.62 отсылает к ней, когда
|
||||||
|
* генератор пишет {@code theme="4"}, не кладя theme).
|
||||||
|
*
|
||||||
|
* <p>Индексы {@code @theme} (CT_Color, §18.18.62) в имена элементов
|
||||||
|
* clrScheme: 0→lt1, 1→dk1, 2→lt2, 3→dk2, 4..9→accent1..6, 10→hlink,
|
||||||
|
* 11→folHlink. Порядок lt/dk переставлен намеренно (историческая инверсия
|
||||||
|
* Excel — не опечатка).</p>
|
||||||
|
*/
|
||||||
|
final class ThemeModel {
|
||||||
|
|
||||||
|
private static final Logger LOG = LoggerFactory.getLogger(ThemeModel.class);
|
||||||
|
|
||||||
|
/** Часть темы (первая; theme2+ в SpreadsheetML не используются). */
|
||||||
|
static final String THEME_PART = "xl/theme/theme1.xml";
|
||||||
|
|
||||||
|
/** Дефолтная палитра Office (та, что кладёт в файл сам Excel). */
|
||||||
|
private static final Map<String, String> DEFAULT_SCHEME = defaultScheme();
|
||||||
|
|
||||||
|
/** {@code @theme} → имя элемента clrScheme (§18.18.62). */
|
||||||
|
static String elementForIndex(int theme) {
|
||||||
|
return switch (theme) {
|
||||||
|
case 0 -> "lt1";
|
||||||
|
case 1 -> "dk1";
|
||||||
|
case 2 -> "lt2";
|
||||||
|
case 3 -> "dk2";
|
||||||
|
case 4 -> "accent1";
|
||||||
|
case 5 -> "accent2";
|
||||||
|
case 6 -> "accent3";
|
||||||
|
case 7 -> "accent4";
|
||||||
|
case 8 -> "accent5";
|
||||||
|
case 9 -> "accent6";
|
||||||
|
case 10 -> "hlink";
|
||||||
|
case 11 -> "folHlink";
|
||||||
|
default -> null;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
private final Map<String, String> scheme;
|
||||||
|
private final String minorFont;
|
||||||
|
|
||||||
|
private ThemeModel(Map<String, String> scheme, String minorFont) {
|
||||||
|
this.scheme = scheme;
|
||||||
|
this.minorFont = minorFont;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Чтение темы; отсутствие/брак части — дефолтная палитра + warn (это
|
||||||
|
* легитимный .xlsx, падать нельзя).
|
||||||
|
*/
|
||||||
|
static ThemeModel read(XlsxPackage pkg, WarnOnce warn) {
|
||||||
|
byte[] data = pkg.entry(THEME_PART);
|
||||||
|
if (data == null) {
|
||||||
|
warn.warn(LOG, "В .xlsx нет xl/theme/theme1.xml — дефолтная палитра Office");
|
||||||
|
return new ThemeModel(DEFAULT_SCHEME, null);
|
||||||
|
}
|
||||||
|
Map<String, String> scheme = new LinkedHashMap<>();
|
||||||
|
String[] minor = new String[1];
|
||||||
|
try {
|
||||||
|
parse(data, scheme, minor);
|
||||||
|
} catch (XMLStreamException e) {
|
||||||
|
warn.warn(LOG, "Не разобран xl/theme/theme1.xml ({}) — дефолтная палитра Office",
|
||||||
|
e.getMessage());
|
||||||
|
return new ThemeModel(DEFAULT_SCHEME, null);
|
||||||
|
}
|
||||||
|
scheme.keySet().removeIf(k -> scheme.get(k) == null);
|
||||||
|
return new ThemeModel(scheme.isEmpty() ? DEFAULT_SCHEME : scheme, minor[0]);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** RRGGBG элемента схемы или null (нет элемента — автоцвет). */
|
||||||
|
String color(String element) {
|
||||||
|
return scheme.get(element);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Гарнитура minorFont/latin (для {@code <c .../>} шрифтов без {@code name}); null — нет темы. */
|
||||||
|
String minorFont() {
|
||||||
|
return minorFont;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void parse(byte[] data, Map<String, String> scheme, String[] minor)
|
||||||
|
throws XMLStreamException {
|
||||||
|
XMLStreamReader xr = XlsxPackage.newSecureReader()
|
||||||
|
.createXMLStreamReader(new ByteArrayInputStream(data));
|
||||||
|
boolean rootSeen = false;
|
||||||
|
while (!rootSeen && xr.hasNext()) {
|
||||||
|
rootSeen = xr.next() == XMLStreamConstants.START_ELEMENT;
|
||||||
|
}
|
||||||
|
String clrElement = null; // имя элемента clrScheme, внутри которого мы
|
||||||
|
boolean inMinor = false;
|
||||||
|
int minorDepth = 0;
|
||||||
|
while (xr.hasNext()) {
|
||||||
|
int ev = xr.next();
|
||||||
|
if (ev == XMLStreamConstants.START_ELEMENT) {
|
||||||
|
String name = xr.getLocalName();
|
||||||
|
switch (name) {
|
||||||
|
case "srgbClr", "sysClr" -> {
|
||||||
|
if (clrElement != null) {
|
||||||
|
String hex = "srgbClr".equals(name)
|
||||||
|
? XlsxPackage.attr(xr, "val")
|
||||||
|
: XlsxPackage.attr(xr, "lastClr");
|
||||||
|
scheme.putIfAbsent(clrElement, hex == null ? null : normalize(hex));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
case "minorFont" -> {
|
||||||
|
inMinor = true;
|
||||||
|
minorDepth = 1;
|
||||||
|
}
|
||||||
|
default -> {
|
||||||
|
if (clrElement == null && CLR_ELEMENTS.contains(name)) {
|
||||||
|
clrElement = name; // дети читаются следующими итерациями
|
||||||
|
} else if (inMinor) {
|
||||||
|
switch (name) {
|
||||||
|
case "latin" -> {
|
||||||
|
if (minor[0] == null) {
|
||||||
|
minor[0] = XlsxPackage.attr(xr, "typeface");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
default -> { }
|
||||||
|
}
|
||||||
|
minorDepth++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else if (ev == XMLStreamConstants.END_ELEMENT) {
|
||||||
|
String name = xr.getLocalName();
|
||||||
|
if (clrElement != null && name.equals(clrElement)) {
|
||||||
|
clrElement = null;
|
||||||
|
} else if (inMinor && --minorDepth == 0) {
|
||||||
|
inMinor = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Имена элементов clrScheme (§14.2.9). */
|
||||||
|
private static final java.util.Set<String> CLR_ELEMENTS = java.util.Set.of(
|
||||||
|
"dk1", "lt1", "dk2", "lt2", "accent1", "accent2", "accent3", "accent4",
|
||||||
|
"accent5", "accent6", "hlink", "folHlink");
|
||||||
|
|
||||||
|
/** 8-ричный ARGB → 6-ричный RGB; короткий/битый — как есть (resolver отфильтрует). */
|
||||||
|
private static String normalize(String hex) {
|
||||||
|
String h = hex.length() == 8 ? hex.substring(2) : hex;
|
||||||
|
return h.toUpperCase(java.util.Locale.ROOT);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Map<String, String> defaultScheme() {
|
||||||
|
Map<String, String> m = new LinkedHashMap<>();
|
||||||
|
m.put("dk1", "000000");
|
||||||
|
m.put("lt1", "FFFFFF");
|
||||||
|
m.put("dk2", "44546A");
|
||||||
|
m.put("lt2", "E7E6E6");
|
||||||
|
m.put("accent1", "4472C4");
|
||||||
|
m.put("accent2", "ED7D31");
|
||||||
|
m.put("accent3", "A5A5A5");
|
||||||
|
m.put("accent4", "FFC000");
|
||||||
|
m.put("accent5", "5B9BD5");
|
||||||
|
m.put("accent6", "70AD47");
|
||||||
|
m.put("hlink", "0563C1");
|
||||||
|
m.put("folHlink", "954F72");
|
||||||
|
return Map.copyOf(m);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -55,9 +55,12 @@ public final class XlsxToDocx {
|
|||||||
WarnOnce warn = new WarnOnce();
|
WarnOnce warn = new WarnOnce();
|
||||||
XlsxPackage pkg = XlsxPackage.read(xlsxBytes);
|
XlsxPackage pkg = XlsxPackage.read(xlsxBytes);
|
||||||
WorkbookModel wb = WorkbookModel.read(pkg);
|
WorkbookModel wb = WorkbookModel.read(pkg);
|
||||||
|
ThemeModel theme = ThemeModel.read(pkg, warn);
|
||||||
StylesModel styles = StylesModel.read(pkg, warn);
|
StylesModel styles = StylesModel.read(pkg, warn);
|
||||||
SharedStrings sst = SharedStrings.read(pkg, warn);
|
SharedStrings sst = SharedStrings.read(pkg, warn);
|
||||||
Metrics metrics = Metrics.forNormalFamily(styles.normalFontName());
|
Metrics metrics = Metrics.forNormalFamily(styles.normalFontName(theme));
|
||||||
|
NumberFormats numfmt = new NumberFormats(styles.customFormats(), wb.date1904());
|
||||||
|
ColorResolver colors = new ColorResolver(theme, styles.indexedColors());
|
||||||
|
|
||||||
StringBuilder body = new StringBuilder();
|
StringBuilder body = new StringBuilder();
|
||||||
List<DocxPackageWriter.Part> parts = new ArrayList<>();
|
List<DocxPackageWriter.Part> parts = new ArrayList<>();
|
||||||
@@ -73,8 +76,8 @@ public final class XlsxToDocx {
|
|||||||
// уточняет находку по embeddings; structural-признаки — здесь)
|
// уточняет находку по embeddings; structural-признаки — здесь)
|
||||||
throw new DrawingFoundException(DrawingFoundException.Kind.OLE);
|
throw new DrawingFoundException(DrawingFoundException.Kind.OLE);
|
||||||
}
|
}
|
||||||
String tableXml = SheetToTable.emit(model, styles, sst, wb, metrics,
|
String tableXml = SheetToTable.emit(model, styles, sst, wb, metrics, numfmt,
|
||||||
parts, hyperlinks, warn);
|
colors, parts, hyperlinks, warn);
|
||||||
if (tableXml.isEmpty()) {
|
if (tableXml.isEmpty()) {
|
||||||
// пустой лист — только страница (секция появится шагом 6)
|
// пустой лист — только страница (секция появится шагом 6)
|
||||||
continue;
|
continue;
|
||||||
|
|||||||
@@ -57,4 +57,19 @@ class XlsxPdfConverterTest {
|
|||||||
assertTrue(flat.contains("ЖИРНЫЙ"), "rich-строка потеряна");
|
assertTrue(flat.contains("ЖИРНЫЙ"), "rich-строка потеряна");
|
||||||
assertTrue(flat.contains("объединённойячейки"), "merge-текст потерян");
|
assertTrue(flat.contains("объединённойячейки"), "merge-текст потерян");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void numFmt_formattedNumbersReachPdf() throws IOException {
|
||||||
|
Path pdf = convertPdf(sample("xlsx-numfmt.xlsx"));
|
||||||
|
String flat;
|
||||||
|
try (PDDocument doc = Loader.loadPDF(pdf.toFile())) {
|
||||||
|
flat = norm(new PDFTextStripper().getText(doc)).replaceAll("\\s+", "");
|
||||||
|
}
|
||||||
|
assertFalse(flat.contains("#"), "в PDF есть «#» (не покрыт глиф)");
|
||||||
|
assertTrue(flat.contains("$1,234.00"), "деньги потеряны");
|
||||||
|
assertTrue(flat.contains("42.5%"), "проценты потеряны");
|
||||||
|
assertTrue(flat.contains("1.22E+07"), "научный потерян");
|
||||||
|
assertTrue(flat.contains("03.12.2024"), "дата потеряна");
|
||||||
|
assertTrue(flat.contains("36:00"), "elapsed потерян");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,89 @@
|
|||||||
|
package ru.pjandro.wordpdf.internal.xlsx;
|
||||||
|
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertNull;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.zip.ZipOutputStream;
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Разрешение ColorSpec → RRGGBB: rgb/ARGB, тема (дефолтный Office-схема
|
||||||
|
* clrScheme), легаси-палитра indexed + переопределение 64+n из styles
|
||||||
|
* colors, tint/shade (HSL-модуляция, MS-OI29500 §2.3.1.6.16).
|
||||||
|
*/
|
||||||
|
class ColorResolverTest {
|
||||||
|
|
||||||
|
private static final WarnOnce WARN = new WarnOnce();
|
||||||
|
|
||||||
|
private static ColorResolver resolver() throws Exception {
|
||||||
|
byte[] emptyZip;
|
||||||
|
try (java.io.ByteArrayOutputStream bos = new java.io.ByteArrayOutputStream()) {
|
||||||
|
try (ZipOutputStream z = new ZipOutputStream(bos)) {
|
||||||
|
z.finish();
|
||||||
|
}
|
||||||
|
emptyZip = bos.toByteArray();
|
||||||
|
}
|
||||||
|
// ThemeModel без theme1.xml — дефолтный Office-схема (accent1 = 4472C4)
|
||||||
|
return new ColorResolver(ThemeModel.read(XlsxPackage.read(emptyZip), WARN), List.of());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void rgbLiteral() throws Exception {
|
||||||
|
assertEquals("FF0000", resolver().resolve(
|
||||||
|
new ColorSpec("FF0000", null, null, null, null)));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void argbLosesAlpha() throws Exception {
|
||||||
|
assertEquals("00FF00", resolver().resolve(
|
||||||
|
new ColorSpec("FF00FF00", null, null, null, null)));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void themeAccent1() throws Exception {
|
||||||
|
assertEquals("4472C4", resolver().resolve(
|
||||||
|
new ColorSpec(null, null, 4, null, null)));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void themeTint() throws Exception {
|
||||||
|
// HLS-модуляция светлоты (MS-OI29500 §2.3.1.6.16): accent1 4472C4,
|
||||||
|
// tint 0.6 → L 0.5176→0.8070
|
||||||
|
assertEquals("B4C7E7", resolver().resolve(
|
||||||
|
new ColorSpec(null, null, 4, 0.6, null)));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void indexedLegacyPalette() throws Exception {
|
||||||
|
// Excel 97: 8=чёрный, 10=красный
|
||||||
|
assertEquals("000000", resolver().resolve(
|
||||||
|
new ColorSpec(null, 8, null, null, null)));
|
||||||
|
assertEquals("FF0000", resolver().resolve(
|
||||||
|
new ColorSpec(null, 10, null, null, null)));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void indexedOverrideFromStyles() throws Exception {
|
||||||
|
ColorResolver r = new ColorResolver(
|
||||||
|
ThemeModel.read(XlsxPackage.read(new byte[0]), WARN), List.of("112233"));
|
||||||
|
assertEquals("112233", r.resolve(new ColorSpec(null, 64, null, null, null)));
|
||||||
|
assertNull(r.resolve(new ColorSpec(null, 66, null, null, null)));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void unresolvableIsEmpty() throws Exception {
|
||||||
|
ColorResolver r = resolver();
|
||||||
|
assertNull(r.resolve(null));
|
||||||
|
assertNull(r.resolve(new ColorSpec(null, null, null, null, null)));
|
||||||
|
assertNull(r.resolve(new ColorSpec("zzzzzz", null, null, null, null)));
|
||||||
|
assertNull(r.resolve(new ColorSpec(null, null, 99, null, null)));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void shadeDarkens() throws Exception {
|
||||||
|
// FFFF00 shade −0.5: L 0.5→0.25, тон/насыщенность сохраняются
|
||||||
|
assertEquals("7F8000", resolver().resolve(
|
||||||
|
new ColorSpec("FFFF00", null, null, null, -0.5)));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,66 @@
|
|||||||
|
package ru.pjandro.wordpdf.internal.xlsx;
|
||||||
|
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertNull;
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||||
|
|
||||||
|
import java.io.StringReader;
|
||||||
|
|
||||||
|
import javax.xml.stream.XMLStreamReader;
|
||||||
|
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
|
/** Разбор CT_Color (§18.18.15) и числовые фолбэки атрибутов. */
|
||||||
|
class ColorSpecTest {
|
||||||
|
|
||||||
|
private static ColorSpec parse(String elementXml) throws Exception {
|
||||||
|
XMLStreamReader xr = XlsxPackage.newSecureReader()
|
||||||
|
.createXMLStreamReader(new StringReader(elementXml));
|
||||||
|
xr.next();
|
||||||
|
ColorSpec spec = ColorSpec.fromColorElement(xr);
|
||||||
|
xr.close();
|
||||||
|
return spec;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void emptyElement_isAuto() throws Exception {
|
||||||
|
ColorSpec auto = parse("<color/>");
|
||||||
|
assertTrue(auto.isEmpty());
|
||||||
|
assertNull(auto.rgb());
|
||||||
|
assertEquals(ColorSpec.AUTO, auto);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void allAttributes_parsed() throws Exception {
|
||||||
|
ColorSpec spec = parse("<color rgb=\"FFFF0000\" theme=\"4\" tint=\"0.4\""
|
||||||
|
+ " shade=\"-0.2\"/>");
|
||||||
|
assertEquals("FFFF0000", spec.rgb());
|
||||||
|
assertEquals(4, spec.theme());
|
||||||
|
assertEquals(0.4, spec.tint());
|
||||||
|
assertEquals(-0.2, spec.shade());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void brokenTintOnly_degradesToAuto() throws Exception {
|
||||||
|
ColorSpec spec = parse("<color tint=\"x\"/>");
|
||||||
|
assertNull(spec.tint(), "не-числовой tint — null");
|
||||||
|
assertEquals(ColorSpec.AUTO, spec, "единственный атрибут битый — auto");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void parseInt_parseDouble_garbageNull() {
|
||||||
|
assertNull(ColorSpec.parseInt(null));
|
||||||
|
assertNull(ColorSpec.parseInt("1.5"));
|
||||||
|
assertEquals(-3, ColorSpec.parseInt("-3"));
|
||||||
|
assertNull(ColorSpec.parseDouble(null));
|
||||||
|
assertNull(ColorSpec.parseDouble("abc"));
|
||||||
|
assertEquals(-1.5e-3, ColorSpec.parseDouble("-1.5e-3"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void rgbHelper() {
|
||||||
|
ColorSpec spec = ColorSpec.rgb("AABBCC");
|
||||||
|
assertEquals("AABBCC", spec.rgb());
|
||||||
|
assertTrue(spec.tint() == null && spec.theme() == null);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,43 @@
|
|||||||
|
package ru.pjandro.wordpdf.internal.xlsx;
|
||||||
|
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||||
|
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
|
/** MDW Normal-семейства и формула ширины столбца §18.3.1.13/MS-OI29500. */
|
||||||
|
class MetricsTest {
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void mdw_carlitoIsCanonical7() {
|
||||||
|
Metrics metrics = Metrics.forNormalFamily("Calibri");
|
||||||
|
assertEquals(7, metrics.mdw(), "Calibri→Carlito 11pt MDW = 7 px");
|
||||||
|
assertEquals(metrics.mdw(), Metrics.forNormalFamily(null).mdw(),
|
||||||
|
"нет имени — Carlito");
|
||||||
|
assertEquals(metrics.mdw(), Metrics.forNormalFamily("НетТакого").mdw(),
|
||||||
|
"вне бандла — Carlito");
|
||||||
|
assertTrue(Metrics.forNormalFamily("DEJAVU SANS").mdw() >= 1,
|
||||||
|
"регистр имени не важен, MDW > 0");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void colWidthPx_canonical64() {
|
||||||
|
Metrics metrics = Metrics.forNormalFamily("Calibri");
|
||||||
|
assertEquals(64, metrics.colWidthPx(8.43, 8.0, false),
|
||||||
|
"w=8.43, MDW=7 → канонические 64 px");
|
||||||
|
assertEquals(0, metrics.colWidthPx(8.43, 8.0, true), "hidden — 0");
|
||||||
|
assertEquals(0, metrics.colWidthPx(null, 8.0, true), "hidden без width — тоже 0");
|
||||||
|
assertEquals(metrics.defaultWidthPx(8.0), metrics.colWidthPx(null, 8.0, false));
|
||||||
|
assertTrue(metrics.defaultWidthPx(8.0) > 60);
|
||||||
|
assertTrue(metrics.colWidthPx(20.0, 8.0, false) > metrics.colWidthPx(10.0, 8.0, false));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void unitConversions() {
|
||||||
|
assertEquals(150, Metrics.pxToTwips(10));
|
||||||
|
assertEquals(95250L, Metrics.pxToEmu(10));
|
||||||
|
assertEquals(400, Metrics.ptToTwips(20));
|
||||||
|
assertEquals(1440, Metrics.inchesToTwips(1));
|
||||||
|
assertEquals(144, Metrics.ptToTwips(7.2));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,363 @@
|
|||||||
|
package ru.pjandro.wordpdf.internal.xlsx;
|
||||||
|
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||||
|
|
||||||
|
import java.util.Map;
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Движок форматных кодов SpreadsheetML (§18.8.31): встроенные id, кастомы
|
||||||
|
* из фикстуры samples/xlsx-numfmt.xlsx и эталонные пары Excel. Деградации
|
||||||
|
* (мнимый 29.02.1900 → 28.02, дробный формат → General) закреплены здесь же.
|
||||||
|
*/
|
||||||
|
class NumberFormatsTest {
|
||||||
|
|
||||||
|
private static NumberFormats custom(String code) {
|
||||||
|
return new NumberFormats(Map.of(164, code), false);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String fmt(String code, String raw) {
|
||||||
|
return custom(code).format(164, raw, new WarnOnce());
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String builtin(int id, String raw) {
|
||||||
|
return new NumberFormats(Map.of(), false).format(id, raw, new WarnOnce());
|
||||||
|
}
|
||||||
|
|
||||||
|
// ================== встроенные id ==================
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void builtinTwoDecimals() {
|
||||||
|
assertEquals("3.14", builtin(2, "3.14159"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void builtinThousands() {
|
||||||
|
assertEquals("1,235", builtin(3, "1234.5"));
|
||||||
|
assertEquals("1,234.50", builtin(4, "1234.5"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void builtinPercent() {
|
||||||
|
assertEquals("43%", builtin(9, "0.425"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void builtinDate() {
|
||||||
|
// id 14 — код «mm-dd-yy», вывод locale-independent (месяц первым)
|
||||||
|
assertEquals("12-03-24", builtin(14, "45629"));
|
||||||
|
assertEquals("3-Dec", builtin(16, "45629"));
|
||||||
|
assertEquals("(1,234.50)", builtin(39, "-1234.5"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void builtinTime() {
|
||||||
|
assertEquals("18:00", builtin(20, "0.75"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void builtinDateTime() {
|
||||||
|
assertEquals("12/3/24 18:30", builtin(22, "45629.7708333333"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void builtinElapsed() {
|
||||||
|
assertEquals("36:00:00", builtin(46, "1.5"));
|
||||||
|
}
|
||||||
|
|
||||||
|
// ================== кастомные коды фикстуры ==================
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void twoDecimals() {
|
||||||
|
assertEquals("3.14", fmt("0.00", "3.14159"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void thousands() {
|
||||||
|
assertEquals("1,235", fmt("#,##0", "1234.5"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void moneySections() {
|
||||||
|
assertEquals("$1,234.00", fmt("$#,##0.00_);($#,##0.00)", "1234.0"));
|
||||||
|
assertEquals("($1,234.50)", fmt("$#,##0.00_);($#,##0.00)", "-1234.5"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void percent() {
|
||||||
|
assertEquals("42.5%", fmt("0.0%", "0.425"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void scientific() {
|
||||||
|
assertEquals("1.22E+07", fmt("0.00E+00", "12234567"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void scaleMillions() {
|
||||||
|
assertEquals("12", fmt("#,##0,,", "12345678"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void dateCustom() {
|
||||||
|
assertEquals("03.12.2024", fmt("dd.mm.yyyy", "45629"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void weekdayShort() {
|
||||||
|
assertEquals("Tue", fmt("ddd", "45629"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void longDateTimeMonthVsMinutes() {
|
||||||
|
// «mmmm» после yyyy — месяц; «mm» после hh — минуты (контекст соседа)
|
||||||
|
assertEquals("03 December 2024 18:30", fmt("dd mmmm yyyy hh:mm", "45629.7708333333"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void elapsedHours() {
|
||||||
|
assertEquals("36:00", fmt("[h]:mm", "1.5"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void colorSectionStripped() {
|
||||||
|
assertEquals("-1.50", fmt("[Red]0.00", "-1.5"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void accountingSections() {
|
||||||
|
String code = "_(* #,##0_);_(* (#,##0);_(* \"-\"??);_(@)";
|
||||||
|
assertEquals("1,235", fmt(code, "1234.56"));
|
||||||
|
assertEquals("(1,235)", fmt(code, "-1234.56"));
|
||||||
|
// accounting: минус выравнивается в колонке знаков, «)» печатается всегда
|
||||||
|
assertEquals("-)", fmt(code, "0"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void signSections() {
|
||||||
|
assertEquals("2.50", fmt("0.00;-0.00;0.00;@", "2.5"));
|
||||||
|
assertEquals("-2.50", fmt("0.00;-0.00;0.00;@", "-2.5"));
|
||||||
|
assertEquals("0.00", fmt("0.00;-0.00;0.00;@", "0"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void negativeZeroIsZero() {
|
||||||
|
assertEquals("0.00", fmt("0.00", "-0.0"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void fakeFeb29_1900degradesTo28() {
|
||||||
|
assertEquals("28.02.1900", fmt("dd.mm.yyyy", "60"));
|
||||||
|
assertEquals("01.03.1900", fmt("dd.mm.yyyy", "61"));
|
||||||
|
assertEquals("01.01.1900", fmt("dd.mm.yyyy", "1"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void ampm() {
|
||||||
|
assertEquals("6:00 PM", fmt("h:mm AM/PM", "0.75"));
|
||||||
|
assertEquals("6:00 P", fmt("h:mm A/P", "0.75"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void optionalHashDecimalTrimmed() {
|
||||||
|
// «0» после точки обязателен, хвост «#» с нулями обрезается
|
||||||
|
assertEquals("1.5", fmt("0.0##", "1.5"));
|
||||||
|
assertEquals("1.0", fmt("0.0##", "1"));
|
||||||
|
assertEquals("1.234", fmt("0.0##", "1.234"));
|
||||||
|
assertEquals("1.23", fmt("0.0#", "1.234"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void optionalIntegerZero() {
|
||||||
|
assertEquals(".5", fmt("#.##", "0.5"));
|
||||||
|
assertEquals("12.5", fmt("#.##", "12.5"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void textCodeFallsBackToGeneral() {
|
||||||
|
assertEquals("5", fmt("@", "5"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void fractionDegradesToGeneral() {
|
||||||
|
assertEquals("1.4", fmt("5/8", "1.4"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void brokenNumberPassesThrough() {
|
||||||
|
assertEquals("abc", fmt("0.00", "abc"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void unknownIdGeneral() {
|
||||||
|
assertEquals("123456.789", new NumberFormats(Map.of(), false)
|
||||||
|
.format(9999, "123456.789", new WarnOnce()));
|
||||||
|
}
|
||||||
|
|
||||||
|
// ================== эпоха 1904 ==================
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void epoch1904() {
|
||||||
|
NumberFormats nf = new NumberFormats(Map.of(164, "dd.mm.yyyy hh:mm"), true);
|
||||||
|
assertEquals("01.01.1904 00:00", nf.format(164, "0", new WarnOnce()));
|
||||||
|
assertEquals("02.03.1904 00:00", nf.format(164, "61", new WarnOnce()));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void negativeIn1904StillDates() {
|
||||||
|
// в эпохе 1904 отрицательные сериальники календарны (Excel так же)
|
||||||
|
assertEquals("30.12.1903", new NumberFormats(Map.of(164, "dd.mm.yyyy"), true)
|
||||||
|
.format(164, "-1.5", new WarnOnce()));
|
||||||
|
}
|
||||||
|
|
||||||
|
// ================== синтаксис кода ==================
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void escapedSemicolonDoesNotSplitSections() {
|
||||||
|
assertEquals(";5.00", fmt("\\;0.00", "5"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void semicolonInBracketsDoesNotSplit() {
|
||||||
|
assertEquals("7", fmt("[a;b]0", "7"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void quotedAndBackslashLiterals() {
|
||||||
|
assertEquals("ab5", fmt("\"ab\"#", "5"));
|
||||||
|
assertEquals("$5", fmt("\\$0", "5"));
|
||||||
|
assertEquals("a\"b5", fmt("\"a\\\"b\"0", "5"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void unterminatedQuoteDegradesToGeneral() {
|
||||||
|
assertEquals("5", fmt("\"abc0", "5"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void underscoreAndStarPaddingStripped() {
|
||||||
|
assertEquals("1,235", fmt("_(* #,##0", "1234.5"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void trailingSpecialsBecomeLiterals() {
|
||||||
|
assertEquals("5_", fmt("0_", "5"));
|
||||||
|
assertEquals("5*", fmt("0*", "5"));
|
||||||
|
assertEquals("5\\", fmt("0\\", "5"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void currencyBracketLiteral() {
|
||||||
|
assertEquals("US5", fmt("[$US]0", "5"));
|
||||||
|
assertEquals("5", fmt("[$$-419]0", "5"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void emptyBracketSkipped() {
|
||||||
|
assertEquals("5", fmt("[]0", "5"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void percentBeforeNumberKeepsPosition() {
|
||||||
|
assertEquals("%42.5", fmt("%0.0", "0.425"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void generalCodeIsGeneral() {
|
||||||
|
assertEquals("5", fmt("General", "5"));
|
||||||
|
assertEquals("5", new NumberFormats(Map.of(), false)
|
||||||
|
.format(0, "5", new WarnOnce()));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void questionMarkDigits() {
|
||||||
|
assertEquals("5.50", fmt("??0.00", "5.5"));
|
||||||
|
assertEquals("1235", fmt("#?#?0", "1234.5"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void decimalWithoutInteger() {
|
||||||
|
assertEquals(".5", fmt(".##", "0.5"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void twoDecimalZonesConcatenate() {
|
||||||
|
// вторая точка-зона дописывается в ту же дробную маску
|
||||||
|
assertEquals("01.40x", fmt("0.0x0.0", "1.4"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void zeroPaddingToMask() {
|
||||||
|
assertEquals("00007", fmt("00000", "7"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void forcedZeroDecimalsKept() {
|
||||||
|
assertEquals("1.5", fmt("0.0#", "1.5"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void twoSectionsZeroUsesFirst() {
|
||||||
|
assertEquals("0.00", fmt("0.00;-0.00", "0"));
|
||||||
|
assertEquals("-1.00", fmt("0.00;-0.00", "-1"));
|
||||||
|
}
|
||||||
|
|
||||||
|
// ================== дата/время: детали ==================
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void monthContextFromNeighbor() {
|
||||||
|
assertEquals("12", fmt("m", "45629"));
|
||||||
|
assertEquals("3 12", fmt("d m", "45629"));
|
||||||
|
assertEquals("18 0", fmt("h m", "0.75"));
|
||||||
|
assertEquals("0 0", fmt("m s", "0.75"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void dayAndMonthWidths() {
|
||||||
|
assertEquals("3", fmt("d", "45629"));
|
||||||
|
assertEquals("Tuesday", fmt("dddd", "45629"));
|
||||||
|
assertEquals("12", fmt("m", "45629"));
|
||||||
|
assertEquals("Dec", fmt("mmm", "45629"));
|
||||||
|
assertEquals("D", fmt("mmmmm", "45629"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void elapsedAllUnits() {
|
||||||
|
assertEquals("2160", fmt("[m]", "1.5"));
|
||||||
|
assertEquals("129600", fmt("[s]", "1.5"));
|
||||||
|
assertEquals("2160:00", fmt("[mm]:ss", "1.5"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void hour12MidnightAndNoon() {
|
||||||
|
assertEquals("12:00 AM", fmt("h:mm AM/PM", "0"));
|
||||||
|
assertEquals("12:00 PM", fmt("h:mm AM/PM", "0.5"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void narrowTimeFields() {
|
||||||
|
assertEquals("18:0", fmt("h:m", "0.75"));
|
||||||
|
assertEquals("0", fmt("s", "0.5"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void lowercaseAmPm() {
|
||||||
|
assertEquals("6:00 am", fmt("h:mm am/pm", "0.25"));
|
||||||
|
assertEquals("6:00 p", fmt("h:mm a/p", "0.75"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void dateMinusNumberTokIgnored() {
|
||||||
|
assertEquals("18:00", fmt("h:mm.0", "0.75"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void negativeDate1900IsGeneral() {
|
||||||
|
assertEquals("-5", fmt("dd.mm.yyyy", "-5"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void scientificNegativeExponent() {
|
||||||
|
assertEquals("1.23E-04", fmt("0.00E+00", "0.00012345"));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,65 @@
|
|||||||
|
package ru.pjandro.wordpdf.internal.xlsx;
|
||||||
|
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||||
|
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
|
/** General-вывод §18.8.30 и типы {@code @t} (boolean/ошибка/кэш-формула). */
|
||||||
|
class NumberTextTest {
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void of_types() {
|
||||||
|
assertEquals("", NumberText.of(null, "s"));
|
||||||
|
assertEquals("TRUE", NumberText.of("1", "b"));
|
||||||
|
assertEquals("FALSE", NumberText.of("0", "b"));
|
||||||
|
assertEquals("FALSE", NumberText.of("2", "b"));
|
||||||
|
assertEquals("#DIV/0!", NumberText.of("#DIV/0!", "e"));
|
||||||
|
assertEquals("кэш", NumberText.of("кэш", "str"));
|
||||||
|
assertEquals("2024-01-02", NumberText.of("2024-01-02", "d"));
|
||||||
|
assertEquals("1.5", NumberText.of("1.5", "n"));
|
||||||
|
assertEquals("1.5", NumberText.of("1.5", null), "тип без @t — число");
|
||||||
|
assertEquals("чужойТип", NumberText.of("чужойТип", "zz"),
|
||||||
|
"неизвестный тип — general-обход");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void general_integersAndPassthrough() {
|
||||||
|
assertEquals("42", NumberText.general("42"));
|
||||||
|
assertEquals("42", NumberText.general("42.0"));
|
||||||
|
assertEquals("-7", NumberText.general("-7"));
|
||||||
|
assertEquals("0", NumberText.general("-0.0"));
|
||||||
|
assertEquals("9999999999", NumberText.general("9999999999"),
|
||||||
|
"10 знаков — ещё десятичная запись");
|
||||||
|
assertEquals("не число", NumberText.general("не число"));
|
||||||
|
assertEquals("1.5", NumberText.general(" 1.5 "));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void general_scientificBoundaries() {
|
||||||
|
assertEquals("1E+10", NumberText.general("10000000000"),
|
||||||
|
"11-й знак — научный, как Excel General");
|
||||||
|
assertEquals("1E+15", NumberText.general("1000000000000000"));
|
||||||
|
assertEquals("1E-10", NumberText.general("0.0000000001"));
|
||||||
|
assertEquals("5E-10", NumberText.general("0.0000000005"));
|
||||||
|
assertEquals("-2500000000", NumberText.general("-2500000000.0"));
|
||||||
|
assertEquals("1.23456789E+20", NumberText.general("123456789012000000000"),
|
||||||
|
"10 значащих знаков");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void decimal_shortestRoundTrip() {
|
||||||
|
assertEquals("0.5", NumberText.general("0.5"));
|
||||||
|
assertEquals("0.30000000000000004", NumberText.general("0.30000000000000004"),
|
||||||
|
"shortest round-trip без обрезания");
|
||||||
|
assertEquals("0.000000001", NumberText.general("0.000000001"),
|
||||||
|
"abs == 1e-9 — нижняя граница десятичного диапазона");
|
||||||
|
assertEquals("9999999999.5", NumberText.general("9999999999.5"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void scientific_twoDigitExponent() {
|
||||||
|
assertEquals("1.5E+20", NumberText.general("1.5e20"));
|
||||||
|
assertEquals("1E+105", NumberText.general("1e105"));
|
||||||
|
assertEquals("-1.5E-20", NumberText.general("-1.5e-20"));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,111 @@
|
|||||||
|
package ru.pjandro.wordpdf.internal.xlsx;
|
||||||
|
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertNull;
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertThrows;
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
|
/** SST §18.8: plain/rich-раны, rPr-переопределения, rPh-вырезание, индексы. */
|
||||||
|
class SharedStringsTest {
|
||||||
|
|
||||||
|
private static SharedStrings read(String sstXml) throws IOException {
|
||||||
|
return SharedStrings.read(
|
||||||
|
XlsxTestZips.pkg(Map.of("xl/sharedStrings.xml", sstXml)), new WarnOnce());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void missingSst_emptyTable() throws IOException {
|
||||||
|
SharedStrings sst = SharedStrings.read(XlsxTestZips.pkg(Map.of()), new WarnOnce());
|
||||||
|
WarnOnce warn = new WarnOnce();
|
||||||
|
assertTrue(sst.at(0, warn).isEmpty());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void brokenSst_ioException() {
|
||||||
|
assertThrows(IOException.class, () -> read("<sst><si><unclosed"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void plainAndRunsAndPhonetic() throws IOException {
|
||||||
|
SharedStrings sst = read("""
|
||||||
|
<sst>
|
||||||
|
<si><t>просто</t></si>
|
||||||
|
<si>
|
||||||
|
<t>база </t>
|
||||||
|
<r><t>курсив</t></r>
|
||||||
|
<rPh sb="0" eb="3"><t>фоне</t></rPh>
|
||||||
|
<r><rPr><i/></rPr><t>ажным</t></r>
|
||||||
|
</si>
|
||||||
|
<si><t xml:space="preserve"> пробелы </t></si>
|
||||||
|
<si><phoneticRun sb="0" t="x"/></si>
|
||||||
|
</sst>""");
|
||||||
|
assertEquals("просто", sst.at(0, new WarnOnce()).get(0).text());
|
||||||
|
assertNull(sst.at(0, new WarnOnce()).get(0).style());
|
||||||
|
List<SharedStrings.Run> rich = sst.at(1, new WarnOnce());
|
||||||
|
assertEquals(3, rich.size(), "plain-префикс первым, rPh вырезан");
|
||||||
|
assertEquals("база ", rich.get(0).text());
|
||||||
|
assertEquals("курсив", rich.get(1).text());
|
||||||
|
assertNull(rich.get(1).style(), "r без rPr — стиль ячейки");
|
||||||
|
assertEquals("ажным", rich.get(2).text());
|
||||||
|
assertEquals(Boolean.TRUE, rich.get(2).style().italic());
|
||||||
|
assertEquals(" пробелы ", sst.at(2, new WarnOnce()).get(0).text());
|
||||||
|
assertTrue(sst.at(3, new WarnOnce()).isEmpty(), "только phoneticRun — пусто");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void runStyle_allOverrides() throws IOException {
|
||||||
|
SharedStrings sst = read("""
|
||||||
|
<sst><si><r>
|
||||||
|
<rPr>
|
||||||
|
<b/><i val="0"/><strike/><u val="double"/>
|
||||||
|
<sz val="9.5"/><color rgb="FF00B050"/>
|
||||||
|
<vertAlign val="superscript"/><rFont val="Calibri"/>
|
||||||
|
</rPr>
|
||||||
|
<t>текст</t>
|
||||||
|
</r></si></sst>""");
|
||||||
|
SharedStrings.RunStyle st = sst.at(0, new WarnOnce()).get(0).style();
|
||||||
|
assertEquals(Boolean.TRUE, st.bold());
|
||||||
|
assertEquals(Boolean.FALSE, st.italic(), "val=0 — ложь");
|
||||||
|
assertEquals(Boolean.TRUE, st.strikeout());
|
||||||
|
assertEquals("double", st.underline());
|
||||||
|
assertEquals(9.5, st.sizePt());
|
||||||
|
assertEquals("FF00B050", st.color().rgb());
|
||||||
|
assertEquals("superscript", st.vertAlign());
|
||||||
|
assertEquals("Calibri", st.fontName());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void runStyle_neutralValuesCollapseToNull() throws IOException {
|
||||||
|
SharedStrings sst = read("""
|
||||||
|
<sst><si><r>
|
||||||
|
<rPr><u val="none"/><vertAlign val="baseline"/><sz val="x"/></rPr>
|
||||||
|
<t>т</t>
|
||||||
|
</r></si></sst>""");
|
||||||
|
assertNull(sst.at(0, new WarnOnce()).get(0).style(),
|
||||||
|
"u=none + vertAlign=baseline + битый sz — пустой стиль");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void at_outOfBoundsWarnsEmpty() throws IOException {
|
||||||
|
SharedStrings sst = read("<sst><si><t>раз</t></si></sst>");
|
||||||
|
assertTrue(sst.at(1, new WarnOnce()).isEmpty());
|
||||||
|
assertTrue(sst.at(-1, new WarnOnce()).isEmpty());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void nestedSkip_doesNotBreakParentParse() throws IOException {
|
||||||
|
// неизвестный элемент с вложенными детьми не должен обрывать <si>
|
||||||
|
SharedStrings sst = read("""
|
||||||
|
<sst><si>
|
||||||
|
<extLst><ext><a xmlns:a="urn:x"><b/></a></ext></extLst>
|
||||||
|
<t>после skip</t>
|
||||||
|
</si></sst>""");
|
||||||
|
assertEquals("после skip", sst.at(0, new WarnOnce()).get(0).text());
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,292 @@
|
|||||||
|
package ru.pjandro.wordpdf.internal.xlsx;
|
||||||
|
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertNull;
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertThrows;
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Разбор части листа: cols/rows/cells/merge/hyperlinks/rowBreaks/pageSetup
|
||||||
|
* (§18.3.1), битые ref и атрибуты — деградация, а не падение.
|
||||||
|
*/
|
||||||
|
class SheetModelTest {
|
||||||
|
|
||||||
|
private static final WorkbookModel.Sheet SHEET =
|
||||||
|
new WorkbookModel.Sheet("Лист1", null, "xl/worksheets/sheet1.xml");
|
||||||
|
|
||||||
|
private static SheetModel read(String sheetXml) throws IOException {
|
||||||
|
return SheetModel.read(XlsxTestZips.pkg(
|
||||||
|
Map.of("xl/worksheets/sheet1.xml", sheetXml)), SHEET, new WarnOnce());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void missingPart_emptyModel() throws IOException {
|
||||||
|
SheetModel model = SheetModel.read(XlsxTestZips.pkg(Map.of()), SHEET, new WarnOnce());
|
||||||
|
assertTrue(model.rows().isEmpty());
|
||||||
|
assertEquals(0, model.usedCols());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void brokenXml_ioException() {
|
||||||
|
assertThrows(IOException.class, () -> read("<worksheet><sheetData><unclosed"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void sheetPr_fitToPageFlag() throws IOException {
|
||||||
|
SheetModel fit = read(XlsxTestZips.sheet(
|
||||||
|
"<sheetPr><pageSetUpPr fitToPage=\"1\"/></sheetPr><sheetView/>"));
|
||||||
|
assertTrue(fit.pageSetup().fitToPage());
|
||||||
|
SheetModel off = read(XlsxTestZips.sheet("<sheetPr><pageSetUpPr/></sheetPr>"));
|
||||||
|
assertFalse(off.pageSetup().fitToPage());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void sheetFormatPr_defaultsAndGuards() throws IOException {
|
||||||
|
SheetModel model = read(XlsxTestZips.sheet(
|
||||||
|
"<sheetFormatPr defaultRowHeight=\"20\" baseColWidth=\"7\"/>"));
|
||||||
|
assertEquals(20.0, model.defaultRowHeight());
|
||||||
|
assertEquals(7.0, model.baseColWidth());
|
||||||
|
SheetModel zero = read(XlsxTestZips.sheet(
|
||||||
|
"<sheetFormatPr defaultRowHeight=\"0\" baseColWidth=\"-3\"/>"));
|
||||||
|
assertEquals(15.0, zero.defaultRowHeight(), "0/отрицательное — дефолт");
|
||||||
|
assertEquals(8.0, zero.baseColWidth());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void cols_spansHiddenStyleAndOverlap() throws IOException {
|
||||||
|
SheetModel model = read(XlsxTestZips.sheet("""
|
||||||
|
<cols>
|
||||||
|
<col min="1" max="3" width="12.5" style="4"/>
|
||||||
|
<col min="2" max="2" width="99"/>
|
||||||
|
<col min="5" max="5" width="5" hidden="1"/>
|
||||||
|
<col min="7" hidden="0"/>
|
||||||
|
<col min="0" width="5"/>
|
||||||
|
<col min="x" width="5"/>
|
||||||
|
</cols>"""));
|
||||||
|
assertEquals(12.5, model.cols().get(0).width());
|
||||||
|
assertEquals(4, model.cols().get(2).style());
|
||||||
|
assertEquals(12.5, model.cols().get(1).width(), "первая запись выигрывает");
|
||||||
|
assertTrue(model.cols().get(4).hidden());
|
||||||
|
assertNull(model.cols().get(6).width(), "min без max — одна колонка");
|
||||||
|
assertFalse(model.cols().get(6).hidden());
|
||||||
|
assertFalse(model.cols().containsKey(5), "min=0 — мимо");
|
||||||
|
assertFalse(model.cols().containsKey(-1));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void rows_cellsTypesAndRowStyle() throws IOException {
|
||||||
|
SheetModel model = read(XlsxTestZips.sheet("""
|
||||||
|
<sheetData>
|
||||||
|
<row r="0"/>
|
||||||
|
<row r="1" ht="30" customHeight="1" hidden="1" s="3" customFormat="1">
|
||||||
|
<c r="A1" s="7" t="s"><v>2</v></c>
|
||||||
|
<c><v>5</v></c>
|
||||||
|
<c r="C1" t="str"><v>кэш</v></c>
|
||||||
|
</row>
|
||||||
|
<row r="2">
|
||||||
|
<c r="A2" t="b"><v>1</v></c>
|
||||||
|
<c r="B2" t="e"><v>#DIV/0!</v></c>
|
||||||
|
<c r="C2"><v>1.5</v><f>A1+1</f></c>
|
||||||
|
<c r="D2" t="inlineStr"><is><t>инлайн</t></is></c>
|
||||||
|
<c r="E2"><f>B2*2</f></c>
|
||||||
|
<c r="F2"/>
|
||||||
|
</row>
|
||||||
|
</sheetData>"""));
|
||||||
|
SheetModel.RowData row1 = model.rows().get(1);
|
||||||
|
assertEquals(30.0, row1.ht());
|
||||||
|
assertTrue(row1.customHeight());
|
||||||
|
assertTrue(row1.hidden());
|
||||||
|
assertEquals(3, row1.effectiveStyle(), "customFormat — стиль строки");
|
||||||
|
assertEquals("2", row1.cells().get(0).raw());
|
||||||
|
assertEquals(7, row1.cells().get(0).styleIdx());
|
||||||
|
assertEquals("s", row1.cells().get(0).type());
|
||||||
|
assertEquals("5", row1.cells().get(1).raw(), "ячейка без @r — по счёту");
|
||||||
|
assertEquals("кэш", row1.cells().get(2).raw());
|
||||||
|
assertNull(model.rows().get(0), "r=0 — строка мимо");
|
||||||
|
assertNull(model.rows().get(2).effectiveStyle(), "без customFormat — не применяется");
|
||||||
|
assertEquals("1", model.rows().get(2).cells().get(0).raw());
|
||||||
|
assertEquals(1.5, Double.parseDouble(model.rows().get(2).cells().get(2).raw()));
|
||||||
|
assertEquals("инлайн", model.rows().get(2).cells().get(3).runs().get(0).text());
|
||||||
|
assertNull(model.rows().get(2).cells().get(4).raw(), "формула без кэша — пусто");
|
||||||
|
assertNull(model.rows().get(2).cells().get(5).raw());
|
||||||
|
assertEquals(6, model.usedCols());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void mergeCells_rangesAndGarbage() throws IOException {
|
||||||
|
SheetModel model = read(XlsxTestZips.sheet("""
|
||||||
|
<mergeCells count="3">
|
||||||
|
<mergeCell ref="B2:D4"/>
|
||||||
|
<mergeCell ref="A1"/>
|
||||||
|
<mergeCell ref="битый"/>
|
||||||
|
</mergeCells>"""));
|
||||||
|
assertEquals(2, model.merges().size());
|
||||||
|
SheetModel.Merge m = model.merges().get(0);
|
||||||
|
assertEquals(1, m.row1());
|
||||||
|
assertEquals(3, m.row2());
|
||||||
|
assertEquals(1, m.col1());
|
||||||
|
assertEquals(3, m.col2());
|
||||||
|
SheetModel.Merge single = model.merges().get(1);
|
||||||
|
assertEquals(0, single.row1());
|
||||||
|
assertEquals(0, single.col2(), "одна ячейка — вырожденный прямоугольник");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void hyperlinks_externalRelResolved_internalIgnored() throws IOException {
|
||||||
|
String rels = XlsxTestZips.sheetRels(
|
||||||
|
XlsxTestZips.rel("rId1", XlsxTestZips.REL_HYPERLINK,
|
||||||
|
"https://example.com/", "External"),
|
||||||
|
XlsxTestZips.rel("rId2", XlsxTestZips.REL_HYPERLINK,
|
||||||
|
"other.xlsx", "External"));
|
||||||
|
String xml = XlsxTestZips.sheet("""
|
||||||
|
<hyperlinks>
|
||||||
|
<hyperlink ref="A1" r:id="rId1"/>
|
||||||
|
<hyperlink ref="A2" r:id="rMiss"/>
|
||||||
|
<hyperlink ref="A3" r:id="rId2"/>
|
||||||
|
<hyperlink ref="A4" location="Лист2!A1"/>
|
||||||
|
<hyperlink r:id="rId1"/>
|
||||||
|
</hyperlinks>""");
|
||||||
|
XlsxPackage pkg = XlsxTestZips.pkg(Map.of(
|
||||||
|
"xl/worksheets/sheet1.xml", xml,
|
||||||
|
"xl/worksheets/_rels/sheet1.xml.rels", rels));
|
||||||
|
SheetModel model = SheetModel.read(pkg, SHEET, new WarnOnce());
|
||||||
|
assertEquals("https://example.com/", model.externalLinks().get("A1"));
|
||||||
|
assertEquals("other.xlsx", model.externalLinks().get("A3"));
|
||||||
|
assertEquals(2, model.externalLinks().size(), "внутренние/битые — мимо");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void rowBreaks_manualOnly() throws IOException {
|
||||||
|
SheetModel model = read(XlsxTestZips.sheet("""
|
||||||
|
<rowBreaks count="4">
|
||||||
|
<brk id="12" man="1"/>
|
||||||
|
<brk id="20"/>
|
||||||
|
<brk id="30" man="0"/>
|
||||||
|
<brk id="40" man="false"/>
|
||||||
|
<brk id="0" man="1"/>
|
||||||
|
<brk id="x" man="1"/>
|
||||||
|
</rowBreaks>"""));
|
||||||
|
assertEquals(java.util.List.of(12, 20), model.rowBreaks());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void pageMargins_partialFallsBackToDefaults() throws IOException {
|
||||||
|
SheetModel model = read(XlsxTestZips.sheet(
|
||||||
|
"<pageMargins left=\"0.25\" top=\"0.5\" right=\"x\"/>"));
|
||||||
|
assertEquals(0.25, model.margins().left());
|
||||||
|
assertEquals(0.5, model.margins().top());
|
||||||
|
assertEquals(0.7, model.margins().right(), "битый/нет — дефолт 0.7");
|
||||||
|
assertEquals(0.75, model.margins().bottom());
|
||||||
|
assertEquals(0.3, model.margins().header());
|
||||||
|
assertEquals(0.3, model.margins().footer());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void pageSetup_attributesKeepFitToPageFromSheetPr() throws IOException {
|
||||||
|
SheetModel model = read(XlsxTestZips.sheet("""
|
||||||
|
<sheetPr><pageSetUpPr fitToPage="1"/></sheetPr>
|
||||||
|
<pageSetup paperSize="1" orientation="landscape" scale="55"
|
||||||
|
fitToWidth="0" fitToHeight="2"/>"""));
|
||||||
|
SheetModel.PageSetup ps = model.pageSetup();
|
||||||
|
assertEquals(1, ps.paperSize());
|
||||||
|
assertTrue(ps.landscape());
|
||||||
|
assertEquals(55, ps.scale());
|
||||||
|
assertEquals(0, ps.fitToWidth());
|
||||||
|
assertEquals(2, ps.fitToHeight());
|
||||||
|
assertTrue(ps.fitToPage(), "pageSetup не затирает fitToPage из sheetPr");
|
||||||
|
SheetModel bare = read(XlsxTestZips.sheet("<pageSetup orientation=\"portrait\"/>"));
|
||||||
|
assertEquals(9, bare.pageSetup().paperSize());
|
||||||
|
assertEquals(100, bare.pageSetup().scale());
|
||||||
|
assertEquals(1, bare.pageSetup().fitToWidth());
|
||||||
|
assertFalse(bare.pageSetup().landscape());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void drawingAndOleFlags() throws IOException {
|
||||||
|
String rels = XlsxTestZips.sheetRels(XlsxTestZips.rel("rId9",
|
||||||
|
XlsxTestZips.REL_DRAWING, "../drawings/drawing1.xml"));
|
||||||
|
XlsxPackage withDrawing = XlsxTestZips.pkg(Map.of(
|
||||||
|
"xl/worksheets/sheet1.xml",
|
||||||
|
XlsxTestZips.sheet("<drawing r:id=\"rId9\"/><legacyDrawing r:id=\"rIdL\"/>"),
|
||||||
|
"xl/worksheets/_rels/sheet1.xml.rels", rels));
|
||||||
|
SheetModel model = SheetModel.read(withDrawing, SHEET, new WarnOnce());
|
||||||
|
assertEquals("xl/drawings/drawing1.xml", model.drawingPath());
|
||||||
|
assertTrue(model.olePresent(), "legacyDrawing — OLE-мусворд рядом");
|
||||||
|
|
||||||
|
XlsxPackage noRid = XlsxTestZips.pkg(Map.of("xl/worksheets/sheet1.xml",
|
||||||
|
XlsxTestZips.sheet("<drawing/><oleObjects/>")));
|
||||||
|
SheetModel m2 = SheetModel.read(noRid, SHEET, new WarnOnce());
|
||||||
|
assertNull(m2.drawingPath(), "drawing без r:id — нет цели");
|
||||||
|
assertTrue(m2.olePresent());
|
||||||
|
|
||||||
|
XlsxPackage brokenRid = XlsxTestZips.pkg(Map.of("xl/worksheets/sheet1.xml",
|
||||||
|
XlsxTestZips.sheet("<drawing r:id=\"rНет\"/>")));
|
||||||
|
assertNull(SheetModel.read(brokenRid, SHEET, new WarnOnce()).drawingPath());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void unknownElements_skippedDocumentSurvives() throws IOException {
|
||||||
|
SheetModel model = read(XlsxTestZips.sheet("""
|
||||||
|
<dimension ref="A1:B2"/>
|
||||||
|
<sheetViews><sheetView workbookViewId="0"/></sheetViews>
|
||||||
|
<conditionalFormatting sqref="A1"><cfRule type="cellIs"/></conditionalFormatting>
|
||||||
|
<autoFilter ref="A1:B2"/>
|
||||||
|
<headerFooter><oddHeader>&Cшапка</oddHeader></headerFooter>
|
||||||
|
<pageMargins left="1" right="1" top="1" bottom="1" header="0.2" footer="0.2"/>"""));
|
||||||
|
assertEquals(1.0, model.margins().left(), "элементы после default-скипа читаются");
|
||||||
|
assertTrue(model.rows().isEmpty());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void printOptions_warningsDoNotThrow() throws IOException {
|
||||||
|
SheetModel model = read(XlsxTestZips.sheet(
|
||||||
|
"<printOptions horizontalCentered=\"1\" verticalCentered=\"on\""
|
||||||
|
+ " gridLines=\"1\" headings=\"1\"/>"));
|
||||||
|
assertEquals(0.7, model.margins().left());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void worksheetWithoutRNamespace_parsesFine() throws IOException {
|
||||||
|
SheetModel model = read(XlsxTestZips.sheet(
|
||||||
|
"<sheetData><row r=\"1\"><c r=\"A1\"><v>7</v></c></row></sheetData>", false));
|
||||||
|
assertEquals("7", model.rows().get(1).cells().get(0).raw());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void parseRef_variants() {
|
||||||
|
assertRef(new int[] {0, 0}, "A1");
|
||||||
|
assertRef(new int[] {11, 27}, "AB12");
|
||||||
|
assertRef(new int[] {9, 701}, "ZZ10");
|
||||||
|
assertRef(new int[0], null);
|
||||||
|
assertRef(new int[0], "");
|
||||||
|
assertRef(new int[0], "12");
|
||||||
|
assertRef(new int[0], "AB");
|
||||||
|
assertRef(new int[0], "A0");
|
||||||
|
assertRef(new int[0], "A-1");
|
||||||
|
assertRef(new int[] {4, 2}, "C5");
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void assertRef(int[] expected, String ref) {
|
||||||
|
assertEquals(java.util.Arrays.toString(expected),
|
||||||
|
java.util.Arrays.toString(SheetModel.parseRef(ref)), "ref=" + ref);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void parseRange_variants() {
|
||||||
|
assertEquals("[0, 1, 1, 3]", java.util.Arrays.toString(SheetModel.parseRange("B1:D2")));
|
||||||
|
assertEquals("[0, 0, 0, 0]", java.util.Arrays.toString(SheetModel.parseRange("A1")));
|
||||||
|
assertEquals("[0, 0, 0, 0]", java.util.Arrays.toString(
|
||||||
|
SheetModel.parseRange("A1:битый")), "битый второй — вырожденный");
|
||||||
|
assertEquals("[0, 0, 1, 1]", java.util.Arrays.toString(
|
||||||
|
SheetModel.parseRange(" B2 : A1 ")), "нормализация min/max + пробелы");
|
||||||
|
assertEquals("[]", java.util.Arrays.toString(SheetModel.parseRange(null)));
|
||||||
|
assertEquals("[]", java.util.Arrays.toString(SheetModel.parseRange("")));
|
||||||
|
assertEquals("[]", java.util.Arrays.toString(SheetModel.parseRange(":A1")));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,337 @@
|
|||||||
|
package ru.pjandro.wordpdf.internal.xlsx;
|
||||||
|
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.LinkedHashMap;
|
||||||
|
import java.util.LinkedHashSet;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
|
import ru.pjandro.wordpdf.internal.DocxPackageWriter;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Эмит .xlsx-листа в таблицу docx: сетка без скрытых колонок, merge'ы с
|
||||||
|
* редиректом контента, стили/границы/заливки, раны SST, гиперссылки.
|
||||||
|
*/
|
||||||
|
class SheetToTableTest {
|
||||||
|
|
||||||
|
private static final String STYLES = """
|
||||||
|
<styleSheet>
|
||||||
|
<numFmts><numFmt numFmtId="164" formatCode="#,##0.00"/></numFmts>
|
||||||
|
<fonts>
|
||||||
|
<font><sz val="11"/><name val="Calibri"/></font>
|
||||||
|
<font><b/><i/><strike/><u val="single"/><color rgb="FFFF0000"/>
|
||||||
|
<sz val="12"/></font>
|
||||||
|
</fonts>
|
||||||
|
<fills>
|
||||||
|
<fill><patternFill patternType="none"/></fill>
|
||||||
|
<fill><patternFill patternType="gray125"/></fill>
|
||||||
|
<fill><patternFill patternType="solid"><fgColor theme="5"/></patternFill></fill>
|
||||||
|
<fill><patternFill patternType="solid"><bgColor rgb="FF00FF00"/></patternFill></fill>
|
||||||
|
</fills>
|
||||||
|
<borders>
|
||||||
|
<border/>
|
||||||
|
<border>
|
||||||
|
<left style="mediumDashed"><color rgb="FF112233"/></left>
|
||||||
|
<right style="none"/>
|
||||||
|
<top style="неизвестныйСтиль"/>
|
||||||
|
<bottom style="hair"/>
|
||||||
|
</border>
|
||||||
|
<border>
|
||||||
|
<left style="dashDotDot"/><right style="slantDashDot"/>
|
||||||
|
<top style="mediumDashDotDot"/><bottom style="double"/>
|
||||||
|
</border>
|
||||||
|
</borders>
|
||||||
|
<cellXfs>
|
||||||
|
<xf/>
|
||||||
|
<xf fontId="1" applyFont="1" borderId="1" applyBorder="1"
|
||||||
|
fillId="2" applyFill="1" applyAlignment="1">
|
||||||
|
<alignment horizontal="distributed" vertical="justify"
|
||||||
|
wrapText="1" indent="2"/></xf>
|
||||||
|
<xf borderId="2" applyBorder="1" fillId="3" applyFill="1"
|
||||||
|
applyAlignment="1"><alignment vertical="top"/></xf>
|
||||||
|
<xf numFmtId="164" applyNumFmt="1"/>
|
||||||
|
<xf borderId="99"/>
|
||||||
|
<xf borderId="2" applyBorder="1"
|
||||||
|
applyAlignment="1"><alignment horizontal="justify"/></xf>
|
||||||
|
</cellXfs>
|
||||||
|
</styleSheet>""";
|
||||||
|
|
||||||
|
private static final String SST = """
|
||||||
|
<sst>
|
||||||
|
<si>
|
||||||
|
<r><rPr><b/><color rgb="FF00B050"/><vertAlign val="superscript"/></rPr>
|
||||||
|
<t>верх</t></r>
|
||||||
|
<r><rPr><u val="single"/></rPr><t xml:space="preserve"> низ </t></r>
|
||||||
|
</si>
|
||||||
|
<si><t>обычная</t></si>
|
||||||
|
</sst>""";
|
||||||
|
|
||||||
|
/** Полный пакет: лист {@code sheetBody} + {@link #STYLES} + {@link #SST}. */
|
||||||
|
private record Emitted(String xml, List<DocxPackageWriter.Part> parts,
|
||||||
|
List<String> hyperlinks) {
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Emitted emit(String sheetBody, String relsXml) throws IOException {
|
||||||
|
Map<String, String> parts = new LinkedHashMap<>();
|
||||||
|
parts.put("xl/styles.xml", STYLES);
|
||||||
|
parts.put("xl/sharedStrings.xml", SST);
|
||||||
|
parts.put("xl/worksheets/sheet1.xml", sheetBody);
|
||||||
|
if (relsXml != null) {
|
||||||
|
parts.put("xl/worksheets/_rels/sheet1.xml.rels", relsXml);
|
||||||
|
}
|
||||||
|
XlsxPackage pkg = XlsxTestZips.workbook("Лист1|", parts);
|
||||||
|
WarnOnce warn = new WarnOnce();
|
||||||
|
WorkbookModel wb = WorkbookModel.read(pkg);
|
||||||
|
SheetModel model = SheetModel.read(pkg, wb.sheets().get(0), warn);
|
||||||
|
StylesModel styles = StylesModel.read(pkg, warn);
|
||||||
|
SharedStrings sst = SharedStrings.read(pkg, warn);
|
||||||
|
ColorResolver colors = new ColorResolver(ThemeModel.read(pkg, warn),
|
||||||
|
styles.indexedColors());
|
||||||
|
Metrics metrics = Metrics.forNormalFamily(styles.normalFontName(
|
||||||
|
ThemeModel.read(pkg, warn)));
|
||||||
|
List<DocxPackageWriter.Part> outParts = new ArrayList<>();
|
||||||
|
LinkedHashSet<String> links = new LinkedHashSet<>();
|
||||||
|
String xml = SheetToTable.emit(model, styles, sst, wb, metrics,
|
||||||
|
new NumberFormats(styles.customFormats(), wb.date1904()), colors,
|
||||||
|
outParts, links, warn);
|
||||||
|
return new Emitted(xml, outParts, new ArrayList<>(links));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void emptyAndInsignificant_emitNothing() throws IOException {
|
||||||
|
assertEquals("", emit(XlsxTestZips.sheet("<sheetData/>"), null).xml());
|
||||||
|
assertEquals("", emit(XlsxTestZips.sheet("""
|
||||||
|
<sheetData>
|
||||||
|
<row r="1"/>
|
||||||
|
<row r="2"><c r="A2"/><c r="B2"/></row>
|
||||||
|
</sheetData>"""), null).xml(),
|
||||||
|
"пустые ячейки — незначимый лист");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void grid_skipsHiddenColumnAndRow() throws IOException {
|
||||||
|
Emitted out = emit(XlsxTestZips.sheet("""
|
||||||
|
<cols><col min="1" max="1" hidden="1"/></cols>
|
||||||
|
<sheetData>
|
||||||
|
<row r="1"><c r="B1"><v>1</v></c><c r="D1"><v>4</v></c></row>
|
||||||
|
<row r="2" hidden="1"><c r="B2"><v>2</v></c></row>
|
||||||
|
</sheetData>"""), null);
|
||||||
|
assertEquals(3, count(out.xml(), "<w:gridCol"), "B,C,D видмы, A скрыта");
|
||||||
|
assertEquals(1, count(out.xml(), "<w:tr>"), "скрытая строка не эмитится");
|
||||||
|
assertTrue(out.xml().contains("<w:vAlign"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void types_booleanErrorGeneralSst() throws IOException {
|
||||||
|
Emitted out = emit(XlsxTestZips.sheet("""
|
||||||
|
<sheetData>
|
||||||
|
<row r="1">
|
||||||
|
<c r="A1" t="b"><v>1</v></c>
|
||||||
|
<c r="B1" t="e"><v>#N/A</v></c>
|
||||||
|
<c r="C1" t="str"><v>кэш</v></c>
|
||||||
|
<c r="D1"><v>2.5</v></c>
|
||||||
|
<c r="E1" s="3"><v>42.25</v></c>
|
||||||
|
<c r="F1" t="s"><v>1</v></c>
|
||||||
|
</row>
|
||||||
|
</sheetData>"""), null);
|
||||||
|
assertTrue(out.xml().contains(">TRUE<"));
|
||||||
|
assertTrue(out.xml().contains(">#N/A<"));
|
||||||
|
assertTrue(out.xml().contains(">кэш<"));
|
||||||
|
assertTrue(out.xml().contains(">2.5<"));
|
||||||
|
assertTrue(out.xml().contains(">42.25<"), "numFmt 164 #,##0.00");
|
||||||
|
assertTrue(out.xml().contains(">обычная<"), "rich-строка по индексу SST");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void sstIndexOutOfRange_fallsBackToRawText() throws IOException {
|
||||||
|
Emitted out = emit(XlsxTestZips.sheet(
|
||||||
|
"<sheetData><row r=\"1\"><c r=\"A1\" t=\"s\"><v>99</v></c></row></sheetData>"),
|
||||||
|
null);
|
||||||
|
assertTrue(out.xml().contains(">99<"), "индекс вне SST — сырое значение текстом");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void richRuns_stylesAndSpacePreserve() throws IOException {
|
||||||
|
Emitted out = emit(XlsxTestZips.sheet(
|
||||||
|
"<sheetData><row r=\"1\"><c r=\"A1\" t=\"s\"><v>0</v></c></row></sheetData>"),
|
||||||
|
null);
|
||||||
|
assertTrue(out.xml().contains("<w:vertAlign w:val=\"superscript\"/>"));
|
||||||
|
assertTrue(out.xml().contains("w:color w:val=\"00B050\""));
|
||||||
|
assertTrue(out.xml().contains("<w:u w:val=\"single\"/>"));
|
||||||
|
assertTrue(out.xml().contains(" xml:space=\"preserve\"> низ </w:t>"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void styles_bordersShdVAlignJcIndentFont() throws IOException {
|
||||||
|
Emitted out = emit(XlsxTestZips.sheet(
|
||||||
|
"<sheetData><row r=\"1\"><c r=\"A1\" s=\"1\"><v>7</v></c></row></sheetData>"),
|
||||||
|
null);
|
||||||
|
String xml = out.xml();
|
||||||
|
assertTrue(xml.contains("<w:left w:val=\"mediumDashed\" w:sz=\"12\""
|
||||||
|
+ " w:space=\"0\" w:color=\"112233\"/>"));
|
||||||
|
assertFalse(xml.contains("<w:right"), "style=none — сторона не эмитится");
|
||||||
|
assertFalse(xml.contains("неизвестныйСтиль"), "неизвестный стиль — сторона мимо");
|
||||||
|
assertTrue(xml.contains("<w:bottom w:val=\"single\" w:sz=\"2\" w:space=\"0\""
|
||||||
|
+ " w:color=\"auto\"/>"), "hair без color — auto");
|
||||||
|
assertTrue(xml.contains("w:fill=\"ED7D31\""), "solid fgColor theme=5");
|
||||||
|
assertTrue(xml.contains("<w:jc w:val=\"distribute\"/>"));
|
||||||
|
assertTrue(xml.contains("<w:vAlign w:val=\"both\"/>"), "vertical=justify → both");
|
||||||
|
int expect = Metrics.pxToTwips(3 * 2 * Metrics.forNormalFamily("Calibri").mdw());
|
||||||
|
assertTrue(xml.contains("<w:ind w:left=\"" + expect + "\"/>"), "отступ 3·MDW за единицу");
|
||||||
|
assertTrue(xml.contains("<w:b/><w:bCs/>"));
|
||||||
|
assertTrue(xml.contains("<w:strike/>"));
|
||||||
|
assertTrue(xml.contains("<w:sz w:val=\"24\"/>"), "12 pt → 24 half-pt");
|
||||||
|
assertTrue(xml.contains("w:color w:val=\"FF0000\""), "цвет шрифта FF0000");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void styles_borderOobAndFillWithoutFg() throws IOException {
|
||||||
|
Emitted out = emit(XlsxTestZips.sheet(
|
||||||
|
"<sheetData><row r=\"1\"><c r=\"A1\" s=\"2\"><v>7</v></c>"
|
||||||
|
+ "<c r=\"B1\" s=\"4\"><v>8</v></c></row></sheetData>"), null);
|
||||||
|
assertTrue(out.xml().contains("<w:top w:val=\"mediumDashDotDot\" w:sz=\"12\""
|
||||||
|
+ " w:space=\"0\" w:color=\"auto\"/>"));
|
||||||
|
assertTrue(out.xml().contains("<w:right w:val=\"dashDot\""), "slantDashDot → dashDot");
|
||||||
|
assertTrue(out.xml().contains("<w:bottom w:val=\"double\""));
|
||||||
|
assertFalse(out.xml().contains("00FF00"), "solid без fgColor — заливы нет");
|
||||||
|
assertTrue(out.xml().contains("<w:vAlign w:val=\"top\"/>"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void rowStyleAndColStylePrecedence() throws IOException {
|
||||||
|
Emitted rowStyled = emit(XlsxTestZips.sheet("""
|
||||||
|
<sheetData>
|
||||||
|
<row r="1" s="5" customFormat="1"><c r="A1"><v>7</v></c>
|
||||||
|
<c r="B1" s="0"><v>8</v></c></row>
|
||||||
|
</sheetData>"""), null);
|
||||||
|
// A без своего s → стиль строки 5 (границы borderId=2); B — явно s=0
|
||||||
|
String[] tcs = rowStyled.xml().split("<w:tc>");
|
||||||
|
assertTrue(tcs[1].contains("mediumDashDotDot"), "стиль строки на ячейке без своего s");
|
||||||
|
assertFalse(tcs[2].contains("<w:tcBorders"), "явный s=0 перекрывает стиль строки");
|
||||||
|
assertTrue(rowStyled.xml().contains("<w:jc w:val=\"both\"/>"), "justify → both");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void colStyle_appliedToStylelessCell() throws IOException {
|
||||||
|
Emitted out = emit(XlsxTestZips.sheet("""
|
||||||
|
<cols><col min="1" max="1" style="5"/></cols>
|
||||||
|
<sheetData><row r="1"><c r="A1"><v>7</v></c></row></sheetData>"""), null);
|
||||||
|
assertTrue(out.xml().contains("mediumDashDotDot"), "стиль колонки без cell/row s");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void merges_singleRow_gridSpanNoVMerge() throws IOException {
|
||||||
|
Emitted out = emit(XlsxTestZips.sheet("""
|
||||||
|
<sheetData>
|
||||||
|
<row r="1"><c r="A1"><v>широко</v></c><c r="B1"/><c r="C1"><v>мимо</v></c></row>
|
||||||
|
</sheetData>
|
||||||
|
<mergeCells><mergeCell ref="A1:B1"/></mergeCells>"""), null);
|
||||||
|
assertTrue(out.xml().contains("<w:gridSpan w:val=\"2\"/>"));
|
||||||
|
assertFalse(out.xml().contains("vMerge"), "однострочный merge — без vMerge");
|
||||||
|
assertTrue(out.xml().contains(">широко<"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void merges_hiddenColumnOrigin_contentRedirectsToFirstVisible() throws IOException {
|
||||||
|
Emitted out = emit(XlsxTestZips.sheet("""
|
||||||
|
<cols><col min="1" max="1" hidden="1"/></cols>
|
||||||
|
<sheetData>
|
||||||
|
<row r="1"><c r="A1"><v>редирект</v></c></row>
|
||||||
|
</sheetData>
|
||||||
|
<mergeCells><mergeCell ref="A1:B1"/></mergeCells>"""), null);
|
||||||
|
assertTrue(out.xml().contains(">редирект<"), "контент из скрытой origin-колонки");
|
||||||
|
assertEquals(1, count(out.xml(), "<w:gridCol"), "видна только B");
|
||||||
|
assertFalse(out.xml().contains("<w:gridSpan"),
|
||||||
|
"одна видимая колонка диапазона — span не эмитится");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void merges_verticalAndContentRedirectThroughHiddenOrigin() throws IOException {
|
||||||
|
Emitted out = emit(XlsxTestZips.sheet("""
|
||||||
|
<cols><col min="1" max="1" hidden="1"/></cols>
|
||||||
|
<sheetData>
|
||||||
|
<row r="1" hidden="1"><c r="A1"><v>редирект</v></c></row>
|
||||||
|
<row r="2"><c r="A2"/><c r="B2"/><c r="C2"/></row>
|
||||||
|
</sheetData>
|
||||||
|
<mergeCells><mergeCell ref="A1:C2"/></mergeCells>"""), null);
|
||||||
|
String xml = out.xml();
|
||||||
|
assertTrue(xml.contains(">редирект<"), "контент из скрытой origin-ячейки");
|
||||||
|
assertTrue(xml.contains("<w:vMerge w:val=\"restart\"/>"));
|
||||||
|
assertTrue(xml.contains("<w:gridSpan w:val=\"2\"/>"), "видимы B,C");
|
||||||
|
assertEquals(1, count(xml, "<w:tr>"), "строка 1 скрыта");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void hyperlinks_dedupByTarget() throws IOException {
|
||||||
|
String rels = XlsxTestZips.sheetRels(
|
||||||
|
XlsxTestZips.rel("rId1", XlsxTestZips.REL_HYPERLINK,
|
||||||
|
"https://a.example/", "External"),
|
||||||
|
XlsxTestZips.rel("rId2", XlsxTestZips.REL_HYPERLINK,
|
||||||
|
"https://a.example/", "External"),
|
||||||
|
XlsxTestZips.rel("rId3", XlsxTestZips.REL_HYPERLINK,
|
||||||
|
"https://b.example/", "External"));
|
||||||
|
Emitted out = emit(XlsxTestZips.sheet("""
|
||||||
|
<sheetData>
|
||||||
|
<row r="1"><c r="A1"><v>a</v></c><c r="B1"><v>a2</v></c>
|
||||||
|
<c r="C1"><v>b</v></c></row>
|
||||||
|
</sheetData>
|
||||||
|
<hyperlinks>
|
||||||
|
<hyperlink ref="A1" r:id="rId1"/>
|
||||||
|
<hyperlink ref="B1" r:id="rId2"/>
|
||||||
|
<hyperlink ref="C1" r:id="rId3"/>
|
||||||
|
</hyperlinks>"""), rels);
|
||||||
|
assertTrue(out.xml().contains("<w:hyperlink r:id=\"hl0\">"));
|
||||||
|
assertTrue(out.xml().contains("<w:hyperlink r:id=\"hl1\">"));
|
||||||
|
assertEquals(List.of("https://a.example/", "https://b.example/"),
|
||||||
|
out.hyperlinks());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void hyperlinkOnEmptyCell_stillEmitted() throws IOException {
|
||||||
|
String rels = XlsxTestZips.sheetRels(XlsxTestZips.rel("rId1",
|
||||||
|
XlsxTestZips.REL_HYPERLINK, "https://a/", "External"));
|
||||||
|
Emitted out = emit(XlsxTestZips.sheet("""
|
||||||
|
<sheetData><row r="1"><c r="A1" s="1"/></row></sheetData>
|
||||||
|
<hyperlinks><hyperlink ref="A1" r:id="rId1"/></hyperlinks>"""), rels);
|
||||||
|
assertTrue(out.xml().contains("<w:hyperlink r:id=\"hl0\"><w:r>"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void escaping_controlCharsAndEntities() throws IOException {
|
||||||
|
String body = XlsxTestZips.sheet("<sheetData><row r=\"1\">"
|
||||||
|
+ "<c r=\"A1\" t=\"inlineStr\"><is><t>т&<>"x</t></is></c>"
|
||||||
|
+ "</row></sheetData>");
|
||||||
|
Emitted out = emit(body, null);
|
||||||
|
assertTrue(out.xml().contains("т&<>"x"),
|
||||||
|
"сущности разбираются и переэкранируются");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void defaultRowHeight_appliedAsExactTwips() throws IOException {
|
||||||
|
Emitted custom = emit(XlsxTestZips.sheet("""
|
||||||
|
<sheetFormatPr defaultRowHeight="20"/>
|
||||||
|
<sheetData><row r="1"><c r="A1"><v>7</v></c>
|
||||||
|
<c r="B1"><v>8</v></c></row></sheetData>"""), null);
|
||||||
|
assertTrue(custom.xml().contains("<w:trHeight w:val=\"400\" w:hRule=\"exact\"/>"),
|
||||||
|
"20pt = 400 twips");
|
||||||
|
Emitted rowHt = emit(XlsxTestZips.sheet(
|
||||||
|
"<sheetData><row r=\"1\" ht=\"33.5\"><c r=\"A1\"><v>7</v></c></row></sheetData>"),
|
||||||
|
null);
|
||||||
|
assertTrue(rowHt.xml().contains("<w:trHeight w:val=\"670\" w:hRule=\"exact\"/>"));
|
||||||
|
}
|
||||||
|
|
||||||
|
private static int count(String haystack, String needle) {
|
||||||
|
int n = 0;
|
||||||
|
for (int i = haystack.indexOf(needle); i >= 0; i = haystack.indexOf(needle, i + 1)) {
|
||||||
|
n++;
|
||||||
|
}
|
||||||
|
return n;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,250 @@
|
|||||||
|
package ru.pjandro.wordpdf.internal.xlsx;
|
||||||
|
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertNull;
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertThrows;
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* {@code xl/styles.xml} §18.8: таблицы и разрешение cellXfs через
|
||||||
|
* cellStyleXfs по apply*-флагам (base-first),padding дефолтов.
|
||||||
|
*/
|
||||||
|
class StylesModelTest {
|
||||||
|
|
||||||
|
private static StylesModel read(String stylesXml) throws IOException {
|
||||||
|
return StylesModel.read(XlsxTestZips.pkg(Map.of("xl/styles.xml", stylesXml)),
|
||||||
|
new WarnOnce());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void missingStyles_allDefaults() throws IOException {
|
||||||
|
StylesModel styles = StylesModel.read(XlsxTestZips.pkg(Map.of()), new WarnOnce());
|
||||||
|
assertEquals("Calibri", styles.font(0).name());
|
||||||
|
assertEquals(11.0, styles.font(0).sizePt());
|
||||||
|
assertEquals(0, styles.customFormats().size());
|
||||||
|
assertEquals("none", styles.fill(0).patternType());
|
||||||
|
assertEquals("gray125", styles.fill(1).patternType());
|
||||||
|
assertNull(styles.border(0).left());
|
||||||
|
assertEquals(0, styles.xf(0).numFmtId());
|
||||||
|
assertNull(styles.font(9));
|
||||||
|
assertNull(styles.fill(9));
|
||||||
|
assertNull(styles.border(9));
|
||||||
|
assertSame0(styles);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void assertSame0(StylesModel styles) {
|
||||||
|
assertEquals(styles.xf(0).fontId(), styles.xf(999).fontId(), "индекс вне — xf[0]");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void brokenStyles_ioException() {
|
||||||
|
assertThrows(IOException.class, () -> read("<styleSheet><unclosed"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void fonts_allChildren() throws IOException {
|
||||||
|
StylesModel styles = read("""
|
||||||
|
<styleSheet>
|
||||||
|
<fonts count="2">
|
||||||
|
<font>
|
||||||
|
<sz val="14"/><name val="Times New Roman"/><scheme val="minor"/>
|
||||||
|
<b/><i val="0"/><strike/><u val="double"/>
|
||||||
|
<color theme="4" tint="-0.25"/>
|
||||||
|
</font>
|
||||||
|
<font/>
|
||||||
|
</fonts>
|
||||||
|
</styleSheet>""");
|
||||||
|
StylesModel.FontDef f = styles.font(0);
|
||||||
|
assertEquals("Times New Roman", f.name());
|
||||||
|
assertEquals("minor", f.scheme());
|
||||||
|
assertEquals(14.0, f.sizePt());
|
||||||
|
assertEquals(Boolean.TRUE, f.bold());
|
||||||
|
assertEquals(Boolean.FALSE, f.italic());
|
||||||
|
assertEquals(Boolean.TRUE, f.strikeout());
|
||||||
|
assertEquals("double", f.underline());
|
||||||
|
assertEquals(4, f.color().theme());
|
||||||
|
assertEquals(-0.25, f.color().tint());
|
||||||
|
StylesModel.FontDef empty = styles.font(1);
|
||||||
|
assertNull(empty.name());
|
||||||
|
assertEquals("Times New Roman", styles.normalFontName(null),
|
||||||
|
"Normal = шрифт cellXfs[0]");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void normalFontName_themeFallbackChain() throws IOException {
|
||||||
|
StylesModel noName = read("""
|
||||||
|
<styleSheet><fonts><font><scheme val="minor"/></font></fonts></styleSheet>""");
|
||||||
|
ThemeModel theme = ThemeModel.read(XlsxTestZips.pkg(Map.of(ThemeModel.THEME_PART, """
|
||||||
|
<a:theme xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main">
|
||||||
|
<a:minorFont><a:latin typeface="Noto Sans"/></a:minorFont>
|
||||||
|
</a:theme>""")), new WarnOnce());
|
||||||
|
assertEquals("Noto Sans", noName.normalFontName(theme));
|
||||||
|
assertEquals("Calibri", noName.normalFontName(null), "нет имени и темы — Calibri");
|
||||||
|
assertEquals("Calibri", noName.normalFontName(
|
||||||
|
ThemeModel.read(XlsxTestZips.pkg(Map.of()), new WarnOnce())),
|
||||||
|
"тема без minorFont — Calibri");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void fills_patternTypesAndColors() throws IOException {
|
||||||
|
StylesModel styles = read("""
|
||||||
|
<styleSheet>
|
||||||
|
<fills count="4">
|
||||||
|
<fill><patternFill patternType="none"/></fill>
|
||||||
|
<fill><patternFill patternType="solid">
|
||||||
|
<fgColor rgb="FFFFC000"/><bgColor indexed="64"/></patternFill></fill>
|
||||||
|
<fill><patternFill/></fill>
|
||||||
|
<fill><gradientFill angle="45"/></fill>
|
||||||
|
</fills>
|
||||||
|
</styleSheet>""");
|
||||||
|
assertEquals("none", styles.fill(0).patternType());
|
||||||
|
assertEquals("solid", styles.fill(1).patternType());
|
||||||
|
assertEquals("FFFFC000", styles.fill(1).fgColor().rgb());
|
||||||
|
assertEquals("none", styles.fill(2).patternType(), "patternType без атрибута — none");
|
||||||
|
assertNull(styles.fill(2).fgColor());
|
||||||
|
assertEquals("none", styles.fill(3).patternType(), "gradientFill — не паттерн");
|
||||||
|
assertNull(styles.fill(3).fgColor());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void borders_sidesWithColorsDiagonalsIgnored() throws IOException {
|
||||||
|
StylesModel styles = read("""
|
||||||
|
<styleSheet>
|
||||||
|
<borders count="2">
|
||||||
|
<border diagonalUp="1">
|
||||||
|
<left style="thin"><color rgb="FF0000FF"/></left>
|
||||||
|
<right style="mediumDashed"/>
|
||||||
|
<top style="dotted"><color indexed="13"/></top>
|
||||||
|
<color/>
|
||||||
|
<bottom style="thick"><auto/></bottom>
|
||||||
|
</border>
|
||||||
|
<border/>
|
||||||
|
</borders>
|
||||||
|
</styleSheet>""");
|
||||||
|
StylesModel.BorderDef b = styles.border(0);
|
||||||
|
assertEquals("thin", b.left().style());
|
||||||
|
assertEquals("FF0000FF", b.left().color().rgb());
|
||||||
|
assertEquals("mediumDashed", b.right().style());
|
||||||
|
assertNull(b.right().color(), "сторона без color-ребёнка");
|
||||||
|
assertEquals("dotted", b.top().style());
|
||||||
|
assertEquals(13, b.top().color().indexed(),
|
||||||
|
"color стороны после color-ребёнка предыдущей стороны не теряется");
|
||||||
|
assertEquals("thick", b.bottom().style());
|
||||||
|
assertNull(b.bottom().color(), "ребёнок <auto/> — не color-элемент");
|
||||||
|
assertNull(styles.border(1).left());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void numFmts_customCodes() throws IOException {
|
||||||
|
StylesModel styles = read("""
|
||||||
|
<styleSheet>
|
||||||
|
<numFmts count="3">
|
||||||
|
<numFmt numFmtId="164" formatCode="#,##0.00"/>
|
||||||
|
<numFmt numFmtId="164" formatCode="другой"/>
|
||||||
|
<numFmt numFmtId="x" formatCode="код"/>
|
||||||
|
<numFmt numFmtId="166"/>
|
||||||
|
</numFmts>
|
||||||
|
</styleSheet>""");
|
||||||
|
assertEquals(1, styles.customFormats().size(), "дубль/битый id/нет code — мимо");
|
||||||
|
assertEquals("#,##0.00", styles.customFormats().get(164));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void colors_indexedPalette() throws IOException {
|
||||||
|
StylesModel styles = read("""
|
||||||
|
<styleSheet>
|
||||||
|
<colors>
|
||||||
|
<mru/>
|
||||||
|
<indexedColors>
|
||||||
|
<rgbColor rgb="FF000000"/>
|
||||||
|
<rgbColor/>
|
||||||
|
<fgColor rgb="FFFFFFFF"/>
|
||||||
|
</indexedColors>
|
||||||
|
</colors>
|
||||||
|
</styleSheet>""");
|
||||||
|
assertEquals(2, styles.indexedColors().size());
|
||||||
|
assertEquals("FF000000", styles.indexedColors().get(0));
|
||||||
|
assertEquals("000000", styles.indexedColors().get(1), "rgb без атрибута — чёрный");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void cellXfs_applyFlagsResolveViaBase() throws IOException {
|
||||||
|
StylesModel styles = read("""
|
||||||
|
<styleSheet>
|
||||||
|
<cellStyleXfs count="1">
|
||||||
|
<xf numFmtId="10" fontId="1" fillId="2" borderId="3"
|
||||||
|
applyAlignment="1"><alignment horizontal="center" vertical="top"
|
||||||
|
wrapText="1" indent="2"/></xf>
|
||||||
|
</cellStyleXfs>
|
||||||
|
<cellXfs count="4">
|
||||||
|
<xf xfId="0" fontId="7" fillId="9" applyFont="1" applyFill="0"
|
||||||
|
borderId="5"/>
|
||||||
|
<xf xfId="0" applyAlignment="0"><alignment indent="9"/></xf>
|
||||||
|
<xf xfId="0" applyAlignment="1"><alignment horizontal="right"/></xf>
|
||||||
|
<xf xfId="42" numFmtId="164"/>
|
||||||
|
</cellXfs>
|
||||||
|
<dxfs count="1"><dxf><font><b/></font></dxf></dxfs>
|
||||||
|
</styleSheet>""");
|
||||||
|
// cellXfs[0] — тоже формат (Normal), база у него такая же
|
||||||
|
StylesModel.CellXf x0 = styles.xf(0);
|
||||||
|
assertEquals(7, x0.fontId(), "applyFont=1 — своё");
|
||||||
|
assertEquals(2, x0.fillId(), "applyFill=0 — база");
|
||||||
|
assertEquals(5, x0.borderId(), "без флага applyBorder — своё значение есть → своё");
|
||||||
|
assertEquals(10, x0.numFmtId());
|
||||||
|
StylesModel.CellXf x1 = styles.xf(1);
|
||||||
|
assertEquals("center", x1.horizontal(), "applyAlignment=0 — база");
|
||||||
|
assertEquals("top", x1.vertical());
|
||||||
|
assertTrue(x1.wrapText());
|
||||||
|
assertEquals(2, x1.indent(), "индент базы, своё 9 отброшено");
|
||||||
|
StylesModel.CellXf x2 = styles.xf(2);
|
||||||
|
assertEquals("right", x2.horizontal(), "applyAlignment=1 — своё");
|
||||||
|
assertNull(x2.vertical(), "своё отсутствует — null, не база");
|
||||||
|
assertEquals(0, x2.indent());
|
||||||
|
StylesModel.CellXf x3 = styles.xf(3);
|
||||||
|
assertEquals(164, x3.numFmtId(), "xfId вне таблицы — без базы");
|
||||||
|
assertEquals(0, x3.fontId());
|
||||||
|
assertNull(x3.horizontal());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void cellXfs_ownValuesWithoutFlagsWhenAttrPresent() throws IOException {
|
||||||
|
StylesModel styles = read("""
|
||||||
|
<styleSheet>
|
||||||
|
<cellStyleXfs><xf numFmtId="10" fontId="1" fillId="2" borderId="3"/></cellStyleXfs>
|
||||||
|
<cellXfs>
|
||||||
|
<xf xfId="0" numFmtId="0" fontId="1" fillId="2" borderId="3"/>
|
||||||
|
<xf xfId="0"/>
|
||||||
|
</cellXfs>
|
||||||
|
</styleSheet>""");
|
||||||
|
assertEquals(0, styles.xf(0).numFmtId(), "свой numFmtId задан без флага — берётся свой");
|
||||||
|
assertEquals(1, styles.xf(0).fontId());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void padding_whenTablesEmpty() throws IOException {
|
||||||
|
StylesModel styles = read("<styleSheet>"
|
||||||
|
+ "<fonts count=\"0\"/><fills count=\"0\"/><borders count=\"0\"/>"
|
||||||
|
+ "<cellXfs count=\"0\"/></styleSheet>");
|
||||||
|
assertEquals("Calibri", styles.font(0).name());
|
||||||
|
assertEquals("gray125", styles.fill(1).patternType());
|
||||||
|
assertNull(styles.border(0).left());
|
||||||
|
assertEquals(1, styles.xfCount());
|
||||||
|
assertEquals(0, styles.xf(0).borderId());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void alignment_wrapTextFalseExplicit() throws IOException {
|
||||||
|
StylesModel styles = read("<styleSheet><cellXfs><xf>"
|
||||||
|
+ "<alignment horizontal=\"general\" wrapText=\"0\" indent=\"x\"/>"
|
||||||
|
+ "</xf></cellXfs></styleSheet>");
|
||||||
|
assertEquals("general", styles.xf(0).horizontal());
|
||||||
|
assertFalse(styles.xf(0).wrapText());
|
||||||
|
assertEquals(0, styles.xf(0).indent(), "битый indent — 0");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,127 @@
|
|||||||
|
package ru.pjandro.wordpdf.internal.xlsx;
|
||||||
|
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertNull;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Тема {@code xl/theme/theme1.xml}: схема цветов, minorFont, дефолты при
|
||||||
|
* отсутствии/браке части (§14.2.9, §18.18.62).
|
||||||
|
*/
|
||||||
|
class ThemeModelTest {
|
||||||
|
|
||||||
|
private static ThemeModel read(Map<String, String> parts) throws IOException {
|
||||||
|
return ThemeModel.read(XlsxTestZips.pkg(parts), new WarnOnce());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void fullScheme_parsesColorsAndMinorFont() throws IOException {
|
||||||
|
String theme = """
|
||||||
|
<?xml version="1.0"?>
|
||||||
|
<a:theme xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main">
|
||||||
|
<a:themeElements>
|
||||||
|
<a:clrScheme name="O">
|
||||||
|
<a:dk1><a:sysClr val="windowText" lastClr="000000"/></a:dk1>
|
||||||
|
<a:lt1><a:srgbClr val="FFFFFF"/></a:lt1>
|
||||||
|
<a:dk2><a:srgbClr val="44546A"/></a:dk2>
|
||||||
|
<a:lt2><a:srgbClr val="E7E6E6"/></a:lt2>
|
||||||
|
<a:accent1><a:srgbClr val="FF4472C4"/></a:accent1>
|
||||||
|
<a:accent2><a:srgbClr val="ed7d31"/></a:accent2>
|
||||||
|
<a:hlink><a:srgbClr val="0563C1"/></a:hlink>
|
||||||
|
<a:folHlink><a:srgbClr val="954F72"/></a:folHlink>
|
||||||
|
</a:clrScheme>
|
||||||
|
<a:fontScheme name="O">
|
||||||
|
<a:majorFont><a:latin typeface="Calibri Light"/></a:majorFont>
|
||||||
|
<a:minorFont><a:latin typeface="Aptos Narrow"/></a:minorFont>
|
||||||
|
</a:fontScheme>
|
||||||
|
</a:themeElements>
|
||||||
|
</a:theme>""";
|
||||||
|
ThemeModel theme1 = read(Map.of(ThemeModel.THEME_PART, theme));
|
||||||
|
assertEquals("000000", theme1.color("dk1"));
|
||||||
|
assertEquals("FFFFFF", theme1.color("lt1"));
|
||||||
|
assertEquals("4472C4", theme1.color("accent1"), "ARGB 8 hex -> RGB");
|
||||||
|
assertEquals("ED7D31", theme1.color("accent2"), "нижний регистр -> верхний");
|
||||||
|
assertEquals("0563C1", theme1.color("hlink"));
|
||||||
|
assertEquals("954F72", theme1.color("folHlink"));
|
||||||
|
assertEquals("Aptos Narrow", theme1.minorFont());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void missingTheme_defaultOfficePalette() throws IOException {
|
||||||
|
ThemeModel theme = read(Map.of());
|
||||||
|
assertEquals("4472C4", theme.color("accent1"));
|
||||||
|
assertEquals("000000", theme.color("dk1"));
|
||||||
|
assertEquals("0563C1", theme.color("hlink"));
|
||||||
|
assertNull(theme.minorFont());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void brokenTheme_defaultPalette() throws IOException {
|
||||||
|
ThemeModel theme = read(Map.of(ThemeModel.THEME_PART, "<a:theme><unclosed"));
|
||||||
|
assertEquals("ED7D31", theme.color("accent2"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void schemeWithoutColors_fallsBackToDefault() throws IOException {
|
||||||
|
String theme = """
|
||||||
|
<?xml version="1.0"?>
|
||||||
|
<a:theme xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main">
|
||||||
|
<a:clrScheme><a:dk1/><a:accent1/></a:clrScheme>
|
||||||
|
</a:theme>""";
|
||||||
|
ThemeModel empty = read(Map.of(ThemeModel.THEME_PART, theme));
|
||||||
|
assertEquals("4472C4", empty.color("accent1"), "пустая схема -> дефолт");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void partialScheme_missingElementIsNull() throws IOException {
|
||||||
|
String theme = """
|
||||||
|
<?xml version="1.0"?>
|
||||||
|
<a:theme xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main">
|
||||||
|
<a:clrScheme>
|
||||||
|
<a:accent1><a:srgbClr/></a:accent1>
|
||||||
|
<a:accent6><a:srgbClr val="ABC"/></a:accent6>
|
||||||
|
</a:clrScheme>
|
||||||
|
</a:theme>""";
|
||||||
|
ThemeModel theme1 = read(Map.of(ThemeModel.THEME_PART, theme));
|
||||||
|
assertEquals("ABC", theme1.color("accent6"), "короткий hex остаётся как есть");
|
||||||
|
assertNull(theme1.color("accent1"), "srgbClr без val не пишется в схему");
|
||||||
|
assertNull(theme1.color("dk1"), "нет элемента — автоцвет");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void colorElementInsideScheme_notConfusedWithClrElement() throws IOException {
|
||||||
|
// srgbClr ВНЕ clrScheme-элемента игнорируется; val у sysClr без
|
||||||
|
// lastClr — тоже
|
||||||
|
String theme = """
|
||||||
|
<?xml version="1.0"?>
|
||||||
|
<a:theme xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main">
|
||||||
|
<a:srgbClr val="111111"/>
|
||||||
|
<a:clrScheme>
|
||||||
|
<a:dk1><a:sysClr val="windowText"/></a:dk1>
|
||||||
|
<a:accent1><a:srgbClr val="22222222"/></a:accent1>
|
||||||
|
</a:clrScheme>
|
||||||
|
</a:theme>""";
|
||||||
|
ThemeModel theme1 = read(Map.of(ThemeModel.THEME_PART, theme));
|
||||||
|
assertNull(theme1.color("dk1"));
|
||||||
|
assertEquals("222222", theme1.color("accent1"));
|
||||||
|
assertNull(theme1.color("hlink"), "вне схемы цвет не ловится");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void elementForIndex_excelIndexMapping() {
|
||||||
|
assertEquals("lt1", ThemeModel.elementForIndex(0));
|
||||||
|
assertEquals("dk1", ThemeModel.elementForIndex(1));
|
||||||
|
assertEquals("lt2", ThemeModel.elementForIndex(2));
|
||||||
|
assertEquals("dk2", ThemeModel.elementForIndex(3));
|
||||||
|
assertEquals("accent1", ThemeModel.elementForIndex(4));
|
||||||
|
assertEquals("accent6", ThemeModel.elementForIndex(9));
|
||||||
|
assertEquals("hlink", ThemeModel.elementForIndex(10));
|
||||||
|
assertEquals("folHlink", ThemeModel.elementForIndex(11));
|
||||||
|
assertNull(ThemeModel.elementForIndex(12));
|
||||||
|
assertNull(ThemeModel.elementForIndex(-1));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,100 @@
|
|||||||
|
package ru.pjandro.wordpdf.internal.xlsx;
|
||||||
|
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertThrows;
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
|
/** {@code xl/workbook.xml}: порядок листов, state, date1904, битые связи. */
|
||||||
|
class WorkbookModelTest {
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void missingWorkbook_ioException() {
|
||||||
|
assertThrows(IOException.class,
|
||||||
|
() -> WorkbookModel.read(XlsxTestZips.pkg(Map.of("xl/a.xml", "<a/>"))));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void sheets_orderStateAndPartPaths() throws IOException {
|
||||||
|
XlsxPackage pkg = XlsxTestZips.workbook(
|
||||||
|
"Первый|;Второй|hidden|rId2;Третий|veryHidden|rId3",
|
||||||
|
Map.of(
|
||||||
|
"xl/worksheets/sheet1.xml", "<worksheet/>",
|
||||||
|
"xl/worksheets/sheet2.xml", "<worksheet/>",
|
||||||
|
"xl/worksheets/sheet3.xml", "<worksheet/>"));
|
||||||
|
List<WorkbookModel.Sheet> sheets = WorkbookModel.read(pkg).sheets();
|
||||||
|
assertEquals(3, sheets.size());
|
||||||
|
assertEquals("Первый", sheets.get(0).name());
|
||||||
|
assertTrue(sheets.get(0).visible());
|
||||||
|
assertEquals("xl/worksheets/sheet2.xml", sheets.get(1).partPath());
|
||||||
|
assertFalse(sheets.get(1).visible());
|
||||||
|
assertFalse(sheets.get(2).visible());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void defaultStateAttribute_visible() throws IOException {
|
||||||
|
XlsxPackage pkg = XlsxTestZips.workbook("Л|visible|rId1",
|
||||||
|
Map.of("xl/worksheets/sheet1.xml", "<worksheet/>"));
|
||||||
|
assertTrue(WorkbookModel.read(pkg).sheets().get(0).visible());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void brokenSheetLinks_skipped() throws IOException {
|
||||||
|
// rid нет в rels; rel внешнего типа; rel на несуществующую часть; sheet без r:id
|
||||||
|
XlsxPackage pkg = XlsxTestZips.pkg(Map.of(
|
||||||
|
"xl/workbook.xml", """
|
||||||
|
<workbook xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main"
|
||||||
|
xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships">
|
||||||
|
<sheets>
|
||||||
|
<sheet name="НетRid"/>
|
||||||
|
<sheet name="НетВRel" r:id="rIdX"/>
|
||||||
|
<sheet name="Внешняя" r:id="rIdE"/>
|
||||||
|
<sheet name="НетЧасти" r:id="rIdM"/>
|
||||||
|
<sheet name="Ок" r:id="rIdOk"/>
|
||||||
|
</sheets></workbook>""",
|
||||||
|
"xl/_rels/workbook.xml.rels", XlsxTestZips.sheetRels(
|
||||||
|
XlsxTestZips.rel("rIdE", XlsxTestZips.REL_WORKSHEET,
|
||||||
|
"https://evil/", "External"),
|
||||||
|
XlsxTestZips.rel("rIdM", XlsxTestZips.REL_WORKSHEET,
|
||||||
|
"worksheets/gone.xml"),
|
||||||
|
XlsxTestZips.rel("rIdOk", XlsxTestZips.REL_WORKSHEET,
|
||||||
|
"worksheets/sheet1.xml")),
|
||||||
|
"xl/worksheets/sheet1.xml", "<worksheet/>"));
|
||||||
|
List<WorkbookModel.Sheet> sheets = WorkbookModel.read(pkg).sheets();
|
||||||
|
assertEquals(1, sheets.size());
|
||||||
|
assertEquals("Ок", sheets.get(0).name());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void emptySheetName_becomesEmptyString() throws IOException {
|
||||||
|
XlsxPackage pkg = XlsxTestZips.pkg(Map.of(
|
||||||
|
"xl/workbook.xml", """
|
||||||
|
<workbook xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main"
|
||||||
|
xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships">
|
||||||
|
<sheets><sheet r:id="rId1"/></sheets></workbook>""",
|
||||||
|
"xl/_rels/workbook.xml.rels", XlsxTestZips.sheetRels(XlsxTestZips.rel(
|
||||||
|
"rId1", XlsxTestZips.REL_WORKSHEET, "worksheets/sheet1.xml")),
|
||||||
|
"xl/worksheets/sheet1.xml", "<worksheet/>"));
|
||||||
|
assertEquals("", WorkbookModel.read(pkg).sheets().get(0).name());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void date1904_flag() throws IOException {
|
||||||
|
XlsxPackage pkg = XlsxTestZips.pkg(Map.of(
|
||||||
|
"xl/workbook.xml", """
|
||||||
|
<workbook xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main">
|
||||||
|
<workbookPr date1904="1"/><sheets/></workbook>"""));
|
||||||
|
assertTrue(WorkbookModel.read(pkg).date1904());
|
||||||
|
XlsxPackage off = XlsxTestZips.pkg(Map.of(
|
||||||
|
"xl/workbook.xml",
|
||||||
|
"<workbook xmlns=\"http://schemas.openxmlformats.org/spreadsheetml/2006/main\">"
|
||||||
|
+ "<workbookPr date1904=\"off\"/><sheets/></workbook>"));
|
||||||
|
assertFalse(WorkbookModel.read(off).date1904());
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,150 @@
|
|||||||
|
package ru.pjandro.wordpdf.internal.xlsx;
|
||||||
|
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertNull;
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertSame;
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||||
|
|
||||||
|
import java.io.ByteArrayInputStream;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.io.StringReader;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
import javax.xml.stream.XMLStreamReader;
|
||||||
|
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
|
/** Пути rels, разрешение целей связей, XML-boolean и атрибутные хелперы. */
|
||||||
|
class XlsxPackageTest {
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void relsPathOf_and_parentDir() {
|
||||||
|
assertEquals("xl/worksheets/_rels/sheet1.xml.rels",
|
||||||
|
XlsxPackage.relsPathOf("xl/worksheets/sheet1.xml"));
|
||||||
|
assertEquals("xl/_rels/workbook.xml.rels", XlsxPackage.relsPathOf("xl/workbook.xml"));
|
||||||
|
assertEquals("_rels/root.xml.rels", XlsxPackage.relsPathOf("root.xml"));
|
||||||
|
assertEquals("xl/worksheets/", XlsxPackage.parentDir("xl/worksheets/sheet1.xml"));
|
||||||
|
assertEquals("", XlsxPackage.parentDir("root.xml"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void resolvePath_absoluteRelativeDotDot() {
|
||||||
|
assertEquals("xl/media/x.png", XlsxPackage.resolvePath("xl/drawings/", "/xl/media/x.png"));
|
||||||
|
assertEquals("xl/theme/theme1.xml",
|
||||||
|
XlsxPackage.resolvePath("xl/drawings/", "../theme/theme1.xml"));
|
||||||
|
assertEquals("xl/drawings/x.xml", XlsxPackage.resolvePath("xl/drawings/", "./x.xml"));
|
||||||
|
assertEquals("xl/drawings/theme/x.xml",
|
||||||
|
XlsxPackage.resolvePath("xl/drawings/", "theme\\x.xml".replace('/', '\\')));
|
||||||
|
assertEquals("xl/x.xml", XlsxPackage.resolvePath("xl/", "x.xml?param=1"));
|
||||||
|
assertEquals("", XlsxPackage.resolvePath("", "../.."));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void truthy_ooXmlBooleanSemantics() {
|
||||||
|
assertFalse(XlsxPackage.truthy(null));
|
||||||
|
assertFalse(XlsxPackage.truthy("0"));
|
||||||
|
assertFalse(XlsxPackage.truthy("false"));
|
||||||
|
assertFalse(XlsxPackage.truthy("FALSE"));
|
||||||
|
assertFalse(XlsxPackage.truthy("off"));
|
||||||
|
assertTrue(XlsxPackage.truthy(""), "атрибут выставлен без значения — истина");
|
||||||
|
assertTrue(XlsxPackage.truthy("1"));
|
||||||
|
assertTrue(XlsxPackage.truthy("true"));
|
||||||
|
assertTrue(XlsxPackage.truthy("on"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void entryMissing_andDirectoryEntrySkipped() throws IOException {
|
||||||
|
XlsxPackage pkg = XlsxTestZips.pkg(Map.of(
|
||||||
|
"xl/", "",
|
||||||
|
"xl/workbook.xml", "<workbook/>"));
|
||||||
|
assertTrue(pkg.has("xl/workbook.xml"));
|
||||||
|
assertFalse(pkg.has("xl/"), "каталоговая запись — не часть");
|
||||||
|
assertNull(pkg.entry("xl/"));
|
||||||
|
assertNull(pkg.entry("xl/nope.xml"));
|
||||||
|
assertEquals("<workbook/>",
|
||||||
|
new String(pkg.entry("xl/workbook.xml"), java.nio.charset.StandardCharsets.UTF_8));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void rels_missingFileYieldsEmpty() throws IOException {
|
||||||
|
XlsxPackage pkg = XlsxTestZips.pkg(Map.of("xl/workbook.xml", "<workbook/>"));
|
||||||
|
assertTrue(pkg.rels("xl/workbook.xml").isEmpty());
|
||||||
|
assertNull(pkg.relByTargetId("xl/workbook.xml", "rId1"));
|
||||||
|
assertNull(pkg.relTargetPath("xl/workbook.xml", "rId1"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void rels_brokenXmlYieldsEmpty() throws IOException {
|
||||||
|
XlsxPackage pkg = XlsxTestZips.pkg(Map.of(
|
||||||
|
"xl/_rels/workbook.xml.rels", "<Relationships><unclosed"));
|
||||||
|
assertTrue(pkg.rels("xl/workbook.xml").isEmpty());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void rels_duplicateAndIncompleteEntries() throws IOException {
|
||||||
|
XlsxPackage pkg = XlsxTestZips.pkg(Map.of("xl/_rels/wb.xml.rels", """
|
||||||
|
<Relationships>
|
||||||
|
<Relationship Id="rId1" Type="T" Target="a.xml"/>
|
||||||
|
<Relationship Id="rId1" Type="T" Target="other.xml"/>
|
||||||
|
<Relationship Id="rId2" Type="T"/>
|
||||||
|
<Relationship Type="T" Target="x.xml" Id=""/>
|
||||||
|
</Relationships>"""));
|
||||||
|
var rels = pkg.rels("xl/wb.xml");
|
||||||
|
assertEquals(2, rels.size(), "первый дубль Id + rel с пустым Id (Id != null)");
|
||||||
|
XlsxPackage.Rel first = pkg.relByTargetId("xl/wb.xml", "rId1");
|
||||||
|
assertSame(pkg.relByTargetId("xl/wb.xml", "rId1"), first, "rels кэшируются");
|
||||||
|
assertEquals("a.xml", first.target());
|
||||||
|
assertFalse(first.external());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void relTargetPath_externalAndResolution() throws IOException {
|
||||||
|
XlsxPackage pkg = XlsxTestZips.pkg(Map.of("xl/_rels/workbook.xml.rels", """
|
||||||
|
<Relationships>
|
||||||
|
<Relationship Id="rExt" Type="T" Target="https://example.com/"
|
||||||
|
TargetMode="External"/>
|
||||||
|
<Relationship Id="rInt" Type="T" Target="worksheets/sheet1.xml"/>
|
||||||
|
<Relationship Id="rUp" Type="T" Target="../customXml/item1.xml"/>
|
||||||
|
</Relationships>"""));
|
||||||
|
assertTrue(pkg.relByTargetId("xl/workbook.xml", "rExt").external());
|
||||||
|
assertNull(pkg.relTargetPath("xl/workbook.xml", "rExt"));
|
||||||
|
assertEquals("xl/worksheets/sheet1.xml",
|
||||||
|
pkg.relTargetPath("xl/workbook.xml", "rInt"));
|
||||||
|
assertEquals("customXml/item1.xml",
|
||||||
|
pkg.relTargetPath("xl/workbook.xml", "rUp"), "«..» выходит из xl/ в корень");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void attr_and_attrNs() throws Exception {
|
||||||
|
XMLStreamReader xr = XlsxPackage.newSecureReader().createXMLStreamReader(
|
||||||
|
new StringReader("<c r=\"A1\" t=\"s\" xmlns:r=\"http://r\" r:id=\"rId5\"/>"));
|
||||||
|
xr.next();
|
||||||
|
assertEquals("A1", XlsxPackage.attr(xr, "r"));
|
||||||
|
assertEquals("s", XlsxPackage.attr(xr, "t"));
|
||||||
|
assertNull(XlsxPackage.attr(xr, "s"));
|
||||||
|
assertEquals("rId5", XlsxPackage.attr(xr, "id"), "атрибут по локальному имени");
|
||||||
|
assertEquals("rId5", XlsxPackage.attrNs(xr, "http://r", "id"));
|
||||||
|
assertNull(XlsxPackage.attrNs(xr, "http://other", "id"));
|
||||||
|
xr.close();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void secureReader_rejectsExternalEntities() {
|
||||||
|
// SUPPORT_DTD=false: DOCTYPE в rels — ошибка разбора, а не сущность
|
||||||
|
String xml = "<?xml version=\"1.0\"?><!DOCTYPE r [<!ENTITY e SYSTEM"
|
||||||
|
+ " \"file:///etc/passwd\">]><Relationships>&e;</Relationships>";
|
||||||
|
boolean failed = false;
|
||||||
|
try {
|
||||||
|
var xr = XlsxPackage.newSecureReader()
|
||||||
|
.createXMLStreamReader(new ByteArrayInputStream(xml.getBytes(
|
||||||
|
java.nio.charset.StandardCharsets.UTF_8)));
|
||||||
|
while (xr.hasNext()) {
|
||||||
|
xr.next();
|
||||||
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
failed = true;
|
||||||
|
}
|
||||||
|
assertTrue(failed, "DTD запрещён");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,126 @@
|
|||||||
|
package ru.pjandro.wordpdf.internal.xlsx;
|
||||||
|
|
||||||
|
import java.io.ByteArrayOutputStream;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.nio.charset.StandardCharsets;
|
||||||
|
import java.util.LinkedHashMap;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.zip.ZipEntry;
|
||||||
|
import java.util.zip.ZipOutputStream;
|
||||||
|
|
||||||
|
/** Сборка .xlsx-пакета из текстовых частей для юнитов моста. */
|
||||||
|
final class XlsxTestZips {
|
||||||
|
|
||||||
|
static final String NS_MAIN =
|
||||||
|
"http://schemas.openxmlformats.org/spreadsheetml/2006/main";
|
||||||
|
static final String NS_R =
|
||||||
|
"http://schemas.openxmlformats.org/officeDocument/2006/relationships";
|
||||||
|
static final String REL_WORKSHEET = NS_R + "/worksheet";
|
||||||
|
static final String REL_HYPERLINK = NS_R + "/hyperlink";
|
||||||
|
static final String REL_DRAWING = NS_R + "/drawing";
|
||||||
|
|
||||||
|
private XlsxTestZips() {
|
||||||
|
}
|
||||||
|
|
||||||
|
static XlsxPackage pkg(Map<String, String> parts) throws IOException {
|
||||||
|
return XlsxPackage.read(zipBytes(parts));
|
||||||
|
}
|
||||||
|
|
||||||
|
static byte[] zipBytes(Map<String, String> parts) throws IOException {
|
||||||
|
ByteArrayOutputStream bos = new ByteArrayOutputStream();
|
||||||
|
try (ZipOutputStream zip = new ZipOutputStream(bos)) {
|
||||||
|
for (var e : parts.entrySet()) {
|
||||||
|
zip.putNextEntry(new ZipEntry(e.getKey()));
|
||||||
|
zip.write(e.getValue().getBytes(StandardCharsets.UTF_8));
|
||||||
|
zip.closeEntry();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return bos.toByteArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Пакет: workbook с листами {@code @spec} ("Имя|state|rid") + части. */
|
||||||
|
static XlsxPackage workbook(String sheetSpecs, Map<String, String> extraParts,
|
||||||
|
String... extraRels) throws IOException {
|
||||||
|
return pkg(workbookParts(sheetSpecs, extraParts, extraRels));
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Тот же {@link #workbook}, но байты .xlsx (для XlsxToDocx.convert). */
|
||||||
|
static byte[] workbookBytes(String sheetSpecs, Map<String, String> extraParts,
|
||||||
|
String... extraRels) throws IOException {
|
||||||
|
return zipBytes(workbookParts(sheetSpecs, extraParts, extraRels));
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Map<String, String> workbookParts(String sheetSpecs,
|
||||||
|
Map<String, String> extraParts, String... extraRels) {
|
||||||
|
Map<String, String> parts = new LinkedHashMap<>();
|
||||||
|
StringBuilder sheets = new StringBuilder();
|
||||||
|
StringBuilder rels = new StringBuilder();
|
||||||
|
String[][] rows = parseSpecs(sheetSpecs);
|
||||||
|
for (String[] row : rows) {
|
||||||
|
String name = row[0];
|
||||||
|
String state = row[1].isEmpty() ? "" : " state=\"" + row[1] + "\"";
|
||||||
|
String rid = row[2];
|
||||||
|
sheets.append("<sheet name=\"").append(name).append("\" sheetId=\"1\"")
|
||||||
|
.append(state).append(" r:id=\"").append(rid).append("\"/>");
|
||||||
|
rels.append("<Relationship Id=\"").append(rid).append("\" Type=\"")
|
||||||
|
.append(REL_WORKSHEET).append("\" Target=\"")
|
||||||
|
.append(row[3]).append("\"/>");
|
||||||
|
}
|
||||||
|
parts.put("xl/workbook.xml", "<?xml version=\"1.0\"?><workbook xmlns=\"" + NS_MAIN
|
||||||
|
+ "\" xmlns:r=\"" + NS_R + "\"><sheets>" + sheets + "</sheets></workbook>");
|
||||||
|
parts.put("xl/_rels/workbook.xml.rels",
|
||||||
|
"<?xml version=\"1.0\"?><Relationships xmlns=\"http://schemas.openxmlformats"
|
||||||
|
+ ".org/package/2006/relationships\">" + rels + "</Relationships>");
|
||||||
|
parts.putAll(extraParts);
|
||||||
|
for (String relsPart : extraRels) {
|
||||||
|
parts.putIfAbsent(relsPart,
|
||||||
|
"<?xml version=\"1.0\"?><Relationships xmlns=\"http://schemas.openxmlformats"
|
||||||
|
+ ".org/package/2006/relationships\"/>");
|
||||||
|
}
|
||||||
|
return parts;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** "Имя|state|rid|target;Имя2|..." → массивы строк. */
|
||||||
|
private static String[][] parseSpecs(String sheetSpecs) {
|
||||||
|
if (sheetSpecs.isEmpty()) {
|
||||||
|
return new String[0][];
|
||||||
|
}
|
||||||
|
String[] rows = sheetSpecs.split(";");
|
||||||
|
String[][] out = new String[rows.length][4];
|
||||||
|
for (int i = 0; i < rows.length; i++) {
|
||||||
|
String[] f = rows[i].split("\\|", -1);
|
||||||
|
out[i][0] = f[0];
|
||||||
|
out[i][1] = f.length > 1 ? f[1] : "";
|
||||||
|
out[i][2] = f.length > 2 ? f[2] : "rId" + (i + 1);
|
||||||
|
out[i][3] = f.length > 3 ? f[3] : "worksheets/sheet" + (i + 1) + ".xml";
|
||||||
|
}
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Обёртка листа worksheet c произвольным содержимым {@code body}. */
|
||||||
|
static String sheet(String body) {
|
||||||
|
return sheet(body, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
static String sheet(String body, boolean withRNamespace) {
|
||||||
|
String rns = withRNamespace ? " xmlns:r=\"" + NS_R + "\"" : "";
|
||||||
|
return "<?xml version=\"1.0\"?><worksheet xmlns=\"" + NS_MAIN + "\"" + rns
|
||||||
|
+ ">" + body + "</worksheet>";
|
||||||
|
}
|
||||||
|
|
||||||
|
/** rels листа с произвольными Relationship-записями. */
|
||||||
|
static String sheetRels(String... relationships) {
|
||||||
|
return "<?xml version=\"1.0\"?><Relationships xmlns=\"http://schemas.openxmlformats"
|
||||||
|
+ ".org/package/2006/relationships\">" + String.join("", relationships)
|
||||||
|
+ "</Relationships>";
|
||||||
|
}
|
||||||
|
|
||||||
|
static String rel(String id, String type, String target) {
|
||||||
|
return rel(id, type, target, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
static String rel(String id, String type, String target, String mode) {
|
||||||
|
return "<Relationship Id=\"" + id + "\" Type=\"" + type + "\" Target=\"" + target + "\""
|
||||||
|
+ (mode == null ? "" : " TargetMode=\"" + mode + "\"") + "/>";
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -6,20 +6,27 @@ import java.io.ByteArrayInputStream;
|
|||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
import java.nio.charset.StandardCharsets;
|
import java.nio.charset.StandardCharsets;
|
||||||
|
import java.util.Map;
|
||||||
import java.util.regex.Matcher;
|
import java.util.regex.Matcher;
|
||||||
import java.util.regex.Pattern;
|
import java.util.regex.Pattern;
|
||||||
import java.util.zip.ZipEntry;
|
import java.util.zip.ZipEntry;
|
||||||
import java.util.zip.ZipInputStream;
|
import java.util.zip.ZipInputStream;
|
||||||
|
|
||||||
import ru.pjandro.wordpdf.ConvertOptions;
|
import ru.pjandro.wordpdf.ConvertOptions;
|
||||||
|
import ru.pjandro.wordpdf.DrawingFoundException;
|
||||||
|
import ru.pjandro.wordpdf.ValidationException;
|
||||||
|
import ru.pjandro.wordpdf.WordPdfSettings;
|
||||||
|
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||||
import static org.junit.jupiter.api.Assertions.assertNotNull;
|
import static org.junit.jupiter.api.Assertions.assertNotNull;
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertThrows;
|
||||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Структура docx-конвертата моста .xlsx (samples/xlsx-basic.xlsx): сетка без
|
* Структура docx-конвертата моста .xlsx (samples/xlsx-basic.xlsx): сетка без
|
||||||
* скрытых колонок/строк, merge'ы, внешняя гиперссылка, rich-раны SST.
|
* скрытых колонок/строк, merge'ы, внешняя гиперссылка, rich-раны SST,
|
||||||
* PDF-уровень — XlsxPdfConverterTest; стили/numFmt — шаг 5.
|
* заливки/рамки/цвета/шрифты/vAlign, форматные числа (numFmt, эпоха 1904).
|
||||||
|
* PDF-уровень — XlsxPdfConverterTest.
|
||||||
*/
|
*/
|
||||||
class XlsxToDocxTest {
|
class XlsxToDocxTest {
|
||||||
|
|
||||||
@@ -100,4 +107,119 @@ class XlsxToDocxTest {
|
|||||||
int tables = xml.split("<w:tbl>", -1).length - 1;
|
int tables = xml.split("<w:tbl>", -1).length - 1;
|
||||||
assertTrue(tables == 2, "число таблиц: " + tables);
|
assertTrue(tables == 2, "число таблиц: " + tables);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void cellStyles_fillBorderFontColorVAlign() throws IOException {
|
||||||
|
String xml = documentXml("xlsx-basic.xlsx");
|
||||||
|
assertTrue(xml.contains("w:fill=\"FFFF00\""), "жёлтая заливка заголовка потеряна");
|
||||||
|
assertTrue(xml.contains("w:color w:val=\"FF0000\""), "красный шрифт Q1 потерян");
|
||||||
|
assertTrue(xml.contains("w:color w:val=\"4472C4\""), "theme-accent1 шрифт потерян");
|
||||||
|
assertTrue(xml.contains("w:fill=\"B4C7E7\""), "accent1+tint заливка потеряна");
|
||||||
|
assertTrue(xml.contains("w:val=\"medium\""), "medium-рамка потеряна");
|
||||||
|
assertTrue(xml.contains("w:val=\"dashed\""), "dashed-рамка потеряна");
|
||||||
|
assertTrue(xml.contains("w:val=\"double\""), "double-рамка потеряна");
|
||||||
|
assertTrue(xml.contains("<w:u w:val=\"single\"/>"), "подчёркивание потеряно");
|
||||||
|
assertTrue(xml.contains("<w:strike/>"), "зачёркивание потеряно");
|
||||||
|
assertTrue(xml.contains("<w:sz w:val=\"28\""), "14pt заголовок потерян");
|
||||||
|
assertTrue(xml.contains("<w:vAlign w:val=\"bottom\"/>"),
|
||||||
|
"Excel-дефолт vAlign bottom потерян");
|
||||||
|
assertTrue(xml.contains("<w:vAlign w:val=\"top\"/>"), "явный top потерян");
|
||||||
|
assertTrue(xml.contains("<w:vAlign w:val=\"center\"/>"), "center в merge потерян");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void numFmt_formattedNumbers() throws IOException {
|
||||||
|
String xml = documentXml("xlsx-numfmt.xlsx");
|
||||||
|
assertTrue(xml.contains(">123456.789<"), "General потерян");
|
||||||
|
assertTrue(xml.contains(">3.14<"), "0.00 потерян");
|
||||||
|
assertTrue(xml.contains(">1,235<"), "#,##0 потерян");
|
||||||
|
assertTrue(xml.contains(">$1,234.00<"), "деньги+ потеряны");
|
||||||
|
assertTrue(xml.contains(">($1,234.50)<"), "деньги− потеряны");
|
||||||
|
assertTrue(xml.contains(">42.5%<"), "процент потерян");
|
||||||
|
assertTrue(xml.contains(">1.22E+07<"), "научный потерян");
|
||||||
|
assertTrue(xml.contains(">12<"), "scale-миллионы потерян");
|
||||||
|
assertTrue(xml.contains(">03.12.2024<"), "дата кастомная потеряна");
|
||||||
|
assertTrue(xml.contains(">12-03-24<"), "builtin14 потерян");
|
||||||
|
assertTrue(xml.contains(">Tue<"), "ddd потерян");
|
||||||
|
assertTrue(xml.contains(">03 December 2024 18:30<"), "dd mmmm yyyy hh:mm потерян");
|
||||||
|
assertTrue(xml.contains(">18:00<"), "builtin20 потерян");
|
||||||
|
assertTrue(xml.contains(">36:00<"), "elapsed потерян");
|
||||||
|
assertTrue(xml.contains(">-1.50<"), "[Red]-секция потеряна");
|
||||||
|
assertTrue(xml.contains(">привет<"), "текст в 4-секционном коде потерян");
|
||||||
|
assertTrue(xml.contains(">314.16%<"), "builtin10 потерян");
|
||||||
|
assertTrue(xml.contains(">12.5<"), "строка в числовом формате изменена");
|
||||||
|
assertTrue(xml.contains(">0.00<"), "минус-ноль искажён");
|
||||||
|
assertTrue(xml.contains(">28.02.1900<"), "мнимый 29.02.1900 не деградирован");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void epoch1904_datesFormatted() throws IOException {
|
||||||
|
String xml = documentXml("xlsx-1904.xlsx");
|
||||||
|
assertTrue(xml.contains(">01.01.1904 00:00<"), "serial 0 эпохи 1904 потерян");
|
||||||
|
assertTrue(xml.contains(">02.03.1904 00:00<"), "serial 61 эпохи 1904 потерян");
|
||||||
|
}
|
||||||
|
|
||||||
|
// ================== крафтовые пакеты (уровень workbook) ==================
|
||||||
|
|
||||||
|
private static String documentXmlBytes(byte[] xlsx) throws IOException {
|
||||||
|
return documentXmlBytes(xlsx, ConvertOptions.defaults());
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String documentXmlBytes(byte[] xlsx, ConvertOptions options)
|
||||||
|
throws IOException {
|
||||||
|
byte[] docx = XlsxToDocx.convert(xlsx, options);
|
||||||
|
try (ZipInputStream zip = new ZipInputStream(new ByteArrayInputStream(docx))) {
|
||||||
|
ZipEntry entry;
|
||||||
|
while ((entry = zip.getNextEntry()) != null) {
|
||||||
|
if (DOCUMENT_ENTRY.equals(entry.getName())) {
|
||||||
|
return new String(zip.readAllBytes(), StandardCharsets.UTF_8);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
throw new AssertionError("в конвертате нет word/document.xml");
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String dataSheet(String extraChildren) {
|
||||||
|
return XlsxTestZips.sheet("<sheetData><row r=\"1\"><c r=\"A1\"><v>данные</v></c>"
|
||||||
|
+ "</row></sheetData>" + extraChildren);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void hiddenSheets_skippedFromDocx() throws IOException {
|
||||||
|
byte[] xlsx = XlsxTestZips.workbookBytes("Вид|;Тайный|hidden|rId2", Map.of(
|
||||||
|
"xl/worksheets/sheet1.xml", dataSheet(""),
|
||||||
|
"xl/worksheets/sheet2.xml", XlsxTestZips.sheet(
|
||||||
|
"<sheetData><row r=\"1\"><c r=\"A1\"><v>секрет</v></c></row>"
|
||||||
|
+ "</sheetData>")));
|
||||||
|
String xml = documentXmlBytes(xlsx);
|
||||||
|
assertTrue(xml.contains(">данные<"));
|
||||||
|
assertFalse(xml.contains("секрет"), "hidden-лист не эмитится");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void olePresent_errorOnOleRejects_otherwiseIgnored() throws IOException {
|
||||||
|
byte[] xlsx = XlsxTestZips.workbookBytes("Лист|", Map.of(
|
||||||
|
"xl/worksheets/sheet1.xml", dataSheet("<legacyDrawing/>")));
|
||||||
|
assertThrows(DrawingFoundException.class,
|
||||||
|
() -> XlsxToDocx.convert(xlsx, new ConvertOptions(false, false, true,
|
||||||
|
WordPdfSettings.MAX_INPUT_MB, WordPdfSettings.MAX_PAGES)));
|
||||||
|
// флаг выключен — лист проходит, OLE-окружение просто не эмитится
|
||||||
|
assertTrue(documentXmlBytes(xlsx).contains(">данные<"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void emptySheets_onlyBodyParagraphRemains() throws IOException {
|
||||||
|
byte[] xlsx = XlsxTestZips.workbookBytes("Лист|", Map.of(
|
||||||
|
"xl/worksheets/sheet1.xml", XlsxTestZips.sheet("<sheetData/>")));
|
||||||
|
String xml = documentXmlBytes(xlsx);
|
||||||
|
assertFalse(xml.contains("<w:tbl>"), "пустой лист — без таблицы");
|
||||||
|
assertTrue(xml.contains("<w:p/>"), "документ обязан содержать контент-блок");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void garbageBytes_validationException() {
|
||||||
|
assertThrows(ValidationException.class,
|
||||||
|
() -> XlsxToDocx.convert("это не zip".getBytes(StandardCharsets.UTF_8),
|
||||||
|
ConvertOptions.defaults()));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user