From 0c00b9b782d5159129e054f86a0b258001539588 Mon Sep 17 00:00:00 2001
From: Terry Catapano <terry@edgy.cul.columbia.edu>
Date: Wed, 13 Jun 2012 14:33:35 -0400
Subject: [PATCH] remove <lb/> from content model of <abstract>

---
 ead_revised.rng               | 54 +++++++++++++++++++----------------
 ead_revised_test_instance.xml |  1 -
 2 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/ead_revised.rng b/ead_revised.rng
index 39b16d6..b30de55 100755
--- a/ead_revised.rng
+++ b/ead_revised.rng
@@ -106,6 +106,7 @@ Other changes:
 * create element <formsavailable> in <did>, with children <container> and <dao> (which are now only available in <formsavailable>)
 * eliminate linkgrp
 * remove linking attributes from <bibref>; restrict <bibref> to <bibliography> only
+* remove <lb/> from content model of <abstract>
 
 -->
 <!--
@@ -975,29 +976,7 @@ Other changes:
 	</define>
 	<define name="m.render">
 		<choice>
-			<element name="emph">
-				<optional>
-					<attribute name="render">
-						<choice>
-							<ref name="av.render"/>
-						</choice>
-					</attribute>
-				</optional>
-				<optional>
-					<attribute name="id">
-						<data type="ID"/>
-					</attribute>
-				</optional>
-				<optional>
-					<attribute name="altrender"/>
-				</optional>
-				<zeroOrMore>
-					<choice>
-						<text/>
-						<ref name="m.phrase.basic"/>
-					</choice>
-				</zeroOrMore>
-			</element>
+			<ref name="emph"/>
 			<element name="lb">
 				<empty/>
 				<empty/>
@@ -1353,7 +1332,8 @@ Other changes:
 				<zeroOrMore>
 					<choice>
 						<text/>
-						<ref name="m.phrase.basic"/>
+							<ref name="emph"/>
+							<ref name="m.refs"/>						
 					</choice>
 				</zeroOrMore>
 			</element>
@@ -5048,4 +5028,30 @@ Other changes:
 			</optional>
 		</element>
 	</define>
+	<!--TC; 2012-06-13: create pattern for <emph> so it can be referenced from multiple patterns -->
+	<define name="emph">
+		<element name="emph">
+			<optional>
+				<attribute name="render">
+					<choice>
+						<ref name="av.render"/>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="id">
+					<data type="ID"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="altrender"/>
+			</optional>
+			<zeroOrMore>
+				<choice>
+					<text/>
+					<ref name="m.phrase.basic"/>
+				</choice>
+			</zeroOrMore>
+		</element>
+	</define>
 </grammar>
diff --git a/ead_revised_test_instance.xml b/ead_revised_test_instance.xml
index 55755e9..d969e12 100755
--- a/ead_revised_test_instance.xml
+++ b/ead_revised_test_instance.xml
@@ -43,7 +43,6 @@
             <p>Blah blah blah</p>
         </scopecontent>
         <legalstatus>Blah blah blah</legalstatus>
-        <bibliography></bibliography>
         <relations>
             <cpfRelation>
                 <objectXMLWrap>