Skip to content

Commit 90129f4

Browse files
ylussaudylussaud
committed
Fixed #554 Fix support of internal links for generation from html data.
1 parent 5d046b1 commit 90129f4

9 files changed

Lines changed: 35 additions & 2 deletions

File tree

‎plugins/org.obeonetwork.m2doc.html/src/org/obeonetwork/m2doc/html/services/M2DocHTMLParser.java‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2019, 2025 Obeo.
2+
* Copyright (c) 2019, 2026 Obeo.
33
* All rights reserved. This program and the accompanying materials
44
* are made available under the terms of the Eclipse Public License v2.0
55
* which accompanies this distribution, and is available at
@@ -1929,7 +1929,12 @@ private URI toURI(URI baseURI, String uri) {
19291929
if (file.isAbsolute()) {
19301930
res = URI.createFileURI(uri);
19311931
} else {
1932-
res = URI.createURI(uri.replace('\\', '/')).resolve(baseURI);
1932+
final URI targetURI = URI.createURI(uri.replace('\\', '/'));
1933+
if (targetURI.isCurrentDocumentReference()) {
1934+
res = targetURI;
1935+
} else {
1936+
res = targetURI.resolve(baseURI);
1937+
}
19331938
}
19341939

19351940
return res;

‎tests/org.obeonetwork.m2doc.html.tests/resources/html/aInternalLink/aInternalLink-expected-ast.txt‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
2+
=== PROPERTIES ===
3+
version: 5.0.0
4+
metamodels:
5+
imports:
6+
=== HEADER ===
7+
8+
=== BODY ===
9+
10+
A simple demonstration of a query :
11+
[query: .asBookmark('Bookmark ID1', 'ID1')]
12+
***************************
13+
[query: .fromHTMLURI('doc.html')]
14+
End of demonstration.
15+
=== FOOTER ===
16+
17+
=== TEMPLATES ===

‎tests/org.obeonetwork.m2doc.html.tests/resources/html/aInternalLink/aInternalLink-expected-generation-messages.txt‎

Whitespace-only changes.

‎tests/org.obeonetwork.m2doc.html.tests/resources/html/aInternalLink/aInternalLink-expected-generation.docx‎

8.25 KB
Binary file not shown.

‎tests/org.obeonetwork.m2doc.html.tests/resources/html/aInternalLink/aInternalLink-expected-validation.docx‎

Whitespace-only changes.

‎tests/org.obeonetwork.m2doc.html.tests/resources/html/aInternalLink/aInternalLink-template.docx‎

8.26 KB
Binary file not shown.

‎tests/org.obeonetwork.m2doc.html.tests/resources/html/aInternalLink/aInternalLink.genconf‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<genconf:Generation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:genconf="http://www.obeonetwork.org/m2doc/genconf/1.0" name="a" templateFileName="a-template.docx" resultFileName="a-actual-generation.docx" validationFileName="a-actual-validation.docx"/>

‎tests/org.obeonetwork.m2doc.html.tests/resources/html/aInternalLink/doc.html‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<html>
2+
<head>
3+
</head>
4+
<body>
5+
<a href="#ID1">Reference to ID1</a>
6+
</body>
7+
</html>
8+
9+

‎tests/org.obeonetwork.m2doc.html.tests/resources/m2DocHtmlServices/bug499/bug499-expected-generation.docx‎

-84 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)