[gtk-doc] Support lists with blocks inside them
- From: William Jon McCann <mccann src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk-doc] Support lists with blocks inside them
- Date: Thu, 30 Jan 2014 21:30:26 +0000 (UTC)
commit c120faa0922a47a0065ad520c93881ba24a59c39
Author: William Jon McCann <william jon mccann gmail com>
Date: Thu Jan 30 02:51:17 2014 -0500
Support lists with blocks inside them
https://bugzilla.gnome.org/show_bug.cgi?id=723288
gtkdoc-mkdb.in | 6 +++---
tests/gobject/src/gobject.c | 5 +++++
2 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/gtkdoc-mkdb.in b/gtkdoc-mkdb.in
index e12f896..9b47d0c 100755
--- a/gtkdoc-mkdb.in
+++ b/gtkdoc-mkdb.in
@@ -4723,7 +4723,7 @@ sub ConvertMarkDownCallback {
# New paragraph.
$text.="\n"; # we need a new line to avoid too complicated matching rules below
our $is_last = 0;
- $text =~
s%(?<=\n)-\s+(.+?)(?=(?:\n-\s+(?{$is_last=0}))|(?:\n\n(?{$is_last=1}))|(?:\n$(?{$is_last=1})))%ReplaceMarkDownListItem($1,
"itemizedlist", $is_last)%egs;
+ $text =~ s%(?<=\n)-\s+(.+?)(?=(?:\n-\s+(?{$is_last=0}))|(?:\n\n[^
\-\t](?{$is_last=1}))|(?:\n$(?{$is_last=1})))%ReplaceMarkDownListItem($1, "itemizedlist", $is_last)%egs;
chomp $text;
# Simple (unnested) lists:
@@ -4735,7 +4735,7 @@ sub ConvertMarkDownCallback {
#
# New paragraph.
$text.="\n"; # we need a new line to avoid too complicated matching rules below
- $text =~
s%(?<=\n)\*\s+(.+?)(?=(?:\n\*\s+(?{$is_last=0}))|(?:\n\n(?{$is_last=1}))|(?:\n$(?{$is_last=1})))%ReplaceMarkDownListItem($1,
"itemizedlist", $is_last)%egs;
+ $text =~ s%(?<=\n)\*\s+(.+?)(?=(?:\n\*\s+(?{$is_last=0}))|(?:\n\n[^
*\t](?{$is_last=1}))|(?:\n$(?{$is_last=1})))%ReplaceMarkDownListItem($1, "itemizedlist", $is_last)%egs;
chomp $text;
# Ordered (unnested) lists:
@@ -4747,7 +4747,7 @@ sub ConvertMarkDownCallback {
#
# New paragraph.
$text.="\n"; # we need a new line to avoid too complicated matching rules below
- $text =~
s%(?<=\n)\d+\.\s+(.+?)(?=(?:\n\d+\.\s+(?{$is_last=0}))|(?:\n\n(?{$is_last=1}))|(?:\n$(?{$is_last=1})))%ReplaceMarkDownListItem($1,
"orderedlist", $is_last)%egs;
+ $text =~ s%(?<=\n)\d+\.\s+(.+?)(?=(?:\n\d+\.\s+(?{$is_last=0}))|(?:\n\n[^
\d\t](?{$is_last=1}))|(?:\n$(?{$is_last=1})))%ReplaceMarkDownListItem($1, "orderedlist", $is_last)%egs;
chomp $text;
# Make Paragraphs on blank lines
diff --git a/tests/gobject/src/gobject.c b/tests/gobject/src/gobject.c
index 70cdbd9..026bd36 100644
--- a/tests/gobject/src/gobject.c
+++ b/tests/gobject/src/gobject.c
@@ -55,8 +55,13 @@
*
* This example serves two main purposes:
* * testing alternate list syntax
+ *
+ * With section text in each.
+ *
* * not sure if we want this one
*
+ * It has more stuff.
+ *
* # Coda #
*
* 1. There
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]