From 2aa9e45c24bfefdeebd7e90da387f3c074ac2994 Mon Sep 17 00:00:00 2001
From: Andrea Zagli <azagli@libero.it>
Date: Sat, 3 Aug 2019 10:13:58 +0200
Subject: [PATCH] Lines that don't start with * are body part of the header.

---
 src/parser.c     | 86 +++++++++++++++++++++++++++++-------------------
 tests/simple.org |  3 ++
 2 files changed, 55 insertions(+), 34 deletions(-)

diff --git a/src/parser.c b/src/parser.c
index be59f18..ace8ce6 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -57,6 +57,7 @@ typedef struct
 		guint level;
 		gchar *str;
 		gchar *tags;
+		GString *body;
 	} Header;
 
 static void
@@ -189,6 +190,10 @@ traverse_func (GNode *node,
 		{
 			g_printf ("\tTAGS %s\n", h->tags);
 		}
+	if (h->body != NULL)
+		{
+			g_printf ("\tBODY %s", h->body->str);
+		}
 
 	return FALSE;
 }
@@ -275,52 +280,65 @@ zak_gorg_parser_parse (ZakGorgParser *zak_gorg_parser)
 
 					g_regex_match (regex, strline, 0, &match_info);
 
-					Header *h = g_new0 (Header, 1);
-					for (l = 0; l < i - start; l++)
+					if (strline[0] != '*')
 						{
-							if (strline[l] == ' ')
+							Header *h = (Header *)cur->data;
+							if (h->body == NULL)
 								{
-									h->level = l;
-									break;
+									h->body = g_string_new ("");
 								}
-						}
-
-					rx_start = 0;
-					h->tags = g_match_info_fetch (match_info, 0);
-					if (h->tags != NULL)
-						{
-							g_match_info_fetch_pos (match_info, 0, &rx_start, NULL);
-						}
-
-					if (rx_start > 0)
-						{
-							h->str = g_strndup (strline + h->level + 1, rx_start - (h->level + 1));
+							g_string_append_printf (h->body, "%s\n", strline);
 						}
 					else
 						{
-							h->str = g_strdup (strline + h->level + 1);
-						}
-					g_strstrip (h->str);
+							Header *h = g_new0 (Header, 1);
+							h->body = NULL;
+							for (l = 0; l < i - start; l++)
+								{
+									if (strline[l] == ' ')
+										{
+											h->level = l;
+											break;
+										}
+								}
 
-					g_match_info_free (match_info);
-					g_free (strline);
+							rx_start = 0;
+							h->tags = g_match_info_fetch (match_info, 0);
+							if (h->tags != NULL)
+								{
+									g_match_info_fetch_pos (match_info, 0, &rx_start, NULL);
+								}
 
-					GNode *n = g_node_new (h);
+							if (rx_start > 0)
+								{
+									h->str = g_strndup (strline + h->level + 1, rx_start - (h->level + 1));
+								}
+							else
+								{
+									h->str = g_strdup (strline + h->level + 1);
+								}
+							g_strstrip (h->str);
 
-					if (h->level == 0)
-						{
-							cur = root;
-						}
-					else
-						{
-							Header *hcur = (Header *)cur->data;
-							if (h->level == hcur->level)
+							g_match_info_free (match_info);
+							g_free (strline);
+
+							GNode *n = g_node_new (h);
+
+							if (h->level == 0)
+								{
+									cur = root;
+								}
+							else
 								{
-									cur = cur->parent;
+									Header *hcur = (Header *)cur->data;
+									if (h->level == hcur->level)
+										{
+											cur = cur->parent;
+										}
 								}
+							g_node_append (cur, n);
+							cur = n;
 						}
-					g_node_append (cur, n);
-					cur = n;
 				}
 		}
 
diff --git a/tests/simple.org b/tests/simple.org
index 1cbfd2b..3e70bf8 100644
--- a/tests/simple.org
+++ b/tests/simple.org
@@ -1,7 +1,10 @@
 * first line                                                          :first:
 ** sub 1 first line                                          :tag1:tag2:tag3:
+body with no space
 ** sub 2 first line
 * second line                                                          :tag1:
+  the body of the second line
+  it's multiline body
 *** sub 1 sub 1 second line (without parent)
 * third line                                                     :third:line:
 ** sub 1 :third (no tag): line
-- 
2.49.0