asciidoctor-iso 0.0.1 → 0.6.0

data/lib/asciidoctor/iso/validate.make.sh

@@ -0,0 +1,8 @@
+if [[ ! -d jing-trang ]]; then
+  git clone https://github.com/relaxng/jing-trang.git
+fi
+cd jing-trang
+./ant
+cd ..
+java -jar jing-trang/build/trang.jar -I rnc -O rng validate.rnc validate.rng
+

data/lib/asciidoctor/iso/validate.rb

@@ -1,37 +1,208 @@
+require "asciidoctor/iso/utils"
+require_relative './validate_style.rb'
 require "nokogiri"
+require "jing"
+require "pp"
 
 module Asciidoctor
   module ISO
     module Validate
-      class << self
-        def title_validate(root)
-          if root.at("//title_en/title_intro").nil? &&
-              !root.at("//title_fr/title_intro").nil?
-            warn "No English Title Intro!"
-          end
-          if !root.at("//title_en/title_intro").nil? &&
-              root.at("//title_fr/title_intro").nil?
-            warn "No French Title Intro!"
-          end
-          if root.at("//title_en/title_part").nil? &&
-              !root.at("//title_fr/title_part").nil?
-            warn "No English Title Part!"
-          end
-          if !root.at("//title_en/title_part").nil? &&
-              root.at("//title_fr/title_part").nil?
-            warn "No French Title Part!"
-          end
+
+      def title_intro_validate(root)
+        title_intro_en = root.at("//title[@language='en']/title-intro")
+        title_intro_fr = root.at("//title[@language='fr']/title-intro")
+        if title_intro_en.nil? && !title_intro_fr.nil?
+          warn "No English Title Intro!"
+        end
+        if !title_intro_en.nil? && title_intro_fr.nil?
+          warn "No French Title Intro!"
         end
+      end
+
+      def title_part_validate(root)
+        title_part_en = root.at("//title[@language='en']/title-part")
+        title_part_fr = root.at("//title[@language='fr']/title-part")
+        if title_part_en.nil? && !title_part_fr.nil?
+          warn "No English Title Part!"
+        end
+        if !title_part_en.nil? && title_part_fr.nil?
+          warn "No French Title Part!"
+        end
+      end
+
+      def title_names_type_validate(root)
+        doctypes = /International\sStandard | Technical\sSpecification |
+        Publicly\sAvailable\sSpecification | Technical\sReport | Guide /xi
+        title_main_en = root.at("//title[@language='en']/title-main")
+        if doctypes.match? title_main_en.text
+          warn "Main Title may name document type"
+        end
+        title_intro_en = root.at("//title[@language='en']/title-intro")
+        if !title_intro_en.nil? && doctypes.match?(title_intro_en.text)
+          warn "Part Title may name document type"
+        end
+      end
+
+      def title_validate(root)
+        title_intro_validate(root)
+        title_part_validate(root)
+        title_names_type_validate(root)
+      end
+
+      def onlychild_clause_validate(root)
+        q = "//subsection"
+        root.xpath(q).each do |c|
+          next unless c.xpath("../subsection").size == 1
+          title = c.at("./title")
+          location = if c["id"].nil? && title.nil?
+                       c.text[0..60] + "..."
+                     else
+                       c["id"]
+                     end
+          location += ":#{title.text}" unless title.nil?
+          warn "ISO style: #{location}: subsection is only child"
+        end
+      end
+
+      def foreword_validate(root)
+        f = root.at("//content[title = 'Foreword']")
+        s = f.at("./subsection")
+        warn "ISO style: foreword contains subsections" unless s.nil?
+      end
+
+      def normref_validate(root)
+        f = root.at("//references[title = 'Normative References']")
+        f.at("./references") and
+          warn "ISO style: normative references contains subsections"
+      end
 
-        def validate(doc)
-          filename = File.join(File.dirname(__FILE__), "validate.rng")
-          schema = Nokogiri::XML::RelaxNG(File.read(filename))
-          title_validate(doc.root)
-          schema.validate(doc).each do |error|
-            warn "RELAXNG Validation: #{error.message}"
+      def symbols_validate(root)
+        f = root.at("//clause[title = 'Symbols and Abbreviations']") 
+        return if f.nil?
+        f.elements do |e|
+          unless e.name == "dl"
+            warn "ISO style: Symbols and Abbreviations can only contain "\
+              "a definition list"
+            return
           end
         end
       end
