anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 19:07:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DocBook: bug fixing with several bibliographic references at once.

Browse Source
This commit is contained in:
Thibaut Cuvelier 2020-08-01 03:51:14 +02:00
parent 5324566013
commit fed71fa8c2
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
autotests/export/docbook/bibliography_precooked_aastex.xml
View File

@ -6,7 +6,7 @@
</info> </info>
<section> <section>
<title>Introduction</title> <title>Introduction</title>
<Standard>A focal problem today in the dynamics of globular clusters is core collapse. It has been predicted by theory for decades <biblioref endterm="hen61.lyn68.spi85-0" />, but observation has been less alert to the phenomenon. For many years the central brightness peak in M15 <biblioref endterm="kin75.new78-1" /> seemed a unique anomaly. Then <biblioref endterm="aur82" /> suggested a central peak in NGC 6397, and a limited photographic survey of ours <biblioref endterm="djo84" /> found three more cases, including NGC 6624, whose sharp center had often been remarked on <biblioref endterm="can78" />. </Standard> <Standard>A focal problem today in the dynamics of globular clusters is core collapse. It has been predicted by theory for decades <biblioref endterm="hen61" />, <biblioref endterm="lyn68" />, <biblioref endterm="spi85" />, but observation has been less alert to the phenomenon. For many years the central brightness peak in M15 <biblioref endterm="kin75" />, <biblioref endterm="new78" /> seemed a unique anomaly. Then <biblioref endterm="aur82" /> suggested a central peak in NGC 6397, and a limited photographic survey of ours <biblioref endterm="djo84" /> found three more cases, including NGC 6624, whose sharp center had often been remarked on <biblioref endterm="can78" />. </Standard>
</section> </section>
<section> <section>
<title>Observations</title> <title>Observations</title>
@ -65,7 +65,7 @@
<m:mrow><m:mi>B</m:mi> <m:mrow><m:mi>B</m:mi>
</m:mrow> </m:mrow>
</m:math></inlineequation>. All four cameras had scales of the order of 0.4 arcsec/pixel, and our field sizes were around 3 arcmin.</Standard> </m:math></inlineequation>. All four cameras had scales of the order of 0.4 arcsec/pixel, and our field sizes were around 3 arcmin.</Standard>
<Standard>The CCD images are unfortunately not always suitable, for very poor clusters or for clusters with large cores. Since the latter are easily studied by other means, we augmented our own CCD profiles by collecting from the literature a number of star-count profiles <biblioref endterm="kin68.pet76.har84.ort85-2" />, as well as photoelectric profiles <biblioref endterm="kin66.kin75-3" /> and electronographic profiles <biblioref endterm="kro84" />. In a few cases we judged normality by eye estimates on one of the Sky Surveys.</Standard> <Standard>The CCD images are unfortunately not always suitable, for very poor clusters or for clusters with large cores. Since the latter are easily studied by other means, we augmented our own CCD profiles by collecting from the literature a number of star-count profiles <biblioref endterm="kin68" />, <biblioref endterm="pet76" />, <biblioref endterm="har84" />, <biblioref endterm="ort85" />, as well as photoelectric profiles <biblioref endterm="kin66" />, <biblioref endterm="kin75" /> and electronographic profiles <biblioref endterm="kro84" />. In a few cases we judged normality by eye estimates on one of the Sky Surveys.</Standard>
</section> </section>
<section> <section>
<title>Helicity Amplitudes</title> <title>Helicity Amplitudes</title>

9
src/insets/InsetCitation.cpp
View File

@ -552,14 +552,15 @@ void InsetCitation::docbook(XMLStream & xs, OutputParams const &) const
return; return;
// Split the different citations (on ","), so that one tag can be output for each of them. // Split the different citations (on ","), so that one tag can be output for each of them.
string citations = to_utf8(xml::cleanID(getParam("key"))); // DocBook does not support having multiple citations in one tag, so that we have to deal with formatting here.
docstring citations = getParam("key");
if (citations.find(',') == string::npos) { if (citations.find(',') == string::npos) {
xs << xml::CompTag("biblioref", "endterm=\"" + citations + "\""); xs << xml::CompTag("biblioref", "endterm=\"" + to_utf8(xml::cleanID(citations)) + "\"");
} else { } else {
size_t pos = 0; size_t pos = 0;
while (pos != string::npos) { while (pos != string::npos) {
pos = citations.find(','); pos = citations.find(',');
xs << xml::CompTag("biblioref", "endterm=\"" + citations.substr(0, pos) + "\""); xs << xml::CompTag("biblioref", "endterm=\"" + to_utf8(xml::cleanID(citations.substr(0, pos))) + "\"");
citations.erase(0, pos + 1); citations.erase(0, pos + 1);
if (pos != string::npos) { if (pos != string::npos) {
@ -627,7 +628,7 @@ void InsetCitation::latex(otexstream & os, OutputParams const & runparams) const
// check if we have to do a qualified list // check if we have to do a qualified list
vector<docstring> keys = getVectorFromString(cleanupWhitespace(key)); vector<docstring> keys = getVectorFromString(cleanupWhitespace(key));
bool const qualified = cs.hasQualifiedList bool const qualified = cs.hasQualifiedList
&& (!getParam("pretextlist").empty() && (!getParam("F").empty()
|| !getParam("posttextlist").empty()); || !getParam("posttextlist").empty());
if (runparams.inulemcmd > 0) if (runparams.inulemcmd > 0)