[Libreoffice-commits] .: i18npool/source

Caolán McNamara caolan at kemper.freedesktop.org
Sat Jan 29 04:55:43 PST 2011


 i18npool/source/breakiterator/makefile.mk |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

New commits:
commit f36959ea3f48c491739deee1e152240ece9397f1
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Jan 29 12:51:52 2011 +0000

    Resolves: fdo#31271 wrong line break with (

diff --git a/i18npool/source/breakiterator/makefile.mk b/i18npool/source/breakiterator/makefile.mk
index f308812..fc6561c 100644
--- a/i18npool/source/breakiterator/makefile.mk
+++ b/i18npool/source/breakiterator/makefile.mk
@@ -79,7 +79,17 @@ GENBRK:=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/genbrk
 GENCCODE:=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/genccode
 .ENDIF
 
-$(MISC)$/%.brk : data/%.txt
+.INCLUDE .IGNORE :  icuversion.mk
+
+$(MISC)$/%.txt : data/%.txt
+# fdo#31271 ")" reclassified in more recent ICU/Unicode Standards
+.IF "$(ICU_MAJOR)" >= "5" || ("$(ICU_MAJOR)" == "4" && "$(ICU_MINOR)" >= "4")
+    $(SED) "s#\[:LineBreak =  Close_Punctuation:\]#\[\[:LineBreak =  Close_Punctuation:\] \[:LineBreak = Close_Parenthesis:\]\]#" $< > $@
+.ELSE
+    $(COPY) $< $@
+.ENDIF
+
+$(MISC)$/%.brk : $(MISC)/%.txt
     $(WRAPCMD) $(GENBRK) -r $< -o $(MISC)$/$*.brk
 
 $(MISC)$/%_brk.c : $(MISC)$/%.brk


More information about the Libreoffice-commits mailing list