diff --git a/doc/config.yml.sample b/doc/config.yml.sample index 2c6cc08af..58e6ce225 100644 --- a/doc/config.yml.sample +++ b/doc/config.yml.sample @@ -312,7 +312,8 @@ epubmaker: # texstyle: ["reviewmacro"] # # LaTeX用のdocumentclassを指定する -# review-jsbook.clsのオプションについてはsty/README.mdを参照 +# オプションについてはsty/README.mdを参照 +# デフォルトは印刷用。電子配布版を作るには media=ebook とする # texdocumentclass: ["review-jsbook", "media=print,paper=a5"] # # LaTeX用のコマンドを指定する diff --git a/lib/review/init.rb b/lib/review/init.rb index 4b486b1c7..8353adba5 100644 --- a/lib/review/init.rb +++ b/lib/review/init.rb @@ -18,6 +18,11 @@ def self.execute(*args) new.execute(*args) end + TEX_DOCUMENTCLASS_OPTS = { + 'review-jsbook' => 'media=print,paper=a5', + 'review-jlreq' => 'media=print,paper=a5' + } + def initialize @template = 'review-jsbook' @logger = ReVIEW.logger @@ -148,6 +153,11 @@ def generate_config(dir) content.gsub!(/^#.*epubversion:.*$/, 'epubversion: 2') content.gsub!(/^#.*htmlversion:.*$/, 'htmlversion: 4') end + + if TEX_DOCUMENTCLASS_OPTS[@template] + content.gsub!(/^#\s*texdocumentclass:.*$/, %Q(texdocumentclass: ["#{@template}", "#{TEX_DOCUMENTCLASS_OPTS[@template]}"])) + end + File.open(File.join(dir, 'config.yml'), 'w') { |f| f.write(content) } end diff --git a/lib/review/update.rb b/lib/review/update.rb index 0be76942b..bfa2245fb 100644 --- a/lib/review/update.rb +++ b/lib/review/update.rb @@ -336,6 +336,10 @@ def update_tex_parameters @template = nil else @template = config['texdocumentclass'][0] + + if @template == 'review-jsbook' + update_review_jsbook_opts(yml, config['texdocumentclass'][1]) + end end # no need to update @@ -365,16 +369,7 @@ def update_tex_parameters end flag, modified_opts = convert_documentclass_opts(yml, @template, config['texdocumentclass'][1]) - if flag # successfully converted - @logger.info t("%s: previous 'texdocumentclass' option '%s' is safely replaced with '%s'.", [File.basename(yml), config['texdocumentclass'][1], modified_opts]) - else # something wrong - unless confirm("%s: previous 'texdocumentclass' option '%s' couldn't be converted fully. '%s' is suggested. Do you really proceed?", [File.basename(yml), config['texdocumentclass'][1], modified_opts], nil) - @template = nil - next - end - end - - rewrite_yml(yml, 'texdocumentclass', %Q(["#{@template}", "#{modified_opts}"])) + rewrite_documentclass_opts_by_flag(flag, yml, config['texdocumentclass'][1], modified_opts) else @template = nil @logger.error t("%s: ** 'texdocumentclass' specifies '%s'. Because this is unknown class for this tool, you need to update it by yourself if it won't work. **", [File.basename(yml), config['texdocumentclass'][0]]) @@ -382,6 +377,33 @@ def update_tex_parameters end end + def rewrite_documentclass_opts_by_flag(flag, yml, old_opts, modified_opts) + if flag # successfully converted + @logger.info t("%s: previous 'texdocumentclass' option '%s' is safely replaced with '%s'.", [File.basename(yml), old_opts, modified_opts]) + else # something wrong + unless confirm("%s: previous 'texdocumentclass' option '%s' couldn't be converted fully. '%s' is suggested. Do you really proceed?", [File.basename(yml), old_opts, modified_opts], nil) + @template = nil + return nil + end + end + + rewrite_yml(yml, 'texdocumentclass', %Q(["#{@template}", "#{modified_opts}"])) + end + + def update_review_jsbook_opts(yml, old_opts) + modified_opts = old_opts.gsub(/Q=([^,]+)/, 'fontsize=\1Q'). + gsub(/W=([^,]+)/, 'line_length=\1zw'). + gsub(/L=([^,]+)/, 'number_of_lines=\1'). + gsub(/H=([^,]+)/, 'baselineskip=\1H'). + gsub(/head=([^,]+)/, 'head_space=\1') + + if modified_opts == old_opts + return nil + end + + rewrite_documentclass_opts_by_flag(true, yml, old_opts, modified_opts) + end + def convert_documentclass_opts(yml, cls, prev_opts) # XXX: at this time, review-jsbook and review-jlreq uses same parameters opts = [] @@ -393,13 +415,11 @@ def convert_documentclass_opts(yml, cls, prev_opts) when 'a4j', 'a5j', 'b4j', 'b5j', 'a3paper', 'a4paper', 'a5paper', 'a6paper', 'b4paper', 'b5paper', 'b6paper', 'letterpaper', 'legalpaper', 'executivepaper' opts << "paper=#{v.sub('j', '').sub('paper', '')}" when /[\d.]+ptj/ # not cared... - q = sprintf('%.2f', v.sub('pt', '').to_f * 1.4056) - opts << "Q=#{q}" + opts << "fontsize=#{v.sub('j', '')}" when /[\d.]+pt/ - q = sprintf('%.2f', v.sub('pt', '').to_f * 1.4056) - opts << "Q=#{q}" + opts << "fontsize=#{v}" when /[\d.]+Q/ - opts << "Q=#{v.sub('Q', '')}" + opts << "fontsize=#{v}" when 'landscape', 'oneside', 'twoside', 'vartwoside', 'onecolumn', 'twocolumn', 'titlepage', 'notitlepage', 'openright', 'openany', 'leqno', 'fleqn', 'disablejfam', 'draft', 'final', diff --git a/templates/latex/review-jsbook/review-jsbook.cls b/templates/latex/review-jsbook/review-jsbook.cls index 36003130c..f0a13bcf0 100644 --- a/templates/latex/review-jsbook/review-jsbook.cls +++ b/templates/latex/review-jsbook/review-jsbook.cls @@ -19,9 +19,6 @@ % OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN % THE SOFTWARE. -\ifx\epTeXinputencoding\undefined\else - \epTeXinputencoding utf8 -\fi \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{review-jsbook} [2018/09/30 v3.0 Re:VIEW pLaTeX class modified for jsbook.cls] @@ -82,9 +79,6 @@ \edef\recls@set@js@paper{#1}% \PassOptionsToClass{\recls@set@js@paper}{jsbook}} -\def\recls@disable@jsopt#1{% - \recls@DeclareOption{#1}{\recls@error{option #1: not available}}} - \recls@define@paper{a3}{paper} \recls@define@paper{a4}{paper} \recls@define@paper{a5}{paper} @@ -98,11 +92,55 @@ \recls@define@paper{legal}{paper} \recls@define@paper{executive}{paper} -%% disable some options of jsbook.cls +%% define/set specific fontsize +\def\recls@define@fontsize#1{% + \@namedef{recls@fontsize@#1}{#1}} + +\def\recls@set@fontsize#1{% + \@ifundefined{recls@fontsize@#1}{% + \recls@set@customfontsize{#1}}{\@recls@set@fontsize{#1}}} +\def\@recls@set@fontsize#1{% + \expandafter\expandafter\expandafter + \@@recls@set@fontsize\expandafter\expandafter\expandafter + {\csname recls@fontsize@#1\endcsname}} +\def\@@recls@set@fontsize#1{% + \edef\recls@jsfontsize{#1}% + \ifdim\recls@jsfontsize=\recls@fontsize\else + \recls@warning{jsbook.cls has no such fontsize '\recls@fontsize'.^^J + pass through '\recls@jsfontsize' option to jsbook.cls}% + \fi + \PassOptionsToClass{\recls@jsfontsize}{jsbook}} + +%% NOTE: カスタムフォントサイズの対応は、事実上、止めることにしました。 +\def\recls@set@customfontsize#1{% + \setlength{\@tempdima}{#1}% + \ifdim\@tempdima<8.5pt\recls@set@fontsize{8pt}% + \else\ifdim\@tempdima<9.5pt\recls@set@fontsize{9pt}% + \else\ifdim\@tempdima<10.5pt\recls@set@fontsize{10pt}% + \else\ifdim\@tempdima<11.5pt\recls@set@fontsize{11pt}% + \else\ifdim\@tempdima<12.5pt\recls@set@fontsize{12pt}% + \else\ifdim\@tempdima<13pt\recls@set@fontsize{14pt}% + \else\ifdim\@tempdima<18.5pt\recls@set@fontsize{17pt}% + \else\ifdim\@tempdima<20.5pt\recls@set@fontsize{20pt}% + \else\ifdim\@tempdima<23pt\recls@set@fontsize{21pt}% + \else\ifdim\@tempdima<27.5pt\recls@set@fontsize{25pt}% + \else\ifdim\@tempdima<33pt\recls@set@fontsize{30pt}% + \else\ifdim\@tempdima<39.5pt\recls@set@fontsize{36pt}% + \else\recls@set@fontsize{43pt}% + \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi +} + \@for\recls@tmp:={% - a4j,a5j,b4j,b5j,% 8pt,9pt,10pt,11pt,12pt,14pt,17pt,20pt,21pt,25pt,30pt,36pt,43pt,12Q,14Q,% - 10ptj,10.5ptj,11ptj,12ptj,winjis,mingoth}\do{% + 10ptj,10.5ptj,11ptj,12ptj}\do{% + \expandafter\recls@define@fontsize\expandafter{\recls@tmp}} + +%% disable some options of jsbook.cls +\def\recls@disable@jsopt#1{% + \recls@DeclareOption{#1}{\recls@error{option #1: not available}}} + +\@for\recls@tmp:={% + a4j,a5j,b4j,b5j,winjis,mingoth}\do{% \expandafter\recls@disable@jsopt\expandafter{\recls@tmp}} %% \recls@set@tombowpaper{} @@ -163,7 +201,7 @@ \DeclareOptionX{media}[print]{\gdef\recls@cameraready{#1}} %% 用紙 -\DeclareOptionX{paper}[a5]{\gdef\recls@paper{#1}} +\DeclareOptionX{paper}[a4]{\gdef\recls@paper{#1}} \DeclareOptionX{tombopaper}{% \gdef\recls@tombowopts{}%%default: auto-detect \ifx#1\@empty\else\gdef\recls@tombowopts{tombow-#1}\fi} @@ -173,17 +211,18 @@ %% カスタム用紙サイズ \DeclareOptionX{paperwidth}{\gdef\recls@paperwidth{#1}} \DeclareOptionX{paperheight}{\gdef\recls@paperheight{#1}} -%% 基本版面 QWLH、天、ノド -\DeclareOptionX{Q}[13]{\gdef\recls@Q{#1}} -\DeclareOptionX{W}[35]{\gdef\recls@W{#1}} -\DeclareOptionX{L}[32]{\gdef\recls@L{#1}} -\DeclareOptionX{H}[22]{\gdef\recls@H{#1}} -\DeclareOptionX{head}[\z@]{\gdef\recls@head{#1}}%[18mm] -\DeclareOptionX{gutter}[\z@]{\gdef\recls@gutter{#1}}%[20mm] +%% 基本版面、天、ノド +\DeclareOptionX{fontsize}[10pt]{\gdef\recls@fontsize{#1}} +\DeclareOptionX{line_length}{\gdef\recls@line@length{#1}}%%ベタ組みになるように調整 +\DeclareOptionX{number_of_lines}{\gdef\recls@number@of@lines{#1}} +\DeclareOptionX{baselineskip}{\def\recls@baselineskip{#1}} +\DeclareOptionX{linegap}{\def\recls@linegap{#1}} +\DeclareOptionX{head_space}{\gdef\recls@head@space{#1}} +\DeclareOptionX{gutter}{\gdef\recls@gutter{#1}} %% headheight,headsep,footskip -\DeclareOptionX{headheight}[\z@]{\gdef\recls@headheight{#1}} -\DeclareOptionX{headsep}[\z@]{\gdef\recls@headsep{#1}} -\DeclareOptionX{footskip}[\z@]{\gdef\recls@footskip{#1}} +\DeclareOptionX{headheight}{\gdef\recls@headheight{#1}} +\DeclareOptionX{headsep}{\gdef\recls@headsep{#1}} +\DeclareOptionX{footskip}{\gdef\recls@footskip{#1}} %% 表紙・開始番号・通しノンブル \newif\if@reclscover \@reclscovertrue @@ -194,19 +233,20 @@ \PassOptionsToClass{dvipdfmx,nomag}{jsbook} \DeclareOptionX*{\PassOptionsToClass{\CurrentOption}{jsbook}}% -\ExecuteOptionsX{media,cameraready,hiddenfolio,% +\ExecuteOptionsX{cameraready,media,hiddenfolio,% paper,tombopaper,bleed_margin,paperwidth,paperheight,% - Q,W,L,H,head,gutter,headheight,headsep,footskip,% + fontsize,line_length,number_of_lines,baselineskip,linegap,head_space,% + gutter,headheight,headsep,,footskip,% cover,startpage,serial_pagination} \ProcessOptionsX\relax -%% set specific papersize +%% set specific papersize, fontsize \recls@set@paper{\recls@paper} \recls@set@tombowpaper{\recls@tombowopts} +\recls@set@fontsize{\recls@fontsize} %% camera-ready PDF file preparation for each print, ebook \def\recls@tmp{preview}\ifx\recls@cameraready\recls@tmp -%%FIXME: media=preview の挙動は保留。例：フォント関係を仕込む \@camerareadyfalse\@pdfhyperlinkfalse\@reclscovertrue \else\def\recls@tmp{print}\ifx\recls@cameraready\recls@tmp \@camerareadytrue\@pdfhyperlinkfalse\@reclscoverfalse @@ -215,11 +255,6 @@ \RequirePackage[pdfbox,\recls@tombowopts]{gentombow}% \settombowbleed{\recls@tombobleed}% \recls@set@hiddenfolio{\recls@hiddenfolio}}% - %%FIXME: gentombow upstreamでトンボ版スタイルコマンドが実装されたら、それに置き換えても良いかな。 - % \AtEndOfClass{% - % \PassOptionsToPackage{\recls@tombowopts}{gentombow}% - % \RequirePackage[hiddenfolio=\recls@hiddenfolio,tombobleed=\recls@tombobleed]{gentombow-hiddenfolio}% - % }% }{% \IfFileExists{gentombow09j.sty}{% from vendor/gentombow. \AtEndOfClass{% @@ -247,18 +282,9 @@ \PassOptionsToPackage{uplatex}{otf} \fi\fi -\PassOptionsToClass{10pt}{jsbook}%%<= forcely load 10pt \LoadClass{jsbook} -%%\typeout{!!! mag: \the\mag}%%=> 1000 -> OK - -\IfFileExists{platexrelease.sty}{}{%% is bundled in TL16 or higher release version -\@ifundefined{jsc@setfontsize}{%%compatibility for TL13, TL14, TL15 frozen -\newdimen\jsc@mpt -\jsc@mpt=1\p@ -\def\jsc@setfontsize#1#2#3{% - \@setfontsize#1{#2\jsc@mpt}{#3\jsc@mpt}} -}\relax -} +% \typeout{!!! magscale: \jsc@magscale} +% \typeout{!!! mag: \the\mag}%%=> 1000 -> OK %% override papersize with custom papersize \ifx\recls@paperwidth\@empty\else\ifx\recls@paperheight\@empty\else @@ -269,197 +295,59 @@ \fi \fi\fi -\def\recls@JYn{\if@recls@uptex JY2\else JY1\fi}% -\def\recls@JTn{\if@recls@uptex JT2\else JT1\fi}% -\def\recls@pfx@{\if@recls@uptex up\else \fi}% -\def\recls@sfx@{\if@recls@uptex \else n\fi}% -\def\recls@sc@le{\if@recls@uptex 0.924714\else 0.961026\fi}% -\def\recls@jisrh{\recls@pfx@ jis\if@recls@uptex r-h\fi}% -\def\recls@jisgh{\recls@pfx@ jisg\if@recls@uptex -h\fi}% -\def\recls@jisrv{\recls@pfx@ jis\if@recls@uptex r\fi -v}% -\def\recls@jisgv{\recls@pfx@ jisg-v}% - -\expandafter\let\csname\recls@JYn/mc/m/n/10\endcsname\relax -\expandafter\let\csname\recls@JYn/gt/m/n/10\endcsname\relax - -%% calculate font size scaler -\@tempdima=13\dimexpr 13\p@\relax -\@tempdimb=\recls@Q\dimexpr\recls@Q\p@\relax -\@settopoint\@tempdima \@settopoint\@tempdimb -\@tempcnta=\strip@pt\@tempdima\relax -\@tempcntb=\strip@pt\@tempdimb\relax -\@tempdima=\dimexpr\@tempcntb\p@/\@tempcnta\relax -\recls@get@p@{\@tempdima}{\recls@fnt@scale}% \typeout{!!! \recls@fnt@scale}% - -\RequirePackage{lmodern} - -\newdimen\JQ \JQ=1.08141Q\relax - -%% declare relative font definitions -%% : mc (reserved), gt (reserved), mgt? -%% : m (reserved), bx (reserved), eb? -%% : n (reserved) -%% JYn -\DeclareFontShape{\recls@JYn}{mc}{m}{n}{% - <-> s * [\recls@sc@le] \recls@jisrh -}{} -\DeclareFontShape{\recls@JYn}{gt}{m}{n}{% - <-> s * [\recls@sc@le] \recls@jisgh -}{} -\DeclareFontShape{\recls@JYn}{mc}{bx}{n}{<->ssub*gt/m/n}{} -\DeclareFontShape{\recls@JYn}{gt}{bx}{n}{<->ssub*gt/m/n}{} -%% JTn -\DeclareFontShape{\recls@JTn}{mc}{m}{n}{% - <-> s * [\recls@sc@le] \recls@jisrv -}{} -\DeclareFontShape{\recls@JTn}{gt}{m}{n}{% - <-> s * [\recls@sc@le] \recls@jisgv -}{} -\DeclareFontShape{\recls@JTn}{mc}{bx}{n}{<->ssub*gt/m/n}{} -\DeclareFontShape{\recls@JTn}{gt}{bx}{n}{<->ssub*gt/m/n}{} -%% it -\DeclareFontShape{\recls@JYn}{mc}{m}{it}{<->ssub*mc/m/n}{} -\DeclareFontShape{\recls@JYn}{mc}{bx}{it}{<->ssub*mc/bx/n}{} -\DeclareFontShape{\recls@JYn}{gt}{m}{it}{<->ssub*gt/m/n}{} -\DeclareFontShape{\recls@JYn}{gt}{bx}{it}{<->ssub*gt/bx/n}{} -\DeclareFontShape{\recls@JTn}{mc}{m}{it}{<->ssub*mc/m/n}{} -\DeclareFontShape{\recls@JTn}{mc}{bx}{it}{<->ssub*mc/bx/n}{} -\DeclareFontShape{\recls@JTn}{gt}{m}{it}{<->ssub*gt/m/n}{} -\DeclareFontShape{\recls@JTn}{gt}{bx}{it}{<->ssub*gt/bx/n}{} -%% sl -\DeclareFontShape{\recls@JYn}{mc}{m}{sl}{<->ssub*mc/m/n}{} -\DeclareFontShape{\recls@JYn}{mc}{bx}{sl}{<->ssub*mc/bx/n}{} -\DeclareFontShape{\recls@JYn}{gt}{m}{sl}{<->ssub*gt/m/n}{} -\DeclareFontShape{\recls@JYn}{gt}{bx}{sl}{<->ssub*gt/bx/n}{} -\DeclareFontShape{\recls@JTn}{mc}{m}{sl}{<->ssub*mc/m/n}{} -\DeclareFontShape{\recls@JTn}{mc}{bx}{sl}{<->ssub*mc/bx/n}{} -\DeclareFontShape{\recls@JTn}{gt}{m}{sl}{<->ssub*gt/m/n}{} -\DeclareFontShape{\recls@JTn}{gt}{bx}{sl}{<->ssub*gt/bx/n}{} -%% sc -\DeclareFontShape{\recls@JYn}{mc}{m}{sc}{<->ssub*mc/m/n}{} -\DeclareFontShape{\recls@JYn}{mc}{bx}{sc}{<->ssub*mc/bx/n}{} -\DeclareFontShape{\recls@JYn}{gt}{m}{sc}{<->ssub*gt/m/n}{} -\DeclareFontShape{\recls@JYn}{gt}{bx}{sc}{<->ssub*gt/bx/n}{} -\DeclareFontShape{\recls@JTn}{mc}{m}{sc}{<->ssub*mc/m/n}{} -\DeclareFontShape{\recls@JTn}{mc}{bx}{sc}{<->ssub*mc/bx/n}{} -\DeclareFontShape{\recls@JTn}{gt}{m}{sc}{<->ssub*gt/m/n}{} -\DeclareFontShape{\recls@JTn}{gt}{bx}{sc}{<->ssub*gt/bx/n}{} - -\renewcommand{\normalsize}{% - \jsc@setfontsize\normalsize{\recls@Q\JQ}{\recls@H H} - \abovedisplayskip 11\jsc@mpt \@plus3\jsc@mpt \@minus4\jsc@mpt - \abovedisplayshortskip \z@ \@plus3\jsc@mpt - \belowdisplayskip 9\jsc@mpt \@plus3\jsc@mpt \@minus4\jsc@mpt - \belowdisplayshortskip \belowdisplayskip - \let\@listi\@listI} -\hyphenpenalty\@M\relax -\exhyphenpenalty\@M\relax -\normalsize - -\setbox0\hbox{\char\jis"3441}%" -\setlength\Cht{\ht0} -\setlength\Cdp{\dp0} -\setlength\Cwd{\wd0} -\setlength\Cvs{\baselineskip} -\setlength\Chs{\wd0} -\setbox0=\box\voidb@x - -\renewcommand{\small}{% - \ifnarrowbaselines - \jsc@setfontsize\small - {\dimexpr\recls@Q\JQ - 1\JQ}{1.5\dimexpr\recls@Q H - 3H}% - \else - \jsc@setfontsize\small - {\dimexpr\recls@Q\JQ - 1\JQ}{1.5\dimexpr\recls@Q H - 1H}% - \fi - \abovedisplayskip 9\jsc@mpt \@plus3\jsc@mpt \@minus4\jsc@mpt - \abovedisplayshortskip \z@ \@plus3\jsc@mpt - \belowdisplayskip \abovedisplayskip - \belowdisplayshortskip \belowdisplayskip - \def\@listi{\leftmargin\leftmargini - \topsep \z@ - \parsep \z@ - \itemsep \parsep}} - -\renewcommand{\footnotesize}{% - \ifnarrowbaselines - \jsc@setfontsize\footnotesize - {\dimexpr\recls@Q\JQ - 2\JQ}{1.5\dimexpr\recls@Q H - 3H}% - \else - \jsc@setfontsize\footnotesize - {\dimexpr\recls@Q\JQ - 2\JQ}{1.5\dimexpr\recls@Q H - 2H}% - \fi - \abovedisplayskip 6\jsc@mpt \@plus2\jsc@mpt \@minus3\jsc@mpt - \abovedisplayshortskip \z@ \@plus2\jsc@mpt - \belowdisplayskip \abovedisplayskip - \belowdisplayshortskip \belowdisplayskip - \def\@listi{\leftmargin\leftmargini - \topsep \z@ - \parsep \z@ - \itemsep \parsep}} - -\renewcommand{\scriptsize}{\jsc@setfontsize\scriptsize - {\dimexpr\recls@Q\JQ - 3\JQ}{1.25\dimexpr\recls@Q H - 3H}} -\renewcommand{\tiny}{\jsc@setfontsize\tiny - {.5\dimexpr\recls@Q\JQ}{.5\dimexpr\recls@Q H + 2H}} -\if@twocolumn - \renewcommand{\large}{\@setfontsize\large - {\recls@fnt@scale\dimexpr 18\JQ}{\n@baseline}} -\else - \renewcommand{\large}{\@setfontsize\large - {\recls@fnt@scale\dimexpr 18\JQ}{\recls@fnt@scale\dimexpr 27H}} +%% baseline +\ifx\recls@linegap\@empty\else + \setlength{\baselineskip}{\dimexpr\Cwd+\recls@linegap} +\fi +\ifx\recls@baselineskip\@empty\else + \setlength{\baselineskip}{\recls@baselineskip} \fi -\renewcommand{\Large}{\@setfontsize\Large - {\recls@fnt@scale\dimexpr 20\JQ}{\recls@fnt@scale\dimexpr 30H}} -\renewcommand{\LARGE}{\@setfontsize\LARGE - {\recls@fnt@scale\dimexpr 24\JQ}{\recls@fnt@scale\dimexpr 36H}} -\renewcommand{\huge}{\@setfontsize\huge - {\recls@fnt@scale\dimexpr 28\JQ}{\recls@fnt@scale\dimexpr 42H}} -\renewcommand{\Huge}{\@setfontsize\Huge - {\recls@fnt@scale\dimexpr 32\JQ}{\recls@fnt@scale\dimexpr 48H}} -\renewcommand{\HUGE}{\jsc@setfontsize\HUGE - {\recls@fnt@scale\dimexpr 36\JQ}{\recls@fnt@scale\dimexpr 54H}} +\setlength{\Cvs}{\baselineskip} %% headheight, headsep, footskip \setlength\topskip{\Cht} -\ifdim\recls@headheight>\z@\relax\setlength\headheight{\recls@headheight}\fi -\ifdim\recls@headsep>\z@\relax\setlength\headsep{\recls@headsep}\fi -\ifdim\recls@footskip>\z@\relax\setlength\footskip{\recls@footskip}\fi +\ifx\recls@headheight\@empty\else\setlength\headheight{\recls@headheight}\fi +\ifx\recls@headsep\@empty\else\setlength\headsep{\recls@headsep}\fi +\ifx\recls@footskip\@empty\else\setlength\footskip{\recls@footskip}\fi \setlength\maxdepth{.5\topskip} %% 字詰め数、行数 -\setlength\textwidth{\recls@W\Cwd} -\setlength\textheight{\recls@L\Cvs} -\addtolength\textheight{-\Cvs}\addtolength\textheight{\Cwd} -\addtolength\textheight{1H}%.5H - -\setlength\fullwidth{\textwidth} +\ifx\recls@line@length\@empty\else + \@tempcnta\dimexpr\recls@line@length/\Cwd\relax + \setlength\textwidth{\@tempcnta\Cwd} + \setlength\fullwidth{\textwidth} +\fi +\ifx\recls@number@of@lines\@empty\else + \setlength\textheight{\recls@number@of@lines\Cvs} + \addtolength\textheight{-\Cvs}\addtolength\textheight{\Cwd} + \addtolength\textheight{1H} +\fi %% ノド、小口 -\ifdim\recls@gutter>\z@ -\setlength\oddsidemargin{\recls@gutter}%ノド -\addtolength\oddsidemargin{-1in} -\setlength\evensidemargin{\paperwidth} -\addtolength\evensidemargin{-2in} -\addtolength\evensidemargin{-\oddsidemargin} -\addtolength\evensidemargin{-\textwidth} +\ifx\recls@gutter\@empty + \setlength\oddsidemargin\paperwidth + \addtolength\oddsidemargin{-\fullwidth}%%line_lengthを与えたとき\textwidth + \setlength\oddsidemargin{.5\oddsidemargin} + \addtolength\oddsidemargin{-1in} + \setlength\evensidemargin\oddsidemargin + \edef\recls@gutter{\evensidemargin} \else -\setlength\oddsidemargin\paperwidth -\addtolength\oddsidemargin{-\textwidth} -\setlength\oddsidemargin{.5\oddsidemargin} -\addtolength\oddsidemargin{-1in} -\setlength\evensidemargin\oddsidemargin -\edef\recls@gutter{\evensidemargin} + \setlength\oddsidemargin{\recls@gutter}%ノド + \addtolength\oddsidemargin{-1in} + \setlength\evensidemargin{\paperwidth} + \addtolength\evensidemargin{-2in} + \addtolength\evensidemargin{-\oddsidemargin} + \addtolength\evensidemargin{-\textwidth} \fi %% 天、地 -\ifdim\recls@head>\z@ -\setlength\topmargin{\recls@head}%天 +\ifx\recls@head@space\@empty + \setlength\topmargin\paperheight + \addtolength\topmargin{-\textheight} + \edef\recls@head@space{\dimexpr\topmargin+1in+\headheight+\headsep} + \setlength\topmargin{.5\topmargin} \else -\setlength\topmargin\paperheight -\addtolength\topmargin{-\textheight} -\edef\recls@head{\dimexpr\topmargin+1in+\headheight+\headsep} -\setlength\topmargin{.5\topmargin} + \setlength\topmargin{\recls@head@space}%天 \fi \addtolength\topmargin{-1in} \addtolength\topmargin{-\headheight}\addtolength\topmargin{-\headsep} @@ -476,7 +364,7 @@ %% more useful macros %% ---------- %% include fullpage graphics -\let\grnchry@head\recls@head +\let\grnchry@head\recls@head@space \let\grnchry@gutter\recls@gutter \newcommand*\includefullpagegraphics{% \clearpage diff --git a/test/test_update.rb b/test/test_update.rb index b28fa8fb2..f140f9ade 100644 --- a/test/test_update.rb +++ b/test/test_update.rb @@ -234,7 +234,7 @@ def test_update_tex_parameters_jsbook_to_review_jsbook assert_match(/By default it is migrated to/, io.string) assert_match(/is safely replaced/, io.string) cont = <