Only print labels if selected variable is non-empty.

Closes #437.
jgm · Jan 27, 2020 · 167e44e · 167e44e
1 parent b05d286
commit 167e44e
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 15 deletions.
diff --git a/src/Text/CSL/Eval/Names.hs b/src/Text/CSL/Eval/Names.hs
@@ -380,22 +380,23 @@ formatTerm f fm p refid s = do
         else oStr' t fm
 
 formatLabel :: Form -> Formatting -> Bool -> Text -> State EvalState [Output]
-formatLabel f fm p s
-    | "locator" <- s = when' ( (/=) "" <$> gets (citeLocator . cite . env)) $ do
-                       (l,v) <- getLocVar
-                       form (\fm' -> return . flip OLoc emptyFormatting . output fm') id l (isRange v)
-    | "page"    <- s = checkPlural
-    | "volume"  <- s = checkPlural
-    | "issue"   <- s = checkPlural
-    | "ibid"    <- s = format s p
-    | isRole       s = do a <- getAgents' (if s == "editortranslator"
-                                              then "editor"
-                                              else s)
-                          if null a
-                             then return []
-                             else form (\fm' x -> [OLabel x fm']) id s p
-    | otherwise      = format s p
+formatLabel f fm p s = when' (isVarSet s) go
     where
+      go
+        | "locator" <- s = when' ( (/=) "" <$> gets (citeLocator . cite . env)) $ do
+                           (l,v) <- getLocVar
+                           form (\fm' -> return . flip OLoc emptyFormatting . output fm') id l (isRange v)
+        | "page"    <- s = checkPlural
+        | "volume"  <- s = checkPlural
+        | "issue"   <- s = checkPlural
+        | "ibid"    <- s = format s p
+        | isRole       s = do a <- getAgents' (if s == "editortranslator"
+                                                  then "editor"
+                                                  else s)
+                              if null a
+                                 then return []
+                                 else form (\fm' x -> [OLabel x fm']) id s p
+        | otherwise      = format s p
       isRole = flip elem ["author", "collection-editor", "composer", "container-author"
                          ,"director", "editor", "editorial-director", "editortranslator"
                          ,"illustrator", "interviewer", "original-author", "recipient"

diff --git a/tests/issue437.csl b/tests/issue437.csl
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" default-locale="en-US" version="1.0">
+  <info>
+    <title>Minimal style to reproduce bug</title>
+    <id>http://www.example.org/styles/minimal-test-style</id>
+    <author>
+      <name>Nicolas Chachereau</name>
+      <email>nicolas@nchachereau.ch</email>
+    </author>
+    <updated>2020-01-27T14:27:45+01:00</updated>
+  </info>
+  <citation>
+    <layout>
+      <group delimiter=", ">
+        <names variable="author"/>
+        <text variable="title"/>
+        <text variable="publisher-place"/>
+        <date variable="issued" form="numeric" date-parts="year"/>
+        <group delimiter="&#160;">
+          <number variable="number-of-pages"/>
+          <label variable="number-of-pages"/>
+        </group>
+      </group>
+    </layout>
+  </citation>
+</style>
diff --git a/tests/issue437.expected.native b/tests/issue437.expected.native
@@ -0,0 +1,3 @@
+Pandoc (Meta {unMeta = fromList [("csl",MetaInlines [Str "tests/issue437.csl"]),("references",MetaList [MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Smith"]),("given",MetaInlines [Str "John"])])]),("id",MetaInlines [Str "hirt2009"]),("issued",MetaList [MetaMap (fromList [("year",MetaInlines [Str "2009"])])]),("publisher",MetaInlines [Str "Publishing",Space,Str "House"]),("publisher-place",MetaInlines [Str "Lausanne"]),("title",MetaInlines [Str "Some",Space,Str "Book"]),("type",MetaInlines [Str "book"])])])]})
+[BlockQuote
+ [Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "quote.",Cite [Citation {citationId = "hirt2009", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 1}] [Note [Para [Str "John",Space,Str "Smith,",Space,Str "Some",Space,Str "Book,",Space,Str "Lausanne,",Space,Str "2009"]]]]]]
diff --git a/tests/issue437.in.native b/tests/issue437.in.native
@@ -0,0 +1,3 @@
+Pandoc (Meta {unMeta = fromList [("csl",MetaInlines [Str "tests/issue437.csl"]),("references",MetaList [MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Smith"]),("given",MetaInlines [Str "John"])])]),("id",MetaInlines [Str "hirt2009"]),("issued",MetaList [MetaMap (fromList [("year",MetaInlines [Str "2009"])])]),("publisher",MetaInlines [Str "Publishing",Space,Str "House"]),("publisher-place",MetaInlines [Str "Lausanne"]),("title",MetaInlines [Str "Some",Space,Str "Book"]),("type",MetaInlines [Str "book"])])])]})
+[BlockQuote
+ [Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "quote.",Space,Cite [Citation {citationId = "hirt2009", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0}] [Str "[@hirt2009]"]]]]