metanorma-itu 1.2.14 → 1.2.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb90a7538cd02f6e27fb05a6315dcb7d4e346c366207a9a592e7c3cd0452ccea
-  data.tar.gz: 9ebf7d79f72c347f6d8e552fb052c9d6136d8e318703bff1b480d0b4475a9d4b
+  metadata.gz: ffb983ed512580a604a3c27ad83a232cebe458f4d5596a4a71f3dedfcb7810db
+  data.tar.gz: 2f75e990f258c04e5fc8415234b033c9f103bf3d359a2e545bf27b4cabf68877
 SHA512:
-  metadata.gz: dd679ec6c5e2cd43a01b1ade453faaa224159e10f2e14e8bb7c94c4f22d86eeb7b8d37350d48c8fb8c5e5a4076ac734ee8725b031c8d82f89c60e7a9f8bd8a83
-  data.tar.gz: f7075597cb2b0bca44adfce25e6982781beb2d04d1b91d206e9807b218d1a6f106df7ce21dde2002bcb5e2265c594630b22a16b235c428431303231513900cc3
+  metadata.gz: a209fa5be357695a99566411b459852154f5eafd065ce88f6b2bd8d6c32ce8a0720cd0ae1eca1c3881aa4a4590476cf135035804e6120445c2fdc22bd1fc451d
+  data.tar.gz: a8bc66759c3be7fe9e072c4e6947737781286c51930f766e314e69f53069c2292e6c505bbfc3e373a5c9c5f4b7c5ba46e5655bd23c45339616c7183bbd272757

data/.github/workflows/rake.yml

@@ -30,7 +30,9 @@ jobs:
             os: 'macos-latest'
             experimental: true
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@v2
+        with:
+          submodules: true
 
       - uses: ruby/setup-ruby@v1
         with:
@@ -38,14 +40,3 @@ jobs:
           bundler-cache: true
 
       - run: bundle exec rake
-
-  tests-passed:
-    needs: rake
-    runs-on: ubuntu-latest
-    steps:
-      - uses: peter-evans/repository-dispatch@v1
-        with:
-          token: ${{ secrets.METANORMA_CI_PAT_TOKEN || secrets.GITHUB_TOKEN }}
-          repository: ${{ github.repository }}
-          event-type: notify
-          client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'

data/lib/asciidoctor/itu/isodoc.rng

@@ -102,7 +102,7 @@
           </attribute>
         </optional>
         <oneOrMore>
-          <ref name="li"/>
+          <ref name="ul_li"/>
         </oneOrMore>
         <zeroOrMore>
           <ref name="note"/>
@@ -1716,4 +1716,26 @@
       </zeroOrMore>
     </element>
   </define>
+  <define name="ul_li">
+    <element name="li">
+      <optional>
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="uncheckedcheckbox">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="checkedcheckbox">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <oneOrMore>
+        <ref name="BasicBlock"/>
+      </oneOrMore>
+    </element>
+  </define>
 </grammar>

data/lib/isodoc/itu/itu.implementers-guide.xsl

@@ -3,6 +3,7 @@
 	<xsl:output method="xml" encoding="UTF-8" indent="no"/>
 
 	<xsl:param name="svg_images"/>
+	<xsl:param name="external_index"/><!-- path to index xml, generated on 1st pass, based on FOP Intermediate Format -->
 	<xsl:variable name="images" select="document($svg_images)"/>
 	
 	
@@ -187,7 +188,9 @@
 				</fo:page-sequence-master>
 			</fo:layout-master-set>
 
-			<xsl:call-template name="addPDFUAmeta"/>
+			<fo:declarations>
+				<xsl:call-template name="addPDFUAmeta"/>
+			</fo:declarations>
 			
 			<xsl:call-template name="addBookmarks">
 				<xsl:with-param name="contents" select="$contents"/>
@@ -1581,6 +1584,7 @@
 		<xsl:variable name="element-name">
 			<xsl:choose>
 				<xsl:when test="ancestor::itu:dd">fo:inline</xsl:when>
