wip

src/stencil/cleanup.clj

@@ -211,22 +211,6 @@
  :when (= :cmd/include (:cmd item))]
  (:name item))))
 
-;; Calculate for each numbering how many for loops deep it is.
-(defn- numid->depth [ast]
- (let [cache (volatile! {})]
- ;; visit all nodes and set up a cache.
- (doseq [e ast]
- ((fn f [d node]
- (assert (map? node))
- (when (= ooxml/attr-numId (:open+close node))
- (vswap! cache update (ooxml/val (:attrs node)) (fnil conj #{}) d))
- (let [d (if (= :for (:cmd node)) (cons (gensym "x") d) d)]
- (doseq [block (::blocks node)
- b (::children block)]
- (f d b)))) () e))
- (into {} (for [[k v] @cache]
- [k (count (take-while true? (apply map = (map reverse v))))]))))
-
 ;; add ::depth to ooxml/numId elements
 (defn- ast-numbering-depths [ast]
  (let [numid->paths (volatile! {})
@@ -263,7 +247,6 @@
  executable (mapv control-ast-normalize (annotate-environments ast))]
  {:variables (find-variables ast)
  :fragments (find-fragments ast)
- :num-depth (numid->depth ast)
  :dynamic? (boolean (some :cmd executable))
  :executable executable}))
 

src/stencil/model.clj

@@ -53,19 +53,9 @@
  {:source-file cts
  ::path (.getName cts)})
 
-#_
-(defn- add-unique-index
- "Annotates some elements with an unique id.
- These elements need special care when rendering duplicates them.
- For example, numberings need to be reset to start from 1 again."
- [elem]
- (when (= (:open+close elem) ooxml/attr-numId)
- (update elem :attrs assoc ::unique (gensym "uniq"))))
-
 (defn ->exec [xml-streamable]
  (with-open [stream (io/input-stream xml-streamable)]
  (-> (merger/parse-to-tokens-seq stream)
- ;(->> (map (some-fn add-unique-index identity)))
  (cleanup/process)
  (select-keys [:variables :dynamic? :executable :fragments]))))