|
 |
5dfd4cb |
--- abiword-3.0.0/plugins/grammar/linkgrammarwrap/LinkGrammarWrap.cpp.orig 2014-06-29 14:50:30.000000000 -0500
|
|
|
5dfd4cb |
+++ abiword-3.0.0/plugins/grammar/linkgrammarwrap/LinkGrammarWrap.cpp 2014-06-29 14:55:39.000000000 -0500
|
|
|
5dfd4cb |
@@ -145,12 +145,11 @@ bool LinkGrammarWrap::parseSentence(Piec
|
|
|
cf47a09 |
}
|
|
|
cf47a09 |
AbiGrammarError * pWordMap = new AbiGrammarError();
|
|
|
cf47a09 |
pWordMap->m_iErrLow = iLow;
|
|
|
cf47a09 |
- pWordMap->m_iErrHigh = iLow + strlen(sentence_get_nth_word(sent, i));
|
|
|
5dfd4cb |
+ pWordMap->m_iErrHigh = iLow + strlen(linkage_get_word(linkage, i));
|
|
|
cf47a09 |
pWordMap->m_iWordNum = i;
|
|
|
cf47a09 |
vecMapOfWords.addItem(pWordMap);
|
|
|
cf47a09 |
bool bNew = false;
|
|
|
cf47a09 |
- if(!sentence_nth_word_has_disjunction(sent, i))
|
|
|
5dfd4cb |
- {
|
|
|
5dfd4cb |
+
|
|
|
cf47a09 |
//UT_DEBUGMSG(("|%s| NULL LINK\n",sent->word[i].string));
|
|
|
cf47a09 |
if(pErr == NULL)
|
|
|
5dfd4cb |
{
|
|
|
5dfd4cb |
@@ -167,7 +166,7 @@ bool LinkGrammarWrap::parseSentence(Piec
|
|
|
cf47a09 |
}
|
|
|
cf47a09 |
pErr = new AbiGrammarError();
|
|
|
cf47a09 |
}
|
|
|
cf47a09 |
- iHigh = iLow + strlen(sentence_get_nth_word(sent, i));
|
|
|
5dfd4cb |
+ iHigh = iLow + strlen(linkage_get_word(linkage, i));
|
|
|
cf47a09 |
pErr->m_iErrLow = iLow + iOff -1;
|
|
|
cf47a09 |
pErr->m_iErrHigh = iHigh + iOff -1;
|
|
|
cf47a09 |
if(pErr->m_iErrLow < 0)
|
|
|
5dfd4cb |
@@ -188,7 +187,7 @@ bool LinkGrammarWrap::parseSentence(Piec
|
|
|
cf47a09 |
//
|
|
|
cf47a09 |
// Expand the sqiggle
|
|
|
cf47a09 |
//
|
|
|
cf47a09 |
- iHigh = iLow + strlen(sentence_get_nth_word(sent, i)) + iOff;
|
|
|
5dfd4cb |
+ iHigh = iLow + strlen(linkage_get_word(linkage, i)) + iOff;
|
|
|
cf47a09 |
pErr->m_iErrHigh = iHigh;
|
|
|
cf47a09 |
if(pErr->m_iErrHigh < totlen-1)
|
|
|
cf47a09 |
{
|
|
|
5dfd4cb |
@@ -196,8 +195,7 @@ bool LinkGrammarWrap::parseSentence(Piec
|
|
|
5dfd4cb |
}
|
|
|
cf47a09 |
pErr->m_iWordNum = i;
|
|
|
cf47a09 |
}
|
|
|
5dfd4cb |
- }
|
|
|
cf47a09 |
- iLow += strlen(sentence_get_nth_word(sent, i));
|
|
|
5dfd4cb |
+ iLow += strlen(linkage_get_word(linkage, i));
|
|
|
cf47a09 |
}
|
|
|
cf47a09 |
//
|
|
|
cf47a09 |
// No NULL links but still an error , mark the whole sentence bad.
|