isodoc 1.8.1 → 1.8.3

data/spec/isodoc/xref_spec.rb

@@ -1869,7 +1869,7 @@ RSpec.describe IsoDoc do
         <title>2.</title>
             <term id='_waxy_rice'>
              <name>2.1.</name>
-              <preferred>waxy rice</preferred>
+              <preferred><strong>waxy rice</strong></preferred>
               <termnote id='note1'>
                 <name>Note 1 to entry</name>
                 <p id='_b0cb3dfd-78fc-47dd-a339-84070d947463'>
@@ -1880,7 +1880,7 @@ RSpec.describe IsoDoc do
             </term>
             <term id='_nonwaxy_rice'>
              <name>2.2.</name>
-              <preferred>nonwaxy rice</preferred>
+              <preferred><strong>nonwaxy rice</strong></preferred>
               <termnote id='note2'>
                 <name>Note 1 to entry</name>
                 <p id='_b0cb3dfd-78fc-47dd-a339-84070d947463'>
@@ -1957,7 +1957,7 @@ RSpec.describe IsoDoc do
             <title>2.</title>
             <term id='_waxy_rice'>
               <name>2.1.</name>
-              <preferred>waxy rice</preferred>
+              <preferred><strong>waxy rice</strong></preferred>
               <termnote id='note1'>
                 <name>Note 1 to entry</name>
                 <p id='_b0cb3dfd-78fc-47dd-a339-84070d947463'>
@@ -1967,7 +1967,7 @@ RSpec.describe IsoDoc do
               </termnote>
               <term id='_nonwaxy_rice'>
                 <name>2.1.1.</name>
-                <preferred>nonwaxy rice</preferred>
+                <preferred><strong>nonwaxy rice</strong></preferred>
                 <termnote id='note2'>
                   <name>Note 1 to entry</name>
                   <p id='_b0cb3dfd-78fc-47dd-a339-84070d947463'>
@@ -2046,7 +2046,7 @@ RSpec.describe IsoDoc do
         <title>2.</title>
             <term id='_waxy_rice'>
              <name>2.1.</name>
-              <preferred>waxy rice</preferred>
+              <preferred><strong>waxy rice</strong></preferred>
               <termexample id='note1'>
                 <name>EXAMPLE</name>
                 <p id='_b0cb3dfd-78fc-47dd-a339-84070d947463'>
@@ -2057,7 +2057,7 @@ RSpec.describe IsoDoc do
             </term>
             <term id='_nonwaxy_rice'>
              <name>2.2.</name>
-              <preferred>nonwaxy rice</preferred>
+              <preferred><strong>nonwaxy rice</strong></preferred>
               <termexample id='note2'>
                 <name>EXAMPLE 1</name>
                 <p id='_b0cb3dfd-78fc-47dd-a339-84070d947463'>
@@ -2134,7 +2134,7 @@ RSpec.describe IsoDoc do
             <title>2.</title>
             <term id='_waxy_rice'>
               <name>2.1.</name>
-              <preferred>waxy rice</preferred>
+              <preferred><strong>waxy rice</strong></preferred>
               <termexample id='note1'>
                 <name>EXAMPLE</name>
                 <p id='_b0cb3dfd-78fc-47dd-a339-84070d947463'>
@@ -2144,7 +2144,7 @@ RSpec.describe IsoDoc do
               </termexample>
               <term id='_nonwaxy_rice'>
                 <name>2.1.1.</name>
-                <preferred>nonwaxy rice</preferred>
+                <preferred><strong>nonwaxy rice</strong></preferred>
                 <termexample id='note2'>
                   <name>EXAMPLE 1</name>
                   <p id='_b0cb3dfd-78fc-47dd-a339-84070d947463'>
@@ -2317,7 +2317,7 @@ RSpec.describe IsoDoc do
               </title>
               <term id='J'>
                 <name>3.1.1.</name>
-                <preferred>Term2</preferred>
+                <preferred><strong>Term2</strong></preferred>
               </term>
             </terms>
             <definitions id='K'>
@@ -2800,6 +2800,77 @@ RSpec.describe IsoDoc do
       .to be_equivalent_to xmlpp(output)
   end
 
