Index: staging/apertium-cat-srd/apertium-cat-srd.cat-srd.lrx
===================================================================
--- staging/apertium-cat-srd/apertium-cat-srd.cat-srd.lrx	(revision 80867)
+++ staging/apertium-cat-srd/apertium-cat-srd.cat-srd.lrx	(revision 80868)
@@ -92,6 +92,11 @@
      <match tags="np.*"/>
   </rule>
   <rule weight="1.0">
+     <or><match lemma="més" tags="adv"/><match lemma="menys" tags="adv"/></or>
+     <match lemma="que" tags="cnjsub"><select lemma="de"/></match>
+     <match tags="np.*"/>
+  </rule>
+  <rule weight="1.0">
      <or><match lemma="pitjor" tags="adv"/><match lemma="millor" tags="adv"/></or>
      <match lemma="que" tags="cnjsub"><select lemma="de"/></match>
      <match tags="np.*"/>
@@ -105,6 +110,12 @@
      <match tags="n.*"/>
   </rule>
   <rule weight="1.0">
+     <or><match lemma="més" tags="adv"/><match lemma="menys" tags="adv"/></or>
+     <match lemma="que" tags="cnjsub"><select lemma="de"/></match>
+     <match tags="det.*"/>
+     <match tags="n.*"/>
+  </rule>
+  <rule weight="1.0">
      <or><match lemma="pitjor" tags="adv"/><match lemma="millor" tags="adv"/></or>
      <match lemma="que" tags="cnjsub"><select lemma="de"/></match>
      <match tags="det.*"/>
@@ -118,6 +129,11 @@
      <match tags="prn.tn.pos.*"/>
   </rule>
   <rule weight="1.0">
+     <or><match lemma="més" tags="adv"/><match lemma="menys" tags="adv"/></or>
+     <match lemma="que" tags="cnjsub"><select lemma="de"/></match>
+     <match tags="prn.tn.pos.*"/>
+  </rule>
+  <rule weight="1.0">
      <or><match lemma="pitjor" tags="adv"/><match lemma="millor" tags="adv"/></or>
      <match lemma="que" tags="cnjsub"><select lemma="de"/></match>
      <match tags="prn.tn.pos.*"/>
@@ -172,8 +188,51 @@
      <or><match tags="vblex.*.p3.pl"/><match tags="vbhaver.*.p3.pl"/><match tags="vbser.*.p3.pl"/><match tags="vbmod.*.p3.pl"/></or>
   </rule>
 
+  <rule weight="1.0">
+     <or><match lemma="més" tags="adv"/><match lemma="menys" tags="adv"/></or>
+     <match lemma="que" tags="cnjsub"><select lemma="de"/></match>
+     <or><match tags="prn.tn.p1.*"/><match tags="prn.tn.p2.*"/><match tags="prn.tn.p3.*"/></or>
+  </rule>
   <rule weight="1.2">
      <or><match lemma="més" tags="adv"/><match lemma="menys" tags="adv"/></or>
+     <match lemma="que" tags="cnjsub"><select lemma="chi"/></match>
+     <match tags="prn.tn.p1.*.sg"/>
+     <or><match tags="vblex.*.p1.sg"/><match tags="vbhaver.*.p1.sg"/><match tags="vbser.*.p1.sg"/><match tags="vbmod.*.p1.sg"/></or>
+  </rule>
+  <rule weight="1.2">
+     <or><match lemma="més" tags="adv"/><match lemma="menys" tags="adv"/></or>
+     <match lemma="que" tags="cnjsub"><select lemma="chi"/></match>
+     <match tags="prn.tn.p2.*.sg"/>
+     <or><match tags="vblex.*.p2.sg"/><match tags="vbhaver.*.p2.sg"/><match tags="vbser.*.p2.sg"/><match tags="vbmod.*.p2.sg"/></or>
+  </rule>
+  <rule weight="1.2">
+     <or><match lemma="més" tags="adv"/><match lemma="menys" tags="adv"/></or>
+     <match lemma="que" tags="cnjsub"><select lemma="chi"/></match>
+     <match tags="prn.tn.p3.*.sg"/>
+     <or><match tags="vblex.*.p3.sg"/><match tags="vbhaver.*.p3.sg"/><match tags="vbser.*.p3.sg"/><match tags="vbmod.*.p3.sg"/></or>
+  </rule>
+  <rule weight="1.2">
+     <or><match lemma="més" tags="adv"/><match lemma="menys" tags="adv"/></or>
+     <match lemma="que" tags="cnjsub"><select lemma="chi"/></match>
+     <match tags="prn.tn.p1.*.pl"/>
+     <or><match tags="vblex.*.p1.pl"/><match tags="vbhaver.*.p1.pl"/><match tags="vbser.*.p1.pl"/><match tags="vbmod.*.p1.pl"/></or>
+  </rule>
+  <rule weight="1.2">
+     <or><match lemma="més" tags="adv"/><match lemma="menys" tags="adv"/></or>
+     <match lemma="que" tags="cnjsub"><select lemma="chi"/></match>
+     <match tags="prn.tn.p2.*.pl"/>
+     <or><match tags="vblex.*.p2.pl"/><match tags="vbhaver.*.p2.pl"/><match tags="vbser.*.p2.pl"/><match tags="vbmod.*.p2.pl"/></or>
+  </rule>
+  <rule weight="1.2">
+     <or><match lemma="més" tags="adv"/><match lemma="menys" tags="adv"/></or>
+     <match lemma="que" tags="cnjsub"><select lemma="chi"/></match>
+     <match tags="prn.tn.p3.*.pl"/>
+     <or><match tags="vblex.*.p3.pl"/><match tags="vbhaver.*.p3.pl"/><match tags="vbser.*.p3.pl"/><match tags="vbmod.*.p3.pl"/></or>
+  </rule>
+
+
+  <rule weight="1.2">
+     <or><match lemma="més" tags="adv"/><match lemma="menys" tags="adv"/></or>
      <or><match tags="adj.*"/><match tags="adv"/></or>
      <match lemma="que" tags="cnjsub"><select lemma="chi"/></match>
      <match tags="prn.tn.p1.*.sg"/>
