missing space after usg in subentry content

makigumo · Jun 20, 2024 · 0e26bed · 0e26bed
1 parent 39795c4
commit 0e26bed
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/Wadoku.css b/Wadoku.css
@@ -439,7 +439,10 @@ span.etym {
     display: block;
 }
 
-.sense .reg, .sense .usage, .subheadword .reg, .subheadword .usage {
+.sense .reg,
+.sense .usage,
+.subheadword .reg,
+.subheadword .usage {
     display: inline-block;
 }
 
@@ -459,7 +462,12 @@ span.etym {
     font-style: italic
 }
 
-.reg + .token:before, .usage + .token:before, .famn + .token:before {
+/* letztes dom, reg, usage */
+.dom:has(+ *:not(.dom)):after,
+.reg:has(+ *:not(.reg)):after,
+.usage:has(+ *:not(.usage)):after,
+
+.famn + .token:before {
     content: '\0020'
 }
 

diff --git a/xsl/entry_export_macdic.xslt b/xsl/entry_export_macdic.xslt
@@ -1237,7 +1237,10 @@
     <xsl:template mode="compact" match="wd:sense[empty(./wd:sense) and @related]"/>
 
     <xsl:template name="sense_content">
-        <xsl:apply-templates select="wd:usg"/>
+        <xsl:if test="wd:usg">
+            <xsl:apply-templates select="wd:usg" />
+            <xsl:text> </xsl:text>
+        </xsl:if>
         <xsl:apply-templates select="wd:trans"/>
         <xsl:if test="not(empty(wd:def) and empty(wd:expl) and empty(wd:date))">
             <xsl:text> </xsl:text>