tavi-cvs-commit — CVS commit changelogs should be forwarded to this list

[Tavi-cvs-commit] CVS: tavi/lib defaults.php,1.8,1.9

[Even H. <ho...@us...>]

Update of /cvsroot/tavi/tavi/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv9146

Modified Files:
	defaults.php 
Log Message:
Fixed the little annoying bug...

Index: defaults.php
===================================================================
RCS file: /cvsroot/tavi/tavi/lib/defaults.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- defaults.php	29 Aug 2003 15:14:01 -0000	1.8
+++ defaults.php	9 Sep 2003 10:32:54 -0000	1.9
@@ -124,8 +124,9 @@
 $RateEdit   = 20;
 
 // $TempDir determines the location of temp files used for computing diffs.
-// The default selects depending on OS, but could/should be set to a given value
-$TempDir = strncmp(PHP_OS, "WIN", 3) ? $_ENV["TEMP"] : '/tmp';
+// The default makes a choice based on the environment
+$TempDir = isset($_ENV['TMP'])  ? $_ENV['TMP'] :
+             isset($_ENV['TEMP']) ? $_ENV['TEMP'] : "/tmp";
 
 // $DiffCmd determines what command to run to compute diffs.
 $DiffCmd = '/usr/bin/diff';

[Tavi-cvs-commit] CVS: tavi/parse macros.php,1.13,1.14

[Even H. <ho...@us...>]

Update of /cvsroot/tavi/tavi/parse
In directory sc8-pr-cvs1:/tmp/cvs-serv25954

Modified Files:
	macros.php 
Log Message:
Added CurlyOptions, Index,  for making index-list using TitleSearch

Index: macros.php
===================================================================
RCS file: /cvsroot/tavi/tavi/parse/macros.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- macros.php	8 Sep 2003 10:08:17 -0000	1.13
+++ macros.php	8 Sep 2003 11:10:12 -0000	1.14
@@ -231,19 +231,14 @@
   //   Class      : Sets the class of the list used for results
   //   STyle      : Sets the style attribute
   //   Delimiter  : Choose delimiter between text entries
+  //   Index      : Divides the list according to first character,
+  //                or first character after value of option
   //
   // Examples:  [[TitleSearch Pages$]]
   //            [[TitleSearch *]]
   //            [[TitleSearch {c=prelist} ^Tavi]]
+  //            [[TitleSearch {i=5} ^Tavi]]
 
-  //**old** comments
-  //**   OneLine:     Search result is displayed separated by spaces on
-  //**                one long line/paragraph
-  //**   CommaDelim : On one line, delimited by ', '
-  //**   BarDelim   : On one line, delimited by ' | '
-  //**   Bullet     : In a bulleted list
-  //**   default    : Each result on a single line, with <pre>-tags around
- 
   global $pagestore, $AlphaPtn;
 
   // Check for CurlyOptions, and split them
@@ -266,6 +261,13 @@
       if ($value == "prelist") { $useDelim = ''; }
     } else if ($name[0]=='d') {   // Delimiter - Changes the delimiter used
       $useDelim = $value;
+    } else if ($name[0]=='i') {  // Index - Use heading to divide index
+      $showIndex = true; $level=2;
+      if (is_numeric($value)) {
+        $indexCharNo = $value -1;
+      } else {
+        $indexCharNo = 0;
+      }
     }
   }
 
@@ -281,46 +283,46 @@
     $pattern=$search;
   }
 
-  /* **OLD COMMENTS**
-  // Set up the correct pattern for inserting the item according
-  // to which liststyle is wanted
-  if ($listStyle == "OneLine")    { $insertStr = "%s "; }
-  else if ($listStyle == "CommaDelim") { $insertStr = "%s, ";   }
-  else if ($listStyle == "BarDelim")   { $insertStr = "%s | ";   }
-  else if ($listStyle == "Bullet")   { $insertStr = "  <li>%s</li>\n";   }
-  else { $insertStr = "%s\n"; }
-     */
-  if ($listAttr != "") {
-    // If any attributes are present, use them instead of default...
-    $text = entity_list("*", 'start', $listAttr);
-  } else {
-    // ... which is present result on one line, comma-separated
-    $text = entity_list("*", 'start', 'class=oneline ');
+  if ($listAttr == "") { // If no listAttr set a proper default
+    $listAttr = 'class=oneline ';
     $useDelim = ($useDelim) ? $useDelim : ', ';
   }
 
+  if ($showIndex) {
+    $lastIndexChar ='';
+  } else {
+    $text = entity_list("*", 'start', $listAttr);
+  }
+
   // Loop through all pagetitles
   $list = $pagestore->allpages();
   foreach($list as $page)
   {
     if (preg_match("|$pattern|", $page[1])) {
-       $text .= entity_listitem("*", "start");
-       $text .= sprintf("%s".$useDelim, html_ref($page[1], $page[1]));
+      if ($showIndex && ($lastIndexChar != $page[1][$indexCharNo])) {
+        if ($lastIndexChar != '') {  // End previous list
+          if ($useDelim) {
+           $text = preg_replace("/" . preg_quote($useDelim) . "$/",
+                                "\n", $text);
+          }
+          $text .= entity_list("*", "end");
+        }
+
+        // Add index-header
+        $text .= new_entity(array('head_start', $level)) .
+           substr($page[1], 0, $indexCharNo+1) .
+           new_entity(array('head_end', $level));
+
+        // Start list again
+        $text .= entity_list("*", 'start', $listAttr);
+        $lastIndexChar = $page[1][$indexCharNo];
+      }
+
+      $text .= entity_listitem("*", "start");
+      $text .= sprintf("%s".$useDelim, html_ref($page[1], $page[1]));
     }
   }
 
-  /* **OLD COMMENTS**
-  // The different liststyles need some different cleanup afterwards
-  if (($listStyle == "CommaDelim") or ($listStyle == "BarDelim")) {
-    $text = preg_replace("/[|,]+ $/", "\n", $text);
-  } else if ($listStyle == "Bullet") {
-    $text = "<ul>\n$text\n</ul>"; 
-  } else if ($listStyle == "OneLine") { 
-    ;  // No need for extra work, do a noop to prevent html_code'ing
-  } else {
-    $text = html_code ($text);
-  }
-     */
   if ($useDelim) {
     $text = preg_replace("/" . preg_quote($useDelim) . "$/", "\n", $text);
   }

[Tavi-cvs-commit] CVS: tavi/template wiki.css,1.11,1.12

[Even H. <ho...@us...>]

Update of /cvsroot/tavi/tavi/template
In directory sc8-pr-cvs1:/tmp/cvs-serv26119

Modified Files:
	wiki.css 
Log Message:
Updated in accordance to provide inline TitleSearch'es

Index: wiki.css
===================================================================
RCS file: /cvsroot/tavi/tavi/template/wiki.css,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- wiki.css	29 Aug 2003 16:45:08 -0000	1.11
+++ wiki.css	8 Sep 2003 11:10:51 -0000	1.12
@@ -51,7 +51,9 @@
 
 /* Used together with TitleSearch */
 ul.oneline
-  { list-style-type: none; }
+  { list-style-type: none;
+    display: inline;
+    margin-left: 0em; }
 ul.oneline li
   { display: inline; }
 ul.prelist
@@ -68,4 +70,4 @@
  div#header #toolbar-top    { display: none; }
  div#footer #toolbar-bottom { display: none; }
  div#footer form            { display: none; }
-}
+}
\ No newline at end of file

[Tavi-cvs-commit] CVS: tavi/parse transforms.php,1.30,1.31

