From: kgsoft <kgsoft@users.osdn.me>
Date: Mon, 9 Apr 2018 10:50:32 +0000 (+0000)
Subject: テーブル結合のサンプル追加
X-Git-Url: http://git.osdn.net/view?p=fswiki%2Ffswiki.git;a=commitdiff_plain;h=3768311993c345e0bc457452fb6f5b5b0a7a2838

テーブル結合のサンプル追加
---

diff --git a/data/Help%2FFSWiki.wiki b/data/Help%2FFSWiki.wiki
index d377991..1f344dc 100644
--- a/data/Help%2FFSWiki.wiki
+++ b/data/Help%2FFSWiki.wiki
@@ -79,11 +79,12 @@
 !!!¥Æ¡¼¥Ö¥ë
 CSV¤Ï¥Æ¡¼¥Ö¥ë¤Ë¤Ê¤ê¤Þ¤¹¡££±¹ÔÌܤ¬¥Ø¥Ã¥À¤Ë¤Ê¤ê¤Þ¤¹¡£
 
+ ,h-1,h-2,h-3
  ,1-1,1-2,1-3
  ,2-1,2-2,2-3
+,h-1,h-2,h-3
 ,1-1,1-2,1-3
 ,2-1,2-2,2-3
-,,,
 
 ¥»¥ëÆâ¤Ë¥«¥ó¥Þ¤ò´Þ¤á¤¿¤¤¾ì¹ç¤ÏÃͤò¥À¥Ö¥ë¥¯¥©¡¼¥È¤Ç°Ï¤ß¤Þ¤¹¡£¤Þ¤¿¡¢¥À¥Ö¥ë¥¯¥©¡¼¥È¤Ç°Ï¤ó¤À¥»¥ë¤Ë¥À¥Ö¥ë¥¯¥©¡¼¥È¤òɽ¼¨¤·¤¿¤¤¾ì¹ç¤Ï¥À¥Ö¥ë¥¯¥©¡¼¥È¤ò2¤Ä³¤±¤Æµ­½Ò¤·¤Þ¤¹¡£
 
@@ -92,6 +93,15 @@ CSV
 ,¥«¥ó¥Þ,¥À¥Ö¥ë¥¯¥©¡¼¥È
 ,"¥»¥ë¤ÎÃæ¤Ë¥«¥ó¥Þ,¤òɽ¼¨","¥»¥ë¤ÎÃæ¤Ë¥À¥Ö¥ë¥¯¥©¡¼¥È""¤òɽ¼¨"
 
+¥»¥ëÆâ¤Ë"<<"¤òµ­½Ò¤¹¤ë¤Èº¸Â¦¤Î¥»¥ë¤È·ë¹ç¤·¤Þ¤¹¡£
+
+ ,h-1,h-2,h-3
+ ,1-1,1-2,1-3
+ ,2-1,<<,2-3
+,h-1,h-2,h-3
+,1-1,1-2,1-3
+,2-1,<<,2-3
+
 !!!À°·ÁºÑ¥Æ¥­¥¹¥È
 ¹ÔƬ¤ò¥¹¥Ú¡¼¥¹¤Þ¤¿¤Ï¥¿¥Ö¤Ç¤Ï¤¸¤á¤ë¤ÈÀ°·ÁºÑ¥Æ¥­¥¹¥È¤È¤·¤Æ°·¤ï¤ì¤Þ¤¹¡£
  ¤³¤ì¤ÏÀ°·ÁºÑ¥Æ¥­¥¹¥È¤Ç¤¹¡£
diff --git a/data/Help%2FWalWiki.wiki b/data/Help%2FWalWiki.wiki
index 10c53f4..881ce66 100644
--- a/data/Help%2FWalWiki.wiki
+++ b/data/Help%2FWalWiki.wiki
@@ -78,8 +78,10 @@
 !!!¥Æ¡¼¥Ö¥ë
 CSV¤Ï¥Æ¡¼¥Ö¥ë¤Ë¤Ê¤ê¤Þ¤¹¡££±¹ÔÌܤ¬¥Ø¥Ã¥À¤Ë¤Ê¤ê¤Þ¤¹¡£
 
