From a65a16d380ee8975a947e7c32f3a6372dad9a742 Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Tue, 7 Sep 2010 14:52:29 +0200 Subject: [PATCH] Enable linefeed in text source property with the html entity . --- .gitignore | 1 + src/rptobjecttext.c | 5 +++-- src/rptreport.c | 5 +++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 04c6645..a38016e 100644 --- a/.gitignore +++ b/.gitignore @@ -48,6 +48,7 @@ tests/test_rptreport tests/test_rptreport_creation tests/test_report_created* tests/test_rptprint_mm.rptr +tests/test_report_newline.rpt POTFILES mkinstalldirs stamp-it diff --git a/src/rptobjecttext.c b/src/rptobjecttext.c index afad6fc..30152b2 100644 --- a/src/rptobjecttext.c +++ b/src/rptobjecttext.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2007 Andrea Zagli + * Copyright (C) 2006-2010 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -259,7 +259,8 @@ RptObject priv->font = rpt_common_get_font (xnode); priv->align = rpt_common_get_align (xnode); - g_object_set (rpt_obj_text, "source", xmlGetProp (xnode, "source"), NULL); + prop = (gchar *)xmlGetProp (xnode, "source"); + g_object_set (rpt_obj_text, "source", prop, NULL); prop = (gchar *)xmlGetProp (xnode, "background-color"); if (prop != NULL) diff --git a/src/rptreport.c b/src/rptreport.c index 55a1d0d..9e492e8 100644 --- a/src/rptreport.c +++ b/src/rptreport.c @@ -2078,6 +2078,11 @@ rpt_report_rptprint_parse_text_source (RptReport *rpt_report, RptObject *rptobj, yy_scan_string (source); yyparse (rpt_report, row, &ret); + if (g_strstr_len (ret, -1, " ") != NULL) + { + ret = g_strjoinv ("\n", g_strsplit (ret, " ", -1)); + } + if (ret == NULL) { xmlNodeSetContent (xnode, ""); -- 2.49.0