Skip to content

Commit 0b671df

Browse files
vschvsch
committed
fix extra div in admonition
1 parent 0fe3c38 commit 0b671df

51 files changed

Lines changed: 336 additions & 323 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.idea/artifacts/flexmark_parent_jar.xml‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ following sample:
4242
<dependency>
4343
<groupId>com.vladsch.flexmark</groupId>
4444
<artifactId>flexmark-all</artifactId>
45-
<version>0.32.8</version>
45+
<version>0.32.10</version>
4646
</dependency>
4747
```
4848

@@ -85,7 +85,7 @@ public class BasicSample {
8585
#### Building via Gradle
8686

8787
```shell
88-
compile 'com.vladsch.flexmark:flexmark-all:0.32.8'
88+
compile 'com.vladsch.flexmark:flexmark-all:0.32.10'
8989
```
9090

9191
#### Building with Android Studio

‎VERSION.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ flexmark-java
88
- [To Do](#to-do)
99
- [Docx Converter](#docx-converter)
1010
- [GitLab compatibility extensions](#gitlab-compatibility-extensions)
11+
- [0.32.10](#03210)
1112
- [0.32.8](#0328)
1213
- [0.32.6](#0326)
1314
- [0.32.4](#0324)
@@ -253,6 +254,18 @@ flexmark-java
253254

254255
&nbsp;</details>
255256

257+
0.32.10
258+
-------
259+
260+
* Add: `AdmonitionBlock` getters/setters for `titleOpeningMarker`, `title`, `titleClosingMarker`
261+
* Fix: `AdmonitionNodeRenderer` remove erroneous, extra `</div>`
262+
* Add: `AdmonitionNodeRenderer` attributable parts:
263+
* ADMONITION_SVG_OBJECT_PART - svg object at top of body, part is on `Document` node
264+
* ADMONITION_HEADING_PART - heading div
265+
* ADMONITION_ICON_PART - heading icon svg
266+
* ADMONITION_TITLE_PART - heading title span
267+
* ADMONITION_BODY_PART - admonition body div
268+
256269
0.32.8
257270
------
258271

‎flexmark-all/pom.xml‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.vladsch.flexmark</groupId>
99
<artifactId>flexmark-java</artifactId>
10-
<version>0.32.8</version>
10+
<version>0.32.10</version>
1111
</parent>
1212

1313
<artifactId>flexmark-all</artifactId>
@@ -21,177 +21,177 @@
2121
<dependency>
2222
<groupId>com.vladsch.flexmark</groupId>
2323
<artifactId>flexmark</artifactId>
24-
<version>0.32.8</version>
24+
<version>0.32.10</version>
2525
</dependency>
2626
<dependency>
2727
<groupId>com.vladsch.flexmark</groupId>
2828
<artifactId>flexmark-ext-abbreviation</artifactId>
29-
<version>0.32.8</version>
29+
<version>0.32.10</version>
3030
</dependency>
3131
<dependency>
3232
<groupId>com.vladsch.flexmark</groupId>
3333
<artifactId>flexmark-ext-admonition</artifactId>
34-
<version>0.32.8</version>
34+
<version>0.32.10</version>
3535
</dependency>
3636
<dependency>
3737
<groupId>com.vladsch.flexmark</groupId>
3838
<artifactId>flexmark-ext-anchorlink</artifactId>
39-
<version>0.32.8</version>
39+
<version>0.32.10</version>
4040
</dependency>
4141
<dependency>
4242
<groupId>com.vladsch.flexmark</groupId>
4343
<artifactId>flexmark-ext-aside</artifactId>
44-
<version>0.32.8</version>
44+
<version>0.32.10</version>
4545
</dependency>
4646
<dependency>
4747
<groupId>com.vladsch.flexmark</groupId>
4848
<artifactId>flexmark-ext-attributes</artifactId>
49-
<version>0.32.8</version>
49+
<version>0.32.10</version>
5050
</dependency>
5151
<dependency>
5252
<groupId>com.vladsch.flexmark</groupId>
5353
<artifactId>flexmark-ext-autolink</artifactId>
54-
<version>0.32.8</version>
54+
<version>0.32.10</version>
5555
</dependency>
5656
<dependency>
5757
<groupId>com.vladsch.flexmark</groupId>
5858
<artifactId>flexmark-ext-definition</artifactId>
59-
<version>0.32.8</version>
59+
<version>0.32.10</version>
6060
</dependency>
6161
<dependency>
6262
<groupId>com.vladsch.flexmark</groupId>
6363
<artifactId>flexmark-ext-emoji</artifactId>
64-
<version>0.32.8</version>
64+
<version>0.32.10</version>
6565
</dependency>
6666
<dependency>
6767
<groupId>com.vladsch.flexmark</groupId>
6868
<artifactId>flexmark-ext-enumerated-reference</artifactId>
69-
<version>0.32.8</version>
69+
<version>0.32.10</version>
7070
</dependency>
7171
<dependency>
7272
<groupId>com.vladsch.flexmark</groupId>
7373
<artifactId>flexmark-ext-escaped-character</artifactId>
74-
<version>0.32.8</version>
74+
<version>0.32.10</version>
7575
</dependency>
7676
<dependency>
7777
<groupId>com.vladsch.flexmark</groupId>
7878
<artifactId>flexmark-ext-footnotes</artifactId>
79-
<version>0.32.8</version>
79+
<version>0.32.10</version>
8080
</dependency>
8181
<dependency>
8282
<groupId>com.vladsch.flexmark</groupId>
8383
<artifactId>flexmark-ext-gfm-issues</artifactId>
84-
<version>0.32.8</version>
84+
<version>0.32.10</version>
8585
</dependency>
8686
<dependency>
8787
<groupId>com.vladsch.flexmark</groupId>
8888
<artifactId>flexmark-ext-gfm-strikethrough</artifactId>
89-
<version>0.32.8</version>
89+
<version>0.32.10</version>
9090
</dependency>
9191
<dependency>
9292
<groupId>com.vladsch.flexmark</groupId>
9393
<artifactId>flexmark-ext-gfm-tables</artifactId>
94-
<version>0.32.8</version>
94+
<version>0.32.10</version>
9595
</dependency>
9696
<dependency>
9797
<groupId>com.vladsch.flexmark</groupId>
9898
<artifactId>flexmark-ext-gfm-tasklist</artifactId>
99-
<version>0.32.8</version>
99+
<version>0.32.10</version>
100100
</dependency>
101101
<dependency>
102102
<groupId>com.vladsch.flexmark</groupId>
103103
<artifactId>flexmark-ext-gfm-users</artifactId>
104-
<version>0.32.8</version>
104+
<version>0.32.10</version>
105105
</dependency>
106106
<dependency>
107107
<groupId>com.vladsch.flexmark</groupId>
108108
<artifactId>flexmark-ext-jekyll-front-matter</artifactId>
109-
<version>0.32.8</version>
109+
<version>0.32.10</version>
110110
</dependency>
111111
<dependency>
112112
<groupId>com.vladsch.flexmark</groupId>
113113
<artifactId>flexmark-ext-jekyll-tag</artifactId>
114-
<version>0.32.8</version>
114+
<version>0.32.10</version>
115115
</dependency>
116116
<dependency>
117117
<groupId>com.vladsch.flexmark</groupId>
118118
<artifactId>flexmark-ext-ins</artifactId>
119-
<version>0.32.8</version>
119+
<version>0.32.10</version>
120120
</dependency>
121121
<dependency>
122122
<groupId>com.vladsch.flexmark</groupId>
123123
<artifactId>flexmark-ext-xwiki-macros</artifactId>
124-
<version>0.32.8</version>
124+
<version>0.32.10</version>
125125
</dependency>
126126
<dependency>
127127
<groupId>com.vladsch.flexmark</groupId>
128128
<artifactId>flexmark-ext-superscript</artifactId>
129-
<version>0.32.8</version>
129+
<version>0.32.10</version>
130130
</dependency>
131131
<dependency>
132132
<groupId>com.vladsch.flexmark</groupId>
133133
<artifactId>flexmark-ext-tables</artifactId>
134-
<version>0.32.8</version>
134+
<version>0.32.10</version>
135135
</dependency>
136136
<dependency>
137137
<groupId>com.vladsch.flexmark</groupId>
138138
<artifactId>flexmark-ext-toc</artifactId>
139-
<version>0.32.8</version>
139+
<version>0.32.10</version>
140140
</dependency>
141141
<dependency>
142142
<groupId>com.vladsch.flexmark</groupId>
143143
<artifactId>flexmark-ext-typographic</artifactId>
144-
<version>0.32.8</version>
144+
<version>0.32.10</version>
145145
</dependency>
146146
<dependency>
147147
<groupId>com.vladsch.flexmark</groupId>
148148
<artifactId>flexmark-ext-wikilink</artifactId>
149-
<version>0.32.8</version>
149+
<version>0.32.10</version>
150150
</dependency>
151151
<dependency>
152152
<groupId>com.vladsch.flexmark</groupId>
153153
<artifactId>flexmark-ext-yaml-front-matter</artifactId>
154-
<version>0.32.8</version>
154+
<version>0.32.10</version>
155155
</dependency>
156156
<dependency>
157157
<groupId>com.vladsch.flexmark</groupId>
158158
<artifactId>flexmark-ext-youtube-embedded</artifactId>
159-
<version>0.32.8</version>
159+
<version>0.32.10</version>
160160
</dependency>
161161
<dependency>
162162
<groupId>com.vladsch.flexmark</groupId>
163163
<artifactId>flexmark-formatter</artifactId>
164-
<version>0.32.8</version>
164+
<version>0.32.10</version>
165165
</dependency>
166166
<dependency>
167167
<groupId>com.vladsch.flexmark</groupId>
168168
<artifactId>flexmark-html-parser</artifactId>
169-
<version>0.32.8</version>
169+
<version>0.32.10</version>
170170
</dependency>
171171
<dependency>
172172
<groupId>com.vladsch.flexmark</groupId>
173173
<artifactId>flexmark-jira-converter</artifactId>
174-
<version>0.32.8</version>
174+
<version>0.32.10</version>
175175
</dependency>
176176
<dependency>
177177
<groupId>com.vladsch.flexmark</groupId>
178178
<artifactId>flexmark-pdf-converter</artifactId>
179-
<version>0.32.8</version>
179+
<version>0.32.10</version>
180180
</dependency>
181181
<dependency>
182182
<groupId>com.vladsch.flexmark</groupId>
183183
<artifactId>flexmark-profile-pegdown</artifactId>
184-
<version>0.32.8</version>
184+
<version>0.32.10</version>
185185
</dependency>
186186
<dependency>
187187
<groupId>com.vladsch.flexmark</groupId>
188188
<artifactId>flexmark-util</artifactId>
189-
<version>0.32.8</version>
189+
<version>0.32.10</version>
190190
</dependency>
191191
<dependency>
192192
<groupId>com.vladsch.flexmark</groupId>
193193
<artifactId>flexmark-youtrack-converter</artifactId>
194-
<version>0.32.8</version>
194+
<version>0.32.10</version>
195195
</dependency>
196196
</dependencies>
197197

‎flexmark-docx-converter/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.vladsch.flexmark</groupId>
77
<artifactId>flexmark-java</artifactId>
8-
<version>0.32.8</version>
8+
<version>0.32.10</version>
99
</parent>
1010

1111
<artifactId>flexmark-docx-converter</artifactId>

‎flexmark-ext-abbreviation/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.vladsch.flexmark</groupId>
66
<artifactId>flexmark-java</artifactId>
7-
<version>0.32.8</version>
7+
<version>0.32.10</version>
88
</parent>
99

1010
<artifactId>flexmark-ext-abbreviation</artifactId>

‎flexmark-ext-admonition/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.vladsch.flexmark</groupId>
66
<artifactId>flexmark-java</artifactId>
7-
<version>0.32.8</version>
7+
<version>0.32.10</version>
88
</parent>
99

1010
<artifactId>flexmark-ext-admonition</artifactId>

‎flexmark-ext-admonition/src/main/java/com/vladsch/flexmark/ext/admonition/AdmonitionBlock.java‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,30 @@ public BasedSequence getTitle() {
7979
return title;
8080
}
8181

82+
public BasedSequence getTitleOpeningMarker() {
83+
return titleOpeningMarker;
84+
}
85+
86+
public void setTitleOpeningMarker(final BasedSequence titleOpeningMarker) {
87+
this.titleOpeningMarker = titleOpeningMarker;
88+
}
89+
90+
public void setTitle(final BasedSequence title) {
91+
this.title = title;
92+
}
93+
94+
public BasedSequence getTitleClosingMarker() {
95+
return titleClosingMarker;
96+
}
97+
98+
public void setTitleClosingMarker(final BasedSequence titleClosingMarker) {
99+
this.titleClosingMarker = titleClosingMarker;
100+
}
101+
102+
public BasedSequence getTitleChars() {
103+
return spanningChars(titleOpeningMarker, title, titleClosingMarker);
104+
}
105+
82106
public void setTitleChars(BasedSequence titleChars) {
83107
if (titleChars != null && titleChars != BasedSequence.NULL) {
84108
int titleCharsLength = titleChars.length();

0 commit comments

Comments
 (0)