Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3591
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/91/3591/1
fdo#63711 Calc: fix Catalan and Hungarian hyphenation
Change-Id: Ib9b3a63ad48ab9a8c109a97f4053c0fc4aca8a28
---
M editeng/source/editeng/impedit3.cxx
1 file changed, 27 insertions(+), 20 deletions(-)
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index bcd3695..5fd8362 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -1748,6 +1748,9 @@
sal_Bool bHangingPunctuation = sal_False;
sal_Unicode cAlternateReplChar = 0;
sal_Unicode cAlternateExtraChar = 0;
+ sal_Bool bAltFullLeft = sal_False;
+ sal_Bool bAltFullRight = sal_False;
+ sal_uInt32 nAltDelChar = 0;
if ( ( nMaxBreakPos < ( nMax + pLine->GetStart() ) ) && ( pNode->GetChar(
nMaxBreakPos ) == ' ' ) )
{
@@ -1853,29 +1856,38 @@
}
else
{
- String aAlt( xHyphWord->getHyphenatedWord() );
+ // TODO: handle all alternative hyphenations (see
hyphen-1.2.8/tests/unicode.*)
+ OUString aAlt( xHyphWord->getHyphenatedWord() );
+ OUString aWord2(aWord);
+ OUString aAltLeft(aAlt.copy(0, _nWordLen));
+ OUString aAltRight(aAlt.copy(_nWordLen));
+ bAltFullLeft = aWord2.startsWith(aAltLeft);
+ bAltFullRight = aWord2.endsWith(aAltRight);
+ nAltDelChar = aWord2.getLength() -
aAlt.getLength() + (1 - bAltFullLeft) + (1 - bAltFullRight);
- // We expect the two cases, which might exist now:
+ // NOTE: improved for other cases, see fdo#63711
+
+ // We expect[ed] the two cases:
// 1) packen becomes pak-ken
// 2) Schiffahrt becomes Schiff-fahrt
// In case 1, a character has to be replaced
// in case 2 a character is added.
// The identification is complicated by long
// compound words because the Hyphenator separates
- // all position of the word.
+ // all position of the word. [This is not true for
libhyphen.]
// "Schiffahrtsbrennesseln" ->
"Schifffahrtsbrennnesseln"
// We can thus actually not directly connect the index of the
// AlternativeWord to aWord. The whole issue will
be simplified
// by a function in the Hyphenator as soon as AMA
builds this in...
sal_uInt16 nAltStart = _nWordLen - 1;
- sal_uInt16 nTxtStart = nAltStart - (aAlt.Len() -
aWord.Len());
+ sal_uInt16 nTxtStart = nAltStart -
(aAlt.getLength() - aWord.Len());
sal_uInt16 nTxtEnd = nTxtStart;
sal_uInt16 nAltEnd = nAltStart;
// The regions between the nStart and nEnd is the
// difference between alternative and original
string.
- while( nTxtEnd < aWord.Len() && nAltEnd <
aAlt.Len() &&
- aWord.GetChar(nTxtEnd) !=
aAlt.GetChar(nAltEnd) )
+ while( nTxtEnd < aWord.Len() && nAltEnd <
aAlt.getLength() &&
+ aWord.GetChar(nTxtEnd) != aAlt[nAltEnd] )
{
++nTxtEnd;
++nAltEnd;
@@ -1883,7 +1895,7 @@
// If a character is added, then we notice it now:
if( nAltEnd > nTxtEnd && nAltStart == nAltEnd &&
- aWord.GetChar( nTxtEnd ) ==
aAlt.GetChar(nAltEnd) )
+ aWord.GetChar( nTxtEnd ) == aAlt[nAltEnd] )
{
++nAltEnd;
++nTxtStart;
@@ -1893,13 +1905,13 @@
DBG_ASSERT( ( nAltEnd - nAltStart ) == 1,
"Alternate: Wrong assumption!" );
if ( nTxtEnd > nTxtStart )
- cAlternateReplChar = aAlt.GetChar( nAltStart );
+ cAlternateReplChar = aAlt[nAltStart];
else
- cAlternateExtraChar = aAlt.GetChar( nAltStart
);
+ cAlternateExtraChar = aAlt[nAltStart];
bHyphenated = sal_True;
nBreakPos = nWordStart + nTxtStart;
- if ( cAlternateReplChar )
+ if ( cAlternateReplChar || aAlt.getLength() <
aWord2.getLength() || !bAltFullRight) // also for "oma-tje", "re-eel"
nBreakPos++;
}
}
@@ -1947,21 +1959,16 @@
TextPortion* pHyphPortion = new TextPortion( 0 );
pHyphPortion->GetKind() = PORTIONKIND_HYPHENATOR;
String aHyphText(rtl::OUString(CH_HYPH));
- if ( cAlternateReplChar )
+ if ( (cAlternateReplChar || cAlternateExtraChar) && bAltFullRight ) //
alternation after the break doesn't supported
{
TextPortion* pPrev = pParaPortion->GetTextPortions()[nEndPortion];
DBG_ASSERT( pPrev && pPrev->GetLen(), "Hyphenate: Prev portion?!"
);
- pPrev->SetLen( pPrev->GetLen() - 1 );
- pHyphPortion->SetLen( 1 );
- pHyphPortion->SetExtraValue( cAlternateReplChar );
+ pPrev->SetLen( pPrev->GetLen() - nAltDelChar );
+ pHyphPortion->SetLen( nAltDelChar );
+ if (cAlternateReplChar && !bAltFullLeft)
pHyphPortion->SetExtraValue( cAlternateReplChar );
// Correct width of the portion above:
pPrev->GetSize().Width() =
- pLine->GetCharPosArray()[ nBreakPos-1 - pLine->GetStart() - 1
];
- }
- else if ( cAlternateExtraChar )
- {
- pHyphPortion->SetExtraValue( cAlternateExtraChar );
- aHyphText.Insert( rtl::OUString(cAlternateExtraChar), 0 );
+ pLine->GetCharPosArray()[ nBreakPos-1 - pLine->GetStart() -
nAltDelChar ];
}
// Determine the width of the Hyph-Portion:
--
To view, visit https://gerrit.libreoffice.org/3591
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib9b3a63ad48ab9a8c109a97f4053c0fc4aca8a28
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Németh László <nem...@numbertext.org>
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
