don't force space after sort separator

typst · Aug 4, 2024 · 39c8022 · 39c8022
1 parent b078cc6
commit 39c8022
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/src/csl/rendering/names.rs b/src/csl/rendering/names.rs
@@ -654,7 +654,6 @@ fn write_name<T: EntryLike>(
 
         if name.given_name.is_some() {
             ctx.push_str(sort_sep);
-            ctx.ensure_space();
 
             let idx = ctx.push_format(first_format);
             let cidx = ctx.push_case(first_case);
@@ -680,7 +679,6 @@ fn write_name<T: EntryLike>(
 
         if let Some(suffix) = &name.suffix {
             ctx.push_str(sort_sep);
-            ctx.ensure_space();
             ctx.push_str(suffix);
         }
     };
@@ -704,7 +702,6 @@ fn write_name<T: EntryLike>(
 
         if name.given_name.is_some() {
             ctx.push_str(sort_sep);
-            ctx.ensure_space();
 
             let idx = ctx.push_format(first_format);
             let cidx = ctx.push_case(first_case);
@@ -735,7 +732,6 @@ fn write_name<T: EntryLike>(
 
         if let Some(suffix) = &name.suffix {
             ctx.push_str(sort_sep);
-            ctx.ensure_space();
             ctx.push_str(suffix);
         }
     };

diff --git a/tests/citeproc-pass.txt b/tests/citeproc-pass.txt
@@ -262,6 +262,7 @@ nameattr_NameFormOnNamesInCitation
 nameattr_NameFormOnStyleInCitation
 nameattr_NamesDelimiterOnBibliographyInCitation
 nameattr_NamesDelimiterOnNamesInCitation
+nameattr_SortSeparatorOnBibliographyInCitation
 nameattr_SortSeparatorOnCitationInCitation
 nameattr_SortSeparatorOnNamesInCitation
 nameattr_SortSeparatorOnStyleInCitation
@@ -302,6 +303,7 @@ sort_DateVariableMixedElementsDescendingB
 sort_LatinUnicode
 sort_LocalizedDateLimitedParts
 sort_TestInheritance
+sortseparator_SortSeparatorEmpty
 substitute_RepeatedNamesOk
 substitute_SubstituteOnlyOnceString
 substitute_SubstituteOnlyOnceTerm