Compare commits
1 Commits
Author | SHA1 | Date |
---|---|---|
Peter Robinson | 3842f7bc05 |
File diff suppressed because it is too large
Load Diff
|
@ -1,35 +0,0 @@
|
|||
--- abiword-3.0.0/plugins/grammar/linkgrammarwrap/LinkGrammarWrap.cpp.orig 2014-06-30 08:21:30.000000000 -0500
|
||||
+++ abiword-3.0.0/plugins/grammar/linkgrammarwrap/LinkGrammarWrap.cpp 2014-06-30 08:27:01.000000000 -0500
|
||||
@@ -220,6 +220,7 @@ bool LinkGrammarWrap::parseSentence(Piec
|
||||
pErr = NULL;
|
||||
}
|
||||
|
||||
+#ifdef DEAD_DEBUG_CODE
|
||||
// for(i=0; i< pT->m_vecGrammarErrors.getItemCount(); i++)
|
||||
// {
|
||||
// pErr = pT->m_vecGrammarErrors.getNthItem(i);
|
||||
@@ -227,15 +228,10 @@ bool LinkGrammarWrap::parseSentence(Piec
|
||||
// }
|
||||
UT_UTF8String sErr = linkage_get_violation_name(linkage);
|
||||
// UT_DEBUGMSG(("Top Level error message |%s|\n",sErr.utf8_str()));
|
||||
- UT_sint32 count = linkage_get_num_sublinkages(linkage);
|
||||
//
|
||||
// Find linkages with violations
|
||||
//
|
||||
- for(i=0; i<count;i++)
|
||||
{
|
||||
- UT_sint32 iok = linkage_set_current_sublinkage(linkage, i);
|
||||
- if(iok == 0)
|
||||
- continue;
|
||||
UT_sint32 j = 0;
|
||||
UT_sint32 iNum = linkage_get_num_links(linkage);
|
||||
for(j=0;j< iNum;j++)
|
||||
@@ -252,6 +248,8 @@ bool LinkGrammarWrap::parseSentence(Piec
|
||||
}
|
||||
}
|
||||
linkage_delete(linkage);
|
||||
+#endif // DEAD_DEBUG_CODE
|
||||
+
|
||||
for(i=0; i< vecMapOfWords.getItemCount(); i++)
|
||||
{
|
||||
AbiGrammarError * p = vecMapOfWords.getNthItem(i);
|
|
@ -1,45 +0,0 @@
|
|||
--- abiword-3.0.0/plugins/grammar/linkgrammarwrap/LinkGrammarWrap.cpp.orig 2014-06-29 14:50:30.000000000 -0500
|
||||
+++ abiword-3.0.0/plugins/grammar/linkgrammarwrap/LinkGrammarWrap.cpp 2014-06-29 14:55:39.000000000 -0500
|
||||
@@ -145,12 +145,11 @@ bool LinkGrammarWrap::parseSentence(Piec
|
||||
}
|
||||
AbiGrammarError * pWordMap = new AbiGrammarError();
|
||||
pWordMap->m_iErrLow = iLow;
|
||||
- pWordMap->m_iErrHigh = iLow + strlen(sentence_get_nth_word(sent, i));
|
||||
+ pWordMap->m_iErrHigh = iLow + strlen(linkage_get_word(linkage, i));
|
||||
pWordMap->m_iWordNum = i;
|
||||
vecMapOfWords.addItem(pWordMap);
|
||||
bool bNew = false;
|
||||
- if(!sentence_nth_word_has_disjunction(sent, i))
|
||||
- {
|
||||
+
|
||||
//UT_DEBUGMSG(("|%s| NULL LINK\n",sent->word[i].string));
|
||||
if(pErr == NULL)
|
||||
{
|
||||
@@ -167,7 +166,7 @@ bool LinkGrammarWrap::parseSentence(Piec
|
||||
}
|
||||
pErr = new AbiGrammarError();
|
||||
}
|
||||
- iHigh = iLow + strlen(sentence_get_nth_word(sent, i));
|
||||
+ iHigh = iLow + strlen(linkage_get_word(linkage, i));
|
||||
pErr->m_iErrLow = iLow + iOff -1;
|
||||
pErr->m_iErrHigh = iHigh + iOff -1;
|
||||
if(pErr->m_iErrLow < 0)
|
||||
@@ -188,7 +187,7 @@ bool LinkGrammarWrap::parseSentence(Piec
|
||||
//
|
||||
// Expand the sqiggle
|
||||
//
|
||||
- iHigh = iLow + strlen(sentence_get_nth_word(sent, i)) + iOff;
|
||||
+ iHigh = iLow + strlen(linkage_get_word(linkage, i)) + iOff;
|
||||
pErr->m_iErrHigh = iHigh;
|
||||
if(pErr->m_iErrHigh < totlen-1)
|
||||
{
|
||||
@@ -196,8 +195,7 @@ bool LinkGrammarWrap::parseSentence(Piec
|
||||
}
|
||||
pErr->m_iWordNum = i;
|
||||
}
|
||||
- }
|
||||
- iLow += strlen(sentence_get_nth_word(sent, i));
|
||||
+ iLow += strlen(linkage_get_word(linkage, i));
|
||||
}
|
||||
//
|
||||
// No NULL links but still an error , mark the whole sentence bad.
|
|
@ -20,9 +20,6 @@ Source13: abiword.xml
|
|||
Patch0: abiword-2.6.0-windowshelppaths.patch
|
||||
Patch1: abiword-2.8.3-desktop.patch
|
||||
Patch2: abiword-2.6.0-boolean.patch
|
||||
Patch3: abiword-3.0.0-librevenge.patch
|
||||
Patch4: abiword-3.0.0-link-grammar-5.patch
|
||||
Patch5: abiword-3.0.0-link-grammar-5-second.patch
|
||||
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
|
@ -44,7 +41,6 @@ BuildRequires: gtk3-devel
|
|||
BuildRequires: gtkmathview-devel
|
||||
BuildRequires: libgsf-devel
|
||||
BuildRequires: libpng-devel
|
||||
BuildRequires: librevenge-devel
|
||||
BuildRequires: librsvg2-devel
|
||||
BuildRequires: libsoup-devel
|
||||
BuildRequires: libwmf-devel
|
||||
|
@ -107,9 +103,6 @@ Python bindings for developing with libabiword
|
|||
# patch abiword
|
||||
%patch1 -p1 -b .desktop
|
||||
%patch2 -p1 -b .boolean
|
||||
%patch3 -p0 -b .librevenge
|
||||
%patch4 -p1 -b .link-grammar-5
|
||||
%patch5 -p1 -b .link-grammar-5-second
|
||||
|
||||
# setup abiword documentation
|
||||
%setup -q -T -b 1 -n abiword-docs-%{version}
|
||||
|
|
Loading…
Reference in New Issue