metanorma-ogc 2.6.0 → 2.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3c9e7230287337f9903c6e2628a5fb7b47ef3c8318e0a404d783564db1776c9
-  data.tar.gz: cb7741ebe5cf3875f498388f88cd52c20bb67ff0801ed9f91384a92ed7e2d445
+  metadata.gz: 35680f6a9dbf6cebb472698a3d3665ec78f9d81735ec9068c0068cf26326b82e
+  data.tar.gz: 4cc255a9dbf73b58c30492a0bfa107cbfa6379f418c8cd18bc4aeeb1ec9f7c85
 SHA512:
-  metadata.gz: 4ea130e97e8ad1a5d7500c1f624ef62b89295921e4b112c0ca7e0ad46be1de1cd0e48e5270a2c9e3206d2b710b3396ab4f1a03eee009ce610e4ad004ec483f81
-  data.tar.gz: a3018511b9c1cca08f3c5d6c8ed8c6f500d1aebb839d352bef4724933bdfb74c36e34c1c18f0b6e421865a4cd78c68ab049e4ca3056dd0d010dab0d73c01bfdc
+  metadata.gz: 906b73d6e8fe1ce05aa7bd62b7df4923fd0b64ab711a286e96553f16a8d25da0bd8be4badadf585d92234f7a265a3b9f6c201a20113f071dac576dc6c1afbd70
+  data.tar.gz: 1a4f85e5ba023bd4531b903579749f618f61c47a5ab0a847e4c3c06e8d23b334d47bc8b6f822d17d0723fb3c1d4339f1d43773d916ee593da7da1ca23ea98286

data/lib/isodoc/ogc/html/htmlstyle.css

@@ -232,7 +232,7 @@ h6:hover > a.anchor,
   background-color: #777;
   color: white;
   cursor: pointer;
-  padding: 12px 0;
+  padding: 3px 0;
   margin: 0;
   width: 100%;
   border: none;
@@ -1107,7 +1107,7 @@ p.Biblio, p.NormRef {
   margin-left: 2em; }
 
 /* Blocks */
