提交: 39db50f56ff34fc20ad15f63caa4463168cb5940 - TinyBannavi (git)

タイニー番組ナビゲータ本体

Commit MetaInfo

• 修訂: 39db50f56ff34fc20ad15f63caa4463168cb5940 (tree)
• 時間: 2021-11-03 20:32:51
• 作者: Masahiko Kimura <mkimura@u01....>
• Commiter: Masahiko Kimura

Log Message

Ver.1.13.3 (2021/11/3)
1. ［全般］管理対象の番組記号を増やす
2. ［全般］番組記号の表示/非表示をタイトルの前後で独立して設定できるようにする
3. ［全般］ツリービューの隠れている部分やリストの末尾省略されているセルをツールチップで表示する
4. ［新聞形式］番組のツールチップのレイアウトを改善し、表示内容を増やす（終了時刻、番組長、マーク）

Change Summary

• modified: TinyBannavi/src/tainavi/AbsListedView.java
• modified: TinyBannavi/src/tainavi/AbsPaperView.java
• modified: TinyBannavi/src/tainavi/AbsReserveListView.java
• modified: TinyBannavi/src/tainavi/AbsSettingView.java
• modified: TinyBannavi/src/tainavi/Bounds.java
• modified: TinyBannavi/src/tainavi/CommonUtils.java
• modified: TinyBannavi/src/tainavi/Env.java
• modified: TinyBannavi/src/tainavi/JNETable.java
• modified: TinyBannavi/src/tainavi/JTXTButton.java
• modified: TinyBannavi/src/tainavi/MarkChar.java
• modified: TinyBannavi/src/tainavi/TVProgram.java
• modified: TinyBannavi/src/tainavi/TVProgramUtils.java
• modified: TinyBannavi/src/tainavi/VersionInfo.java
• modified: TinyBannavi/src/tainavi/Viewer.java

差異

--- a/TinyBannavi/src/tainavi/AbsListedView.java
+++ b/TinyBannavi/src/tainavi/AbsListedView.java
@@ -5,7 +5,10 @@ import java.awt.Color;
 import java.awt.Component;
 import java.awt.Desktop;
 import java.awt.Dimension;
+import java.awt.FontMetrics;
+import java.awt.Insets;
 import java.awt.Point;
+import java.awt.Rectangle;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.ComponentAdapter;
@@ -4203,7 +4206,12 @@ public abstract class AbsListedView extends JPanel implements TickTimerListener
 		if (jTree_tree == null) {
 
 			// ツリーの作成
-			jTree_tree = new JTree();
+			jTree_tree = new JTree(){
+				@Override public String getToolTipText(MouseEvent e) {
+					return CommonUtils.GetTreeTooltip(jScrollPane_tree, jTree_tree, e);
+				}
+			};
+			jTree_tree.setToolTipText("dummy");
 			jTree_tree.getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);
 			jTree_tree.setRootVisible(env.getRootNodeVisible());
 			jTree_tree.setCellRenderer(new VWTreeCellRenderer());	// 検索結果が存在するノードの色を変える
@@ -4730,9 +4738,6 @@ public abstract class AbsListedView extends JPanel implements TickTimerListener
 			Component comp = super.prepareRenderer(tcr, row, column);
 			Color fgColor = (prechknextweek)?(nextweekFgColor):(this.getForeground());
 			Color bgColor = (isSepRowColor && row%2 == 1)?(evenColor):(super.getBackground());
-			int mrow = this.convertRowIndexToModel(row);
-		    int mcol = convertColumnIndexToModel(column);
-			ListedItem item = rowData.get(mrow);
 
 			isRowPassed(row);
 
@@ -4765,30 +4770,58 @@ public abstract class AbsListedView extends JPanel implements TickTimerListener
 				comp.setBackground(bgColor);
 			}
 
+			return comp;
+		}
+
+	    // getToolTipText()をオーバーライド
+		@Override
+	    public String getToolTipText(MouseEvent e){
+	    	int row = rowAtPoint(e.getPoint());
+	    	int column = columnAtPoint(e.getPoint());
+	    	if (row == -1 || column == -1)
+	    		return null;
+
+			int mrow = this.convertRowIndexToModel(row);
+		    int mcol = convertColumnIndexToModel(column);
+			ListedItem item = rowData.get(mrow);
+
 			// ツールチップテキストを生成する
 			ListColumnInfo info = lvitems.getVisibleAt(column);
 
-			String text = null;
-		    if (item != null && info != null && comp instanceof JComponent){
-				int cindex = info.getId()-1;
-		    	if (cindex == ListedColumn.RSVMARK.getColumn())
-			    	text = item.marker != null ? item.marker.getTooltipText() : null;
-		    	else if (cindex >= ListedColumn.RSVMARK1.getColumn() && cindex < ListedColumn.RSVMARK1.getColumn()+marker_num){
-		    		int n = cindex-ListedColumn.RSVMARK1.getColumn();
-			    	text = item.marker_array[n] != null ? item.marker_array[n].getTooltipText() : null;
-		    	}
-		    	else if (cindex == ListedColumn.PICKMARK.getColumn() || cindex == ListedColumn.DUPMARK.getColumn()){
-			      Object o = getModel().getValueAt(mrow, mcol);
-			      String s = (o != null) ? o.toString() : null;
-			      text = RsvMark.getTooltipText(s);
-		    	}
-
-		    	if (text != null)
-		    		((JComponent) comp).setToolTipText(text);
-			}
-
-			return comp;
-		}
+			int cindex = info.getId()-1;
+	    	if (cindex == ListedColumn.RSVMARK.getColumn())
+		    	return item.marker != null ? item.marker.getTooltipText() : null;
+	    	else if (cindex >= ListedColumn.RSVMARK1.getColumn() && cindex < ListedColumn.RSVMARK1.getColumn()+marker_num){
+	    		int n = cindex-ListedColumn.RSVMARK1.getColumn();
+		    	return item.marker_array[n] != null ? item.marker_array[n].getTooltipText() : null;
+	    	}
+	    	else if (cindex == ListedColumn.PICKMARK.getColumn() || cindex == ListedColumn.DUPMARK.getColumn()){
+	    		Object o = getModel().getValueAt(mrow, mcol);
+	    		String s = (o != null) ? o.toString() : null;
+	    		return RsvMark.getTooltipText(s);
+	    	}
+	    	else if (cindex == ListedColumn.TITLE.getColumn()){
+	    		if (item.title == null)
+	    			return null;
+
+		        String text = String.join("", item.title.split("\0", 8));
+				if (text == null)
+					return null;
+
+		    	Insets i = getInsets();
+		        Rectangle rect = getCellRect(row, column, false);
+		        FontMetrics fm = getFontMetrics(getFont());
+
+		        int width = fm.stringWidth(text);
+
+		        if (width > rect.width-(i.left+i.right))
+		        	return text;
+		        else
+		        	return null;
+	    	}
+	    	else
+	    		return super.getToolTipText(e);
+	    }
 
 		// 直接rowDataを見に行くようになったから、このisRowPassed()はもういらないんじゃ…
 

--- a/TinyBannavi/src/tainavi/AbsPaperView.java
+++ b/TinyBannavi/src/tainavi/AbsPaperView.java
@@ -2188,20 +2188,8 @@ public abstract class AbsPaperView extends JPanel implements TickTimerListener,H
 		b2.setVBounds(col,row,1,tvd.length);
 
 		// ツールチップを付加する
-		if ( env.getTooltipEnable() == true && ! tvd.title.equals("") && ! tvd.start.equals("") ) {
-			String t = "";
-			int tlen = bounds.getTooltipWidth();
-			for (int i=0; i<tvd.title.length(); i+=tlen) {
-				t += tvd.title.substring(i, (i+tlen<tvd.title.length())?(i+tlen):(tvd.title.length()))+"<BR>";
-			}
-			String d = "";
-			int dlen = tlen+2;
-			for (int i=0; i<tvd.detail.length(); i+=dlen) {
-				d += "&nbsp;&nbsp;&nbsp;&nbsp;"+tvd.detail.substring(i, (i+dlen<tvd.detail.length())?(i+dlen):(tvd.detail.length()))+"<BR>";
-			}
-			String e = getExtensionMark(tvd);
-			b2.setToolTipText(("<html>"+tvd.start+"&nbsp;<FONT COLOR=RED><EM>"+e+"</EM></FONT><BR>&nbsp;<FONT COLOR=BLUE><STRONG><U>"+t+"</U></STRONG></FONT>"+d+"</html>"));
-		}
+		if (Env.TheEnv.getTooltipEnable() && ! tvd.title.isEmpty() && ! tvd.start.isEmpty())
+			b2.setToolTipText("dummy");
 	}
 
 
@@ -2626,7 +2614,7 @@ public abstract class AbsPaperView extends JPanel implements TickTimerListener,H
 				else if (byCenter && !value.equals("")){
 					c = CommonUtils.getCalendar(value, 3600*24);
 					if (c != null)
-						redrawByDateWithCenter(node.getLabel(), CommonUtils.getDate(c));
+						redrawByDateWithCenter(null, CommonUtils.getDate(c));
 				}
 				else
 					redrawByCurrentSelection();
