summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmacsConf <emacsconf-org@gnu.org>2025-11-27 14:37:28 -0500
committerEmacsConf <emacsconf-org@gnu.org>2025-11-27 14:37:28 -0500
commitc1cc853ccc154818cf68549284c6d48b391bb9b7 (patch)
tree8be6f17816f2ee1ed528a74f24984ec3167e3982
parent57ed5436c4adb78179d08a34703cbd4ca2d78bfe (diff)
downloademacsconf-el-c1cc853ccc154818cf68549284c6d48b391bb9b7.tar.xz
emacsconf-el-c1cc853ccc154818cf68549284c6d48b391bb9b7.zip
pad-related changes
Diffstat (limited to '')
-rw-r--r--emacsconf-publish.el19
1 files changed, 15 insertions, 4 deletions
diff --git a/emacsconf-publish.el b/emacsconf-publish.el
index 4e906ab..6b0415c 100644
--- a/emacsconf-publish.el
+++ b/emacsconf-publish.el
@@ -603,7 +603,13 @@ ${categories}
("irc" "IRC")
(_ (plist-get o :qa-type)))
(emacsconf-surround " <" (and (member emacsconf-publishing-phase '(schedule conference))
- (plist-get o :qa-url)) ">" ""))
+ (plist-get o :qa-url)) ">" "")
+ (if (string= (plist-get o :qa-type) "pad")
+ ""
+ (format " Etherpad: <%s>"
+ (plist-get o :pad-url)
+ )
+ ))
(concat (or (plist-get o :video-time)
(plist-get o :time)) "-min talk cancelled"))
:pad-info
@@ -752,8 +758,11 @@ This includes the intro note, the schedule, and talk resources."
"")
(format
"[[!template text=\"\"\"%s\"\"\" start=\"%s\" video=\"%s\" id=\"subtitle\"%s]]"
- (replace-regexp-in-string "^#" "\\\\#"
- (replace-regexp-in-string "\"" "&quot;" (elt sub 3)))
+ (replace-regexp-in-string
+ "^#" "\\\\#"
+ (replace-regexp-in-string
+ "*" "\\\\*"
+ (replace-regexp-in-string "\"" "&quot;" (elt sub 3))))
(concat (format-seconds "%02h:%02m:%02s" (/ (floor msecs) 1000))
"." (format "%03d" (mod (floor msecs) 1000)))
video-id
@@ -1239,7 +1248,9 @@ You can also get this schedule as iCalendar files: ${icals}. Importing that into
:time (plist-get o :time)
:q-and-a (plist-get o :qa-link)
:note (plist-get o :sched-note)
- :pad (and emacsconf-publish-include-pads (plist-get o :pad-url))
+ :pad (and emacsconf-publish-include-pads
+ (not (string= "pad" (plist-get o :qa-type)))
+ (plist-get o :pad-url))
:startutc (format-time-string "%FT%T%z" (plist-get o :start-time) t)
:endutc (format-time-string "%FT%T%z" (plist-get o :end-time) t)
:start (format-time-string "%-l:%M" (plist-get o :start-time) emacsconf-timezone)