diff options
author | Dimitri van Heesch <doxygen@gmail.com> | 2019-01-10 18:34:14 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-10 18:34:14 (GMT) |
commit | 121ec253945f6563ac6731e3596cd9beaa39cb72 (patch) | |
tree | 10a16082118b5c7d644fb0a543b6a2e5bf01383c /testing | |
parent | 7f6815973d3d4db95b4a97a851c7839da632fab8 (diff) | |
parent | 6296ca32abf74dff4883b2f476ee311c2cd0324f (diff) | |
download | Doxygen-121ec253945f6563ac6731e3596cd9beaa39cb72.zip Doxygen-121ec253945f6563ac6731e3596cd9beaa39cb72.tar.gz Doxygen-121ec253945f6563ac6731e3596cd9beaa39cb72.tar.bz2 |
Merge pull request #6738 from albert-github/feature/issue_6733
issue #6733 invalid cite anchor id when using crossref
Diffstat (limited to 'testing')
-rwxr-xr-x[-rw-r--r--] | testing/012/citelist.xml | 65 | ||||
-rwxr-xr-x[-rw-r--r--] | testing/012/indexpage.xml | 25 | ||||
-rw-r--r-- | testing/012_cite.dox | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | testing/050/indexpage.xml | 65 | ||||
-rw-r--r-- | testing/sample.bib | 25 |
5 files changed, 128 insertions, 54 deletions
diff --git a/testing/012/citelist.xml b/testing/012/citelist.xml index f415968..cb039fd 100644..100755 --- a/testing/012/citelist.xml +++ b/testing/012/citelist.xml @@ -1,22 +1,43 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version=""> - <compounddef id="citelist" kind="page"> - <compoundname>citelist</compoundname> - <title>Bibliography</title> - <briefdescription> - </briefdescription> - <detaileddescription> - <para> - <variablelist> - <varlistentry> - <term><anchor id="citelist_1CITEREF_knuth79"/>[1]</term> - </varlistentry> - <listitem> - <para>Donald<nonbreakablespace/>E. Knuth. <emphasis>Tex and Metafont, New Directions in Typesetting</emphasis>. American Mathematical Society and Digital Press, Stanford, 1979.</para> - <para/> - </listitem> - </variablelist> - </para> - </detaileddescription> - </compounddef> -</doxygen> +<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+ <compounddef id="citelist" kind="page">
+ <compoundname>citelist</compoundname>
+ <title>Bibliography</title>
+ <briefdescription>
+ </briefdescription>
+ <detaileddescription>
+ <para>
+ <variablelist>
+ <varlistentry>
+ <term><anchor id="citelist_1CITEREF_Be09"/>[1]</term>
+ </varlistentry>
+ <listitem>
+ <para>P.<nonbreakablespace/>Belotti. <ulink url="http://doi.org/10.1007/978-1-4614-1927-3_5">Disjunctive cuts for non-convex MINLP</ulink>. In <ulink url="#CITEREF_LeLe12">Lee and Leyffer</ulink> <ulink url="#CITEREF_LeLe12">[4]</ulink>, pages 117<ndash/>144.</para>
+ <para/>
+ </listitem>
+ <varlistentry>
+ <term><anchor id="citelist_1CITEREF_BertholdHeinzVigerske2009"/>[2]</term>
+ </varlistentry>
+ <listitem>
+ <para>T.<nonbreakablespace/>Berthold, S.<nonbreakablespace/>Heinz, and S.<nonbreakablespace/>Vigerske. <ulink url="http://doi.org/10.1007/978-1-4614-1927-3_15">Extending a CIP framework to solve MIQCPs</ulink>. In <ulink url="#CITEREF_LeLe12">Lee and Leyffer</ulink> <ulink url="#CITEREF_LeLe12">[4]</ulink>, pages 427<ndash/>444.</para>
+ <para/>
+ </listitem>
+ <varlistentry>
+ <term><anchor id="citelist_1CITEREF_knuth79"/>[3]</term>
+ </varlistentry>
+ <listitem>
+ <para>Donald<nonbreakablespace/>E. Knuth. <emphasis>Tex and Metafont, New Directions in Typesetting</emphasis>. American Mathematical Society and Digital Press, Stanford, 1979.</para>
+ <para/>
+ </listitem>
+ <varlistentry>
+ <term><anchor id="citelist_1CITEREF_LeLe12"/>[4]</term>
+ </varlistentry>
+ <listitem>
+ <para>Jon Lee and Sven Leyffer, editors. <ulink url="http://doi.org/10.1007/978-1-4614-1927-3"><emphasis>Mixed Integer Nonlinear Programming</emphasis></ulink>, volume 154 of <emphasis>The IMA Volumes in Mathematics and its Applications</emphasis>. Springer, 2012.</para>
+ <para/>
+ </listitem>
+ </variablelist>
+ </para>
+ </detaileddescription>
+ </compounddef>
+</doxygen>
diff --git a/testing/012/indexpage.xml b/testing/012/indexpage.xml index 73fb669..e682540 100644..100755 --- a/testing/012/indexpage.xml +++ b/testing/012/indexpage.xml @@ -1,12 +1,13 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version=""> - <compounddef id="indexpage" kind="page"> - <compoundname>index</compoundname> - <title>My Project</title> - <briefdescription> - </briefdescription> - <detaileddescription> - <para>See <ref refid="citelist_1CITEREF_knuth79" kindref="member">[1]</ref> for more info. </para> - </detaileddescription> - </compounddef> -</doxygen> +<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+ <compounddef id="indexpage" kind="page">
+ <compoundname>index</compoundname>
+ <title>My Project</title>
+ <briefdescription>
+ </briefdescription>
+ <detaileddescription>
+ <para>See <ref refid="citelist_1CITEREF_knuth79" kindref="member">[3]</ref> for more info.</para>
+ <para>Oter references with crosreference see <ref refid="citelist_1CITEREF_Be09" kindref="member">[1]</ref> and <ref refid="citelist_1CITEREF_BertholdHeinzVigerske2009" kindref="member">[2]</ref> for more info. </para>
+ </detaileddescription>
+ </compounddef>
+</doxygen>
diff --git a/testing/012_cite.dox b/testing/012_cite.dox index 94be5e7..4b5e40d 100644 --- a/testing/012_cite.dox +++ b/testing/012_cite.dox @@ -4,4 +4,6 @@ // config: CITE_BIB_FILES = $INPUTDIR/sample.bib /** \mainpage * See \cite knuth79 for more info. + * + * Oter references with crosreference see \cite Be09 and \cite BertholdHeinzVigerske2009 for more info. */ diff --git a/testing/050/indexpage.xml b/testing/050/indexpage.xml index 2f183fe..bbaacf4 100644..100755 --- a/testing/050/indexpage.xml +++ b/testing/050/indexpage.xml @@ -1,20 +1,45 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version=""> - <compounddef id="indexpage" kind="page"> - <compoundname>index</compoundname> - <title>My Project</title> - <briefdescription> - </briefdescription> - <detaileddescription> - <para>Some normal text. <verbatim>A verbatim section with a /* C comment */ in it -</verbatim> Showing a file as verbatim <verbatim>@book{knuth79, - author = "Donald E. Knuth", - title = "Tex and Metafont, New Directions in Typesetting", - year = "1979", - publisher = "American Mathematical Society and Digital Press", - address = "Stanford" -} -</verbatim> More text after the verbatim section. </para> - </detaileddescription> - </compounddef> -</doxygen> +<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+ <compounddef id="indexpage" kind="page">
+ <compoundname>index</compoundname>
+ <title>My Project</title>
+ <briefdescription>
+ </briefdescription>
+ <detaileddescription>
+ <para>Some normal text. <verbatim>A verbatim section with a /* C comment */ in it
+</verbatim> Showing a file as verbatim <verbatim>@book{knuth79,
+ author = "Donald E. Knuth",
+ title = "Tex and Metafont, New Directions in Typesetting",
+ year = "1979",
+ publisher = "American Mathematical Society and Digital Press",
+ address = "Stanford"
+}
+@InCollection{ BertholdHeinzVigerske2009,
+ author = {T. Berthold and S. Heinz and S. Vigerske},
+ title = {Extending a {CIP} framework to solve {MIQCP}s},
+ crossref = {LeLe12},
+ pages = {427--444},
+ url = {http://doi.org/10.1007/978-1-4614-1927-3_15}
+}
+@Book{ LeLe12,
+ title = {Mixed Integer Nonlinear Programming},
+ booktitle = {Mixed Integer Nonlinear Programming},
+ publisher = {Springer},
+ year = {2012},
+ editor = {Jon Lee and Sven Leyffer},
+ volume = {154},
+ series = {The IMA Volumes in Mathematics and its Applications},
+ url = {http://doi.org/10.1007/978-1-4614-1927-3},
+ issn = {978-1-4614-1926-6}
+}
+@InCollection{ Be09,
+ author = {P. Belotti},
+ title = {Disjunctive cuts for non-convex {MINLP}},
+ crossref = {LeLe12},
+ pages = {117--144},
+ url = {http://doi.org/10.1007/978-1-4614-1927-3_5}
+}
+</verbatim> More text after the verbatim section. </para>
+ </detaileddescription>
+ </compounddef>
+</doxygen>
diff --git a/testing/sample.bib b/testing/sample.bib index 436e8cd..c20175d 100644 --- a/testing/sample.bib +++ b/testing/sample.bib @@ -5,3 +5,28 @@ publisher = "American Mathematical Society and Digital Press", address = "Stanford" } +@InCollection{ BertholdHeinzVigerske2009, + author = {T. Berthold and S. Heinz and S. Vigerske}, + title = {Extending a {CIP} framework to solve {MIQCP}s}, + crossref = {LeLe12}, + pages = {427--444}, + url = {http://doi.org/10.1007/978-1-4614-1927-3_15} +} +@Book{ LeLe12, + title = {Mixed Integer Nonlinear Programming}, + booktitle = {Mixed Integer Nonlinear Programming}, + publisher = {Springer}, + year = {2012}, + editor = {Jon Lee and Sven Leyffer}, + volume = {154}, + series = {The IMA Volumes in Mathematics and its Applications}, + url = {http://doi.org/10.1007/978-1-4614-1927-3}, + issn = {978-1-4614-1926-6} +} +@InCollection{ Be09, + author = {P. Belotti}, + title = {Disjunctive cuts for non-convex {MINLP}}, + crossref = {LeLe12}, + pages = {117--144}, + url = {http://doi.org/10.1007/978-1-4614-1927-3_5} +} |