fix cURL/SSL

[ardour.git] / tools / fmt-luadoc.php

diff --git a/tools/fmt-luadoc.php b/tools/fmt-luadoc.php
index 530a4d8c48e856259b868f12701f86f2c5e44fc0..7f7b35d589c74084deb71a85cb4dd516611cead9 100755 (executable)
--- a/tools/fmt-luadoc.php
+++ b/tools/fmt-luadoc.php
@@ -384,6 +384,7 @@ foreach ($doc as $b) {
                        'cand' => canonical_decl ($b)
                );
                break;
+       case "Cast":
        case "Weak/Shared Pointer Cast":
                checkclass ($b);
                $classlist[luafn2class ($b['lua'])]['cast'][] = array (
@@ -414,14 +415,17 @@ foreach ($doc as $b) {
 foreach ($classlist as $ns => $cl) {
        if (strpos ($cl['type'], ' Array') !== false) {
                $classlist[$ns]['arr'] = true;
+               $classlist[$ns]['cdecl'] = $cl['decl'];
                continue;
        }
        foreach ($classes as $c) {
                if ($c['lua'] == $ns) {
                        if (strpos ($c['type'], 'Pointer Class') !== false) {
                                $classlist[$ns]['ptr'] = true;
-                               $classlist[$ns]['decl'] = 'boost::shared_ptr< '.$c['decl']. ' >, boost::weak_ptr< '.$c['decl']. ' >';
+                               $classlist[$ns]['cdecl'] = 'boost::shared_ptr< '.$c['decl']. ' >, boost::weak_ptr< '.$c['decl']. ' >';
                                break;
+                       } else {
+                               $classlist[$ns]['cdecl'] = $c['decl'];
                        }
                }
        }
@@ -481,10 +485,19 @@ function doxydoc ($canonical_declaration) {
        if (isset ($api[$canonical_declaration])) {
                $dox_found++;
                return $api[$canonical_declaration]['doc'];
-       } else {
-               $dox_miss++;
-               return '';
        }
+       // remove template namespace e.g.
+       //  "ARDOUR::Track::bounceable(boost::shared_ptr<ARDOUR::Processor>"
+       //  "ARDOUR::Track::bounceable(boost::shared_ptr<Processor>"
+       $cn = preg_replace ('/<[^>]*::([^>]*)>/', '<$1>', $canonical_declaration);
+       if (isset ($api[$cn])) {
+               $dox_found++;
+               return $api[$cn]['doc'];
+       }
+       #fwrite (STDERR, $canonical_declaration."\n"); # XXX DEBUG
+
+       $dox_miss++;
+       return '';
 }
 
 ################################################################################
@@ -769,7 +782,7 @@ title: Class Reference
 ---
 
 <p class="warning">
-This documention is far from complete may be inaccurate and subject to change.
+This documentation is far from complete may be inaccurate and subject to change.
 </p>
 
 <?php
@@ -931,8 +944,8 @@ foreach ($classlist as $ns => $cl) {
        }
 
        # show original C++ declaration
-       if (isset ($cl['decl'])) {
-               echo '<p class="cdecl"><em>C&#8225;</em>: '.htmlentities ($cl['decl']).'</p>'.NL;
+       if (isset ($cl['cdecl'])) {
+               echo '<p class="cdecl"><em>C&#8225;</em>: '.htmlentities ($cl['cdecl']).'</p>'.NL;
        }
 
        # print class inheritance (direct parent *name* only)