anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-19 14:30:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "DocBook: use DocBookItemTag within paragraphs."

Browse Source 
This reverts commit 49b998f99b.
This commit is contained in:
Thibaut Cuvelier 2020-08-03 22:57:11 +02:00
parent 21c92c8a12
commit fe8aff31fd
3 changed files with 13 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,21 +5,21 @@
<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><orgname>Astronomy Department, University of California, Berkeley, CA 94720</orgname></affiliation></author>
<author><affiliation role="alternate"><orgname>Visiting Astronomer Cerro Tololo Inter-American Observatory.CTIO is operated by AURA Inc. under contract to the National Science Foundation.</orgname></affiliation></author>
<author><affiliation role="alternate"><orgname>Society of Fellows, Harvard University.</orgname></affiliation></author>
<author><affiliation role="alternate"><orgname>present address: Center for Astrophysics60 Garden Street, Cambridge, MA 02138</orgname></affiliation></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><orgname>National Optical Astronomy Observatories, Tucson, AZ 85719</orgname></affiliation></author>
<author><affiliation role="alternate"><orgname>Visiting Programmer, Space Telescope Science Institute</orgname></affiliation></author>
<author><affiliation role="alternate"><orgname>Patron, Alonso's Bar and Grill</orgname></affiliation></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><orgname>Space Telescope Science Institute, Baltimore, MD 21218</orgname></affiliation></author>
<author><affiliation role="alternate"><orgname>Patron, Alonso's Bar and Grill</orgname></affiliation></author>
<abstract><para>
<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>
</para></abstract>
</abstract>
</info>
<section>
<title>Introduction</title>

15
lib/layouts/aastex.layout
View File

@ -155,9 +155,6 @@ Style Author
Series Medium
Shape SmallCaps
EndFont
DocBookTag personname
DocBookWrapperTag author
DocBookInInfo always
End
@ -175,10 +172,6 @@ Style Affiliation
Family Roman
Size Normal
EndFont
DocBookTag affiliation
DocBookWrapperTag author
DocBookItemTag orgname
DocBookInInfo always
End
@ -201,11 +194,6 @@ Style Altaffilation
LabelFont
Color green
EndFont
DocBookTag affiliation
DocBookAttr role="alternate"
DocBookItemTag orgname
DocBookWrapperTag author
DocBookInInfo always
End
@ -225,9 +213,6 @@ Style Email
Size Normal
Shape Italic
EndFont
DocBookTag email
DocBookWrapperTag author
DocBookInInfo always
End

9
src/output_docbook.cpp
View File

@ -191,25 +191,20 @@ namespace {
void openParTag(XMLStream & xs, Layout const & lay)
{
if (lay.docbookwrappertag() != "NONE")
if (lay.docbookwrappertag() != "NONE") {
xs << xml::StartTag(lay.docbookwrappertag(), lay.docbookwrapperattr());
}
string tag = lay.docbooktag();
if (tag == "Plain Layout")
tag = "para";
xs << xml::ParTag(tag, lay.docbookattr());
if (lay.docbookitemtag() != "NONE")
xs << xml::StartTag(lay.docbookitemtag(), lay.docbookitemattr());
}
void closeTag(XMLStream & xs, Layout const & lay)
{
if (lay.docbookitemtag() != "NONE")
xs << xml::EndTag(lay.docbookitemtag());
string tag = lay.docbooktag();
if (tag == "Plain Layout")
tag = "para";