RubyGems - metanorma-iso - Versions diffs - 1.5.4 → 1.5.9 - Mend

metanorma-iso 1.5.4 → 1.5.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (34) hide show

checksums.yaml +4 -4
data/lib/asciidoctor/iso/basicdoc.rng +23 -0
data/lib/asciidoctor/iso/front.rb +3 -12
data/lib/asciidoctor/iso/isodoc.rng +121 -14
data/lib/asciidoctor/iso/isostandard.rng +8 -1
data/lib/asciidoctor/iso/section.rb +0 -7
data/lib/isodoc/iso/html/isodoc.css +16 -4
data/lib/isodoc/iso/html/isodoc.scss +18 -4
data/lib/isodoc/iso/iso.amendment.xsl +802 -267
data/lib/isodoc/iso/iso.international-standard.xsl +802 -267
data/lib/isodoc/iso/isosts_convert.rb +31 -0
data/lib/isodoc/iso/xref.rb +7 -11
data/lib/metanorma-iso.rb +1 -0
data/lib/metanorma/iso/processor.rb +4 -1
data/lib/metanorma/iso/version.rb +1 -1
data/metanorma-iso.gemspec +2 -2
data/spec/asciidoctor-iso/amd_spec.rb +7 -39
data/spec/asciidoctor-iso/base_spec.rb +6 -6
data/spec/asciidoctor-iso/cleanup_spec.rb +30 -30
data/spec/asciidoctor-iso/table_spec.rb +111 -111
data/spec/isodoc/amd_spec.rb +31 -16
data/spec/isodoc/blocks_spec.rb +1 -1
data/spec/isodoc/i18n_spec.rb +17 -4
data/spec/isodoc/inline_spec.rb +1 -1
data/spec/isodoc/iso_spec.rb +5 -5
data/spec/isodoc/postproc_spec.rb +4 -1
data/spec/isodoc/ref_spec.rb +5 -2
data/spec/isodoc/section_spec.rb +2 -2
data/spec/isodoc/table_spec.rb +1 -1
data/spec/isodoc/terms_spec.rb +1 -1
data/spec/isodoc/xref_spec.rb +11 -11
data/spec/metanorma/processor_spec.rb +1 -1
data/spec/spec_helper.rb +1 -1
metadata +7 -6

data/lib/isodoc/iso/isosts_convert.rb ADDED

@@ -0,0 +1,31 @@
+require "isodoc"
+require "mn2sts"
+module IsoDoc
+  module Iso
+    # A {Converter} implementation that generates HTML output, and a document
+    # schema encapsulation of the document for validation
+    #
+    class IsoStsConvert < IsoDoc::XslfoPdfConvert
+      def initialize(options)
+        @libdir = File.dirname(__FILE__)
+        @format = :isosts
+        @suffix = "isosts.xml"
+      end
+      def convert(input_filename, file = nil, debug = false, output_filename = nil)
+        file = File.read(input_filename, encoding: "utf-8") if file.nil?
+        docxml, filename, dir = convert_init(file, input_filename, debug)
+        /\.xml$/.match(input_filename) or
+          input_filename = Tempfile.open([filename, ".xml"], encoding: "utf-8") do |f|
+          f.write file
+          f.path
+        end
+        FileUtils.rm_rf dir
+        Mn2sts.convert(input_filename, output_filename || "#{filename}.#{@suffix}", iso: true)
+      end
+    end
+  end
+end

data/lib/isodoc/iso/xref.rb CHANGED

@@ -1,20 +1,16 @@
 module IsoDoc
   module Iso
     class Xref < IsoDoc::Xref
-      def parse(docxml)
-        if @klass.amd(docxml)
-          back_anchor_names(docxml)
-          note_anchor_names(docxml.xpath(ns("//annex//table | //annex//figure")))
-          note_anchor_names(docxml.xpath(ns("//annex")))
-          example_anchor_names(docxml.xpath(ns("//annex")))
-          list_anchor_names(docxml.xpath(ns("//annex")))
+      def initial_anchor_names(d)
+        if @klass.amd(d)
+          d.xpath(ns("//preface/*")).each { |c| c.element? and preface_names(c) }
+          sequential_asset_names(d.xpath(ns("//preface/*")))
+          middle_section_asset_names(d)
+          termnote_anchor_names(d)
+          termexample_anchor_names(d)
         else
           super
         end
