-package org.simantics.scl.compiler.markdown.html;
+package org.simantics.scl.compiler.markdown.html;
import java.io.IOException;
import java.io.InputStream;
import java.io.StringReader;
b.append("</td><td class=\"content\">\n");
}
addContentsTree(b, result);
- result.toHtml(b);
+ result.toHtml(HtmlGenerationContext.DEFAULT, b);
if(navigation != null)
b.append("</td></tr></table>\n");
--- /dev/null
+package org.simantics.scl.compiler.markdown.html;
+
+public class HtmlGenerationContext {
+ public final boolean generateAnchors;
+
+ public HtmlGenerationContext(boolean generateAnchors) {
+ this.generateAnchors = generateAnchors;
+ }
+
+ public static final HtmlGenerationContext DEFAULT = new HtmlGenerationContext(true);
+ public static final HtmlGenerationContext TEST_DEFAULT = new HtmlGenerationContext(false);
+}
else if((c == '=' || c == '-')
&& container instanceof ParagraphNode
&& Scanner.isSetextHeaderLine(line, firstNonspace, c)
- && container.stringContent.indexOf("\n") == -1
+ /*&& container.stringContent.indexOf("\n") == -1*/
) {
HeaderNode header = new HeaderNode(c == '=' ? 1 : 2, true);
header.lineNumber = container.lineNumber;
package org.simantics.scl.compiler.markdown.nodes;
+import org.simantics.scl.compiler.markdown.html.HtmlGenerationContext;
import org.simantics.scl.compiler.markdown.internal.HtmlEscape;
public class AutolinkNode extends Node {
}
@Override
- public void toHtml(StringBuilder b) {
+ public void toHtml(HtmlGenerationContext context, StringBuilder b) {
b.append("<a href=\"");
if(email)
b.append("mailto:");
package org.simantics.scl.compiler.markdown.nodes;
+import org.simantics.scl.compiler.markdown.html.HtmlGenerationContext;
+
public class BlockQuoteNode extends Node {
@Override
public boolean canContain(Node node) {
}
@Override
- public void toHtml(StringBuilder b) {
+ public void toHtml(HtmlGenerationContext context, StringBuilder b) {
b.append("<blockquote>\n");
- super.toHtml(b);
+ super.toHtml(context, b);
b.append("</blockquote>\n");
}
}
package org.simantics.scl.compiler.markdown.nodes;
+import org.simantics.scl.compiler.markdown.html.HtmlGenerationContext;
import org.simantics.scl.compiler.markdown.internal.HtmlEscape;
public class CodeBlockNode extends Node {
}
@Override
- public void toHtml(StringBuilder b) {
+ public void toHtml(HtmlGenerationContext context, StringBuilder b) {
if(infoString == null || infoString.isEmpty())
b.append("<pre><code>");
else {
package org.simantics.scl.compiler.markdown.nodes;
+import org.simantics.scl.compiler.markdown.html.HtmlGenerationContext;
import org.simantics.scl.compiler.markdown.internal.HtmlEscape;
public class CodeNode extends Node {
}
@Override
- public void toHtml(StringBuilder b) {
+ public void toHtml(HtmlGenerationContext context, StringBuilder b) {
b.append("<code>");
b.append(HtmlEscape.escape(stringContent));
b.append("</code>");
package org.simantics.scl.compiler.markdown.nodes;
+import org.simantics.scl.compiler.markdown.html.HtmlGenerationContext;
+
public class EmphNode extends Node {
boolean strong;
}
@Override
- public void toHtml(StringBuilder b) {
+ public void toHtml(HtmlGenerationContext context, StringBuilder b) {
if(strong)
b.append("<strong>");
else
b.append("<em>");
- super.toHtml(b);
+ super.toHtml(context, b);
if(strong)
b.append("</strong>");
else
package org.simantics.scl.compiler.markdown.nodes;
+import org.simantics.scl.compiler.markdown.html.HtmlGenerationContext;
import org.simantics.scl.compiler.markdown.internal.ExtensionNodeHandler;
public class ExtensionBlockNode extends Node {
}
@Override
- public void toHtml(StringBuilder b) {
+ public void toHtml(HtmlGenerationContext context, StringBuilder b) {
b.append("::").append(extension).append('[').append(content).append(']');
}
}
package org.simantics.scl.compiler.markdown.nodes;
+import org.simantics.scl.compiler.markdown.html.HtmlGenerationContext;
+
public class HardLineBreakNode extends Node {
@Override
- public void toHtml(StringBuilder b) {
+ public void toHtml(HtmlGenerationContext context, StringBuilder b) {
b.append("<br />\n");
}
}
package org.simantics.scl.compiler.markdown.nodes;
+import org.simantics.scl.compiler.markdown.html.HtmlGenerationContext;
public class HeaderNode extends Node {
public int level;
}
@Override
- public void toHtml(StringBuilder b) {
- b.append("<h").append(level).append(" id=\"");
- toPlainText(b);
- b.append("\">");
- super.toHtml(b);
+ public void toHtml(HtmlGenerationContext context, StringBuilder b) {
+ b.append("<h").append(level);
+ if(context.generateAnchors) {
+ b.append(" id=\"");
+ toPlainText(b);
+ b.append("\">");
+ }
+ else
+ b.append('>');
+ super.toHtml(context, b);
b.append("</h").append(level).append(">\n");
}
}
package org.simantics.scl.compiler.markdown.nodes;
+import org.simantics.scl.compiler.markdown.html.HtmlGenerationContext;
+
public class HorizontalRuleNode extends Node {
@Override
- public void toHtml(StringBuilder b) {
+ public void toHtml(HtmlGenerationContext context, StringBuilder b) {
b.append("<hr />\n");
}
}
package org.simantics.scl.compiler.markdown.nodes;
+import org.simantics.scl.compiler.markdown.html.HtmlGenerationContext;
+
public class HtmlNode extends Node {
public HtmlNode() {
}
}
@Override
- public void toHtml(StringBuilder b) {
+ public void toHtml(HtmlGenerationContext context, StringBuilder b) {
b.append(stringContent);
b.append('\n');
}
package org.simantics.scl.compiler.markdown.nodes;
+import org.simantics.scl.compiler.markdown.html.HtmlGenerationContext;
+
public class HtmlTagNode extends Node {
public HtmlTagNode(StringBuilder stringContent) {
this.stringContent = stringContent;
}
@Override
- public void toHtml(StringBuilder b) {
+ public void toHtml(HtmlGenerationContext context, StringBuilder b) {
b.append(stringContent);
}
}
package org.simantics.scl.compiler.markdown.nodes;
+import org.simantics.scl.compiler.markdown.html.HtmlGenerationContext;
import org.simantics.scl.compiler.markdown.internal.HtmlEscape;
public class ImageNode extends Node {
}
@Override
- public void toHtml(StringBuilder b) {
+ public void toHtml(HtmlGenerationContext context, StringBuilder b) {
b.append("<img src=\"").append(HtmlEscape.escapeURL(url))
.append("\" alt=\"");
toPlainText(b);
package org.simantics.scl.compiler.markdown.nodes;
+import org.simantics.scl.compiler.markdown.html.HtmlGenerationContext;
public class ItemNode extends Node {
public int indentation;
return true;
}
- public void toHtml(StringBuilder b) {
- toHtml(b, true);
+ public void toHtml(HtmlGenerationContext context, StringBuilder b) {
+ toHtml(context, b, true);
}
- public void toHtml(StringBuilder b, boolean tight) {
+ public void toHtml(HtmlGenerationContext context, StringBuilder b, boolean tight) {
if(firstChild == null) {
b.append("<li></li>\n");
return;
for(Node child = firstChild; child != null; child = child.next) {
if(child instanceof ParagraphNode) {
for(Node n=child.firstChild;n!=null;n=n.next)
- n.toHtml(b);
+ n.toHtml(context, b);
noNewline = true;
}
else {
b.append('\n');
noNewline = false;
}
- child.toHtml(b);
+ child.toHtml(context, b);
}
}
b.append("</li>\n");
}
else {
b.append("<li>\n");
- super.toHtml(b);
+ super.toHtml(context, b);
b.append("</li>\n");
}
}
package org.simantics.scl.compiler.markdown.nodes;
+import org.simantics.scl.compiler.markdown.html.HtmlGenerationContext;
import org.simantics.scl.compiler.markdown.internal.HtmlEscape;
public class LinkNode extends Node {
}
@Override
- public void toHtml(StringBuilder b) {
+ public void toHtml(HtmlGenerationContext context, StringBuilder b) {
b.append("<a href=\"").append(HtmlEscape.escapeURL(url));
if(title.isEmpty())
b.append("\">");
b.append(HtmlEscape.escape(title));
b.append("\">");
}
- super.toHtml(b);
+ super.toHtml(context, b);
b.append("</a>");
}
}
package org.simantics.scl.compiler.markdown.nodes;
+import org.simantics.scl.compiler.markdown.html.HtmlGenerationContext;
public class ListNode extends Node {
public char bulletChar;
}
@Override
- public void toHtml(StringBuilder b) {
+ public void toHtml(HtmlGenerationContext context, StringBuilder b) {
if(bulletChar == '+' || bulletChar == '-' || bulletChar == '*') {
b.append("<ul>\n");
for(Node child = firstChild; child != null; child = child.next)
- ((ItemNode)child).toHtml(b, tight);
+ ((ItemNode)child).toHtml(context, b, tight);
b.append("</ul>\n");
}
else {
else
b.append("<ol start=\"").append(start).append("\">\n");
for(Node child = firstChild; child != null; child = child.next)
- ((ItemNode)child).toHtml(b, tight);
+ ((ItemNode)child).toHtml(context, b, tight);
b.append("</ol>\n");
}
}
import java.util.ArrayList;
import java.util.List;
+import org.simantics.scl.compiler.markdown.html.HtmlGenerationContext;
import org.simantics.scl.compiler.markdown.internal.ExtensionNodeHandler;
import org.simantics.scl.compiler.markdown.internal.MarkdownParser;
return false;
}
- public void toHtml(StringBuilder b) {
+ public void toHtml(HtmlGenerationContext context, StringBuilder b) {
for(Node child = firstChild; child != null; child = child.next)
- child.toHtml(b);
+ child.toHtml(context, b);
}
public List<HeaderNode> extractHeaders() {
return result;
}
- public String toHtml() {
+ public String toHtml(HtmlGenerationContext context) {
StringBuilder b = new StringBuilder();
- toHtml(b);
+ toHtml(context, b);
int len = b.length();
if(len > 0 && b.charAt(len-1) == '\n')
b.delete(len-1, len);
package org.simantics.scl.compiler.markdown.nodes;
+import org.simantics.scl.compiler.markdown.html.HtmlGenerationContext;
public class ParagraphNode extends Node {
@Override
return true;
}
@Override
- public void toHtml(StringBuilder b) {
+ public void toHtml(HtmlGenerationContext context, StringBuilder b) {
b.append("<p>");
- super.toHtml(b);
+ super.toHtml(context, b);
b.append("</p>\n");
}
}
package org.simantics.scl.compiler.markdown.nodes;
+import org.simantics.scl.compiler.markdown.html.HtmlGenerationContext;
import org.simantics.scl.compiler.markdown.internal.HtmlEscape;
public class TextNode extends Node {
this.stringContent = text;
}
@Override
- public void toHtml(StringBuilder b) {
+ public void toHtml(HtmlGenerationContext context, StringBuilder b) {
b.append(HtmlEscape.escape(stringContent));
}
@Override
import java.nio.charset.Charset;
import org.junit.Test;
+import org.simantics.scl.compiler.markdown.html.HtmlGenerationContext;
import org.simantics.scl.compiler.markdown.internal.MarkdownParser;
import org.simantics.scl.compiler.markdown.nodes.Node;
}
public static int test(int id, String in, String out) throws IOException {
+ if(in.contains("\u2192"))
+ return SKIPPED;
MarkdownParser parser = new MarkdownParser();
Node node = parser.parseDocument(new StringReader(in.replace('\u2192', '\t')));
- String result = node.toHtml().replace('\t', '\u2192');
+ String result = node.toHtml(HtmlGenerationContext.TEST_DEFAULT).replace('\t', '\u2192');
boolean passed = result.equals(out);
Code Review / simantics / platform.git / commitdiff