Docs/Doxybook: Move the Doxybook logic that marks things as "Inherite…

…d from"

into each synopsis template so that newlines are inserted in the right place.

docs/doxybook_templates/class_members.tmpl

@@ -35,9 +35,9 @@
 {%- if exists("baseClasses") -%}{%- for base in baseClasses -%}
   {%- if existsIn(base, "publicTypes") -%}
     {%- for child in base.publicTypes -%}
-      {%- set base.synopsis_indent_width = default(synopsis_indent_width, 0) -%}
-      {{- render("synopsis_inherited_from.tmpl", base) -}}
+      {%- set synopsis_is_inherited = true -%}
       {%- include "synopsis_type.tmpl" -%}
+      {%- set synopsis_is_inherited = false -%}
       {%- set synopsis_needs_leading_line_break = true -%}
     {%- endfor -%}
   {%- endif -%}
@@ -51,9 +51,9 @@
 {%- if exists("baseClasses") -%}{%- for base in baseClasses -%}
   {%- if existsIn(base, "publicClasses") -%}
     {%- for child in base.publicClasses -%}
-      {%- set base.synopsis_indent_width = default(synopsis_indent_width, 0) -%}
-      {{- render("synopsis_inherited_from.tmpl", base) -}}
+      {%- set synopsis_is_inherited = true -%}
       {%- include "synopsis_class.tmpl" -%}
+      {%- set synopsis_is_inherited = false -%}
       {%- set synopsis_needs_leading_line_break = true -%}
     {%- endfor -%}
   {%- endif -%}
@@ -70,9 +70,9 @@
   {%- if existsIn(base, "friends") -%}
     {%- for child in base.friends -%}
       {%- if child.type == "class" or child.type == "struct" -%}
-        {%- set base.synopsis_indent_width = default(synopsis_indent_width, 0) -%}
-        {{- render("synopsis_inherited_from.tmpl", base) -}}
+        {%- set synopsis_is_inherited = true -%}
         {%- include "synopsis_friend_class.tmpl" -%}
+        {%- set synopsis_is_inherited = false -%}
         {%- set synopsis_needs_leading_line_break = true -%}
       {%- endif -%}
     {%- endfor -%}
@@ -87,9 +87,9 @@
 {%- if exists("baseClasses") -%}{%- for base in baseClasses -%}
   {%- if existsIn(base, "publicAttributes") -%}
     {%- for child in base.publicAttributes -%}
-      {%- set base.synopsis_indent_width = default(synopsis_indent_width, 0) -%}
-      {{- render("synopsis_inherited_from.tmpl", base) -}}
+      {%- set synopsis_is_inherited = true -%}
       {%- include "synopsis_variable.tmpl" -%}
+      {%- set synopsis_is_inherited = false -%}
       {%- set synopsis_needs_leading_line_break = true -%}
     {%- endfor -%}
   {%- endif -%}
@@ -103,9 +103,9 @@
 {%- if exists("baseClasses") -%}{%- for base in baseClasses -%}
   {%- if existsIn(base, "publicFunctions") -%}
     {%- for child in base.publicFunctions -%}
-      {%- set base.synopsis_indent_width = default(synopsis_indent_width, 0) -%}
-      {{- render("synopsis_inherited_from.tmpl", base) -}}
+      {%- set synopsis_is_inherited = true -%}
       {%- include "synopsis_function.tmpl" -%}
+      {%- set synopsis_is_inherited = false -%}
       {%- set synopsis_needs_leading_line_break = true -%}
     {%- endfor -%}
   {%- endif -%}
@@ -122,9 +122,9 @@
   {%- if existsIn(base, "friends") -%}
     {%- for child in base.friends -%}
       {%- if child.type != "class" and child.type != "struct" -%}
-        {%- set base.synopsis_indent_width = default(synopsis_indent_width, 0) -%}
-        {{- render("synopsis_inherited_from.tmpl", base) -}}
+        {%- set synopsis_is_inherited = true -%}
         {%- include "synopsis_friend_function.tmpl" -%}
+        {%- set synopsis_is_inherited = false -%}
         {%- set synopsis_needs_leading_line_break = true -%}
       {%- endif -%}
     {%- endfor -%}
@@ -149,9 +149,9 @@
 {%- if exists("baseClasses") -%}{%- for base in baseClasses -%}
   {%- if existsIn(base, "protectedTypes") -%}
     {%- for child in base.protectedTypes -%}
-      {%- set base.synopsis_indent_width = default(synopsis_indent_width, 0) -%}
-      {{- render("synopsis_inherited_from.tmpl", base) -}}
+      {%- set synopsis_is_inherited = true -%}
       {%- include "synopsis_type.tmpl" -%}
+      {%- set synopsis_is_inherited = false -%}
       {%- set synopsis_needs_leading_line_break = true -%}
     {%- endfor -%}
   {%- endif -%}
@@ -165,9 +165,9 @@
 {%- if exists("baseClasses") -%}{%- for base in baseClasses -%}
   {%- if existsIn(base, "protectedClasses") -%}
     {%- for child in base.protectedClasses -%}
-      {%- set base.synopsis_indent_width = default(synopsis_indent_width, 0) -%}
-      {{- render("synopsis_inherited_from.tmpl", base) -}}
+      {%- set synopsis_is_inherited = true -%}
       {%- include "synopsis_class.tmpl" -%}
+      {%- set synopsis_is_inherited = false -%}
       {%- set synopsis_needs_leading_line_break = true -%}
     {%- endfor -%}
   {%- endif -%}
