Commit 61953ae5 authored by Kartik Mistry's avatar Kartik Mistry 🇮🇳

Merge tag 'upstream/1.2.1+svn_57448'

Upstream version 1.2.1+svn~57448
parents f35e5ff6 a4713fc4
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -14,6 +14,9 @@ VAR2=val-
PREFVAR1=#dejar en blanco
PREFVAR2=val-
TARGETS_COMMON = $(PREFIX1).automorf.bin $(PREFIX1).autobil.bin $(PREFIX1).autogen.bin \
$(PREFVAR1)$(PREFIX2).autogen.bin \
$(PREFVAR2)$(PREFIX2).autogen.bin \
$(PREFVAR1)$(PREFIX2).autopgen.bin \
$(PREFVAR1)$(PREFIX1).autopgen.bin \
$(PREFIX2).automorf.bin $(PREFIX2).autobil.bin \
$(PREFVAR1)$(PREFIX1).t1x.bin \
......
This diff is collapsed.
VERSION=1.1.0
LANG1=es
LANG2=ca
PREFIX1=$(LANG1)-$(LANG2)
PREFIX2=$(LANG2)-$(LANG1)
BASENAME=apertium-$(PREFIX1)
VAR1=std
VAR2=val-
PREFVAR1=#dejar en blanco
PREFVAR2=val-
TARGETS_COMMON = $(PREFIX1).automorf.bin $(PREFIX1).autobil.bin $(PREFIX1).autogen.bin \
$(PREFIX1).autopgen.bin $(PREFIX2).automorf.bin $(PREFIX2).autobil.bin \
$(PREFIX2).autogen.bin $(PREFIX2).autopgen.bin modes \
$(PREFIX1).lextormono.bin $(PREFIX2).lextormono.bin \
$(PREFIX1).lextorbil.bin $(PREFIX2).lextorbil.bin \
$(BASENAME).$(LANG1)-lextor.dix $(BASENAME).$(LANG2)-lextor.dix \
$(BASENAME).$(PREFIX1)-lextor.dix $(BASENAME).$(PREFIX2)-lextor.dix
TARGETS = $(TARGETS_COMMON) trules-$(PREFIX1).bin trules-$(PREFIX2).bin \
trules-$(PREFIX1).xml trules-$(PREFIX2).xml
.deps/commonbil.dix: $(BASENAME).$(PREFIX1).dix
xsltproc --stringparam lang cat --stringparam side right filter.xsl $< | xsltproc --stringparam alt eco alt.xsl - >$@
$(BASENAME).$(LANG1)-lextor.dix: .deps/commonbil.dix
apertium-validate-dictionary .deps/commonbil.dix
apertium-gen-lextormono rl .deps/commonbil.dix $@
$(BASENAME).$(LANG2)-lextor.dix: .deps/commonbil.dix
apertium-validate-dictionary .deps/commonbil.dix
apertium-gen-lextormono lr .deps/commonbil.dix $@
$(BASENAME).$(PREFIX1)-lextor.dix: .deps/commonbil.dix
apertium-validate-dictionary .deps/commonbil.dix
apertium-gen-lextorbil rl .deps/commonbil.dix $@
$(BASENAME).$(PREFIX2)-lextor.dix: .deps/commonbil.dix
apertium-validate-dictionary .deps/commonbil.dix
apertium-gen-lextorbil lr .deps/commonbil.dix $@
$(PREFIX1).lextormono.bin: $(BASENAME).$(LANG1)-lextor.dix
apertium-validate-dictionary $<
lt-comp lr $< $@
$(PREFIX2).lextormono.bin: $(BASENAME).$(LANG2)-lextor.dix
apertium-validate-dictionary $<
lt-comp lr $< $@
$(PREFIX1).lextorbil.bin: $(BASENAME).$(PREFIX1)-lextor.dix
apertium-validate-dictionary $<
lt-comp lr $< $@
$(PREFIX2).lextorbil.bin: $(BASENAME).$(PREFIX2)-lextor.dix
apertium-validate-dictionary $<
lt-comp lr $< $@
.deps/$(PREFVAR1)$(LANG1).dix: $(BASENAME).$(LANG1).dix
xsltproc translate-to-default-equivalent.xsl $< | xsltproc --stringparam alt eco alt.xsl - | xsltproc --stringparam lang cat --stringparam side left filter.xsl - | xsltproc --stringparam alt eco alt.xsl - >$@
.deps/$(PREFVAR2)$(LANG1).dix: $(BASENAME).$(LANG1).dix
xsltproc translate-to-default-equivalent.xsl $< | xsltproc --stringparam alt eco alt.xsl - | xsltproc --stringparam lang val --stringparam side left filter.xsl - | xsltproc --stringparam alt eco alt.xsl - >$@
.deps/$(PREFVAR1)$(LANG2).dix: $(BASENAME).$(LANG2).dix
xsltproc translate-to-default-equivalent.xsl $< | xsltproc --stringparam alt eco alt.xsl - | xsltproc --stringparam lang cat --stringparam side left filter.xsl - | xsltproc --stringparam alt eco alt.xsl - >$@
.deps/$(PREFVAR2)$(LANG2).dix: $(BASENAME).$(LANG2).dix
xsltproc translate-to-default-equivalent.xsl $< | xsltproc --stringparam alt eco alt.xsl - | xsltproc --stringparam lang val --stringparam side left filter.xsl - | xsltproc --stringparam alt eco alt.xsl - >$@
.deps/$(PREFVAR1)$(PREFIX1).dix: $(BASENAME).$(PREFIX1).dix
xsltproc translate-to-default-equivalent.xsl $< | xsltproc --stringparam alt eco alt.xsl - | xsltproc --stringparam lang cat --stringparam side right filter.xsl - | xsltproc --stringparam alt eco alt.xsl - >$@
.deps/$(PREFVAR2)$(PREFIX1).dix: $(BASENAME).$(PREFIX1).dix
xsltproc translate-to-default-equivalent.xsl $< | xsltproc --stringparam alt eco alt.xsl - | xsltproc --stringparam lang val --stringparam side right filter.xsl - | xsltproc --stringparam alt eco alt.xsl - >$@
$(PREFVAR1)$(PREFIX1).automorf.bin: .deps/$(PREFVAR1)$(LANG1).dix $(BASENAME).$(LANG1).acx
apertium-validate-acx $(BASENAME).$(LANG1).acx
apertium-validate-dictionary $<
lt-comp lr $< $@ $(BASENAME).$(LANG1).acx
$(PREFVAR1)$(PREFIX1).autobil.bin: .deps/$(PREFVAR1)$(PREFIX1).dix
apertium-validate-dictionary $<
lt-comp lr $< $@
$(PREFVAR1)$(PREFIX1).autogen.bin: .deps/$(PREFVAR1)$(LANG2).dix
apertium-validate-dictionary $<
lt-comp rl $< $@
$(PREFIX1).autopgen.bin: $(BASENAME).post-$(LANG2).dix
apertium-validate-dictionary $<
lt-comp lr $< $@
$(PREFVAR1)$(PREFIX2).automorf.bin: .deps/$(PREFVAR1)$(LANG2).dix $(BASENAME).$(LANG2).acx
apertium-validate-acx $(BASENAME).$(LANG2).acx
apertium-validate-dictionary $<
lt-comp lr $< $@ $(BASENAME).$(LANG2).acx
$(PREFVAR1)$(PREFIX2).autobil.bin: .deps/$(PREFVAR1)$(PREFIX1).dix
apertium-validate-dictionary $<
lt-comp rl $< $@
$(PREFVAR1)$(PREFIX2).autogen.bin: .deps/$(PREFVAR1)$(LANG1).dix
apertium-validate-dictionary $<
lt-comp rl $< $@
$(PREFVAR1)$(PREFIX2).autopgen.bin: $(BASENAME).post-$(LANG1).dix
apertium-validate-dictionary $<
lt-comp lr $< $@
$(PREFVAR2)$(PREFIX1).automorf.bin: .deps/$(PREFVAR2)$(LANG1).dix $(BASENAME).$(LANG1).acx
apertium-validate-acx $(BASENAME).$(LANG1).acx
apertium-validate-dictionary $<
lt-comp lr $< $@ $(BASENAME).$(LANG1).acx
$(PREFVAR2)$(PREFIX1).autobil.bin: .deps/$(PREFVAR2)$(PREFIX1).dix
apertium-validate-dictionary $<
lt-comp lr $< $@
$(PREFVAR2)$(PREFIX1).autogen.bin: .deps/$(PREFVAR2)$(LANG2).dix
apertium-validate-dictionary $<
lt-comp rl $< $@
$(PREFVAR2)$(PREFIX2).automorf.bin: .deps/$(PREFVAR2)$(LANG2).dix $(BASENAME).$(LANG2).acx
apertium-validate-acx $(BASENAME).$(LANG2).acx
apertium-validate-dictionary $<
lt-comp lr $< $@ $(BASENAME).$(LANG2).acx
$(PREFVAR2)$(PREFIX2).autobil.bin: .deps/$(PREFVAR2)$(PREFIX1).dix
apertium-validate-dictionary $<
lt-comp rl $< $@
$(PREFVAR2)$(PREFIX2).autogen.bin: .deps/$(PREFVAR2)$(LANG1).dix
apertium-validate-dictionary $<
lt-comp rl $< $@
trules-$(PREFIX1).bin: $(BASENAME).trules-$(PREFIX1).xml
apertium-validate-transfer $(BASENAME).trules-$(PREFIX1).xml
apertium-preprocess-transfer $(BASENAME).trules-$(PREFIX1).xml \
trules-$(PREFIX1).bin
trules-$(PREFIX2).bin: $(BASENAME).trules-$(PREFIX2).xml
apertium-validate-transfer $(BASENAME).trules-$(PREFIX2).xml
apertium-preprocess-transfer $(BASENAME).trules-$(PREFIX2).xml \
trules-$(PREFIX2).bin
trules-$(PREFIX1).xml: $(BASENAME).trules-$(PREFIX1).xml
ln -s $(BASENAME).trules-$(PREFIX1).xml trules-$(PREFIX1).xml
trules-$(PREFIX2).xml: $(BASENAME).trules-$(PREFIX2).xml
ln -s $(BASENAME).trules-$(PREFIX2).xml trules-$(PREFIX2).xml
EXTRA_DIST=$(BASENAME).$(LANG1).dix $(BASENAME).$(PREFIX1).dix \
$(BASENAME).post-$(LANG1).dix $(BASENAME).post-$(LANG2).dix \
$(BASENAME).$(LANG2).dix $(BASENAME).$(LANG1).tsx \
$(BASENAME).$(LANG2).tsx $(BASENAME).trules-$(PREFIX1).xml \
$(BASENAME).trules-$(PREFIX2).xml $(PREFIX1).prob $(PREFIX2).prob \
modes.xml translate-to-default-equivalent.xsl alt.xsl \
$(PREFIX1)-latin1.prob $(PREFIX2)-latin1.prob \
$(BASENAME).$(LANG1).acx $(BASENAME).$(LANG2).acx
apertium_es_cadir=$(prefix)/share/apertium/apertium-$(PREFIX1)/
apertium_es_modesdir=$(prefix)/share/apertium/modes/
$(PREFIX1).mode: modes.xml
apertium-gen-modes modes.xml
cp *.mode modes/
$(PREFIX2).mode: modes.xml
apertium-gen-modes modes.xml
cp *.mode modes/
modes: modes.xml
apertium-gen-modes modes.xml
apertium_es_ca_DATA=$(PREFVAR1)$(PREFIX1).automorf.bin $(PREFVAR1)$(PREFIX2).automorf.bin \
$(PREFVAR1)$(PREFIX1).autobil.bin $(PREFVAR1)$(PREFIX2).autobil.bin \
$(PREFVAR1)$(PREFIX1).autogen.bin $(PREFVAR1)$(PREFIX2).autogen.bin \
$(PREFVAR2)$(PREFIX1).automorf.bin $(PREFVAR2)$(PREFIX2).automorf.bin \
$(PREFVAR2)$(PREFIX1).autobil.bin $(PREFVAR2)$(PREFIX2).autobil.bin \
$(PREFVAR2)$(PREFIX1).autogen.bin $(PREFVAR2)$(PREFIX2).autogen.bin \
$(PREFIX1).autopgen.bin $(PREFIX2).autopgen.bin \
$(PREFVAR1)$(PREFIX1).lextorbil.bin $(PREFVAR1)$(PREFIX2).lextorbil.bin \
$(PREFVAR1)$(PREFIX1).lextormono.bin $(PREFVAR1)$(PREFIX2).lextormono.bin \
$(PREFIX1).prob $(PREFIX2).prob trules-$(PREFIX1).xml \
trules-$(PREFIX2).xml trules-$(PREFIX1).bin \
trules-$(PREFIX2).bin \
$(PREFVAR1)$(PREFIX1).mode $(PREFVAR1)$(PREFIX2).mode \
$(PREFVAR2)$(PREFIX1).mode $(PREFVAR2)$(PREFIX2).mode \
$(PREFVAR1)$(PREFIX1)-multi.mode $(PREFVAR1)$(PREFIX2)-multi.mode \
$(BASENAME).$(LANG1)-lextor.dix $(BASENAME).$(LANG2)-lextor.dix \
$(BASENAME).$(PREFIX1)-lextor.dix $(BASENAME).$(PREFIX2)-lextor.dix
install-data-local:
apertium-gen-modes modes.xml apertium-$(PREFIX1)
cp *.mode modes/
$(INSTALL_DATA) $(PREFVAR1)$(PREFIX1).mode $(apertium_es_modesdir)
$(INSTALL_DATA) $(PREFVAR1)$(PREFIX2).mode $(apertium_es_modesdir)
$(INSTALL_DATA) $(PREFVAR2)$(PREFIX1).mode $(apertium_es_modesdir)
$(INSTALL_DATA) $(PREFVAR2)$(PREFIX2).mode $(apertium_es_modesdir)
$(INSTALL_DATA) $(PREFVAR1)$(PREFIX1)-multi.mode $(apertium_es_modesdir)
$(INSTALL_DATA) $(PREFVAR1)$(PREFIX2)-multi.mode $(apertium_es_modesdir)
$(INSTALL_DATA) $(BASENAME).trules-$(PREFIX2).xml $(BASENAME).trules-$(PREFIX1).xml $(apertium_es_cadir)
CLEANFILES = -rf $(TARGETS) modes .deps/ $(PREFVAR2)$(PREFIX1).automorf.bin $(PREFVAR2)$(PREFIX1).autobil.bin \
$(PREFVAR2)$(PREFIX2).automorf.bin $(PREFVAR2)$(PREFIX2).autobil.bin \
$(PREFVAR2)$(PREFIX2).autogen.bin $(PREFVAR2)$(PREFIX1).autogen.bin
This diff is collapsed.
This diff is collapsed.
......@@ -604,6 +604,21 @@
<list-item v="catàleg"/> <!-- a="mireiafarrus" -->
<list-item v="biblioteca"/> <!-- a="mireiafarrus" -->
<list-item v="centre"/> <!-- a="mireiafarrus" per solucionar "al centre de suport">"*al centro de apoyo" -->
<list-item v="apartat"/> <!-- a="mireiafarrus" -->
<list-item v="enunciat"/> <!-- a="mireiafarrus" -->
<list-item v="carpeta"/> <!-- a="mireiafarrus" -->
<list-item v="enllaç"/> <!-- a="mireiafarrus" -->
<list-item v="educació"/> <!-- a="mireiafarrus" -->
<list-item v="moment"/> <!-- a="mireiafarrus" -->
<list-item v="espai"/> <!-- a="mireiafarrus" -->
<list-item v="web"/> <!-- a="mireiafarrus" -->
<list-item v="recta"/> <!-- a="mireiafarrus" -->
<list-item v="classe"/> <!-- a="mireiafarrus" -->
<list-item v="calendari"/> <!-- a="mireiafarrus" -->
<list-item v="debat"/> <!-- a="mireiafarrus" -->
<list-item v="planificació"/> <!-- a="mireiafarrus" -->
<list-item v="tecnologia"/> <!-- a="mireiafarrus" -->
</def-list>
<def-list n="dies">
......@@ -902,7 +917,7 @@
</def-macro>
<def-macro n="f_bcond" npar="1"><!--Per mirar si el blanc conté o no format. Cal posar aquesta funció en les regles en què desaparegui alguna paraula, per tal de decidir si el blanc de la paraula eliminada s'ha d'eliminar o conservar. Si conté format cal conservar-la, si no en conté cal eliminar-la perquè no apareguin dos espais seguits. -->
<def-macro n="f_bcond" npar="2"><!--Per mirar si el blanc conté o no format. Cal posar aquesta funció en les regles en què desaparegui alguna paraula, per tal de decidir si el blanc de la paraula eliminada s'ha d'eliminar o conservar. Si conté format cal conservar-la, si no en conté cal eliminar-la perquè no apareguin dos espais seguits. -->
<choose>
<when>
<test>
......@@ -5986,6 +6001,7 @@
<action>
<call-macro n="f_bcond">
<with-param pos="1"/>
<with-param pos="2"/>
</call-macro>
<call-macro n="f_enviaa">
<with-param pos="2"/>
......@@ -6048,6 +6064,8 @@
</call-macro>
<!--<call-macro n="f_bcond">
<with-param pos="1"/>
<with-param pos="2"/>
</call-macro>-->
</otherwise>
</choose>
......@@ -6079,6 +6097,7 @@
</out>
<call-macro n="f_bcond">
<with-param pos="1"/>
<with-param pos="2"/>
</call-macro>
</action>
</rule>
......@@ -6139,6 +6158,7 @@
</out>
<call-macro n="f_bcond">
<with-param pos="1"/>
<with-param pos="2"/>
</call-macro>
</otherwise>
</choose>
......@@ -6229,6 +6249,7 @@
</out>
<call-macro n="f_bcond">
<with-param pos="1"/>
<with-param pos="2"/>
</call-macro>
</when>
</choose>
......@@ -6286,6 +6307,7 @@
<otherwise>
<call-macro n="f_bcond">
<with-param pos="1"/>
<with-param pos="2"/>
</call-macro>
</otherwise>
</choose>
......@@ -6351,6 +6373,7 @@
<otherwise>
<call-macro n="f_bcond">
<with-param pos="1"/>
<with-param pos="2"/>
</call-macro>
</otherwise>
</choose>
......@@ -6411,6 +6434,7 @@
<otherwise>
<call-macro n="f_bcond">
<with-param pos="1"/>
<with-param pos="2"/>
</call-macro>
</otherwise>
</choose>
......@@ -6946,6 +6970,7 @@
</out>
<call-macro n="f_bcond">
<with-param pos="1"/>
<with-param pos="2"/>
</call-macro>
<out>
<b pos="2"/>
......@@ -7186,6 +7211,7 @@
</out>
<call-macro n="f_bcond">
<with-param pos="1"/>
<with-param pos="2"/>
</call-macro>
<out>
<b pos="2"/>
......@@ -7224,6 +7250,7 @@
</out>
<call-macro n="f_bcond">
<with-param pos="1"/>
<with-param pos="2"/>
</call-macro>
<out>
<b pos="2"/>
......@@ -7258,6 +7285,7 @@
</out>
<call-macro n="f_bcond">
<with-param pos="1"/>
<with-param pos="2"/>
</call-macro>
<out>
<b pos="2"/>
......@@ -7291,6 +7319,7 @@
</out>
<call-macro n="f_bcond">
<with-param pos="1"/>
<with-param pos="2"/>
</call-macro>
<out>
<b pos="2"/>
......@@ -7566,6 +7595,7 @@
</out>
<call-macro n="f_bcond">
<with-param pos="1"/>
<with-param pos="2"/>
</call-macro>
<out>
<b pos="2"/>
......@@ -7608,6 +7638,7 @@
</out>
<call-macro n="f_bcond">
<with-param pos="1"/>
<with-param pos="2"/>
</call-macro>
<out>
<b pos="2"/>
......@@ -7646,6 +7677,7 @@
</out>
<call-macro n="f_bcond">
<with-param pos="1"/>
<with-param pos="2"/>
</call-macro>
<out>
<b pos="2"/>
......@@ -7684,6 +7716,7 @@
</out>
<call-macro n="f_bcond">
<with-param pos="1"/>
<with-param pos="2"/>
</call-macro>
<out>
<b pos="2"/>
......@@ -7820,6 +7853,7 @@
</out>
<call-macro n="f_bcond">
<with-param pos="1"/>
<with-param pos="2"/>
</call-macro>
</otherwise>
</choose>
......@@ -7910,6 +7944,7 @@
</out>
<call-macro n="f_bcond">
<with-param pos="1"/>
<with-param pos="2"/>
</call-macro>
<out>
<b pos="2"/>
......@@ -7944,6 +7979,7 @@
</out>
<call-macro n="f_bcond">
<with-param pos="2"/>
<with-param pos="3"/>
</call-macro>
<call-macro n="f_outverb2">
<with-param pos="3"/>
......@@ -7975,6 +8011,7 @@
</out>
<call-macro n="f_bcond">
<with-param pos="2"/>
<with-param pos="3"/>
</call-macro>
<call-macro n="f_outverb3">
<with-param pos="3"/>
......@@ -8005,6 +8042,7 @@
</out>
<call-macro n="f_bcond">
<with-param pos="1"/>
<with-param pos="2"/>
</call-macro>
<out>
<b pos="2"/>
......@@ -8046,6 +8084,7 @@
</out>
<call-macro n="f_bcond">
<with-param pos="2"/>
<with-param pos="3"/>
</call-macro>
<out>
<lu>
......@@ -8088,6 +8127,7 @@
</out>
<call-macro n="f_bcond">
<with-param pos="2"/>
<with-param pos="3"/>
</call-macro>
<out>
<lu>
......
......@@ -5,6 +5,7 @@
<equiv-char value="&#x2019;"/>
<equiv-char value="&#x2BC;"/>
<equiv-char value="&#8217;"/>
<equiv-char value="&#39;"/>
</char>
<char value="&#183;">
<equiv-char value="."/>
......
This diff is collapsed.
This diff is collapsed.
......@@ -214,9 +214,15 @@
<cat-item lemma="llamar" tags="vblex.pri.*"/>
<cat-item lemma="llamar" tags="vblex.pii.*"/>
<cat-item lemma="llamar" tags="vblex.fti.*"/>
<cat-item lemma="llamar" tags="vblex.ifi.*"/>
<cat-item lemma="parecer" tags="vblex.pri.*"/>
<cat-item lemma="parecer" tags="vblex.pii.*"/>
<cat-item lemma="parecer" tags="vblex.fti.*"/>
<cat-item lemma="parecer" tags="vblex.ifi.*"/>
<cat-item lemma="quebrar" tags="vblex.pri.*"/>
<cat-item lemma="quebrar" tags="vblex.pii.*"/>
<cat-item lemma="quebrar" tags="vblex.fti.*"/>
<cat-item lemma="quebrar" tags="vblex.ifi.*"/>
</def-cat>
<def-cat n="caer">
......@@ -556,6 +562,21 @@
<list-item v="regió"/>
<list-item v="catàleg"/> <!-- a="mireiafarrus" -->
<list-item v="biblioteca"/> <!-- a="mireiafarrus" -->
<list-item v="centre"/> <!-- a="mireiafarrus" -->
<list-item v="apartat"/> <!-- a="mireiafarrus" -->
<list-item v="enunciat"/> <!-- a="mireiafarrus" -->
<list-item v="carpeta"/> <!-- a="mireiafarrus" -->
<list-item v="enllaç"/> <!-- a="mireiafarrus" -->
<list-item v="educació"/> <!-- a="mireiafarrus" -->
<list-item v="moment"/> <!-- a="mireiafarrus" -->
<list-item v="espai"/> <!-- a="mireiafarrus" -->
<list-item v="web"/> <!-- a="mireiafarrus" -->
<list-item v="recta"/> <!-- a="mireiafarrus" -->
<list-item v="classe"/> <!-- a="mireiafarrus" -->
<list-item v="calendari"/> <!-- a="mireiafarrus" -->
<list-item v="debat"/> <!-- a="mireiafarrus" -->
<list-item v="planificació"/> <!-- a="mireiafarrus" -->
<list-item v="tecnologia"/> <!-- a="mireiafarrus" -->
</def-list>
<def-list n="tiempo">
......@@ -696,6 +717,7 @@
</test>
<call-macro n="f_bcond">
<with-param pos="1"/>
<with-param pos="2"/>
</call-macro>
</when>
<otherwise>
......@@ -792,6 +814,7 @@
</test>
<call-macro n="f_bcond">
<with-param pos="1"/>
<with-param pos="2"/>
</call-macro>
</when>
<otherwise>
......@@ -894,7 +917,7 @@
</def-macro>
<def-macro n="f_bcond" npar="1"><!--Para mirar si el blanco contiene o no formato. Hay que poner esta función en las reglas en que desaparezca alguna palabra, con tal de decidir si el blanco de la palabra eliminada debe eliminarse también o conservarse. Si contiene formato hay que conservarla, si no contiene formato hay que eliminarla para que no aparezcan dos espacios seguidos. -->
<def-macro n="f_bcond" npar="2"><!--Para mirar si el blanco contiene o no formato. Hay que poner esta función en las reglas en que desaparezca alguna palabra, con tal de decidir si el blanco de la palabra eliminada debe eliminarse también o conservarse. Si contiene formato hay que conservarla, si no contiene formato hay que eliminarla para que no aparezcan dos espacios seguidos. -->
<choose>
<when>
<test>
......@@ -5954,6 +5977,7 @@
</out>
<call-macro n="f_bcond">
<with-param pos="2"/>
<with-param pos="3"/>
</call-macro>
</action>
......@@ -5994,6 +6018,7 @@
</out>
<call-macro n="f_bcond">
<with-param pos="3"/>
<with-param pos="4"/>
</call-macro>
</action>
......@@ -6032,6 +6057,7 @@
</out>
<call-macro n="f_bcond">
<with-param pos="2"/>
<with-param pos="3"/>
</call-macro>
</action>
......@@ -6081,6 +6107,7 @@
</out>
<call-macro n="f_bcond">
<with-param pos="2"/>
<with-param pos="3"/>
</call-macro>
</action>
......@@ -7473,23 +7500,31 @@
<lit v="assemblar"/>
</let>
</when>
</choose>
</when>
</choose>
<when>
<test>
<equal>
<clip pos="2" side="sl" part="lem"/>
<lit v="quebrar"/>
</equal>
</test>
<let>
<clip pos="2" side="tl" part="lem"/>
<lit v="trencar"/>
</let>
</when>
</choose>
</when>
</choose>
<out>
<lu>
<clip pos="1" side="tl" part="whole"/>
</lu>
<b pos="1"/>
<lu>
<clip pos="2" side="tl" part="whole"/>
</lu>
</out>
<call-macro n="f_pretind">
<with-param pos="2"/>
</call-macro>
</action>
</rule>
......@@ -7521,6 +7556,7 @@
</test>
<call-macro n="f_bcond"><!--Envía el blanco sólo si tiene formato -->
<with-param pos="1"/>
<with-param pos="2"/>
</call-macro>
<call-macro n="f_pretind"><!--Traduce el pretérito indefinido si es el caso y envía el verbo -->
<with-param pos="2"/>
......@@ -7570,6 +7606,7 @@
</test>
<call-macro n="f_bcond">
<with-param pos="1"/>
<with-param pos="2"/>
</call-macro>
<out>
......@@ -7631,6 +7668,7 @@
<action>
<call-macro n="f_bcond">
<with-param pos="1"/>
<with-param pos="2"/>
</call-macro>
<out>
<lu>
......@@ -7654,6 +7692,7 @@
<action>
<call-macro n="f_bcond">
<with-param pos="1"/>
<with-param pos="2"/>
</call-macro>
<out>
<lu>
......@@ -7709,6 +7748,7 @@
</call-macro>
<call-macro n="f_bcond">
<with-param pos="1"/>
<with-param pos="2"/>
</call-macro>
</when>
<otherwise>
......
......@@ -5,6 +5,7 @@
<equiv-char value="&#x2019;"/>
<equiv-char value="&#x2BC;"/>
<equiv-char value="&#8217;"/>
<equiv-char value="&#39;"/>
</char>
<char value="&#183;">
<equiv-char value="."/>
......
This diff is collapsed.
......@@ -247,6 +247,10 @@
<e>
<i>hiu</i>
</e>
<e>
<i>Hollywood</i>
</e>
</pardef>
<pardef n="vocals">
......@@ -1524,6 +1528,7 @@
<!-- <e>
<i>io</i>
</e> mireia -->
</pardef>
<pardef n="consonant_menys_s_reduit">
......
......@@ -94,6 +94,30 @@
</e>
</pardef>
<pardef n="EL">
<!-- <e>
<p>
<l><a/>EL<b/></l>
<r>L<b/></r>
</p>
</e> -->
<e>
<p>
<l>EL<b/></l>
<r>L<b/></r>
</p>
</e>
<e>
<p>
<l>EL</l>
<r>L</r>
</p>
<par n="caracter_general"/>
</e>
</pardef>
<pardef n="pr">
<e>
......@@ -184,6 +208,24 @@
</p>
<par n="el"/>
</e>
<e>
<p>
<l><a/>A<b/></l>
<r>A</r>
</p>
<par n="EL"/>
</e>
<e>
<p>
<l><a/>A</l>
<r>A</r>
</p>
<par n="EL"/>
</e>
<e>
<p>
<l><a/>y<b/>i</l>
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
No preview for this file type
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
-------------------------------------------------------------------------------
Data: dl feb 14 09:29:53 GMT 2011
--
1 Entrada: una versió molt senzilla
1 Eixida: una versión mucho sencilla
2 Entrada: és molt senzilla
2 Eixida: es mucho sencilla
-------------------------------------------------------------------------------
Data: dl feb 14 09:31:16 GMT 2011
--
1 Entrada: De fet, si vas a algun congrés de lingüística computacional
1 Eixida: De hecho, si vaso en algún congreso de lingüística computacional
-------------------------------------------------------------------------------
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
<