anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "DocBook: allow empty paragraphs before the <info> section."

Browse Source 
This reverts commit c6937cece9.
This commit is contained in:
Thibaut Cuvelier 2020-08-03 22:58:15 +02:00
parent fa38ae3fc0
commit 348297520f
2 changed files with 2 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,23 +3,6 @@
See http://www.lyx.org/ for more information -->
<article xml:lang="en_US" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:xi="http://www.w3.org/2001/XInclude" version="5.2">
<info>
<title>Collapsed Cores in Globular Clusters, Gauge-Boson Couplings, and AASTeX Examples</title>
<author><personname>S. Djorgovski and Ivan R. King</personname></author>
<author><affiliation>Astronomy Department, University of California, Berkeley, CA 94720</affiliation></author>
<author><affiliation role="alternate">Visiting Astronomer Cerro Tololo Inter-American Observatory.CTIO is operated by AURA Inc. under contract to the National Science Foundation.</affiliation></author>
<author><affiliation role="alternate">Society of Fellows, Harvard University.</affiliation></author>
<author><affiliation role="alternate">present address: Center for Astrophysics60 Garden Street, Cambridge, MA 02138</affiliation></author>
<author><personname>C. D. Biemesderfer</personname></author>
<author><affiliation>National Optical Astronomy Observatories, Tucson, AZ 85719</affiliation></author>
<author><affiliation role="alternate">Visiting Programmer, Space Telescope Science Institute</affiliation></author>
<author><affiliation role="alternate">Patron, Alonso's Bar and Grill</affiliation></author>
<author><email>aastex-help@aas.org</email></author>
<author><personname>R. J. Hanisch</personname></author>
<author><affiliation>Space Telescope Science Institute, Baltimore, MD 21218</affiliation></author>
<author><affiliation role="alternate">Patron, Alonso's Bar and Grill</affiliation></author>
<abstract>
<para>This is a preliminary report on surface photometry of the major fraction of known globular clusters, to see which of them show the signs of a collapsed core. We also explore some diversionary mathematics and recreational tables. </para>
</abstract>
</info>
<section>
<title>Introduction</title>

23
src/output_docbook.cpp
View File

@ -764,34 +764,15 @@ DocBookDocumentSectioning hasDocumentSectioning(ParagraphList const &paragraphs,
}
bool hasOnlyNotes(Paragraph const & par)
{
for (int i = 0; i < par.size(); ++i)
if (!par.isInset(i) || !dynamic_cast<InsetNote *>(par.insetList().get(i)))
return false;
return true;
}
DocBookInfoTag getParagraphsWithInfo(ParagraphList const &paragraphs, pit_type bpit, pit_type const epit) {
DocBookInfoTag getParagraphsWithInfo(ParagraphList const &paragraphs, pit_type const bpit, pit_type const epit) {
set<pit_type> shouldBeInInfo;
set<pit_type> mustBeInInfo;
// Find the first non empty paragraph by mutating bpit.
while (bpit < epit) {
Paragraph const &par = paragraphs[bpit];
if (par.empty() || hasOnlyNotes(par))
bpit += 1;
else
break;
}
// Find the last info-like paragraph.
pit_type cpit = bpit;
while (cpit < epit) {
// Skip paragraphs only containing one note.
Paragraph const &par = paragraphs[cpit];
if (hasOnlyNotes(par)) {
if (par.size() == 1 && dynamic_cast<InsetNote*>(paragraphs[cpit].insetList().get(0))) {
cpit += 1;
continue;
}