diff options
| author | Eike Rathke <erack@redhat.com> | 2012-04-02 22:24:00 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2012-04-03 00:15:30 +0200 |
| commit | 43084e8b30c101a44510b7a8267d5c2b316a17bb (patch) | |
| tree | ea6810804a963c35683c5e16cf0fe02f1d15d0bf /i18npool | |
| parent | 9ef0b8e3aa2137af67624dbd757fe464e44202ed (diff) | |
only as of ICU 4.9 RBBI the Prepend property is empty
This reverts 0c08a84c04b166ab6479716e2c33cd444d7e3dbe and instead strips the
Prepend variable during build time.
Diffstat (limited to 'i18npool')
| -rw-r--r-- | i18npool/CustomTarget_breakiterator.mk | 8 | ||||
| -rw-r--r-- | i18npool/source/breakiterator/data/char.txt | 1 | ||||
| -rw-r--r-- | i18npool/source/breakiterator/data/char_in.txt | 3 |
3 files changed, 11 insertions, 1 deletions
diff --git a/i18npool/CustomTarget_breakiterator.mk b/i18npool/CustomTarget_breakiterator.mk index 10dce5ff3c5b..a8379d746f56 100644 --- a/i18npool/CustomTarget_breakiterator.mk +++ b/i18npool/CustomTarget_breakiterator.mk @@ -95,10 +95,16 @@ $(IPBI)/%.brk : $(IPBI)/%.txt $(GENBRKTARGET) $(call gb_Helper_abbreviate_dirs_native,\ $(GENBRK) -r $< -o $@ $(if $(findstring s,$(MAKEFLAGS)),> /dev/null)) -# fdo#31271 ")" reclassified in more recent ICU/Unicode Standards +# fdo#31271 ")" reclassified in more recent Unicode Standards / ICU 4.4 +# Prepend set empty as of Unicode Version 6.1 / ICU 4.9, which bails out if used. +# NOTE: strips every line with _word_ 'Prepend', including $Prepend $(IPBI)/%.txt : $(SRCDIR)/i18npool/source/breakiterator/data/%.txt | $(IPBI)/.dir ifeq ($(ICU_RECLASSIFIED_CLOSE_PARENTHESIS),YES) +ifeq ($(ICU_RECLASSIFIED_PREPEND_SET_EMPTY),YES) + sed "s#\[:LineBreak = Close_Punctuation:\]#\[\[:LineBreak = Close_Punctuation:\] \[:LineBreak = Close_Parenthesis:\]\]#;/\<Prepend\>/d" $< > $@ +else sed "s#\[:LineBreak = Close_Punctuation:\]#\[\[:LineBreak = Close_Punctuation:\] \[:LineBreak = Close_Parenthesis:\]\]#" $< > $@ +endif else cp $< $@ endif diff --git a/i18npool/source/breakiterator/data/char.txt b/i18npool/source/breakiterator/data/char.txt index acb932eddbd0..8e49a565ed8c 100644 --- a/i18npool/source/breakiterator/data/char.txt +++ b/i18npool/source/breakiterator/data/char.txt @@ -16,6 +16,7 @@ $CR = [\p{Grapheme_Cluster_Break = CR}]; $LF = [\p{Grapheme_Cluster_Break = LF}]; $Control = [\p{Grapheme_Cluster_Break = Control}]; +$Prepend = [\p{Grapheme_Cluster_Break = Prepend}]; $Extend = [\p{Grapheme_Cluster_Break = Extend}]; $SpacingMark = [\p{Grapheme_Cluster_Break = SpacingMark}]; # True Indic wants to move by syllables. Break up SpacingMark. This based on Unicode 6.0 data diff --git a/i18npool/source/breakiterator/data/char_in.txt b/i18npool/source/breakiterator/data/char_in.txt index 5ad12a7f2fd9..5e1ed67596c0 100644 --- a/i18npool/source/breakiterator/data/char_in.txt +++ b/i18npool/source/breakiterator/data/char_in.txt @@ -15,6 +15,7 @@ $CR = [\p{Grapheme_Cluster_Break = CR}]; $LF = [\p{Grapheme_Cluster_Break = LF}]; $Control = [\p{Grapheme_Cluster_Break = Control}]; +$Prepend = [\p{Grapheme_Cluster_Break = Prepend}]; $Extend = [\p{Grapheme_Cluster_Break = Extend}]; $SpacingMark = [\p{Grapheme_Cluster_Break = SpacingMark}]; $BengaliLetter = [\u0985-\u09B9 \u09CE \u09DC-\u09E1 \u09F0-\u09F1]; @@ -71,6 +72,7 @@ $L ($L | $V | $LV | $LVT); [^$Control $CR $LF] $Extend; [^$Control $CR $LF] $SpacingMark; +$Prepend [^$Control $CR $LF]; ## ------------------------------------------------- @@ -92,6 +94,7 @@ $T ($LVT | $T); $Extend [^$Control $CR $LF]; $SpacingMark [^$Control $CR $LF]; +[^$Control $CR $LF] $Prepend; ## ------------------------------------------------- |