with LaTeX itemize
+ */
+ fun changeList() {
+ content = content.replaceTag("", "\\begin{itemize}", "\\end{itemize}")
+ .replaceTag("", "
", "\\begin{itemize}", "\\end{itemize}")
+ }
+
+ /**
+ * Replace - with LaTeX itemize item
+ */
+ fun changeListItem() {
+ content = content.replaceTag("
- ", "
", "\\item ", "")
+ }
+
+ /**
+ * Replace with LaTeX verbatim
+ */
+ fun changeMono() {
+ content = content.replaceTag("", "
", "\\begin{verbatim}", "\\end{verbatim}")
+ }
+
+ /**
+ * Replace , empty , and with LaTeX plain text
+ */
+ fun changeParagraph() {
+ content = content.replaceTag("", "
", "", "")
+ .replaceTag("", "
", "", "")
+ .replaceTag("
", "
", "\n", "")
+ .replaceTag("", "", "", "")
+ }
+
+ /**
+ * Replace
with LaTeX \section
+ */
+ fun changeSection() {
+ content = content.replaceTag("", "
", "\\section{", "}\n")
+ }
+
+ /**
+ * Replace with LaTeX \subsection
+ */
+ fun changeSubSection() {
+ content = content.replaceTag("", "
", "\\subsection{", "}\n")
+ }
+
+ /**
+ * Replace with LaTeX \subsubsection
+ */
+ fun changeSubSubSection() {
+ content = content.replaceTag("", "
", "\\subsubsection{", "}\n")
+ }
+
+ /**
+ * Replace
with LaTex tabular
+ */
+ fun changeTable() {
+ val pattern = Pattern.compile("(?:)+")
+ val matcher = pattern.matcher(content)
+
+ while (matcher.find()) {
+ val document = Jsoup.parse(matcher.group(0), "", Parser.xmlParser())
+ val table = document.select("table")[0]
+ val rows = table.select("tr")
+
+ val columnsDump = ArrayList()
+ var colCount = 0
+
+ for (row in rows) {
+ var columns = row.select("td")
+ if (columns.isEmpty()) {
+ // Maybe this is an header
+ columns = row.select("th")
+ }
+
+ if (colCount == 0) {
+ colCount = columns.size
+ }
+
+ val dump = StringBuilder()
+ columns.map { it.wholeText() }.forEach { dump.append("$it &") }
+
+ // Replace the last & with a LaTeX newLine
+ columnsDump.add(dump.removeSuffix("&").append("\\\\\n"))
+ }
+
+ // Build the LaTeX table
+ val latexTable = StringBuilder().run {
+ append("\\begin{table}[h]\n\\begin{tabular}{${"l".repeat(colCount)}}\n")
+ columnsDump.forEach { append(" $it") }
+ append("\\end{tabular}\n\\end{table}")
+ toString()
+ }
+
+ content = content.replace(matcher.group(0), latexTable)
+ }
+ }
+
+ /**
+ * Replace with LaTeX \underline
+ */
+ fun changeUnderline() {
+ content = content.replaceTag("", "", "\\underline{", "}")
+ }
+
+ /**
+ * Add an author to the document
+ *
+ * @param author the text being inserted
+ */
+ fun addAuthor(author: String) {
+ insert(AUTHOR.format(author), true, true)
+ }
+
+ /**
+ * Add a title to the document
+ *
+ * @param title the text being inserted
+ */
+ fun addTitle(title: String) {
+ insert(TITLE.format(title), true, true)
+ }
+
+ /**
+ * Remove the html comments
+ */
+ fun stripComments() {
+ content = content.replace(Regex("(?s)"), "")
+ }
+
+ /**
+ * Insert content into the document
+ *
+ * @param string the content being inserted
+ * @param preLine whether a newLine char should be inserted before the content
+ * @param afterLine whether a newLine char should be inserted after the content
+ */
+ private fun insert(string: String, preLine: Boolean = false, afterLine: Boolean = false) {
+ document.apply {
+ if (preLine) {
+ append("\n")
+ }
+
+ append(string)
+
+ if (afterLine) {
+ append("\n")
+ }
+ }
+ }
+
+ private fun String.replaceTag(oldOpen: String, oldClose: String?,
+ newOpen: String, newClose: String?): String {
+ var replaced = replace(oldOpen, newOpen)
+
+ if (oldClose != null && newClose != null) {
+ replaced = replaced.replace(oldClose, newClose)
+ }
+
+ return replaced
+ }
+
+ private fun CharSequence.append(append: String) = "${toString()}$append"
+
+ override fun toString() = document.toString()
+
+ companion object {
+ private const val AUTHOR = "\\author{%1\$s}"
+ private const val TITLE = "\\title{%1\$s}"
+ private const val LINK = "\\underline{\\href{%1\$s}{%2\$s}}"
+
+ private const val HEADER =
+ "\\documentclass[hidelinks,12pt,a4paper,numbers=enddot]{scrartcl}\n\n" +
+ "\\usepackage[margin=2cm]{geometry}\n" +
+ "\\usepackage{hyperref}"
+ }
+}
\ No newline at end of file
diff --git a/bonus2/src/ch/usi/inf/atelier/group1/html/JekyllHtmlFile.kt b/bonus2/src/ch/usi/inf/atelier/group1/jekyll/JekyllPage.kt
similarity index 71%
rename from bonus2/src/ch/usi/inf/atelier/group1/html/JekyllHtmlFile.kt
rename to bonus2/src/ch/usi/inf/atelier/group1/jekyll/JekyllPage.kt
index 0cc09f0..75bd0ba 100644
--- a/bonus2/src/ch/usi/inf/atelier/group1/html/JekyllHtmlFile.kt
+++ b/bonus2/src/ch/usi/inf/atelier/group1/jekyll/JekyllPage.kt
@@ -1,15 +1,22 @@
/*
- * Copyright (c) 2018. Bevilacqua Joey
+ * Copyright (c) 2018 Bevilacqua Joey.
*/
-package ch.usi.inf.atelier.group1.html
+package ch.usi.inf.atelier.group1.jekyll
import ch.usi.inf.atelier.group1.util.extensions.getContent
import java.io.BufferedReader
import java.io.File
import java.io.StringReader
-class JekyllHtmlFile(file: File) {
+class JekyllPage(file: File) {
+ /**
+ * The jekyll header variables
+ */
val header = HashMap()
+
+ /**
+ * The jekyll html code
+ */
val content: String
init {
@@ -28,12 +35,14 @@ class JekyllHtmlFile(file: File) {
isIteratingInHeader = HEADER_END != line
if (isIteratingInHeader) {
+ // Import a jekyll variable
val values = line.split(":")
if (values.size == 2) {
header[values[0]] = values[1].trim()
}
}
} else {
+ // Import html code
contentBuilder.append(line).append('\n')
}
@@ -43,10 +52,14 @@ class JekyllHtmlFile(file: File) {
content = contentBuilder.toString()
}
+ /**
+ * Check whether the imported file actually had valid content
+ *
+ * @return true if the header and the content aren't empty
+ */
fun isValid() = header.isNotEmpty() && content.isNotBlank()
- override fun toString() =
- "Header:\n$header\nContent:\n$content"
+ override fun toString() = "Header:\n$header\nContent:\n$content"
companion object {
private const val HEADER_START = "---"
diff --git a/bonus2/src/ch/usi/inf/atelier/group1/tex/TexDocument.kt b/bonus2/src/ch/usi/inf/atelier/group1/tex/TexDocument.kt
deleted file mode 100644
index 75dead2..0000000
--- a/bonus2/src/ch/usi/inf/atelier/group1/tex/TexDocument.kt
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (c) 2018. Bevilacqua Joey
- */
-package ch.usi.inf.atelier.group1.tex
-
-class TexDocument {
- private val document = StringBuilder()
-
- fun start() {
- document.clear()
-
- insert(HEADER, false, true)
- }
-
- fun beginDocument() {
- insert("\\begin{document}", false, true)
- insert("\\maketitle", false, true)
- insert("\\tableofcontents", false, true)
- insert("\\newpage", false, true)
- }
-
- fun endDocument() {
- insert("\\end{document}", false, true)
- }
-
- fun addParagraph(content: String) {
- if (content.isNotBlank()) {
- insert(content, true, true)
- }
- }
-
- fun addText(content: String) {
- if (content.isNotBlank()) {
- insert(content, false, true)
- }
- }
-
- fun addSection(content: String) {
- insert(SECTION.format(content, content.trim().toLowerCase()), false, true)
- }
-
- fun addSubSection(content: String) {
- insert(SUB_SECTION.format(content), false, true)
- }
-
- fun addSubSubSection(content: String) {
- insert(SUB_SUB_SECTION.format(content), false, true)
- }
-
- fun addBold(content: String) {
- insert(BOLD.format(content), false, false)
- }
-
- fun addItalics(content: String) {
- insert(ITALICS.format(content), false, false)
- }
-
- fun addCode(content: String) {
- insert(CODE.format(content), false, false)
- }
-
- fun addPre(content: String) {
- insert(PRE.format(content), false, true)
- }
-
- fun addLink(content: String, url: String) {
- insert(LINK.format(content, url), false, true)
- }
-
- fun beginList() {
- insert("\\begin{itemize}", false, true)
- }
-
- fun endList() {
- insert("\\end{itemize}", false, true)
-
- }
-
- fun addListItem(content: String) {
- insert(LIST_ITEM.format(content), false, true)
- }
-
- fun addBr() {
- insert("", false, false)
- }
-
- fun setAuthor(content: String) {
- insert(AUTHOR.format(content), false, true)
- }
-
- fun setTitle(content: String) {
- insert(TITLE.format(content), false, true)
- }
-
- private fun insert(string: String, newLine: Boolean, endLine: Boolean) {
- document.apply {
- append(string)
- if(newLine) {
- append("\\\\")
- }
- if (endLine) {
- append("\n")
- }
- }
- }
-
- override fun toString() = document.toString()
-
- companion object {
- private const val AUTHOR = "\\author{%1\$s}\n"
- private const val BOLD = "\\textbf{%1\$s}"
- private const val CODE = "\\texttt{%1\$s}"
- private const val ITALICS = "\\emph{%1\$s}"
- private const val LINK = "\\emph{%1\$s} \\footnote{\\url{%2\$s}}"
- private const val LIST_ITEM = "\\item %1\$s"
- private const val PRE = "\n\\begin{verbatim}\n%1\$s\n\\end{verbatim}"
- private const val SECTION = "\\section{%1\$s}\\label{%2\$s}"
- private const val SUB_SECTION = "\\subsection{%1\$s}"
- private const val SUB_SUB_SECTION = "\\subsubsection{%1\$s}"
- private const val TITLE = "\\title{%1\$s}\n"
-
- private const val HEADER =
- "\\documentclass[hidelinks,12pt,a4paper,numbers=enddot]{scrartcl}\n\n" +
- "\\usepackage[margin=2cm]{geometry}\n" +
- "\\usepackage{hyperref}\n"
-
- }
-}
\ No newline at end of file
diff --git a/bonus2/src/ch/usi/inf/atelier/group1/util/Log.kt b/bonus2/src/ch/usi/inf/atelier/group1/util/Log.kt
index 88ad775..db2dd99 100644
--- a/bonus2/src/ch/usi/inf/atelier/group1/util/Log.kt
+++ b/bonus2/src/ch/usi/inf/atelier/group1/util/Log.kt
@@ -1,21 +1,28 @@
/*
- * Copyright (c) 2018. Bevilacqua Joey
+ * Copyright (c) 2018 Bevilacqua Joey.
*/
package ch.usi.inf.atelier.group1.util
-import java.lang.Exception
+import java.text.SimpleDateFormat
+import java.util.*
object Log {
- fun e(message: String = "", exception: Exception) {
- e("$message: ${exception.message ?: "Unknown error"}")
- }
-
- fun e(message: String) {
- System.err.println(message)
+ fun e(exception: Exception) {
+ print('E', exception.message ?: "Unknown error", true)
}
fun i(obj: Any) {
- println(obj.toString())
+ print('I', obj.toString(), false)
+ }
+
+ private fun print(prefix: Char, message: String, isErr: Boolean) {
+ val time = SimpleDateFormat("yyyy-MM-dd hh:mm").format(Date())
+
+ if (isErr) {
+ System.err.println("$prefix $time\t$message")
+ } else {
+ System.out.println("$prefix $time\t$message")
+ }
}
}
\ No newline at end of file
diff --git a/bonus2/src/ch/usi/inf/atelier/group1/util/extensions/File.kt b/bonus2/src/ch/usi/inf/atelier/group1/util/extensions/File.kt
index af437dd..3399725 100644
--- a/bonus2/src/ch/usi/inf/atelier/group1/util/extensions/File.kt
+++ b/bonus2/src/ch/usi/inf/atelier/group1/util/extensions/File.kt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018. Bevilacqua Joey
+ * Copyright (c) 2018 Bevilacqua Joey.
*/
package ch.usi.inf.atelier.group1.util.extensions
@@ -9,6 +9,11 @@ import java.io.File
import java.io.FileReader
import java.io.IOException
+/**
+ * Get the content of the file as String
+ *
+ * @return this File content
+ */
fun File.getContent(): String {
val content = StringBuilder()
try {
diff --git a/bonus2/src/ch/usi/inf/atelier/group1/util/extensions/String.kt b/bonus2/src/ch/usi/inf/atelier/group1/util/extensions/String.kt
deleted file mode 100644
index c39e71f..0000000
--- a/bonus2/src/ch/usi/inf/atelier/group1/util/extensions/String.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (c) 2018. Bevilacqua Joey
- */
-package ch.usi.inf.atelier.group1.util.extensions
-
-import ch.usi.inf.atelier.group1.util.Log
-import java.io.File
-import java.io.IOException
-
-fun String.toFile(): File? {
- try {
- File(this)
- } catch (e: IOException) {
- Log.e("Failed to open $this as File", e)
- throw e
- }
-
- return null
-}
-
-fun String.getClosingTag() = "