+
+      def seqcheck(names, msg, accepted)
+        n = names.shift
+        unless accepted.include? n
+          warn "ISO style: #{msg}"
+          names = []
+        end
+        names
+      end
+
+      # spec of permissible section sequence
+      SEQ = [
+        {
+          msg: "Initial section must be (content) Foreword",
+          val:  [{ tag: "content", title: "Foreword" }],
+        },
+        {
+          msg: "Prefatory material must be followed by (clause) Scope",
+          val:  [{ tag: "content", title: "Introduction" },
+                 { tag: "clause", title: "Scope" }],
+        },
+        {
+          msg: "Prefatory material must be followed by (clause) Scope",
+          val: [{ tag: "clause", title: "Scope" }],
+        },
+        {
+          msg: "Scope must be followed by Normative References",
+          val: [{ tag: "references", title: "Normative References" }]
+        },
+        { 
+          msg: "Normative References must be followed by "\
+          "Terms and Definitions",
+          val: [
+            { tag: "terms", title: "Terms and Definitions" },
+            { tag: "terms", 
+              title: "Terms, Definitions, Symbols and Abbreviations" }
+          ]
+        },
+      ]
+
+      def sections_sequence_validate(root)
+        f = root.xpath(" //sections/content | //sections/terms | "\
+                       "//sections/clause | //sections/references | "\
+                       "//sections/annex")
+        names = f.map { |s| { tag: s.name, title: s.at("./title").text } }
+        names = seqcheck(names, SEQ[0][:msg], SEQ[0][:val]) or return
+        n = names[0]
+        names = seqcheck(names, SEQ[1][:msg], SEQ[1][:val]) or return
+        if n == { tag: "content", title: "Introduction" }
+          names = seqcheck(names, SEQ[2][:msg], SEQ[2][:val]) or return
+        end
+        names = seqcheck(names, SEQ[3][:msg], SEQ[3][:val]) or return
+        names = seqcheck(names, SEQ[4][:msg], SEQ[4][:val]) or return
+        n = names.shift
+        if n == { tag: "clause", title: "Symbols and Abbreviations" }
+          n = names.shift or return
+        end
+        n[:tag] == "clause" or
+          warn "ISO style: Document must contain at least one clause"
+        n == { tag: "clause", title: "Scope" } and
+          warn "ISO style: Scope must occur before Terms and Definitions"
+        n = names.shift or return
+        while n[:tag] == "clause"
+          n[:title] == "Scope" and
+            warn "ISO style: Scope must occur before Terms and Definitions"
+          n[:title] == "Symbols and Abbreviations" and
+            warn "ISO style: Symbols and Abbreviations must occur "\
+            "right after Terms and Definitions"
+          n = names.shift or return
+        end
+        unless n[:tag] == "annex" or n[:tag] == "references"
+          warn "ISO style: Only annexes and references can follow clauses"
+        end
+        while n[:tag] == "annex"
+          n = names.shift or return
+        end
+        n == { tag: "references", title: "Bibliography" } or
+          warn "ISO style: Final section must be (references) Bibliography"
+        names.empty? or
+          warn "ISO style: There are sections after the final Bibliography"
+      end
+
+      def iso8601_validate(root)
+        root.xpath("//review/@date | //revision-date").each do |d|
+          /^\d{8}(T\d{4,6})?$/.match? d.text or
+            warn "ISO style: #{d.text} is not an ISO 8601 date"
+        end
+      end
+
+      def content_validate(doc)
+        title_validate(doc.root)
+        foreword_validate(doc.root)
+        normref_validate(doc.root)
+        symbols_validate(doc.root)
+        iso8601_validate(doc.root)
+        onlychild_clause_validate(doc.root)
+        sections_sequence_validate(doc.root)
+      end
+
+      def schema_validate(doc, filename)
+        File.open(".tmp.xml", "w") { |f| f.write(doc.to_xml) }
+        begin
+          errors = Jing.new(filename).validate(".tmp.xml")
+        rescue Jing::Error => e
+          abort "what what what #{e}"
+        end
+        warn "Valid!" if errors.none?
+        errors.each do |error|
+          warn "#{error[:message]} @ #{error[:line]}:#{error[:column]}"
+        end
+      end
+
+      def validate(doc)
+        content_validate(doc)
+        schema_validate(doc, File.join(File.dirname(__FILE__), "isostandard.rng"))
+      end
     end
   end
 end

data/lib/asciidoctor/iso/validate_style.rb

