yowa
yowak****@cool*****
2003年 6月 12日 (木) 00:40:49 JST
ょゎです。 差分の表示で、追加・削除された行のタグが style/*/html_formatter.rb は <span class={added,deleted}> なのに template/*/diff.html は <b class=added> と <s class=deleted>になっています。 theme/hiki_base.css を見るかぎり、<span> の方が正しいんですよね。 ……と思ったのですが、 <ins> と <del> を使った方がいいのかな、と思い直 しました。どうでしょうか。 <ins> と <del> を使う版のパッチを付けます。 ------------------------------ ょゎ <mailto:yowak****@cool*****> <http://yowaken.dip.jp/> Index: style/default/html_formatter.rb =================================================================== RCS file: /cvsroot/hiki/hiki/style/default/Attic/html_formatter.rb,v retrieving revision 1.1.2.12 diff -u -r1.1.2.12 html_formatter.rb --- style/default/html_formatter.rb 8 Jun 2003 04:23:57 -0000 1.1.2.12 +++ style/default/html_formatter.rb 11 Jun 2003 15:27:18 -0000 @@ -70,9 +70,9 @@ lines = l[2] case l[0] when :+ - s << "<span class=added>#{lines.join.escapeHTML}</span>\n" + s << "<ins class=added>#{lines.join.escapeHTML}</ins>\n" when :- - s << "<span class=deleted>#{lines.join.escapeHTML}</span>\n" + s << "<del class=deleted>#{lines.join.escapeHTML}</del>\n" end end s Index: style/rd+/html_formatter.rb =================================================================== RCS file: /cvsroot/hiki/hiki/style/rd+/Attic/html_formatter.rb,v retrieving revision 1.1.2.4 diff -u -r1.1.2.4 html_formatter.rb --- style/rd+/html_formatter.rb 31 May 2003 10:13:07 -0000 1.1.2.4 +++ style/rd+/html_formatter.rb 11 Jun 2003 15:27:18 -0000 @@ -30,9 +30,9 @@ lines = l[2] case l[0] when :+ - s << "<span class=added>#{lines.join.escapeHTML}</span>\n" + s << "<ins class=added>#{lines.join.escapeHTML}</ins>\n" when :- - s << "<span class=deleted>#{lines.join.escapeHTML}</span>\n" + s << "<del class=deleted>#{lines.join.escapeHTML}</del>\n" end end s Index: template/en/diff.html =================================================================== RCS file: /cvsroot/hiki/hiki/template/en/diff.html,v retrieving revision 1.1.2.6 diff -u -r1.1.2.6 diff.html --- template/en/diff.html 8 Jun 2003 08:33:08 -0000 1.1.2.6 +++ template/en/diff.html 11 Jun 2003 15:27:18 -0000 @@ -20,8 +20,8 @@ <div class="body"> <div class="section"> <ul> - <li>Added lines is showed as <b class=added>here</b>.</li> - <li>Removed lines is showed as <s class=deleted>here</s>.</li> + <li>Added lines is showed as <ins class=added>here</ins>.</li> + <li>Removed lines is showed as <del class=deleted>here</del>.</li> </ul> <hr> <pre class="diff" id=differ></pre> Index: template/ja/diff.html =================================================================== RCS file: /cvsroot/hiki/hiki/template/ja/diff.html,v retrieving revision 1.1.1.1.2.6 diff -u -r1.1.1.1.2.6 diff.html --- template/ja/diff.html 8 Jun 2003 08:33:09 -0000 1.1.1.1.2.6 +++ template/ja/diff.html 11 Jun 2003 15:27:18 -0000 @@ -20,8 +20,8 @@ <div class="body"> <div class="section"> <ul> - <li>最後の更新で追加された行は<b class=added>このように</b>表示します。</li> - <li>最後の更新で削除された行は<s class=deleted>このように</s>表示します。</li> + <li>最後の更新で追加された行は<ins class=added>このように</ins>表示します。</li> + <li>最後の更新で削除された行は<del class=deleted>このように</del>表示します。</li> </ul> <hr> <pre class="diff" id=differ></pre> Index: theme/hiki_base.css =================================================================== RCS file: /cvsroot/hiki/hiki/theme/hiki_base.css,v retrieving revision 1.1.1.1.2.1 diff -u -r1.1.1.1.2.1 hiki_base.css --- theme/hiki_base.css 31 May 2003 10:13:10 -0000 1.1.1.1.2.1 +++ theme/hiki_base.css 11 Jun 2003 15:27:18 -0000 @@ -1,8 +1,8 @@ -span.added { +ins.added { font-weight: bold; } -span.deleted { +del.deleted { text-decoration: line-through; }