s4
changeset 189:972cb5ab0c5f
Rename m4 to _m4
| author | HIROSE Yuuji <yuuji@gentei.org> |
|---|---|
| date | Sat, 23 Apr 2016 17:34:04 +0859 |
| parents | 952e0a160efd |
| children | ba6c2c3c0373 |
| files | s4-blog.sh |
| diffstat | 1 files changed, 19 insertions(+), 19 deletions(-) [+] |
line diff
1.1 --- a/s4-blog.sh Sat Apr 23 17:29:34 2016 +0859 1.2 +++ b/s4-blog.sh Sat Apr 23 17:34:04 2016 +0859 1.3 @@ -454,10 +454,10 @@ 1.4 title=`getvalbyid blog title $1` 1.5 ge=`gecos $owner` 1.6 lshandoutsub $owner "$@" \ 1.7 - |m4 -D_TITLE_="提出状況" \ 1.8 - -D_FORMHEAD_="$time [$title]@${ge:-$owner}" \ 1.9 - -D_FORM_="syscmd(cat)" -D_DUMPHEAD_= -D_DUMPTABLE_= \ 1.10 - $layout/html.m4.html $layout/form+dump-whead.m4.html 1.11 + |_m4 -D_TITLE_="提出状況" \ 1.12 + -D_FORMHEAD_="$time [$title]@${ge:-$owner}" \ 1.13 + -D_FORM_="syscmd(cat)" -D_DUMPHEAD_= -D_DUMPTABLE_= \ 1.14 + $layout/html.m4.html $layout/form+dump-whead.m4.html 1.15 } 1.16 lshandoutsub() { 1.17 # $1=owner $2=rowid of blog 1.18 @@ -574,7 +574,7 @@ 1.19 where m.val is not null order by $by $ord;" 1.20 err lshandoutbyauthor: sql=`echo "$sql"` 1.21 title="個人提出ファイル" 1.22 - m4 -D_TITLE_=$title $layout/html.m4.html 1.23 + _m4 -D_TITLE_=$title $layout/html.m4.html 1.24 hra="<a href=\"?lsmyfile+" 1.25 hrb="<a href=\"?showattc+article_m+" 1.26 hrc="<a href=\"?replyblog+" 1.27 @@ -583,8 +583,8 @@ 1.28 | sed -e "s|\(<TR><TD>\)\([^/]*\)/\([0-9]*\)|\1$hrb\3\">\2</a>|" \ 1.29 -e "s|,t,\(.*\):\([^<]*\)\(</TD>\)|$hrc\2\">\1</a>\3|" \ 1.30 -e "s|\(<TH>\)\([A-Z]*\)\(</TH>\)|\1$hra\2$lkod\">\2</a>|" \ 1.31 - | m4 -D_TITLE_=$title -D_FORM_="<p>($by$jord)</p>" \ 1.32 - -D_DUMPTABLE_="syscmd(cat)" $layout/form+dump.m4.html 1.33 + | _m4 -D_TITLE_=$title -D_FORM_="<p>($by$jord)</p>" \ 1.34 + -D_DUMPTABLE_="syscmd(cat)" $layout/form+dump.m4.html 1.35 echo '</table>' 1.36 } 1.37 searchart() { 1.38 @@ -697,13 +697,13 @@ 1.39 echo "${guide}新規話題作成" > $tmpd/title.$$ 1.40 listblog $listing > $tmpd/listblog.$$ 1.41 genform $formdir/blog.def \ 1.42 - | m4 -D_TITLE_="spaste(\`$tmpd/title.$$')" \ 1.43 - -D_FORMHEAD_="序文は簡単に詳しくはコメントに" \ 1.44 - -D_DUMPHEAD_="これまでの蓄積" \ 1.45 - -D_FORM_="syscmd(\`cat')" \ 1.46 - -D_DUMPTABLE_="spaste(\`$tmpd/listblog.$$')" \ 1.47 - $layout/html.m4.html \ 1.48 - $layout/form+dump-whead.m4.html 1.49 + | _m4 -D_TITLE_="spaste(\`$tmpd/title.$$')" \ 1.50 + -D_FORMHEAD_="序文は簡単に詳しくはコメントに" \ 1.51 + -D_DUMPHEAD_="これまでの蓄積" \ 1.52 + -D_FORM_="syscmd(\`cat')" \ 1.53 + -D_DUMPTABLE_="spaste(\`$tmpd/listblog.$$')" \ 1.54 + $layout/html.m4.html \ 1.55 + $layout/form+dump-whead.m4.html 1.56 } 1.57 1.58 blog_reply() { 1.59 @@ -745,9 +745,9 @@ 1.60 echo "$title" > $tmpd/title.$$ 1.61 echo "$subtitle" > $tmpd/subtitle.$$ 1.62 ${BLOG_SHOW:-blog_showentry} blog $rowid \ 1.63 - | m4 -D_TITLE_="spaste(\`$tmpd/title.$$')" -D_BODYCLASS_=general \ 1.64 - -D_FORMHEAD_="spaste(\`$tmpd/subtitle.$$')" \ 1.65 - -D_FORM_='' \ 1.66 - -D_DUMPTABLE_="syscmd(cat)" -D_DUMPHEAD_="" \ 1.67 - $layout/html.m4.html $layout/form+dump-whead.m4.html 1.68 + | _m4 -D_TITLE_="spaste(\`$tmpd/title.$$')" -D_BODYCLASS_=general \ 1.69 + -D_FORMHEAD_="spaste(\`$tmpd/subtitle.$$')" \ 1.70 + -D_FORM_='' \ 1.71 + -D_DUMPTABLE_="syscmd(cat)" -D_DUMPHEAD_="" \ 1.72 + $layout/html.m4.html $layout/form+dump-whead.m4.html 1.73 }