[Even H. <ho...@us...>]

Update of /cvsroot/tavi/tavi/parse
In directory sc8-pr-cvs1:/tmp/cvs-serv18691

Modified Files:
	transforms.php 
Log Message:
Added markup for /ChildPage or ((/Child Pages))

Index: transforms.php
===================================================================
RCS file: /cvsroot/tavi/tavi/parse/transforms.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- transforms.php	29 Aug 2003 16:45:08 -0000	1.30
+++ transforms.php	8 Sep 2003 10:31:46 -0000	1.31
@@ -57,9 +57,9 @@
   if(!$EnableWikiLinks) { return $text; }
 
   if($validate)
-    { $ptn = "/(^|[^A-Za-z])($LinkPtn)(())(\"\")?/e"; }
+    { $ptn = "/(^|[^A-Za-z])(\\/?$LinkPtn)(())(\"\")?/e"; }
   else
-    { $ptn = "/(^|[^A-Za-z])(!?$LinkPtn)((\#[A-Za-z]([-A-Za-z0-9_:.]*[-A-Za-z0-9_])?)?)(\"\")?/e"; }
+    { $ptn = "/(^|[^A-Za-z])(!?\\/?$LinkPtn)((\#[A-Za-z]([-A-Za-z0-9_:.]*[-A-Za-z0-9_])?)?)(\"\")?/e"; }
 
   return preg_replace($ptn,
                       "q1('\\1').wikiname_token(q1('\\2'),'\\3')",
@@ -68,9 +68,14 @@
 
 function wikiname_token($name, $anchor)
 {
+  global $ParseObject;
   if($name[0] == '!')                   // No-link escape sequence.
     { return substr($name, 1); }        // Trim leading '!'.
-  return new_entity(array('ref', $name, $name, '', $anchor, $anchor));
+  $link = $name;
+  // translate sub-page markup into a qualified wikiword
+  if ($name[0] == '/')
+    { $link = $ParseObject . $name; }
+  return new_entity(array('ref', $link, $name, '', $anchor, $anchor));
 }
 
 function parse_freelink($text, $validate = 0)
@@ -81,11 +86,11 @@
 
   if($validate)
   {
-    $ptn = "/\\(\\(([-A-Za-z0-9 _+\\/.,;:!?'\"\\[\\]\\{\\}&\xc0-\xff]+)()()\\)\\)/e";
+    $ptn = "/\\(\\((\\/?[-A-Za-z0-9 _+\\/.,;:!?'\"\\[\\]\\{\\}&\xc0-\xff]+)()()\\)\\)/e";
   }
   else
   {
-    $ptn = "/\\(\\(([-A-Za-z0-9 _+\\/.,;:!?'\"\\[\\]\\{\\}&\xc0-\xff]+)(\|[-A-Za-z0-9 _+\\/.,;:!?'\"\\[\\]\\{\\}&\xc0-\xff]+)?(\#[A-Za-z][-A-Za-z0-9_:.]*)?()\\)\\)/e";
+    $ptn = "/\\(\\((\\/?[-A-Za-z0-9 _+\\/.,;:!?'\"\\[\\]\\{\\}&\xc0-\xff]+)(\|[-A-Za-z0-9 _+\\/.,;:!?'\"\\[\\]\\{\\}&\xc0-\xff]+)?(\#[A-Za-z][-A-Za-z0-9_:.]*)?()\\)\\)/e";
   }
 
   return preg_replace($ptn,
@@ -95,10 +100,17 @@
 
 function freelink_token($link, $appearance, $anchor, $anchor_appearance)
 {
+  global $ParseObject;
+
   if($appearance == '')
     { $appearance = $link; }
   else
     { $appearance = substr($appearance, 1); }   // Trim leading '|'.
+
+  // translate sub-page markup into a qualified wikiword
+  if ($link[0] == '/')
+    { $link = $ParseObject . $link; }
+ 
   return new_entity(array('ref', $link, $appearance, '',
                           $anchor, $anchor_appearance));
 }
@@ -628,4 +640,4 @@
 
   return $text;
 }
-?>
+?>
\ No newline at end of file

[Tavi-cvs-commit] CVS: tavi/parse macros.php,1.12,1.13

[Even H. <ho...@us...>]

Update of /cvsroot/tavi/tavi/parse
In directory sc8-pr-cvs1:/tmp/cvs-serv14391

Modified Files:
	macros.php 
Log Message:
Added displaying of origin as a CurlyOptions...

Index: macros.php
===================================================================
RCS file: /cvsroot/tavi/tavi/parse/macros.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- macros.php	29 Aug 2003 16:45:08 -0000	1.12
+++ macros.php	8 Sep 2003 10:08:17 -0000	1.13
@@ -152,14 +152,31 @@
 }
 
 // Prepare a list of pages linked to that do not exist.
