Skip to content

Commit f385232

Browse files
committed
add default output-ext, fix indent detection and output-ext regex
1 parent e74fd4f commit f385232

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

chatu.el

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@
173173
(defun chatu-get-output-ext (line)
174174
"Get chatu output file extension from string LINE."
175175
(when (string-match
176-
":output-ext +\"\\(.+?\\)\"" line)
176+
":output-ext +\"\\(.+?\\)[ \\t\\n]" line)
177177
(list :output-ext
178178
(substring-no-properties
179179
(match-string 1 line)))))
@@ -234,7 +234,9 @@
234234
(if input-dir
235235
(concat input-dir "/" input)
236236
input)))
237-
(output-ext (plist-get keyword-plist :output-ext))
237+
(output-ext (or (plist-get keyword-plist :output-ext)
238+
"svg"))
239+
(_ (plist-put keyword-plist :output-ext output-ext))
238240
(output (plist-get keyword-plist :output))
239241
(output-dir (or (plist-get keyword-plist :output-dir)
240242
;; if output already contains parent folder
@@ -248,11 +250,10 @@
248250
(concat (file-name-sans-extension
249251
;; remove input's parent folder
250252
(file-name-base input))
251-
"-" page "." (or output-ext "svg"))
253+
"-" page "." output-ext)
252254
(file-name-with-extension
253255
(file-name-base input)
254-
;; when output-ext is set, use it.
255-
(or output-ext "svg")))))
256+
output-ext))))
256257
(_ (plist-put keyword-plist :output-path
257258
(if output-dir
258259
(concat output-dir "/" output)
@@ -338,11 +339,15 @@
338339
(result (plist-get keyword-plist :output-path))
339340
(result-dir (file-name-directory result))
340341
(space-count (string-search
341-
"#"
342+
(cond ((derived-mode-p 'markdown-mode)
343+
"<"
344+
)
345+
((derived-mode-p 'org-mode)
346+
"#"))
342347
(buffer-substring
343348
(line-beginning-position)
344349
(line-end-position)))))
345-
;; ensure output-dir exists.
350+
;; ensure output-dir exists.
346351
(when (not (file-exists-p result-dir))
347352
(make-directory result-dir t))
348353
(forward-line)

0 commit comments

Comments
 (0)