Skip to content

[SW2.5] 楽素記号をあらわす記法を追加 #375

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ViVi-shark wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

[SW2.5] 楽素記号をあらわす記法を追加 #375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f123452
[SW2.5] 楽素記号をあらわす記法を追加
Jun 7, 2025
a3b32a5
折り畳みのデフォルト展開記法から `[↓]` を削除
Nov 15, 2025
e355cef
[SW2.5] 楽素記号をあらわす記法に、より簡易な入力のためのバリエーションを追加（ `[↑]` `[↓]` ）
Nov 15, 2025
26505b8
Merge commit 'aaa4ad8c54b2db790517a9a8375f9f20b9ad27fd' into feature/…
Nov 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion _core/lib/edit.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -702,7 +702,7 @@ sub textRuleArea {
　　　　　　<code>:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|説明文2行目</code> 項目名を記入しないか、半角スペースで埋めると上と結合します。<br>
折り畳み：行頭に<code>[>]項目名</code>：以降のテキストがすべて折り畳みになります。<br>
　　　　　項目名を省略すると、自動的に「詳細」になります。<br>
　　　　　<code>&gt;</code>の代わりに<code>↓</code><code>V</code><code>v</code><code>Ｖ</code><code>ｖ</code>のいずれかの文字をもちいると、デフォルトで展開状態となります（例： <code>[v]項目名</code>）。<br>
　　　　　<code>&gt;</code>の代わりに<code>V</code><code>v</code><code>Ｖ</code><code>ｖ</code>のいずれかの文字をもちいると、デフォルトで展開状態となります（例： <code>[v]項目名</code>）。<br>
折り畳み終了：行頭に<code>[---]</code>：（ハイフンは3つ以上任意）<br>
　　　　　　　省略すると、以後のテキストが全て折りたたまれます。<br>
コメントアウト：行頭に<code>//</code>：記述した行を非表示にします。
Expand Down
16 changes: 10 additions & 6 deletions _core/lib/subroutine.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,6 +492,10 @@ sub unescapeTags {
$text =~ s/(\[[常準主補宣]\])+/&textToIcon($&);/egi;
$text =~ s/「((?:[○◯〇△＞▶〆☆≫»□☐☑🗨]|&gt;&gt;)+)/"「".&textToIcon($1);/egi;
}

$text =~ s|\[[⤴↑]\]|<i class="s-icon uplift">⤴</i>|g;
$text =~ s|\[[⤵↓]\]|<i class="s-icon calm">⤵</i>|g;
$text =~ s|\[♡\]|<i class="s-icon heart">♡</i>|g;
}


