Punctuation question

Hi, all.

Carles Pina and I have been tidying up some punctuation issues, and we
could use some style guru feedback on a case that’s come up. In
ieee.csl, it looks sort of like this:

[1]

P.G. Zimbardo, “Does
Psychology make a significant difference in our lives?” American
Psychologist
, vol. 59, Jan. 2004, pp. 339-351.

The issue is with the characters around the “… lives? …” question
mark. The style ordinarily puts a comma after the title, followed by
the quote. citeproc-js is currently quashing the comma in this case.
It was leaving it in place until a couple of days ago:

[1]

P.G. Zimbardo, “Does
Psychology make a significant difference in our lives?,” American
Psychologist
, vol. 59, Jan. 2004, pp. 339-351.

Is there a general convention on this? Failing that, are there views
on which looks more correct?

Frank

Looks like the latter is correct in CMoS 16th edition, but the former is correct in CMoS 15th edition:

Ugh.

Simon