+ ,h-1,h-2,h-3
  ,1-1,1-2,1-3
  ,2-1,2-2,2-3
+,h-1,h-2,h-3
 ,1-1,1-2,1-3
 ,2-1,2-2,2-3
 
@@ -90,6 +92,15 @@ CSV
 ,¥«¥ó¥Þ,¥À¥Ö¥ë¥¯¥©¡¼¥È
 ,"¥»¥ë¤ÎÃæ¤Ë¥«¥ó¥Þ,¤òɽ¼¨","¥»¥ë¤ÎÃæ¤Ë¥À¥Ö¥ë¥¯¥©¡¼¥È""¤òɽ¼¨"
 
+¥»¥ëÆâ¤Ë"<<"¤òµ­½Ò¤¹¤ë¤Èº¸Â¦¤Î¥»¥ë¤È·ë¹ç¤·¤Þ¤¹¡£
+
+ ,h-1,h-2,h-3
+ ,1-1,1-2,1-3
+ ,2-1,<<,2-3
+,h-1,h-2,h-3
+,1-1,1-2,1-3
+,2-1,<<,2-3
+
 !!!À°·ÁºÑ¥Æ¥­¥¹¥È
 ¹ÔƬ¤ò¥¹¥Ú¡¼¥¹¤Þ¤¿¤Ï¥¿¥Ö¤Ç¤Ï¤¸¤á¤ë¤ÈÀ°·ÁºÑ¥Æ¥­¥¹¥È¤È¤·¤Æ°·¤ï¤ì¤Þ¤¹¡£
  ¤³¤ì¤ÏÀ°·ÁºÑ¥Æ¥­¥¹¥È¤Ç¤¹¡£
diff --git a/data/Help%2FYukiWiki.wiki b/data/Help%2FYukiWiki.wiki
index dee03c5..338bbe4 100644
--- a/data/Help%2FYukiWiki.wiki
+++ b/data/Help%2FYukiWiki.wiki
@@ -78,8 +78,10 @@
 !!!¥Æ¡¼¥Ö¥ë
 CSV¤Ï¥Æ¡¼¥Ö¥ë¤Ë¤Ê¤ê¤Þ¤¹¡££±¹ÔÌܤ¬¥Ø¥Ã¥À¤Ë¤Ê¤ê¤Þ¤¹¡£
 
+ ,h-1,h-2,h-3
  ,1-1,1-2,1-3
  ,2-1,2-2,2-3
+,h-1,h-2,h-3
 ,1-1,1-2,1-3
 ,2-1,2-2,2-3
 
@@ -90,6 +92,15 @@ CSV
 ,¥«¥ó¥Þ,¥À¥Ö¥ë¥¯¥©¡¼¥È
 ,"¥»¥ë¤ÎÃæ¤Ë¥«¥ó¥Þ,¤òɽ¼¨","¥»¥ë¤ÎÃæ¤Ë¥À¥Ö¥ë¥¯¥©¡¼¥È""¤òɽ¼¨"
 
+¥»¥ëÆâ¤Ë"<<"¤òµ­½Ò¤¹¤ë¤Èº¸Â¦¤Î¥»¥ë¤È·ë¹ç¤·¤Þ¤¹¡£
+
+ ,h-1,h-2,h-3
+ ,1-1,1-2,1-3
+ ,2-1,<<,2-3
+,h-1,h-2,h-3
+,1-1,1-2,1-3
+,2-1,<<,2-3
+
 !!!À°·ÁºÑ¥Æ¥­¥¹¥È
 ¹ÔƬ¤ò¥¹¥Ú¡¼¥¹¤Þ¤¿¤Ï¥¿¥Ö¤Ç¤Ï¤¸¤á¤ë¤ÈÀ°·ÁºÑ¥Æ¥­¥¹¥È¤È¤·¤Æ°·¤ï¤ì¤Þ¤¹¡£
  ¤³¤ì¤ÏÀ°·ÁºÑ¥Æ¥­¥¹¥È¤Ç¤¹¡£