+				<xsl:when test="ancestor::itu:title">fo:inline</xsl:when>
 				<xsl:when test="normalize-space(ancestor::itu:p[1]//text()[not(parent::itu:tt)]) != ''">fo:inline</xsl:when>
 				<xsl:otherwise>fo:block</xsl:otherwise>
 			</xsl:choose>
@@ -1588,9 +1592,12 @@
 		<xsl:element name="{$element-name}">
 			<xsl:attribute name="font-family">Courier</xsl:attribute>
 			<xsl:attribute name="font-size">10pt</xsl:attribute>
-			<xsl:if test="local-name(..) != 'dt' and not(ancestor::itu:dd)">
+			<xsl:if test="local-name(..) != 'dt' and not(ancestor::itu:dd) and not(ancestor::itu:title)">
 				<xsl:attribute name="text-align">center</xsl:attribute>
 			</xsl:if>
+			<xsl:if test="ancestor::itu:title">
+				<xsl:attribute name="font-size">11pt</xsl:attribute>
+			</xsl:if>
 			<xsl:apply-templates/>
 		</xsl:element>
 	</xsl:template>
@@ -2129,6 +2136,7 @@
 		
 		
 		
+		
 			<xsl:attribute name="font-size">10pt</xsl:attribute>
 			<xsl:attribute name="margin-top">12pt</xsl:attribute>
 			<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
@@ -2758,7 +2766,15 @@
 	</xsl:template><xsl:template match="*[local-name()='link']" mode="td_text">
 		<xsl:value-of select="@target"/>
 	</xsl:template><xsl:template match="*[local-name()='math']" mode="td_text">
-		<xsl:variable name="math_text" select="normalize-space(.)"/>
+		<xsl:variable name="mathml">
+			<xsl:for-each select="*">
+				<xsl:if test="local-name() != 'unit' and local-name() != 'prefix' and local-name() != 'dimension' and local-name() != 'quantity'">
+					<xsl:copy-of select="."/>
+				</xsl:if>
+			</xsl:for-each>
+		</xsl:variable>
+		
+		<xsl:variable name="math_text" select="normalize-space(xalan:nodeset($mathml))"/>
 		<xsl:value-of select="translate($math_text, ' ', '#')"/><!-- mathml images as one 'word' without spaces -->
 	</xsl:template><xsl:template match="*[local-name()='table2']"/><xsl:template match="*[local-name()='thead']"/><xsl:template match="*[local-name()='thead']" mode="process">
 		<xsl:param name="cols-count"/>
@@ -3760,6 +3776,10 @@
 		<fo:inline font-size="10pt" color="red" text-decoration="line-through">
 			<xsl:apply-templates/>
 		</fo:inline>
+	</xsl:template><xsl:template match="*[local-name()='hi']">
+		<fo:inline background-color="yellow">
+			<xsl:apply-templates/>
+		</fo:inline>
 	</xsl:template><xsl:template match="text()[ancestor::*[local-name()='smallcap']]">
 		<xsl:variable name="text" select="normalize-space(.)"/>
 		<fo:inline font-size="75%">
@@ -4100,6 +4120,7 @@
 				<xsl:apply-templates select="." mode="mathml"/>
 			</xsl:variable>
 			<fo:instream-foreign-object fox:alt-text="Math">
+				
 				<!-- <xsl:copy-of select="."/> -->
 				<xsl:copy-of select="xalan:nodeset($mathml)"/>
 			</fo:instream-foreign-object>			
@@ -4118,7 +4139,7 @@
 			<xsl:apply-templates select="@*|node()" mode="mathml"/>
 		</xsl:copy>
 		<mathml:mspace width="0.5ex"/>
-	</xsl:template><xsl:template match="*[local-name()='localityStack']"/><xsl:template match="*[local-name()='link']" name="link">
+	</xsl:template><xsl:template match="mathml:math/*[local-name()='unit']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='prefix']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='dimension']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='quantity']" mode="mathml"/><xsl:template match="*[local-name()='localityStack']"/><xsl:template match="*[local-name()='link']" name="link">
 		<xsl:variable name="target">
 			<xsl:choose>
 				<xsl:when test="starts-with(normalize-space(@target), 'mailto:')">
@@ -4152,8 +4173,6 @@
 				</xsl:otherwise>
 			</xsl:choose>
 		</fo:inline>