+  it "cross-references definition list terms that are stem expressions" do
+    input = <<~INPUT
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+      <preface>
+      <foreword>
+      <p>
+      <xref target="N1"/>
+      </p>
+      </foreword>
+      <introduction id="intro">
+      <dl id="N01">
+      <dt id="N1"><stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mrow><mover accent="true"><mrow><mi>e</mi></mrow><mo>^</mo></mover></mrow><mrow><mi>r</mi></mrow></msub></math></stem>
+      <index><primary>
+      <stem type="MathML">
+        <math xmlns="http://www.w3.org/1998/Math/MathML">
+          <msub>
+            <mrow>
+              <mover accent="true">
+                <mrow>
+                  <mi>e</mi>
+                </mrow>
+                <mo>^</mo>
+              </mover>
+            </mrow>
+            <mrow>
+              <mi>r</mi>
+            </mrow>
+          </msub>
+        </math>
+      </stem>
+      </primary></index></dt><dd>
+      <p id="_543e0447-dfc6-477e-00cb-1738d6853190"><stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mi>r</mi></math></stem>-direction</p>
+      </dd>
+            </dl>
+                </clause>
+                </annex>
+                </iso-standard>
+    INPUT
+    output = <<~OUTPUT
+      <foreword displayorder='1'>
+        <p>
+     <xref target='N1'>
+     Introduction, Definition List: 
+     <stem type='MathML'>
+       <math xmlns='http://www.w3.org/1998/Math/MathML'>
+         <msub>
+           <mrow>
+             <mover accent='true'>
+               <mrow>
+                 <mi>e</mi>
+               </mrow>
+               <mo>^</mo>
+             </mover>
+           </mrow>
+           <mrow>
+             <mi>r</mi>
+           </mrow>
+         </msub>
+       </math>
+       <!-- (hat e)_((r)) -->
+     </stem>
+   </xref>
+        </p>
+      </foreword>
+    OUTPUT
+    expect(xmlpp(Nokogiri::XML(IsoDoc::PresentationXMLConvert.new({})
+      .convert("test", input, true))
+      .at("//xmlns:foreword").to_xml))
+      .to be_equivalent_to xmlpp(output)
+  end
+
   it "cross-references bookmarks" do
     input = <<~INPUT
           <iso-standard xmlns="http://riboseinc.com/isoxml">

data/spec/isodoc/xslfo_convert_spec.rb

@@ -61,4 +61,39 @@ RSpec.describe IsoDoc do
     expect(convert.pdf_options(nil))
       .to eq({ "--param baseassetpath=" => "ABC" })
   end
+
+  it "test pdf encryption options" do
+    convert = IsoDoc::XslfoPdfConvert.new(
+      {
+        pdfencryptionlength: "a",
+        pdfownerpassword: "b",
+        pdfuserpassword: "c",
+        pdfallowprint: "d",
+        pdfallowcopycontent: "e",
+        pdfalloweditcontent: "f",
+        pdfalloweditannotations: "g",
+        pdfallowfillinforms: "h",
+        pdfallowaccesscontent: "i",
+        pdfallowassembledocument: "j",
+        pdfallowprinthq: "k",
+        pdfencryptmetadata: "l",
+      },
+    )
+
+    expect(convert.pdf_options(nil))
+      .to eq({
+               "--allow-access-content" => "i",
+               "--allow-assemble-document" => "j",
+               "--allow-copy-content" => "e",
+               "--allow-edit-annotations" => "g",
+               "--allow-edit-content" => "f",
+               "--allow-fill-in-forms" => "h",
+               "--allow-print" => "d",
+               "--allow-print-hq" => "k",
+               "--encrypt-metadata" => "l",
+               "--encryption-length" => "a",
+               "--owner-password" => "b",
+               "--user-password" => "c",
+             })
+  end
 end

data/spec/spec_helper.rb

@@ -31,7 +31,7 @@ end
 
 def metadata(hash)
   Hash[hash.sort].delete_if do |_k, v|
-    v.nil? || v.respond_to?(:empty?) && v.empty?
+    v.nil? || (v.respond_to?(:empty?) && v.empty?)
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-04 00:00:00.000000000 Z
+date: 2021-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -193,19 +193,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: debug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '9.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '9.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
@@ -532,7 +532,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: Convert documents in IsoDoc into Word and HTML in AsciiDoc.