summaryrefslogtreecommitdiff
path: root/language
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-09-28 03:04:08 +0000
committerNorbert Preining <norbert@preining.info>2020-09-28 03:04:08 +0000
commit34310603e5253ef5742542e3f0123b341a70ee20 (patch)
tree51076d298e97a9c86619db3ada2af17e81c074d1 /language
parentac0ae0fcbd5ee121e6b9134cced71d961e30ed68 (diff)
CTAN sync 202009280304
Diffstat (limited to 'language')
-rw-r--r--language/greek/greek-fontenc/Makefile13
-rw-r--r--language/greek/greek-fontenc/README50
-rw-r--r--language/greek/greek-fontenc/alphabeta-doc.pdfbin429772 -> 429754 bytes
-rw-r--r--language/greek/greek-fontenc/alphabeta-lgr.def2
-rw-r--r--language/greek/greek-fontenc/alphabeta-lgr.def.html351
-rw-r--r--language/greek/greek-fontenc/alphabeta-tuenc.def2
-rw-r--r--language/greek/greek-fontenc/alphabeta-tuenc.def.html95
-rw-r--r--language/greek/greek-fontenc/alphabeta-tuenc.html78
-rw-r--r--language/greek/greek-fontenc/alphabeta.sty22
-rw-r--r--language/greek/greek-fontenc/alphabeta.sty.html118
-rw-r--r--language/greek/greek-fontenc/diacritics.pdfbin307222 -> 307307 bytes
-rw-r--r--language/greek/greek-fontenc/greek-euenc.def2
-rw-r--r--language/greek/greek-fontenc/greek-fontenc.def73
-rw-r--r--language/greek/greek-fontenc/greek-fontenc.def.html154
-rw-r--r--language/greek/greek-fontenc/greek-fontenc.html (renamed from language/greek/greek-fontenc/README.html)172
-rw-r--r--language/greek/greek-fontenc/greekhyperref.pdfbin220718 -> 221120 bytes
-rw-r--r--language/greek/greek-fontenc/lgrenc-test.pdfbin306863 -> 318675 bytes
-rw-r--r--language/greek/greek-fontenc/lgrenc-test.tex56
-rw-r--r--language/greek/greek-fontenc/lgrenc.def27
-rw-r--r--language/greek/greek-fontenc/lgrenc.def.html466
-rw-r--r--language/greek/greek-fontenc/textalpha-doc.pdfbin470128 -> 473143 bytes
-rw-r--r--language/greek/greek-fontenc/textalpha.sty35
-rw-r--r--language/greek/greek-fontenc/textalpha.sty.html143
-rw-r--r--language/greek/greek-fontenc/tuenc-greek-doc.pdfbin84395 -> 83201 bytes
-rw-r--r--language/greek/greek-fontenc/tuenc-greek-doc.tex2
-rw-r--r--language/greek/greek-fontenc/tuenc-greek.def45
-rw-r--r--language/greek/greek-fontenc/tuenc-greek.def.html144
-rw-r--r--language/japanese/jlreq/Makefile2
-rw-r--r--language/japanese/jlreq/README-ja.md10
-rw-r--r--language/japanese/jlreq/README.md6
-rw-r--r--language/japanese/jlreq/jlreq-ja.pdfbin359458 -> 359921 bytes
-rw-r--r--language/japanese/jlreq/jlreq.cls219
-rw-r--r--language/japanese/jlreq/jlreq.pdfbin116315 -> 116789 bytes
-rw-r--r--language/japanese/platex-tools/LICENSE2
-rw-r--r--language/japanese/platex-tools/README.md2
-rw-r--r--language/japanese/platex-tools/plarray.sty4
-rw-r--r--language/japanese/platex-tools/plextarray.sty4
-rw-r--r--language/japanese/platex-tools/plextdelarray.sty2
-rw-r--r--language/japanese/platex-tools/pxatbegshi.pdfbin70954 -> 83094 bytes
-rw-r--r--language/japanese/platex-tools/pxatbegshi.sty26
-rw-r--r--language/japanese/platex-tools/pxatbegshi.tex23
-rw-r--r--language/japanese/platex-tools/pxeveryshi.pdfbin44094 -> 57534 bytes
-rw-r--r--language/japanese/platex-tools/pxeveryshi.sty29
-rw-r--r--language/japanese/platex-tools/pxeveryshi.tex11
-rw-r--r--language/japanese/platex-tools/pxmulticol.sty2
-rw-r--r--language/japanese/platex-tools/pxxspace.pdfbin40065 -> 39968 bytes
-rw-r--r--language/japanese/platex-tools/pxxspace.sty4
-rw-r--r--language/japanese/plautopatch/README.md6
-rw-r--r--language/japanese/plautopatch/plarydshln.sty2
-rw-r--r--language/japanese/plautopatch/plautopatch-ja.pdfbin101660 -> 103312 bytes
-rw-r--r--language/japanese/plautopatch/plautopatch-ja.tex4
-rw-r--r--language/japanese/plautopatch/plautopatch.pdfbin35223 -> 36706 bytes
-rw-r--r--language/japanese/plautopatch/plautopatch.sty75
-rw-r--r--language/japanese/plautopatch/plautopatch.tex4
-rw-r--r--language/japanese/plautopatch/pldocverb.sty4
-rw-r--r--language/japanese/plautopatch/plextarydshln.sty2
-rw-r--r--language/japanese/plautopatch/plextcolortbl.sty4
-rw-r--r--language/japanese/plautopatch/pxesopic.sty177
-rw-r--r--language/japanese/plautopatch/pxpdfpages.sty4
-rw-r--r--language/japanese/plautopatch/pxpgfrcs.sty2
-rw-r--r--language/japanese/plautopatch/pxstfloats.sty5
-rw-r--r--language/japanese/plautopatch/pxtextpos.sty2
-rw-r--r--language/japanese/pxjahyper/README-ja.md3
-rw-r--r--language/japanese/pxjahyper/README.md1
-rw-r--r--language/japanese/pxjahyper/pxjahyper-ajm.def2
-rw-r--r--language/japanese/pxjahyper/pxjahyper.pdfbin116816 -> 116718 bytes
-rw-r--r--language/japanese/pxjahyper/pxjahyper.sty10
-rw-r--r--language/japanese/pxjahyper/pxjahyper.tex4
68 files changed, 1664 insertions, 1043 deletions
diff --git a/language/greek/greek-fontenc/Makefile b/language/greek/greek-fontenc/Makefile
index a784a80580..05fd97cdfd 100644
--- a/language/greek/greek-fontenc/Makefile
+++ b/language/greek/greek-fontenc/Makefile
@@ -70,13 +70,12 @@ lgr2licr.lua: lgr2licr.lua.txt
doc: html pdf
+html: greek-fontenc.html tuenc-greek.def.html greek-fontenc.def.html \
+ lgrenc.def.html textalpha.sty.html alphabeta.sty.html \
+ alphabeta-tuenc.def.html alphabeta-lgr.def.html lgr2licr.lua.html
-html: README.html tuenc-greek.def.html greek-fontenc.def.html lgrenc.def.html \
- textalpha.sty.html alphabeta.sty.html \
- alphabeta-tuenc.def.html alphabeta-lgr.def.html lgr2licr.lua.html
-
-README.html: README
- $(RST2HTML) README README.html
+greek-fontenc.html: README
+ $(RST2HTML) README greek-fontenc.html
tuenc-greek.def.html: tuenc-greek.def
$(PYLIT) tuenc-greek.def
@@ -100,7 +99,7 @@ alphabeta.sty.html: alphabeta.sty
alphabeta-tuenc.def.html: alphabeta-tuenc.def
$(PYLIT) alphabeta-tuenc.def
- $(RST2HTML) alphabeta-tuenc.def.txt alphabeta-tuenc.html
+ $(RST2HTML) alphabeta-tuenc.def.txt alphabeta-tuenc.def.html
alphabeta-lgr.def.html: alphabeta-lgr.def
$(PYLIT) alphabeta-lgr.def
diff --git a/language/greek/greek-fontenc/README b/language/greek/greek-fontenc/README
index d6488da197..fe1ffd9a64 100644
--- a/language/greek/greek-fontenc/README
+++ b/language/greek/greek-fontenc/README
@@ -4,7 +4,6 @@ Greek font encoding definition files
************************************
:Author: Günter Milde
-:Date: 2019-07-10
:Copyright: © 2013 Günter Milde <milde@users.sf.net>
:Licence: This work may be distributed and/or modified under the
conditions of the `LaTeX Project Public License`_, either
@@ -70,6 +69,10 @@ Changelog
0.14 2020-02-28 Update test for Unicode fonts.
Rename ``greek-euenc`` to ``tuenc-greek``.
.. Use ``\UTFencoding`` instead of ``\LastDeclaredEncoding``.
+1.0 2020-09-25 Bugfix in textalpha_: Let ``\greekscript`` set
+ ``\encodingdefault``.
+.. ``\textKoppa`` as alias for ``\textkoppa`` in LGR.
+.. Update URLs.
====== =========== ==========================================================
__ http://tex.stackexchange.com/questions/281631/greek-small-rho-with-dasia-and-also-psili-problem-with-accent-and-lgr-encodin
@@ -92,19 +95,24 @@ TeX files
`LGR Greek font encoding definitions <lgrenc.def.html>`_.
This file is the successor of the basic LGR encoding definition file which
- comes with babel_'s Greek support and of ``lgrxenc.def`` from the now
- obsolete lgrx_ bundle.
+ comes with babel_'s Greek support and the now obsolete lgrx_ bundle.
.. _textalpha:
`<textalpha.sty>`_
`Greek symbols in text <textalpha.sty.html>`_
- independent of font encoding and TeX engine.
+
+ Use ``\textalpha`` ... ``\textOmega`` independent of font encoding and TeX
+ engine.
.. _alphabeta:
`<alphabeta.sty>`_
- Generic macros for `Greek symbols in text and math <alphabeta.sty.html>`_.
+ `Greek symbols in text and math <alphabeta.sty.html>`_.
+
+ Use ``\alpha`` ... ``\Omega`` independent of text/math mode, font
+ encoding, and TeX engine.
+
`<alphabeta-tuenc.def>`_
`Composite definitions with XeTeX/LuaTeX. <alphabeta-tuenc.def.html>`_.
@@ -121,21 +129,20 @@ with Docutils_ to the HTML documentation.
Documentation and test documents
================================
-`<textalpha-doc.tex>`__, `<textalpha-doc.pdf>`_
- `The textalpha package`.
+`textalpha` package documentation:
+ `<textalpha-doc.tex>`__, `<textalpha-doc.pdf>`_
-`<alphabeta-doc.tex>`__ `<alphabeta-doc.pdf>`_
- `The alphabeta package`.
+`alphabeta` package documentation:
+ `<alphabeta-doc.tex>`__ `<alphabeta-doc.pdf>`_
-`<lgrenc-test.tex>`_, `<lgrenc-test.pdf>`_
- Test and usage example.
+Test and usage example
+ `<lgrenc-test.tex>`_, `<lgrenc-test.pdf>`_
-`<tuenc-greek-doc.tex>`_, `<tuenc-greek-doc.pdf>`_
- Example for use of the Greek LICR definitions with XeTeX or
- LuaTeX.
+Font setup for Greek with XeTeX/LuaTeX
+ `<tuenc-greek-doc.tex>`_, `<tuenc-greek-doc.pdf>`_
-`<greekhyperref.tex>`_, `<greekhyperref.pdf>`_
- `Greek script in PDF metadata`.
+Greek script in PDF metadata
+ `<greekhyperref.tex>`_, `<greekhyperref.pdf>`_
The package hyperref_ defines the PU font encoding which also supports
(monotonic) Greek.
@@ -178,8 +185,8 @@ for Debian `bug 858987`_ for details and the `arabi workaround`_ below.
Usage
=====
-There are many alternatives to set up the support for a Greek font encoding
-provided by this package, e.g.:
+There are several alternatives to set up the support for a Greek font
+encoding provided by this package, e.g.:
textalpha_:
Ensure support for Greek characters in text mode::
@@ -338,7 +345,8 @@ Greek characters.
EU1, EU2
--------
-Legacy Unicode font encodings for XeTeX and LuaTeX respectively.
+Legacy Unicode font encodings for XeTeX and LuaTeX respectively. Superseded
+by TU_.
Greek LICR macros
@@ -504,10 +512,10 @@ as-is).
.. [fntguide] LaTeX3 Project Team, `LaTeX2ε font selection`, 2005.
- http://mirror.ctan.org/macros/latex/doc/fntguide.pdf
+ http://mirror.ctan.org/macros/latex/base/fntguide.pdf
.. [encguide] Frank Mittelbach, Robin Fairbairns, Werner Lemberg,
LaTeX3 Project Team, `LaTeX font encodings`, 2006.
- http://mirror.ctan.org/macros/latex/doc/encguide.pdf
+ http://mirror.ctan.org/macros/latex/base/encguide.pdf
.. [greek-usage] Apostolos Syropoulos, `Writing Greek with the greek option
of the babel package`, 1997.
http://mirrors.ctan.org/language/babel/contrib/greek/usage.pdf
diff --git a/language/greek/greek-fontenc/alphabeta-doc.pdf b/language/greek/greek-fontenc/alphabeta-doc.pdf
index 4bfc21010e..a696c0ca3a 100644
--- a/language/greek/greek-fontenc/alphabeta-doc.pdf
+++ b/language/greek/greek-fontenc/alphabeta-doc.pdf
Binary files differ
diff --git a/language/greek/greek-fontenc/alphabeta-lgr.def b/language/greek/greek-fontenc/alphabeta-lgr.def
index 958fb7cfba..efdce493e0 100644
--- a/language/greek/greek-fontenc/alphabeta-lgr.def
+++ b/language/greek/greek-fontenc/alphabeta-lgr.def
@@ -11,7 +11,7 @@
% ::
\ProvidesFile{alphabeta-lgr}
-[2014/09/04 0.11.2 Composite definitions for 8-bit TeX]
+[2014/09/04 1.0 Composite definitions for 8-bit TeX]
% :Changelog:
% .. class:: borderless
diff --git a/language/greek/greek-fontenc/alphabeta-lgr.def.html b/language/greek/greek-fontenc/alphabeta-lgr.def.html
index e324cc3bdd..4ce4aa4208 100644
--- a/language/greek/greek-fontenc/alphabeta-lgr.def.html
+++ b/language/greek/greek-fontenc/alphabeta-lgr.def.html
@@ -1,15 +1,17 @@
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.13: http://docutils.sourceforge.net/" />
+<meta charset="utf-8"/>
+<meta name="generator" content="Docutils 0.17b.dev: http://docutils.sourceforge.net/" />
<title>alphabeta-lgr.def</title>
+<meta name="dcterms.rights" content="© 2014 Günter Milde" />
+<link rel="schema.dcterms" href="http://purl.org/dc/terms/"/>
<style type="text/css">
/* Minimal style sheet for the HTML output of Docutils. */
/* */
/* :Author: Günter Milde, based on html4css1.css by David Goodger */
-/* :Id: $Id: minimal.css 7893 2015-05-11 15:38:58Z milde $ */
+/* :Id: $Id$ */
/* :Copyright: © 2015 Günter Milde. */
/* :License: Released under the terms of the `2-Clause BSD license`_, */
/* in short: */
@@ -28,50 +30,51 @@
/* .. _CSS2.1: http://www.w3.org/TR/CSS2 */
/* .. _validates: http://jigsaw.w3.org/css-validator/validator$link */
-/* Figure/table alignment */
-.align-left { text-align: left; }
-.align-right { text-align: right; }
-.align-center { clear: both; text-align: center;}
+/* alignment of text and inline objects inside block objects*/
+.align-left { text-align: left; }
+.align-right { text-align: right; }
+.align-center { clear: both; text-align: center; }
+.align-top { vertical-align: top; }
+.align-middle { vertical-align: middle; }
+.align-bottom { vertical-align: bottom; }
/* titles */
h1.title, p.subtitle {
text-align: center;
}
-p.admonition-title,
p.topic-title,
p.sidebar-title,
p.rubric,
+p.admonition-title,
p.system-message-title {
font-weight: bold;
}
h1 + p.subtitle,
-h1 + p.section-subtitle {
+h2 + p.section-subtitle {
font-size: 1.6em;
}
-h2 + p.section-subtitle { font-size: 1.28em; }
+h3 + p.section-subtitle {
+ font-size: 1.28em;
+}
p.subtitle,
p.section-subtitle,
p.sidebar-subtitle {
font-weight: bold;
margin-top: -0.5em;
}
-p.sidebar-title,
+p.sidebar-title {
+ font-size: larger;
+}
p.rubric {
font-size: larger;
+ color: maroon;
}
-p.rubric { color: maroon; }
a.toc-backref {
color: black;
text-decoration: none; }
/* Warnings, Errors */
-div.caution p.admonition-title,
-div.attention p.admonition-title,
-div.danger p.admonition-title,
-div.error p.admonition-title,
-div.warning p.admonition-title,
-div.system-messages h1,
-div.error,
+div.system-messages h2,
span.problematic,
p.system-message-title {
color: red;
@@ -98,10 +101,11 @@ dl.simple > dd, dl.compact > dd {
}
/* Table of Contents */
-div.topic.contents { margin: 0; }
-ul.auto-toc {
+div.topic.contents { margin: 0.5em 0; }
+div.topic.contents ul {
list-style-type: none;
- padding-left: 1.5em; }
+ padding-left: 1.5em;
+}
/* Enumerated Lists */
ol.arabic { list-style: decimal }
@@ -156,13 +160,24 @@ pre.address { font: inherit; }
dd.authors > p { margin: 0; }
/* Option Lists */
-dl.option-list { margin-left: 40px; }
+dl.option-list { margin-left: 1.5em; }
dl.option-list > dt { font-weight: normal; }
span.option { white-space: nowrap; }
/* Footnotes and Citations */
+dl.footnote.superscript > dd {margin-left: 1em; }
+dl.footnote.brackets > dd {margin-left: 2em; }
dl > dt.label { font-weight: normal; }
-dt.label > span.fn-backref { margin: 0.2em; }
+a.footnote-reference.brackets:before,
+dt.label > span.brackets:before { content: "["; }
+a.footnote-reference.brackets:after,
+dt.label > span.brackets:after { content: "]"; }
+a.footnote-reference.superscript,
+dl.footnote.superscript > dt.label {
+ vertical-align: super;
+ font-size: smaller;
+}
+dt.label > span.fn-backref { margin-left: 0.2em; }
dt.label > span.fn-backref > a { font-style: italic; }
/* Line Blocks */
@@ -173,41 +188,42 @@ div.line-block div.line-block {
margin-left: 40px;
}
-/* Images and Figures */
-img.align-left,
+/* Figures, Images, and Tables */
.figure.align-left,
-object.align-left {
- display: block;
+figure.align-left,
+img.align-left,
+object.align-left,
+table.align-left {
margin-right: auto;
}
-img.align-center,
.figure.align-center,
-object.align-center {
- display: block;
+figure.align-center,
+img.align-center,
+object.align-center,
+table.align-center {
margin-left: auto;
margin-right: auto;
}
-img.align-right,
.figure.align-right,
-object.align-right {
- display: block;
+figure.align-right,
+img.align-right,
+object.align-right,
+table.align-right {
margin-left: auto;
}
-/* reset inner alignment in figures */
-div.align-right { text-align: inherit }
-
-/* Admonitions and System Messages */
-div.admonition,
-div.system-message,
-div.sidebar{
- margin: 40px;
- border: medium outset;
- padding-right: 1em;
- padding-left: 1em;
+img.align-center, img.align-right,
+object.align-center, object.align-right {
+ display: block;
+}
+/* reset inner alignment in figures and tables */
+.figure.align-left, .figure.align-right,
+figure.align-left, figure.align-right,
+table.align-left, table.align-center, table.align-right {
+ text-align: inherit;
}
/* Sidebar */
-div.sidebar {
+aside.sidebar {
width: 30%;
max-width: 26em;
float: right;
@@ -215,13 +231,16 @@ div.sidebar {
}
/* Text Blocks */
+blockquote,
div.topic,
+div.admonition,
+div.system-message,
pre.literal-block,
pre.doctest-block,
pre.math,
pre.code {
- margin-right: 40px;
- margin-left: 40px;
+ margin-left: 1.5em;
+ margin-right: 1.5em;
}
pre.code .ln { color: gray; } /* line numbers */
@@ -247,14 +266,23 @@ table.borderless td, table.borderless th {
padding-right: 0.5em /* separate table cells */
}
+/* Document Header and Footer */
+header { border-bottom: 1px solid black; }
+footer { border-top: 1px solid black; }
+
+/* new HTML5 block elements: set display for older browsers */
+header, section, footer, aside, nav, main, article, figure {
+ display: block;
+}
+
</style>
<style type="text/css">
/* CSS31_ style sheet for the output of Docutils HTML writers. */
-/* Rules for easy reading and pre-defined style variants. */
+/* Rules for easy reading and pre-defined style variants. */
/* */
/* :Author: Günter Milde, based on html4css1.css by David Goodger */
-/* :Id: $Id: plain.css 7893 2015-05-11 15:38:58Z milde $ */
+/* :Id: $Id$ */
/* :Copyright: © 2015 Günter Milde. */
/* :License: Released under the terms of the `2-Clause BSD license`_, */
/* in short: */
@@ -262,11 +290,11 @@ table.borderless td, table.borderless th {
/* Copying and distribution of this file, with or without modification, */
/* are permitted in any medium without royalty provided the copyright */
/* notice and this notice are preserved. */
-/* */
+/* */
/* This file is offered as-is, without any warranty. */
/* */
/* .. _2-Clause BSD license: http://www.spdx.org/licenses/BSD-2-Clause */
-/* .. _CSS3: http://www.w3.org/TR/CSS3 */
+/* .. _CSS3: http://www.w3.org/TR/CSS3 */
/* Document Structure */
@@ -274,17 +302,20 @@ table.borderless td, table.borderless th {
/* "page layout" */
body {
- padding: 0 5%;
- margin: 8px 0;
+ margin: 0;
+ background-color: #dbdbdb;
}
-div.document {
+div.document,
+main {
line-height:1.3;
- counter-reset: table;
- /* counter-reset: figure; */
+ counter-reset: table figure;
/* avoid long lines --> better reading */
+ /* optimum is 45…75 characters/line <http://webtypography.net/2.1.2> */
/* OTOH: lines should not be too short because of missing hyphenation, */
- max-width: 50em;
+ max-width: 50em;
+ padding: 1px 2%; /* 1px on top avoids grey bar above title (mozilla) */
margin: auto;
+ background-color: white;
}
/* Sections */
@@ -298,32 +329,35 @@ hr.docutils {
clear: both;
}
-/* Paragraphs */
-/* ========== */
+/* Paragraphs */
+/* ========== */
/* vertical space (parskip) */
-p, ol, ul, dl,
+p, ol, ul, dl, li, dd,
div.line-block,
-table{
+div.topic,
+table {
margin-top: 0.5em;
margin-bottom: 0.5em;
}
+p:first-child { margin-top: 0; }
+/* (:last-child is new in CSS 3) */
+p:last-child { margin-bottom: 0; }
+
h1, h2, h3, h4, h5, h6,
dl > dd {
margin-bottom: 0.5em;
}
-/* Lists */
-/* ========== */
-
-/* Definition Lists */
+/* Lists */
+/* ===== */
-dl > dd p:first-child { margin-top: 0; }
-/* :last-child is not part of CSS 2.1 (introduced in CSS 3) */
-/* dl > dd p:last-child { margin-bottom: 0; } */
+/* Separate list entries in compound lists */
+dl > dd, ol > li,
-/* lists nested in definition lists */
-/* :only-child is not part of CSS 2.1 (introduced in CSS 3) */
+/* Definition Lists */
+/* Indent lists nested in definition lists */
+/* (:only-child is new in CSS 3) */
dd > ul:only-child, dd > ol:only-child { padding-left: 1em; }
/* Description Lists */
@@ -372,23 +406,20 @@ span.fn-backref {
font-weight: normal;
}
-/* Text Blocks */
-/* ============ */
+/* Text Blocks */
+/* =========== */
-/* Literal Blocks */
-pre.literal-block, pre.doctest-block,
-pre.math, pre.code {
- margin-left: 1.5em;
- margin-right: 1.5em
+/* Literal Blocks */
+
+pre.literal-block,
+pre.doctest-block,
+pre.math,
+pre.code {
+ font-family: monospace;
}
-/* Block Quotes */
+/* Block Quotes */
-blockquote,
-div.topic {
- margin-left: 1.5em;
- margin-right: 1.5em
-}
blockquote > table,
div.topic > table {
margin-top: 0;
@@ -400,11 +431,13 @@ div.topic p.attribution {
margin-left: 20%;
}
-/* Tables */
-/* ====== */
+/* Tables */
+/* ====== */
/* th { vertical-align: bottom; } */
+table tr { text-align: left; }
+
/* "booktabs" style (no vertical lines) */
table.booktabs {
border: 0;
@@ -417,7 +450,6 @@ table.booktabs * {
}
table.booktabs th {
border-bottom: thin solid;
- text-align: left;
}
/* numbered tables (counter defined in div.document) */
@@ -427,11 +459,11 @@ table.numbered > caption:before {
font-weight: bold;
}
-/* Explicit Markup Blocks */
-/* ====================== */
+/* Explicit Markup Blocks */
+/* ====================== */
-/* Footnotes and Citations */
-/* ----------------------- */
+/* Footnotes and Citations */
+/* ----------------------- */
/* line on the left */
dl.footnote {
@@ -440,44 +472,80 @@ dl.footnote {
border-left-width: thin;
}
-/* Directives */
-/* ---------- */
+/* Directives */
+/* ---------- */
-/* Body Elements */
-/* ~~~~~~~~~~~~~ */
+/* Body Elements */
+/* ~~~~~~~~~~~~~ */
/* Images and Figures */
-img.align-left,
+
+/* let content flow to the side of aligned images and figures */
.figure.align-left,
+figure.align-left,
+img.align-left,
object.align-left {
+ display: block;
clear: left;
float: left;
- margin-right: 1em
+ margin-right: 1em;
}
-img.align-right,
.figure.align-right,
+figure.align-right,
+img.align-right,
object.align-right {
+ display: block;
clear: right;
float: right;
- margin-left: 1em
+ margin-left: 1em;
}
/* Stop floating sidebars, images and figures at section level 1,2,3 */
-h1, h2, h3 { clear: both; }
+h1, h2, h3, h4 { clear: both; }
+
+/* Numbered figures */
+figure.numbered > figcaption > p:before {
+ counter-increment: figure;
+ content: "Figure " counter(figure) ": ";
+ font-weight: bold;
+}
+
+
+/* Admonitions and System Messages */
+
+div.admonition,
+div.system-message,
+aside.sidebar {
+ border: medium outset;
+ margin: 1em 1.5em;
+ padding: 0.5em 1em;
+}
+
+div.caution p.admonition-title,
+div.attention p.admonition-title,
+div.danger p.admonition-title,
+div.error p.admonition-title,
+div.warning p.admonition-title,
+div.error {
+ color: red;
+}
+
/* Sidebar */
-/* Move into the margin. In a layout with fixed margins, */
-/* it can be moved into the margin completely. */
-div.sidebar {
+/* Move right. In a layout with fixed margins, */
+/* it can be moved into the margin. */
+div.sidebar,
+aside.sidebar {
width: 30%;
max-width: 26em;
margin-left: 1em;
- margin-right: -5.5%;
- background-color: #ffffee ;
+ margin-right: -2%;
+ background-color: #ffffee;
}
-/* Code */
+/* Code */
+pre.code { padding: 0.7ex }
pre.code, code { background-color: #eeeeee }
pre.code .ln { color: gray; } /* line numbers */
/* basic highlighting: for a complete scheme, see */
@@ -489,57 +557,58 @@ pre.code .name.builtin, code .name.builtin { color: #352B84 }
pre.code .deleted, code .deleted { background-color: #DEB0A1}
pre.code .inserted, code .inserted { background-color: #A3D289}
-/* Math */
+/* Math */
/* styled separately (see math.css for math-output=HTML) */
-/* Epigraph */
-/* Highlights */
-/* Pull-Quote */
-/* Compound Paragraph */
-/* Container */
-
-/* can be styled in a custom stylesheet */
+/* Epigraph */
+/* Highlights */
+/* Pull-Quote */
+/* Compound Paragraph */
+/* Container */
/* Document Header and Footer */
-div.footer, div.header {
- clear: both;
+footer, header {
font-size: smaller;
+ clear: both;
+ padding: 0.5em 2%;
+ background-color: #ebebee;
+ border: none;
}
-/* Inline Markup */
-/* ============= */
+/* Inline Markup */
+/* ============= */
+
+/* Emphasis */
+/* em */
+/* Strong Emphasis */
+/* strong */
+/* Interpreted Text */
+/* span.interpreted */
+/* Title Reference */
+/* cite */
-/* Emphasis */
-/* em */
-/* Strong Emphasis */
-/* strong */
-/* Interpreted Text */
-/* span.interpreted */
-/* Title Reference */
-/* cite */
-/* Inline Literals */
+/* Inline Literals */
/* possible values: normal, nowrap, pre, pre-wrap, pre-line */
-/* span.docutils.literal { white-space: pre-wrap; } */
+/* span.docutils.literal { white-space: pre-wrap; } */
-/* Hyperlink References */
+/* Hyperlink References */
a { text-decoration: none; }
-/* External Targets */
-/* span.target.external */
-/* Internal Targets */
-/* span.target.internal */
-/* Footnote References */
-/* a.footnote-reference */
-/* Citation References */
-/* a.citation-reference */
+/* External Targets */
+/* span.target.external */
+/* Internal Targets */
+/* span.target.internal */
+/* Footnote References */
+/* a.footnote-reference */
+/* Citation References */
+/* a.citation-reference */
</style>
</head>
<body>
-<div class="document" id="alphabeta-lgr-def">
+<main id="alphabeta-lgr-def">
<h1 class="title">alphabeta-lgr.def</h1>
-
<p class="subtitle" id="composite-definitions-for-8-bit-tex">Composite definitions for 8-bit TeX</p>
<dl class="docinfo">
<dt class="copyright">Copyright</dt>
@@ -551,7 +620,7 @@ version 1.3 of this license or any later version.</p>
</dd>
<dt class="identification">Identification</dt>
<dd class="identification"><pre class="literal-block">\ProvidesFile{alphabeta-lgr}
-[2014/09/04 0.11.2 Composite definitions for 8-bit TeX]</pre>
+[2014/09/04 1.0 Composite definitions for 8-bit TeX]</pre>
</dd>
<dt class="changelog">Changelog</dt>
<dd class="changelog"><table class="borderless">
@@ -724,6 +793,6 @@ composite commands for use with 8-bit TeX fonts. It is sourced by
\DeclareTextCompositeCommand{\LGR&#64;hiatus}{LGR}{\Alpha}{\LGR&#64;A&#64;hiatus}
\DeclareTextCompositeCommand{\LGR&#64;hiatus}{LGR}{\Epsilon}{\LGR&#64;E&#64;hiatus}</pre>
<!-- References -->
-</div>
+</main>
</body>
</html>
diff --git a/language/greek/greek-fontenc/alphabeta-tuenc.def b/language/greek/greek-fontenc/alphabeta-tuenc.def
index 043afc86b0..14305d563e 100644
--- a/language/greek/greek-fontenc/alphabeta-tuenc.def
+++ b/language/greek/greek-fontenc/alphabeta-tuenc.def
@@ -11,7 +11,7 @@
% ::
\ProvidesFile{alphabeta-tuenc}
-[2020/02/28 0.14 Composite definitions for XeTeX and LuaTeX]
+[2020/02/28 1.0 Composite definitions for XeTeX and LuaTeX]
% Composite definitions for ``alphabeta.sty`` with XeTeX and LuaTeX.
%
diff --git a/language/greek/greek-fontenc/alphabeta-tuenc.def.html b/language/greek/greek-fontenc/alphabeta-tuenc.def.html
index f10b6088ad..9978e53b82 100644
--- a/language/greek/greek-fontenc/alphabeta-tuenc.def.html
+++ b/language/greek/greek-fontenc/alphabeta-tuenc.def.html
@@ -3,9 +3,9 @@
<head>
<meta charset="utf-8"/>
<meta name="generator" content="Docutils 0.17b.dev: http://docutils.sourceforge.net/" />
-<title>alphabeta-euenc.def</title>
+<title>alphabeta-tuenc.def</title>
<meta name="dcterms.rights" content="© 2013 Günter Milde" />
-<link rel="schema.dcterms" href="http://purl.org/dc/terms/">
+<link rel="schema.dcterms" href="http://purl.org/dc/terms/"/>
<style type="text/css">
/* Minimal style sheet for the HTML output of Docutils. */
@@ -50,33 +50,31 @@ p.system-message-title {
font-weight: bold;
}
h1 + p.subtitle,
-h1 + p.section-subtitle {
+h2 + p.section-subtitle {
font-size: 1.6em;
}
-h2 + p.section-subtitle { font-size: 1.28em; }
+h3 + p.section-subtitle {
+ font-size: 1.28em;
+}
p.subtitle,
p.section-subtitle,
p.sidebar-subtitle {
font-weight: bold;
margin-top: -0.5em;
}
-p.sidebar-title,
+p.sidebar-title {
+ font-size: larger;
+}
p.rubric {
font-size: larger;
+ color: maroon;
}
-p.rubric { color: maroon; }
a.toc-backref {
color: black;
text-decoration: none; }
/* Warnings, Errors */
-div.caution p.admonition-title,
-div.attention p.admonition-title,
-div.danger p.admonition-title,
-div.error p.admonition-title,
-div.warning p.admonition-title,
-div.system-messages h1,
-div.error,
+div.system-messages h2,
span.problematic,
p.system-message-title {
color: red;
@@ -213,8 +211,6 @@ object.align-right,
table.align-right {
margin-left: auto;
}
-.figure.align-center, .figure.align-right,
-figure.align-center, figure.align-right,
img.align-center, img.align-right,
object.align-center, object.align-right {
display: block;
@@ -226,18 +222,6 @@ table.align-left, table.align-center, table.align-right {
text-align: inherit;
}
-/* Admonitions and System Messages */
-div.admonition,
-div.system-message,
-aside.sidebar {
- margin: 1em 1.5em;
- border: medium outset;
- padding-top: 0.5em;
- padding-bottom: 0.5em;
- padding-right: 1em;
- padding-left: 1em;
-}
-
/* Sidebar */
aside.sidebar {
width: 30%;
@@ -249,6 +233,8 @@ aside.sidebar {
/* Text Blocks */
blockquote,
div.topic,
+div.admonition,
+div.system-message,
pre.literal-block,
pre.doctest-block,
pre.math,
@@ -322,11 +308,11 @@ body {
div.document,
main {
line-height:1.3;
- counter-reset: table;
- /* counter-reset: figure; */
+ counter-reset: table figure;
/* avoid long lines --> better reading */
+ /* optimum is 45…75 characters/line <http://webtypography.net/2.1.2> */
/* OTOH: lines should not be too short because of missing hyphenation, */
- max-width: 50em;
+ max-width: 50em;
padding: 1px 2%; /* 1px on top avoids grey bar above title (mozilla) */
margin: auto;
background-color: white;
@@ -514,7 +500,35 @@ object.align-right {
margin-left: 1em;
}
/* Stop floating sidebars, images and figures at section level 1,2,3 */
-h1, h2, h3 { clear: both; }
+h1, h2, h3, h4 { clear: both; }
+
+/* Numbered figures */
+figure.numbered > figcaption > p:before {
+ counter-increment: figure;
+ content: "Figure " counter(figure) ": ";
+ font-weight: bold;
+}
+
+
+/* Admonitions and System Messages */
+
+div.admonition,
+div.system-message,
+aside.sidebar {
+ border: medium outset;
+ margin: 1em 1.5em;
+ padding: 0.5em 1em;
+}
+
+div.caution p.admonition-title,
+div.attention p.admonition-title,
+div.danger p.admonition-title,
+div.error p.admonition-title,
+div.warning p.admonition-title,
+div.error {
+ color: red;
+}
+
/* Sidebar */
@@ -593,8 +607,8 @@ a { text-decoration: none; }
</style>
</head>
<body>
-<main id="alphabeta-euenc-def">
-<h1 class="title">alphabeta-euenc.def</h1>
+<main id="alphabeta-tuenc-def">
+<h1 class="title">alphabeta-tuenc.def</h1>
<p class="subtitle" id="composite-definitions-for-xetex-and-luatex">Composite definitions for XeTeX and LuaTeX</p>
<dl class="docinfo">
<dt class="copyright">Copyright</dt>
@@ -605,8 +619,8 @@ conditions of the <a class="reference external" href="http://www.latex-project.o
version 1.3 of this license or any later version.</p>
</dd>
<dt class="identification">Identification</dt>
-<dd class="identification"><pre class="literal-block">\ProvidesFile{alphabeta-euenc}
-[2014/09/04 0.11.2 Composite definitions for XeTeX and LuaTeX]</pre>
+<dd class="identification"><pre class="literal-block">\ProvidesFile{alphabeta-tuenc}
+[2020/02/28 1.0 Composite definitions for XeTeX and LuaTeX]</pre>
</dd>
</dl>
<p>Composite definitions for <span class="docutils literal">alphabeta.sty</span> with XeTeX and LuaTeX.</p>
@@ -631,6 +645,11 @@ version 1.3 of this license or any later version.</p>
<td><p>0.11.2</p></td>
<td><p>documentation update</p></td>
</tr>
+<tr><td><p>2020/02/28</p></td>
+<td><p>0.14</p></td>
+<td><p>rename to <span class="docutils literal"><span class="pre">alphabeta-tuenc.def</span></span>,
+use <span class="docutils literal">\UTFencname</span> instead of <span class="docutils literal">\LastDeclaredEncoding</span></p></td>
+</tr>
</tbody>
</table>
</dd>
@@ -641,11 +660,11 @@ the established command names in text, too.</p>
<p>The NFSS TextComposite mechanism looks for the next token without expanding
it. In order to let compositions like <span class="docutils literal"><span class="pre">\&gt;&quot;\alpha</span></span> work as expected we
define TextComposites with the <cite>letter name commands</cite>.</p>
-<p>This file expands the font encoding definitions in <a class="reference external" href="greek-euenc.def.html">greek-euenc.def</a> with
+<p>This file expands the font encoding definitions in <a class="reference external" href="tuenc-greek.def.html">tuenc-greek.def</a> with
composite commands for use with Unicode fonts. It is sourced by <a class="reference external" href="alphabeta.sty.html">alphabeta</a>
under XeTeX/LuaTeX.</p>
<section id="greek-and-coptic">
-<h1>Greek and Coptic</h1>
+<h2>Greek and Coptic</h2>
<pre class="literal-block">\DeclareTextCompositeCommand{\'}{\UTFencname}{\Alpha}{Ά}
\DeclareTextCompositeCommand{\'}{\UTFencname}{\Epsilon}{Έ}
\DeclareTextCompositeCommand{\'}{\UTFencname}{\Eta}{Ή}
@@ -670,7 +689,7 @@ under XeTeX/LuaTeX.</p>
\DeclareTextCompositeCommand{\'}{\UTFencname}{\omega}{ώ}</pre>
</section>
<section id="greek-extended">
-<h1>Greek Extended</h1>
+<h2>Greek Extended</h2>
<p>Postfix ypogegrammeni cannot be second part of composite defs.</p>
<pre class="literal-block">\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\alpha}{ἀ}
\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\alpha}{ἁ}
diff --git a/language/greek/greek-fontenc/alphabeta-tuenc.html b/language/greek/greek-fontenc/alphabeta-tuenc.html
index 569c2f99cf..1e2857bca3 100644
--- a/language/greek/greek-fontenc/alphabeta-tuenc.html
+++ b/language/greek/greek-fontenc/alphabeta-tuenc.html
@@ -5,7 +5,7 @@
<meta name="generator" content="Docutils 0.17b.dev: http://docutils.sourceforge.net/" />
<title>alphabeta-tuenc.def</title>
<meta name="dcterms.rights" content="© 2013 Günter Milde" />
-<link rel="schema.dcterms" href="http://purl.org/dc/terms/">
+<link rel="schema.dcterms" href="http://purl.org/dc/terms/"/>
<style type="text/css">
/* Minimal style sheet for the HTML output of Docutils. */
@@ -50,33 +50,31 @@ p.system-message-title {
font-weight: bold;
}
h1 + p.subtitle,
-h1 + p.section-subtitle {
+h2 + p.section-subtitle {
font-size: 1.6em;
}
-h2 + p.section-subtitle { font-size: 1.28em; }
+h3 + p.section-subtitle {
+ font-size: 1.28em;
+}
p.subtitle,
p.section-subtitle,
p.sidebar-subtitle {
font-weight: bold;
margin-top: -0.5em;
}
-p.sidebar-title,
+p.sidebar-title {
+ font-size: larger;
+}
p.rubric {
font-size: larger;
+ color: maroon;
}
-p.rubric { color: maroon; }
a.toc-backref {
color: black;
text-decoration: none; }
/* Warnings, Errors */
-div.caution p.admonition-title,
-div.attention p.admonition-title,
-div.danger p.admonition-title,
-div.error p.admonition-title,
-div.warning p.admonition-title,
-div.system-messages h1,
-div.error,
+div.system-messages h2,
span.problematic,
p.system-message-title {
color: red;
@@ -213,8 +211,6 @@ object.align-right,
table.align-right {
margin-left: auto;
}
-.figure.align-center, .figure.align-right,
-figure.align-center, figure.align-right,
img.align-center, img.align-right,
object.align-center, object.align-right {
display: block;
@@ -226,18 +222,6 @@ table.align-left, table.align-center, table.align-right {
text-align: inherit;
}
-/* Admonitions and System Messages */
-div.admonition,
-div.system-message,
-aside.sidebar {
- margin: 1em 1.5em;
- border: medium outset;
- padding-top: 0.5em;
- padding-bottom: 0.5em;
- padding-right: 1em;
- padding-left: 1em;
-}
-
/* Sidebar */
aside.sidebar {
width: 30%;
@@ -249,6 +233,8 @@ aside.sidebar {
/* Text Blocks */
blockquote,
div.topic,
+div.admonition,
+div.system-message,
pre.literal-block,
pre.doctest-block,
pre.math,
@@ -322,11 +308,11 @@ body {
div.document,
main {
line-height:1.3;
- counter-reset: table;
- /* counter-reset: figure; */
+ counter-reset: table figure;
/* avoid long lines --> better reading */
+ /* optimum is 45…75 characters/line <http://webtypography.net/2.1.2> */
/* OTOH: lines should not be too short because of missing hyphenation, */
- max-width: 50em;
+ max-width: 50em;
padding: 1px 2%; /* 1px on top avoids grey bar above title (mozilla) */
margin: auto;
background-color: white;
@@ -514,7 +500,35 @@ object.align-right {
margin-left: 1em;
}
/* Stop floating sidebars, images and figures at section level 1,2,3 */
-h1, h2, h3 { clear: both; }
+h1, h2, h3, h4 { clear: both; }
+
+/* Numbered figures */
+figure.numbered > figcaption > p:before {
+ counter-increment: figure;
+ content: "Figure " counter(figure) ": ";
+ font-weight: bold;
+}
+
+
+/* Admonitions and System Messages */
+
+div.admonition,
+div.system-message,
+aside.sidebar {
+ border: medium outset;
+ margin: 1em 1.5em;
+ padding: 0.5em 1em;
+}
+
+div.caution p.admonition-title,
+div.attention p.admonition-title,
+div.danger p.admonition-title,
+div.error p.admonition-title,
+div.warning p.admonition-title,
+div.error {
+ color: red;
+}
+
/* Sidebar */
@@ -650,7 +664,7 @@ define TextComposites with the <cite>letter name commands</cite>.</p>
composite commands for use with Unicode fonts. It is sourced by <a class="reference external" href="alphabeta.sty.html">alphabeta</a>
under XeTeX/LuaTeX.</p>
<section id="greek-and-coptic">
-<h1>Greek and Coptic</h1>
+<h2>Greek and Coptic</h2>
<pre class="literal-block">\DeclareTextCompositeCommand{\'}{\UTFencname}{\Alpha}{Ά}
\DeclareTextCompositeCommand{\'}{\UTFencname}{\Epsilon}{Έ}
\DeclareTextCompositeCommand{\'}{\UTFencname}{\Eta}{Ή}
@@ -675,7 +689,7 @@ under XeTeX/LuaTeX.</p>
\DeclareTextCompositeCommand{\'}{\UTFencname}{\omega}{ώ}</pre>
</section>
<section id="greek-extended">
-<h1>Greek Extended</h1>
+<h2>Greek Extended</h2>
<p>Postfix ypogegrammeni cannot be second part of composite defs.</p>
<pre class="literal-block">\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\alpha}{ἀ}
\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\alpha}{ἁ}
diff --git a/language/greek/greek-fontenc/alphabeta.sty b/language/greek/greek-fontenc/alphabeta.sty
index b4a4f94b69..53027da0b9 100644
--- a/language/greek/greek-fontenc/alphabeta.sty
+++ b/language/greek/greek-fontenc/alphabeta.sty
@@ -14,7 +14,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{alphabeta}
- [2020/02/28 v0.14 macros for Greek letters in text and math]
+ [2020/02/28 1.0 macros for Greek letters in text and math]
% Changelog:
% .. class:: borderless
@@ -51,9 +51,9 @@
% doors interfere with kerning between letters and replacement of
% accent+character with a pre-composed character.
%
-% Therefore, Greek text should be written with the help of babel_ or
-% polyglossia_ (setting the language to ``greek``) or wrapped in the
-% provided ``ensuregreek`` macro. Using babel_ or polyglossia_ also helps
+% Therefore, Greek text should be written with the help of Babel_ or
+% Polyglossia_ (setting the language to ``greek``) or wrapped in the
+% provided ``ensuregreek`` macro. Using Babel_ or Polyglossia_ also helps
% to ensure proper hyphenation.
%
%
@@ -391,11 +391,11 @@
% .. References
% ----------
% .. _LaTeX Project Public License: http://www.latex-project.org/lppl.txt
-% .. _CB Fonts: http://www.ctan.org/pkg/cbgreek-complete
-% .. _babel: http://www.ctan.org/cgi-bin/ctanPackageInformation.py?id=babel
+% .. _CB Fonts: http://ctan.org/pkg/cbgreek-complete
+% .. _Babel: http://ctan.org/pkg/babel
% .. _e-TeX: http://www.tex.ac.uk/cgi-bin/texfaq2html?label=etex
-% .. _greek-fontenc: http://www.ctan.org/pkg/greek-fontenc
-% .. _greek-inputenc: http://www.ctan.org/pkg/greek-inputenc
-% .. _inputenc: http://www.ctan.org/pkg/inputenc
-% .. _fixltx2e: http://www.ctan.org/pkg/fixltx2e
-% .. _polyglossia: http://www.ctan.org/pkg/polyglossia
+% .. _greek-fontenc: http://ctan.org/pkg/greek-fontenc
+% .. _greek-inputenc: http://ctan.org/pkg/greek-inputenc
+% .. _inputenc: http://ctan.org/pkg/inputenc
+% .. _fixltx2e: http://ctan.org/pkg/fixltx2e
+% .. _Polyglossia: http://ctan.org/pkg/polyglossia
diff --git a/language/greek/greek-fontenc/alphabeta.sty.html b/language/greek/greek-fontenc/alphabeta.sty.html
index e5277b4d44..97581b7a0d 100644
--- a/language/greek/greek-fontenc/alphabeta.sty.html
+++ b/language/greek/greek-fontenc/alphabeta.sty.html
@@ -5,7 +5,7 @@
<meta name="generator" content="Docutils 0.17b.dev: http://docutils.sourceforge.net/" />
<title>alphabeta: Greek symbols in text and math</title>
<meta name="dcterms.rights" content="© 2010 Günter Milde" />
-<link rel="schema.dcterms" href="http://purl.org/dc/terms/">
+<link rel="schema.dcterms" href="http://purl.org/dc/terms/"/>
<style type="text/css">
/* Minimal style sheet for the HTML output of Docutils. */
@@ -50,33 +50,31 @@ p.system-message-title {
font-weight: bold;
}
h1 + p.subtitle,
-h1 + p.section-subtitle {
+h2 + p.section-subtitle {
font-size: 1.6em;
}
-h2 + p.section-subtitle { font-size: 1.28em; }
+h3 + p.section-subtitle {
+ font-size: 1.28em;
+}
p.subtitle,
p.section-subtitle,
p.sidebar-subtitle {
font-weight: bold;
margin-top: -0.5em;
}
-p.sidebar-title,
+p.sidebar-title {
+ font-size: larger;
+}
p.rubric {
font-size: larger;
+ color: maroon;
}
-p.rubric { color: maroon; }
a.toc-backref {
color: black;
text-decoration: none; }
/* Warnings, Errors */
-div.caution p.admonition-title,
-div.attention p.admonition-title,
-div.danger p.admonition-title,
-div.error p.admonition-title,
-div.warning p.admonition-title,
-div.system-messages h1,
-div.error,
+div.system-messages h2,
span.problematic,
p.system-message-title {
color: red;
@@ -213,8 +211,6 @@ object.align-right,
table.align-right {
margin-left: auto;
}
-.figure.align-center, .figure.align-right,
-figure.align-center, figure.align-right,
img.align-center, img.align-right,
object.align-center, object.align-right {
display: block;
@@ -226,18 +222,6 @@ table.align-left, table.align-center, table.align-right {
text-align: inherit;
}
-/* Admonitions and System Messages */
-div.admonition,
-div.system-message,
-aside.sidebar {
- margin: 1em 1.5em;
- border: medium outset;
- padding-top: 0.5em;
- padding-bottom: 0.5em;
- padding-right: 1em;
- padding-left: 1em;
-}
-
/* Sidebar */
aside.sidebar {
width: 30%;
@@ -249,6 +233,8 @@ aside.sidebar {
/* Text Blocks */
blockquote,
div.topic,
+div.admonition,
+div.system-message,
pre.literal-block,
pre.doctest-block,
pre.math,
@@ -322,11 +308,11 @@ body {
div.document,
main {
line-height:1.3;
- counter-reset: table;
- /* counter-reset: figure; */
+ counter-reset: table figure;
/* avoid long lines --> better reading */
+ /* optimum is 45…75 characters/line <http://webtypography.net/2.1.2> */
/* OTOH: lines should not be too short because of missing hyphenation, */
- max-width: 50em;
+ max-width: 50em;
padding: 1px 2%; /* 1px on top avoids grey bar above title (mozilla) */
margin: auto;
background-color: white;
@@ -514,7 +500,35 @@ object.align-right {
margin-left: 1em;
}
/* Stop floating sidebars, images and figures at section level 1,2,3 */
-h1, h2, h3 { clear: both; }
+h1, h2, h3, h4 { clear: both; }
+
+/* Numbered figures */
+figure.numbered > figcaption > p:before {
+ counter-increment: figure;
+ content: "Figure " counter(figure) ": ";
+ font-weight: bold;
+}
+
+
+/* Admonitions and System Messages */
+
+div.admonition,
+div.system-message,
+aside.sidebar {
+ border: medium outset;
+ margin: 1em 1.5em;
+ padding: 0.5em 1em;
+}
+
+div.caution p.admonition-title,
+div.attention p.admonition-title,
+div.danger p.admonition-title,
+div.error p.admonition-title,
+div.warning p.admonition-title,
+div.error {
+ color: red;
+}
+
/* Sidebar */
@@ -606,7 +620,7 @@ version 1.3 of this license or any later version.</p>
<dt class="identification">Identification</dt>
<dd class="identification"><pre class="literal-block">\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{alphabeta}
- [2020/02/28 v0.14 macros for Greek letters in text and math]</pre>
+ [2020/02/28 1.0 macros for Greek letters in text and math]</pre>
</dd>
</dl>
<div class="abstract topic">
@@ -642,7 +656,7 @@ mode.</p>
</tr>
<tr><td><p>0.4</p></td>
<td><p>2013-09-11</p></td>
-<td><p>move to <a class="reference external" href="http://www.ctan.org/pkg/greek-fontenc">greek-fontenc</a>, support XeTeX/LuaTeX.</p></td>
+<td><p>move to <a class="reference external" href="http://ctan.org/pkg/greek-fontenc">greek-fontenc</a>, support XeTeX/LuaTeX.</p></td>
</tr>
<tr><td><p>0.13</p></td>
<td><p>2015-09-04</p></td>
@@ -663,13 +677,13 @@ mode.</p>
</dd>
</dl>
<section id="motivation">
-<h1>Motivation</h1>
+<h2>Motivation</h2>
<p>By default, the <span class="docutils literal">\alpha, \beta, ...</span> macros for Greek letters
are only valid in mathematical mode.</p>
<p>With this package, the math macros are redefined to work in both, text and
math mode, so that Greek letters can be specified with the established
command names in text, too.</p>
-<p>If used together with the <span class="docutils literal">utf8</span> option of <a class="reference external" href="http://www.ctan.org/pkg/inputenc">inputenc</a>, literal Unicode
+<p>If used together with the <span class="docutils literal">utf8</span> option of <a class="reference external" href="http://ctan.org/pkg/inputenc">inputenc</a>, literal Unicode
characters can be used for Greek symbols in mathematical formulas.</p>
<div class="admonition attention">
<p class="admonition-title">Attention!</p>
@@ -677,21 +691,21 @@ characters can be used for Greek symbols in mathematical formulas.</p>
However, with 8-bit TeX, the automatic font-encoding switches behind the
doors interfere with kerning between letters and replacement of
accent+character with a pre-composed character.</p>
-<p>Therefore, Greek text should be written with the help of <a class="reference external" href="http://www.ctan.org/cgi-bin/ctanPackageInformation.py?id=babel">babel</a> or
-<a class="reference external" href="http://www.ctan.org/pkg/polyglossia">polyglossia</a> (setting the language to <span class="docutils literal">greek</span>) or wrapped in the
-provided <span class="docutils literal">ensuregreek</span> macro. Using <a class="reference external" href="http://www.ctan.org/cgi-bin/ctanPackageInformation.py?id=babel">babel</a> or <a class="reference external" href="http://www.ctan.org/pkg/polyglossia">polyglossia</a> also helps
+<p>Therefore, Greek text should be written with the help of <a class="reference external" href="http://ctan.org/pkg/babel">Babel</a> or
+<a class="reference external" href="http://ctan.org/pkg/polyglossia">Polyglossia</a> (setting the language to <span class="docutils literal">greek</span>) or wrapped in the
+provided <span class="docutils literal">ensuregreek</span> macro. Using <a class="reference external" href="http://ctan.org/pkg/babel">Babel</a> or <a class="reference external" href="http://ctan.org/pkg/polyglossia">Polyglossia</a> also helps
to ensure proper hyphenation.</p>
</div>
</section>
<section id="usage">
-<h1>Usage</h1>
+<h2>Usage</h2>
<pre class="code latex literal-block"><code><span class="keyword">\usepackage</span><span class="name builtin">{</span>alphabeta<span class="name builtin">}</span></code></pre>
-<p>The <a class="reference external" href="http://www.ctan.org/pkg/greek-inputenc">greek-inputenc</a> package provides support for Unicode (utf-8) input
-of Greek characters with 8-bit TeX and the <a class="reference external" href="http://www.ctan.org/pkg/inputenc">inputenc</a> package:</p>
+<p>The <a class="reference external" href="http://ctan.org/pkg/greek-inputenc">greek-inputenc</a> package provides support for Unicode (utf-8) input
+of Greek characters with 8-bit TeX and the <a class="reference external" href="http://ctan.org/pkg/inputenc">inputenc</a> package:</p>
<pre class="code latex literal-block"><code><span class="keyword">\usepackage</span><span class="name attribute">[utf-8]</span><span class="name builtin">{</span>inputenc<span class="name builtin">}</span>
<span class="keyword">\usepackage</span><span class="name builtin">{</span>alphabeta<span class="name builtin">}</span></code></pre>
<section id="conflicts">
-<h2>Conflicts</h2>
+<h3>Conflicts</h3>
<p><cite>alphabeta</cite> does not work if the <span class="docutils literal">utf8x</span> input encoding is selected.
(<span class="docutils literal">utf8x</span> is an interface to the <span class="docutils literal">ucs</span> package which uses a
non-compatible definition of <span class="docutils literal">\DeclareUnicodeCharacter</span>.)</p>
@@ -699,28 +713,28 @@ non-compatible definition of <span class="docutils literal">\DeclareUnicodeChara
</section>
</section>
<section id="implementation">
-<h1>Implementation</h1>
+<h2>Implementation</h2>
<section id="requirements">
-<h2>Requirements</h2>
+<h3>Requirements</h3>
<p>This package extends the <a class="reference external" href="textalpha.sty.html">textalpha</a> package.
Package options are passed on to <cite>textalpha</cite>:</p>
<pre class="literal-block">\RequirePackageWithOptions{textalpha}</pre>
-<p>Just like <cite>alphabeta</cite>, <cite>textalpha</cite> is part of <a class="reference external" href="http://www.ctan.org/pkg/greek-fontenc">greek-fontenc</a>.</p>
+<p>Just like <cite>alphabeta</cite>, <cite>textalpha</cite> is part of <a class="reference external" href="http://ctan.org/pkg/greek-fontenc">greek-fontenc</a>.</p>
<p>This package requires the <a class="reference external" href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=etex">e-TeX</a> extensions (i.e. a not too old TeX
distribution) for the <span class="docutils literal">\ifdefined</span> test.</p>
-<p>It uses the <span class="docutils literal">\TextOrMath</span> test from the <a class="reference external" href="http://www.ctan.org/pkg/fixltx2e">fixltx2e</a> standard LaTeX package.
+<p>It uses the <span class="docutils literal">\TextOrMath</span> test from the <a class="reference external" href="http://ctan.org/pkg/fixltx2e">fixltx2e</a> standard LaTeX package.
<span class="docutils literal">fixltx2e</span> is loaded by default since TeXLive 2015. In case of an
<span class="docutils literal">\TextOrMath undefined</span> error, load it in the document preamble via</p>
<pre class="code latex literal-block"><code><span class="keyword">\usepackage</span><span class="name builtin">{</span>fixltx2e<span class="name builtin">}</span></code></pre>
</section>
<section id="postpone-the-re-definitions">
-<h2>Postpone the re-definitions</h2>
+<h3>Postpone the re-definitions</h3>
<p>To prevent other packages overwriting the re-defined commands we postpone
the next steps until the start of the document body:</p>
<pre class="literal-block">\AtBeginDocument{</pre>
</section>
<section id="save-math-macros">
-<h2>Save math macros</h2>
+<h3>Save math macros</h3>
<p>Provide an alias for the standard math commands:</p>
<pre class="literal-block">\let\mathGamma\Gamma
\let\mathDelta\Delta
@@ -777,7 +791,7 @@ the next steps until the start of the document body:</p>
\fi</pre>
</section>
<section id="commands-to-access-greek-letters-by-name">
-<h2>Commands to access Greek letters by name</h2>
+<h3>Commands to access Greek letters by name</h3>
<p>For letters defined in math mode, the commands work in both, text and math.</p>
<p>Some Greek letters look identical to Latin letters and can therefore not be
used as variable symbols in math formulas. These letters are not defined in
@@ -847,7 +861,7 @@ in both, text and math mode.</p>
\renewcommand*{\psi}{\TextOrMath{\textpsi}{\mathpsi}}
\renewcommand*{\omega}{\TextOrMath{\textomega}{\mathomega}}</pre>
<section id="archaic-letters">
-<h3>Archaic letters</h3>
+<h4>Archaic letters</h4>
<pre class="literal-block">\renewcommand*{\digamma}{\TextOrMath{\textdigamma}{\mathdigamma}} % ϝ
\providecommand*{\Digamma}{\textDigamma} % Ϝ
\providecommand*{\stigma}{\textstigma} % ϛ
@@ -860,7 +874,7 @@ in both, text and math mode.</p>
\providecommand*{\sampi}{\textsampi} % ϡ</pre>
</section>
<section id="variant-shape-symbols">
-<h3>Variant shape symbols</h3>
+<h4>Variant shape symbols</h4>
<p>TeX’s concept of “standard” vs. “variant” math symbols does not map to the
distinction between GREEK LETTER … vs. GREEK … SYMBOL in the Unicode
standard (see <a class="reference external" href="tuenc-greek-doc.pdf">tuenc-greek-doc.pdf</a>).</p>
@@ -898,7 +912,7 @@ math (or, if not supported, the SYMBOL shape):</p>
</section>
</section>
<section id="textcompositecommands-for-the-generic-macros">
-<h2>TextCompositeCommands for the generic macros</h2>
+<h3>TextCompositeCommands for the generic macros</h3>
<p>The NFSS TextComposite mechanism looks for the next token without expanding
it. In order to let compositions like <span class="docutils literal"><span class="pre">\ensuregreek{\'\Alpha}</span></span> or
<span class="docutils literal"><span class="pre">\ensuregreek{\&gt;&quot;\alpha}</span></span> work as expected we define TextComposites with the
@@ -911,7 +925,7 @@ is LGR).</p>
\fi</pre>
</section>
<section id="re-definition-for-greek-unicode-input-in-math-mode">
-<h2>Re-definition for Greek Unicode input in math mode</h2>
+<h3>Re-definition for Greek Unicode input in math mode</h3>
<p>Check with <span class="docutils literal">\ifdefined</span> for the definition of
<span class="docutils literal">\DeclareUnicodeCharacter</span>. In contrast to <span class="docutils literal">\&#64;ifdefined</span>, this works
without side-effects. It makes the package dependent on the <a class="reference external" href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=etex">e-TeX</a>
diff --git a/language/greek/greek-fontenc/diacritics.pdf b/language/greek/greek-fontenc/diacritics.pdf
index 7826d70893..59e6183c97 100644
--- a/language/greek/greek-fontenc/diacritics.pdf
+++ b/language/greek/greek-fontenc/diacritics.pdf
Binary files differ
diff --git a/language/greek/greek-fontenc/greek-euenc.def b/language/greek/greek-fontenc/greek-euenc.def
index 621e3b8f1d..3835e17e5c 100644
--- a/language/greek/greek-fontenc/greek-euenc.def
+++ b/language/greek/greek-fontenc/greek-euenc.def
@@ -9,6 +9,6 @@
% version 1.3 of this license or any later version.
\ProvidesFile{greek-euenc.def}
-[2020/02/28 0.14 Greek LICRs for XeTeX and LuaTeX]
+[2020/02/28 1.0 Greek LICRs for XeTeX and LuaTeX]
\input{tuenc-greek.def}
diff --git a/language/greek/greek-fontenc/greek-fontenc.def b/language/greek/greek-fontenc/greek-fontenc.def
index 8d45b2508c..0af15b2cab 100644
--- a/language/greek/greek-fontenc/greek-fontenc.def
+++ b/language/greek/greek-fontenc/greek-fontenc.def
@@ -12,7 +12,7 @@
% ::
\ProvidesFile{greek-fontenc.def}
-[2015/08/04 v0.13.4 Common Greek font encoding definitions]
+[2020/09/25 1.0 Common Greek font encoding definitions]
% :Abstract: This file provides definitions that are shared between
% font encodings providing Greek characters.
@@ -27,6 +27,7 @@
% 0.12 2014-12-12 Remove symbol macros for breathing accents.
% 0.13 2015-08-04 No @uclclist entry for ypogegrammeni/prosgegrammeni.
% 0.13.4 2019-07-10 ``@uclclist`` entry for ``\prosgegrammeni``.
+% 1.0 2020/09/25 ``\textKoppa`` as alias for ``\textkoppa`` in LGR.
% ====== ============ =========================================================
%
% Usage
@@ -69,9 +70,10 @@
%
% Compatibility aliases for hyperref_'s puenc.def::
-\DeclareTextCommand{\textstigmagreek}{\LastDeclaredEncoding}{\textstigma}
\DeclareTextCommand{\textkoppagreek}{\LastDeclaredEncoding}{\textkoppa}
+\DeclareTextCommand{\textKoppagreek}{\LastDeclaredEncoding}{\textKoppa}
\DeclareTextCommand{\textStigmagreek}{\LastDeclaredEncoding}{\textStigma}
+\DeclareTextCommand{\textstigmagreek}{\LastDeclaredEncoding}{\textstigma}
\DeclareTextCommand{\textSampigreek}{\LastDeclaredEncoding}{\textSampi}
\DeclareTextCommand{\textsampigreek}{\LastDeclaredEncoding}{\textsampi}
\DeclareTextCommand{\textdigammagreek}{\LastDeclaredEncoding}{\textdigamma}
@@ -269,32 +271,33 @@
\accdialytikaperispomeni\LGR@accDialytika
\accperispomeni\LGR@accdropped
\LGR@ypogegrammeni\prosgegrammeni
- \textalpha \textAlpha
- \textbeta \textBeta
- \textgamma \textGamma
- \textdelta \textDelta
- \textepsilon\textEpsilon
- \textzeta \textZeta
- \texteta \textEta
- \texttheta \textTheta
- \textiota \textIota
- \textkappa \textKappa
- \textlambda \textLambda
- \textmu \textMu
- \textnu \textNu
- \textxi \textXi
- \textomicron\textOmicron
- \textpi \textPi
- \textrho \textRho
+ \textalpha \textAlpha
+ \textbeta \textBeta
+ \textgamma \textGamma
+ \textdelta \textDelta
+ \textepsilon \textEpsilon
+ \textzeta \textZeta
+ \texteta \textEta
+ \texttheta \textTheta
+ \textiota \textIota
+ \textkappa \textKappa
+ \textlambda \textLambda
+ \textmu \textMu
+ \textnu \textNu
+ \textxi \textXi
+ \textomicron \textOmicron
+ \textpi \textPi
+ \textrho \textRho
\textvarsigma \textSigma
\textsigma \textSigma
\textautosigma \textSigma
- \texttau \textTau
- \textupsilon\textUpsilon
- \textphi \textPhi
- \textchi \textChi
- \textpsi \textPsi
- \textomega \textOmega
+ \texttau \textTau
+ \textupsilon \textUpsilon
+ \textphi \textPhi
+ \textchi \textChi
+ \textpsi \textPsi
+ \textomega \textOmega
+ \textkoppa \textKoppa
\textqoppa \textQoppa
\textvarstigma \textStigma
\textstigma \textStigma
@@ -372,21 +375,21 @@
% ----------
%
% .. _alphabeta: alphabeta.sty.html
-% .. _athnum: http://www.ctan.org/pkg/athnum
-% .. _Babel: http://www.ctan.org/pkg/babel
+% .. _athnum: http://ctan.org/pkg/athnum
+% .. _Babel: http://ctan.org/pkg/babel
% .. _babel patch: http://www.eutypon.gr/eutypon/pdf/e2008-20/e20-a03.pdf
-% .. _fntguide: http://mirror.ctan.org/macros/latex/doc/fntguide.pdf
-% .. _fontenc: http://www.ctan.org/pkg/fontenc
-% .. _hyperref: http://www.ctan.org/pkg/hyperref
-% .. _ibycus: http://www.ctan.org/pkg/ibycus-babel
+% .. _fntguide: http://mirror.ctan.org/macros/latex/base/fntguide.pdf
+% .. _fontenc: http://ctan.org/pkg/fontenc
+% .. _hyperref: http://ctan.org/pkg/hyperref
+% .. _ibycus: http://ctan.org/pkg/ibycus-babel
% .. _LaTeX Project Public License: http://www.latex-project.org/lppl.txt
-% .. _lgrx: http://www.ctan.org/pkg/lgrx
-% .. _ltxcmds: http://www.ctan.org/pkg/ltxcmds
-% .. _teubner: http://www.ctan.org/pkg/teubner
+% .. _lgrx: http://ctan.org/pkg/lgrx
+% .. _ltxcmds: http://ctan.org/pkg/ltxcmds
+% .. _teubner: http://ctan.org/pkg/teubner
% .. _teubner-doc:
% http://mirror.ctan.org/macros/latex/contrib/teubner/teubner-doc.pdf
% .. _textalpha: textalpha.sty.html
-% .. _ucs: http://www.ctan.org/pkg/unicode
+% .. _ucs: http://ctan.org/pkg/unicode
%
% .. _lgrenc.def: lgrenc.def.html
% .. _tuenc-greek.def: tuenc-greek.def.html
diff --git a/language/greek/greek-fontenc/greek-fontenc.def.html b/language/greek/greek-fontenc/greek-fontenc.def.html
index 12bd86f74c..1cc5050126 100644
--- a/language/greek/greek-fontenc/greek-fontenc.def.html
+++ b/language/greek/greek-fontenc/greek-fontenc.def.html
@@ -5,7 +5,7 @@
<meta name="generator" content="Docutils 0.17b.dev: http://docutils.sourceforge.net/" />
<title>greek-fontenc.def</title>
<meta name="dcterms.rights" content="© 2013 Günter Milde" />
-<link rel="schema.dcterms" href="http://purl.org/dc/terms/">
+<link rel="schema.dcterms" href="http://purl.org/dc/terms/"/>
<style type="text/css">
/* Minimal style sheet for the HTML output of Docutils. */
@@ -50,33 +50,31 @@ p.system-message-title {
font-weight: bold;
}
h1 + p.subtitle,
-h1 + p.section-subtitle {
+h2 + p.section-subtitle {
font-size: 1.6em;
}
-h2 + p.section-subtitle { font-size: 1.28em; }
+h3 + p.section-subtitle {
+ font-size: 1.28em;
+}
p.subtitle,
p.section-subtitle,
p.sidebar-subtitle {
font-weight: bold;
margin-top: -0.5em;
}
-p.sidebar-title,
+p.sidebar-title {
+ font-size: larger;
+}
p.rubric {
font-size: larger;
+ color: maroon;
}
-p.rubric { color: maroon; }
a.toc-backref {
color: black;
text-decoration: none; }
/* Warnings, Errors */
-div.caution p.admonition-title,
-div.attention p.admonition-title,
-div.danger p.admonition-title,
-div.error p.admonition-title,
-div.warning p.admonition-title,
-div.system-messages h1,
-div.error,
+div.system-messages h2,
span.problematic,
p.system-message-title {
color: red;
@@ -213,8 +211,6 @@ object.align-right,
table.align-right {
margin-left: auto;
}
-.figure.align-center, .figure.align-right,
-figure.align-center, figure.align-right,
img.align-center, img.align-right,
object.align-center, object.align-right {
display: block;
@@ -226,18 +222,6 @@ table.align-left, table.align-center, table.align-right {
text-align: inherit;
}
-/* Admonitions and System Messages */
-div.admonition,
-div.system-message,
-aside.sidebar {
- margin: 1em 1.5em;
- border: medium outset;
- padding-top: 0.5em;
- padding-bottom: 0.5em;
- padding-right: 1em;
- padding-left: 1em;
-}
-
/* Sidebar */
aside.sidebar {
width: 30%;
@@ -249,6 +233,8 @@ aside.sidebar {
/* Text Blocks */
blockquote,
div.topic,
+div.admonition,
+div.system-message,
pre.literal-block,
pre.doctest-block,
pre.math,
@@ -322,11 +308,11 @@ body {
div.document,
main {
line-height:1.3;
- counter-reset: table;
- /* counter-reset: figure; */
+ counter-reset: table figure;
/* avoid long lines --> better reading */
+ /* optimum is 45…75 characters/line <http://webtypography.net/2.1.2> */
/* OTOH: lines should not be too short because of missing hyphenation, */
- max-width: 50em;
+ max-width: 50em;
padding: 1px 2%; /* 1px on top avoids grey bar above title (mozilla) */
margin: auto;
background-color: white;
@@ -514,7 +500,35 @@ object.align-right {
margin-left: 1em;
}
/* Stop floating sidebars, images and figures at section level 1,2,3 */
-h1, h2, h3 { clear: both; }
+h1, h2, h3, h4 { clear: both; }
+
+/* Numbered figures */
+figure.numbered > figcaption > p:before {
+ counter-increment: figure;
+ content: "Figure " counter(figure) ": ";
+ font-weight: bold;
+}
+
+
+/* Admonitions and System Messages */
+
+div.admonition,
+div.system-message,
+aside.sidebar {
+ border: medium outset;
+ margin: 1em 1.5em;
+ padding: 0.5em 1em;
+}
+
+div.caution p.admonition-title,
+div.attention p.admonition-title,
+div.danger p.admonition-title,
+div.error p.admonition-title,
+div.warning p.admonition-title,
+div.error {
+ color: red;
+}
+
/* Sidebar */
@@ -606,7 +620,7 @@ version 1.3 of this license or any later version.</p>
</dd>
<dt class="identification">Identification</dt>
<dd class="identification"><pre class="literal-block">\ProvidesFile{greek-fontenc.def}
-[2015/08/04 v0.13.4 Common Greek font encoding definitions]</pre>
+[2020/09/25 1.0 Common Greek font encoding definitions]</pre>
</dd>
</dl>
<div class="abstract topic">
@@ -647,19 +661,23 @@ font encodings providing Greek characters.</p>
<td><p>2019-07-10</p></td>
<td><p><span class="docutils literal">&#64;uclclist</span> entry for <span class="docutils literal">\prosgegrammeni</span>.</p></td>
</tr>
+<tr><td><p>1.0</p></td>
+<td><p>2020/09/25</p></td>
+<td><p><span class="docutils literal">\textKoppa</span> as alias for <span class="docutils literal">\textkoppa</span> in LGR.</p></td>
+</tr>
</tbody>
</table>
</dd>
</dl>
<section id="usage">
-<h1>Usage</h1>
+<h2>Usage</h2>
<p>This file is input by the font encoding definition files <a class="reference external" href="lgrenc.def.html">lgrenc.def</a>. and
<a class="reference external" href="tuenc-greek.def.html">tuenc-greek.def</a>.</p>
</section>
<section id="implementation">
-<h1>Implementation</h1>
+<h2>Implementation</h2>
<section id="ensuregreek-greekscript">
-<h2>ensuregreek, greekscript</h2>
+<h3>ensuregreek, greekscript</h3>
<p>Provide “empty” encoding-specific definitions for <span class="docutils literal">\ensuregreek</span> and
<span class="docutils literal">\greekscript</span>. The definitions in this file make the font encoding fit
for use with the Greek script. (See <span class="docutils literal">textalpha.sty</span> for default
@@ -676,13 +694,14 @@ the Greek script, if required. The following definition announces the
<pre class="literal-block">\ProvideTextCommand{\greekscript}{\LastDeclaredEncoding}{}</pre>
</section>
<section id="aliases">
-<h2>Aliases</h2>
+<h3>Aliases</h3>
<p>Aliases are defined via <cite>DeclareTextCommand</cite> so that up/downcasing works
without the need for additional <a class="reference internal" href="#uclclist">uclclist</a> entries.</p>
-<p>Compatibility aliases for <a class="reference external" href="http://www.ctan.org/pkg/hyperref">hyperref</a>’s puenc.def:</p>
-<pre class="literal-block">\DeclareTextCommand{\textstigmagreek}{\LastDeclaredEncoding}{\textstigma}
-\DeclareTextCommand{\textkoppagreek}{\LastDeclaredEncoding}{\textkoppa}
+<p>Compatibility aliases for <a class="reference external" href="http://ctan.org/pkg/hyperref">hyperref</a>’s puenc.def:</p>
+<pre class="literal-block">\DeclareTextCommand{\textkoppagreek}{\LastDeclaredEncoding}{\textkoppa}
+\DeclareTextCommand{\textKoppagreek}{\LastDeclaredEncoding}{\textKoppa}
\DeclareTextCommand{\textStigmagreek}{\LastDeclaredEncoding}{\textStigma}
+\DeclareTextCommand{\textstigmagreek}{\LastDeclaredEncoding}{\textstigma}
\DeclareTextCommand{\textSampigreek}{\LastDeclaredEncoding}{\textSampi}
\DeclareTextCommand{\textsampigreek}{\LastDeclaredEncoding}{\textsampi}
\DeclareTextCommand{\textdigammagreek}{\LastDeclaredEncoding}{\textdigamma}
@@ -690,7 +709,7 @@ without the need for additional <a class="reference internal" href="#uclclist">u
\DeclareTextCommand{\textnumeralsigngreek}{\LastDeclaredEncoding}{\textdexiakeraia}
\DeclareTextCommand{\textnumeralsignlowergreek}{\LastDeclaredEncoding}{\textaristerikeraia}</pre>
-<p>Names from <a class="reference external" href="http://www.ctan.org/pkg/babel">babel</a> and <a class="reference external" href="http://www.ctan.org/pkg/teubner">teubner</a> (do we want to define them here as alias?)</p>
+<p>Names from <a class="reference external" href="http://ctan.org/pkg/babel">babel</a> and <a class="reference external" href="http://ctan.org/pkg/teubner">teubner</a> (do we want to define them here as alias?)</p>
<pre class="code latex literal-block"><code><span class="keyword">\DeclareTextCommand</span><span class="name builtin">{</span><span class="keyword">\anwtonos</span><span class="name builtin">}{</span><span class="keyword">\LastDeclaredEncoding</span><span class="name builtin">}{</span><span class="keyword">\textdexiakeraia</span><span class="name builtin">}</span> <span class="comment">% ʹ
</span><span class="keyword">\DeclareTextCommand</span><span class="name builtin">{</span><span class="keyword">\katwtonos</span><span class="name builtin">}{</span><span class="keyword">\LastDeclaredEncoding</span><span class="name builtin">}{</span><span class="keyword">\textaristerikeraia</span><span class="name builtin">}</span> <span class="comment">% ͵</span></code></pre>
<p>Two Unicode code points and names for one character:</p>
@@ -715,7 +734,7 @@ table, LCI encoding)?</p>
</span><span class="name variable">\DeclareTextCommand</span><span class="name builtin">{</span><span class="literal string">\)</span><span class="name builtin">}{</span><span class="keyword">\LastDeclaredEncoding</span><span class="name builtin">}{</span><span class="keyword">\accpsili</span><span class="name builtin">}</span></code></pre>
</section>
<section id="composite-diacritics">
-<h2>Composite diacritics</h2>
+<h3>Composite diacritics</h3>
<p>Composite accents can be input as sequence of simple diacritics (in
arbitrary order) via named macro, symbol macro and “transcription
characters”, e.g. one of</p>
@@ -817,14 +836,14 @@ composite definitions starting with standard macros are requried:</p>
\DeclareTextCompositeCommand{\accdasia}{\LastDeclaredEncoding}{\~}{\accdasiaperispomeni}</pre>
</section>
<section id="uppercase">
-<span id="uclclist"></span><h2>UPPERCASE</h2>
+<span id="uclclist"></span><h3>UPPERCASE</h3>
<p>If UPPERCASE (all-caps) is generated with <span class="docutils literal">\MakeUppercase</span>, macro
substitutions in the <span class="docutils literal">\&#64;uclclist</span> apply. This can be used to drop the
diacritics (except dialytika and <a class="reference external" href="https://en.wikipedia.org/wiki/Iota_subscript">iota subscript</a>). Different conventions
exist for the <a class="reference external" href="https://opoudjis.net/unicode/unicode_adscript.html">treatment of the iota subscript with uppercase letters</a>. In
the CB Fonts, a small capital adscript iota is used.</p>
<section id="uclclist-extension">
-<h3>&#64;uclclist extension</h3>
+<h4>&#64;uclclist extension</h4>
<p>Based on the <a class="reference external" href="http://www.eutypon.gr/eutypon/pdf/e2008-20/e20-a03.pdf">babel patch</a> and <span class="docutils literal">fontenc.sty</span>.</p>
<p>The definition of an auxiliary, self-restting macro makes this idempotent
(only the first use of this function will expand the <span class="docutils literal">&#64;uclclist</span>).
@@ -847,32 +866,33 @@ The second and third lines are TeX’ way of writing <span class="docutils liter
\accdialytikaperispomeni\LGR&#64;accDialytika
\accperispomeni\LGR&#64;accdropped
\LGR&#64;ypogegrammeni\prosgegrammeni
- \textalpha \textAlpha
- \textbeta \textBeta
- \textgamma \textGamma
- \textdelta \textDelta
- \textepsilon\textEpsilon
- \textzeta \textZeta
- \texteta \textEta
- \texttheta \textTheta
- \textiota \textIota
- \textkappa \textKappa
- \textlambda \textLambda
- \textmu \textMu
- \textnu \textNu
- \textxi \textXi
- \textomicron\textOmicron
- \textpi \textPi
- \textrho \textRho
+ \textalpha \textAlpha
+ \textbeta \textBeta
+ \textgamma \textGamma
+ \textdelta \textDelta
+ \textepsilon \textEpsilon
+ \textzeta \textZeta
+ \texteta \textEta
+ \texttheta \textTheta
+ \textiota \textIota
+ \textkappa \textKappa
+ \textlambda \textLambda
+ \textmu \textMu
+ \textnu \textNu
+ \textxi \textXi
+ \textomicron \textOmicron
+ \textpi \textPi
+ \textrho \textRho
\textvarsigma \textSigma
\textsigma \textSigma
\textautosigma \textSigma
- \texttau \textTau
- \textupsilon\textUpsilon
- \textphi \textPhi
- \textchi \textChi
- \textpsi \textPsi
- \textomega \textOmega
+ \texttau \textTau
+ \textupsilon \textUpsilon
+ \textphi \textPhi
+ \textchi \textChi
+ \textpsi \textPsi
+ \textomega \textOmega
+ \textkoppa \textKoppa
\textqoppa \textQoppa
\textvarstigma \textStigma
\textstigma \textStigma
@@ -885,7 +905,7 @@ The second and third lines are TeX’ way of writing <span class="docutils liter
<pre class="literal-block">\update&#64;uclc&#64;with&#64;greek</pre>
</section>
<section id="substitution-macros">
-<h3>Substitution macros</h3>
+<h4>Substitution macros</h4>
<p>Drop diacritics (The argument passing ensures that kerning is preserved)</p>
<pre class="literal-block">\DeclareTextCommand{\LGR&#64;accdropped}{\LastDeclaredEncoding}[1]{#1}</pre>
<p>Keep dialytika: Define a dummy alias so that downcasing with
@@ -898,7 +918,7 @@ accent:</p>
<pre class="literal-block">\DeclareTextCommand{\LGR&#64;ypogegrammeni}{\LastDeclaredEncoding}{\ypogegrammeni}</pre>
</section>
<section id="mark-hiatus">
-<h3>Mark hiatus</h3>
+<h4>Mark hiatus</h4>
<p>Tonos and dasia mark a hiatus if placed on the
first vowel of a diphthong (ΑΙ, ΑΥ, ΕΙ). A dialytika must be placed on the
second vowel if they are dropped (άυλος → ΑΫΛΟΣ, μάινα → ΜΑΪΝΑ, κέικ → ΚΕΪΚ,
diff --git a/language/greek/greek-fontenc/README.html b/language/greek/greek-fontenc/greek-fontenc.html
index b326583200..e0e864507f 100644
--- a/language/greek/greek-fontenc/README.html
+++ b/language/greek/greek-fontenc/greek-fontenc.html
@@ -5,9 +5,8 @@
<meta name="generator" content="Docutils 0.17b.dev: http://docutils.sourceforge.net/" />
<title>greek-fontenc</title>
<meta name="author" content="Günter Milde" />
-<meta name="dcterms.date" content="2019-07-10" />
<meta name="dcterms.rights" content="© 2013 Günter Milde &lt;milde&#64;users.sf.net&gt;" />
-<link rel="schema.dcterms" href="http://purl.org/dc/terms/">
+<link rel="schema.dcterms" href="http://purl.org/dc/terms/"/>
<style type="text/css">
/* Minimal style sheet for the HTML output of Docutils. */
@@ -52,33 +51,31 @@ p.system-message-title {
font-weight: bold;
}
h1 + p.subtitle,
-h1 + p.section-subtitle {
+h2 + p.section-subtitle {
font-size: 1.6em;
}
-h2 + p.section-subtitle { font-size: 1.28em; }
+h3 + p.section-subtitle {
+ font-size: 1.28em;
+}
p.subtitle,
p.section-subtitle,
p.sidebar-subtitle {
font-weight: bold;
margin-top: -0.5em;
}
-p.sidebar-title,
+p.sidebar-title {
+ font-size: larger;
+}
p.rubric {
font-size: larger;
+ color: maroon;
}
-p.rubric { color: maroon; }
a.toc-backref {
color: black;
text-decoration: none; }
/* Warnings, Errors */
-div.caution p.admonition-title,
-div.attention p.admonition-title,
-div.danger p.admonition-title,
-div.error p.admonition-title,
-div.warning p.admonition-title,
-div.system-messages h1,
-div.error,
+div.system-messages h2,
span.problematic,
p.system-message-title {
color: red;
@@ -215,8 +212,6 @@ object.align-right,
table.align-right {
margin-left: auto;
}
-.figure.align-center, .figure.align-right,
-figure.align-center, figure.align-right,
img.align-center, img.align-right,
object.align-center, object.align-right {
display: block;
@@ -228,18 +223,6 @@ table.align-left, table.align-center, table.align-right {
text-align: inherit;
}
-/* Admonitions and System Messages */
-div.admonition,
-div.system-message,
-aside.sidebar {
- margin: 1em 1.5em;
- border: medium outset;
- padding-top: 0.5em;
- padding-bottom: 0.5em;
- padding-right: 1em;
- padding-left: 1em;
-}
-
/* Sidebar */
aside.sidebar {
width: 30%;
@@ -251,6 +234,8 @@ aside.sidebar {
/* Text Blocks */
blockquote,
div.topic,
+div.admonition,
+div.system-message,
pre.literal-block,
pre.doctest-block,
pre.math,
@@ -324,11 +309,11 @@ body {
div.document,
main {
line-height:1.3;
- counter-reset: table;
- /* counter-reset: figure; */
+ counter-reset: table figure;
/* avoid long lines --> better reading */
+ /* optimum is 45…75 characters/line <http://webtypography.net/2.1.2> */
/* OTOH: lines should not be too short because of missing hyphenation, */
- max-width: 50em;
+ max-width: 50em;
padding: 1px 2%; /* 1px on top avoids grey bar above title (mozilla) */
margin: auto;
background-color: white;
@@ -516,7 +501,35 @@ object.align-right {
margin-left: 1em;
}
/* Stop floating sidebars, images and figures at section level 1,2,3 */
-h1, h2, h3 { clear: both; }
+h1, h2, h3, h4 { clear: both; }
+
+/* Numbered figures */
+figure.numbered > figcaption > p:before {
+ counter-increment: figure;
+ content: "Figure " counter(figure) ": ";
+ font-weight: bold;
+}
+
+
+/* Admonitions and System Messages */
+
+div.admonition,
+div.system-message,
+aside.sidebar {
+ border: medium outset;
+ margin: 1em 1.5em;
+ padding: 0.5em 1em;
+}
+
+div.caution p.admonition-title,
+div.attention p.admonition-title,
+div.danger p.admonition-title,
+div.error p.admonition-title,
+div.warning p.admonition-title,
+div.error {
+ color: red;
+}
+
/* Sidebar */
@@ -601,8 +614,6 @@ a { text-decoration: none; }
<dl class="docinfo simple">
<dt class="author">Author</dt>
<dd class="author"><p>Günter Milde</p></dd>
-<dt class="date">Date</dt>
-<dd class="date">2019-07-10</dd>
<dt class="copyright">Copyright</dt>
<dd class="copyright">© 2013 Günter Milde &lt;<a class="reference external" href="mailto:milde&#64;users.sf.net">milde&#64;users.sf.net</a>&gt;</dd>
<dt class="licence">Licence</dt>
@@ -630,7 +641,7 @@ endorsement by the TeX community and related packages.</p>
punctuation may change in future versions.</p>
</div>
<section id="changelog">
-<h1>Changelog</h1>
+<h2>Changelog</h2>
<table class="borderless">
<colgroup>
<col style="width: 8%" />
@@ -770,11 +781,26 @@ Rename <span class="docutils literal"><span class="pre">greek-euenc</span></span
<td></td>
<td><p>Use <span class="docutils literal">\UTFencoding</span> instead of <span class="docutils literal">\LastDeclaredEncoding</span>.</p></td>
</tr>
+<tr><td><p>1.0</p></td>
+<td><p>2020-09-25</p></td>
+<td><p>Bugfix in <a class="reference internal" href="#textalpha">textalpha</a>: Let <span class="docutils literal">\greekscript</span> set
+<span class="docutils literal">\encodingdefault</span>.</p></td>
+</tr>
+<tr><td><!-- -->
+</td>
+<td></td>
+<td><p><span class="docutils literal">\textKoppa</span> as alias for <span class="docutils literal">\textkoppa</span> in LGR.</p></td>
+</tr>
+<tr><td><!-- -->
+</td>
+<td></td>
+<td><p>Update URLs.</p></td>
+</tr>
</tbody>
</table>
</section>
<section id="tex-files">
-<h1>TeX files</h1>
+<h2>TeX files</h2>
<dl class="simple">
<dt><a class="reference external" href="greek-fontenc.def">greek-fontenc.def</a></dt>
<dd><p><a class="reference external" href="greek-fontenc.def.html">Common Greek font encoding definitions</a>.</p>
@@ -787,15 +813,17 @@ Rename <span class="docutils literal"><span class="pre">greek-euenc</span></span
<dt><a class="reference external" href="lgrenc.def">lgrenc.def</a></dt>
<dd><p><a class="reference external" href="lgrenc.def.html">LGR Greek font encoding definitions</a>.</p>
<p>This file is the successor of the basic LGR encoding definition file which
-comes with <a class="reference external" href="http://www.ctan.org/pkg/babel">babel</a>’s Greek support and of <span class="docutils literal">lgrxenc.def</span> from the now
-obsolete <a class="reference external" href="http://www.ctan.org/pkg/lgrx">lgrx</a> bundle.</p>
+comes with <a class="reference external" href="http://www.ctan.org/pkg/babel">babel</a>’s Greek support and the now obsolete <a class="reference external" href="http://www.ctan.org/pkg/lgrx">lgrx</a> bundle.</p>
</dd>
<dt id="textalpha"><a class="reference external" href="textalpha.sty">textalpha.sty</a></dt>
-<dd><p><a class="reference external" href="textalpha.sty.html">Greek symbols in text</a>
-independent of font encoding and TeX engine.</p>
+<dd><p><a class="reference external" href="textalpha.sty.html">Greek symbols in text</a></p>
+<p>Use <span class="docutils literal">\textalpha</span> … <span class="docutils literal">\textOmega</span> independent of font encoding and TeX
+engine.</p>
</dd>
<dt id="alphabeta"><a class="reference external" href="alphabeta.sty">alphabeta.sty</a></dt>
-<dd><p>Generic macros for <a class="reference external" href="alphabeta.sty.html">Greek symbols in text and math</a>.</p>
+<dd><p><a class="reference external" href="alphabeta.sty.html">Greek symbols in text and math</a>.</p>
+<p>Use <span class="docutils literal">\alpha</span> … <span class="docutils literal">\Omega</span> independent of text/math mode, font
+encoding, and TeX engine.</p>
</dd>
<dt><a class="reference external" href="alphabeta-tuenc.def">alphabeta-tuenc.def</a></dt>
<dd><p><a class="reference external" href="alphabeta-tuenc.def.html">Composite definitions with XeTeX/LuaTeX.</a>.</p>
@@ -808,30 +836,29 @@ independent of font encoding and TeX engine.</p>
with <a class="reference external" href="http://docutils.sourceforge.net/rst.html">Docutils</a> to the HTML documentation.</p>
</section>
<section id="documentation-and-test-documents">
-<h1>Documentation and test documents</h1>
+<h2>Documentation and test documents</h2>
<dl>
-<dt><a class="reference external" href="textalpha-doc.tex">textalpha-doc.tex</a>, <a class="reference external" href="textalpha-doc.pdf">textalpha-doc.pdf</a></dt>
-<dd><p><cite>The textalpha package</cite>.</p>
+<dt><cite>textalpha</cite> package documentation:</dt>
+<dd><p><a class="reference external" href="textalpha-doc.tex">textalpha-doc.tex</a>, <a class="reference external" href="textalpha-doc.pdf">textalpha-doc.pdf</a></p>
</dd>
-<dt><a class="reference external" href="alphabeta-doc.tex">alphabeta-doc.tex</a> <a class="reference external" href="alphabeta-doc.pdf">alphabeta-doc.pdf</a></dt>
-<dd><p><cite>The alphabeta package</cite>.</p>
+<dt><cite>alphabeta</cite> package documentation:</dt>
+<dd><p><a class="reference external" href="alphabeta-doc.tex">alphabeta-doc.tex</a> <a class="reference external" href="alphabeta-doc.pdf">alphabeta-doc.pdf</a></p>
</dd>
-<dt><a class="reference external" href="lgrenc-test.tex">lgrenc-test.tex</a>, <a class="reference external" href="lgrenc-test.pdf">lgrenc-test.pdf</a></dt>
-<dd><p>Test and usage example.</p>
+<dt>Test and usage example</dt>
+<dd><p><a class="reference external" href="lgrenc-test.tex">lgrenc-test.tex</a>, <a class="reference external" href="lgrenc-test.pdf">lgrenc-test.pdf</a></p>
</dd>
-<dt><a class="reference external" href="tuenc-greek-doc.tex">tuenc-greek-doc.tex</a>, <a class="reference external" href="tuenc-greek-doc.pdf">tuenc-greek-doc.pdf</a></dt>
-<dd><p>Example for use of the Greek LICR definitions with XeTeX or
-LuaTeX.</p>
+<dt>Font setup for Greek with XeTeX/LuaTeX</dt>
+<dd><p><a class="reference external" href="tuenc-greek-doc.tex">tuenc-greek-doc.tex</a>, <a class="reference external" href="tuenc-greek-doc.pdf">tuenc-greek-doc.pdf</a></p>
</dd>
-<dt><a class="reference external" href="greekhyperref.tex">greekhyperref.tex</a>, <a class="reference external" href="greekhyperref.pdf">greekhyperref.pdf</a></dt>
-<dd><p><cite>Greek script in PDF metadata</cite>.</p>
+<dt>Greek script in PDF metadata</dt>
+<dd><p><a class="reference external" href="greekhyperref.tex">greekhyperref.tex</a>, <a class="reference external" href="greekhyperref.pdf">greekhyperref.pdf</a></p>
<p>The package <a class="reference external" href="http://www.ctan.org/pkg/hyperref">hyperref</a> defines the PU font encoding which also supports
(monotonic) Greek.</p>
</dd>
</dl>
</section>
<section id="experimental-files">
-<h1>Experimental files</h1>
+<h2>Experimental files</h2>
<p>These files are still in development and will eventually be moved to/merged
with other packages or removed in future versions:</p>
<dl class="simple">
@@ -841,7 +868,7 @@ with other packages or removed in future versions:</p>
</dl>
</section>
<section id="installation">
-<h1>Installation</h1>
+<h2>Installation</h2>
<p>If possible, get this package from your distribution using its installation
manager.</p>
<p>Otherwise, make sure LaTeX can find the package and definition files:</p>
@@ -853,16 +880,16 @@ the current working directory (e.g. for testing).</p></li>
</ul>
</section>
<section id="conflicts">
-<h1>Conflicts</h1>
+<h2>Conflicts</h2>
<p>The <a class="reference external" href="https://www.ctan.org/pkg/arabi">arabi</a> package provides the Babel <span class="docutils literal">arabic</span> option which loads
<span class="docutils literal">arabicfnt.sty</span> for font setup. This package overwrites the LICR macros
<span class="docutils literal">\omega</span> and <span class="docutils literal">\textomega</span> with font selecting commands. See the report
for Debian <a class="reference external" href="https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=858987">bug 858987</a> for details and the <a class="reference internal" href="#arabi-workaround">arabi workaround</a> below.</p>
</section>
<section id="usage">
-<h1>Usage</h1>
-<p>There are many alternatives to set up the support for a Greek font encoding
-provided by this package, e.g.:</p>
+<h2>Usage</h2>
+<p>There are several alternatives to set up the support for a Greek font
+encoding provided by this package, e.g.:</p>
<dl>
<dt><a class="reference internal" href="#textalpha">textalpha</a>:</dt>
<dd><p>Ensure support for Greek characters in text mode:</p>
@@ -928,19 +955,19 @@ is loaded after <span class="docutils literal">arabic</span>:</p>
\renewcommand{\omega}{\mathomega}</pre>
</section>
<section id="greek-text-font-encodings">
-<h1>Greek text font encodings</h1>
+<h2>Greek text font encodings</h2>
<p>Greek TeX font encodings are the envisaged <a class="reference internal" href="#t7">T7</a>, <a class="reference internal" href="#lgr">LGR</a>, and <a class="reference internal" href="#lgi">LGI</a>.
Greek letters and symbols are also defined in the Unicode-based font
encodings <a class="reference internal" href="#tu">TU</a>, <a class="reference internal" href="#eu1-eu2">EU1, EU2</a>, and PU (<a class="reference external" href="http://www.ctan.org/pkg/hyperref">hyperref</a>).</p>
<section id="t7">
-<h2>T7</h2>
+<h3>T7</h3>
<p>The <a class="citation-reference" href="#encguide" id="id12">[encguide]</a> reserves the name T7 for a Greek <cite>standard font encoding</cite>.
However, up to now, there is no agreement on an implementation because the
restrictions for general text encodings are too severe for typesetting
polytonic Greek.</p>
</section>
<section id="lgr">
-<h2>LGR</h2>
+<h3>LGR</h3>
<p>The LGR font encoding is the de-facto standard for typesetting Greek with
(8-bit) LaTeX. <cite>greek-fontenc</cite> provides a comprehensive <a class="reference internal" href="#lgr-font-encoding-definition-file">LGR font
encoding definition file</a>.</p>
@@ -961,7 +988,7 @@ font-encoding comprising Latin and Greek like the envisaged <a class="reference
Unicode (with XeTeX or LuaTeX).</p>
</section>
<section id="lgi">
-<h2>LGI</h2>
+<h3>LGI</h3>
<p>The ‘Ibycus’ fonts from the package <a class="reference external" href="http://www.ctan.org/pkg/ibygrk">ibygrk</a> implement an alternative
transliteration scheme (also explained in <a class="citation-reference" href="#babel-patch" id="id16">[babel-patch]</a>).
It is currently not supported by <cite>greek-fontenc</cite>.</p>
@@ -969,7 +996,7 @@ It is currently not supported by <cite>greek-fontenc</cite>.</p>
setup (without any LICR macros or composite definitions).</p>
</section>
<section id="tu">
-<h2>TU</h2>
+<h3>TU</h3>
<p>Standard Unicode font encoding for XeTeX and LuaTeX loaded by <a class="reference external" href="http://www.ctan.org/pkg/fontspec">fontspec</a>
(since v2.5a). <cite>greek-fontenc</cite> adds support for the Greek script (see
<a class="reference internal" href="#tuenc-greek">tuenc-greek</a>).</p>
@@ -981,17 +1008,18 @@ fonts. Unfortunately, the <a class="reference external" href="http://www.ctan.or
Greek characters.</p>
</section>
<section id="eu1-eu2">
-<h2>EU1, EU2</h2>
-<p>Legacy Unicode font encodings for XeTeX and LuaTeX respectively.</p>
+<h3>EU1, EU2</h3>
+<p>Legacy Unicode font encodings for XeTeX and LuaTeX respectively. Superseded
+by <a class="reference internal" href="#tu">TU</a>.</p>
</section>
</section>
<section id="greek-licr-macros">
-<h1>Greek LICR macros</h1>
+<h2>Greek LICR macros</h2>
<p>This package provides LaTeX internal character representations (LICR macros)
for Greek letters and diacritics. Macro names were selected based on the
following considerations:</p>
<section id="letters-and-symbols">
-<h2>letters and symbols</h2>
+<h3>letters and symbols</h3>
<ul>
<li><p>The <a class="reference internal" href="#fntguide">fntguide</a> (section 6.4 Naming conventions) recommends:</p>
<blockquote>
@@ -1079,7 +1107,7 @@ additional packages (e.g. <a class="reference external" href="alphabeta.sty">alp
</ul>
</section>
<section id="accent-macros">
-<h2>accent macros</h2>
+<h3>accent macros</h3>
<ul>
<li><p>standard accent macros (<span class="docutils literal">\DeclareTextAccent</span> definitions in
<span class="docutils literal"><span class="pre">latex/base/...</span></span>) are one-symbol macros (<span class="docutils literal">\' \&quot; ... \u \v ...</span>) .</p></li>
@@ -1103,7 +1131,7 @@ provided. (The non-standard macros <span class="docutils literal">\&lt;</span> a
<a class="reference internal" href="#textalpha">textalpha</a> or <a class="reference internal" href="#alphabeta">alphabeta</a>.)</p>
</section>
<section id="symbol-variants">
-<h2>symbol variants</h2>
+<h3>symbol variants</h3>
<p>See also <a class="reference external" href="http://en.wikipedia.org/wiki/Greek_alphabet#Glyph_variants">http://en.wikipedia.org/wiki/Greek_alphabet#Glyph_variants</a></p>
<p>Mathematical notation distinguishes variant shapes for beta (β|ϐ), theta
(θ|ϑ), phi (φ|ϕ), pi (π|ϖ), kappa (κ|ϰ), rho (ρ|ϱ), Theta (Θ|ϴ), and epsilon
@@ -1131,7 +1159,7 @@ variants).</p></li>
</ul>
</section>
<section id="references">
-<h2>References</h2>
+<h3>References</h3>
<p>An alternative, more complete set of short mnemonic character names is
the <a class="reference external" href="http://www.w3.org/TR/xml-entity-names/">XML Entity Definitions for Characters</a> W3C Recommendation from
01 April 2010.</p>
@@ -1146,12 +1174,12 @@ as-is).</p>
<dl class="citation">
<dt class="label" id="fntguide"><span class="brackets"><a class="fn-backref" href="#id6">fntguide</a></span></dt>
<dd><p>LaTeX3 Project Team, <cite>LaTeX2ε font selection</cite>, 2005.
-<a class="reference external" href="http://mirror.ctan.org/macros/latex/doc/fntguide.pdf">http://mirror.ctan.org/macros/latex/doc/fntguide.pdf</a></p>
+<a class="reference external" href="http://mirror.ctan.org/macros/latex/base/fntguide.pdf">http://mirror.ctan.org/macros/latex/base/fntguide.pdf</a></p>
</dd>
<dt class="label" id="encguide"><span class="brackets"><a class="fn-backref" href="#id12">encguide</a></span></dt>
<dd><p>Frank Mittelbach, Robin Fairbairns, Werner Lemberg,
LaTeX3 Project Team, <cite>LaTeX font encodings</cite>, 2006.
-<a class="reference external" href="http://mirror.ctan.org/macros/latex/doc/encguide.pdf">http://mirror.ctan.org/macros/latex/doc/encguide.pdf</a></p>
+<a class="reference external" href="http://mirror.ctan.org/macros/latex/base/encguide.pdf">http://mirror.ctan.org/macros/latex/base/encguide.pdf</a></p>
</dd>
<dt class="label" id="greek-usage"><span class="brackets"><a class="fn-backref" href="#id13">greek-usage</a></span></dt>
<dd><p>Apostolos Syropoulos, <cite>Writing Greek with the greek option
diff --git a/language/greek/greek-fontenc/greekhyperref.pdf b/language/greek/greek-fontenc/greekhyperref.pdf
index 00db9f151d..3d5f049461 100644
--- a/language/greek/greek-fontenc/greekhyperref.pdf
+++ b/language/greek/greek-fontenc/greekhyperref.pdf
Binary files differ
diff --git a/language/greek/greek-fontenc/lgrenc-test.pdf b/language/greek/greek-fontenc/lgrenc-test.pdf
index e288403d29..48be697a74 100644
--- a/language/greek/greek-fontenc/lgrenc-test.pdf
+++ b/language/greek/greek-fontenc/lgrenc-test.pdf
Binary files differ
diff --git a/language/greek/greek-fontenc/lgrenc-test.tex b/language/greek/greek-fontenc/lgrenc-test.tex
index 76425b1b1f..861c981c61 100644
--- a/language/greek/greek-fontenc/lgrenc-test.tex
+++ b/language/greek/greek-fontenc/lgrenc-test.tex
@@ -184,27 +184,17 @@ Ligature break up: AY fi \LGR AU "i $\mapsto$
\LGR \textschwa{}, \texteuro{}
\Latin
-Some symbol definitions expect a Latin font.\emph{ babel-greek} redefines
-them with \verb|\latintext|, however this macro is not guaranteed to be
-defined, so it should not be used in a font encoding definition file. The
-textcomp.sty package provides coyright, registered, and trademark symbols
-for use with any font encodings. (Like any other Latin character, the
-``sharp s'' (\ss) is not save to use when LGR is the active font encoding.)
-Latin:
-\textcopyright{}
-\textregistered{}
-\texttrademark{}
-\SS{} (uppercase of \ss).
+Some ASCII symbols are replaced by other symbols in LGR encoding:
+\emph{babel-greek} redefines some with \verb|\latintext|, however this macro
+is not guaranteed to be defined, so it cannot be used in a font encoding
+definition file.
-LGR (with textcomp):
-\LGR
-\textcopyright{}
-\textregistered{}
-\texttrademark{}
-\SS{} (\Latin uppercase of \LGR \ss).
+Avoid: \texttt{"\#\&';<>?@} because it becomes
+\LGR \ \texttt{"\#\&';<>?@}.
\Latin
+
\subsection{Greek alphabet}
Greek letters via Latin transcription and LICR macros:
@@ -238,13 +228,37 @@ The small sigma is set with a different glyph if it ends a word:
In the Latin transcription, the letter `s' stands for \verb|\textautosigma|
which automatically chooses the glyph according to the position.
+The textcomp.sty package provides coyright, registered, and trademark
+symbols for use with any font encodings. (Like any other Latin character,
+the ``sharp s'' (\ss) is not save to use when LGR is the active font
+encoding.)
+
+Latin:
+\textcopyright{}
+\textregistered{}
+\texttrademark{}
+\SS{} (uppercase of \ss).
+
+LGR (with textcomp):
+\LGR
+\textcopyright{}
+\textregistered{}
+\texttrademark{}
+\SS{} (\Latin uppercase of \LGR \ss).
+\Latin
+
\subsection{Additional Greek symbols}
\begin{quote}
- \LGR \textkoppa{} \Latin textkoppa \\ % ϟ
- \LGR \textqoppa{} \Latin textqoppa (archaic koppa) \\ % ϙ
- \LGR \textQoppa{} \Latin textQoppa (archaic Koppa) \\ % Ϙ
- \LGR \textstigma{} \Latin textstigma \\ % ϛ
+ \LGR \textkoppa{} \Latin textkoppa (numeral koppa = 90) \\ % ϟ
+ \LGR \textKoppa{} \Latin textKoppa (numeral Koppa = 90)%
+ \footnote{Modern typographical practice normally does not observe a
+ contrast between uppercase and lowercase forms for numeric koppa.
+ % https://en.wikipedia.org/wiki/Koppa_(letter)
+ In LGR, there is ony one slot for Koppa and koppa.} \\ % Ϟ
+ \LGR \textqoppa{} \Latin textqoppa (archaic koppa) \\ % ϙ
+ \LGR \textQoppa{} \Latin textQoppa (archaic Koppa) \\ % Ϙ
+ \LGR \textstigma{} \Latin textstigma \\ % ϛ
\LGR \textvarstigma{} \Latin textvarstigma \\ % no separate Unicode character
\LGR \textStigma{} \Latin textStigma (Sigma-Tau-Ligature in CB-fonts)%
\footnote{the name ``stigma'' originally applied to a medieval sigma-tau
diff --git a/language/greek/greek-fontenc/lgrenc.def b/language/greek/greek-fontenc/lgrenc.def
index 9430bfd6e4..3834be2e55 100644
--- a/language/greek/greek-fontenc/lgrenc.def
+++ b/language/greek/greek-fontenc/lgrenc.def
@@ -55,6 +55,8 @@
% 0.13 2015-08-04 Support for symbol variants.
% 0.13.1 2015-12-07 Fix `rho with dasia bug` (Linus Romer).
% 0.13.3 2019-07-09 Drop error font declaration (cf. `ltxbugs 4399`_).
+% 1.0 2020/09/25 ``\textKoppa`` as alias for ``\textkoppa``
+% (there is no capital Koppa in LGR).
% ====== ============ ========================================================
%
% Usage
@@ -95,7 +97,7 @@
% ::
\ProvidesFile{lgrenc.def}
-[2019/07/09 v0.13.3 LGR Greek font encoding definitions]
+[2020/09/25 1.0 LGR Greek font encoding definitions]
% Copyright © 2010 Günter Milde
% This file is part of the "greek-fontenc" package.
% It may be distributed and/or modified under the
@@ -213,6 +215,7 @@
\DeclareTextSymbol{\textstigma}{LGR}{6} % ϛ
\DeclareTextSymbol{\textvarstigma}{LGR}{7} % stigma variant (CB.enc, teubner)
\DeclareTextSymbol{\textkoppa}{LGR}{18} % ϟ (greek small letter koppa)
+\DeclareTextSymbol{\textKoppa}{LGR}{18} % ϟ (capital numerical koppa) not distinct in LGR
\DeclareTextSymbol{\textqoppa}{LGR}{19} % ϙ (archaic koppa)
\DeclareTextSymbol{\textQoppa}{LGR}{21} % Ϙ (archaic Koppa)
\DeclareTextSymbol{\textStigma}{LGR}{22} % Ϛ in some fonts ϹΤ ligature
@@ -904,22 +907,22 @@
%
% .. _README: README.html
% .. _alphabeta: alphabeta.sty.html
-% .. _athnum: http://www.ctan.org/pkg/athnum
-% .. _Babel: http://www.ctan.org/pkg/babel
+% .. _athnum: http://ctan.org/pkg/athnum
+% .. _Babel: http://ctan.org/pkg/babel
% .. _babel patch: http://www.eutypon.gr/eutypon/pdf/e2008-20/e20-a03.pdf
-% .. _fntguide: http://mirror.ctan.org/macros/latex/doc/fntguide.pdf
-% .. _fontenc: http://www.ctan.org/pkg/fontenc
-% .. _hyperref: http://www.ctan.org/pkg/hyperref
-% .. _ibycus: http://www.ctan.org/pkg/ibycus-babel
+% .. _fntguide: http://mirror.ctan.org/macros/latex/base/fntguide.pdf
+% .. _fontenc: http://ctan.org/pkg/fontenc
+% .. _hyperref: http://ctan.org/pkg/hyperref
+% .. _ibycus: http://ctan.org/pkg/ibycus-babel
% .. _LaTeX Project Public License: http://www.latex-project.org/lppl.txt
-% .. _lgrx: http://www.ctan.org/pkg/lgrx
-% .. _ltxcmds: http://www.ctan.org/pkg/ltxcmds
-% .. _teubner: http://www.ctan.org/pkg/teubner
+% .. _lgrx: http://ctan.org/pkg/lgrx
+% .. _ltxcmds: http://ctan.org/pkg/ltxcmds
+% .. _teubner: http://ctan.org/pkg/teubner
% .. _teubner-doc:
% http://mirror.ctan.org/macros/latex/contrib/teubner/teubner-doc.pdf
% .. _textalpha: textalpha.sty.html
-% .. _ucs: http://www.ctan.org/pkg/unicode
-% .. _xunicode: http://www.ctan.org/pkg/xunicode
+% .. _ucs: http://ctan.org/pkg/unicode
+% .. _xunicode: http://ctan.org/pkg/xunicode
% .. _ltxbugs 4399:
% https://www.latex-project.org/cgi-bin/ltxbugs2html?pr=latex%2F4399&search=
%
diff --git a/language/greek/greek-fontenc/lgrenc.def.html b/language/greek/greek-fontenc/lgrenc.def.html
index a326fd105a..0cc5230663 100644
--- a/language/greek/greek-fontenc/lgrenc.def.html
+++ b/language/greek/greek-fontenc/lgrenc.def.html
@@ -2,10 +2,10 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8"/>
-<meta name="generator" content="Docutils 0.15b.dev: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.17b.dev: http://docutils.sourceforge.net/" />
<title>lgrenc.def</title>
<meta name="dcterms.rights" content="© 2010, 2014 Günter Milde" />
-<link rel="schema.dcterms" href="http://purl.org/dc/terms/">
+<link rel="schema.dcterms" href="http://purl.org/dc/terms/"/>
<style type="text/css">
/* Minimal style sheet for the HTML output of Docutils. */
@@ -42,41 +42,39 @@
h1.title, p.subtitle {
text-align: center;
}
-p.admonition-title,
p.topic-title,
p.sidebar-title,
p.rubric,
+p.admonition-title,
p.system-message-title {
font-weight: bold;
}
h1 + p.subtitle,
-h1 + p.section-subtitle {
+h2 + p.section-subtitle {
font-size: 1.6em;
}
-h2 + p.section-subtitle { font-size: 1.28em; }
+h3 + p.section-subtitle {
+ font-size: 1.28em;
+}
p.subtitle,
p.section-subtitle,
p.sidebar-subtitle {
font-weight: bold;
margin-top: -0.5em;
}
-p.sidebar-title,
+p.sidebar-title {
+ font-size: larger;
+}
p.rubric {
font-size: larger;
+ color: maroon;
}
-p.rubric { color: maroon; }
a.toc-backref {
color: black;
text-decoration: none; }
/* Warnings, Errors */
-div.caution p.admonition-title,
-div.attention p.admonition-title,
-div.danger p.admonition-title,
-div.error p.admonition-title,
-div.warning p.admonition-title,
-div.system-messages h1,
-div.error,
+div.system-messages h2,
span.problematic,
p.system-message-title {
color: red;
@@ -103,7 +101,7 @@ dl.simple > dd, dl.compact > dd {
}
/* Table of Contents */
-div.topic.contents { margin: 0; }
+div.topic.contents { margin: 0.5em 0; }
div.topic.contents ul {
list-style-type: none;
padding-left: 1.5em;
@@ -162,7 +160,7 @@ pre.address { font: inherit; }
dd.authors > p { margin: 0; }
/* Option Lists */
-dl.option-list { margin-left: 40px; }
+dl.option-list { margin-left: 1.5em; }
dl.option-list > dt { font-weight: normal; }
span.option { white-space: nowrap; }
@@ -192,45 +190,40 @@ div.line-block div.line-block {
/* Figures, Images, and Tables */
.figure.align-left,
+figure.align-left,
img.align-left,
object.align-left,
table.align-left {
margin-right: auto;
}
.figure.align-center,
+figure.align-center,
img.align-center,
-object.align-center {
- margin-left: auto;
- margin-right: auto;
- display: block;
-}
+object.align-center,
table.align-center {
margin-left: auto;
margin-right: auto;
}
.figure.align-right,
+figure.align-right,
img.align-right,
object.align-right,
table.align-right {
margin-left: auto;
}
+img.align-center, img.align-right,
+object.align-center, object.align-right {
+ display: block;
+}
/* reset inner alignment in figures and tables */
-/* div.align-left, div.align-center, div.align-right, */
-table.align-left, table.align-center, table.align-right
-{ text-align: inherit }
-
-/* Admonitions and System Messages */
-div.admonition,
-div.system-message,
-div.sidebar{
- margin: 40px;
- border: medium outset;
- padding-right: 1em;
- padding-left: 1em;
+.figure.align-left, .figure.align-right,
+figure.align-left, figure.align-right,
+table.align-left, table.align-center, table.align-right {
+ text-align: inherit;
}
/* Sidebar */
-div.sidebar {
+aside.sidebar {
width: 30%;
max-width: 26em;
float: right;
@@ -240,12 +233,14 @@ div.sidebar {
/* Text Blocks */
blockquote,
div.topic,
+div.admonition,
+div.system-message,
pre.literal-block,
pre.doctest-block,
pre.math,
pre.code {
margin-left: 1.5em;
- margin-right: 1.5em
+ margin-right: 1.5em;
}
pre.code .ln { color: gray; } /* line numbers */
@@ -271,14 +266,23 @@ table.borderless td, table.borderless th {
padding-right: 0.5em /* separate table cells */
}
+/* Document Header and Footer */
+header { border-bottom: 1px solid black; }
+footer { border-top: 1px solid black; }
+
+/* new HTML5 block elements: set display for older browsers */
+header, section, footer, aside, nav, main, article, figure {
+ display: block;
+}
+
</style>
<style type="text/css">
/* CSS31_ style sheet for the output of Docutils HTML writers. */
-/* Rules for easy reading and pre-defined style variants. */
+/* Rules for easy reading and pre-defined style variants. */
/* */
/* :Author: Günter Milde, based on html4css1.css by David Goodger */
-/* :Id: $Id$ */
+/* :Id: $Id$ */
/* :Copyright: © 2015 Günter Milde. */
/* :License: Released under the terms of the `2-Clause BSD license`_, */
/* in short: */
@@ -286,11 +290,11 @@ table.borderless td, table.borderless th {
/* Copying and distribution of this file, with or without modification, */
/* are permitted in any medium without royalty provided the copyright */
/* notice and this notice are preserved. */
-/* */
+/* */
/* This file is offered as-is, without any warranty. */
/* */
/* .. _2-Clause BSD license: http://www.spdx.org/licenses/BSD-2-Clause */
-/* .. _CSS3: http://www.w3.org/TR/CSS3 */
+/* .. _CSS3: http://www.w3.org/TR/CSS3 */
/* Document Structure */
@@ -301,13 +305,14 @@ body {
margin: 0;
background-color: #dbdbdb;
}
-div.document {
+div.document,
+main {
line-height:1.3;
- counter-reset: table;
- /* counter-reset: figure; */
+ counter-reset: table figure;
/* avoid long lines --> better reading */
+ /* optimum is 45…75 characters/line <http://webtypography.net/2.1.2> */
/* OTOH: lines should not be too short because of missing hyphenation, */
- max-width: 50em;
+ max-width: 50em;
padding: 1px 2%; /* 1px on top avoids grey bar above title (mozilla) */
margin: auto;
background-color: white;
@@ -324,32 +329,35 @@ hr.docutils {
clear: both;
}
-/* Paragraphs */
-/* ========== */
+/* Paragraphs */
+/* ========== */
/* vertical space (parskip) */
-p, ol, ul, dl,
+p, ol, ul, dl, li, dd,
div.line-block,
-table{
+div.topic,
+table {
margin-top: 0.5em;
margin-bottom: 0.5em;
}
+p:first-child { margin-top: 0; }
+/* (:last-child is new in CSS 3) */
+p:last-child { margin-bottom: 0; }
+
h1, h2, h3, h4, h5, h6,
dl > dd {
margin-bottom: 0.5em;
}
-/* Lists */
-/* ========== */
-
-/* Definition Lists */
+/* Lists */
+/* ===== */
-dl > dd > p:first-child { margin-top: 0; }
-/* :last-child is not part of CSS 2.1 (introduced in CSS 3) */
-dl > dd > p:last-child { margin-bottom: 0; }
+/* Separate list entries in compound lists */
+dl > dd, ol > li,
-/* lists nested in definition lists */
-/* :only-child is not part of CSS 2.1 (introduced in CSS 3) */
+/* Definition Lists */
+/* Indent lists nested in definition lists */
+/* (:only-child is new in CSS 3) */
dd > ul:only-child, dd > ol:only-child { padding-left: 1em; }
/* Description Lists */
@@ -398,12 +406,19 @@ span.fn-backref {
font-weight: normal;
}
-/* Text Blocks */
-/* ============ */
+/* Text Blocks */
+/* =========== */
+
+/* Literal Blocks */
-/* Literal Blocks */
+pre.literal-block,
+pre.doctest-block,
+pre.math,
+pre.code {
+ font-family: monospace;
+}
-/* Block Quotes */
+/* Block Quotes */
blockquote > table,
div.topic > table {
@@ -416,8 +431,8 @@ div.topic p.attribution {
margin-left: 20%;
}
-/* Tables */
-/* ====== */
+/* Tables */
+/* ====== */
/* th { vertical-align: bottom; } */
@@ -444,11 +459,11 @@ table.numbered > caption:before {
font-weight: bold;
}
-/* Explicit Markup Blocks */
-/* ====================== */
+/* Explicit Markup Blocks */
+/* ====================== */
-/* Footnotes and Citations */
-/* ----------------------- */
+/* Footnotes and Citations */
+/* ----------------------- */
/* line on the left */
dl.footnote {
@@ -457,47 +472,78 @@ dl.footnote {
border-left-width: thin;
}
-/* Directives */
-/* ---------- */
+/* Directives */
+/* ---------- */
-/* Body Elements */
-/* ~~~~~~~~~~~~~ */
+/* Body Elements */
+/* ~~~~~~~~~~~~~ */
/* Images and Figures */
/* let content flow to the side of aligned images and figures */
.figure.align-left,
+figure.align-left,
img.align-left,
object.align-left {
display: block;
clear: left;
float: left;
- margin-right: 1em
+ margin-right: 1em;
}
.figure.align-right,
+figure.align-right,
img.align-right,
object.align-right {
display: block;
clear: right;
float: right;
- margin-left: 1em
+ margin-left: 1em;
}
/* Stop floating sidebars, images and figures at section level 1,2,3 */
-h1, h2, h3 { clear: both; }
+h1, h2, h3, h4 { clear: both; }
+
+/* Numbered figures */
+figure.numbered > figcaption > p:before {
+ counter-increment: figure;
+ content: "Figure " counter(figure) ": ";
+ font-weight: bold;
+}
+
+
+/* Admonitions and System Messages */
+
+div.admonition,
+div.system-message,
+aside.sidebar {
+ border: medium outset;
+ margin: 1em 1.5em;
+ padding: 0.5em 1em;
+}
+
+div.caution p.admonition-title,
+div.attention p.admonition-title,
+div.danger p.admonition-title,
+div.error p.admonition-title,
+div.warning p.admonition-title,
+div.error {
+ color: red;
+}
+
/* Sidebar */
-/* Move into the margin. In a layout with fixed margins, */
-/* it can be moved into the margin completely. */
-div.sidebar {
+/* Move right. In a layout with fixed margins, */
+/* it can be moved into the margin. */
+div.sidebar,
+aside.sidebar {
width: 30%;
max-width: 26em;
margin-left: 1em;
- margin-right: -5.5%;
- background-color: #ffffee ;
+ margin-right: -2%;
+ background-color: #ffffee;
}
-/* Code */
+/* Code */
pre.code { padding: 0.7ex }
pre.code, code { background-color: #eeeeee }
@@ -511,55 +557,57 @@ pre.code .name.builtin, code .name.builtin { color: #352B84 }
pre.code .deleted, code .deleted { background-color: #DEB0A1}
pre.code .inserted, code .inserted { background-color: #A3D289}
-/* Math */
+/* Math */
/* styled separately (see math.css for math-output=HTML) */
-/* Epigraph */
-/* Highlights */
-/* Pull-Quote */
-/* Compound Paragraph */
-/* Container */
-
-/* can be styled in a custom stylesheet */
+/* Epigraph */
+/* Highlights */
+/* Pull-Quote */
+/* Compound Paragraph */
+/* Container */
/* Document Header and Footer */
-div.footer, div.header {
- clear: both;
+footer, header {
font-size: smaller;
+ clear: both;
+ padding: 0.5em 2%;
+ background-color: #ebebee;
+ border: none;
}
-/* Inline Markup */
-/* ============= */
-
-/* Emphasis */
-/* em */
-/* Strong Emphasis */
-/* strong */
-/* Interpreted Text */
-/* span.interpreted */
-/* Title Reference */
-/* cite */
-/* Inline Literals */
+/* Inline Markup */
+/* ============= */
+
+/* Emphasis */
+/* em */
+/* Strong Emphasis */
+/* strong */
+/* Interpreted Text */
+/* span.interpreted */
+/* Title Reference */
+/* cite */
+
+/* Inline Literals */
/* possible values: normal, nowrap, pre, pre-wrap, pre-line */
-/* span.docutils.literal { white-space: pre-wrap; } */
+/* span.docutils.literal { white-space: pre-wrap; } */
-/* Hyperlink References */
+/* Hyperlink References */
a { text-decoration: none; }
-/* External Targets */
-/* span.target.external */
-/* Internal Targets */
-/* span.target.internal */
-/* Footnote References */
-/* a.footnote-reference */
-/* Citation References */
-/* a.citation-reference */
+/* External Targets */
+/* span.target.external */
+/* Internal Targets */
+/* span.target.internal */
+/* Footnote References */
+/* a.footnote-reference */
+/* Citation References */
+/* a.citation-reference */
</style>
</head>
<body>
-<div class="document" id="lgrenc-def">
+<main id="lgrenc-def">
<h1 class="title">lgrenc.def</h1>
<p class="subtitle" id="lgr-greek-font-encoding-definitions">LGR Greek font encoding definitions</p>
<dl class="docinfo simple">
@@ -572,7 +620,7 @@ version 1.3 of this license or any later version.</p>
</dd>
</dl>
<div class="abstract topic">
-<p class="topic-title first">Abstract</p>
+<p class="topic-title">Abstract</p>
<p>The LGR font encoding is the de-facto standard for Greek
typesetting with LaTeX. This file provides a comprehensive set
of macros to typeset Greek with LGR encoded fonts. It works for
@@ -580,7 +628,7 @@ both, monotonic and polytonic Greek, independent of the <cite>babel</cite>
package.</p>
</div>
<div class="contents topic" id="contents">
-<p class="topic-title first">Contents</p>
+<p class="topic-title">Contents</p>
<ul class="simple">
<li><p><a class="reference internal" href="#changelog" id="id2">Changelog</a></p></li>
<li><p><a class="reference internal" href="#usage" id="id3">Usage</a></p></li>
@@ -627,10 +675,10 @@ package.</p>
</li>
</ul>
</div>
-<div class="section" id="changelog">
-<h1><a class="toc-backref" href="#id2">Changelog</a></h1>
+<section id="changelog">
+<h2><a class="toc-backref" href="#id2">Changelog</a></h2>
<p>Development of this file started under the name “lgrxenc.def” as part of the
-<a class="reference external" href="http://www.ctan.org/pkg/lgrx">lgrx</a> bundle. With version 0.8, it moved to <span class="docutils literal"><span class="pre">greek-fontenc/lgrx.def</span></span>.</p>
+<a class="reference external" href="http://ctan.org/pkg/lgrx">lgrx</a> bundle. With version 0.8, it moved to <span class="docutils literal"><span class="pre">greek-fontenc/lgrx.def</span></span>.</p>
<table class="borderless">
<colgroup>
<col style="width: 8%" />
@@ -687,7 +735,7 @@ package.</p>
</tr>
<tr><td><p>0.8</p></td>
<td><p>2013-05-13</p></td>
-<td><p>rename to lgrenc.def (superseding the <a class="reference external" href="http://www.ctan.org/pkg/babel">babel</a> version),</p></td>
+<td><p>rename to lgrenc.def (superseding the <a class="reference external" href="http://ctan.org/pkg/babel">babel</a> version),</p></td>
</tr>
<tr><td><!-- -->
</td>
@@ -757,13 +805,18 @@ package.</p>
<td><p>2019-07-09</p></td>
<td><p>Drop error font declaration (cf. <a class="reference external" href="https://www.latex-project.org/cgi-bin/ltxbugs2html?pr=latex%2F4399&amp;search=">ltxbugs 4399</a>).</p></td>
</tr>
+<tr><td><p>1.0</p></td>
+<td><p>2020/09/25</p></td>
+<td><p><span class="docutils literal">\textKoppa</span> as alias for <span class="docutils literal">\textkoppa</span>
+(there is no capital Koppa in LGR).</p></td>
+</tr>
</tbody>
</table>
-</div>
-<div class="section" id="usage">
-<h1><a class="toc-backref" href="#id3">Usage</a></h1>
-<p>Load this file by calling <a class="reference external" href="http://www.ctan.org/pkg/fontenc">fontenc</a> with the <span class="docutils literal">LGR</span> option
-or indirectly via the <a class="reference external" href="http://www.ctan.org/pkg/babel">babel</a>, <a class="reference external" href="textalpha.sty.html">textalpha</a> or <a class="reference external" href="alphabeta.sty.html">alphabeta</a> packages.</p>
+</section>
+<section id="usage">
+<h2><a class="toc-backref" href="#id3">Usage</a></h2>
+<p>Load this file by calling <a class="reference external" href="http://ctan.org/pkg/fontenc">fontenc</a> with the <span class="docutils literal">LGR</span> option
+or indirectly via the <a class="reference external" href="http://ctan.org/pkg/babel">babel</a>, <a class="reference external" href="textalpha.sty.html">textalpha</a> or <a class="reference external" href="alphabeta.sty.html">alphabeta</a> packages.</p>
<dl>
<dt>Example:</dt>
<dd><p>Select font encodings <cite>T1</cite> (as default) and <cite>LGR</cite> (for Greek):</p>
@@ -772,11 +825,11 @@ or indirectly via the <a class="reference external" href="http://www.ctan.org/pk
</blockquote>
</dd>
</dl>
-</div>
-<div class="section" id="implementation">
-<h1><a class="toc-backref" href="#id4">Implementation</a></h1>
-<div class="section" id="read-this-file-only-once">
-<h2><a class="toc-backref" href="#id5">Read this file only once</a></h2>
+</section>
+<section id="implementation">
+<h2><a class="toc-backref" href="#id4">Implementation</a></h2>
+<section id="read-this-file-only-once">
+<h3><a class="toc-backref" href="#id5">Read this file only once</a></h3>
<div class="admonition note">
<p class="admonition-title">Note</p>
<p>The use of <span class="docutils literal">\&#64;ifundefined</span> has the side-effect that the tested
@@ -791,11 +844,11 @@ anyway.</p>
{\message{LGR font encoding definitions already loaded}
\expandafter\endinput % &quot;return&quot;
}</pre>
-</div>
-<div class="section" id="identification">
-<h2><a class="toc-backref" href="#id6">Identification</a></h2>
+</section>
+<section id="identification">
+<h3><a class="toc-backref" href="#id6">Identification</a></h3>
<pre class="literal-block">\ProvidesFile{lgrenc.def}
-[2019/07/09 v0.13.3 LGR Greek font encoding definitions]
+[2020/09/25 1.0 LGR Greek font encoding definitions]
% Copyright © 2010 Günter Milde
% This file is part of the &quot;greek-fontenc&quot; package.
% It may be distributed and/or modified under the
@@ -803,25 +856,25 @@ anyway.</p>
% version 1.3 of this license or any later version.</pre>
<p>You can test the version date using</p>
<pre class="code latex literal-block"><code><span class="keyword">\&#64;</span>ifl&#64;ter <span class="name builtin">{</span>extension<span class="name builtin">}{</span>filename<span class="name builtin">}{</span>date<span class="name builtin">}{</span>YES<span class="name builtin">}{</span>NO<span class="name builtin">}</span></code></pre>
-<p>or using <a class="reference external" href="http://www.ctan.org/pkg/ltxcmds">ltxcmds</a>’ <span class="docutils literal">\&#64;iffilelater</span>.</p>
-</div>
-<div class="section" id="base-setup">
-<h2><a class="toc-backref" href="#id7">Base setup</a></h2>
+<p>or using <a class="reference external" href="http://ctan.org/pkg/ltxcmds">ltxcmds</a>’ <span class="docutils literal">\&#64;iffilelater</span>.</p>
+</section>
+<section id="base-setup">
+<h3><a class="toc-backref" href="#id7">Base setup</a></h3>
<p>Declare the LGR font encoding and base substitutions:</p>
<pre class="literal-block">\DeclareFontEncoding{LGR}{}{}
\DeclareFontSubstitution{LGR}{cmr}{m}{n}</pre>
-</div>
-<div class="section" id="text-symbols">
-<h2><a class="toc-backref" href="#id8">Text symbols</a></h2>
-<div class="section" id="greek-alphabet">
-<h3><a class="toc-backref" href="#id9">Greek Alphabet</a></h3>
+</section>
+<section id="text-symbols">
+<h3><a class="toc-backref" href="#id8">Text symbols</a></h3>
+<section id="greek-alphabet">
+<h4><a class="toc-backref" href="#id9">Greek Alphabet</a></h4>
<p>Greek letters are accessible by the Latin transcription, but the mapping is
specific to the LGR font encoding.</p>
<p>The LICR macros provide a way to access the symbols independent of the
specific font encoding, in any font encoding supporting Greek. An
-alternative Greek font encodings is LGI (<a class="reference external" href="http://www.ctan.org/pkg/ibycus-babel">ibycus</a>). Greek script is also
+alternative Greek font encodings is LGI (<a class="reference external" href="http://ctan.org/pkg/ibycus-babel">ibycus</a>). Greek script is also
supported by the Unicode-based font encodings PU (<cite>PDF Unicode</cite> used by
-<a class="reference external" href="http://www.ctan.org/pkg/hyperref">hyperref</a> for PDF metadata), TU, EU1 (XeTeX) and EU2 (LuaTeX). The <a class="reference external" href="textalpha.sty.html">textalpha</a>
+<a class="reference external" href="http://ctan.org/pkg/hyperref">hyperref</a> for PDF metadata), TU, EU1 (XeTeX) and EU2 (LuaTeX). The <a class="reference external" href="textalpha.sty.html">textalpha</a>
package makes these macros available independent of the current font
encoding.</p>
<pre class="literal-block">\DeclareTextSymbol{\textAlpha}{LGR}{65}
@@ -876,24 +929,25 @@ encoding.</p>
\DeclareTextSymbol{\textchi}{LGR}{113}
\DeclareTextSymbol{\textpsi}{LGR}{121}
\DeclareTextSymbol{\textomega}{LGR}{119}</pre>
-</div>
-<div class="section" id="additional-greek-symbols">
-<h3><a class="toc-backref" href="#id10">Additional Greek symbols</a></h3>
-<div class="section" id="ancient-greek-numbers-athenian-numerals">
-<h4><a class="toc-backref" href="#id11">Ancient Greek Numbers (Athenian Numerals)</a></h4>
-<p>Names from <a class="reference external" href="http://www.ctan.org/pkg/unicode">ucs</a> (<span class="docutils literal">ucsencs.def</span>)
+</section>
+<section id="additional-greek-symbols">
+<h4><a class="toc-backref" href="#id10">Additional Greek symbols</a></h4>
+<section id="ancient-greek-numbers-athenian-numerals">
+<h5><a class="toc-backref" href="#id11">Ancient Greek Numbers (Athenian Numerals)</a></h5>
+<p>Names from <a class="reference external" href="http://ctan.org/pkg/unicode">ucs</a> (<span class="docutils literal">ucsencs.def</span>)
(In ucs, five hundred is (wrongly?) named textpentehkaton.)</p>
<pre class="literal-block">\DeclareTextSymbol{\textpentedeka}{LGR}{2} % GREEK ACROPHONIC ATTIC FIFTY
\DeclareTextSymbol{\textpentehekaton}{LGR}{3} % GREEK ACROPHONIC ATTIC FIVE HUNDRED
\DeclareTextSymbol{\textpenteqilioi}{LGR}{4} % GREEK ACROPHONIC ATTIC FIVE THOUSAND
\DeclareTextSymbol{\textpentemuria}{LGR}{5} % GREEK ACROPHONIC ATTIC FIFTY THOUSAND</pre>
-</div>
-<div class="section" id="archaic-letters">
-<h4><a class="toc-backref" href="#id12">Archaic letters</a></h4>
-<p>Names after <a class="reference external" href="http://www.ctan.org/pkg/teubner">teubner</a> and <a class="reference external" href="http://www.ctan.org/pkg/unicode">ucs</a>:</p>
+</section>
+<section id="archaic-letters">
+<h5><a class="toc-backref" href="#id12">Archaic letters</a></h5>
+<p>Names after <a class="reference external" href="http://ctan.org/pkg/teubner">teubner</a> and <a class="reference external" href="http://ctan.org/pkg/unicode">ucs</a>:</p>
<pre class="literal-block">\DeclareTextSymbol{\textstigma}{LGR}{6} % ϛ
\DeclareTextSymbol{\textvarstigma}{LGR}{7} % stigma variant (CB.enc, teubner)
\DeclareTextSymbol{\textkoppa}{LGR}{18} % ϟ (greek small letter koppa)
+\DeclareTextSymbol{\textKoppa}{LGR}{18} % ϟ (capital numerical koppa) not distinct in LGR
\DeclareTextSymbol{\textqoppa}{LGR}{19} % ϙ (archaic koppa)
\DeclareTextSymbol{\textQoppa}{LGR}{21} % Ϙ (archaic Koppa)
\DeclareTextSymbol{\textStigma}{LGR}{22} % Ϛ in some fonts ϹΤ ligature
@@ -903,16 +957,16 @@ encoding.</p>
\DeclareTextSymbol{\texterotimatiko}{LGR}{63} % ;
\DeclareTextSymbol{\textdigamma}{LGR}{147} % ϝ (ucs) \digamma used by amsmath for math-macro
\DeclareTextSymbol{\textDigamma}{LGR}{195} % Ϝ (ucs)</pre>
-</div>
-<div class="section" id="numeral-signs">
-<h4><a class="toc-backref" href="#id13">Numeral signs</a></h4>
+</section>
+<section id="numeral-signs">
+<h5><a class="toc-backref" href="#id13">Numeral signs</a></h5>
<p>See also <a class="reference external" href="http://en.wikipedia.org/wiki/Greek_numerals">http://en.wikipedia.org/wiki/Greek_numerals</a></p>
-<p>Names from <a class="reference external" href="http://www.ctan.org/pkg/unicode">ucs</a>:</p>
+<p>Names from <a class="reference external" href="http://ctan.org/pkg/unicode">ucs</a>:</p>
<pre class="literal-block">\DeclareTextSymbol{\textdexiakeraia}{LGR}{254} % ʹ (Dexia keraia)
\DeclareTextSymbol{\textaristerikeraia}{LGR}{255} % ͵ (Aristeri keraia)</pre>
-</div>
-<div class="section" id="variant-symbols">
-<h4><a class="toc-backref" href="#id14">variant symbols</a></h4>
+</section>
+<section id="variant-symbols">
+<h5><a class="toc-backref" href="#id14">variant symbols</a></h5>
<p>Mathematical notation distinguishes variant shapes for pi, phi, rho, theta
(small and capital), beta, and kappa (characters for the latter three
symbols are not included in TeX’s math fonts). These variations have no
@@ -947,10 +1001,10 @@ provide fallback LICR macros with detailed error reporting:</p>
\ProvideTextCommand{\textpisymbol} {LGR}{\LGR&#64;TextSymbolOnlyMath{ϖ pi symbol}{$\varpi$}}
\ProvideTextCommand{\textrhosymbol} {LGR}{\LGR&#64;TextSymbolOnlyMath{ϱ rho symbol}{$\varrho$}}
\ProvideTextCommand{\textepsilonsymbol}{LGR}{\LGR&#64;TextSymbolOnlyMath{ϵ lunate epsilon symbol}{$\epsilon$}}</pre>
-</div>
-</div>
-<div class="section" id="other">
-<h3><a class="toc-backref" href="#id15">Other</a></h3>
+</section>
+</section>
+<section id="other">
+<h4><a class="toc-backref" href="#id15">Other</a></h4>
<p>Characters that also exist in other font encodings:</p>
<ul class="simple">
<li><p>define them for LGR if there is a matching glyph,</p></li>
@@ -1002,7 +1056,7 @@ to the Greek letters:</p>
<p><cite>tipa</cite> uses the macro names <span class="docutils literal">\textepsilon</span>, <span class="docutils literal">\textgamma</span>, <span class="docutils literal">\textiota</span>,
<span class="docutils literal">\textphi</span>, and <span class="docutils literal">\textupsilon</span> for the Latin characters. This is no
problem with 8-bit fonts (set the font encoding to T3 vs. LGR to
-disambiguate), but leads to ambiguity with Unicode fonts. <a class="reference external" href="http://www.ctan.org/pkg/xunicode">xunicode</a> uses the
+disambiguate), but leads to ambiguity with Unicode fonts. <a class="reference external" href="http://ctan.org/pkg/xunicode">xunicode</a> uses the
<span class="docutils literal">gr</span> infix and alias names to disambiguate:</p>
<ul class="simple">
<li><p>03B3 <span class="docutils literal">\textgrgamma</span></p></li>
@@ -1021,11 +1075,11 @@ systematical basis:</p>
<li><p>0269 <span class="docutils literal">\textiotalatin</span></p></li>
<li><p>028A <span class="docutils literal">\textscupsilon</span> % TIPA-U</p></li>
</ul>
-</div>
-<div class="section" id="not-implemented">
-<h3><a class="toc-backref" href="#id16">Not implemented</a></h3>
+</section>
+<section id="not-implemented">
+<h4><a class="toc-backref" href="#id16">Not implemented</a></h4>
<p>The characters at position 16 and 17 are used in the <span class="docutils literal">\nexus</span> macro
-of the <a class="reference external" href="http://www.ctan.org/pkg/teubner">teubner</a> package to form an extensible, hat-like bracket. In
+of the <a class="reference external" href="http://ctan.org/pkg/teubner">teubner</a> package to form an extensible, hat-like bracket. In
<span class="docutils literal">CB.enc</span>, they are mapped to</p>
<blockquote>
<p>16–MODIFIER LETTER LOW ACUTE ACCENT
@@ -1038,10 +1092,10 @@ SHELL BRACKET.</p>
macros that expect a Latin script. These definitions are problematic in a
font-encoding definition file as they require <span class="docutils literal">\textlatin</span> which is
defined in <span class="docutils literal">babel.def</span>. They were moved to <span class="docutils literal">greek.ldf</span>.</p>
-</div>
-</div>
-<div class="section" id="diacritics">
-<h2><a class="toc-backref" href="#id17">Diacritics</a></h2>
+</section>
+</section>
+<section id="diacritics">
+<h3><a class="toc-backref" href="#id17">Diacritics</a></h3>
<p>This section defines <a class="reference internal" href="#named-macros">named macros</a> for Greek diacritics and standard
<a class="reference internal" href="#symbol-macros">symbol macros</a> as alias for simple diacritics. Convenient input
conventions for <a class="reference internal" href="#composite-diacritics">composite diacritics</a> are defined as <a class="reference internal" href="#composite-definitions">composite
@@ -1059,13 +1113,13 @@ working also inside the tabbing environment.</p></li>
<li><p>Named macros are required for upcasing according to Greek typesetting
conventions (cf. <a class="reference internal" href="#uppercase">UPPERCASE</a> below) and for composite diacritics.</p></li>
</ul>
-<div class="section" id="named-macros">
-<h3><a class="toc-backref" href="#id18">Named macros</a></h3>
-<p>Definitions are based on the <a class="reference external" href="http://www.ctan.org/pkg/teubner">teubner</a> package by Claudio Beccari, the <a class="reference external" href="http://www.ctan.org/pkg/unicode">ucs</a>
+<section id="named-macros">
+<h4><a class="toc-backref" href="#id18">Named macros</a></h4>
+<p>Definitions are based on the <a class="reference external" href="http://ctan.org/pkg/teubner">teubner</a> package by Claudio Beccari, the <a class="reference external" href="http://ctan.org/pkg/unicode">ucs</a>
package, and the <a class="reference external" href="http://www.eutypon.gr/eutypon/pdf/e2008-20/e20-a03.pdf">babel patch</a> by Werner Lemberg. Names are derived from
the Unicode name with the prefix “acc” (cf. <cite>How to name accent macros?</cite>
in the <a class="reference external" href="README.html">README</a>) reducing the probability of incompatibilities compared to the
-two-letter <a class="reference external" href="http://www.ctan.org/pkg/teubner">teubner</a> diacritic macros or the “text” prefix used by <a class="reference external" href="http://www.ctan.org/pkg/unicode">ucs</a>.</p>
+two-letter <a class="reference external" href="http://ctan.org/pkg/teubner">teubner</a> diacritic macros or the “text” prefix used by <a class="reference external" href="http://ctan.org/pkg/unicode">ucs</a>.</p>
<p>Simple Greek diacritics:</p>
<pre class="literal-block">\DeclareTextAccent{\accdialytika}{LGR}{34} % διαλυτικά (diaeresis/trema)
\DeclareTextAccent{\acctonos}{LGR}{39} % τόνος/ὀξεῖα tonos/oxia (acute)
@@ -1098,39 +1152,39 @@ of additional diacritic symbols:</p>
\DeclareTextAccent{\accbrevebelow}{LGR}{20} % BREVE BELOW
\DeclareTextAccent{\u}{LGR}{30} % BREVE (Greek vrachy)
\DeclareTextAccent{\=}{LGR}{31} % MACRON</pre>
-</div>
-<div class="section" id="aliases">
-<h3><a class="toc-backref" href="#id19">Aliases</a></h3>
+</section>
+<section id="aliases">
+<h4><a class="toc-backref" href="#id19">Aliases</a></h4>
<p>The standard <span class="target" id="symbol-macros">symbol macros</span> are exclusively used for Greek diacritics
in LGR:</p>
<pre class="literal-block">\DeclareTextCommand{\&quot;}{LGR}{\accdialytika}
\DeclareTextCommand{\'}{LGR}{\acctonos}
\DeclareTextCommand{\`}{LGR}{\accvaria}
\DeclareTextCommand{\~}{LGR}{\accperispomeni}</pre>
-</div>
-</div>
-<div class="section" id="common-greek-font-encoding-definitions">
-<h2><a class="toc-backref" href="#id20">Common Greek font encoding definitions</a></h2>
+</section>
+</section>
+<section id="common-greek-font-encoding-definitions">
+<h3><a class="toc-backref" href="#id20">Common Greek font encoding definitions</a></h3>
<p>The file greek-fontenc.def contains font encoding definitions that are
shared by font encodings providing Greek characters:</p>
<pre class="literal-block">\input{greek-fontenc.def}</pre>
-</div>
-<div class="section" id="composite-definitions">
-<h2><a class="toc-backref" href="#id21">Composite definitions</a></h2>
-<div class="section" id="composite-diacritics">
-<h3><a class="toc-backref" href="#id22">Composite diacritics</a></h3>
+</section>
+<section id="composite-definitions">
+<h3><a class="toc-backref" href="#id21">Composite definitions</a></h3>
+<section id="composite-diacritics">
+<h4><a class="toc-backref" href="#id22">Composite diacritics</a></h4>
<p>Composite accents can be input as sequence of simple diacritics (in
arbitrary order) via named macro, symbol macro and “transcription
characters”, e.g. <span class="docutils literal">\accdialytica\accvaria\textalpha</span>, <span class="docutils literal"><span class="pre">\&quot;\'\textalpha</span></span>,
<span class="docutils literal"><span class="pre">\&quot;'\textalpha</span></span>, or <span class="docutils literal"><span class="pre">\'&quot;\textalpha</span></span>.</p>
<p>The actual declarations are part of the <a class="reference internal" href="#common-greek-font-encoding-definitions">common Greek font encoding
definitions</a>.</p>
-</div>
-<div class="section" id="pre-composed-letters">
-<h3><a class="toc-backref" href="#id23">Pre-composed letters</a></h3>
-<div class="section" id="small-letters-with-diacritics">
-<h4><a class="toc-backref" href="#id24">Small letters with diacritics</a></h4>
-<p>(from <a class="reference external" href="http://www.ctan.org/pkg/teubner">teubner</a> with changed names of the composite accents):</p>
+</section>
+<section id="pre-composed-letters">
+<h4><a class="toc-backref" href="#id23">Pre-composed letters</a></h4>
+<section id="small-letters-with-diacritics">
+<h5><a class="toc-backref" href="#id24">Small letters with diacritics</a></h5>
+<p>(from <a class="reference external" href="http://ctan.org/pkg/teubner">teubner</a> with changed names of the composite accents):</p>
<pre class="literal-block">\DeclareTextComposite{\accvaria}{LGR}{a}{128}
\DeclareTextComposite{\accdasia}{LGR}{a}{129}
\DeclareTextComposite{\accpsili}{LGR}{a}{130}
@@ -1294,9 +1348,9 @@ definitions</a>.</p>
\DeclareTextComposite{\accpsilivaria}{LGR}{\textomicron}{239}
\DeclareTextComposite{\accdasia}{LGR}{\textrho}{251}
\DeclareTextComposite{\accpsili}{LGR}{\textrho}{252}</pre>
-</div>
-<div class="section" id="capital-letters-with-diacritics">
-<h4><a class="toc-backref" href="#id25">Capital letters with diacritics</a></h4>
+</section>
+<section id="capital-letters-with-diacritics">
+<h5><a class="toc-backref" href="#id25">Capital letters with diacritics</a></h5>
<blockquote>
<p>In Greek, diacritics are omitted in all-uppercase words, but kept as part
of an uppercase initial (written before rather than above the letter).</p>
@@ -1452,11 +1506,11 @@ in cases where they are not needed when writing in lowercase)</p>
<p>Except for the dialytika:</p>
<pre class="literal-block">\DeclareTextComposite{\accdialytika}{LGR}{\textIota}{219}
\DeclareTextComposite{\accdialytika}{LGR}{\textUpsilon}{223}</pre>
-</div>
-</div>
-</div>
-<div class="section" id="uppercase">
-<h2><a class="toc-backref" href="#id26">UPPERCASE</a></h2>
+</section>
+</section>
+</section>
+<section id="uppercase">
+<h3><a class="toc-backref" href="#id26">UPPERCASE</a></h3>
<p>The <a class="reference internal" href="#common-greek-font-encoding-definitions">common Greek font encoding definitions</a> in <span class="docutils literal"><span class="pre">greek-fontenc.def</span></span> extend
the <cite>uclclist</cite> with Greek LICR macros. Here, we add LGR specific “hiatus”
handling.</p>
@@ -1508,8 +1562,8 @@ not require kerning anyway.</p>
</ul>
<!-- References
- - - - - - - - - - -->
-</div>
-</div>
-</div>
+</section>
+</section>
+</main>
</body>
</html>
diff --git a/language/greek/greek-fontenc/textalpha-doc.pdf b/language/greek/greek-fontenc/textalpha-doc.pdf
index f7d3d021f9..940651d0e2 100644
--- a/language/greek/greek-fontenc/textalpha-doc.pdf
+++ b/language/greek/greek-fontenc/textalpha-doc.pdf
Binary files differ
diff --git a/language/greek/greek-fontenc/textalpha.sty b/language/greek/greek-fontenc/textalpha.sty
index e99f65e666..9bf8fa2a12 100644
--- a/language/greek/greek-fontenc/textalpha.sty
+++ b/language/greek/greek-fontenc/textalpha.sty
@@ -16,7 +16,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{textalpha}
-[2020/02/28 v0.14 macros for Greek letters in text]
+[2020/09/25 1.0 macros for Greek letters in text]
% .. note::
%
@@ -46,6 +46,7 @@
% 0.14 2020-02-28 Update test for Unicode fonts.
% Rename ``greek-euenc`` to ``tuenc-greek``.
% Don't use ``\LastDeclaredEncoding``.
+% 1.0 2020-09-25 Also set ``\encodingdefault`` with ``\greekscript``.
% ====== ========== =========================================================
%
% .. contents::
@@ -300,7 +301,9 @@
% ``\ProvideTextCommandDefault`` to enable the author or other packages to use
% an alternative definition (see [fntguide_])::
-\ProvideTextCommandDefault{\greekscript}{\fontencoding{LGR}\selectfont}
+\ProvideTextCommandDefault{\greekscript}{\fontencoding{LGR}\selectfont
+ \def\encodingdefault{\greekfontencoding}}
+
% The ``\ensuregreek`` command can be used to ensure that its argument is set in
% a font encoding with support for Greek. Again the default is LGR::
@@ -419,7 +422,9 @@
% numeral signs: http://en.wikipedia.org/wiki/Greek_numerals ::
-\DeclareTextSymbolDefault{\textnumeralsigngreek}{LGR} % (puenc.def)
+\DeclareTextSymbolDefault{\textdexiakeraia}{LGR} % ʹ (Dexia keraia)
+\DeclareTextSymbolDefault{\textnumeralsigngreek}{LGR} % (puenc.def)
+\DeclareTextSymbolDefault{\textaristerikeraia}{LGR} % ͵ (Aristeri keraia)
\DeclareTextSymbolDefault{\textnumeralsignlowergreek}{LGR} % (puenc.def)
% variant shape symbols
@@ -526,18 +531,18 @@
% .. References
% ----------
% .. _LaTeX Project Public License: http://www.latex-project.org/lppl.txt
-% .. _CB fonts: http://www.ctan.org/pkg/cbgreek-complete
-% .. _babel: http://www.ctan.org/pkg/babel
+% .. _CB fonts: http://ctan.org/pkg/cbgreek-complete
+% .. _babel: http://ctan.org/pkg/babel
% .. _e-TeX: http://www.tex.ac.uk/cgi-bin/texfaq2html?label=etex
-% .. _fontenc: http://www.ctan.org/pkg/fontenc
-% .. _fontspec: http://www.ctan.org/pkg/fontspec
-% .. _fntguide: http://mirror.ctan.org/macros/latex/doc/fntguide.pdf
-% .. _greek-fontenc: http://www.ctan.org/pkg/greek-fontenc
-% .. _greek-inputenc: http://www.ctan.org/pkg/greek-inputenc
-% .. _hyperref: http://www.ctan.org/pkg/hyperref
-% .. _inputenc: http://www.ctan.org/pkg/inputenc
-% .. _polyglossia: http://www.ctan.org/pkg/polyglossia
-% .. _textgreek: http://www.ctan.org/pkg/textgreek
-% .. _xunicode: http://www.ctan.org/pkg/xunicode
+% .. _fontenc: http://ctan.org/pkg/fontenc
+% .. _fontspec: http://ctan.org/pkg/fontspec
+% .. _fntguide: http://mirror.ctan.org/macros/latex/base/fntguide.pdf
+% .. _greek-fontenc: http://ctan.org/pkg/greek-fontenc
+% .. _greek-inputenc: http://ctan.org/pkg/greek-inputenc
+% .. _hyperref: http://ctan.org/pkg/hyperref
+% .. _inputenc: http://ctan.org/pkg/inputenc
+% .. _polyglossia: http://ctan.org/pkg/polyglossia
+% .. _textgreek: http://ctan.org/pkg/textgreek
+% .. _xunicode: http://ctan.org/pkg/xunicode
%
% .. _erotimatiko: https://en.wikipedia.org/wiki/Question_mark#Erotimatiko
diff --git a/language/greek/greek-fontenc/textalpha.sty.html b/language/greek/greek-fontenc/textalpha.sty.html
index 6ad667468c..48021df494 100644
--- a/language/greek/greek-fontenc/textalpha.sty.html
+++ b/language/greek/greek-fontenc/textalpha.sty.html
@@ -5,7 +5,7 @@
<meta name="generator" content="Docutils 0.17b.dev: http://docutils.sourceforge.net/" />
<title>textalpha.sty</title>
<meta name="dcterms.rights" content="© 2010 Günter Milde" />
-<link rel="schema.dcterms" href="http://purl.org/dc/terms/">
+<link rel="schema.dcterms" href="http://purl.org/dc/terms/"/>
<style type="text/css">
/* Minimal style sheet for the HTML output of Docutils. */
@@ -50,33 +50,31 @@ p.system-message-title {
font-weight: bold;
}
h1 + p.subtitle,
-h1 + p.section-subtitle {
+h2 + p.section-subtitle {
font-size: 1.6em;
}
-h2 + p.section-subtitle { font-size: 1.28em; }
+h3 + p.section-subtitle {
+ font-size: 1.28em;
+}
p.subtitle,
p.section-subtitle,
p.sidebar-subtitle {
font-weight: bold;
margin-top: -0.5em;
}
-p.sidebar-title,
+p.sidebar-title {
+ font-size: larger;
+}
p.rubric {
font-size: larger;
+ color: maroon;
}
-p.rubric { color: maroon; }
a.toc-backref {
color: black;
text-decoration: none; }
/* Warnings, Errors */
-div.caution p.admonition-title,
-div.attention p.admonition-title,
-div.danger p.admonition-title,
-div.error p.admonition-title,
-div.warning p.admonition-title,
-div.system-messages h1,
-div.error,
+div.system-messages h2,
span.problematic,
p.system-message-title {
color: red;
@@ -213,8 +211,6 @@ object.align-right,
table.align-right {
margin-left: auto;
}
-.figure.align-center, .figure.align-right,
-figure.align-center, figure.align-right,
img.align-center, img.align-right,
object.align-center, object.align-right {
display: block;
@@ -226,18 +222,6 @@ table.align-left, table.align-center, table.align-right {
text-align: inherit;
}
-/* Admonitions and System Messages */
-div.admonition,
-div.system-message,
-aside.sidebar {
- margin: 1em 1.5em;
- border: medium outset;
- padding-top: 0.5em;
- padding-bottom: 0.5em;
- padding-right: 1em;
- padding-left: 1em;
-}
-
/* Sidebar */
aside.sidebar {
width: 30%;
@@ -249,6 +233,8 @@ aside.sidebar {
/* Text Blocks */
blockquote,
div.topic,
+div.admonition,
+div.system-message,
pre.literal-block,
pre.doctest-block,
pre.math,
@@ -322,11 +308,11 @@ body {
div.document,
main {
line-height:1.3;
- counter-reset: table;
- /* counter-reset: figure; */
+ counter-reset: table figure;
/* avoid long lines --> better reading */
+ /* optimum is 45…75 characters/line <http://webtypography.net/2.1.2> */
/* OTOH: lines should not be too short because of missing hyphenation, */
- max-width: 50em;
+ max-width: 50em;
padding: 1px 2%; /* 1px on top avoids grey bar above title (mozilla) */
margin: auto;
background-color: white;
@@ -514,7 +500,35 @@ object.align-right {
margin-left: 1em;
}
/* Stop floating sidebars, images and figures at section level 1,2,3 */
-h1, h2, h3 { clear: both; }
+h1, h2, h3, h4 { clear: both; }
+
+/* Numbered figures */
+figure.numbered > figcaption > p:before {
+ counter-increment: figure;
+ content: "Figure " counter(figure) ": ";
+ font-weight: bold;
+}
+
+
+/* Admonitions and System Messages */
+
+div.admonition,
+div.system-message,
+aside.sidebar {
+ border: medium outset;
+ margin: 1em 1.5em;
+ padding: 0.5em 1em;
+}
+
+div.caution p.admonition-title,
+div.attention p.admonition-title,
+div.danger p.admonition-title,
+div.error p.admonition-title,
+div.warning p.admonition-title,
+div.error {
+ color: red;
+}
+
/* Sidebar */
@@ -607,7 +621,7 @@ version 1.3 of this license or any later version.</p>
<dt class="identification">Identification</dt>
<dd class="identification"><pre class="literal-block">\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{textalpha}
-[2020/02/28 v0.14 macros for Greek letters in text]</pre>
+[2020/09/25 1.0 macros for Greek letters in text]</pre>
</dd>
</dl>
<div class="abstract topic">
@@ -618,7 +632,7 @@ in text mode.</p>
<div class="admonition note">
<p class="admonition-title">Note</p>
<p>The package was renamed from <cite>textgreek</cite> to <cite>textalpha</cite> to prevent
-confusion with the <a class="reference external" href="http://www.ctan.org/pkg/textgreek">textgreek</a> package by Leonard Michlmayr.</p>
+confusion with the <a class="reference external" href="http://ctan.org/pkg/textgreek">textgreek</a> package by Leonard Michlmayr.</p>
</div>
<dl>
<dt>Changelog:</dt>
@@ -648,7 +662,7 @@ confusion with the <a class="reference external" href="http://www.ctan.org/pkg/t
<tr><td><p>0.5</p></td>
<td><p>2013-09-11
..</p></td>
-<td><p>move to <a class="reference external" href="http://www.ctan.org/pkg/greek-fontenc">greek-fontenc</a>,
+<td><p>move to <a class="reference external" href="http://ctan.org/pkg/greek-fontenc">greek-fontenc</a>,
support XeTeX/LuaTeX, add breve below accents.</p></td>
</tr>
<tr><td><p>0.11</p></td>
@@ -682,6 +696,10 @@ in LGR.</p></td>
Rename <span class="docutils literal"><span class="pre">greek-euenc</span></span> to <span class="docutils literal"><span class="pre">tuenc-greek</span></span>.
Don’t use <span class="docutils literal">\LastDeclaredEncoding</span>.</p></td>
</tr>
+<tr><td><p>1.0</p></td>
+<td><p>2020-09-25</p></td>
+<td><p>Also set <span class="docutils literal">\encodingdefault</span> with <span class="docutils literal">\greekscript</span>.</p></td>
+</tr>
</tbody>
</table>
</dd>
@@ -720,7 +738,7 @@ Don’t use <span class="docutils literal">\LastDeclaredEncoding</span>.</p></td
</ul>
</div>
<section id="motivation">
-<h1><a class="toc-backref" href="#id1">Motivation</a></h1>
+<h2><a class="toc-backref" href="#id1">Motivation</a></h2>
<p>By default, TeX macros for Greek letters are only valid in mathematical
mode. This package sets up a suitable <a class="reference internal" href="#font-encoding">font encoding</a> and <cite>LaTeX internal
character representations</cite> (LICR) definitions for Greek (<span class="docutils literal">\textalpha</span> –
@@ -732,17 +750,17 @@ and does “the right thing” to set up Greek text font support:</p>
<li><p>If an Unicode font encoding is declared by <span class="docutils literal">fontspec</span>, add Greek LICR
definitions.</p></li>
<li><p>Otherwise, the <a class="reference external" href="README.html#lgr">LGR font encoding</a> is set as <cite>default font encoding</cite>
-(cf. <a class="reference external" href="http://mirror.ctan.org/macros/latex/doc/fntguide.pdf">fntguide</a> section 5.3) for Greek.</p></li>
+(cf. <a class="reference external" href="http://mirror.ctan.org/macros/latex/base/fntguide.pdf">fntguide</a> section 5.3) for Greek.</p></li>
</ul>
<p>Advantages:</p>
<ul>
-<li><p>Symbols from a Greek text font (e.g. the <a class="reference external" href="http://www.ctan.org/pkg/cbgreek-complete">CB fonts</a>) can be accessed
+<li><p>Symbols from a Greek text font (e.g. the <a class="reference external" href="http://ctan.org/pkg/cbgreek-complete">CB fonts</a>) can be accessed
without the need for an explicite font-encoding switch anywhere in the
text.</p></li>
<li><p>Unicode input of Greek characters is supported</p>
<ul>
<li><p>via <span class="docutils literal"><span class="pre">\usepackage[utf8]{inputenc}</span></span> and <span class="docutils literal">lgrenc.dfu</span> from
-<a class="reference external" href="http://www.ctan.org/pkg/greek-inputenc">greek-inputenc</a> for 8-bit TeX or XeTeX/LuaTeX in 8-bit compatibility
+<a class="reference external" href="http://ctan.org/pkg/greek-inputenc">greek-inputenc</a> for 8-bit TeX or XeTeX/LuaTeX in 8-bit compatibility
mode in any font encoding (see <a class="reference external" href="textalpha-doc.tex">textalpha-doc.tex</a>).</p></li>
<li><p>natively by XeTeX/LuaTeX for Unicode fonts.</p>
<p>If 8-bit font encodings like LGR are used alongside Unicode fonts, text
@@ -758,14 +776,14 @@ literal Unicode characters</em> (see <a class="reference external" href="tuenc-g
However, with 8-bit TeX engines, the automatic font-encoding switches
behind the doors interfere with kerning between letters and replacement
of accent+character with a pre-composed character.</p>
-<p>Therefore, Greek text should be written with the help of <a class="reference external" href="http://www.ctan.org/pkg/babel">babel</a> or
-<a class="reference external" href="http://www.ctan.org/pkg/polyglossia">polyglossia</a> (setting the language to <span class="docutils literal">greek</span>) or wrapped in the
-provided <span class="docutils literal">ensuregreek</span> macro. Using <a class="reference external" href="http://www.ctan.org/pkg/babel">babel</a> or <a class="reference external" href="http://www.ctan.org/pkg/polyglossia">polyglossia</a> also helps
+<p>Therefore, Greek text should be written with the help of <a class="reference external" href="http://ctan.org/pkg/babel">babel</a> or
+<a class="reference external" href="http://ctan.org/pkg/polyglossia">polyglossia</a> (setting the language to <span class="docutils literal">greek</span>) or wrapped in the
+provided <span class="docutils literal">ensuregreek</span> macro. Using <a class="reference external" href="http://ctan.org/pkg/babel">babel</a> or <a class="reference external" href="http://ctan.org/pkg/polyglossia">polyglossia</a> also helps
to ensure correct hyphenation of Greek text.</p>
</div>
</section>
<section id="usage">
-<h1><a class="toc-backref" href="#id2">Usage</a></h1>
+<h2><a class="toc-backref" href="#id2">Usage</a></h2>
<p>Ensure support for Greek characters in text mode with</p>
<pre class="code latex literal-block"><code><span class="keyword">\usepackage</span><span class="name builtin">{</span>textalpha<span class="name builtin">}</span></code></pre>
<p>eventually with the <a class="reference internal" href="#options">options</a> to normalize symbols variants</p>
@@ -773,7 +791,7 @@ to ensure correct hyphenation of Greek text.</p>
<p>and/or to use the semicolon as <a class="reference external" href="https://en.wikipedia.org/wiki/Question_mark#Erotimatiko">erotimatiko</a> also in 8-bit TeX</p>
<pre class="code latex literal-block"><code><span class="keyword">\usepackage</span><span class="name attribute">[normalize-symbols,keep-semicolon]</span><span class="name builtin">{</span>textalpha<span class="name builtin">}</span></code></pre>
<p>To give <span class="docutils literal">textalpha.sty</span> a chance of finding out which <a class="reference internal" href="#font-encodings">font encodings</a>
-are used, load it after <a class="reference external" href="http://www.ctan.org/pkg/fontspec">fontspec</a> and/or <a class="reference external" href="http://www.ctan.org/pkg/fontenc">fontenc</a>.</p>
+are used, load it after <a class="reference external" href="http://ctan.org/pkg/fontspec">fontspec</a> and/or <a class="reference external" href="http://ctan.org/pkg/fontenc">fontenc</a>.</p>
<p>For detailled examples see <a class="reference external" href="textalpha-doc.tex">textalpha-doc.tex</a> and <a class="reference external" href="textalpha-doc.pdf">textalpha-doc.pdf</a>
(8-bit TeX and XeTeX/LuaTeX in 8-bit compatibility mode) as well as
<a class="reference external" href="tuenc-greek-doc.tex">tuenc-greek-doc.tex</a> and <a class="reference external" href="tuenc-greek-doc.pdf">tuenc-greek-doc.pdf</a> (XeTeX/LuaTeX with
@@ -782,11 +800,11 @@ Unicode fonts).</p>
in the same document (see <a class="reference external" href="tuenc-greek-doc.tex">tuenc-greek-doc.tex</a>).</p>
</section>
<section id="implementation">
-<h1><a class="toc-backref" href="#id3">Implementation</a></h1>
+<h2><a class="toc-backref" href="#id3">Implementation</a></h2>
<section id="options">
-<h2><a class="toc-backref" href="#id4">Options</a></h2>
+<h3><a class="toc-backref" href="#id4">Options</a></h3>
<section id="normalize-symbols">
-<h3><a class="toc-backref" href="#id5">normalize-symbols</a></h3>
+<h4><a class="toc-backref" href="#id5">normalize-symbols</a></h4>
<p>The “variant shape” symbol characters like <span class="docutils literal">03D1 GREEK THETA SYMBOL</span> are
mathematical charcters for mathematical use
(similar to <span class="docutils literal">1D440 MATHEMATICAL ITALIC CAPITAL M</span>).
@@ -807,7 +825,7 @@ errors to prevent information loss in cases where the distinction between
\DeclareOption{normalize-symbols}{\textalpha&#64;normalizeSymbolstrue}</pre>
</section>
<section id="keep-semicolon">
-<h3><a class="toc-backref" href="#id6">keep-semicolon</a></h3>
+<h4><a class="toc-backref" href="#id6">keep-semicolon</a></h4>
<p>The <a class="reference external" href="https://en.wikipedia.org/wiki/Question_mark#Erotimatiko">erotimatiko</a> looks like a semicolon but is a
<strong>Greek question mark</strong>:</p>
<ul class="simple">
@@ -828,14 +846,14 @@ With XeTeX/LuaTeX and Unicode fonts, this option is ignored.</p>
</section>
</section>
<section id="font-encodings">
-<span id="font-encoding"></span><h2><a class="toc-backref" href="#id7">Font encodings</a></h2>
+<span id="font-encoding"></span><h3><a class="toc-backref" href="#id7">Font encodings</a></h3>
<p>With 8-bit LaTeX, the <a class="reference external" href="README.html#lgr">LGR font encoding</a> is used for Greek characters. If
no Greek-supporting font encoding (TU, EU1, EU2, or LGR) is declared, LGR is
loaded and set up as default Greek font encoding by this package.</p>
<p>With XeTeX or LuaTeX, there is one common input and font encoding –
Unicode. 8-bit TeX font encodings are only used in compatibility mode or for
fonts not available otherwise. For compatibility with the LaTeX font
-selection system, <a class="reference external" href="http://www.ctan.org/pkg/fontspec">fontspec</a> defines the TU font encoding or the (pseudo)
+selection system, <a class="reference external" href="http://ctan.org/pkg/fontspec">fontspec</a> defines the TU font encoding or the (pseudo)
font encodings EU1 and EU2 for XeTeX and LuaTeX respectively. However
<cite>fontspec</cite> does not define Greek LICR macros. We therefore explicitely
load Greek LICR definitions for XeTeX/LuaTeX from <a class="reference external" href="tuenc-greek.def.html">tuenc-greek.def</a> which in turn includes <a class="reference external" href="greek-fontenc.def.html">greek-fontenc.def</a>.</p>
@@ -855,7 +873,7 @@ or EU2 is detected.</p></li>
\input{lgrenc.def}
}
\fi</pre>
-<p>The package <a class="reference external" href="http://www.ctan.org/pkg/hyperref">hyperref</a> defines the PU font encoding which also supports
+<p>The package <a class="reference external" href="http://ctan.org/pkg/hyperref">hyperref</a> defines the PU font encoding which also supports
(monotonic) Greek. It currently misses polytonic greek and the
<span class="docutils literal">\greekscript</span> and <span class="docutils literal">\ensuregreek</span> TextCommands:</p>
<pre class="literal-block">\&#64;ifl&#64;aded{def}{puenc}
@@ -866,7 +884,7 @@ or EU2 is detected.</p></li>
{}</pre>
</section>
<section id="symbol-macros-for-breathings">
-<h2><a class="toc-backref" href="#id8">Symbol macros for breathings</a></h2>
+<h3><a class="toc-backref" href="#id8">Symbol macros for breathings</a></h3>
<p>In the Latin transcription provided by LGR, breathing accents (Dasia and
Psili) are input as &lt; and &gt;. We provide the corresponding NFSS macro accents
(moved here from <a class="reference external" href="greek-fontenc.def.html">greek-fontenc.def</a>).</p>
@@ -896,7 +914,7 @@ macros twice, for LGR and Unicode font encodings (if they are defined):</p>
}{}</pre>
</section>
<section id="default-declarations">
-<h2><a class="toc-backref" href="#id9">Default declarations</a></h2>
+<h3><a class="toc-backref" href="#id9">Default declarations</a></h3>
<p>The following definitions ensure that the Greek LICR macros can be used
anywhere in the document also with 8-bit TeX by declaring LGR as their
default font encoding. Abort here, if the LGR font encoding is not defined:</p>
@@ -905,15 +923,16 @@ default font encoding. Abort here, if the LGR font encoding is not defined:</p>
% else return:
{\expandafter\endinput}</pre>
<section id="greekscript-ensuregreek">
-<h3><a class="toc-backref" href="#id10">greekscript, ensuregreek</a></h3>
+<h4><a class="toc-backref" href="#id10">greekscript, ensuregreek</a></h4>
<p>The <span class="docutils literal">\greekscript</span> declaration ensures the current font encoding supports
the Greek script. <span class="docutils literal"><span class="pre">greek-fontenc.def</span></span> sets this to the empty declaration
for font encodings that do so. This is currently used by <span class="docutils literal">lgrenc.def</span>
(LGR) and <span class="docutils literal"><span class="pre">tuenc-greek.def</span></span> (Greek LICR macros for TU, EU1, or EU2).</p>
<p>We define LGR as default encoding for Greek text. We use
<span class="docutils literal">\ProvideTextCommandDefault</span> to enable the author or other packages to use
-an alternative definition (see [<a class="reference external" href="http://mirror.ctan.org/macros/latex/doc/fntguide.pdf">fntguide</a>]):</p>
-<pre class="literal-block">\ProvideTextCommandDefault{\greekscript}{\fontencoding{LGR}\selectfont}</pre>
+an alternative definition (see [<a class="reference external" href="http://mirror.ctan.org/macros/latex/base/fntguide.pdf">fntguide</a>]):</p>
+<pre class="literal-block">\ProvideTextCommandDefault{\greekscript}{\fontencoding{LGR}\selectfont
+ \def\encodingdefault{\greekfontencoding}}</pre>
<p>The <span class="docutils literal">\ensuregreek</span> command can be used to ensure that its argument is set in
a font encoding with support for Greek. Again the default is LGR:</p>
<pre class="literal-block">\ProvideTextCommandDefault{\ensuregreek}[1]{\leavevmode{\greekscript #1}}</pre>
@@ -934,7 +953,7 @@ argument unchanged. This way, kerning and selection of precomposed glyphs
would work also for cases like <span class="docutils literal"><span class="pre">\ensuregreek{\'A}U</span></span>.</p>
</section>
<section id="greek-alphabet">
-<h3><a class="toc-backref" href="#id11">Greek Alphabet</a></h3>
+<h4><a class="toc-backref" href="#id11">Greek Alphabet</a></h4>
<p>Define the <span class="docutils literal">text*</span> marcos as default for all font encodings:</p>
<pre class="literal-block">\DeclareTextSymbolDefault{\textAlpha}{LGR}
\DeclareTextSymbolDefault{\textBeta}{LGR}
@@ -990,7 +1009,7 @@ would work also for cases like <span class="docutils literal"><span class="pre">
\DeclareTextSymbolDefault{\textomega}{LGR}</pre>
</section>
<section id="additional-greek-symbols">
-<h3><a class="toc-backref" href="#id12">Additional Greek symbols</a></h3>
+<h4><a class="toc-backref" href="#id12">Additional Greek symbols</a></h4>
<p>Including alias names for compatibility with hyperref’s puenc.def.</p>
<p>Ancient Greek Numbers (Athenian Numerals):</p>
<pre class="literal-block">\DeclareTextSymbolDefault{\textpentedeka}{LGR} % GREEK ACROPHONIC ATTIC FIFTY
@@ -1018,10 +1037,12 @@ would work also for cases like <span class="docutils literal"><span class="pre">
\DeclareTextSymbolDefault{\textdigammagreek}{LGR} % ϝ (puenc.def)
\DeclareTextSymbolDefault{\textDigammagreek}{LGR} % Ϝ (puenc.def)</pre>
<p>numeral signs: <a class="reference external" href="http://en.wikipedia.org/wiki/Greek_numerals">http://en.wikipedia.org/wiki/Greek_numerals</a></p>
-<pre class="literal-block">\DeclareTextSymbolDefault{\textnumeralsigngreek}{LGR} % (puenc.def)
+<pre class="literal-block">\DeclareTextSymbolDefault{\textdexiakeraia}{LGR} % ʹ (Dexia keraia)
+\DeclareTextSymbolDefault{\textnumeralsigngreek}{LGR} % (puenc.def)
+\DeclareTextSymbolDefault{\textaristerikeraia}{LGR} % ͵ (Aristeri keraia)
\DeclareTextSymbolDefault{\textnumeralsignlowergreek}{LGR} % (puenc.def)</pre>
<section id="variant-shape-symbols">
-<h4><a class="toc-backref" href="#id13">variant shape symbols</a></h4>
+<h5><a class="toc-backref" href="#id13">variant shape symbols</a></h5>
<p>Mathematical notation uses variant shapes of some Greek letters as
additional symbols. There are separate code points for the symbol variants
in Unicode but not in the LGR font encoding used for Greek in 8-bit TeX.
@@ -1048,7 +1069,7 @@ The variations have no syntactic meaning in Greek text.</p>
</section>
</section>
<section id="diacritics">
-<h3><a class="toc-backref" href="#id14">Diacritics</a></h3>
+<h4><a class="toc-backref" href="#id14">Diacritics</a></h4>
<p>Greek diacritics via “named” macros:</p>
<pre class="literal-block">\DeclareTextAccentDefault{\accdasia}{LGR}
\DeclareTextAccentDefault{\accpsili}{LGR}
@@ -1078,7 +1099,7 @@ The variations have no syntactic meaning in Greek text.</p>
\DeclareTextAccentDefault{\accbrevebelow}{LGR} % BREVE BELOW</pre>
</section>
<section id="auxiliary-macros">
-<h3><a class="toc-backref" href="#id15">Auxiliary macros</a></h3>
+<h4><a class="toc-backref" href="#id15">Auxiliary macros</a></h4>
<p><span class="docutils literal">\MakeUppercase</span> requires four internal commands:</p>
<pre class="literal-block">\DeclareTextAccentDefault{\LGR&#64;accdropped}{LGR}
\DeclareTextAccentDefault{\LGR&#64;accDialytika}{LGR}
@@ -1086,7 +1107,7 @@ The variations have no syntactic meaning in Greek text.</p>
\DeclareTextSymbolDefault{\LGR&#64;ypogegrammeni}{LGR}</pre>
</section>
<section id="semicolon-as-erotimatiko">
-<h3><a class="toc-backref" href="#id16">semicolon as erotimatiko</a></h3>
+<h4><a class="toc-backref" href="#id16">semicolon as erotimatiko</a></h4>
<p>The text command <span class="docutils literal">\textsemicolon</span> inserts <span class="docutils literal">\texterotimatiko</span>
in LGR font encoding and a “normal” semicolon else:</p>
<pre class="literal-block">\ProvideTextCommandDefault{\textsemicolon}{;}
diff --git a/language/greek/greek-fontenc/tuenc-greek-doc.pdf b/language/greek/greek-fontenc/tuenc-greek-doc.pdf
index e8c8c9ed2c..5883ad163b 100644
--- a/language/greek/greek-fontenc/tuenc-greek-doc.pdf
+++ b/language/greek/greek-fontenc/tuenc-greek-doc.pdf
Binary files differ
diff --git a/language/greek/greek-fontenc/tuenc-greek-doc.tex b/language/greek/greek-fontenc/tuenc-greek-doc.tex
index a00a1e1389..efd1f3e53c 100644
--- a/language/greek/greek-fontenc/tuenc-greek-doc.tex
+++ b/language/greek/greek-fontenc/tuenc-greek-doc.tex
@@ -18,7 +18,7 @@
% \usepackage{libertineotf}
\setmainfont{Linux Libertine O}
\setsansfont{Linux Biolinum O}
-\setmainfont{FreeSerif}%
+% \setmainfont{FreeSerif}%
% \setmainfont{Droid Sans}
% Declare the font encoding and Greek LICR definitions:
diff --git a/language/greek/greek-fontenc/tuenc-greek.def b/language/greek/greek-fontenc/tuenc-greek.def
index ab1fd033f3..dcc9b0b672 100644
--- a/language/greek/greek-fontenc/tuenc-greek.def
+++ b/language/greek/greek-fontenc/tuenc-greek.def
@@ -11,7 +11,7 @@
% ::
\ProvidesFile{tuenc-greek.def}
-[2020/02/28 0.14 Greek LICRs for XeTeX and LuaTeX]
+[2020/09/25 1.0 Greek LICRs for XeTeX and LuaTeX]
% :abstract:
% Experimental support for Greek LICR macros with XeTeX and LuaTeX.
@@ -36,6 +36,7 @@
% .. LICR macros for symbol variants.
% 0.13.3 2018-01-06 Documentation update.
% 0.14 2020-02-28 Rename to ``tuenc-greek.def``. Use ``\UTFencname``.
+% 1.0 2020/09/25 ``\textKoppa`` as alias for ``\textkoppa`` in LGR.
% ====== ========== ========================================================
%
% .. contents::
@@ -240,7 +241,7 @@
\DeclareTextCommand{\textstigma}{\UTFencname}{ϛ}
\DeclareTextCommand{\textDigamma}{\UTFencname}{Ϝ}
\DeclareTextCommand{\textdigamma}{\UTFencname}{ϝ}
-\DeclareTextCommand{\textKoppa}{\UTFencname}{Ϟ} % not defined in LGR
+\DeclareTextCommand{\textKoppa}{\UTFencname}{Ϟ} % in LGR identic to \textkoppa
\DeclareTextCommand{\textkoppa}{\UTFencname}{ϟ} % \koppa, \textqoppa [sic!]
\DeclareTextCommand{\textSampi}{\UTFencname}{Ϡ}
\DeclareTextCommand{\textsampi}{\UTFencname}{ϡ}
@@ -821,25 +822,11 @@
% ~~~~~~~~
%
% The common Greek font encoding definitions in greek-fontenc.def_ extend the
-% `uclclist` with Greek LICR macros. Here, we add textkoppa/textKoppa and
-% Unicode-specific "hiatus_" handling (copied from lgrenc.def_ and changed
+% `uclclist` with Greek LICR macros. Here, we add Unicode-specific "hiatus_"
+% handling (copied from lgrenc.def_ and changed
% Latin transcription to Unicode literals).
-%
-% @uclclist extension (see also greek-fontenc.def_)::
-
-\providecommand*\tuenc@greek@update@uclclist{%
- \expandafter\def\expandafter\@uclclist\expandafter{%
- \@uclclist
- \textkoppa \textKoppa
- }%
- \let\tuenc@greek@update@uclclist\relax
-}
-
-% Expand the uclc list using the just defined macro::
-
-\tuenc@greek@update@uclclist
-
-% Now the hiatus definition modifications::
+%
+% The hiatus definition modifications::
\DeclareTextCommand{\LGR@A@hiatus}{\UTFencname}{%
\LGR@ifnextchar{Ι}{\textAlpha\"}{%
@@ -863,18 +850,18 @@
% .. References
%
% .. _LaTeX Project Public License: http://www.latex-project.org/lppl.txt
-% .. _babel-greek: http://www.ctan.org/pkg/babel-greek
-% .. _euenc: http://www.ctan.org/pkg/euenc
-% .. _fontspec: http://www.ctan.org/pkg/fontspec
-% .. _greek-fontenc: http://www.ctan.org/pkg/greek-fontenc
-% .. _grnumalt: http://www.ctan.org/pkg/grnumalt
-% .. _inputenc: http://www.ctan.org/pkg/inputenc
+% .. _babel-greek: http://ctan.org/pkg/babel-greek
+% .. _euenc: http://ctan.org/pkg/euenc
+% .. _fontspec: http://ctan.org/pkg/fontspec
+% .. _greek-fontenc: http://ctan.org/pkg/greek-fontenc
+% .. _grnumalt: http://ctan.org/pkg/grnumalt
+% .. _inputenc: http://ctan.org/pkg/inputenc
% .. _textalpha: textalpha.sty.html
-% .. _xgreek: http://www.ctan.org/pkg/xgreek
-% .. _xunicode: http://www.ctan.org/pkg/xunicode
+% .. _xgreek: http://ctan.org/pkg/xgreek
+% .. _xunicode: http://ctan.org/pkg/xunicode
%
% .. _LaTeX2e font selection:
-% http://mirror.ctan.org/macros/latex/doc/fntguide.pdf
+% http://mirror.ctan.org/macros/latex/base/fntguide.pdf
% .. _common Greek font encoding definitions:
% .. _greek-fontenc.def: greek-fontenc.def.html
% .. _lgrenc.def: lgrenc.def.html
diff --git a/language/greek/greek-fontenc/tuenc-greek.def.html b/language/greek/greek-fontenc/tuenc-greek.def.html
index 8af311a8ae..d34d5cda23 100644
--- a/language/greek/greek-fontenc/tuenc-greek.def.html
+++ b/language/greek/greek-fontenc/tuenc-greek.def.html
@@ -5,7 +5,7 @@
<meta name="generator" content="Docutils 0.17b.dev: http://docutils.sourceforge.net/" />
<title>tuenc-greek.def</title>
<meta name="dcterms.rights" content="© 2013 Günter Milde" />
-<link rel="schema.dcterms" href="http://purl.org/dc/terms/">
+<link rel="schema.dcterms" href="http://purl.org/dc/terms/"/>
<style type="text/css">
/* Minimal style sheet for the HTML output of Docutils. */
@@ -50,33 +50,31 @@ p.system-message-title {
font-weight: bold;
}
h1 + p.subtitle,
-h1 + p.section-subtitle {
+h2 + p.section-subtitle {
font-size: 1.6em;
}
-h2 + p.section-subtitle { font-size: 1.28em; }
+h3 + p.section-subtitle {
+ font-size: 1.28em;
+}
p.subtitle,
p.section-subtitle,
p.sidebar-subtitle {
font-weight: bold;
margin-top: -0.5em;
}
-p.sidebar-title,
+p.sidebar-title {
+ font-size: larger;
+}
p.rubric {
font-size: larger;
+ color: maroon;
}
-p.rubric { color: maroon; }
a.toc-backref {
color: black;
text-decoration: none; }
/* Warnings, Errors */
-div.caution p.admonition-title,
-div.attention p.admonition-title,
-div.danger p.admonition-title,
-div.error p.admonition-title,
-div.warning p.admonition-title,
-div.system-messages h1,
-div.error,
+div.system-messages h2,
span.problematic,
p.system-message-title {
color: red;
@@ -213,8 +211,6 @@ object.align-right,
table.align-right {
margin-left: auto;
}
-.figure.align-center, .figure.align-right,
-figure.align-center, figure.align-right,
img.align-center, img.align-right,
object.align-center, object.align-right {
display: block;
@@ -226,18 +222,6 @@ table.align-left, table.align-center, table.align-right {
text-align: inherit;
}
-/* Admonitions and System Messages */
-div.admonition,
-div.system-message,
-aside.sidebar {
- margin: 1em 1.5em;
- border: medium outset;
- padding-top: 0.5em;
- padding-bottom: 0.5em;
- padding-right: 1em;
- padding-left: 1em;
-}
-
/* Sidebar */
aside.sidebar {
width: 30%;
@@ -249,6 +233,8 @@ aside.sidebar {
/* Text Blocks */
blockquote,
div.topic,
+div.admonition,
+div.system-message,
pre.literal-block,
pre.doctest-block,
pre.math,
@@ -322,11 +308,11 @@ body {
div.document,
main {
line-height:1.3;
- counter-reset: table;
- /* counter-reset: figure; */
+ counter-reset: table figure;
/* avoid long lines --> better reading */
+ /* optimum is 45…75 characters/line <http://webtypography.net/2.1.2> */
/* OTOH: lines should not be too short because of missing hyphenation, */
- max-width: 50em;
+ max-width: 50em;
padding: 1px 2%; /* 1px on top avoids grey bar above title (mozilla) */
margin: auto;
background-color: white;
@@ -514,7 +500,35 @@ object.align-right {
margin-left: 1em;
}
/* Stop floating sidebars, images and figures at section level 1,2,3 */
-h1, h2, h3 { clear: both; }
+h1, h2, h3, h4 { clear: both; }
+
+/* Numbered figures */
+figure.numbered > figcaption > p:before {
+ counter-increment: figure;
+ content: "Figure " counter(figure) ": ";
+ font-weight: bold;
+}
+
+
+/* Admonitions and System Messages */
+
+div.admonition,
+div.system-message,
+aside.sidebar {
+ border: medium outset;
+ margin: 1em 1.5em;
+ padding: 0.5em 1em;
+}
+
+div.caution p.admonition-title,
+div.attention p.admonition-title,
+div.danger p.admonition-title,
+div.error p.admonition-title,
+div.warning p.admonition-title,
+div.error {
+ color: red;
+}
+
/* Sidebar */
@@ -606,13 +620,13 @@ version 1.3 of this license or any later version.</p>
</dd>
<dt class="identification">Identification</dt>
<dd class="identification"><pre class="literal-block">\ProvidesFile{tuenc-greek.def}
-[2020/02/28 0.14 Greek LICRs for XeTeX and LuaTeX]</pre>
+[2020/09/25 1.0 Greek LICRs for XeTeX and LuaTeX]</pre>
</dd>
</dl>
<div class="abstract topic">
<p class="topic-title">Abstract</p>
<p>Experimental support for Greek LICR macros with XeTeX and LuaTeX.
-Extends <a href="#id14"><span class="problematic" id="id15">tuenc_</span></a>. Used by <a class="reference external" href="http://www.ctan.org/pkg/babel-greek">babel-greek</a> and <a class="reference external" href="textalpha.sty.html">textalpha</a>.</p>
+Extends <a href="#id14"><span class="problematic" id="id15">tuenc_</span></a>. Used by <a class="reference external" href="http://ctan.org/pkg/babel-greek">babel-greek</a> and <a class="reference external" href="textalpha.sty.html">textalpha</a>.</p>
</div>
<dl>
<dt><strong>History</strong>:</dt>
@@ -666,7 +680,7 @@ fix upcasing of <span class="docutils literal">\finalsigma</span>.</p></td>
</tr>
<tr><td><p>0.13</p></td>
<td><p>2015-08-07</p></td>
-<td><p><span class="docutils literal">\lccode</span>/<span class="docutils literal">\uccode</span> corrections from <a class="reference external" href="http://www.ctan.org/pkg/xgreek">xgreek</a>.</p></td>
+<td><p><span class="docutils literal">\lccode</span>/<span class="docutils literal">\uccode</span> corrections from <a class="reference external" href="http://ctan.org/pkg/xgreek">xgreek</a>.</p></td>
</tr>
<tr><td><!-- -->
</td>
@@ -681,6 +695,10 @@ fix upcasing of <span class="docutils literal">\finalsigma</span>.</p></td>
<td><p>2020-02-28</p></td>
<td><p>Rename to <span class="docutils literal"><span class="pre">tuenc-greek.def</span></span>. Use <span class="docutils literal">\UTFencname</span>.</p></td>
</tr>
+<tr><td><p>1.0</p></td>
+<td><p>2020/09/25</p></td>
+<td><p><span class="docutils literal">\textKoppa</span> as alias for <span class="docutils literal">\textkoppa</span> in LGR.</p></td>
+</tr>
</tbody>
</table>
</dd>
@@ -710,21 +728,21 @@ fix upcasing of <span class="docutils literal">\finalsigma</span>.</p></td>
</ul>
</div>
<section id="motivation">
-<h1><a class="toc-backref" href="#id1">Motivation</a></h1>
+<h2><a class="toc-backref" href="#id1">Motivation</a></h2>
<p>LICR macro definitions for the Greek script are missing in <a href="#id16"><span class="problematic" id="id17">tuenc_</span></a> (as well
-as the predecessors <a class="reference external" href="http://www.ctan.org/pkg/xunicode">xunicode</a>, <a class="reference external" href="http://www.ctan.org/pkg/euenc">euenc</a>).</p>
+as the predecessors <a class="reference external" href="http://ctan.org/pkg/xunicode">xunicode</a>, <a class="reference external" href="http://ctan.org/pkg/euenc">euenc</a>).</p>
<p>This file defines <cite>LaTeX Internal Character Representaction</cite> (LICR) macros
-for Greek letters and symbols. It works independed of <a class="reference external" href="http://www.ctan.org/pkg/xunicode">xunicode</a> using the
-standard commands for <a class="reference external" href="http://mirror.ctan.org/macros/latex/doc/fntguide.pdf">LaTeX2e font selection</a>.</p>
+for Greek letters and symbols. It works independed of <a class="reference external" href="http://ctan.org/pkg/xunicode">xunicode</a> using the
+standard commands for <a class="reference external" href="http://mirror.ctan.org/macros/latex/base/fntguide.pdf">LaTeX2e font selection</a>.</p>
</section>
<section id="requirements">
-<h1><a class="toc-backref" href="#id2">Requirements</a></h1>
-<p>Requires XeTeX or LuaTeX, <a class="reference external" href="http://www.ctan.org/pkg/fontspec">fontspec</a>, and a font with Greek characters.</p>
+<h2><a class="toc-backref" href="#id2">Requirements</a></h2>
+<p>Requires XeTeX or LuaTeX, <a class="reference external" href="http://ctan.org/pkg/fontspec">fontspec</a>, and a font with Greek characters.</p>
<p>See <a class="reference external" href="tuenc-greek-doc.tex">tuenc-greek-doc.tex</a> and <a class="reference external" href="tuenc-greek-doc.pdf">tuenc-greek-doc.pdf</a> for setup and
usage examples.</p>
</section>
<section id="greek-diacritics">
-<h1><a class="toc-backref" href="#id3">Greek Diacritics</a></h1>
+<h2><a class="toc-backref" href="#id3">Greek Diacritics</a></h2>
<p>Define “named macros” for simple and combined diacritics.</p>
<ul class="simple">
<li><p>Named accent macros can be used instead of the <span class="docutils literal">\&#64;tabacckludge</span> by
@@ -762,20 +780,20 @@ COMBINING COMMA ABOVE)</p>
\DeclareTextCommand{\accpsiliperispomeni}{\UTFencname}[1]{#1\char&quot;0342 \char&quot;0313 }</pre>
</section>
<section id="common-definitions">
-<h1><a class="toc-backref" href="#id4">Common Definitions</a></h1>
+<h2><a class="toc-backref" href="#id4">Common Definitions</a></h2>
<p>Use the <a class="reference external" href="greek-fontenc.def.html">common Greek font encoding definitions</a>:</p>
<pre class="literal-block">\renewcommand*{\LastDeclaredEncoding}{\UTFencname}
\input{greek-fontenc.def}</pre>
</section>
<section id="character-definitions">
-<h1><a class="toc-backref" href="#id5">Character Definitions</a></h1>
+<h2><a class="toc-backref" href="#id5">Character Definitions</a></h2>
<section id="general-punctuation">
-<h2><a class="toc-backref" href="#id6">General Punctuation</a></h2>
+<h3><a class="toc-backref" href="#id6">General Punctuation</a></h3>
<p>Ligature break up with ZERO WIDTH NON-JOINER:</p>
<pre class="literal-block">\DeclareTextCommand{\textcompwordmark}{\UTFencname}{\char&quot;200C}</pre>
</section>
<section id="greek-and-coptic">
-<h2><a class="toc-backref" href="#id7">Greek and Coptic</a></h2>
+<h3><a class="toc-backref" href="#id7">Greek and Coptic</a></h3>
<pre class="literal-block">% NR Unicode Name % babel name, % PU name
% 0370 GREEK CAPITAL LETTER HETA % Ͱ
% 0371 GREEK SMALL LETTER HETA % ͱ
@@ -880,7 +898,7 @@ COMBINING COMMA ABOVE)</p>
\DeclareTextCommand{\textstigma}{\UTFencname}{ϛ}
\DeclareTextCommand{\textDigamma}{\UTFencname}{Ϝ}
\DeclareTextCommand{\textdigamma}{\UTFencname}{ϝ}
-\DeclareTextCommand{\textKoppa}{\UTFencname}{Ϟ} % not defined in LGR
+\DeclareTextCommand{\textKoppa}{\UTFencname}{Ϟ} % in LGR identic to \textkoppa
\DeclareTextCommand{\textkoppa}{\UTFencname}{ϟ} % \koppa, \textqoppa [sic!]
\DeclareTextCommand{\textSampi}{\UTFencname}{Ϡ}
\DeclareTextCommand{\textsampi}{\UTFencname}{ϡ}
@@ -904,7 +922,7 @@ COMBINING COMMA ABOVE)</p>
\DeclareTextCommand{\textvarrho}{\UTFencname}{ϱ}</pre>
</section>
<section id="greek-extended">
-<h2><a class="toc-backref" href="#id8">Greek Extended</a></h2>
+<h3><a class="toc-backref" href="#id8">Greek Extended</a></h3>
<p>We skip definitions for characters “… WITH OXIA”, because they would
overwrite the defintions for “… WITH TONOS” in the <cite>Greek and Coptic</cite>
block.</p>
@@ -1102,13 +1120,13 @@ block.</p>
\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\textcompwordmark}{῾}</pre>
</section>
<section id="letterlike-symbols">
-<h2><a class="toc-backref" href="#id9">Letterlike Symbols</a></h2>
+<h3><a class="toc-backref" href="#id9">Letterlike Symbols</a></h3>
<pre class="literal-block">\DeclareTextCommand{\textohm}{\UTFencname}{Ω} % OHM SIGN</pre>
</section>
<section id="ancient-greek-numbers">
-<h2><a class="toc-backref" href="#id10">Ancient Greek Numbers</a></h2>
+<h3><a class="toc-backref" href="#id10">Ancient Greek Numbers</a></h3>
<p>TODO: map other chars to corresponding Greek letters.
-See also the <a class="reference external" href="http://www.ctan.org/pkg/grnumalt">grnumalt</a> package.</p>
+See also the <a class="reference external" href="http://ctan.org/pkg/grnumalt">grnumalt</a> package.</p>
<p>Definition with literal Unicode characters, because the code-point has 5
hexadecimal digits:</p>
<pre class="literal-block">\DeclareTextCommand{\textpentedeka}{\UTFencname}{𐅄} % GREEK ACROPHONIC ATTIC FIFTY
@@ -1118,11 +1136,11 @@ hexadecimal digits:</p>
</section>
</section>
<section id="uppercase">
-<h1><a class="toc-backref" href="#id11">UPPERCASE</a></h1>
+<h2><a class="toc-backref" href="#id11">UPPERCASE</a></h2>
<p>Greek letters drop diacritics (eccept dialytika and sub-iota) in UPPERCASE.</p>
<section id="uc-lc-values">
-<h2><a class="toc-backref" href="#id12">uc/lc values</a></h2>
-<p><span class="docutils literal">\lccode</span> and <span class="docutils literal">\uccode</span> corrections from the <a class="reference external" href="http://www.ctan.org/pkg/xgreek">xgreek</a> package by Apostolos Syropoulos:</p>
+<h3><a class="toc-backref" href="#id12">uc/lc values</a></h3>
+<p><span class="docutils literal">\lccode</span> and <span class="docutils literal">\uccode</span> corrections from the <a class="reference external" href="http://ctan.org/pkg/xgreek">xgreek</a> package by Apostolos Syropoulos:</p>
<pre class="literal-block">\global\lccode&quot;0370=&quot;0371 \global\uccode&quot;0370=&quot;0370
\global\lccode&quot;0371=&quot;0371 \global\uccode&quot;0371=&quot;0370
\global\lccode&quot;0372=&quot;0373 \global\uccode&quot;0372=&quot;0372
@@ -1443,22 +1461,12 @@ hexadecimal digits:</p>
\global\lccode&quot;1FFC=&quot;1FF3 \global\uccode&quot;1FFC=&quot;1FFC</pre>
</section>
<section id="uclclist">
-<h2><a class="toc-backref" href="#id13">uclclist</a></h2>
+<h3><a class="toc-backref" href="#id13">uclclist</a></h3>
<p>The common Greek font encoding definitions in <a class="reference external" href="greek-fontenc.def.html">greek-fontenc.def</a> extend the
-<cite>uclclist</cite> with Greek LICR macros. Here, we add textkoppa/textKoppa and
-Unicode-specific “<a class="reference external" href="greek-fontenc.def.html#mark-hiatus">hiatus</a>” handling (copied from <a class="reference external" href="lgrenc.def.html">lgrenc.def</a> and changed
+<cite>uclclist</cite> with Greek LICR macros. Here, we add Unicode-specific “<a class="reference external" href="greek-fontenc.def.html#mark-hiatus">hiatus</a>”
+handling (copied from <a class="reference external" href="lgrenc.def.html">lgrenc.def</a> and changed
Latin transcription to Unicode literals).</p>
-<p>&#64;uclclist extension (see also <a class="reference external" href="greek-fontenc.def.html">greek-fontenc.def</a>):</p>
-<pre class="literal-block">\providecommand*\tuenc&#64;greek&#64;update&#64;uclclist{%
- \expandafter\def\expandafter\&#64;uclclist\expandafter{%
- \&#64;uclclist
- \textkoppa \textKoppa
- }%
- \let\tuenc&#64;greek&#64;update&#64;uclclist\relax
-}</pre>
-<p>Expand the uclc list using the just defined macro:</p>
-<pre class="literal-block">\tuenc&#64;greek&#64;update&#64;uclclist</pre>
-<p>Now the hiatus definition modifications:</p>
+<p>The hiatus definition modifications:</p>
<pre class="literal-block">\DeclareTextCommand{\LGR&#64;A&#64;hiatus}{\UTFencname}{%
\LGR&#64;ifnextchar{Ι}{\textAlpha\&quot;}{%
\LGR&#64;ifnextchar{Υ}{\textAlpha\&quot;}{%
@@ -1481,13 +1489,13 @@ Latin transcription to Unicode literals).</p>
</section>
</section>
<section class="system-messages">
-<h1>Docutils System Messages</h1>
+<h2>Docutils System Messages</h2>
<div class="system-message" id="id14">
<p class="system-message-title">System Message: ERROR/3 (<span class="docutils literal">tuenc-greek.def.txt</span>, line 17); <em><a href="#id15">backlink</a></em></p>
<p>Unknown target name: &quot;tuenc&quot;.</p>
</div>
<div class="system-message" id="id16">
-<p class="system-message-title">System Message: ERROR/3 (<span class="docutils literal">tuenc-greek.def.txt</span>, line 46); <em><a href="#id17">backlink</a></em></p>
+<p class="system-message-title">System Message: ERROR/3 (<span class="docutils literal">tuenc-greek.def.txt</span>, line 47); <em><a href="#id17">backlink</a></em></p>
<p>Unknown target name: &quot;tuenc&quot;.</p>
</div>
</section>
diff --git a/language/japanese/jlreq/Makefile b/language/japanese/jlreq/Makefile
index 2d7b528547..06bcae1994 100644
--- a/language/japanese/jlreq/Makefile
+++ b/language/japanese/jlreq/Makefile
@@ -1,6 +1,8 @@
TEXMF:=$(shell kpsewhich -var-value=TEXMFHOME)
MAKEJVFCNF:=$(shell ls -R $(shell kpsewhich --var-value=TEXMFDIST)/fonts/source | awk '/:$$/{sub(/:$$/,"");f=$$0} tolower($$0) ~ /makejvf-upjpn\.cnf$$/{print f"/"$$0}' | head -n 1)
+.PHONY: all jfm doc latexdoc pdfdoc htmldoc jfm-install cls-install sty-install install tds uninstall jfmclean docclean clean
+
all: jfm
jfm: \
diff --git a/language/japanese/jlreq/README-ja.md b/language/japanese/jlreq/README-ja.md
index 544f1ce7cf..5f429b501b 100644
--- a/language/japanese/jlreq/README-ja.md
+++ b/language/japanese/jlreq/README-ja.md
@@ -1,7 +1,7 @@
# jlreq
## これは何?
-[日本語組版処理の要件](https://www.w3.org/TR/jlreq/ja/)の実装を試みる[LuaTeX-ja](https://osdn.jp/projects/luatex-ja/wiki/FrontPage) / pLaTeX / upLaTeX用のクラスファイルと,それに必要なJFMの組み合わせです.
+[日本語組版処理の要件](https://www.w3.org/TR/jlreq/?lang=ja)の実装を試みる[LuaTeX-ja](https://osdn.jp/projects/luatex-ja/wiki/FrontPage) / pLaTeX / upLaTeX用のクラスファイルと,それに必要なJFMの組み合わせです.
## 提供されるもの
クラスファイルjlreq.clsと,横書きLuaTeX-ja用のJFMであるjfm-jlreq.luaが用意されています.また,縦書きのJFMやpLaTeX / upLaTeX用のJFMを生成するいくつかのスクリプトがあります.
@@ -38,7 +38,7 @@ pLaTeX / upLaTeX / LuaLaTeX上で動きます.以下のパッケージを内
その他,`oneside / twoside / onecolumn / twocolumn / titlepage / notitlepage / draft / final / openright / openany / leqno / fleqn`というよくあるオプションを受け付けます.
-標準的な文書クラスと同じように中身を書くことができますが,次のような命令が追加 / 拡張されています.なお,本ドキュメントでは[日本語組版処理の要件](https://www.w3.org/TR/jlreq/ja/)における用語を断りなく使います.
+標準的な文書クラスと同じように中身を書くことができますが,次のような命令が追加 / 拡張されています.なお,本ドキュメントでは[日本語組版処理の要件](https://www.w3.org/TR/jlreq/?lang=ja)における用語を断りなく使います.
### `\jlreqsetup`
設定用命令です.プリアンブルでしか使えません.文書に対する設定は,クラスオプションとして行うか`\jlreqsetup`を通じて行うかします.どちらで設定するかは設定項目によります.
@@ -70,7 +70,7 @@ pLaTeX / upLaTeX / LuaLaTeX上で動きます.以下のパッケージを内
です.`&`が省略されている場合は自動で調整されます.
### `\tatechuyoko`
-縦中横を出力します.`\tatechuyoko{<文字列>}`とします.縦書きでない場所で使うとエラーになります.
+縦中横を出力します.`\tatechuyoko{<中身>}`とします.`\tatechuyoko`は縦書きでない場所で使うとエラーになりますが,`\tatechuyoko*`は縦書きでない場所ではそのまま出力されます.
### `\jafontsize`
和文フォントサイズを指定する`\fontsize`です.クラスオプションで`jafontscale=0.9`とされている場合,`\fontsize{9pt}{15pt}`とすると和文フォントのサイズは`8.1pt`となりますが,`\jafontsize{9pt}{15pt}`とすると`9pt`となります.(欧文フォントサイズは`10pt`となる.)なお,第二引数は`\fontsize`の第二引数と全く同じです.
@@ -479,6 +479,10 @@ JFMの名前は次の通りです.`[]`で囲まれている文字は設定に
* 2020-05-01
- `\jlreqsetup`に`theorem_label_font`と`theorem_font`を追加.
- バグ修正.
+* 2020-09-27
+ - `\tatechuyoko`の`*`版を追加.
+ - バグ修正
+
--------------
Noriyuki Abe
diff --git a/language/japanese/jlreq/README.md b/language/japanese/jlreq/README.md
index c0ef2c541f..66fbfaafea 100644
--- a/language/japanese/jlreq/README.md
+++ b/language/japanese/jlreq/README.md
@@ -1,7 +1,7 @@
# jlreq
## What is this?
-This package provides the class file and JFM (Japanese font metric) files for LuaTeX-ja / pLaTeX / upLaTeX. This aims to implement [Requirements for Japanese Text Layout](https://www.w3.org/TR/jlreq/).
+This package provides the class file and JFM (Japanese font metric) files for LuaTeX-ja / pLaTeX / upLaTeX. This aims to implement [Requirements for Japanese Text Layout](https://www.w3.org/TR/jlreq/?lang=en).
## Installation
Run `make` to generate JFM files. Move the files as follows:
@@ -127,6 +127,10 @@ This package is distributed under the BSD 2-Clause License. See [LICENSE](LICENS
* 2020-05-01
- Added `theorem_label_font` and `theorem_font` to `\jlreqsetup`.
- Fixed bugs.
+* 2020-09-27
+ - Added `*`-version of `\tatechuyoko`.
+ - Fixed bugs.
+
--------------
Noriyuki Abe
diff --git a/language/japanese/jlreq/jlreq-ja.pdf b/language/japanese/jlreq/jlreq-ja.pdf
index 3a0fb1c3f7..2194b7fb14 100644
--- a/language/japanese/jlreq/jlreq-ja.pdf
+++ b/language/japanese/jlreq/jlreq-ja.pdf
Binary files differ
diff --git a/language/japanese/jlreq/jlreq.cls b/language/japanese/jlreq/jlreq.cls
index 913785b02d..ba89816ec6 100644
--- a/language/japanese/jlreq/jlreq.cls
+++ b/language/japanese/jlreq/jlreq.cls
@@ -5,8 +5,8 @@
%%
% (based on JLReq 20120403 https://www.w3.org/TR/2012/NOTE-jlreq-20120403/ja/)
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{jlreq}[2020/05/01 jlreq]
-\RequirePackage{xkeyval,everyhook,filehook,etoolbox,ifthen}
+\ProvidesClass{jlreq}[2020/09/27 jlreq]
+\RequirePackage{xkeyval,everyhook,etoolbox,ifthen,filehook}
\RequirePackage{jlreq-helpers}
\newcommand*{\jlreq@undeferr}[1]{\ClassError{jlreq}{Trying to delete \string#1 even though it is not defined, may be a bug}{\@ehc}}
@@ -44,6 +44,10 @@
{\csname jlreq@original@\expandafter\@gobble\string#1\endcsname}%
{#1}%
}
+\def\jlreq@restoreoriginalcs#1{%
+ \jlreq@if{\ifcsname jlreq@original@\expandafter\@gobble\string#1\endcsname\fi}%
+ {\expandafter\let\expandafter#1\csname jlreq@original@\expandafter\@gobble\string#1\endcsname}{}%
+}
%. オプションの定義
% オプション処理の際にしか使わない変数(後でそれを元に別の変数を調整する)
@@ -1177,18 +1181,7 @@
\newcommand{\huge}{\@setfontsize\huge{2\jlreq@fontsize}{\dimexpr 28\jlreq@baselineskip/17\relax}}
\newcommand{\Huge}{\@setfontsize\Huge{\dimexpr 25\jlreq@fontsize/10\relax}{\dimexpr 33\jlreq@baselineskip/17\relax}}
-%. plextから一部拝借
-% オプションも*もない\rensuji(コピペ)
-\DeclareRobustCommand{\jlreq@rensuji}[1]{%
- \ifvmode\leavevmode\fi
- \jlreq@ifydir{\hbox{#1}}{%
- \hskip 0pt plus 0.25\jlreq@zw minus 0pt % \rensujiskipは固定値
- \setbox\jlreq@tempboxa=\hbox{\yoko#1}%
- \@tempdima=\dimexpr\ht\jlreq@tempboxa+\dp\jlreq@tempboxa\relax
- \vrule\@width\z@ \@height.5\@tempdima \@depth.5\@tempdima
- \hbox to 1\jlreq@zw{\yoko\hss#1\hss}%
- \hskip 0pt plus 0.25\jlreq@zw minus 0pt
-}}
+%. plextから拝借
\def\jlreq@Kanji#1{\expandafter\kansuji\csname c@#1\endcsname}
% このあたりはtarticleと同じ
@@ -2256,7 +2249,7 @@
\def\jlreq@do{}% 初期化.これに最終処理を入れていく.
% 入力チェック
\ifthenelse{\equal{\jlreq@column@spanning}{true}}{%
- \jlreq@if{\ifjlreq@column@spanning@possible\else\fi}{
+ \jlreq@if{\unless\ifjlreq@column@spanning@possible\fi}{
\ClassWarningNoLine{jlreq}{column_spanning can be used only with `pagebreak=nariyuki' or `pagebreak=clearcolumn' (in BlockHeading #1)}%
\def\jlreq@column@spanning{false}%
}{}%
@@ -3139,14 +3132,42 @@
% \footnoteと\footnotemarkの前後に\jlreq@hook@prenote/\jlreq@hook@postnoteを入れる
\jlreq@saveoriginalcs{\footnote}
\jlreq@saveoriginalcs{\footnotemark}
+\long\def\jlreq@footnotetext@for@footnote[#1]#2{%
+ \def\jlreq@result{\footnotetext[#1]{#2}}%
+}
\def\footnote{%
+ \jlreq@footnote{\footnote}{\footnotemark}{\jlreq@footnotetext@for@footnote}%
+}
+\def\jlreq@footnote#1#2#3{%
\jlreq@hook@prenote
- \@ifnextchar[{\jlreq@footnote@impl@woption}{\jlreq@footnote@impl@wooption}%
+ \@ifnextchar[{\jlreq@footnote@impl@woption{#1}{#2}{#3}}{\jlreq@footnote@impl@wooption{#1}{#2}{#3}}%
}
\def\footnotemark{%
\jlreq@hook@prenote
\@ifnextchar[{\jlreq@footnotemark@impl@woption}{\jlreq@footnotemark@impl@wooption}%
}
+\long\def\jlreq@footnotemark@impl@woption[#1]{%
+ \jlreq@useoriginalcs{\footnotemark}[#1]%
+ \jlreq@hook@postnote
+}
+\long\def\jlreq@footnotemark@impl@wooption{%
+ \jlreq@useoriginalcs{\footnotemark}%
+ \jlreq@hook@postnote
+}
+\def\jlreq@restore@original@footnotes{%
+ \let\jlreq@temporary@saved@footnote=\footnote
+ \let\jlreq@temporary@saved@footnotemark=\footnotemark
+ \let\jlreq@temporary@saved@footnotetext=\footnotetext
+ \jlreq@restoreoriginalcs{\footnote}%
+ \jlreq@restoreoriginalcs{\footnotemark}%
+ \jlreq@restoreoriginalcs{\footnotetext}%
+}
+\def\jlreq@restore@jlreq@footnotes{%
+ \let\footnote=\jlreq@temporary@saved@footnote
+ \let\footnotemark=\jlreq@temporary@saved@footnotemark
+ \let\footnotetext=\jlreq@temporary@saved@footnotetext
+}
+
\ifthenelse{\boolean{@tate} \AND \(\boolean{@twoside} \OR \boolean{@twocolumn}\)}{
% 縦組の傍注は,その見開き内に付いている合印に対応する注を,奇数ページの左端にそろえて配置する.多段組では最下段の左端にそろえて配置する.(4.2.6.a)
% 必要ならば\footnoteを\footnotemarkと\footnotetextにわけ,\footnotetextをアウトプット時まで遅延することで実現する.
@@ -3156,7 +3177,7 @@
\jlreq@footnote@delayfootnoteslist
}
\preto\@opcol{\jlreq@hook@@opcol}
- % \jlreq@footnote@delayfootnote@delay#1#2#3:#1ページ目に\footnotetext[#2]{#3}を出す
+ % \jlreq@footnote@delayfootnote@delay#1#2:#1ページ目に#2を出す
% \jlreq@footnote@delayfootnote@page:何ページ目に\footnotetextを入れるかを\jlreq@resultcntに入れる.その場での場合は-1.
\if@twocolumn
\if@twoside
@@ -3173,89 +3194,100 @@
\ifnum\jlreq@resultcnt=\value{page}\if@firstcolumn\else\jlreq@resultcnt=-1 \fi\fi
}
\fi
- \long\def\jlreq@footnote@delayfootnote@delay#1#2#3{%
+ \long\def\jlreq@footnote@delayfootnote@delay#1#2{%
% 二段組みの場合は上段を組んだ直後に\footnotetextを挿入(そのページの下段に入る)
- \ifnum 0\if@firstcolumn\else 1\fi\ifnum#1>\value{page}1\fi>0
- \xappto\jlreq@footnote@delayfootnoteslist{\unexpanded{\jlreq@footnote@delayfootnote{#1}{#2}{#3}}}%
- \else
- \footnotetext[#2]{#3}%
- \fi
+ \jlreq@if{\ifnum 0\if@firstcolumn\else 1\fi\ifnum#1>\value{page}1\fi>0 \fi}{%
+ \xappto\jlreq@footnote@delayfootnoteslist{\unexpanded{\jlreq@footnote@delayfootnote{#1}{#2}}}%
+ }{#2}%
}
\else
\def\jlreq@footnote@delayfootnote@page{%
\jlreq@setcurrentpage
- \ifodd\jlreq@currentpage
+ \jlreq@if{\ifodd\jlreq@currentpage\relax\fi}{%
\jlreq@resultcnt=-1
- \else
+ }{%
\jlreq@resultcnt=\numexpr\jlreq@currentpage+1\relax
- \fi
+ }%
}
- \long\def\jlreq@footnote@delayfootnote@delay#1#2#3{%
+ \long\def\jlreq@footnote@delayfootnote@delay#1#2{%
% 一段組の場合はその前のページを組んだ直後に\footnotetextを挿入.
- \ifnum\numexpr#1 - 1\relax>\value{page}%
- \xappto\jlreq@footnote@delayfootnoteslist{\unexpanded{\jlreq@footnote@delayfootnote{#1}{#2}{#3}}}%
- \else
- \footnotetext[#2]{#3}%
- \fi
+ \jlreq@if{\ifnum\numexpr#1 - 1\relax>\value{page} \fi}{%
+ \xappto\jlreq@footnote@delayfootnoteslist{\unexpanded{\jlreq@footnote@delayfootnote{#1}{#2}}}%
+ }{#2}%
}
\fi
- \def\jlreq@footnote@delayfootnote@immediate#1#2#3{%
- \ifnum #1<\jlreq@currentpage
- \xappto\jlreq@footnote@delayfootnoteslist{\unexpanded{\jlreq@footnote@delayfootnote{#1}{#2}{#3}}}%
- \else
- \footnotetext[#2]{#3}%
- \fi
+ \def\jlreq@footnote@delayfootnote@immediate#1#2{%
+ \jlreq@if{\ifnum #1<\jlreq@currentpage\relax\fi}{%
+ \xappto\jlreq@footnote@delayfootnoteslist{\unexpanded{\jlreq@footnote@delayfootnote{#1}{#2}}}%
+ }{#2}%
}
\let\jlreq@footnote@delayfootnote=\jlreq@footnote@delayfootnote@delay
\def\jlreq@footnote@flushdelayfootnoteslist{%
- \ifx\jlreq@footnote@delayfootnoteslist\@empty\else
+ \jlreq@if{\ifx\jlreq@footnote@delayfootnoteslist\@empty\fi}{}{%
\let\jlreq@footnote@delayfootnote=\jlreq@footnote@delayfootnote@immediate
\jlreq@setcurrentpage
\expandafter\gdef\expandafter\jlreq@footnote@delayfootnoteslist\expandafter{\expandafter}%
\jlreq@footnote@delayfootnoteslist
\let\jlreq@footnote@delayfootnote=\jlreq@footnote@delayfootnote@delay
- \fi
+ }%
}
\AtEndDocument{\jlreq@footnote@flushdelayfootnoteslist}
\preto\newpage{\jlreq@footnote@flushdelayfootnoteslist}
- \long\def\jlreq@footnote@impl@woption[#1]#2{%
+ \long\def\jlreq@footnote@impl@woption#1#2#3[#4]#5{%
\jlreq@footnote@delayfootnote@page
- \ifnum\jlreq@resultcnt=-1
- \jlreq@useoriginalcs{\footnote}[#1]{#2}%
- \else
- \jlreq@useoriginalcs{\footnotemark}[#1]%
- \xappto\jlreq@footnote@delayfootnoteslist{\noexpand\jlreq@footnote@delayfootnote{\the\jlreq@resultcnt}{\unexpanded{#1}}{\unexpanded{#2}}}%
- \fi
+ \begingroup
+ \edef\jlreq@do{\unexpanded{%
+ \jlreq@restore@original@footnotes
+ \def\jlreq@result{}#2[#4]\jlreq@result
+ \def\jlreq@result{}#3[#4]{#5}%
+ \jlreq@restore@jlreq@footnotes}%
+ \jlreq@if{\ifnum\jlreq@resultcnt=-1 \fi}{\noexpand\jlreq@result}{\unexpanded{%
+ \xappto\jlreq@footnote@delayfootnoteslist{%
+ \noexpand\jlreq@footnote@delayfootnote{\the\jlreq@resultcnt}{%
+ \noexpand\jlreq@restore@original@footnotes
+ \expandonce{\jlreq@result}%
+ \noexpand\jlreq@restore@jlreq@footnotes
+ }%
+ }%
+ }}%
+ }%
+ \expandafter\endgroup\jlreq@do
\jlreq@hook@postnote
}
- \long\def\jlreq@footnote@impl@wooption#1{%
+ \long\def\jlreq@footnote@impl@wooption#1#2#3#4{%
\jlreq@footnote@delayfootnote@page
- \ifnum\jlreq@resultcnt=-1
- \jlreq@useoriginalcs{\footnote}{#1}%
- \else
- \jlreq@useoriginalcs{\footnotemark}%
- \xappto\jlreq@footnote@delayfootnoteslist{\noexpand\jlreq@footnote@delayfootnote{\the\jlreq@resultcnt}{\the\value{footnote}}{\unexpanded{#1}}}%
- \fi
+ \begingroup
+ \stepcounter{footnote}%
+ \edef\jlreq@do{%
+ \unexpanded{\def\jlreq@result{}#2}[\the\value{footnote}]\noexpand\jlreq@result
+ \unexpanded{\def\jlreq@result{}#3}[\the\value{footnote}]\unexpanded{{#4}}%
+ \jlreq@if{\ifnum\jlreq@resultcnt=-1 \fi}{\noexpand\jlreq@result}{\unexpanded{%
+ \xappto\jlreq@footnote@delayfootnoteslist{%
+ \noexpand\jlreq@footnote@delayfootnote{\the\jlreq@resultcnt}{%
+ \noexpand\jlreq@restore@original@footnotes
+ \expandonce{\jlreq@result}%
+ \noexpand\jlreq@restore@jlreq@footnotes
+ }%
+ }%
+ }}%
+ }%
+ \expandafter\endgroup\jlreq@do
\jlreq@hook@postnote
}
}{
- \long\def\jlreq@footnote@impl@woption[#1]#2{%
- \jlreq@useoriginalcs{\footnote}[#1]{#2}%
+ \long\def\jlreq@footnote@impl@woption#1#2#3[#4]#5{%
+ \jlreq@restore@original@footnotes
+ #1[#4]{#5}%
+ \jlreq@restore@jlreq@footnotes
\jlreq@hook@postnote
}
- \long\def\jlreq@footnote@impl@wooption#1{%
- \jlreq@useoriginalcs{\footnote}{#1}%
+ \long\def\jlreq@footnote@impl@wooption#1#2#3#4{%
+ \jlreq@restore@original@footnotes
+ #1{#4}%
+ \jlreq@restore@jlreq@footnotes
\jlreq@hook@postnote
}
}
-\long\def\jlreq@footnotemark@impl@woption[#1]{%
- \jlreq@useoriginalcs{\footnotemark}[#1]%
- \jlreq@hook@postnote
-}
-\long\def\jlreq@footnotemark@impl@wooption{%
- \jlreq@useoriginalcs{\footnotemark}%
- \jlreq@hook@postnote
-}
% 合印
\renewcommand*{\@makefnmark}{%
@@ -3263,7 +3295,7 @@
}
% 4.2.2注3
\if@tate
- \renewcommand*{\thefootnote}{\jlreq@open@bracket@before@space\inhibitglue(\jlreq@rensuji{\@arabic\c@footnote})\inhibitglue}
+ \renewcommand*{\thefootnote}{\jlreq@open@bracket@before@space\inhibitglue(\tatechuyoko*{\@arabic\c@footnote})\inhibitglue}
\else
\renewcommand*{\thefootnote}{\arabic{footnote}\hbox{})\inhibitglue}
\fi
@@ -4041,7 +4073,7 @@
}%
}
\def\jlreq@pagestyle@make@runninghead@#1#2#3#4#5{%
- \jlreq@if{\ifnum\numexpr\jlreq@ifendmark{#5\fi}{1}{0}*\ifjlreq@tempa 1\else 0\fi\relax=1 \fi}{%
+ \jlreq@if{\ifnum\numexpr\jlreq@ifendmark{#5}{1}{0}*\ifjlreq@tempa 1\else 0\fi\relax=1 \fi}{%
% 項目が一つしか無い
\jlreq@ifempty{#2}{\csappto}{\cspreto}{#1}{#4}%
}{%
@@ -5123,7 +5155,7 @@
\protected@write\@auxout{%
\let\label\@gobble\let\index\@gobble\let\glossary\@gobble
\if@tate
- \@temptokena{\jlreq@rensuji{\thepage}}%
+ \@temptokena{\tatechuyoko{\thepage}}%
\else
\@temptokena{\thepage}%
\fi
@@ -5526,11 +5558,17 @@
%. その他諸々
%.. 縦中横
-\edef\@tempa{%
- \unexpanded{%
- \jlreq@ifydir{\ClassError{jlreq}{\string\tatechuyoko\space is not allowed in yoko mode}{\@ehc}}{}%
- \ifvmode\leavevmode\fi
+\protected\def\tatechuyoko{\@ifstar
+ {\jlreq@tatechuyoko@i}%
+ {%
+ \jlreq@iftdir{}{\ClassError{jlreq}{\string\tatechuyoko\space is not allowed in yoko mode}{\@ehc}}%
+ \jlreq@tatechuyoko@ii
}%
+}
+\def\jlreq@tatechuyoko@i#1{\jlreq@iftdir{\jlreq@tatechuyoko@ii{#1}}{#1}}
+
+\edef\@tempa{%
+ \unexpanded{\ifvmode\leavevmode\fi}%
\ifx l\jlreq@engine\unexpanded{%
\jlreq@lastnodechar=\lastnodechar\relax
\ifnum\jlreq@lastnodechar>-1 \inhibitglue\fi
@@ -5540,19 +5578,22 @@
}\fi
}
-\expandafter\protected\expandafter\def\expandafter\tatechuyoko\expandafter#\expandafter1\expandafter{%
+\expandafter\def\expandafter\jlreq@tatechuyoko@ii\expandafter#\expandafter1\expandafter{%
\@tempa
% 前のJFM glue
\ifnum\jlreq@lastnodechar>-1
\jlreq@calc@jfmglue{\char\jlreq@lastnodechar}{阿}%
\jlreq@ifgluezero\jlreq@resultskip{}{\hskip\jlreq@resultskip}%
\fi
- \hbox{\yoko
- \setbox\jlreq@tempboxa=\hbox{阿}%
- \vrule width 0pt height \ht\jlreq@tempboxa depth \dp\jlreq@tempboxa #1}%
- \futurelet\jlreq@nextchar\jlreq@tatechuyoko@
+ \hbox{\yoko
+ \begingroup
+ \setbox\jlreq@tempboxa=\hbox{阿}%
+ \vrule width 0pt height \ht\jlreq@tempboxa depth \dp\jlreq@tempboxa
+ \endgroup
+ #1}%
+ \futurelet\jlreq@nextchar\jlreq@tatechuyoko@iii
}
-\def\jlreq@tatechuyoko@{%
+\def\jlreq@tatechuyoko@iii{%
\begingroup
\def\jlreq@do{}%
\jlreq@getfirsttoken@expandmacros{\jlreq@nextchar}{\jlreq@tempa}%
@@ -5676,11 +5717,11 @@
\if@tate
\renewcommand{\thepart}{\jlreq@Kanji{part}}
\ifthenelse{\equal{\jlreq@article@type}{article}}{}{\renewcommand{\thechapter}{\jlreq@Kanji{chapter}}}
- \renewcommand{\thesection}{\jlreq@rensuji{\@arabic\c@section}}
- \renewcommand{\thesubsection}{\jlreq@rensuji{\@alph\c@subsection}}
- \renewcommand{\thesubsubsection}{\jlreq@rensuji{\@arabic\c@subsubsection}}
- \renewcommand{\theparagraph}{(\jlreq@rensuji{\@arabic\c@paragraph})}
- \renewcommand{\thesubparagraph}{(\jlreq@rensuji{\@arabic\c@subparagraph})}
+ \renewcommand{\thesection}{\tatechuyoko*{\@arabic\c@section}}
+ \renewcommand{\thesubsection}{\tatechuyoko*{\@alph\c@subsection}}
+ \renewcommand{\thesubsubsection}{\tatechuyoko*{\@arabic\c@subsubsection}}
+ \renewcommand{\theparagraph}{(\tatechuyoko*{\@arabic\c@paragraph})}
+ \renewcommand{\thesubparagraph}{(\tatechuyoko*{\@arabic\c@subparagraph})}
\ifthenelse{\equal{\jlreq@article@type}{article}}{
\NewBlockHeading{part}{0}{font={\jlreq@keepbaselineskip{\LARGE}},indent=4\jlreq@zw,lines=4,after_label_space=1\jlreq@zw,second_heading_text_indent={-1\jlreq@zw,1\jlreq@zw},subtitle_font={\jlreq@keepbaselineskip{\large}}}
@@ -5805,9 +5846,9 @@
%.. 箇条書き
\if@tate
\renewcommand{\theenumi}{\jlreq@Kanji{enumi}}
- \renewcommand{\theenumii}{\jlreq@rensuji{\@arabic\c@enumii}}
- \renewcommand{\theenumiii}{\jlreq@rensuji{\@arabic\c@enumiii}}
- \renewcommand{\theenumiv}{\jlreq@rensuji{\@arabic\c@enumiv}}
+ \renewcommand{\theenumii}{\tatechuyoko*{\@arabic\c@enumii}}
+ \renewcommand{\theenumiii}{\tatechuyoko*{\@arabic\c@enumiii}}
+ \renewcommand{\theenumiv}{\tatechuyoko*{\@arabic\c@enumiv}}
\newcommand{\labelenumi}{\theenumi}
\newcommand{\labelenumii}{\theenumii}
\newcommand{\labelenumiii}{\theenumiii}
@@ -5911,7 +5952,7 @@
\if@tate
\jlreqsetup{
appendix_counter = {
- section = {value = 0, the = {\jlreq@rensuji{\Alph{section}}}},
+ section = {value = 0, the = {\tatechuyoko*{\Alph{section}}}},
subsection = {value = 0},
}
}
@@ -5928,7 +5969,7 @@
\if@tate
\jlreqsetup{
appendix_counter = {
- chapter = {value = 0, the = {\jlreq@rensuji{\Alph{chapter}}}},
+ chapter = {value = 0, the = {\tatechuyoko*{\Alph{chapter}}}},
}
}
\else
diff --git a/language/japanese/jlreq/jlreq.pdf b/language/japanese/jlreq/jlreq.pdf
index b770c64681..e36f3d8a87 100644
--- a/language/japanese/jlreq/jlreq.pdf
+++ b/language/japanese/jlreq/jlreq.pdf
Binary files differ
diff --git a/language/japanese/platex-tools/LICENSE b/language/japanese/platex-tools/LICENSE
index c463b620a9..9661ce7b8d 100644
--- a/language/japanese/platex-tools/LICENSE
+++ b/language/japanese/platex-tools/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2016-2019 Hironobu Yamashita
+Copyright (c) 2016-2020 Hironobu Yamashita
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff --git a/language/japanese/platex-tools/README.md b/language/japanese/platex-tools/README.md
index 72fb0632cb..903bb76ee3 100644
--- a/language/japanese/platex-tools/README.md
+++ b/language/japanese/platex-tools/README.md
@@ -83,6 +83,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)).
## Release Date
-2019-09-07
+2020-09-27
Hironobu Yamashita
diff --git a/language/japanese/platex-tools/plarray.sty b/language/japanese/platex-tools/plarray.sty
index 8c797ef59c..52ff536d54 100644
--- a/language/japanese/platex-tools/plarray.sty
+++ b/language/japanese/platex-tools/plarray.sty
@@ -7,9 +7,9 @@
%
% This package is expected to be compatible with
% * array.sty in latex-tools
-% (2016/10/06 v2.4d -- 2018/11/13 v2.4j)
+% (2016/10/06 v2.4d -- 2019/08/31 v2.4l)
% * plcore.ltx in platex
-% (2001/09/26 v1.2a -- 2018/09/02 v1.3)
+% (2001/09/26 v1.2a -- 2020/03/05 v1.3e)
%
\NeedsTeXFormat{pLaTeX2e}
diff --git a/language/japanese/platex-tools/plextarray.sty b/language/japanese/platex-tools/plextarray.sty
index 1e706d9a75..a1f3805678 100644
--- a/language/japanese/platex-tools/plextarray.sty
+++ b/language/japanese/platex-tools/plextarray.sty
@@ -7,9 +7,9 @@
%
% This package is expected to be compatible with
% * array.sty in latex-tools
-% (2016/10/06 v2.4d -- 2018/11/13 v2.4j)
+% (2016/10/06 v2.4d -- 2019/08/31 v2.4l)
% * plext.sty in platex
-% (2001/09/26 v1.2 -- 2018/10/07 v1.2k)
+% (2001/09/26 v1.2 -- 2019/09/29 v1.2l)
% Largely based on lltjext.sty from LuaTeX-ja project.
%
diff --git a/language/japanese/platex-tools/plextdelarray.sty b/language/japanese/platex-tools/plextdelarray.sty
index 1c6b097c2c..03008c193e 100644
--- a/language/japanese/platex-tools/plextdelarray.sty
+++ b/language/japanese/platex-tools/plextdelarray.sty
@@ -9,7 +9,7 @@
% * delarray.sty in latex-tools
% (2014/10/28 v1.01)
% * plext.sty in platex
-% (2001/09/26 v1.2 -- 2018/10/07 v1.2k)
+% (2001/09/26 v1.2 -- 2019/09/29 v1.2l)
%
\NeedsTeXFormat{pLaTeX2e}
diff --git a/language/japanese/platex-tools/pxatbegshi.pdf b/language/japanese/platex-tools/pxatbegshi.pdf
index 68527a8a2c..6401ed5cf8 100644
--- a/language/japanese/platex-tools/pxatbegshi.pdf
+++ b/language/japanese/platex-tools/pxatbegshi.pdf
Binary files differ
diff --git a/language/japanese/platex-tools/pxatbegshi.sty b/language/japanese/platex-tools/pxatbegshi.sty
index bbe8c49ac3..3c8a830415 100644
--- a/language/japanese/platex-tools/pxatbegshi.sty
+++ b/language/japanese/platex-tools/pxatbegshi.sty
@@ -18,13 +18,19 @@
% the original code (2018/09/21 v0.3), which was largely based on
% H. Kitagawa's on GitHub:texjporg/tex-jp-build#21.
% -- concept: execute all hooks inside yoko direction \vbox
-% --------------------------------------------------
+%
+% Update: version 2020/09/09 v0.6 supports LaTeX2e 2020-10-01
+% based on a method proposed by H. Kitagawa in lltjp-atbegshi.sty.
+%
+% Update: version 2020/09/25 v0.7 does nothing, since
+% pLaTeX2e 2020-10-01 will support the situation natively.
+% --------------------------------------------------------------------
%
%% package declaration
\NeedsTeXFormat{pLaTeX2e}
\ProvidesPackage{pxatbegshi}
- [2019/09/07 v0.5 Patch to atbegshi for (u)pLaTeX]
+ [2020/09/25 v0.7 Patch to atbegshi for (u)pLaTeX]
%% preparations
\def\pxabgs@pkgname{pxatbegshi}
@@ -33,6 +39,20 @@
%% load it
\RequirePackage{atbegshi}
+%% Since LaTeX2e 2020-10-01, atbegshi.sty is merely
+%% an emulation by atbegshi-ltx.sty from ltshipout.dtx.
+%% The new code does NOT define \AtBegShi@Output,
+%% so we can detect it!
+
+\ifx\AtBegShi@Output\@undefined
+ %% pLaTeX2e 2020-10-01 natively supports the situation
+ \PackageInfo{pxatbegshi}{This package is no longer needed}
+ \expandafter\endinput
+\fi
+
+%% The rest of this package is meant for
+%% LaTeX2e 2020-02-02 PL5 or older.
+
%% internal macros are locally effective
\begingroup
@@ -56,8 +76,6 @@
%---------------------------------------
-% concept: execute all hooks inside yoko direction \vbox
-
% prepare
\let\pxabgs@AtBegShi@Output\AtBegShi@Output
% try first patch
diff --git a/language/japanese/platex-tools/pxatbegshi.tex b/language/japanese/platex-tools/pxatbegshi.tex
index 35c6fd413a..e3d34cda14 100644
--- a/language/japanese/platex-tools/pxatbegshi.tex
+++ b/language/japanese/platex-tools/pxatbegshi.tex
@@ -25,6 +25,10 @@ with Japanese classes for vertical writing (tarticle.cls, etc).
The package \textsf{pxatbegshi} provides a patch for \textsf{atbegshi}
to work with both horizontal and vertical writing.
+With \pLaTeXe~2020-10-01 or later, this package does
+nothing because the \pLaTeXe\ itself handles the situation.
+Therefore, you will not need this package at all.
+
This package is part of \textsf{platex-tools} bundle:
\begin{verbatim}
https://github.com/aminophen/platex-tools
@@ -40,7 +44,18 @@ p\LaTeX の縦組クラス(tarticle.clsなど)で使うとエラーが出て
この\textsf{pxatbegshi}パッケージは、縦組クラスでも
\textsf{atbegshi}パッケージの機能を使えるようにするためのものです。
もちろん、横組クラスで\textsf{pxatbegshi}パッケージを使用しても
-問題は起きません。
+ほぼ問題は起きません。ただし、制約事項として
+\begin{quote}
+「\verb+\AtBeginShipout+の中身が外部垂直モードで実行されること」を
+想定した使用は\emph{サポートしない}
+\end{quote}
+と明言します(例:\verb+aminophen/platex-tools#15+)。
+
+\pLaTeXe~2020-10-01以降では、同等の機能が\pLaTeXe{}カーネルに
+存在するため、\textsf{pxatbegshi}パッケージは何もしません。
+
+\newpage
+\section{使いかた}
使いかたは、\textsf{atbegshi}パッケージの代わりに、あるいは
\textsf{atbegshi}パッケージに追加して、\textsf{pxatbegshi}パッケージを
@@ -58,12 +73,12 @@ p\LaTeX の縦組クラス(tarticle.clsなど)で使うとエラーが出て
\end{document}
\end{verbatim}
-\section*{謝辞}
+\section{謝辞}
-本パッケージの実装は、北川さん(Hironori Kitagawa)さんによる
+本パッケージの実装は、北川さん(Hironori Kitagawa)による
「\verb+\AtBegShi@Output+の処理を強引に横組でやらせるコード」
をベースにしています\footnote{2018/09/21 v0.4では
-Takayuki Yato (ZR) 氏による\textsf{bxpapersize}パッケージを参考に
+Takayuki Yato (ZR) さんによる\textsf{bxpapersize}パッケージを参考に
していましたが、\textsf{multicol}パッケージで問題が起きるようなので
v0.3以前と同様に北川さんのコードベースに戻しました。}。
diff --git a/language/japanese/platex-tools/pxeveryshi.pdf b/language/japanese/platex-tools/pxeveryshi.pdf
index b9b989d393..d4538ba42c 100644
--- a/language/japanese/platex-tools/pxeveryshi.pdf
+++ b/language/japanese/platex-tools/pxeveryshi.pdf
Binary files differ
diff --git a/language/japanese/platex-tools/pxeveryshi.sty b/language/japanese/platex-tools/pxeveryshi.sty
index 8a534095d9..23bbd8abe0 100644
--- a/language/japanese/platex-tools/pxeveryshi.sty
+++ b/language/japanese/platex-tools/pxeveryshi.sty
@@ -1,18 +1,39 @@
%
% pxeveryshi.sty
-% written by Takayuki Yato (ZR)
+% originally written by Takayuki Yato (ZR)
+% and modified by Hironobu Yamashita
%
% This package is distributed as part of the platex-tools bundle
% maintained by Hironobu Yamashita
% by courtesy of the original author.
% https://github.com/aminophen/platex-tools
%
+% --------------------------------------------------------------------
+% [Note]
+% Update: version 2020/09/25 v0.2 does nothing, since
+% pLaTeX2e 2020-10-01 will support the situation natively.
+% --------------------------------------------------------------------
+%
\NeedsTeXFormat{pLaTeX2e}
\ProvidesPackage{pxeveryshi}
- [2012/05/19 v0.1 everyshi package for pLaTeX]
+ [2020/09/25 v0.2 everyshi package for pLaTeX]
\RequirePackageWithOptions{everyshi}
-%
+
+%% Since LaTeX2e 2020-10-01, everyshi.sty is merely
+%% an emulation by everyshi-ltx.sty from ltshipout.dtx.
+%% The new code does NOT define \@EveryShipout@Output,
+%% so we can detect it!
+
+\ifx\@EveryShipout@Output\@undefined
+ %% pLaTeX2e 2020-10-01 natively supports the situation
+ \PackageInfo{pxeveryshi}{This package is no longer needed}
+ \expandafter\endinput
+\fi
+
+%% The rest of this package is meant for
+%% LaTeX2e 2020-02-02 PL5 or older.
+
\def\@EveryShipout@Output{%
\setbox8\vbox{%
\yoko
@@ -23,6 +44,6 @@
\gdef\@EveryShipout@AtNextHook{}%
\@EveryShipout@Org@Shipout\box\@cclv
}
-%
+
\endinput
%% EOF
diff --git a/language/japanese/platex-tools/pxeveryshi.tex b/language/japanese/platex-tools/pxeveryshi.tex
index b5e612ba51..598fba6a5b 100644
--- a/language/japanese/platex-tools/pxeveryshi.tex
+++ b/language/japanese/platex-tools/pxeveryshi.tex
@@ -8,7 +8,7 @@
\usepackage{pxeveryshi}
\GetFileInfo{pxeveryshi.sty}
\title{Package \textsf{pxeveryshi} \fileversion}
-\author{Takayuki Yato}
+\author{Takayuki Yato \& Hironobu Yamashita}
\date{\filedate}
\begin{document}
@@ -25,6 +25,10 @@ cannot be used with Japanese classes for vertical writing
The package \textsf{pxeveryshi} provides a patch for \textsf{everyshi}
to work with both horizontal and vertical writing.
+With \pLaTeXe~2020-10-01 or later, this package does
+nothing because the \pLaTeXe\ itself handles the situation.
+Therefore, you will not need this package at all.
+
This package is part of \textsf{platex-tools} bundle:
\begin{verbatim}
https://github.com/aminophen/platex-tools
@@ -40,6 +44,11 @@ p\LaTeX の縦組クラス(tarticle.clsなど)で使うとエラーが出て
\textsf{everyshi}パッケージ(およびこれに依存するパッケージ)が
使えるようになります。
+\pLaTeXe~2020-10-01以降では、同等の機能が\pLaTeXe{}カーネルに
+存在するため、\textsf{pxeveryshi}パッケージは何もしません。
+
+\section{使いかた}
+
使いかたは、\textsf{everyshi}パッケージの代わりに、あるいは
\textsf{everyshi}パッケージに追加して、\textsf{pxeveryshi}パッケージを
読みこむだけです。使用例:
diff --git a/language/japanese/platex-tools/pxmulticol.sty b/language/japanese/platex-tools/pxmulticol.sty
index 63274eb94e..2b0c3af4dd 100644
--- a/language/japanese/platex-tools/pxmulticol.sty
+++ b/language/japanese/platex-tools/pxmulticol.sty
@@ -7,7 +7,7 @@
%
% This package is expected to be compatible with
% * multicol.sty in latex-tools
-% (1995/10/19 v1.5l -- 2018/04/01 v1.8r)
+% (1995/10/19 v1.5l -- 2019/12/09 v1.8y)
%
\NeedsTeXFormat{pLaTeX2e}
diff --git a/language/japanese/platex-tools/pxxspace.pdf b/language/japanese/platex-tools/pxxspace.pdf
index 2aa3d48831..8dc7a2a4a8 100644
--- a/language/japanese/platex-tools/pxxspace.pdf
+++ b/language/japanese/platex-tools/pxxspace.pdf
Binary files differ
diff --git a/language/japanese/platex-tools/pxxspace.sty b/language/japanese/platex-tools/pxxspace.sty
index 1a8207536c..384a157be6 100644
--- a/language/japanese/platex-tools/pxxspace.sty
+++ b/language/japanese/platex-tools/pxxspace.sty
@@ -24,14 +24,14 @@
%% package declaration
\NeedsTeXFormat{pLaTeX2e}
\ProvidesPackage{pxxspace}
- [2019/04/30 v0.2 Patch for xspace for pLaTeX/upLaTeX]
+ [2019/09/23 v0.2a Patch for xspace for pLaTeX/upLaTeX]
\def\pxxs@pkgname{pxxspace}
%--------------------------------------- preparations
%% e-TeX is required
\RequirePackage{etoolbox}[2011/01/03]% v2.1
-\ifx\numdef\@undefined \endinput \fi
+\ifx\numdef\@undefined \expandafter\endinput \fi
%% packages
\RequirePackage{xspace}[2009/10/20]% v1.13
diff --git a/language/japanese/plautopatch/README.md b/language/japanese/plautopatch/README.md
index 6799dc2f80..1063a4b9b4 100644
--- a/language/japanese/plautopatch/README.md
+++ b/language/japanese/plautopatch/README.md
@@ -33,6 +33,7 @@ The following patches are currently registered:
- multicol (latex-tools) -> pxmulticol (platex-tools)
- xspace (latex-tools) -> pxxspace (platex-tools)
- textpos -> pxtextpos (maintained here!)
+- eso-pic -> pxesopic (maintained here!)
- pdfpages -> pxpdfpages (maintained here!)
- stfloats (sttools) -> pxstfloats (pxsttools)
- hyperref -> pxjahyper (by Takayuki YATO)
@@ -72,6 +73,9 @@ Short information:
- pxtextpos.sty:
Patch for textpos.sty (by Norman Gray) to support
Japanese-style crop marks (called 'tombow' in Japanese).
+- pxesopic.sty:
+ Patch for eso-pic.sty (by Rolf Niepraschk) to support
+ Japanese-style crop marks (called 'tombow' in Japanese).
- pxpdfpages.sty:
Patch for pdfpages.sty (by Andreas Matthias) to support
Japanese-style crop marks (called 'tombow' in Japanese).
@@ -101,6 +105,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)).
## Release Date
-2020-05-25
+2020-09-27
Hironobu Yamashita
diff --git a/language/japanese/plautopatch/plarydshln.sty b/language/japanese/plautopatch/plarydshln.sty
index d9c26a2c7f..b84c27df01 100644
--- a/language/japanese/plautopatch/plarydshln.sty
+++ b/language/japanese/plautopatch/plarydshln.sty
@@ -9,7 +9,7 @@
% * arydshln.sty
% (2004/08/31 v1.71 -- 2019/02/21 v1.76)
% * plcore.ltx in platex
-% (2001/09/26 v1.2a -- 2019/02/08 v1.3b)
+% (2001/09/26 v1.2a -- 2020/03/05 v1.3e)
%
%% package declaration
diff --git a/language/japanese/plautopatch/plautopatch-ja.pdf b/language/japanese/plautopatch/plautopatch-ja.pdf
index 775fd4bb43..418ebd8b87 100644
--- a/language/japanese/plautopatch/plautopatch-ja.pdf
+++ b/language/japanese/plautopatch/plautopatch-ja.pdf
Binary files differ
diff --git a/language/japanese/plautopatch/plautopatch-ja.tex b/language/japanese/plautopatch/plautopatch-ja.tex
index c09f3db8b1..acdb3f5e39 100644
--- a/language/japanese/plautopatch/plautopatch-ja.tex
+++ b/language/japanese/plautopatch/plautopatch-ja.tex
@@ -119,6 +119,7 @@ p\LaTeX/up\LaTeX{}で動作するソースと通常の\LaTeX{}ソースの
\ITEMoTo multicol (latex-tools) -> pxmulticol (platex-tools)
\ITEMoTo xspace (latex-tools) -> pxxspace (platex-tools)
\ITEMxTx textpos -> pxtextpos (maintained here!)
+\ITEMxTx eso-pic -> pxesopic (maintained here!)
\ITEMxTx pdfpages -> pxpdfpages (maintained here!)
\ITEMoTo stfloats (sttools) -> pxstfloats (pxsttools)
\ITEMxTx hyperref -> pxjahyper (by Takayuki YATO)
@@ -158,6 +159,9 @@ p\LaTeX/up\LaTeX{}で動作するソースと通常の\LaTeX{}ソースの
\item 2020/02/25 v0.9e \textsf{textpos}のサポート
\item 2020/05/05 v0.9f \textsf{collcell}のサポート
\item 2020/05/25 v0.9g \textsf{pxjahyper}の自動読込
+ \item 2020/09/13 v0.9h \LaTeXe~2020-10-01では\textsf{filehook}非依存に
+ \item 2020/09/25 v0.9i \textsf{pxeveryshi}と\textsf{pxatbegshi}を不要に
+ \item 2020/09/27 v0.9j \textsf{eso-pic}のサポート(要\LaTeXe~2020-10-01)
\end{itemize}
\end{document}
diff --git a/language/japanese/plautopatch/plautopatch.pdf b/language/japanese/plautopatch/plautopatch.pdf
index d86957c827..44aefb55a5 100644
--- a/language/japanese/plautopatch/plautopatch.pdf
+++ b/language/japanese/plautopatch/plautopatch.pdf
Binary files differ
diff --git a/language/japanese/plautopatch/plautopatch.sty b/language/japanese/plautopatch/plautopatch.sty
index 30707cb8b4..f77c4e0b8a 100644
--- a/language/japanese/plautopatch/plautopatch.sty
+++ b/language/japanese/plautopatch/plautopatch.sty
@@ -8,7 +8,7 @@
\NeedsTeXFormat{LaTeX2e}% not pLaTeX2e on purpose!
\ProvidesPackage{plautopatch}
- [2020/05/25 v0.9g Automated patches for pLaTeX/upLaTeX]
+ [2020/09/27 v0.9j Automated patches for pLaTeX/upLaTeX]
\ifx\pfmtname\@undefined
\PackageWarningNoLine{plautopatch}{%
@@ -23,7 +23,21 @@
\def\platpc@warn{\PackageWarningNoLine\platpc@pkgname}
\def\platpc@info{\PackageInfo\platpc@pkgname}
-\RequirePackage{filehook}
+%% Since LaTeX2e 2020-10-01, most of features in filehook.sty
+%% is available in ltfilehook.dtx.
+%% The new code defines \declare@file@substitution,
+%% so we can detect it!
+
+\ifx\declare@file@substitution\@undefined
+ % LaTeX2e 2020-02-02 PL5 or older
+ \RequirePackage{filehook}
+ \let\platpc@ExecuteAfterPackage=\AtEndOfPackageFile
+ \let\platpc@ExecuteBeforePackage=\AtBeginOfPackageFile
+\else
+ % LaTeX2e 2020-10-01 or newer
+ \def\platpc@ExecuteAfterPackage#1{\AddToHook{package/after/#1}}
+ \def\platpc@ExecuteBeforePackage#1{\AddToHook{package/before/#1}}
+\fi
% low-level helpers
@@ -67,7 +81,7 @@
\@ifpackageloaded{#1}{%
\csname platpc@end@#1\endcsname
}{%
- \AtEndOfPackageFile{#1}{\csname platpc@end@#1\endcsname}%
+ \platpc@ExecuteAfterPackage{#1}{\csname platpc@end@#1\endcsname}%
}%
}
\@onlypreamble\platpc@patch@after
@@ -84,16 +98,16 @@
\@ifpackageloaded{#2}{%
\csname platpc@end@#1+#2\endcsname
}{%
- \AtEndOfPackageFile{#2}{\csname platpc@end@#1+#2\endcsname}%
+ \platpc@ExecuteAfterPackage{#2}{\csname platpc@end@#1+#2\endcsname}%
}%
}{%
\@ifpackageloaded{#2}{%
- \AtEndOfPackageFile{#1}{\csname platpc@end@#1+#2\endcsname}%
+ \platpc@ExecuteAfterPackage{#1}{\csname platpc@end@#1+#2\endcsname}%
}{%
- \AtEndOfPackageFile{#1}{%
+ \platpc@ExecuteAfterPackage{#1}{%
\@ifpackageloaded{#2}{\csname platpc@end@#1+#2\endcsname}{}%
}%
- \AtEndOfPackageFile{#2}{%
+ \platpc@ExecuteAfterPackage{#2}{%
\@ifpackageloaded{#1}{\csname platpc@end@#1+#2\endcsname}{}%
}%
}%
@@ -119,13 +133,7 @@
% load the <patch> package
\RequirePackage{#2}\platpc@addtolist{#2}%
% avoid loading <orig> twice by discarding "\@@input <orig>" (*!)
- \let\platpc@filehook@@atbegin\filehook@@atbegin
- \def\filehook@@atbegin\@@input####1\filehook@atend{%
- \let\filehook@@atbegin\platpc@filehook@@atbegin
- % avoid infinite loop even when \AtEndOfPackageFile used
- \expandafter\let\csname filehook@atend@#1.sty\endcsname\relax
- \filehook@@atbegin
- \filehook@atend}%
+ \platpc@discard@input{#1}%
% all done
}%
}%
@@ -134,11 +142,30 @@
\@ifpackageloaded{#1}{%
\platpc@err@toolate{#1}%
}{% else
- \AtBeginOfPackageFile{#1}{\csname platpc@begin@#1\endcsname}%
+ \platpc@ExecuteBeforePackage{#1}{\csname platpc@begin@#1\endcsname}%
}%
}
\@onlypreamble\platpc@patch@before
+\ifx\declare@file@substitution\@undefined
+ % LaTeX2e 2020-02-02 PL5 or older
+ \def\platpc@discard@input#1{%
+ \let\platpc@filehook@@atbegin\filehook@@atbegin
+ \def\filehook@@atbegin\@@input##1\filehook@atend{%
+ \let\filehook@@atbegin\platpc@filehook@@atbegin
+ % avoid infinite loop even when \AtEndOfPackageFile used
+ \expandafter\let\csname filehook@atend@#1.sty\endcsname\relax
+ \filehook@@atbegin
+ \filehook@atend}}
+\else
+ % LaTeX2e 2020-10-01 or newer
+ \def\platpc@discard@input#1{%
+ \let\platpc@InputIfFileExists\InputIfFileExists
+ \def\InputIfFileExists##1##2##3{%
+ \let\InputIfFileExists\platpc@InputIfFileExists}}
+\fi
+\@onlypreamble\platpc@discard@input
+
% interface for users who want don't patches
%% \plautopatchdisable{<orig 1>,<orig 2>,...}
@@ -186,12 +213,24 @@
% --- in most cases, pxeverysel can be safely loaded even after everysel
% --- but it can fail when \AtBeginDocument{everysel} is involved
\platpc@patch@before{everysel}{pxeverysel}% platex-tools
-\platpc@patch@after{everyshi}{pxeveryshi}% platex-tools
-\platpc@patch@after{atbegshi}{pxatbegshi}% platex-tools
+% --- since LaTeX2e 2020-10-01, everyshi.sty is merely
+% --- an emulation by everyshi-ltx.sty from ltshipout.dtx,
+% --- which is supported by pLaTeX2e kernel natively
+\@ifl@t@r{\fmtversion}{2020/10/01}{}%
+ {\platpc@patch@after{everyshi}{pxeveryshi}}% platex-tools
+% --- since LaTeX2e 2020-10-01, atbegshi.sty is merely
+% --- an emulation by atbegshi-ltx.sty from ltshipout.dtx,
+% --- which is supported by pLaTeX2e kernel natively
+\@ifl@t@r{\fmtversion}{2020/10/01}{}%
+ {\platpc@patch@after{atbegshi}{pxatbegshi}}% platex-tools
\platpc@patch@before{ftnright}{pxftnright}% platex-tools
\platpc@patch@after{multicol}{pxmulticol}% platex-tools
\platpc@patch@after{xspace}{pxxspace}% platex-tools
\platpc@patch@after{textpos}{pxtextpos}% (maintained here!)
+% --- until LaTeX2e 2020-10-01, patching eso-pic automatically
+% --- is not supported by pxesopic
+\@ifl@t@r{\fmtversion}{2020/10/01}%
+ {\platpc@patch@before{eso-pic}{pxesopic}}{}% (maintained here!)
\platpc@patch@after{pdfpages}{pxpdfpages}% (maintained here!)
\platpc@patch@before{stfloats}{pxstfloats}% pxsttools -- (!!)
% --- in most cases, pxjahyper works without explicit options
@@ -213,6 +252,6 @@
% special case, mainly for problematic packages
% --- mdwtab forbids loading array
% --- so plarray should also be forbidden
-\AtEndOfPackageFile{mdwtab}{\@namedef{ver@plarray.sty}{}}
+\platpc@ExecuteAfterPackage{mdwtab}{\@namedef{ver@plarray.sty}{}}
\endinput
diff --git a/language/japanese/plautopatch/plautopatch.tex b/language/japanese/plautopatch/plautopatch.tex
index d415bda829..b0e3cda4a5 100644
--- a/language/japanese/plautopatch/plautopatch.tex
+++ b/language/japanese/plautopatch/plautopatch.tex
@@ -118,6 +118,7 @@ Current version (\filedate\space\fileversion) supports the followings:
\ITEMoTo multicol (latex-tools) -> pxmulticol (platex-tools)
\ITEMoTo xspace (latex-tools) -> pxxspace (platex-tools)
\ITEMxTx textpos -> pxtextpos (maintained here!)
+\ITEMxTx eso-pic -> pxesopic (maintained here!)
\ITEMxTx pdfpages -> pxpdfpages (maintained here!)
\ITEMoTo stfloats (sttools) -> pxstfloats (pxsttools)
\ITEMxTx hyperref -> pxjahyper (by Takayuki YATO)
@@ -160,6 +161,9 @@ a comma-separated list of them:
\item 2020/02/25 v0.9e Add support for \textsf{textpos}
\item 2020/05/05 v0.9f Add support for \textsf{collcell}
\item 2020/05/25 v0.9g Automatically load \textsf{pxjahyper}
+ \item 2020/09/13 v0.9h No dependency for \textsf{filehook} on \LaTeXe~2020-10-01
+ \item 2020/09/25 v0.9i Do not require \textsf{pxeveryshi} and \textsf{pxatbegshi}
+ \item 2020/09/27 v0.9j Add support for \textsf{eso-pic} (\LaTeXe~2020-10-01 required)
\end{itemize}
\end{document}
diff --git a/language/japanese/plautopatch/pldocverb.sty b/language/japanese/plautopatch/pldocverb.sty
index fc36b14ccd..bd1dcb9c84 100644
--- a/language/japanese/plautopatch/pldocverb.sty
+++ b/language/japanese/plautopatch/pldocverb.sty
@@ -7,9 +7,9 @@
%
% This package is expected to be compatible with
% * doc.sty
-% (2004/02/09 v2.1b -- 2018/09/25 v2.1i)
+% (2004/02/09 v2.1b -- 2020/06/15 v2.1m)
% * plcore.ltx in platex
-% (2001/09/26 v1.2a -- 2019/02/08 v1.3b)
+% (2001/09/26 v1.2a -- 2020/03/05 v1.3e)
%
%% package declaration
diff --git a/language/japanese/plautopatch/plextarydshln.sty b/language/japanese/plautopatch/plextarydshln.sty
index ac0059c5e4..2ccdc865ed 100644
--- a/language/japanese/plautopatch/plextarydshln.sty
+++ b/language/japanese/plautopatch/plextarydshln.sty
@@ -9,7 +9,7 @@
% * arydshln.sty
% (2004/08/31 v1.71 -- 2019/02/21 v1.76)
% * plext.sty in platex
-% (2001/09/26 v1.2 -- 2018/10/07 v1.2k)
+% (2001/09/26 v1.2 -- 2019/09/29 v1.2l)
%
%% package declaration
diff --git a/language/japanese/plautopatch/plextcolortbl.sty b/language/japanese/plautopatch/plextcolortbl.sty
index 08ae5bd82d..4519b99e24 100644
--- a/language/japanese/plautopatch/plextcolortbl.sty
+++ b/language/japanese/plautopatch/plextcolortbl.sty
@@ -7,9 +7,9 @@
%
% This package is expected to be compatible with
% * colortbl.sty
-% (2012/06/21 v1.0b -- 2018/12/12 v1.0d)
+% (2012/06/21 v1.0b -- 2020/01/04 v1.0e)
% * plext.sty in platex
-% (2001/09/26 v1.2 -- 2018/10/07 v1.2k)
+% (2001/09/26 v1.2 -- 2019/09/29 v1.2l)
%
%% package declaration
diff --git a/language/japanese/plautopatch/pxesopic.sty b/language/japanese/plautopatch/pxesopic.sty
new file mode 100644
index 0000000000..f020501e94
--- /dev/null
+++ b/language/japanese/plautopatch/pxesopic.sty
@@ -0,0 +1,177 @@
+%
+% pxesopic.sty
+% written by Hironobu Yamashita (@aminophen)
+%
+% This package is part of the plautopatch bundle.
+% https://github.com/aminophen/plautopatch
+%
+% This package is expected to be compatible with
+% * eso-pic.sty
+% ????/??/?? v?.? -- 2018/04/12 v2.0h
+%
+% --------------------------------------------------------------
+% [Note]
+% The package ``pxesopic.sty'' relies heavily on internals
+% of ``plautopatch.sty''
+% --------------------------------------------------------------
+%
+
+%% package declaration
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{pxesopic}
+ [2020/09/27 v0.2a Patch to eso-pic for tombow]
+
+%% preparations
+\def\pxesop@pkgname{pxesopic}
+\def\pxesop@error{\PackageError\pxesop@pkgname}
+\def\pxesop@warn{\PackageWarningNoLine\pxesop@pkgname}
+\let\pxesop@debug\@gobble
+\def\pxesop@debug#1{\typeout{\pxesop@pkgname: [DEBUG] #1}}% for debug
+
+%% hooks
+\ifx\declare@file@substitution\@undefined
+ % LaTeX2e 2020-02-02 PL5 or older
+ \RequirePackage{filehook}
+ \let\pxesop@ExecuteAfterPackage=\AtEndOfPackageFile
+ \let\pxesop@ExecuteBeforePackage=\AtBeginOfPackageFile
+\else
+ % LaTeX2e 2020-10-01 or newer
+ \def\pxesop@ExecuteAfterPackage#1{\AddToHook{package/after/#1}}
+ \def\pxesop@ExecuteBeforePackage#1{\AddToHook{package/before/#1}}
+\fi
+
+%% the contents of \AtBeginShipout is dependent on \iftombow;
+%% delay execution of \AtBeginShipout inside ``eso-pic.sty''
+%% until \AtBeginDocument, to support both (u)pLaTeX kernel
+%% and ``gentombow.sty''
+\RequirePackage{atbegshi}% eso-pic requires atbegshi
+\pxesop@ExecuteBeforePackage{eso-pic}{\pxesop@before}
+\pxesop@ExecuteAfterPackage{eso-pic}{\pxesop@after}
+%
+\def\pxesop@before{%
+ \let\pxesop@AtBeginShipout\AtBeginShipout
+ \def\AtBeginShipout##1{\def\pxesop@hook{##1}}% hide it
+ \pxesop@debug{\noexpand\AtBeginShipout disabled}%
+ \let\pxesop@before\relax
+}
+\def\pxesop@after{%
+ \let\AtBeginShipout\pxesop@AtBeginShipout % restore
+ \let\pxesop@AtBeginShipout\relax
+ \pxesop@debug{\noexpand\AtBeginShipout restored}%
+ \let\@unknownoptionerror\relax %% avoid an error
+ \pxesop@debug{\noexpand\@unknownoptionerror disabled}%
+ \let\pxesop@after\relax
+}
+%%
+
+%% load it; be careful not to cause unknown option error!
+\expandafter\ifx\csname @unknownoptionerror\endcsname
+ \pxesop@error{Failed to save \noexpand\@unknownoptionerror}\@ehc
+\fi
+\let\pxesop@unknownoptionerror\@unknownoptionerror
+%
+\chardef\pxesop@status\z@
+\@ifpackageloaded{plautopatch}{%
+ \expandafter\ifx\csname platpc@begin@eso-pic\endcsname\relax
+ % ``plautopatch.sty'' is loaded but the macro is \relax
+ % => means that ``pxesopic.sty'' is automatically loaded
+ \chardef\pxesop@status\@ne
+ \fi
+}{}
+%
+%% pass all options to keyval-style ``eso-pic.sty''
+\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{eso-pic}}
+\ProcessOptions\relax
+\RequirePackage{eso-pic}
+%
+%% recover the error
+\ifnum\pxesop@status>\z@ % auto
+ \def\pxesop@pkgtohook{eso-pic}%
+ % note that ``plautopatch.sty'' discards the hook
+ % on LaTeX2e 2020-02-02 PL5 or older
+ \ifx\declare@file@substitution\@undefined
+ \let\pxesop@pkgtohook\pxesop@pkgname
+ % throw an error for unsupported usage
+ % [FIXME] the error below is actually unnecessary when
+ % none of ``eso-pic.sty'' options is used; how to detect that?
+ \pxesop@error{Try loading \pxesop@pkgname\space by hand}\@ehc
+ \fi
+\else
+ \let\pxesop@pkgtohook\pxesop@pkgname
+\fi
+\pxesop@ExecuteAfterPackage\pxesop@pkgtohook{%
+ \let\@unknownoptionerror\pxesop@unknownoptionerror
+ \pxesop@debug{\noexpand\@unknownoptionerror restored}%
+}
+%%
+
+%% delayed to detect \iftombow status
+\AtBeginDocument{%
+ \ifx\tombowtrue\@undefined
+ \pxesop@warn{Tombow feature unavailable, aborting}%
+ \fi
+ \iftombow \pxesop@new \else \pxesop@orig \fi}%
+%
+%% for \iftombow is FALSE => restore from ``eso-pic.sty''
+\expandafter\def\expandafter\pxesop@orig\expandafter{%
+ \expandafter\AtBeginShipout\expandafter{\pxesop@hook}}
+%
+%% for \iftombow is TRUE => redefine by ``pxesopic.sty''
+\def\pxesop@new{%
+ %% \AtStockLowerLeft: based on TRUE of \ESO@isMEMOIR
+ \renewcommand\AtStockLowerLeft[1]{%
+ \begingroup
+ \@tempdima=-\stockwidth
+ \advance\@tempdima\paperwidth
+ \@tempdimb=-\stockheight
+ \advance\@tempdimb\paperheight
+ %% specific BEGIN
+ \advance\@tempdima 1in\relax
+ \advance\@tempdimb 1in\relax
+ %% specific END
+ \AtPageLowerLeft{%
+ \put(\LenToUnit{\@tempdima},\LenToUnit{\@tempdimb}){##1}%
+ }%
+ \endgroup
+ }% ===
+ %% \AtStockUpperLeft: based on TRUE of \ESO@isMEMOIR
+ \renewcommand\AtStockUpperLeft[1]{%
+ \AtStockLowerLeft{%
+ \put(0,\LenToUnit{\stockheight}){##1}%
+ }%
+ }% ===
+ %% \AtStockCenter: based on TRUE of \ESO@isMEMOIR
+ \renewcommand\AtStockCenter[1]{%
+ \AtStockLowerLeft{%
+ \put(\LenToUnit{.5\stockwidth},\LenToUnit{.5\stockheight}){##1}%
+ }%
+ }%
+ %% \AtTextUpperLeft: same as FALSE of \ESO@isMEMOIR
+ % (no change)
+ %
+ %% \AtBeginShipout: based on TRUE of \ESO@isMEMOIR
+ \AtBeginShipout{%
+ \@tempdima=\dimexpr(\stockwidth-\paperwidth)/2\relax
+ \@tempdimb=-\dimexpr(\stockheight+\paperheight)/2\relax
+ \ifESO@texcoord
+ \advance\@tempdimb\paperheight % [FIXME] not sure!
+ \fi
+ \nointerlineskip
+ \AtBeginShipoutUpperLeft{%
+ \put(\LenToUnit{\@tempdima},\LenToUnit{\@tempdimb}){%
+ \ESO@HookIIIBG\ESO@HookIBG\ESO@HookIIBG
+ \global\let\ESO@HookIIBG\@empty
+ }%
+ }%
+ \AtBeginShipoutUpperLeftForeground{%
+ \put(\LenToUnit{\@tempdima},\LenToUnit{\@tempdimb}){%
+ \ESO@HookIFG\ESO@HookIIFG\ESO@HookIIIFG
+ \global\let\ESO@HookIIFG\@empty
+ }%
+ }%
+ }% ===
+}
+%%
+
+\endinput
+%% EOF
diff --git a/language/japanese/plautopatch/pxpdfpages.sty b/language/japanese/plautopatch/pxpdfpages.sty
index 43c8b274e8..36b796cf28 100644
--- a/language/japanese/plautopatch/pxpdfpages.sty
+++ b/language/japanese/plautopatch/pxpdfpages.sty
@@ -7,9 +7,9 @@
%
% This package is expected to be compatible with
% * pdfpages.sty
-% (2015/07/19 v0.5a -- 2017/10/31 v0.5l)
+% (2015/07/19 v0.5a -- 2020/01/28 v0.5q)
% * plcore.ltx in platex
-% (2001/09/26 v1.2a -- 2018/09/02 v1.3)
+% (2001/09/26 v1.2a -- 2020/03/05 v1.3e)
%
%% package declaration
diff --git a/language/japanese/plautopatch/pxpgfrcs.sty b/language/japanese/plautopatch/pxpgfrcs.sty
index 578e26de0b..b5508dcf47 100644
--- a/language/japanese/plautopatch/pxpgfrcs.sty
+++ b/language/japanese/plautopatch/pxpgfrcs.sty
@@ -9,7 +9,7 @@
%% package declaration
\NeedsTeXFormat{pLaTeX2e}
\ProvidesPackage{pxpgfrcs}
- [2018/09/21 v0.1]
+ [2018/09/21 v0.1 shadings etc in tate class]
\RequirePackage{pgfrcs}
% Note: I chose the name "pxpgfrcs.sty"
diff --git a/language/japanese/plautopatch/pxstfloats.sty b/language/japanese/plautopatch/pxstfloats.sty
index fe19974931..2698407f1f 100644
--- a/language/japanese/plautopatch/pxstfloats.sty
+++ b/language/japanese/plautopatch/pxstfloats.sty
@@ -6,8 +6,9 @@
% for now distributed as part of the plautopatch bundle.
% https://github.com/aminophen/plautopatch
%
-% This package `pxstfloats.sty' is based on:
-% * stfloats.sty in sttools (2016/06/28 v3.2)
+% This package is expected to be compatible with
+% * stfloats.sty in sttools
+% 2012/05/29 v1.1 -- 2017/03/27 v3.3
% Many thanks to lltjp-stfloats.sty in LuaTeX-ja project.
%
diff --git a/language/japanese/plautopatch/pxtextpos.sty b/language/japanese/plautopatch/pxtextpos.sty
index 439005987e..c6e7cf5fe0 100644
--- a/language/japanese/plautopatch/pxtextpos.sty
+++ b/language/japanese/plautopatch/pxtextpos.sty
@@ -13,7 +13,7 @@
%% package declaration
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{pxtextpos}
- [2019/11/17 v0.2a Patch to textpos for (u)pLaTeX]
+ [2019/11/17 v0.2a Patch to textpos for tombow]
%% preparations
\def\pxtxtpos@pkgname{pxtextpos}
diff --git a/language/japanese/pxjahyper/README-ja.md b/language/japanese/pxjahyper/README-ja.md
index 1e61d70fc3..2e79a6d60c 100644
--- a/language/japanese/pxjahyper/README-ja.md
+++ b/language/japanese/pxjahyper/README-ja.md
@@ -41,6 +41,9 @@ pxjahyper パッケージ ー 本体
更新履歴
--------
+ * Version 0.5a 〈2020/09/27〉
+ - LaTeX カーネル 2020/10/01 版への対応。
+
* Version 0.5 〈2020/06/13〉
- `otfmacros` オプションを正式にサポート。
- `disablecmds` オプションを追加。
diff --git a/language/japanese/pxjahyper/README.md b/language/japanese/pxjahyper/README.md
index b1d28bca54..5b574a4526 100644
--- a/language/japanese/pxjahyper/README.md
+++ b/language/japanese/pxjahyper/README.md
@@ -42,6 +42,7 @@ Please refer to the manual `pxjahyper.pdf` (in Japanese) for detail.
Revision History
----------------
+ * Version 0.5a 〈2020/09/27〉
* Version 0.5 〈2020/06/13〉
* Version 0.4b 〈2020/04/24〉
* Version 0.4a 〈2019/11/23〉
diff --git a/language/japanese/pxjahyper/pxjahyper-ajm.def b/language/japanese/pxjahyper/pxjahyper-ajm.def
index 288f320997..48b6e14216 100644
--- a/language/japanese/pxjahyper/pxjahyper-ajm.def
+++ b/language/japanese/pxjahyper/pxjahyper-ajm.def
@@ -11,7 +11,7 @@
%% package declaration
\NeedsTeXFormat{pLaTeX2e}
-\ProvidesFile{pxjahyper-ajm.def}[2020/06/13 v0.5]
+\ProvidesFile{pxjahyper-ajm.def}[2020/09/27 v0.5a]
%% avoid multiple loading
\csname pxjahyperajmLoaded\endcsname
diff --git a/language/japanese/pxjahyper/pxjahyper.pdf b/language/japanese/pxjahyper/pxjahyper.pdf
index 9d164d0fda..0f5ecfe408 100644
--- a/language/japanese/pxjahyper/pxjahyper.pdf
+++ b/language/japanese/pxjahyper/pxjahyper.pdf
Binary files differ
diff --git a/language/japanese/pxjahyper/pxjahyper.sty b/language/japanese/pxjahyper/pxjahyper.sty
index 4d83b2a351..120cc9697e 100644
--- a/language/japanese/pxjahyper/pxjahyper.sty
+++ b/language/japanese/pxjahyper/pxjahyper.sty
@@ -10,7 +10,7 @@
%% package declaration
\NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{pxjahyper}[2020/06/13 v0.5]
+\ProvidesPackage{pxjahyper}[2020/09/27 v0.5a]
%% error messages
\def\pxhy@pkgname{pxjahyper}
@@ -246,6 +246,7 @@ pxhy@driver = \the\pxhy@driver^^J%
\let\pxhy@mk\indent % unexpandable
%% \pxhy@out@special{<text>}
+\ifx\AddToHook\@undefined %------- without hook system
\def\pxhy@out@special#1{%
\begingroup
\toks\z@{\special{#1}}%
@@ -253,6 +254,13 @@ pxhy@driver = \the\pxhy@driver^^J%
\xdef\AtBegShi@HookFirst{\the\toks@\the\toks\tw@}%
\endgroup
}
+\else %------- with hook system
+\def\pxhy@out@special#1{%
+ \AddToHook{shipout/firstpage}[./urgent]{\special{#1}}%
+}
+\DeclareHookRule{shipout/firstpage}{./urgent}{<}{hyperref}
+\DeclareHookRule{shipout/firstpage}{.}{>}{hyperref}
+\fi
%% \pxhy@get@jchar{<num>}
% Let \pxhy@jchar a macro expanding to a single jchar token
diff --git a/language/japanese/pxjahyper/pxjahyper.tex b/language/japanese/pxjahyper/pxjahyper.tex
index e7387f2386..0606701516 100644
--- a/language/japanese/pxjahyper/pxjahyper.tex
+++ b/language/japanese/pxjahyper/pxjahyper.tex
@@ -6,8 +6,8 @@
\MakeShortVerb{\|}
\usepackage{bxtexlogo}
\bxtexlogoimport{*}
-\newcommand{\PkgVersion}{0.5}
-\newcommand{\PkgDate}{2020/06/13}
+\newcommand{\PkgVersion}{0.5a}
+\newcommand{\PkgDate}{2020/09/27}
\newcommand{\Pkg}[1]{\textsf{#1}}
\newcommand{\Meta}[1]{$\langle$\mbox{}#1\mbox{}$\rangle$}
\newcommand{\Note}{\par\noindent ※}