@@ -0,0 +1,175 @@
+require "asciidoctor/iso/utils"
+require "nokogiri"
+require "jing"
+require "pp"
+
+module Asciidoctor
+  module ISO
+    module Validate
+
+      REQUIREMENT_RE_STR = <<~REGEXP
+        \\b
+         ( shall | (is|are)_to |
+           (is|are)_required_(not_)?to |
+           has_to |
+           only\\b[^.,]+\\b(is|are)_permitted |
+           it_is_necessary |
+           (needs|need)_to |
+           (is|are)_not_(allowed | permitted |
+                         acceptable | permissible) |
+           (is|are)_not_to_be |
+           (need|needs)_not |
+           do_not )
+        \\b
+      REGEXP
+      REQUIREMENT_RE =
+        Regexp.new(REQUIREMENT_RE_STR.gsub(/\s/, "").gsub(/_/, "\\s"),
+                   Regexp::IGNORECASE)
+
+      def requirement(text)
+        text.split(/\.\s+/).each do |t|
+          return t if REQUIREMENT_RE.match? t
+        end
+        nil
+      end
+
+      RECOMMENDATION_RE_STR = <<~REGEXP
+        \\b
+            should |
+            ought_(not_)?to |
+            it_is_(not_)?recommended_that
+        \\b
+      REGEXP
+      RECOMMENDATION_RE =
+        Regexp.new(RECOMMENDATION_RE_STR.gsub(/\s/, "").gsub(/_/, "\\s"),
+                   Regexp::IGNORECASE)
+
+      def recommendation(text)
+        text.split(/\.\s+/).each do |t|
+          return t if RECOMMENDATION_RE.match? t
+        end
+        nil
+      end
+
+      PERMISSION_RE_STR = <<~REGEXP
+        \\b
+             may |
+            (is|are)_(permitted | allowed | permissible ) |
+            it_is_not_required_that |
+            no\\b[^.,]+\\b(is|are)_required
+        \\b
+      REGEXP
+      PERMISSION_RE =
+        Regexp.new(PERMISSION_RE_STR.gsub(/\s/, "").gsub(/_/, "\\s"),
+                   Regexp::IGNORECASE)
+
+      def permission(text)
+        text.split(/\.\s+/).each do |t|
+          return t if PERMISSION_RE.match? t
+        end
+        nil
+      end
+
+      POSSIBILITY_RE_STR = <<~REGEXP
+        \\b
+           can | cannot | be_able_to |
+           there_is_a_possibility_of |
+           it_is_possible_to | be_unable_to |
+           there_is_no_possibility_of |
+           it_is_not_possible_to
+        \\b
+      REGEXP
+      POSSIBILITY_RE =
+        Regexp.new(POSSIBILITY_RE_STR.gsub(/\s/, "").gsub(/_/, "\\s"),
+                   Regexp::IGNORECASE)
+
+      def posssibility(text)
+        text.split(/\.\s+/).each do |t|
+          return t if POSSIBILITY_RE.match? t
+        end
+        nil
+      end
+
+      def external_constraint(text)
+        text.split(/\.\s+/).each do |t|
+          return t if /\b(must)\b/xi.match? t
+        end
+        nil
+      end
+
+      def style_no_guidance(node, text, docpart)
+        r = requirement(text)
+        style_warning(node, "#{docpart} may contain requirement", r) if r
+        r = permission(text)
+        style_warning(node, "#{docpart} may contain permission", r) if r
+        r = recommendation(text)
+        style_warning(node, "#{docpart} may contain recommendation", r) if r
+      end
+
+      def foreword_style(node, text)
+        style_no_guidance(node, text, "Foreword")
+      end
+
+      def scope_style(node, text)
+        style_no_guidance(node, text, "Scope")
+      end
+
+      def introduction_style(node, text)
+        r = requirement(text)
+        style_warning(node, "Introduction may contain requirement", r) if r
+      end
+
+      def termexample_style(node, text)
+        style_no_guidance(node, text, "Term Example")
+        style(node, text)
+      end
+
+      def note_style(node, text)
+        style_no_guidance(node, text, "Note")
+        style(node, text)
+      end
+
+      def footnote_style(node, text)
+        style_no_guidance(node, text, "Footnote")
+        style(node, text)
+      end
+
+      def style_warning(node, msg, text)
+        w = "ISO style: WARNING (#{Utils::current_location(node)}): #{msg}"
+        w += ": #{text}" if text
+        warn w
+      end
+
+      # style check with a single regex
+      def style_single_regex(n, text, re, warning)
+        m = re.match(text) and style_warning(n, warning, m[:num])
+      end
+
+      # style check with a regex on a token
+      # and a negative match on its preceding token
+      def style_two_regex_not_prev(n, text, re, re_prev, warning)
+        return if text.nil?
+        words = text.split(/\W+/).each_index do |i|
+          next if i == 0
+          m = re.match text[i]
+          m_prev = re_prev.match text[i - 1]
+          if !m.nil? && m_prev.nil?
+            style_warning(n, warning, m[:num])
+          end
+        end
+      end
+
+      def style(n, text)
+        style_single_regex(n, text, /\b(?<num>[0-9]+\.[0-9]+)\b/,
+                           "possible decimal point")
+        style_two_regex_not_prev(n, text, /^(?<num>[0-9]{4,})$/,
+                                 %r{(\bISO|\bIEC|\bIEEE|/)$},
+                                 "number not broken up in threes")
+        style_single_regex(n, text, /\b(?<num>[0-9.,]+%)/,
+                           "no space before percent sign")
+        style_single_regex(n, text, /\b(?<num>[0-9.,]+ \u00b1 [0-9,.]+ %)/,
+                           "unbracketed tolerance before percent sign")
+      end
+    end
+  end
+end

