Index: branches/apertium-separable/examples/new-example.dix
===================================================================
--- branches/apertium-separable/examples/new-example.dix (revision 81711)
+++ branches/apertium-separable/examples/new-example.dix (revision 81713)
@@ -134,19 +134,19 @@
bebeagainst
- against
+ against
bebeearly
- early
+ early
bebeintegrated
- integratedintointo
+ integratedintointo
bebelate
- late
+ late
bebeonone'sway
@@ -158,245 +158,244 @@
blowblowout
- out
+ out
blowblowoutofthewater
-
- outof
+ outofthewater
bringbringdown
- down
+ down
bringbringdown
- down
+ down
bringbringtogether
- together
+ together
buoybuoyup
- up
+ up
buoybuoyup
- up
+ up
callcalloff
- off
+ off
carrycarryout
- out
+ out
chatchatup
- up
+ up
checkcheckin
- in
+ in
checkcheckout
- out
+ out
churnchurnup
- up
+ up
coilcoilup
- up
+ up
dependdependon
- on
+ on
dependdependon
- upon
+ upon
digdigup
- up
+ up
dressdressup
- up
+ up
fillfillin
- possible
+ possible
fillfillup
- up
+ up
firefireoff
- off
+ off
foulfoulup
- up
+ up
getgetacross
- across
+ across
givegiveback
- back
+ back
givegiveoff
- off
+ off
givegiveup
- up
+ up
givegiveup
- uptoto
+ uptoto
hikehikeup
- up
+ up
holdholdresponsible
- responsible
+ responsible
knockdowndown
- down
+ down
linelineup
- up
+ up
makemakeangry
- angry
+ angry
makemakecompatible
- compatible
+ compatible
makemakecompatible
- on
+ on
makemakeimpossible
- impossible
+ impossible
makemakepossible
- possible
+ possible
makemakeup
- up
+ up
movemoveaway
- away
+ away
notenotedown
- down
+ down
patchpatchup
- up
+ up
patchpatchup
- up
+ up
paypayout
- out
+ out
pickpickup
- up
+ up
pisspissoff
- off
+ off
pommelpommelaway
- away
+ away
pullpullout
- out
+ out
putputaside
- aside
+ aside
putputoff
- off
+ off
rollrollup
- up
+ up
sendsendback
- back
+ back
serveserveup
- up
+ up
setsetoff
- off
+ off
setsetup
- up
+ up
shakeshakeup
- up
+ up
shutshutdown
- down
+ down
slowslowdown
- down
+ down
stirstirup
- up
+ up
taketakeaway
- away
+ away
taketakeback
- back
+ back
taketakeforgranted
@@ -404,11 +403,11 @@
taketakeinto
- intoaccountaccount
+ intoaccountaccount
taketakeoff
- off
+ off
taketakeone'schances
@@ -416,71 +415,71 @@
taketakeout
- out
+ out
taketakeout
- outofof
+ outofof
throwthrowoff
- offbalancebalance
+ offbalancebalance
throwthrowout
- out
+ out
tracetraceback
- back
+ back
turnturnoff
- off
+ off
turnturninto
- into
+ into
wallwalloff
- off
+ off
wallwalloff
- off
+ off
wearwearaway
- away
+ away
wearwearout
- out
+ out
wipewipeaway
- away
+ away
wipewipeoff
- off
+ off
wipewipeout
- out
+ out
wipewipeup
- up
+ up
wirewireup
- up
+ up
wirewireup
- up
+ up
Index: branches/apertium-separable/examples/apertium-eng-kaz.kaz-eng.lsx
===================================================================
--- branches/apertium-separable/examples/apertium-eng-kaz.kaz-eng.lsx (revision 81711)
+++ branches/apertium-separable/examples/apertium-eng-kaz.kaz-eng.lsx (revision 81713)
@@ -11,11 +11,11 @@
-
-
+
+
-
+
Index: branches/apertium-separable/src/lsx_FSTProcessor.cc
===================================================================
--- branches/apertium-separable/src/lsx_FSTProcessor.cc (revision 81711)
+++ branches/apertium-separable/src/lsx_FSTProcessor.cc (revision 81713)
@@ -1334,6 +1334,11 @@
alt_out += blankqueue.front().c_str();
blankqueue.pop();
}
+ else if((out.at(i) == L'$') && blankqueue.size() == 0 && i != (int) out.size()-1)
+ {
+ alt_out += out.at(i);
+ alt_out += L' ';
+ }
else if(out.at(i) == L' ' && blankqueue.size() > 0)
{
alt_out += blankqueue.front().c_str();
Index: branches/apertium-separable/src/lsx_compiler.cc
===================================================================
--- branches/apertium-separable/src/lsx_compiler.cc (revision 81711)
+++ branches/apertium-separable/src/lsx_compiler.cc (revision 81713)
@@ -759,15 +759,14 @@
}
else if(name == COMPILER_ENTRY_ELEM && tipo == XML_READER_TYPE_END_ELEMENT)
{
+ /* INSERTING FINAL <$> HERE */
+ // list wb;
+ // wb.push_back(alphabet(L"<$>"));
+ // EntryToken e;
+ // e.setSingleTransduction(wb, wb);
+ // elements.push_back(e);
+
// insertar elements into letter transducer
-
- // INSERTING FINAL <$> HERE
- list wb;
- wb.push_back(alphabet(L"<$>"));
- EntryToken e;
- e.setSingleTransduction(wb, wb);
- elements.push_back(e);
-
insertEntryTokens(elements);
return;
}