diff options
author | Dimitri van Heesch <dimitri@stack.nl> | 2014-12-20 14:04:50 (GMT) |
---|---|---|
committer | Dimitri van Heesch <dimitri@stack.nl> | 2014-12-20 14:04:50 (GMT) |
commit | 67e8d626fec0c4365106902dcd16b988b8cceb10 (patch) | |
tree | dab43c4c97739308cd75399c7c88cf0f954af6b5 /testing | |
parent | c09f84c27bd916342ca0e8fdcb5244cd902f8e09 (diff) | |
parent | 329a4ddc036ac9dfe72b11d62cb4043bc8488c20 (diff) | |
download | Doxygen-67e8d626fec0c4365106902dcd16b988b8cceb10.zip Doxygen-67e8d626fec0c4365106902dcd16b988b8cceb10.tar.gz Doxygen-67e8d626fec0c4365106902dcd16b988b8cceb10.tar.bz2 |
Merge branch 'feature/bug_size_latex' of https://github.com/albert-github/doxygen into albert-github-feature/bug_size_latex
Conflicts:
src/doctokenizer.h
src/latexgen.cpp
Diffstat (limited to 'testing')
-rw-r--r-- | testing/022/indexpage.xml | 5 | ||||
-rw-r--r-- | testing/031/indexpage.xml | 2 | ||||
-rw-r--r-- | testing/037/class_receiver.xml | 5 | ||||
-rw-r--r-- | testing/037/class_sender.xml | 5 |
4 files changed, 10 insertions, 7 deletions
diff --git a/testing/022/indexpage.xml b/testing/022/indexpage.xml index 83ed868..afcf23a 100644 --- a/testing/022/indexpage.xml +++ b/testing/022/indexpage.xml @@ -4,14 +4,15 @@ <compoundname>index</compoundname> <title>My Project</title> <detaileddescription> - <para>Class relations expressed via an inline dot graph: <dot> + <para>Class relations expressed via an inline dot graph: <dot> digraph example { node [shape=record, fontname=Helvetica, fontsize=10]; b [ label="class B" URL="\ref B"]; c [ label="class C" URL="\ref C"]; b -> c [ arrowhead="open", style="dashed" ]; } -</dot> </para> +</dot> + </para> </detaileddescription> </compounddef> </doxygen> diff --git a/testing/031/indexpage.xml b/testing/031/indexpage.xml index a0297fa..a6ffb36 100644 --- a/testing/031/indexpage.xml +++ b/testing/031/indexpage.xml @@ -6,7 +6,7 @@ <detaileddescription> <para>Some text. <image type="html" name="sample.png"/> <image type="latex" name="sample.png" width="5cm">Doxygen logo</image> - More text. </para> +More text. </para> </detaileddescription> </compounddef> </doxygen> diff --git a/testing/037/class_receiver.xml b/testing/037/class_receiver.xml index fc63646..5c4fde6 100644 --- a/testing/037/class_receiver.xml +++ b/testing/037/class_receiver.xml @@ -25,11 +25,12 @@ <briefdescription> </briefdescription> <detaileddescription> - <para><ref refid="class_receiver" kindref="compound">Receiver</ref> class. Can be used to receive and execute commands. After execution of a command, the receiver will send an acknowledgement <msc> + <para><ref refid="class_receiver" kindref="compound">Receiver</ref> class. Can be used to receive and execute commands. After execution of a command, the receiver will send an acknowledgement <msc> Receiver,Sender; Receiver<-Sender [label="Command()", URL="\ref Command()"]; Receiver->Sender [label="Ack()", URL="\ref Sender::Ack()", ID="1"]; -</msc> </para> +</msc> + </para> </detaileddescription> <location file="037_msc.cpp" bodystart="28" bodyend="33"/> <listofallmembers> diff --git a/testing/037/class_sender.xml b/testing/037/class_sender.xml index 4254384..e58ab88 100644 --- a/testing/037/class_sender.xml +++ b/testing/037/class_sender.xml @@ -25,11 +25,12 @@ <briefdescription> </briefdescription> <detaileddescription> - <para><ref refid="class_sender" kindref="compound">Sender</ref> class. Can be used to send a command to the server. The receiver will acknowledge the command by calling <ref refid="class_sender_1a8ad2c6f9baa4e798868fe4a4d45f8fda" kindref="member">Ack()</ref>. <msc> + <para><ref refid="class_sender" kindref="compound">Sender</ref> class. Can be used to send a command to the server. The receiver will acknowledge the command by calling <ref refid="class_sender_1a8ad2c6f9baa4e798868fe4a4d45f8fda" kindref="member">Ack()</ref>. <msc> Sender,Receiver; Sender->Receiver [label="Command()", URL="\ref Receiver::Command()"]; Sender<-Receiver [label="Ack()", URL="\ref Ack()", ID="1"]; -</msc> </para> +</msc> + </para> </detaileddescription> <location file="037_msc.cpp" bodystart="13" bodyend="18"/> <listofallmembers> |