Expand Down Expand Up @@ -542,12 +546,12 @@ sub unescapeTagsLines {
$text =~ s/^RIGHT:/<\/p><p class="right">/gim;

my $d_count = 0;
$d_count += ($text =~ s/^\[(&gt;|[↓vＶｖ])\]\*\*\*\*(.*?)$/"<\/p><details @{[$1 eq '&gt;' ? '' : 'open']}><summary class=\"header4\">$2<\/summary><div class=\"detail-body\"><p>"/gime);
$d_count += ($text =~ s/^\[(&gt;|[↓vＶｖ])\]\*\*\*(.*?)$/"<\/p><details @{[$1 eq '&gt;' ? '' : 'open']}><summary class=\"header3\">$2<\/summary><div class=\"detail-body\"><p>"/gime);
$d_count += ($text =~ s/^\[(&gt;|[↓vＶｖ])\]\*\*(.*?)$/"<\/p><details @{[$1 eq '&gt;' ? '' : 'open']}><summary class=\"header2\">$2<\/summary><div class=\"detail-body\"><p>"/gime);
$d_count += ($text =~ s/^\[(&gt;|[↓vＶｖ])\]\*(.*?)$/"<\/p><details @{[$1 eq '&gt;' ? '' : 'open']}><summary class=\"header1\">$2<\/summary><div class=\"detail-bod\"><p>"/gime);
$d_count += ($text =~ s/^\[(&gt;|[↓vＶｖ])\](.+?)$/"<\/p><details @{[$1 eq '&gt;' ? '' : 'open']}><summary>$2<\/summary><div class=\"detail-body\"><p>"/gime);
$d_count += ($text =~ s/^\[(&gt;|[↓vＶｖ])\]$/"<\/p><details @{[$1 eq '&gt;' ? '' : 'open']}><summary>詳細<\/summary><div class=\"detail-body\"><p>"/gime);
$d_count += ($text =~ s/^\[(&gt;|[vＶｖ])\]\*\*\*\*(.*?)$/"<\/p><details @{[$1 eq '&gt;' ? '' : 'open']}><summary class=\"header4\">$2<\/summary><div class=\"detail-body\"><p>"/gime);
$d_count += ($text =~ s/^\[(&gt;|[vＶｖ])\]\*\*\*(.*?)$/"<\/p><details @{[$1 eq '&gt;' ? '' : 'open']}><summary class=\"header3\">$2<\/summary><div class=\"detail-body\"><p>"/gime);
$d_count += ($text =~ s/^\[(&gt;|[vＶｖ])\]\*\*(.*?)$/"<\/p><details @{[$1 eq '&gt;' ? '' : 'open']}><summary class=\"header2\">$2<\/summary><div class=\"detail-body\"><p>"/gime);
$d_count += ($text =~ s/^\[(&gt;|[vＶｖ])\]\*(.*?)$/"<\/p><details @{[$1 eq '&gt;' ? '' : 'open']}><summary class=\"header1\">$2<\/summary><div class=\"detail-bod\"><p>"/gime);
$d_count += ($text =~ s/^\[(&gt;|[vＶｖ])\](.+?)$/"<\/p><details @{[$1 eq '&gt;' ? '' : 'open']}><summary>$2<\/summary><div class=\"detail-body\"><p>"/gime);
$d_count += ($text =~ s/^\[(&gt;|[vＶｖ])\]$/"<\/p><details @{[$1 eq '&gt;' ? '' : 'open']}><summary>詳細<\/summary><div class=\"detail-body\"><p>"/gime);
$d_count -= ($text =~ s/^\[-{3,}\]\n?$/<\/p><\/div><\/details><p>/gim);

$text =~ s/^-{4,}$/<\/p><hr><p>/gim;
Expand Down
3 changes: 3 additions & 0 deletions _core/lib/sw2/edit-arts.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,6 +450,9 @@
　流派アイテム　：<code>[流]</code>：<img class="i-icon" src="${set::icon_dir}wp_school.png"><br>
　アルフレイム大陸由来の流派アイテム：<code>[ア]</code>：<img class="i-icon" src="${set::icon_dir}wp_school_a.png"><br>
　テラスティア大陸由来の流派アイテム：<code>[テ]</code>：<img class="i-icon" src="${set::icon_dir}wp_school_t.png"><br>
　高揚の楽素：<code>[⤴]</code><code>[↑]</code>：<i class="s-icon uplift">⤴</i><br>
　鎮静の楽素：<code>[⤵]</code><code>[↓]</code>：<i class="s-icon calm">⤵</i><br>
　魅惑の楽素：<code>[♡]</code>：<i class="s-icon heart">♡</i><br>
HTML
}
else {
Expand Down
3 changes: 3 additions & 0 deletions _core/lib/sw2/edit-chara.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1713,6 +1713,9 @@ sub chatPaletteFormOptional {
　主動作型　：<code>[主]</code>：<i class="s-icon major "><span class="raw">[主]</span></i><br>
　補助動作型：<code>[補]</code>：<i class="s-icon minor "><span class="raw">[補]</span></i><br>
　宣言型　　：<code>[宣]</code>：<i class="s-icon active "><span class="raw">[宣]</span></i><br>
　高揚の楽素：<code>[⤴]</code><code>[↑]</code>：<i class="s-icon uplift">⤴</i><br>
　鎮静の楽素：<code>[⤵]</code><code>[↓]</code>：<i class="s-icon calm">⤵</i><br>
　魅惑の楽素：<code>[♡]</code>：<i class="s-icon heart">♡</i><br>
HTML
print textRuleArea( $text_rule,'「容姿・経歴・その他メモ」「履歴（自由記入）」「所持品」「収支履歴」' );

Expand Down
3 changes: 3 additions & 0 deletions _core/lib/sw2/edit-item.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,9 @@
　流派アイテム　：<code>[流]</code>：<img class="i-icon" src="${set::icon_dir}wp_school.png"><br>
　アルフレイム大陸由来の流派アイテム：<code>[ア]</code>：<img class="i-icon" src="${set::icon_dir}wp_school_a.png"><br>
　テラスティア大陸由来の流派アイテム：<code>[テ]</code>：<img class="i-icon" src="${set::icon_dir}wp_school_t.png"><br>
　高揚の楽素：<code>[⤴]</code><code>[↑]</code>：<i class="s-icon uplift">⤴</i><br>
　鎮静の楽素：<code>[⤵]</code><code>[↓]</code>：<i class="s-icon calm">⤵</i><br>
　魅惑の楽素：<code>[♡]</code>：<i class="s-icon heart">♡</i><br>
HTML
}
else {
Expand Down