Index: staging/apertium-cat-srd/apertium-cat-srd.cat-srd.t1x
===================================================================
--- staging/apertium-cat-srd/apertium-cat-srd.cat-srd.t1x	(revision 80867)
+++ staging/apertium-cat-srd/apertium-cat-srd.cat-srd.t1x	(revision 80868)
@@ -4,6 +4,19 @@
 <def-cat n="prn">
    <cat-item tags="prn.*"/>
 </def-cat>
+<def-cat n="prn_tn_fort">
+   <cat-item lemma="jo" tags="prn.tn.*"/>
+   <cat-item lemma="tu" tags="prn.tn.*"/>
+   <cat-item lemma="ell" tags="prn.tn.*"/>
+   <cat-item lemma="ells" tags="prn.tn.*"/>
+   <cat-item lemma="vostè" tags="prn.tn.*"/>
+   <cat-item lemma="nosaltres" tags="prn.tn.*"/>
+   <cat-item lemma="vosaltres" tags="prn.tn.*"/>
+   <cat-item lemma="vós" tags="prn.tn.*"/>
+   <cat-item lemma="ells" tags="prn.tn.*"/>
+   <cat-item lemma="elles" tags="prn.tn.*"/>
+   <cat-item lemma="vostès" tags="prn.tn.*"/>
+</def-cat>
 <def-cat n="det_pos">
    <cat-item tags="det.pos.*"/>
 </def-cat>
@@ -266,6 +279,9 @@
    <cat-item lemma="norantè" tags="adj.*"/>
    <cat-item lemma="centè" tags="adj.*"/>
 </def-cat>
+<def-cat n="que_cnjsub">
+   <cat-item lemma="que" tags="cnjsub"/>
+</def-cat>
 </section-def-cats>
 
 <section-def-attrs>
@@ -2904,7 +2920,7 @@
        <with-param pos="1"/>
      </call-macro>     
      <out>
-       <chunk name="p">
+       <chunk name="prn">
          <tags>
            <tag><lit-tag v="SPron"/></tag>
          </tags>
@@ -2919,6 +2935,69 @@
 </rule>
 
 
+<rule comment="regla: que prn_tn_fort">
+   <pattern>
+     <pattern-item n="que_cnjsub"/>
+     <pattern-item n="prn_tn_fort"/>
+   </pattern>
+   <action>
+     <choose>
+       <when>
+         <test>
+	   <equal><clip pos="1" side="tl" part="lem"/><lit v="chi"/></equal>
+         </test>
+         <out>
+           <chunk name="chi_prn">
+             <tags>
+               <tag><lit-tag v="cnjsub"/></tag>
+             </tags>
+             <lu>
+               <clip pos="1" side="tl" part="lemh"/>
+               <clip pos="1" side="tl" part="tags"/>
+               <clip pos="1" side="tl" part="lemq"/>
+             </lu>
+             <b pos="1"/>
+             <lu>
+               <clip pos="2" side="tl" part="lemh"/>
+               <clip pos="2" side="tl" part="tags"/>
+               <clip pos="2" side="tl" part="lemq"/>
+             </lu>
+           </chunk>
+         </out>
+       </when>
+       <otherwise>
+        <choose>
+          <when>
+            <test>
+	      <equal caseless="yes"><clip pos="2" side="sl" part="lem"/><lit v="jo"/></equal>
+            </test>
+	    <let><clip pos="2" side="tl" part="lem"/><lit v="mene"/></let>
+          </when>
+        </choose>
+         <out>
+           <chunk name="de_prn">
+             <tags>
+               <tag><lit-tag v="SPron"/></tag>
+             </tags>
+             <lu>
+               <clip pos="1" side="tl" part="lemh"/>
+               <clip pos="1" side="tl" part="tags"/>
+               <clip pos="1" side="tl" part="lemq"/>
+             </lu>
+             <b pos="1"/>
+             <lu>
+               <clip pos="2" side="tl" part="lemh"/>
+               <clip pos="2" side="tl" part="tags"/>
+               <clip pos="2" side="tl" part="lemq"/>
+             </lu>
+           </chunk>
+         </out>
+       </otherwise>
+     </choose>
+   </action>
+</rule>
+
+
 <rule comment="regla: n">
    <pattern>
      <pattern-item n="nom"/>