-	</xsl:template><xsl:template match="*[local-name()='bookmark']">
-		<fo:inline id="{@id}"/>
 	</xsl:template><xsl:template match="*[local-name()='appendix']">
 		<fo:block id="{@id}" xsl:use-attribute-sets="appendix-style">
 			<xsl:apply-templates select="*[local-name()='title']" mode="process"/>
@@ -4368,6 +4387,7 @@
 		<fo:block id="{@id}">
 			<xsl:apply-templates/>
 		</fo:block>
+		<xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
 	</xsl:template><xsl:template match="*[local-name() = 'figure'][@class = 'pseudocode']//*[local-name() = 'p']">
 		<fo:block xsl:use-attribute-sets="figure-pseudocode-p-style">
 			<xsl:apply-templates/>
@@ -4951,10 +4971,11 @@
 		</xsl:choose>
 
 	</xsl:template><xsl:template match="*[local-name() = 'example']/*[local-name() = 'p']">
-	
+		<xsl:variable name="num"><xsl:number/></xsl:variable>
 		<xsl:variable name="element">
 			block
 			
+			
 		</xsl:variable>		
 		<xsl:choose>			
 			<xsl:when test="normalize-space($element) = 'block'">
@@ -5045,29 +5066,47 @@
 		<xsl:text>— </xsl:text>
 		<xsl:apply-templates/>
 	</xsl:template><xsl:template match="*[local-name() = 'eref']">
-		<fo:inline xsl:use-attribute-sets="eref-style">
-			<xsl:if test="@type = 'footnote'">
-				
-					<xsl:attribute name="keep-together.within-line">always</xsl:attribute>
-					<xsl:attribute name="font-size">80%</xsl:attribute>
-					<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
-					<xsl:attribute name="vertical-align">super</xsl:attribute>
-									
-				
-			</xsl:if>	
-		
-			<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
-					
-				<xsl:if test="@type = 'inline'">
-					
-					
-					
-				</xsl:if>
-			
-			
-				<xsl:apply-templates/>
-			</fo:basic-link>
-		</fo:inline>
+	
+		<xsl:variable name="bibitemid">
+			<xsl:choose>
+				<xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"/>
+				<xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
+				<xsl:otherwise><xsl:value-of select="@bibitemid"/></xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+	
+		<xsl:choose>
+			<xsl:when test="normalize-space($bibitemid) != ''">
+				<fo:inline xsl:use-attribute-sets="eref-style">
+					<xsl:if test="@type = 'footnote'">
+						
+							<xsl:attribute name="keep-together.within-line">always</xsl:attribute>
+							<xsl:attribute name="font-size">80%</xsl:attribute>
+							<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
+							<xsl:attribute name="vertical-align">super</xsl:attribute>
+											
+						
+					</xsl:if>	
+											
+					<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
+						<xsl:if test="normalize-space(@citeas) = ''">
+							<xsl:attribute name="fox:alt-text"><xsl:value-of select="."/></xsl:attribute>
+						</xsl:if>
+						<xsl:if test="@type = 'inline'">
+							
+							
+							
+						</xsl:if>
+
+						<xsl:apply-templates/>
+					</fo:basic-link>
+							
+				</fo:inline>
+			</xsl:when>
+			<xsl:otherwise>
+				<fo:inline><xsl:apply-templates/></fo:inline>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template><xsl:template match="*[local-name() = 'tab']">
 		<!-- zero-space char -->
 		<xsl:variable name="depth">
@@ -5259,6 +5298,153 @@
 				</fo:block>
 			</xsl:otherwise>
 		</xsl:choose>