-function view_macro_wanted()
+function view_macro_wanted($args)
 {
   global $pagestore, $LkTbl, $PgTbl;
 
+  // Check for CurlyOptions, and split them
+  preg_match("/^(?:\s*{([^]]*)})?\s*(.*)$/", $args, $arg);
+  $options = split(',', $arg[1]);
+  $search = $arg[2];
+
+  // Defaults
+  $displayOrigin = false;
+
+  // Parse options
+  foreach ($options as $opt) {
+    list($name, $value) = split('=', $opt);
+    $name=strtolower($name);
+    if (preg_match("/^or/i", $name)) {  // ORigin  - Displays origin of wanted pages
+      $displayOrigin = !($value == 'false');
+    }
+  }
+
   $text = '';
   $first = 1;
 
-  $q1 = $pagestore->dbh->query("SELECT l.link, SUM(l.count) AS ct, p.title " .
+  $q1 = $pagestore->dbh->query("SELECT l.link, SUM(l.count) AS ct, l.page, p.title " .
                                "FROM $LkTbl AS l LEFT JOIN $PgTbl AS p " .
                                "ON l.link = p.title " .
                                "WHERE p.title IS NULL " .
@@ -174,9 +191,26 @@
     else
       { $first = 0; }
 
+    if ($displayOrigin) {
+      if ($result[1] > 1) {
+         $q2 = $pagestore->dbh->query("SELECT l.page, l.link from $LkTbl as l ".
+                                      "WHERE l.link = '". $result[0] ."'");
+
+         $deref = ' from ';
+         while (($res2 = $pagestore->dbh->result($q2))) {
+           $deref .= html_url(editUrl($res2[0]), '?'.$res2[0]) . ', ';
+         }
+
+         $deref = preg_replace("/, $/", "", $deref);
+      } else {
+         $deref = ' from '. html_url(editURL($result[2]), '?'.$result[2]);
+      }
+    } else {
+      $deref = '';
+    }
     $text = $text . '(' .
             html_url(findURL($result[0]), $result[1]) .
-            ') ' . html_ref($result[0], $result[0]);
+            ') ' . html_ref($result[0], $result[0]) . $deref;
   }
 
   return html_code($text);
@@ -223,13 +257,14 @@
   // Parse options
   foreach ($options as $opt) {
     list($name, $value) = split('=', $opt);
-    if (preg_match("/^st/", $name)) {
+    $name=strtolower($name);
+    if (preg_match("/^st/", $name)) { // STyle - Adds a style-attribute
       $style = $value;
       $listAttr = "style=\"$value\" ";
-    } else if ($name[0]=='c') {
+    } else if ($name[0]=='c') {   // Class - Adds a class-attribute
       $listAttr = "class=\"$value\" ";
       if ($value == "prelist") { $useDelim = ''; }
-    } else if ($name[0]=='d') {
+    } else if ($name[0]=='d') {   // Delimiter - Changes the delimiter used
       $useDelim = $value;
     }
   }
@@ -399,4 +434,4 @@
   return $result;
 }
 
-?>
+?>
\ No newline at end of file

[Tavi-cvs-commit] CVS: tavi/parse html.php,1.26,1.27 transforms.php,1.31,1.32

[Even H. <ho...@us...>]

Update of /cvsroot/tavi/tavi/parse
In directory sc8-pr-cvs1:/tmp/cvs-serv4608

Modified Files:
	html.php transforms.php 
Log Message:
Added CurlyOptions to the table formatting 

Index: html.php
===================================================================
RCS file: /cvsroot/tavi/tavi/parse/html.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- html.php	29 Aug 2003 16:45:08 -0000	1.26
+++ html.php	8 Sep 2003 12:11:38 -0000	1.27
@@ -70,20 +70,106 @@
   { return html_bold_start() . 'Changed:' . html_bold_end(); }
 function html_diff_delete()
   { return html_bold_start() . 'Deleted:' . html_bold_end(); }
-function html_table_start()
-  { return '<table border="1">'; }
+function html_table_start($args)
+{
+  if ($args != '') {
+    $extraStr = '';
+
+    // Split and parse CurlyOptions
+    $options = split(',', $args);
+    foreach ($options as $opt) {
+      list($name, $value) = split('=', $opt);
+      // Only use the Table-options
+      if ($name[0]=='T') {
+        if ($name[1]=='c') { // TClass - Class of <table>
+          $extraStr .= ' class="'. $value .'"';
+        } else if ($name[1]=='s') {  // TStyle - Style of <table>
+          $extraStr .= ' style="'. $value .'"';
+        } else if ($name[1]=='b') { // TBorder - Use border with given width
+          if (is_numeric($value)) {
+            $extraStr .= ' border="'. $value .'"';
+          } else {
+            $extraStr .= ' border="1"';
+          }
+        }
+      }
+    }
+
+    return "<table$extraStr>";
+  } else {
+    return '<table border="1">';
+  }
+}
 function html_table_end()
   { return '</table>'; }
-function html_table_row_start()
-  { return '<tr>'; }
+function html_table_row_start($args)
+{
+  if ($args != '') {
+    $extraStr = '';
+
+    // Split and parse CurlyOptions
+    $options = split(',', $args);
+    foreach ($options as $opt) {
+      list($name, $value) = split('=', $opt);
+      // Only use the Row-options
+      if ($name[0]=='R') {
+        if ($name[1]=='c') { // RClass - Class of <row>
+          $extraStr .= ' class="'. $value .'"';
+        } else if ($name[1]=='s') {  // RStyle - Style of <row>
+          $extraStr .= ' style="'. $value .'"';
+        }
+      }
+    }
+
+    return "<tr$extraStr>";
+  } else {
+    return "<tr>";
+  }
+}
 function html_table_row_end()
   { return '</tr>'; }
-function html_table_cell_start($span = 1)
+function html_table_cell_start($span = 1, $args)
 {
+
+  if ($args != '') {
+    $styleStr = '';
+
+    $options = split(',', $args);
+
+    // Parse CurlyOptions
+    foreach ($options as $opt) {
+      list($name, $value) = split('=', $opt);
+      if ($name[0]=='T' or $name[0]=='R') {
+        continue; //Was either a row or table option
+      }
+      if ($name[0]=='w') {
+        if (is_numeric($value)) {
+          $rowspan = $value;
+        } else {
+          $rowspan=2;
+        }
+        $extraStr .= ' rowspan="' . $rowspan .'"';
+      } else if ($name[0] == 'l') { $styleStr .= ' text-align: left;';
+      } else if ($name[0] == 'c') { $styleStr .= ' text-align: center;';
+      } else if ($name[0] == 'r') { $styleStr .= ' text-align: right;';
+      } else if ($name[0] == 't') { $styleStr .= ' vertical-align: top;';
+      } else if ($name[0] == 'b') { $styleStr .= ' vertical-align: bottom;';
+      } else if ($name[0] == 'B') { $styleStr .= ' font-weight: bold;';
+      } else if ($name[0] == 'I') { $styleStr .= ' font-style: italic;';
+      } else if ($name[0] == 's') { $styleStr .= ' '. $value .';';
+      } else if ($name[0] == 'C') { $extraStr .= ' class="'. $value .'"';
+      }
+    }
+
+    if ($styleStr != "") {
+      $extraStr .= ' style="'. $styleStr .'"';
+    }
+  }
+
   if($span == 1)
-    { return '<td>'; }
+    { return '<td'. $extraStr .'>'; }
   else
-    { return '<td colspan="' . $span . '">'; }
+    { return '<td colspan="'. $span .'"' .$extraStr. '>'; }
 }
 function html_table_cell_end()
   { return '</td>'; }
@@ -296,4 +382,4 @@
                        '\\1 \\2', $page, -1);
   return $page;
 }
-?>
+?>
\ No newline at end of file

Index: transforms.php
===================================================================
RCS file: /cvsroot/tavi/tavi/parse/transforms.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- transforms.php	8 Sep 2003 10:31:46 -0000	1.31
+++ transforms.php	8 Sep 2003 12:11:38 -0000	1.32
@@ -612,19 +612,23 @@
 
   $pre = '';
   $post = '';
-  if(preg_match('/^(\|\|)+.*(\|\|)\s*$/', $text))  // Table.
+  if(preg_match('/^(\|\|)+(\{([^{}]+)\})?.*(\|\|)\s*$/', $text, $args))  // Table.
   {
     if(!$in_table)
     {
-      $pre = html_table_start();
+      $pre = html_table_start($args[3]);
       $in_table = 1;
     }
-    $text = preg_replace('/^((\|\|)+)(.*)\|\|\s*$/e',
-                         "new_entity(array('raw',html_table_row_start().html_table_cell_start(strlen('\\1')/2))).".
-                         "q1('\\3').new_entity(array('raw',html_table_cell_end().html_table_row_end()))",
+    $text = preg_replace('/\|\s+\|/e',
+                         "q1('|').new_entity(array('raw','&nbsp;')).q1('|')", 
+                         $text);
+    $text = preg_replace('/^((\|\|+)(\{([^{}]+)\})?)(.*)\|\|\s*$/e',
+                         "new_entity(array('raw',html_table_row_start('\\4').
+                                                 html_table_cell_start(strlen('\\2')/2, '\\4'))).".
+                         "q1('\\5').new_entity(array('raw',html_table_cell_end().html_table_row_end()))",
                          $text, -1);
-    $text = preg_replace('/((\|\|)+)/e',
-                         "new_entity(array('raw',html_table_cell_end().html_table_cell_start(strlen('\\1')/2)))",
+    $text = preg_replace('/((\|\|+)(\{([^{}]+)\})?)/e',
+                         "new_entity(array('raw',html_table_cell_end().html_table_cell_start(strlen('\\2')/2, '\\4')))",
                          $text, -1);
   }
   else if($in_table)                    // Have exited table.

[Tavi-cvs-commit] CVS: tavi ChangeLog.txt,1.11,1.12

[Even H. <ho...@us...>]

Update of /cvsroot/tavi/tavi
In directory sc8-pr-cvs1:/tmp/cvs-serv7872

Modified Files:
	ChangeLog.txt 
Log Message:
Changes since last version. Are now ready to lease version 0.24

