From 893fbfec781cb30c00e903d875e63d5cbb795c85 Mon Sep 17 00:00:00 2001 From: "David B. Kinder" Date: Wed, 26 Oct 2022 07:35:28 -0700 Subject: [PATCH] doc: fix views and applicable VMs label handling in config option doc Custom attributes in the XML schema, such as `applicable-vms` and `views`, are designed to recursively inherit those of the parent. Thus, the effective attribute of an element should be derived by its lowest ancestor that has that attribute explicitly defined. Looking up only one level would not be sufficient. This patch updates the `configdoc.xsl` to derive the effective attributes properly so that icons in the generated doc properly reflects what is specified in the schema. Addresses ACRN-7347 Signed-off-by: Junjie Mao Signed-off-by: David B. Kinder --- doc/scripts/configdoc.xsl | 126 +++++++++++++++++--------------------- 1 file changed, 56 insertions(+), 70 deletions(-) diff --git a/doc/scripts/configdoc.xsl b/doc/scripts/configdoc.xsl index 035a562b5..71546258c 100644 --- a/doc/scripts/configdoc.xsl +++ b/doc/scripts/configdoc.xsl @@ -1,5 +1,10 @@ - + @@ -13,7 +18,6 @@ - @@ -23,24 +27,21 @@ - + + - - - - - - - - - - - + + + + + + + @@ -58,9 +59,8 @@ - - - + + @@ -84,8 +84,9 @@ - - + + + @@ -112,56 +113,27 @@ |icon-hypervisor| - - - |icon-pre-launched-vm| |icon-post-launched-vm| |icon-service-vm| - - - - |icon-pre-launched-vm| - - - |icon-post-launched-vm| - - - |icon-service-vm| - - - + + |icon-pre-launched-vm| + + + |icon-post-launched-vm| + + + |icon-service-vm| + / - - - |icon-basic| |icon-advanced| - - - |icon-not-available| - - - |icon-not-available| - - - - - - |icon-basic| - - - |icon-advanced| - - - - - |icon-basic| - - - |icon-advanced| - - - - - + + |icon-basic| + + + |icon-advanced| + + + |icon-not-availble| + @@ -177,7 +149,6 @@ - @@ -191,7 +162,6 @@ - @@ -207,7 +177,9 @@ - + + + @@ -220,7 +192,8 @@ - + + @@ -400,4 +373,17 @@ + + + + + + + + + + + + +