From cdcb543d9ea26b8827e46eff74e3d1c44a29db61 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 28 Jul 2010 10:39:30 +0200
Subject: [PATCH] [IMP] extract generalized containers in a separate pattern

bzr revid: xmo@openerp.com-20100728083930-115frmz01oallbpb
---
 bin/addons/base/rng/view.rng | 64 ++++++++++++++----------------------
 1 file changed, 25 insertions(+), 39 deletions(-)

diff --git a/bin/addons/base/rng/view.rng b/bin/addons/base/rng/view.rng
index 0b536846ca0..ab29ed72560 100644
--- a/bin/addons/base/rng/view.rng
+++ b/bin/addons/base/rng/view.rng
@@ -38,33 +38,37 @@
     </rng:optional>
   </rng:define>
 
+  <rng:define name="container">
+    <rng:optional><rng:attribute name="col"/></rng:optional>
+    <rng:zeroOrMore>
+      <rng:choice>
+        <rng:ref name="notebook"/>
+        <rng:ref name="field"/>
+        <rng:ref name="shortcut"/>
+        <rng:ref name="group"/>
+        <rng:ref name="button"/>
+        <rng:ref name="hpaned" />
+        <rng:ref name="label" />
+        <rng:ref name="separator"/>
+        <rng:ref name="image"/>
+        <rng:ref name="form"/>
+        <rng:ref name="vpaned"/>
+        <rng:ref name="filter"/>
+        <rng:ref name="html"/>
+        <rng:element name="newline"><rng:empty/></rng:element>
+        <rng:element name="properties"><rng:empty/></rng:element>
+      </rng:choice>
+    </rng:zeroOrMore>
+  </rng:define>
+
     <rng:define name="form">
         <rng:element name="form">
             <rng:ref name="overload"/>
             <rng:optional><rng:attribute name="string"/></rng:optional>
-            <rng:optional><rng:attribute name="col"/></rng:optional>
             <rng:optional><rng:attribute name="editable"/></rng:optional>
             <rng:optional><rng:attribute name="type"/></rng:optional>
             <rng:optional><rng:attribute name="link"/></rng:optional>
-            <rng:zeroOrMore>
-                <rng:choice>
-                    <rng:ref name="notebook"/>
-                    <rng:ref name="field"/>
-		    		<rng:ref name="shortcut"/>
-                    <rng:ref name="group"/>
-                    <rng:ref name="button"/>
-                    <rng:ref name="hpaned" />
-                    <rng:ref name="label" />
-                    <rng:ref name="separator"/>
-                    <rng:ref name="image"/>
-                    <rng:ref name="form"/>
-                    <rng:ref name="vpaned"/>
-                    <rng:ref name="filter"/>
-                    <rng:ref name="html"/>
-                    <rng:element name="newline"><rng:empty/></rng:element>
-                    <rng:element name="properties"><rng:empty/></rng:element>
-                </rng:choice>
-            </rng:zeroOrMore>
+            <rng:ref name="container"/>
         </rng:element>
     </rng:define>
 
@@ -459,7 +463,6 @@
         <rng:element name="group">
             <rng:ref name="overload"/>
             <rng:optional><rng:attribute name="attrs"/></rng:optional>
-            <rng:optional><rng:attribute name="col"/></rng:optional>
             <rng:optional><rng:attribute name="colspan"/></rng:optional>
             <rng:optional><rng:attribute name="rowspan"/></rng:optional>
             <rng:optional><rng:attribute name="expand"/></rng:optional>
@@ -471,24 +474,7 @@
             <rng:optional><rng:attribute name="width"/></rng:optional>
             <rng:optional><rng:attribute name="name"/></rng:optional>
             <rng:optional><rng:attribute name="color" /></rng:optional>
-            <rng:zeroOrMore>
-                <rng:choice>
-                    <rng:ref name="separator"/>
-                    <rng:ref name="button"/>
-                    <rng:ref name="field"/>
-		    		<rng:ref name="shortcut"/>
-                    <rng:ref name="label" />
-                    <rng:ref name="group" />
-                    <rng:ref name="filter"/>
-                    <rng:element name="properties"><rng:empty/></rng:element>
-                    <rng:element name="newline"><rng:empty/></rng:element>
-                    <rng:ref name="image"/>
-                    <rng:ref name="notebook"/>
-                    <rng:ref name="hpaned"/>
-                    <rng:ref name="vpaned"/>
-                    <rng:ref name="html"/>
-                </rng:choice>
-            </rng:zeroOrMore>
+            <rng:ref name="container"/>
         </rng:element>
     </rng:define>