Index: ChangeLog.txt
===================================================================
RCS file: /cvsroot/tavi/tavi/ChangeLog.txt,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- ChangeLog.txt	29 Aug 2003 16:45:08 -0000	1.11
+++ ChangeLog.txt	8 Sep 2003 12:31:06 -0000	1.12
@@ -3,10 +3,17 @@
 WikkiTikkiTavi - ChangeLog
 --------------------------
 
+2003-09-08  Even Holen <eve...@pv...>
+  * Added CurlyOptions, ORigin, to show origin of WantedPages
+  * Added markup for child pages, using /ChildPage or ((/Child page))
+  * Added CurlyOptions, Index, to TitleSearch to make headings
+    in searches. Also changed css-file to allow inside paragraphs
+  * Added CurlyOptions to table formatting code. Now it's possible to
+    set classes, styles and special options on <table>, <row> and <cell>
+
 2003-08-29  Even Holen <eve...@pv...>
   * lib/defaults.php: Choose $TempDir based on OS
-  * Started adding the TitleSearch macro. It's now working, but
-    lacks the finishing touch on style/class selection
+  * Added TitleSearch-macro
 
 2003-08-14  Even Holen <eve...@pv...>
   * lib/defaults.php: Removed grouping from patterns, and included
@@ -258,4 +265,3 @@
 2000-12-27  Scott Moonen  <sm...@an...> 
 
     * Version 0.02 released.
-

[Tavi-cvs-commit] CVS: tavi ChangeLog.txt,1.12,1.13 NEWS.txt,1.8,1.9

[Even H. <ho...@us...>]

Update of /cvsroot/tavi/tavi
In directory sc8-pr-cvs1:/tmp/cvs-serv9290

Modified Files:
	ChangeLog.txt NEWS.txt 
Log Message:
Last cvs-commit before releasing version 0.24

Index: ChangeLog.txt
===================================================================
RCS file: /cvsroot/tavi/tavi/ChangeLog.txt,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- ChangeLog.txt	8 Sep 2003 12:31:06 -0000	1.12
+++ ChangeLog.txt	8 Sep 2003 12:38:16 -0000	1.13
@@ -2,6 +2,8 @@
 
 WikkiTikkiTavi - ChangeLog
 --------------------------
+2003-09-08 Even Holen <eve...@pv...>
+  * ** Version 0.24 released **
 
 2003-09-08  Even Holen <eve...@pv...>
   * Added CurlyOptions, ORigin, to show origin of WantedPages
@@ -264,4 +266,4 @@
 
 2000-12-27  Scott Moonen  <sm...@an...> 
 
-    * Version 0.02 released.
+    * Version 0.02 released.
\ No newline at end of file

Index: NEWS.txt
===================================================================
RCS file: /cvsroot/tavi/tavi/NEWS.txt,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- NEWS.txt	16 Jan 2002 16:48:34 -0000	1.8
+++ NEWS.txt	8 Sep 2003 12:38:16 -0000	1.9
@@ -2,8 +2,15 @@
 
 WikkiTikkiTavi - News
 ---------------------
+See also ChangeLog.txt for more details of changes.
 
-See also ChangeLog.txt.
+2003-09-08  Even Holen <eve...@pv...>
+  WikkiTikkiTavi version 0.24 is released. And this file hasn't been updated
+  in a while. Changes since version 0.21 includes lots of bug fixes and minor
+  adjustments to formatting rules. With this new version the macro TitleSearch
+  has been added, and the implementation of CurlyOptions has begun. This
+  affects in this version changes to table formatting and to the macros
+  TitleSearch and WantedPages.
 
 ---------------------
 
@@ -26,4 +33,3 @@
 
   WikkiTikkiTavi has had a CVS reorganization, intending to bring it to a
   more "normal" state (as defined by common CVS usage conventions).
-

[Tavi-cvs-commit] CVS: tavi/template wiki.css,1.10,1.11

[Even H. <ho...@us...>]

Update of /cvsroot/tavi/tavi/template
In directory sc8-pr-cvs1:/tmp/cvs-serv16396/template

Modified Files:
	wiki.css 
Log Message:
Added first version of TitleSearch. See code for examples. Still not quite finished.

Index: wiki.css
===================================================================
RCS file: /cvsroot/tavi/tavi/template/wiki.css,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- wiki.css	12 Jul 2003 14:09:01 -0000	1.10
+++ wiki.css	29 Aug 2003 16:45:08 -0000	1.11
@@ -49,6 +49,15 @@
   { background: transparent;
     color:      #383838; }
 
+/* Used together with TitleSearch */
+ul.oneline
+  { list-style-type: none; }
+ul.oneline li
+  { display: inline; }
+ul.prelist
+  { list-style-type: none;
+    font-family: monospace; }
+
 div#header #logo
   { float: right; }
 div#header hr

[Tavi-cvs-commit] CVS: tavi/parse html.php,1.25,1.26 macros.php,1.11,1.12 transforms.php,1.29,1.30

[Even H. <ho...@us...>]

Update of /cvsroot/tavi/tavi/parse
In directory sc8-pr-cvs1:/tmp/cvs-serv16396/parse

Modified Files:
	html.php macros.php transforms.php 
Log Message:
Added first version of TitleSearch. See code for examples. Still not quite finished.

Index: html.php
===================================================================
RCS file: /cvsroot/tavi/tavi/parse/html.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- html.php	29 Aug 2003 15:04:05 -0000	1.25
+++ html.php	29 Aug 2003 16:45:08 -0000	1.26
@@ -18,8 +18,8 @@
   { return '<tt>'; }
 function html_tt_end()
   { return '</tt>'; }
-function html_ul_start()
-  { return '<ul>'; }
+function html_ul_start($attr='')
+  { return "<ul $attr>"; }
 function html_ul_end()
   { return "</ul>\n"; }
 function html_ol_start()

Index: macros.php
===================================================================
RCS file: /cvsroot/tavi/tavi/parse/macros.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- macros.php	30 Jun 2003 10:47:00 -0000	1.11
+++ macros.php	29 Aug 2003 16:45:08 -0000	1.12
@@ -182,6 +182,118 @@
   return html_code($text);
 }
 