data/lib/asciidoctor/iso/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module ISO
-    VERSION = "0.0.1".freeze
+    VERSION = "0.6.0".freeze
   end
 end

data/spec/examples/rice.adoc

@@ -11,11 +11,11 @@
 :title-main-en: Specifications and test methods
 :title-part-en: Rice
 :title-intro-fr: Céréales et légumineuses
-:title-main-fr: Spécification et éthodes d'essai
+:title-main-fr: Spécification et méthodes d'essai
 :title-part-fr: Riz
 :doctype: international-standard
-:docstage: 60
-:docsubstage: 60
+:docstage: 30
+:docsubstage: 92
 :technical-committee-number: 34
 :technical-committee: Food products
 :subcommittee-number: 4
@@ -23,7 +23,7 @@
 :workgroup-number: 3
 :workgroup: Rice Group
 :toc:
-:sectnumlevels: 9
+:sectnumlevels: 7
 :stem:
 :xrefstyle: short
 :appendix-caption: Annex
@@ -33,7 +33,8 @@
 :example-caption: Figure
 
 .Foreword 
-ISO (the International Organization for Standardization) is a worldwide federation of national standards bodies (ISO member bodies). The work of preparing International Standards is normally carried out through ISO technical committees. Each member body interested in a subject for which a technical committee has been established has the right to be represented on that committee. International organizations, governmental and non-governmental, in liaison with ISO, also take part in the work. ISO collaborates closely with the International Electrotechnical Commission (IEC) on all matters of electrotechnical standardization.
+ISO (the International Organization for Standardization) 
+is a worldwide federation of national standards bodies (ISO member bodies). The work of preparing International Standards is normally carried out through ISO technical committees. Each member body interested in a subject for which a technical committee has been established has the right to be represented on that committee. International organizations, governmental and non-governmental, in liaison with ISO, also take part in the work. ISO collaborates closely with the International Electrotechnical Commission (IEC) on all matters of electrotechnical standardization.
 
 The procedures used to develop this document and those intended for its further maintenance are described in the ISO/IEC Directives, Part 1. In particular the different approval criteria needed for the different types of ISO documents should be noted. This document was drafted in accordance with the editorial rules of the ISO/IEC Directives, Part 2 (see www.iso.org/directives).
 
@@ -72,6 +73,7 @@ ISO takes no position concerning the evidence, validity and scope of this patent
 
 The holder of this patent right has assured ISO that he/she is willing to negotiate licences under reasonable and non-discriminatory terms and conditions with applicants throughout the world. In this respect, the statement of the holder of this patent right is registered with ISO. Information may be obtained from: 
 
+[align=left]
 Vache Equipment +
 Fictitious +
 World +
@@ -134,7 +136,7 @@ rice retaining its husk after threshing
 _paddy_ (<<paddy>>) from which the husk only has been removed 
 
 [.source]
-<<ISO7301>>, 3.2, modified The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here
+<<ISO7301>>, 3.2, The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here
 
 === milled rice 
 [alt]#white rice#