-.SourceTitle {
+.SourceTitle, .FigureTitle {
   font-weight: 700;
   font-size: 1em;
   text-align: center; }

data/lib/isodoc/ogc/html/htmlstyle.scss

@@ -424,7 +424,7 @@ p.Biblio, p.NormRef {
 
 /* Blocks */
 
-.SourceTitle {
+.SourceTitle, .FigureTitle {
   @include blockTitle();
 }
 

data/lib/isodoc/ogc/html/scripts.html

@@ -1,71 +1,12 @@
-  <script>
-    $("#toc").on('click', 'li', function(e) {
-    $(this).parent().find('li.toc-active').removeClass('toc-active');
-    $(this).addClass('toc-active');
-});
-  </script>
-
-  <script>
-  //TOC toggle animation
-$('#toggle').on('click', function(){
-    if( $('nav').is(':visible') ) {
-        $('nav').animate({ 'left': '-353px' }, 'slow', function(){
-            $('nav').hide();
-        });
-        $('body').animate({ 'margin-left': '-333px' }, 'slow');
-    }
-    else {
-        $('nav').show();
-        $('nav').animate({ 'left': '0px' }, 'slow');
-        $('body').animate({ 'margin-left': '0' }, 'slow');
-    }
-});
-</script>
-
 <script>
-    // Scroll to top button
-    window.onscroll = function() {scrollFunction()};
-    
-    function scrollFunction() {
-        if (document.body.scrollTop > 100 || document.documentElement.scrollTop > 100) {
-            document.getElementById("myBtn").style.display = "block";
-        } else {
-            document.getElementById("myBtn").style.display = "none";
-        }
-    }
-    
-    // When the user clicks on the button, scroll to the top of the document
-    function topFunction() {
-        document.body.scrollTop = 0;
-        document.documentElement.scrollTop = 0;
-    }
-    </script>
-
-  <script>
-// @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt Expat
-//
-// AnchorJS - v4.2.2 - 2020-04-20
-// https://www.bryanbraun.com/anchorjs/
-// Copyright (c) 2020 Bryan Braun; Licensed MIT
-//
-// @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt Expat
-!function(A,e){"use strict";"function"==typeof define&&define.amd?define([],e):"object"==typeof module&&module.exports?module.exports=e():(A.AnchorJS=e(),A.anchors=new A.AnchorJS)}(this,function(){"use strict";return function(A){function f(A){A.icon=A.hasOwnProperty("icon")?A.icon:"",A.visible=A.hasOwnProperty("visible")?A.visible:"hover",A.placement=A.hasOwnProperty("placement")?A.placement:"right",A.ariaLabel=A.hasOwnProperty("ariaLabel")?A.ariaLabel:"Anchor",A.class=A.hasOwnProperty("class")?A.class:"",A.base=A.hasOwnProperty("base")?A.base:"",A.truncate=A.hasOwnProperty("truncate")?Math.floor(A.truncate):64,A.titleText=A.hasOwnProperty("titleText")?A.titleText:""}function p(A){var e;if("string"==typeof A||A instanceof String)e=[].slice.call(document.querySelectorAll(A));else{if(!(Array.isArray(A)||A instanceof NodeList))throw new Error("The selector provided to AnchorJS was invalid.");e=[].slice.call(A)}return e}this.options=A||{},this.elements=[],f(this.options),this.isTouchDevice=function(){return!!("ontouchstart"in window||window.DocumentTouch&&document instanceof DocumentTouch)},this.add=function(A){var e,t,i,n,o,s,a,r,c,h,l,u,d=[];if(f(this.options),"touch"===(l=this.options.visible)&&(l=this.isTouchDevice()?"always":"hover"),0===(e=p(A=A||"h2, h3, h4, h5, h6")).length)return this;for(!function(){if(null!==document.head.querySelector("style.anchorjs"))return;var A,e=document.createElement("style");e.className="anchorjs",e.appendChild(document.createTextNode("")),void 0===(A=document.head.querySelector('[rel="stylesheet"],style'))?document.head.appendChild(e):document.head.insertBefore(e,A);e.sheet.insertRule(".anchorjs-link{opacity:0;text-decoration:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}",e.sheet.cssRules.length),e.sheet.insertRule(":hover>.anchorjs-link,.anchorjs-link:focus{opacity:1}",e.sheet.cssRules.length),e.sheet.insertRule("[data-anchorjs-icon]::after{content:attr(data-anchorjs-icon)}",e.sheet.cssRules.length),e.sheet.insertRule('@font-face{font-family:anchorjs-icons;src:url(data:n/a;base64,AAEAAAALAIAAAwAwT1MvMg8yG2cAAAE4AAAAYGNtYXDp3gC3AAABpAAAAExnYXNwAAAAEAAAA9wAAAAIZ2x5ZlQCcfwAAAH4AAABCGhlYWQHFvHyAAAAvAAAADZoaGVhBnACFwAAAPQAAAAkaG10eASAADEAAAGYAAAADGxvY2EACACEAAAB8AAAAAhtYXhwAAYAVwAAARgAAAAgbmFtZQGOH9cAAAMAAAAAunBvc3QAAwAAAAADvAAAACAAAQAAAAEAAHzE2p9fDzz1AAkEAAAAAADRecUWAAAAANQA6R8AAAAAAoACwAAAAAgAAgAAAAAAAAABAAADwP/AAAACgAAA/9MCrQABAAAAAAAAAAAAAAAAAAAAAwABAAAAAwBVAAIAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAMCQAGQAAUAAAKZAswAAACPApkCzAAAAesAMwEJAAAAAAAAAAAAAAAAAAAAARAAAAAAAAAAAAAAAAAAAAAAQAAg//0DwP/AAEADwABAAAAAAQAAAAAAAAAAAAAAIAAAAAAAAAIAAAACgAAxAAAAAwAAAAMAAAAcAAEAAwAAABwAAwABAAAAHAAEADAAAAAIAAgAAgAAACDpy//9//8AAAAg6cv//f///+EWNwADAAEAAAAAAAAAAAAAAAAACACEAAEAAAAAAAAAAAAAAAAxAAACAAQARAKAAsAAKwBUAAABIiYnJjQ3NzY2MzIWFxYUBwcGIicmNDc3NjQnJiYjIgYHBwYUFxYUBwYGIwciJicmNDc3NjIXFhQHBwYUFxYWMzI2Nzc2NCcmNDc2MhcWFAcHBgYjARQGDAUtLXoWOR8fORYtLTgKGwoKCjgaGg0gEhIgDXoaGgkJBQwHdR85Fi0tOAobCgoKOBoaDSASEiANehoaCQkKGwotLXoWOR8BMwUFLYEuehYXFxYugC44CQkKGwo4GkoaDQ0NDXoaShoKGwoFBe8XFi6ALjgJCQobCjgaShoNDQ0NehpKGgobCgoKLYEuehYXAAAADACWAAEAAAAAAAEACAAAAAEAAAAAAAIAAwAIAAEAAAAAAAMACAAAAAEAAAAAAAQACAAAAAEAAAAAAAUAAQALAAEAAAAAAAYACAAAAAMAAQQJAAEAEAAMAAMAAQQJAAIABgAcAAMAAQQJAAMAEAAMAAMAAQQJAAQAEAAMAAMAAQQJAAUAAgAiAAMAAQQJAAYAEAAMYW5jaG9yanM0MDBAAGEAbgBjAGgAbwByAGoAcwA0ADAAMABAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAH//wAP) format("truetype")}',e.sheet.cssRules.length)}(),t=document.querySelectorAll("[id]"),i=[].map.call(t,function(A){return A.id}),o=0;o<e.length;o++)if(this.hasAnchorJSLink(e[o]))d.push(o);else{if(e[o].hasAttribute("id"))n=e[o].getAttribute("id");else if(e[o].hasAttribute("data-anchor-id"))n=e[o].getAttribute("data-anchor-id");else{for(c=r=this.urlify(e[o].textContent),a=0;void 0!==s&&(c=r+"-"+a),a+=1,-1!==(s=i.indexOf(c)););s=void 0,i.push(c),e[o].setAttribute("id",c),n=c}(h=document.createElement("a")).className="anchorjs-link "+this.options.class,h.setAttribute("aria-label",this.options.ariaLabel),h.setAttribute("data-anchorjs-icon",this.options.icon),this.options.titleText&&(h.title=this.options.titleText),u=document.querySelector("base")?window.location.pathname+window.location.search:"",u=this.options.base||u,h.href=u+"#"+n,"always"===l&&(h.style.opacity="1"),""===this.options.icon&&(h.style.font="1em/1 anchorjs-icons","left"===this.options.placement&&(h.style.lineHeight="inherit")),"left"===this.options.placement?(h.style.position="absolute",h.style.marginLeft="-1em",h.style.paddingRight="0.5em",e[o].insertBefore(h,e[o].firstChild)):(h.style.paddingLeft="0.375em",e[o].appendChild(h))}for(o=0;o<d.length;o++)e.splice(d[o]-o,1);return this.elements=this.elements.concat(e),this},this.remove=function(A){for(var e,t,i=p(A),n=0;n<i.length;n++)(t=i[n].querySelector(".anchorjs-link"))&&(-1!==(e=this.elements.indexOf(i[n]))&&this.elements.splice(e,1),i[n].removeChild(t));return this},this.removeAll=function(){this.remove(this.elements)},this.urlify=function(A){return this.options.truncate||f(this.options),A.trim().replace(/\'/gi,"").replace(/[& +$,:;=?@"#{}|^~[`%!'<>\]\.\/\(\)\*\\\n\t\b\v]/g,"-").replace(/-{2,}/g,"-").substring(0,this.options.truncate).replace(/^-+|-+$/gm,"").toLowerCase()},this.hasAnchorJSLink=function(A){var e=A.firstChild&&-1<(" "+A.firstChild.className+" ").indexOf(" anchorjs-link "),t=A.lastChild&&-1<(" "+A.lastChild.className+" ").indexOf(" anchorjs-link ");return e||t||!1}}});
-// @license-end
-  </script>
-  <script>
-/*
-  $(document).ready(function() {
-          $('[id^=toc]').each(function ()
-          {
-             var currentToc = $(this);
-       var url = window.location.href;
-             currentToc.wrap("<a href='" + url + "#" + currentToc.attr("id") + "' </a>");
-          });
-});
-*/
-  anchors.options = {
-  placement: 'left'
-};
-anchors.add('h1, h2, h3, h4');
+const activeBtns = document.querySelectorAll('.collapsible.active')
+
+// check if there are any active buttons, and open the content for each of them as default
+if (activeBtns.length) {
+    activeBtns.forEach(btn => {
+        const content = btn.nextElementSibling
+        content.style.maxHeight = content.scrollHeight + 'px'
+    })
+}
 </script>
 

data/lib/isodoc/ogc/html_convert.rb

@@ -140,6 +140,37 @@ module IsoDoc
         html
       end
 
+      def figure_parse1(node, out)
+        out.div **figure_attrs(node) do |div|
+          node.children.each do |n|
+            figure_key(out) if n.name == "dl"
+            parse(n, div) unless n.name == "name"
+          end
+        end
+        figure_name_parse(node, out, node.at(ns("./name")))
+      end
+
+      def html_cleanup(html)
+        collapsible(super)
+      end
+
+      def collapsible(html)
+        html.xpath("//*[@class = 'sourcecode' or @class = 'figure']")
+          .each do |d|
+          d["class"] += " hidable"
+          d.previous = "<p class='collapsible active'>&#xa0;</p>"
+        end
+        html
+      end
+
+      def inject_script(doc)
+        a = super.split(%{</body>})
+        scripts = File.read(File.join(File.dirname(__FILE__),
+                                      "html/scripts.html"),
+                            encoding: "UTF-8")
+        "#{a[0]}#{scripts}#{a[1]}"
+      end
+        
       # to pass on to imported _coverpage.scss
       def scss_fontheader(is_html_css)
         super + <<~SCSS

data/lib/isodoc/ogc/i18n-en.yaml

@@ -20,17 +20,23 @@ toc_recommendations: List of Recommendations
 table_of_figures: Table of Figures
 security_empty: No security considerations have been made for this document.
 internal_terms_boilerplate: |
-  <p>This document uses the terms defined in <link target="https://portal.ogc.org/public_ogc/directives/directives.php">OGC Policy Directive 49</link>, which is based on the ISO/IEC Directives, Part 2, Rules for the structure and drafting of International Standards. In particular, the word “shall” (not “must”) is the verb form used to indicate a requirement to be strictly followed to conform to this document and OGC documents do not use the equivalent phrases in the ISO/IEC Directives, Part 2.</p>
-  <p>This document also uses terms defined in the OGC Standard for Modular specifications (<link target="https://portal.opengeospatial.org/files/?artifact_id=34762">OGC 08-131r3</link>), also known as the 'ModSpec'. The definitions of terms such as standard, specification, requirement, and conformance test are provided in the ModSpec.</p>
-  <p>For the purposes of this document, the following additional terms and definitions apply.</p>
+  This document uses the terms defined in https://portal.ogc.org/public_ogc/directives/directives.php[OGC Policy Directive 49], which is based on the ISO/IEC Directives, Part 2, Rules for the structure and drafting of International Standards. In particular, the word “shall” (not “must”) is the verb form used to indicate a requirement to be strictly followed to conform to this document and OGC documents do not use the equivalent phrases in the ISO/IEC Directives, Part 2.
+
+  This document also uses terms defined in the OGC Standard for Modular specifications (https://portal.opengeospatial.org/files/?artifact_id=34762[OGC 08-131r3]), also known as the 'ModSpec'. The definitions of terms such as standard, specification, requirement, and conformance test are provided in the ModSpec.
+
+  For the purposes of this document, the following additional terms and definitions apply.
 external_terms_boilerplate: |
-  <p>This document uses the terms defined in <link target="https://portal.ogc.org/public_ogc/directives/directives.php">OGC Policy Directive 49</link>, which is based on the ISO/IEC Directives, Part 2, Rules for the structure and drafting of International Standards. In particular, the word “shall” (not “must”) is the verb form used to indicate a requirement to be strictly followed to conform to this document and OGC documents do not use the equivalent phrases in the ISO/IEC Directives, Part 2.</p>
-  <p>This document also uses terms defined in the OGC Standard for Modular specifications (<link target="https://portal.opengeospatial.org/files/?artifact_id=34762">OGC 08-131r3</link>), also known as the 'ModSpec'. The definitions of terms such as standard, specification, requirement, and conformance test are provided in the ModSpec.</p>
-  <p>For the purposes of this document, the terms and definitions given in % additionally apply.</p>
+  This document uses the terms defined in https://portal.ogc.org/public_ogc/directives/directives.php[OGC Policy Directive 49], which is based on the ISO/IEC Directives, Part 2, Rules for the structure and drafting of International Standards. In particular, the word “shall” (not “must”) is the verb form used to indicate a requirement to be strictly followed to conform to this document and OGC documents do not use the equivalent phrases in the ISO/IEC Directives, Part 2.
+
+  This document also uses terms defined in the OGC Standard for Modular specifications (https://portal.opengeospatial.org/files/?artifact_id=34762[OGC 08-131r3]), also known as the 'ModSpec'. The definitions of terms such as standard, specification, requirement, and conformance test are provided in the ModSpec.
+
+  For the purposes of this document, the terms and definitions given in % additionally apply.
 internal_external_terms_boilerplate: |
-  <p>This document uses the terms defined in <link target="https://portal.ogc.org/public_ogc/directives/directives.php">OGC Policy Directive 49</link>, which is based on the ISO/IEC Directives, Part 2, Rules for the structure and drafting of International Standards. In particular, the word “shall” (not “must”) is the verb form used to indicate a requirement to be strictly followed to conform to this document and OGC documents do not use the equivalent phrases in the ISO/IEC Directives, Part 2.</p>
-  <p>This document also uses terms defined in the OGC Standard for Modular specifications (<link target="https://portal.opengeospatial.org/files/?artifact_id=34762">OGC 08-131r3</link>), also known as the 'ModSpec'. The definitions of terms such as standard, specification, requirement, and conformance test are provided in the ModSpec.</p>
-  <p>For the purposes of this document, the terms and definitions given in % and the following additionally apply.</p>
+  This document uses the terms defined in https://portal.ogc.org/public_ogc/directives/directives.php[OGC Policy Directive 49], which is based on the ISO/IEC Directives, Part 2, Rules for the structure and drafting of International Standards. In particular, the word “shall” (not “must”) is the verb form used to indicate a requirement to be strictly followed to conform to this document and OGC documents do not use the equivalent phrases in the ISO/IEC Directives, Part 2.
+
+  This document also uses terms defined in the OGC Standard for Modular specifications (https://portal.opengeospatial.org/files/?artifact_id=34762[OGC 08-131r3]), also known as the 'ModSpec'. The definitions of terms such as standard, specification, requirement, and conformance test are provided in the ModSpec.
+
+  For the purposes of this document, the terms and definitions given in % and the following additionally apply.
 term_defined_in: "(%)"
 submission_date: Submission Date
 approval_date: Approval Date

data/lib/isodoc/ogc/ogc.abstract-specification-topic.xsl

@@ -817,7 +817,7 @@
 								<xsl:choose>
 									<xsl:when test="@level = 1">
 										<fo:list-block provisional-distance-between-starts="8mm">
-											<xsl:if test="@type = 'annex'">
+											<xsl:if test="@type = 'annex' or (@type = 'references' and normalize-space(@section) = '')">
 												<xsl:attribute name="provisional-distance-between-starts">0mm</xsl:attribute>
 											</xsl:if>
 											<fo:list-item>
@@ -8103,6 +8103,12 @@
 		<xsl:for-each select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'attachment']">
 			<attachment filename="{@name}"/>
 		</xsl:for-each>
+		<xsl:if test="not(//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'attachment'])">
+			<xsl:for-each select="//*[local-name() = 'bibitem'][@hidden = 'true'][*[local-name() = 'uri'][@type = 'attachment']]">
+				<xsl:variable name="attachment_path" select="*[local-name() = 'uri'][@type = 'attachment']"/>
+				<attachment filename="{$attachment_path}"/>
+			</xsl:for-each>
+		</xsl:if>
 	</xsl:variable>
 	<xsl:variable name="pdfAttachmentsList" select="xalan:nodeset($pdfAttachmentsList_)"/>
 
@@ -8115,7 +8121,7 @@
 					<xsl:value-of select="concat(normalize-space(@target), '.pdf')"/>
 				</xsl:when>
 				<!-- link to the PDF attachment -->
-				<xsl:when test="$pdfAttachmentsList//attachment[@filename = current()/@target]">
+				<xsl:when test="@attachment = 'true' and $pdfAttachmentsList//attachment[@filename = current()/@target]">
 					<xsl:value-of select="concat('url(embedded-file:', @target, ')')"/>
 				</xsl:when>
 				<!-- <xsl:when test="starts-with($target_normalized, '_') and contains($target_normalized, '_attachments/') and $pdfAttachmentsList//attachment[@filename = $target_attachment_name]">
@@ -8770,7 +8776,16 @@
 		</xsl:variable>
 		<xsl:variable name="img_src">
 			<xsl:choose>
-				<xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
+				<xsl:when test="not(starts-with(@src, 'data:'))">
+					<xsl:choose>
+						<xsl:when test="@extracted = 'true'"> <!-- added in mn2pdf v1.97 -->
+							<xsl:value-of select="@src"/>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:value-of select="concat($basepath, @src)"/>
+						</xsl:otherwise>
+					</xsl:choose>
+				</xsl:when>
 				<xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
@@ -8783,7 +8798,7 @@
 		<!-- <xsl:message>width_effective=<xsl:value-of select="$width_effective"/></xsl:message>
 		<xsl:message>indent_left=<xsl:value-of select="$indent_left"/></xsl:message>
 		<xsl:message>image_width_effective=<xsl:value-of select="$image_width_effective"/> for <xsl:value-of select="ancestor::ogc:p[1]/@id"/></xsl:message> -->
-		<xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
+		<xsl:variable name="scale" select="java:org.metanorma.fop.utils.ImageUtils.getImageScale($img_src, $image_width_effective, $height_effective)"/>
 		<xsl:value-of select="$scale"/>
 	</xsl:template>
 
@@ -8802,7 +8817,14 @@
 				<xsl:value-of select="concat('url(file:///',$basepath, $src_png, ')')"/>
 			</xsl:when>
 			<xsl:when test="not(starts-with(@src, 'data:'))">
-				<xsl:value-of select="concat('url(file:///',$basepath, @src, ')')"/>
+				<xsl:choose>
+					<xsl:when test="@extracted = 'true'"> <!-- added in mn2pdf v1.97 -->
+						<xsl:value-of select="concat('url(file:///', @src, ')')"/>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:value-of select="concat('url(file:///',$basepath, @src, ')')"/>
+					</xsl:otherwise>
+				</xsl:choose>
 			</xsl:when>
 			<xsl:otherwise>
 				<xsl:value-of select="@src"/>
@@ -8824,7 +8846,14 @@
 			</xsl:when>
 			<xsl:when test="not(starts-with(@src, 'data:'))">
 				<xsl:variable name="src">
-					<xsl:value-of select="concat('url(file:///',$basepath, @src, ')')"/>
+					<xsl:choose>
+						<xsl:when test="@extracted = 'true'"> <!-- added in mn2pdf v1.97 -->
+							<xsl:value-of select="concat('url(file:///', @src, ')')"/>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:value-of select="concat('url(file:///',$basepath, @src, ')')"/>
+						</xsl:otherwise>
+					</xsl:choose>
 				</xsl:variable>
 				<xsl:variable name="file" select="java:java.io.File.new(@src)"/>
 				<xsl:variable name="bufferedImage" select="java:javax.imageio.ImageIO.read($file)"/>
@@ -13608,6 +13637,39 @@
 		</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:pdfaExtension="http://www.aiim.org/pdfa/ns/extension/" xmlns:pdfaProperty="http://www.aiim.org/pdfa/ns/property#" xmlns:pdfaSchema="http://www.aiim.org/pdfa/ns/schema#" rdf:about="">
+					<pdfaExtension:schemas>
+						<rdf:Bag>
+							<rdf:li rdf:parseType="Resource">
+								<pdfaSchema:namespaceURI>http://www.aiim.org/pdfua/ns/id/</pdfaSchema:namespaceURI>
+								<pdfaSchema:prefix>pdfuaid</pdfaSchema:prefix>
+								<pdfaSchema:schema>PDF/UA identification schema</pdfaSchema:schema>
+								<pdfaSchema:property>
+									<rdf:Seq>
+										<rdf:li rdf:parseType="Resource">
+											<pdfaProperty:category>internal</pdfaProperty:category>
+											<pdfaProperty:description>PDF/UA version identifier</pdfaProperty:description>
+											<pdfaProperty:name>part</pdfaProperty:name>
+											<pdfaProperty:valueType>Integer</pdfaProperty:valueType>
+										</rdf:li>
+										<rdf:li rdf:parseType="Resource">
+											<pdfaProperty:category>internal</pdfaProperty:category>
+											<pdfaProperty:description>PDF/UA amendment identifier</pdfaProperty:description>
+											<pdfaProperty:name>amd</pdfaProperty:name>
+											<pdfaProperty:valueType>Text</pdfaProperty:valueType>
+										</rdf:li>
+										<rdf:li rdf:parseType="Resource">
+											<pdfaProperty:category>internal</pdfaProperty:category>
+											<pdfaProperty:description>PDF/UA corrigenda identifier</pdfaProperty:description>
+											<pdfaProperty:name>corr</pdfaProperty:name>
+											<pdfaProperty:valueType>Text</pdfaProperty:valueType>
+										</rdf:li>
+									</rdf:Seq>
+								</pdfaSchema:property>
+							</rdf:li>
+						</rdf:Bag>
+					</pdfaExtension:schemas>
+				</rdf:Description>
 				<rdf:Description xmlns:pdf="http://ns.adobe.com/pdf/1.3/" xmlns:dc="http://purl.org/dc/elements/1.1/" rdf:about="">
 				<!-- Dublin Core properties go here -->
 					<dc:title>
@@ -13618,33 +13680,57 @@
 
 							</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>
+						<rdf:Alt>
+							<rdf:li xml:lang="x-default">
+								<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>
+							</rdf:li>
+						</rdf:Alt>
 					</dc:title>
-					<dc:creator>
+					<xsl:variable name="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>
+									<rdf:Seq>
+										<xsl:for-each select="*[local-name() = 'contributor'][*[local-name() = 'role']/@type='author']">
+											<rdf:li>
+												<xsl:value-of select="*[local-name() = 'organization']/*[local-name() = 'name']"/>
+											</rdf:li>
+											<!-- <xsl:if test="position() != last()">; </xsl:if> -->
+										</xsl:for-each>
+									</rdf:Seq>
 
 						</xsl:for-each>
-					</dc:creator>
-					<dc:description>
+					</xsl:variable>
+					<xsl:if test="normalize-space($dc_creator) != ''">
+						<dc:creator>
+							<xsl:copy-of select="$dc_creator"/>
+						</dc:creator>
+					</xsl:if>
+
+					<xsl:variable name="dc_description">
 						<xsl:variable name="abstract">
 
 									<xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()[not(ancestor::*[local-name() = 'title'])]"/>
 
 						</xsl:variable>
-						<xsl:value-of select="normalize-space($abstract)"/>
-					</dc:description>
+						<rdf:Alt>
+							<rdf:li xml:lang="x-default">
+								<xsl:value-of select="normalize-space($abstract)"/>
+							</rdf:li>
+						</rdf:Alt>
+					</xsl:variable>
+					<xsl:if test="normalize-space($dc_description)">
+						<dc:description>
+							<xsl:copy-of select="$dc_description"/>
+						</dc:description>
+					</xsl:if>
+
 					<pdf:Keywords>
 						<xsl:call-template name="insertKeywords">
 							<xsl:with-param name="meta">true</xsl:with-param>
@@ -13659,26 +13745,37 @@
 		</x:xmpmeta>
 		<!-- add attachments -->
 		<xsl:for-each select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'attachment']">
-			<xsl:choose>
-				<xsl:when test="normalize-space() != ''">
-					<xsl:variable name="src_attachment" select="java:replaceAll(java:java.lang.String.new(.),'(&#13;&#10;|&#13;|&#10;)', '')"/> <!-- remove line breaks -->
-					<pdf:embedded-file src="{$src_attachment}" filename="{@name}"/>
-				</xsl:when>
-				<xsl:otherwise>
-					<!-- _{filename}_attachments -->
-					<!-- <xsl:variable name="url" select="concat('url(file:///',$inputxml_basepath, '_', $inputxml_filename_prefix, '_attachments', '/', @name, ')')"/> -->
-					<xsl:variable name="url" select="concat('url(file:///',$inputxml_basepath , @name, ')')"/>
-					<pdf:embedded-file src="{$url}" filename="{@name}"/>
-				</xsl:otherwise>
-			</xsl:choose>
+			<xsl:variable name="description" select="normalize-space(//*[local-name() = 'bibitem'][@hidden = 'true'][*[local-name() = 'uri'][@type = 'attachment'] = current()/@name]/*[local-name() = 'formattedref'])"/>
+
+			<pdf:embedded-file filename="{@name}">
+				<xsl:attribute name="src">
+					<xsl:choose>
+						<xsl:when test="normalize-space() != ''">
+							<xsl:variable name="src_attachment" select="java:replaceAll(java:java.lang.String.new(.),'(&#13;&#10;|&#13;|&#10;)', '')"/> <!-- remove line breaks -->
+							<xsl:value-of select="$src_attachment"/>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:variable name="url" select="concat('url(file:///',$inputxml_basepath , @name, ')')"/>
+							<xsl:value-of select="$url"/>
+						</xsl:otherwise>
+					</xsl:choose>
+				</xsl:attribute>
+				<xsl:if test="$description != ''">
+					<xsl:attribute name="description"><xsl:value-of select="$description"/></xsl:attribute>
+				</xsl:if>
+			</pdf:embedded-file>
 		</xsl:for-each>
 		<!-- references to external attachments (no binary-encoded within the Metanorma XML file) -->
 		<xsl:if test="not(//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'attachment'])">
 			<xsl:for-each select="//*[local-name() = 'bibitem'][@hidden = 'true'][*[local-name() = 'uri'][@type = 'attachment']]">
 				<xsl:variable name="attachment_path" select="*[local-name() = 'uri'][@type = 'attachment']"/>
-				<xsl:variable name="url" select="concat('url(file:///',$inputxml_basepath, $attachment_path, ')')"/>
-				<xsl:variable name="filename_embedded" select="substring-after($attachment_path, concat('_', $inputxml_filename_prefix, '_attachments', '/'))"/>
-				<pdf:embedded-file src="{$url}" filename="{$filename_embedded}"/>
+				<xsl:variable name="url" select="concat('url(file:///',$basepath, $attachment_path, ')')"/>
+				<xsl:variable name="description" select="normalize-space(*[local-name() = 'formattedref'])"/>
+				<pdf:embedded-file src="{$url}" filename="{$attachment_path}">
+					<xsl:if test="$description != ''">
+						<xsl:attribute name="description"><xsl:value-of select="$description"/></xsl:attribute>
+					</xsl:if>
+				</pdf:embedded-file>
 			</xsl:for-each>
 		</xsl:if>
 	</xsl:template> <!-- addPDFUAmeta -->
@@ -14056,7 +14153,14 @@
 				<xsl:value-of select="$src"/>
 			</xsl:when>
 			<xsl:otherwise>
-				<xsl:value-of select="concat('url(file:///',$basepath, $src, ')')"/>
+				<xsl:choose>
+					<xsl:when test="@extracted = 'true'"> <!-- added in mn2pdf v1.97 -->
+						<xsl:value-of select="concat('url(file:///', @src, ')')"/>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:value-of select="concat('url(file:///',$basepath, $src, ')')"/>
+					</xsl:otherwise>
+				</xsl:choose>
 			</xsl:otherwise>
 		</xsl:choose>
 	</xsl:template>