+// Do a textual search in list of page titles
+function view_macro_titlesearch($args)
+{
+  // Description of TitleSearch macro:
+  //   [[TitleSearch {options} search-pattern]]
+  // This macro searches for page-titles matching the searchpattern,
+  // and presents it according to options. The pattern may include
+  // ^ or $ to lock it against start or end, and otherwise it must 
+  // only contain alpha-characters (or '/'). The special pattern '*'
+  // matches every title.
+  //
+  // Legal options, capitalized unique prefix:
+  //   Class      : Sets the class of the list used for results
+  //   STyle      : Sets the style attribute
+  //   Delimiter  : Choose delimiter between text entries
+  //
+  // Examples:  [[TitleSearch Pages$]]
+  //            [[TitleSearch *]]
+  //            [[TitleSearch {c=prelist} ^Tavi]]
+
+  //**old** comments
+  //**   OneLine:     Search result is displayed separated by spaces on
+  //**                one long line/paragraph
+  //**   CommaDelim : On one line, delimited by ', '
+  //**   BarDelim   : On one line, delimited by ' | '
+  //**   Bullet     : In a bulleted list
+  //**   default    : Each result on a single line, with <pre>-tags around
+ 
+  global $pagestore, $AlphaPtn;
+
+  // Check for CurlyOptions, and split them
+  preg_match("/^(?:\s*{([^]]*)})?\s*(.*)$/", $args, $arg);
+  $options = split(',', $arg[1]);
+  $search = $arg[2];
+
+  // Some defaults
+  $useDelim = ''; // Empty delimiter at the start, changed by options
+
+  // Parse options
+  foreach ($options as $opt) {
+    list($name, $value) = split('=', $opt);
+    if (preg_match("/^st/", $name)) {
+      $style = $value;
+      $listAttr = "style=\"$value\" ";
+    } else if ($name[0]=='c') {
+      $listAttr = "class=\"$value\" ";
+      if ($value == "prelist") { $useDelim = ''; }
+    } else if ($name[0]=='d') {
+      $useDelim = $value;
+    }
+  }
+
+  // Check for illegal characters to make search pattern safer against exploits
+  if ($search == '*') {  // Match every title 
+    $pattern = "."; 
+  } else if ( !preg_match("/^\^?(\/|$AlphaPtn)+\\$?$/", $search)) {
+     // Search can be locked at ^start and/or end$, and elsewise only
+     // contain Alpha-characters, digits not included
+     return "[[TitleSearch $args]]";
+  } else {
+    // $search validates, so use as is
+    $pattern=$search;
+  }
+
+  /* **OLD COMMENTS**
+  // Set up the correct pattern for inserting the item according
+  // to which liststyle is wanted
+  if ($listStyle == "OneLine")    { $insertStr = "%s "; }
+  else if ($listStyle == "CommaDelim") { $insertStr = "%s, ";   }
+  else if ($listStyle == "BarDelim")   { $insertStr = "%s | ";   }
+  else if ($listStyle == "Bullet")   { $insertStr = "  <li>%s</li>\n";   }
+  else { $insertStr = "%s\n"; }
+     */
+  if ($listAttr != "") {
+    // If any attributes are present, use them instead of default...
+    $text = entity_list("*", 'start', $listAttr);
+  } else {
+    // ... which is present result on one line, comma-separated
+    $text = entity_list("*", 'start', 'class=oneline ');
+    $useDelim = ($useDelim) ? $useDelim : ', ';
+  }
+
+  // Loop through all pagetitles
+  $list = $pagestore->allpages();
+  foreach($list as $page)
+  {
+    if (preg_match("|$pattern|", $page[1])) {
+       $text .= entity_listitem("*", "start");
+       $text .= sprintf("%s".$useDelim, html_ref($page[1], $page[1]));
+    }
+  }
+
+  /* **OLD COMMENTS**
+  // The different liststyles need some different cleanup afterwards
+  if (($listStyle == "CommaDelim") or ($listStyle == "BarDelim")) {
+    $text = preg_replace("/[|,]+ $/", "\n", $text);
+  } else if ($listStyle == "Bullet") {
+    $text = "<ul>\n$text\n</ul>"; 
+  } else if ($listStyle == "OneLine") { 
+    ;  // No need for extra work, do a noop to prevent html_code'ing
+  } else {
+    $text = html_code ($text);
+  }
+     */
+  if ($useDelim) {
+    $text = preg_replace("/" . preg_quote($useDelim) . "$/", "\n", $text);
+  }
+  $text .= entity_list("*", "end");
+
+  return parse_elements($text);
+}
+
 // Prepare a list of pages sorted by how many links they contain.
 function view_macro_outlinks()
 {

Index: transforms.php
===================================================================
RCS file: /cvsroot/tavi/tavi/parse/transforms.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- transforms.php	14 Aug 2003 14:46:04 -0000	1.29
+++ transforms.php	29 Aug 2003 16:45:08 -0000	1.30
@@ -469,10 +469,10 @@
   return $text;
 }
 
-function entity_list($type, $fn)
+function entity_list($type, $fn, $attr='')
 {
   if($type == '*')
-    { return new_entity(array('bullet_list_' . $fn)); }
+    { return new_entity(array('bullet_list_' . $fn, $attr)); }
   else if($type == ':' || $type == ';')
     { return new_entity(array('indent_list_' . $fn)); }
   else if($type == '#')

[Tavi-cvs-commit] CVS: tavi ChangeLog.txt,1.10,1.11

[Even H. <ho...@us...>]

Update of /cvsroot/tavi/tavi
In directory sc8-pr-cvs1:/tmp/cvs-serv16396

Modified Files:
	ChangeLog.txt 
Log Message:
Added first version of TitleSearch. See code for examples. Still not quite finished.

Index: ChangeLog.txt
===================================================================
RCS file: /cvsroot/tavi/tavi/ChangeLog.txt,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ChangeLog.txt	14 Aug 2003 14:46:04 -0000	1.10
+++ ChangeLog.txt	29 Aug 2003 16:45:08 -0000	1.11
@@ -3,6 +3,11 @@
 WikkiTikkiTavi - ChangeLog
 --------------------------
 
+2003-08-29  Even Holen <eve...@pv...>
+  * lib/defaults.php: Choose $TempDir based on OS
+  * Started adding the TitleSearch macro. It's now working, but
+    lacks the finishing touch on style/class selection
+
 2003-08-14  Even Holen <eve...@pv...>
   * lib/defaults.php: Removed grouping from patterns, and included
     multi-level subpage-support
@@ -253,5 +258,4 @@
 2000-12-27  Scott Moonen  <sm...@an...> 
 
     * Version 0.02 released.
-
 

[Tavi-cvs-commit] CVS: tavi/parse html.php,1.24,1.25

[Even H. <ho...@us...>]

Update of /cvsroot/tavi/tavi/parse
In directory sc8-pr-cvs1:/tmp/cvs-serv28386

Modified Files:
	html.php 
Log Message:
Add inclusion of SubPages-paths to toolbar

Index: html.php
===================================================================
RCS file: /cvsroot/tavi/tavi/parse/html.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- html.php	15 Jan 2002 15:38:07 -0000	1.24
+++ html.php	29 Aug 2003 15:04:05 -0000	1.25
@@ -193,11 +193,21 @@
          '">' .  'See complete list (' . $count .
          ' entries)</a></strong></td></tr>';
 }
-function html_toolbar_top()
+function html_parents_top($path)
+{
+  $ret = ''; $topDir='';
+  foreach (split('/', $path) as $subDir) {
+    $ret .= html_ref($topDir . $subDir, $subDir) . '/ ';
+    $topDir .= $subDir . '/';
+  };
+  return $ret;
+}
+function html_toolbar_top($path)
 {
   global $HomePage, $PrefsScript;
   return html_ref($HomePage, $HomePage) . ' | ' .
          html_ref('RecentChanges', 'RecentChanges') . ' | ' .
+         (($path!="")? html_parents_top($path) . ' | ' : '') .
          '<a href="' . $PrefsScript . '">Preferences</a>';
 }
 function html_history_entry($page, $version, $time, $host, $user, $c1, $c2,

[Tavi-cvs-commit] CVS: tavi/lib defaults.php,1.7,1.8

[Even H. <ho...@us...>]

Update of /cvsroot/tavi/tavi/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv30163

Modified Files:
	defaults.php 
Log Message:
Choose $TempDir based on os

Index: defaults.php
===================================================================
RCS file: /cvsroot/tavi/tavi/lib/defaults.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- defaults.php	14 Aug 2003 14:46:04 -0000	1.7
+++ defaults.php	29 Aug 2003 15:14:01 -0000	1.8
@@ -124,7 +124,8 @@
 $RateEdit   = 20;
 
 // $TempDir determines the location of temp files used for computing diffs.
-$TempDir = '/tmp';
+// The default selects depending on OS, but could/should be set to a given value
+$TempDir = strncmp(PHP_OS, "WIN", 3) ? $_ENV["TEMP"] : '/tmp';
 
 // $DiffCmd determines what command to run to compute diffs.
 $DiffCmd = '/usr/bin/diff';
@@ -248,6 +249,7 @@
                      'LinkTable'     => 'view_macro_linktab',
                      'OrphanedPages' => 'view_macro_orphans',
                      'WantedPages'   => 'view_macro_wanted',
+                     'TitleSearch'   => 'view_macro_titlesearch',
                      'PageLinks'     => 'view_macro_outlinks',
                      'PageRefs'      => 'view_macro_refs'
                    );