@@ -246,10 +248,12 @@ The mass fraction of extraneous matter and defective kernels in husked and mille
 
 NOTE: Lower mass fractions of moisture are sometimes needed for certain destinations depending on the climate, duration of transport and storage. For further details, see <<ISO6322-1>>, <<ISO6322-2>> and <<ISO6322-3>>.
 
+==== {blank}
+
 The defect tolerance for the categories considered, and determined in accordance with the method given in <<AnnexA>>, shall not exceed the limits given in <<table1>>. 
 
 [#table1]
-[cols="<,^,^,^,^",options="footer"]
+[cols="<,^,^,^,^",options="header,footer",headerrows=2]
 .Maximum permissible mass fraction of defects
 |===
 .2+|Defect 4+^| Maximum permissible mass fraction of defects in husked rice +
@@ -275,13 +279,14 @@ stem:[w_max]
 | Waxy rice | 1,0 footnoteref:[defectsmass] | 1,0 | 1,0 footnoteref:[defectsmass] | 1,0
 
 5+a| Live insects shall not be present. Dead insects shall be included in extraneous matter.
+|===
 
 NOTE: This table is based on <<ISO7301>>, Table 1.
 
 NOTE: Some commercial contracts require information in addition to that provided in this table.
 
 NOTE: Only full red husked (cargo) rice is considered in this table.
-|===
+
 
 [[clause5]]
 == Sampling 
@@ -368,15 +373,15 @@ For each test method, the test report shall specify the following:
 
 The packaging shall not transmit any odour or flavour to the product and shall not contain substances which may damage the product or constitute a health risk. 
 
-If bags are used, they shall comply with the requirements of <<ISO8531-1>>, Clause 9, or <<ISO8351-2>, as appropriate. 
+If bags are used, they shall comply with the requirements of <<ISO8531-1>>, Clause 9, or <<ISO8351-2>>, as appropriate. 
 
 == Marking 
 
 The packages shall be marked or labelled as required by the country of destination. 
 
 [[AnnexA]]
-[appendix]
-== Determination of defects (normative)
+[appendix,subtype=normative]
+== Determination of defects
 
 // "normative" follows title
 === Principle 
@@ -387,27 +392,33 @@ Extraneous matter, broken kernels, damaged kernels and other kinds of rice are s
 
 The usual laboratory apparatus and, in particular, the following. 
 
-// inline
+[%inline-header]
 [[AnnexA-2-1]]
 ==== Sample divider, 
 
 consisting of a conical sample divider or multiple-slot sample divider with a distribution system, e.g. "Split-it-right" sample divider, such as that shown in <<figureA-1>>. 
 
+[%inline-header]
 ==== Sieve, 
 
 with round perforations of diameter 1,4 mm. 
 
+[%inline-header]
 ==== Tweezers. 
 
+[%inline-header]
 ==== Scalpel. 
 
+[%inline-header]
 ==== Paintbrush. 
 
+[%inline-header]
 [[AnnexA-2-6]]
 ==== Steel bowls, 
 
 of diameter 100 mm ± 5 mm; seven per test sample. 
 
+[%inline-header]
 ==== Balance, 
 
 which can be read to the nearest 0,01 g. 
@@ -427,11 +438,11 @@ All parts of kernels which get stuck in the perforations of a sieve should be co
 
 [[figureA-1]]
 .Split-it-right sample divider
-image::splititright.gif[]
+image::rice_images/rice_image1.png[]
 
 === Determination 
 
-Weigh, to the nearest 0,1 g, one of the test samples obtained in accordance with <<AnnexA-4-1>> and separate the different defects into the bowls (<<AnnexA-2-6>>). When a kernel has several defects, classify it in the defect category for which the maximum permissible value is the lowest (see <<table1>). 
+Weigh, to the nearest 0,1 g, one of the test samples obtained in accordance with <<AnnexA-4-1>> and separate the different defects into the bowls (<<AnnexA-2-6>>). When a kernel has several defects, classify it in the defect category for which the maximum permissible value is the lowest (see <<table1>>). 
 
 Weigh, to the nearest 0,01 g, the fractions so obtained. 
 
@@ -442,7 +453,7 @@ Express the mass fraction of each defect using Formula (<<formulaA-1>>):
 [[formulaA-1,A.1]]
 [stem]
 ++++
-w = m_D/m_s 
+w = (m_D) / (m_s)
 ++++
 
 where 
@@ -457,7 +468,7 @@ Report the results as specified in <<clause7>>.
 
 [[AnnexB]]
 [appendix]
-== Determination of the waxy rice content of parboiled rice (informative)
+== Determination of the waxy rice content of parboiled rice
 
 === Principle 
 
@@ -467,32 +478,39 @@ Waxy rice kernels have a reddish brown colour when stained in an iodine solution
 
 The usual laboratory apparatus and, in particular, the following. 
 
+[%inline-header]
 [[AnnexB-2-1]]
 ==== Balance, 
 
 capable of weighing to the nearest 0,01 g. 
 
+[%inline-header]
 [[AnnexB-2-2]]
 ==== Glass beaker, 
 
 of capacity 250 ml. 
 
+[%inline-header]
 [[AnnexB-2-3]]
 ==== Small white colour bowls, 
 
 or any white colour container of a suitable size.
 
+[%inline-header]
 [[AnnexB-2-4]]
 ==== Wire sieve, 
 
 with long rounded apertures of (1 mm stem:[{:(+0.02),(0):}] mm) &times; (20 mm stem:[{:(+2),(-1):}] mm). 
 
+[%inline-header]
 [[AnnexB-2-5]]
 ==== Stirrer rod. 
 
+[%inline-header]
 [[AnnexB-2-6]]
 ==== Tweezers or forceps. 
 
+[%inline-header]
 [[AnnexB-2-7]]
 ==== Tissue paper. 
 
@@ -500,16 +518,19 @@ with long rounded apertures of (1 mm stem:[{:(+0.02),(0):}] mm) &times; (20 mm s
 
 WARNING: Direct contact of iodine with skin can cause lesions so care should be taken in handling iodine. Iodine vapour is very irritating to eyes and mucous membranes. 
 
+[%inline-header]
 [[AnnexB-3-1]]
 ==== Deionized water, 
 
 Grade 3 quality as specified in <<ISO3696>>.
 
+[%inline-header]
 [[AnnexB-3-2]]
 ==== Iodine stock solution, 
 
 containing a mass fraction of 4,1 % iodine and 6,3 % potassium iodide in deionized water such as Lugols.footnote:[Lugols is an example of a suitable product available commercially. This information is given for the convenience of users of this document and does not constitute an endorsement by ISO of this product.] 
 
+[%inline-header]
 [[AnnexB-3-3]]
 ==== Iodine working solution, 
 
@@ -546,7 +567,7 @@ Calculate the mass fraction, expressed as a percentage, of the waxy rice, stem:[
 [[formulaB-1,B.1]]
 [stem]
 ++++
-w_(wax) = m_1/(m_1 + m_2) xx 100
+w_(wax) = (m_1) / (m_1 + m_2) xx 100
 ++++
 
 where 
@@ -559,15 +580,15 @@ stem:[m_2]:: is the mass, expressed in grams, of the non-waxy rice portion.
 Report the results as specified in <<clause7>>, giving the results calculated using Formula (<<formulaB-1>>). 
 
 [[AnnexC]]
-[appendix]
-== Gelatinization (informative) 
+[appendix,subtype=informative]
+== Gelatinization
 
 <<figureC-1>> gives an example of a typical gelatinization curve. <<figureC-2>> shows the three stages of gelatinization. 
 
 [[figureC-1]]
 .Typical gelatinization curve
 // Footnote macro cannot contain stem macro!
-image::figc1.gif[] 
+image::rice_images/rice_image2.png[] 
 footnote:[The time stem:[t_90] was estimated to be 18,2 min for this example.]
 
 *Key*
@@ -583,19 +604,19 @@ NOTE: These results are based on a study carried out on three different types of
 .Stages of gelatinization
 ====
 .Initial stages: No grains are fully gelatinized (ungelatinized starch granules are visible inside the kernels)
-image::figc2a.gif[]
+image::rice_images/rice_image3_1.png[]
 
 .Intermediate stages: Some fully gelatinized kernels are visible
-image::figc2b.gif[]
+image::rice_images/rice_image3_2.png[]
 
 .Final stages: All kernels are fully gelatinized
-image::fig2c.gif[]
+image::rice_images/rice_image3_3.png[]
 
 ====
 
 [[AnnexD]]
 [appendix]
-== Results of interlaboratory test for husked rice yields (informative) 
+== Results of interlaboratory test for husked rice yields
 
 An interlaboratory test <<ref15>> was carried out by the ENR [Rice Research Centre (Italy)] in accordance with <<ISO5725-1>> and <<ISO5725-2>>, with the participation of 15 laboratories. Each laboratory carried out three determinations on four different types of kernel. The statistical results are shown in <<tableD-1>>.