From c5906ca471012a6a03e999a1cd44ea2d21263e43 Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Wed, 13 Apr 2016 00:48:39 +0200
Subject: update luadoc tools

---
 tools/fmt-luadoc.php   | 21 ++++++++++++++++-----
 tools/update_luadoc.sh |  4 +++-
 2 files changed, 19 insertions(+), 6 deletions(-)

(limited to 'tools')

diff --git a/tools/fmt-luadoc.php b/tools/fmt-luadoc.php
index 530a4d8c48..073061d068 100755
--- a/tools/fmt-luadoc.php
+++ b/tools/fmt-luadoc.php
@@ -420,8 +420,10 @@ foreach ($classlist as $ns => $cl) {
 		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 +483,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 '';
 }
 
 ################################################################################
@@ -932,7 +943,7 @@ 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;
+		echo '<p class="cdecl"><em>C&#8225;</em>: '.htmlentities ($cl['cdecl']).'</p>'.NL;
 	}
 
 	# print class inheritance (direct parent *name* only)
diff --git a/tools/update_luadoc.sh b/tools/update_luadoc.sh
index 048374d835..07001cab58 100755
--- a/tools/update_luadoc.sh
+++ b/tools/update_luadoc.sh
@@ -9,7 +9,9 @@ test -e ../gtk2_ardour/arluadoc
 test -e ../build/gtk2_ardour/luadoc
 
 # generate ../doc/ardourapi.json.gz
-./doxy2json/ardourdoc.sh
+if test -z "$1"; then
+	./doxy2json/ardourdoc.sh
+fi
 
 # generate ../doc/luadoc.json.gz
 $DIR/../gtk2_ardour/arluadoc
-- 
cgit v1.2.3