Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,13 @@ for this cycle.
- The unused engine-internal `Font.adjustFontSizeToFit(...)` (and its `PdfFont` /
`WordFont` implementations) has been removed; text auto-sizing is resolved by the
layout compiler.
- The dormant Entity-Component-System engine internals have been removed: the
`EntityManager` / `SystemECS` runtime, the `Entity` component model with its
geometry / coordinator / renderable companions, the ECS render pipeline
(`engine.render.*` and the guide renderers under `engine.render.guides`), and
`LayoutSnapshotExtractor`. None were reachable from the live render path —
`DocumentSession` → layout compiler → fixed-layout backend — so document layout,
PDF output, and the public `guideLines(...)` overlay are unchanged.

### Public API

Expand Down
16 changes: 0 additions & 16 deletions qa/src/test/resources/logback.xml
Original file line number Diff line number Diff line change
Expand Up @@ -93,24 +93,8 @@
</root>

<!-- Layout / pagination tracing during tests -->
<logger name="com.demcha.compose.engine.pagination" level="DEBUG" additivity="false">
<appender-ref ref="LAYOUT_TRACE_FILE"/>
</logger>

<logger name="com.demcha.compose.engine.layout.container" level="DEBUG" additivity="false">
<appender-ref ref="LAYOUT_TRACE_FILE"/>
</logger>

<logger name="com.demcha.compose.engine.components.core.Entity" level="DEBUG" additivity="false">
<appender-ref ref="LAYOUT_TRACE_FILE"/>
</logger>

<logger name="com.demcha.compose.engine.components.layout.coordinator" level="DEBUG" additivity="false">
<appender-ref ref="LAYOUT_TRACE_FILE"/>
</logger>

<logger name="com.demcha.compose.engine.render.guides" level="DEBUG" additivity="false">
<appender-ref ref="LAYOUT_TRACE_FILE"/>
</logger>

</configuration>
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import com.demcha.compose.engine.components.content.text.TextDataBody;
import com.demcha.compose.engine.components.content.text.TextIndentStrategy;
import com.demcha.compose.engine.components.content.text.TextStyle;
import com.demcha.compose.engine.components.renderable.BlockText;
import com.demcha.compose.engine.text.TextControlSanitizer;
import com.demcha.compose.engine.measurement.TextMeasurementSystem;
import com.demcha.compose.engine.text.markdown.MarkDownParser;

Expand Down Expand Up @@ -560,7 +560,7 @@ private static List<List<InlineLayoutToken>> tokenizeInlineRuns(List<InlineRun>
continue;
}
TextStyle style = textRun.textStyle() == null ? defaultStyle : toTextStyle(textRun.textStyle());
String normalized = BlockText.sanitizeText(textRun.text().replace("\r\n", "\n").replace('\r', '\n'));
String normalized = TextControlSanitizer.remove(textRun.text().replace("\r\n", "\n").replace('\r', '\n'));
String[] parts = normalized.split("\n", -1);
for (int partIndex = 0; partIndex < parts.length; partIndex++) {
if (partIndex > 0) {
Expand Down Expand Up @@ -592,7 +592,7 @@ private static List<List<InlineLayoutToken>> tokenizeInlineRuns(List<InlineRun>
// run's outer edges — lead pad on the first word, trail pad on the
// last — and toInlineParagraphLine coalesces the same-group tokens on
// each visual line back into one rounded fill.
String normalized = BlockText.sanitizeText(
String normalized = TextControlSanitizer.remove(
highlight.text().replace("\r\n", " ").replace('\r', ' ').replace('\n', ' '));
if (normalized.isEmpty()) {
continue;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import com.demcha.compose.document.style.DocumentTextStyle;
import com.demcha.compose.engine.components.content.text.TextIndentStrategy;
import com.demcha.compose.engine.components.content.text.TextStyle;
import com.demcha.compose.engine.components.renderable.BlockText;
import com.demcha.compose.engine.text.TextControlSanitizer;
import com.demcha.compose.engine.components.style.Padding;
import com.demcha.compose.engine.measurement.TextMeasurementSystem;

Expand Down Expand Up @@ -736,7 +736,7 @@ private static List<String> sanitizeLogicalLines(String rawText) {
String[] logicalLines = safeText.split("\n", -1);
List<String> sanitized = new ArrayList<>(logicalLines.length);
for (String logicalLine : logicalLines) {
sanitized.add(BlockText.sanitizeText(logicalLine));
sanitized.add(TextControlSanitizer.remove(logicalLine));
}
return List.copyOf(sanitized);
}
Expand Down
Loading
Loading