Skip to content

Commit b85e29a

Browse files
authored
Merge pull request #581 from fugerit-org/580-bug-handle-some-special-characters-x25a0-x25a1
580 bug handle some special characters x25a0 x25a1
2 parents e1cc7da + ad289e6 commit b85e29a

File tree

33 files changed

+286
-27
lines changed

33 files changed

+286
-27
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
### Added
11+
12+
- new built-in function stringToBase64
13+
1014
### Changed
1115

1216
- fj-doc-maven-plugin, init, flavour : quarkus-version set to 3.29.2 across all the modules

fj-doc-base-kotlin/src/main/java/org/fugerit/java/doc/base/kotlin/dsl/Background.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ class Background : HelperDSL.TagWithText( "background" ) {
1010
* Creates a new default Image instance.
1111
* @return the new instance.
1212
*/
13-
fun image( init: Image.() -> Unit = {} ): Image {
14-
return initTag(Image(), init);
13+
fun image( text: String = "", init: Image.() -> Unit = {} ): Image {
14+
return initTag(Image(text), init);
1515
}
1616

1717

fj-doc-base-kotlin/src/main/java/org/fugerit/java/doc/base/kotlin/dsl/Body.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ class Body : HelperDSL.TagWithText( "body" ) {
3131
* Creates a new default Image instance.
3232
* @return the new instance.
3333
*/
34-
fun image( init: Image.() -> Unit = {} ): Image {
35-
return initTag(Image(), init);
34+
fun image( text: String = "", init: Image.() -> Unit = {} ): Image {
35+
return initTag(Image(text), init);
3636
}
3737
/**
3838
* Creates a new default Phrase instance.

fj-doc-base-kotlin/src/main/java/org/fugerit/java/doc/base/kotlin/dsl/Cell.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ class Cell : HelperDSL.TagWithText( "cell" ) {
2424
* Creates a new default Image instance.
2525
* @return the new instance.
2626
*/
27-
fun image( init: Image.() -> Unit = {} ): Image {
28-
return initTag(Image(), init);
27+
fun image( text: String = "", init: Image.() -> Unit = {} ): Image {
28+
return initTag(Image(text), init);
2929
}
3030
/**
3131
* Creates a new default Phrase instance.

fj-doc-base-kotlin/src/main/java/org/fugerit/java/doc/base/kotlin/dsl/Footer.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ class Footer : HelperDSL.TagWithText( "footer" ) {
1717
* Creates a new default Image instance.
1818
* @return the new instance.
1919
*/
20-
fun image( init: Image.() -> Unit = {} ): Image {
21-
return initTag(Image(), init);
20+
fun image( text: String = "", init: Image.() -> Unit = {} ): Image {
21+
return initTag(Image(text), init);
2222
}
2323
/**
2424
* Creates a new default Phrase instance.

fj-doc-base-kotlin/src/main/java/org/fugerit/java/doc/base/kotlin/dsl/FooterExt.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ class FooterExt : HelperDSL.TagWithText( "footer-ext" ) {
2424
* Creates a new default Image instance.
2525
* @return the new instance.
2626
*/
27-
fun image( init: Image.() -> Unit = {} ): Image {
28-
return initTag(Image(), init);
27+
fun image( text: String = "", init: Image.() -> Unit = {} ): Image {
28+
return initTag(Image(text), init);
2929
}
3030
/**
3131
* Creates a new default Phrase instance.

fj-doc-base-kotlin/src/main/java/org/fugerit/java/doc/base/kotlin/dsl/Header.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ class Header : HelperDSL.TagWithText( "header" ) {
1717
* Creates a new default Image instance.
1818
* @return the new instance.
1919
*/
20-
fun image( init: Image.() -> Unit = {} ): Image {
21-
return initTag(Image(), init);
20+
fun image( text: String = "", init: Image.() -> Unit = {} ): Image {
21+
return initTag(Image(text), init);
2222
}
2323
/**
2424
* Creates a new default Phrase instance.

fj-doc-base-kotlin/src/main/java/org/fugerit/java/doc/base/kotlin/dsl/HeaderExt.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ class HeaderExt : HelperDSL.TagWithText( "header-ext" ) {
2424
* Creates a new default Image instance.
2525
* @return the new instance.
2626
*/
27-
fun image( init: Image.() -> Unit = {} ): Image {
28-
return initTag(Image(), init);
27+
fun image( text: String = "", init: Image.() -> Unit = {} ): Image {
28+
return initTag(Image(text), init);
2929
}
3030
/**
3131
* Creates a new default Phrase instance.

fj-doc-base-kotlin/src/main/java/org/fugerit/java/doc/base/kotlin/dsl/Image.kt

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,15 @@ package org.fugerit.java.doc.base.kotlin.dsl
55
*
66
* This class will provide function to handle all image attributes and kids
77
*/
8-
class Image : HelperDSL.TagWithText( "image" ) {
8+
class Image( text: String = "" ) : HelperDSL.TagWithText( "image" ) {
9+
10+
init { setText(text) }
11+
/**
12+
* Function to set text content for this element.
13+
*/
14+
15+
fun setText( value: String ) { addKid( HelperDSL.TextElement( value ) ) }
16+
917

1018
/**
1119
* Function handling url attribute of the Image with specific check on type.

fj-doc-base/src/main/docs/doc_xsd_config_ref.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -410,6 +410,7 @@ <h1 style="font-weight: bold;">Reference xsd documentation for Venus - Fugerit
410410
<span >An image to include in the document (roughly comparable to a HTML 'image' element)</span>
411411
</td>
412412
<td id="cell_19_2" style=" width: 40%; border-top: 1px solid black; border-bottom: 1px solid black; border-left: 1px solid black; border-right: 1px solid black; padding: 2px;">
413+
<span >mixed </span>
413414
</td>
414415
</tr>
415416
<tr>

0 commit comments

Comments
 (0)