+	</xsl:template><xsl:variable name="index" select="document($external_index)"/><xsl:variable name="dash" select="'–'"/><xsl:variable name="bookmark_in_fn">
+		<xsl:for-each select="//*[local-name() = 'bookmark'][ancestor::*[local-name() = 'fn']]">
+			<bookmark><xsl:value-of select="@id"/></bookmark>
+		</xsl:for-each>
+	</xsl:variable><xsl:template match="@*|node()" mode="index_add_id">
+		<xsl:copy>
+				<xsl:apply-templates select="@*|node()" mode="index_add_id"/>
+		</xsl:copy>
+	</xsl:template><xsl:template match="*[local-name() = 'xref']" mode="index_add_id">
+		<xsl:variable name="id">
+			<xsl:call-template name="generateIndexXrefId"/>
+		</xsl:variable>
+		<xsl:copy> <!-- add id to xref -->
+			<xsl:apply-templates select="@*" mode="index_add_id"/>
+			<xsl:attribute name="id">
+				<xsl:value-of select="$id"/>
+			</xsl:attribute>
+			<xsl:apply-templates mode="index_add_id"/>
+		</xsl:copy>
+		<!-- split <xref target="bm1" to="End" pagenumber="true"> to two xref:
+		<xref target="bm1" pagenumber="true"> and <xref target="End" pagenumber="true"> -->
+		<xsl:if test="@to">
+			<xsl:value-of select="$dash"/>
+			<xsl:copy>
+				<xsl:copy-of select="@*"/>
+				<xsl:attribute name="target"><xsl:value-of select="@to"/></xsl:attribute>
+				<xsl:attribute name="id">
+					<xsl:value-of select="$id"/><xsl:text>_to</xsl:text>
+				</xsl:attribute>
+				<xsl:apply-templates mode="index_add_id"/>
+			</xsl:copy>
+		</xsl:if>
+	</xsl:template><xsl:template match="@*|node()" mode="index_update">
+		<xsl:copy>
+				<xsl:apply-templates select="@*|node()" mode="index_update"/>
+		</xsl:copy>
+	</xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']" mode="index_update">
+		<xsl:copy>
+			<xsl:apply-templates select="@*" mode="index_update"/>
+		<xsl:apply-templates select="node()[1]" mode="process_li_element"/>
+		</xsl:copy>
+	</xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']/node()" mode="process_li_element" priority="2">
+		<xsl:param name="element"/>
+		<xsl:param name="remove" select="'false'"/>
+		<xsl:param name="target"/>
+		<!-- <node></node> -->
+		<xsl:choose>
+			<xsl:when test="self::text()  and (normalize-space(.) = ',' or normalize-space(.) = $dash) and $remove = 'true'">
+				<!-- skip text (i.e. remove it) and process next element -->
+				<!-- [removed_<xsl:value-of select="."/>] -->
+				<xsl:apply-templates select="following-sibling::node()[1]" mode="process_li_element">
+					<xsl:with-param name="target"><xsl:value-of select="$target"/></xsl:with-param>
+				</xsl:apply-templates>
+			</xsl:when>
+			<xsl:when test="self::text()">
+				<xsl:value-of select="."/>
+				<xsl:apply-templates select="following-sibling::node()[1]" mode="process_li_element"/>
+			</xsl:when>
+			<xsl:when test="self::* and local-name(.) = 'xref'">
+				<xsl:variable name="id" select="@id"/>
+				<xsl:variable name="page" select="$index//item[@id = $id]"/>
+				<xsl:variable name="id_next" select="following-sibling::*[local-name() = 'xref'][1]/@id"/>
+				<xsl:variable name="page_next" select="$index//item[@id = $id_next]"/>
+				
+				<xsl:variable name="id_prev" select="preceding-sibling::*[local-name() = 'xref'][1]/@id"/>
+				<xsl:variable name="page_prev" select="$index//item[@id = $id_prev]"/>
+				
+				<xsl:choose>
+					<!-- 2nd pass -->
+					<!-- if page is equal to page for next and page is not the end of range -->
+					<xsl:when test="$page != '' and $page_next != '' and $page = $page_next and not(contains($page, '_to'))">  <!-- case: 12, 12-14 -->
+						<!-- skip element (i.e. remove it) and remove next text ',' -->
+						<!-- [removed_xref] -->
+						
+						<xsl:apply-templates select="following-sibling::node()[1]" mode="process_li_element">
+							<xsl:with-param name="remove">true</xsl:with-param>
+							<xsl:with-param name="target">
+								<xsl:choose>
+									<xsl:when test="$target != ''"><xsl:value-of select="$target"/></xsl:when>
+									<xsl:otherwise><xsl:value-of select="@target"/></xsl:otherwise>
+								</xsl:choose>
+							</xsl:with-param>
+						</xsl:apply-templates>
+					</xsl:when>
+					
+					<xsl:when test="$page != '' and $page_prev != '' and $page = $page_prev and contains($page_prev, '_to')"> <!-- case: 12-14, 14, ... -->
+						<!-- remove xref -->
+						<xsl:apply-templates select="following-sibling::node()[1]" mode="process_li_element">
+							<xsl:with-param name="remove">true</xsl:with-param>
+						</xsl:apply-templates>
+					</xsl:when>
+
+					<xsl:otherwise>
+						<xsl:apply-templates select="." mode="xref_copy">
+							<xsl:with-param name="target" select="$target"/>
+						</xsl:apply-templates>
+						<xsl:apply-templates select="following-sibling::node()[1]" mode="process_li_element"/>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:when>
+			<xsl:when test="self::* and local-name(.) = 'ul'">
+				<!-- ul -->
+				<xsl:apply-templates select="." mode="index_update"/>
+			</xsl:when>
+			<xsl:otherwise>
+			 <xsl:apply-templates select="." mode="xref_copy">
+					<xsl:with-param name="target" select="$target"/>
+				</xsl:apply-templates>
+				<xsl:apply-templates select="following-sibling::node()[1]" mode="process_li_element"/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template><xsl:template match="@*|node()" mode="xref_copy">
+		<xsl:param name="target"/>
+		<xsl:copy>
+			<xsl:apply-templates select="@*" mode="xref_copy"/>
+			<xsl:if test="$target != '' and not(xalan:nodeset($bookmark_in_fn)//bookmark[. = $target])">
+				<xsl:attribute name="target"><xsl:value-of select="$target"/></xsl:attribute>
+			</xsl:if>
+			<xsl:apply-templates select="node()" mode="xref_copy"/>
+		</xsl:copy>
+	</xsl:template><xsl:template name="generateIndexXrefId">
+		<xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/>
+		
+		<xsl:variable name="docid">
+			<xsl:call-template name="getDocumentId"/>
+		</xsl:variable>
+		<xsl:variable name="item_number">
+			<xsl:number count="*[local-name() = 'li'][ancestor::*[local-name() = 'indexsect']]" level="any"/>
+		</xsl:variable>
+		<xsl:variable name="xref_number"><xsl:number count="*[local-name() = 'xref']"/></xsl:variable>
+		<xsl:value-of select="concat($docid, '_', $item_number, '_', $xref_number)"/> <!-- $level, '_',  -->
+	</xsl:template><xsl:template match="*[local-name() = 'indexsect']/*[local-name() = 'clause']" priority="4">
+		<xsl:apply-templates/>
+		<fo:block>
+		<xsl:if test="following-sibling::*[local-name() = 'clause']">
+			<fo:block> </fo:block>
+		</xsl:if>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'ul']" priority="4">
+		<xsl:apply-templates/>
+	</xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']" priority="4">
+		<xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/>
+		<fo:block start-indent="{5 * $level}mm" text-indent="-5mm">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'bookmark']">
+		<fo:inline id="{@id}"/>
 	</xsl:template><xsl:template match="*[local-name() = 'errata']">
 		<!-- <row>
 					<date>05-07-2013</date>