-      end
-      def initial_anchor_names(d)
-        super
         introduction_names(d.at(ns("//introduction")))
       end

data/lib/metanorma-iso.rb CHANGED

@@ -5,6 +5,7 @@ require_relative "isodoc/iso/html_convert"
 require_relative "isodoc/iso/word_convert"
 require_relative "isodoc/iso/pdf_convert"
 require_relative "isodoc/iso/sts_convert"
+require_relative "isodoc/iso/isosts_convert"
 require_relative "isodoc/iso/presentation_xml_convert"
 require "asciidoctor/extensions"

data/lib/metanorma/iso/processor.rb CHANGED

@@ -25,7 +25,8 @@ module Metanorma
           html_alt: "alt.html",
           doc: "doc",
           pdf: "pdf",
-          sts: "sts.xml"
+          sts: "sts.xml",
+          isosts: "iso.sts.xml"
         )
       end
@@ -50,6 +51,8 @@ module Metanorma
           IsoDoc::Iso::PdfConvert.new(options).convert(inname, isodoc_node, nil, outname)
         when :sts
           IsoDoc::Iso::StsConvert.new(options).convert(inname, isodoc_node, nil, outname)
+        when :isosts
+          IsoDoc::Iso::IsoStsConvert.new(options).convert(inname, isodoc_node, nil, outname)
         when :presentation
           IsoDoc::Iso::PresentationXMLConvert.new(options).convert(inname, isodoc_node, nil, outname)
         else

data/lib/metanorma/iso/version.rb CHANGED

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "1.5.4".freeze
+    VERSION = "1.5.9".freeze
   end
 end

data/metanorma-iso.gemspec CHANGED

@@ -31,10 +31,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency "ruby-jing"
   spec.add_dependency "isodoc", "~> 1.2.0"
-  spec.add_dependency "metanorma-standoc", "~> 1.5.0"
+  spec.add_dependency "metanorma-standoc", "~> 1.6.0"
   spec.add_dependency "tokenizer", "~> 0.3.0"
   spec.add_dependency "twitter_cldr"
-  spec.add_dependency "mn2sts", "~> 1.2.0"
+  spec.add_dependency "mn2sts", "~> 1.5.0"
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "sassc", "2.4.0"

data/spec/asciidoctor-iso/amd_spec.rb CHANGED

@@ -2,22 +2,6 @@ require "spec_helper"
 require "fileutils"
 RSpec.describe Asciidoctor::ISO do
-  it "validates amendment document against distinct ISO XML schema" do
-    FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
-  = Document title
-  Author
-  :docfile: test.adoc
-  :nodoc:
-  :no-isobib:
-  :doctype: amendment
-  [change=mid-air]
-  == Para
-  INPUT
-    expect(File.read("test.err")).to include 'value of attribute "change" is invalid; must be equal to'
-end
     it "processes amendment sections" do
     expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{AMD_BLANK_HDR}
@@ -147,22 +131,6 @@ end
 OUTPUT
     end
