From 5121b9a41d671dbaf7350c349d246793d8d8a4e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Wed, 12 Jun 2019 15:07:57 +0200 Subject: [PATCH] Update TDEL10n module + Add new options to function tde_l10n_prepare_xml -- preserve / remove multiple line breaks -- this fix the extraction from tips files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- modules/TDEL10n.cmake | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/TDEL10n.cmake b/modules/TDEL10n.cmake index 8b2774f..62aad3a 100644 --- a/modules/TDEL10n.cmake +++ b/modules/TDEL10n.cmake @@ -690,7 +690,7 @@ function( tde_l10n_prepare_xml ) unset( _context ) set( _skip_properties "database|associations|populationText" ) set( _tags "[tT][eE][xX][tT]|title|string|whatsthis|tooltip|label" ) - set( _preserve "line-wrap" "lines-leading" "spaces-leading" "spaces-trailing" "spaces-multi" ) + set( _preserve "line-wrap" "lines-leading" "lines-multi" "spaces-leading" "spaces-trailing" "spaces-multi" ) set( _no_c_format 1 ) unset( _directive ) set( _var _source ) @@ -872,8 +872,9 @@ function( tde_l10n_prepare_xml ) if( _xml_inside ) if( ";${_preserve};" MATCHES ";line-wrap;" ) - if( ";${_preserve};" MATCHES ";lines-leading;" - OR NOT "${_xml_line}" STREQUAL "" OR NOT _xml_tag_empty ) + if( NOT "${_xml_line}" STREQUAL "" + OR ( ";${_preserve};" MATCHES ";lines-leading;" AND _xml_tag_empty ) + OR ( ";${_preserve};" MATCHES ";lines-multi;" AND NOT _xml_tag_empty ) ) set( _xml_line "${_xml_line}\\n" ) endif( ) elseif( NOT "${_xml_line}" STREQUAL "" AND NOT _xml_tag_empty )