Solve year-suffix / no-date interaction #137
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Test results (failure; full results): 4 regressions, 2 new passing testsregression: csl_test_suite::variables_TitleShortOnShortTitleNoTitleCondition.txt My Long Title 1 has title-short
My Long Title 2 does not have title-short
-[CSL STYLE ERROR: reference with no printed form.]
+does not have title-short
regression: csl_test_suite::bugreports_ChicagoAuthorDateLooping.txt-(Manstein 1982; [CSL STYLE ERROR: reference with no printed form.]; [CSL STYLE ERROR: reference with no printed form.])
+(Manstein 1982; Anon.; Anon.)
regression: csl_test_suite::bugreports_DoubleEncodedAngleBraces.txtregression: csl_test_suite::bugreports_SingleQuoteXml.txt-[[CSL STYLE ERROR: reference with no printed form.] ; O A. "hello" <i>Book Title</i>]
+[Cite with a composer ; O A. "hello" <i>Book Title</i>]
added passing tests:
|
delete 'recompute queueing node' log
Fixes ref-ir mismatch in bugreports_ByBy.txt
You can see how the issue might apply to the GroupVars
promote_plain()'s
match self { Plain | Important => Important, _ => self }
Test results (success; full results): 2 new passing testsadded passing tests:
|
Test results (success; full results): 2 new passing testsadded passing tests:
|
cormacrelf
commented
Dec 1, 2021
Comment on lines
914
to
919
| if added_suffix { | ||
| tree.recompute_group_vars(); | ||
| return; | ||
| } | ||
|
|
||
| // Then attempt to do it for the ones that are embedded in date output |
There was a problem hiding this comment.
Explicit year suffixes weren't recomputing the tree's groupvars, only implicit ones were.
Comment on lines
+190
to
+199
| let gv = if let csl::TextTermSelector::Simple(csl::SimpleTermSelector::Misc( | ||
| csl::MiscTerm::NoDate, | ||
| _, | ||
| )) = term_selector | ||
| { | ||
| GroupVars::Important // Make this Important (same for element.rs) to have no-date act as a variable | ||
| } else { | ||
| GroupVars::Plain | ||
| }; | ||
| (RefIR::Edge(content), gv) |
There was a problem hiding this comment.
This is where we make the no date term behave like a variable
| @@ -120,7 +120,7 @@ impl Disambiguation<Markup> for Element { | |||
| let gv = GroupVars::rendered_if(edge.is_some()); | |||
| return (RefIR::Edge(edge), gv); | |||
| } else { | |||
| return (RefIR::Edge(None), GroupVars::Plain); | |||
| return (RefIR::Edge(None), GroupVars::Missing); | |||
There was a problem hiding this comment.
This is where we remove the special case for YearSuffix
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As discussed in andras-simonyi/citeproc-el#70 (comment)
This makes the "no date" term behave like a variable for group suppression. It also makes the GroupVars code work less by accident and more on purpose.