@@ -5475,70 +5661,68 @@
 		<xsl:variable name="lang">
 			<xsl:call-template name="getLang"/>
 		</xsl:variable>
-		<fo:declarations>
-			<pdf:catalog xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf">
-					<pdf:dictionary type="normal" key="ViewerPreferences">
-						<pdf:boolean key="DisplayDocTitle">true</pdf:boolean>
-					</pdf:dictionary>
-				</pdf:catalog>
-			<x:xmpmeta xmlns:x="adobe:ns:meta/">
-				<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-					<rdf:Description xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:pdf="http://ns.adobe.com/pdf/1.3/" rdf:about="">
-					<!-- Dublin Core properties go here -->
-						<dc:title>
-							<xsl:variable name="title">
-								<xsl:for-each select="(//*[contains(local-name(), '-standard')])[1]/*[local-name() = 'bibdata']">
-									
-									
-									
-									
-									
-									
-										<xsl:value-of select="*[local-name() = 'title'][@type='main']"/>
-																	
-								</xsl:for-each>
-							</xsl:variable>
-							<xsl:choose>
-								<xsl:when test="normalize-space($title) != ''">
-									<xsl:value-of select="$title"/>
-								</xsl:when>
-								<xsl:otherwise>
-									<xsl:text> </xsl:text>
-								</xsl:otherwise>
-							</xsl:choose>							
-						</dc:title>
-						<dc:creator>
+		<pdf:catalog xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf">
+				<pdf:dictionary type="normal" key="ViewerPreferences">
+					<pdf:boolean key="DisplayDocTitle">true</pdf:boolean>
+				</pdf:dictionary>
+			</pdf:catalog>
+		<x:xmpmeta xmlns:x="adobe:ns:meta/">
+			<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+				<rdf:Description xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:pdf="http://ns.adobe.com/pdf/1.3/" rdf:about="">
+				<!-- Dublin Core properties go here -->
+					<dc:title>
+						<xsl:variable name="title">
 							<xsl:for-each select="(//*[contains(local-name(), '-standard')])[1]/*[local-name() = 'bibdata']">
 								
