X-Git-Url: http://www2.svjatoslav.eu/gitweb/?p=sixth.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fsixth%2Fcore%2Fdocument%2Fcontent%2FMultilineCode.java;h=212d4128504b3376710f43de834f837de74aae49;hp=db64e3ea5859a94661cb5359e376e6e6e91a0faa;hb=9b683d223e06fc5ec9e2561c659de5a79d3a8194;hpb=1f96525468e7f76c1ce817a8a7b22c93a39e40b4 diff --git a/src/main/java/eu/svjatoslav/sixth/core/document/content/MultilineCode.java b/src/main/java/eu/svjatoslav/sixth/core/document/content/MultilineCode.java index db64e3e..212d412 100644 --- a/src/main/java/eu/svjatoslav/sixth/core/document/content/MultilineCode.java +++ b/src/main/java/eu/svjatoslav/sixth/core/document/content/MultilineCode.java @@ -1,13 +1,24 @@ package eu.svjatoslav.sixth.core.document.content; import eu.svjatoslav.commons.string.String2; +import eu.svjatoslav.commons.string.tokenizer.Tokenizer; + +import static eu.svjatoslav.commons.string.tokenizer.Terminator.TerminationStrategy.DROP; public class MultilineCode implements Content { public final String language; public final String code; - public MultilineCode(String language, String code) { - this.language = language; + public MultilineCode(String languageAndParams, String code) { + + final Tokenizer tokenizer = new Tokenizer(languageAndParams); + tokenizer.addTerminator(DROP, "[ \\t]+", "whitespace"); + if (tokenizer.hasMoreContent()){ + language = tokenizer.getNextToken().token; + } else { + language = null; + } + this.code = code; } @@ -22,7 +33,6 @@ public class MultilineCode implements Content { } public String getMDlanguage(){ - // TODO: do not append ORG parameters to language, like: file: .... if (language == null) return ""; return language; }