@@ -3255,7 +3243,13 @@ public abstract class AbsPaperView extends JPanel implements TickTimerListener,H
 		if (jTree_tree == null) {
 
 			// ツリーの作成
-			jTree_tree = new JTree();
+			jTree_tree = new JTree(){
+			  @Override public String getToolTipText(MouseEvent e) {
+				  return CommonUtils.GetTreeTooltip(jScrollPane_tree, jTree_tree, e);
+			  }
+			};
+			jTree_tree.setToolTipText("dummy");
+
 			jTree_tree.getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);
 			jTree_tree.setCellRenderer(new TreeCellRenderer());	// 検索結果が存在するノードの色を変える
 			jTree_tree.setRootVisible(env.getRootNodeVisible());

--- a/TinyBannavi/src/tainavi/AbsReserveListView.java
+++ b/TinyBannavi/src/tainavi/AbsReserveListView.java
@@ -25,7 +25,6 @@ import java.util.HashMap;
 import java.util.Map.Entry;
 
 import javax.swing.ImageIcon;
-import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.JMenuItem;
 import javax.swing.JPanel;
@@ -1936,35 +1935,44 @@ public abstract class AbsReserveListView extends JPanel implements TickTimerList
 				c.setBackground(bgColor);
 			}
 
+			return c;
+		}
+
+	    // getToolTipText()をオーバーライド
+		@Override
+	    public String getToolTipText(MouseEvent e){
+	    	int row = rowAtPoint(e.getPoint());
+	    	int column = columnAtPoint(e.getPoint());
+	    	if (row == -1 || column == -1)
+	    		return null;
+
 			// ツールチップテキストを生成する
 			if (column == RsvedColumn.DUPMARK.getColumn()){
-			    if (c instanceof JComponent) {
-			      int mr = convertRowIndexToModel(row);
-			      int mc = convertColumnIndexToModel(column);
-			      Object o = getModel().getValueAt(mr, mc);
-
-			      String text = null;
-			      if (o != null){
-			    	  String s = o.toString();
-			    	  if (s == null)
-			    		  ;
-			    	  else if (s.startsWith("□")){
-			    		  text = "□:開始時間と終了時間が同じ";
-			    	  }
-			    	  else if (s.startsWith("■")){
-			    		  text = "■:時間が重なっている";
-			    	  }
-			    	  else if (s.startsWith("★")){
-			    		  text = "★:エンコーダの数を超える予約がある";
-			    	  }
-			      }
-
-			      ((JComponent) c).setToolTipText(text);
-			    }
-			}
+				int mr = convertRowIndexToModel(row);
+				int mc = convertColumnIndexToModel(column);
+				Object o = getModel().getValueAt(mr, mc);
+
+				String text = null;
+				if (o != null){
+					String s = o.toString();
+					if (s == null)
+						;
+					else if (s.startsWith("□")){
+						text = "□:開始時間と終了時間が同じ";
+					}
+					else if (s.startsWith("■")){
+						text = "■:時間が重なっている";
+					}
+					else if (s.startsWith("★")){
+						text = "★:エンコーダの数を超える予約がある";
+					}
+				}
 
-			return c;
-		}
+				return text;
+			}
+	    	else
+	    		return super.getToolTipText(e);
+	    }
 
 		// 連続して同じ行へのアクセスがあったら計算を行わず前回のままにする
 		private boolean isRowPassed(int prow) {

--- a/TinyBannavi/src/tainavi/AbsSettingView.java
+++ b/TinyBannavi/src/tainavi/AbsSettingView.java
@@ -1512,7 +1512,8 @@ public abstract class AbsSettingView extends JScrollPane {
 			env.setSyncTreeWidth(jCBP_syncTreeWidth.isSelected());
 			env.setShortExtMark(jCBP_shortExtMark.isSelected());
 			for (int row=0; row<jTable_showmarks.getRowCount(); row++) {
-				env.getOptMarks().put((TVProgram.ProgOption) jTable_showmarks.getValueAt(row, 2), (Boolean) jTable_showmarks.getValueAt(row, 0));
+				env.getOptMarks().put((TVProgram.ProgOption) jTable_showmarks.getValueAt(row, 3), (Boolean) jTable_showmarks.getValueAt(row, 0));
+				env.getOptPostfixMarks().put((TVProgram.ProgOption) jTable_showmarks.getValueAt(row, 3), (Boolean) jTable_showmarks.getValueAt(row, 1));
 			}
 			for (int row=0; row<jTable_clipboard.getRowCount(); row++) {
 				cbitems.get(row).setB((Boolean)jTable_clipboard.getValueAt(row, 0));
@@ -2584,32 +2585,127 @@ public abstract class AbsSettingView extends JScrollPane {
 	}
 	private JNETable getJTable_showmarks() {
 		if (jTable_showmarks == null) {
-			jTable_showmarks = getDispTable(null);
+			jTable_showmarks = getDispTable_showmarks();
 
 			DefaultTableModel model = (DefaultTableModel)jTable_showmarks.getModel();
 
 			//
 			for (Object[] obj : TVProgram.optMarks) {
-				Entry<ProgOption,Boolean> entry = null;
+				Entry<ProgOption,Boolean> entryPrefix = null;
 				for (Entry<ProgOption,Boolean> e : env.getOptMarks().entrySet()) {
 					if (e.getKey() == obj[0]) {
-						entry = e;
+						entryPrefix = e;
 						break;
 					}
 				}
-				if ( entry != null ) {
-					Object[] data = { entry.getValue(),obj[1],obj[0] };
-					model.addRow(data);
-				}
-				else {
-					Object[] data = { Boolean.TRUE,obj[1],obj[0] };
-					model.addRow(data);
+
+				Entry<ProgOption,Boolean> entryPostfix = null;
+				for (Entry<ProgOption,Boolean> e : env.getOptPostfixMarks().entrySet()) {
+					if (e.getKey() == obj[0]) {
+						entryPostfix = e;
+						break;
+					}
 				}
+
+				Object label = obj.length > 1 ? obj[1] : ((ProgOption)obj[0]).getProgLabel();
+				Object [] data = {
+						entryPrefix != null ? entryPrefix.getValue() : Boolean.FALSE,
+						entryPostfix != null ? entryPostfix.getValue() : Boolean.FALSE,
+						label,
+						obj[0]
+				};
+
+				model.addRow(data);
 			}
 		}
 		return(jTable_showmarks);
 	}
 
+	/**
+	 * 表示マーク用のテーブルを生成する
+	 *
+	 * @return		生成したJNETableオブジェクト
+	 */
+	private JNETable getDispTable_showmarks() {
+		String prefix = "前";
+		String postfix = "後";
+
+		// ヘッダの設定
+		String[] colname = {prefix, postfix, "アイテム", "ID"};
+		int[] colwidth = {30,30,240,0};
+
+		//
+		DefaultTableModel model = new DefaultTableModel(colname, 0);
+		JNETable jTable = new JNETable(model, false) {
+			private static final long serialVersionUID = 1L;
+
+			@Override
+			public boolean isCellEditable(int row, int column) {
+				return (column == 0 || column == 1);
+			}
+		};
+
+		jTable.setAutoResizeMode(JNETable.AUTO_RESIZE_OFF);
+		DefaultTableColumnModel columnModel = (DefaultTableColumnModel)jTable.getColumnModel();
+		TableColumn column = null;
+		for (int i = 0 ; i < columnModel.getColumnCount() ; i++){
+			column = columnModel.getColumn(i);
+			column.setPreferredWidth(colwidth[i]);
+		}
+
+		// にゃーん
+		jTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+
+		// エディタに手を入れる
+		DefaultCellEditor editor = new DefaultCellEditor(new JCheckBox() {
+
+			private static final long serialVersionUID = 1L;
+
+			@Override
+			public int getHorizontalAlignment() {
+				return JCheckBox.CENTER;
+			}
+		});
+
+		jTable.getColumn(prefix).setCellEditor(editor);
+		jTable.getColumn(postfix).setCellEditor(editor);
+
+		// レンダラに手を入れる
+		DefaultTableCellRenderer renderer = new DefaultTableCellRenderer() {
+			private static final long serialVersionUID = 1L;
+
+			@Override
+			public Component getTableCellRendererComponent(JTable table, Object value,
+					boolean isSelected, boolean hasFocus, int row, int column) {
+				//
+				JCheckBox cBox = new JCheckBox();
+				cBox.setHorizontalAlignment(JCheckBox.CENTER);
+				//
+				Boolean b = (Boolean)value;
+				cBox.setSelected(b.booleanValue());
+				//
+				if (isSelected) {
+					cBox.setBackground(table.getSelectionBackground());
+				}
+				else {
+					cBox.setBackground(table.getBackground());
+				}
+
+				// 【新】【終】は後ろには表示できない
+				if (column == 1 && (row == 0 || row == 1)){
+					cBox.setEnabled(false);
+					cBox.setSelected(false);
+				}
+
+				return cBox;
+			}
+		};
+		jTable.getColumn(prefix).setCellRenderer(renderer);
+		jTable.getColumn(postfix).setCellRenderer(renderer);
+
+		return jTable;
+	}
+
 	/*
 	 *  クリップボードアイテムの選択
 	 */

--- a/TinyBannavi/src/tainavi/Bounds.java
+++ b/TinyBannavi/src/tainavi/Bounds.java
@@ -10,6 +10,8 @@ import java.util.HashMap;
  * 【結論】ちゃんと設計しないとメンバの変更で簡単に例外が起きる。できるならシリアライズは自前で組もう！
  */
 public class Bounds {
+	public static Bounds TheBounds = null;
+
 	//
 	private static final String BOUNDS_FILE = "env"+File.separator+"bounds.xml";
 	private static final String BOUNDS_TEXT = "env"+File.separator+"bounds.txt";

--- a/TinyBannavi/src/tainavi/CommonUtils.java
+++ b/TinyBannavi/src/tainavi/CommonUtils.java
@@ -3,6 +3,9 @@ package tainavi;
 
 import java.awt.Color;
 import java.awt.Desktop;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.event.MouseEvent;
 import java.beans.XMLDecoder;
 import java.beans.XMLEncoder;
 import java.io.BufferedInputStream;
@@ -33,12 +36,18 @@ import java.util.Calendar;
 import java.util.GregorianCalendar;
 import java.util.HashMap;
 import java.util.Map.Entry;
+import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 import java.util.zip.ZipOutputStream;
 
+import javax.swing.JScrollPane;
+import javax.swing.JTree;
+import javax.swing.JViewport;
+import javax.swing.tree.TreePath;
+
 /**
  * <P>頻繁に使用する雑多なメソッドをstaticで提供します。
  * <P>パッケージを小分けにしておけばよかった…
@@ -1784,4 +1793,25 @@ public class CommonUtils {
 	public static void closing(HttpURLConnection ucon) {
 		if ( ucon != null ) ucon.disconnect();
 	}
+
+	public static String GetTreeTooltip(JScrollPane pane, JTree tree, MouseEvent e){
+	  Object o = null;
+	  TreePath path = tree.getPathForLocation(e.getX(), e.getY());
+	  if (Objects.nonNull(path) && pane != null) {
+		  JViewport vp = pane.getViewport();
+		  if (vp == null)
+			  return null;
+
+		  Point pt = vp.getViewPosition();
+		  Rectangle rp = tree.getPathBounds(path);
+		  Rectangle rt = pane.getViewportBorderBounds();
+		  rt.setLocation(pt);
+		  if (rt.contains(rp))
+			  return null;
+
+		  o = path.getLastPathComponent();
+	  }
+
+	  return Objects.toString(o, null);
+	}
 }

--- a/TinyBannavi/src/tainavi/Env.java
+++ b/TinyBannavi/src/tainavi/Env.java
@@ -674,10 +674,17 @@ public class Env {
 	public boolean getShortExtMark() { return shortExtMark; }
 	public void setShortExtMark(boolean b) { shortExtMark = b; }
 	private boolean shortExtMark = false;
+
 	// 表示マークの選択
 	public HashMap<TVProgram.ProgOption,Boolean> getOptMarks() { return optMarks; }
 	public void setOptMarks(HashMap<TVProgram.ProgOption,Boolean> h) { optMarks = h;	}
 	private HashMap<TVProgram.ProgOption,Boolean> optMarks = new HashMap<TVProgram.ProgOption, Boolean>();
+
+	// 表示マークの選択（後付け）
+	public HashMap<TVProgram.ProgOption,Boolean> getOptPostfixMarks() { return optPostfixMarks; }
+	public void setOptPostfixMarks(HashMap<TVProgram.ProgOption,Boolean> h) { optPostfixMarks = h;	}
+	private HashMap<TVProgram.ProgOption,Boolean> optPostfixMarks = new HashMap<TVProgram.ProgOption, Boolean>();
+
 	// クリップボードアイテムの選択（->clipboardItem）
 	// 右クリックメニューの実行アイテム
 	public ArrayList<TextValueSet> getTvCommand() { return tvCommand; }

--- a/TinyBannavi/src/tainavi/JNETable.java
+++ b/TinyBannavi/src/tainavi/JNETable.java
@@ -2,6 +2,10 @@ package tainavi;
 
 import java.awt.Color;
 import java.awt.Component;
+import java.awt.FontMetrics;
+import java.awt.Insets;
+import java.awt.Rectangle;
+import java.awt.event.MouseEvent;
 
 import javax.swing.JTable;
 import javax.swing.ListSelectionModel;
@@ -116,6 +120,40 @@ public class JNETable extends JTable {
 		}
 	}
 
+
+    // getToolTipText()をオーバーライド
+	@Override
+    public String getToolTipText(MouseEvent e){
+    	int row = rowAtPoint(e.getPoint());
+    	int column = columnAtPoint(e.getPoint());
+    	if (row == -1 || column == -1)
+    		return null;
+
+    	try{
+	    	String text = (String)getModel().getValueAt(row, column);
+	    	if (text == null)
+	    		return null;
+
+			String[] xs = text.split("\0", 4);
+			if (xs.length <= 0 || xs[0] == null)
+				return null;
+
+	    	Insets i = getInsets();
+	        Rectangle rect = getCellRect(row, column, false);
+	        FontMetrics fm = getFontMetrics(getFont());
+
+	        int width = fm.stringWidth(xs[0]);
+
+	        if (width > rect.width-(i.left+i.right))
+	        	return xs[0];
+	        else
+	        	return null;
+    	}
+    	catch(ClassCastException ex){
+    		return null;
+    	}
+    }
+
 	/*
 	 * コンストラクタ
 	 */

--- a/TinyBannavi/src/tainavi/JTXTButton.java
+++ b/TinyBannavi/src/tainavi/JTXTButton.java
@@ -9,6 +9,7 @@ import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.Rectangle;
 import java.awt.RenderingHints;
+import java.awt.event.MouseEvent;
 import java.awt.font.FontRenderContext;
 import java.awt.font.GlyphMetrics;
 import java.awt.font.GlyphVector;
@@ -30,7 +31,7 @@ public class JTXTButton extends JLabel {
 	/*******************************************************************************
 	 * 定数
 	 ******************************************************************************/
-	
+
 	/**
 	 *  フォントスタイル
 	 */
@@ -38,23 +39,23 @@ public class JTXTButton extends JLabel {
 		BOLD		("太字"),
 		ITALIC		("斜体"),
 		UNDERLINE	("下線");
-		
+
 		private String name;
-		
+
 		private FontStyle(String name) {
 			this.name = name;
 		}
-		
+
 		@Override
 		public String toString() {
 			return name;
 		}
-		
-		
+
+
 		public String getId() {
 			return super.toString();
 		}
-		
+
 		public static FontStyle get(String id) {
 			for ( FontStyle fs : FontStyle.values() ) {
 				if ( fs.getId().equals(id) ) {
@@ -64,62 +65,62 @@ public class JTXTButton extends JLabel {
 			return null;
 		}
 	};
-	
+
 	private static final float DRAWTAB = 2.0F;
-	
-	
+
+
 	/*******************************************************************************
 	 * 部品
 	 ******************************************************************************/
-	
+
 	// 描画バッファ
 	private BufferedImage image = null;		// ビットマップ
-	
+
 	private int vrow;						// 仮想座標縦位置
 	private int vcolumn;					// 仮想座標横位置
 	private int vheight;					// 仮想座標高さ
 	private int vwidth;						// 仮想座標幅
-	
+
 	// 番組情報
 	private ProgDetailList tvd = null;		// 番組情報そのまま
-	
+
 	// 表示設定
 	private static boolean showStart = true;
 	private static boolean splitEpno = false;
 	private static boolean showDetail = true;
 	private static float detailTab = 2.0F;
-	
+
 	private static Font defaultFont = new JLabel().getFont();
-	
+
 	private static Font titleFont = defaultFont;
 	private static int titleFontSize = defaultFont.getSize();
 	private static Color titleFontColor = Color.BLUE;
 	private static int titleFontStyle = Font.BOLD;
-	
+
 	private static Font detailFont = defaultFont;
 	private static int detailFontSize = defaultFont.getSize();
 	private static Color detailFontColor = Color.DARK_GRAY;
 	private static int detailFontStyle = defaultFont.getStyle();
-	
+
 	private static Font startFont = defaultFont;
-	
+
 	private static FontRenderContext frc = new FontRenderContext(null, RenderingHints.VALUE_TEXT_ANTIALIAS_ON, RenderingHints.VALUE_FRACTIONALMETRICS_DEFAULT);
 
 	private static int columnWidth = 0;
 	private static float heightMultiplier = 0;
-	
-	
+
+
 	/*******************************************************************************
 	 * コンストラクタ
 	 ******************************************************************************/
-	
+
 	// ないよ
-	
-	
+
+
 	/*******************************************************************************
 	 * メソッド
 	 ******************************************************************************/
-	
+
 	// 内容をリセットする
 	// setVisible(false)するとリソースが解放されてしまうのか再描画に時間がかかるようになるので表示範囲外に出して隠してしまう
 	public void clean() {
@@ -127,13 +128,13 @@ public class JTXTButton extends JLabel {
 		image = null;
 		setBounds(-1,-1,0,0);
 	}
-	
+
 	// フラグを変えた後に再描画させる
 	public void forceRepaint() {
 		image = null;
 		super.repaint();
 	}
-	
+
 	// 仮想位置の変更
 	//public void setVRow(int n) { vrow = n; }
 	public int getVRow() { return vrow; }
@@ -141,10 +142,10 @@ public class JTXTButton extends JLabel {
 	public int getVColumn() { return vcolumn; }
 	//public void setVHeight(int n) { vheight = n; }
 	public int getVHeight() { return vheight; }
-	
+
 	public static void setColumnWidth(int n) { columnWidth = n; }
 	public static void setHeightMultiplier(float f) { heightMultiplier = f; }
-	
+
 	public void setVBounds(int x, int y, int width, int height) {
 		vrow = y;
 		vcolumn = x;
@@ -156,7 +157,7 @@ public class JTXTButton extends JLabel {
 				vwidth*columnWidth,
 				(int) Math.ceil(((float)vheight)*heightMultiplier));
 	}
-	
+
 	public void reVBounds() {
 		super.setBounds(
 				vcolumn*columnWidth,
@@ -164,12 +165,12 @@ public class JTXTButton extends JLabel {
 				vwidth*columnWidth,
 				(int) Math.ceil(((float)vheight)*heightMultiplier));
 	}
-	
+
 	// 番組情報のやりとり
 	public void setInfo(ProgDetailList tvd) {
 		this.tvd = tvd;
 		this.setText(null);	// 簡易表示時代の名残
-		
+
 		this.setVerticalAlignment(JButton.TOP);
 		this.setHorizontalAlignment(JButton.LEFT);
 		//this.setBorder(new LineBorder(Color.BLACK,1));
@@ -178,7 +179,7 @@ public class JTXTButton extends JLabel {
 	public ProgDetailList getInfo() {
 		return tvd;
 	}
-	
+
 	// 予約待機枠を表示するかどうかの確認
 	public boolean isStandby() { return tvd.marked && tvd.showinstandby; }
 	public boolean isStandbyByTrace() { return tvd.markedByTrace; }
@@ -196,7 +197,7 @@ public class JTXTButton extends JLabel {
 	public static void setDetailTab(float n) {
 		detailTab = n;
 	}
-	
+
 	// フォントスタイル
 	public static void setTitleFont(String fn) {
 		if ( fn != null && ! fn.equals("") ) {
@@ -234,7 +235,7 @@ public class JTXTButton extends JLabel {
 	public static void setDetailFontColor(Color c) {
 		detailFontColor = c;
 	}
-	
+
 	// フォントスタイルの変更
 	public static void setTitleFontStyle(ArrayList<FontStyle> fsa) {
 		titleFont = setFontStyle(titleFont, (float)titleFontSize, fsa);
@@ -242,7 +243,7 @@ public class JTXTButton extends JLabel {
 	public static void setDetailFontStyle(ArrayList<FontStyle> fsa) {
 		detailFont = setFontStyle(detailFont, (float)detailFontSize, fsa);
 	}
-	
+
 	private static Font setFontStyle(Font f, float size, ArrayList<FontStyle> fsa) {
 		Map<TextAttribute, Object>  attributes = new HashMap<TextAttribute, Object>();
 		attributes.put(TextAttribute.WEIGHT, TextAttribute.WEIGHT_REGULAR);
@@ -264,25 +265,25 @@ public class JTXTButton extends JLabel {
 		attributes.put(TextAttribute.SIZE, size);
 		return f.deriveFont(attributes);
 	}
-	
+
 	// フォントエイリアスの変更
 	public static void setAAHint(Object o) {
 		frc = new FontRenderContext(null, o, RenderingHints.VALUE_FRACTIONALMETRICS_DEFAULT);
 	}
-	
-	
+
+
 	/*******************************************************************************
 	 * メソッド
 	 ******************************************************************************/
-	
+
 	/**
 	 * ビットマップの描画処理
 	 */
 	@Override
-	protected void paintComponent(Graphics g) { 
-		
+	protected void paintComponent(Graphics g) {
+
 		super.paintComponent(g);
-		
+
 		// 初回描画時
 		if (image == null) {
 			//
@@ -295,12 +296,12 @@ public class JTXTButton extends JLabel {
 
 			image = new BufferedImage(imgw, imgh, BufferedImage.TYPE_INT_ARGB);
 			Graphics2D g2 = (Graphics2D)image.createGraphics();
-			
+
 			g2.setRenderingHint(RenderingHints.KEY_RENDERING,RenderingHints.VALUE_RENDER_SPEED);
 			g2.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1.0f));
-			
+
 			float baseline = 0.0F;
-			
+
 			// 開始時刻と延長警告の描画
 			if (showStart && tvd.start != null && tvd.start.length() > 0) {
 				FontMetrics fm = g2.getFontMetrics(startFont);
@@ -310,31 +311,31 @@ public class JTXTButton extends JLabel {
 				float startx = Float.valueOf(DRAWTAB);
 				float startw = draww;
 				float xposstartx = 0.0F;
-				
-				baseline = as;	// 初期垂直位置 
-				
+
+				baseline = as;	// 初期垂直位置
+
 				{
 					WrappedGlyphVector wgv = getWrappedGlyphVector(tvd.start, startw, xposstartx, startFont, as, frc);
 					GlyphVector gv = wgv.getGv();
 					g2.setPaint(Color.BLACK);
 					g2.drawGlyphVector(gv, startx, baseline);
-					
+
 					xposstartx = wgv.getLastX();	// 後続有り
 					baseline += wgv.getLastY();
 				}
-				
+
 				{
 					WrappedGlyphVector wgv = getWrappedGlyphVector(" "+tvd.extension_mark, startw, xposstartx, startFont, as, frc);
 					GlyphVector gv = wgv.getGv();
 					g2.setPaint(Color.RED);
 					g2.drawGlyphVector(gv, startx, baseline);
-					
+
 					baseline += wgv.getLastY();
 				}
-				
+
 				baseline += hi;
 			}
-			
+
 			// タイトルの描画
 			String title = ( splitEpno ) ? tvd.splitted_title : tvd.title;
 			if ( title.length() > 0 ) {
@@ -351,19 +352,19 @@ public class JTXTButton extends JLabel {
 						aMark = tvd.prefix_mark + tvd.newlast_mark;
 					}
 				}
-				
+
 				FontMetrics fm = g2.getFontMetrics(titleFont);
 				float hi = Float.valueOf(fm.getHeight());
 				float as = Float.valueOf(fm.getAscent());
-				
+
 				float titlex = Float.valueOf(DRAWTAB);
 				float titlew = draww;
 				float xpos = 0.0F;
-				
+
 				if ( baseline == 0.0F ) {
 					baseline = as;	// 初期垂直位置
 				}
-				
+
 				if ( aMark.length() > 0 ) {
 					WrappedGlyphVector wgv = getWrappedGlyphVector(aMark, titlew, xpos, titleFont, as, frc);
 					GlyphVector gv = wgv.getGv();
@@ -373,20 +374,20 @@ public class JTXTButton extends JLabel {
 					xpos = wgv.getLastX();	// 後続有り
 					baseline += wgv.getLastY();
 				}
-				
+
 				{
 					WrappedGlyphVector wgv = getWrappedGlyphVector(title+tvd.postfix_mark, titlew, xpos, titleFont, as, frc);
 					GlyphVector gv = wgv.getGv();
 					g2.setPaint(titleFontColor);
-					
+
 					drawString(g2, wgv, titlex, baseline);
 
 					baseline += wgv.getLastY();
 				}
-				
+
 				baseline += hi;
 			}
-			
+
 			// 番組詳細の描画
 			if ( showDetail ) {
 				String detail;
@@ -417,35 +418,35 @@ public class JTXTButton extends JLabel {
 				float as = Float.valueOf(fm.getAscent());
 				float detailx = Float.valueOf(DRAWTAB+detailTab);
 				float detailw = draww-detailTab;
-				
+
 				if ( baseline == 0.0F ) {
 					baseline = as;	// 初期垂直位置
 				}
 
 				WrappedGlyphVector wgv = getWrappedGlyphVector(detail, detailw, 0.0f, detailFont, as, frc);
 				g2.setPaint(detailFontColor);
-				
+
 				drawString(g2, wgv, detailx, baseline);
 			}
 		}
-		
+
 		// 反映
 		g.drawImage(image, 0, 0, this);
 	}
-	
+
 	/**
-	 * 
+	 *
 	 */
 	private void drawString(Graphics2D g2, WrappedGlyphVector wgv, float x, float y) {
 		g2.drawGlyphVector(wgv.getGv(), x, y);
-		
+
 		if ( wgv.getGv().getFont().getAttributes().get(TextAttribute.UNDERLINE) != null ) {
 			for ( Rectangle r : wgv.getLinePositions() ) {
 				g2.drawLine((int)x+r.x, (int)y+r.y+1, (int)x+r.x+r.width-1, (int)y+r.y+1);
 			}
 		}
 	}
-	
+
 	/**
 	 * 参考：てんぷらメモ／JTableのセル幅で文字列を折り返し  ( http://terai.xrea.jp/Swing/TableCellRenderer.html )
 	 * @param str			描画する文字列
@@ -485,34 +486,60 @@ public class JTXTButton extends JLabel {
             gmPos.setLocation(xpos, ypos);
             gv.setGlyphPosition(i, gmPos);
             xpos = xpos + advance;
-            
+
             wgv.setLastX(xpos);
             wgv.setLastY(ypos);
         }
         return wgv;
     }
-    
+
     private class WrappedGlyphVector {
-    	
+
     	public WrappedGlyphVector(GlyphVector gv) {
     		super();
     		this.gv = gv;
     	}
-    	
+
     	private GlyphVector gv;
-    	
+
     	public GlyphVector getGv() { return gv; }
-    	
+
     	private float lastx;
     	private float lasty;
-    	
+
     	public void setLastX(float x) { lastx = x; }
     	public float getLastX() { return lastx; }
     	public void setLastY(float y) { lasty = y; }
     	public float getLastY() { return lasty; }
-    	
+
     	private ArrayList<Rectangle> linePositions = new ArrayList<Rectangle>();
     	public ArrayList<Rectangle> getLinePositions() { return linePositions; }
     	public void addLinePosition(Rectangle r) { linePositions.add(r); }
     }
+
+    @Override
+    public String getToolTipText(MouseEvent e){
+		// ツールチップを付加する
+		if (! Env.TheEnv.getTooltipEnable() || tvd == null || tvd.title.isEmpty() || tvd.start.isEmpty())
+			return null;
+
+		int tlen = Bounds.TheBounds.getTooltipWidth()*15;
+		StringBuilder sb = new StringBuilder("");
+
+		sb.append("<html>");
+		sb.append(tvd.start + "～" + tvd.end + " (" + tvd.recmin + "分)");
+		sb.append("&nbsp;<FONT COLOR=RED><EM>" + tvd.extension_mark + "</EM></FONT><BR>");
+
+		sb.append("<DIV width=\"" + String.valueOf(tlen+10) + "\"><STRONG><U><FONT COLOR=RED>");
+		sb.append(tvd.prefix_mark);
+		sb.append("</FONT><FONT COLOR=BLUE>");
+		sb.append(tvd.title + tvd.postfix_mark);
+		sb.append("</FONT></U></STRONG></DIV>");
+
+		sb.append("<DIV style=\"margin-left: 10px;\" width=\"" + String.valueOf(tlen) + "\">");
+		sb.append(tvd.detail);
+		sb.append("</DIV></html>");
+
+		return sb.toString();
+    }
 }

--- a/TinyBannavi/src/tainavi/MarkChar.java
+++ b/TinyBannavi/src/tainavi/MarkChar.java
@@ -1,5 +1,7 @@
 package tainavi;
 
+import java.util.HashMap;
+
 import tainavi.TVProgram.ProgFlags;
 import tainavi.TVProgram.ProgOption;
 import tainavi.TVProgram.ProgScrumble;
@@ -36,13 +38,10 @@ public class MarkChar {
 		MULTIVOICE		( "[多]" ),
 		STANDIN			( "[吹]" ),
 		DATA			( "[デ]" ),
-		SURROUND		( "[5.1]" ),
+		SURROUND		( "[SS]" ),
 		PRECEDING		( "【先】" ),
 
 		REPEATED		( "[再]" ),
-
-		BS4K			( "[4K]"),
-		BS8K			( "[8K]"),
 		;
 
 		private String name;
@@ -98,138 +97,50 @@ public class MarkChar {
 	 *  普通のマークの取得
 	 */
 	public String getOptionMark(ProgDetailList tvd) {
-
-		String mkNewArr = "";
-		String mkModified = "";
-		String mkNoscr = "";
-		String mkSpecial = "";
-		String mkNoSyobo = "";
-		String mkRating = "";
-
-		String mkFirst = "";
-		String mkLive = "";
-		String mkSubtitle = "";
-		String mkBilingual = "";
-		String mkTextbc = "";
-		String mkMultivoice = "";
-		String mkStandin = "";
-		String mkPv = "";
-		String mkData = "";
-		String mkSurround = "";
-		String mkNonrepeated = "";
-		String mkMoved = "";
-		String mkPrec = "";
-		String mk4k = "";
-		String mk8k = "";
-
-		if (tvd.noscrumble == ProgScrumble.NOSCRUMBLE && env.getOptMarks().get(ProgOption.HIDDEN_NOSCRUMBLE) == Boolean.TRUE) {
-			mkNoscr = MarkItem.NOSCRUMBLE.getName();
-		}
-
-		if ( tvd.newarrival && env.getOptMarks().get(ProgOption.NEWARRIVAL) == Boolean.TRUE ) {
-			mkNewArr = ((env.getShortExtMark())?(MarkItem.NEWARRIVAL_S.getName()):(MarkItem.NEWARRIVAL.getName()));
-		}
-		if ( tvd.modified && env.getOptMarks().get(ProgOption.MODIFIED) == Boolean.TRUE ) {
-			mkModified = MarkItem.MODIFIED.getName();
-		}
-		if ( tvd.nonrepeated && env.getOptMarks().get(ProgOption.NONREPEATED) == Boolean.TRUE ) {
-			mkNonrepeated = MarkItem.NONREPEATED.getName();
-		}
-		for ( ProgOption opt : tvd.getOption() ) {
-			if ( env.getOptMarks().get(opt) != null && env.getOptMarks().get(opt) == Boolean.FALSE ) {
-				continue;
-			}
-			switch (opt) {
-			case SPECIAL:
-				// 特別番組
-				mkSpecial = MarkItem.SPECIAL.getName();
-				break;
-			case RATING:
-				// 視聴年齢制限
-				mkRating = MarkItem.RATING.getName();
-				break;
-			case FIRST:
-				// 初回放送
-				mkFirst = MarkItem.FIRST.getName();
-				break;
-
-			case NOSYOBO:
-				mkNoSyobo = MarkItem.NOSYOBO.getName();
-				break;
-
-			case LIVE:
-				// 生放送
-				mkLive = MarkItem.LIVE.getName();
-				break;
-			case PV:
-				// ペイパービュー
-				mkPv = MarkItem.PV.getName();
-				break;
-			case SUBTITLE:
-				// 字幕放送
-				mkSubtitle = MarkItem.SUBTITLE.getName();
-				break;
-			case BILINGUAL:
-				// 二か国語放送
-				mkBilingual = MarkItem.BILINGUAL.getName();
-				break;
-			case MULTIVOICE:
-				// 音声多重放送
-				mkMultivoice = MarkItem.MULTIVOICE.getName();
-				break;
-			case STANDIN:
-				// 吹き替え
-				mkStandin = MarkItem.STANDIN.getName();
-				break;
-			case DATA:
-				// データ放送
-				mkData = MarkItem.DATA.getName();
-				break;
-			case SURROUND:
-				// 5.1chサラウンド
-				mkSurround = MarkItem.SURROUND.getName();
-				break;
-			case MOVED:
-				// 先週無かったか時間が違う
-				mkMoved = MarkItem.MOVED.getName();
-				break;
-			case PRECEDING:
-				// 先行放送
-				mkPrec = MarkItem.PRECEDING.getName();
-				break;
-			case BS4K:
-				mk4k = MarkItem.BS4K.getName();
-				break;
-			case BS8K:
-				mk8k = MarkItem.BS8K.getName();
-				break;
-			default:
-				break;
-			}
-		}
-
-		return(mkNewArr+mkNoSyobo+mkMoved+mkModified+mkFirst+mkNonrepeated+mkNoscr+mkSpecial+mkRating+mkPrec+mkLive+
-				mkPv+mkSubtitle+mkBilingual+mkTextbc+mkMultivoice+mkStandin+mkData+mkSurround+mk4k+mk8k);
+		return getOptionMark(tvd, env.getOptMarks());
 	}
 
 	/**
 	 * タイトルの後ろにつくマークの取得
 	 */
 	public String getPostfixMark(ProgDetailList tvd) {
+		return getOptionMark(tvd, env.getOptPostfixMarks());
+	}
+
+	/**
+	 * 前後のマークの取得
+	 *
+	 * @param tvd			番組詳細情報
+	 * @param options		表示オプション
+	 * @return				マーク
+	 */
+	public String getOptionMark(ProgDetailList tvd, HashMap<TVProgram.ProgOption,Boolean> options) {
+
+		StringBuilder sb = new StringBuilder("");
+
+		if (tvd.noscrumble == ProgScrumble.NOSCRUMBLE && options.get(ProgOption.HIDDEN_NOSCRUMBLE) == Boolean.TRUE) {
+			sb.append(MarkItem.NOSCRUMBLE.getName());
+		}
 
-		String mkRep = "";
+		if ( tvd.newarrival && options.get(ProgOption.NEWARRIVAL) == Boolean.TRUE ) {
+			sb.append(((env.getShortExtMark())?(MarkItem.NEWARRIVAL_S.getName()):(MarkItem.NEWARRIVAL.getName())));
+		}
+
+		if ( tvd.modified && options.get(ProgOption.MODIFIED) == Boolean.TRUE ) {
+			sb.append(MarkItem.MODIFIED.getName());
+		}
+		if ( tvd.nonrepeated && options.get(ProgOption.NONREPEATED) == Boolean.TRUE ) {
+			sb.append(MarkItem.NONREPEATED.getName());
+		}
 
 		for ( ProgOption opt : tvd.getOption() ) {
-			switch (opt) {
-			case REPEAT:
-				mkRep = MarkItem.REPEATED.getName();
-				break;
-			default:
-				break;
+			if ( options.get(opt) != null && options.get(opt) == Boolean.FALSE ) {
+				continue;
 			}
+
+			sb.append(opt.getMark());
 		}
 
-		return(mkRep);
+		return sb.toString();
 	}
-
 }

--- a/TinyBannavi/src/tainavi/TVProgram.java
+++ b/TinyBannavi/src/tainavi/TVProgram.java
@@ -20,31 +20,76 @@ public interface TVProgram {
 	 *  NOSCRUMBLEは間違って（？）ProgScrumbleを使うこととなってしまったのだ。ここにあるのはマーク表示のための一覧用なのだ。
 	 */
 	public enum ProgOption {
-		HIDDEN_NEW,
-		HIDDEN_LAST,
-		HIDDEN_NOSCRUMBLE,
-		FIRST,
-		REPEAT,
-		LIVE,
-		SPECIAL,
-		NOSYOBO,
-		SUBTITLE,
-		BILINGUAL,
-		STANDIN,
-		PV,
-		MULTIVOICE,
-		DATA,
-		SURROUND,
-		NEWARRIVAL,
-		MODIFIED,
-		NONREPEATED,
-		MOVED,
-		PRECEDING,
-		RATING,
-		BS4K,
-		BS8K,
-		NOOPTION
-		};
+		HIDDEN_NEW			("【新】", "新番組" ),
+		HIDDEN_LAST		("【終】", "最終回" ),
+		HIDDEN_NOSCRUMBLE	("【無料】", "無料放送" ),
+		FIRST				("【初】", "初回放送" ),
+		REPEAT				("[再]",	"再放送" ),
+		LIVE				("[生]",	"生放送" ),
+		SPECIAL				("[特]",	"特番" ),
+		NOSYOBO 			("[!]",		"しょぼかる未定義" ),
+		SUBTITLE			("[字]",	"字幕放送"	),
+		BILINGUAL			("[二]",	"二か国語放送" ),
+		STANDIN				("[吹]",	"吹替放送" ),
+		PV 					("[PV]",	"ペイパービュー" ),
+		MULTIVOICE			("[多]",	"音声多重放送" ),
+		DATA 				("[デ]",	"番組連動データ放送" ),
+		SURROUND 			("[SS]",	"サラウンドステレオ" ),
+		NEWARRIVAL	 		("[NEW]",	"予約待機の新着" ),
+		MODIFIED 			("(更)",	"番組詳細に更新あり - 予約待機分のみ" ),
+		NONREPEATED 		("[初]",	"リピート放送の初回放送回" ),
+		MOVED		 		("(移)",	"先週無かったか時間が違う" ),
+		PRECEDING			("【先】",	"先行放送" ),
+		RATING				("[Ｒ]",	"視聴制限あり" ),
+
+		BS4K 				("[4K]",	"BS/CS 4K放送" ),
+		BS8K 				("[8K]",	"BS 8K放送"),
+
+		NOOPTION			("",		""),
+
+		BMODE 				("[Ｂ]",	"圧縮Bモードステレオ" ),
+		NEWS				("[Ｎ]",	"ニュース" ),
+		PROGRESSIVE		("[Ｐ]",	"プログレッシブ放送" ),
+		STEREO				("[Ｓ]",	"ステレオ放送" ),
+		WIDE				("[Ｗ]",	"ワイド放送" ),
+		HDTV				("[HV]",	"HDTV" ),
+		MULTIVIEW			("[MV]",	"マルチビューテレビ" ),
+		SDTV				("[SD]",	"SDTV" ),
+		PPV					("[PPV]",	"ペイパービュー" ),
+		SIGN				("[手]",	"手話通訳放送" ),
+		TWOWAY				("[双]",	"双方向放送" ),
+		COMMENTARY			("[解]",	"音声解説" ),
+		WEATHER				("[天]",	"天気予報" ),
+		TRAFFIC				("[交]",	"交通情報" ),
+		MOVIE				("[映]",	"劇映画" ),
+		FREE				("[無]",	"無料放送" ),
+		PAY					("[料]",	"有料放送"),
+		SHOPPING			("[販]",	"通販" ),
+		SURROUND51			("[5.1]",	"5.1chサラウンド" ),
+		SURROUND222		("[22.2]",	"22.2chサラウンド" ),
+		HDR					("[HDR]",	"ハイダイナミックレンジ" ),
+		;
+
+		String mark;
+		String desc;
+
+		ProgOption(String m, String d){
+			mark = m;
+			desc = d;
+		}
+
+		public String getProgLabel(){ return mark + desc;	}
+		public String getMark(){ return mark; }
+
+		public static ProgOption GetProgOptionFromMark(String mark){
+			for (ProgOption po : ProgOption.values()){
+				if (po.getMark().equals(mark))
+					return po;
+			}
+
+			return null;
+		}
+	};
 
 	public static enum ProgGenre {
 		NEWS		("ニュース/報道",		"0"),
@@ -293,29 +338,52 @@ public interface TVProgram {
 	};
 
 	public static final Object[][] optMarks = {
-		{ ProgOption.HIDDEN_NEW, "【新】新番組" },
-		{ ProgOption.HIDDEN_LAST, "【終】最終回" },
-		{ ProgOption.HIDDEN_NOSCRUMBLE, "【無料】無料放送" },
-		{ ProgOption.FIRST, "【初】初回放送" },
-		{ ProgOption.PRECEDING, "【先】先行放送" },
-		{ ProgOption.NONREPEATED, "[初]リピート放送の初回放送回" },
+		{ ProgOption.HIDDEN_NEW },
+		{ ProgOption.HIDDEN_LAST },
+		{ ProgOption.HIDDEN_NOSCRUMBLE },
+		{ ProgOption.FIRST },
+		{ ProgOption.PRECEDING },
+		{ ProgOption.NONREPEATED },
 		//{ false, ProgOption.REPEAT, "[再]再放送" },
-		{ ProgOption.LIVE, "[生]生放送" },
-		{ ProgOption.SPECIAL, "[特]特番" },
-		{ ProgOption.RATING, "[Ｒ]視聴制限あり" },
-		{ ProgOption.SUBTITLE, "[字]文字多重放送" },
-		{ ProgOption.MULTIVOICE, "[多]音声多重放送" },
-		{ ProgOption.BILINGUAL, "[二]二か国語放送" },
-		{ ProgOption.STANDIN, "[吹]吹替放送" },
-		{ ProgOption.SURROUND, "[5.1]5.1chサラウンド" },
-		{ ProgOption.DATA, "[デ]データ放送" },
-		{ ProgOption.PV, "[PV]ペイパービュー" },
-		{ ProgOption.NOSYOBO, "[!]しょぼかる未定義" },
-		{ ProgOption.NEWARRIVAL, "[NEW]予約待機の新着" },
-		{ ProgOption.MODIFIED, "(更)番組詳細に更新あり - 予約待機分のみ" },
-		{ ProgOption.MOVED, "(移)先週無かったか時間が違う" },
-		{ ProgOption.BS4K, "[4K]BS/CS 4K放送"},
-		{ ProgOption.BS8K, "[8K]BS 8K放送"},
+		{ ProgOption.LIVE },
+		{ ProgOption.SPECIAL },
+		{ ProgOption.RATING },
+		{ ProgOption.SUBTITLE },
+		{ ProgOption.MULTIVOICE },
+		{ ProgOption.BILINGUAL },
+		{ ProgOption.STANDIN },
+		{ ProgOption.SURROUND },
+		{ ProgOption.DATA },
+		{ ProgOption.PV },
+		{ ProgOption.NOSYOBO },
+		{ ProgOption.NEWARRIVAL },
+		{ ProgOption.MODIFIED },
+		{ ProgOption.MOVED },
+		{ ProgOption.BS4K},
+		{ ProgOption.BS8K},
+
+		{ ProgOption.REPEAT },
+		{ ProgOption.BMODE },
+		{ ProgOption.NEWS },
+		{ ProgOption.PROGRESSIVE },
+		{ ProgOption.STEREO },
+		{ ProgOption.WIDE },
+		{ ProgOption.HDTV },
+		{ ProgOption.MULTIVIEW },
+		{ ProgOption.SDTV },
+		{ ProgOption.PPV },
+		{ ProgOption.SIGN },
+		{ ProgOption.TWOWAY },
+		{ ProgOption.COMMENTARY } ,
+		{ ProgOption.WEATHER },
+		{ ProgOption.TRAFFIC },
+		{ ProgOption.MOVIE },
+		{ ProgOption.FREE },
+		{ ProgOption.PAY },
+		{ ProgOption.SHOPPING },
+		{ ProgOption.SURROUND51  },
+		{ ProgOption.SURROUND222 },
+		{ ProgOption.HDR },
 	};
 
 	public static final String[] OKINIIRI = {"★★★★★","★★★★","★★★","★★","★",""};

--- a/TinyBannavi/src/tainavi/TVProgramUtils.java
+++ b/TinyBannavi/src/tainavi/TVProgramUtils.java
@@ -1047,49 +1047,48 @@ public class TVProgramUtils implements Cloneable {
 	/*
 	 * UNIODEの番組記号のマッピング情報
 	 *
-	 * 無視するオプション：Ｓ|Ｎ|Ｂ|映|双|解|手|天|英|日|録|HV
 	 */
 	enum UnicodeCharMap{
-		BS4K		("4K"	,0x0001F19E,	ProgOption.BS4K),
-		BS8K		("8K"	,0x0001F19F,	ProgOption.BS8K),
-
-		BMODE		("Ｂ"	,0x0001F131,	ProgOption.NOOPTION),
-		NEWS		("Ｎ"	,0x0001F13D,	ProgOption.NOOPTION),
-//		PROGRESSIVE	("Ｐ"	,0x0001F13F),
-		STEREO		("Ｓ"	,0x0001F142,	ProgOption.NOOPTION),
-//		WIDE		("Ｗ"	,0x0001F146),
-		HDTV		("HV"	,0x0001F14A,	ProgOption.NOOPTION),
-//		MULTIVIEW	("MV"	,0x0001F14B),
-//		SDTV		("SD"	,0x0001F14C),
+		BMODE		("Ｂ"	,0x0001F131,	ProgOption.BMODE),
+		NEWS		("Ｎ"	,0x0001F13D,	ProgOption.NEWS),
+		PROGRESSIVE	("Ｐ"	,0x0001F13F,ProgOption.PROGRESSIVE),
+		STEREO		("Ｓ"	,0x0001F142,	ProgOption.STEREO),
+		WIDE		("Ｗ"	,0x0001F146,	ProgOption.WIDE),
+		HDTV		("HV"	,0x0001F14A,	ProgOption.HDTV),
+		MULTIVIEW	("MV"	,0x0001F14B,	ProgOption.MULTIVIEW),
+		SDTV		("SD"	,0x0001F14C,	ProgOption.SDTV),
 		SURROUND	("SS"	,0x0001F14D,	ProgOption.SURROUND),
-//		PPV			("PPV"	,0x0001F14E),
+		PPV			("PPV"	,0x0001F14E,	ProgOption.PPV),
 
-		SIGN		("手"	,0x0001F210,	ProgOption.NOOPTION),
+		SIGN		("手"	,0x0001F210,	ProgOption.SIGN),
 		SUBTITLE	("字"	,0x0001F211,	ProgOption.SUBTITLE),
-		TWOWAY		("双"	,0x0001F212,	ProgOption.NOOPTION),
+		TWOWAY		("双"	,0x0001F212,	ProgOption.TWOWAY),
 		DATA		("デ"	,0x0001F213,	ProgOption.DATA),
 		BILINGUAL	("二"	,0x0001F214,	ProgOption.BILINGUAL),
-		MULTIPLEX	("多"	,0x0001F215,	ProgOption.MULTIVOICE),
-		COMMENTARY	("解"	,0x0001F216,	ProgOption.NOOPTION),
-		WEATHER		("天"	,0x0001F217,	ProgOption.NOOPTION),
-//		TRAFFIC		("交"	,0x0001F218),
-		MOVIE		("映"	,0x0001F219,	ProgOption.NOOPTION),
-		FREE		("無"	,0x0001F21A,	ProgOption.NOOPTION),
-		PAY			("料"	,0x0001F21B,	ProgOption.PV),
-//		FORMER		("前"	,0x0001F21C),
-//		LATTER		("後"	,0x0001F21D),
-		REAIR		("再"	,0x0001F21E,	ProgOption.REPEAT),
+		MULTIVOICE	("多"	,0x0001F215,	ProgOption.MULTIVOICE),
+		COMMENTARY	("解"	,0x0001F216,	ProgOption.COMMENTARY),
+		WEATHER		("天"	,0x0001F217,	ProgOption.WEATHER),
+		TRAFFIC		("交"	,0x0001F218,	ProgOption.TRAFFIC),
+		MOVIE		("映"	,0x0001F219,	ProgOption.MOVIE),
+		FREE		("無"	,0x0001F21A,	ProgOption.FREE),
+		PAY			("料"	,0x0001F21B,	ProgOption.PAY),
+		FORMER		("前"	,0x0001F21C,	ProgOption.NOOPTION),
+		LATTER		("後"	,0x0001F21D,	ProgOption.NOOPTION),
+		REPEAT		("再"	,0x0001F21E,	ProgOption.REPEAT),
 		NEW			("新"	,0x0001F21F,	ProgOption.NOOPTION),
 		FIRST		("初"	,0x0001F220,	ProgOption.FIRST),
 		END			("終"	,0x0001F221,	ProgOption.NOOPTION),
 		LIVE		("生"	,0x0001F222,	ProgOption.LIVE),
-//		SHOPPING	("販"	,0x0001F223),
-//		VOICE		("声"	,0x0001F224),
-		DUBBED		("吹"	,0x0001F225,	ProgOption.STANDIN),
+		SHOPPING	("販"	,0x0001F223,	ProgOption.SHOPPING),
+		VOICE		("声"	,0x0001F224,	ProgOption.NOOPTION),
+		STANDIN		("吹"	,0x0001F225,	ProgOption.STANDIN),
 
-		SURROUND51	("5.1"	,0x0001F1A0,	ProgOption.NOOPTION),
-		SURROUND222	("22.2"	,0x0001F1A2,	ProgOption.NOOPTION),
-		HDR			("HDR"	,0x0001F1A7,	ProgOption.NOOPTION),
+		// テレビ王国の独自コード
+		BS4K		("4K"	,0x0001F19E,	ProgOption.BS4K),
+		BS8K		("8K"	,0x0001F19F,	ProgOption.BS8K),
+		SURROUND51	("5.1"	,0x0001F1A0,	ProgOption.SURROUND51),
+		SURROUND222	("22.2"	,0x0001F1A2,	ProgOption.SURROUND222),
+		HDR			("HDR"	,0x0001F1A7,	ProgOption.HDR),
 		;
 
 		String	label;			// ラベル
@@ -1109,12 +1108,9 @@ public class TVProgramUtils implements Cloneable {
 			progOption = po;
 		}
 
-		/**
-		 * ラベルを取得する
-		 *
-		 * @return		ラベル
-		 */
 		public String getLabel(){ return label; }
+		public String getCode(){ return cp2s(codePoint); }
+		public ProgOption getProgOption(){ return progOption; }
 
 		/**
 		 * 指定した文字列で検索する
@@ -1145,10 +1141,44 @@ public class TVProgramUtils implements Cloneable {
 		 *
 		 * @param pdl	番組情報
 		 */
+		private static String codeList = null;
 		public static void ExtractAllSymbols(ProgDetailList pdl){
+			if (codeList == null){
+				StringBuilder sb = new StringBuilder("");
+				for (UnicodeCharMap chm : UnicodeCharMap.values()){
+					sb.append(chm.getCode());
+				}
+
+				codeList = sb.toString();
+			}
+
+			Matcher md = Pattern.compile("[" + codeList + "]").matcher(pdl.title);
+			boolean found = false;
+			while (md.find()){
+				UnicodeCharMap chm = getMapFromCode(md.group());
+				if (chm != null && chm.getProgOption() != ProgOption.NOOPTION)
+					pdl.addOption(chm.getProgOption());
+				found = true;
+			}
+
+			if (found)
+				pdl.title = md.replaceAll("");
+		}
+
+		/**
+		 * 文字コードからマップ情報を取得する
+		 *
+		 * @param code		文字コード
+		 * @return			マップ情報
+		 */
+		public static UnicodeCharMap getMapFromCode(String code){
 			for (UnicodeCharMap chm : UnicodeCharMap.values()){
-				chm.extractSymbol(pdl);
+				if (code.equals(chm.getCode())){
+					return chm;
+				}
 			}
+
+			return null;
 		}
 	}
 
@@ -1184,6 +1214,7 @@ public class TVProgramUtils implements Cloneable {
 	 * タイトルからフラグを抽出する
 	 */
 	protected void doSplitFlags(ProgDetailList pdl, HashMap<String, String> nf) {
+		// テレビ王国のUNICODE記号を抽出する
 		ExtractAllUnicodeSymbols(pdl);
 
 		Matcher md = Pattern.compile("(#1|第1話)\\b").matcher(pdl.title);
@@ -1233,78 +1264,60 @@ public class TVProgramUtils implements Cloneable {
 
 		HashMap<String, String> xf = new HashMap<String, String>();
 
-		String flagExpr = "[\\[［(（【](.{1,3})[\\]］)）】]";
+		String flagExpr = "[\\[［(（【]([^\\]］)）】]{1,4})[\\]］)）】]";
 		Matcher mx = Pattern.compile(flagExpr).matcher(pdl.title);
 		while (mx.find()) {
-			if (mx.group(1).equals("新") || mx.group(1).equals("新番組")) {
+			String mark = mx.group(1);
+			ProgOption po = ProgOption.GetProgOptionFromMark("[" + mark + "]");
+
+			if (mark.equals("新") || mark.equals("新番組")) {
 				pdl.flag = ProgFlags.NEW;
 			}
-			else if (mx.group(1).equals("終") || mx.group(1).equals("完") || mx.group(1).equals("最終回")) {
+			else if (mark.equals("終") || mark.equals("完") || mark.equals("最終回")) {
 				pdl.flag = ProgFlags.LAST;
 			}
-			else if (mx.group(1).equals("再")) {
+			else if (mark.equals("再")) {
 				pdl.addOption(ProgOption.REPEAT);
 			}
-			else if (mx.group(1).equals("初")) {
+			else if (mark.equals("初")) {
 				pdl.addOption(ProgOption.FIRST);
 			}
-			else if (mx.group(1).equals("生")) {
-				pdl.addOption(ProgOption.LIVE);
+			else if (mark.equals("無") || mark.equals("無料")) {
+				//pdl.addOption(ProgOption.NOSCRUMBLE);
+				pdl.noscrumble = ProgScrumble.NOSCRUMBLE;
 			}
-
-			else if (mx.group(1).equals("二／吹")) {
+			else if (mark.equals("二／吹")) {
 				pdl.addOption(ProgOption.BILINGUAL);
 				pdl.addOption(ProgOption.STANDIN);
 			}
-			else if (mx.group(1).equals("字") || mx.group(1).equals("字幕") || mx.group(1).equals("字幕版")) {
+			else if (mark.equals("字幕") || mark.equals("字幕版")) {
 				pdl.addOption(ProgOption.SUBTITLE);
 			}
-			else if (mx.group(1).equals("二")) {
-				pdl.addOption(ProgOption.BILINGUAL);
-			}
-			else if (mx.group(1).equals("多")) {
-				pdl.addOption(ProgOption.MULTIVOICE);
-			}
-			else if (mx.group(1).equals("SS") || mx.group(1).equals("5.1")) {
-				pdl.addOption(ProgOption.SURROUND);
-			}
-			else if (mx.group(1).equals("吹") || mx.group(1).equals("吹替") || mx.group(1).equals("吹替版")) {
+			else if (mark.equals("吹替") || mark.equals("吹替版")) {
 				pdl.addOption(ProgOption.STANDIN);	// (ないよ)
 			}
-			else if (mx.group(1).equals("デ")) {
-				pdl.addOption(ProgOption.DATA);
-			}
-			else if (mx.group(1).equals("無") || mx.group(1).equals("無料")) {
-				//pdl.addOption(ProgOption.NOSCRUMBLE);
-				pdl.noscrumble = ProgScrumble.NOSCRUMBLE;
-			}
-			else if (mx.group(1).equals("4K")) {
-				pdl.addOption(ProgOption.BS4K);
-			}
-			else if (mx.group(1).equals("8K")) {
-				pdl.addOption(ProgOption.BS8K);
-			}
-
-			else if (mx.group(1).matches("^(Ｓ|Ｎ|Ｂ|映|双|解|手|天|英|日|録|HV)$")) {
+			else if (po != null && po != ProgOption.NOOPTION)
+				pdl.addOption(po);
+			else if (mark.matches("^(Ｓ|Ｎ|Ｂ|映|双|解|手|天|英|日|録|HV)$")) {
 				// 無視するフラグ
-				if ( mx.group(1).equals("日") && ( ! pdl.title.matches(String.format("^(%s)*[(（]日[）)].*", flagExpr)) && ! pdl.title.matches(".*[\\[［]日[\\]］].*")) ) {
+				if ( mark.equals("日") && ( ! pdl.title.matches(String.format("^(%s)*[(（]日[）)].*", flagExpr)) && ! pdl.title.matches(".*[\\[［]日[\\]］].*")) ) {
 					// 削除しないフラグ（特殊）
 					continue;
 				}
 			}
-			else if (mx.group(1).matches("^(韓|仮|[前後][編篇半]|[月火水木金土]|[0-9０-９]+)$")) {
+			else if (mark.matches("^(韓|仮|[前後][編篇半]|[月火水木金土]|[0-9０-９]+)$")) {
 				// 削除しないフラグ
 				continue;
 			}
 
 			else {
 				// 未知のフラグ
-				nf.put(mx.group(1),null);
+				nf.put(mark, null);
 				continue;
 			}
 
 			// 削除するフラグ
-			xf.put(mx.group(1), null);
+			xf.put(mark, null);
 		}
 		{
 			// 認識されたフラグだけ削除する.

--- a/TinyBannavi/src/tainavi/VersionInfo.java
+++ b/TinyBannavi/src/tainavi/VersionInfo.java
@@ -5,7 +5,7 @@ import java.util.regex.Pattern;
 
 
 public class VersionInfo {
-	private static final String Version = "タイニー番組ナビゲータ for DBR-T2007　3.22.18β+1.13.2";
+	private static final String Version = "タイニー番組ナビゲータ for DBR-T2007　3.22.18β+1.13.3";
 
 	private static final String OSname = System.getProperty("os.name");
 	private static final String OSvers = System.getProperty("os.version");

--- a/TinyBannavi/src/tainavi/Viewer.java
+++ b/TinyBannavi/src/tainavi/Viewer.java
@@ -114,7 +114,7 @@ public class Viewer extends JFrame implements ChangeListener,TickTimerListener,H
 
 	// 設定値をいれるところ
 	private final Env env = Env.TheEnv = new Env();							// 主要な設定
-	private final Bounds bounds = new Bounds();								// ウィンドウサイズとか動的に変化するもの
+	private final Bounds bounds = Bounds.TheBounds = new Bounds();			// ウィンドウサイズとか動的に変化するもの
 	private final ClipboardInfoList cbitems = new ClipboardInfoList();			// クリップボード対応機能でどの項目をコピーするかとかの設定
 	private final ListedColumnInfoList lvitems = new ListedColumnInfoList();	// リスト形式ビューの表示項目
 	private final ReserveListColumnInfoList rlitems = new ReserveListColumnInfoList();
@@ -2746,13 +2746,20 @@ public class Viewer extends JFrame implements ChangeListener,TickTimerListener,H
 		for (final TextValueSet tv : env.getTvCommand()) {
 			JMenuItem menuItem = new JMenuItem(tv.getText());
 
+			String body = "";
+			Matcher ma = Pattern.compile("^(.*)[ 　]").matcher(tvd.title);
+			if (ma.find())
+				body = ma.group(1);
+
 			String escepedTitle = "";
 			String escepedChName = "";
 			String escepedDetail = "";
+			String escepedBody = "";
 			try {
 				escepedTitle = URLEncoder.encode(tvd.title,"UTF-8");
 				escepedDetail = URLEncoder.encode(tvd.detail,"UTF-8");
 				escepedChName = URLEncoder.encode(tvd.center,"UTF-8");
+				escepedBody = URLEncoder.encode(body,"UTF-8");
 			} catch (UnsupportedEncodingException e2) {
 				//
 			}
@@ -2776,6 +2783,7 @@ public class Viewer extends JFrame implements ChangeListener,TickTimerListener,H
 			cmd = cmd.replaceAll("%END%", tvd.end);
 			cmd = cmd.replaceAll("%DETAILURL%", tvd.link);
 			cmd = cmd.replaceAll("%SYOBODETAILURL%",  tvd.linkSyobo != null ? tvd.linkSyobo : "");
+			cmd = cmd.replaceAll("%ENCBODY%", escepedBody);
 
 			// CHAN-TORU対応
 			if ( cmd.matches(".*%TVKAREACODE%.*") && cmd.matches(".*%TVKPID%.*") ) {
@@ -4942,6 +4950,8 @@ public class Viewer extends JFrame implements ChangeListener,TickTimerListener,H
 		if ( reload_prog ) {
 			loadTVProgram(false, LoadFor.ALL, false);	// 部品呼び出し
 		}
+		else
+			loadTVProgramPostProcess(false);
 
 		// Web番組表の再構築
 		mpList.setHistoryOnlyUpdateOnce(env.getHistoryOnlyUpdateOnce());