-      it "processes section attributes" do
-     expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-      #{AMD_BLANK_HDR}
-      [change=delete,locality="clause=introduction,paragraph=4-7",inline-header="true"]
-      == Clause 1
-     INPUT
-             #{BLANK_HDR.sub(%r{<doctype>article</doctype>}, "<doctype>amendment</doctype>")}
-       <sections><clause id="_" obligation="normative"  change="delete" locality="clause=introduction,paragraph=4-7">
-         <title>Clause 1</title>
-       </clause>
-       </sections>
-       </iso-standard>
-     OUTPUT
-  end
   it "processes default metadata, amendment" do
     expect(xmlpp(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true).sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       = Document title
@@ -215,7 +183,7 @@ OUTPUT
       :doctype: amendment
       :updates-document-type: international-standard
     INPUT
-    <iso-standard xmlns='https://www.metanorma.org/ns/iso'>
+    <iso-standard xmlns='https://www.metanorma.org/ns/iso'  type="semantic" version="#{Metanorma::ISO::VERSION}">
   <bibdata type='standard'>
     <title language='en' format='text/plain' type='main'>Introduction — Main Title — Title — Title Part — Mass fraction of
        extraneous matter, milled rice (nonglutinous), sample dividers and
@@ -330,7 +298,7 @@ Author
 :updates: ISO 17301-1:2030
 :amendment-number: 1
 INPUT
- <iso-standard xmlns='https://www.metanorma.org/ns/iso'>
+ <iso-standard xmlns='https://www.metanorma.org/ns/iso'  type="semantic" version="#{Metanorma::ISO::VERSION}">
    <bibdata type='standard'>
      <docidentifier type='ISO'>ISO 17301-1:2030/CD Amd 1</docidentifier>
      <docidentifier type='iso-with-lang'>ISO 17301-1:2030/CD Amd 1(E)</docidentifier>
@@ -398,7 +366,7 @@ Author
 :updates: ISO 17301-1:2030
 :amendment-number: 1
 INPUT
-<iso-standard xmlns='https://www.metanorma.org/ns/iso'>
+<iso-standard xmlns='https://www.metanorma.org/ns/iso'  type="semantic" version="#{Metanorma::ISO::VERSION}">
          <bibdata type='standard'>
            <docidentifier type='ISO'>ISO 17301-1:2030/DAmd 1</docidentifier>
            <docidentifier type='iso-with-lang'>ISO 17301-1:2030/DAmd 1(E)</docidentifier>
@@ -465,7 +433,7 @@ Author
 :updates: ISO 17301-1:2030
 :amendment-number: 1
 INPUT
-<iso-standard xmlns='https://www.metanorma.org/ns/iso'>
+<iso-standard xmlns='https://www.metanorma.org/ns/iso'  type="semantic" version="#{Metanorma::ISO::VERSION}">
          <bibdata type='standard'>
            <docidentifier type='ISO'>ISO 17301-1:2030/Amd 1</docidentifier>
            <docidentifier type='iso-with-lang'>ISO 17301-1:2030/Amd 1(E)</docidentifier>
@@ -533,7 +501,7 @@ Author
 :updates: ISO 17301-1:2030
 :corrigendum-number: 3
 INPUT
-<iso-standard xmlns='https://www.metanorma.org/ns/iso'>
+<iso-standard xmlns='https://www.metanorma.org/ns/iso'  type="semantic" version="#{Metanorma::ISO::VERSION}">
   <bibdata type='standard'>
     <docidentifier type='ISO'>ISO 17301-1:2030/CD Cor.3</docidentifier>
     <docidentifier type='iso-with-lang'>ISO 17301-1:2030/CD Cor.3(E)</docidentifier>
@@ -601,7 +569,7 @@ Author
 :updates: ISO 17301-1:2030
 :corrigendum-number: 3
 INPUT
-<iso-standard xmlns='https://www.metanorma.org/ns/iso'>
+<iso-standard xmlns='https://www.metanorma.org/ns/iso'  type="semantic" version="#{Metanorma::ISO::VERSION}">
   <bibdata type='standard'>
     <docidentifier type='ISO'>ISO 17301-1:2030/FDCor.3</docidentifier>
     <docidentifier type='iso-with-lang'>ISO 17301-1:2030/FDCor.3(E)</docidentifier>
@@ -668,7 +636,7 @@ Author
 :updates: ISO 17301-1:2030
 :corrigendum-number: 3
 INPUT
-<iso-standard xmlns='https://www.metanorma.org/ns/iso'>
+<iso-standard xmlns='https://www.metanorma.org/ns/iso'  type="semantic" version="#{Metanorma::ISO::VERSION}">
          <bibdata type='standard'>
            <docidentifier type='ISO'>ISO 17301-1:2030/Cor.3</docidentifier>
            <docidentifier type='iso-with-lang'>ISO 17301-1:2030/Cor.3(E)</docidentifier>

data/spec/asciidoctor-iso/base_spec.rb CHANGED

@@ -91,7 +91,7 @@ RSpec.describe Asciidoctor::ISO do
       :copyright-year: 2000
     INPUT
            <?xml version="1.0" encoding="UTF-8"?>
-       <iso-standard xmlns="https://www.metanorma.org/ns/iso">
+       <iso-standard xmlns="https://www.metanorma.org/ns/iso"  type="semantic" version="#{Metanorma::ISO::VERSION}">
        <bibdata type="standard">
    <title language="en" format="text/plain" type="main">Introduction — Main Title — Title — Title Part</title>
    <title language="en" format="text/plain" type="title-intro">Introduction</title>
@@ -173,7 +173,7 @@ RSpec.describe Asciidoctor::ISO do
   it "processes complex metadata" do
-    expect(xmlpp(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true).sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~'OUTPUT')
+    expect(xmlpp(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true).sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       = Document title
       Author
       :docfile: test.adoc
@@ -191,7 +191,7 @@ RSpec.describe Asciidoctor::ISO do
       :doctype: technical-report
     INPUT
            <?xml version="1.0" encoding="UTF-8"?>
-       <iso-standard xmlns="https://www.metanorma.org/ns/iso">
+       <iso-standard xmlns="https://www.metanorma.org/ns/iso"  type="semantic" version="#{Metanorma::ISO::VERSION}">
        <bibdata type="standard">
          <docidentifier type="ISO">ISO/IEC/IETF/TR 1000-1-1:2001</docidentifier>
          <docidentifier type='iso-with-lang'>ISO/IEC/IETF/TR 1000-1-1:2001(X)</docidentifier>
@@ -294,7 +294,7 @@ RSpec.describe Asciidoctor::ISO do
       :doctype: technical-specification
       :iteration: 2
     INPUT
-    <iso-standard xmlns="https://www.metanorma.org/ns/iso">
+    <iso-standard xmlns="https://www.metanorma.org/ns/iso"  type="semantic" version="#{Metanorma::ISO::VERSION}">
 <bibdata type="standard">
   <docidentifier type="ISO">ISO/DTS 1000.2</docidentifier>
   <docidentifier type='iso-with-lang'>ISO/DTS 1000.2(F)</docidentifier>
@@ -360,7 +360,7 @@ OUTPUT
       :docnumber: 1000
       :docstage: 60
     INPUT
-<iso-standard xmlns="https://www.metanorma.org/ns/iso">
+<iso-standard xmlns="https://www.metanorma.org/ns/iso"  type="semantic" version="#{Metanorma::ISO::VERSION}">
 <bibdata type="standard">
   <docidentifier type="ISO">ISO 1000</docidentifier>
   <docidentifier type='iso-with-lang'>ISO 1000(E)</docidentifier>
@@ -426,7 +426,7 @@ OUTPUT
       :docstage: 60
       :docsubstage: 00
     INPUT
-<iso-standard xmlns="https://www.metanorma.org/ns/iso">
+<iso-standard xmlns="https://www.metanorma.org/ns/iso"  type="semantic" version="#{Metanorma::ISO::VERSION}">
 <bibdata type="standard">
   <docidentifier type="ISO">ISO 1000</docidentifier>
   <docidentifier type='iso-with-lang'>ISO 1000(E)</docidentifier>

data/spec/asciidoctor-iso/cleanup_spec.rb CHANGED

@@ -425,9 +425,9 @@ RSpec.describe Asciidoctor::ISO do
        <sections><table id="_">
          <tbody>
            <tr>
-             <td align="left">a</td>
-             <td align="left">b</td>
-             <td align="left">c</td>
+             <td valign="top" align="left">a</td>
+             <td valign="top" align="left">b</td>
+             <td valign="top" align="left">c</td>
            </tr>
          </tbody>
        <dl id="_">
@@ -456,23 +456,23 @@ RSpec.describe Asciidoctor::ISO do
        #{BLANK_HDR}
        <sections>
              <table id="_"><thead><tr>
-             <th align="left">a</th>
-             <th align="left">b</th>
-             <th align="left">c</th>
+             <th valign="top" align="left">a</th>
+             <th valign="top" align="left">b</th>
+             <th valign="top" align="left">c</th>
            </tr><tr>
-             <th align="left">a</th>
-             <th align="left">b</th>
-             <th align="left">c</th>
+             <th valign="top" align="left">a</th>
+             <th valign="top" align="left">b</th>
+             <th valign="top" align="left">c</th>
            </tr><tr>
-             <th align="left">a</th>
-             <th align="left">b</th>
-             <th align="left">c</th>
+             <th valign="top" align="left">a</th>
+             <th valign="top" align="left">b</th>
+             <th valign="top" align="left">c</th>
            </tr></thead>
          <tbody>
            <tr>
-             <td align="left">a</td>
-             <td align="left">b</td>
-             <td align="left">c</td>
+             <td valign="top" align="left">a</td>
+             <td valign="top" align="left">b</td>
+             <td valign="top" align="left">c</td>
            </tr>
          </tbody>
        </table>
@@ -498,26 +498,26 @@ RSpec.describe Asciidoctor::ISO do
          <table id="_">
          <thead>
            <tr>
-             <th align="left">a</th>
-             <th align="left">b</th>
-             <th align="left">c</th>
+             <th valign="top" align="left">a</th>
+             <th valign="top" align="left">b</th>
+             <th valign="top" align="left">c</th>
            </tr>
          <tr>
-             <th align="left">a</th>
-             <th align="left">b</th>
-             <th align="left">c</th>
+             <th valign="top" align="left">a</th>
+             <th valign="top" align="left">b</th>
+             <th valign="top" align="left">c</th>
            </tr><tr>
-             <th align="left">a</th>
-             <th align="left">b</th>
-             <th align="left">c</th>
+             <th valign="top" align="left">a</th>
+             <th valign="top" align="left">b</th>
+             <th valign="top" align="left">c</th>
            </tr></thead>
          <tbody>
            <tr>
-             <td align="left">a</td>
-             <td align="left">b</td>
-             <td align="left">c</td>
+             <td valign="top" align="left">a</td>
+             <td valign="top" align="left">b</td>
+             <td valign="top" align="left">c</td>
            </tr>
          </tbody>
        </table>
@@ -541,9 +541,9 @@ RSpec.describe Asciidoctor::ISO do
               <sections><table id="_">
          <tbody>
            <tr>
-             <td align="left">a</td>
-             <td align="left">b</td>
-             <td align="left">c</td>
+             <td valign="top" align="left">a</td>
+             <td valign="top" align="left">b</td>
+             <td valign="top" align="left">c</td>
            </tr>
          </tbody>
        <note id="_">

data/spec/asciidoctor-iso/table_spec.rb CHANGED

@@ -17,16 +17,16 @@ RSpec.describe Asciidoctor::ISO do
          <name>Table Name</name>
          <thead>
            <tr>
-             <th align="left">A</th>
-             <th align="left">B</th>
-             <th align="left">C</th>
+             <th valign="top" align="left">A</th>
+             <th valign="top" align="left">B</th>
+             <th valign="top" align="left">C</th>
            </tr>
          </thead>
          <tbody>
            <tr>
-             <th align="left">1</th>
-             <td align="left">2</td>
-             <td align="left">3</td>
+             <th valign="top" align="left">1</th>
+             <td valign="top" align="left">2</td>
+             <td valign="top" align="left">3</td>
            </tr>
          </tbody>
        </table>
@@ -51,21 +51,21 @@ RSpec.describe Asciidoctor::ISO do
          <table id="_">
          <name>Table Name</name>
          <thead><tr>
-             <th align="left">A</th>
-             <th align="left">B</th>
-             <th align="left">C</th>
+             <th valign="top" align="left">A</th>
+             <th valign="top" align="left">B</th>
+             <th valign="top" align="left">C</th>
            </tr><tr>
-             <th align="left">1</th>
-             <th align="left">2</th>
-             <th align="left">3</th>
+             <th valign="top" align="left">1</th>
+             <th valign="top" align="left">2</th>
+             <th valign="top" align="left">3</th>
            </tr></thead>
          <tbody>
            <tr>
-             <th align="left">1</th>
-             <td align="left">2</td>
-             <td align="left">3</td>
+             <th valign="top" align="left">1</th>
+             <td valign="top" align="left">2</td>
+             <td valign="top" align="left">3</td>
            </tr>
          </tbody>
        </table>
@@ -88,21 +88,21 @@ RSpec.describe Asciidoctor::ISO do
     #{BLANK_HDR}
            <sections>
          <table id="_"><thead><tr>
-             <th align="left">A</th>
-             <th align="left">B</th>
-             <th align="left">C</th>
+             <th valign="top" align="left">A</th>
+             <th valign="top" align="left">B</th>
+             <th valign="top" align="left">C</th>
            </tr><tr>
-             <th align="left">1</th>
-             <th align="left">2</th>
-             <th align="left">3</th>
+             <th valign="top" align="left">1</th>
+             <th valign="top" align="left">2</th>
+             <th valign="top" align="left">3</th>
            </tr></thead>
          <tbody>
            <tr>
-             <th align="left">1</th>
-             <td align="left">2</td>
-             <td align="left">3</td>
+             <th valign="top" align="left">1</th>
+             <td valign="top" align="left">2</td>
+             <td valign="top" align="left">3</td>
            </tr>
          </tbody>
        </table>
@@ -148,8 +148,8 @@ RSpec.describe Asciidoctor::ISO do
          <name>Maximum permissible mass fraction of defects</name>
          <thead>
            <tr>
-             <th rowspan="2" align="left">Defect</th>
-             <th colspan="4" align="center">Maximum permissible mass fraction of defects in husked rice<br/>
+             <th rowspan="2" valign="top" align="left">Defect</th>
+             <th colspan="4" valign="top" align="center">Maximum permissible mass fraction of defects in husked rice<br/>
        <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mrow>
   <mi>w</mi>
 </mrow>
@@ -159,147 +159,147 @@ RSpec.describe Asciidoctor::ISO do
 </msub></math></stem></th>
            </tr>
          <tr>
-             <th align="left">in husked rice</th>
-             <th align="center">in milled rice (non-glutinous)</th>
-             <th align="center">in husked parboiled rice</th>
-             <th align="center">in milled parboiled rice</th>
+             <th valign="top" align="left">in husked rice</th>
+             <th valign="top" align="center">in milled rice (non-glutinous)</th>
+             <th valign="top" align="center">in husked parboiled rice</th>
+             <th valign="top" align="center">in milled parboiled rice</th>
            </tr></thead>
          <tbody>
            <tr>
-             <td align="left">Extraneous matter: organic<fn reference="a">
+             <td valign="top" align="left">Extraneous matter: organic<fn reference="a">
          <p id="_">Organic extraneous matter includes foreign seeds, husks, bran, parts of straw, etc.</p>
        </fn></td>
-             <td align="center">1,0</td>
-             <td align="center">0,5</td>
-             <td align="center">1,0</td>
-             <td align="center">0,5</td>
+             <td valign="top" align="center">1,0</td>
+             <td valign="top" align="center">0,5</td>
+             <td valign="top" align="center">1,0</td>
+             <td valign="top" align="center">0,5</td>
            </tr>
            <tr>
-             <td align="left">Extraneous matter: inorganic<fn reference="b">
+             <td valign="top" align="left">Extraneous matter: inorganic<fn reference="b">
          <p id="_">Inorganic extraneous matter includes stones, sand, dust, etc.</p>
        </fn></td>
-             <td align="center">0,5</td>
-             <td align="center">0,5</td>
-             <td align="center">0,5</td>
-             <td align="center">0,5</td>
+             <td valign="top" align="center">0,5</td>
+             <td valign="top" align="center">0,5</td>
+             <td valign="top" align="center">0,5</td>
+             <td valign="top" align="center">0,5</td>
            </tr>
            <tr>
-             <td align="left">Paddy</td>
-             <td align="center">2,5</td>
-             <td align="center">0,3</td>
-             <td align="center">2,5</td>
-             <td align="center">0,3</td>
+             <td valign="top" align="left">Paddy</td>
+             <td valign="top" align="center">2,5</td>
+             <td valign="top" align="center">0,3</td>
+             <td valign="top" align="center">2,5</td>
+             <td valign="top" align="center">0,3</td>
            </tr>
            <tr>
-             <td align="left">Husked rice, non-parboiled</td>
-             <td align="center">Not applicable</td>
-             <td align="center">1,0</td>
-             <td align="center">1,0</td>
-             <td align="center">1,0</td>
+             <td valign="top" align="left">Husked rice, non-parboiled</td>
+             <td valign="top" align="center">Not applicable</td>
+             <td valign="top" align="center">1,0</td>
+             <td valign="top" align="center">1,0</td>
+             <td valign="top" align="center">1,0</td>
            </tr>
            <tr>
-             <td align="left">Milled rice, non-parboiled</td>
-             <td align="center">1,0</td>
-             <td align="center">Not applicable</td>
-             <td align="center">1,0</td>
-             <td align="center">1,0</td>
+             <td valign="top" align="left">Milled rice, non-parboiled</td>
+             <td valign="top" align="center">1,0</td>
+             <td valign="top" align="center">Not applicable</td>
+             <td valign="top" align="center">1,0</td>
+             <td valign="top" align="center">1,0</td>
            </tr>
            <tr>
-             <td align="left">Husked rice, parboiled</td>
-             <td align="center">1,0</td>
-             <td align="center">1,0</td>
-             <td align="center">Not applicable</td>
-             <td align="center">1,0</td>
+             <td valign="top" align="left">Husked rice, parboiled</td>
+             <td valign="top" align="center">1,0</td>
+             <td valign="top" align="center">1,0</td>
+             <td valign="top" align="center">Not applicable</td>
+             <td valign="top" align="center">1,0</td>
            </tr>
            <tr>
-             <td align="left">Milled rice, parboiled</td>
-             <td align="center">1,0</td>
-             <td align="center">1,0</td>
-             <td align="center">1,0</td>
-             <td align="center">Not applicable</td>
+             <td valign="top" align="left">Milled rice, parboiled</td>
+             <td valign="top" align="center">1,0</td>
+             <td valign="top" align="center">1,0</td>
+             <td valign="top" align="center">1,0</td>
+             <td valign="top" align="center">Not applicable</td>
            </tr>
            <tr>
-             <td align="left">Chips</td>
-             <td align="center">0,1</td>
-             <td align="center">0,1</td>
-             <td align="center">0,1</td>
-             <td align="center">0,1</td>
+             <td valign="top" align="left">Chips</td>
+             <td valign="top" align="center">0,1</td>
+             <td valign="top" align="center">0,1</td>
+             <td valign="top" align="center">0,1</td>
+             <td valign="top" align="center">0,1</td>
            </tr>
            <tr>
-             <td align="left">HDK</td>
-             <td align="center">2,0<fn reference="c">
+             <td valign="top" align="left">HDK</td>
+             <td valign="top" align="center">2,0<fn reference="c">
          <p id="_">The maximum permissible mass fraction of defects shall be determined with respect to the mass fraction obtained after milling.</p>
        </fn></td>
-             <td align="center">2,0</td>
-             <td align="center">2,0<fn reference="c">
+             <td valign="top" align="center">2,0</td>
+             <td valign="top" align="center">2,0<fn reference="c">
          <p id="_">The maximum permissible mass fraction of defects shall be determined with respect to the mass fraction obtained after milling.</p>
        </fn></td>
-             <td align="center">2,0</td>
+             <td valign="top" align="center">2,0</td>
            </tr>
            <tr>
-             <td align="left">Damaged kernels</td>
-             <td align="center">4,0</td>
-             <td align="center">3,0</td>
-             <td align="center">4,0</td>
-             <td align="center">3,0</td>
+             <td valign="top" align="left">Damaged kernels</td>
+             <td valign="top" align="center">4,0</td>
+             <td valign="top" align="center">3,0</td>
+             <td valign="top" align="center">4,0</td>
+             <td valign="top" align="center">3,0</td>
            </tr>
            <tr>
-             <td align="left">Immature and/or malformed kernels</td>
-             <td align="center">8,0</td>
-             <td align="center">2,0</td>
-             <td align="center">8,0</td>
-             <td align="center">2,0</td>
+             <td valign="top" align="left">Immature and/or malformed kernels</td>
+             <td valign="top" align="center">8,0</td>
+             <td valign="top" align="center">2,0</td>
+             <td valign="top" align="center">8,0</td>
+             <td valign="top" align="center">2,0</td>
            </tr>
            <tr>
-             <td align="left">Chalky kernels</td>
-             <td align="center">5,0<fn reference="c">
+             <td valign="top" align="left">Chalky kernels</td>
+             <td valign="top" align="center">5,0<fn reference="c">
          <p id="_">The maximum permissible mass fraction of defects shall be determined with respect to the mass fraction obtained after milling.</p>
        </fn></td>
-             <td align="center">5,0</td>
-             <td align="center">Not applicable</td>
-             <td align="center">Not applicable</td>
+             <td valign="top" align="center">5,0</td>
+             <td valign="top" align="center">Not applicable</td>
+             <td valign="top" align="center">Not applicable</td>
            </tr>
            <tr>
-             <td align="left">Red kernels and red-streaked kernels</td>
-             <td align="center">12,0</td>
-             <td align="center">12,0</td>
-             <td align="center">12,0<fn reference="c">
+             <td valign="top" align="left">Red kernels and red-streaked kernels</td>
+             <td valign="top" align="center">12,0</td>
+             <td valign="top" align="center">12,0</td>
+             <td valign="top" align="center">12,0<fn reference="c">
          <p id="_">The maximum permissible mass fraction of defects shall be determined with respect to the mass fraction obtained after milling.</p>
        </fn></td>
-             <td align="center">12,0</td>
+             <td valign="top" align="center">12,0</td>
            </tr>
            <tr>
-             <td align="left">Partly gelatinized kernels</td>
-             <td align="center">Not applicable</td>
-             <td align="center">Not applicable</td>
-             <td align="center">11,0<fn reference="c">
+             <td valign="top" align="left">Partly gelatinized kernels</td>
+             <td valign="top" align="center">Not applicable</td>
+             <td valign="top" align="center">Not applicable</td>
+             <td valign="top" align="center">11,0<fn reference="c">
          <p id="_">The maximum permissible mass fraction of defects shall be determined with respect to the mass fraction obtained after milling.</p>
        </fn></td>
-             <td align="center">11,0</td>
+             <td valign="top" align="center">11,0</td>
            </tr>
            <tr>
-             <td align="left">Pecks</td>
-             <td align="center">Not applicable</td>
-             <td align="center">Not applicable</td>
-             <td align="center">4,0</td>
-             <td align="center">2,0</td>
+             <td valign="top" align="left">Pecks</td>
+             <td valign="top" align="center">Not applicable</td>
+             <td valign="top" align="center">Not applicable</td>
+             <td valign="top" align="center">4,0</td>
+             <td valign="top" align="center">2,0</td>
            </tr>
            <tr>
-             <td align="left">Waxy rice</td>
-             <td align="center">1,0<fn reference="c">
+             <td valign="top" align="left">Waxy rice</td>
+             <td valign="top" align="center">1,0<fn reference="c">
          <p id="_">The maximum permissible mass fraction of defects shall be determined with respect to the mass fraction obtained after milling.</p>
        </fn></td>
-             <td align="center">1,0</td>
-             <td align="center">1,0<fn reference="c">
+             <td valign="top" align="center">1,0</td>
+             <td valign="top" align="center">1,0<fn reference="c">
          <p id="_">The maximum permissible mass fraction of defects shall be determined with respect to the mass fraction obtained after milling.</p>
        </fn></td>
-             <td align="center">1,0</td>
+             <td valign="top" align="center">1,0</td>
            </tr>
          </tbody>
          <tfoot>
            <tr>
-             <td colspan="5" align="left">
+             <td colspan="5" valign="top" align="left">
                <p id="_">Live insects shall not be present. Dead insects shall be included in extraneous matter.</p>
              </td>
            </tr>