diff --git a/clang-tools-extra/clang-doc/assets/class-template.mustache b/clang-tools-extra/clang-doc/assets/class-template.mustache index bbac3ffae02fb..1197e76ab553c 100644 --- a/clang-tools-extra/clang-doc/assets/class-template.mustache +++ b/clang-tools-extra/clang-doc/assets/class-template.mustache @@ -11,10 +11,10 @@ {{Name}} {{#Stylesheets}} - + {{/Stylesheets}} {{#Scripts}} - + {{/Scripts}} {{! Highlight.js dependency for syntax highlighting }} @@ -22,217 +22,219 @@ - +
+
+
+

{{TagType}} {{Name}}

+
    + {{#HasPublicMembers}} +
  • + Public Members +
    • +
  • +
      + {{#PublicMembers}} +
    • + {{Name}} +
      • + {{/PublicMembers}} +
    +
    • + {{/HasPublicMembers}} + {{#ProtectedMembers}} +
  • + Protected Members +
    • +
  • +
      + {{#Obj}} +
    • + {{Name}} +
      • + {{/Obj}} +
    +
    • + {{/ProtectedMembers}} + {{#HasPublicFunctions}} +
  • + Public Method +
    • +
  • +
      + {{#PublicFunctions}} +
    • + {{Name}} +
      • + {{/PublicFunctions}} +
    +
    • + {{/HasPublicFunctions}} + {{#ProtectedFunction}} +
  • + Protected Method +
    • +
  • +
      + {{#Obj}} +
    • + {{Name}} +
      • + {{/Obj}} +
    +
    • + {{/ProtectedFunction}} + {{#Enums}} +
  • + Enums +
    • +
  • + +
    • + {{/Enums}} + {{#Typedef}} +
  • Typedef
    • + {{/Typedef}} + {{#Record}} +
  • + Inner Classes +
    • +
  • +
      + {{#Links}} +
    • + {{Name}} +
      • + {{/Links}} +
    +
    • + {{/Record}} +
+
+
+
+
+
+

{{TagType}} {{Name}}

+

Defined at line {{Location.LineNumber}} of file {{Location.Filename}}

+ {{#Description}} +
+ {{>Comments}} +
+ {{/Description}} +
+
{{#HasPublicMembers}} -
  • - Public Members -
    • -
  • -
      +
      +

      Public Members

      +
      {{#PublicMembers}} -
    • - {{Name}} -
      • +
      + 
      {{Type}} {{Name}}
      + {{#MemberComments}} +
      + {{>Comments}} +
      + {{/MemberComments}} +
      {{/PublicMembers}} -
    -
    • +
    + {{/HasPublicMembers}} {{#ProtectedMembers}} -
  • - Protected Members -
    • -
  • -
      +
      +

      Protected Members

      +
      {{#Obj}} -
    • - {{Name}} -
      • +
      + 
      {{Type}} {{Name}}
      + {{#MemberComments}} +
      + {{>Comments}} +
      + {{/MemberComments}} +
      {{/Obj}} -
    -
    • +
    + {{/ProtectedMembers}} {{#HasPublicFunctions}} -
  • - Public Method -
    • -
  • - -
    • - {{/HasPublicFunctions}} + + + {{/PublicFunctions}} {{#ProtectedFunction}}
  • Protected Method
    • -
  • - -
    • + {{/ProtectedFunction}} {{#Enums}} -
  • - Enums -
    • -
  • - -
    • + + {{/Enums}} - {{#Typedef}} -
  • Typedef
    • - {{/Typedef}} {{#Record}} -
  • - Inner Classes -
    • -
  • - - -
    -
    -
    -
    -

    {{TagType}} {{Name}}

    -

    Defined at line {{Location.LineNumber}} of file {{Location.Filename}}

    - {{#Description}} -
    - {{>Comments}} -
    - {{/Description}} -
    -
    - {{#HasPublicMembers}} -
    -

    Public Members

    -
    - {{#PublicMembers}} -
    - 
    {{Type}} {{Name}}
    - {{#MemberComments}} -
    - {{>Comments}} -
    - {{/MemberComments}} -
    - {{/PublicMembers}} -
    -
    - {{/HasPublicMembers}} - {{#ProtectedMembers}} -
    -

    Protected Members

    -
    - {{#Obj}} -
    - 
    {{Type}} {{Name}}
    - {{#MemberComments}} -
    - {{>Comments}} -
    - {{/MemberComments}} -
    - {{/Obj}} -
    -
    - {{/ProtectedMembers}} - {{#HasPublicFunctions}} -
    -

    Public Methods

    -
    - {{#PublicFunctions}} - {{>FunctionPartial}} - {{/PublicFunctions}} -
    -
    - {{/PublicFunctions}} - {{#ProtectedFunction}} -
  • - Protected Method -
    • - - {{/ProtectedFunction}} - {{#Enums}} -
    -

    Enumerations

    -
    - {{#Obj}} -{{>EnumPartial}} - {{/Obj}} -
    -
    - {{/Enums}} - {{#Record}} -
    -

    Inner Classes

    - -
    - {{/Record}} - {{#Typedef}} -
    -

    Enums

    -
    - {{/Typedef}} + {{#Typedef}} +
    +

    Enums

    +
    + {{/Typedef}} + - -
    + diff --git a/clang-tools-extra/clang-doc/assets/namespace-template.mustache b/clang-tools-extra/clang-doc/assets/namespace-template.mustache index 8a5be46aee28b..7fb66cadbb8e8 100644 --- a/clang-tools-extra/clang-doc/assets/namespace-template.mustache +++ b/clang-tools-extra/clang-doc/assets/namespace-template.mustache @@ -7,104 +7,103 @@ }} - - - {{NamespaceTitle}} - {{#Stylesheets}} - - {{/Stylesheets}} - {{#Scripts}} - - {{/Scripts}} - {{! Highlight.js dependency for syntax highlighting }} - - - - - - +
    +
    +
    +

    {{RecordType}} {{Name}}

    +
      {{#HasEnums}} -
      -

      Enumerations

      -
      +
    • + Enums +
      • +
    • +
        {{#Enums}} - {{>EnumPartial}} +
      • + {{Name}} +
        • {{/Enums}} -
      • -
      +
    + {{/HasEnums}} - {{#HasRecords}} -
    -

    Inner Classes

    -
    + {{/HasRecords}} -
    + +
    +
    +
    + {{#HasEnums}} +
    +

    Enumerations

    +
    + {{#Enums}} + {{>EnumPartial}} + {{/Enums}} +
    +
    + {{/HasEnums}} + {{#HasRecords}} +
    +

    Inner Classes

    + +
    + {{/HasRecords}}
    -
    - + + + diff --git a/clang-tools-extra/test/clang-doc/mustache-separate-namespace.cpp b/clang-tools-extra/test/clang-doc/mustache-separate-namespace.cpp index add8a221feb40..cb0f9dc64bba6 100644 --- a/clang-tools-extra/test/clang-doc/mustache-separate-namespace.cpp +++ b/clang-tools-extra/test/clang-doc/mustache-separate-namespace.cpp @@ -25,7 +25,6 @@ namespace MyNamespace { // CHECK-GLOBAL-NEXT: // CHECK-GLOBAL-NEXT:
    // CHECK-GLOBAL-NEXT:
    -// CHECK-GLOBAL-EMPTY: // CHECK-GLOBAL-NEXT:
    // CHECK-GLOBAL-NEXT: // CHECK-GLOBAL-NEXT: