review 3.2.0 → 5.1.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/workflows/ruby-tex.yml +31 -0
- data/.github/workflows/ruby-win.yml +45 -0
- data/.github/workflows/ruby.yml +27 -0
- data/.rubocop.yml +167 -42
- data/.travis.yml +1 -1
- data/Dockerfile +21 -5
- data/NEWS.ja.md +428 -1
- data/NEWS.md +429 -2
- data/README.md +11 -7
- data/Rakefile +7 -2
- data/appveyor.yml +0 -20
- data/bin/review +2 -4
- data/bin/review-catalog-converter +5 -5
- data/bin/review-check +13 -17
- data/bin/review-checkdep +3 -6
- data/bin/review-compile +13 -22
- data/bin/review-epub2html +1 -4
- data/bin/review-epubmaker +3 -4
- data/bin/review-idgxmlmaker +14 -0
- data/bin/review-index +5 -86
- data/bin/review-init +1 -4
- data/bin/review-pdfmaker +1 -3
- data/bin/review-preproc +11 -13
- data/bin/review-textmaker +1 -3
- data/bin/review-update +1 -4
- data/bin/review-validate +7 -7
- data/bin/review-vol +5 -82
- data/bin/review-webmaker +1 -3
- data/doc/config.yml.sample +67 -16
- data/doc/config.yml.sample-simple +4 -3
- data/doc/format.ja.md +133 -21
- data/doc/format.md +135 -34
- data/doc/makeindex.ja.md +2 -2
- data/doc/pdfmaker.ja.md +43 -1
- data/doc/pdfmaker.md +42 -1
- data/doc/quickstart.ja.md +55 -25
- data/doc/quickstart.md +47 -17
- data/lib/review.rb +1 -1
- data/lib/review/book.rb +2 -2
- data/lib/review/book/base.rb +89 -90
- data/lib/review/book/bib.rb +21 -0
- data/lib/review/book/book_unit.rb +158 -0
- data/lib/review/book/chapter.rb +51 -29
- data/lib/review/book/index.rb +42 -248
- data/lib/review/book/index/item.rb +46 -0
- data/lib/review/book/page_metric.rb +7 -7
- data/lib/review/book/part.rb +45 -10
- data/lib/review/book/volume.rb +5 -5
- data/lib/review/builder.rb +171 -54
- data/lib/review/call_hook.rb +20 -0
- data/lib/review/catalog.rb +15 -17
- data/lib/review/compiler.rb +240 -102
- data/lib/review/configure.rb +101 -12
- data/lib/review/converter.rb +1 -1
- data/lib/review/epub2html.rb +6 -1
- data/lib/review/epubmaker.rb +120 -118
- data/lib/review/epubmaker/content.rb +113 -0
- data/lib/review/epubmaker/epubcommon.rb +372 -0
- data/lib/review/epubmaker/epubv2.rb +178 -0
- data/lib/review/epubmaker/epubv3.rb +231 -0
- data/lib/review/epubmaker/producer.rb +168 -0
- data/lib/review/epubmaker/reviewheaderlistener.rb +12 -2
- data/lib/review/epubmaker/zip_exporter.rb +84 -0
- data/lib/review/exception.rb +6 -0
- data/lib/review/extentions/string.rb +0 -4
- data/lib/review/htmlbuilder.rb +147 -149
- data/lib/review/htmlutils.rb +10 -14
- data/lib/review/i18n.rb +4 -3
- data/lib/review/idgxmlbuilder.rb +229 -103
- data/lib/review/idgxmlmaker.rb +188 -0
- data/lib/review/img_math.rb +245 -0
- data/lib/review/index_builder.rb +654 -0
- data/lib/review/init-web/finish.html +10 -0
- data/lib/review/init-web/index.html +190 -0
- data/lib/review/init-web/review-layout-design.js +691 -0
- data/lib/review/init.rb +124 -41
- data/lib/review/latexbox.rb +58 -0
- data/lib/review/latexbuilder.rb +249 -97
- data/lib/review/latexutils.rb +9 -1
- data/lib/review/lineinput.rb +113 -3
- data/lib/review/logger.rb +43 -8
- data/lib/review/makerhelper.rb +13 -186
- data/lib/review/markdownbuilder.rb +75 -39
- data/lib/review/md2inaobuilder.rb +3 -5
- data/lib/review/pdfmaker.rb +88 -83
- data/lib/review/plaintextbuilder.rb +158 -83
- data/lib/review/preprocessor.rb +30 -24
- data/lib/review/rstbuilder.rb +58 -39
- data/lib/review/sec_counter.rb +14 -0
- data/lib/review/template.rb +6 -0
- data/lib/review/textmaker.rb +29 -17
- data/lib/review/textutils.rb +68 -2
- data/lib/review/tocprinter.rb +242 -97
- data/lib/review/topbuilder.rb +147 -61
- data/lib/review/update.rb +27 -28
- data/lib/review/version.rb +1 -1
- data/lib/review/volumeprinter.rb +97 -0
- data/lib/review/webmaker.rb +36 -35
- data/lib/review/webtocprinter.rb +39 -35
- data/lib/review/yamlloader.rb +4 -0
- data/review.gemspec +8 -5
- data/samples/sample-book/README.md +7 -2
- data/samples/sample-book/src/.gitignore +154 -0
- data/samples/sample-book/src/config-ebook.yml +4 -0
- data/samples/sample-book/src/config-epub2.yml +1 -1
- data/samples/sample-book/src/config-jlreq-ebook.yml +4 -0
- data/samples/sample-book/src/config-jlreq.yml +6 -0
- data/samples/sample-book/src/config.yml +3 -3
- data/samples/sample-book/src/lib/tasks/review.rake +45 -14
- data/samples/sample-book/src/lib/tasks/z01_copy_sty.rake +14 -8
- data/samples/syntax-book/Gemfile +1 -1
- data/samples/syntax-book/ch01.re +3 -1
- data/samples/syntax-book/ch02.re +28 -21
- data/samples/syntax-book/ch03.re +4 -7
- data/samples/syntax-book/config-jlreq-lualatex.yml +4 -0
- data/samples/syntax-book/config-jlreq.yml +5 -0
- data/samples/syntax-book/config-print.yml +3 -0
- data/samples/syntax-book/config.yml +1 -1
- data/samples/syntax-book/images/img3-2.png +0 -0
- data/samples/syntax-book/lib/tasks/review.rake +30 -15
- data/samples/syntax-book/lib/tasks/z01_copy_sty.rake +14 -8
- data/templates/html/_colophon.html.erb +23 -0
- data/templates/html/_colophon_history.html.erb +9 -0
- data/templates/html/_cover.html.erb +10 -0
- data/templates/html/_part_body.html.erb +6 -0
- data/templates/html/_titlepage.html.erb +20 -0
- data/templates/html/layout-html5.html.erb +6 -0
- data/templates/html/layout-xhtml1.html.erb +6 -0
- data/templates/latex/config.erb +45 -27
- data/templates/latex/layout.tex.erb +1 -0
- data/templates/latex/review-jlreq/README.md +3 -1
- data/templates/latex/review-jlreq/review-base.sty +124 -37
- data/templates/latex/review-jlreq/review-jlreq.cls +29 -22
- data/templates/latex/review-jlreq/review-style.sty +9 -1
- data/templates/latex/review-jlreq/review-tcbox.sty +348 -0
- data/templates/latex/review-jlreq/reviewmacro.sty +5 -0
- data/templates/latex/review-jsbook/README.md +46 -5
- data/templates/latex/review-jsbook/review-base.sty +111 -30
- data/templates/latex/review-jsbook/review-jsbook.cls +16 -2
- data/templates/latex/review-jsbook/review-style.sty +10 -2
- data/templates/latex/review-jsbook/review-tcbox.sty +348 -0
- data/templates/latex/review-jsbook/reviewmacro.sty +5 -0
- data/templates/opf/epubv2.opf.erb +7 -7
- data/templates/opf/epubv3.opf.erb +7 -7
- data/templates/opf/opf_manifest_epubv2.opf.erb +10 -0
- data/templates/opf/opf_manifest_epubv3.opf.erb +10 -0
- data/templates/opf/opf_metainfo_epubv2.opf.erb +17 -0
- data/templates/opf/opf_metainfo_epubv3.opf.erb +49 -0
- data/templates/opf/opf_tocx_epubv2.opf.erb +9 -0
- data/templates/opf/opf_tocx_epubv3.opf.erb +17 -0
- data/templates/web/html/layout-html5.html.erb +9 -8
- data/templates/web/html/layout-xhtml1.html.erb +6 -0
- data/test/assets/header_listener.html +35 -0
- data/test/assets/img_math/img1.png +0 -0
- data/test/assets/img_math/img2.png +0 -0
- data/test/assets/img_math/img3.png +0 -0
- data/test/assets/syntax_book_index_detail.txt +58 -0
- data/test/assets/test_template.tex +20 -9
- data/test/assets/test_template_backmatter.tex +20 -9
- data/test/book_test_helper.rb +11 -5
- data/test/run_test.rb +1 -1
- data/test/test_book.rb +123 -78
- data/test/test_book_chapter.rb +99 -56
- data/test/test_book_part.rb +3 -3
- data/test/test_builder.rb +24 -15
- data/test/test_catalog.rb +19 -42
- data/test/test_catalog_converter_cmd.rb +1 -1
- data/test/test_converter.rb +1 -0
- data/test/test_epub3maker.rb +170 -126
- data/test/test_epubmaker.rb +249 -129
- data/test/test_epubmaker_cmd.rb +16 -9
- data/test/test_helper.rb +23 -11
- data/test/test_htmlbuilder.rb +1083 -114
- data/test/test_htmlutils.rb +0 -12
- data/test/test_i18n.rb +37 -37
- data/test/test_idgxmlbuilder.rb +627 -27
- data/test/test_idgxmlmaker_cmd.rb +50 -0
- data/test/test_image_finder.rb +52 -70
- data/test/test_img_math.rb +111 -0
- data/test/test_index.rb +62 -52
- data/test/test_indexbuilder.rb +52 -0
- data/test/test_latexbuilder.rb +1189 -59
- data/test/test_latexbuilder_v2.rb +74 -34
- data/test/test_lineinput.rb +20 -93
- data/test/test_logger.rb +17 -4
- data/test/test_makerhelper.rb +2 -14
- data/test/test_markdownbuilder.rb +77 -4
- data/test/test_md2inaobuilder.rb +12 -2
- data/test/test_pdfmaker.rb +101 -12
- data/test/test_pdfmaker_cmd.rb +102 -8
- data/test/test_plaintextbuilder.rb +562 -31
- data/test/test_review_ext.rb +2 -1
- data/test/test_reviewheaderlistener.rb +49 -0
- data/test/test_rstbuilder.rb +58 -5
- data/test/test_sec_counter.rb +156 -0
- data/test/test_template.rb +12 -2
- data/test/test_textmaker_cmd.rb +58 -0
- data/test/test_textutils.rb +109 -2
- data/test/test_tocprinter.rb +46 -0
- data/test/test_topbuilder.rb +400 -17
- data/test/test_update.rb +53 -44
- data/test/test_webtocprinter.rb +75 -43
- data/test/test_yamlloader.rb +13 -0
- data/test/test_zip_exporter.rb +5 -6
- data/vendor/gentombow/LICENSE +1 -1
- data/vendor/gentombow/Makefile +0 -1
- data/vendor/gentombow/bounddvi-en.pdf +0 -0
- data/vendor/gentombow/bounddvi-en.tex +1 -0
- data/vendor/gentombow/bounddvi.pdf +0 -0
- data/vendor/gentombow/bounddvi.sty +30 -7
- data/vendor/gentombow/bounddvi.tex +1 -0
- data/vendor/gentombow/create_archive.sh +1 -0
- data/vendor/gentombow/gentombow-ja.pdf +0 -0
- data/vendor/gentombow/gentombow-ja.tex +9 -0
- data/vendor/gentombow/gentombow.pdf +0 -0
- data/vendor/gentombow/gentombow.sty +32 -10
- data/vendor/gentombow/gentombow.tex +8 -0
- data/vendor/gentombow/tests/gentombow-01-pdfx.tex +8 -0
- data/vendor/gentombow/tests/gentombow-02-pdfx.tex +8 -0
- data/vendor/jsclasses/LICENSE +1 -1
- data/vendor/jsclasses/Makefile +3 -2
- data/vendor/jsclasses/create_archive.sh +5 -5
- data/vendor/jsclasses/jis/Makefile +3 -2
- data/vendor/jsclasses/jis/jsarticle.cls +74 -31
- data/vendor/jsclasses/jis/jsbook.cls +74 -31
- data/vendor/jsclasses/jis/jsclasses.dtx +176 -36
- data/vendor/jsclasses/jis/jsclasses.ins +15 -5
- data/vendor/jsclasses/jis/jslogo.dtx +4 -4
- data/vendor/jsclasses/jis/jslogo.ins +9 -0
- data/vendor/jsclasses/jis/jslogo.sty +4 -16
- data/vendor/jsclasses/jis/jspf.cls +73 -30
- data/vendor/jsclasses/jis/jsreport.cls +74 -31
- data/vendor/jsclasses/jis/jsverb.ins +9 -0
- data/vendor/jsclasses/jis/jsverb.sty +1 -13
- data/vendor/jsclasses/jis/kiyou.cls +74 -31
- data/vendor/jsclasses/jis/minijs.sty +65 -22
- data/vendor/jsclasses/jis/okumacro.dtx +4 -5
- data/vendor/jsclasses/jis/okumacro.ins +9 -0
- data/vendor/jsclasses/jis/okumacro.sty +4 -17
- data/vendor/jsclasses/jis/okuverb.ins +9 -0
- data/vendor/jsclasses/jis/okuverb.sty +1 -13
- data/vendor/jsclasses/jis/winjis.sty +23 -19
- data/vendor/jsclasses/jsarticle.cls +74 -31
- data/vendor/jsclasses/jsbook.cls +74 -31
- data/vendor/jsclasses/jsclasses.dtx +176 -36
- data/vendor/jsclasses/jsclasses.ins +15 -5
- data/vendor/jsclasses/jsclasses.pdf +0 -0
- data/vendor/jsclasses/jslogo.dtx +4 -4
- data/vendor/jsclasses/jslogo.ins +9 -0
- data/vendor/jsclasses/jslogo.pdf +0 -0
- data/vendor/jsclasses/jslogo.sty +4 -16
- data/vendor/jsclasses/jspf.cls +73 -30
- data/vendor/jsclasses/jsreport.cls +74 -31
- data/vendor/jsclasses/jsverb.ins +9 -0
- data/vendor/jsclasses/jsverb.pdf +0 -0
- data/vendor/jsclasses/jsverb.sty +1 -13
- data/vendor/jsclasses/kiyou.cls +74 -31
- data/vendor/jsclasses/minijs.sty +68 -22
- data/vendor/jsclasses/okumacro.dtx +4 -5
- data/vendor/jsclasses/okumacro.ins +9 -0
- data/vendor/jsclasses/okumacro.pdf +0 -0
- data/vendor/jsclasses/okumacro.sty +4 -17
- data/vendor/jsclasses/okuverb.ins +9 -0
- data/vendor/jsclasses/okuverb.pdf +0 -0
- data/vendor/jsclasses/okuverb.sty +1 -13
- data/vendor/jsclasses/tests/relfont.tex +10 -0
- data/vendor/jsclasses/winjis.sty +23 -19
- metadata +136 -23
- data/.rubocop_todo.yml +0 -7
- data/lib/epubmaker.rb +0 -23
- data/lib/epubmaker/content.rb +0 -110
- data/lib/epubmaker/epubcommon.rb +0 -441
- data/lib/epubmaker/epubv2.rb +0 -143
- data/lib/epubmaker/epubv3.rb +0 -233
- data/lib/epubmaker/producer.rb +0 -375
- data/lib/epubmaker/zip_exporter.rb +0 -81
- data/lib/lineinput.rb +0 -155
- data/lib/review/book/compilable.rb +0 -173
- data/lib/review/tocparser.rb +0 -271
- data/samples/syntax-book/review-ext.rb +0 -14
- data/test/test_tocparser.rb +0 -25
data/lib/review/textmaker.rb
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
# Copyright (c) 2018 Kenshi Muto
|
1
|
+
# Copyright (c) 2018-2021 Kenshi Muto
|
2
2
|
#
|
3
3
|
# This program is free software.
|
4
4
|
# You can distribute or modify this program under the terms of
|
@@ -15,24 +15,29 @@ require 'review/book'
|
|
15
15
|
require 'review/yamlloader'
|
16
16
|
require 'review/topbuilder'
|
17
17
|
require 'review/version'
|
18
|
+
require 'review/makerhelper'
|
19
|
+
require 'review/img_math'
|
18
20
|
|
19
21
|
module ReVIEW
|
20
22
|
class TEXTMaker
|
23
|
+
include MakerHelper
|
24
|
+
|
21
25
|
attr_accessor :config, :basedir
|
22
26
|
|
23
27
|
def initialize
|
24
28
|
@basedir = nil
|
25
29
|
@logger = ReVIEW.logger
|
26
30
|
@plaintext = nil
|
31
|
+
@img_math = nil
|
27
32
|
end
|
28
33
|
|
29
34
|
def error(msg)
|
30
|
-
@logger.error
|
35
|
+
@logger.error msg
|
31
36
|
exit 1
|
32
37
|
end
|
33
38
|
|
34
39
|
def warn(msg)
|
35
|
-
@logger.warn
|
40
|
+
@logger.warn msg
|
36
41
|
end
|
37
42
|
|
38
43
|
def self.execute(*args)
|
@@ -42,10 +47,12 @@ module ReVIEW
|
|
42
47
|
def parse_opts(args)
|
43
48
|
cmd_config = {}
|
44
49
|
opts = OptionParser.new
|
50
|
+
@buildonly = nil
|
45
51
|
|
46
52
|
opts.banner = 'Usage: review-textmaker [-n] configfile'
|
47
53
|
opts.version = ReVIEW::VERSION
|
48
54
|
opts.on('-n', 'No decoration.') { @plaintext = true }
|
55
|
+
opts.on('-y', '--only file1,file2,...', 'Build only specified files.') { |v| @buildonly = v.split(/\s*,\s*/).map { |m| m.strip.sub(/\.re\Z/, '') } }
|
49
56
|
opts.on('--help', 'Prints this message and quit.') do
|
50
57
|
puts opts.help
|
51
58
|
exit 0
|
@@ -65,30 +72,32 @@ module ReVIEW
|
|
65
72
|
end
|
66
73
|
|
67
74
|
def remove_old_files(path)
|
75
|
+
@img_math.cleanup_mathimg
|
68
76
|
FileUtils.rm_rf(path)
|
69
77
|
end
|
70
78
|
|
71
79
|
def execute(*args)
|
72
|
-
@config = ReVIEW::Configure.values
|
73
|
-
@config.maker = 'textmaker'
|
74
80
|
cmd_config, yamlfile = parse_opts(args)
|
75
81
|
error "#{yamlfile} not found." unless File.exist?(yamlfile)
|
76
82
|
|
77
|
-
|
78
|
-
|
79
|
-
|
80
|
-
|
81
|
-
|
82
|
-
end
|
83
|
-
# YAML configs will be overridden by command line options.
|
84
|
-
@config.deep_merge!(cmd_config)
|
83
|
+
@config = ReVIEW::Configure.create(maker: 'textmaker',
|
84
|
+
yamlfile: yamlfile,
|
85
|
+
config: cmd_config)
|
86
|
+
@img_math = ReVIEW::ImgMath.new(@config, path_name: '_review_math_text')
|
87
|
+
|
85
88
|
I18n.setup(@config['language'])
|
86
89
|
begin
|
87
90
|
generate_text_files(yamlfile)
|
91
|
+
@logger.success("built #{build_path}")
|
88
92
|
rescue ApplicationError => e
|
89
93
|
raise if @config['debug']
|
94
|
+
|
90
95
|
error(e.message)
|
91
96
|
end
|
97
|
+
|
98
|
+
if @config['math_format'] == 'imgmath'
|
99
|
+
@img_math.make_math_images
|
100
|
+
end
|
92
101
|
end
|
93
102
|
|
94
103
|
def generate_text_files(yamlfile)
|
@@ -97,8 +106,7 @@ module ReVIEW
|
|
97
106
|
remove_old_files(@path)
|
98
107
|
Dir.mkdir(@path)
|
99
108
|
|
100
|
-
@book = ReVIEW::Book.
|
101
|
-
@book.config = @config
|
109
|
+
@book = ReVIEW::Book::Base.new(@basedir, config: @config)
|
102
110
|
|
103
111
|
build_body(@path, yamlfile)
|
104
112
|
end
|
@@ -107,9 +115,9 @@ module ReVIEW
|
|
107
115
|
base_path = Pathname.new(@basedir)
|
108
116
|
builder = nil
|
109
117
|
if @plaintext
|
110
|
-
builder = ReVIEW::PLAINTEXTBuilder.new
|
118
|
+
builder = ReVIEW::PLAINTEXTBuilder.new(img_math: @img_math)
|
111
119
|
else
|
112
|
-
builder = ReVIEW::TOPBuilder.new
|
120
|
+
builder = ReVIEW::TOPBuilder.new(img_math: @img_math)
|
113
121
|
end
|
114
122
|
@converter = ReVIEW::Converter.new(@book, builder)
|
115
123
|
@book.parts.each do |part|
|
@@ -144,6 +152,10 @@ module ReVIEW
|
|
144
152
|
filename = Pathname.new(chap.path).relative_path_from(base_path).to_s
|
145
153
|
end
|
146
154
|
id = File.basename(filename).sub(/\.re\Z/, '')
|
155
|
+
if @buildonly && !@buildonly.include?(id)
|
156
|
+
warn "skip #{id}.re"
|
157
|
+
return
|
158
|
+
end
|
147
159
|
|
148
160
|
textfile = "#{id}.txt"
|
149
161
|
|
data/lib/review/textutils.rb
CHANGED
@@ -1,4 +1,13 @@
|
|
1
|
+
# Copyright (c) 2008-2020 Minero Aoki, Kenshi Muto, Masayoshi Takahashi,
|
2
|
+
# KADO Masanori
|
3
|
+
# 2002-2007 Minero Aoki
|
4
|
+
#
|
5
|
+
# This program is free software.
|
6
|
+
# You can distribute or modify this program under the terms of
|
7
|
+
# the GNU LGPL, Lesser General Public License version 2.1.
|
8
|
+
#
|
1
9
|
require 'nkf'
|
10
|
+
require 'digest'
|
2
11
|
|
3
12
|
module ReVIEW
|
4
13
|
module TextUtils
|
@@ -26,10 +35,67 @@ module ReVIEW
|
|
26
35
|
end
|
27
36
|
end
|
28
37
|
|
38
|
+
blocked_lines.map! { |i| join_lines_to_paragraph(i) }
|
39
|
+
|
29
40
|
if pre && post
|
30
|
-
blocked_lines.map! { |i|
|
41
|
+
blocked_lines.map! { |i| pre + i + post }
|
42
|
+
end
|
43
|
+
|
44
|
+
blocked_lines
|
45
|
+
end
|
46
|
+
|
47
|
+
def add_space?(line1, line2, lang, lazy = nil)
|
48
|
+
# https://drafts.csswg.org/css-text-3/#line-break-transform
|
49
|
+
tail = line1[-1]
|
50
|
+
head = line2[0]
|
51
|
+
if tail.nil? || head.nil?
|
52
|
+
return nil
|
53
|
+
end
|
54
|
+
|
55
|
+
space = true
|
56
|
+
# rule 2
|
57
|
+
if %i[F W H].include?(Unicode::Eaw.property(tail)) &&
|
58
|
+
%i[F W H].include?(Unicode::Eaw.property(head)) &&
|
59
|
+
tail !~ /\p{Hangul}/ && head !~ /\p{Hangul}/
|
60
|
+
space = nil
|
61
|
+
end
|
62
|
+
|
63
|
+
if %w[ja zh zh_CN zh_TW yi].include?(lang)
|
64
|
+
# rule 3
|
65
|
+
if (%i[F W H].include?(Unicode::Eaw.property(tail)) &&
|
66
|
+
tail !~ /\p{Hangul}/ &&
|
67
|
+
(head =~ /\p{P}/ || head =~ /\p{S}/ || Unicode::Eaw.property(head) == :A)) ||
|
68
|
+
(%i[F W H].include?(Unicode::Eaw.property(head)) &&
|
69
|
+
head !~ /\p{Hangul}/ &&
|
70
|
+
(tail =~ /\p{P}/ || head =~ /\p{S}/ || Unicode::Eaw.property(tail) == :A))
|
71
|
+
space = nil
|
72
|
+
end
|
73
|
+
|
74
|
+
# lazy than rule 3, but it looks better
|
75
|
+
if lazy &&
|
76
|
+
(%i[F W H].include?(Unicode::Eaw.property(tail)) &&
|
77
|
+
tail !~ /\p{Hangul}/) ||
|
78
|
+
(%i[F W H].include?(Unicode::Eaw.property(head)) &&
|
79
|
+
head !~ /\p{Hangul}/)
|
80
|
+
space = nil
|
81
|
+
end
|
82
|
+
end
|
83
|
+
space
|
84
|
+
end
|
85
|
+
|
86
|
+
def join_lines_to_paragraph(lines)
|
87
|
+
unless @book.config['join_lines_by_lang']
|
88
|
+
return lines.join
|
89
|
+
end
|
90
|
+
|
91
|
+
lazy = true
|
92
|
+
lang = 'ja'
|
93
|
+
0.upto(lines.size - 2) do |n|
|
94
|
+
if add_space?(lines[n], lines[n + 1], lang, lazy)
|
95
|
+
lines[n] += ' '
|
96
|
+
end
|
31
97
|
end
|
32
|
-
|
98
|
+
lines.join
|
33
99
|
end
|
34
100
|
|
35
101
|
private
|
data/lib/review/tocprinter.rb
CHANGED
@@ -1,148 +1,293 @@
|
|
1
|
-
# Copyright (c) 2008-
|
2
|
-
#
|
1
|
+
# Copyright (c) 2008-2021 Minero Aoki, Kenshi Muto
|
2
|
+
# 1999-2007 Minero Aoki
|
3
3
|
#
|
4
4
|
# This program is free software.
|
5
5
|
# You can distribute or modify this program under the terms of
|
6
6
|
# the GNU LGPL, Lesser General Public License version 2.1.
|
7
|
-
# For details of LGPL, see the file "COPYING".
|
7
|
+
# For details of the GNU LGPL, see the file "COPYING".
|
8
8
|
#
|
9
9
|
|
10
|
-
require 'review/
|
11
|
-
require 'review/
|
10
|
+
require 'review/book'
|
11
|
+
require 'review/version'
|
12
|
+
require 'optparse'
|
13
|
+
require 'review/plaintextbuilder'
|
12
14
|
|
13
15
|
module ReVIEW
|
14
|
-
class
|
15
|
-
def
|
16
|
-
|
16
|
+
class PLAINTEXTTocBuilder < PLAINTEXTBuilder
|
17
|
+
def headline(level, label, caption)
|
18
|
+
if @chapter.is_a?(ReVIEW::Book::Part)
|
19
|
+
print "\x01H0\x01" # XXX: don't modify level value. level value will be handled in sec_counter#prefix()
|
20
|
+
else
|
21
|
+
print "\x01H#{level}\x01"
|
22
|
+
end
|
23
|
+
# embed header information for tocparser
|
24
|
+
super(level, label, caption)
|
17
25
|
end
|
18
26
|
|
19
|
-
def
|
20
|
-
|
21
|
-
|
22
|
-
|
27
|
+
def base_block(type, lines, caption = nil)
|
28
|
+
puts "\x01STARTLIST\x01"
|
29
|
+
super(type, lines, caption)
|
30
|
+
puts "\x01ENDLIST\x01"
|
23
31
|
end
|
24
32
|
|
25
|
-
def
|
26
|
-
|
33
|
+
def blank
|
34
|
+
@blank_seen = true
|
27
35
|
end
|
36
|
+
end
|
28
37
|
|
29
|
-
|
30
|
-
|
38
|
+
class TOCPrinter
|
39
|
+
class Counter
|
40
|
+
def initialize(name: nil, level: nil, headline: nil, lines: nil, chars: nil, list_lines: nil, text_lines: nil, part: nil)
|
41
|
+
@name = name
|
42
|
+
@level = level
|
43
|
+
@headline = headline
|
44
|
+
@lines = lines
|
45
|
+
@chars = chars
|
46
|
+
@list_lines = list_lines
|
47
|
+
@text_lines = text_lines
|
48
|
+
@part = part
|
49
|
+
end
|
50
|
+
|
51
|
+
attr_accessor :name, :level, :headline, :lines, :chars, :list_lines, :text_lines, :part
|
31
52
|
end
|
32
53
|
|
33
|
-
def
|
34
|
-
|
35
|
-
print_node 1, chap_node
|
36
|
-
print_children chap_node
|
54
|
+
def self.execute(*args)
|
55
|
+
new.execute(*args)
|
37
56
|
end
|
38
57
|
|
39
|
-
def
|
40
|
-
|
58
|
+
def initialize
|
59
|
+
@logger = ReVIEW.logger
|
60
|
+
@yamlfile = 'config.yml'
|
61
|
+
@upper = 4
|
62
|
+
@indent = true
|
63
|
+
@buildonly = nil
|
64
|
+
@detail = nil
|
65
|
+
@calc_char_width = nil
|
41
66
|
end
|
42
|
-
end
|
43
67
|
|
44
|
-
|
45
|
-
private
|
68
|
+
attr_accessor :calc_char_width
|
46
69
|
|
47
|
-
def
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
70
|
+
def execute(*args)
|
71
|
+
parse_options(args)
|
72
|
+
@config = ReVIEW::Configure.create(yamlfile: @yamlfile)
|
73
|
+
@book = ReVIEW::Book::Base.new('.', config: @config)
|
74
|
+
unless File.readable?(@yamlfile)
|
75
|
+
@logger.error("No such fiile or can't open #{@yamlfile}.")
|
76
|
+
exit 1
|
77
|
+
end
|
78
|
+
I18n.setup(@config['language'])
|
79
|
+
|
80
|
+
if @detail
|
81
|
+
begin
|
82
|
+
require 'unicode/eaw'
|
83
|
+
@calc_char_width = true
|
84
|
+
rescue LoadError
|
85
|
+
@logger.warn('not found unicode/eaw library. page volume may be unreliable.')
|
86
|
+
@calc_char_width = nil
|
53
87
|
end
|
54
88
|
end
|
89
|
+
|
90
|
+
print_result(build_result_array)
|
55
91
|
end
|
56
92
|
|
57
|
-
def
|
58
|
-
|
59
|
-
|
60
|
-
@
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
93
|
+
def build_result_array
|
94
|
+
result_array = []
|
95
|
+
begin
|
96
|
+
@book.parts.each do |part|
|
97
|
+
if part.name.present? && (@buildonly.nil? || @buildonly.include?(part.name))
|
98
|
+
result_array.push(Counter.new(part: 'start'))
|
99
|
+
if part.file?
|
100
|
+
content = build_chap(part)
|
101
|
+
result_array.concat(parse_contents(part.name, @upper, content))
|
102
|
+
else
|
103
|
+
title = part.format_number + I18n.t('chapter_postfix') + part.title
|
104
|
+
result_array.push(
|
105
|
+
Counter.new(name: '', lines: 1, chars: title.size, list_lines: 0, text_lines: 1),
|
106
|
+
Counter.new(level: 0, headline: title, lines: 1, chars: title.size, list_lines: 0, text_lines: 1)
|
107
|
+
)
|
108
|
+
end
|
109
|
+
end
|
110
|
+
|
111
|
+
part.chapters.each do |chap|
|
112
|
+
if @buildonly.nil? || @buildonly.include?(chap.name)
|
113
|
+
content = build_chap(chap)
|
114
|
+
result_array.concat(parse_contents(chap.name, @upper, content))
|
115
|
+
end
|
116
|
+
end
|
117
|
+
if part.name.present? && (@buildonly.nil? || @buildonly.include?(part.name))
|
118
|
+
result_array.push(Counter.new(part: 'end'))
|
119
|
+
end
|
120
|
+
end
|
121
|
+
rescue ReVIEW::FileNotFound, ReVIEW::CompileError => e
|
122
|
+
@logger.error e
|
123
|
+
exit 1
|
68
124
|
end
|
125
|
+
|
126
|
+
result_array
|
69
127
|
end
|
70
128
|
|
71
|
-
def
|
72
|
-
|
129
|
+
def print_result(result_array)
|
130
|
+
result_array.each do |result|
|
131
|
+
if result.part
|
132
|
+
next
|
133
|
+
end
|
134
|
+
|
135
|
+
if result.name
|
136
|
+
# file information
|
137
|
+
if @detail
|
138
|
+
puts '============================='
|
139
|
+
printf("%6dC %5dL %5dP %s\n", result.chars, result.lines, calc_pages(result).ceil, result.name)
|
140
|
+
puts '-----------------------------'
|
141
|
+
end
|
142
|
+
next
|
143
|
+
end
|
144
|
+
|
145
|
+
# section information
|
146
|
+
if @detail
|
147
|
+
printf('%6dC %5dL %5.1fP ', result.chars, result.lines, calc_pages(result))
|
148
|
+
end
|
149
|
+
if @indent && result.level
|
150
|
+
print ' ' * (result.level == 0 ? 0 : result.level - 1)
|
151
|
+
end
|
152
|
+
puts result.headline
|
153
|
+
end
|
73
154
|
end
|
74
155
|
|
75
|
-
def
|
76
|
-
|
77
|
-
|
78
|
-
cols[0, 3] # does not display volume of level-4 section
|
156
|
+
def calc_pages(result)
|
157
|
+
(result.list_lines.to_f / @book.page_metric.list.n_lines) +
|
158
|
+
(result.text_lines.to_f / @book.page_metric.text.n_lines)
|
79
159
|
end
|
80
|
-
end
|
81
160
|
|
82
|
-
|
83
|
-
|
161
|
+
def calc_linesize(line)
|
162
|
+
return line.size unless @calc_char_width
|
84
163
|
|
85
|
-
|
86
|
-
|
87
|
-
|
88
|
-
|
164
|
+
line.each_char.inject(0) do |result, char|
|
165
|
+
# XXX: should include A also?
|
166
|
+
if %i[Na H N].include?(Unicode::Eaw.property(char))
|
167
|
+
result + 0.5 # halfwidth
|
168
|
+
else
|
169
|
+
result + 1
|
170
|
+
end
|
171
|
+
end
|
89
172
|
end
|
90
173
|
|
91
|
-
def
|
92
|
-
|
93
|
-
|
174
|
+
def parse_contents(name, upper, content)
|
175
|
+
headline_array = []
|
176
|
+
counter = Counter.new(lines: 0, chars: 0, list_lines: 0, text_lines: 0)
|
177
|
+
listmode = nil
|
178
|
+
|
179
|
+
content.each_line(chomp: true) do |l|
|
180
|
+
if l.start_with?("\x01STARTLIST\x01")
|
181
|
+
listmode = true
|
182
|
+
next
|
183
|
+
elsif l.start_with?("\x01ENDLIST\x01")
|
184
|
+
listmode = nil
|
185
|
+
next
|
186
|
+
elsif l =~ /\A\x01H(\d)\x01/
|
187
|
+
# headline
|
188
|
+
level = $1.to_i
|
189
|
+
l = $'
|
190
|
+
if level <= upper
|
191
|
+
if counter.chars > 0
|
192
|
+
headline_array.push(counter)
|
193
|
+
end
|
194
|
+
headline = l
|
195
|
+
counter = Counter.new(
|
196
|
+
level: level,
|
197
|
+
headline: headline,
|
198
|
+
lines: 1,
|
199
|
+
chars: headline.size,
|
200
|
+
list_lines: 0,
|
201
|
+
text_lines: 1
|
202
|
+
)
|
203
|
+
next
|
204
|
+
end
|
205
|
+
end
|
206
|
+
|
207
|
+
counter.lines += 1
|
208
|
+
counter.chars += l.size
|
209
|
+
|
210
|
+
if listmode
|
211
|
+
# code list: calculate line wrapping
|
212
|
+
counter.list_lines += calc_line_wrapping(l, mode: :list)
|
213
|
+
else
|
214
|
+
# normal paragraph: calculate line wrapping
|
215
|
+
counter.text_lines += calc_line_wrapping(l, mode: :text)
|
216
|
+
end
|
94
217
|
end
|
95
|
-
|
218
|
+
headline_array.push(counter)
|
219
|
+
|
220
|
+
total = calc_total_count(name, headline_array)
|
221
|
+
headline_array.unshift(total)
|
96
222
|
end
|
97
223
|
|
98
|
-
def
|
99
|
-
|
100
|
-
|
101
|
-
|
102
|
-
|
103
|
-
|
104
|
-
|
105
|
-
|
106
|
-
end
|
107
|
-
@out.puts li(a_name(path, escape_html(label)))
|
108
|
-
return unless print?(2)
|
109
|
-
if print?(3)
|
110
|
-
@out.puts chap_sections_to_s(chap_node)
|
111
|
-
else
|
112
|
-
@out.puts chapter_to_s(chap_node)
|
224
|
+
def calc_line_wrapping(line, mode:)
|
225
|
+
return 1 if line.size == 0
|
226
|
+
|
227
|
+
case mode
|
228
|
+
when :list
|
229
|
+
(calc_linesize(line) - 1) / @book.page_metric.list.n_columns + 1
|
230
|
+
else # mode == :text
|
231
|
+
(calc_linesize(line) - 1) / @book.page_metric.text.n_columns + 1
|
113
232
|
end
|
114
233
|
end
|
115
234
|
|
116
|
-
|
235
|
+
def calc_total_count(name, headline_array)
|
236
|
+
total = Counter.new(name: name,
|
237
|
+
lines: 0,
|
238
|
+
chars: 0,
|
239
|
+
list_lines: 0,
|
240
|
+
text_lines: 0)
|
117
241
|
|
118
|
-
|
119
|
-
|
120
|
-
res = []
|
121
|
-
res << '<ol>'
|
122
|
-
chap.each_section { |sec| res << li(escape_html(sec.label)) }
|
123
|
-
res << '</ol>'
|
124
|
-
res.join("\n")
|
125
|
-
end
|
242
|
+
headline_array.each do |h|
|
243
|
+
next unless h.lines
|
126
244
|
|
127
|
-
|
128
|
-
|
129
|
-
|
130
|
-
|
131
|
-
next unless print?(4)
|
132
|
-
next unless sec.section_size > 0
|
133
|
-
res << '<ul>'
|
134
|
-
sec.each_section { |node| res << li(escape_html(node.label)) }
|
135
|
-
res << '</ul>'
|
245
|
+
total.lines += h.lines
|
246
|
+
total.chars += h.chars
|
247
|
+
total.list_lines += h.list_lines
|
248
|
+
total.text_lines += h.text_lines
|
136
249
|
end
|
137
|
-
|
250
|
+
|
251
|
+
total
|
138
252
|
end
|
139
253
|
|
140
|
-
def
|
141
|
-
|
254
|
+
def build_chap(chap)
|
255
|
+
compiler = ReVIEW::Compiler.new(ReVIEW::PLAINTEXTTocBuilder.new)
|
256
|
+
begin
|
257
|
+
compiler.compile(@book.chapter(chap.name))
|
258
|
+
rescue ReVIEW::ApplicationError => e
|
259
|
+
@logger.error e.message
|
260
|
+
exit 1
|
261
|
+
end
|
142
262
|
end
|
143
263
|
|
144
|
-
def
|
145
|
-
|
264
|
+
def parse_options(args)
|
265
|
+
opts = OptionParser.new
|
266
|
+
opts.version = ReVIEW::VERSION
|
267
|
+
opts.on('--yaml=YAML', 'Read configurations from YAML file.') { |yaml| @yamlfile = yaml }
|
268
|
+
opts.on('-y', '--only file1,file2,...', 'list only specified files.') do |v|
|
269
|
+
@buildonly = v.split(/\s*,\s*/).map { |m| m.strip.sub(/\.re\Z/, '') }
|
270
|
+
end
|
271
|
+
opts.on('-l', '--level N', 'list upto N level (default=4)') do |n|
|
272
|
+
@upper = n.to_i
|
273
|
+
end
|
274
|
+
opts.on('-d', '--detail', 'show characters and lines of each section.') do
|
275
|
+
@detail = true
|
276
|
+
end
|
277
|
+
opts.on('--noindent', "don't indent headlines.") do
|
278
|
+
@indent = nil
|
279
|
+
end
|
280
|
+
opts.on('--help', 'print this message and quit.') do
|
281
|
+
puts opts.help
|
282
|
+
exit 0
|
283
|
+
end
|
284
|
+
begin
|
285
|
+
opts.parse!(args)
|
286
|
+
rescue OptionParser::ParseError => e
|
287
|
+
@logger.error e.message
|
288
|
+
$stderr.puts opts.help
|
289
|
+
exit 1
|
290
|
+
end
|
146
291
|
end
|
147
292
|
end
|
148
293
|
end
|