# HG changeset patch
# User HIROSE Yuuji <yuuji@gentei.org>
# Date 1592021997 -32400
# Node ID c5b61d23052bf9716f632211971ed3699994aa38
# Parent  809caeb20758ea5164e9a462df17977fabc35e66
Display WORLD name in HTML header

diff -r 809caeb20758 -r c5b61d23052b examples/common/default/html.m4.html
--- a/examples/common/default/html.m4.html	Sat Jun 13 13:19:07 2020 +0900
+++ b/examples/common/default/html.m4.html	Sat Jun 13 13:19:57 2020 +0900
@@ -7,7 +7,7 @@
 `<meta name="theme-color" content="_S4COLOR_">',
 `<meta name="theme-color" content="#8ea">')
 <meta name="viewport" content="width=device-width,initial-scale=0.5">
-<title>_TITLE_|ifdef(`_S4NAME_',`_S4NAME_',s4)</title>
+<title>_TITLE_|ifdef(`_S4WORLD_',`{_S4WORLD_}')ifdef(`_S4NAME_',`_S4NAME_',s4)</title>
 <link rel="stylesheet" type="text/css" href="templ/default/default.css">
 <script type="text/javascript" src="s4-main.js" charset="utf-8"></script>
 ifdef(`_S4CSS_',
@@ -19,7 +19,7 @@
 <div class="topmenu">
 <ul>
  <li class="casmenu"><a href="?home" accesskey="1" title="Shortcut: 1
-Home">ホーム</a>_S4WORLDS_</li>
+Home">ホーム</a>ifdef(`_S4WORLDS_',`_S4WORLDS_')</li>
  <!-- <li><a href="?blog">話題作成</a></li> -->
  <li><a href="?mems" accesskey="2" title="Shortcut: 2
 Members">参加者一覧</a></li>
diff -r 809caeb20758 -r c5b61d23052b s4-funcs.sh
--- a/s4-funcs.sh	Sat Jun 13 13:19:07 2020 +0900
+++ b/s4-funcs.sh	Sat Jun 13 13:19:57 2020 +0900
@@ -492,7 +492,8 @@
 _m4() {
   #S4NAME=f,f,f
   m4 ${S4NAME:+"-D_S4NAME_=${S4NAME}"} ${S4CSS:+-D_S4CSS_="$S4CSS"} \
-     -D_S4WORLDS_="$S4WORLDS" "$@"
+     ${S4WORLD:+-D_S4WORLD_="$S4WORLD"} \
+     ${S4WORLDS:+-D_S4WORLDS_="$S4WORLDS"} "$@"
 }
 ismember() {
   # $1=user, $2=group