@@ -259,4 +261,4 @@
                      'parse_define_sisterwiki',
                      'parse_define_links'
                    );
-?>
+?>
\ No newline at end of file

[Tavi-cvs-commit] CVS: tavi/template common.php,1.10,1.11

[Even H. <ho...@us...>]

Update of /cvsroot/tavi/tavi/template
In directory sc8-pr-cvs1:/tmp/cvs-serv28196

Modified Files:
	common.php 
Log Message:
Supply path of page to html_toolbar_top(). See next commit... ;)

Index: common.php
===================================================================
RCS file: /cvsroot/tavi/tavi/template/common.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- common.php	12 Jul 2003 14:09:01 -0000	1.10
+++ common.php	29 Aug 2003 15:03:13 -0000	1.11
@@ -27,6 +27,7 @@
   $keywords = ' ' . html_split_name($args['headlink']);
   $keywords = str_replace('"', '"', $keywords);
 
+  preg_match("/^(.*)\//", $args['headlink'], $path); // Find startpath of page
   ob_start();                           // Start buffering output.
 
   if($SeparateTitleWords)
@@ -77,7 +78,7 @@
   <div id="toolbar-top">
 <?php
   if($args['toolbar'])
-    { print html_toolbar_top(); }
+    { print html_toolbar_top($path[1]); }
 ?>
 
 </div>

[Tavi-cvs-commit] CVS: tavi/parse transforms.php,1.28,1.29

[Even H. <ho...@us...>]

Update of /cvsroot/tavi/tavi/parse
In directory sc8-pr-cvs1:/tmp/cvs-serv29288/parse

Modified Files:
	transforms.php 
Log Message:
Removed grouping from patterns by using ?: in lib/defaults.php, and updated
parse/transforms.php accordingly. And fixed $LinkPtn to allow multiple levels
of subpages.


Index: transforms.php
===================================================================
RCS file: /cvsroot/tavi/tavi/parse/transforms.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- transforms.php	1 Jul 2003 19:26:22 -0000	1.28
+++ transforms.php	14 Aug 2003 14:46:04 -0000	1.29
@@ -62,7 +62,7 @@
     { $ptn = "/(^|[^A-Za-z])(!?$LinkPtn)((\#[A-Za-z]([-A-Za-z0-9_:.]*[-A-Za-z0-9_])?)?)(\"\")?/e"; }
 
   return preg_replace($ptn,
-                      "q1('\\1').wikiname_token(q1('\\2'),'\\4')",
+                      "q1('\\1').wikiname_token(q1('\\2'),'\\3')",
                       $text, -1);
 }
 
@@ -108,7 +108,7 @@
   global $InterwikiPtn;
 
   return preg_replace("/(^|[^A-Za-z])($InterwikiPtn)(?=\$|[^\\/=&~A-Za-z0-9])/e",
-                      "q1('\\1').interwiki_token(q1('\\3'),q1('\\4')).q1('\\6')",
+                      "q1('\\1').interwiki_token(q1('\\3'),q1('\\4')).q1('\\5')",
                       $text, -1);
 }
 
@@ -137,7 +137,7 @@
   global $UrlPtn;
 
   return preg_replace("/\\[($UrlPtn) ([^]]+)]/e",
-                      "url_token(q1('\\1'), q1('[\\4]'))", $text, -1);
+                      "url_token(q1('\\1'), q1('[\\2]'))", $text, -1);
 }
 
 function parse_hyperlink($text)
@@ -145,7 +145,7 @@
   global $UrlPtn;
 
   return preg_replace("/(^|[^A-Za-z])($UrlPtn)(\$|[^\\/?=&~A-Za-z0-9])/e",
-                      "q1('\\1').url_token(q1('\\2'), q1('\\2')).q1('\\5')", $text, -1);
+                      "q1('\\1').url_token(q1('\\2'), q1('\\2')).q1('\\3')", $text, -1);
 }
 
 function url_token($value, $display)

[Tavi-cvs-commit] CVS: tavi ChangeLog.txt,1.9,1.10

[Even H. <ho...@us...>]

Update of /cvsroot/tavi/tavi
In directory sc8-pr-cvs1:/tmp/cvs-serv29288

Modified Files:
	ChangeLog.txt 
Log Message:
Removed grouping from patterns by using ?: in lib/defaults.php, and updated
parse/transforms.php accordingly. And fixed $LinkPtn to allow multiple levels
of subpages.


Index: ChangeLog.txt
===================================================================
RCS file: /cvsroot/tavi/tavi/ChangeLog.txt,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- ChangeLog.txt	12 Jul 2003 14:09:01 -0000	1.9
+++ ChangeLog.txt	14 Aug 2003 14:46:04 -0000	1.10
@@ -2,6 +2,13 @@
 
 WikkiTikkiTavi - ChangeLog
 --------------------------
+
+2003-08-14  Even Holen <eve...@pv...>
+  * lib/defaults.php: Removed grouping from patterns, and included
+    multi-level subpage-support
+  * parse/transforms.php: Corrected the subpattern matching according
+    to change in lib/defaults.php
+
 2003-07-12  Even Holen <eve...@pv...>
   * template/wiki.css: Made css-compliant again, and added code to remove
     items from footer in printout

[Tavi-cvs-commit] CVS: tavi/lib defaults.php,1.6,1.7

[Even H. <ho...@us...>]

Update of /cvsroot/tavi/tavi/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv29288/lib

Modified Files:
	defaults.php 
Log Message:
Removed grouping from patterns by using ?: in lib/defaults.php, and updated
parse/transforms.php accordingly. And fixed $LinkPtn to allow multiple levels
of subpages.


Index: defaults.php
===================================================================
RCS file: /cvsroot/tavi/tavi/lib/defaults.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- defaults.php	30 Jun 2003 10:47:00 -0000	1.6
+++ defaults.php	14 Aug 2003 14:46:04 -0000	1.7
@@ -15,25 +15,23 @@
 //**********************************************************************
 
 // The following variables establish the format for WikiNames in this wiki.
-//   Note that changing this might require a change to parse/transforms.php so
-//   that parse_wikiname knows how many parentheses are included in $LinkPtn.
 $UpperPtn = "[A-Z\xc0-\xde]";
 $LowerPtn = "[a-z\xdf-\xfe]";
 $AlphaPtn = "[A-Za-z\xc0-\xfe]";
 $LinkPtn = $UpperPtn . $AlphaPtn . '*' . $LowerPtn . '+' .
-           $UpperPtn . $AlphaPtn . '*(\\/' . $UpperPtn . $AlphaPtn . '*)?';
+           $UpperPtn . $AlphaPtn . '*(?:(?:\\/' . $UpperPtn . $AlphaPtn . '*)+)?';
 
 // $UrlPtn establishes the format for URLs in this wiki.
-//   Note that changing this requires a change to parse/transforms.php so
-//   that parse_hyperlinkxxx know how many parentheses are included in $UrlPtn.
-$UrlPtn  = "(http:|mailto:|https:|ftp:|gopher:|news:)" .
-           "([^ \\/\"\']*\\/)*[^ \\t\\n\\/\"\']*[A-Za-z0-9\\/?=&~_]";
+$UrlPtn  = "(?:https?:|mailto:|ftp:|gopher:|news:)" .
+           "(?:[^ \\/\"\']*\\/)*[^ \\t\\n\\/\"\']*[A-Za-z0-9\\/?=&~_]";
 
 // $InterWikiPtn establishes the format for InterWiki links in this wiki.
