diff --git a/src/nextjournal/markdown.cljc b/src/nextjournal/markdown.cljc index 87b7633..d66eb1d 100644 --- a/src/nextjournal/markdown.cljc +++ b/src/nextjournal/markdown.cljc @@ -1,7 +1,6 @@ (ns nextjournal.markdown "Markdown as data" (:require [nextjournal.markdown.parser.impl :as impl] - [nextjournal.markdown.parser.impl.utils :as u] [nextjournal.markdown.transform :as markdown.transform])) diff --git a/src/nextjournal/markdown/parser/impl.clj b/src/nextjournal/markdown/parser/impl.clj index 0442f74..c5915d3 100644 --- a/src/nextjournal/markdown/parser/impl.clj +++ b/src/nextjournal/markdown/parser/impl.clj @@ -1,8 +1,8 @@ (ns nextjournal.markdown.parser.impl (:require [clojure.zip :as z] [nextjournal.markdown.parser :as parser] - [nextjournal.markdown.parser2.types] - [nextjournal.markdown.parser2.formulas :as formulas]) + [nextjournal.markdown.parser.impl.types] + [nextjournal.markdown.parser.impl.formulas :as formulas]) (:import (org.commonmark.parser Parser) (org.commonmark.ext.task.list.items TaskListItemsExtension TaskListItemMarker) (org.commonmark.ext.footnotes FootnotesExtension FootnoteReference FootnoteDefinition InlineFootnote) @@ -35,13 +35,13 @@ (set! *warn-on-reflection* true) ;; TODO: ;; - [x] inline formulas -;; - [ ] block formulas +;; - [x] block formulas ;; - [x] tight lists ;; - [x] task lists -;; - [ ] footnotes +;; - [x] footnotes ;; - [ ] strikethroughs ext ;; - [ ] tables -;; - [ ] fenced code info +;; - [x] fenced code info ;; - [ ] html nodes ;; - [ ] auto link ;; - [ ] promote single images as blocks diff --git a/src/nextjournal/markdown/parser2/formulas.clj b/src/nextjournal/markdown/parser/impl/formulas.clj similarity index 98% rename from src/nextjournal/markdown/parser2/formulas.clj rename to src/nextjournal/markdown/parser/impl/formulas.clj index 6086632..231e9db 100644 --- a/src/nextjournal/markdown/parser2/formulas.clj +++ b/src/nextjournal/markdown/parser/impl/formulas.clj @@ -1,4 +1,4 @@ -(ns nextjournal.markdown.parser2.formulas +(ns nextjournal.markdown.parser.impl.formulas (:require [clojure.string :as str]) (:import (java.util Set) (java.util.regex Matcher) diff --git a/src/nextjournal/markdown/parser2/types.clj b/src/nextjournal/markdown/parser/impl/types.clj similarity index 95% rename from src/nextjournal/markdown/parser2/types.clj rename to src/nextjournal/markdown/parser/impl/types.clj index acdfb93..7c4cc3b 100644 --- a/src/nextjournal/markdown/parser2/types.clj +++ b/src/nextjournal/markdown/parser/impl/types.clj @@ -1,4 +1,4 @@ -(ns nextjournal.markdown.parser2.types) +(ns nextjournal.markdown.parser.impl.types) ;; See also ;; https://github.com/noties/Markwon/blob/master/markwon-ext-latex/src/main/java/io/noties/markwon/ext/latex/JLatexMathBlockParser.java