chapo

oeuvres · Feb 12, 2024 · 3d87778 · 3d87778
1 parent e81452f
commit 3d87778
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/docx/docx_teilike.xsl b/docx/docx_teilike.xsl
@@ -147,18 +147,20 @@
       <!-- known semantic style names, should not be structuring heading -->
       <xsl:when test="$teinte_p/@parent != ''">
         <xsl:element name="{$teinte_p/@parent}">
+          <!-- atts on parent -->
+          <xsl:if test="$teinte_p/@attribute">
+            <xsl:attribute name="{$teinte_p/@attribute}">
+              <xsl:value-of select="$teinte_p/@value"/>
+            </xsl:attribute>
+          </xsl:if>
           <xsl:text>&#10;  </xsl:text>
           <xsl:element name="{$teinte_p/@element}">
+            <!-- rend in parent, ex, bibliographic line on right -->
             <xsl:if test="$rend != ''">
               <xsl:attribute name="rend">
                 <xsl:value-of select="$rend"/>
               </xsl:attribute>
             </xsl:if>
-            <xsl:if test="$teinte_p/@attribute">
-              <xsl:attribute name="{$teinte_p/@attribute}">
-                <xsl:value-of select="$teinte_p/@value"/>
-              </xsl:attribute>
-            </xsl:if>
             <xsl:apply-templates select="w:hyperlink | w:r"/>
           </xsl:element>
           <xsl:text>&#10;</xsl:text>

diff --git a/docx/styles.xml b/docx/styles.xml
@@ -90,6 +90,7 @@ LGPL  http://www.gnu.org/licenses/lgpl.html
   <style level="p" name="byline" element="byline" doc="true"/>
   <style level="p" name="camera" element="camera" doc="true"/>
   <style level="p" name="chant" element="l" attribute="type" value="chant"/>
+  <style level="p" name="chapo" element="p" parent="argument" attribute="type" value="chapo"/>
   <style level="p" name="caption" element="caption" doc="true"/>
   <style level="p" name="castitem" element="castItem" parent="castList" doc="true"/>
   <style level="p" name="castlist" element="castList" doc="true"/>

diff --git a/docx/teilike_pcre.tsv b/docx/teilike_pcre.tsv
@@ -34,7 +34,7 @@ search	replace	?comment
 <($inline)($atts)/>		empty inlines
 
 
-
+(</id>)\s+	\1	<head><id>ID</id> Title</head>
 (<($block)($atts)>) +	\1	<block>   spaces at start of block
 <note($atts)>(\s*<p>)?\s*[\[\(]?(nde|NdE)[\]\)\. ] *	"<note\1 resp=""editor"">\2"	note, editor
 <note($atts)>(\s*<p>)?\s*[\[\(]?(nda|NdA)[\]\)\. ] *	"<note\1 resp=""author"">\2"	note, author