fix: numberings in loops are reset

src/stencil/model.clj

@@ -6,6 +6,7 @@
  (:require [clojure.data.xml :as xml]
  [clojure.java.io :as io :refer [file]]
  [stencil.eval :as eval]
+ [stencil.ooxml :as ooxml]
  [stencil.merger :as merger]
  [stencil.model.numbering :as numbering]
  [stencil.types :refer [->FragmentInvoke ->ReplaceImage]]
@@ -52,10 +53,18 @@
  {: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]))))
 

src/stencil/postprocess/list_ref.clj

@@ -307,3 +307,21 @@
  (let [xml-tree (enrich-dirty-refs-meta xml-tree)
  bookmark-meta (get-bookmark-meta xml-tree)]
  (rerender-refs xml-tree bookmark-meta)))
+
+;; finds nodes with unique id and if these are not unique anymore, replace the numbering id with a duplicate numbering definition
+(defn fix-numbering-reset [xml-tree]
+ (let [found (atom #{})
+ last-val (atom nil)
+ edit-attrs (fn [attrs]
+ (let [old-id (ooxml/val attrs)
+ unq-id (:stencil.model/unique attrs)
+ new-id old-id] ;; TODO
+ ;; ha az unique id benne van a found set-ben
+ ;; akkor uj value-t szamolunk es beallitjuk a last-val-t.
+ ;; egyebkent ha a last-val nem ugyanaz mint a mostani, akkor beallitjuk a last val-t (?)
+ (-> attrs
+ (dissoc :stencil.model/unique)
+ (assoc ooxml/val new-id))))]
+ ;; find nodes with unique id in attrs
+ (dfs-walk-xml-node xml-tree (fn [n] (and (map? n) (:stencil.model/unique (:attrs n))))
+ (fn [n] (zip/edit n update :attrs edit-attrs)))))

src/stencil/tree_postprocess.clj

@@ -26,6 +26,8 @@
 
  #'fix-list-dirty-refs
 
+ #'fix-numbering-reset
+
  #'replace-images
 
  ;; call this first. includes fragments and evaluates them too.