diff options
| -rwxr-xr-x | tools/doxy2json/ardourdoc.sh | 1 | ||||
| -rwxr-xr-x | tools/fmt-luadoc.php | 11 |
2 files changed, 11 insertions, 1 deletions
diff --git a/tools/doxy2json/ardourdoc.sh b/tools/doxy2json/ardourdoc.sh index 0ec2ce6605..6b2faadb5b 100755 --- a/tools/doxy2json/ardourdoc.sh +++ b/tools/doxy2json/ardourdoc.sh @@ -59,6 +59,7 @@ foreach (json_decode (\$json, true) as \$a) { \$a['decl'] = str_replace ('const long', 'long', \$a['decl']); \$a['decl'] = str_replace ('const unsigned int', 'unsigned int', \$a['decl']); \$a['decl'] = str_replace ('const unsigned long', 'unsigned long', \$a['decl']); + \$a['decl'] = str_replace (' ::Vamp::', ' Vamp::', \$a['decl']); \$canon = str_replace (' *', '*', \$a['decl']); \$api[\$canon] = \$a; } diff --git a/tools/fmt-luadoc.php b/tools/fmt-luadoc.php index 938a774ed4..3f7ef99b72 100755 --- a/tools/fmt-luadoc.php +++ b/tools/fmt-luadoc.php @@ -102,6 +102,10 @@ function arg2lua ($argtype, $flags = 0) { return array ($arg => $flags); } + if ($arg == 'luabridge::LuaRef') { + return array ('Lua-Function' => $flags | 4); + } + # check Class declarations first foreach (array_merge ($classes, $consts) as $b) { if ($b['ldec'] == $arg) { @@ -200,6 +204,8 @@ function canonical_decl ($b) { $a = preg_replace ('/([^>]) >/', '$1>', $a); $a = preg_replace ('/^Cairo::/', '', $a); // special case cairo enums $a = preg_replace ('/([^ ])&/', '$1 &', $a); + $a = preg_replace ('/std::vector<([^>]*)> const/', 'const std::vector<$1>', $a); + $a = str_replace ('std::vector', 'vector', $a); $a = str_replace ('vector', 'std::vector', $a); $a = str_replace ('std::string', 'string', $a); $a = str_replace ('string const', 'const string', $a); @@ -577,7 +583,10 @@ function format_args ($args) { foreach ($args as $a) { if (!$first) { $rv .= ', '; }; $first = false; $flags = $a[varname ($a)]; - if ($flags & 2) { + if ($flags & 4) { + $rv .= '<span>'.varname ($a).'</span>'; + } + else if ($flags & 2) { $rv .= '<em>LuaTable</em> {'.typelink (varname ($a), true, 'em').'}'; } elseif ($flags & 1) { |