Author: ltheussl
Date: Tue Oct 18 09:04:52 2011
New Revision: 1185539
URL: http://svn.apache.org/viewvc?rev=1185539&view=rev
Log:
[DOXIA-451] Tweak Doxia Markdown module HTML to better match
Submitted by: Brian Ferris
Added:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownToDoxiaHtmlSerializer.java
(with props)
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/markdown/MarkdownParserTest.java
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java?rev=1185539&r1=1185538&r2=1185539&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java
Tue Oct 18 09:04:52 2011
@@ -31,6 +31,7 @@ import org.codehaus.plexus.util.IOUtil;
import org.pegdown.Extensions;
import org.pegdown.PegDownProcessor;
+import org.pegdown.ast.RootNode;
/**
* Implementation of {@link org.apache.maven.doxia.parser.Parser} for Markdown
documents.
@@ -60,12 +61,14 @@ public class MarkdownParser
* {@inheritDoc}
*/
@Override
- public void parse( Reader reader, Sink sink )
+ public void parse( Reader source, Sink sink )
throws ParseException
{
try
{
- super.parse( new StringReader( "<html><body>" +
PEGDOWN_PROCESSOR.markdownToHtml( IOUtil.toString( reader ) ) +
"</body></html>" ), sink );
+ RootNode rootNode = PEGDOWN_PROCESSOR.parseMarkdown(
IOUtil.toString( source ).toCharArray() );
+ String markdownAsHtml = new
MarkdownToDoxiaHtmlSerializer().toHtml( rootNode );
+ super.parse( new StringReader( "<html><body>" + markdownAsHtml +
"</body></html>" ), sink );
}
catch ( IOException e )
{
Added:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownToDoxiaHtmlSerializer.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownToDoxiaHtmlSerializer.java?rev=1185539&view=auto
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownToDoxiaHtmlSerializer.java
(added)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownToDoxiaHtmlSerializer.java
Tue Oct 18 09:04:52 2011
@@ -0,0 +1,46 @@
+package org.apache.maven.doxia.module.markdown;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.pegdown.ToHtmlSerializer;
+import org.pegdown.ast.VerbatimNode;
+
+/**
+ * Custom Markdown to HTML serialization strategy that better matches the
+ * conventions of existing Doxia modules.
+ *
+ * @author Brian Ferris (bdfer...@google.com)
+ */
+public class MarkdownToDoxiaHtmlSerializer
+ extends ToHtmlSerializer
+{
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void visit( VerbatimNode node )
+ {
+ printer.println().print( "<div class=\"source\"><pre>" );
+ String text = node.getText();
+ text = transformVerbatimText( text );
+ printer.printEncoded( text, this );
+ printer.print( "</pre></div>" );
+ }
+}
Propchange:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownToDoxiaHtmlSerializer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownToDoxiaHtmlSerializer.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/markdown/MarkdownParserTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/markdown/MarkdownParserTest.java?rev=1185539&r1=1185538&r2=1185539&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/markdown/MarkdownParserTest.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/markdown/MarkdownParserTest.java
Tue Oct 18 09:04:52 2011
@@ -147,9 +147,7 @@ public class MarkdownParserTest
assertEquals( "paragraph_", it.next().getName() );
assertEquals( "text", it.next().getName() );
assertEquals( "verbatim", it.next().getName() );
- assertEquals( "monospaced", it.next().getName() );
assertEquals( "text", it.next().getName() );
- assertEquals( "monospaced_", it.next().getName() );
assertEquals( "verbatim_", it.next().getName() );
assertEquals( "body_", it.next().getName() );
