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

DocBook: update bibliography handling for 337f953426.

Browse Source
This commit is contained in:
Thibaut Cuvelier 2024-02-26 14:36:01 +01:00
parent 8282a477f5
commit c71f703914
2 changed files with 105 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
autotests/export/docbook/basic.lyx
View File

@ -1,5 +1,5 @@
#LyX 2.4 created this file. For more info see https://www.lyx.org/
\lyxformat 599
\lyxformat 620
\begin_document
\begin_header
\save_transient_properties true
@ -57,6 +57,7 @@
\suppress_date false
\justification true
\use_refstyle 1
\use_formatted_ref 0
\use_minted 0
\use_lineno 0
\index Index
@ -87,6 +88,7 @@
\html_css_as_file 0
\html_be_strict false
\docbook_table_output 0
\docbook_mathml_prefix 1
\end_header
\begin_body
@ -147,7 +149,8 @@ I am a quote
\end_layout
\begin_layout Standard
Now, we're outside quotes.
Now,
we're outside quotes.
\end_layout
\begin_layout Standard
@ -177,6 +180,7 @@ reference "sec:Sec-2kqgsdiflhqsdlifgjuzer=povtuizmvnuer=t vmsrmfli uh =a'\"rtpf
plural "false"
caps "false"
noprefix "false"
nolink "false"
\end_inset
@ -184,8 +188,9 @@ noprefix "false"
\end_layout
\begin_layout Standard
Also, a formula with an user-defined macro that outputs well in LaTeX but
cannot in MathML:
Also,
a formula with an user-defined macro that outputs well in LaTeX but cannot in MathML:
\begin_inset Formula $\testmacro$
\end_inset
@ -268,6 +273,7 @@ reference "sec:Sec-1"
plural "false"
caps "false"
noprefix "false"
nolink "false"
\end_inset
@ -284,7 +290,8 @@ First item.
\begin_inset Newline newline
\end_inset
Second line of the first item, after a line break.
Second line of the first item,
after a line break.
\end_layout
@ -366,6 +373,7 @@ I repeat that in a footnote.
\begin_layout Standard
On the other hand,
\begin_inset Foot
status open
@ -392,7 +400,9 @@ I am the fifth section and I deal with floats
\end_layout
\begin_layout Standard
Now, three tables:
Now,
three tables:
\end_layout
\begin_layout Standard
@ -463,7 +473,8 @@ Row 1
\begin_inset Text
\begin_layout Plain Layout
Col 3, row 1
Col 3,
row 1
\end_layout
\end_inset
@ -492,7 +503,8 @@ Row 2
\begin_inset Text
\begin_layout Plain Layout
Col 3, row 2
Col 3,
row 2
\end_layout
\end_inset
@ -602,7 +614,8 @@ Row 1
\begin_inset Text
\begin_layout Plain Layout
Col 3, row 1
Col 3,
row 1
\end_layout
\end_inset
@ -631,7 +644,8 @@ Row 2
\begin_inset Text
\begin_layout Plain Layout
Col 3, row 2
Col 3,
row 2
\end_layout
\end_inset
@ -717,7 +731,8 @@ Row 1
\begin_inset Text
\begin_layout Plain Layout
Col 3, row 1
Col 3,
row 1
\end_layout
\end_inset
@ -746,7 +761,8 @@ Row 2
\begin_inset Text
\begin_layout Plain Layout
Col 3, row 2
Col 3,
row 2
\end_layout
\end_inset
@ -765,7 +781,9 @@ Col 3, row 2
\end_layout
\begin_layout Standard
Then, one figure:
Then,
one figure:
\end_layout
\begin_layout Standard
@ -810,6 +828,7 @@ I am the sixth section and I really like bibliographies
\begin_layout Standard
This text has references.
First reference:
\begin_inset CommandInset citation
LatexCommand cite
key "big"
@ -819,6 +838,7 @@ literal "false"
.
Second reference:
\begin_inset CommandInset citation
LatexCommand cite
key "small"
@ -828,6 +848,7 @@ literal "false"
.
Both at the same time:
\begin_inset CommandInset citation
LatexCommand cite
key "big,small"
@ -837,6 +858,7 @@ literal "false"
.
A book:
\begin_inset CommandInset citation
LatexCommand cite
key "Gro60"
@ -849,7 +871,9 @@ literal "false"
\end_layout
\begin_layout Standard
Many things, just testing for completeness:
Many things,
just testing for completeness:
\begin_inset CommandInset citation
LatexCommand cite
key "article,book,booklet,conference,inbook,incollection"
@ -866,8 +890,12 @@ I am the seventh section and I deal with indices
\end_layout
\begin_layout Standard
First, a term to index:
First,
a term to index:
\begin_inset Index idx
range none
pageformat default
status open
\begin_layout Plain Layout
@ -878,7 +906,10 @@ Term to index
.
Then a term to add to the second index:
\begin_inset Index oth
range none
pageformat default
status open
\begin_layout Plain Layout
@ -893,7 +924,10 @@ Term to add to the second index
\begin_layout Standard
Then several terms for the first index:
\begin_inset Index idx
range none
pageformat default
status open
\begin_layout Plain Layout
@ -908,7 +942,10 @@ Term!to!index
\begin_layout Standard
With a see:
\begin_inset Index idx
range none
pageformat default
status open
\begin_layout Plain Layout
@ -919,7 +956,10 @@ Term|see{index}
.
With a see also:
\begin_inset Index idx
range none
pageformat default
status open
\begin_layout Plain Layout
@ -934,7 +974,10 @@ Term|seealso{index}
\begin_layout Standard
Several terms with a see:
\begin_inset Index idx
range none
pageformat default
status open
\begin_layout Plain Layout
@ -945,7 +988,10 @@ Term!to!index|see{index}
.
Several terms with a see also:
\begin_inset Index idx
range none
pageformat default
status open
\begin_layout Plain Layout
@ -960,7 +1006,10 @@ Term!to!index|seealso{index}
\begin_layout Standard
A start of range:
\begin_inset Index idx
range none
pageformat default
status open
\begin_layout Plain Layout
@ -971,7 +1020,10 @@ Term to index|(
.
The corresponding end of range:
\begin_inset Index idx
range none
pageformat default
status open
\begin_layout Plain Layout
@ -985,7 +1037,10 @@ Term to index|)
\begin_layout Standard
Several terms with a start of range:
\begin_inset Index idx
range none
pageformat default
status open
\begin_layout Plain Layout
@ -996,7 +1051,10 @@ Term!to!index|(
.
The corresponding end of range:
\begin_inset Index idx
range none
pageformat default
status open
\begin_layout Plain Layout
@ -1009,8 +1067,12 @@ Term!to!index|)
\end_layout
\begin_layout Standard
These terms already appeared before! Start of range:
These terms already appeared before!
Start of range:
\begin_inset Index idx
range none
pageformat default
status open
\begin_layout Plain Layout
@ -1021,7 +1083,10 @@ Term!to!index|(
.
The corresponding end of range:
\begin_inset Index idx
range none
pageformat default
status open
\begin_layout Plain Layout

8
src/insets/InsetBibtex.cpp
View File

@ -1130,7 +1130,10 @@ void InsetBibtex::docbook(XMLStream & xs, OutputParams const &) const
// Relations between documents.
vector<pair<string, string>> relations = { // <bibtex, docbook biblioset relation>
make_pair("journal", "journal"),
make_pair("journaltitle", "journal"),
make_pair("fulljournaltitle", "journal"),
make_pair("booktitle", "book"),
make_pair("fullbooktitle", "book"),
make_pair("series", "series")
};
// Various things that do not fit DocBook.
@ -1145,6 +1148,8 @@ void InsetBibtex::docbook(XMLStream & xs, OutputParams const &) const
toDocBookTag["institution"] = "SPECIFIC"; // No direct translation to DocBook: <org>.
toDocBookTag["title"] = "title";
toDocBookTag["fulltitle"] = "title";
toDocBookTag["quotetitle"] = "title";
toDocBookTag["volume"] = "volumenum";
toDocBookTag["edition"] = "edition";
toDocBookTag["pages"] = "artpagenums";
@ -1155,7 +1160,10 @@ void InsetBibtex::docbook(XMLStream & xs, OutputParams const &) const
toDocBookTag["month"] = "SPECIFIC"; // No direct translation to DocBook: <pubdate>.
toDocBookTag["journal"] = "SPECIFIC"; // No direct translation to DocBook: <biblioset>.
toDocBookTag["journaltitle"] = "SPECIFIC"; // No direct translation to DocBook: <biblioset>.
toDocBookTag["fulljournaltitle"] = "SPECIFIC"; // No direct translation to DocBook: <biblioset>.
toDocBookTag["booktitle"] = "SPECIFIC"; // No direct translation to DocBook: <biblioset>.
toDocBookTag["fullbooktitle"] = "SPECIFIC"; // No direct translation to DocBook: <biblioset>.
toDocBookTag["series"] = "SPECIFIC"; // No direct translation to DocBook: <biblioset>.
for (auto const & id: biblioId)