@@ -181,9 +181,9 @@
 {%- if exists("baseClasses") -%}{%- for base in baseClasses -%}
   {%- if existsIn(base, "protectedAttributes") -%}
     {%- for child in base.protectedAttributes -%}
-      {%- set base.synopsis_indent_width = default(synopsis_indent_width, 0) -%}
-      {{- render("synopsis_inherited_from.tmpl", base) -}}
+      {%- set synopsis_is_inherited = true -%}
       {%- include "synopsis_variable.tmpl" -%}
+      {%- set synopsis_is_inherited = false -%}
       {%- set synopsis_needs_leading_line_break = true -%}
     {%- endfor -%}
   {%- endif -%}
@@ -197,9 +197,9 @@
 {%- if exists("baseClasses") -%}{%- for base in baseClasses -%}
   {%- if existsIn(base, "protectedFunctions") -%}
     {%- for child in base.protectedFunctions -%}
-      {%- set base.synopsis_indent_width = default(synopsis_indent_width, 0) -%}
-      {{- render("synopsis_inherited_from.tmpl", base) -}}
+      {%- set synopsis_is_inherited = true -%}
       {%- include "synopsis_function.tmpl" -%}
+      {%- set synopsis_is_inherited = false -%}
       {%- set synopsis_needs_leading_line_break = true -%}
     {%- endfor -%}
   {%- endif -%}

docs/doxybook_templates/synopsis_class.tmpl

@@ -1,4 +1,5 @@
 {%- include "synopsis_leading_line_break.tmpl" -%}
+{%- include "synopsis_inherited_from.tmpl" -%}
 {%- set child.synopsis_indent_width = default(synopsis_indent_width, 0) -%}
 {{- render("synopsis_brief.tmpl", child) -}}
 {#- The Doxygen metadata that a parent has on its nested   -#}{{ noop() -}}

docs/doxybook_templates/synopsis_friend_class.tmpl

@@ -1,4 +1,5 @@
 {%- include "synopsis_leading_line_break.tmpl" -%}
+{%- include "synopsis_inherited_from.tmpl" -%}
 {%- set child.synopsis_indent_width = default(synopsis_indent_width, 0) -%}
 {{- render("synopsis_brief.tmpl", child) -}}
 {{- render("synopsis_template_parameters.tmpl", child) -}}

docs/doxybook_templates/synopsis_friend_function.tmpl

@@ -1,4 +1,5 @@
 {%- include "synopsis_leading_line_break.tmpl" -%}
+{%- include "synopsis_inherited_from.tmpl" -%}
 {%- set child.synopsis_indent_width = default(synopsis_indent_width, 0) -%}
 {{- render("synopsis_brief.tmpl", child) -}}
 {{- render("synopsis_template_parameters.tmpl", child) -}}

docs/doxybook_templates/synopsis_function.tmpl

@@ -1,4 +1,5 @@
 {%- include "synopsis_leading_line_break.tmpl" -%}
+{%- include "synopsis_inherited_from.tmpl" -%}
 {%- set child.synopsis_indent_width = default(synopsis_indent_width, 0) -%}
 {{- render("synopsis_brief.tmpl", child) -}}
 {{- render("synopsis_template_parameters.tmpl", child) -}}

docs/doxybook_templates/synopsis_inherited_from.tmpl

@@ -1,8 +1,4 @@
-<span class="doxybook-comment">{{ noop() -}}
-  {%- if default(synopsis_indent_width, 0) != 0 -%}
-    <code>{%- include "synopsis_indent.tmpl" -%}</code>
-  {%- endif -%}
-  /* Inherited from <code>{{ noop() -}}
-    <b><a href="{{ url }}">{%- include "name_qualified.tmpl" -%}</a></b>{{ noop() -}}
-  </code> */{{ noop() -}}
-</span>{{ noop() -}}
+{%- if default(synopsis_is_inherited, false) != false -%}
+  {%- set base.synopsis_indent_width = default(synopsis_indent_width, 0) -%}
+  {{- render("synopsis_inherited_from_comment.tmpl", base) -}}
+{%- endif -%}

docs/doxybook_templates/synopsis_inherited_from_comment.tmpl

@@ -0,0 +1,8 @@
+<span class="doxybook-comment">{{ noop() -}}
+  {%- if default(synopsis_indent_width, 0) != 0 -%}
+    <code>{%- include "synopsis_indent.tmpl" -%}</code>
+  {%- endif -%}
+  /* Inherited from <code>{{ noop() -}}
+    <b><a href="{{ url }}">{%- include "name_qualified.tmpl" -%}</a></b>{{ noop() -}}
+  </code> */{{ noop() -}}
+</span>{{ noop() -}}

docs/doxybook_templates/synopsis_type.tmpl

@@ -1,4 +1,5 @@
 {%- include "synopsis_leading_line_break.tmpl" -%}
+{%- include "synopsis_inherited_from.tmpl" -%}
 {%- set child.synopsis_indent_width = default(synopsis_indent_width, 0) -%}
 {{- render("synopsis_brief.tmpl", child) -}}
 {{- render("synopsis_template_parameters.tmpl", child) -}}

docs/doxybook_templates/synopsis_variable.tmpl

@@ -1,4 +1,5 @@
 {%- include "synopsis_leading_line_break.tmpl" -%}
+{%- include "synopsis_inherited_from.tmpl" -%}
 {%- set child.synopsis_indent_width = default(synopsis_indent_width, 0) -%}
 {{- render("synopsis_brief.tmpl", child) -}}
 {{- render("synopsis_template_parameters.tmpl", child) -}}