# HG changeset patch
# User HIROSE Yuuji <yuuji@gentei.org>
# Date 1609652696 -32400
# Node ID 5acef432b1de1a94baaa9842c98c83465ab2d475
# Parent  0352ff0fb37faa90f2ac82fa2163786be8259478
TD-class delimiter changed to :::

diff -r 0352ff0fb37f -r 5acef432b1de s4-funcs.sh
--- a/s4-funcs.sh	Sun Jan 03 13:37:20 2021 +0900
+++ b/s4-funcs.sh	Sun Jan 03 14:44:56 2021 +0900
@@ -86,6 +86,7 @@
 "
 likeesc=`printf '\037'`		# ESCAPE char of LIKE operator
 iconcachekey="profimgcache_S"
+asdelim=":::"			# delimiter of dumptable td-class specifier
 
 # Start debug logging
 logtag="($$)${S4WORLD:+{$S4WORLD\}}"
@@ -3728,9 +3729,9 @@
   done
 }
 dt_colhack() {
-  # FROM: <TD>xxx:yyy</TD>
+  # FROM: <TD>xxx:::yyy</TD>
   # TO:   <TD class="xxx">yyy</TD>
-  sed -Ee 's,<TD>([^:<"]+):([^<]*)(</TD>|$),<TD class="\1">\2\3,g'
+  sed -Ee 's,<TD>([^:<"]+)'$asdelim'([^<]*)(</TD>|$),<TD class="\1">\2\3,g'
 }
 dt_rowhack() {
   # From: <TR>
@@ -3859,9 +3860,9 @@
     esac
     ss=`printf "$substr" "$valvar"`
     if [ x"$fromtbl" = x"b" ]; then
-      eav=$eav${eav:+,}" \"$as:\"||coalesce(max(case key when '$col' then $ss end), '') as $as"
+      eav=$eav${eav:+,}" \"$as$asdelim\"||coalesce(max(case key when '$col' then $ss end), '') as $as"
     else
-      eav=$eav${eav:+,}" \"$as:\"||$ss as $as"
+      eav=$eav${eav:+,}" \"$as$asdelim\"||$ss as $as"
     fi
     scols="$scols${scols:+, }${fromtbl}.$as"
   done