[gtk-doc] mkdb: tune last xml fixup change
- From: Stefan Kost <stefkost src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk-doc] mkdb: tune last xml fixup change
- Date: Tue, 13 Jul 2010 08:16:14 +0000 (UTC)
commit ec1f3cc6c43884409ab7850952270f86b3d5e363
Author: Stefan Kost <ensonic users sf net>
Date: Tue Jul 13 10:40:53 2010 +0300
mkdb: tune last xml fixup change
Add anotehr variant to the tests. Don't check for a newline after <para>.
gtkdoc-mkdb.in | 2 +-
tests/bugs/docs/tester-sections.txt | 1 +
tests/bugs/src/tester.c | 23 +++++++++++++++++------
tests/bugs/src/tester.h | 1 +
4 files changed, 20 insertions(+), 7 deletions(-)
---
diff --git a/gtkdoc-mkdb.in b/gtkdoc-mkdb.in
index 14087b4..56925b8 100755
--- a/gtkdoc-mkdb.in
+++ b/gtkdoc-mkdb.in
@@ -4351,7 +4351,7 @@ sub MergeSourceDocumentation {
$src_doc_para = "<para>\n$src_doc\n</para>";
# fixup xml markup
$src_doc_para =~ s%<para>\n(<refsect[1-9])%$1%gms;
- $src_doc_para =~ s%<para>\n<para>\n%<para>\n%gms;
+ $src_doc_para =~ s%<para>\n<para>%<para>%gms;
$src_doc_para =~ s%(</refsect[1-9]>)\n</para>%$1%gms;
#print "$symbol : [$src_doc][$src_doc_para]\n";
}
diff --git a/tests/bugs/docs/tester-sections.txt b/tests/bugs/docs/tester-sections.txt
index 65fa7e5..26f0fd3 100644
--- a/tests/bugs/docs/tester-sections.txt
+++ b/tests/bugs/docs/tester-sections.txt
@@ -40,6 +40,7 @@ bug_602518c
bug_607445
bug_610257
bug_623968a
+bug_623968b
<SUBSECTION Standard>
<SUBSECTION Private>
GTKDOC_GNUC_CONST
diff --git a/tests/bugs/src/tester.c b/tests/bugs/src/tester.c
index f07cd9f..abadc6e 100644
--- a/tests/bugs/src/tester.c
+++ b/tests/bugs/src/tester.c
@@ -245,14 +245,10 @@ bug_610257(const unsigned char *der, int *len)
/**
* bug_623968a:
*
- * <para>
- * test
- * </para>
+ * <para>test</para>
* <refsect3>
* <title>subsect</title>
- * <para>
- * test
- * </para>
+ * <para>test</para>
* </refsect3>
**/
void
@@ -260,3 +256,18 @@ bug_623968a(void)
{
}
+/**
+ * bug_623968b:
+ *
+ * test
+ *
+ * <refsect3>
+ * <title>subsect</title>
+ * <para>test</para>
+ * </refsect3>
+ **/
+void
+bug_623968b(void)
+{
+}
+
diff --git a/tests/bugs/src/tester.h b/tests/bugs/src/tester.h
index ff6963c..4327b7c 100644
--- a/tests/bugs/src/tester.h
+++ b/tests/bugs/src/tester.h
@@ -287,6 +287,7 @@ signed long bug_610257(const unsigned char *der, int *len);
void bug_623968a(void);
+void bug_623968b(void);
#endif // GTKDOC_TESTER_H
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]