Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HTMLBuilder: use class instead of width for //image[scale=XXX] #482

Merged
merged 3 commits into from
Jan 28, 2016
Merged

HTMLBuilder: use class instead of width for //image[scale=XXX] #482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
282f61a
HTMLBuilder: use class instead of width for //image[scale=XXX]
takahashim Jan 20, 2016
2898698
fix rubocop warning
takahashim Jan 24, 2016
026ae68
travis.yml: add libgmp3-dev for fix in TravisCI
takahashim Jan 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ rvm:
- 2.3.0
- ruby-head

addons:
apt_packages:
- libgmp3-dev

branches:
only:
- master
Expand Down
23 changes: 23 additions & 0 deletions doc/sample.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,3 +106,26 @@ p.noindent {
p.flushright {
text-align: right;
}


/**
* from EBPAJ EPUB 3 File Creation Guide sample style
*
* cf. http://ebpaj.jp/counsel/guide
*/

/* image width definition(pacentage) */
.width-010per { width: 10%; }
.width-020per { width: 20%; }
.width-025per { width: 25%; }
.width-030per { width: 30%; }
.width-033per { width: 33%; }
.width-040per { width: 40%; }
.width-050per { width: 50%; }
.width-060per { width: 60%; }
.width-067per { width: 67%; }
.width-070per { width: 70%; }
.width-075per { width: 75%; }
.width-080per { width: 80%; }
.width-090per { width: 90%; }
.width-100per { width: 100%; }
15 changes: 12 additions & 3 deletions lib/review/htmlbuilder.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -599,15 +599,24 @@ def texequation(lines)

def handle_metric(str)
if str =~ /\Ascale=([\d.]+)\Z/
return "width=\"#{($1.to_f * 100).round}%\""
return {'class' => sprintf("width-%03dper", ($1.to_f * 100).round)}
else
k, v = str.split('=', 2)
return %Q|#{k}=\"#{v.sub(/\A["']/, '').sub(/["']\Z/, '')}\"|
return {k => v.sub(/\A["']/, '').sub(/["']\Z/, '')}
end
end

def result_metric(array)
" #{array.join(' ')}"
attrs = {}
array.each do |item|
k = item.keys[0]
if attrs[k]
attrs[k] << item[k]
else
attrs[k] = [item[k]]
end
end
" "+attrs.map{|k, v| %Q|#{k}="#{v.join(' ')}"| }.join(' ')
end

def image_image(id, caption, metric)
Expand Down
24 changes: 23 additions & 1 deletion test/sample-book/src/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,4 +248,26 @@ strong{
}
em {
font-style: italic;
}
}

/**
* from EBPAJ EPUB 3 File Creation Guide sample style
*
* cf. http://ebpaj.jp/counsel/guide
*/

/* image width definition(pacentage) */
.width-010per { width: 10%; }
.width-020per { width: 20%; }
.width-025per { width: 25%; }
.width-030per { width: 30%; }
.width-033per { width: 33%; }
.width-040per { width: 40%; }
.width-050per { width: 50%; }
.width-060per { width: 60%; }
.width-067per { width: 67%; }
.width-070per { width: 70%; }
.width-075per { width: 75%; }
.width-080per { width: 80%; }
.width-090per { width: 90%; }
.width-100per { width: 100%; }
10 changes: 5 additions & 5 deletions test/test_htmlbuilder.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ def @chapter.image(id)
end

actual = compile_block("//image[sampleimg][sample photo][scale=1.2]{\n//}\n")
assert_equal %Q|<div id="sampleimg" class="image">\n<img src="images/chap1-sampleimg.png" alt="sample photo" width="120%" />\n<p class="caption">\n図1.1: sample photo\n</p>\n</div>\n|, actual
assert_equal %Q|<div id="sampleimg" class="image">\n<img src="images/chap1-sampleimg.png" alt="sample photo" class="width-120per" />\n<p class="caption">\n図1.1: sample photo\n</p>\n</div>\n|, actual
end

def test_image_with_metric2
Expand All @@ -370,7 +370,7 @@ def @chapter.image(id)
end

actual = compile_block("//image[sampleimg][sample photo][scale=1.2,html::class=sample,latex::ignore=params]{\n//}\n")
assert_equal %Q|<div id="sampleimg" class="image">\n<img src="images/chap1-sampleimg.png" alt="sample photo" width="120%" class="sample" />\n<p class="caption">\n図1.1: sample photo\n</p>\n</div>\n|, actual
assert_equal %Q|<div id="sampleimg" class="image">\n<img src="images/chap1-sampleimg.png" alt="sample photo" class="width-120per sample" />\n<p class="caption">\n図1.1: sample photo\n</p>\n</div>\n|, actual
end

def test_image_with_tricky_id
Expand Down Expand Up @@ -414,7 +414,7 @@ def @chapter.image(id)
end

actual = compile_block("//indepimage[sampleimg][sample photo][scale=1.2]\n")
assert_equal %Q|<div class="image">\n<img src="images/chap1-sampleimg.png" alt="sample photo" width="120%" />\n<p class="caption">\n図: sample photo\n</p>\n</div>\n|, actual
assert_equal %Q|<div class="image">\n<img src="images/chap1-sampleimg.png" alt="sample photo" class="width-120per" />\n<p class="caption">\n図: sample photo\n</p>\n</div>\n|, actual
end

def test_indepimage_with_metric2
Expand All @@ -425,7 +425,7 @@ def @chapter.image(id)
end

actual = compile_block("//indepimage[sampleimg][sample photo][scale=1.2, html::class=\"sample\",latex::ignore=params]\n")
assert_equal %Q|<div class="image">\n<img src="images/chap1-sampleimg.png" alt="sample photo" width="120%" class="sample" />\n<p class="caption">\n図: sample photo\n</p>\n</div>\n|, actual
assert_equal %Q|<div class="image">\n<img src="images/chap1-sampleimg.png" alt="sample photo" class="width-120per sample" />\n<p class="caption">\n図: sample photo\n</p>\n</div>\n|, actual
end

def test_indepimage_without_caption_but_with_metric
Expand All @@ -436,7 +436,7 @@ def @chapter.image(id)
end

actual = compile_block("//indepimage[sampleimg][][scale=1.2]\n")
assert_equal %Q|<div class="image">\n<img src="images/chap1-sampleimg.png" alt="" width="120%" />\n</div>\n|, actual
assert_equal %Q|<div class="image">\n<img src="images/chap1-sampleimg.png" alt="" class="width-120per" />\n</div>\n|, actual
end

def test_dlist
Expand Down