X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fltj-base.sty;h=622b387723318635a2079150394f24f02a39a91d;hb=3cc79ca744822a3f5e3f2210d4a5ea469b4971f6;hp=1dc744450f02ea4cb8fa3b27a553164bd384c55e;hpb=71b8a2487f68f9b77e19b7bbc8d673441ef0a230;p=luatex-ja%2Fluatexja.git diff --git a/src/ltj-base.sty b/src/ltj-base.sty index 1dc7444..622b387 100644 --- a/src/ltj-base.sty +++ b/src/ltj-base.sty @@ -13,7 +13,7 @@ \ifltj@in@latex %<*LaTeX> \NeedsTeXFormat{LaTeX2e} - \ProvidesPackage{ltj-base}[2014/07/18] + \ProvidesPackage{ltj-base}[2020-08-04] \fi % %%------------------ Tiny helpers @@ -96,13 +96,6 @@ %! plain であるか. \ltj@csletcs{ifltj@in@plain}{iffalse} -%% \ltj@require@package{}{} -%! サブパッケージを読み込む. LaTeX では \RequirePackage、それ以外では -%! \input を使う. は必須だが空でもよい. -\def\ltj@require@package#1#2{ - \RequirePackage{#1}[#2] -} - %% \ltj@print{} %! 端末への出力. \let\ltj@print\typeout @@ -116,11 +109,6 @@ \ltj@csletcs{ifltj@in@plain}{iffalse} \fi -%% \ltj@require@package{}{} -\def\ltj@require@package#1#2{ - \input #1.sty\relax -} - %% \ltj@print{} \def\ltj@print#1{ \immediate\write16{#1} @@ -256,151 +244,6 @@ %! つまり単なる \luatexescape. \let\ltj@luaxescape\luatexluaescapestring -%%------------------ Fully-expandable error messaging - -%! ixerrtrick パッケージから移植. -%! 展開限定文脈でも使える \PackageError 等. -%! Lua 関数版(luatexja/base.lua 参照)もある. - -%% \ltj@@error@message@a -\begingroup -\def~{ } -\xdef\ltj@@error@message@a{% - Type~~H ~~for immediate help% -}% -\endgroup - -%%<+> \ltj@MessageBreak -% An analogue of \MessageBreak that is used in \ltj@GenericError, etc. -% (\MessageBreak cannot be used there.) -% NB: It is realized as a macro that expands to two instances -% of the character of code 127. This marker is later detected -% by the Lua process. -\begingroup -\lccode42=127 -\lowercase{ - \gdef\ltj@MessageBreak{**} - \directlua{ - luatexja.base._error_set_break("**") - } -} -\endgroup - -%%<+> \ltj@GenericError{}{}{}{} -% A variant of \GenericError that can be used in expansion-only -% situation. The meanings of arguments are the same as the original -% \GenericError. -%%<+> \ltj@PlainError{}{} -% A simpler error messenger available in expansion-only situations. -% It behaves similarly to: -% \errhelp{} -\begingroup -% with the same hack as in \GenericError... -\lccode`\@=`\ % -\lccode`\~=`\ % -\lccode`\}=`\ % -\lccode`\{=`\ % -\catcode`\ =11\relax% -\lowercase{% -\endgroup% -\def\ltj@GenericError#1#2#3#4{% not protected -\directlua{% -luatexja.base._error_set_message("\ltj@luaxescape{#1}",% -"\ltj@luaxescape{#2.^^J^^J#3^^J\ltj@@error@message@a}",% -"\ltj@luaxescape{#4}")% -}% -\ % use csname with four spaces as last expander -} -\def\ {% csname with four spaces -\directlua{% -luatexja.base._error_show(false)% and many spaces trail! - % - % -}% -}% -\def\ltj@PlainError#1#2{% -\directlua{% -luatexja.base._error_set_message(" ",% -"\ltj@luaxescape{#1}",% -"\ltj@luaxescape{#2}")% -}% -\error % again a weird name is used -} -\def\error {% csname with two trailing spaces -\directlua{% -luatexja.base._error_show(true)% and many spaces trail! - % - % -}% -}% -} - -%% \ltj@@error@on@line -\def\ltj@@error@on@line{ - on input line \the \inputlineno -} - -%% \ltj@generic@warn@info -\def\ltj@@generic@warn@info#1#2#3#4{ - \begingroup - \directlua{ - luatexja.base._generic_warn_info("\ltj@luaxescape{#3}", - "\ltj@luaxescape{#4}", (#1 > 0), (#2 > 0)) - } - \endgroup -} - -%% \ltj@GenericWarning{}{} -\def\ltj@GenericWarning{ - \ltj@@generic@warn@info{1}{1} -} -%% \ltj@GenericWarningNoLine{}{} -\def\ltj@GenericWarningNoLine{ - \ltj@@generic@warn@info{1}{0} -} -%% \ltj@GenericInfo{}{} -\def\ltj@GenericInfo{ - \ltj@@generic@warn@info{0}{1} -} -%% \ltj@GenericInfoNoLine{}{} -\def\ltj@GenericInfoNoLine{ - \ltj@@generic@warn@info{0}{0} -} - -%% \ltj@@space@seq@a -\begingroup -\def~{ } -\xdef\ltj@@space@seq@a{~~~~~~~~~~~~~~~~} -\xdef\ltj@@space@seq@b{~~~~~~~~~~~~~} -\endgroup - -%% \ltj@PackageError{}{}{} -\def\ltj@PackageError#1#2#3{% - \ltj@GenericError{(#1)\ltj@@space@seq@a}% - {Package #1 Error: #2}% - {See the #1 package documentation for explanation.}% - {#3}% -} -%% \ltj@PackageWarning{}{} -\def\ltj@PackageWarning#1#2{% - \ltj@GenericWarning{(#1)\ltj@@space@seq@a}% - {Package #1 Warning: #2}% -} -%% \ltj@PackageWarningNoLine{}{} -\def\ltj@PackageWarningNoLine#1#2{% - \ltj@GenericWarningNoLine{(#1)\ltj@@space@seq@a}% - {Package #1 Warning: #2}% -} -%% \ltj@PackageInfo{}{} -\def\ltj@PackageInfo#1#2{% - \ltj@GenericInfo{(#1)\ltj@@space@seq@b}% - {Package #1 Info: #2}% -} -%% \ltj@PackageInfoNoLine{}{} -\def\ltj@PackageInfoNoLine#1#2{% - \ltj@GenericInfoNoLine{(#1)\ltj@@space@seq@b}% - {Package #1 Info: #2}% -} %%------------------ debug logging \ifdefined\LuaTeXjaDebugEnabled @@ -444,19 +287,20 @@ luatexja.base._error_show(true)% and many spaces trail! %% from Sonja Maus, ``Looking Ahead for a '', %% TUGBoat, 11, No. 4, 1990. \newbox\ltj@afbox +\directlua{luatexja.afbox_number=\the\ltj@afbox} \protected\def\ltj@afterbox#1{% \def\ltj@afb@xarg{#1}% \afterassignment\ltj@afb@x - \chardef\next`.} -\def\ltj@afb@x{\futurelet\next\ltj@afb@xtest} + \chardef\ltj@@next`.} +\def\ltj@afb@x{\futurelet\ltj@@next\ltj@afb@xtest} \def\ltj@afb@xtest{% - \ifcase\ifx\next\hbox\tw@\fi - \ifx\next\vbox\tw@\fi - \ifx\next\vtop\tw@\fi - \ifx\next\box\@ne\fi - \ifx\next\copy\@ne\fi - \ifx\next\vsplit\@ne\fi - \ifx\next\lastbox\@ne\fi + \ifcase\ifx\ltj@@next\hbox\tw@\fi + \ifx\ltj@@next\vbox\tw@\fi + \ifx\ltj@@next\vtop\tw@\fi + \ifx\ltj@@next\box\@ne\fi + \ifx\ltj@@next\copy\@ne\fi + \ifx\ltj@@next\vsplit\@ne\fi + \ifx\ltj@@next\lastbox\@ne\fi 0% ``A was ...'' error will be causes by \setbox later anyway. \or\afterassignment\ltj@afb@xarg \or\afterassignment\ltj@afb@xagarg