You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by de...@apache.org on 2018/11/22 12:06:42 UTC
[maven-doxia] branch master updated (99a60c7 -> ec0d0d6)
This is an automated email from the ASF dual-hosted git repository.
dennisl pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git.
from 99a60c7 upgraded parent POM from 32 to 33
new 41ad6cd [DOXIA-577] Handle whitespace in tables properly in ConfluenceSink. Line breaks within a table are removed. Any whitespace-only content is trimmed.
new 0b50239 [DOXIA-578] Boxed verbatim sections uses incorrect Confluence syntax.
new ec0d0d6 [DOXIA-579] Lists in Confluence syntax requires 2 line breaks after the list
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../doxia/module/confluence/ConfluenceSink.java | 37 ++++++++++++++++++++--
.../module/confluence/ConfluenceSinkTest.java | 6 ++--
2 files changed, 38 insertions(+), 5 deletions(-)
[maven-doxia] 03/03: [DOXIA-579] Lists in Confluence syntax
requires 2 line breaks after the list
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dennisl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git
commit ec0d0d6f45bc34d087f82c4a905d3241c1f6f943
Author: Dennis Lundberg <de...@apache.org>
AuthorDate: Thu Nov 22 13:06:16 2018 +0100
[DOXIA-579] Lists in Confluence syntax requires 2 line breaks after the list
---
.../maven/doxia/module/confluence/ConfluenceSink.java | 14 ++++++++++++++
.../maven/doxia/module/confluence/ConfluenceSinkTest.java | 4 ++--
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSink.java b/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSink.java
index 21263fd..246193f 100644
--- a/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSink.java
+++ b/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSink.java
@@ -482,6 +482,11 @@ public class ConfluenceSink
public void list_()
{
levelList--;
+ if ( levelList == 0 )
+ {
+ writeEOL( true );
+ writeEOL();
+ }
}
/** {@inheritDoc} */
@@ -526,6 +531,10 @@ public class ConfluenceSink
/** {@inheritDoc} */
public void numberedList( int numbering )
{
+ if ( !writer.toString().endsWith( EOL + EOL ) )
+ {
+ writeEOL( true );
+ }
levelList++;
String style;
@@ -553,6 +562,11 @@ public class ConfluenceSink
public void numberedList_()
{
levelList--;
+ if ( levelList == 0 )
+ {
+ writeEOL( true );
+ writeEOL();
+ }
listStyles.pop();
}
diff --git a/doxia-modules/doxia-module-confluence/src/test/java/org/apache/maven/doxia/module/confluence/ConfluenceSinkTest.java b/doxia-modules/doxia-module-confluence/src/test/java/org/apache/maven/doxia/module/confluence/ConfluenceSinkTest.java
index 286bbc6..e78a1a5 100644
--- a/doxia-modules/doxia-module-confluence/src/test/java/org/apache/maven/doxia/module/confluence/ConfluenceSinkTest.java
+++ b/doxia-modules/doxia-module-confluence/src/test/java/org/apache/maven/doxia/module/confluence/ConfluenceSinkTest.java
@@ -133,7 +133,7 @@ public class ConfluenceSinkTest
/** {@inheritDoc} */
protected String getListBlock( String item )
{
- return ConfluenceMarkup.LIST_ITEM_MARKUP + item + EOL;
+ return ConfluenceMarkup.LIST_ITEM_MARKUP + item + EOL + EOL;
}
/** {@inheritDoc} */
@@ -151,7 +151,7 @@ public class ConfluenceSinkTest
/** {@inheritDoc} */
protected String getNumberedListBlock( String item )
{
- return ConfluenceMarkup.NUMBERING_MARKUP + " " + item + EOL;
+ return ConfluenceMarkup.NUMBERING_MARKUP + " " + item + EOL + EOL;
}
/** {@inheritDoc} */
[maven-doxia] 01/03: [DOXIA-577] Handle whitespace in tables
properly in ConfluenceSink. Line breaks within a table are removed. Any
whitespace-only content is trimmed.
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dennisl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git
commit 41ad6cd454dcd6fed8d61e1ed712bdb23cc42286
Author: Dennis Lundberg <de...@apache.org>
AuthorDate: Thu Nov 22 12:47:08 2018 +0100
[DOXIA-577] Handle whitespace in tables properly in ConfluenceSink.
Line breaks within a table are removed.
Any whitespace-only content is trimmed.
---
.../doxia/module/confluence/ConfluenceSink.java | 21 ++++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
diff --git a/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSink.java b/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSink.java
index 17e6000..6516dbc 100644
--- a/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSink.java
+++ b/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSink.java
@@ -61,6 +61,9 @@ public class ConfluenceSink
/** An indication on if we're in verbatim box mode. */
private boolean verbatimBoxedFlag;
+ /** An indication on if we're in table mode. */
+ private boolean tableFlag;
+
/** An indication on if we're in table header mode. */
private boolean tableHeaderFlag;
@@ -819,6 +822,7 @@ public class ConfluenceSink
public void table()
{
// nop
+ tableFlag = true;
writeEOL( true );
writeEOL();
}
@@ -832,6 +836,7 @@ public class ConfluenceSink
/** {@inheritDoc} */
public void table_()
{
+ tableFlag = false;
writeEOL( true );
writeEOL();
}
@@ -964,7 +969,21 @@ public class ConfluenceSink
write( LINK_START_MARKUP );
}
- content( text );
+ if ( tableFlag )
+ {
+ // Remove line breaks, because it interferes with the table syntax
+ String strippedText = StringUtils.replace( text, "\n", "" );
+ // Trim if only whitespace, to handle ignorable whitespace from xdoc documents
+ if ( StringUtils.isWhitespace( strippedText ) )
+ {
+ strippedText = StringUtils.trim( strippedText );
+ }
+ content( strippedText );
+ }
+ else
+ {
+ content( text );
+ }
if ( linkName != null )
{
[maven-doxia] 02/03: [DOXIA-578] Boxed verbatim sections uses
incorrect Confluence syntax.
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dennisl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git
commit 0b50239c05906390efc66f7522f57bd87fc7586e
Author: Dennis Lundberg <de...@apache.org>
AuthorDate: Thu Nov 22 12:57:56 2018 +0100
[DOXIA-578] Boxed verbatim sections uses incorrect Confluence syntax.
---
.../java/org/apache/maven/doxia/module/confluence/ConfluenceSink.java | 2 +-
.../org/apache/maven/doxia/module/confluence/ConfluenceSinkTest.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSink.java b/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSink.java
index 6516dbc..21263fd 100644
--- a/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSink.java
+++ b/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSink.java
@@ -1081,7 +1081,7 @@ public class ConfluenceSink
if ( verbatimBoxedFlag )
{
- write( "{code|borderStyle=solid}" );
+ write( "{code:borderStyle=solid}" );
}
else
{
diff --git a/doxia-modules/doxia-module-confluence/src/test/java/org/apache/maven/doxia/module/confluence/ConfluenceSinkTest.java b/doxia-modules/doxia-module-confluence/src/test/java/org/apache/maven/doxia/module/confluence/ConfluenceSinkTest.java
index 90e8344..286bbc6 100644
--- a/doxia-modules/doxia-module-confluence/src/test/java/org/apache/maven/doxia/module/confluence/ConfluenceSinkTest.java
+++ b/doxia-modules/doxia-module-confluence/src/test/java/org/apache/maven/doxia/module/confluence/ConfluenceSinkTest.java
@@ -230,7 +230,7 @@ public class ConfluenceSinkTest
/** {@inheritDoc} */
protected String getVerbatimBlock( String text )
{
- return "{code|borderStyle=solid}" + EOL + text + "{code}" + EOL + EOL;
+ return "{code:borderStyle=solid}" + EOL + text + "{code}" + EOL + EOL;
}
/** {@inheritDoc} */