-									<xsl:for-each select="*[local-name() = 'contributor'][*[local-name() = 'role']/@type='author']">
-										<xsl:value-of select="*[local-name() = 'organization']/*[local-name() = 'name']"/>
-										<xsl:if test="position() != last()">; </xsl:if>
-									</xsl:for-each>
-								
 								
 								
-							</xsl:for-each>
-						</dc:creator>
-						<dc:description>
-							<xsl:variable name="abstract">
 								
-									<xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()"/>									
 								
 								
-							</xsl:variable>
-							<xsl:value-of select="normalize-space($abstract)"/>
-						</dc:description>
-						<pdf:Keywords>
-							<xsl:call-template name="insertKeywords"/>
-						</pdf:Keywords>
-					</rdf:Description>
-					<rdf:Description xmlns:xmp="http://ns.adobe.com/xap/1.0/" rdf:about="">
-						<!-- XMP properties go here -->
-						<xmp:CreatorTool/>
-					</rdf:Description>
-				</rdf:RDF>
-			</x:xmpmeta>
-		</fo:declarations>
+									<xsl:value-of select="*[local-name() = 'title'][@type='main']"/>
+																
+							</xsl:for-each>
+						</xsl:variable>
+						<xsl:choose>
+							<xsl:when test="normalize-space($title) != ''">
+								<xsl:value-of select="$title"/>
+							</xsl:when>
+							<xsl:otherwise>
+								<xsl:text> </xsl:text>
+							</xsl:otherwise>
+						</xsl:choose>							
+					</dc:title>
+					<dc:creator>
+						<xsl:for-each select="(//*[contains(local-name(), '-standard')])[1]/*[local-name() = 'bibdata']">
+							
+								<xsl:for-each select="*[local-name() = 'contributor'][*[local-name() = 'role']/@type='author']">
+									<xsl:value-of select="*[local-name() = 'organization']/*[local-name() = 'name']"/>
+									<xsl:if test="position() != last()">; </xsl:if>
+								</xsl:for-each>
+							
+							
+							
+						</xsl:for-each>
+					</dc:creator>
+					<dc:description>
+						<xsl:variable name="abstract">
+							
+								<xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()"/>									
+							
+							
+						</xsl:variable>
+						<xsl:value-of select="normalize-space($abstract)"/>
+					</dc:description>
+					<pdf:Keywords>
+						<xsl:call-template name="insertKeywords"/>
+					</pdf:Keywords>
+				</rdf:Description>
+				<rdf:Description xmlns:xmp="http://ns.adobe.com/xap/1.0/" rdf:about="">
+					<!-- XMP properties go here -->
+					<xmp:CreatorTool/>
+				</rdf:Description>
+			</rdf:RDF>
+		</x:xmpmeta>
 	</xsl:template><xsl:template name="getId">
 		<xsl:choose>
 			<xsl:when test="../@id">