From daa6873fe1d06863ffc2980970295b39071f02ba Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sat, 19 Jun 2021 03:01:48 +0000 Subject: CTAN sync 202106190301 --- macros/latex/contrib/acrotex-js/README.md | 13 + macros/latex/contrib/acrotex-js/acrotex-js.dtx | 83 +++++ macros/latex/contrib/acrotex-js/acrotex-js.ins | 60 ++++ .../latex/contrib/acrotex-js/docs/acrotex-js.pdf | Bin 0 -> 203759 bytes .../contrib/acrotex-js/docs/install_jsfiles.pdf | Bin 0 -> 188602 bytes .../contrib/acrotex-js/docs/install_jsfiles.tex | 333 +++++++++++++++++++++ macros/latex/contrib/acrotex-js/js-files/aeb.js | 24 ++ .../latex/contrib/acrotex-js/js-files/aeb_pro.js | 177 +++++++++++ macros/latex/contrib/huawei/cd | 0 macros/latex/contrib/l3kernel/CHANGELOG.md | 12 +- macros/latex/contrib/l3kernel/README.md | 2 +- macros/latex/contrib/l3kernel/expl3.dtx | 4 +- macros/latex/contrib/l3kernel/expl3.pdf | Bin 623452 -> 623657 bytes macros/latex/contrib/l3kernel/interface3.pdf | Bin 1721217 -> 1721426 bytes macros/latex/contrib/l3kernel/interface3.tex | 2 +- macros/latex/contrib/l3kernel/l3basics.dtx | 2 +- macros/latex/contrib/l3kernel/l3bootstrap.dtx | 2 +- macros/latex/contrib/l3kernel/l3box.dtx | 2 +- macros/latex/contrib/l3kernel/l3candidates.dtx | 2 +- macros/latex/contrib/l3kernel/l3cctab.dtx | 2 +- macros/latex/contrib/l3kernel/l3clist.dtx | 2 +- macros/latex/contrib/l3kernel/l3coffins.dtx | 2 +- macros/latex/contrib/l3kernel/l3color.dtx | 2 +- macros/latex/contrib/l3kernel/l3debug.dtx | 2 +- macros/latex/contrib/l3kernel/l3deprecation.dtx | 2 +- macros/latex/contrib/l3kernel/l3doc.dtx | 2 +- macros/latex/contrib/l3kernel/l3docstrip.dtx | 2 +- macros/latex/contrib/l3kernel/l3docstrip.pdf | Bin 151731 -> 151926 bytes macros/latex/contrib/l3kernel/l3expan.dtx | 2 +- macros/latex/contrib/l3kernel/l3file.dtx | 2 +- macros/latex/contrib/l3kernel/l3flag.dtx | 2 +- macros/latex/contrib/l3kernel/l3fp-assign.dtx | 2 +- macros/latex/contrib/l3kernel/l3fp-aux.dtx | 2 +- macros/latex/contrib/l3kernel/l3fp-basics.dtx | 2 +- macros/latex/contrib/l3kernel/l3fp-convert.dtx | 2 +- macros/latex/contrib/l3kernel/l3fp-expo.dtx | 2 +- macros/latex/contrib/l3kernel/l3fp-extended.dtx | 2 +- macros/latex/contrib/l3kernel/l3fp-logic.dtx | 2 +- macros/latex/contrib/l3kernel/l3fp-parse.dtx | 2 +- macros/latex/contrib/l3kernel/l3fp-random.dtx | 2 +- macros/latex/contrib/l3kernel/l3fp-round.dtx | 2 +- macros/latex/contrib/l3kernel/l3fp-traps.dtx | 2 +- macros/latex/contrib/l3kernel/l3fp-trig.dtx | 2 +- macros/latex/contrib/l3kernel/l3fp.dtx | 2 +- macros/latex/contrib/l3kernel/l3fparray.dtx | 2 +- macros/latex/contrib/l3kernel/l3int.dtx | 2 +- macros/latex/contrib/l3kernel/l3intarray.dtx | 2 +- .../latex/contrib/l3kernel/l3kernel-functions.dtx | 2 +- macros/latex/contrib/l3kernel/l3keys.dtx | 2 +- macros/latex/contrib/l3kernel/l3legacy.dtx | 2 +- macros/latex/contrib/l3kernel/l3luatex.dtx | 2 +- macros/latex/contrib/l3kernel/l3msg.dtx | 2 +- macros/latex/contrib/l3kernel/l3names.dtx | 2 +- macros/latex/contrib/l3kernel/l3news.pdf | Bin 395907 -> 395907 bytes macros/latex/contrib/l3kernel/l3news01.pdf | Bin 122713 -> 122713 bytes macros/latex/contrib/l3kernel/l3news02.pdf | Bin 150672 -> 150672 bytes macros/latex/contrib/l3kernel/l3news03.pdf | Bin 148707 -> 148707 bytes macros/latex/contrib/l3kernel/l3news04.pdf | Bin 114588 -> 114588 bytes macros/latex/contrib/l3kernel/l3news05.pdf | Bin 112485 -> 112485 bytes macros/latex/contrib/l3kernel/l3news06.pdf | Bin 151572 -> 151572 bytes macros/latex/contrib/l3kernel/l3news07.pdf | Bin 128312 -> 128312 bytes macros/latex/contrib/l3kernel/l3news08.pdf | Bin 163455 -> 163455 bytes macros/latex/contrib/l3kernel/l3news09.pdf | Bin 250134 -> 250134 bytes macros/latex/contrib/l3kernel/l3news10.pdf | Bin 150289 -> 150289 bytes macros/latex/contrib/l3kernel/l3news11.pdf | Bin 170069 -> 170069 bytes macros/latex/contrib/l3kernel/l3news12.pdf | Bin 204992 -> 204992 bytes macros/latex/contrib/l3kernel/l3pdf.dtx | 2 +- macros/latex/contrib/l3kernel/l3prefixes.pdf | Bin 80464 -> 80464 bytes macros/latex/contrib/l3kernel/l3prg.dtx | 2 +- macros/latex/contrib/l3kernel/l3prop.dtx | 2 +- macros/latex/contrib/l3kernel/l3quark.dtx | 2 +- macros/latex/contrib/l3kernel/l3regex.dtx | 2 +- macros/latex/contrib/l3kernel/l3seq.dtx | 2 +- macros/latex/contrib/l3kernel/l3skip.dtx | 2 +- macros/latex/contrib/l3kernel/l3sort.dtx | 2 +- macros/latex/contrib/l3kernel/l3str-convert.dtx | 2 +- macros/latex/contrib/l3kernel/l3str.dtx | 2 +- macros/latex/contrib/l3kernel/l3styleguide.pdf | Bin 296155 -> 296381 bytes macros/latex/contrib/l3kernel/l3styleguide.tex | 2 +- macros/latex/contrib/l3kernel/l3syntax-changes.pdf | Bin 242838 -> 243052 bytes macros/latex/contrib/l3kernel/l3syntax-changes.tex | 2 +- macros/latex/contrib/l3kernel/l3sys.dtx | 4 +- macros/latex/contrib/l3kernel/l3term-glossary.pdf | Bin 231224 -> 231439 bytes macros/latex/contrib/l3kernel/l3term-glossary.tex | 2 +- macros/latex/contrib/l3kernel/l3text-case.dtx | 43 ++- macros/latex/contrib/l3kernel/l3text-purify.dtx | 2 +- macros/latex/contrib/l3kernel/l3text.dtx | 35 ++- macros/latex/contrib/l3kernel/l3tl-analysis.dtx | 2 +- macros/latex/contrib/l3kernel/l3tl.dtx | 2 +- macros/latex/contrib/l3kernel/l3token.dtx | 2 +- macros/latex/contrib/l3kernel/l3unicode.dtx | 2 +- macros/latex/contrib/l3kernel/source3.pdf | Bin 6837890 -> 6840646 bytes macros/latex/contrib/l3kernel/source3.tex | 2 +- macros/latex/contrib/l3packages/CHANGELOG.md | 9 +- macros/latex/contrib/l3packages/README.md | 2 +- macros/latex/contrib/l3packages/l3keys2e.dtx | 4 +- macros/latex/contrib/l3packages/l3keys2e.pdf | Bin 369315 -> 369536 bytes macros/latex/contrib/l3packages/xfp.dtx | 4 +- macros/latex/contrib/l3packages/xfp.pdf | Bin 331713 -> 331906 bytes macros/latex/contrib/l3packages/xfrac.dtx | 4 +- macros/latex/contrib/l3packages/xfrac.pdf | Bin 484860 -> 485047 bytes macros/latex/contrib/l3packages/xparse.dtx | 18 +- macros/latex/contrib/l3packages/xparse.pdf | Bin 534253 -> 534451 bytes macros/latex/contrib/l3packages/xtemplate.dtx | 4 +- macros/latex/contrib/l3packages/xtemplate.pdf | Bin 440078 -> 440264 bytes macros/xetex/generic/xetexko/ChangeLog | 7 + macros/xetex/generic/xetexko/README | 7 +- macros/xetex/generic/xetexko/xetexko-doc.pdf | Bin 254038 -> 255904 bytes macros/xetex/generic/xetexko/xetexko-doc.tex | 13 +- macros/xetex/generic/xetexko/xetexko.sty | 294 +++++++++--------- 110 files changed, 1023 insertions(+), 247 deletions(-) create mode 100644 macros/latex/contrib/acrotex-js/README.md create mode 100644 macros/latex/contrib/acrotex-js/acrotex-js.dtx create mode 100644 macros/latex/contrib/acrotex-js/acrotex-js.ins create mode 100644 macros/latex/contrib/acrotex-js/docs/acrotex-js.pdf create mode 100644 macros/latex/contrib/acrotex-js/docs/install_jsfiles.pdf create mode 100644 macros/latex/contrib/acrotex-js/docs/install_jsfiles.tex create mode 100644 macros/latex/contrib/acrotex-js/js-files/aeb.js create mode 100644 macros/latex/contrib/acrotex-js/js-files/aeb_pro.js delete mode 100644 macros/latex/contrib/huawei/cd (limited to 'macros') diff --git a/macros/latex/contrib/acrotex-js/README.md b/macros/latex/contrib/acrotex-js/README.md new file mode 100644 index 0000000000..2a2bb095aa --- /dev/null +++ b/macros/latex/contrib/acrotex-js/README.md @@ -0,0 +1,13 @@ +The acrotex-js Package +Author: D. P. Story +Dated: 2021-06-18 + +In the distribution of this package are two critical JavaScript files (aeb.js +and aeb_pro.js) used by the packages insdljs, aeb_pro, thorshammer, and +docassembly. Previously these JS files where distributed with the individual +packages, now they are distributed by this package and must be installed according +to the instructions in the docs folder. + + +dps + diff --git a/macros/latex/contrib/acrotex-js/acrotex-js.dtx b/macros/latex/contrib/acrotex-js/acrotex-js.dtx new file mode 100644 index 0000000000..950d7cb6a5 --- /dev/null +++ b/macros/latex/contrib/acrotex-js/acrotex-js.dtx @@ -0,0 +1,83 @@ +%\iffalse +%<*copyright> +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% acrotex-js.sty package %% +%% Copyright (C) 2021 %% +%% dpstory@acrotex.net %% +%% %% +%% This program can redistributed and/or modified under %% +%% the terms of the LaTeX Project Public License %% +%% Distributed from CTAN archives in directory %% +%% macros/latex/base/lppl.txt; either version 1 of the %% +%% License, or (at your option) any later version. %% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%\NeedsTeXFormat{LaTeX2e}[1997/12/01] +%\ProvidesPackage{acrotex-js} +% [2021/06/18 v1.0 acrotex-js: A library of JavaScript files (dps)] +%<*driver> +\documentclass{ltxdoc} +\usepackage[colorlinks,hyperindex=false]{hyperref} +\hypersetup{pdfpagemode=UseNone} +%\pdfstringdefDisableCommands{\let\\\textbackslash} +%\EnableCrossrefs \CodelineIndex +\OnlyDescription % comment out for implementation details +\EnableCrossrefs +\CodelineIndex +\RecordChanges +\InputIfFileExists{aebdocfmt.def}{\PackageInfo{web}{Inputting aebdocfmt.def}} + {\def\IndexOpt{\DescribeMacro}\def\IndexKey{\DescribeMacro}\let\setupFullwidth\relax + \PackageInfo{web}{aebdocfmt.def cannot be found}} +\begin{document} +\def\CMD#1{\textbackslash#1} +\let\pkg\textsf +\let\opt\texttt +\let\app\textsf +\addtolength{\marginparwidth}{3pt} + \GetFileInfo{acrotex-js.sty} + \title{\texorpdfstring{\protect\pkg{acrotex-js}}{acrotex-js}: Formatting for mobile devices} + \author{D. P. Story\\ + Email: \texttt{dpstory@acrotex.net}} + \date{processed \today} + \maketitle + \tableofcontents + \DocInput{acrotex-js.dtx} +\IfFileExists{\jobname.ind}{\newpage\setupFullwidth\par\PrintIndex}{\paragraph*{Index} The index goes here.\\Execute + \texttt{makeindex -s gind.ist -o acrotex-js.ind acrotex-js.idx} on the command line and recompile + \texttt{acrotex-js.dtx}.} +\IfFileExists{\jobname.gls}{\PrintChanges}{\paragraph*{Change History} The list of changes goes here.\\Execute + \texttt{makeindex -s gglo.ist -o acrotex-js.gls acrotex-js.glo} on the command line and recompile + \texttt{acrotex-js.dtx}.} +\end{document} +% +% \fi +% \MakeShortVerb{|} +% \InputIfFileExists{aebdonotindex.def}{\PackageInfo{web}{Inputting aebdonotindex.def}} +% {\PackageInfo{web}{cannot find aebdonotindex.def}} +% \section*{Commentary} +% This file is a dummy {\LaTeX} package. The output of \pkg{acrotex-js} produces no document +% that is consumed by any {\LaTeX} engine. At the time of first publication of this ``package'' +% distributes the JavaScript files \texttt{aeb.js} and \texttt{aeb\_pro.js} (found in the +% \texttt{js-files} folder of this distribution) and provides documentation of how to +% install it, refer to \texttt{docs/install\_jsfiles.pdf}. +% +% \paragraph*{Packages that require this JS files.} The following is a list of packages +% that require the proper installation of the JS files provided by this package. +% \begin{itemize} +% \item \texttt{aeb.js}: Required by the \pkg{insdljs} package,\footnote{Or, any package that uses \pkg{insdljs}.} +% but for only for owners of the \app{Acrobat} application \emph{and} who use the +% \textsf{dvips \texttt{->} Adobe Distiller} +% or \textsf{dvips \texttt{->} ps2pdf} workflow.\footnote{There is no harm in the routine installation of this +% file even if you don't use \app{Distiller} or \app{ps2pdf}.} +% \item \texttt{aeb\_pro.js}: Required by the \pkg{aeb\_pro}, \pkg{thorshammer}, and \pkg{docassembly} packages. +% \end{itemize} +% In all cases, the JS files must be correctly installed for the above packages for them to perform as designed. +% Refer to \texttt{docs/install\_jsfiles.pdf} for installation instructions. +% +% \changes{v1.0}{2021/06/18}{First publication version} +% \begin{macrocode} +%<*package> +% noop +% +% \end{macrocode} +\endinput diff --git a/macros/latex/contrib/acrotex-js/acrotex-js.ins b/macros/latex/contrib/acrotex-js/acrotex-js.ins new file mode 100644 index 0000000000..2f358ca317 --- /dev/null +++ b/macros/latex/contrib/acrotex-js/acrotex-js.ins @@ -0,0 +1,60 @@ +%% +%% This file will generate fast loadable files and documentation +%% driver files from the doc files in this package when run through +%% LaTeX or TeX. +%% +%% Copyright 1999-2012 D. P. Story +%% +%% This file is part of the `AcroTeX eDucation Bundle'. +%% ------------------------------------------- +%% +%% It may be distributed under the conditions of the LaTeX Project Public +%% License, either version 1.2 of this license or (at your option) any +%% later version. The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.2 or later is part of all distributions of LaTeX +%% version 1999/12/01 or later. +%% +%% --------------- start of docstrip commands ------------------ +%% +\def\filedate{2018/04/26} +\def\batchfile{acrotex-js.ins} + +\input docstrip +\ifx\generate\undefined + \Msg{**********************************************} + \Msg{*} + \Msg{* This installation requires docstrip} + \Msg{* version 2.4 or later.} + \Msg{*} + \Msg{* An older version of docstrip has been input} + \Msg{*} + \Msg{**********************************************} + \errhelp{Move or rename old docstrip.tex and get a newer one.} + \errmessage{Old docstrip in input path} + \batchmode + \csname @@end\endcsname\end +\fi + +\keepsilent +\askforoverwritefalse +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\preamble +\endpreamble + +\generate +{% + \file{acrotex-js.sty}{\from{acrotex-js.dtx}{copyright,package}} +} + +\Msg{***************************************************************} +\Msg{*} +\Msg{* \space To finish the installation you have to copy the files } +\Msg{*} +\Msg{* \space *.sty, *.cfg and *.def into a directory searched by TeX} +\Msg{*} +\Msg{***************************************************************} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\endinput diff --git a/macros/latex/contrib/acrotex-js/docs/acrotex-js.pdf b/macros/latex/contrib/acrotex-js/docs/acrotex-js.pdf new file mode 100644 index 0000000000..fd3da4b47d Binary files /dev/null and b/macros/latex/contrib/acrotex-js/docs/acrotex-js.pdf differ diff --git a/macros/latex/contrib/acrotex-js/docs/install_jsfiles.pdf b/macros/latex/contrib/acrotex-js/docs/install_jsfiles.pdf new file mode 100644 index 0000000000..f4f1b89a47 Binary files /dev/null and b/macros/latex/contrib/acrotex-js/docs/install_jsfiles.pdf differ diff --git a/macros/latex/contrib/acrotex-js/docs/install_jsfiles.tex b/macros/latex/contrib/acrotex-js/docs/install_jsfiles.tex new file mode 100644 index 0000000000..bae522243b --- /dev/null +++ b/macros/latex/contrib/acrotex-js/docs/install_jsfiles.tex @@ -0,0 +1,333 @@ +\documentclass{article} +\usepackage[fleqn]{amsmath} +% +% the driver line is not necessary if you +% have aebpro.cfg configured to your driver. +% +\usepackage[web]{aeb_pro} +\usepackage{eforms} +\usepackage[altbullet]{lucidbry} +\usepackage{pifont} +\usepackage{fancyvrb} + +\ifpdf\def\x{% + \usepackage[T1]{fontenc} + \usepackage[altbullet]{lucidabr}} + \let\copyright\textcopyright +\else\def\x{% + \usepackage[altbullet]{lucidbry}} + \usepackage[active]{srcltx} +\fi\x + + + +\makeatletter +\renewcommand{\paragraph} + {\@startsection{paragraph}{4}{0pt}{6pt}{-3pt} + {\normalfont\normalsize\bfseries}} +\renewcommand{\subparagraph} + {\@startsection{subparagraph}{5}{\parindent}{6pt}{-3pt}% + {\normalfont\normalsize\bfseries}} +\makeatother + +\mathindent\parindent + +\def\AEBP{\app{AeB Pro}} +\def\AEB{\app{AeB}} +\def\app#1{\textsf{#1}} +\def\amtIndent{\parindent} +\def\meta#1{$\langle\textit{\texttt{#1}}\rangle$} +\def\SC#1{{\small#1}} +\def\PDF{\SC{PDF}} +\let\opt\texttt +\let\pkg\textsf + +\def\copyGetPath{\qquad\pushButton[\TU{Copy app.getPath to console} +\CA{getPath}\A{\JS{console.show();\r +console.println('\\napp.getPath("user");'); +}}]{cpyGtPth}{}{11bp}} + +\def\copyGetPathJS{\qquad\pushButton[\TU{Copy app.getPath to console} +\CA{getPath}\A{\JS{console.show();\r +console.println('\\napp.getPath("user", "javascript");'); +}}]{cpyGtPthJS}{}{11bp}} + +%\reversemarginpar +\def\jsSupInstr{How to install JavaScript support files} +\title{\jsSupInstr} +\author{D. P. Story} +\version{1.0} + +\chngDocObjectTo{\newDO}{doc} +\begin{docassembly} +var titleOfManual="How to install JavaScript files"; +var manualfilename="Manual_BG_Print_jsfiles.pdf"; +var manualtemplate="Manual_BG_Brown.pdf"; // Blue, Green, Brown +var _pathToBlank="C:/Users/Public/Documents/ManualBGs/"+manualtemplate; +var doc; +var buildIt=false; +if ( buildIt ) { + console.println("Creating new " + manualfilename + " file."); + doc = \appopenDoc({cPath: _pathToBlank, bHidden: true}); + var _path=this.path; + var pos=_path.lastIndexOf("/"); + _path=_path.substring(0,pos)+"/"+manualfilename; + \docSaveAs\newDO ({ cPath: _path }); + doc.closeDoc(); + doc = \appopenDoc({cPath: manualfilename, oDoc:this, bHidden: true}); + f=doc.getField("ManualTitle"); + f.value=titleOfManual; + doc.flattenPages(); + \docSaveAs\newDO({ cPath: manualfilename }); + doc.closeDoc(); +} else { + console.println("Using the current "+manualfilename+" file."); +} +\retnAbsPathAs(_path); +_path += "/"+manualfilename; +var _path=this.path; +var pos=_path.lastIndexOf("/"); +_path=_path.substring(0,pos)+"/"+manualfilename; +\addWatermarkFromFile({ + bOnTop:false, + bOnPrint:false, + cDIPath:_path +}); +\executeSave(); +\end{docassembly} + +\begin{document} + +\maketitle + +\section{Introduction} + +Because some of the \app{Acrobat} JavaScript methods have security +restrictions, they can be only executed in the console window, or as part +of a batch sequence, or from the JavaScript folder reserved by +\app{Acrobat} for that use. The developer (of {\LaTeX} packages or {\PDF} +form documents) may want to use these restricted JavaScript methods as +part of document assembly. To use the restricted methods, they must be +called from the \emph{user JavaScript folder}. The scripts are contained in a +\SC{JS} file that \app{Acrobat} reads when it first starts up. + +In this article, we provide detailed steps for locating the user JavaScript +folder of \app{Acrobat} and for installing JavaScript files in that folder. +Various packages distributed by package author D. P. Story (notably +\pkg{acrotex}, \pkg{aeb\_pro}, \pkg{thorshammer}, and \pkg{docassembly}), use +the JavaScript files \texttt{aeb.js} and \texttt{aeb\_pro.js}, which are +placed in the user JavaScript folder. It is important to correctly install +these files for the packages listed above to function as expected. + +Other JavaScript files may be placed in the folder as well, for example, the +\texttt{config.js} file is one that is commonly used for general purposes. + +Before we get started, if you are using a version of \app{Acrobat} prior +to version~8.1, you need not read any further. The security restrictions +described below were not in effect for those versions. + +\section{Installing the JavaScript support files} + +The functionality of {\AEB} (\pkg{acrotex}) and {\AEBP} (\pkg{aeb\_pro}, as +well as other packages, depends, to some extent, on the proper installation +of their JavaScript support files. +\begin{itemize} + \item \AEB: For authors using the $\app{dvips}+\app{Acrobat Distiller}$ + workflow, \texttt{aeb.js} is required; this file is not used by + \app{pdflatex} or \app{xelatex} users. + + \item \AEBP: For authors using the $\app{dvips}+\app{Acrobat + Distiller}$ workflow, \texttt{aeb\_pro.js} is required; for authors + that prefer \app{pdflatex}, \app{lualatex}, or \app{xelatex} as the + {\PDF} creator \emph{and who own} the \app{Acrobat} application, + the \texttt{aeb\_pro.js} is required with the \opt{useacrobat} + option of \AEBP. When using the \opt{nopro} option of \AEBP, the + JavaScript file \texttt{aeb\_pro.js} is not used. + \item For \pkg{thorshammer} and \pkg{docassembly}, \pkg{aeb\_pro.js} is + required to be installed. + +\end{itemize} +The placement of the JavaScript files has changed over the years and is a +function of the version number \meta{ver}. Start \app{Acrobat} and open the +console debugger window by pressing \texttt{Ctrl+J} (for \app{Windows OS}) +or \texttt{Cmd+J} (for \app{Mac OS}). Now execute the code +\texttt{app.getPath("user")} in the console window. To do this, press the +\textsf{getPath} button provided below, which copies the necessary code to +the console window. +\begin{equation} +\begin{minipage}{.8\linewidth} +\begin{Verbatim}[commandchars={!~@}] +app.getPath("user");!copyGetPath +\end{Verbatim} +\end{minipage}\label{display:getPath} +\end{equation} +With the cursor on the line containing the script, press the +\texttt{Ctrl+Enter} (for \app{Windows OS}) or \texttt{Cmd+Enter} (for +\app{Mac~OS}) key. This will execute the JavaScript and return the `root' +path to the user's application data for \app{Acrobat}. + +The rest of the instructions depend on your operating system, +\app{Windows} or \app{Mac}. + +\subsection{For users of \app{Windows OS}} + +There are several cases, jump to the numbered paragraph that describes your +version (\meta{ver}) of \app{Acrobat}. + +%/C/Users/D. P. Story/AppData/Roaming/Adobe/Acrobat/11.0 +%/C/Users/D. P. Story/AppData/Roaming/Adobe/Acrobat/Privileged/11.0/JavaScripts + +\def\Stepi{\ding{182}\enspace} +\def\Stepii{\ding{183}\enspace} +\def\Stepiii{\ding{184}\enspace} + +\paragraph*{{\Stepi}For $\mathbf{\text{\meta{ver}}}$, $\mathbf{8.1 \le +\text{\meta{ver}} < 10.1.1}$.} For the \app{Windows OS}, executing the script +in display~\eqref{display:getPath} returns a string of the +form:\footnote{This string is for \app{Windows OS} beyond \app{WinXP}.} +\begin{equation} +\begin{minipage}{.8\linewidth} +\begin{Verbatim}[xleftmargin=\amtIndent,fontsize=\small,commandchars=!()] +/C/Users/!meta(username)/AppData/Roaming/Adobe/Acrobat/!meta(ver) +\end{Verbatim} +\end{minipage}\label{display:path} +\end{equation} +Navigate to this folder location. The correct location for the \SC{JS} +files is in the \texttt{JavaScripts} subfolder. If the folder does not +exist, create it. The final path for the JavaScript support files is then +\begin{Verbatim}[xleftmargin=\amtIndent,fontsize=\small,commandchars=!()] +/C/Users/!meta(username)/AppData/Roaming/Adobe/ + Acrobat/!meta(ver)/JavaScripts +\end{Verbatim} +Finally, copy \texttt{aeb.js} (if applicable) and/or \texttt{aeb\_pro.js} (if +applicable) into this folder. Close \app{Acrobat}, the next time +\app{Acrobat} is started, it will read in the \SC{JS} files. + +\paragraph*{{\Stepii}For $\mathbf{\text{\meta{ver}}}$, $\mathbf{10.1.1 \le +\text{\meta{ver}} < 12}$.} For these versions of \app{Acrobat} security has +have tightened up even more; the \texttt{JavaScripts} folder is now a +subfolder of a special \texttt{Privileged} folder. Execute +\texttt{app.getPath("user")} in the console window, as in +display~\eqref{display:getPath}. The method brings back a string similar to +the one in display~\eqref{display:path}. The correct path is obtained by +simply inserting \texttt{Privileged} into the path in +display~\eqref{display:path}, between \texttt{Acrobat} and \meta{ver}, as +displayed below. +\begin{Verbatim}[xleftmargin=\amtIndent,fontsize=\small,commandchars=!()] +/C/Users/!meta(username)/AppData/Roaming/Adobe/ + Acrobat/!textbf(Privileged)/!meta(ver)/JavaScripts +\end{Verbatim} +But this is a mere description of the correct location, the path must +exist! The path must be created, if it does not already exist. + +Navigate to the folder, one folder above the path shown in +display~\eqref{display:path}, that is, navigate to, +\begin{Verbatim}[xleftmargin=\amtIndent,fontsize=\small,commandchars=!()] +/C/Users/!meta(username)/AppData/Roaming/Adobe/Acrobat/ +\end{Verbatim} +If a \texttt{Privileged} folder exists, enter into it; otherwise, create +it, then enter it. +\begin{Verbatim}[xleftmargin=\amtIndent,fontsize=\small,commandchars=!()] +/C/Users/!meta(username)/AppData/Roaming/Adobe/Acrobat/Privileged +\end{Verbatim} +Now create a folder named \meta{ver}, unless it already exists, and enter +it. The version is always the major release \texttt{8.0}, \texttt{9.0}, +\texttt{10.0}, or \texttt{11.0}. +\begin{Verbatim}[xleftmargin=\amtIndent,fontsize=\small,commandchars=!()] +/C/Users/!meta(username)/AppData/Roaming/Adobe/ + Acrobat/Privileged/!meta(ver) +\end{Verbatim} +Finally, create the \texttt{JavaScript} folder, unless it already exists, +to obtain the final path to the user folder JavaScripts: +\begin{Verbatim}[xleftmargin=\amtIndent,fontsize=\small,commandchars=!()] +/C/Users/!meta(username)/AppData/Roaming/Adobe/ + Acrobat/Privileged/!meta(ver)/JavaScripts +\end{Verbatim} +Copy \texttt{aeb.js} (if applicable) and/or \texttt{aeb\_pro.js} (if +applicable) into this folder. Close \textsf{Acrobat}, the next time +\textsf{Acrobat} is started, it will read in the \SC{JS} files. + +\paragraph*{{\Stepiii}For $\mathbf{\text{\meta{ver}}}$, $\mathbf{ +\text{\meta{ver}} > 12} $.} Beginning with the next major version following +version~11, Adobe changed its versioning scheme. There are now two tracks, +\emph{subscription} and \emph{classic} (also called \emph{perpetual}). For +subscription, the version, as I understand it, will always be \texttt{DC} +(Document Cloud), and for the classic, for which you've purchased a +\emph{perpetual license}, the \meta{ver} is a calendar year. The first +classic version is \texttt{2015}, the next one is most likely \texttt{2017}, +since major releases occur about every two years. + +Execute the code of display~\eqref{display:getPath} by pressing the button +provided to obtain a path of the form, +\begin{Verbatim}[xleftmargin=\amtIndent,fontsize=\small,commandchars=!()] +/C/Users/!meta(username)/AppData/Roaming/Adobe/Acrobat/DC +\end{Verbatim} +for the subscription license or, +\begin{Verbatim}[xleftmargin=\amtIndent,fontsize=\small,commandchars=!()] +/C/Users/!meta(username)/AppData/Roaming/Adobe/Acrobat/2015 +\end{Verbatim} +for the classic (or perpetual) license. Of course, this last path is for +the first classic version. + +Now, to obtain the path to the \texttt{JavaScripts} folder, follow the +instructions for numbered paragraph \ding{183}, but with \meta{ver} equal +to either \texttt{DC} or \texttt{2015} (a calendar year). + +%/C/Users/D. P. Story/AppData/Roaming/Adobe/Acrobat/Privileged/11.0/JavaScripts + +\subsection{For users of \app{Mac OS}} + +\app{Mac OS} does not have the security restrictions that \app{Windows OS} +does, as described in paragraphs \ding{183} and \ding{184}. + +Follow the instructions of paragraph \ding{182}, by first pressing the button +provided in display~\eqref{display:getPath}, then, in the console window, +execute this script as described in the paragraph following +display~\eqref{display:getPath}. After working through \ding{182}, one +obtains any of the following paths depending on the version (\meta{ver}) you +are using:\medskip + +\noindent +For $\text{\meta{ver}} = \texttt{8.0}, \texttt{9.0}, \texttt{10.0}, +\texttt{11.0}$: +\begin{Verbatim}[xleftmargin=\amtIndent,fontsize=\small,commandchars=!()] +/Users/!meta(user)/Library/Application\ Support/Adobe/ + Acrobat/!meta(ver)/JavaScripts +\end{Verbatim} +\medskip + +\noindent +For $\text{\meta{ver}} > 12$, the path is, +\begin{Verbatim}[xleftmargin=\amtIndent,fontsize=\small,commandchars=!()] +/Users/!meta(user)/Library/Application\ Support/Adobe/ + Acrobat/DC/JavaScripts +\end{Verbatim} +for a subscription license, and, +\begin{Verbatim}[xleftmargin=\amtIndent,fontsize=\small,commandchars=!()] +/Users/!meta(user)/Library/Application\ Support/Adobe/ + Acrobat/2015/JavaScripts +\end{Verbatim} +or more generally, +\begin{Verbatim}[xleftmargin=\amtIndent,fontsize=\small,commandchars=!()] +/Users/!meta(user)/Library/Application\ Support/Adobe/ + Acrobat/!meta(year)/JavaScripts +\end{Verbatim} +for the perpetual license. + +In all cases, if the \texttt{JavaScripts} folder does not exist, it must +be created. Copy any \SC{JS} support files into the \texttt{JavaScripts} +folder. The script files are read the next time \app{Acrobat} is started. + +\section{Testing the placement of the JavaScript support files} + +Assuming you have successfully followed the instructions and created the +\texttt{JavaScripts} folder, test the validity of what you have done by +closing \app{Acrobat} then opening it again. Open the console window +(\texttt{Ctrl+J} or \texttt{Cmd+J}, for \app{Mac OS}) and execute this +command in the console window: +\begin{Verbatim}[xleftmargin=\amtIndent,commandchars={!~@}] +app.getPath("user","javascript");!quad!copyGetPathJS +\end{Verbatim} +If you have followed the instructions, the return string should read the +complete path to the \texttt{JavaScripts} folder. +\end{document} diff --git a/macros/latex/contrib/acrotex-js/js-files/aeb.js b/macros/latex/contrib/acrotex-js/js-files/aeb.js new file mode 100644 index 0000000000..09310d2e40 --- /dev/null +++ b/macros/latex/contrib/acrotex-js/js-files/aeb.js @@ -0,0 +1,24 @@ +/* + AEB Import FDF Methods + + Copyright (C) 2006--2016 AcroTeX.Net + D. P. Story + http://www.acrotex.net + + Version 1.0 +*/ +if ( typeof aebTrustedFunctions == "undefined") { + aebTrustedFunctions = app.trustedFunction( function ( doc, oFunction, oArgs ) + { + app.beginPriv(); + var retn = oFunction( oArgs, doc ) + app.endPriv(); + return retn; + }); +} +aebImportAnFDF = app.trustPropagatorFunction( function ( oArgs, doc ) +{ + app.beginPriv(); + doc.importAnFDF(oArgs); + app.endPriv(); +}); diff --git a/macros/latex/contrib/acrotex-js/js-files/aeb_pro.js b/macros/latex/contrib/acrotex-js/js-files/aeb_pro.js new file mode 100644 index 0000000000..5dbfe4d53a --- /dev/null +++ b/macros/latex/contrib/acrotex-js/js-files/aeb_pro.js @@ -0,0 +1,177 @@ +/* + AEB Pro Document Assembly Methods + + Copyright (C) 2012 -- 2021 AcroTeX.Net + D. P. Story + http://www.acrotex.net + + Version 1.6.1 + + v1.6.1 aebCreateTemplate now returns an object + v1.6 Added aebAddWatermarkFromText, aebLaunchURL + v1.5 Added aebCertifyInvisibleSign +*/ + +if ( typeof aebTrustedFunctions == "undefined") { + aebTrustedFunctions = app.trustedFunction( function ( doc, oFunction, oArgs ) + { + app.beginPriv(); + var retn = oFunction( oArgs, doc ); + app.endPriv(); + return retn; + }); +} +aebAddWatermarkFromFile = app.trustPropagatorFunction( function ( oArgs, doc ) +{ + var Msg=function(e){return (aebAddWatermarkFromFile.msg==undefined)?("Add Watermark from File Error: " + e.toString()):aebAddWatermarkFromFile.msg;} + app.beginPriv(); + try { doc.addWatermarkFromFile(oArgs); } catch(e) {console.println(Msg(e));} + app.endPriv(); + aebAddWatermarkFromFile.msg=undefined; +}); +aebAddWatermarkFromText = app.trustPropagatorFunction( function ( oArgs, doc ) +{ + app.beginPriv(); + return doc.addWatermarkFromText(oArgs); + app.endPriv(); +}); +aebImportIcon = app.trustPropagatorFunction( function ( oArgs, doc ) +{ + app.beginPriv(); + return doc.importIcon(oArgs); + app.endPriv(); +}); +aebInsertPages = app.trustPropagatorFunction( function ( oArgs, doc ) +{ + var Msg=function(e){return (aebInsertPages.msg==undefined)?("Insert Pages Error: " + e.toString()):aebInsertPages.msg;} + app.beginPriv(); + try { doc.insertPages(oArgs); } catch(e) {console.println(Msg(e));} + app.endPriv(); + aebInsertPages.msg=undefined; +}) +aebAppOpenDoc = app.trustPropagatorFunction( function ( oArgs, doc ) +{ + var Msg=function(e){return (aebAppOpenDoc.msg==undefined)?("App Open Doc Error: " + e.toString()):aebAppOpenDoc.msg;} + app.beginPriv(); + try { return app.openDoc(oArgs); } catch(e) {console.println(Msg(e));} + app.endPriv(); + aebAppOpenDoc.msg=undefined; + return retn; +}) +aebImportTextData = app.trustPropagatorFunction( function ( oArgs, doc ) +{ + app.beginPriv(); + return doc.importTextData(oArgs); + app.endPriv(); +}); +aebImportSound = app.trustPropagatorFunction( function ( oArgs, doc ) +{ + app.beginPriv(); + return doc.importSound(oArgs); + app.endPriv(); +}); +aebSaveAs = app.trustPropagatorFunction( function ( oArgs, doc ) +{ + app.beginPriv(); + app.execMenuItem("Save"); + app.endPriv(); +}); +aebDocSaveAs = app.trustPropagatorFunction( function ( oArgs, doc ) +{ + var Msg=function(e){return (aebDocSaveAs.msg==undefined)?("Doc SaveAs Error: " + e.toString()):aebDocSaveAs.msg;} + app.beginPriv(); + try { + return doc.saveAs(oArgs); + } catch(e){console.println(Msg(e));} + app.endPriv(); + aebDocSaveAs.msg=undefined; + +}); +aebExtractPages = app.trustPropagatorFunction( function ( oArgs, doc ) +{ + app.beginPriv(); + return doc.extractPages(oArgs); + app.endPriv(); +}); +aebMailDoc = app.trustPropagatorFunction( function ( oArgs, doc ) +{ + app.beginPriv(); + return doc.mailDoc(oArgs); + app.endPriv(); +}); +aebImportDataObject = app.trustPropagatorFunction( function ( oArgs, doc ) +{ + app.beginPriv(); + return doc.importDataObject(oArgs); + app.endPriv(); +}); +aebSignatureSign = app.trustPropagatorFunction( function ( oArgs, field ) +{ + app.beginPriv(); + return field.signatureSign(oArgs); + app.endPriv(); +}); +aebSecurityHandlerLogin = app.trustPropagatorFunction( function ( oArgs, securityHandler ) +{ + app.beginPriv(); + return securityHandler.login(oArgs); + app.endPriv(); +}); +aebTimestampSign = app.trustPropagatorFunction( function ( oArgs, doc ) +{ + app.beginPriv(); + return doc.timestampSign(oArgs); + app.endPriv(); +}); +aebSecurityGetHandler = app.trustPropagatorFunction( function ( oArgs, security ) +{ + app.beginPriv(); + return security.getHandler(oArgs); + app.endPriv(); +}); +aebAppGetPath = app.trustPropagatorFunction( function ( oArgs, doc ) +{ + app.beginPriv(); + return app.getPath(oArgs); + app.endPriv(); + return retn; +}); +aebSignatureSetSeedValue = app.trustPropagatorFunction( function ( oArgs, field ) +{ + app.beginPriv(); + return field.signatureSetSeedValue( oArgs ) + app.endPriv(); +}); +aebCertifyInvisibleSign = app.trustPropagatorFunction( function ( oArgs, field ) +{ + app.beginPriv(); + return field.certifyInvisibleSign( oArgs ) + app.endPriv(); +}); +aebAddIcon=app.trustPropagatorFunction( function ( oArgs, doc ) +{ + app.beginPriv(); + doc.addIcon(oArgs); + app.endPriv(); +}); +aebCreateTemplate = app.trustPropagatorFunction( function ( oArgs, doc ) +{ + var Msg=function(e){return (aebCreateTemplate.msg==undefined)?("Create Template Error: " + e.toString()):aebCreateTemplate.msg;} + app.beginPriv(); + try { return doc.createTemplate(oArgs); } catch(e) {console.println(Msg(e));} + app.endPriv(); + aebCreateTemplate.msg=undefined; + +}) +aebBrowseForDoc=app.trustPropagatorFunction( function ( oArgs, doc ) +{ + app.beginPriv(); + var retn = app.browseForDoc(oArgs); + app.endPriv(); +}); +aebLaunchURL=app.trustPropagatorFunction ( function ( oArgs ) +{ + app.beginPriv(); + var retn = app.launchURL(oArgs); + app.endPriv(); +}); diff --git a/macros/latex/contrib/huawei/cd b/macros/latex/contrib/huawei/cd deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/macros/latex/contrib/l3kernel/CHANGELOG.md b/macros/latex/contrib/l3kernel/CHANGELOG.md index c50ec1abb6..ba547574c8 100644 --- a/macros/latex/contrib/l3kernel/CHANGELOG.md +++ b/macros/latex/contrib/l3kernel/CHANGELOG.md @@ -7,6 +7,15 @@ this project uses date-based 'snapshot' version identifiers. ## [Unreleased] +## [2021-06-18] + +### Fixed +- Local assignment to `\g__sys_backend_tl` +- Incorrect internal function name (issue #939) +- Case-changing exceptions for (u)pTeX (issue #939) +- Low-level error if accent commands are not followed by + letter when case changing (see #946) + ## [2021-06-01] ### Fixed @@ -930,7 +939,8 @@ this project uses date-based 'snapshot' version identifiers. - Step functions have been added for dim variables, e.g. `\dim_step_inline:nnnn` -[Unreleased]: https://github.com/latex3/latex3/compare/2021-06-01...HEAD +[Unreleased]: https://github.com/latex3/latex3/compare/2021-06-18...HEAD +[2021-06-18]: https://github.com/latex3/latex3/compare/2021-06-01...2021-06-18 [2021-06-01]: https://github.com/latex3/latex3/compare/2021-05-27...2021-06-01 [2021-05-27]: https://github.com/latex3/latex3/compare/2021-05-25...2021-05-27 [2021-05-25]: https://github.com/latex3/latex3/compare/2021-05-11...2021-05-25 diff --git a/macros/latex/contrib/l3kernel/README.md b/macros/latex/contrib/l3kernel/README.md index a3a5246eb7..fb9ac4b35e 100644 --- a/macros/latex/contrib/l3kernel/README.md +++ b/macros/latex/contrib/l3kernel/README.md @@ -1,7 +1,7 @@ LaTeX3 Programming Conventions ============================== -Release 2021-06-01 +Release 2021-06-18 Overview -------- diff --git a/macros/latex/contrib/l3kernel/expl3.dtx b/macros/latex/contrib/l3kernel/expl3.dtx index d5c4846435..bf5d002f00 100644 --- a/macros/latex/contrib/l3kernel/expl3.dtx +++ b/macros/latex/contrib/l3kernel/expl3.dtx @@ -24,7 +24,7 @@ % %<*driver|generic|package|2ekernel> % -\def\ExplFileDate{2021-06-01}% +\def\ExplFileDate{2021-06-18}% %<*driver> \documentclass[full]{l3doc} \usepackage{graphicx} @@ -51,7 +51,7 @@ % }^^A % } % -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/expl3.pdf b/macros/latex/contrib/l3kernel/expl3.pdf index f16cd6a56e..2f6c765002 100644 Binary files a/macros/latex/contrib/l3kernel/expl3.pdf and b/macros/latex/contrib/l3kernel/expl3.pdf differ diff --git a/macros/latex/contrib/l3kernel/interface3.pdf b/macros/latex/contrib/l3kernel/interface3.pdf index 1e117704a3..4b8b052652 100644 Binary files a/macros/latex/contrib/l3kernel/interface3.pdf and b/macros/latex/contrib/l3kernel/interface3.pdf differ diff --git a/macros/latex/contrib/l3kernel/interface3.tex b/macros/latex/contrib/l3kernel/interface3.tex index 60ce5fa910..910481e48e 100644 --- a/macros/latex/contrib/l3kernel/interface3.tex +++ b/macros/latex/contrib/l3kernel/interface3.tex @@ -54,7 +54,7 @@ for those people who are interested. {latex-team@latex-project.org}% }% } -\date{Released 2021-06-01} +\date{Released 2021-06-18} \pagenumbering{roman} \maketitle diff --git a/macros/latex/contrib/l3kernel/l3basics.dtx b/macros/latex/contrib/l3kernel/l3basics.dtx index 32ba653cdf..6c1d3438dd 100644 --- a/macros/latex/contrib/l3kernel/l3basics.dtx +++ b/macros/latex/contrib/l3kernel/l3basics.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3bootstrap.dtx b/macros/latex/contrib/l3kernel/l3bootstrap.dtx index 68e473afba..aa17ea4fe9 100644 --- a/macros/latex/contrib/l3kernel/l3bootstrap.dtx +++ b/macros/latex/contrib/l3kernel/l3bootstrap.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3box.dtx b/macros/latex/contrib/l3kernel/l3box.dtx index 363f808d04..348b4a4891 100644 --- a/macros/latex/contrib/l3kernel/l3box.dtx +++ b/macros/latex/contrib/l3kernel/l3box.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3candidates.dtx b/macros/latex/contrib/l3kernel/l3candidates.dtx index 6d8b6ce3cf..d086571aab 100644 --- a/macros/latex/contrib/l3kernel/l3candidates.dtx +++ b/macros/latex/contrib/l3kernel/l3candidates.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3cctab.dtx b/macros/latex/contrib/l3kernel/l3cctab.dtx index 5e5ab15853..c3fc4bf154 100644 --- a/macros/latex/contrib/l3kernel/l3cctab.dtx +++ b/macros/latex/contrib/l3kernel/l3cctab.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3clist.dtx b/macros/latex/contrib/l3kernel/l3clist.dtx index 45f801cd22..3634c4cfeb 100644 --- a/macros/latex/contrib/l3kernel/l3clist.dtx +++ b/macros/latex/contrib/l3kernel/l3clist.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3coffins.dtx b/macros/latex/contrib/l3kernel/l3coffins.dtx index 3c58a7e1fa..df743b97c2 100644 --- a/macros/latex/contrib/l3kernel/l3coffins.dtx +++ b/macros/latex/contrib/l3kernel/l3coffins.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3color.dtx b/macros/latex/contrib/l3kernel/l3color.dtx index 621a3f9137..a6b1b11262 100644 --- a/macros/latex/contrib/l3kernel/l3color.dtx +++ b/macros/latex/contrib/l3kernel/l3color.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3debug.dtx b/macros/latex/contrib/l3kernel/l3debug.dtx index 20302524a4..b8d89381d9 100644 --- a/macros/latex/contrib/l3kernel/l3debug.dtx +++ b/macros/latex/contrib/l3kernel/l3debug.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3deprecation.dtx b/macros/latex/contrib/l3kernel/l3deprecation.dtx index bd3a81327d..569153fb6a 100644 --- a/macros/latex/contrib/l3kernel/l3deprecation.dtx +++ b/macros/latex/contrib/l3kernel/l3deprecation.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3doc.dtx b/macros/latex/contrib/l3kernel/l3doc.dtx index 6a46df0608..1a3dbbeb90 100644 --- a/macros/latex/contrib/l3kernel/l3doc.dtx +++ b/macros/latex/contrib/l3kernel/l3doc.dtx @@ -79,7 +79,7 @@ and all files in that bundle must be distributed together. % % \title{The \cls{l3doc} class} % \author{\Team} -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % \maketitle % \tableofcontents % diff --git a/macros/latex/contrib/l3kernel/l3docstrip.dtx b/macros/latex/contrib/l3kernel/l3docstrip.dtx index 46914ab674..045e32f4cb 100644 --- a/macros/latex/contrib/l3kernel/l3docstrip.dtx +++ b/macros/latex/contrib/l3kernel/l3docstrip.dtx @@ -63,7 +63,7 @@ % }^^A % } % -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3docstrip.pdf b/macros/latex/contrib/l3kernel/l3docstrip.pdf index b026a33009..b6e64a7b3e 100644 Binary files a/macros/latex/contrib/l3kernel/l3docstrip.pdf and b/macros/latex/contrib/l3kernel/l3docstrip.pdf differ diff --git a/macros/latex/contrib/l3kernel/l3expan.dtx b/macros/latex/contrib/l3kernel/l3expan.dtx index c6ed80179f..9b031db812 100644 --- a/macros/latex/contrib/l3kernel/l3expan.dtx +++ b/macros/latex/contrib/l3kernel/l3expan.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3file.dtx b/macros/latex/contrib/l3kernel/l3file.dtx index 008f3022ce..4962f58d17 100644 --- a/macros/latex/contrib/l3kernel/l3file.dtx +++ b/macros/latex/contrib/l3kernel/l3file.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3flag.dtx b/macros/latex/contrib/l3kernel/l3flag.dtx index 7aba908314..a9e02e1619 100644 --- a/macros/latex/contrib/l3kernel/l3flag.dtx +++ b/macros/latex/contrib/l3kernel/l3flag.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-assign.dtx b/macros/latex/contrib/l3kernel/l3fp-assign.dtx index 4edf5519ac..144308f9ef 100644 --- a/macros/latex/contrib/l3kernel/l3fp-assign.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-assign.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % \maketitle % % \begin{documentation} diff --git a/macros/latex/contrib/l3kernel/l3fp-aux.dtx b/macros/latex/contrib/l3kernel/l3fp-aux.dtx index aeba0d0b05..0e975f1dcb 100644 --- a/macros/latex/contrib/l3kernel/l3fp-aux.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-aux.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-basics.dtx b/macros/latex/contrib/l3kernel/l3fp-basics.dtx index 5c02e1a440..2bcfe264d9 100644 --- a/macros/latex/contrib/l3kernel/l3fp-basics.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-basics.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-convert.dtx b/macros/latex/contrib/l3kernel/l3fp-convert.dtx index 0d645b863b..9586c12f4f 100644 --- a/macros/latex/contrib/l3kernel/l3fp-convert.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-convert.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-expo.dtx b/macros/latex/contrib/l3kernel/l3fp-expo.dtx index a36ccafc4e..a2bf913bb0 100644 --- a/macros/latex/contrib/l3kernel/l3fp-expo.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-expo.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-extended.dtx b/macros/latex/contrib/l3kernel/l3fp-extended.dtx index 114acefe54..06a7018065 100644 --- a/macros/latex/contrib/l3kernel/l3fp-extended.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-extended.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-logic.dtx b/macros/latex/contrib/l3kernel/l3fp-logic.dtx index aa9c963d4f..fe505475db 100644 --- a/macros/latex/contrib/l3kernel/l3fp-logic.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-logic.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-parse.dtx b/macros/latex/contrib/l3kernel/l3fp-parse.dtx index f1b9ad5625..2300d319d3 100644 --- a/macros/latex/contrib/l3kernel/l3fp-parse.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-parse.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-random.dtx b/macros/latex/contrib/l3kernel/l3fp-random.dtx index 59ebc24e08..7dd2dfbc37 100644 --- a/macros/latex/contrib/l3kernel/l3fp-random.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-random.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-round.dtx b/macros/latex/contrib/l3kernel/l3fp-round.dtx index f17bf63110..62bdc91e6f 100644 --- a/macros/latex/contrib/l3kernel/l3fp-round.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-round.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-traps.dtx b/macros/latex/contrib/l3kernel/l3fp-traps.dtx index e9f0a81052..c7a9296ba8 100644 --- a/macros/latex/contrib/l3kernel/l3fp-traps.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-traps.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % \maketitle % % \begin{documentation} diff --git a/macros/latex/contrib/l3kernel/l3fp-trig.dtx b/macros/latex/contrib/l3kernel/l3fp-trig.dtx index 508426b0bb..8bcea37b09 100644 --- a/macros/latex/contrib/l3kernel/l3fp-trig.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-trig.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp.dtx b/macros/latex/contrib/l3kernel/l3fp.dtx index f645df8901..62e370d78f 100644 --- a/macros/latex/contrib/l3kernel/l3fp.dtx +++ b/macros/latex/contrib/l3kernel/l3fp.dtx @@ -49,7 +49,7 @@ % }^^A % } % -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fparray.dtx b/macros/latex/contrib/l3kernel/l3fparray.dtx index d5fb50aeef..1f50538909 100644 --- a/macros/latex/contrib/l3kernel/l3fparray.dtx +++ b/macros/latex/contrib/l3kernel/l3fparray.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3int.dtx b/macros/latex/contrib/l3kernel/l3int.dtx index eff6136914..3e1b6ae796 100644 --- a/macros/latex/contrib/l3kernel/l3int.dtx +++ b/macros/latex/contrib/l3kernel/l3int.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3intarray.dtx b/macros/latex/contrib/l3kernel/l3intarray.dtx index 03b82260e1..7913bb33a3 100644 --- a/macros/latex/contrib/l3kernel/l3intarray.dtx +++ b/macros/latex/contrib/l3kernel/l3intarray.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3kernel-functions.dtx b/macros/latex/contrib/l3kernel/l3kernel-functions.dtx index fc23a46791..ba5fb07e64 100644 --- a/macros/latex/contrib/l3kernel/l3kernel-functions.dtx +++ b/macros/latex/contrib/l3kernel/l3kernel-functions.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3keys.dtx b/macros/latex/contrib/l3kernel/l3keys.dtx index f1b9c97ba8..911dca1c4a 100644 --- a/macros/latex/contrib/l3kernel/l3keys.dtx +++ b/macros/latex/contrib/l3kernel/l3keys.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3legacy.dtx b/macros/latex/contrib/l3kernel/l3legacy.dtx index 3df7ca9463..eec217d33e 100644 --- a/macros/latex/contrib/l3kernel/l3legacy.dtx +++ b/macros/latex/contrib/l3kernel/l3legacy.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3luatex.dtx b/macros/latex/contrib/l3kernel/l3luatex.dtx index 05518b1164..d5f01e9703 100644 --- a/macros/latex/contrib/l3kernel/l3luatex.dtx +++ b/macros/latex/contrib/l3kernel/l3luatex.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3msg.dtx b/macros/latex/contrib/l3kernel/l3msg.dtx index 4b615b6be3..b2341a9034 100644 --- a/macros/latex/contrib/l3kernel/l3msg.dtx +++ b/macros/latex/contrib/l3kernel/l3msg.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3names.dtx b/macros/latex/contrib/l3kernel/l3names.dtx index b3e5b55914..0d306a533c 100644 --- a/macros/latex/contrib/l3kernel/l3names.dtx +++ b/macros/latex/contrib/l3kernel/l3names.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3news.pdf b/macros/latex/contrib/l3kernel/l3news.pdf index 0d9bfb99ba..fb6b613b01 100644 Binary files a/macros/latex/contrib/l3kernel/l3news.pdf and b/macros/latex/contrib/l3kernel/l3news.pdf differ diff --git a/macros/latex/contrib/l3kernel/l3news01.pdf b/macros/latex/contrib/l3kernel/l3news01.pdf index d63b059689..bc846306df 100644 Binary files a/macros/latex/contrib/l3kernel/l3news01.pdf and b/macros/latex/contrib/l3kernel/l3news01.pdf differ diff --git a/macros/latex/contrib/l3kernel/l3news02.pdf b/macros/latex/contrib/l3kernel/l3news02.pdf index 67ee9869fd..0d20678a7d 100644 Binary files a/macros/latex/contrib/l3kernel/l3news02.pdf and b/macros/latex/contrib/l3kernel/l3news02.pdf differ diff --git a/macros/latex/contrib/l3kernel/l3news03.pdf b/macros/latex/contrib/l3kernel/l3news03.pdf index d094ebe5c6..43c14de35d 100644 Binary files a/macros/latex/contrib/l3kernel/l3news03.pdf and b/macros/latex/contrib/l3kernel/l3news03.pdf differ diff --git a/macros/latex/contrib/l3kernel/l3news04.pdf b/macros/latex/contrib/l3kernel/l3news04.pdf index 20e2e3f7bc..4261a77e79 100644 Binary files a/macros/latex/contrib/l3kernel/l3news04.pdf and b/macros/latex/contrib/l3kernel/l3news04.pdf differ diff --git a/macros/latex/contrib/l3kernel/l3news05.pdf b/macros/latex/contrib/l3kernel/l3news05.pdf index 26412071f4..2f293cee60 100644 Binary files a/macros/latex/contrib/l3kernel/l3news05.pdf and b/macros/latex/contrib/l3kernel/l3news05.pdf differ diff --git a/macros/latex/contrib/l3kernel/l3news06.pdf b/macros/latex/contrib/l3kernel/l3news06.pdf index 3955aadf7c..08b5622507 100644 Binary files a/macros/latex/contrib/l3kernel/l3news06.pdf and b/macros/latex/contrib/l3kernel/l3news06.pdf differ diff --git a/macros/latex/contrib/l3kernel/l3news07.pdf b/macros/latex/contrib/l3kernel/l3news07.pdf index 554b6fcfce..303ba407c1 100644 Binary files a/macros/latex/contrib/l3kernel/l3news07.pdf and b/macros/latex/contrib/l3kernel/l3news07.pdf differ diff --git a/macros/latex/contrib/l3kernel/l3news08.pdf b/macros/latex/contrib/l3kernel/l3news08.pdf index e14980c997..a7dc4778e4 100644 Binary files a/macros/latex/contrib/l3kernel/l3news08.pdf and b/macros/latex/contrib/l3kernel/l3news08.pdf differ diff --git a/macros/latex/contrib/l3kernel/l3news09.pdf b/macros/latex/contrib/l3kernel/l3news09.pdf index 13de207bab..f247028b93 100644 Binary files a/macros/latex/contrib/l3kernel/l3news09.pdf and b/macros/latex/contrib/l3kernel/l3news09.pdf differ diff --git a/macros/latex/contrib/l3kernel/l3news10.pdf b/macros/latex/contrib/l3kernel/l3news10.pdf index d1746e581a..3ba552665b 100644 Binary files a/macros/latex/contrib/l3kernel/l3news10.pdf and b/macros/latex/contrib/l3kernel/l3news10.pdf differ diff --git a/macros/latex/contrib/l3kernel/l3news11.pdf b/macros/latex/contrib/l3kernel/l3news11.pdf index cdebc4911f..e84613d4ca 100644 Binary files a/macros/latex/contrib/l3kernel/l3news11.pdf and b/macros/latex/contrib/l3kernel/l3news11.pdf differ diff --git a/macros/latex/contrib/l3kernel/l3news12.pdf b/macros/latex/contrib/l3kernel/l3news12.pdf index 17503b055e..85287d2fe1 100644 Binary files a/macros/latex/contrib/l3kernel/l3news12.pdf and b/macros/latex/contrib/l3kernel/l3news12.pdf differ diff --git a/macros/latex/contrib/l3kernel/l3pdf.dtx b/macros/latex/contrib/l3kernel/l3pdf.dtx index 31ce1eade9..f5bed9f426 100644 --- a/macros/latex/contrib/l3kernel/l3pdf.dtx +++ b/macros/latex/contrib/l3kernel/l3pdf.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3prefixes.pdf b/macros/latex/contrib/l3kernel/l3prefixes.pdf index 9a4676923d..cf725f6a8e 100644 Binary files a/macros/latex/contrib/l3kernel/l3prefixes.pdf and b/macros/latex/contrib/l3kernel/l3prefixes.pdf differ diff --git a/macros/latex/contrib/l3kernel/l3prg.dtx b/macros/latex/contrib/l3kernel/l3prg.dtx index b0dd7e18fa..a581d8c058 100644 --- a/macros/latex/contrib/l3kernel/l3prg.dtx +++ b/macros/latex/contrib/l3kernel/l3prg.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3prop.dtx b/macros/latex/contrib/l3kernel/l3prop.dtx index 75dbce2d58..15cd20f78b 100644 --- a/macros/latex/contrib/l3kernel/l3prop.dtx +++ b/macros/latex/contrib/l3kernel/l3prop.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3quark.dtx b/macros/latex/contrib/l3kernel/l3quark.dtx index 705bcad2ea..50ec219874 100644 --- a/macros/latex/contrib/l3kernel/l3quark.dtx +++ b/macros/latex/contrib/l3kernel/l3quark.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3regex.dtx b/macros/latex/contrib/l3kernel/l3regex.dtx index 336ee3dcbf..a26b1c0b2c 100644 --- a/macros/latex/contrib/l3kernel/l3regex.dtx +++ b/macros/latex/contrib/l3kernel/l3regex.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3seq.dtx b/macros/latex/contrib/l3kernel/l3seq.dtx index cb652f1986..278dcc521e 100644 --- a/macros/latex/contrib/l3kernel/l3seq.dtx +++ b/macros/latex/contrib/l3kernel/l3seq.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3skip.dtx b/macros/latex/contrib/l3kernel/l3skip.dtx index 6bc8c7528a..d3b338f664 100644 --- a/macros/latex/contrib/l3kernel/l3skip.dtx +++ b/macros/latex/contrib/l3kernel/l3skip.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3sort.dtx b/macros/latex/contrib/l3kernel/l3sort.dtx index c03cebf414..2c82f521aa 100644 --- a/macros/latex/contrib/l3kernel/l3sort.dtx +++ b/macros/latex/contrib/l3kernel/l3sort.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3str-convert.dtx b/macros/latex/contrib/l3kernel/l3str-convert.dtx index cb9fc40441..a49d2d7f11 100644 --- a/macros/latex/contrib/l3kernel/l3str-convert.dtx +++ b/macros/latex/contrib/l3kernel/l3str-convert.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3str.dtx b/macros/latex/contrib/l3kernel/l3str.dtx index 772f2eab89..72bf49b062 100644 --- a/macros/latex/contrib/l3kernel/l3str.dtx +++ b/macros/latex/contrib/l3kernel/l3str.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3styleguide.pdf b/macros/latex/contrib/l3kernel/l3styleguide.pdf index 2a86a2817e..91877e934c 100644 Binary files a/macros/latex/contrib/l3kernel/l3styleguide.pdf and b/macros/latex/contrib/l3kernel/l3styleguide.pdf differ diff --git a/macros/latex/contrib/l3kernel/l3styleguide.tex b/macros/latex/contrib/l3kernel/l3styleguide.tex index 683c13fb3e..e81b8cd899 100644 --- a/macros/latex/contrib/l3kernel/l3styleguide.tex +++ b/macros/latex/contrib/l3kernel/l3styleguide.tex @@ -32,7 +32,7 @@ The released version of this bundle is available from CTAN. {latex-team@latex-project.org}% }% } -\date{Released 2021-06-01} +\date{Released 2021-06-18} \begin{document} diff --git a/macros/latex/contrib/l3kernel/l3syntax-changes.pdf b/macros/latex/contrib/l3kernel/l3syntax-changes.pdf index 86ab67a0ec..90bc87c2aa 100644 Binary files a/macros/latex/contrib/l3kernel/l3syntax-changes.pdf and b/macros/latex/contrib/l3kernel/l3syntax-changes.pdf differ diff --git a/macros/latex/contrib/l3kernel/l3syntax-changes.tex b/macros/latex/contrib/l3kernel/l3syntax-changes.tex index 9230f5231d..f1237177f6 100644 --- a/macros/latex/contrib/l3kernel/l3syntax-changes.tex +++ b/macros/latex/contrib/l3kernel/l3syntax-changes.tex @@ -32,7 +32,7 @@ The released version of this bundle is available from CTAN. {latex-team@latex-project.org}% }% } -\date{Released 2021-06-01} +\date{Released 2021-06-18} \newcommand{\TF}{\textit{(TF)}} diff --git a/macros/latex/contrib/l3kernel/l3sys.dtx b/macros/latex/contrib/l3kernel/l3sys.dtx index 98954c4a33..3dc310fdca 100644 --- a/macros/latex/contrib/l3kernel/l3sys.dtx +++ b/macros/latex/contrib/l3kernel/l3sys.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % @@ -498,7 +498,7 @@ } { \tl_if_blank:nF {#1} - { \tl_set:Nn \g_@@_backend_tl {#1} } + { \tl_gset:Nn \g_@@_backend_tl {#1} } \@@_load_backend_check:N \g_@@_backend_tl \str_const:Nx \c_sys_backend_str { \g_@@_backend_tl } \__kernel_sys_configuration_load:n diff --git a/macros/latex/contrib/l3kernel/l3term-glossary.pdf b/macros/latex/contrib/l3kernel/l3term-glossary.pdf index 312860e101..93dbdcb147 100644 Binary files a/macros/latex/contrib/l3kernel/l3term-glossary.pdf and b/macros/latex/contrib/l3kernel/l3term-glossary.pdf differ diff --git a/macros/latex/contrib/l3kernel/l3term-glossary.tex b/macros/latex/contrib/l3kernel/l3term-glossary.tex index 1182b98079..b2b77851b9 100644 --- a/macros/latex/contrib/l3kernel/l3term-glossary.tex +++ b/macros/latex/contrib/l3kernel/l3term-glossary.tex @@ -32,7 +32,7 @@ The released version of this bundle is available from CTAN. {latex-team@latex-project.org}% }% } -\date{Released 2021-06-01} +\date{Released 2021-06-18} \newcommand{\TF}{\textit{(TF)}} diff --git a/macros/latex/contrib/l3kernel/l3text-case.dtx b/macros/latex/contrib/l3kernel/l3text-case.dtx index 0b32e63997..691d6a8f06 100644 --- a/macros/latex/contrib/l3kernel/l3text-case.dtx +++ b/macros/latex/contrib/l3kernel/l3text-case.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % @@ -163,10 +163,15 @@ % \begin{macro}[EXP] % {\@@_change_case_char_title:nN, \@@_change_case_char_titleonly:nN} % \begin{macro}[EXP]{\@@_change_case_char_title:nnnN} -% \begin{macro}[EXP]{\@@_change_case_char:nnnN, \@@_change_case_char_aux:nnnN} +% \begin{macro}[EXP] +% { +% \@@_change_case_char:nnnN , +% \@@_change_case_char_auxi:nnnN , +% \@@_change_case_char_auxii:nnnN +% } % \begin{macro}[EXP]{\@@_change_case_char_UTFviii:nnnNN} % \begin{macro}[EXP]{\@@_change_case_char_UTFviii:nnnNNN} -% \begin{macro}[EXP]{\@@_change_case_char_UTFviii:nnnNNNNN} +% \begin{macro}[EXP]{\@@_change_case_char_UTFviii:nnnNNNN} % \begin{macro}[EXP]{\@@_change_case_char_UTFviii:nnnn} % \begin{macro}[EXP] % { @@ -608,6 +613,7 @@ % are to deal with. Those can then be grabbed to reconstruct the full % Unicode character, which is then used in a lookup. (As will become % obvious below, there is no intention here of covering all of Unicode.) +% For (u)p-\TeX{} there are a limited number of tokens we can touch. % \begin{macrocode} \cs_new:Npn \@@_change_case_char:nnnN #1#2#3#4 { @@ -623,7 +629,7 @@ { \sys_if_engine_luatex_p: } { \sys_if_engine_xetex_p: } { - \cs_new_eq:NN \@@_change_case_char_aux:nnnN + \cs_new_eq:NN \@@_change_case_char_auxi:nnnN \@@_change_case_char:nnnN \cs_gset:Npn \@@_change_case_char:nnnN #1#2#3#4 { @@ -631,20 +637,33 @@ { \int_compare:nNnTF { `#4 } < { "E0 } { \@@_change_case_char_UTFviii:nnnNN } - { - \int_compare:nNnTF { `#4 } < { "F0 } - { \@@_change_case_char_UTFviii:nnnNNN } - { \@@_change_case_char_UTFviii:nnnNNNN } - } - {#1} {#2} {#3} #4 + { \@@_change_case_char_auxii:nnnN } } - { \@@_change_case_char_aux:nnnN {#1} {#2} {#3} #4 } + { \@@_change_case_char_auxi:nnnN } + {#1} {#2} {#3} #4 } + \sys_if_engine_pdftex:TF + { + \cs_new:Npn \@@_change_case_char_auxii:nnnN #1#2#3#4 + { + \int_compare:nNnTF { `#4 } < { "F0 } + { \@@_change_case_char_UTFviii:nnnNNN } + { \@@_change_case_char_UTFviii:nnnNNNN } + {#1} {#2} {#3} #4 + } + } + { + \cs_new:Npn \@@_change_case_char_auxii:nnnN #1#2#3#4 + { + \@@_change_case_store:n {#4} + \use:c { @@_change_case_char_next_ #2 :nn } {#2} {#3} + } + } \cs_new:Npn \@@_change_case_char_UTFviii:nnnNN #1#2#3#4#5 { \@@_change_case_char_UTFviii:nnnn {#1} {#2} {#3} {#4#5} } \cs_new:Npn \@@_change_case_char_UTFviii:nnnNNN #1#2#3#4#5#6 { \@@_change_case_char_UTFviii:nnnn {#1} {#2} {#3} {#4#5#6} } - \cs_new:Npn \@@_change_case_char_UTFviii:nnnNNNNN #1#2#3#4#5#6#7 + \cs_new:Npn \@@_change_case_char_UTFviii:nnnNNNN #1#2#3#4#5#6#7 { \@@_change_case_char_UTFviii:nnnn {#1} {#2} {#3} {#4#5#6#7} } \cs_new:Npn \@@_change_case_char_UTFviii:nnnn #1#2#3#4 { diff --git a/macros/latex/contrib/l3kernel/l3text-purify.dtx b/macros/latex/contrib/l3kernel/l3text-purify.dtx index b4be856f81..b215f68953 100644 --- a/macros/latex/contrib/l3kernel/l3text-purify.dtx +++ b/macros/latex/contrib/l3kernel/l3text-purify.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3text.dtx b/macros/latex/contrib/l3kernel/l3text.dtx index 724c190681..c7ced6efbf 100644 --- a/macros/latex/contrib/l3kernel/l3text.dtx +++ b/macros/latex/contrib/l3kernel/l3text.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % @@ -625,6 +625,8 @@ % \begin{macro}[EXP]{\@@_expand_exclude:nN} % \begin{macro}[EXP]{\@@_expand_exclude:NN} % \begin{macro}[EXP]{\@@_expand_exclude:Nn} +% \begin{macro}[EXP]{\@@_expand_accent:N} +% \begin{macro}[EXP]{\@@_expand_accent:NN} % \begin{macro}[EXP]{\@@_expand_letterlike:N} % \begin{macro}[EXP]{\@@_expand_letterlike:NN} % \begin{macro}[EXP]{\@@_expand_cs:N, \@@_expand_encoding:N} @@ -858,15 +860,13 @@ } % \end{macrocode} % Next we exclude math commands: this is mainly as there \emph{might} be an -% \cs{ensuremath}. We also handle accents, which are basically the same issue -% but are kept separate for semantic reasons. +% \cs{ensuremath}. % \begin{macrocode} \cs_new:Npn \@@_expand_exclude:N #1 { \exp_args:Ne \@@_expand_exclude:nN { \exp_not:V \l_text_math_arg_tl - \exp_not:V \l_text_accents_tl \exp_not:V \l_text_expand_exclude_tl } #1 @@ -879,7 +879,7 @@ \cs_new:Npn \@@_expand_exclude:NN #1#2 { \@@_if_recursion_tail_stop_do:Nn #2 - { \@@_expand_letterlike:N #1 } + { \@@_expand_accent:N #1 } \str_if_eq:nnTF {#1} {#2} { \@@_use_i_delimit_by_q_recursion_stop:nw @@ -893,6 +893,29 @@ \@@_expand_loop:w } % \end{macrocode} +% Accents. +% \begin{macrocode} +\cs_new:Npn \@@_expand_accent:N #1 + { + \exp_after:wN \@@_expand_accent:NN \exp_after:wN + #1 \l_text_accents_tl + \q_@@_recursion_tail \q_@@_recursion_stop + } +\cs_new:Npn \@@_expand_accent:NN #1#2 + { + \@@_if_recursion_tail_stop_do:Nn #2 + { \@@_expand_letterlike:N #1 } + \cs_if_eq:NNTF #2 #1 + { + \@@_use_i_delimit_by_q_recursion_stop:nw + { + \@@_expand_store:n {#1} + \@@_expand_loop:w + } + } + { \@@_expand_accent:NN #1 } + } +% \end{macrocode} % Another list of exceptions: these ones take no arguments so are % easier to handle. % \begin{macrocode} @@ -1091,6 +1114,8 @@ % \end{macro} % \end{macro} % \end{macro} +% \end{macro} +% \end{macro} % % \begin{macro} % { diff --git a/macros/latex/contrib/l3kernel/l3tl-analysis.dtx b/macros/latex/contrib/l3kernel/l3tl-analysis.dtx index 443fbd49e7..adf4218a35 100644 --- a/macros/latex/contrib/l3kernel/l3tl-analysis.dtx +++ b/macros/latex/contrib/l3kernel/l3tl-analysis.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3tl.dtx b/macros/latex/contrib/l3kernel/l3tl.dtx index 1be92dc30a..fa2d4780ea 100644 --- a/macros/latex/contrib/l3kernel/l3tl.dtx +++ b/macros/latex/contrib/l3kernel/l3tl.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3token.dtx b/macros/latex/contrib/l3kernel/l3token.dtx index 3f3ee57d91..86882d5944 100644 --- a/macros/latex/contrib/l3kernel/l3token.dtx +++ b/macros/latex/contrib/l3kernel/l3token.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3unicode.dtx b/macros/latex/contrib/l3kernel/l3unicode.dtx index f8a05f0ec6..e185bc71a6 100644 --- a/macros/latex/contrib/l3kernel/l3unicode.dtx +++ b/macros/latex/contrib/l3kernel/l3unicode.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/source3.pdf b/macros/latex/contrib/l3kernel/source3.pdf index 285bfec232..c57ab4d98b 100644 Binary files a/macros/latex/contrib/l3kernel/source3.pdf and b/macros/latex/contrib/l3kernel/source3.pdf differ diff --git a/macros/latex/contrib/l3kernel/source3.tex b/macros/latex/contrib/l3kernel/source3.tex index b48ff25fba..f1364e89d0 100644 --- a/macros/latex/contrib/l3kernel/source3.tex +++ b/macros/latex/contrib/l3kernel/source3.tex @@ -53,7 +53,7 @@ for those people who are interested. {latex-team@latex-project.org}% }% } -\date{Released 2021-06-01} +\date{Released 2021-06-18} \pagenumbering{roman} \maketitle diff --git a/macros/latex/contrib/l3packages/CHANGELOG.md b/macros/latex/contrib/l3packages/CHANGELOG.md index bfe53c2b72..e20b40ad1e 100644 --- a/macros/latex/contrib/l3packages/CHANGELOG.md +++ b/macros/latex/contrib/l3packages/CHANGELOG.md @@ -7,6 +7,12 @@ this project uses date-based 'snapshot' version identifiers. ## [Unreleased] +## [2021-06-18] + +### Fixed + +- Correct internal changes to message naming + ## [2021-06-01] ### Fixed @@ -142,7 +148,8 @@ this project uses date-based 'snapshot' version identifiers. - Switch to ISO date format - Improve cross-module use of internal functions -[Unreleased]: https://github.com/latex3/latex3/compare/2021-06-01...HEAD +[Unreleased]: https://github.com/latex3/latex3/compare/2021-06-18...HEAD +[2021-06-18]: https://github.com/latex3/latex3/compare/2021-06-01...2021-06-18 [2021-06-01]: https://github.com/latex3/latex3/compare/2021-05-27...2021-06-01 [2021-05-27]: https://github.com/latex3/latex3/compare/2021-05-07...2021-05-27 [2021-05-07]: https://github.com/latex3/latex3/compare/2021-03-12...2021-05-07 diff --git a/macros/latex/contrib/l3packages/README.md b/macros/latex/contrib/l3packages/README.md index 543fc348bb..8a4377894c 100644 --- a/macros/latex/contrib/l3packages/README.md +++ b/macros/latex/contrib/l3packages/README.md @@ -1,7 +1,7 @@ LaTeX3 High-Level Concepts ========================== -Release 2021-06-01 +Release 2021-06-18 Overview -------- diff --git a/macros/latex/contrib/l3packages/l3keys2e.dtx b/macros/latex/contrib/l3packages/l3keys2e.dtx index e544c17987..183f3a7c01 100644 --- a/macros/latex/contrib/l3packages/l3keys2e.dtx +++ b/macros/latex/contrib/l3packages/l3keys2e.dtx @@ -62,7 +62,7 @@ % }^^A % } % -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % @@ -139,7 +139,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{l3keys2e}{2021-06-01}{} +\ProvidesExplPackage{l3keys2e}{2021-06-18}{} {LaTeX2e option processing using LaTeX3 keys} % \end{macrocode} % diff --git a/macros/latex/contrib/l3packages/l3keys2e.pdf b/macros/latex/contrib/l3packages/l3keys2e.pdf index ac8a276327..98a6021eab 100644 Binary files a/macros/latex/contrib/l3packages/l3keys2e.pdf and b/macros/latex/contrib/l3packages/l3keys2e.pdf differ diff --git a/macros/latex/contrib/l3packages/xfp.dtx b/macros/latex/contrib/l3packages/xfp.dtx index 91f96ca568..48ecbf7fc0 100644 --- a/macros/latex/contrib/l3packages/xfp.dtx +++ b/macros/latex/contrib/l3packages/xfp.dtx @@ -63,7 +63,7 @@ % }^^A % } % -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % @@ -166,7 +166,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{xfp}{2021-06-01}{} +\ProvidesExplPackage{xfp}{2021-06-18}{} {L3 Floating point unit} % \end{macrocode} % diff --git a/macros/latex/contrib/l3packages/xfp.pdf b/macros/latex/contrib/l3packages/xfp.pdf index 90c8efca28..f5503a5717 100644 Binary files a/macros/latex/contrib/l3packages/xfp.pdf and b/macros/latex/contrib/l3packages/xfp.pdf differ diff --git a/macros/latex/contrib/l3packages/xfrac.dtx b/macros/latex/contrib/l3packages/xfrac.dtx index 51cd687575..07b1e76af3 100644 --- a/macros/latex/contrib/l3packages/xfrac.dtx +++ b/macros/latex/contrib/l3packages/xfrac.dtx @@ -65,7 +65,7 @@ % }^^A % } % -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % @@ -535,7 +535,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{xfrac}{2021-06-01}{} +\ProvidesExplPackage{xfrac}{2021-06-18}{} {L3 Experimental split-level fractions} % \end{macrocode} % diff --git a/macros/latex/contrib/l3packages/xfrac.pdf b/macros/latex/contrib/l3packages/xfrac.pdf index d3540dc2fe..83fe8b0283 100644 Binary files a/macros/latex/contrib/l3packages/xfrac.pdf and b/macros/latex/contrib/l3packages/xfrac.pdf differ diff --git a/macros/latex/contrib/l3packages/xparse.dtx b/macros/latex/contrib/l3packages/xparse.dtx index e34990588a..ca7b5c12d5 100644 --- a/macros/latex/contrib/l3packages/xparse.dtx +++ b/macros/latex/contrib/l3packages/xparse.dtx @@ -67,7 +67,7 @@ % }^^A % } % -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % @@ -1064,7 +1064,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{xparse}{2021-06-01}{} +\ProvidesExplPackage{xparse}{2021-06-18}{} {L3 Experimental document command parser} % \end{macrocode} % @@ -1080,14 +1080,19 @@ \ProcessOptions \relax \cs_set_protected:Npn \@@_tmp:w #1 { - \keys_define:nn { ltcmd } + \keys_define:nn {#1} { log-declarations .bool_set:N = \l_@@_log_bool , log-declarations .initial:n = false } - \keys_set:nV { ltcmd } \l_@@_options_clist + \keys_set:nV {#1} \l_@@_options_clist \bool_if:NF \l_@@_log_bool - { \msg_redirect_module:nnn { LaTeX / ltcmd } { info } { none } } + { \msg_redirect_module:nnn { LaTeX / #1 } { info } { none } } + \cs_new_protected:Npn \@@_unknown_argument_type_error:n ##1 + { + \__kernel_msg_error:nnxx {#1} { unknown-argument-type } + { \@@_environment_or_command: } { \tl_to_str:n {##1} } + } } \msg_if_exist:nnTF { cmd } { define-command } { \@@_tmp:w { cmd } } @@ -1109,8 +1114,7 @@ \int_incr:N \l_@@_current_arg_int \cs_if_exist_use:cF { @@_normalize_type_ \tl_to_str:n {#1} :w } { - \__kernel_msg_error:nnxx { ltcmd } { unknown-argument-type } - { \@@_environment_or_command: } { \tl_to_str:n {#1} } + \@@_unknown_argument_type_error:n {#1} \@@_bad_def:wn } } diff --git a/macros/latex/contrib/l3packages/xparse.pdf b/macros/latex/contrib/l3packages/xparse.pdf index 32764368c3..cbfa8c8452 100644 Binary files a/macros/latex/contrib/l3packages/xparse.pdf and b/macros/latex/contrib/l3packages/xparse.pdf differ diff --git a/macros/latex/contrib/l3packages/xtemplate.dtx b/macros/latex/contrib/l3packages/xtemplate.dtx index 8bc76461dc..7a7d682d63 100644 --- a/macros/latex/contrib/l3packages/xtemplate.dtx +++ b/macros/latex/contrib/l3packages/xtemplate.dtx @@ -63,7 +63,7 @@ % }^^A % } % -% \date{Released 2021-06-01} +% \date{Released 2021-06-18} % % \maketitle % @@ -682,7 +682,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{xtemplate}{2021-06-01}{} +\ProvidesExplPackage{xtemplate}{2021-06-18}{} {L3 Experimental prototype document functions} % \end{macrocode} % diff --git a/macros/latex/contrib/l3packages/xtemplate.pdf b/macros/latex/contrib/l3packages/xtemplate.pdf index 3359b8fe1c..8e8e58b2af 100644 Binary files a/macros/latex/contrib/l3packages/xtemplate.pdf and b/macros/latex/contrib/l3packages/xtemplate.pdf differ diff --git a/macros/xetex/generic/xetexko/ChangeLog b/macros/xetex/generic/xetexko/ChangeLog index 486d2ddf12..f1b41e9cef 100644 --- a/macros/xetex/generic/xetexko/ChangeLog +++ b/macros/xetex/generic/xetexko/ChangeLog @@ -1,3 +1,10 @@ +2021-06-18 Dohyun Kim + + Version 3.7 + + * fix position of dotemph regarding hangul tone marks + * enhance compatibility with ulem/ruby packages + 2021-06-10 Dohyun Kim Version 3.6 diff --git a/macros/xetex/generic/xetexko/README b/macros/xetex/generic/xetexko/README index 8546016217..fcec961996 100644 --- a/macros/xetex/generic/xetexko/README +++ b/macros/xetex/generic/xetexko/README @@ -1,4 +1,4 @@ -XeTeX-ko Package version 3.6 (2021/06/10) +XeTeX-ko Package version 3.7 (2021/06/18) ========================================= XeTeX-ko is a macro package for Xe(La)TeX which supports typesetting @@ -124,8 +124,9 @@ Emphasise Hangul or Hanja by putting dot above. \begin{vertical}{} \end{vertical} This environment makes a vbox vertically typeset. is an -argument to indicate the box height. For vertical typesetting -of entire document, use the command \verticaltypesetting instead. +argument to indicate the box height. When is \empty, an hbox +with natural height will be made. For vertical typesetting of +entire document, use the command \verticaltypesetting instead. \은 \는 \이 \가 \을 \를 \와 \과 \로 \으로 \라 \이라 Commands for automatic Josa selection. Unlike those of cjk-ko diff --git a/macros/xetex/generic/xetexko/xetexko-doc.pdf b/macros/xetex/generic/xetexko/xetexko-doc.pdf index 654bedda95..e8c210813e 100644 Binary files a/macros/xetex/generic/xetexko/xetexko-doc.pdf and b/macros/xetex/generic/xetexko/xetexko-doc.pdf differ diff --git a/macros/xetex/generic/xetexko/xetexko-doc.tex b/macros/xetex/generic/xetexko/xetexko-doc.tex index fed8d24e1b..226dc96105 100644 --- a/macros/xetex/generic/xetexko/xetexko-doc.tex +++ b/macros/xetex/generic/xetexko/xetexko-doc.tex @@ -74,7 +74,7 @@ \title{\xetexko\ 간단 매뉴얼} \author{Dohyun Kim \normalsize <\texttt{nomos at ktug org}> \and \normalsize <\url{http://github.com/dohyunkim/xetexko}>} -\date{Version 3.6\quad 2021/06/10} +\date{Version 3.7\quad 2021/06/18} \maketitle \begin{quote}\small @@ -285,7 +285,11 @@ fontspec과 마찬가지로 각 명령의 끝에 `s'를 붙여도 된다. \item[CharRaise, charraise]\quad 글자의 {\addhangulfontfeature{charraise=.5ex}수직 위치}를 조절한다. - 기본값은 \verb|0pt|. + 기본값은 \verb|0pt|.% + \footnote{% + 세로쓰기에서는 이 옵션의 값을 고정길이(가령 pt 단위)로 주어야 + 크기가 다른 폰트들 간에 중앙정렬이 이루어진다. + } 고정폭 글꼴에서도 이 옵션은 작동한다. \end{description} \vernote{3.0}부터는 다음 옵션들이 아무 효과도 가져오지 않게 @@ -690,7 +694,10 @@ microtype 패키지의 protrusion 기능이 잘 작동하지 않는 경우가 \LaTeX 에서는 \uwave{ulem 패키지}를 로드하는 것만으로 자동 지원된다. \cs{xetexkoulemsupport} 명령이 \vernote{3.3}부터 부활하였으므로 -플레인텍에서는 이 명령을 명시해야 할 경우가 있을 것이다. +플레인텍에서는 이 명령을 명시해야 할 경우가 있을 것이다.% +\footnote{% + ulem 명령어의 인자 안에서도 \cs{dotemph} 명령을 쓸 수 있다. +} %\hfill \fboxsep=-\fboxrule \fbox{\vbox to1em{\hbox to1em{\hss}\vss}} diff --git a/macros/xetex/generic/xetexko/xetexko.sty b/macros/xetex/generic/xetexko/xetexko.sty index e82c85aabd..edd8221c8c 100644 --- a/macros/xetex/generic/xetexko/xetexko.sty +++ b/macros/xetex/generic/xetexko/xetexko.sty @@ -16,7 +16,7 @@ \ifdefined\ProvidesPackage \NeedsTeXFormat{LaTeX2e}[2021/06/01] - \ProvidesPackage{xetexko}[2021/06/10 v3.6 typesetting Korean with XeTeX] + \ProvidesPackage{xetexko}[2021/06/18 v3.7 typesetting Korean with XeTeX] \else \ifdefined\@tempcnta\else \newcount\@tempcnta \fi \ifdefined\@sptoken \else @@ -598,23 +598,22 @@ \chardef\XeKo@cjk@ignorespaces\z@ \protected\def\removeclassicspaces{\chardef\XeKo@cjk@ignorespaces\@ne} -\expandafter\let\csname XeKo@1@class\endcsname =\XeTeXcharclassHG -\expandafter\let\csname XeKo@2@class\endcsname =\XeTeXcharclassID -% skip 3 which ulem uses -\expandafter\let\csname XeKo@4@class\endcsname =\XeTeXcharclassSY -\expandafter\let\csname XeKo@5@class\endcsname =\XeTeXcharclassAA -\expandafter\let\csname XeKo@6@class\endcsname =\XeTeXcharclassAO -\expandafter\let\csname XeKo@7@class\endcsname =\XeTeXcharclassAC -\expandafter\let\csname XeKo@8@class\endcsname =\XeTeXcharclassAP -\expandafter\let\csname XeKo@9@class\endcsname =\XeTeXcharclassAM -\expandafter\let\csname XeKo@10@class\endcsname=\XeTeXcharclassAH -\expandafter\let\csname XeKo@11@class\endcsname=\XeTeXcharclassOP -\expandafter\let\csname XeKo@12@class\endcsname=\XeTeXcharclassCL -\expandafter\let\csname XeKo@13@class\endcsname=\XeTeXcharclassMD -\expandafter\let\csname XeKo@14@class\endcsname=\XeTeXcharclassFS -\expandafter\let\csname XeKo@15@class\endcsname=\XeTeXcharclassEX -\expandafter\let\csname XeKo@16@class\endcsname=\XeTeXcharclassLD -\expandafter\let\csname XeKo@17@class\endcsname=\XeTeXcharclassVC +\expandafter\let\csname XeKo@6@class\endcsname =\XeTeXcharclassHG +\expandafter\let\csname XeKo@7@class\endcsname =\XeTeXcharclassID +\expandafter\let\csname XeKo@8@class\endcsname =\XeTeXcharclassSY +\expandafter\let\csname XeKo@9@class\endcsname =\XeTeXcharclassAA +\expandafter\let\csname XeKo@10@class\endcsname=\XeTeXcharclassAO +\expandafter\let\csname XeKo@11@class\endcsname=\XeTeXcharclassAC +\expandafter\let\csname XeKo@12@class\endcsname=\XeTeXcharclassAP +\expandafter\let\csname XeKo@13@class\endcsname=\XeTeXcharclassAM +\expandafter\let\csname XeKo@14@class\endcsname=\XeTeXcharclassAH +\expandafter\let\csname XeKo@15@class\endcsname=\XeTeXcharclassOP +\expandafter\let\csname XeKo@16@class\endcsname=\XeTeXcharclassCL +\expandafter\let\csname XeKo@17@class\endcsname=\XeTeXcharclassMD +\expandafter\let\csname XeKo@18@class\endcsname=\XeTeXcharclassFS +\expandafter\let\csname XeKo@19@class\endcsname=\XeTeXcharclassEX +\expandafter\let\csname XeKo@20@class\endcsname=\XeTeXcharclassLD +\expandafter\let\csname XeKo@21@class\endcsname=\XeTeXcharclassVC \newtoks\XeKo@toks@ \newtoks\XeKo@toks@ii @@ -628,7 +627,7 @@ \ifnum\XeKo@charslot="FFFF \expandafter\XeKo@flush@toks \else - \ifnum 0\ifnum\XeKo@currclass>4 \ifnum\XeKo@currclass<11 % AA..AH + \ifnum 0\ifnum\XeKo@currclass>8 \ifnum\XeKo@currclass<15 % AA..AH 1\fi\fi >\z@ \expandafter\expandafter\expandafter\XeKo@check@next@tok@latin \else % HG ID @@ -657,18 +656,18 @@ \fi } \def\XeKo@addto@toks#1{% - \ifnum\XeKo@currclass=5 % AA + \ifnum\XeKo@currclass=9 % AA \global\let\XeKo@josatoken=#1\relax \else\ifnum\XeTeXcharclass\XeKo@charslot=\XeTeXcharclassJJ \global\let\XeKo@josatoken=#1\relax - \else\ifnum\XeKo@currclass=4 % SY + \else\ifnum\XeKo@currclass=8 % SY \global\let\XeKo@josatoken=#1\relax \fi\fi\fi \XeKo@toks@\expandafter{\the\XeKo@toks@ #1}% \XeKo@check@next@tok } \def\XeKo@flush@toks{% - \ifnum\XeKo@currclass<\thr@@ + \ifnum\XeKo@currclass<8 % \XeKo@toks@ii{}\expandafter\XeKo@char@orphan % HG, ID \else \expandafter\XeKo@do@flush@toks @@ -729,20 +728,20 @@ \XeKo@pre@hang % hanging punctuations \fi \XeKo@char@raise@start % charraise - \ifnum\XeKo@currclass=\@ne - \XeKo@everyhangul{\the\XeKo@toks@}% everyhangul + \ifnum\XeKo@currclass=6 % + \XeKo@everyhangul{\XeKo@maybe@dotemph \the\XeKo@toks@}% everyhangul \else - \ifnum\XeKo@currclass=\tw@ - \XeKo@everyhanja{\the\XeKo@toks@}% everyhanja + \ifnum\XeKo@currclass=7 % + \XeKo@everyhanja{\XeKo@maybe@dotemph \the\XeKo@toks@}% everyhanja \else \ifnum\XeKo@compresspuncts=\@ne - \ifnum\XeKo@currclass=11 % OP + \ifnum\XeKo@currclass=15 % OP \hbox to.5em\bgroup\hss \the\XeKo@toks@ \egroup - \else\ifnum\XeKo@currclass=12 % CL + \else\ifnum\XeKo@currclass=16 % CL \hbox to.5em\bgroup \the\XeKo@toks@ \hss\egroup - \else\ifnum\XeKo@currclass=13 % MD + \else\ifnum\XeKo@currclass=17 % MD \hbox to.5em\bgroup\hss \the\XeKo@toks@ \hss\egroup - \else\ifnum\XeKo@currclass=14 % FS + \else\ifnum\XeKo@currclass=18 % FS \hbox to.5em\bgroup \the\XeKo@toks@ \hss\egroup \else \the\XeKo@toks@ @@ -773,8 +772,8 @@ } % remove space \def\XeKo@maybe@ignorespaces{% - \ifnum 0\ifnum\XeKo@currclass<5 1\else % HG ID SY - \ifnum\XeKo@currclass>10 1\fi\fi % CJK punctuations + \ifnum 0\ifnum\XeKo@currclass<9 1\else % HG ID SY + \ifnum\XeKo@currclass>14 1\fi\fi % CJK punctuations >\z@ \expandafter\XeKo@ignorespaces@iv \fi @@ -810,7 +809,7 @@ \ifnum\XeKo@hangingpuncts=\@ne \ifcsname XeKo@hanging@ratio@\number`#1\endcsname \ifnum 0\ifnum\XeKo@compresspuncts=\@ne - \ifnum\XeKo@currclass=11 % OP + \ifnum\XeKo@currclass=15 % OP 1\fi\fi >\z@ \XeKo@dimen@=.5em \else @@ -829,8 +828,8 @@ \ifnum\XeKo@hangingpuncts=\@ne \ifcsname XeKo@hanging@ratio@\number`#1\endcsname \ifnum 0\ifnum\XeKo@compresspuncts=\@ne - \ifnum\XeKo@currclass>11 % - \ifnum\XeKo@currclass<15 % CL MD FS + \ifnum\XeKo@currclass>15 % + \ifnum\XeKo@currclass<19 % CL MD FS 1\fi\fi\fi >\z@ \XeKo@dimen@=.5em \else @@ -868,14 +867,14 @@ \def\XeKo@startHG#1{% \global\let\XeKo@josatoken=#1\relax \let\XeKo@pre@hang\XeKo@undefined \let\XeKo@post@hang\XeKo@undefined - \def\XeKo@currclass{1}% + \def\XeKo@currclass{6}% \XeKo@toks@{#1}% \XeKo@check@next@tok } \def\XeKo@startID#1{% \global\let\XeKo@josatoken=#1\relax \let\XeKo@pre@hang\XeKo@undefined \let\XeKo@post@hang\XeKo@undefined - \def\XeKo@currclass{2}% + \def\XeKo@currclass{7}% \XeKo@toks@{#1}% \ifdefined\fallbackhanjafont \iffontchar\font`#1\else @@ -886,55 +885,55 @@ } \def\XeKo@startCJ#1{% \let\XeKo@pre@hang\XeKo@undefined \let\XeKo@post@hang\XeKo@undefined - \def\XeKo@currclass{2}% same as ID + \def\XeKo@currclass{7}% same as ID \XeKo@toks@{#1}% \XeKo@check@next@tok } \def\XeKo@startSY#1{% \global\let\XeKo@josatoken=#1\relax \let\XeKo@pre@hang\XeKo@undefined \let\XeKo@post@hang\XeKo@undefined - \def\XeKo@currclass{4}% + \def\XeKo@currclass{8}% \XeKo@toks@{#1}% \XeKo@check@next@tok } \def\XeKo@startAA#1{% \global\let\XeKo@josatoken=#1\relax \let\XeKo@pre@hang\XeKo@undefined \let\XeKo@post@hang\XeKo@undefined - \def\XeKo@currclass{5}% + \def\XeKo@currclass{9}% \XeKo@toks@{#1}% \XeKo@check@next@tok } \def\XeKo@startAO#1{% \let\XeKo@pre@hang\XeKo@undefined \let\XeKo@post@hang\XeKo@undefined - \def\XeKo@currclass{6}% + \def\XeKo@currclass{10}% \XeKo@toks@{#1}% \XeKo@def@pre@hang{#1}% \XeKo@check@next@tok } \def\XeKo@startAC#1{% \let\XeKo@pre@hang\XeKo@undefined \let\XeKo@post@hang\XeKo@undefined - \def\XeKo@currclass{7}% + \def\XeKo@currclass{11}% \XeKo@toks@{#1}% \XeKo@def@post@hang{#1}% \XeKo@check@next@tok } \def\XeKo@startAP#1{% \let\XeKo@pre@hang\XeKo@undefined \let\XeKo@post@hang\XeKo@undefined - \def\XeKo@currclass{8}% + \def\XeKo@currclass{12}% \XeKo@toks@{#1}% \XeKo@def@post@hang{#1}% \XeKo@check@next@tok } \def\XeKo@startAM#1{% \let\XeKo@pre@hang\XeKo@undefined \let\XeKo@post@hang\XeKo@undefined - \def\XeKo@currclass{9}% + \def\XeKo@currclass{13}% \XeKo@toks@{#1}% \XeKo@def@post@hang{#1}% \XeKo@check@next@tok } \def\XeKo@startAH#1{% \let\XeKo@pre@hang\XeKo@undefined \let\XeKo@post@hang\XeKo@undefined - \def\XeKo@currclass{10}% + \def\XeKo@currclass{14}% \XeKo@toks@{#1}% \ifnum`#1=\hyphenchar\font \else % exclude hyphen char \XeKo@def@post@hang{#1}% @@ -943,49 +942,49 @@ } \def\XeKo@startOP#1{% \let\XeKo@pre@hang\XeKo@undefined \let\XeKo@post@hang\XeKo@undefined - \def\XeKo@currclass{11}% + \def\XeKo@currclass{15}% \XeKo@toks@{#1}% \XeKo@def@pre@hang{#1}% \XeKo@check@next@tok } \def\XeKo@startCL#1{% \let\XeKo@pre@hang\XeKo@undefined \let\XeKo@post@hang\XeKo@undefined - \def\XeKo@currclass{12}% + \def\XeKo@currclass{16}% \XeKo@toks@{#1}% \XeKo@def@post@hang{#1}% \XeKo@check@next@tok } \def\XeKo@startMD#1{% \let\XeKo@pre@hang\XeKo@undefined \let\XeKo@post@hang\XeKo@undefined - \def\XeKo@currclass{13}% + \def\XeKo@currclass{17}% \XeKo@toks@{#1}% \XeKo@def@post@hang{#1}% \XeKo@check@next@tok } \def\XeKo@startFS#1{% \let\XeKo@pre@hang\XeKo@undefined \let\XeKo@post@hang\XeKo@undefined - \def\XeKo@currclass{14}% + \def\XeKo@currclass{18}% \XeKo@toks@{#1}% \XeKo@def@post@hang{#1}% \XeKo@check@next@tok } \def\XeKo@startEX#1{% \let\XeKo@pre@hang\XeKo@undefined \let\XeKo@post@hang\XeKo@undefined - \def\XeKo@currclass{15}% + \def\XeKo@currclass{19}% \XeKo@toks@{#1}% \XeKo@def@post@hang{#1}% \XeKo@check@next@tok } \def\XeKo@startLD#1{% \let\XeKo@pre@hang\XeKo@undefined \let\XeKo@post@hang\XeKo@undefined - \def\XeKo@currclass{16}% + \def\XeKo@currclass{20}% \XeKo@toks@{#1}% \XeKo@def@post@hang{#1}% \XeKo@check@next@tok } \def\XeKo@startVC#1{% \let\XeKo@pre@hang\XeKo@undefined \let\XeKo@post@hang\XeKo@undefined - \def\XeKo@currclass{17}% + \def\XeKo@currclass{21}% \XeKo@toks@{#1}% \XeKo@def@post@hang{#1}% \XeKo@check@next@tok @@ -994,9 +993,9 @@ \XeTeXinterchartoks\XeTeXcharclassBoundary\XeTeXcharclassHG{% \ifnum\lastnodetype=12 % \ifcase\lastkern + \or \XKinterhanjabreak \or \or \or \or % 1: ruby를 한자처럼 취급 \or \unkern\unkern \XKinterhangulbreak % HG HG \or \unkern\unkern \XKinterhanjabreak % ID HG - \or \or \unkern\unkern % SY HG \or \unkern\unkern \XeKo@latincjk % AA HG \or \unkern\unkern % AO HG @@ -1020,9 +1019,9 @@ \XeTeXinterchartoks\XeTeXcharclassBoundary\XeTeXcharclassID{% \ifnum\lastnodetype=12 % \ifcase\lastkern + \or \XKinterhanjabreak \or \or \or \or \or \unkern\unkern \XKinterhanjabreak % HG ID \or \unkern\unkern \XKinterhanjabreak % ID ID - \or \or \unkern\unkern % SY ID \or \unkern\unkern \XeKo@latincjk % AA ID \or \unkern\unkern % AO ID @@ -1046,9 +1045,9 @@ \XeTeXinterchartoks\XeTeXcharclassBoundary\XeTeXcharclassCJ{% \ifnum\lastnodetype=12 % \ifcase\lastkern + \or \XKinterhanjabreak \XeKo@suppress@linebreak \or \or \or \or \or \unkern\unkern \XKinterhanjabreak \XeKo@suppress@linebreak % HG CJ \or \unkern\unkern \XKinterhanjabreak \XeKo@suppress@linebreak % ID CJ - \or \or \unkern\unkern % SY CJ \or \unkern\unkern \XeKo@latincjk % AA CJ \or \unkern\unkern % AO CJ @@ -1072,9 +1071,9 @@ \XeTeXinterchartoks\XeTeXcharclassBoundary\XeTeXcharclassSY{% \ifnum\lastnodetype=12 % \ifcase\lastkern + \or \or \or \or \or \or \unkern\unkern % HG SY \or \unkern\unkern % ID SY - \or \or \unkern\unkern % SY SY \or \unkern\unkern % AA SY \or \unkern\unkern % AO SY @@ -1098,9 +1097,9 @@ \XeTeXinterchartoks\XeTeXcharclassBoundary\XeTeXcharclassAA{% \ifnum\lastnodetype=12 % \ifcase\lastkern + \or \XeKo@latincjk \or \or \or \or \or \unkern\unkern \XeKo@latincjk % HG AA \or \unkern\unkern \XeKo@latincjk % ID AA - \or \or \unkern\unkern % SY AA \or \unkern\unkern % AA AA \or \unkern\unkern % AO AA @@ -1122,9 +1121,9 @@ \XeTeXinterchartoks\XeTeXcharclassBoundary\XeTeXcharclassAO{% \ifnum\lastnodetype=12 % \ifcase\lastkern + \or \XeKo@latincjk \or \or \or \or \or \unkern\unkern \XeKo@latincjk % HG AO \or \unkern\unkern \XeKo@latincjk % ID AO - \or \or \unkern\unkern \XeKo@latincjk % SY AO \or \unkern\unkern % AA AO \or \unkern\unkern % AO AO @@ -1146,9 +1145,9 @@ \XeTeXinterchartoks\XeTeXcharclassBoundary\XeTeXcharclassAC{% \ifnum\lastnodetype=12 % \ifcase\lastkern + \or \or \or \or \or \or \unkern\unkern % HG AC \or \unkern\unkern % ID AC - \or \or \unkern\unkern % SY AC \or \unkern\unkern % AA AC \or \unkern\unkern % AO AC @@ -1170,9 +1169,9 @@ \XeTeXinterchartoks\XeTeXcharclassBoundary\XeTeXcharclassAP{% \ifnum\lastnodetype=12 % \ifcase\lastkern + \or \or \or \or \or \or \unkern\unkern % HG AP \or \unkern\unkern % ID AP - \or \or \unkern\unkern % SY AP \or \unkern\unkern % AA AP \or \unkern\unkern % AO AP @@ -1194,9 +1193,9 @@ \XeTeXinterchartoks\XeTeXcharclassBoundary\XeTeXcharclassAM{% \ifnum\lastnodetype=12 % \ifcase\lastkern + \or \XeKo@nobreak\XeKo@latincjk \or \or \or \or \or \unkern\unkern \XeKo@nobreak\XeKo@latincjk % HG AM \or \unkern\unkern \XeKo@nobreak\XeKo@latincjk % ID AM - \or \or \unkern\unkern \XeKo@nobreak\XeKo@latincjk % SY AM \or \unkern\unkern % AA AM \or \unkern\unkern % AO AM @@ -1218,9 +1217,9 @@ \XeTeXinterchartoks\XeTeXcharclassBoundary\XeTeXcharclassAH{% \ifnum\lastnodetype=12 % \ifcase\lastkern + \or \XeKo@nobreak \or \or \or \or \or \unkern\unkern \XeKo@nobreak % HG AH \or \unkern\unkern \XeKo@nobreak % ID AH - \or \or \unkern\unkern \XeKo@nobreak % SY AH \or \unkern\unkern % AA AH \or \unkern\unkern % AO AH @@ -1242,9 +1241,9 @@ \XeTeXinterchartoks\XeTeXcharclassBoundary\XeTeXcharclassOP{% \ifnum\lastnodetype=12 % \ifcase\lastkern + \or \XeKo@halfhalf \or \or \or \or \or \unkern\unkern \XeKo@halfhalf % HG OP \or \unkern\unkern \XeKo@halfhalf % ID OP - \or \or \unkern\unkern \XeKo@halfhalf % SY OP \or \unkern\unkern \XeKo@halfhalf % AA OP \or \unkern\unkern \XeKo@nobreak\XeKo@halfhalf % AO OP @@ -1268,9 +1267,9 @@ \XeTeXinterchartoks\XeTeXcharclassBoundary\XeTeXcharclassCL{% \ifnum\lastnodetype=12 % \ifcase\lastkern + \or \or \or \or \or \or \unkern\unkern % HG CL \or \unkern\unkern % ID CL - \or \or \unkern\unkern % SY CL \or \unkern\unkern % AA CL \or \unkern\unkern % AO CL @@ -1292,9 +1291,9 @@ \XeTeXinterchartoks\XeTeXcharclassBoundary\XeTeXcharclassMD{% \ifnum\lastnodetype=12 % \ifcase\lastkern + \or \XeKo@nobreak\XeKo@quarterquarter \or \or \or \or \or \unkern\unkern \XeKo@nobreak\XeKo@quarterquarter % HG MD \or \unkern\unkern \XeKo@nobreak\XeKo@quarterquarter % ID MD - \or \or \unkern\unkern \XeKo@nobreak\XeKo@quarterquarter % SY MD \or \unkern\unkern \XeKo@nobreak\XeKo@quarterquarter % AA MD \or \unkern\unkern \XeKo@nobreak\XeKo@quarterquarter % AO MD @@ -1318,9 +1317,9 @@ \XeTeXinterchartoks\XeTeXcharclassBoundary\XeTeXcharclassFS{% \ifnum\lastnodetype=12 % \ifcase\lastkern + \or \or \or \or \or \or \unkern\unkern % HG FS \or \unkern\unkern % ID FS - \or \or \unkern\unkern % SY FS \or \unkern\unkern % AA FS \or \unkern\unkern % AO FS @@ -1342,9 +1341,9 @@ \XeTeXinterchartoks\XeTeXcharclassBoundary\XeTeXcharclassEX{% \ifnum\lastnodetype=12 % \ifcase\lastkern + \or \or \or \or \or \or \unkern\unkern % HG EX \or \unkern\unkern % ID EX - \or \or \unkern\unkern % SY EX \or \unkern\unkern % AA EX \or \unkern\unkern % AO EX @@ -1366,9 +1365,9 @@ \XeTeXinterchartoks\XeTeXcharclassBoundary\XeTeXcharclassLD{% \ifnum\lastnodetype=12 % \ifcase\lastkern + \or \XKinterhanjabreak \XeKo@suppress@linebreak \or \or \or \or \or \unkern\unkern \XKinterhanjabreak \XeKo@suppress@linebreak % HG LD \or \unkern\unkern \XKinterhanjabreak \XeKo@suppress@linebreak % ID LD - \or \or \unkern\unkern % SY LD \or \unkern\unkern % AA LD \or \unkern\unkern % AO LD @@ -1390,9 +1389,9 @@ \XeTeXinterchartoks\XeTeXcharclassBoundary\XeTeXcharclassVC{% \ifnum\lastnodetype=12 % \ifcase\lastkern + \or \or \or \or \or \or \unkern\unkern % HG VC \or \unkern\unkern % ID VC - \or \or \unkern\unkern % SY VC \or \unkern\unkern % AA VC \or \unkern\unkern % AO VC @@ -1418,7 +1417,7 @@ % !!!!! 이 경우 \everyhangul 등이 제대로 작동 않는다 !!!!! \XeTeXinterchartoks\XeTeXcharclassBoundary\XeTeXcharclassJJ{% \ifnum\lastnodetype=12 % - \ifnum\lastkern=\@ne + \ifnum\lastkern=6 % \unkern\unkern \expandafter\expandafter\expandafter\XeKo@startJJ \fi @@ -1441,9 +1440,9 @@ \XeTeXinterchartoks\XeTeXcharclassBoundary\XeTeXcharclassCM{% \ifnum\lastnodetype=12 % \ifcase\lastkern + \or \or \or \or \or \or \unkern\unkern \expandafter\expandafter\expandafter\XeKo@startCM % HG \or \unkern\unkern \expandafter\expandafter\expandafter\XeKo@startCM % ID - \or \or \unkern\unkern \expandafter\expandafter\expandafter\XeKo@startCM % SY \or \unkern\unkern \expandafter\expandafter\expandafter\XeKo@startCM % AA \or \unkern\unkern \expandafter\expandafter\expandafter\XeKo@startCM % AO @@ -1485,7 +1484,7 @@ \XeKo@insert@kerns } \def\XeKo@rebox@punctbox#1{% - \ifnum 0\ifnum\XeKo@currclass>10 \ifnum\XeKo@currclass<15 + \ifnum 0\ifnum\XeKo@currclass>14 \ifnum\XeKo@currclass<19 % OP .. FS 1\fi\fi >\z@ \setbox\XeKo@box@=\lastbox \hbox to.5em\bgroup @@ -1684,22 +1683,46 @@ \fi \newbox\XeKo@dotemph@box +\let\XeKo@maybe@dotemph\relax + \protected\def\dotemph#1{% \leavevmode + \setbox\XeKo@dotemph@box\hbox{\raise\dotemphraise\hbox{\dotemphchar}}% \begingroup - \setbox\XeKo@dotemph@box\hbox{\dotemphchar}% - \edef\XeKo@flush@char@orphan{% - \unexpanded{% - \edef\XeKo@tempa{% - \XeKo@toks@{% - \setbox\z@\hbox{\the\XeKo@toks@}% - \setbox\tw@\hbox to\wd\z@{\hss\unhcopy\XeKo@dotemph@box\hss}\ht\tw@\z@\dp\tw@\z@ - \rlap{\raise\dotemphraise\box\tw@}\the\XeKo@toks@ }% - }\XeKo@tempa }% - \unexpanded\expandafter{\XeKo@flush@char@orphan}}% + \let\XeKo@maybe@dotemph\XeKo@do@dotemph #1\relax \endgroup - } +} +\def\XeKo@do@dotemph{% + \XeKo@check@hangulTM % 방점 너비를 감안하자 + \setbox\z@\hbox{\the\XeKo@toks@}% + \setbox\tw@\hbox to\wd\z@{% + \hss + \ifnum\XeKo@has@hangulTM>\z@ + \kern\fontcharwd\font\XeKo@has@hangulTM + \fi + \unhcopy\XeKo@dotemph@box + \hss + }\wd\tw@\z@ \ht\tw@\z@ \dp\tw@\z@ + \box\tw@ +} +\def\XeKo@check@hangulTM{% + \chardef\XeKo@has@hangulTM\z@ + \expandafter\XeKo@check@hangulTM@e \the\XeKo@toks@ ^^^^302e\relax + \ifnum\XeKo@has@hangulTM=\z@ + \expandafter\XeKo@check@hangulTM@f \the\XeKo@toks@ ^^^^302f\relax + \fi +} +\def\XeKo@check@hangulTM@e#1^^^^302e#2\relax{% + \ifx\empty#2\empty \else + \chardef\XeKo@has@hangulTM="302E + \fi +} +\def\XeKo@check@hangulTM@f#1^^^^302f#2\relax{% + \ifx\empty#2\empty \else + \chardef\XeKo@has@hangulTM="302F + \fi +} % other commands \let\enablecjksymbolspacing\compresspunctuations @@ -1755,62 +1778,49 @@ \let\disableautojosa\relax \let\disablejamoautojosa\relax % ulem support -\ifcsname ver@xetexko.sty\endcsname - \def\xetexkoulemsupport{% - \ifdefined\UL@hook - \UL@hook\expandafter{\the\UL@hook - % uline 안에서 폰트가 변경되는 경우를 대비 - \expandafter\def\expandafter\XeKo@hangul@selectfont\expandafter{% - \XeKo@hangul@selectfont - \ifdefined\XeKo@in@selectfont\else - \xdef\XeKo@UL@hangul@font{% - \def\noexpand\XeKo@hangul@font{\unexpanded\expandafter{\XeKo@hangul@font}}}% - \aftergroup\aftergroup\aftergroup\XeKo@UL@hangul@font - % 여기서 라틴폰트 지정을 보존한다. - \global\let\XeKo@UL@latin@font\font@name - \aftergroup\aftergroup\aftergroup\XeKo@UL@latin@font - \fi }% - \expandafter\def\expandafter\XeKo@hanja@selectfont\expandafter{% - \XeKo@hanja@selectfont - \ifdefined\XeKo@in@selectfont\else - \xdef\XeKo@UL@hanja@font{% - \def\noexpand\XeKo@hanja@font{\unexpanded\expandafter{\XeKo@hanja@font}}}% - \aftergroup\aftergroup\aftergroup\XeKo@UL@hanja@font - \fi }% - }% - \fi - } -\else - \let\XeKo@UL@hangul@patch\relax - \let\XeKo@UL@hanja@patch \relax - \def\xetexkoulemsupport{% - \ifdefined\UL@hook - \UL@hook\expandafter{\the\UL@hook - % uline 안에서 폰트가 변경되는 경우를 대비 - \def\XeKo@UL@hangul@patch{% - \xdef\XeKo@UL@hangul@font{% - \def\noexpand\XeKo@hangul@font{\unexpanded\expandafter{\XeKo@hangul@font}}}% - \aftergroup\aftergroup\aftergroup\XeKo@UL@hangul@font - \XeKo@UL@latin@patch - }% - \def\XeKo@UL@hanja@patch{% - \xdef\XeKo@UL@hanja@font{% - \def\noexpand\XeKo@hanja@font{\unexpanded\expandafter{\XeKo@hanja@font}}}% - \aftergroup\aftergroup\aftergroup\XeKo@UL@hanja@font - \XeKo@UL@latin@patch - }% - % uline 안에서 폰트 지시는 라틴폰트, 한글폰트 순서로 해야 라틴폰트가 올바로 동작함 - \def\XeKo@UL@latin@patch{% - \ifnum 0\expandafter\ifx\the\font\XeKo@raw@hangul@font 1\else - \expandafter\ifx\the\font\XeKo@raw@hanja@font 1\fi\fi =\z@ - \global\expandafter\let\expandafter\XeKo@UL@latin@font\the\font - \aftergroup\aftergroup\aftergroup\XeKo@UL@latin@font - \fi - }% - }% +\protected\def\XeKo@UL@dotemph#1{% + \ifx\ \LA@space\else \UL@stop\fi + \leavevmode + \setbox\XeKo@dotemph@box\hbox{\raise\dotemphraise\hbox{\dotemphchar}}% + \begingroup + \let\XeKo@maybe@dotemph\XeKo@do@dotemph + \XeKo@UL@dotemph@#1 ^^^^ffff \relax + \endgroup + \ifx\ \LA@space\else \UL@start\fi +} +\def\XeKo@UL@dotemph@#1 {% + \ifx^^^^ffff#1\relax + \unskip\unskip\unskip + \else + \ifx\ \LA@space + #1\ % + \else + \UL@start + #1\ % + \UL@stop \fi - } -\fi + \expandafter\XeKo@UL@dotemph@ + \fi +} +\def\xetexkoulemsupport{% + \let\XeKo@UL@stop\UL@stop + \UL@hook\expandafter{\the\UL@hook + \let\dotemph\XeKo@UL@dotemph + % uline 안에서 폰트가 변경되는 경우를 대비 + \def\UL@stop{% + \global\let\XeKo@UL@tmp@latinfont \XeKo@latin@font + \global\let\XeKo@UL@tmp@hangulfont \XeKo@hangul@font + \global\let\XeKo@UL@tmp@hanjafont \XeKo@hanja@font + \global\let\XeKo@UL@tmp@rawhangulfont \XeKo@raw@hangul@font + \global\let\XeKo@UL@tmp@rawhanjafont \XeKo@raw@hanja@font + \expandafter \XeKo@UL@stop \the\font + \let\XeKo@latin@font \XeKo@UL@tmp@latinfont + \let\XeKo@hangul@font \XeKo@UL@tmp@hangulfont + \let\XeKo@hanja@font \XeKo@UL@tmp@hanjafont + \let\XeKo@raw@hangul@font \XeKo@UL@tmp@rawhangulfont + \let\XeKo@raw@hanja@font \XeKo@UL@tmp@rawhanjafont + }% +}} % math hangul \def\setmathhangulblock#1#2{% @@ -1829,7 +1839,7 @@ \unexpanded\expandafter{\plainoutput}}% \def\pagebody{\setbox\z@\vbox to\hsize{\boxmaxdepth=\maxdepth \pagecontents}% \XeKo@rotatebox\z@\box\z@}% - \maxdepth\z@ \typesetvertical + \typesetvertical \let\verticaltypesetting\relax % prevent multiple running } \def\beginverticaltypesetting{\vfill\supereject \begingroup \verticaltypesetting} @@ -1845,7 +1855,6 @@ \ifdefined\xetexkointerhchar \def\noexpand\xetexkointerhchar{\xetexkointerhchar}\fi \ifdefined\xetexkocharraise \def\noexpand\xetexkocharraise{\xetexkocharraise}\fi }% - \XeKo@UL@hangul@patch } \protected\def\sethangulfont#1{% \def\@tempa{#1}% @@ -1861,7 +1870,6 @@ \ifdefined\xetexkointerhchar \def\noexpand\xetexkointerhchar{\xetexkointerhchar}\fi \ifdefined\xetexkocharraise \def\noexpand\xetexkocharraise{\xetexkocharraise}\fi }% - \noexpand\XeKo@UL@hangul@patch }% } \protected\def\hanjafont{% @@ -1874,7 +1882,6 @@ \ifdefined\xetexkointerhchar \def\noexpand\xetexkointerhchar{\xetexkointerhchar}\fi \ifdefined\xetexkocharraise \def\noexpand\xetexkocharraise{\xetexkocharraise}\fi }% - \XeKo@UL@hanja@patch } \protected\def\sethanjafont#1{% \def\@tempa{#1}% @@ -1890,7 +1897,6 @@ \ifdefined\xetexkointerhchar \def\noexpand\xetexkointerhchar{\xetexkointerhchar}\fi \ifdefined\xetexkocharraise \def\noexpand\xetexkocharraise{\xetexkocharraise}\fi }% - \noexpand\XeKo@UL@hanja@patch }% } \protected\def\hanjabyhangulfont{\let\XeKo@hanja@font\XeKo@hangul@font } @@ -1946,7 +1952,7 @@ \expandafter\textwidth\expandafter\textheight \@outputpage }% - \maxdepth\z@ \typesetvertical + \typesetvertical \let\verticaltypesetting\relax % prevent multiple running } \def\endverticaltypesetting{% -- cgit v1.2.3