bug fix.

diff --git a/lib/util_url.cc b/lib/util_url.cc
index c438d18..8f8157d 100644 (file)
--- a/lib/util_url.cc
+++ b/lib/util_url.cc
@@ -166,7 +166,7 @@ ustring  buildQuery (MNode* query) {
 
     while (query && query->isCons ()) {
        MNode*  a = query->car ();
-       if (a->isCons ()) {
+       if (a && a->isCons ()) {
            if (c == 0)
                ans.append (CharConst ("?"));
            else

diff --git a/wiki/wikiline.cc b/wiki/wikiline.cc
index f1a9e37..9ffca11 100644 (file)
--- a/wiki/wikiline.cc
+++ b/wiki/wikiline.cc
@@ -37,20 +37,20 @@ static void  errorBadParam (WikiMotorObjVec* param, WikiFormat* wiki) {
 */
 /*DOC:
 ===変数展開===
- [[variable]]
- [[variable/]]
- [[variable~]]
- [[variable,]]
+ [[VARIABLE]]
+ [[VARIABLE/]]
+ [[VARIABLE~]]
+ [[VARIABLE,]]
 // [[@array]]
 
 */
 /*DOC:
 ===選択出力===
- [[variable?value:TRUE_TEXT]]
- [[variable!?value:FALSE_TEXT]]
- [[variable?value:TRUE_TEXT||FALSE_TEXT]]
- [[variable!?value:FALSE_TEXT||TRUE_TEXT]]
- [[variable?value1:TEXT1||?value2:TEXT2||?value3:TEXT3||TEXT4]]
+ [[VARIABLE?VALUE:true_text]]
+ [[VARIABLE!?VALUE:false_text]]
+ [[VARIABLE?VALUE:true_text||false_text]]
+ [[VARIABLE!?VALUE:false_text||true_text]]
+ [[VARIABLE?VALUE1:text1||?VALUE2:text2||?VALUE3:text3||text4]]
 
 */
 /*DOC: