Merge pull request #42 from CourseOrchestra/fit_images_without_width

Added fit width for images without width

Author: anlug1

lib/a-od-producer/asciidoctor-od.rb

@@ -106,6 +106,9 @@
 $aodp_sn_index_2 = "Index_20_2"
 $aodp_sn_index_3 = "Index_20_3"
 $aodp_sn_alphabetical_index_pagenum = "Alphabetical_20_Index_20_Pagenum"
+$aodp_assume_src_dpi = 130
+$aodp_list_first_level_indent = "12.7mm"
+$aodp_list_other_levels_indent = "6.4mm"
 
 =begin
 tag::algorithm_description[]
@@ -649,6 +652,8 @@ def h_svg_width_height
       img_ew = @snr.match(re)[1]
     end
 
+
+
     re = / ip_t_([a-z]+) /
     type = @snr.match(re)[1]
 
@@ -665,14 +670,32 @@ def h_svg_width_height
     end
 
     re = / ip_sd_([0-9]+) /
-    srcdpi = 100 # assume image is 100dpi
+    srcdpi = $aodp_assume_src_dpi
     srcdpi = @snr.match(re)[1].to_f if !!(@snr =~ re)
 
     re = / ip_su_([a-z]+) /
     svgunit = 'px'
     svgunit = @snr.match(re)[1] if !!(@snr =~ re)
 
-    if !!(@snr !~ / ip_fr_/)
+    # if guessing then use fictrect strategy with a 100% square minus list indent
+    # todo should count 100% from parent inner width
+    guess_width = false
+    if !!(@snr !~ / ip_fr_/) && !!(@snr !~ / ip_w_[0-9]/)
+      list_level = 0
+      re = / in_list_item_([0-9]) /
+      list_level = @snr.match(re)[1].to_f if !!(@snr =~ re)
+      list_first_level_indent_mm = MiscMethods.text_measurement_to_mm $aodp_list_first_level_indent
+      list_other_levels_indent_mm = MiscMethods.text_measurement_to_mm $aodp_list_other_levels_indent
+      rect_w = $aodp_100_percent_mm
+      rect_h = $aodp_100_percent_mm
+      if list_level > 0
+        rect_w = rect_w - list_first_level_indent_mm - (list_level - 1) *  list_other_levels_indent_mm
+      end
+      guess_width = true
+    end
+
+
+    if !!(@snr !~ / ip_fr_/) && !guess_width
       re = /([0-9\.]+)([a-z_]+)/
       img_cw = img_ew.match(re)[1].to_f
       img_cunit = img_ew.match(re)[2]

lib/a-od-producer/misc.rb

@@ -1,4 +1,14 @@
 class MiscMethods
+  def self.text_measurement_to_mm text_measurement
+    re = /^([0-9]+[\.]?[0-9]*)([a-z]+)$/
+    if  !!(text_measurement =~ re)
+      measurement = text_measurement.match(re)[1].to_f
+      unit = text_measurement.match(re)[2]
+    else
+      raise "\"#{text_measurement}\" is not a text measurement value"
+    end
+    measurement_to_mm measurement, unit
+  end
   def self.measurement_to_mm measurement, unit
     coef = {mm: 1.0,
             cm: 10.0,

lib/slim/helpers.rb

@@ -11,7 +11,7 @@ def set_current_cell_style op, cell_style = ""
 
   def set_current_list_item_style op, list_item_style = ""
     $aod_ll += op
-    $aod_current_list_item_style[$aod_ll] = "in_list_item_#{$aod_tl} #{list_item_style}" if $aod_ll > 0
+    $aod_current_list_item_style[$aod_ll] = "in_list_item_#{$aod_ll} #{list_item_style}" if $aod_ll > 0
   end
 
   # Calculates style based on role and position in some elements

test/test.rb

@@ -2,6 +2,15 @@
 require_relative "../lib/a-od-producer/misc.rb"
 
 class TestMiscMethods < Minitest::Test
+  describe "Method text_measurement_to_mm " do
+    it "should correctly calculate measurement in mm" do
+      assert_equal MiscMethods.text_measurement_to_mm("1pt").round(3), 0.353
+      assert_equal MiscMethods.text_measurement_to_mm("1.5pt").round(3), 0.529
+      assert_raises RuntimeError do
+        MiscMethods.measurement_to_mm(1, "inches")
+      end
+    end
+  end
   describe "Method measurement_to_mm " do
     it "should correctly calculate measurement in mm" do
       assert_equal MiscMethods.measurement_to_mm(1, "mm").round(3), 1.000

test/test_cases/stew/long_line.png

@@ -13,11 +13,6 @@
 
 {nbsp}
 
-|===
-l| cat foo.txt \| grep bar
-|===
-
-
 Some sort of [((preamble))]
 multiline paragraph.
 
@@ -47,7 +42,7 @@ https://asciidoctor.org/[Asciidoctor]
 == Diagram extension
 
 .A diagram in adoc file
-[plantuml, diagram-classes, png, fitrect="170x225mm", srcdpi=300, width = "70%"]   
+[plantuml, diagram-classes, png, fitrect="170x225mm", srcdpi=300, width = "70%"]
 ....
 skinparam dpi 300
 
@@ -79,7 +74,7 @@ class BasicParagraph < BasicHelper <1> <2>
   def h_parent_style_name <2>
     @sd[:parent_style_name] = $defsn_p
     a = b + <3>
-        abc[1] 
+        abc[1]
   end
 end
 ----
@@ -136,7 +131,7 @@ a|
 
 [cols="1,2"]
 !===
-!Just for the fun of it 
+!Just for the fun of it
 a!
 .Some header
 [example]
@@ -149,9 +144,9 @@ A deeply digged example. Interesting to see the number
 
 Some text.
 
-[IMPORTANT] 
+[IMPORTANT]
 .Feeding the Werewolves
-==== 
+====
 While werewolves are hardy community members, keep in mind the following dietary concerns:
 
 . They are allergic to cinnamon.
@@ -178,7 +173,7 @@ C = \alpha + \beta Y^{\gamma} + \epsilon
 .({counter: eq})
 ++++
 \begin{bmatrix}
-a & b \\ 
+a & b \\
 c & d
 \end{bmatrix}\binom{n}{k}
 ++++
@@ -240,9 +235,15 @@ image::ruler.png[fitrect="170x225mm", srcdpi=100, width = "10%"]
 
 [square]
 .Marked list heading
-* First point
-** Subpoint 1
-. And a little mix-in
+* First point (long line with fitted width)
++
+image::long_line.png[]
+** Subpoint 1 (long line with fitted width)
++
+image::long_line.png[]
+. And a little mix-in (short line that shouldn't be fitted due to size)
++
+image::short_line.png[]
 ** Subpoint 2
 * Second point with no bullet
 * Third point
@@ -294,7 +295,7 @@ Example of informal table with no vertical lines.
 [.portrait]
 === A Test Section 1.1 (portrait)
 
-A Table (<<t1>>) Test paragraph text. A Test paragraph text. A Test paragraph text. A Test paragraph text. A Test paragraph text. A Test paragraph text. A Test paragraph text. 
+A Table (<<t1>>) Test paragraph text. A Test paragraph text. A Test paragraph text. A Test paragraph text. A Test paragraph text. A Test paragraph text. A Test paragraph text.
 
 [.text-align-center]
 A Test centered paragraph text. A Test centered paragraph text. A Test centered paragraph text. A Test centered paragraph text. A Test centered paragraph text. A Test centered paragraph text. A Test centered paragraph text. A Test centered paragraph text. A Test centered paragraph text.
@@ -307,16 +308,16 @@ A Test centered paragraph text. A Test centered paragraph text. A Test centered
 
 .^|b1 centered vertically
 |c1 Here a very long multiline text is situated in order to show that vertical alignment works
-2+a|a2 spanned 
+2+a|a2 spanned
 
-Asciidoc contents 
+Asciidoc contents
 
 * a
 . a1
 . a2
 +
 And some text as a paragraph to check paragraph in list alignment
-* b 
+* b
 
 |c2
 h|a3 (cell header)
@@ -351,10 +352,10 @@ And some TIP in a table
 3+|a9
 3+|a10
 
-|===  
+|===
 
 [.text-align-right]
-A Test right-aligned paragraph text. 
+A Test right-aligned paragraph text.
 
 == Some long, very long, very very long, very very very long, very very very very long h e a d i n g of level 1 (doesn't hang over page number)
 === Some long, very long, very very long, very very very long, very very very very long h e a d i n g of level 2
@@ -367,6 +368,3 @@ A Test right-aligned paragraph text.
 == Appendix example
 
 An appendix
-
-[index]
-== An index