Skip to content

Commit 150eeaa

Browse files
vschvsch
committed
prep 0.34.56, fix for vsch#274, add & to escape list
1 parent 3ad67fe commit 150eeaa

17 files changed

Lines changed: 25 additions & 25 deletions

‎VERSION.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ flexmark-java
262262
0.34.56
263263
-------
264264

265-
Fix: #274, FlexmarkHtmlParser can not handle escaped tags correctly, now `<` and `>` are also
265+
Fix: #274, FlexmarkHtmlParser can not handle escaped tags correctly, now `<`, `>` and `&` are also
266266
escaped.
267267

268268
0.34.53

‎flexmark-html-parser/src/main/java/com/vladsch/flexmark/convert/html/FlexmarkHtmlParser.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -561,9 +561,9 @@ private String prepareText(String text, final boolean inCode) {
561561

562562
if (!inCode) {
563563
// replace < > [ ] | ` by escaped versions
564-
text = text.replace("\u00A0", myOptions.nbspText);
565564
text = text.replace("\\", "\\\\");
566-
//text = text.replace("&", "\\&");
565+
text = text.replace("&", "\\&");
566+
text = text.replace("\u00A0", myOptions.nbspText);
567567
text = text.replace("<", "\\<").replace(">", "\\>");
568568
text = text.replace("[", "\\[").replace("]", "\\]");
569569
text = text.replace("|", "\\|").replace("`", "\\`");

‎flexmark-html-parser/src/test/resources/app_html_parser_spec.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4079,7 +4079,7 @@ Uses `<strike>` tags instead of del.
40794079
## Unicode Emoji Page
40804080

40814081
```````````````````````````````` example(Unicode Emoji Page: 1) options(table-no-alignment, table-no-width)
4082-
| [Smileys & People](#smileys_&_people) |||||
4082+
| [Smileys \& People](#smileys_&_people) |||||
40834083
| [face-positive](#face-positive) |||||
40844084
| [№](../format.html#col-num) | [Code](../format.html#col-code) | [Sample](../format.html#col-vendor) | [CLDR Short Name](../format.html#col-name) | [Other Keywords](../format.html#col-annotations) |
40854085
|-----------------------------|---------------------------------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|--------------------------------------------|----------------------------------------------------------------|
@@ -4113,7 +4113,7 @@ Uses `<strike>` tags instead of del.
41134113

41144114

41154115
```````````````````````````````` example(Unicode Emoji Page: 2) options(table-no-alignment, table-no-width, table-ignore-mid-heading)
4116-
| [Smileys & People](#smileys_&_people) |||||
4116+
| [Smileys \& People](#smileys_&_people) |||||
41174117
| [face-positive](#face-positive) |||||
41184118
| [№](../format.html#col-num) | [Code](../format.html#col-code) | [Sample](../format.html#col-vendor) | [CLDR Short Name](../format.html#col-name) | [Other Keywords](../format.html#col-annotations) |
41194119
|-----------------------------|---------------------------------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|--------------------------------------------|----------------------------------------------------------------|

‎flexmark-html-parser/src/test/resources/flexmark_html_attributes_parser_spec.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2132,10 +2132,10 @@ Table with `th` in `tbody`
21322132
```````````````````````````````` example Tables: 49
21332133
| Result | Description | Entity Name |
21342134
|--------|--------------------|-------------|
2135-
| | non-breaking space | &nbsp; |
2136-
| \< | less than | &lt; |
2137-
| \> | greater than | &gt; |
2138-
| & | ampersand | &amp; |
2135+
| | non-breaking space | \&nbsp; |
2136+
| \< | less than | \&lt; |
2137+
| \> | greater than | \&gt; |
2138+
| \& | ampersand | \&amp; |
21392139
21402140
.
21412141
<table>

‎flexmark-html-parser/src/test/resources/flexmark_html_parser_spec.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2354,10 +2354,10 @@ Table with `th` in `tbody`
23542354
```````````````````````````````` example Tables: 49
23552355
| Result | Description | Entity Name |
23562356
|--------|--------------------|-------------|
2357-
| | non-breaking space | &nbsp; |
2358-
| \< | less than | &lt; |
2359-
| \> | greater than | &gt; |
2360-
| & | ampersand | &amp; |
2357+
| | non-breaking space | \&nbsp; |
2358+
| \< | less than | \&lt; |
2359+
| \> | greater than | \&gt; |
2360+
| \& | ampersand | \&amp; |
23612361
23622362
.
23632363
<table>

‎flexmark-html-parser/src/test/resources/html_attribute_parser_issue_spec.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1057,8 +1057,8 @@ info("End of the response");
10571057
«
10581058
»
10591059
…
1060-
&endash;
1061-
&emdash;
1060+
\&endash;
1061+
\&emdash;
10621062
“
10631063
”
10641064
‘
@@ -1143,8 +1143,8 @@ info("End of the response");
11431143
\<\<
11441144
\>\>
11451145
…
1146-
&endash;
1147-
&emdash;
1146+
\&endash;
1147+
\&emdash;
11481148
"
11491149
"
11501150
'
@@ -1404,7 +1404,7 @@ Issue #149
14041404

14051405

14061406
```````````````````````````````` example Issue  149: 2
1407-
#### G2 & G3: Controlled Arc Move\[[edit](https://duet3d.com/w2/index.php?title=G-code&action=edit&section=12 "Edit section: G2 & G3: Controlled Arc Move")\]
1407+
#### G2 \& G3: Controlled Arc Move\[[edit](https://duet3d.com/w2/index.php?title=G-code&action=edit&section=12 "Edit section: G2 & G3: Controlled Arc Move")\]
14081408
14091409
**Implemented in beta in 1.17c+2**
14101410
@@ -1452,7 +1452,7 @@ Examples
14521452

14531453

14541454
```````````````````````````````` example Issue  149: 3
1455-
#### G2 & G3: Controlled Arc Move\[[edit](https://duet3d.com/w2/index.php?title=G-code&action=edit&section=12 "Edit section: G2 & G3: Controlled Arc Move")\]
1455+
#### G2 \& G3: Controlled Arc Move\[[edit](https://duet3d.com/w2/index.php?title=G-code&action=edit&section=12 "Edit section: G2 & G3: Controlled Arc Move")\]
14561456
14571457
**Implemented in beta in 1.17c+2**
14581458

‎flexmark-html-parser/src/test/resources/html_parser_issue_spec.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1057,8 +1057,8 @@ info("End of the response");
10571057
«
10581058
»
10591059
…
1060-
&endash;
1061-
&emdash;
1060+
\&endash;
1061+
\&emdash;
10621062
“
10631063
”
10641064
‘
@@ -1143,8 +1143,8 @@ info("End of the response");
11431143
\<\<
11441144
\>\>
11451145
…
1146-
&endash;
1147-
&emdash;
1146+
\&endash;
1147+
\&emdash;
11481148
"
11491149
"
11501150
'
@@ -1404,7 +1404,7 @@ Issue #149
14041404

14051405

14061406
```````````````````````````````` example Issue  149: 2
1407-
#### G2 & G3: Controlled Arc Move\[[edit](https://duet3d.com/w2/index.php?title=G-code&action=edit&section=12 "Edit section: G2 & G3: Controlled Arc Move")\]
1407+
#### G2 \& G3: Controlled Arc Move\[[edit](https://duet3d.com/w2/index.php?title=G-code&action=edit&section=12 "Edit section: G2 & G3: Controlled Arc Move")\]
14081408
14091409
**Implemented in beta in 1.17c+2**
14101410
@@ -1452,7 +1452,7 @@ Examples
14521452

14531453

14541454
```````````````````````````````` example Issue  149: 3
1455-
#### G2 & G3: Controlled Arc Move\[[edit](https://duet3d.com/w2/index.php?title=G-code&action=edit&section=12 "Edit section: G2 & G3: Controlled Arc Move")\]
1455+
#### G2 \& G3: Controlled Arc Move\[[edit](https://duet3d.com/w2/index.php?title=G-code&action=edit&section=12 "Edit section: G2 & G3: Controlled Arc Move")\]
14561456
14571457
**Implemented in beta in 1.17c+2**
14581458

‎lib/kotlin-reflect-sources.jar‎

662 KB
Binary file not shown.

‎lib/kotlin-reflect.jar‎

2.52 MB
Binary file not shown.

‎lib/kotlin-stdlib-jdk7-sources.jar‎

2.4 KB
Binary file not shown.

0 commit comments

Comments
 (0)