Add support for formatting attributes in layout element

Fixes #99
michel-kraemer · Mar 11, 2021 · 383b6a5 · 383b6a5
1 parent fbf8e3d
commit 383b6a5
Show file tree

Hide file tree

Showing 6 changed files with 76 additions and 7 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,7 @@
 [submodule "citeproc-java/src/test/resources/test-suite"]
 	path = citeproc-java/src/test/resources/test-suite
 	url = https://github.com/citation-style-language/test-suite.git
+	shallow = true
+[submodule "citeproc-java/src/test/resources/citeproc-js"]
+	path = citeproc-java/src/test/resources/citeproc-js
+	url = https://github.com/Juris-M/citeproc-js.git
diff --git a/citeproc-java/src/main/java/de/undercouch/citeproc/csl/internal/SCitationLayout.java b/citeproc-java/src/main/java/de/undercouch/citeproc/csl/internal/SCitationLayout.java
@@ -2,6 +2,7 @@
 
 import de.undercouch.citeproc.csl.CSLCitationItem;
 import de.undercouch.citeproc.csl.internal.behavior.Affixes;
+import de.undercouch.citeproc.csl.internal.behavior.FormattingAttributes;
 import de.undercouch.citeproc.helper.NodeHelper;
 import org.apache.commons.lang3.CharSet;
 import org.w3c.dom.Node;
@@ -18,7 +19,8 @@ public class SCitationLayout extends SRenderingElementContainer {
     private static final Pattern TRIM_END = Pattern.compile("\\p{Space}+$");
     private static final Pattern IGNORE_END = Pattern.compile("[\\p{Space}\\p{Pf}\"']+$");
 
-    protected final Affixes affixes;
+    private final Affixes affixes;
+    private final int formattingAttributes;
     private final String delimiter;
 
     /**
@@ -28,6 +30,7 @@ public class SCitationLayout extends SRenderingElementContainer {
     public SCitationLayout(Node node) {
         super(node);
         affixes = new Affixes(node);
+        formattingAttributes = FormattingAttributes.of(node);
         delimiter = NodeHelper.getAttrValue(node, "delimiter");
     }
 
@@ -65,7 +68,7 @@ private void renderInternal(RenderContext ctx) {
                 tmp.emit(suffix, Token.Type.SUFFIX);
             }
         }
-        ctx.emit(tmp.getResult());
+        ctx.emit(tmp.getResult(), formattingAttributes);
     }
 
     /**

diff --git a/citeproc-java/src/main/java/de/undercouch/citeproc/csl/internal/SLayout.java b/citeproc-java/src/main/java/de/undercouch/citeproc/csl/internal/SLayout.java
@@ -1,6 +1,7 @@
 package de.undercouch.citeproc.csl.internal;
 
 import de.undercouch.citeproc.csl.internal.behavior.Affixes;
+import de.undercouch.citeproc.csl.internal.behavior.FormattingAttributes;
 import de.undercouch.citeproc.csl.internal.rendering.SRenderingElement;
 import org.w3c.dom.Node;
 
@@ -10,6 +11,7 @@
  */
 public class SLayout extends SRenderingElementContainer {
     private final Affixes affixes;
+    private final int formattingAttributes;
 
     /**
      * Construct the layout element from an XML node
@@ -18,6 +20,7 @@ public class SLayout extends SRenderingElementContainer {
     public SLayout(Node node) {
         super(node);
         affixes = new Affixes(node);
+        formattingAttributes = FormattingAttributes.of(node);
     }
 
     @Override
@@ -26,22 +29,24 @@ public void render(RenderContext ctx) {
     }
 
     private void renderInternal(RenderContext ctx) {
+        RenderContext tmp = new RenderContext(ctx);
         for (int i = 0; i < elements.size(); i++) {
             SRenderingElement e = elements.get(i);
             if (i == 0) {
                 // render first field
-                RenderContext tmp = new RenderContext(ctx);
-                e.render(tmp);
-                for (Token t : tmp.getResult().getTokens()) {
+                RenderContext innerTmp = new RenderContext(tmp);
+                e.render(innerTmp);
+                for (Token t : innerTmp.getResult().getTokens()) {
                     // set flag in token
                     Token nt = new Token.Builder(t)
                             .firstField(true)
                             .build();
-                    ctx.emit(nt);
+                    tmp.emit(nt);
                 }
             } else {
-                e.render(ctx);
+                e.render(tmp);
             }
         }
+        ctx.emit(tmp.getResult(), formattingAttributes);
     }
 }
diff --git a/citeproc-java/src/test/resources/citeproc-js b/citeproc-java/src/test/resources/citeproc-js
diff --git a/citeproc-java/src/test/resources/fixtures/bibliography-formatting-attributes.yaml b/citeproc-java/src/test/resources/fixtures/bibliography-formatting-attributes.yaml
@@ -0,0 +1,31 @@
+mode: bibliography
+
+style:
+  <style xmlns="http://purl.org/net/xbiblio/csl" version="1.0">
+    <bibliography>
+      <layout vertical-align="sup">
+        <names variable="author" suffix=". ">
+          <name initialize-with=". " />
+        </names>
+        <text variable="title"/>
+      </layout>
+    </bibliography>
+  </style>
+
+items:
+  - id: item1
+    author:
+      - given: Given
+        family: Name
+    title: My title
+  - id: item2
+    author:
+      - given: Another
+        family: Name
+
+result:
+  html: |-
+    <div class="csl-bib-body">
+      <div class="csl-entry"><sup>G. Name. My title</sup></div>
+      <div class="csl-entry"><sup>A. Name. </sup></div>
+    </div>
diff --git a/citeproc-java/src/test/resources/fixtures/citation-formatting-attributes.yaml b/citeproc-java/src/test/resources/fixtures/citation-formatting-attributes.yaml
@@ -0,0 +1,25 @@
+mode: citation
+
+style:
+  <style xmlns="http://purl.org/net/xbiblio/csl" version="1.0">
+    <citation>
+      <layout delimiter="," vertical-align="sup">
+        <text variable="citation-number"/>
+      </layout>
+    </citation>
+  </style>
+
+items:
+  - id: item1
+    author:
+      - given: Given
+        family: Name
+    title: My title
+  - id: item2
+    author:
+      - given: Another
+        family: Name
+
+result:
+  html:
+    <sup>1,2</sup>