From 1e8e932f8b9b7f6e9021e228a4a3c80b1d7c9416 Mon Sep 17 00:00:00 2001
From: David Carlisle <d.p.carlisle@gmail.com>
Date: Sat, 11 Jan 2025 21:24:03 +0000
Subject: [PATCH] update layout attributes fixes

---
 project-examples/scripts/latex-document.rnc   |  7 ++++++-
 project-examples/scripts/latex-document.rng   | 12 ++++++------
 project-examples/scripts/latex-document17.rnc |  7 ++++++-
 project-examples/scripts/latex-document17.rng | 12 ++++++------
 4 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/project-examples/scripts/latex-document.rnc b/project-examples/scripts/latex-document.rnc
index 69d4e269..d5fa6902 100644
--- a/project-examples/scripts/latex-document.rnc
+++ b/project-examples/scripts/latex-document.rnc
@@ -127,6 +127,7 @@ BChapter= element latexSEbible:Chapter {
 
 Chapter-Title = element latexSEbible:Chapter-Title {
   showtags-attributes,
+  layout-attributes,
   attribute rolemaps-to {"H3"},
   attribute id {text}?,
   attribute title {text}?,
@@ -153,7 +154,7 @@ pdf2-attributes =
   showtags-attributes
 
 showtags-attributes =
-  attribute af {"yes" | "no"}?,
+  attribute af {text}?,
   attribute rolemapped-from {text}?,
   attribute referenced-as {text}?
 
@@ -687,6 +688,7 @@ codeline = element latexSE:codeline {
 \list = element latexSE:list {
  attribute rolemaps-to {"L"},
   pdf2-attributes,
+  list-attributes,
   LI*
 }
 L |= \list
@@ -694,6 +696,7 @@ L |= \list
 itemize = element latexSE:itemize {
   attribute rolemaps-to {"L"},
   pdf2-attributes,
+  list-attributes,
   LI*
 }
 L |= itemize
@@ -701,6 +704,7 @@ L |= itemize
 enumerate = element latexSE:enumerate {
   attribute rolemaps-to {"L"},
   pdf2-attributes,
+  list-attributes,
   LI*
 }
 L |= enumerate
@@ -720,6 +724,7 @@ quotation = element latexSE:quotation {
 description= element latexSE:description {
  attribute rolemaps-to {"L"},
  pdf2-attributes,
+ list-attributes,
  LI*
 }
 
diff --git a/project-examples/scripts/latex-document.rng b/project-examples/scripts/latex-document.rng
index 1344afa7..473d496f 100644
--- a/project-examples/scripts/latex-document.rng
+++ b/project-examples/scripts/latex-document.rng
@@ -301,6 +301,7 @@
   <define name="Chapter-Title">
     <element name="latexSEbible:Chapter-Title">
       <ref name="showtags-attributes"/>
+      <ref name="layout-attributes"/>
       <attribute name="rolemaps-to">
         <value>H3</value>
       </attribute>
@@ -343,12 +344,7 @@
   </define>
   <define name="showtags-attributes">
     <optional>
-      <attribute name="af">
-        <choice>
-          <value>yes</value>
-          <value>no</value>
-        </choice>
-      </attribute>
+      <attribute name="af"/>
     </optional>
     <optional>
       <attribute name="rolemapped-from"/>
@@ -2902,6 +2898,7 @@
         <value>L</value>
       </attribute>
       <ref name="pdf2-attributes"/>
+      <ref name="list-attributes"/>
       <zeroOrMore>
         <ref name="LI"/>
       </zeroOrMore>
@@ -2916,6 +2913,7 @@
         <value>L</value>
       </attribute>
       <ref name="pdf2-attributes"/>
+      <ref name="list-attributes"/>
       <zeroOrMore>
         <ref name="LI"/>
       </zeroOrMore>
@@ -2930,6 +2928,7 @@
         <value>L</value>
       </attribute>
       <ref name="pdf2-attributes"/>
+      <ref name="list-attributes"/>
       <zeroOrMore>
         <ref name="LI"/>
       </zeroOrMore>
@@ -2966,6 +2965,7 @@
         <value>L</value>
       </attribute>
       <ref name="pdf2-attributes"/>
+      <ref name="list-attributes"/>
       <zeroOrMore>
         <ref name="LI"/>
       </zeroOrMore>
diff --git a/project-examples/scripts/latex-document17.rnc b/project-examples/scripts/latex-document17.rnc
index deb8d4c3..ad6857a3 100644
--- a/project-examples/scripts/latex-document17.rnc
+++ b/project-examples/scripts/latex-document17.rnc
@@ -130,6 +130,7 @@ BChapter= element latexSEbible:Chapter {
 
 Chapter-Title = element latexSEbible:Chapter-Title {
   showtags-attributes,
+  layout-attributes,
   attribute rolemaps-to {"H3"},
   attribute id {text}?,
   attribute title {text}?,
@@ -156,7 +157,7 @@ pdf2-attributes =
   showtags-attributes
 
 showtags-attributes =
-  attribute af {"yes" | "no"}?,
+  attribute af {text}?,
   attribute rolemapped-from {text}?,
   attribute referenced-as {text}?
 
@@ -690,6 +691,7 @@ codeline = element latexSE:codeline {
 \list = element latexSE:list {
  attribute rolemaps-to {"L"},
   pdf2-attributes,
+  list-attributes,
   LI*
 }
 L |= \list
@@ -697,6 +699,7 @@ L |= \list
 itemize = element latexSE:itemize {
   attribute rolemaps-to {"L"},
   pdf2-attributes,
+  list-attributes,
   LI*
 }
 L |= itemize
@@ -704,6 +707,7 @@ L |= itemize
 enumerate = element latexSE:enumerate {
   attribute rolemaps-to {"L"},
   pdf2-attributes,
+  list-attributes,
   LI*
 }
 L |= enumerate
@@ -723,6 +727,7 @@ quotation = element latexSE:quotation {
 description= element latexSE:description {
  attribute rolemaps-to {"L"},
  pdf2-attributes,
+ list-attributes,
  LI*
 }
 
diff --git a/project-examples/scripts/latex-document17.rng b/project-examples/scripts/latex-document17.rng
index 9457f5ce..30f7ced7 100644
--- a/project-examples/scripts/latex-document17.rng
+++ b/project-examples/scripts/latex-document17.rng
@@ -344,6 +344,7 @@
     <element>
       <name ns="">Chapter-Title</name>
       <ref name="showtags-attributes"/>
+      <ref name="layout-attributes"/>
       <attribute name="rolemaps-to">
         <value>H3</value>
       </attribute>
@@ -387,12 +388,7 @@
   </define>
   <define name="showtags-attributes">
     <optional>
-      <attribute name="af">
-        <choice>
-          <value>yes</value>
-          <value>no</value>
-        </choice>
-      </attribute>
+      <attribute name="af"/>
     </optional>
     <optional>
       <attribute name="rolemapped-from"/>
@@ -3012,6 +3008,7 @@
         <value>L</value>
       </attribute>
       <ref name="pdf2-attributes"/>
+      <ref name="list-attributes"/>
       <zeroOrMore>
         <ref name="LI"/>
       </zeroOrMore>
@@ -3027,6 +3024,7 @@
         <value>L</value>
       </attribute>
       <ref name="pdf2-attributes"/>
+      <ref name="list-attributes"/>
       <zeroOrMore>
         <ref name="LI"/>
       </zeroOrMore>
@@ -3042,6 +3040,7 @@
         <value>L</value>
       </attribute>
       <ref name="pdf2-attributes"/>
+      <ref name="list-attributes"/>
       <zeroOrMore>
         <ref name="LI"/>
       </zeroOrMore>
@@ -3081,6 +3080,7 @@
         <value>L</value>
       </attribute>
       <ref name="pdf2-attributes"/>
+      <ref name="list-attributes"/>
       <zeroOrMore>
         <ref name="LI"/>
       </zeroOrMore>