thank you for reviewing > Added: > maven/doxia/doxia/trunk/.gitignore was this intentional?
> Modified: maven/doxia/doxia/trunk/pom.xml > URL: > http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/pom.xml?rev=1465675&r1 > =1465674&r2=1465675&view=diff > =========================================================================== > === --- maven/doxia/doxia/trunk/pom.xml (original) > +++ maven/doxia/doxia/trunk/pom.xml Mon Apr 8 16:18:04 2013 > @@ -370,6 +370,7 @@ under the License. > <configuration> > <excludes> > <exclude>org/apache/maven/doxia/document/*</exclude> > + > <exclude>org/apache/maven/doxia/module/markdown/MarkdownToDoxiaHtmlSerializ > er</exclude> </excludes> > </configuration> > </execution> was this intentional too? Regards, Hervé Le lundi 8 avril 2013 16:18:05 [email protected] a écrit : > Author: krosenvold > Date: Mon Apr 8 16:18:04 2013 > New Revision: 1465675 > > URL: http://svn.apache.org/r1465675 > Log: > [DOXIA-484] Upgrade pegdown dependency > > Patch by Hervé Boutemy ;) > > Added: > maven/doxia/doxia/trunk/.gitignore > Modified: > maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/pom.xml > > maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/main/java/o > rg/apache/maven/doxia/module/markdown/MarkdownToDoxiaHtmlSerializer.java > maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/test/resour > ces/test.md maven/doxia/doxia/trunk/pom.xml > > Added: maven/doxia/doxia/trunk/.gitignore > URL: > http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/.gitignore?rev=1465675 > &view=auto > =========================================================================== > === --- maven/doxia/doxia/trunk/.gitignore (added) > +++ maven/doxia/doxia/trunk/.gitignore Mon Apr 8 16:18:04 2013 > @@ -0,0 +1,14 @@ > +*.iml > +*.ipr > +target > +*.iws > +.classpath > +dependency-reduced-pom.xml > +build > +.classpath > +.project > +.settings > +.idea > +.surefire-* > +.DS_Store > +*.versionsBackup > > Modified: > maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/pom.xml URL: > http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-mo > dule-markdown/pom.xml?rev=1465675&r1=1465674&r2=1465675&view=diff > =========================================================================== > === --- maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/pom.xml > (original) +++ > maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/pom.xml Mon Apr > 8 16:18:04 2013 @@ -50,7 +50,7 @@ under the License. > <dependency> > <groupId>org.pegdown</groupId> > <artifactId>pegdown</artifactId> > - <version>1.0.2</version> > + <version>1.2.1</version> > </dependency> > <dependency> > <groupId>org.apache.maven.doxia</groupId> > > Modified: > maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/main/java/o > rg/apache/maven/doxia/module/markdown/MarkdownToDoxiaHtmlSerializer.java > URL: > http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-mo > dule-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownT > oDoxiaHtmlSerializer.java?rev=1465675&r1=1465674&r2=1465675&view=diff > =========================================================================== > === --- > maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/main/java/o > rg/apache/maven/doxia/module/markdown/MarkdownToDoxiaHtmlSerializer.java > (original) +++ > maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/main/java/o > rg/apache/maven/doxia/module/markdown/MarkdownToDoxiaHtmlSerializer.java Mon > Apr 8 16:18:04 2013 @@ -19,6 +19,7 @@ package > org.apache.maven.doxia.module.ma > * under the License. > */ > > +import org.pegdown.LinkRenderer; > import org.pegdown.ToHtmlSerializer; > import org.pegdown.ast.VerbatimNode; > > @@ -31,16 +32,26 @@ import org.pegdown.ast.VerbatimNode; > public class MarkdownToDoxiaHtmlSerializer > extends ToHtmlSerializer > { > + public MarkdownToDoxiaHtmlSerializer() > + { > + super( new LinkRenderer() ); > + } > + > /** > * {@inheritDoc} > */ > @Override > public void visit( VerbatimNode node ) > { > - printer.println().print( "<div class=\"source\"><pre>" ); > + printer.println().print( "<div class=\"source\"><pre>" ); // better > than "<pre><code>" from Pegdown String text = node.getText(); > - text = transformVerbatimText( text ); > - printer.printEncoded( text, this ); > + // print HTML breaks for all initial newlines > + while ( text.charAt( 0 ) == '\n' ) > + { > + printer.print( "<br/>" ); > + text = text.substring( 1 ); > + } > + printer.printEncoded( text ); > printer.print( "</pre></div>" ); > } > } > > Modified: > maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/test/resour > ces/test.md URL: > http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-mo > dule-markdown/src/test/resources/test.md?rev=1465675&r1=1465674&r2=1465675&v > iew=diff > =========================================================================== > === --- > maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/test/resour > ces/test.md (original) +++ > maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/test/resour > ces/test.md Mon Apr 8 16:18:04 2013 @@ -126,7 +126,6 @@ And here it is > <del>in the middle of</de > pegdown/src/test/resources/docs-php-markdown-todo/Links_inline_style.md > --- > > -[silly URL w/ angle brackets](<?}]*+|&)>). > > > pegdown/src/test/resources/docs-php-markdown-todo/Nesting.md > @@ -608,12 +607,7 @@ Here's a [link] [1] with an ampersand in > > Here's a link with an amersand in the link text: [AT&T] [2]. > > -Here's an inline [link](/script?foo=1&bar=2). > > -Here's an inline [link](</script?foo=1&bar=2>). > - > - > -[1]: http://example.com/?foo=1&bar=2 > [2]: http://att.com/ "AT&T" > > > @@ -622,7 +616,6 @@ pegdown/src/test/resources/MarkdownTest1 > > Link: <http://example.com/>. > > -With an ampersand: <http://example.com/?foo=1&bar=2> > > * In a list? > * <http://example.com/> > @@ -4469,7 +4462,6 @@ And here it is <del>in the middle of</de > pegdown/src/test/resources/PhpMarkdown/Links_inline_style.md > --- > > -[silly URL w/ angle brackets](<?}]*+|&)>). > > > pegdown/src/test/resources/PhpMarkdown/MD5_Hashes.md > > Modified: maven/doxia/doxia/trunk/pom.xml > URL: > http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/pom.xml?rev=1465675&r1 > =1465674&r2=1465675&view=diff > =========================================================================== > === --- maven/doxia/doxia/trunk/pom.xml (original) > +++ maven/doxia/doxia/trunk/pom.xml Mon Apr 8 16:18:04 2013 > @@ -370,6 +370,7 @@ under the License. > <configuration> > <excludes> > <exclude>org/apache/maven/doxia/document/*</exclude> > + > <exclude>org/apache/maven/doxia/module/markdown/MarkdownToDoxiaHtmlSerializ > er</exclude> </excludes> > </configuration> > </execution> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