-//   Note that changing this requires a change to parse/transforms.php so
-//   that parse_interwiki knows how many parentheses are in $InterwikiPtn.
 $InterwikiPtn = "([A-Za-z0-9]+):" .
-                "(([^ \\/\"\']*\\/)*[^ \\t\\n\\/\"\']*[\\/=&~A-Za-z0-9])";
+                "((?:[^ \\/\"\']*\\/)*[^ \\t\\n\\/\"\']*[\\/=&~A-Za-z0-9])";
+// Note: To avoid side effect of using parentheses in both $LinkPtn, $UrlPtn and
+//       $InterwikiPtn the special syntax (?: is used. This hides the parentheses
+//       from respectively parse_wikinames, parse_hyperlinkXXX and parse_interwiki
+//       in parse/transforms.php
 
 // !!!WARNING!!!
 // If $AdminEnabled is set to 1, the script admin/index.php will be accessible.

Re: [Tavi-cvs-commit] CVS: tavi/template common.php,1.9,1.10 wiki.css,1.9,1.10

[Even H. <ev...@pv...>]

On Sat, Jul 12, 2003 at 01:05:34PM -0400, Kimmo Suominen wrote:
> The "form" class is not used in the CSS -- is this an oversight?
> 

I just made the change to make it more coherent. Somewhere around
version 0.30 I will do a major cleanup and remove non-useful markup, and
also clean up the use of ids and/or classes. 

For the time being I just moved the existing code around a bit, pending
for a proper cleanup later. 

Regards,
Even Holen
-- 
<><   Even Holen, ev...@pv..., http://www.pvv.ntnu.no/~evenh/   :-)

Re: [Tavi-cvs-commit] CVS: tavi/template common.php,1.9,1.10 wiki.css,1.9,1.10

[Kimmo S. <kim...@su...>]

The "form" class is not used in the CSS -- is this an oversight?

+ Kim


