fix: hyperlinks (#30)

src/stencil/model.clj

@@ -40,6 +40,10 @@
  "Relationship type of image files in .rels files."
  "http:https://schemas.openxmlformats.org/officeDocument/2006/relationships/image")
 
+(def rel-type-hyperlink
+ "Relationship type of hyperlinks in .rels files."
+ "http:https://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink")
+
 (def tag-relationships
  :xmlns.http%3A%2F%2Fschemas.openxmlformats.org%2Fpackage%2F2006%2Frelationships/Relationships)
 
@@ -73,7 +77,7 @@
  :when (= tag-relationship (:tag d))]
  [(:Id (:attrs d)) {::type (doto (:Type (:attrs d)) assert)
  ::target (doto (:Target (:attrs d)) assert)
- ::mode (:TargetMode :attrs)}]))))
+ ::mode (:TargetMode (:attrs d))}]))))
 
 
 (defn- parse-style
@@ -273,6 +277,7 @@
  (into result
  (for [m (tree-seq coll? seq evaled-template-model)
  :when (and (map? m) (not (sorted? m)) (:path m))
+ :when (not= "External" (::mode m))
  :when (not (contains? result (:path m)))]
  [(:path m) (or (:writer (:result m)) (resource-copier m))]))
 
@@ -284,6 +289,7 @@
  (.getParentFile (file (:source-file m))))))
  path-parent (some-> m :path file .getParentFile)]
  relation (vals (:parsed (:relations m)))
+ :when (not= "External" (::mode relation))
  :let [path (str (.normalize (.toPath (file path-parent (::target relation)))))]
  :when (or (:writer relation) (not (contains? result path)))
  :let [src (or (:source-file relation) (file @src-parent (::target relation)))]]
@@ -363,8 +369,11 @@
  (assert (every? string? (keys id-rename)))
  (assert (every? string? (vals id-rename)))
  (doall (for [item executable]
- ;; Image relation ids are being renamed here.
- (update-some item [:attrs ooxml/embed] id-rename))))
+ (-> item
+ ;; Image relation ids are being renamed here.
+ (update-some [:attrs ooxml/r-embed] id-rename)
+ ;; Hyperlink relation ids are being renamed here
+ (update-some [:attrs ooxml/r-id] id-rename)))))
 
 
 ;; generates a random relation id
@@ -374,10 +383,11 @@
 (defn- relation-ids-rename [model fragment-name]
  (doall
  (for [[old-rel-id m] (-> model :main :relations :parsed (doto assert))
- :when (= rel-type-image (::type m))
+ :when (#{rel-type-image rel-type-hyperlink} (::type m))
  :let [new-id (->relation-id)
- extension (last (.split (str (::target m)) "\\."))
- new-path (str new-id "." extension)]]
+ new-path (if (= "External" (::mode m))
+ (::target m)
+ (str new-id "." (last (.split (str (::target m)) "\\."))))]]
  {::type (::type m)
  ::mode (::mode m)
  ::target new-path

src/stencil/ooxml.clj

@@ -39,4 +39,5 @@
 (def style-id :xmlns.http%3A%2F%2Fschemas.openxmlformats.org%2Fwordprocessingml%2F2006%2Fmain/styleId)
 
 ;; relation id used with images
-(def embed :xmlns.http%3A%2F%2Fschemas.openxmlformats.org%2FofficeDocument%2F2006%2Frelationships/embed)
+(def r-embed :xmlns.http%3A%2F%2Fschemas.openxmlformats.org%2FofficeDocument%2F2006%2Frelationships/embed)
+(def r-id :xmlns.http%3A%2F%2Fschemas.openxmlformats.org%2FofficeDocument%2F2006%2Frelationships/id)