summaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
authoralbert-github <albert.tests@gmail.com>2014-11-28 13:44:07 (GMT)
committeralbert-github <albert.tests@gmail.com>2014-11-28 13:44:07 (GMT)
commit329a4ddc036ac9dfe72b11d62cb4043bc8488c20 (patch)
tree8ca50b460259cbadced0e68f100ba3fb620faed7 /testing
parent0fea3d4ca57187f271d7580ff16f32b7ab4657df (diff)
downloadDoxygen-329a4ddc036ac9dfe72b11d62cb4043bc8488c20.zip
Doxygen-329a4ddc036ac9dfe72b11d62cb4043bc8488c20.tar.gz
Doxygen-329a4ddc036ac9dfe72b11d62cb4043bc8488c20.tar.bz2
Limit images sizes and make more uniform (LaTeX)
This patch adjusts some problems regarding image sizes in LaTeX output of doxygen (a.o. Bug 738299 - When using msc or PlantUML, the default latex for the created image should include [width=\linewidth]) this has been done is such a way that all the "image" commands (i.e. image, dot, dotfile, msc, mscfile, diafile, startuml) operate in a similar way / have the same possibilities. - commands.doc Adjusted documentation to reflect changes. - cmdmapper.cpp - cmdmapper.h Added utility function to map command id back to command name - doctokenizer.h - doctokenizer.l Handle Caption and Size indication. Required also that some other rules had to be tightened a bit (like usage of {} in startuml and usage of "" for captions. This was already described in the documentation in this way). - docparser.cpp - docparser.h Created routine to uniformly handle the Caption and size indications and store them in a general way. - latexgen.cpp Replaced graphicx package by adjustbox package (includes graphicx) to support "min width" etc. - doxygen.sty templates\latex Added commands to make commands with and without caption behave similar. - docbookvisitor.cpp - docbookvisitor.h - htmldocvisitor.cpp - latexdocvisitor.cpp - latexdocvisitor.h - printdocvisitor.h - xmldocvisitor.cpp Created routine to uniformly handle the Caption and size indications in a general way. - indexpage.xml (testing\022) - indexpage.xml (testing\031) - class_receiver.xml (testing\037) - class_sender.xml (testing\037) Adjusted example output.
Diffstat (limited to 'testing')
-rw-r--r--testing/022/indexpage.xml5
-rw-r--r--testing/031/indexpage.xml2
-rw-r--r--testing/037/class_receiver.xml5
-rw-r--r--testing/037/class_sender.xml5
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 -&gt; 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 eb37d47..2fcde6d 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&lt;-Sender [label="Command()", URL="\ref Command()"];
Receiver-&gt;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 117ed93..b77017a 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-&gt;Receiver [label="Command()", URL="\ref Receiver::Command()"];
Sender&lt;-Receiver [label="Ack()", URL="\ref Ack()", ID="1"];
-</msc> </para>
+</msc>
+ </para>
</detaileddescription>
<location file="037_msc.cpp" bodystart="13" bodyend="18"/>
<listofallmembers>