| From:    Even Holen <ho...@us...>
| Date:    Sat, 12 Jul 2003 07:09:03 -0700
|
| Update of /cvsroot/tavi/tavi/template
| In directory sc8-pr-cvs1:/tmp/cvs-serv9968/template
|
| Modified Files:
| 	common.php wiki.css
| Log Message:
| * template/wiki.css: Made css-compliant again, and added code to remove  item
| s from footer in printout
| * templace/common.php: Cleaned up some code in the common_epilogue
|
|
| Index: common.php
| ===================================================================
| RCS file: /cvsroot/tavi/tavi/template/common.php,v
| retrieving revision 1.9
| retrieving revision 1.10
| diff -u -d -r1.9 -r1.10
| --- common.php	30 Jun 2003 10:47:01 -0000	1.9
| +++ common.php	12 Jul 2003 14:09:01 -0000	1.10
| @@ -74,7 +74,7 @@
|      print $args['headsufx'];
|  ?>
|    </h1>
| -  <div id="toolbar_top">
| +  <div id="toolbar-top">
|  <?php
|    if($args['toolbar'])
|      { print html_toolbar_top(); }
| @@ -113,14 +113,8 @@
|  ?>
|  <div id="footer">
|  <hr />
| +<div id="toolbar-bottom">
|  <?php
| -  if(!$args['nosearch'])
| -  {
| -?>
| -<form method="get" action="<?php print $FindScript; ?>">
| -<div class="form">
| -<?php
| -  }
|    if($args['edit'])
|    {
|      if($args['editver'] == 0)
| @@ -151,6 +145,7 @@
|    if($args['timestamp'])
|    {
|  ?>
| +</div>
|    Document last modified <?php print html_time($args['timestamp']); ?><br />
|  <?php
|    }
| @@ -167,10 +162,12 @@
|    if(!$args['nosearch'])
|    {
|  ?>
| +<div class="form">
| +<form method="get" action="<?php print $FindScript; ?>">
|    <input type="hidden" name="action" value="find" />
|    Search: <input type="text" name="find" size="20" />
| -</div>
|  </form>
| +</div>
|  <?php
|    }
|  ?>
|
| Index: wiki.css
| ===================================================================
| RCS file: /cvsroot/tavi/tavi/template/wiki.css,v
| retrieving revision 1.9
| retrieving revision 1.10
| diff -u -d -r1.9 -r1.10
| --- wiki.css	30 Jun 2003 10:47:01 -0000	1.9
| +++ wiki.css	12 Jul 2003 14:09:01 -0000	1.10
| @@ -55,5 +55,8 @@
|    { clear: both; }
|
|  @media print {
| - div#header #toolbar_top { display: none}
| + body                       { background-color: #ffffff; color: #000000; }
| + div#header #toolbar-top    { display: none; }
| + div#footer #toolbar-bottom { display: none; }
| + div#footer form            { display: none; }
|  }
|

[Tavi-cvs-commit] CVS: tavi/template common.php,1.9,1.10 wiki.css,1.9,1.10

[Even H. <ho...@us...>]

Update of /cvsroot/tavi/tavi/template
In directory sc8-pr-cvs1:/tmp/cvs-serv9968/template

Modified Files:
	common.php wiki.css 
Log Message:
* template/wiki.css: Made css-compliant again, and added code to remove  items from footer in printout
* templace/common.php: Cleaned up some code in the common_epilogue


Index: common.php
===================================================================
RCS file: /cvsroot/tavi/tavi/template/common.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- common.php	30 Jun 2003 10:47:01 -0000	1.9
+++ common.php	12 Jul 2003 14:09:01 -0000	1.10
@@ -74,7 +74,7 @@
     print $args['headsufx'];
 ?>
   </h1>
-  <div id="toolbar_top">
+  <div id="toolbar-top">
 <?php
   if($args['toolbar'])
     { print html_toolbar_top(); }
@@ -113,14 +113,8 @@
 ?>
 <div id="footer">
 <hr />
+<div id="toolbar-bottom">
 <?php
-  if(!$args['nosearch'])
-  {
-?>
-<form method="get" action="<?php print $FindScript; ?>">
-<div class="form">
-<?php
-  }
   if($args['edit'])
   {
     if($args['editver'] == 0)
@@ -151,6 +145,7 @@
   if($args['timestamp'])
   {
 ?>
+</div>
   Document last modified <?php print html_time($args['timestamp']); ?><br />
 <?php
   }
@@ -167,10 +162,12 @@
   if(!$args['nosearch'])
   {
 ?>
+<div class="form">
+<form method="get" action="<?php print $FindScript; ?>">
   <input type="hidden" name="action" value="find" />
   Search: <input type="text" name="find" size="20" />
-</div>
 </form>
+</div>
 <?php
   }
 ?>

Index: wiki.css
===================================================================
RCS file: /cvsroot/tavi/tavi/template/wiki.css,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- wiki.css	30 Jun 2003 10:47:01 -0000	1.9
+++ wiki.css	12 Jul 2003 14:09:01 -0000	1.10
@@ -55,5 +55,8 @@
   { clear: both; }
 
 @media print {
- div#header #toolbar_top { display: none}
+ body                       { background-color: #ffffff; color: #000000; }
+ div#header #toolbar-top    { display: none; }
+ div#footer #toolbar-bottom { display: none; }
+ div#footer form            { display: none; }
 }

[Tavi-cvs-commit] CVS: tavi ChangeLog.txt,1.8,1.9

[Even H. <ho...@us...>]

Update of /cvsroot/tavi/tavi
In directory sc8-pr-cvs1:/tmp/cvs-serv9968

Modified Files:
	ChangeLog.txt 
Log Message:
* template/wiki.css: Made css-compliant again, and added code to remove  items from footer in printout
* templace/common.php: Cleaned up some code in the common_epilogue


Index: ChangeLog.txt
===================================================================
RCS file: /cvsroot/tavi/tavi/ChangeLog.txt,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ChangeLog.txt	30 Jun 2003 10:47:00 -0000	1.8
+++ ChangeLog.txt	12 Jul 2003 14:09:01 -0000	1.9
@@ -2,6 +2,14 @@
 
 WikkiTikkiTavi - ChangeLog
 --------------------------
+2003-07-12  Even Holen <eve...@pv...>
+  * template/wiki.css: Made css-compliant again, and added code to remove
+    items from footer in printout
+  * templace/common.php: Cleaned up some code in the common_epilogue
+
+2003-07-03  Even Holen <eve...@pv...>
+  * **  Version 0.23 released **
+
 2003-06-30  Even Holen <eve...@pv...>
   * parse/transforms.php and parse/save.php: Removed fixed regarding
     parse_clear which removed all text. Inserted parse_no_macros instead

Re: [Tavi-cvs-commit] CVS: tavi/parse macros.php,1.10,1.10.2.1 save.php,1.5,1.5.2.1 transforms.php,1.25,1.25.2.1

[Even H. <ev...@pv...>]

On Wed, Jul 02, 2003 at 07:42:37PM -0400, Kimmo Suominen wrote:
> I'm using categories as a quick index on pages that do not otherwise
> reference the other pages in the category.  I don't like that approach
> as much anymore, though, since there is no alphabetical sort option.

Ahh... But this I plan to change...  After implementing 
TaviSuggestions/CurlyOptions this is a natural candidate for the use of
options. So one day you might write this as: 
 
  [[! {sort=alphabetical}  WhatEver MyOtherPages AndStuff ]]
or maybe the short form:
  [[! {so=a}  WhatEver MyOtherPages AndStuff ]]

> However, I don't think the pages should be considered orphaned.

Which other considerations, other than time consumption, are there for
not executing macros during the on save procedure?

Why was the execution removed in the first place? Enabling them would
possible solve all these issues, with the exception of saving taking
more time.

Executing macros would give: 
 + A correct OrphanedPages with regards to pages in categories
 + Updated link databases, even after sorting
 + No macro names showing on WantedPages
 - Slow down on saving
 - Incorrect OrphanedPages as pages listed on OrphanedPaged would not
   be OrphanedPages... ;(

Not every issue are easily solved... Anyone have a Columbi egg?

Regards,
Even Holen
-- 
<><   Even Holen, ev...@pv..., http://www.pvv.ntnu.no/~evenh/   :-)

Re: [Tavi-cvs-commit] CVS: tavi/parse macros.php,1.10,1.10.2.1 save.php,1.5,1.5.2.1 transforms.php,1.25,1.25.2.1

[Kimmo S. <kim...@su...>]

I'm using categories as a quick index on pages that do not otherwise
reference the other pages in the category.  I don't like that approach
as much anymore, though, since there is no alphabetical sort option.
However, I don't think the pages should be considered orphaned.

+ Kim


| From:    Even Holen <ev...@pv...>
| Date:    Thu, 03 Jul 2003 01:21:48 +0200
|
| I see your point, and will take it into consideration.  I'm still
| thinking of categories as a way to organize pages according to my
| liking, and that these pages would/should have other links to give them
| a proper place in the web of pages. And following this train of
| thoughts they would not end up on OrphanedPages => This added to my
| decision of implementing this patch.

Re: [Tavi-cvs-commit] CVS: tavi/parse macros.php,1.10,1.10.2.1 save.php,1.5,1.5.2.1 transforms.php,1.25,1.25.2.1

[Even H. <ev...@pv...>]

On Wed, Jul 02, 2003 at 04:01:49PM -0700, Scott Moonen wrote:
> Even,
> 
> > > >    if($macros_index != -1)
> > > > -    { $ParseEngine[$macros_index] = 'parse_noop'; }
> > > > +    { $ParseEngine[$macros_index] = 'parse_clear'; }
> > > 
> > > I realize you've now changed this to parse_no_macros.  But realize that
> > > either this or parse_no_macros will prevent category pages from showing
> > > up as having links to pages in their category.  Consider what will happen
> > > to andstuff.org/CategoryHomePage, for example.
[...]
> I wasn't thinking about backlinks; as long as the backlink function uses
> find and not the link database we're okay.  I was specifically thinking of
> the link database.  Consider a page that is only referenced in a category
> list.  Your change causes that page to appear on OrphanedPages, which is
> not correct; the page is in fact not orphaned.  Essentially, I am concerned
> that a category's contents are not associated with that category for all the
> various link database purposes.
> 
> Just my opinion. :-)  Since y'all are now in charge I defer to your decision.

I see your point, and will take it into consideration.  I'm still
thinking of categories as a way to organize pages according to my
liking, and that these pages would/should have other links to give them
a proper place in the web of pages. And following this train of
thoughts they would not end up on OrphanedPages => This added to my
decision of implementing this patch.

Two related issues: 

1) Is it natural that WantedPages, OrphanedPages, PageLinks, and all the
other macros should reside in a page with that given name? In Norwegian
I would like WantedPages to reside in a page called "SisteEndringer". 

I've also implemented a TitleSearch macro, not included in main
distribution yet, where one might do something like: 
   [[TitleSearch ^TaviD ]]
This might output the list: TaviDevelopment, TaviDownload, etc.
2a) Is it natural that TitleSearch and TaviD shows on the OrphanedPages?
2b) Should the result be shown within the link database?  


My answers are:
To 1): I think we should allow for nationalisation of page names, and
thus not create 'disturbance' because of the use of macros. This is also
one of the reason for this patch.

To 2a): I didn't like that the parameters of TitleSearch (or TitleSearch
itself) displayed in OrphanedPages. And TitleSearch is a macro I predict
would be used on quite a few pages (at some sites) to create index lists
and stuff like that based on page names. (Given that the site has some
naming schemes allowing for such searches)

To 2b): I think that I'd like the result to go into the link database.
And as such I think I would like the displayed category pages to be
included in the link database. But I'm not sure whether it's easily
done. For categories it's easy since it lists the actual names, for
macros such as TitleSearch not so easy as the search result are not
given in advance. 

It could however be done, but then we have to allow execution of macros, 
and then parse it afterwards for links. (Hmmm... This would solve an 
issue of non-existing username on i.e. RecentChanges _not_ showing up 
on WantedPages. But it would slow down the save process a bit)

So in my world I've settled, for the time being, with this patch
removing the macro text, and thus not adding 'noise' to the
OrphanedPages. Another solution would be to have a sort of no-show list
for OrphanedPages, but is that constructive?

Regards,
Even Holen
-- 
<><   Even Holen, ev...@pv..., http://www.pvv.ntnu.no/~evenh/   :-)

Re: [Tavi-cvs-commit] Re: alpha patterns

[Scott M. <sm...@an...>]

On Mon, Jun 30, 2003 at 05:27:36PM -0400, Kimmo Suominen wrote:
> Or chr(127) (DEL), as a "regular" character that can be produced on
> a keyboard, yet doesn't appear in "printable" text.

I like that.

  -- Scott

-- 
http://scott.andstuff.org/