[Libreoffice-commits] .: 2 commits - editeng/source libexttextcat/Zip_fingerprint.mk

Wed Nov 28 07:12:55 PST 2012

editeng/source/misc/svxacorr.cxx |    4 ++--
 libexttextcat/Zip_fingerprint.mk |    2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 150e32777c99a5d67a51726972f46c06dae8a6ac
Author: CaolÃ¡n McNamara <caolanm at redhat.com>
Date:   Wed Nov 28 13:36:47 2012 +0000

    Resolves: fdo#57640 we really want to *titlecase* the initial character
    
    http://srfi.schemers.org/srfi-13/mail-archive/msg00046.html summarizes well..
    "
    - Titlecase <> uppercase
      Unicode defines three kinds of case mapping: lowercase, uppercase, and
      titlecase. The difference between uppercasing and titlecasing a character
      or character sequence can be seen in compound characters (that is,
      a single character that represents a compount of two characters).
    
      For example, in Unicode, character U+01F3 is LATIN SMALL LETTER DZ.  (Let us
      write this compound character using ASCII as "dz".) This character
      uppercases to character U+01F1, LATIN CAPITAL LETTER DZ.  (Which is
      basically "DZ".) But it titlecases to to character U+01F2, LATIN CAPITAL
      LETTER D WITH SMALL LETTER Z. (Which we can write "Dz".)
    
          character	uppercase titlecase
          --------- --------- ---------
          dz	DZ	  Dz
    "
    
    See TestCharacterClassification::testTitleCase for titlecase regression
    tests.
    
    Change-Id: I198379832d1910632bb6358149a5276b68d7c6eb

diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 930e540..934876f 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -855,7 +855,7 @@ sal_Bool SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
         {
             // valid separator -> replace
             rtl::OUString sChar( *pWordStt );
-            sChar = rCC.uppercase( sChar );
+            sChar = rCC.titlecase(sChar); //see fdo#56740
             return  !comphelper::string::equals(sChar, *pWordStt) &&
                     rDoc.ReplaceRange( xub_StrLen( pWordStt - pStart ), 1, sChar );
         }
@@ -1030,7 +1030,7 @@ sal_Bool SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
     sal_Unicode cSave = *pWordStt;
     nSttPos = sal::static_int_cast< xub_StrLen >( pWordStt - rTxt.GetBuffer() );
     rtl::OUString sChar( cSave );
-    sChar = rCC.uppercase( sChar );
+    sChar = rCC.titlecase(sChar); //see fdo#56740
     sal_Bool bRet = sChar[0] != cSave && rDoc.ReplaceRange( nSttPos, 1, sChar );
 
     // Parahaps someone wants to have the word
commit 6541e4474df1bfc6d0e8880aaa513f456b64a58e
Author: CaolÃ¡n McNamara <caolanm at redhat.com>
Date:   Wed Nov 28 14:49:36 2012 +0000

    we want the fingerprints and config file all in the one dir
    
    Change-Id: I86f6bedf1b0f171dca3ce5b34e8c34796f9f7edf

diff --git a/libexttextcat/Zip_fingerprint.mk b/libexttextcat/Zip_fingerprint.mk
index 05e77b7..6232375 100644
--- a/libexttextcat/Zip_fingerprint.mk
+++ b/libexttextcat/Zip_fingerprint.mk
@@ -34,4 +34,6 @@ $(eval $(call gb_Zip_add_files,fingerprint,\
 	LM/*.lm \
 ))
 
+$(eval $(call gb_Zip_add_commandoptions,fingerprint,-j))
+
 # vim: set shiftwidth=4 tabstop=4 noexpandtab:
