--- dokuwiki-2011-05-25a/lib/plugins/imagereference/syntax.php     2008-09-11 18:29:12.000000000 +1200
+++ dokuwiki/lib/plugins/imagereference/syntax.php      2012-01-19 11:03:52.285067251 +1300
@@ -22,6 +22,7 @@
        
        var $_figure_name_array = array("");
        var $_figure_map = array();
+        var $_captions = array();
        
        
    /**
@@ -80,13 +81,17 @@
     * @see render()
     */
     function connectTo($mode) {
+
       $this->Lexer->addSpecialPattern('<imgref\s[^\r\n]*?>',$mode, 'plugin_imagereference');
-         $this->Lexer->addEntryPattern('<imgcaption\s[^\r\n\|]*?>(?=.*?</imgcaption.*?>)',$mode,'plugin_imagereference');
-         $this->Lexer->addEntryPattern('<imgcaption\s[^\r\n\|]*?\|(?=[^\r\n]*>.*?</imgcaption.*>)',$mode,'plugin_imagereference');
+      $this->Lexer->addSpecialPattern('<tblref\s[^\r\n]*?>',$mode, 'plugin_imagereference');
+
+      $this->Lexer->addEntryPattern('<imgcaption\s[^\|]+\|[^>]+(?=>.*?</imgcaption>)',$mode,'plugin_imagereference');
+      $this->Lexer->addEntryPattern('<tblcaption\s[^\|]+\|[^>]+(?=>.*?</tblcaption>)',$mode,'plugin_imagereference');
     }
- 
+
     function postConnect() {
       $this->Lexer->addExitPattern('</imgcaption>', 'plugin_imagereference');
+      $this->Lexer->addExitPattern('</tblcaption>', 'plugin_imagereference');
     }
        
  
@@ -120,24 +125,39 @@
     * @static
     */
     function handle($match, $state, $pos, &$handler){
-       
         switch ($state) {
         // =========================================================
            case DOKU_LEXER_ENTER : {
-               /* --------------------------------------------------- */
-               $refLabel = trim(substr($match, 11, -1));
+
+             /* --------------------------------------------------- */
+             $refLabel = ''; //trim(substr($match, 11, -1));
+             $caption = '';
+             if (preg_match('/<(?:img|tbl)caption\s+([^\|]+)\|([^>]+)/', $match, $matches))
+             {
+               $refLabel = $matches[1];
+               $caption = $matches[2];
+             }
                // -----------------------------------------------------
                $parsedInput = $this->_parseParam($refLabel);
-               
+
                // ------------------------------------------------------
                //$data = $this->_imgstart($parsedInput);
                // store the figure name from imgcaption
                array_push($this->_figure_name_array, $parsedInput[0]);
-               
-               $this->_figure_map[$parsedInput[0]] = "";
-               
+
+               $this->_figure_map[$parsedInput[0]] = '';
+
+                $this->_captions[$parsedInput[0]] = $caption;
+
+                ///cho '<p>refLabel:' . $refLabel . '</p>';
+                ///cho '<p>parsedInput:' . print_r($parsedInput, true) . '</p>';
+                ///cho '<p>figure_name_array: ' . print_r($this->_figure_name_array, true) . '</p>';
+                ///cho '<p>figure_map: ' . print_r($this->_figure_map, true) . '</p>';
+                ///cho '<p>captions: ' . print_r($this->_captions, true). '</p>';
+
                return array('caption_open', $parsedInput);  // image anchor label
                /* --------------------------------------------------- */
+                //}
            }
         // =========================================================
           case DOKU_LEXER_UNMATCHED : {
@@ -191,7 +211,6 @@
     * @see handle()
     */
     function render($mode, &$renderer, $indata) {
-       
         list($case, $data) = $indata;
         if($mode == 'xhtml'){
                // ---------------------------------------------
@@ -200,8 +219,14 @@
                        /* --------------------------------------- */
                        $refNumber = array_search($data, $this->_figure_name_array);
                        if ($refNumber == null || $refNumber == "")
-                               $refNumber = "##";
-                       $str = "<a href=\"#".$data."\">".$this->getLang('figure').$refNumber." </a>";
+                        {
+                          $refNumber = "##";
+                        }
+                        if (strpos($data,'#') === false)
+                        {
+                          $data = "#" . $data;
+                        }
+                       $str = "<a class=\"wikilink1\" href=\"".$data."\">".$this->getLang('figure').$refNumber."</a>";
                        $renderer->doc .= $str; break;
 //                      $renderer->_xmlEntities($str);break;
                        /* --------------------------------------- */
@@ -210,10 +235,26 @@
                case 'caption_close' :  {
                        // -------------------------------------------------------
                                list($name, $number, $caption) = $data;
-                               $layout = "<div class=\"undercaption\">".$this->getLang('fig').$number.": 
-                                       <a name=\"".$name."\">".$caption."</a><a href=\" \"><span></span></a>
-                                       </div></div>";
-                                       $renderer->doc .= $layout; break;
+                        // - retrieve the caption separately
+                        $caption = $this->_captions[$name];
+                        // - special case for 'hidden' tables
+                        $layout = '';
+                        if ($caption != '##HIDDEN##')
+                        {
+                          // - manual do any formatting (as leaving it to the
+                          //   parser (to foobar) is why we had to do this in
+                          //   the first place
+                          $caption = preg_replace('/\/\/%%(.+?)%%\/\//','<i>\1</i>',$caption);
+                          $caption = preg_replace('/\/\/(.+?)\/\//','<i>\1</i>',$caption);
+                          $caption = preg_replace('/\*\*(.+?)\*\*/','<b>\1</b>',$caption);
+                          $caption = str_replace('%!--', '<!--', $caption);
+                          $caption = str_replace('--%', '-->', $caption);
+                          // - special case: nested image ref (we can't really resolve these)
+                          $caption = preg_replace('/<imgref\s+([^>]+)><\/imgref>/','\1',$caption);
+                          $layout = "<div class=\"undercaption\">".$this->getLang('fig').$number.": <a name=\"".$name."\"></a>".$caption."</div>";
+                          }
+                        $layout .= "</div>";
+                        $renderer->doc .= $layout; break;
                }
                                // -------------------------------------------------------      
                                // data is mostly empty!!!
@@ -284,7 +325,7 @@
     
     function _imgstart($str) {
        // ============================================ //
-       if (!strlen($str)) return array();
+      if (empty($str)) return '';
        
                $layout = "<div class=\"imgcaption";
                //$layout = "<div><div class=\"imgcaption";
@@ -304,6 +345,8 @@
      * @return array(imagename, image number, image caption)
      */
     function _imgend($str) {
+      // [jmt12] I think this function is unused!
+
        // ===================================================== //
        $figureName = end($this->_figure_name_array);
        // get the position of the figure in the array
@@ -311,8 +354,9 @@
                
                return array($figureName, $refNumber, $str);
                
+
                $layout = "<div class=\"undercaption\">".$this->getLang('fig').$refNumber.": 
-               <a name=\"".end($this->_figure_name_array)."\">".$str."</a></div>";
+               <a name=\"".end($this->_figure_name_array)."\"></a>".$str."</div>";
                
                //$layout = "<div id=\"undercaption\">Fig. ".$refNumber.": 
                //<a name=\"".end($this->_figure_name_array)."\">".$str."</a></div></div></div>";