commit fe8aff31fd7e5134001ee6a7708b9e550da2b4ae
Author: Thibaut Cuvelier <[email protected]>
Date: Mon Aug 3 22:57:11 2020 +0200
Revert "DocBook: use DocBookItemTag within paragraphs."
This reverts commit 49b998f99b2d0fe6194bcb92bede29cbc2b7176d.
---
.../docbook/bibliography_precooked_aastex.xml | 22 ++++++++++----------
lib/layouts/aastex.layout | 15 -------------
src/output_docbook.cpp | 9 +------
3 files changed, 13 insertions(+), 33 deletions(-)
diff --git a/autotests/export/docbook/bibliography_precooked_aastex.xml
b/autotests/export/docbook/bibliography_precooked_aastex.xml
index b663868..37dada8 100644
--- a/autotests/export/docbook/bibliography_precooked_aastex.xml
+++ b/autotests/export/docbook/bibliography_precooked_aastex.xml
@@ -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>[email protected]</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>
diff --git a/lib/layouts/aastex.layout b/lib/layouts/aastex.layout
index 5db7dee..275018a 100644
--- a/lib/layouts/aastex.layout
+++ b/lib/layouts/aastex.layout
@@ -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
diff --git a/src/output_docbook.cpp b/src/output_docbook.cpp
index 2e7b637..434148b 100644
--- a/src/output_docbook.cpp
+++ b/src/output_docbook.cpp
@@ -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";
--
lyx-cvs mailing list
[email protected]
http://lists.lyx.org/mailman/listinfo/lyx-cvs
