You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2022/12/11 21:39:10 UTC
[maven-doxia] branch DOXIA-569 updated: fix link and image
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch DOXIA-569
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git
The following commit(s) were added to refs/heads/DOXIA-569 by this push:
new eb946cac fix link and image
eb946cac is described below
commit eb946cac8d9e5f817f0e3b2c5e13bf6e2d994e2d
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Sun Dec 11 22:39:07 2022 +0100
fix link and image
---
.../maven/doxia/module/markdown/MarkdownMarkup.java | 2 +-
.../maven/doxia/module/markdown/MarkdownSink.java | 20 ++++++++++++--------
.../doxia/module/markdown/MarkdownSinkTest.java | 6 +++---
3 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownMarkup.java b/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownMarkup.java
index 09e4cd20..1a927e01 100644
--- a/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownMarkup.java
+++ b/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownMarkup.java
@@ -97,7 +97,7 @@ public interface MarkdownMarkup
/** Syntax for the link start: "[" */
String LINK_START_1_MARKUP = "[";
- /** Syntax for the link start: "}" */
+ /** Syntax for the link start: "](" */
String LINK_START_2_MARKUP = "](";
/** Syntax for the list end: "[]" */
diff --git a/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownSink.java b/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownSink.java
index 2fd4972f..f78379f0 100644
--- a/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownSink.java
+++ b/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownSink.java
@@ -58,6 +58,9 @@ public class MarkdownSink
/** date. */
private String date;
+ /** linkName. */
+ private String linkName;
+
/** startFlag. */
private boolean startFlag;
@@ -158,6 +161,7 @@ public class MarkdownSink
this.author = null;
this.title = null;
this.date = null;
+ this.linkName = null;
this.startFlag = true;
this.tableCaptionFlag = false;
this.tableCellFlag = false;
@@ -814,13 +818,14 @@ public class MarkdownSink
/** {@inheritDoc} */
public void figureGraphics( String name )
{
- write( EOL + "[" + name + "] " );
+ write( "<img src=\"" + name + "\" />" );
}
/** {@inheritDoc} */
public void anchor( String name )
{
- write( ANCHOR_START_MARKUP );
+ //write( ANCHOR_START_MARKUP + name );
+ // TODO get implementation from Xhtml5 base sink
}
/**
@@ -828,7 +833,7 @@ public class MarkdownSink
*/
public void anchor_()
{
- write( ANCHOR_END_MARKUP );
+ //write( ANCHOR_END_MARKUP );
}
/** {@inheritDoc} */
@@ -837,8 +842,7 @@ public class MarkdownSink
if ( !headerFlag )
{
write( LINK_START_1_MARKUP );
- text( name.startsWith( "#" ) ? name.substring( 1 ) : name );
- write( LINK_START_2_MARKUP );
+ linkName = name;
}
}
@@ -849,7 +853,10 @@ public class MarkdownSink
{
if ( !headerFlag )
{
+ write( LINK_START_2_MARKUP );
+ text( linkName.startsWith( "#" ) ? linkName.substring( 1 ) : linkName );
write( LINK_END_MARKUP );
+ linkName = null;
}
}
@@ -864,9 +871,6 @@ public class MarkdownSink
if ( !headerFlag )
{
write( LINK_START_1_MARKUP );
- text( name );
- write( LINK_START_2_MARKUP );
- text( target );
}
}
diff --git a/doxia-modules/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/markdown/MarkdownSinkTest.java b/doxia-modules/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/markdown/MarkdownSinkTest.java
index 28e5652a..3076b80e 100644
--- a/doxia-modules/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/markdown/MarkdownSinkTest.java
+++ b/doxia-modules/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/markdown/MarkdownSinkTest.java
@@ -183,7 +183,7 @@ public class MarkdownSinkTest extends AbstractSinkTest
/** {@inheritDoc} */
protected String getFigureBlock( String source, String caption )
{
- String figureBlock = EOL + Markup.LEFT_SQUARE_BRACKET + source + Markup.RIGHT_SQUARE_BRACKET + Markup.SPACE;
+ String figureBlock = "<img src=\"" + source + "\" />";
if( caption != null )
{
figureBlock += caption + EOL;
@@ -263,14 +263,14 @@ public class MarkdownSinkTest extends AbstractSinkTest
/** {@inheritDoc} */
protected String getAnchorBlock( String anchor )
{
- return MarkdownMarkup.ANCHOR_START_MARKUP + anchor + MarkdownMarkup.ANCHOR_END_MARKUP;
+ return anchor;
}
/** {@inheritDoc} */
protected String getLinkBlock( String link, String text )
{
String lnk = link.startsWith( "#" ) ? link.substring( 1 ) : link;
- return MarkdownMarkup.LINK_START_1_MARKUP + lnk + MarkdownMarkup.LINK_START_2_MARKUP + text + MarkdownMarkup.LINK_END_MARKUP;
+ return MarkdownMarkup.LINK_START_1_MARKUP + text + MarkdownMarkup.LINK_START_2_MARKUP + lnk + MarkdownMarkup.LINK_END_MARKUP;
}
/** {@inheritDoc} */