review 5.1.1 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cb9e501ea85d00f7dc928d4f6304b0b710a6d137583585c0d31a29dab29eede
-  data.tar.gz: 8c50af2163c54fa4e2e0fd49f62cedbe45b1f5b29146bfc6e6fdccc8a57ed95c
+  metadata.gz: 413c947f61e128331f01df2d83a039d519145016ce5757d603be616867acf594
+  data.tar.gz: 3ba0c7cb9bb87e2b8668391d60865a9ff0d1b3f1481cffa0e1670cab540fd99e
 SHA512:
-  metadata.gz: 854d53265b02b978ed8615b09863db0491743cb72caa4762445bfed5c32cb368e7d0c3d87e9d264492f273555e352a4252ddc26a0d38050046e84a454acb981f
-  data.tar.gz: 4f9756da487921f5b7fbaddd3d840e43642738a67fa341a1f6e1b35d01cf2447563ba645c3f9b010626bac25a901b6effe2fbb9d1c478fc84cb0bc88a2d22944
+  metadata.gz: 2131556e6cb7c916684b8fcdb6f1deea8a84b14dbbb5a2e62d4ad31caac832a2136d4afda25ee7c93670c56f24fd98f79090c90617e15db1cfb7ab331999b6b6
+  data.tar.gz: b929c23fa373de5780aeae97332103e19b444a57aa098ccf3f03c31716e7a46972d1213cc539d0785b76f94e2cdf5143521c3f9d446bbdb087030e357edacd7d

data/.github/workflows/ruby-tex.yml

@@ -1,6 +1,10 @@
 name: Test with TeXLive
 
-on: [push]
+on:
+  push:
+    branches:
+    - master
+  pull_request:
 
 jobs:
   build:

data/.github/workflows/ruby-win.yml

@@ -1,6 +1,10 @@
 name: TestWin
 
-on: [push]
+on:
+  push:
+    branches:
+    - master
+  pull_request:
 
 jobs:
   build:

data/.github/workflows/ruby.yml

@@ -1,6 +1,10 @@
 name: Test
 
-on: [push]
+on:
+  push:
+    branches:
+    - master
+  pull_request:
 
 jobs:
   build:

data/.rubocop.yml

@@ -5,9 +5,11 @@ AllCops:
     - tmp/*
   DisplayCopNames: true
   NewCops: enable
+  TargetRubyVersion: 2.5
 
 require:
   - rubocop-performance
+  - rubocop-rake
 
 #### Lint
 
@@ -178,7 +180,7 @@ Style/GuardClause:
   Enabled: false
 
 Style/IfInsideElse:
-  Enabled: false
+  Enabled: true
 
 Style/IfUnlessModifier:
   Enabled: false
@@ -253,6 +255,8 @@ Style/MethodCallWithArgsParentheses:
     - 'write'
     - 'warn'
     - 'error'
+    - 'error!'
+    - 'app_error'
     - 'raise'
     - 'yield'
     - 'source'
@@ -583,7 +587,7 @@ Naming/HeredocDelimiterNaming:
   Enabled: false
 
 Naming/MemoizedInstanceVariableName:
-  Enabled: false
+  Enabled: true
 
 Naming/MethodName:
   Enabled: true

data/NEWS.ja.md

@@ -1,3 +1,51 @@
+# Version 5.2.0
+## 新機能
+* EPUBMaker: CSS 組版向けに、見出しの存在に応じて `<section>` で階層化する機能を追加しました。config.yml で `epubmaker` セクションの `use_section` パラメータを `true` にすると有効化されます ([#1685])
+
+## バグ修正
+* PDFMaker: Ruby 2.6 以上でテンプレートの引数についての警告が出る問題を修正しました ([#1683])
+* EPUBMaker: Docker 環境においてファイルがコピーされず空になる問題を修正しました ([#1686])
+* 縦中横を正しく表示する CSS 設定を追加しました ([#1688])
+* PDFMaker: 新しい TeXLive との組み合わせで pxjahyper のオプション競合エラーが発生するのを修正しました ([#1690])
+* PDFMaker: 画像が見つからないときにコンパイルエラーになるのを修正しました ([#1706])
+
+## 機能強化
+* 警告とエラーを出力する際の処理を改善しました。`error!` (すぐに終了) および `app_error` (`ApplicationError` 例外を上げる) メソッドを導入しました ([#1674])
+* PDFMaker: ビルドのために画像ファイルをコピーする際、実コピーではなくシンボリックリンクを利用して処理を高速化するオプションを追加しました。`pdfmaker` セクションの `use_symlink` パラメータを `true` にすると、デフォルト挙動の実コピーの代わりにシンボリックリンクが使われます。Windows など一部の OS ではこれは動作しない可能性があります ([#1696])
+* PDFMaker: review-jlreq で `serial_pagination=true, openany` を指定したときには前付の後の空ページが入らないようにしました ([#1711])
+
+## その他
+* GitHub Actions まわりを修正しました ([#1684], [#1691])
+* review-preproc: リファクタリングを行いました ([#1697])
+* 入れ子の箇条書きの処理をリファクタリングしました ([#1698])
+* Rubocop 1.12 に対応しました ([#1689], [#1692], [#1699], [#1700])
+* 各ビルダの `builder_init_file` メソッドで最初に `super` で基底 builder の `builder_init_file` を実行するようにしました ([#1702])
+* PDFMaker: FileUtils ライブラリを内部で使う際に、明示記法の `FIleUtils.foobar` を使うようにしました ([#1704])
+
+## コントリビューターのみなさん
+* [@odaki](https://github.com/odaki)
+* [@imamurayusuke](https://github.com/imamurayusuke)
+
+[#1674]: https://github.com/kmuto/review/issues/1674
+[#1683]: https://github.com/kmuto/review/pulls/1683
+[#1684]: https://github.com/kmuto/review/pulls/1684
+[#1685]: https://github.com/kmuto/review/pulls/1685
+[#1686]: https://github.com/kmuto/review/issues/1686
+[#1688]: https://github.com/kmuto/review/pulls/1688
+[#1689]: https://github.com/kmuto/review/pulls/1689
+[#1690]: https://github.com/kmuto/review/pulls/1690
+[#1691]: https://github.com/kmuto/review/pulls/1691
+[#1692]: https://github.com/kmuto/review/pulls/1692
+[#1696]: https://github.com/kmuto/review/issues/1696
+[#1697]: https://github.com/kmuto/review/pulls/1697
+[#1698]: https://github.com/kmuto/review/pulls/1698
+[#1699]: https://github.com/kmuto/review/pulls/1699
+[#1700]: https://github.com/kmuto/review/pulls/1700
+[#1702]: https://github.com/kmuto/review/pulls/1702
+[#1704]: https://github.com/kmuto/review/pulls/1704
+[#1706]: https://github.com/kmuto/review/issues/1706
+[#1711]: https://github.com/kmuto/review/issues/1711
+
 # Version 5.1.1
 ## バグ修正
 * `review-preproc` がエラーになるのを修正しました ([#1679])

data/NEWS.md

@@ -1,3 +1,51 @@
+# Version 5.2.0
+## New Features
+* EPUBMaker: added `<section>` based on heading level for CSS formatting, when the `epubmaker/use_section` parameter is set to `true` ([#1685])
+
+## Bug Fixes
+* PDFMaker: fixed a problem that caused a warning in templates for Ruby 2.6 and above ([#1683])
+* EPUBMaker: fixed an issue that caused copied files to be empty in Docker environments ([#1686])
+* added CSS style for correct displaying horizontal characters in vertical typesetting ([#1688])
+* PDFMaker: fixed the pxjahyper option conflict error on latest TeXLive ([#1690])
+* PDFMaker: fixed compile error when image is not found ([#1706])
+
+## Enhancements
+* improve around warn and error handling ([#1674])
+* PDFMaker: introduced `pdfmaker/use_symlink` parameter to speed up the process by using symbolic links instead of actual copies. This may not work on some operating systems such as Windows ([#1696])
+* PDFMaker: don't insert empty page after frontmatter when using review-jlreq with `serial_pagination=true, openany` ([#1711])
+
+## Others
+* fixed related to GitHub Actions ([#1684], [#1691])
+* review-preproc: refactored ([#1697])
+* refactored nested lists handling ([#1698])
+* refactor code with Rubocop 1.12 ([#1689], [#1692], [#1699], [#1700])
+* The `builder_init_file` method of each builder now executes `super` first to use base builder's `builder_init_file` ([#1702])
+* PDFMaker: Stopped implicitly including FileUtils library ([#1704])
+
+## Contributors
+* [@odaki](https://github.com/odaki)
+* [@imamurayusuke](https://github.com/imamurayusuke)
+
+[#1674]: https://github.com/kmuto/review/issues/1674
+[#1683]: https://github.com/kmuto/review/pulls/1683
+[#1684]: https://github.com/kmuto/review/pulls/1684
+[#1685]: https://github.com/kmuto/review/pulls/1685
+[#1686]: https://github.com/kmuto/review/issues/1686
+[#1688]: https://github.com/kmuto/review/pulls/1688
+[#1689]: https://github.com/kmuto/review/pulls/1689
+[#1690]: https://github.com/kmuto/review/pulls/1690
+[#1691]: https://github.com/kmuto/review/pulls/1691
+[#1692]: https://github.com/kmuto/review/pulls/1692
+[#1696]: https://github.com/kmuto/review/issues/1696
+[#1697]: https://github.com/kmuto/review/pulls/1697
+[#1698]: https://github.com/kmuto/review/pulls/1698
+[#1699]: https://github.com/kmuto/review/pulls/1699
+[#1700]: https://github.com/kmuto/review/pulls/1700
+[#1702]: https://github.com/kmuto/review/pulls/1702
+[#1704]: https://github.com/kmuto/review/pulls/1704
+[#1706]: https://github.com/kmuto/review/issues/1706
+[#1711]: https://github.com/kmuto/review/issues/1711
+
 # Version 5.1.1
 ## Bug Fixes
 * Fix the runtime error of `review-preproc` ([#1679])
@@ -1808,4 +1856,3 @@ To support language parameter for syntax highlighting, if you use review-ext.rb
 * add headline level 5 and 6 (paragraph, subparagraph)
 * escape all dash
 * add ``begin{alltt}..\end{alltt}`` into ``\reviewemlist``, ``\reviewlist`` and ``\reviewcmd``
-

data/bin/review-compile

@@ -16,6 +16,8 @@ require 'fileutils'
 require 'optparse'
 require 'yaml'
 
+include ReVIEW::Loggable
+
 DEFAULT_CONFIG_FILENAME = 'config.yml'.freeze
 
 def main
@@ -47,17 +49,17 @@ def _main
   begin
     loader = ReVIEW::YAMLLoader.new
     if @config['yaml']
-      error "#{@config['yaml']} not found." unless File.exist?(@config['yaml'])
+      error! "#{@config['yaml']} not found." unless File.exist?(@config['yaml'])
       begin
         @config.deep_merge!(loader.load_file(@config['yaml']))
       rescue => e
-        error "yaml error #{e.message}"
+        error! "yaml error #{e.message}"
       end
     elsif File.exist?(DEFAULT_CONFIG_FILENAME)
       begin
         @config.deep_merge!(loader.load_file(DEFAULT_CONFIG_FILENAME))
       rescue => e
-        error "yaml error #{e.message}"
+        error! "yaml error #{e.message}"
       end
     end
 
@@ -73,12 +75,12 @@ def _main
 
     case @mode
     when :files
-      error('no input') if ARGV.empty?
+      error!('no input') if ARGV.empty?
 
       @basedir = File.dirname(ARGV[0])
       book = ReVIEW::Book::Base.new(@basedir, config: @config)
       ARGV.each do |item|
-        error("file not found: #{item}") unless File.exist?(File.join(book.config['contentdir'], item))
+        error!("file not found: #{item}") unless File.exist?(File.join(book.config['contentdir'], item))
         chap_name = File.basename(item, '.*')
         chap = book.chapter(chap_name)
         compiler = ReVIEW::Compiler.new(load_builder_class(@target, @check_only))
@@ -105,7 +107,7 @@ def _main
       raise "must not happen: #{@mode}"
     end
   rescue ReVIEW::ApplicationError => e
-    error(e.message)
+    error! e.message
   end
 end
 
@@ -164,15 +166,6 @@ def parse_opts
   end
 end
 
-def error(msg)
-  @logger.error msg
-  exit 1
-end
-
-def warn(msg)
-  @logger.warn msg
-end
-
 def load_builder_class(target, strict)
   require "review/#{target}builder"
   ReVIEW.const_get("#{target.upcase}Builder").new(strict)

data/bin/review-preproc

@@ -16,9 +16,13 @@ require 'review/version'
 require 'review/extentions'
 require 'review/logger'
 require 'review/lineinput'
+require 'review/loggable'
 require 'stringio'
 require 'fileutils'
 require 'optparse'
+require 'tempfile'
+
+include ReVIEW::Loggable
 
 def sigmain
   Signal.trap(:INT) { exit 1 }
@@ -30,16 +34,7 @@ rescue Errno::EPIPE
   exit 0
 end
 
-def main
-  @logger = ReVIEW.logger
-  if File.file?('review-preproc-ext.rb')
-    if ENV['REVIEW_SAFE_MODE'].to_i & 2 > 0
-      @logger.warn 'review-preproc-ext.rb is prohibited in safe mode. ignored.'
-    else
-      Kernel.load(File.expand_path('review-preproc-ext.rb'))
-    end
-  end
-
+def parse_options
   param = {}
 
   mode = :output
@@ -57,32 +52,42 @@ def main
   begin
     opts.parse!
   rescue OptionParser::ParseError => e
-    @logger.error e.message
+    error e.message
     $stderr.puts opts.help
     exit 1
   end
 
-  pp = ReVIEW::Preprocessor.new(ReVIEW::Repository.new(param), param)
-  current_file = nil
+  [param, mode]
+end
+
+def main
+  @logger = ReVIEW.logger
+  if File.file?('review-preproc-ext.rb')
+    if ENV['REVIEW_SAFE_MODE'].to_i & 2 > 0
+      warn 'review-preproc-ext.rb is prohibited in safe mode. ignored.'
+    else
+      Kernel.load(File.expand_path('review-preproc-ext.rb'))
+    end
+  end
+
+  param, mode = parse_options
+  pp = ReVIEW::Preprocessor.new(param)
   ARGV.each do |path|
-    current_file = path
     case mode
     when :output
-      File.open(path) { |f| pp.process(f, $stdout) }
+      $stdout.write(pp.process(path))
     when :replace
-      File.write("#{path}.pptmp", preproc(pp, path))
-      File.rename("#{path}.pptmp", path)
+      output = pp.process(path)
+      File.write(path, output)
     when :diff, :check
-      tmp = '/tmp/review.pptmp'
-      begin
-        File.write(tmp, preproc(pp, path))
+      Tempfile.create('review.pptmp') do |tmp_io|
+        tmp = tmp_io.path
+        tmp_io.write(pp.process(path))
         if mode == :check
           system("diff -qu #{path} #{tmp} >/dev/null || echo #{path}")
         else
           system("diff -u #{path} #{tmp}")
         end
-      ensure
-        FileUtils.rm_f(tmp)
       end
     else
       raise "must not happen: #{mode}"
@@ -91,18 +96,7 @@ def main
 rescue ReVIEW::Error => e
   raise if $DEBUG
 
-  @logger.error e.message
-  exit 1
-end
-
-def preproc(pp, path)
-  buf = StringIO.new
-  File.open(path) { |f| pp.process(f, buf) }
-  buf.string
-end
-
-def File.write(path, str)
-  File.open(path, 'w') { |f| f.write str }
+  error! e.message
 end
 
 sigmain

data/doc/config.yml.sample

@@ -341,6 +341,8 @@ epubmaker:
   #
   # 脚注に「戻る」リンクを追加する(trueで追加)。脚注の記号および戻るリンクの記号はlocale.ymlで変更可能
   # back_footnote: null
+  # 見出しに応じて<section>で囲むようにする(trueで<section>を利用)
+  # use_section: null
   # epubmaker:階層を使うものはここまで
 
 # LaTeX用のスタイルファイル(styディレクトリ以下に置くこと)

data/doc/writing_vertical.ja.md

@@ -35,6 +35,12 @@ body {
     -epub-writing-mode:   vertical-rl;
     writing-mode: tb-rl;
 }
+
+span.tcy {
+    -webkit-text-combine: horizontal;
+    -ms-text-combine-horizontal: all;
+    text-combine-upright: all;
+}
 ```
 
 また、縦書きの書籍は通常、「左開き」（右ページから左ページへ進む）となるので、config.yml の direction パラメータを設定します。

data/lib/review/builder.rb

@@ -11,6 +11,7 @@ require 'review/textutils'
 require 'review/compiler'
 require 'review/sec_counter'
 require 'review/img_math'
+require 'review/loggable'
 require 'stringio'
 require 'fileutils'
 require 'tempfile'
@@ -19,6 +20,7 @@ require 'csv'
 module ReVIEW
   class Builder
     include TextUtils
+    include Loggable
 
     CAPTION_TITLES = Compiler.minicolumn_names
 
@@ -30,7 +32,8 @@ module ReVIEW
       nil
     end
 
-    attr_accessor :doc_status, :previous_list_type
+    attr_accessor :doc_status
+    attr_reader :location
 
     def initialize(strict = false, *_args, img_math: nil)
       @strict = strict
@@ -38,7 +41,6 @@ module ReVIEW
       @logger = ReVIEW.logger
       @doc_status = {}
       @dictionary = {}
-      @previous_list_type = nil
       @img_math = img_math
     end
 
@@ -76,7 +78,7 @@ module ReVIEW
           begin
             require 'unicode/eaw'
           rescue LoadError
-            warn 'not found unicode/eaw. disabled join_lines_by_lang feature.'
+            warn 'not found unicode/eaw. disabled join_lines_by_lang feature.', location: @location
             @book.config['join_lines_by_lang'] = nil
           end
         end
@@ -101,7 +103,7 @@ module ReVIEW
 
     def check_nest
       if @children && !@children.empty?
-        error "//beginchild of #{@children.reverse.join(',')} misses //endchild"
+        app_error "//beginchild of #{@children.reverse.join(',')} misses //endchild"
       end
     end
 
@@ -161,7 +163,7 @@ module ReVIEW
         list_body(id, lines, lang)
         list_header(id, caption, lang) unless caption_top?('list')
       rescue KeyError
-        error "no such list: #{id}"
+        app_error "no such list: #{id}"
       end
     end
 
@@ -171,7 +173,7 @@ module ReVIEW
         listnum_body(lines, lang)
         list_header(id, caption, lang) unless caption_top?('list')
       rescue KeyError
-        error "no such list: #{id}"
+        app_error "no such list: #{id}"
       end
     end
 
@@ -185,7 +187,7 @@ module ReVIEW
       if @chapter.image_bound?(id)
         image_image(id, caption, metric)
       else
-        warn "image not bound: #{id}" if @strict
+        warn "image not bound: #{id}", location: @location if @strict
         image_dummy(id, caption, lines)
       end
     end
@@ -203,7 +205,7 @@ module ReVIEW
           table_header(id, caption)
         end
       rescue KeyError
-        error "no such table: #{id}"
+        app_error "no such table: #{id}"
       end
     end
 
@@ -218,7 +220,7 @@ module ReVIEW
       when 'verticalbar'
         Regexp.new('\s*\\' + escape('|') + '\s*')
       else
-        error "Unknown value for 'table_row_separator', shold be: tabs, singletab, spaces, verticalbar"
+        app_error "Unknown value for 'table_row_separator', shold be: tabs, singletab, spaces, verticalbar"
       end
     end
 
@@ -233,7 +235,7 @@ module ReVIEW
         rows.push(line.strip.split(table_row_separator_regexp).map { |s| s.sub(/\A\./, '') })
       end
       rows = adjust_n_cols(rows)
-      error 'no rows in the table' if rows.empty?
+      app_error 'no rows in the table' if rows.empty?
       [sepidx, rows]
     end
 
@@ -294,19 +296,19 @@ module ReVIEW
     def inline_chapref(id)
       compile_inline(@book.chapter_index.display_string(id))
     rescue KeyError
-      error "unknown chapter: #{id}"
+      app_error "unknown chapter: #{id}"
     end
 
     def inline_chap(id)
       @book.chapter_index.number(id)
     rescue KeyError
-      error "unknown chapter: #{id}"
+      app_error "unknown chapter: #{id}"
     end
 
     def inline_title(id)
       compile_inline(@book.chapter_index.title(id))
     rescue KeyError
-      error "unknown chapter: #{id}"
+      app_error "unknown chapter: #{id}"
     end
 
     def inline_list(id)
@@ -317,7 +319,7 @@ module ReVIEW
         %Q(#{I18n.t('list')}#{I18n.t('format_number_without_chapter', [chapter.list(id).number])})
       end
     rescue KeyError
-      error "unknown list: #{id}"
+      app_error "unknown list: #{id}"
     end
 
     def inline_img(id)
@@ -328,7 +330,7 @@ module ReVIEW
         %Q(#{I18n.t('image')}#{I18n.t('format_number_without_chapter', [chapter.image(id).number])})
       end
     rescue KeyError
-      error "unknown image: #{id}"
+      app_error "unknown image: #{id}"
     end
 
     def inline_imgref(id)
@@ -349,7 +351,7 @@ module ReVIEW
         %Q(#{I18n.t('table')}#{I18n.t('format_number_without_chapter', [chapter.table(id).number])})
       end
     rescue KeyError
-      error "unknown table: #{id}"
+      app_error "unknown table: #{id}"
     end
 
     def inline_eq(id)
@@ -360,13 +362,13 @@ module ReVIEW
         %Q(#{I18n.t('equation')}#{I18n.t('format_number_without_chapter', [chapter.equation(id).number])})
       end
     rescue KeyError
-      error "unknown equation: #{id}"
+      app_error "unknown equation: #{id}"
     end
 
     def inline_fn(id)
       @chapter.footnote(id).content
     rescue KeyError
-      error "unknown footnote: #{id}"
+      app_error "unknown footnote: #{id}"
     end
 
     def inline_bou(str)
@@ -422,7 +424,7 @@ module ReVIEW
         inline_hd_chap(@chapter, id)
       end
     rescue KeyError
-      error "unknown headline: #{id}"
+      app_error "unknown headline: #{id}"
     end
 
     def inline_column(id)
@@ -436,7 +438,7 @@ module ReVIEW
         inline_column_chap(@chapter, id)
       end
     rescue KeyError
-      error "unknown column: #{id}"
+      app_error "unknown column: #{id}"
     end
 
     def inline_column_chap(chapter, id)
@@ -460,7 +462,7 @@ module ReVIEW
       if translated
         escape(translated)
       else
-        warn "word not bound: #{s}"
+        warn "word not bound: #{s}", location: @location
         escape("[missing word: #{s}]")
       end
     end
@@ -496,18 +498,6 @@ module ReVIEW
       end
     end
 
-    def warn(msg)
-      @logger.warn "#{@location}: #{msg}"
-    end
-
-    def error(msg)
-      if msg =~ /:\d+: error: /
-        raise ApplicationError, msg
-      else
-        raise ApplicationError, "#{@location}: error: #{msg}"
-      end
-    end
-
     def handle_metric(str)
       str
     end
@@ -582,7 +572,7 @@ module ReVIEW
 
     def check_nested_minicolumn
       if @doc_status[:minicolumn]
-        error "#{@location}: nested mini-column is not allowed"
+        app_error "#{@location}: nested mini-column is not allowed"
       end
     end
 
@@ -732,18 +722,22 @@ EOTGNUPLOT
       str
     end
 
+    def previous_list_type
+      @compiler.previous_list_type
+    end
+
     def beginchild
       @children ||= []
-      unless @previous_list_type
-        error "//beginchild is shown, but previous element isn't ul, ol, or dl"
+      unless previous_list_type
+        app_error "//beginchild is shown, but previous element isn't ul, ol, or dl"
       end
-      puts "\x01→#{@previous_list_type}←\x01"
-      @children.push(@previous_list_type)
+      puts "\x01→#{previous_list_type}←\x01"
+      @children.push(previous_list_type)
     end
 
     def endchild
       if @children.nil? || @children.empty?
-        error "//endchild is shown, but any opened //beginchild doesn't exist"
+        app_error "//endchild is shown, but any opened //beginchild doesn't exist"
       else
         puts "\x01→/#{@children.pop}←\x01"
       end
@@ -751,7 +745,7 @@ EOTGNUPLOT
 
     def caption_top?(type)
       unless %w[top bottom].include?(@book.config['caption_position'][type])
-        warn("invalid caption_position/#{type} parameter. 'top' is assumed")
+        warn "invalid caption_position/#{type} parameter. 'top' is assumed", location: @location
       end
       @book.config['caption_position'][type] != 'bottom'
     end