diff options
Diffstat (limited to 'Master/texmf-dist/tex')
490 files changed, 18249 insertions, 8505 deletions
diff --git a/Master/texmf-dist/tex/generic/babel/babel-bidi-basic-r.lua b/Master/texmf-dist/tex/generic/babel/babel-bidi-basic-r.lua index 370e1dbf635..371a4ce840c 100644 --- a/Master/texmf-dist/tex/generic/babel/babel-bidi-basic-r.lua +++ b/Master/texmf-dist/tex/generic/babel/babel-bidi-basic-r.lua @@ -7,7 +7,7 @@ -- babel.dtx (with options: `basic-r') -- -- --- Copyright (C) 2012-2024 Javier Bezos and Johannes L. Braams. +-- Copyright (C) 2012-2025 Javier Bezos and Johannes L. Braams. -- Copyright (C) 1989-2012 Johannes L. Braams and -- any individual authors listed elsewhere in this file. -- All rights reserved. diff --git a/Master/texmf-dist/tex/generic/babel/babel-bidi-basic.lua b/Master/texmf-dist/tex/generic/babel/babel-bidi-basic.lua index a6f6849e7c9..81f88aa84be 100644 --- a/Master/texmf-dist/tex/generic/babel/babel-bidi-basic.lua +++ b/Master/texmf-dist/tex/generic/babel/babel-bidi-basic.lua @@ -7,7 +7,7 @@ -- babel.dtx (with options: `basic') -- -- --- Copyright (C) 2012-2024 Javier Bezos and Johannes L. Braams. +-- Copyright (C) 2012-2025 Javier Bezos and Johannes L. Braams. -- Copyright (C) 1989-2012 Johannes L. Braams and -- any individual authors listed elsewhere in this file. -- All rights reserved. @@ -444,9 +444,7 @@ function Babel.bidi(head, ispar, hdir) end head = node.prev(head) or head - - -------------- FIX HYPERLINKS ---------------- - + --- FIXES --- if has_hyperlink then local flag, linking = 0, 0 for item in node.traverse(head) do @@ -473,10 +471,23 @@ function Babel.bidi(head, ispar, hdir) end end + for item in node.traverse_id(10, head) do + local p = item + local flag = false + while p.prev and p.prev.id == 14 do + flag = true + p = p.prev + end + if flag then + node.insert_before(head, p, node.copy(item)) + node.remove(head,item) + end + end + return head end -- Make sure anything is marked as 'bidi done' (including nodes inserted --- after the babel algorithm). +-- after the babel algorithm). 128 = 1000 0000. function Babel.unset_atdir(head) local ATDIR = Babel.attr_dir for item in node.traverse(head) do diff --git a/Master/texmf-dist/tex/generic/babel/babel-ca-buddhist.tex b/Master/texmf-dist/tex/generic/babel/babel-ca-buddhist.tex index 837d83ff400..533ab3eee1c 100644 --- a/Master/texmf-dist/tex/generic/babel/babel-ca-buddhist.tex +++ b/Master/texmf-dist/tex/generic/babel/babel-ca-buddhist.tex @@ -7,7 +7,7 @@ %% babel.dtx (with options: `ca-buddhist') %% %% -%% Copyright (C) 2012-2024 Javier Bezos and Johannes L. Braams. +%% Copyright (C) 2012-2025 Javier Bezos and Johannes L. Braams. %% Copyright (C) 1989-2012 Johannes L. Braams and %% any individual authors listed elsewhere in this file. %% All rights reserved. diff --git a/Master/texmf-dist/tex/generic/babel/babel-ca-chinese.tex b/Master/texmf-dist/tex/generic/babel/babel-ca-chinese.tex index cff847e02c4..be005c65e4d 100644 --- a/Master/texmf-dist/tex/generic/babel/babel-ca-chinese.tex +++ b/Master/texmf-dist/tex/generic/babel/babel-ca-chinese.tex @@ -7,7 +7,7 @@ %% babel.dtx (with options: `ca-chinese') %% %% -%% Copyright (C) 2012-2024 Javier Bezos and Johannes L. Braams. +%% Copyright (C) 2012-2025 Javier Bezos and Johannes L. Braams. %% Copyright (C) 1989-2012 Johannes L. Braams and %% any individual authors listed elsewhere in this file. %% All rights reserved. diff --git a/Master/texmf-dist/tex/generic/babel/babel-ca-coptic.tex b/Master/texmf-dist/tex/generic/babel/babel-ca-coptic.tex index 43d23a1479e..df61580aeb9 100644 --- a/Master/texmf-dist/tex/generic/babel/babel-ca-coptic.tex +++ b/Master/texmf-dist/tex/generic/babel/babel-ca-coptic.tex @@ -7,7 +7,7 @@ %% babel.dtx (with options: `ca-coptic') %% %% -%% Copyright (C) 2012-2024 Javier Bezos and Johannes L. Braams. +%% Copyright (C) 2012-2025 Javier Bezos and Johannes L. Braams. %% Copyright (C) 1989-2012 Johannes L. Braams and %% any individual authors listed elsewhere in this file. %% All rights reserved. diff --git a/Master/texmf-dist/tex/generic/babel/babel-ca-ethiopic.tex b/Master/texmf-dist/tex/generic/babel/babel-ca-ethiopic.tex index 95a8ef64656..4d1612ac82c 100644 --- a/Master/texmf-dist/tex/generic/babel/babel-ca-ethiopic.tex +++ b/Master/texmf-dist/tex/generic/babel/babel-ca-ethiopic.tex @@ -7,7 +7,7 @@ %% babel.dtx (with options: `ca-ethiopic') %% %% -%% Copyright (C) 2012-2024 Javier Bezos and Johannes L. Braams. +%% Copyright (C) 2012-2025 Javier Bezos and Johannes L. Braams. %% Copyright (C) 1989-2012 Johannes L. Braams and %% any individual authors listed elsewhere in this file. %% All rights reserved. diff --git a/Master/texmf-dist/tex/generic/babel/babel-ca-hebrew.tex b/Master/texmf-dist/tex/generic/babel/babel-ca-hebrew.tex index 315180da5af..c0a2ad7ad86 100644 --- a/Master/texmf-dist/tex/generic/babel/babel-ca-hebrew.tex +++ b/Master/texmf-dist/tex/generic/babel/babel-ca-hebrew.tex @@ -7,7 +7,7 @@ %% babel.dtx (with options: `ca-hebrew') %% %% -%% Copyright (C) 2012-2024 Javier Bezos and Johannes L. Braams. +%% Copyright (C) 2012-2025 Javier Bezos and Johannes L. Braams. %% Copyright (C) 1989-2012 Johannes L. Braams and %% any individual authors listed elsewhere in this file. %% All rights reserved. diff --git a/Master/texmf-dist/tex/generic/babel/babel-ca-islamic.tex b/Master/texmf-dist/tex/generic/babel/babel-ca-islamic.tex index 28c5dd9dc03..a2b0e493b33 100644 --- a/Master/texmf-dist/tex/generic/babel/babel-ca-islamic.tex +++ b/Master/texmf-dist/tex/generic/babel/babel-ca-islamic.tex @@ -7,7 +7,7 @@ %% babel.dtx (with options: `ca-islamic') %% %% -%% Copyright (C) 2012-2024 Javier Bezos and Johannes L. Braams. +%% Copyright (C) 2012-2025 Javier Bezos and Johannes L. Braams. %% Copyright (C) 1989-2012 Johannes L. Braams and %% any individual authors listed elsewhere in this file. %% All rights reserved. diff --git a/Master/texmf-dist/tex/generic/babel/babel-ca-persian.tex b/Master/texmf-dist/tex/generic/babel/babel-ca-persian.tex index f896cbeba63..64c7ec3cb08 100644 --- a/Master/texmf-dist/tex/generic/babel/babel-ca-persian.tex +++ b/Master/texmf-dist/tex/generic/babel/babel-ca-persian.tex @@ -7,7 +7,7 @@ %% babel.dtx (with options: `ca-persian') %% %% -%% Copyright (C) 2012-2024 Javier Bezos and Johannes L. Braams. +%% Copyright (C) 2012-2025 Javier Bezos and Johannes L. Braams. %% Copyright (C) 1989-2012 Johannes L. Braams and %% any individual authors listed elsewhere in this file. %% All rights reserved. diff --git a/Master/texmf-dist/tex/generic/babel/babel-data-bidi.lua b/Master/texmf-dist/tex/generic/babel/babel-data-bidi.lua index 80ec84ca1ae..f7aebcda5e8 100644 --- a/Master/texmf-dist/tex/generic/babel/babel-data-bidi.lua +++ b/Master/texmf-dist/tex/generic/babel/babel-data-bidi.lua @@ -7,7 +7,7 @@ -- babel.dtx (with options: `bididata') -- -- --- Copyright (C) 2012-2024 Javier Bezos and Johannes L. Braams. +-- Copyright (C) 2012-2025 Javier Bezos and Johannes L. Braams. -- Copyright (C) 1989-2012 Johannes L. Braams and -- any individual authors listed elsewhere in this file. -- All rights reserved. diff --git a/Master/texmf-dist/tex/generic/babel/babel-data-cjk.lua b/Master/texmf-dist/tex/generic/babel/babel-data-cjk.lua index 49623e9f9ce..7cf177f8d94 100644 --- a/Master/texmf-dist/tex/generic/babel/babel-data-cjk.lua +++ b/Master/texmf-dist/tex/generic/babel/babel-data-cjk.lua @@ -7,7 +7,7 @@ -- babel.dtx (with options: `cjkdata') -- -- --- Copyright (C) 2012-2024 Javier Bezos and Johannes L. Braams. +-- Copyright (C) 2012-2025 Javier Bezos and Johannes L. Braams. -- Copyright (C) 1989-2012 Johannes L. Braams and -- any individual authors listed elsewhere in this file. -- All rights reserved. diff --git a/Master/texmf-dist/tex/generic/babel/babel-transforms.lua b/Master/texmf-dist/tex/generic/babel/babel-transforms.lua index b5b50f10024..678f30ff2cf 100644 --- a/Master/texmf-dist/tex/generic/babel/babel-transforms.lua +++ b/Master/texmf-dist/tex/generic/babel/babel-transforms.lua @@ -7,7 +7,7 @@ -- babel.dtx (with options: `transforms') -- -- --- Copyright (C) 2012-2024 Javier Bezos and Johannes L. Braams. +-- Copyright (C) 2012-2025 Javier Bezos and Johannes L. Braams. -- Copyright (C) 1989-2012 Johannes L. Braams and -- any individual authors listed elsewhere in this file. -- All rights reserved. diff --git a/Master/texmf-dist/tex/generic/babel/babel.def b/Master/texmf-dist/tex/generic/babel/babel.def index 2c1c97120f4..c4eb33d3b58 100644 --- a/Master/texmf-dist/tex/generic/babel/babel.def +++ b/Master/texmf-dist/tex/generic/babel/babel.def @@ -7,7 +7,7 @@ %% babel.dtx (with options: `core') %% %% -%% Copyright (C) 2012-2024 Javier Bezos and Johannes L. Braams. +%% Copyright (C) 2012-2025 Javier Bezos and Johannes L. Braams. %% Copyright (C) 1989-2012 Johannes L. Braams and %% any individual authors listed elsewhere in this file. %% All rights reserved. @@ -39,7 +39,7 @@ \wlog{File: #1 #4 #3 <#2>}% \let\ProvidesFile\@undefined} \fi -\ProvidesFile{babel.def}[2024/12/21 v24.15 Babel common definitions] +\ProvidesFile{babel.def}[2025/01/01 v25.1 Babel common definitions] \ifx\AtBeginDocument\@undefined \def\@empty{} \def\loadlocalcfg#1{% @@ -595,8 +595,8 @@ \toks@\expandafter{\bbl@tempc#3}% \expandafter\edef\csname extras\languagename\endcsname{\the\toks@}% \fi} -\def\bbl@version{24.15} -\def\bbl@date{2024/12/21} +\def\bbl@version{25.1} +\def\bbl@date{2025/01/01} \ifx\language\@undefined \csname newcount\endcsname\language \fi @@ -717,7 +717,7 @@ \bbl@ifunset{bbl@id@@\languagename}% {\count@\bbl@id@last\relax \advance\count@\@ne - \bbl@csarg\chardef{id@@\languagename}\count@ + \global\bbl@csarg\chardef{id@@\languagename}\count@ \edef\bbl@id@last{\the\count@}% \ifcase\bbl@engine\or \directlua{ diff --git a/Master/texmf-dist/tex/generic/babel/babel.sty b/Master/texmf-dist/tex/generic/babel/babel.sty index 20dc15a55aa..ed9d26229e1 100644 --- a/Master/texmf-dist/tex/generic/babel/babel.sty +++ b/Master/texmf-dist/tex/generic/babel/babel.sty @@ -7,7 +7,7 @@ %% babel.dtx (with options: `package') %% %% -%% Copyright (C) 2012-2024 Javier Bezos and Johannes L. Braams. +%% Copyright (C) 2012-2025 Javier Bezos and Johannes L. Braams. %% Copyright (C) 1989-2012 Johannes L. Braams and %% any individual authors listed elsewhere in this file. %% All rights reserved. @@ -34,7 +34,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{babel}% - [2024/12/21 v24.15 + [2025/01/01 v25.1 The multilingual framework for pdfLaTeX, LuaLaTeX and XeLaTeX] \@ifpackagewith{babel}{debug} {\providecommand\bbl@trace[1]{\message{^^J[ #1 ]}}% @@ -466,8 +466,8 @@ \expandafter\@secondoftwo \fi} \fi -\def\bbl@version{24.15} -\def\bbl@date{2024/12/21} +\def\bbl@version{25.1} +\def\bbl@date{2025/01/01} \ifx\language\@undefined \csname newcount\endcsname\language \fi @@ -588,7 +588,7 @@ \bbl@ifunset{bbl@id@@\languagename}% {\count@\bbl@id@last\relax \advance\count@\@ne - \bbl@csarg\chardef{id@@\languagename}\count@ + \global\bbl@csarg\chardef{id@@\languagename}\count@ \edef\bbl@id@last{\the\count@}% \ifcase\bbl@engine\or \directlua{ diff --git a/Master/texmf-dist/tex/generic/babel/blplain.tex b/Master/texmf-dist/tex/generic/babel/blplain.tex index e6a4076d6d1..a2c33d76ef7 100644 --- a/Master/texmf-dist/tex/generic/babel/blplain.tex +++ b/Master/texmf-dist/tex/generic/babel/blplain.tex @@ -7,7 +7,7 @@ %% babel.dtx (with options: `blplain') %% %% -%% Copyright (C) 2012-2024 Javier Bezos and Johannes L. Braams. +%% Copyright (C) 2012-2025 Javier Bezos and Johannes L. Braams. %% Copyright (C) 1989-2012 Johannes L. Braams and %% any individual authors listed elsewhere in this file. %% All rights reserved. diff --git a/Master/texmf-dist/tex/generic/babel/bplain.tex b/Master/texmf-dist/tex/generic/babel/bplain.tex index 0483d7eb722..c9820aeaca9 100644 --- a/Master/texmf-dist/tex/generic/babel/bplain.tex +++ b/Master/texmf-dist/tex/generic/babel/bplain.tex @@ -7,7 +7,7 @@ %% babel.dtx (with options: `bplain') %% %% -%% Copyright (C) 2012-2024 Javier Bezos and Johannes L. Braams. +%% Copyright (C) 2012-2025 Javier Bezos and Johannes L. Braams. %% Copyright (C) 1989-2012 Johannes L. Braams and %% any individual authors listed elsewhere in this file. %% All rights reserved. diff --git a/Master/texmf-dist/tex/generic/babel/errbabel.def b/Master/texmf-dist/tex/generic/babel/errbabel.def index 9674a0fbf26..3d0106e31b1 100644 --- a/Master/texmf-dist/tex/generic/babel/errbabel.def +++ b/Master/texmf-dist/tex/generic/babel/errbabel.def @@ -7,7 +7,7 @@ %% babel.dtx (with options: `errors') %% %% -%% Copyright (C) 2012-2024 Javier Bezos and Johannes L. Braams. +%% Copyright (C) 2012-2025 Javier Bezos and Johannes L. Braams. %% Copyright (C) 1989-2012 Johannes L. Braams and %% any individual authors listed elsewhere in this file. %% All rights reserved. diff --git a/Master/texmf-dist/tex/generic/babel/hyphen.cfg b/Master/texmf-dist/tex/generic/babel/hyphen.cfg index b32948586c5..4eff4d560b7 100644 --- a/Master/texmf-dist/tex/generic/babel/hyphen.cfg +++ b/Master/texmf-dist/tex/generic/babel/hyphen.cfg @@ -7,7 +7,7 @@ %% babel.dtx (with options: `patterns') %% %% -%% Copyright (C) 2012-2024 Javier Bezos and Johannes L. Braams. +%% Copyright (C) 2012-2025 Javier Bezos and Johannes L. Braams. %% Copyright (C) 1989-2012 Johannes L. Braams and %% any individual authors listed elsewhere in this file. %% All rights reserved. @@ -37,10 +37,10 @@ \wlog{File: #1 #4 #3 <#2>}% \let\ProvidesFile\@undefined} \fi -\ProvidesFile{hyphen.cfg}[2024/12/21 v24.15 Babel hyphens] +\ProvidesFile{hyphen.cfg}[2025/01/01 v25.1 Babel hyphens] \xdef\bbl@format{\jobname} -\def\bbl@version{24.15} -\def\bbl@date{2024/12/21} +\def\bbl@version{25.1} +\def\bbl@date{2025/01/01} \ifx\AtBeginDocument\@undefined \def\@empty{} \fi diff --git a/Master/texmf-dist/tex/generic/babel/locale/zh/babel-zh-Hans-HK.ini b/Master/texmf-dist/tex/generic/babel/locale/zh/babel-zh-Hans-HK.ini index 33c381bbb67..03bb7fb075f 100644 --- a/Master/texmf-dist/tex/generic/babel/locale/zh/babel-zh-Hans-HK.ini +++ b/Master/texmf-dist/tex/generic/babel/locale/zh/babel-zh-Hans-HK.ini @@ -9,8 +9,8 @@ [identification] charset = utf8 -version = 1.12 -date = 2023-10-24 +version = 1.13 +date = 2024-12-28 name.local = 简体中文 name.english = Simplified Chinese name.opentype = Chinese Simplified @@ -237,3 +237,31 @@ fullwidth.lower.alpha = a b c d e f g h i j k l m n fullwidth.upper.alpha = A B C D E F G H I J K L M N O P Q R S T U V W X Y Z date.day = 初一 初二 初三 初四 初五 初六 初七 初八 初九 初十 十一 十二 十三 十四 十五 十六 十七 十八 十九 二十 廿一 廿二 廿三 廿四 廿五 廿六 廿七 廿八 廿九 三十 +[transforms.prehyphenation] +spacing.basic.1.0 = { [、。,.・:;!?)]}〉》」』】〕〗〙〛”〞] ()[([{〈《「『【〔〖〘〚“〝]() } +spacing.basic.1.1 = { insert, kern = -.5 } +spacing.basic.1.2 = { insert, penalty = 0 } +spacing.basic.1.3 = { insert, kern = .5 } +spacing.basic.1.4 = { insert, norule = -.5 0 0 } +spacing.basic.1.5 = {} +spacing.basic.2.0 = { [、。,.・:;!?)]}〉》」』】〕〗〙〛”〞] ()[、。,.・:!?)]}〉》」』】〕〗〙〛”〞]() } +spacing.basic.2.1 = { insert, kern= -.5, step = -1 } +spacing.basic.2.2 = {} +spacing.basic.3.0 = { [([{〈《「『【〔〖〘〚“〝] ()[([{〈《「『【〔〖〘〚“〝]() } +spacing.basic.3.1 = { insert, kern = -.5, step =- 1 } +spacing.basic.3.2 = {} +; +spacing.basic.4.0 = { [、。,.・:;!?)]}〉》」』】〕〗〙〛”〞] ()[{a}]() } +spacing.basic.4.1 = { insert, kern = -.5, step = -1 } +spacing.basic.4.2 = { insert, penalty = 0 } +spacing.basic.4.3 = { insert, kern = .5 } +spacing.basic.4.4 = {} +spacing.basic.5.0 = { [{a}] ()[([{〈《「『【〔〖〘〚“〝]() } +spacing.basic.5.1 = { insert, penalty = 0 } +spacing.basic.5.2 = { insert, kern = .5 } +spacing.basic.5.3 = { insert, norule = -.5 0 0 } +spacing.basic.5.4 = {} +spacing.basic.6.0 = { ^()[([{〈《「『【〔〖〘〚“〝]() } +spacing.basic.6.1 = { insert, kern = -.5 } +spacing.basic.6.2 = {} + diff --git a/Master/texmf-dist/tex/generic/babel/locale/zh/babel-zh-Hans-MO.ini b/Master/texmf-dist/tex/generic/babel/locale/zh/babel-zh-Hans-MO.ini index 56067ebb86d..ecb56844074 100644 --- a/Master/texmf-dist/tex/generic/babel/locale/zh/babel-zh-Hans-MO.ini +++ b/Master/texmf-dist/tex/generic/babel/locale/zh/babel-zh-Hans-MO.ini @@ -9,8 +9,8 @@ [identification] charset = utf8 -version = 1.12 -date = 2023-10-24 +version = 1.13 +date = 2024-12-28 name.local = 简体中文 name.english = Simplified Chinese name.opentype = Chinese Simplified @@ -237,3 +237,31 @@ fullwidth.lower.alpha = a b c d e f g h i j k l m n fullwidth.upper.alpha = A B C D E F G H I J K L M N O P Q R S T U V W X Y Z date.day = 初一 初二 初三 初四 初五 初六 初七 初八 初九 初十 十一 十二 十三 十四 十五 十六 十七 十八 十九 二十 廿一 廿二 廿三 廿四 廿五 廿六 廿七 廿八 廿九 三十 +[transforms.prehyphenation] +spacing.basic.1.0 = { [、。,.・:;!?)]}〉》」』】〕〗〙〛”〞] ()[([{〈《「『【〔〖〘〚“〝]() } +spacing.basic.1.1 = { insert, kern = -.5 } +spacing.basic.1.2 = { insert, penalty = 0 } +spacing.basic.1.3 = { insert, kern = .5 } +spacing.basic.1.4 = { insert, norule = -.5 0 0 } +spacing.basic.1.5 = {} +spacing.basic.2.0 = { [、。,.・:;!?)]}〉》」』】〕〗〙〛”〞] ()[、。,.・:!?)]}〉》」』】〕〗〙〛”〞]() } +spacing.basic.2.1 = { insert, kern= -.5, step = -1 } +spacing.basic.2.2 = {} +spacing.basic.3.0 = { [([{〈《「『【〔〖〘〚“〝] ()[([{〈《「『【〔〖〘〚“〝]() } +spacing.basic.3.1 = { insert, kern = -.5, step =- 1 } +spacing.basic.3.2 = {} +; +spacing.basic.4.0 = { [、。,.・:;!?)]}〉》」』】〕〗〙〛”〞] ()[{a}]() } +spacing.basic.4.1 = { insert, kern = -.5, step = -1 } +spacing.basic.4.2 = { insert, penalty = 0 } +spacing.basic.4.3 = { insert, kern = .5 } +spacing.basic.4.4 = {} +spacing.basic.5.0 = { [{a}] ()[([{〈《「『【〔〖〘〚“〝]() } +spacing.basic.5.1 = { insert, penalty = 0 } +spacing.basic.5.2 = { insert, kern = .5 } +spacing.basic.5.3 = { insert, norule = -.5 0 0 } +spacing.basic.5.4 = {} +spacing.basic.6.0 = { ^()[([{〈《「『【〔〖〘〚“〝]() } +spacing.basic.6.1 = { insert, kern = -.5 } +spacing.basic.6.2 = {} + diff --git a/Master/texmf-dist/tex/generic/babel/locale/zh/babel-zh-Hans-SG.ini b/Master/texmf-dist/tex/generic/babel/locale/zh/babel-zh-Hans-SG.ini index c2b08b3ee47..dc26e9f0118 100644 --- a/Master/texmf-dist/tex/generic/babel/locale/zh/babel-zh-Hans-SG.ini +++ b/Master/texmf-dist/tex/generic/babel/locale/zh/babel-zh-Hans-SG.ini @@ -9,8 +9,8 @@ [identification] charset = utf8 -version = 1.12 -date = 2023-10-24 +version = 1.13 +date = 2024-12-28 name.local = 简体中文 name.english = Simplified Chinese name.opentype = Chinese Simplified @@ -237,4 +237,32 @@ fullwidth.lower.alpha = a b c d e f g h i j k l m n fullwidth.upper.alpha = A B C D E F G H I J K L M N O P Q R S T U V W X Y Z date.day = 初一 初二 初三 初四 初五 初六 初七 初八 初九 初十 十一 十二 十三 十四 十五 十六 十七 十八 十九 二十 廿一 廿二 廿三 廿四 廿五 廿六 廿七 廿八 廿九 三十 +[transforms.prehyphenation] +spacing.basic.1.0 = { [、。,.・:;!?)]}〉》」』】〕〗〙〛”〞] ()[([{〈《「『【〔〖〘〚“〝]() } +spacing.basic.1.1 = { insert, kern = -.5 } +spacing.basic.1.2 = { insert, penalty = 0 } +spacing.basic.1.3 = { insert, kern = .5 } +spacing.basic.1.4 = { insert, norule = -.5 0 0 } +spacing.basic.1.5 = {} +spacing.basic.2.0 = { [、。,.・:;!?)]}〉》」』】〕〗〙〛”〞] ()[、。,.・:!?)]}〉》」』】〕〗〙〛”〞]() } +spacing.basic.2.1 = { insert, kern= -.5, step = -1 } +spacing.basic.2.2 = {} +spacing.basic.3.0 = { [([{〈《「『【〔〖〘〚“〝] ()[([{〈《「『【〔〖〘〚“〝]() } +spacing.basic.3.1 = { insert, kern = -.5, step =- 1 } +spacing.basic.3.2 = {} +; +spacing.basic.4.0 = { [、。,.・:;!?)]}〉》」』】〕〗〙〛”〞] ()[{a}]() } +spacing.basic.4.1 = { insert, kern = -.5, step = -1 } +spacing.basic.4.2 = { insert, penalty = 0 } +spacing.basic.4.3 = { insert, kern = .5 } +spacing.basic.4.4 = {} +spacing.basic.5.0 = { [{a}] ()[([{〈《「『【〔〖〘〚“〝]() } +spacing.basic.5.1 = { insert, penalty = 0 } +spacing.basic.5.2 = { insert, kern = .5 } +spacing.basic.5.3 = { insert, norule = -.5 0 0 } +spacing.basic.5.4 = {} +spacing.basic.6.0 = { ^()[([{〈《「『【〔〖〘〚“〝]() } +spacing.basic.6.1 = { insert, kern = -.5 } +spacing.basic.6.2 = {} + diff --git a/Master/texmf-dist/tex/generic/babel/locale/zh/babel-zh-Hans.ini b/Master/texmf-dist/tex/generic/babel/locale/zh/babel-zh-Hans.ini index 8c7437a953d..ee0252dd60f 100644 --- a/Master/texmf-dist/tex/generic/babel/locale/zh/babel-zh-Hans.ini +++ b/Master/texmf-dist/tex/generic/babel/locale/zh/babel-zh-Hans.ini @@ -11,8 +11,8 @@ [identification] charset = utf8 -version = 1.14 -date = 2023-10-24 +version = 1.15 +date = 2024-12-28 name.local = 简体中文 name.english = Simplified Chinese name.opentype = Chinese Simplified @@ -240,3 +240,31 @@ fullwidth.lower.alpha = a b c d e f g h i j k l m n fullwidth.upper.alpha = A B C D E F G H I J K L M N O P Q R S T U V W X Y Z date.day = 初一 初二 初三 初四 初五 初六 初七 初八 初九 初十 十一 十二 十三 十四 十五 十六 十七 十八 十九 二十 廿一 廿二 廿三 廿四 廿五 廿六 廿七 廿八 廿九 三十 +[transforms.prehyphenation] +spacing.basic.1.0 = { [、。,.・:;!?)]}〉》」』】〕〗〙〛”〞] ()[([{〈《「『【〔〖〘〚“〝]() } +spacing.basic.1.1 = { insert, kern = -.5 } +spacing.basic.1.2 = { insert, penalty = 0 } +spacing.basic.1.3 = { insert, kern = .5 } +spacing.basic.1.4 = { insert, norule = -.5 0 0 } +spacing.basic.1.5 = {} +spacing.basic.2.0 = { [、。,.・:;!?)]}〉》」』】〕〗〙〛”〞] ()[、。,.・:!?)]}〉》」』】〕〗〙〛”〞]() } +spacing.basic.2.1 = { insert, kern= -.5, step = -1 } +spacing.basic.2.2 = {} +spacing.basic.3.0 = { [([{〈《「『【〔〖〘〚“〝] ()[([{〈《「『【〔〖〘〚“〝]() } +spacing.basic.3.1 = { insert, kern = -.5, step =- 1 } +spacing.basic.3.2 = {} +; +spacing.basic.4.0 = { [、。,.・:;!?)]}〉》」』】〕〗〙〛”〞] ()[{a}]() } +spacing.basic.4.1 = { insert, kern = -.5, step = -1 } +spacing.basic.4.2 = { insert, penalty = 0 } +spacing.basic.4.3 = { insert, kern = .5 } +spacing.basic.4.4 = {} +spacing.basic.5.0 = { [{a}] ()[([{〈《「『【〔〖〘〚“〝]() } +spacing.basic.5.1 = { insert, penalty = 0 } +spacing.basic.5.2 = { insert, kern = .5 } +spacing.basic.5.3 = { insert, norule = -.5 0 0 } +spacing.basic.5.4 = {} +spacing.basic.6.0 = { ^()[([{〈《「『【〔〖〘〚“〝]() } +spacing.basic.6.1 = { insert, kern = -.5 } +spacing.basic.6.2 = {} + diff --git a/Master/texmf-dist/tex/generic/babel/locale/zh/babel-zh-Hant-HK.ini b/Master/texmf-dist/tex/generic/babel/locale/zh/babel-zh-Hant-HK.ini index 8fc0abab80a..4a531ac4e66 100644 --- a/Master/texmf-dist/tex/generic/babel/locale/zh/babel-zh-Hant-HK.ini +++ b/Master/texmf-dist/tex/generic/babel/locale/zh/babel-zh-Hant-HK.ini @@ -9,8 +9,8 @@ [identification] charset = utf8 -version = 1.12 -date = 2023-10-24 +version = 1.13 +date = 2024-12-28 name.local = 繁體中文 name.english = Traditional Chinese name.opentype = Chinese Traditional @@ -237,4 +237,32 @@ fullwidth.lower.alpha = a b c d e f g h i j k l m n fullwidth.upper.alpha = A B C D E F G H I J K L M N O P Q R S T U V W X Y Z date.day = 初一 初二 初三 初四 初五 初六 初七 初八 初九 初十 十一 十二 十三 十四 十五 十六 十七 十八 十九 二十 廿一 廿二 廿三 廿四 廿五 廿六 廿七 廿八 廿九 三十 +[transforms.prehyphenation] +spacing.basic.1.0 = { [、。,.・:;!?)]}〉》」』】〕〗〙〛”〞] ()[([{〈《「『【〔〖〘〚“〝]() } +spacing.basic.1.1 = { insert, kern = -.5 } +spacing.basic.1.2 = { insert, penalty = 0 } +spacing.basic.1.3 = { insert, kern = .5 } +spacing.basic.1.4 = { insert, norule = -.5 0 0 } +spacing.basic.1.5 = {} +spacing.basic.2.0 = { [、。,.・:;!?)]}〉》」』】〕〗〙〛”〞] ()[、。,.・:!?)]}〉》」』】〕〗〙〛”〞]() } +spacing.basic.2.1 = { insert, kern= -.5, step = -1 } +spacing.basic.2.2 = {} +spacing.basic.3.0 = { [([{〈《「『【〔〖〘〚“〝] ()[([{〈《「『【〔〖〘〚“〝]() } +spacing.basic.3.1 = { insert, kern = -.5, step =- 1 } +spacing.basic.3.2 = {} +; +spacing.basic.4.0 = { [、。,.・:;!?)]}〉》」』】〕〗〙〛”〞] ()[{a}]() } +spacing.basic.4.1 = { insert, kern = -.5, step = -1 } +spacing.basic.4.2 = { insert, penalty = 0 } +spacing.basic.4.3 = { insert, kern = .5 } +spacing.basic.4.4 = {} +spacing.basic.5.0 = { [{a}] ()[([{〈《「『【〔〖〘〚“〝]() } +spacing.basic.5.1 = { insert, penalty = 0 } +spacing.basic.5.2 = { insert, kern = .5 } +spacing.basic.5.3 = { insert, norule = -.5 0 0 } +spacing.basic.5.4 = {} +spacing.basic.6.0 = { ^()[([{〈《「『【〔〖〘〚“〝]() } +spacing.basic.6.1 = { insert, kern = -.5 } +spacing.basic.6.2 = {} + diff --git a/Master/texmf-dist/tex/generic/babel/locale/zh/babel-zh-Hant-MO.ini b/Master/texmf-dist/tex/generic/babel/locale/zh/babel-zh-Hant-MO.ini index 382daf0da07..7a05703f5cf 100644 --- a/Master/texmf-dist/tex/generic/babel/locale/zh/babel-zh-Hant-MO.ini +++ b/Master/texmf-dist/tex/generic/babel/locale/zh/babel-zh-Hant-MO.ini @@ -9,8 +9,8 @@ [identification] charset = utf8 -version = 1.12 -date = 2023-10-24 +version = 1.13 +date = 2024-12-28 name.local = 繁體中文 name.english = Traditional Chinese name.opentype = Chinese Traditional @@ -237,4 +237,32 @@ fullwidth.lower.alpha = a b c d e f g h i j k l m n fullwidth.upper.alpha = A B C D E F G H I J K L M N O P Q R S T U V W X Y Z date.day = 初一 初二 初三 初四 初五 初六 初七 初八 初九 初十 十一 十二 十三 十四 十五 十六 十七 十八 十九 二十 廿一 廿二 廿三 廿四 廿五 廿六 廿七 廿八 廿九 三十 +[transforms.prehyphenation] +spacing.basic.1.0 = { [、。,.・:;!?)]}〉》」』】〕〗〙〛”〞] ()[([{〈《「『【〔〖〘〚“〝]() } +spacing.basic.1.1 = { insert, kern = -.5 } +spacing.basic.1.2 = { insert, penalty = 0 } +spacing.basic.1.3 = { insert, kern = .5 } +spacing.basic.1.4 = { insert, norule = -.5 0 0 } +spacing.basic.1.5 = {} +spacing.basic.2.0 = { [、。,.・:;!?)]}〉》」』】〕〗〙〛”〞] ()[、。,.・:!?)]}〉》」』】〕〗〙〛”〞]() } +spacing.basic.2.1 = { insert, kern= -.5, step = -1 } +spacing.basic.2.2 = {} +spacing.basic.3.0 = { [([{〈《「『【〔〖〘〚“〝] ()[([{〈《「『【〔〖〘〚“〝]() } +spacing.basic.3.1 = { insert, kern = -.5, step =- 1 } +spacing.basic.3.2 = {} +; +spacing.basic.4.0 = { [、。,.・:;!?)]}〉》」』】〕〗〙〛”〞] ()[{a}]() } +spacing.basic.4.1 = { insert, kern = -.5, step = -1 } +spacing.basic.4.2 = { insert, penalty = 0 } +spacing.basic.4.3 = { insert, kern = .5 } +spacing.basic.4.4 = {} +spacing.basic.5.0 = { [{a}] ()[([{〈《「『【〔〖〘〚“〝]() } +spacing.basic.5.1 = { insert, penalty = 0 } +spacing.basic.5.2 = { insert, kern = .5 } +spacing.basic.5.3 = { insert, norule = -.5 0 0 } +spacing.basic.5.4 = {} +spacing.basic.6.0 = { ^()[([{〈《「『【〔〖〘〚“〝]() } +spacing.basic.6.1 = { insert, kern = -.5 } +spacing.basic.6.2 = {} + diff --git a/Master/texmf-dist/tex/generic/babel/locale/zh/babel-zh-Hant.ini b/Master/texmf-dist/tex/generic/babel/locale/zh/babel-zh-Hant.ini index 98eb7401c64..5b95fa08949 100644 --- a/Master/texmf-dist/tex/generic/babel/locale/zh/babel-zh-Hant.ini +++ b/Master/texmf-dist/tex/generic/babel/locale/zh/babel-zh-Hant.ini @@ -11,8 +11,8 @@ [identification] charset = utf8 -version = 1.13 -date = 2023-10-24 +version = 1.14 +date = 2024-12-28 name.local = 繁體中文 name.english = Traditional Chinese name.opentype = Chinese Traditional @@ -242,4 +242,32 @@ fullwidth.lower.alpha = a b c d e f g h i j k l m n fullwidth.upper.alpha = A B C D E F G H I J K L M N O P Q R S T U V W X Y Z date.day = 初一 初二 初三 初四 初五 初六 初七 初八 初九 初十 十一 十二 十三 十四 十五 十六 十七 十八 十九 二十 廿一 廿二 廿三 廿四 廿五 廿六 廿七 廿八 廿九 三十 +[transforms.prehyphenation] +spacing.basic.1.0 = { [、。,.・:;!?)]}〉》」』】〕〗〙〛”〞] ()[([{〈《「『【〔〖〘〚“〝]() } +spacing.basic.1.1 = { insert, kern = -.5 } +spacing.basic.1.2 = { insert, penalty = 0 } +spacing.basic.1.3 = { insert, kern = .5 } +spacing.basic.1.4 = { insert, norule = -.5 0 0 } +spacing.basic.1.5 = {} +spacing.basic.2.0 = { [、。,.・:;!?)]}〉》」』】〕〗〙〛”〞] ()[、。,.・:!?)]}〉》」』】〕〗〙〛”〞]() } +spacing.basic.2.1 = { insert, kern= -.5, step = -1 } +spacing.basic.2.2 = {} +spacing.basic.3.0 = { [([{〈《「『【〔〖〘〚“〝] ()[([{〈《「『【〔〖〘〚“〝]() } +spacing.basic.3.1 = { insert, kern = -.5, step =- 1 } +spacing.basic.3.2 = {} +; +spacing.basic.4.0 = { [、。,.・:;!?)]}〉》」』】〕〗〙〛”〞] ()[{a}]() } +spacing.basic.4.1 = { insert, kern = -.5, step = -1 } +spacing.basic.4.2 = { insert, penalty = 0 } +spacing.basic.4.3 = { insert, kern = .5 } +spacing.basic.4.4 = {} +spacing.basic.5.0 = { [{a}] ()[([{〈《「『【〔〖〘〚“〝]() } +spacing.basic.5.1 = { insert, penalty = 0 } +spacing.basic.5.2 = { insert, kern = .5 } +spacing.basic.5.3 = { insert, norule = -.5 0 0 } +spacing.basic.5.4 = {} +spacing.basic.6.0 = { ^()[([{〈《「『【〔〖〘〚“〝]() } +spacing.basic.6.1 = { insert, kern = -.5 } +spacing.basic.6.2 = {} + diff --git a/Master/texmf-dist/tex/generic/babel/luababel.def b/Master/texmf-dist/tex/generic/babel/luababel.def index 2e538630e81..9e79ae4a6f9 100644 --- a/Master/texmf-dist/tex/generic/babel/luababel.def +++ b/Master/texmf-dist/tex/generic/babel/luababel.def @@ -7,7 +7,7 @@ %% babel.dtx (with options: `luatex') %% %% -%% Copyright (C) 2012-2024 Javier Bezos and Johannes L. Braams. +%% Copyright (C) 2012-2025 Javier Bezos and Johannes L. Braams. %% Copyright (C) 1989-2012 Johannes L. Braams and %% any individual authors listed elsewhere in this file. %% All rights reserved. diff --git a/Master/texmf-dist/tex/generic/babel/nil.ldf b/Master/texmf-dist/tex/generic/babel/nil.ldf index 03610c0d855..b8f15b9b568 100644 --- a/Master/texmf-dist/tex/generic/babel/nil.ldf +++ b/Master/texmf-dist/tex/generic/babel/nil.ldf @@ -7,7 +7,7 @@ %% babel.dtx (with options: `nil') %% %% -%% Copyright (C) 2012-2024 Javier Bezos and Johannes L. Braams. +%% Copyright (C) 2012-2025 Javier Bezos and Johannes L. Braams. %% Copyright (C) 1989-2012 Johannes L. Braams and %% any individual authors listed elsewhere in this file. %% All rights reserved. @@ -32,7 +32,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension |.ins|) which are part of the distribution. %% -\ProvidesLanguage{nil}[2024/12/21 v24.15 Nil language] +\ProvidesLanguage{nil}[2025/01/01 v25.1 Nil language] \LdfInit{nil}{datenil} \ifx\l@nil\@undefined \newlanguage\l@nil diff --git a/Master/texmf-dist/tex/generic/babel/plain.def b/Master/texmf-dist/tex/generic/babel/plain.def index 6624d517539..f278a21aaba 100644 --- a/Master/texmf-dist/tex/generic/babel/plain.def +++ b/Master/texmf-dist/tex/generic/babel/plain.def @@ -7,7 +7,7 @@ %% babel.dtx (with options: `plain') %% %% -%% Copyright (C) 2012-2024 Javier Bezos and Johannes L. Braams. +%% Copyright (C) 2012-2025 Javier Bezos and Johannes L. Braams. %% Copyright (C) 1989-2012 Johannes L. Braams and %% any individual authors listed elsewhere in this file. %% All rights reserved. diff --git a/Master/texmf-dist/tex/generic/babel/switch.def b/Master/texmf-dist/tex/generic/babel/switch.def index e991164458d..ec58318b70b 100644 --- a/Master/texmf-dist/tex/generic/babel/switch.def +++ b/Master/texmf-dist/tex/generic/babel/switch.def @@ -7,7 +7,7 @@ %% babel.dtx (with options: `kernel') %% %% -%% Copyright (C) 2012-2024 Javier Bezos and Johannes L. Braams. +%% Copyright (C) 2012-2025 Javier Bezos and Johannes L. Braams. %% Copyright (C) 1989-2012 Johannes L. Braams and %% any individual authors listed elsewhere in this file. %% All rights reserved. diff --git a/Master/texmf-dist/tex/generic/babel/txtbabel.def b/Master/texmf-dist/tex/generic/babel/txtbabel.def index 380fb2380c7..28f5fe332b0 100644 --- a/Master/texmf-dist/tex/generic/babel/txtbabel.def +++ b/Master/texmf-dist/tex/generic/babel/txtbabel.def @@ -7,7 +7,7 @@ %% babel.dtx (with options: `texxet') %% %% -%% Copyright (C) 2012-2024 Javier Bezos and Johannes L. Braams. +%% Copyright (C) 2012-2025 Javier Bezos and Johannes L. Braams. %% Copyright (C) 1989-2012 Johannes L. Braams and %% any individual authors listed elsewhere in this file. %% All rights reserved. diff --git a/Master/texmf-dist/tex/generic/babel/xebabel.def b/Master/texmf-dist/tex/generic/babel/xebabel.def index 1e8d4183cc0..24559221338 100644 --- a/Master/texmf-dist/tex/generic/babel/xebabel.def +++ b/Master/texmf-dist/tex/generic/babel/xebabel.def @@ -7,7 +7,7 @@ %% babel.dtx (with options: `xetex') %% %% -%% Copyright (C) 2012-2024 Javier Bezos and Johannes L. Braams. +%% Copyright (C) 2012-2025 Javier Bezos and Johannes L. Braams. %% Copyright (C) 1989-2012 Johannes L. Braams and %% any individual authors listed elsewhere in this file. %% All rights reserved. diff --git a/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht b/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht index a36a855147a..09adb9c4cf3 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht @@ -1,5 +1,5 @@ -% mathml.4ht (2024-10-11-14:13), generated from tex4ht-mathml.tex -% Copyright 2009-2024 TeX Users Group +% mathml.4ht (2025-01-05-13:36), generated from tex4ht-mathml.tex +% Copyright 2009-2025 TeX Users Group % Copyright 1999-2009 Eitan M. Gurari % % This work may be distributed and/or modified under the @@ -17,7 +17,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2024-10-11-14:13} +\immediate\write-1{version 2025-01-05-13:36} \exit:ifnot{Preamble,% accents,% @@ -877,10 +877,12 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% {} {\HCode{<\a:mathml mover\Hnewline accent="true"><\a:mathml mrow\Hnewline>}#2\HCode{</\a:mathml mrow>}% \:widetilde:over \HCode{</\a:mathml mover>}} - \Configure{accent}\tilde\tilde{{}{}} - {} - {\HCode{<\a:mathml mover\Hnewline accent="true"><\a:mathml mrow\Hnewline>}#2\HCode{</\a:mathml mrow>}% - \:tilde:over \HCode{</\a:mathml mover>}} + % this configuration caused problems with text accents. + % we can use Unicode characters with tilde accents instead even in MathML + % \Configure{accent}\tilde\tilde{{}{}} + % {} + % {\HCode{<\a:mathml mover\Hnewline accent="true"><\a:mathml mrow\Hnewline>}#2\HCode{</\a:mathml mrow>}% + % \:tilde:over \HCode{</\a:mathml mover>}} \Configure{accent}\widehat\widehat{{}{}} {} {\HCode{<\a:mathml mover\Hnewline accent="true"><\a:mathml mrow\Hnewline>}#2\HCode{</\a:mathml mrow>}% @@ -1801,6 +1803,8 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% + + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{amsbsy} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1813,7 +1817,6 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{amsmath} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -2185,6 +2188,7 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{amsfonts} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -2196,7 +2200,6 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{amstext} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -2270,6 +2273,7 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{amstex} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -2753,10 +2757,12 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% {} {\HCode{<\a:mathml mover\Hnewline accent="true"><\a:mathml mrow\Hnewline>}#2\HCode{</\a:mathml mrow>}% \:widetilde:over \HCode{</\a:mathml mover>}} - \Configure{accent}\tilde\tilde{{}{}} - {} - {\HCode{<\a:mathml mover\Hnewline accent="true"><\a:mathml mrow\Hnewline>}#2\HCode{</\a:mathml mrow>}% - \:tilde:over \HCode{</\a:mathml mover>}} + % this configuration caused problems with text accents. + % we can use Unicode characters with tilde accents instead even in MathML + % \Configure{accent}\tilde\tilde{{}{}} + % {} + % {\HCode{<\a:mathml mover\Hnewline accent="true"><\a:mathml mrow\Hnewline>}#2\HCode{</\a:mathml mrow>}% + % \:tilde:over \HCode{</\a:mathml mover>}} \Configure{accent}\widehat\widehat{{}{}} {} {\HCode{<\a:mathml mover\Hnewline accent="true"><\a:mathml mrow\Hnewline>}#2\HCode{</\a:mathml mrow>}% @@ -3340,6 +3346,7 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{array} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -3483,7 +3490,6 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{vanilla} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -3527,7 +3533,6 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{amssymb} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -3859,6 +3864,7 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{dcolumn} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -3942,6 +3948,7 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{mathtools} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -4096,6 +4103,13 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% + + + + + + + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{accents} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -4119,7 +4133,6 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{subeqnarray} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -4169,6 +4182,7 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{siunitx} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -4184,7 +4198,6 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{sistyle} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -4282,8 +4295,6 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% - - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{ulem} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -4314,6 +4325,7 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{cancel} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -4357,7 +4369,6 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{stmaryrd} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -4477,6 +4488,12 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% + + + + + + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{mhchem} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -4611,7 +4628,6 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{esvect} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/generic/tex4ht/multind.4ht b/Master/texmf-dist/tex/generic/tex4ht/multind.4ht index 4c531c96f89..f50bf779fb3 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/multind.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/multind.4ht @@ -1,7 +1,6 @@ -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% multind.4ht 2024-12-08-14:21 % -% Copyright (C) 1999-2009 Eitan M. Gurari % -% Copyright 2009-2024 TeX Users Group +% multind.4ht (2025-01-05-08:19), generated from tex4ht-4ht.tex +% Copyright 1999-2009 Eitan M. Gurari +% Copyright 2009-2025 TeX Users Group % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either @@ -18,6 +17,8 @@ % % If you modify this program, changing the % version identification would be appreciated. +\immediate\write-1{version 2025-01-05-08:19} + \pend:defII\@wrindex{\warn:idx{##1}\@ifundefined{##1@idxfile}{}{\html:addr \hbox{\Link-{}{\a:indexhaddr diff --git a/Master/texmf-dist/tex/generic/tex4ht/splitidx.4ht b/Master/texmf-dist/tex/generic/tex4ht/splitidx.4ht index 4fdaf6a4a71..e0f229fc9ea 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/splitidx.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/splitidx.4ht @@ -1,7 +1,6 @@ -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% splitidx.4ht 2024-12-08-14:21 % -% Copyright (C) 2003-2009 Eitan M. Gurari % -% Copyright 2009-2024 TeX Users Group +% splitidx.4ht (2025-01-05-08:19), generated from tex4ht-4ht.tex +% Copyright 2003-2009 Eitan M. Gurari +% Copyright 2009-2025 TeX Users Group % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either @@ -18,6 +17,8 @@ % % If you modify this program, changing the % version identification would be appreciated. +\immediate\write-1{version 2025-01-05-08:19} + \def\warn:idx#1{% \expandafter\ifx \csname #1warn:idx\endcsname\relax \expandafter\global diff --git a/Master/texmf-dist/tex/generic/tex4ht/unicode.4ht b/Master/texmf-dist/tex/generic/tex4ht/unicode.4ht index b3dab45240a..506d0d78b51 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/unicode.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/unicode.4ht @@ -1,5 +1,5 @@ -% unicode.4ht (2024-12-11-12:49), generated from tex4ht-unicode.tex -% Copyright 2009-2023 TeX Users Group +% unicode.4ht (2024-12-15-07:18), generated from tex4ht-unicode.tex +% Copyright 2009-2024 TeX Users Group % Copyright 1998-2009 Eitan M. Gurari % % This work may be distributed and/or modified under the @@ -17,7 +17,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2024-12-11-12:49} +\immediate\write-1{version 2024-12-15-07:18} \exit:ifnot{8859-6,% SIunits,% diff --git a/Master/texmf-dist/tex/generic/tikzducks/t-tikzducks.mkiv b/Master/texmf-dist/tex/generic/tikzducks/t-tikzducks.mkiv index e76f507264d..21a44d4a7dd 100644 --- a/Master/texmf-dist/tex/generic/tikzducks/t-tikzducks.mkiv +++ b/Master/texmf-dist/tex/generic/tikzducks/t-tikzducks.mkiv @@ -14,7 +14,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Code for this ConTeXt User Module kindly provided by @JairoAdelRio https://github.com/samcarter/tikzducks/pull/25 -\writestatus{loading}{ConTeXt User Module / TikZDucks 2024/12/10 version v1.9 Draw rubber ducks in TikZ} +\writestatus{loading}{ConTeXt User Module / TikZDucks 2025/01/05 version v1.10 Draw rubber ducks in TikZ} \setupcolors[state=start] \usemodule[tikz] diff --git a/Master/texmf-dist/tex/generic/tikzducks/tikzducks-generic.tex b/Master/texmf-dist/tex/generic/tikzducks/tikzducks-generic.tex index c7c420f4e52..79a18967dcd 100644 --- a/Master/texmf-dist/tex/generic/tikzducks/tikzducks-generic.tex +++ b/Master/texmf-dist/tex/generic/tikzducks/tikzducks-generic.tex @@ -13,112 +13,130 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\newif\ifduck@name -\newif\ifduck@invisible +\def\duck@listhead{} +\def\duck@listacces{} +\def\duck@headtext{head} +\def\duck@accesstext{acess} + +\ExplSyntaxOn +\NewDocumentCommand{\duck@ini}{om}{ + \expandafter\newif\csname ifduck@#2\endcsname + \def\duck@tmp{#1} + \ifx\duck@headtext\duck@tmp + \tl_put_right:Nn \duck@listhead { {#2} } + \fi + \ifx\duck@accesstext\duck@tmp + \tl_put_right:Nn \duck@listacces { {#2} } + \fi +} +\ExplSyntaxOff + +\duck@ini{name} +\duck@ini{invisible} % Environment %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\newif\ifduck@water +\duck@ini{water} % body parts %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\newif\ifduck@grumpy -\newif\ifduck@laughing -\newif\ifduck@parrot +\duck@ini{grumpy} +\duck@ini{laughing} +\duck@ini{parrot} % hair styles %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\newif\ifduck@shorthair -\newif\ifduck@longhair -\newif\ifduck@crazyhair -\newif\ifduck@recedinghair -\newif\ifduck@eyebrow -\newif\ifduck@beard -\newif\ifduck@mohican -\newif\ifduck@mullet -\newif\ifduck@parting +\duck@ini[head]{shorthair} +\duck@ini[head]{longhair} +\duck@ini[head]{crazyhair} +\duck@ini[head]{recedinghair} +\duck@ini{eyebrow} +\duck@ini[head]{beard} +\duck@ini[head]{mohican} +\duck@ini[head]{mullet} +\duck@ini[head]{parting} % clothing %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\newif\ifduck@clothing -\newif\ifduck@tshirt -\newif\ifduck@jacket -\newif\ifduck@tie -\newif\ifduck@cape -\newif\ifduck@stripes -\newif\ifduck@bowtie -\newif\ifduck@lapel -\newif\ifduck@aodai -\newif\ifduck@scarf +\duck@ini{clothing} +\duck@ini{tshirt} +\duck@ini{jacket} +\duck@ini{tie} +\duck@ini[acess]{cape} +\duck@ini{stripes} +\duck@ini[acess]{bowtie} +\duck@ini{lapel} +\duck@ini{aodai} +\duck@ini[acess]{scarf} % Headgear %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\newif\ifduck@alien -\newif\ifduck@hat -\newif\ifduck@cap -\newif\ifduck@santa -\newif\ifduck@unicorn -\newif\ifduck@magichat -\newif\ifduck@chef -\newif\ifduck@witch -\newif\ifduck@graduate -\newif\ifduck@beret -\newif\ifduck@crown -\newif\ifduck@queencrown -\newif\ifduck@kingcrown -\newif\ifduck@peakedcap -\newif\ifduck@bunny -\newif\ifduck@tophat -\newif\ifduck@darthvader -\newif\ifduck@harlequin -\newif\ifduck@strawhat -\newif\ifduck@helmet -\newif\ifduck@viking -\newif\ifduck@devil -\newif\ifduck@conicalhat -\newif\ifduck@sailor -\newif\ifduck@bobblehat -\newif\ifduck@sombrero +\duck@ini[head]{alien} +\duck@ini[head]{hat} +\duck@ini[head]{cap} +\duck@ini[head]{santa} +\duck@ini{unicorn} +\duck@ini[head]{magichat} +\duck@ini[head]{chef} +\duck@ini[head]{witch} +\duck@ini[head]{graduate} +\duck@ini[head]{beret} +\duck@ini[head]{crown} +\duck@ini[head]{queencrown} +\duck@ini[head]{kingcrown} +\duck@ini[head]{peakedcap} +\duck@ini[head]{bunny} +\duck@ini[head]{tophat} +\duck@ini[head]{darthvader} +\duck@ini[head]{harlequin} +\duck@ini[head]{strawhat} +\duck@ini[head]{helmet} +\duck@ini[head]{viking} +\duck@ini[head]{devil} +\duck@ini[head]{conicalhat} +\duck@ini[head]{sailor} +\duck@ini[head]{bobblehat} +\duck@ini[head]{sombrero} % Accessories %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\newif\ifduck@glasses -\newif\ifduck@sunglasses -\newif\ifduck@squareglasses -\newif\ifduck@icecream -\newif\ifduck@book -\newif\ifduck@magicwand -\newif\ifduck@cricket -\newif\ifduck@rollingpin -\newif\ifduck@signpost -\newif\ifduck@lightsaber -\newif\ifduck@cake -\newif\ifduck@pizza -\newif\ifduck@hockey -\newif\ifduck@baguette -\newif\ifduck@football -\newif\ifduck@mask -\newif\ifduck@necklace -\newif\ifduck@milkshake -\newif\ifduck@wine -\newif\ifduck@prison -\newif\ifduck@speech -\newif\ifduck@think -\newif\ifduck@torch -\newif\ifduck@easter -\newif\ifduck@basket -\newif\ifduck@buttons -\newif\ifduck@sheep -\newif\ifduck@horsetail -\newif\ifduck@crozier -\newif\ifduck@davidlikespineapplepizza -\newif\ifduck@wing -\newif\ifduck@stethoscope -\newif\ifduck@neckerchief -\newif\ifduck@snowduck -\newif\ifduck@vampire -\newif\ifduck@crystalball -\newif\ifduck@cheese -\newif\ifduck@shovel -\newif\ifduck@pickaxe -\newif\ifduck@strawbroom -\newif\ifduck@broom -\newif\ifduck@umbrella -\newif\ifduck@umbrellaclosed -\newif\ifduck@handbag -\newif\ifduck@cocktail -\newif\ifduck@overleaf -\newif\ifduck@banana -\newif\ifduck@stick -\newif\ifduck@megaphone +\duck@ini[acess]{glasses} +\duck@ini[acess]{sunglasses} +\duck@ini[acess]{squareglasses} +\duck@ini[acess]{icecream} +\duck@ini[acess]{book} +\duck@ini[acess]{magicwand} +\duck@ini[acess]{cricket} +\duck@ini[acess]{rollingpin} +\duck@ini[acess]{signpost} +\duck@ini[acess]{lightsaber} +\duck@ini[acess]{cake} +\duck@ini[acess]{pizza} +\duck@ini[acess]{hockey} +\duck@ini[acess]{baguette} +\duck@ini[acess]{football} +\duck@ini[acess]{mask} +\duck@ini[acess]{necklace} +\duck@ini[acess]{milkshake} +\duck@ini[acess]{wine} +\duck@ini[acess]{prison} +\duck@ini{speech} +\duck@ini{think} +\duck@ini[acess]{torch} +\duck@ini[acess]{easter} +\duck@ini[acess]{basket} +\duck@ini{buttons} +\duck@ini{sheep} +\duck@ini{horsetail} +\duck@ini[acess]{crozier} +\duck@ini{davidlikespineapplepizza} +\duck@ini{wing} +\duck@ini[acess]{stethoscope} +\duck@ini[acess]{neckerchief} +\duck@ini{snowduck} +\duck@ini{vampire} +\duck@ini[acess]{crystalball} +\duck@ini[acess]{cheese} +\duck@ini[acess]{shovel} +\duck@ini[acess]{pickaxe} +\duck@ini[acess]{strawbroom} +\duck@ini[acess]{broom} +\duck@ini[acess]{umbrella} +\duck@ini[acess]{umbrellaclosed} +\duck@ini[acess]{handbag} +\duck@ini[acess]{cocktail} +\duck@ini{overleaf} +\duck@ini[acess]{banana} +\duck@ini[acess]{stick} +\duck@ini{megaphone} \tikzset{ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -618,6 +636,7 @@ \ifduck@devil \fill[\duck@devil] (0.7723,2.3756) .. controls (0.6369,2.1184) and (0.7916,2.0228) .. (0.8360,1.9897) .. controls (0.8744,1.9675) and (0.8774,1.9511) .. (0.8853,1.9173) .. controls (0.8853,1.8595) and (0.8407,1.8127) .. (0.7856,1.8127) .. controls (0.7535,1.8178) and (0.7240,1.8231) .. (0.6965,1.8545) .. controls (0.6965,1.8545) and (0.4451,2.2259) .. (0.7723,2.3756) -- cycle; \fi +% % Conical Hat (background) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ifduck@conicalhat \fill[\duck@conicalhat!50!black,rotate=-21] (0.265,1.915) ellipse[x radius=0.79, y radius=0.1]; @@ -1486,8 +1505,8 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\pgfmathdeclarerandomlist{head}{{shorthair}{longhair}{crazyhair}{mohican}{mullet}{beard}{alien}{hat}{cap}{santa}{chef}{graduate}{beret}{magichat}{witch}{crown}{bunny}{peakedcap}{tophat}{queencrown}{kingcrown}{harlequin}{strawhat}{parting}} -\pgfmathdeclarerandomlist{accessories}{{glasses}{sunglasses}{icecream}{book}{signpost}{magicwand}{cricket}{rollingpin}{lightsaber}{cake}{pizza}{hockey}{baguette}{football}{mask}{necklace}{milkshake}{wine}{prison}{cape}{torch}{crozier}{easter}{stethoscope}{neckerchief}{cheese}{shovel}{pickaxe}{crystalball}} +\pgfmathdeclarerandomlist{head}{\duck@listhead} +\pgfmathdeclarerandomlist{accessories}{\duck@listacces} \def\shuffleducks{% \pgfmathrandomitem{\head}{head}% @@ -1499,7 +1518,7 @@ \newcommand*{\randuck}[1][]{% \shuffleducks% \duck[\randomhead, \randomaccessories, #1]% -} +} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % diff --git a/Master/texmf-dist/tex/generic/tikzducks/tikzducks.sty b/Master/texmf-dist/tex/generic/tikzducks/tikzducks.sty index 724cfc61421..6e0822a4a48 100644 --- a/Master/texmf-dist/tex/generic/tikzducks/tikzducks.sty +++ b/Master/texmf-dist/tex/generic/tikzducks/tikzducks.sty @@ -12,7 +12,7 @@ % See https://www.latex-project.org/lppl.txt % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\ProvidesPackage{tikzducks}[2024/12/10 version v1.9 Draw rubber ducks in TikZ] +\ProvidesPackage{tikzducks}[2025/01/05 version v1.10 Draw rubber ducks in TikZ] \RequirePackage{expl3} \RequirePackage{tikz} diff --git a/Master/texmf-dist/tex/generic/unicode-data/BidiBrackets.txt b/Master/texmf-dist/tex/generic/unicode-data/BidiBrackets.txt index 8cebea41544..db4e41b6e6a 100644 --- a/Master/texmf-dist/tex/generic/unicode-data/BidiBrackets.txt +++ b/Master/texmf-dist/tex/generic/unicode-data/BidiBrackets.txt @@ -1,8 +1,8 @@ -# BidiBrackets-15.1.0.txt -# Date: 2023-01-18 -# © 2023 Unicode®, Inc. +# BidiBrackets-16.0.0.txt +# Date: 2024-02-02 +# © 2024 Unicode®, Inc. # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries. -# For terms of use, see https://www.unicode.org/terms_of_use.html +# For terms of use and license, see https://www.unicode.org/terms_of_use.html # # Unicode Character Database # For documentation, see https://www.unicode.org/reports/tr44/ diff --git a/Master/texmf-dist/tex/generic/unicode-data/BidiMirroring.txt b/Master/texmf-dist/tex/generic/unicode-data/BidiMirroring.txt index 7e58cc4d715..d8f60cb79fe 100644 --- a/Master/texmf-dist/tex/generic/unicode-data/BidiMirroring.txt +++ b/Master/texmf-dist/tex/generic/unicode-data/BidiMirroring.txt @@ -1,7 +1,8 @@ -# BidiMirroring-15.1.0.txt -# Date: 2023-01-05 -# © 2023 Unicode®, Inc. -# For terms of use, see https://www.unicode.org/terms_of_use.html +# BidiMirroring-16.0.0.txt +# Date: 2024-01-30 +# © 2024 Unicode®, Inc. +# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries. +# For terms of use and license, see https://www.unicode.org/terms_of_use.html # # Unicode Character Database # For documentation, see https://www.unicode.org/reports/tr44/ @@ -15,7 +16,7 @@ # value, for which there is another Unicode character that typically has a glyph # that is the mirror image of the original character's glyph. # -# The repertoire covered by the file is Unicode 15.1.0. +# The repertoire covered by the file is Unicode 16.0.0. # # The file contains a list of lines with mappings from one code point # to another one for character-based mirroring. @@ -44,7 +45,8 @@ # # This file was originally created by Markus Scherer. # Extended for Unicode 3.2, 4.0, 4.1, 5.0, 5.1, 5.2, and 6.0 by Ken Whistler, -# and for subsequent versions by Ken Whistler, Laurentiu Iancu, and Roozbeh Pournader. +# and for subsequent versions by Ken Whistler, Laurentiu Iancu, Roozbeh Pournader, +# and Robin Leroy. # # Historical and Compatibility Information: # @@ -542,6 +544,7 @@ FF63; FF62 # [BEST FIT] HALFWIDTH RIGHT CORNER BRACKET # 225F; QUESTIONED EQUAL TO # 2260; NOT EQUAL TO # 2262; NOT IDENTICAL TO +# 226D; NOT EQUIVALENT TO # 228C; MULTISET # 22A7; MODELS # 22AA; TRIPLE VERTICAL BAR RIGHT TURNSTILE diff --git a/Master/texmf-dist/tex/generic/unicode-data/CaseFolding.txt b/Master/texmf-dist/tex/generic/unicode-data/CaseFolding.txt index 69c5c64b4c6..1b7a9c156c7 100644 --- a/Master/texmf-dist/tex/generic/unicode-data/CaseFolding.txt +++ b/Master/texmf-dist/tex/generic/unicode-data/CaseFolding.txt @@ -1,8 +1,8 @@ -# CaseFolding-15.1.0.txt -# Date: 2023-05-12, 21:53:10 GMT -# © 2023 Unicode®, Inc. +# CaseFolding-16.0.0.txt +# Date: 2024-04-30, 21:48:11 GMT +# © 2024 Unicode®, Inc. # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries. -# For terms of use, see https://www.unicode.org/terms_of_use.html +# For terms of use and license, see https://www.unicode.org/terms_of_use.html # # Unicode Character Database # For documentation, see https://www.unicode.org/reports/tr44/ @@ -603,6 +603,7 @@ 1C86; C; 044A; # CYRILLIC SMALL LETTER TALL HARD SIGN 1C87; C; 0463; # CYRILLIC SMALL LETTER TALL YAT 1C88; C; A64B; # CYRILLIC SMALL LETTER UNBLENDED UK +1C89; C; 1C8A; # CYRILLIC CAPITAL LETTER TJE 1C90; C; 10D0; # GEORGIAN MTAVRULI CAPITAL LETTER AN 1C91; C; 10D1; # GEORGIAN MTAVRULI CAPITAL LETTER BAN 1C92; C; 10D2; # GEORGIAN MTAVRULI CAPITAL LETTER GAN @@ -1240,9 +1241,13 @@ A7C5; C; 0282; # LATIN CAPITAL LETTER S WITH HOOK A7C6; C; 1D8E; # LATIN CAPITAL LETTER Z WITH PALATAL HOOK A7C7; C; A7C8; # LATIN CAPITAL LETTER D WITH SHORT STROKE OVERLAY A7C9; C; A7CA; # LATIN CAPITAL LETTER S WITH SHORT STROKE OVERLAY +A7CB; C; 0264; # LATIN CAPITAL LETTER RAMS HORN +A7CC; C; A7CD; # LATIN CAPITAL LETTER S WITH DIAGONAL STROKE A7D0; C; A7D1; # LATIN CAPITAL LETTER CLOSED INSULAR G A7D6; C; A7D7; # LATIN CAPITAL LETTER MIDDLE SCOTS S A7D8; C; A7D9; # LATIN CAPITAL LETTER SIGMOID S +A7DA; C; A7DB; # LATIN CAPITAL LETTER LAMBDA +A7DC; C; 019B; # LATIN CAPITAL LETTER LAMBDA WITH STROKE A7F5; C; A7F6; # LATIN CAPITAL LETTER REVERSED HALF H AB70; C; 13A0; # CHEROKEE SMALL LETTER A AB71; C; 13A1; # CHEROKEE SMALL LETTER E @@ -1525,6 +1530,28 @@ FF3A; C; FF5A; # FULLWIDTH LATIN CAPITAL LETTER Z 10CB0; C; 10CF0; # OLD HUNGARIAN CAPITAL LETTER EZS 10CB1; C; 10CF1; # OLD HUNGARIAN CAPITAL LETTER ENT-SHAPED SIGN 10CB2; C; 10CF2; # OLD HUNGARIAN CAPITAL LETTER US +10D50; C; 10D70; # GARAY CAPITAL LETTER A +10D51; C; 10D71; # GARAY CAPITAL LETTER CA +10D52; C; 10D72; # GARAY CAPITAL LETTER MA +10D53; C; 10D73; # GARAY CAPITAL LETTER KA +10D54; C; 10D74; # GARAY CAPITAL LETTER BA +10D55; C; 10D75; # GARAY CAPITAL LETTER JA +10D56; C; 10D76; # GARAY CAPITAL LETTER SA +10D57; C; 10D77; # GARAY CAPITAL LETTER WA +10D58; C; 10D78; # GARAY CAPITAL LETTER LA +10D59; C; 10D79; # GARAY CAPITAL LETTER GA +10D5A; C; 10D7A; # GARAY CAPITAL LETTER DA +10D5B; C; 10D7B; # GARAY CAPITAL LETTER XA +10D5C; C; 10D7C; # GARAY CAPITAL LETTER YA +10D5D; C; 10D7D; # GARAY CAPITAL LETTER TA +10D5E; C; 10D7E; # GARAY CAPITAL LETTER RA +10D5F; C; 10D7F; # GARAY CAPITAL LETTER NYA +10D60; C; 10D80; # GARAY CAPITAL LETTER FA +10D61; C; 10D81; # GARAY CAPITAL LETTER NA +10D62; C; 10D82; # GARAY CAPITAL LETTER PA +10D63; C; 10D83; # GARAY CAPITAL LETTER HA +10D64; C; 10D84; # GARAY CAPITAL LETTER OLD KA +10D65; C; 10D85; # GARAY CAPITAL LETTER OLD NA 118A0; C; 118C0; # WARANG CITI CAPITAL LETTER NGAA 118A1; C; 118C1; # WARANG CITI CAPITAL LETTER A 118A2; C; 118C2; # WARANG CITI CAPITAL LETTER WI diff --git a/Master/texmf-dist/tex/generic/unicode-data/EastAsianWidth.txt b/Master/texmf-dist/tex/generic/unicode-data/EastAsianWidth.txt index 02df4df475c..99f7a31ea5d 100644 --- a/Master/texmf-dist/tex/generic/unicode-data/EastAsianWidth.txt +++ b/Master/texmf-dist/tex/generic/unicode-data/EastAsianWidth.txt @@ -1,8 +1,8 @@ -# EastAsianWidth-15.1.0.txt -# Date: 2023-07-28, 23:34:08 GMT -# © 2023 Unicode®, Inc. +# EastAsianWidth-16.0.0.txt +# Date: 2024-04-30, 21:48:20 GMT +# © 2024 Unicode®, Inc. # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries. -# For terms of use, see https://www.unicode.org/terms_of_use.html +# For terms of use and license, see https://www.unicode.org/terms_of_use.html # # Unicode Character Database # For documentation, see https://www.unicode.org/reports/tr44/ @@ -334,7 +334,7 @@ 0888 ; N # Sk ARABIC RAISED ROUND DOT 0889..088E ; N # Lo [6] ARABIC LETTER NOON WITH INVERTED SMALL V..ARABIC VERTICAL TAIL 0890..0891 ; N # Cf [2] ARABIC POUND MARK ABOVE..ARABIC PIASTRE MARK ABOVE -0898..089F ; N # Mn [8] ARABIC SMALL HIGH WORD AL-JUZ..ARABIC HALF MADDA OVER MADDA +0897..089F ; N # Mn [9] ARABIC PEPET..ARABIC HALF MADDA OVER MADDA 08A0..08C8 ; N # Lo [41] ARABIC LETTER BEH WITH SMALL V BELOW..ARABIC LETTER GRAF 08C9 ; N # Lm ARABIC SMALL FARSI YEH 08CA..08E1 ; N # Mn [24] ARABIC SMALL HIGH FARSI YEH..ARABIC SMALL HIGH SIGN SAFHA @@ -819,12 +819,13 @@ 1B42 ; N # Mn BALINESE VOWEL SIGN PEPET 1B43..1B44 ; N # Mc [2] BALINESE VOWEL SIGN PEPET TEDUNG..BALINESE ADEG ADEG 1B45..1B4C ; N # Lo [8] BALINESE LETTER KAF SASAK..BALINESE LETTER ARCHAIC JNYA +1B4E..1B4F ; N # Po [2] BALINESE INVERTED CARIK SIKI..BALINESE INVERTED CARIK PAREREN 1B50..1B59 ; N # Nd [10] BALINESE DIGIT ZERO..BALINESE DIGIT NINE 1B5A..1B60 ; N # Po [7] BALINESE PANTI..BALINESE PAMENENG 1B61..1B6A ; N # So [10] BALINESE MUSICAL SYMBOL DONG..BALINESE MUSICAL SYMBOL DANG GEDE 1B6B..1B73 ; N # Mn [9] BALINESE MUSICAL SYMBOL COMBINING TEGEH..BALINESE MUSICAL SYMBOL COMBINING GONG 1B74..1B7C ; N # So [9] BALINESE MUSICAL SYMBOL RIGHT-HAND OPEN DUG..BALINESE MUSICAL SYMBOL LEFT-HAND OPEN PING -1B7D..1B7E ; N # Po [2] BALINESE PANTI LANTANG..BALINESE PAMADA LANTANG +1B7D..1B7F ; N # Po [3] BALINESE PANTI LANTANG..BALINESE PANTI BAWAK 1B80..1B81 ; N # Mn [2] SUNDANESE SIGN PANYECEK..SUNDANESE SIGN PANGLAYAR 1B82 ; N # Mc SUNDANESE SIGN PANGWISAD 1B83..1BA0 ; N # Lo [30] SUNDANESE LETTER A..SUNDANESE LETTER HA @@ -859,7 +860,7 @@ 1C5A..1C77 ; N # Lo [30] OL CHIKI LETTER LA..OL CHIKI LETTER OH 1C78..1C7D ; N # Lm [6] OL CHIKI MU TTUDDAG..OL CHIKI AHAD 1C7E..1C7F ; N # Po [2] OL CHIKI PUNCTUATION MUCAAD..OL CHIKI PUNCTUATION DOUBLE MUCAAD -1C80..1C88 ; N # Ll [9] CYRILLIC SMALL LETTER ROUNDED VE..CYRILLIC SMALL LETTER UNBLENDED UK +1C80..1C8A ; N # L& [11] CYRILLIC SMALL LETTER ROUNDED VE..CYRILLIC SMALL LETTER TJE 1C90..1CBA ; N # Lu [43] GEORGIAN MTAVRULI CAPITAL LETTER AN..GEORGIAN MTAVRULI CAPITAL LETTER AIN 1CBD..1CBF ; N # Lu [3] GEORGIAN MTAVRULI CAPITAL LETTER AEN..GEORGIAN MTAVRULI CAPITAL LETTER LABIAL SIGN 1CC0..1CC7 ; N # Po [8] SUNDANESE PUNCTUATION BINDU SURYA..SUNDANESE PUNCTUATION BINDU BA SATANGA @@ -1142,7 +1143,7 @@ 23F1..23F2 ; N # So [2] STOPWATCH..TIMER CLOCK 23F3 ; W # So HOURGLASS WITH FLOWING SAND 23F4..23FF ; N # So [12] BLACK MEDIUM LEFT-POINTING TRIANGLE..OBSERVER EYE SYMBOL -2400..2426 ; N # So [39] SYMBOL FOR NULL..SYMBOL FOR SUBSTITUTE FORM TWO +2400..2429 ; N # So [42] SYMBOL FOR NULL..SYMBOL FOR DELETE MEDIUM SHADE FORM 2440..244A ; N # So [11] OCR HOOK..OCR DOUBLE BACKSLASH 2460..249B ; A # No [60] CIRCLED DIGIT ONE..NUMBER TWENTY FULL STOP 249C..24E9 ; A # So [78] PARENTHESIZED LATIN SMALL LETTER A..CIRCLED LATIN SMALL LETTER Z @@ -1195,7 +1196,9 @@ 261C ; A # So WHITE LEFT POINTING INDEX 261D ; N # So WHITE UP POINTING INDEX 261E ; A # So WHITE RIGHT POINTING INDEX -261F..263F ; N # So [33] WHITE DOWN POINTING INDEX..MERCURY +261F..262F ; N # So [17] WHITE DOWN POINTING INDEX..YIN YANG +2630..2637 ; W # So [8] TRIGRAM FOR HEAVEN..TRIGRAM FOR EARTH +2638..263F ; N # So [8] WHEEL OF DHARMA..MERCURY 2640 ; A # So FEMALE SIGN 2641 ; N # So EARTH 2642 ; A # So MALE SIGN @@ -1213,7 +1216,9 @@ 266F ; A # Sm MUSIC SHARP SIGN 2670..267E ; N # So [15] WEST SYRIAC CROSS..PERMANENT PAPER SIGN 267F ; W # So WHEELCHAIR SYMBOL -2680..2692 ; N # So [19] DIE FACE-1..HAMMER AND PICK +2680..2689 ; N # So [10] DIE FACE-1..BLACK CIRCLE WITH TWO WHITE DOTS +268A..268F ; W # So [6] MONOGRAM FOR YANG..DIGRAM FOR GREATER YIN +2690..2692 ; N # So [3] WHITE FLAG..HAMMER AND PICK 2693 ; W # So ANCHOR 2694..269D ; N # So [10] CROSSED SWORDS..OUTLINED WHITE STAR 269E..269F ; A # So [2] THREE LINES CONVERGING RIGHT..THREE LINES CONVERGING LEFT @@ -1487,7 +1492,7 @@ 3192..3195 ; W # No [4] IDEOGRAPHIC ANNOTATION ONE MARK..IDEOGRAPHIC ANNOTATION FOUR MARK 3196..319F ; W # So [10] IDEOGRAPHIC ANNOTATION TOP MARK..IDEOGRAPHIC ANNOTATION MAN MARK 31A0..31BF ; W # Lo [32] BOPOMOFO LETTER BU..BOPOMOFO LETTER AH -31C0..31E3 ; W # So [36] CJK STROKE T..CJK STROKE Q +31C0..31E5 ; W # So [38] CJK STROKE T..CJK STROKE SZP 31EF ; W # So IDEOGRAPHIC DESCRIPTION CHARACTER SUBTRACTION 31F0..31FF ; W # Lo [16] KATAKANA LETTER SMALL KU..KATAKANA LETTER SMALL RO 3200..321E ; W # So [31] PARENTHESIZED HANGUL KIYEOK..PARENTHESIZED KOREAN CHARACTER O HU @@ -1503,7 +1508,7 @@ 32C0..32FF ; W # So [64] IDEOGRAPHIC TELEGRAPH SYMBOL FOR JANUARY..SQUARE ERA NAME REIWA 3300..33FF ; W # So [256] SQUARE APAATO..SQUARE GAL 3400..4DBF ; W # Lo [6592] CJK UNIFIED IDEOGRAPH-3400..CJK UNIFIED IDEOGRAPH-4DBF -4DC0..4DFF ; N # So [64] HEXAGRAM FOR THE CREATIVE HEAVEN..HEXAGRAM FOR BEFORE COMPLETION +4DC0..4DFF ; W # So [64] HEXAGRAM FOR THE CREATIVE HEAVEN..HEXAGRAM FOR BEFORE COMPLETION 4E00..9FFF ; W # Lo [20992] CJK UNIFIED IDEOGRAPH-4E00..CJK UNIFIED IDEOGRAPH-9FFF A000..A014 ; W # Lo [21] YI SYLLABLE IT..YI SYLLABLE E A015 ; W # Lm YI SYLLABLE WU @@ -1543,10 +1548,10 @@ A788 ; N # Lm MODIFIER LETTER LOW CIRCUMFLEX ACCENT A789..A78A ; N # Sk [2] MODIFIER LETTER COLON..MODIFIER LETTER SHORT EQUALS SIGN A78B..A78E ; N # L& [4] LATIN CAPITAL LETTER SALTILLO..LATIN SMALL LETTER L WITH RETROFLEX HOOK AND BELT A78F ; N # Lo LATIN LETTER SINOLOGICAL DOT -A790..A7CA ; N # L& [59] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN SMALL LETTER S WITH SHORT STROKE OVERLAY +A790..A7CD ; N # L& [62] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN SMALL LETTER S WITH DIAGONAL STROKE A7D0..A7D1 ; N # L& [2] LATIN CAPITAL LETTER CLOSED INSULAR G..LATIN SMALL LETTER CLOSED INSULAR G A7D3 ; N # Ll LATIN SMALL LETTER DOUBLE THORN -A7D5..A7D9 ; N # L& [5] LATIN SMALL LETTER DOUBLE WYNN..LATIN SMALL LETTER SIGMOID S +A7D5..A7DC ; N # L& [8] LATIN SMALL LETTER DOUBLE WYNN..LATIN CAPITAL LETTER LAMBDA WITH STROKE A7F2..A7F4 ; N # Lm [3] MODIFIER LETTER CAPITAL C..MODIFIER LETTER CAPITAL Q A7F5..A7F6 ; N # L& [2] LATIN CAPITAL LETTER REVERSED HALF H..LATIN SMALL LETTER REVERSED HALF H A7F7 ; N # Lo LATIN EPIGRAPHIC LETTER SIDEWAYS I @@ -1870,6 +1875,7 @@ FFFD ; A # So REPLACEMENT CHARACTER 105A3..105B1 ; N # Ll [15] VITHKUQI SMALL LETTER HA..VITHKUQI SMALL LETTER RE 105B3..105B9 ; N # Ll [7] VITHKUQI SMALL LETTER SE..VITHKUQI SMALL LETTER XE 105BB..105BC ; N # Ll [2] VITHKUQI SMALL LETTER Y..VITHKUQI SMALL LETTER ZE +105C0..105F3 ; N # Lo [52] TODHRI LETTER A..TODHRI LETTER OO 10600..10736 ; N # Lo [311] LINEAR A SIGN AB001..LINEAR A SIGN A664 10740..10755 ; N # Lo [22] LINEAR A SIGN A701 A..LINEAR A SIGN A732 JE 10760..10767 ; N # Lo [8] LINEAR A SIGN A800..LINEAR A SIGN A807 @@ -1942,12 +1948,23 @@ FFFD ; A # So REPLACEMENT CHARACTER 10D00..10D23 ; N # Lo [36] HANIFI ROHINGYA LETTER A..HANIFI ROHINGYA MARK NA KHONNA 10D24..10D27 ; N # Mn [4] HANIFI ROHINGYA SIGN HARBAHAY..HANIFI ROHINGYA SIGN TASSI 10D30..10D39 ; N # Nd [10] HANIFI ROHINGYA DIGIT ZERO..HANIFI ROHINGYA DIGIT NINE +10D40..10D49 ; N # Nd [10] GARAY DIGIT ZERO..GARAY DIGIT NINE +10D4A..10D4D ; N # Lo [4] GARAY VOWEL SIGN A..GARAY VOWEL SIGN EE +10D4E ; N # Lm GARAY VOWEL LENGTH MARK +10D4F ; N # Lo GARAY SUKUN +10D50..10D65 ; N # Lu [22] GARAY CAPITAL LETTER A..GARAY CAPITAL LETTER OLD NA +10D69..10D6D ; N # Mn [5] GARAY VOWEL SIGN E..GARAY CONSONANT NASALIZATION MARK +10D6E ; N # Pd GARAY HYPHEN +10D6F ; N # Lm GARAY REDUPLICATION MARK +10D70..10D85 ; N # Ll [22] GARAY SMALL LETTER A..GARAY SMALL LETTER OLD NA +10D8E..10D8F ; N # Sm [2] GARAY PLUS SIGN..GARAY MINUS SIGN 10E60..10E7E ; N # No [31] RUMI DIGIT ONE..RUMI FRACTION TWO THIRDS 10E80..10EA9 ; N # Lo [42] YEZIDI LETTER ELIF..YEZIDI LETTER ET 10EAB..10EAC ; N # Mn [2] YEZIDI COMBINING HAMZA MARK..YEZIDI COMBINING MADDA MARK 10EAD ; N # Pd YEZIDI HYPHENATION MARK 10EB0..10EB1 ; N # Lo [2] YEZIDI LETTER LAM WITH DOT ABOVE..YEZIDI LETTER YOT WITH CIRCUMFLEX ABOVE -10EFD..10EFF ; N # Mn [3] ARABIC SMALL LOW WORD SAKTA..ARABIC SMALL LOW WORD MADDA +10EC2..10EC4 ; N # Lo [3] ARABIC LETTER DAL WITH TWO DOTS VERTICALLY BELOW..ARABIC LETTER KAF WITH TWO DOTS VERTICALLY BELOW +10EFC..10EFF ; N # Mn [4] ARABIC COMBINING ALEF OVERLAY..ARABIC SMALL LOW WORD MADDA 10F00..10F1C ; N # Lo [29] OLD SOGDIAN LETTER ALEPH..OLD SOGDIAN LETTER FINAL TAW WITH VERTICAL TAIL 10F1D..10F26 ; N # No [10] OLD SOGDIAN NUMBER ONE..OLD SOGDIAN FRACTION ONE HALF 10F27 ; N # Lo OLD SOGDIAN LIGATURE AYIN-DALETH @@ -2064,6 +2081,26 @@ FFFD ; A # So REPLACEMENT CHARACTER 11362..11363 ; N # Mc [2] GRANTHA VOWEL SIGN VOCALIC L..GRANTHA VOWEL SIGN VOCALIC LL 11366..1136C ; N # Mn [7] COMBINING GRANTHA DIGIT ZERO..COMBINING GRANTHA DIGIT SIX 11370..11374 ; N # Mn [5] COMBINING GRANTHA LETTER A..COMBINING GRANTHA LETTER PA +11380..11389 ; N # Lo [10] TULU-TIGALARI LETTER A..TULU-TIGALARI LETTER VOCALIC LL +1138B ; N # Lo TULU-TIGALARI LETTER EE +1138E ; N # Lo TULU-TIGALARI LETTER AI +11390..113B5 ; N # Lo [38] TULU-TIGALARI LETTER OO..TULU-TIGALARI LETTER LLLA +113B7 ; N # Lo TULU-TIGALARI SIGN AVAGRAHA +113B8..113BA ; N # Mc [3] TULU-TIGALARI VOWEL SIGN AA..TULU-TIGALARI VOWEL SIGN II +113BB..113C0 ; N # Mn [6] TULU-TIGALARI VOWEL SIGN U..TULU-TIGALARI VOWEL SIGN VOCALIC LL +113C2 ; N # Mc TULU-TIGALARI VOWEL SIGN EE +113C5 ; N # Mc TULU-TIGALARI VOWEL SIGN AI +113C7..113CA ; N # Mc [4] TULU-TIGALARI VOWEL SIGN OO..TULU-TIGALARI SIGN CANDRA ANUNASIKA +113CC..113CD ; N # Mc [2] TULU-TIGALARI SIGN ANUSVARA..TULU-TIGALARI SIGN VISARGA +113CE ; N # Mn TULU-TIGALARI SIGN VIRAMA +113CF ; N # Mc TULU-TIGALARI SIGN LOOPED VIRAMA +113D0 ; N # Mn TULU-TIGALARI CONJOINER +113D1 ; N # Lo TULU-TIGALARI REPHA +113D2 ; N # Mn TULU-TIGALARI GEMINATION MARK +113D3 ; N # Lo TULU-TIGALARI SIGN PLUTA +113D4..113D5 ; N # Po [2] TULU-TIGALARI DANDA..TULU-TIGALARI DOUBLE DANDA +113D7..113D8 ; N # Po [2] TULU-TIGALARI SIGN OM PUSHPIKA..TULU-TIGALARI SIGN SHRII PUSHPIKA +113E1..113E2 ; N # Mn [2] TULU-TIGALARI VEDIC TONE SVARITA..TULU-TIGALARI VEDIC TONE ANUDATTA 11400..11434 ; N # Lo [53] NEWA LETTER A..NEWA LETTER HA 11435..11437 ; N # Mc [3] NEWA VOWEL SIGN AA..NEWA VOWEL SIGN II 11438..1143F ; N # Mn [8] NEWA VOWEL SIGN U..NEWA VOWEL SIGN AI @@ -2123,8 +2160,11 @@ FFFD ; A # So REPLACEMENT CHARACTER 116B8 ; N # Lo TAKRI LETTER ARCHAIC KHA 116B9 ; N # Po TAKRI ABBREVIATION SIGN 116C0..116C9 ; N # Nd [10] TAKRI DIGIT ZERO..TAKRI DIGIT NINE +116D0..116E3 ; N # Nd [20] MYANMAR PAO DIGIT ZERO..MYANMAR EASTERN PWO KAREN DIGIT NINE 11700..1171A ; N # Lo [27] AHOM LETTER KA..AHOM LETTER ALTERNATE BA -1171D..1171F ; N # Mn [3] AHOM CONSONANT SIGN MEDIAL LA..AHOM CONSONANT SIGN MEDIAL LIGATING RA +1171D ; N # Mn AHOM CONSONANT SIGN MEDIAL LA +1171E ; N # Mc AHOM CONSONANT SIGN MEDIAL RA +1171F ; N # Mn AHOM CONSONANT SIGN MEDIAL LIGATING RA 11720..11721 ; N # Mc [2] AHOM VOWEL SIGN A..AHOM VOWEL SIGN AA 11722..11725 ; N # Mn [4] AHOM VOWEL SIGN I..AHOM VOWEL SIGN UU 11726 ; N # Mc AHOM VOWEL SIGN E @@ -2195,6 +2235,9 @@ FFFD ; A # So REPLACEMENT CHARACTER 11AB0..11ABF ; N # Lo [16] CANADIAN SYLLABICS NATTILIK HI..CANADIAN SYLLABICS SPA 11AC0..11AF8 ; N # Lo [57] PAU CIN HAU LETTER PA..PAU CIN HAU GLOTTAL STOP FINAL 11B00..11B09 ; N # Po [10] DEVANAGARI HEAD MARK..DEVANAGARI SIGN MINDU +11BC0..11BE0 ; N # Lo [33] SUNUWAR LETTER DEVI..SUNUWAR LETTER KLOKO +11BE1 ; N # Po SUNUWAR SIGN PVO +11BF0..11BF9 ; N # Nd [10] SUNUWAR DIGIT ZERO..SUNUWAR DIGIT NINE 11C00..11C08 ; N # Lo [9] BHAIKSUKI LETTER A..BHAIKSUKI LETTER VOCALIC L 11C0A..11C2E ; N # Lo [37] BHAIKSUKI LETTER E..BHAIKSUKI LETTER HA 11C2F ; N # Mc BHAIKSUKI VOWEL SIGN AA @@ -2253,6 +2296,7 @@ FFFD ; A # So REPLACEMENT CHARACTER 11F42 ; N # Mn KAWI CONJOINER 11F43..11F4F ; N # Po [13] KAWI DANDA..KAWI PUNCTUATION CLOSING SPIRAL 11F50..11F59 ; N # Nd [10] KAWI DIGIT ZERO..KAWI DIGIT NINE +11F5A ; N # Mn KAWI SIGN NUKTA 11FB0 ; N # Lo LISU LETTER YHA 11FC0..11FD4 ; N # No [21] TAMIL FRACTION ONE THREE-HUNDRED-AND-TWENTIETH..TAMIL FRACTION DOWNSCALING FACTOR KIIZH 11FD5..11FDC ; N # So [8] TAMIL SIGN NEL..TAMIL SIGN MUKKURUNI @@ -2270,7 +2314,13 @@ FFFD ; A # So REPLACEMENT CHARACTER 13440 ; N # Mn EGYPTIAN HIEROGLYPH MIRROR HORIZONTALLY 13441..13446 ; N # Lo [6] EGYPTIAN HIEROGLYPH FULL BLANK..EGYPTIAN HIEROGLYPH WIDE LOST SIGN 13447..13455 ; N # Mn [15] EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT TOP START..EGYPTIAN HIEROGLYPH MODIFIER DAMAGED +13460..143FA ; N # Lo [3995] EGYPTIAN HIEROGLYPH-13460..EGYPTIAN HIEROGLYPH-143FA 14400..14646 ; N # Lo [583] ANATOLIAN HIEROGLYPH A001..ANATOLIAN HIEROGLYPH A530 +16100..1611D ; N # Lo [30] GURUNG KHEMA LETTER A..GURUNG KHEMA LETTER SA +1611E..16129 ; N # Mn [12] GURUNG KHEMA VOWEL SIGN AA..GURUNG KHEMA VOWEL LENGTH MARK +1612A..1612C ; N # Mc [3] GURUNG KHEMA CONSONANT SIGN MEDIAL YA..GURUNG KHEMA CONSONANT SIGN MEDIAL HA +1612D..1612F ; N # Mn [3] GURUNG KHEMA SIGN ANUSVARA..GURUNG KHEMA SIGN THOLHOMA +16130..16139 ; N # Nd [10] GURUNG KHEMA DIGIT ZERO..GURUNG KHEMA DIGIT NINE 16800..16A38 ; N # Lo [569] BAMUM LETTER PHASE-A NGKUE MFON..BAMUM LETTER PHASE-F VUEQ 16A40..16A5E ; N # Lo [31] MRO LETTER TA..MRO LETTER TEK 16A60..16A69 ; N # Nd [10] MRO DIGIT ZERO..MRO DIGIT NINE @@ -2291,6 +2341,11 @@ FFFD ; A # So REPLACEMENT CHARACTER 16B5B..16B61 ; N # No [7] PAHAWH HMONG NUMBER TENS..PAHAWH HMONG NUMBER TRILLIONS 16B63..16B77 ; N # Lo [21] PAHAWH HMONG SIGN VOS LUB..PAHAWH HMONG SIGN CIM NRES TOS 16B7D..16B8F ; N # Lo [19] PAHAWH HMONG CLAN SIGN TSHEEJ..PAHAWH HMONG CLAN SIGN VWJ +16D40..16D42 ; N # Lm [3] KIRAT RAI SIGN ANUSVARA..KIRAT RAI SIGN VISARGA +16D43..16D6A ; N # Lo [40] KIRAT RAI LETTER A..KIRAT RAI VOWEL SIGN AU +16D6B..16D6C ; N # Lm [2] KIRAT RAI SIGN VIRAMA..KIRAT RAI SIGN SAAT +16D6D..16D6F ; N # Po [3] KIRAT RAI SIGN YUPI..KIRAT RAI DOUBLE DANDA +16D70..16D79 ; N # Nd [10] KIRAT RAI DIGIT ZERO..KIRAT RAI DIGIT NINE 16E40..16E7F ; N # L& [64] MEDEFAIDRIN CAPITAL LETTER M..MEDEFAIDRIN SMALL LETTER Y 16E80..16E96 ; N # No [23] MEDEFAIDRIN DIGIT ZERO..MEDEFAIDRIN DIGIT THREE ALTERNATE FORM 16E97..16E9A ; N # Po [4] MEDEFAIDRIN COMMA..MEDEFAIDRIN EXCLAMATION OH @@ -2308,6 +2363,7 @@ FFFD ; A # So REPLACEMENT CHARACTER 17000..187F7 ; W # Lo [6136] TANGUT IDEOGRAPH-17000..TANGUT IDEOGRAPH-187F7 18800..18AFF ; W # Lo [768] TANGUT COMPONENT-001..TANGUT COMPONENT-768 18B00..18CD5 ; W # Lo [470] KHITAN SMALL SCRIPT CHARACTER-18B00..KHITAN SMALL SCRIPT CHARACTER-18CD5 +18CFF ; W # Lo KHITAN SMALL SCRIPT CHARACTER-18CFF 18D00..18D08 ; W # Lo [9] TANGUT IDEOGRAPH-18D00..TANGUT IDEOGRAPH-18D08 1AFF0..1AFF3 ; W # Lm [4] KATAKANA LETTER MINNAN TONE-2..KATAKANA LETTER MINNAN TONE-5 1AFF5..1AFFB ; W # Lm [7] KATAKANA LETTER MINNAN TONE-7..KATAKANA LETTER MINNAN NASALIZED TONE-5 @@ -2327,6 +2383,9 @@ FFFD ; A # So REPLACEMENT CHARACTER 1BC9D..1BC9E ; N # Mn [2] DUPLOYAN THICK LETTER SELECTOR..DUPLOYAN DOUBLE MARK 1BC9F ; N # Po DUPLOYAN PUNCTUATION CHINOOK FULL STOP 1BCA0..1BCA3 ; N # Cf [4] SHORTHAND FORMAT LETTER OVERLAP..SHORTHAND FORMAT UP STEP +1CC00..1CCEF ; N # So [240] UP-POINTING GO-KART..OUTLINED LATIN CAPITAL LETTER Z +1CCF0..1CCF9 ; N # Nd [10] OUTLINED DIGIT ZERO..OUTLINED DIGIT NINE +1CD00..1CEB3 ; N # So [436] BLOCK OCTANT-3..BLACK RIGHT TRIANGLE CARET 1CF00..1CF2D ; N # Mn [46] ZNAMENNY COMBINING MARK GORAZDO NIZKO S KRYZHEM ON LEFT..ZNAMENNY COMBINING MARK KRYZH ON LEFT 1CF30..1CF46 ; N # Mn [23] ZNAMENNY COMBINING TONAL RANGE MARK MRACHNO..ZNAMENNY PRIZNAK MODIFIER ROG 1CF50..1CFC3 ; N # So [116] ZNAMENNY NEUME KRYUK..ZNAMENNY NEUME PAUK @@ -2349,8 +2408,9 @@ FFFD ; A # So REPLACEMENT CHARACTER 1D245 ; N # So GREEK MUSICAL LEIMMA 1D2C0..1D2D3 ; N # No [20] KAKTOVIK NUMERAL ZERO..KAKTOVIK NUMERAL NINETEEN 1D2E0..1D2F3 ; N # No [20] MAYAN NUMERAL ZERO..MAYAN NUMERAL NINETEEN -1D300..1D356 ; N # So [87] MONOGRAM FOR EARTH..TETRAGRAM FOR FOSTERING -1D360..1D378 ; N # No [25] COUNTING ROD UNIT DIGIT ONE..TALLY MARK FIVE +1D300..1D356 ; W # So [87] MONOGRAM FOR EARTH..TETRAGRAM FOR FOSTERING +1D360..1D376 ; W # No [23] COUNTING ROD UNIT DIGIT ONE..IDEOGRAPHIC TALLY MARK FIVE +1D377..1D378 ; N # No [2] TALLY MARK ONE..TALLY MARK FIVE 1D400..1D454 ; N # L& [85] MATHEMATICAL BOLD CAPITAL A..MATHEMATICAL ITALIC SMALL G 1D456..1D49C ; N # L& [71] MATHEMATICAL ITALIC SMALL I..MATHEMATICAL SCRIPT CAPITAL A 1D49E..1D49F ; N # Lu [2] MATHEMATICAL SCRIPT CAPITAL C..MATHEMATICAL SCRIPT CAPITAL D @@ -2431,6 +2491,11 @@ FFFD ; A # So REPLACEMENT CHARACTER 1E4EB ; N # Lm NAG MUNDARI SIGN OJOD 1E4EC..1E4EF ; N # Mn [4] NAG MUNDARI SIGN MUHOR..NAG MUNDARI SIGN SUTUH 1E4F0..1E4F9 ; N # Nd [10] NAG MUNDARI DIGIT ZERO..NAG MUNDARI DIGIT NINE +1E5D0..1E5ED ; N # Lo [30] OL ONAL LETTER O..OL ONAL LETTER EG +1E5EE..1E5EF ; N # Mn [2] OL ONAL SIGN MU..OL ONAL SIGN IKIR +1E5F0 ; N # Lo OL ONAL SIGN HODDOND +1E5F1..1E5FA ; N # Nd [10] OL ONAL DIGIT ZERO..OL ONAL DIGIT NINE +1E5FF ; N # Po OL ONAL ABBREVIATION SIGN 1E7E0..1E7E6 ; N # Lo [7] ETHIOPIC SYLLABLE HHYA..ETHIOPIC SYLLABLE HHYO 1E7E8..1E7EB ; N # Lo [4] ETHIOPIC SYLLABLE GURAGE HHWA..ETHIOPIC SYLLABLE HHWE 1E7ED..1E7EE ; N # Lo [2] ETHIOPIC SYLLABLE GURAGE MWI..ETHIOPIC SYLLABLE GURAGE MWEE @@ -2574,7 +2639,8 @@ FFFD ; A # So REPLACEMENT CHARACTER 1F850..1F859 ; N # So [10] LEFTWARDS SANS-SERIF ARROW..UP DOWN SANS-SERIF ARROW 1F860..1F887 ; N # So [40] WIDE-HEADED LEFTWARDS LIGHT BARB ARROW..WIDE-HEADED SOUTH WEST VERY HEAVY BARB ARROW 1F890..1F8AD ; N # So [30] LEFTWARDS TRIANGLE ARROWHEAD..WHITE ARROW SHAFT WIDTH TWO THIRDS -1F8B0..1F8B1 ; N # So [2] ARROW POINTING UPWARDS THEN NORTH WEST..ARROW POINTING RIGHTWARDS THEN CURVING SOUTH WEST +1F8B0..1F8BB ; N # So [12] ARROW POINTING UPWARDS THEN NORTH WEST..SOUTH WEST ARROW FROM BAR +1F8C0..1F8C1 ; N # So [2] LEFTWARDS ARROW FROM DOWNWARDS ARROW..RIGHTWARDS ARROW FROM DOWNWARDS ARROW 1F900..1F90B ; N # So [12] CIRCLED CROSS FORMEE WITH FOUR DOTS..DOWNWARD FACING NOTCHED HOOK WITH DOT 1F90C..1F93A ; W # So [47] PINCHED FINGERS..FENCER 1F93B ; N # So MODERN PENTATHLON @@ -2584,14 +2650,13 @@ FFFD ; A # So REPLACEMENT CHARACTER 1FA00..1FA53 ; N # So [84] NEUTRAL CHESS KING..BLACK CHESS KNIGHT-BISHOP 1FA60..1FA6D ; N # So [14] XIANGQI RED GENERAL..XIANGQI BLACK SOLDIER 1FA70..1FA7C ; W # So [13] BALLET SHOES..CRUTCH -1FA80..1FA88 ; W # So [9] YO-YO..FLUTE -1FA90..1FABD ; W # So [46] RINGED PLANET..WING -1FABF..1FAC5 ; W # So [7] GOOSE..PERSON WITH CROWN -1FACE..1FADB ; W # So [14] MOOSE..PEA POD -1FAE0..1FAE8 ; W # So [9] MELTING FACE..SHAKING FACE +1FA80..1FA89 ; W # So [10] YO-YO..HARP +1FA8F..1FAC6 ; W # So [56] SHOVEL..FINGERPRINT +1FACE..1FADC ; W # So [15] MOOSE..ROOT VEGETABLE +1FADF..1FAE9 ; W # So [11] SPLATTER..FACE WITH BAGS UNDER EYES 1FAF0..1FAF8 ; W # So [9] HAND WITH INDEX FINGER AND THUMB CROSSED..RIGHTWARDS PUSHING HAND 1FB00..1FB92 ; N # So [147] BLOCK SEXTANT-1..UPPER HALF INVERSE MEDIUM SHADE AND LOWER HALF BLOCK -1FB94..1FBCA ; N # So [55] LEFT HALF INVERSE MEDIUM SHADE AND RIGHT HALF BLOCK..WHITE UP-POINTING CHEVRON +1FB94..1FBEF ; N # So [92] LEFT HALF INVERSE MEDIUM SHADE AND RIGHT HALF BLOCK..TOP LEFT JUSTIFIED LOWER RIGHT QUARTER BLACK CIRCLE 1FBF0..1FBF9 ; N # Nd [10] SEGMENTED DIGIT ZERO..SEGMENTED DIGIT NINE 20000..2A6DF ; W # Lo [42720] CJK UNIFIED IDEOGRAPH-20000..CJK UNIFIED IDEOGRAPH-2A6DF 2A6E0..2A6FF ; W # Cn [32] <reserved-2A6E0>..<reserved-2A6FF> diff --git a/Master/texmf-dist/tex/generic/unicode-data/GraphemeBreakProperty.txt b/Master/texmf-dist/tex/generic/unicode-data/GraphemeBreakProperty.txt index 12453cbdb54..a863397ddab 100644 --- a/Master/texmf-dist/tex/generic/unicode-data/GraphemeBreakProperty.txt +++ b/Master/texmf-dist/tex/generic/unicode-data/GraphemeBreakProperty.txt @@ -1,8 +1,8 @@ -# GraphemeBreakProperty-15.1.0.txt -# Date: 2023-01-05, 20:34:41 GMT -# © 2023 Unicode®, Inc. +# GraphemeBreakProperty-16.0.0.txt +# Date: 2024-05-31, 18:09:38 GMT +# © 2024 Unicode®, Inc. # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries. -# For terms of use, see https://www.unicode.org/terms_of_use.html +# For terms of use and license, see https://www.unicode.org/terms_of_use.html # # Unicode Character Database # For documentation, see https://www.unicode.org/reports/tr44/ @@ -27,6 +27,7 @@ 110BD ; Prepend # Cf KAITHI NUMBER SIGN 110CD ; Prepend # Cf KAITHI NUMBER SIGN ABOVE 111C2..111C3 ; Prepend # Lo [2] SHARADA SIGN JIHVAMULIYA..SHARADA SIGN UPADHMANIYA +113D1 ; Prepend # Lo TULU-TIGALARI REPHA 1193F ; Prepend # Lo DIVES AKURU PREFIXED NASAL SIGN 11941 ; Prepend # Lo DIVES AKURU INITIAL RA 11A3A ; Prepend # Lo ZANABAZAR SQUARE CLUSTER-INITIAL LETTER RA @@ -34,7 +35,7 @@ 11D46 ; Prepend # Lo MASARAM GONDI REPHA 11F02 ; Prepend # Lo KAWI SIGN REPHA -# Total code points: 27 +# Total code points: 28 # ================================================ @@ -106,7 +107,7 @@ E01F0..E0FFF ; Control # Cn [3600] <reserved-E01F0>..<reserved-E0FFF> 0825..0827 ; Extend # Mn [3] SAMARITAN VOWEL SIGN SHORT A..SAMARITAN VOWEL SIGN U 0829..082D ; Extend # Mn [5] SAMARITAN VOWEL SIGN LONG I..SAMARITAN MARK NEQUDAA 0859..085B ; Extend # Mn [3] MANDAIC AFFRICATION MARK..MANDAIC GEMINATION MARK -0898..089F ; Extend # Mn [8] ARABIC SMALL HIGH WORD AL-JUZ..ARABIC HALF MADDA OVER MADDA +0897..089F ; Extend # Mn [9] ARABIC PEPET..ARABIC HALF MADDA OVER MADDA 08CA..08E1 ; Extend # Mn [24] ARABIC SMALL HIGH FARSI YEH..ARABIC SMALL HIGH SIGN SAFHA 08E3..0902 ; Extend # Mn [32] ARABIC TURNED DAMMA BELOW..DEVANAGARI SIGN ANUSVARA 093A ; Extend # Mn DEVANAGARI VOWEL SIGN OE @@ -163,8 +164,11 @@ E01F0..E0FFF ; Control # Cn [3600] <reserved-E01F0>..<reserved-E0FFF> 0C81 ; Extend # Mn KANNADA SIGN CANDRABINDU 0CBC ; Extend # Mn KANNADA SIGN NUKTA 0CBF ; Extend # Mn KANNADA VOWEL SIGN I +0CC0 ; Extend # Mc KANNADA VOWEL SIGN II 0CC2 ; Extend # Mc KANNADA VOWEL SIGN UU 0CC6 ; Extend # Mn KANNADA VOWEL SIGN E +0CC7..0CC8 ; Extend # Mc [2] KANNADA VOWEL SIGN EE..KANNADA VOWEL SIGN AI +0CCA..0CCB ; Extend # Mc [2] KANNADA VOWEL SIGN O..KANNADA VOWEL SIGN OO 0CCC..0CCD ; Extend # Mn [2] KANNADA VOWEL SIGN AU..KANNADA SIGN VIRAMA 0CD5..0CD6 ; Extend # Mc [2] KANNADA LENGTH MARK..KANNADA AI LENGTH MARK 0CE2..0CE3 ; Extend # Mn [2] KANNADA VOWEL SIGN VOCALIC L..KANNADA VOWEL SIGN VOCALIC LL @@ -210,7 +214,9 @@ E01F0..E0FFF ; Control # Cn [3600] <reserved-E01F0>..<reserved-E0FFF> 109D ; Extend # Mn MYANMAR VOWEL SIGN AITON AI 135D..135F ; Extend # Mn [3] ETHIOPIC COMBINING GEMINATION AND VOWEL LENGTH MARK..ETHIOPIC COMBINING GEMINATION MARK 1712..1714 ; Extend # Mn [3] TAGALOG VOWEL SIGN I..TAGALOG SIGN VIRAMA +1715 ; Extend # Mc TAGALOG SIGN PAMUDPOD 1732..1733 ; Extend # Mn [2] HANUNOO VOWEL SIGN I..HANUNOO VOWEL SIGN U +1734 ; Extend # Mc HANUNOO SIGN PAMUDPOD 1752..1753 ; Extend # Mn [2] BUHID VOWEL SIGN I..BUHID VOWEL SIGN U 1772..1773 ; Extend # Mn [2] TAGBANWA VOWEL SIGN I..TAGBANWA VOWEL SIGN U 17B4..17B5 ; Extend # Mn [2] KHMER VOWEL INHERENT AQ..KHMER VOWEL INHERENT AA @@ -242,17 +248,22 @@ E01F0..E0FFF ; Control # Cn [3600] <reserved-E01F0>..<reserved-E0FFF> 1B34 ; Extend # Mn BALINESE SIGN REREKAN 1B35 ; Extend # Mc BALINESE VOWEL SIGN TEDUNG 1B36..1B3A ; Extend # Mn [5] BALINESE VOWEL SIGN ULU..BALINESE VOWEL SIGN RA REPA +1B3B ; Extend # Mc BALINESE VOWEL SIGN RA REPA TEDUNG 1B3C ; Extend # Mn BALINESE VOWEL SIGN LA LENGA +1B3D ; Extend # Mc BALINESE VOWEL SIGN LA LENGA TEDUNG 1B42 ; Extend # Mn BALINESE VOWEL SIGN PEPET +1B43..1B44 ; Extend # Mc [2] BALINESE VOWEL SIGN PEPET TEDUNG..BALINESE ADEG ADEG 1B6B..1B73 ; Extend # Mn [9] BALINESE MUSICAL SYMBOL COMBINING TEGEH..BALINESE MUSICAL SYMBOL COMBINING GONG 1B80..1B81 ; Extend # Mn [2] SUNDANESE SIGN PANYECEK..SUNDANESE SIGN PANGLAYAR 1BA2..1BA5 ; Extend # Mn [4] SUNDANESE CONSONANT SIGN PANYAKRA..SUNDANESE VOWEL SIGN PANYUKU 1BA8..1BA9 ; Extend # Mn [2] SUNDANESE VOWEL SIGN PAMEPET..SUNDANESE VOWEL SIGN PANEULEUNG +1BAA ; Extend # Mc SUNDANESE SIGN PAMAAEH 1BAB..1BAD ; Extend # Mn [3] SUNDANESE SIGN VIRAMA..SUNDANESE CONSONANT SIGN PASANGAN WA 1BE6 ; Extend # Mn BATAK SIGN TOMPI 1BE8..1BE9 ; Extend # Mn [2] BATAK VOWEL SIGN PAKPAK E..BATAK VOWEL SIGN EE 1BED ; Extend # Mn BATAK VOWEL SIGN KARO O 1BEF..1BF1 ; Extend # Mn [3] BATAK VOWEL SIGN U FOR SIMALUNGUN SA..BATAK CONSONANT SIGN H +1BF2..1BF3 ; Extend # Mc [2] BATAK PANGOLAT..BATAK PANONGONAN 1C2C..1C33 ; Extend # Mn [8] LEPCHA VOWEL SIGN E..LEPCHA CONSONANT SIGN T 1C36..1C37 ; Extend # Mn [2] LEPCHA SIGN RAN..LEPCHA SIGN NUKTA 1CD0..1CD2 ; Extend # Mn [3] VEDIC TONE KARSHANA..VEDIC TONE PRENKHA @@ -289,10 +300,12 @@ A8E0..A8F1 ; Extend # Mn [18] COMBINING DEVANAGARI DIGIT ZERO..COMBINING DEV A8FF ; Extend # Mn DEVANAGARI VOWEL SIGN AY A926..A92D ; Extend # Mn [8] KAYAH LI VOWEL UE..KAYAH LI TONE CALYA PLOPHU A947..A951 ; Extend # Mn [11] REJANG VOWEL SIGN I..REJANG CONSONANT SIGN R +A953 ; Extend # Mc REJANG VIRAMA A980..A982 ; Extend # Mn [3] JAVANESE SIGN PANYANGGA..JAVANESE SIGN LAYAR A9B3 ; Extend # Mn JAVANESE SIGN CECAK TELU A9B6..A9B9 ; Extend # Mn [4] JAVANESE VOWEL SIGN WULU..JAVANESE VOWEL SIGN SUKU MENDUT A9BC..A9BD ; Extend # Mn [2] JAVANESE VOWEL SIGN PEPET..JAVANESE CONSONANT SIGN KERET +A9C0 ; Extend # Mc JAVANESE PANGKON A9E5 ; Extend # Mn MYANMAR SIGN SHAN SAW AA29..AA2E ; Extend # Mn [6] CHAM VOWEL SIGN AA..CHAM VOWEL SIGN OE AA31..AA32 ; Extend # Mn [2] CHAM VOWEL SIGN AU..CHAM VOWEL SIGN UE @@ -324,8 +337,9 @@ FF9E..FF9F ; Extend # Lm [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HALFWIDT 10A3F ; Extend # Mn KHAROSHTHI VIRAMA 10AE5..10AE6 ; Extend # Mn [2] MANICHAEAN ABBREVIATION MARK ABOVE..MANICHAEAN ABBREVIATION MARK BELOW 10D24..10D27 ; Extend # Mn [4] HANIFI ROHINGYA SIGN HARBAHAY..HANIFI ROHINGYA SIGN TASSI +10D69..10D6D ; Extend # Mn [5] GARAY VOWEL SIGN E..GARAY CONSONANT NASALIZATION MARK 10EAB..10EAC ; Extend # Mn [2] YEZIDI COMBINING HAMZA MARK..YEZIDI COMBINING MADDA MARK -10EFD..10EFF ; Extend # Mn [3] ARABIC SMALL LOW WORD SAKTA..ARABIC SMALL LOW WORD MADDA +10EFC..10EFF ; Extend # Mn [4] ARABIC COMBINING ALEF OVERLAY..ARABIC SMALL LOW WORD MADDA 10F46..10F50 ; Extend # Mn [11] SOGDIAN COMBINING DOT BELOW..SOGDIAN COMBINING STROKE BELOW 10F82..10F85 ; Extend # Mn [4] OLD UYGHUR COMBINING DOT ABOVE..OLD UYGHUR COMBINING TWO DOTS BELOW 11001 ; Extend # Mn BRAHMI SIGN ANUSVARA @@ -342,10 +356,12 @@ FF9E..FF9F ; Extend # Lm [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HALFWIDT 11173 ; Extend # Mn MAHAJANI SIGN NUKTA 11180..11181 ; Extend # Mn [2] SHARADA SIGN CANDRABINDU..SHARADA SIGN ANUSVARA 111B6..111BE ; Extend # Mn [9] SHARADA VOWEL SIGN U..SHARADA VOWEL SIGN O +111C0 ; Extend # Mc SHARADA SIGN VIRAMA 111C9..111CC ; Extend # Mn [4] SHARADA SANDHI MARK..SHARADA EXTRA SHORT VOWEL MARK 111CF ; Extend # Mn SHARADA SIGN INVERTED CANDRABINDU 1122F..11231 ; Extend # Mn [3] KHOJKI VOWEL SIGN U..KHOJKI VOWEL SIGN AI 11234 ; Extend # Mn KHOJKI SIGN ANUSVARA +11235 ; Extend # Mc KHOJKI SIGN VIRAMA 11236..11237 ; Extend # Mn [2] KHOJKI SIGN NUKTA..KHOJKI SIGN SHADDA 1123E ; Extend # Mn KHOJKI SIGN SUKUN 11241 ; Extend # Mn KHOJKI VOWEL SIGN VOCALIC R @@ -355,9 +371,20 @@ FF9E..FF9F ; Extend # Lm [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HALFWIDT 1133B..1133C ; Extend # Mn [2] COMBINING BINDU BELOW..GRANTHA SIGN NUKTA 1133E ; Extend # Mc GRANTHA VOWEL SIGN AA 11340 ; Extend # Mn GRANTHA VOWEL SIGN II +1134D ; Extend # Mc GRANTHA SIGN VIRAMA 11357 ; Extend # Mc GRANTHA AU LENGTH MARK 11366..1136C ; Extend # Mn [7] COMBINING GRANTHA DIGIT ZERO..COMBINING GRANTHA DIGIT SIX 11370..11374 ; Extend # Mn [5] COMBINING GRANTHA LETTER A..COMBINING GRANTHA LETTER PA +113B8 ; Extend # Mc TULU-TIGALARI VOWEL SIGN AA +113BB..113C0 ; Extend # Mn [6] TULU-TIGALARI VOWEL SIGN U..TULU-TIGALARI VOWEL SIGN VOCALIC LL +113C2 ; Extend # Mc TULU-TIGALARI VOWEL SIGN EE +113C5 ; Extend # Mc TULU-TIGALARI VOWEL SIGN AI +113C7..113C9 ; Extend # Mc [3] TULU-TIGALARI VOWEL SIGN OO..TULU-TIGALARI AU LENGTH MARK +113CE ; Extend # Mn TULU-TIGALARI SIGN VIRAMA +113CF ; Extend # Mc TULU-TIGALARI SIGN LOOPED VIRAMA +113D0 ; Extend # Mn TULU-TIGALARI CONJOINER +113D2 ; Extend # Mn TULU-TIGALARI GEMINATION MARK +113E1..113E2 ; Extend # Mn [2] TULU-TIGALARI VEDIC TONE SVARITA..TULU-TIGALARI VEDIC TONE ANUDATTA 11438..1143F ; Extend # Mn [8] NEWA VOWEL SIGN U..NEWA VOWEL SIGN AI 11442..11444 ; Extend # Mn [3] NEWA SIGN VIRAMA..NEWA SIGN ANUSVARA 11446 ; Extend # Mn NEWA SIGN NUKTA @@ -379,14 +406,17 @@ FF9E..FF9F ; Extend # Lm [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HALFWIDT 116AB ; Extend # Mn TAKRI SIGN ANUSVARA 116AD ; Extend # Mn TAKRI VOWEL SIGN AA 116B0..116B5 ; Extend # Mn [6] TAKRI VOWEL SIGN U..TAKRI VOWEL SIGN AU +116B6 ; Extend # Mc TAKRI SIGN VIRAMA 116B7 ; Extend # Mn TAKRI SIGN NUKTA -1171D..1171F ; Extend # Mn [3] AHOM CONSONANT SIGN MEDIAL LA..AHOM CONSONANT SIGN MEDIAL LIGATING RA +1171D ; Extend # Mn AHOM CONSONANT SIGN MEDIAL LA +1171F ; Extend # Mn AHOM CONSONANT SIGN MEDIAL LIGATING RA 11722..11725 ; Extend # Mn [4] AHOM VOWEL SIGN I..AHOM VOWEL SIGN UU 11727..1172B ; Extend # Mn [5] AHOM VOWEL SIGN AW..AHOM SIGN KILLER 1182F..11837 ; Extend # Mn [9] DOGRA VOWEL SIGN U..DOGRA SIGN ANUSVARA 11839..1183A ; Extend # Mn [2] DOGRA SIGN VIRAMA..DOGRA SIGN NUKTA 11930 ; Extend # Mc DIVES AKURU VOWEL SIGN AA 1193B..1193C ; Extend # Mn [2] DIVES AKURU SIGN ANUSVARA..DIVES AKURU SIGN CANDRABINDU +1193D ; Extend # Mc DIVES AKURU SIGN HALANTA 1193E ; Extend # Mn DIVES AKURU VIRAMA 11943 ; Extend # Mn DIVES AKURU SIGN NUKTA 119D4..119D7 ; Extend # Mn [4] NANDINAGARI VOWEL SIGN U..NANDINAGARI VOWEL SIGN VOCALIC RR @@ -419,20 +449,25 @@ FF9E..FF9F ; Extend # Lm [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HALFWIDT 11F00..11F01 ; Extend # Mn [2] KAWI SIGN CANDRABINDU..KAWI SIGN ANUSVARA 11F36..11F3A ; Extend # Mn [5] KAWI VOWEL SIGN I..KAWI VOWEL SIGN VOCALIC R 11F40 ; Extend # Mn KAWI VOWEL SIGN EU +11F41 ; Extend # Mc KAWI SIGN KILLER 11F42 ; Extend # Mn KAWI CONJOINER +11F5A ; Extend # Mn KAWI SIGN NUKTA 13440 ; Extend # Mn EGYPTIAN HIEROGLYPH MIRROR HORIZONTALLY 13447..13455 ; Extend # Mn [15] EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT TOP START..EGYPTIAN HIEROGLYPH MODIFIER DAMAGED +1611E..16129 ; Extend # Mn [12] GURUNG KHEMA VOWEL SIGN AA..GURUNG KHEMA VOWEL LENGTH MARK +1612D..1612F ; Extend # Mn [3] GURUNG KHEMA SIGN ANUSVARA..GURUNG KHEMA SIGN THOLHOMA 16AF0..16AF4 ; Extend # Mn [5] BASSA VAH COMBINING HIGH TONE..BASSA VAH COMBINING HIGH-LOW TONE 16B30..16B36 ; Extend # Mn [7] PAHAWH HMONG MARK CIM TUB..PAHAWH HMONG MARK CIM TAUM 16F4F ; Extend # Mn MIAO SIGN CONSONANT MODIFIER BAR 16F8F..16F92 ; Extend # Mn [4] MIAO TONE RIGHT..MIAO TONE BELOW 16FE4 ; Extend # Mn KHITAN SMALL SCRIPT FILLER +16FF0..16FF1 ; Extend # Mc [2] VIETNAMESE ALTERNATE READING MARK CA..VIETNAMESE ALTERNATE READING MARK NHAY 1BC9D..1BC9E ; Extend # Mn [2] DUPLOYAN THICK LETTER SELECTOR..DUPLOYAN DOUBLE MARK 1CF00..1CF2D ; Extend # Mn [46] ZNAMENNY COMBINING MARK GORAZDO NIZKO S KRYZHEM ON LEFT..ZNAMENNY COMBINING MARK KRYZH ON LEFT 1CF30..1CF46 ; Extend # Mn [23] ZNAMENNY COMBINING TONAL RANGE MARK MRACHNO..ZNAMENNY PRIZNAK MODIFIER ROG -1D165 ; Extend # Mc MUSICAL SYMBOL COMBINING STEM +1D165..1D166 ; Extend # Mc [2] MUSICAL SYMBOL COMBINING STEM..MUSICAL SYMBOL COMBINING SPRECHGESANG STEM 1D167..1D169 ; Extend # Mn [3] MUSICAL SYMBOL COMBINING TREMOLO-1..MUSICAL SYMBOL COMBINING TREMOLO-3 -1D16E..1D172 ; Extend # Mc [5] MUSICAL SYMBOL COMBINING FLAG-1..MUSICAL SYMBOL COMBINING FLAG-5 +1D16D..1D172 ; Extend # Mc [6] MUSICAL SYMBOL COMBINING AUGMENTATION DOT..MUSICAL SYMBOL COMBINING FLAG-5 1D17B..1D182 ; Extend # Mn [8] MUSICAL SYMBOL COMBINING ACCENT..MUSICAL SYMBOL COMBINING LOURE 1D185..1D18B ; Extend # Mn [7] MUSICAL SYMBOL COMBINING DOIT..MUSICAL SYMBOL COMBINING TRIPLE TONGUE 1D1AA..1D1AD ; Extend # Mn [4] MUSICAL SYMBOL COMBINING DOWN BOW..MUSICAL SYMBOL COMBINING SNAP PIZZICATO @@ -453,13 +488,14 @@ FF9E..FF9F ; Extend # Lm [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HALFWIDT 1E2AE ; Extend # Mn TOTO SIGN RISING TONE 1E2EC..1E2EF ; Extend # Mn [4] WANCHO TONE TUP..WANCHO TONE KOINI 1E4EC..1E4EF ; Extend # Mn [4] NAG MUNDARI SIGN MUHOR..NAG MUNDARI SIGN SUTUH +1E5EE..1E5EF ; Extend # Mn [2] OL ONAL SIGN MU..OL ONAL SIGN IKIR 1E8D0..1E8D6 ; Extend # Mn [7] MENDE KIKAKUI COMBINING NUMBER TEENS..MENDE KIKAKUI COMBINING NUMBER MILLIONS 1E944..1E94A ; Extend # Mn [7] ADLAM ALIF LENGTHENER..ADLAM NUKTA 1F3FB..1F3FF ; Extend # Sk [5] EMOJI MODIFIER FITZPATRICK TYPE-1-2..EMOJI MODIFIER FITZPATRICK TYPE-6 E0020..E007F ; Extend # Cf [96] TAG SPACE..CANCEL TAG E0100..E01EF ; Extend # Mn [240] VARIATION SELECTOR-17..VARIATION SELECTOR-256 -# Total code points: 2130 +# Total code points: 2198 # ================================================ @@ -496,10 +532,8 @@ E0100..E01EF ; Extend # Mn [240] VARIATION SELECTOR-17..VARIATION SELECTOR-256 0C41..0C44 ; SpacingMark # Mc [4] TELUGU VOWEL SIGN U..TELUGU VOWEL SIGN VOCALIC RR 0C82..0C83 ; SpacingMark # Mc [2] KANNADA SIGN ANUSVARA..KANNADA SIGN VISARGA 0CBE ; SpacingMark # Mc KANNADA VOWEL SIGN AA -0CC0..0CC1 ; SpacingMark # Mc [2] KANNADA VOWEL SIGN II..KANNADA VOWEL SIGN U +0CC1 ; SpacingMark # Mc KANNADA VOWEL SIGN U 0CC3..0CC4 ; SpacingMark # Mc [2] KANNADA VOWEL SIGN VOCALIC R..KANNADA VOWEL SIGN VOCALIC RR -0CC7..0CC8 ; SpacingMark # Mc [2] KANNADA VOWEL SIGN EE..KANNADA VOWEL SIGN AI -0CCA..0CCB ; SpacingMark # Mc [2] KANNADA VOWEL SIGN O..KANNADA VOWEL SIGN OO 0CF3 ; SpacingMark # Mc KANNADA SIGN COMBINING ANUSVARA ABOVE RIGHT 0D02..0D03 ; SpacingMark # Mc [2] MALAYALAM SIGN ANUSVARA..MALAYALAM SIGN VISARGA 0D3F..0D40 ; SpacingMark # Mc [2] MALAYALAM VOWEL SIGN I..MALAYALAM VOWEL SIGN II @@ -517,8 +551,6 @@ E0100..E01EF ; Extend # Mn [240] VARIATION SELECTOR-17..VARIATION SELECTOR-256 103B..103C ; SpacingMark # Mc [2] MYANMAR CONSONANT SIGN MEDIAL YA..MYANMAR CONSONANT SIGN MEDIAL RA 1056..1057 ; SpacingMark # Mc [2] MYANMAR VOWEL SIGN VOCALIC R..MYANMAR VOWEL SIGN VOCALIC RR 1084 ; SpacingMark # Mc MYANMAR VOWEL SIGN SHAN E -1715 ; SpacingMark # Mc TAGALOG SIGN PAMUDPOD -1734 ; SpacingMark # Mc HANUNOO SIGN PAMUDPOD 17B6 ; SpacingMark # Mc KHMER VOWEL SIGN AA 17BE..17C5 ; SpacingMark # Mc [8] KHMER VOWEL SIGN OE..KHMER VOWEL SIGN AU 17C7..17C8 ; SpacingMark # Mc [2] KHMER SIGN REAHMUK..KHMER SIGN YUUKALEAPINTU @@ -531,17 +563,13 @@ E0100..E01EF ; Extend # Mn [240] VARIATION SELECTOR-17..VARIATION SELECTOR-256 1A57 ; SpacingMark # Mc TAI THAM CONSONANT SIGN LA TANG LAI 1A6D..1A72 ; SpacingMark # Mc [6] TAI THAM VOWEL SIGN OY..TAI THAM VOWEL SIGN THAM AI 1B04 ; SpacingMark # Mc BALINESE SIGN BISAH -1B3B ; SpacingMark # Mc BALINESE VOWEL SIGN RA REPA TEDUNG -1B3D..1B41 ; SpacingMark # Mc [5] BALINESE VOWEL SIGN LA LENGA TEDUNG..BALINESE VOWEL SIGN TALING REPA TEDUNG -1B43..1B44 ; SpacingMark # Mc [2] BALINESE VOWEL SIGN PEPET TEDUNG..BALINESE ADEG ADEG +1B3E..1B41 ; SpacingMark # Mc [4] BALINESE VOWEL SIGN TALING..BALINESE VOWEL SIGN TALING REPA TEDUNG 1B82 ; SpacingMark # Mc SUNDANESE SIGN PANGWISAD 1BA1 ; SpacingMark # Mc SUNDANESE CONSONANT SIGN PAMINGKAL 1BA6..1BA7 ; SpacingMark # Mc [2] SUNDANESE VOWEL SIGN PANAELAENG..SUNDANESE VOWEL SIGN PANOLONG -1BAA ; SpacingMark # Mc SUNDANESE SIGN PAMAAEH 1BE7 ; SpacingMark # Mc BATAK VOWEL SIGN E 1BEA..1BEC ; SpacingMark # Mc [3] BATAK VOWEL SIGN I..BATAK VOWEL SIGN O 1BEE ; SpacingMark # Mc BATAK VOWEL SIGN U -1BF2..1BF3 ; SpacingMark # Mc [2] BATAK PANGOLAT..BATAK PANONGONAN 1C24..1C2B ; SpacingMark # Mc [8] LEPCHA SUBJOINED LETTER YA..LEPCHA VOWEL SIGN UU 1C34..1C35 ; SpacingMark # Mc [2] LEPCHA CONSONANT SIGN NYIN-DO..LEPCHA CONSONANT SIGN KANG 1CE1 ; SpacingMark # Mc VEDIC TONE ATHARVAVEDIC INDEPENDENT SVARITA @@ -550,11 +578,11 @@ A823..A824 ; SpacingMark # Mc [2] SYLOTI NAGRI VOWEL SIGN A..SYLOTI NAGRI V A827 ; SpacingMark # Mc SYLOTI NAGRI VOWEL SIGN OO A880..A881 ; SpacingMark # Mc [2] SAURASHTRA SIGN ANUSVARA..SAURASHTRA SIGN VISARGA A8B4..A8C3 ; SpacingMark # Mc [16] SAURASHTRA CONSONANT SIGN HAARU..SAURASHTRA VOWEL SIGN AU -A952..A953 ; SpacingMark # Mc [2] REJANG CONSONANT SIGN H..REJANG VIRAMA +A952 ; SpacingMark # Mc REJANG CONSONANT SIGN H A983 ; SpacingMark # Mc JAVANESE SIGN WIGNYAN A9B4..A9B5 ; SpacingMark # Mc [2] JAVANESE VOWEL SIGN TARUNG..JAVANESE VOWEL SIGN TOLONG A9BA..A9BB ; SpacingMark # Mc [2] JAVANESE VOWEL SIGN TALING..JAVANESE VOWEL SIGN DIRGA MURE -A9BE..A9C0 ; SpacingMark # Mc [3] JAVANESE CONSONANT SIGN PENGKAL..JAVANESE PANGKON +A9BE..A9BF ; SpacingMark # Mc [2] JAVANESE CONSONANT SIGN PENGKAL..JAVANESE CONSONANT SIGN CAKRA AA2F..AA30 ; SpacingMark # Mc [2] CHAM VOWEL SIGN O..CHAM VOWEL SIGN AI AA33..AA34 ; SpacingMark # Mc [2] CHAM CONSONANT SIGN YA..CHAM CONSONANT SIGN RA AA4D ; SpacingMark # Mc CHAM CONSONANT SIGN FINAL H @@ -574,18 +602,20 @@ ABEC ; SpacingMark # Mc MEETEI MAYEK LUM IYEK 11145..11146 ; SpacingMark # Mc [2] CHAKMA VOWEL SIGN AA..CHAKMA VOWEL SIGN EI 11182 ; SpacingMark # Mc SHARADA SIGN VISARGA 111B3..111B5 ; SpacingMark # Mc [3] SHARADA VOWEL SIGN AA..SHARADA VOWEL SIGN II -111BF..111C0 ; SpacingMark # Mc [2] SHARADA VOWEL SIGN AU..SHARADA SIGN VIRAMA +111BF ; SpacingMark # Mc SHARADA VOWEL SIGN AU 111CE ; SpacingMark # Mc SHARADA VOWEL SIGN PRISHTHAMATRA E 1122C..1122E ; SpacingMark # Mc [3] KHOJKI VOWEL SIGN AA..KHOJKI VOWEL SIGN II 11232..11233 ; SpacingMark # Mc [2] KHOJKI VOWEL SIGN O..KHOJKI VOWEL SIGN AU -11235 ; SpacingMark # Mc KHOJKI SIGN VIRAMA 112E0..112E2 ; SpacingMark # Mc [3] KHUDAWADI VOWEL SIGN AA..KHUDAWADI VOWEL SIGN II 11302..11303 ; SpacingMark # Mc [2] GRANTHA SIGN ANUSVARA..GRANTHA SIGN VISARGA 1133F ; SpacingMark # Mc GRANTHA VOWEL SIGN I 11341..11344 ; SpacingMark # Mc [4] GRANTHA VOWEL SIGN U..GRANTHA VOWEL SIGN VOCALIC RR 11347..11348 ; SpacingMark # Mc [2] GRANTHA VOWEL SIGN EE..GRANTHA VOWEL SIGN AI -1134B..1134D ; SpacingMark # Mc [3] GRANTHA VOWEL SIGN OO..GRANTHA SIGN VIRAMA +1134B..1134C ; SpacingMark # Mc [2] GRANTHA VOWEL SIGN OO..GRANTHA VOWEL SIGN AU 11362..11363 ; SpacingMark # Mc [2] GRANTHA VOWEL SIGN VOCALIC L..GRANTHA VOWEL SIGN VOCALIC LL +113B9..113BA ; SpacingMark # Mc [2] TULU-TIGALARI VOWEL SIGN I..TULU-TIGALARI VOWEL SIGN II +113CA ; SpacingMark # Mc TULU-TIGALARI SIGN CANDRA ANUNASIKA +113CC..113CD ; SpacingMark # Mc [2] TULU-TIGALARI SIGN ANUSVARA..TULU-TIGALARI SIGN VISARGA 11435..11437 ; SpacingMark # Mc [3] NEWA VOWEL SIGN AA..NEWA VOWEL SIGN II 11440..11441 ; SpacingMark # Mc [2] NEWA VOWEL SIGN O..NEWA VOWEL SIGN AU 11445 ; SpacingMark # Mc NEWA SIGN VISARGA @@ -602,13 +632,12 @@ ABEC ; SpacingMark # Mc MEETEI MAYEK LUM IYEK 1163E ; SpacingMark # Mc MODI SIGN VISARGA 116AC ; SpacingMark # Mc TAKRI SIGN VISARGA 116AE..116AF ; SpacingMark # Mc [2] TAKRI VOWEL SIGN I..TAKRI VOWEL SIGN II -116B6 ; SpacingMark # Mc TAKRI SIGN VIRAMA +1171E ; SpacingMark # Mc AHOM CONSONANT SIGN MEDIAL RA 11726 ; SpacingMark # Mc AHOM VOWEL SIGN E 1182C..1182E ; SpacingMark # Mc [3] DOGRA VOWEL SIGN AA..DOGRA VOWEL SIGN II 11838 ; SpacingMark # Mc DOGRA SIGN VISARGA 11931..11935 ; SpacingMark # Mc [5] DIVES AKURU VOWEL SIGN I..DIVES AKURU VOWEL SIGN E 11937..11938 ; SpacingMark # Mc [2] DIVES AKURU VOWEL SIGN AI..DIVES AKURU VOWEL SIGN O -1193D ; SpacingMark # Mc DIVES AKURU SIGN HALANTA 11940 ; SpacingMark # Mc DIVES AKURU MEDIAL YA 11942 ; SpacingMark # Mc DIVES AKURU MEDIAL RA 119D1..119D3 ; SpacingMark # Mc [3] NANDINAGARI VOWEL SIGN AA..NANDINAGARI VOWEL SIGN II @@ -629,13 +658,10 @@ ABEC ; SpacingMark # Mc MEETEI MAYEK LUM IYEK 11F03 ; SpacingMark # Mc KAWI SIGN VISARGA 11F34..11F35 ; SpacingMark # Mc [2] KAWI VOWEL SIGN AA..KAWI VOWEL SIGN ALTERNATE AA 11F3E..11F3F ; SpacingMark # Mc [2] KAWI VOWEL SIGN E..KAWI VOWEL SIGN AI -11F41 ; SpacingMark # Mc KAWI SIGN KILLER +1612A..1612C ; SpacingMark # Mc [3] GURUNG KHEMA CONSONANT SIGN MEDIAL YA..GURUNG KHEMA CONSONANT SIGN MEDIAL HA 16F51..16F87 ; SpacingMark # Mc [55] MIAO SIGN ASPIRATION..MIAO VOWEL SIGN UI -16FF0..16FF1 ; SpacingMark # Mc [2] VIETNAMESE ALTERNATE READING MARK CA..VIETNAMESE ALTERNATE READING MARK NHAY -1D166 ; SpacingMark # Mc MUSICAL SYMBOL COMBINING SPRECHGESANG STEM -1D16D ; SpacingMark # Mc MUSICAL SYMBOL COMBINING AUGMENTATION DOT -# Total code points: 395 +# Total code points: 378 # ================================================ @@ -648,8 +674,10 @@ A960..A97C ; L # Lo [29] HANGUL CHOSEONG TIKEUT-MIEUM..HANGUL CHOSEONG SSANG 1160..11A7 ; V # Lo [72] HANGUL JUNGSEONG FILLER..HANGUL JUNGSEONG O-YAE D7B0..D7C6 ; V # Lo [23] HANGUL JUNGSEONG O-YEO..HANGUL JUNGSEONG ARAEA-E +16D63 ; V # Lo KIRAT RAI VOWEL SIGN AA +16D67..16D6A ; V # Lo [4] KIRAT RAI VOWEL SIGN E..KIRAT RAI VOWEL SIGN AU -# Total code points: 95 +# Total code points: 100 # ================================================ diff --git a/Master/texmf-dist/tex/generic/unicode-data/LineBreak.txt b/Master/texmf-dist/tex/generic/unicode-data/LineBreak.txt index b6bc6793927..3ce25821747 100644 --- a/Master/texmf-dist/tex/generic/unicode-data/LineBreak.txt +++ b/Master/texmf-dist/tex/generic/unicode-data/LineBreak.txt @@ -1,8 +1,8 @@ -# LineBreak-15.1.0.txt -# Date: 2023-07-28, 13:19:22 GMT [KW] -# © 2023 Unicode®, Inc. +# LineBreak-16.0.0.txt +# Date: 2024-07-29, 16:26:55 GMT +# © 2024 Unicode®, Inc. # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries. -# For terms of use, see https://www.unicode.org/terms_of_use.html +# For terms of use and license, see https://www.unicode.org/terms_of_use.html # # Unicode Character Database # For documentation, see https://www.unicode.org/reports/tr44/ @@ -280,7 +280,7 @@ 0888 ; AL # Sk ARABIC RAISED ROUND DOT 0889..088E ; AL # Lo [6] ARABIC LETTER NOON WITH INVERTED SMALL V..ARABIC VERTICAL TAIL 0890..0891 ; NU # Cf [2] ARABIC POUND MARK ABOVE..ARABIC PIASTRE MARK ABOVE -0898..089F ; CM # Mn [8] ARABIC SMALL HIGH WORD AL-JUZ..ARABIC HALF MADDA OVER MADDA +0897..089F ; CM # Mn [9] ARABIC PEPET..ARABIC HALF MADDA OVER MADDA 08A0..08C8 ; AL # Lo [41] ARABIC LETTER BEH WITH SMALL V BELOW..ARABIC LETTER GRAF 08C9 ; AL # Lm ARABIC SMALL FARSI YEH 08CA..08E1 ; CM # Mn [24] ARABIC SMALL HIGH FARSI YEH..ARABIC SMALL HIGH SIGN SAFHA @@ -748,7 +748,7 @@ 1980..19AB ; SA # Lo [44] NEW TAI LUE LETTER HIGH QA..NEW TAI LUE LETTER LOW SUA 19B0..19C9 ; SA # Lo [26] NEW TAI LUE VOWEL SIGN VOWEL SHORTENER..NEW TAI LUE TONE MARK-2 19D0..19D9 ; NU # Nd [10] NEW TAI LUE DIGIT ZERO..NEW TAI LUE DIGIT NINE -19DA ; SA # No NEW TAI LUE THAM DIGIT ONE +19DA ; NU # No NEW TAI LUE THAM DIGIT ONE 19DE..19DF ; SA # So [2] NEW TAI LUE SIGN LAE..NEW TAI LUE SIGN LAEV 19E0..19FF ; AL # So [32] KHMER SYMBOL PATHAMASAT..KHMER SYMBOL DAP-PRAM ROC 1A00..1A16 ; AL # Lo [23] BUGINESE LETTER KA..BUGINESE LETTER HA @@ -790,14 +790,15 @@ 1B43 ; CM # Mc BALINESE VOWEL SIGN PEPET TEDUNG 1B44 ; VI # Mc BALINESE ADEG ADEG 1B45..1B4C ; AK # Lo [8] BALINESE LETTER KAF SASAK..BALINESE LETTER ARCHAIC JNYA -1B50..1B59 ; ID # Nd [10] BALINESE DIGIT ZERO..BALINESE DIGIT NINE +1B4E..1B4F ; BA # Po [2] BALINESE INVERTED CARIK SIKI..BALINESE INVERTED CARIK PAREREN +1B50..1B59 ; AS # Nd [10] BALINESE DIGIT ZERO..BALINESE DIGIT NINE 1B5A..1B5B ; BA # Po [2] BALINESE PANTI..BALINESE PAMADA 1B5C ; ID # Po BALINESE WINDU 1B5D..1B60 ; BA # Po [4] BALINESE CARIK PAMUNGKAH..BALINESE PAMENENG 1B61..1B6A ; ID # So [10] BALINESE MUSICAL SYMBOL DONG..BALINESE MUSICAL SYMBOL DANG GEDE 1B6B..1B73 ; CM # Mn [9] BALINESE MUSICAL SYMBOL COMBINING TEGEH..BALINESE MUSICAL SYMBOL COMBINING GONG 1B74..1B7C ; ID # So [9] BALINESE MUSICAL SYMBOL RIGHT-HAND OPEN DUG..BALINESE MUSICAL SYMBOL LEFT-HAND OPEN PING -1B7D..1B7E ; BA # Po [2] BALINESE PANTI LANTANG..BALINESE PAMADA LANTANG +1B7D..1B7F ; BA # Po [3] BALINESE PANTI LANTANG..BALINESE PANTI BAWAK 1B80..1B81 ; CM # Mn [2] SUNDANESE SIGN PANYECEK..SUNDANESE SIGN PANGLAYAR 1B82 ; CM # Mc SUNDANESE SIGN PANGWISAD 1B83..1BA0 ; AL # Lo [30] SUNDANESE LETTER A..SUNDANESE LETTER HA @@ -832,7 +833,7 @@ 1C5A..1C77 ; AL # Lo [30] OL CHIKI LETTER LA..OL CHIKI LETTER OH 1C78..1C7D ; AL # Lm [6] OL CHIKI MU TTUDDAG..OL CHIKI AHAD 1C7E..1C7F ; BA # Po [2] OL CHIKI PUNCTUATION MUCAAD..OL CHIKI PUNCTUATION DOUBLE MUCAAD -1C80..1C88 ; AL # Ll [9] CYRILLIC SMALL LETTER ROUNDED VE..CYRILLIC SMALL LETTER UNBLENDED UK +1C80..1C8A ; AL # L& [11] CYRILLIC SMALL LETTER ROUNDED VE..CYRILLIC SMALL LETTER TJE 1C90..1CBA ; AL # Lu [43] GEORGIAN MTAVRULI CAPITAL LETTER AN..GEORGIAN MTAVRULI CAPITAL LETTER AIN 1CBD..1CBF ; AL # Lu [3] GEORGIAN MTAVRULI CAPITAL LETTER AEN..GEORGIAN MTAVRULI CAPITAL LETTER LABIAL SIGN 1CC0..1CC7 ; AL # Po [8] SUNDANESE PUNCTUATION BINDU SURYA..SUNDANESE PUNCTUATION BINDU BA SATANGA @@ -1017,12 +1018,7 @@ 214C..214D ; AL # So [2] PER SIGN..AKTIESELSKAB 214E ; AL # Ll TURNED SMALL F 214F ; AL # So SYMBOL FOR SAMARITAN SOURCE -2150..2153 ; AL # No [4] VULGAR FRACTION ONE SEVENTH..VULGAR FRACTION ONE THIRD -2154..2155 ; AI # No [2] VULGAR FRACTION TWO THIRDS..VULGAR FRACTION ONE FIFTH -2156..215A ; AL # No [5] VULGAR FRACTION TWO FIFTHS..VULGAR FRACTION FIVE SIXTHS -215B ; AI # No VULGAR FRACTION ONE EIGHTH -215C..215D ; AL # No [2] VULGAR FRACTION THREE EIGHTHS..VULGAR FRACTION FIVE EIGHTHS -215E ; AI # No VULGAR FRACTION SEVEN EIGHTHS +2150..215E ; AI # No [15] VULGAR FRACTION ONE SEVENTH..VULGAR FRACTION SEVEN EIGHTHS 215F ; AL # No FRACTION NUMERATOR ONE 2160..216B ; AI # Nl [12] ROMAN NUMERAL ONE..ROMAN NUMERAL TWELVE 216C..216F ; AL # Nl [4] ROMAN NUMERAL FIFTY..ROMAN NUMERAL ONE THOUSAND @@ -1133,7 +1129,7 @@ 23E2..23EF ; AL # So [14] WHITE TRAPEZIUM..BLACK RIGHT-POINTING TRIANGLE WITH DOUBLE VERTICAL BAR 23F0..23F3 ; ID # So [4] ALARM CLOCK..HOURGLASS WITH FLOWING SAND 23F4..23FF ; AL # So [12] BLACK MEDIUM LEFT-POINTING TRIANGLE..OBSERVER EYE SYMBOL -2400..2426 ; AL # So [39] SYMBOL FOR NULL..SYMBOL FOR SUBSTITUTE FORM TWO +2400..2429 ; AL # So [42] SYMBOL FOR NULL..SYMBOL FOR DELETE MEDIUM SHADE FORM 2440..244A ; AL # So [11] OCR HOOK..OCR DOUBLE BACKSLASH 2460..249B ; AI # No [60] CIRCLED DIGIT ONE..NUMBER TWENTY FULL STOP 249C..24E9 ; AI # So [78] PARENTHESIZED LATIN SMALL LETTER A..CIRCLED LATIN SMALL LETTER Z @@ -1407,13 +1403,13 @@ 2E52 ; AL # Po TIRONIAN SIGN CAPITAL ET 2E53..2E54 ; EX # Po [2] MEDIEVAL EXCLAMATION MARK..MEDIEVAL QUESTION MARK 2E55 ; OP # Ps LEFT SQUARE BRACKET WITH STROKE -2E56 ; CL # Pe RIGHT SQUARE BRACKET WITH STROKE +2E56 ; CP # Pe RIGHT SQUARE BRACKET WITH STROKE 2E57 ; OP # Ps LEFT SQUARE BRACKET WITH DOUBLE STROKE -2E58 ; CL # Pe RIGHT SQUARE BRACKET WITH DOUBLE STROKE +2E58 ; CP # Pe RIGHT SQUARE BRACKET WITH DOUBLE STROKE 2E59 ; OP # Ps TOP HALF LEFT PARENTHESIS -2E5A ; CL # Pe TOP HALF RIGHT PARENTHESIS +2E5A ; CP # Pe TOP HALF RIGHT PARENTHESIS 2E5B ; OP # Ps BOTTOM HALF LEFT PARENTHESIS -2E5C ; CL # Pe BOTTOM HALF RIGHT PARENTHESIS +2E5C ; CP # Pe BOTTOM HALF RIGHT PARENTHESIS 2E5D ; BA # Pd OBLIQUE HYPHEN 2E80..2E99 ; ID # So [26] CJK RADICAL REPEAT..CJK RADICAL RAP 2E9B..2EF3 ; ID # So [89] CJK RADICAL CHOKE..CJK RADICAL C-SIMPLIFIED TURTLE @@ -1519,7 +1515,7 @@ 3192..3195 ; ID # No [4] IDEOGRAPHIC ANNOTATION ONE MARK..IDEOGRAPHIC ANNOTATION FOUR MARK 3196..319F ; ID # So [10] IDEOGRAPHIC ANNOTATION TOP MARK..IDEOGRAPHIC ANNOTATION MAN MARK 31A0..31BF ; ID # Lo [32] BOPOMOFO LETTER BU..BOPOMOFO LETTER AH -31C0..31E3 ; ID # So [36] CJK STROKE T..CJK STROKE Q +31C0..31E5 ; ID # So [38] CJK STROKE T..CJK STROKE SZP 31EF ; ID # So IDEOGRAPHIC DESCRIPTION CHARACTER SUBTRACTION 31F0..31FF ; CJ # Lo [16] KATAKANA LETTER SMALL KU..KATAKANA LETTER SMALL RO 3200..321E ; ID # So [31] PARENTHESIZED HANGUL KIYEOK..PARENTHESIZED KOREAN CHARACTER O HU @@ -1578,10 +1574,10 @@ A788 ; AL # Lm MODIFIER LETTER LOW CIRCUMFLEX ACCENT A789..A78A ; AL # Sk [2] MODIFIER LETTER COLON..MODIFIER LETTER SHORT EQUALS SIGN A78B..A78E ; AL # L& [4] LATIN CAPITAL LETTER SALTILLO..LATIN SMALL LETTER L WITH RETROFLEX HOOK AND BELT A78F ; AL # Lo LATIN LETTER SINOLOGICAL DOT -A790..A7CA ; AL # L& [59] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN SMALL LETTER S WITH SHORT STROKE OVERLAY +A790..A7CD ; AL # L& [62] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN SMALL LETTER S WITH DIAGONAL STROKE A7D0..A7D1 ; AL # L& [2] LATIN CAPITAL LETTER CLOSED INSULAR G..LATIN SMALL LETTER CLOSED INSULAR G A7D3 ; AL # Ll LATIN SMALL LETTER DOUBLE THORN -A7D5..A7D9 ; AL # L& [5] LATIN SMALL LETTER DOUBLE WYNN..LATIN SMALL LETTER SIGMOID S +A7D5..A7DC ; AL # L& [8] LATIN SMALL LETTER DOUBLE WYNN..LATIN CAPITAL LETTER LAMBDA WITH STROKE A7F2..A7F4 ; AL # Lm [3] MODIFIER LETTER CAPITAL C..MODIFIER LETTER CAPITAL Q A7F5..A7F6 ; AL # L& [2] LATIN CAPITAL LETTER REVERSED HALF H..LATIN SMALL LETTER REVERSED HALF H A7F7 ; AL # Lo LATIN EPIGRAPHIC LETTER SIDEWAYS I @@ -1643,7 +1639,7 @@ A9C1..A9C6 ; ID # Po [6] JAVANESE LEFT RERENGGAN..JAVANESE PADA WINDU A9C7..A9C9 ; BA # Po [3] JAVANESE PADA PANGKAT..JAVANESE PADA LUNGSI A9CA..A9CD ; ID # Po [4] JAVANESE PADA ADEG..JAVANESE TURNED PADA PISELEH A9CF ; BA # Lm JAVANESE PANGRANGKEP -A9D0..A9D9 ; ID # Nd [10] JAVANESE DIGIT ZERO..JAVANESE DIGIT NINE +A9D0..A9D9 ; AS # Nd [10] JAVANESE DIGIT ZERO..JAVANESE DIGIT NINE A9DE..A9DF ; ID # Po [2] JAVANESE PADA TIRTA TUMETES..JAVANESE PADA ISEN-ISEN A9E0..A9E4 ; SA # Lo [5] MYANMAR LETTER SHAN GHA..MYANMAR LETTER SHAN BHA A9E5 ; SA # Mn MYANMAR SIGN SHAN SAW @@ -1662,7 +1658,7 @@ AA43 ; CM # Mn CHAM CONSONANT SIGN FINAL NG AA44..AA4B ; BA # Lo [8] CHAM LETTER FINAL CH..CHAM LETTER FINAL SS AA4C ; CM # Mn CHAM CONSONANT SIGN FINAL M AA4D ; CM # Mc CHAM CONSONANT SIGN FINAL H -AA50..AA59 ; ID # Nd [10] CHAM DIGIT ZERO..CHAM DIGIT NINE +AA50..AA59 ; AS # Nd [10] CHAM DIGIT ZERO..CHAM DIGIT NINE AA5C ; ID # Po CHAM PUNCTUATION SPIRAL AA5D..AA5F ; BA # Po [3] CHAM PUNCTUATION DANDA..CHAM PUNCTUATION TRIPLE DANDA AA60..AA6F ; SA # Lo [16] MYANMAR LETTER KHAMTI GA..MYANMAR LETTER KHAMTI FA @@ -2552,14 +2548,26 @@ FDF0..FDFB ; AL # Lo [12] ARABIC LIGATURE SALLA USED AS KORANIC STOP SIGN FDFC ; PO # Sc RIAL SIGN FDFD..FDFF ; AL # So [3] ARABIC LIGATURE BISMILLAH AR-RAHMAN AR-RAHEEM..ARABIC LIGATURE AZZA WA JALL FE00..FE0F ; CM # Mn [16] VARIATION SELECTOR-1..VARIATION SELECTOR-16 -FE10 ; IS # Po PRESENTATION FORM FOR VERTICAL COMMA -FE11..FE12 ; CL # Po [2] PRESENTATION FORM FOR VERTICAL IDEOGRAPHIC COMMA..PRESENTATION FORM FOR VERTICAL IDEOGRAPHIC FULL STOP -FE13..FE14 ; IS # Po [2] PRESENTATION FORM FOR VERTICAL COLON..PRESENTATION FORM FOR VERTICAL SEMICOLON +FE10..FE12 ; CL # Po [3] PRESENTATION FORM FOR VERTICAL COMMA..PRESENTATION FORM FOR VERTICAL IDEOGRAPHIC FULL STOP +FE13..FE14 ; NS # Po [2] PRESENTATION FORM FOR VERTICAL COLON..PRESENTATION FORM FOR VERTICAL SEMICOLON FE15..FE16 ; EX # Po [2] PRESENTATION FORM FOR VERTICAL EXCLAMATION MARK..PRESENTATION FORM FOR VERTICAL QUESTION MARK FE17 ; OP # Ps PRESENTATION FORM FOR VERTICAL LEFT WHITE LENTICULAR BRACKET FE18 ; CL # Pe PRESENTATION FORM FOR VERTICAL RIGHT WHITE LENTICULAR BRAKCET FE19 ; IN # Po PRESENTATION FORM FOR VERTICAL HORIZONTAL ELLIPSIS -FE20..FE2F ; CM # Mn [16] COMBINING LIGATURE LEFT HALF..COMBINING CYRILLIC TITLO RIGHT HALF +FE20 ; GL # Mn COMBINING LIGATURE LEFT HALF +FE21 ; CM # Mn COMBINING LIGATURE RIGHT HALF +FE22 ; GL # Mn COMBINING DOUBLE TILDE LEFT HALF +FE23 ; CM # Mn COMBINING DOUBLE TILDE RIGHT HALF +FE24 ; GL # Mn COMBINING MACRON LEFT HALF +FE25 ; CM # Mn COMBINING MACRON RIGHT HALF +FE26..FE27 ; GL # Mn [2] COMBINING CONJOINING MACRON..COMBINING LIGATURE LEFT HALF BELOW +FE28 ; CM # Mn COMBINING LIGATURE RIGHT HALF BELOW +FE29 ; GL # Mn COMBINING TILDE LEFT HALF BELOW +FE2A ; CM # Mn COMBINING TILDE RIGHT HALF BELOW +FE2B ; GL # Mn COMBINING MACRON LEFT HALF BELOW +FE2C ; CM # Mn COMBINING MACRON RIGHT HALF BELOW +FE2D..FE2E ; GL # Mn [2] COMBINING CONJOINING MACRON BELOW..COMBINING CYRILLIC TITLO LEFT HALF +FE2F ; CM # Mn COMBINING CYRILLIC TITLO RIGHT HALF FE30 ; ID # Po PRESENTATION FORM FOR VERTICAL TWO DOT LEADER FE31..FE32 ; ID # Pd [2] PRESENTATION FORM FOR VERTICAL EM DASH..PRESENTATION FORM FOR VERTICAL EN DASH FE33..FE34 ; ID # Pc [2] PRESENTATION FORM FOR VERTICAL LOW LINE..PRESENTATION FORM FOR VERTICAL WAVY LOW LINE @@ -2721,6 +2729,7 @@ FFFD ; AI # So REPLACEMENT CHARACTER 105A3..105B1 ; AL # Ll [15] VITHKUQI SMALL LETTER HA..VITHKUQI SMALL LETTER RE 105B3..105B9 ; AL # Ll [7] VITHKUQI SMALL LETTER SE..VITHKUQI SMALL LETTER XE 105BB..105BC ; AL # Ll [2] VITHKUQI SMALL LETTER Y..VITHKUQI SMALL LETTER ZE +105C0..105F3 ; AL # Lo [52] TODHRI LETTER A..TODHRI LETTER OO 10600..10736 ; AL # Lo [311] LINEAR A SIGN AB001..LINEAR A SIGN A664 10740..10755 ; AL # Lo [22] LINEAR A SIGN A701 A..LINEAR A SIGN A732 JE 10760..10767 ; AL # Lo [8] LINEAR A SIGN A800..LINEAR A SIGN A807 @@ -2795,12 +2804,23 @@ FFFD ; AI # So REPLACEMENT CHARACTER 10D00..10D23 ; AL # Lo [36] HANIFI ROHINGYA LETTER A..HANIFI ROHINGYA MARK NA KHONNA 10D24..10D27 ; CM # Mn [4] HANIFI ROHINGYA SIGN HARBAHAY..HANIFI ROHINGYA SIGN TASSI 10D30..10D39 ; NU # Nd [10] HANIFI ROHINGYA DIGIT ZERO..HANIFI ROHINGYA DIGIT NINE +10D40..10D49 ; NU # Nd [10] GARAY DIGIT ZERO..GARAY DIGIT NINE +10D4A..10D4D ; AL # Lo [4] GARAY VOWEL SIGN A..GARAY VOWEL SIGN EE +10D4E ; AL # Lm GARAY VOWEL LENGTH MARK +10D4F ; AL # Lo GARAY SUKUN +10D50..10D65 ; AL # Lu [22] GARAY CAPITAL LETTER A..GARAY CAPITAL LETTER OLD NA +10D69..10D6D ; CM # Mn [5] GARAY VOWEL SIGN E..GARAY CONSONANT NASALIZATION MARK +10D6E ; BA # Pd GARAY HYPHEN +10D6F ; AL # Lm GARAY REDUPLICATION MARK +10D70..10D85 ; AL # Ll [22] GARAY SMALL LETTER A..GARAY SMALL LETTER OLD NA +10D8E..10D8F ; AL # Sm [2] GARAY PLUS SIGN..GARAY MINUS SIGN 10E60..10E7E ; AL # No [31] RUMI DIGIT ONE..RUMI FRACTION TWO THIRDS 10E80..10EA9 ; AL # Lo [42] YEZIDI LETTER ELIF..YEZIDI LETTER ET 10EAB..10EAC ; CM # Mn [2] YEZIDI COMBINING HAMZA MARK..YEZIDI COMBINING MADDA MARK 10EAD ; BA # Pd YEZIDI HYPHENATION MARK 10EB0..10EB1 ; AL # Lo [2] YEZIDI LETTER LAM WITH DOT ABOVE..YEZIDI LETTER YOT WITH CIRCUMFLEX ABOVE -10EFD..10EFF ; CM # Mn [3] ARABIC SMALL LOW WORD SAKTA..ARABIC SMALL LOW WORD MADDA +10EC2..10EC4 ; AL # Lo [3] ARABIC LETTER DAL WITH TWO DOTS VERTICALLY BELOW..ARABIC LETTER KAF WITH TWO DOTS VERTICALLY BELOW +10EFC..10EFF ; CM # Mn [4] ARABIC COMBINING ALEF OVERLAY..ARABIC SMALL LOW WORD MADDA 10F00..10F1C ; AL # Lo [29] OLD SOGDIAN LETTER ALEPH..OLD SOGDIAN LETTER FINAL TAW WITH VERTICAL TAIL 10F1D..10F26 ; AL # No [10] OLD SOGDIAN NUMBER ONE..OLD SOGDIAN FRACTION ONE HALF 10F27 ; AL # Lo OLD SOGDIAN LIGATURE AYIN-DALETH @@ -2929,6 +2949,27 @@ FFFD ; AI # So REPLACEMENT CHARACTER 11362..11363 ; CM # Mc [2] GRANTHA VOWEL SIGN VOCALIC L..GRANTHA VOWEL SIGN VOCALIC LL 11366..1136C ; CM # Mn [7] COMBINING GRANTHA DIGIT ZERO..COMBINING GRANTHA DIGIT SIX 11370..11374 ; CM # Mn [5] COMBINING GRANTHA LETTER A..COMBINING GRANTHA LETTER PA +11380..11389 ; AS # Lo [10] TULU-TIGALARI LETTER A..TULU-TIGALARI LETTER VOCALIC LL +1138B ; AS # Lo TULU-TIGALARI LETTER EE +1138E ; AS # Lo TULU-TIGALARI LETTER AI +11390..11391 ; AS # Lo [2] TULU-TIGALARI LETTER OO..TULU-TIGALARI LETTER AU +11392..113B5 ; AK # Lo [36] TULU-TIGALARI LETTER KA..TULU-TIGALARI LETTER LLLA +113B7 ; ID # Lo TULU-TIGALARI SIGN AVAGRAHA +113B8..113BA ; CM # Mc [3] TULU-TIGALARI VOWEL SIGN AA..TULU-TIGALARI VOWEL SIGN II +113BB..113C0 ; CM # Mn [6] TULU-TIGALARI VOWEL SIGN U..TULU-TIGALARI VOWEL SIGN VOCALIC LL +113C2 ; CM # Mc TULU-TIGALARI VOWEL SIGN EE +113C5 ; CM # Mc TULU-TIGALARI VOWEL SIGN AI +113C7..113CA ; CM # Mc [4] TULU-TIGALARI VOWEL SIGN OO..TULU-TIGALARI SIGN CANDRA ANUNASIKA +113CC..113CD ; CM # Mc [2] TULU-TIGALARI SIGN ANUSVARA..TULU-TIGALARI SIGN VISARGA +113CE ; CM # Mn TULU-TIGALARI SIGN VIRAMA +113CF ; CM # Mc TULU-TIGALARI SIGN LOOPED VIRAMA +113D0 ; VI # Mn TULU-TIGALARI CONJOINER +113D1 ; AP # Lo TULU-TIGALARI REPHA +113D2 ; CM # Mn TULU-TIGALARI GEMINATION MARK +113D3 ; ID # Lo TULU-TIGALARI SIGN PLUTA +113D4..113D5 ; ID # Po [2] TULU-TIGALARI DANDA..TULU-TIGALARI DOUBLE DANDA +113D7..113D8 ; ID # Po [2] TULU-TIGALARI SIGN OM PUSHPIKA..TULU-TIGALARI SIGN SHRII PUSHPIKA +113E1..113E2 ; CM # Mn [2] TULU-TIGALARI VEDIC TONE SVARITA..TULU-TIGALARI VEDIC TONE ANUDATTA 11400..11434 ; AL # Lo [53] NEWA LETTER A..NEWA LETTER HA 11435..11437 ; CM # Mc [3] NEWA VOWEL SIGN AA..NEWA VOWEL SIGN II 11438..1143F ; CM # Mn [8] NEWA VOWEL SIGN U..NEWA VOWEL SIGN AI @@ -2994,8 +3035,11 @@ FFFD ; AI # So REPLACEMENT CHARACTER 116B8 ; AL # Lo TAKRI LETTER ARCHAIC KHA 116B9 ; AL # Po TAKRI ABBREVIATION SIGN 116C0..116C9 ; NU # Nd [10] TAKRI DIGIT ZERO..TAKRI DIGIT NINE +116D0..116E3 ; NU # Nd [20] MYANMAR PAO DIGIT ZERO..MYANMAR EASTERN PWO KAREN DIGIT NINE 11700..1171A ; SA # Lo [27] AHOM LETTER KA..AHOM LETTER ALTERNATE BA -1171D..1171F ; SA # Mn [3] AHOM CONSONANT SIGN MEDIAL LA..AHOM CONSONANT SIGN MEDIAL LIGATING RA +1171D ; SA # Mn AHOM CONSONANT SIGN MEDIAL LA +1171E ; SA # Mc AHOM CONSONANT SIGN MEDIAL RA +1171F ; SA # Mn AHOM CONSONANT SIGN MEDIAL LIGATING RA 11720..11721 ; SA # Mc [2] AHOM VOWEL SIGN A..AHOM VOWEL SIGN AA 11722..11725 ; SA # Mn [4] AHOM VOWEL SIGN I..AHOM VOWEL SIGN UU 11726 ; SA # Mc AHOM VOWEL SIGN E @@ -3031,7 +3075,7 @@ FFFD ; AI # So REPLACEMENT CHARACTER 11942 ; CM # Mc DIVES AKURU MEDIAL RA 11943 ; CM # Mn DIVES AKURU SIGN NUKTA 11944..11946 ; BA # Po [3] DIVES AKURU DOUBLE DANDA..DIVES AKURU END OF TEXT MARK -11950..11959 ; ID # Nd [10] DIVES AKURU DIGIT ZERO..DIVES AKURU DIGIT NINE +11950..11959 ; AS # Nd [10] DIVES AKURU DIGIT ZERO..DIVES AKURU DIGIT NINE 119A0..119A7 ; AL # Lo [8] NANDINAGARI LETTER A..NANDINAGARI LETTER VOCALIC RR 119AA..119D0 ; AL # Lo [39] NANDINAGARI LETTER E..NANDINAGARI LETTER RRA 119D1..119D3 ; CM # Mc [3] NANDINAGARI VOWEL SIGN AA..NANDINAGARI VOWEL SIGN II @@ -3071,6 +3115,9 @@ FFFD ; AI # So REPLACEMENT CHARACTER 11AB0..11ABF ; AL # Lo [16] CANADIAN SYLLABICS NATTILIK HI..CANADIAN SYLLABICS SPA 11AC0..11AF8 ; AL # Lo [57] PAU CIN HAU LETTER PA..PAU CIN HAU GLOTTAL STOP FINAL 11B00..11B09 ; BB # Po [10] DEVANAGARI HEAD MARK..DEVANAGARI SIGN MINDU +11BC0..11BE0 ; AL # Lo [33] SUNUWAR LETTER DEVI..SUNUWAR LETTER KLOKO +11BE1 ; AL # Po SUNUWAR SIGN PVO +11BF0..11BF9 ; NU # Nd [10] SUNUWAR DIGIT ZERO..SUNUWAR DIGIT NINE 11C00..11C08 ; AL # Lo [9] BHAIKSUKI LETTER A..BHAIKSUKI LETTER VOCALIC L 11C0A..11C2E ; AL # Lo [37] BHAIKSUKI LETTER E..BHAIKSUKI LETTER HA 11C2F ; CM # Mc BHAIKSUKI VOWEL SIGN AA @@ -3132,6 +3179,7 @@ FFFD ; AI # So REPLACEMENT CHARACTER 11F43..11F44 ; BA # Po [2] KAWI DANDA..KAWI DOUBLE DANDA 11F45..11F4F ; ID # Po [11] KAWI PUNCTUATION SECTION MARKER..KAWI PUNCTUATION CLOSING SPIRAL 11F50..11F59 ; AS # Nd [10] KAWI DIGIT ZERO..KAWI DIGIT NINE +11F5A ; CM # Mn KAWI SIGN NUKTA 11FB0 ; AL # Lo LISU LETTER YHA 11FC0..11FD4 ; AL # No [21] TAMIL FRACTION ONE THREE-HUNDRED-AND-TWENTIETH..TAMIL FRACTION DOWNSCALING FACTOR KIIZH 11FD5..11FDC ; AL # So [8] TAMIL SIGN NEL..TAMIL SIGN MUKKURUNI @@ -3170,10 +3218,16 @@ FFFD ; AI # So REPLACEMENT CHARACTER 13440 ; CM # Mn EGYPTIAN HIEROGLYPH MIRROR HORIZONTALLY 13441..13446 ; AL # Lo [6] EGYPTIAN HIEROGLYPH FULL BLANK..EGYPTIAN HIEROGLYPH WIDE LOST SIGN 13447..13455 ; CM # Mn [15] EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT TOP START..EGYPTIAN HIEROGLYPH MODIFIER DAMAGED +13460..143FA ; AL # Lo [3995] EGYPTIAN HIEROGLYPH-13460..EGYPTIAN HIEROGLYPH-143FA 14400..145CD ; AL # Lo [462] ANATOLIAN HIEROGLYPH A001..ANATOLIAN HIEROGLYPH A409 145CE ; OP # Lo ANATOLIAN HIEROGLYPH A410 BEGIN LOGOGRAM MARK 145CF ; CL # Lo ANATOLIAN HIEROGLYPH A410A END LOGOGRAM MARK 145D0..14646 ; AL # Lo [119] ANATOLIAN HIEROGLYPH A411..ANATOLIAN HIEROGLYPH A530 +16100..1611D ; AS # Lo [30] GURUNG KHEMA LETTER A..GURUNG KHEMA LETTER SA +1611E..16129 ; CM # Mn [12] GURUNG KHEMA VOWEL SIGN AA..GURUNG KHEMA VOWEL LENGTH MARK +1612A..1612C ; CM # Mc [3] GURUNG KHEMA CONSONANT SIGN MEDIAL YA..GURUNG KHEMA CONSONANT SIGN MEDIAL HA +1612D..1612F ; CM # Mn [3] GURUNG KHEMA SIGN ANUSVARA..GURUNG KHEMA SIGN THOLHOMA +16130..16139 ; AS # Nd [10] GURUNG KHEMA DIGIT ZERO..GURUNG KHEMA DIGIT NINE 16800..16A38 ; AL # Lo [569] BAMUM LETTER PHASE-A NGKUE MFON..BAMUM LETTER PHASE-F VUEQ 16A40..16A5E ; AL # Lo [31] MRO LETTER TA..MRO LETTER TEK 16A60..16A69 ; NU # Nd [10] MRO DIGIT ZERO..MRO DIGIT NINE @@ -3195,6 +3249,12 @@ FFFD ; AI # So REPLACEMENT CHARACTER 16B5B..16B61 ; AL # No [7] PAHAWH HMONG NUMBER TENS..PAHAWH HMONG NUMBER TRILLIONS 16B63..16B77 ; AL # Lo [21] PAHAWH HMONG SIGN VOS LUB..PAHAWH HMONG SIGN CIM NRES TOS 16B7D..16B8F ; AL # Lo [19] PAHAWH HMONG CLAN SIGN TSHEEJ..PAHAWH HMONG CLAN SIGN VWJ +16D40..16D42 ; AL # Lm [3] KIRAT RAI SIGN ANUSVARA..KIRAT RAI SIGN VISARGA +16D43..16D6A ; AL # Lo [40] KIRAT RAI LETTER A..KIRAT RAI VOWEL SIGN AU +16D6B..16D6C ; AL # Lm [2] KIRAT RAI SIGN VIRAMA..KIRAT RAI SIGN SAAT +16D6D ; AL # Po KIRAT RAI SIGN YUPI +16D6E..16D6F ; BA # Po [2] KIRAT RAI DANDA..KIRAT RAI DOUBLE DANDA +16D70..16D79 ; NU # Nd [10] KIRAT RAI DIGIT ZERO..KIRAT RAI DIGIT NINE 16E40..16E7F ; AL # L& [64] MEDEFAIDRIN CAPITAL LETTER M..MEDEFAIDRIN SMALL LETTER Y 16E80..16E96 ; AL # No [23] MEDEFAIDRIN DIGIT ZERO..MEDEFAIDRIN DIGIT THREE ALTERNATE FORM 16E97..16E98 ; BA # Po [2] MEDEFAIDRIN COMMA..MEDEFAIDRIN FULL STOP @@ -3213,6 +3273,7 @@ FFFD ; AI # So REPLACEMENT CHARACTER 17000..187F7 ; ID # Lo [6136] TANGUT IDEOGRAPH-17000..TANGUT IDEOGRAPH-187F7 18800..18AFF ; ID # Lo [768] TANGUT COMPONENT-001..TANGUT COMPONENT-768 18B00..18CD5 ; AL # Lo [470] KHITAN SMALL SCRIPT CHARACTER-18B00..KHITAN SMALL SCRIPT CHARACTER-18CD5 +18CFF ; AL # Lo KHITAN SMALL SCRIPT CHARACTER-18CFF 18D00..18D08 ; ID # Lo [9] TANGUT IDEOGRAPH-18D00..TANGUT IDEOGRAPH-18D08 1AFF0..1AFF3 ; AL # Lm [4] KATAKANA LETTER MINNAN TONE-2..KATAKANA LETTER MINNAN TONE-5 1AFF5..1AFFB ; AL # Lm [7] KATAKANA LETTER MINNAN TONE-7..KATAKANA LETTER MINNAN NASALIZED TONE-5 @@ -3232,6 +3293,9 @@ FFFD ; AI # So REPLACEMENT CHARACTER 1BC9D..1BC9E ; CM # Mn [2] DUPLOYAN THICK LETTER SELECTOR..DUPLOYAN DOUBLE MARK 1BC9F ; BA # Po DUPLOYAN PUNCTUATION CHINOOK FULL STOP 1BCA0..1BCA3 ; CM # Cf [4] SHORTHAND FORMAT LETTER OVERLAP..SHORTHAND FORMAT UP STEP +1CC00..1CCEF ; AL # So [240] UP-POINTING GO-KART..OUTLINED LATIN CAPITAL LETTER Z +1CCF0..1CCF9 ; NU # Nd [10] OUTLINED DIGIT ZERO..OUTLINED DIGIT NINE +1CD00..1CEB3 ; AL # So [436] BLOCK OCTANT-3..BLACK RIGHT TRIANGLE CARET 1CF00..1CF2D ; CM # Mn [46] ZNAMENNY COMBINING MARK GORAZDO NIZKO S KRYZHEM ON LEFT..ZNAMENNY COMBINING MARK KRYZH ON LEFT 1CF30..1CF46 ; CM # Mn [23] ZNAMENNY COMBINING TONAL RANGE MARK MRACHNO..ZNAMENNY PRIZNAK MODIFIER ROG 1CF50..1CFC3 ; AL # So [116] ZNAMENNY NEUME KRYUK..ZNAMENNY NEUME PAUK @@ -3337,6 +3401,11 @@ FFFD ; AI # So REPLACEMENT CHARACTER 1E4EB ; AL # Lm NAG MUNDARI SIGN OJOD 1E4EC..1E4EF ; CM # Mn [4] NAG MUNDARI SIGN MUHOR..NAG MUNDARI SIGN SUTUH 1E4F0..1E4F9 ; NU # Nd [10] NAG MUNDARI DIGIT ZERO..NAG MUNDARI DIGIT NINE +1E5D0..1E5ED ; AL # Lo [30] OL ONAL LETTER O..OL ONAL LETTER EG +1E5EE..1E5EF ; CM # Mn [2] OL ONAL SIGN MU..OL ONAL SIGN IKIR +1E5F0 ; AL # Lo OL ONAL SIGN HODDOND +1E5F1..1E5FA ; NU # Nd [10] OL ONAL DIGIT ZERO..OL ONAL DIGIT NINE +1E5FF ; AL # Po OL ONAL ABBREVIATION SIGN 1E7E0..1E7E6 ; AL # Lo [7] ETHIOPIC SYLLABLE HHYA..ETHIOPIC SYLLABLE HHYO 1E7E8..1E7EB ; AL # Lo [4] ETHIOPIC SYLLABLE GURAGE HHWA..ETHIOPIC SYLLABLE HHWE 1E7ED..1E7EE ; AL # Lo [2] ETHIOPIC SYLLABLE GURAGE MWI..ETHIOPIC SYLLABLE GURAGE MWEE @@ -3404,14 +3473,13 @@ FFFD ; AI # So REPLACEMENT CHARACTER 1F0D1..1F0F5 ; ID # So [37] PLAYING CARD ACE OF CLUBS..PLAYING CARD TRUMP-21 1F0F6..1F0FF ; ID # Cn [10] <reserved-1F0F6>..<reserved-1F0FF> 1F100..1F10C ; AI # No [13] DIGIT ZERO FULL STOP..DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT ZERO -1F10D..1F10F ; ID # So [3] CIRCLED ZERO WITH SLASH..CIRCLED DOLLAR SIGN WITH OVERLAID BACKSLASH +1F10D..1F10F ; AL # So [3] CIRCLED ZERO WITH SLASH..CIRCLED DOLLAR SIGN WITH OVERLAID BACKSLASH 1F110..1F12D ; AI # So [30] PARENTHESIZED LATIN CAPITAL LETTER A..CIRCLED CD 1F12E..1F12F ; AL # So [2] CIRCLED WZ..COPYLEFT SYMBOL 1F130..1F169 ; AI # So [58] SQUARED LATIN CAPITAL LETTER A..NEGATIVE CIRCLED LATIN CAPITAL LETTER Z -1F16A..1F16C ; AL # So [3] RAISED MC SIGN..RAISED MR SIGN -1F16D..1F16F ; ID # So [3] CIRCLED CC..CIRCLED HUMAN FIGURE +1F16A..1F16F ; AL # So [6] RAISED MC SIGN..CIRCLED HUMAN FIGURE 1F170..1F1AC ; AI # So [61] NEGATIVE SQUARED LATIN CAPITAL LETTER A..SQUARED VOD -1F1AD ; ID # So MASK WORK SYMBOL +1F1AD ; AL # So MASK WORK SYMBOL 1F1AE..1F1E5 ; ID # Cn [56] <reserved-1F1AE>..<reserved-1F1E5> 1F1E6..1F1FF ; RI # So [26] REGIONAL INDICATOR SYMBOL LETTER A..REGIONAL INDICATOR SYMBOL LETTER Z 1F200..1F202 ; ID # So [3] SQUARE HIRAGANA HOKA..SQUARED KATAKANA SA @@ -3521,17 +3589,12 @@ FFFD ; AI # So REPLACEMENT CHARACTER 1F7F0 ; ID # So HEAVY EQUALS SIGN 1F7F1..1F7FF ; ID # Cn [15] <reserved-1F7F1>..<reserved-1F7FF> 1F800..1F80B ; AL # So [12] LEFTWARDS ARROW WITH SMALL TRIANGLE ARROWHEAD..DOWNWARDS ARROW WITH LARGE TRIANGLE ARROWHEAD -1F80C..1F80F ; ID # Cn [4] <reserved-1F80C>..<reserved-1F80F> 1F810..1F847 ; AL # So [56] LEFTWARDS ARROW WITH SMALL EQUILATERAL ARROWHEAD..DOWNWARDS HEAVY ARROW -1F848..1F84F ; ID # Cn [8] <reserved-1F848>..<reserved-1F84F> 1F850..1F859 ; AL # So [10] LEFTWARDS SANS-SERIF ARROW..UP DOWN SANS-SERIF ARROW -1F85A..1F85F ; ID # Cn [6] <reserved-1F85A>..<reserved-1F85F> 1F860..1F887 ; AL # So [40] WIDE-HEADED LEFTWARDS LIGHT BARB ARROW..WIDE-HEADED SOUTH WEST VERY HEAVY BARB ARROW -1F888..1F88F ; ID # Cn [8] <reserved-1F888>..<reserved-1F88F> 1F890..1F8AD ; AL # So [30] LEFTWARDS TRIANGLE ARROWHEAD..WHITE ARROW SHAFT WIDTH TWO THIRDS -1F8AE..1F8AF ; ID # Cn [2] <reserved-1F8AE>..<reserved-1F8AF> -1F8B0..1F8B1 ; ID # So [2] ARROW POINTING UPWARDS THEN NORTH WEST..ARROW POINTING RIGHTWARDS THEN CURVING SOUTH WEST -1F8B2..1F8FF ; ID # Cn [78] <reserved-1F8B2>..<reserved-1F8FF> +1F8B0..1F8BB ; AL # So [12] ARROW POINTING UPWARDS THEN NORTH WEST..SOUTH WEST ARROW FROM BAR +1F8C0..1F8C1 ; AL # So [2] LEFTWARDS ARROW FROM DOWNWARDS ARROW..RIGHTWARDS ARROW FROM DOWNWARDS ARROW 1F900..1F90B ; AL # So [12] CIRCLED CROSS FORMEE WITH FOUR DOTS..DOWNWARD FACING NOTCHED HOOK WITH DOT 1F90C ; EB # So PINCHED FINGERS 1F90D..1F90E ; ID # So [2] WHITE HEART..BROWN HEART @@ -3563,21 +3626,20 @@ FFFD ; AI # So REPLACEMENT CHARACTER 1FA6E..1FA6F ; ID # Cn [2] <reserved-1FA6E>..<reserved-1FA6F> 1FA70..1FA7C ; ID # So [13] BALLET SHOES..CRUTCH 1FA7D..1FA7F ; ID # Cn [3] <reserved-1FA7D>..<reserved-1FA7F> -1FA80..1FA88 ; ID # So [9] YO-YO..FLUTE -1FA89..1FA8F ; ID # Cn [7] <reserved-1FA89>..<reserved-1FA8F> -1FA90..1FABD ; ID # So [46] RINGED PLANET..WING -1FABE ; ID # Cn <reserved-1FABE> -1FABF..1FAC2 ; ID # So [4] GOOSE..PEOPLE HUGGING +1FA80..1FA89 ; ID # So [10] YO-YO..HARP +1FA8A..1FA8E ; ID # Cn [5] <reserved-1FA8A>..<reserved-1FA8E> +1FA8F..1FAC2 ; ID # So [52] SHOVEL..PEOPLE HUGGING 1FAC3..1FAC5 ; EB # So [3] PREGNANT MAN..PERSON WITH CROWN -1FAC6..1FACD ; ID # Cn [8] <reserved-1FAC6>..<reserved-1FACD> -1FACE..1FADB ; ID # So [14] MOOSE..PEA POD -1FADC..1FADF ; ID # Cn [4] <reserved-1FADC>..<reserved-1FADF> -1FAE0..1FAE8 ; ID # So [9] MELTING FACE..SHAKING FACE -1FAE9..1FAEF ; ID # Cn [7] <reserved-1FAE9>..<reserved-1FAEF> +1FAC6 ; ID # So FINGERPRINT +1FAC7..1FACD ; ID # Cn [7] <reserved-1FAC7>..<reserved-1FACD> +1FACE..1FADC ; ID # So [15] MOOSE..ROOT VEGETABLE +1FADD..1FADE ; ID # Cn [2] <reserved-1FADD>..<reserved-1FADE> +1FADF..1FAE9 ; ID # So [11] SPLATTER..FACE WITH BAGS UNDER EYES +1FAEA..1FAEF ; ID # Cn [6] <reserved-1FAEA>..<reserved-1FAEF> 1FAF0..1FAF8 ; EB # So [9] HAND WITH INDEX FINGER AND THUMB CROSSED..RIGHTWARDS PUSHING HAND 1FAF9..1FAFF ; ID # Cn [7] <reserved-1FAF9>..<reserved-1FAFF> 1FB00..1FB92 ; AL # So [147] BLOCK SEXTANT-1..UPPER HALF INVERSE MEDIUM SHADE AND LOWER HALF BLOCK -1FB94..1FBCA ; AL # So [55] LEFT HALF INVERSE MEDIUM SHADE AND RIGHT HALF BLOCK..WHITE UP-POINTING CHEVRON +1FB94..1FBEF ; AL # So [92] LEFT HALF INVERSE MEDIUM SHADE AND RIGHT HALF BLOCK..TOP LEFT JUSTIFIED LOWER RIGHT QUARTER BLACK CIRCLE 1FBF0..1FBF9 ; NU # Nd [10] SEGMENTED DIGIT ZERO..SEGMENTED DIGIT NINE 1FC00..1FFFD ; ID # Cn [1022] <reserved-1FC00>..<reserved-1FFFD> 20000..2A6DF ; ID # Lo [42720] CJK UNIFIED IDEOGRAPH-20000..CJK UNIFIED IDEOGRAPH-2A6DF diff --git a/Master/texmf-dist/tex/generic/unicode-data/PropList.txt b/Master/texmf-dist/tex/generic/unicode-data/PropList.txt index 777e8a28818..fae2831e7a5 100644 --- a/Master/texmf-dist/tex/generic/unicode-data/PropList.txt +++ b/Master/texmf-dist/tex/generic/unicode-data/PropList.txt @@ -1,8 +1,8 @@ -# PropList-15.1.0.txt -# Date: 2023-08-01, 21:56:53 GMT -# © 2023 Unicode®, Inc. +# PropList-16.0.0.txt +# Date: 2024-05-31, 18:09:48 GMT +# © 2024 Unicode®, Inc. # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries. -# For terms of use, see https://www.unicode.org/terms_of_use.html +# For terms of use and license, see https://www.unicode.org/terms_of_use.html # # Unicode Character Database # For documentation, see https://www.unicode.org/reports/tr44/ @@ -62,9 +62,10 @@ FE31..FE32 ; Dash # Pd [2] PRESENTATION FORM FOR VERTICAL EM DASH..PRESENTA FE58 ; Dash # Pd SMALL EM DASH FE63 ; Dash # Pd SMALL HYPHEN-MINUS FF0D ; Dash # Pd FULLWIDTH HYPHEN-MINUS +10D6E ; Dash # Pd GARAY HYPHEN 10EAD ; Dash # Pd YEZIDI HYPHENATION MARK -# Total code points: 30 +# Total code points: 31 # ================================================ @@ -132,7 +133,8 @@ FF63 ; Quotation_Mark # Pe HALFWIDTH RIGHT CORNER BRACKET 0700..070A ; Terminal_Punctuation # Po [11] SYRIAC END OF PARAGRAPH..SYRIAC CONTRACTION 070C ; Terminal_Punctuation # Po SYRIAC HARKLEAN METOBELUS 07F8..07F9 ; Terminal_Punctuation # Po [2] NKO COMMA..NKO EXCLAMATION MARK -0830..083E ; Terminal_Punctuation # Po [15] SAMARITAN PUNCTUATION NEQUDAA..SAMARITAN PUNCTUATION ANNAAU +0830..0835 ; Terminal_Punctuation # Po [6] SAMARITAN PUNCTUATION NEQUDAA..SAMARITAN PUNCTUATION SHIYYAALAA +0837..083E ; Terminal_Punctuation # Po [8] SAMARITAN PUNCTUATION MELODIC QITSA..SAMARITAN PUNCTUATION ANNAAU 085E ; Terminal_Punctuation # Po MANDAIC PUNCTUATION 0964..0965 ; Terminal_Punctuation # Po [2] DEVANAGARI DANDA..DEVANAGARI DOUBLE DANDA 0E5A..0E5B ; Terminal_Punctuation # Po [2] THAI CHARACTER ANGKHANKHU..THAI CHARACTER KHOMUT @@ -149,13 +151,16 @@ FF63 ; Quotation_Mark # Pe HALFWIDTH RIGHT CORNER BRACKET 1808..1809 ; Terminal_Punctuation # Po [2] MONGOLIAN MANCHU COMMA..MONGOLIAN MANCHU FULL STOP 1944..1945 ; Terminal_Punctuation # Po [2] LIMBU EXCLAMATION MARK..LIMBU QUESTION MARK 1AA8..1AAB ; Terminal_Punctuation # Po [4] TAI THAM SIGN KAAN..TAI THAM SIGN SATKAANKUU +1B4E..1B4F ; Terminal_Punctuation # Po [2] BALINESE INVERTED CARIK SIKI..BALINESE INVERTED CARIK PAREREN 1B5A..1B5B ; Terminal_Punctuation # Po [2] BALINESE PANTI..BALINESE PAMADA 1B5D..1B5F ; Terminal_Punctuation # Po [3] BALINESE CARIK PAMUNGKAH..BALINESE CARIK PAREREN -1B7D..1B7E ; Terminal_Punctuation # Po [2] BALINESE PANTI LANTANG..BALINESE PAMADA LANTANG +1B7D..1B7F ; Terminal_Punctuation # Po [3] BALINESE PANTI LANTANG..BALINESE PANTI BAWAK 1C3B..1C3F ; Terminal_Punctuation # Po [5] LEPCHA PUNCTUATION TA-ROL..LEPCHA PUNCTUATION TSHOOK 1C7E..1C7F ; Terminal_Punctuation # Po [2] OL CHIKI PUNCTUATION MUCAAD..OL CHIKI PUNCTUATION DOUBLE MUCAAD +2024 ; Terminal_Punctuation # Po ONE DOT LEADER 203C..203D ; Terminal_Punctuation # Po [2] DOUBLE EXCLAMATION MARK..INTERROBANG 2047..2049 ; Terminal_Punctuation # Po [3] DOUBLE QUESTION MARK..EXCLAMATION QUESTION MARK +2CF9..2CFB ; Terminal_Punctuation # Po [3] COPTIC OLD NUBIAN FULL STOP..COPTIC OLD NUBIAN INDIRECT QUESTION MARK 2E2E ; Terminal_Punctuation # Po REVERSED QUESTION MARK 2E3C ; Terminal_Punctuation # Po STENOGRAPHIC FULL STOP 2E41 ; Terminal_Punctuation # Po REVERSED COMMA @@ -174,6 +179,8 @@ AA5D..AA5F ; Terminal_Punctuation # Po [3] CHAM PUNCTUATION DANDA..CHAM PUN AADF ; Terminal_Punctuation # Po TAI VIET SYMBOL KOI KOI AAF0..AAF1 ; Terminal_Punctuation # Po [2] MEETEI MAYEK CHEIKHAN..MEETEI MAYEK AHANG KHUDAM ABEB ; Terminal_Punctuation # Po MEETEI MAYEK CHEIKHEI +FE12 ; Terminal_Punctuation # Po PRESENTATION FORM FOR VERTICAL IDEOGRAPHIC FULL STOP +FE15..FE16 ; Terminal_Punctuation # Po [2] PRESENTATION FORM FOR VERTICAL EXCLAMATION MARK..PRESENTATION FORM FOR VERTICAL QUESTION MARK FE50..FE52 ; Terminal_Punctuation # Po [3] SMALL COMMA..SMALL FULL STOP FE54..FE57 ; Terminal_Punctuation # Po [4] SMALL SEMICOLON..SMALL EXCLAMATION MARK FF01 ; Terminal_Punctuation # Po FULLWIDTH EXCLAMATION MARK @@ -201,6 +208,7 @@ FF64 ; Terminal_Punctuation # Po HALFWIDTH IDEOGRAPHIC COMMA 111DE..111DF ; Terminal_Punctuation # Po [2] SHARADA SECTION MARK-1..SHARADA SECTION MARK-2 11238..1123C ; Terminal_Punctuation # Po [5] KHOJKI DANDA..KHOJKI DOUBLE SECTION MARK 112A9 ; Terminal_Punctuation # Po MULTANI SECTION MARK +113D4..113D5 ; Terminal_Punctuation # Po [2] TULU-TIGALARI DANDA..TULU-TIGALARI DOUBLE DANDA 1144B..1144D ; Terminal_Punctuation # Po [3] NEWA DANDA..NEWA COMMA 1145A..1145B ; Terminal_Punctuation # Po [2] NEWA DOUBLE COMMA..NEWA PLACEHOLDER MARK 115C2..115C5 ; Terminal_Punctuation # Po [4] SIDDHAM DANDA..SIDDHAM SEPARATOR BAR @@ -221,11 +229,12 @@ FF64 ; Terminal_Punctuation # Po HALFWIDTH IDEOGRAPHIC COMMA 16AF5 ; Terminal_Punctuation # Po BASSA VAH FULL STOP 16B37..16B39 ; Terminal_Punctuation # Po [3] PAHAWH HMONG SIGN VOS THOM..PAHAWH HMONG SIGN CIM CHEEM 16B44 ; Terminal_Punctuation # Po PAHAWH HMONG SIGN XAUS +16D6E..16D6F ; Terminal_Punctuation # Po [2] KIRAT RAI DANDA..KIRAT RAI DOUBLE DANDA 16E97..16E98 ; Terminal_Punctuation # Po [2] MEDEFAIDRIN COMMA..MEDEFAIDRIN FULL STOP 1BC9F ; Terminal_Punctuation # Po DUPLOYAN PUNCTUATION CHINOOK FULL STOP 1DA87..1DA8A ; Terminal_Punctuation # Po [4] SIGNWRITING COMMA..SIGNWRITING COLON -# Total code points: 278 +# Total code points: 291 # ================================================ @@ -430,6 +439,7 @@ FF41..FF46 ; Hex_Digit # L& [6] FULLWIDTH LATIN SMALL LETTER A..FULLWIDTH L # ================================================ 0345 ; Other_Alphabetic # Mn COMBINING GREEK YPOGEGRAMMENI +0363..036F ; Other_Alphabetic # Mn [13] COMBINING LATIN SMALL LETTER A..COMBINING LATIN SMALL LETTER X 05B0..05BD ; Other_Alphabetic # Mn [14] HEBREW POINT SHEVA..HEBREW POINT METEG 05BF ; Other_Alphabetic # Mn HEBREW POINT RAFE 05C1..05C2 ; Other_Alphabetic # Mn [2] HEBREW POINT SHIN DOT..HEBREW POINT SIN DOT @@ -450,6 +460,7 @@ FF41..FF46 ; Hex_Digit # L& [6] FULLWIDTH LATIN SMALL LETTER A..FULLWIDTH L 081B..0823 ; Other_Alphabetic # Mn [9] SAMARITAN MARK EPENTHETIC YUT..SAMARITAN VOWEL SIGN A 0825..0827 ; Other_Alphabetic # Mn [3] SAMARITAN VOWEL SIGN SHORT A..SAMARITAN VOWEL SIGN U 0829..082C ; Other_Alphabetic # Mn [4] SAMARITAN VOWEL SIGN LONG I..SAMARITAN VOWEL SIGN SUKUN +0897 ; Other_Alphabetic # Mn ARABIC PEPET 08D4..08DF ; Other_Alphabetic # Mn [12] ARABIC SMALL HIGH WORD AR-RUB..ARABIC SMALL HIGH WORD WAQFA 08E3..08E9 ; Other_Alphabetic # Mn [7] ARABIC TURNED DAMMA BELOW..ARABIC CURLY KASRATAN 08F0..0902 ; Other_Alphabetic # Mn [19] ARABIC OPEN FATHATAN..DEVANAGARI SIGN ANUSVARA @@ -634,7 +645,7 @@ FF41..FF46 ; Hex_Digit # L& [6] FULLWIDTH LATIN SMALL LETTER A..FULLWIDTH L 1C2C..1C33 ; Other_Alphabetic # Mn [8] LEPCHA VOWEL SIGN E..LEPCHA CONSONANT SIGN T 1C34..1C35 ; Other_Alphabetic # Mc [2] LEPCHA CONSONANT SIGN NYIN-DO..LEPCHA CONSONANT SIGN KANG 1C36 ; Other_Alphabetic # Mn LEPCHA SIGN RAN -1DE7..1DF4 ; Other_Alphabetic # Mn [14] COMBINING LATIN SMALL LETTER ALPHA..COMBINING LATIN SMALL LETTER U WITH DIAERESIS +1DD3..1DF4 ; Other_Alphabetic # Mn [34] COMBINING LATIN SMALL LETTER FLATTENED OPEN A ABOVE..COMBINING LATIN SMALL LETTER U WITH DIAERESIS 24B6..24E9 ; Other_Alphabetic # So [52] CIRCLED LATIN CAPITAL LETTER A..CIRCLED LATIN SMALL LETTER Z 2DE0..2DFF ; Other_Alphabetic # Mn [32] COMBINING CYRILLIC LETTER BE..COMBINING CYRILLIC LETTER IOTIFIED BIG YUS A674..A67B ; Other_Alphabetic # Mn [8] COMBINING CYRILLIC LETTER UKRAINIAN IE..COMBINING CYRILLIC LETTER OMEGA @@ -689,7 +700,9 @@ FB1E ; Other_Alphabetic # Mn HEBREW POINT JUDEO-SPANISH VARIKA 10A05..10A06 ; Other_Alphabetic # Mn [2] KHAROSHTHI VOWEL SIGN E..KHAROSHTHI VOWEL SIGN O 10A0C..10A0F ; Other_Alphabetic # Mn [4] KHAROSHTHI VOWEL LENGTH MARK..KHAROSHTHI SIGN VISARGA 10D24..10D27 ; Other_Alphabetic # Mn [4] HANIFI ROHINGYA SIGN HARBAHAY..HANIFI ROHINGYA SIGN TASSI +10D69 ; Other_Alphabetic # Mn GARAY VOWEL SIGN E 10EAB..10EAC ; Other_Alphabetic # Mn [2] YEZIDI COMBINING HAMZA MARK..YEZIDI COMBINING MADDA MARK +10EFC ; Other_Alphabetic # Mn ARABIC COMBINING ALEF OVERLAY 11000 ; Other_Alphabetic # Mc BRAHMI SIGN CANDRABINDU 11001 ; Other_Alphabetic # Mn BRAHMI SIGN ANUSVARA 11002 ; Other_Alphabetic # Mc BRAHMI SIGN VISARGA @@ -732,6 +745,12 @@ FB1E ; Other_Alphabetic # Mn HEBREW POINT JUDEO-SPANISH VARIKA 1134B..1134C ; Other_Alphabetic # Mc [2] GRANTHA VOWEL SIGN OO..GRANTHA VOWEL SIGN AU 11357 ; Other_Alphabetic # Mc GRANTHA AU LENGTH MARK 11362..11363 ; Other_Alphabetic # Mc [2] GRANTHA VOWEL SIGN VOCALIC L..GRANTHA VOWEL SIGN VOCALIC LL +113B8..113BA ; Other_Alphabetic # Mc [3] TULU-TIGALARI VOWEL SIGN AA..TULU-TIGALARI VOWEL SIGN II +113BB..113C0 ; Other_Alphabetic # Mn [6] TULU-TIGALARI VOWEL SIGN U..TULU-TIGALARI VOWEL SIGN VOCALIC LL +113C2 ; Other_Alphabetic # Mc TULU-TIGALARI VOWEL SIGN EE +113C5 ; Other_Alphabetic # Mc TULU-TIGALARI VOWEL SIGN AI +113C7..113CA ; Other_Alphabetic # Mc [4] TULU-TIGALARI VOWEL SIGN OO..TULU-TIGALARI SIGN CANDRA ANUNASIKA +113CC..113CD ; Other_Alphabetic # Mc [2] TULU-TIGALARI SIGN ANUSVARA..TULU-TIGALARI SIGN VISARGA 11435..11437 ; Other_Alphabetic # Mc [3] NEWA VOWEL SIGN AA..NEWA VOWEL SIGN II 11438..1143F ; Other_Alphabetic # Mn [8] NEWA VOWEL SIGN U..NEWA VOWEL SIGN AI 11440..11441 ; Other_Alphabetic # Mc [2] NEWA VOWEL SIGN O..NEWA VOWEL SIGN AU @@ -761,7 +780,9 @@ FB1E ; Other_Alphabetic # Mn HEBREW POINT JUDEO-SPANISH VARIKA 116AD ; Other_Alphabetic # Mn TAKRI VOWEL SIGN AA 116AE..116AF ; Other_Alphabetic # Mc [2] TAKRI VOWEL SIGN I..TAKRI VOWEL SIGN II 116B0..116B5 ; Other_Alphabetic # Mn [6] TAKRI VOWEL SIGN U..TAKRI VOWEL SIGN AU -1171D..1171F ; Other_Alphabetic # Mn [3] AHOM CONSONANT SIGN MEDIAL LA..AHOM CONSONANT SIGN MEDIAL LIGATING RA +1171D ; Other_Alphabetic # Mn AHOM CONSONANT SIGN MEDIAL LA +1171E ; Other_Alphabetic # Mc AHOM CONSONANT SIGN MEDIAL RA +1171F ; Other_Alphabetic # Mn AHOM CONSONANT SIGN MEDIAL LIGATING RA 11720..11721 ; Other_Alphabetic # Mc [2] AHOM VOWEL SIGN A..AHOM VOWEL SIGN AA 11722..11725 ; Other_Alphabetic # Mn [4] AHOM VOWEL SIGN I..AHOM VOWEL SIGN UU 11726 ; Other_Alphabetic # Mc AHOM VOWEL SIGN E @@ -818,6 +839,9 @@ FB1E ; Other_Alphabetic # Mn HEBREW POINT JUDEO-SPANISH VARIKA 11F36..11F3A ; Other_Alphabetic # Mn [5] KAWI VOWEL SIGN I..KAWI VOWEL SIGN VOCALIC R 11F3E..11F3F ; Other_Alphabetic # Mc [2] KAWI VOWEL SIGN E..KAWI VOWEL SIGN AI 11F40 ; Other_Alphabetic # Mn KAWI VOWEL SIGN EU +1611E..16129 ; Other_Alphabetic # Mn [12] GURUNG KHEMA VOWEL SIGN AA..GURUNG KHEMA VOWEL LENGTH MARK +1612A..1612C ; Other_Alphabetic # Mc [3] GURUNG KHEMA CONSONANT SIGN MEDIAL YA..GURUNG KHEMA CONSONANT SIGN MEDIAL HA +1612D..1612E ; Other_Alphabetic # Mn [2] GURUNG KHEMA SIGN ANUSVARA..GURUNG KHEMA CONSONANT SIGN MEDIAL RA 16F4F ; Other_Alphabetic # Mn MIAO SIGN CONSONANT MODIFIER BAR 16F51..16F87 ; Other_Alphabetic # Mc [55] MIAO SIGN ASPIRATION..MIAO VOWEL SIGN UI 16F8F..16F92 ; Other_Alphabetic # Mn [4] MIAO TONE RIGHT..MIAO TONE BELOW @@ -834,7 +858,7 @@ FB1E ; Other_Alphabetic # Mn HEBREW POINT JUDEO-SPANISH VARIKA 1F150..1F169 ; Other_Alphabetic # So [26] NEGATIVE CIRCLED LATIN CAPITAL LETTER A..NEGATIVE CIRCLED LATIN CAPITAL LETTER Z 1F170..1F189 ; Other_Alphabetic # So [26] NEGATIVE SQUARED LATIN CAPITAL LETTER A..NEGATIVE SQUARED LATIN CAPITAL LETTER Z -# Total code points: 1425 +# Total code points: 1495 # ================================================ @@ -849,7 +873,7 @@ FA70..FAD9 ; Ideographic # Lo [106] CJK COMPATIBILITY IDEOGRAPH-FA70..CJK COM 16FE4 ; Ideographic # Mn KHITAN SMALL SCRIPT FILLER 17000..187F7 ; Ideographic # Lo [6136] TANGUT IDEOGRAPH-17000..TANGUT IDEOGRAPH-187F7 18800..18CD5 ; Ideographic # Lo [1238] TANGUT COMPONENT-001..KHITAN SMALL SCRIPT CHARACTER-18CD5 -18D00..18D08 ; Ideographic # Lo [9] TANGUT IDEOGRAPH-18D00..TANGUT IDEOGRAPH-18D08 +18CFF..18D08 ; Ideographic # Lo [10] KHITAN SMALL SCRIPT CHARACTER-18CFF..TANGUT IDEOGRAPH-18D08 1B170..1B2FB ; Ideographic # Lo [396] NUSHU CHARACTER-1B170..NUSHU CHARACTER-1B2FB 20000..2A6DF ; Ideographic # Lo [42720] CJK UNIFIED IDEOGRAPH-20000..CJK UNIFIED IDEOGRAPH-2A6DF 2A700..2B739 ; Ideographic # Lo [4154] CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B739 @@ -861,7 +885,7 @@ FA70..FAD9 ; Ideographic # Lo [106] CJK COMPATIBILITY IDEOGRAPH-FA70..CJK COM 30000..3134A ; Ideographic # Lo [4939] CJK UNIFIED IDEOGRAPH-30000..CJK UNIFIED IDEOGRAPH-3134A 31350..323AF ; Ideographic # Lo [4192] CJK UNIFIED IDEOGRAPH-31350..CJK UNIFIED IDEOGRAPH-323AF -# Total code points: 106476 +# Total code points: 106477 # ================================================ @@ -932,6 +956,7 @@ FA70..FAD9 ; Ideographic # Lo [106] CJK COMPATIBILITY IDEOGRAPH-FA70..CJK COM 0D3B..0D3C ; Diacritic # Mn [2] MALAYALAM SIGN VERTICAL BAR VIRAMA..MALAYALAM SIGN CIRCULAR VIRAMA 0D4D ; Diacritic # Mn MALAYALAM SIGN VIRAMA 0DCA ; Diacritic # Mn SINHALA SIGN AL-LAKUNA +0E3A ; Diacritic # Mn THAI CHARACTER PHINTHU 0E47..0E4C ; Diacritic # Mn [6] THAI CHARACTER MAITAIKHU..THAI CHARACTER THANTHAKHAT 0E4E ; Diacritic # Mn THAI CHARACTER YAMAKKAN 0EBA ; Diacritic # Mn LAO SIGN PALI VIRAMA @@ -955,9 +980,11 @@ FA70..FAD9 ; Ideographic # Lo [106] CJK COMPATIBILITY IDEOGRAPH-FA70..CJK COM 135D..135F ; Diacritic # Mn [3] ETHIOPIC COMBINING GEMINATION AND VOWEL LENGTH MARK..ETHIOPIC COMBINING GEMINATION MARK 1714 ; Diacritic # Mn TAGALOG SIGN VIRAMA 1715 ; Diacritic # Mc TAGALOG SIGN PAMUDPOD +1734 ; Diacritic # Mc HANUNOO SIGN PAMUDPOD 17C9..17D3 ; Diacritic # Mn [11] KHMER SIGN MUUSIKATOAN..KHMER SIGN BATHAMASAT 17DD ; Diacritic # Mn KHMER SIGN ATTHACAN 1939..193B ; Diacritic # Mn [3] LIMBU SIGN MUKPHRENG..LIMBU SIGN SA-I +1A60 ; Diacritic # Mn TAI THAM SIGN SAKOT 1A75..1A7C ; Diacritic # Mn [8] TAI THAM SIGN TONE-1..TAI THAM SIGN KHUEN-LUE KARAN 1A7F ; Diacritic # Mn TAI THAM COMBINING CRYPTOGRAMMIC DOT 1AB0..1ABD ; Diacritic # Mn [14] COMBINING DOUBLED CIRCUMFLEX ACCENT..COMBINING PARENTHESES BELOW @@ -968,6 +995,8 @@ FA70..FAD9 ; Ideographic # Lo [106] CJK COMPATIBILITY IDEOGRAPH-FA70..CJK COM 1B6B..1B73 ; Diacritic # Mn [9] BALINESE MUSICAL SYMBOL COMBINING TEGEH..BALINESE MUSICAL SYMBOL COMBINING GONG 1BAA ; Diacritic # Mc SUNDANESE SIGN PAMAAEH 1BAB ; Diacritic # Mn SUNDANESE SIGN VIRAMA +1BE6 ; Diacritic # Mn BATAK SIGN TOMPI +1BF2..1BF3 ; Diacritic # Mc [2] BATAK PANGOLAT..BATAK PANONGONAN 1C36..1C37 ; Diacritic # Mn [2] LEPCHA SIGN RAN..LEPCHA SIGN NUKTA 1C78..1C7D ; Diacritic # Lm [6] OL CHIKI MU TTUDDAG..OL CHIKI AHAD 1CD0..1CD2 ; Diacritic # Mn [3] VEDIC TONE KARSHANA..VEDIC TONE PRENKHA @@ -1006,6 +1035,8 @@ A720..A721 ; Diacritic # Sk [2] MODIFIER LETTER STRESS AND HIGH TONE..MODIF A788 ; Diacritic # Lm MODIFIER LETTER LOW CIRCUMFLEX ACCENT A789..A78A ; Diacritic # Sk [2] MODIFIER LETTER COLON..MODIFIER LETTER SHORT EQUALS SIGN A7F8..A7F9 ; Diacritic # Lm [2] MODIFIER LETTER CAPITAL H WITH STROKE..MODIFIER LETTER SMALL LIGATURE OE +A806 ; Diacritic # Mn SYLOTI NAGRI SIGN HASANTA +A82C ; Diacritic # Mn SYLOTI NAGRI SIGN ALTERNATE HASANTA A8C4 ; Diacritic # Mn SAURASHTRA SIGN VIRAMA A8E0..A8F1 ; Diacritic # Mn [18] COMBINING DEVANAGARI DIGIT ZERO..COMBINING DEVANAGARI SIGN AVAGRAHA A92B..A92D ; Diacritic # Mn [3] KAYAH LI TONE PLOPHU..KAYAH LI TONE CALYA PLOPHU @@ -1039,9 +1070,13 @@ FFE3 ; Diacritic # Sk FULLWIDTH MACRON 10780..10785 ; Diacritic # Lm [6] MODIFIER LETTER SMALL CAPITAL AA..MODIFIER LETTER SMALL B WITH HOOK 10787..107B0 ; Diacritic # Lm [42] MODIFIER LETTER SMALL DZ DIGRAPH..MODIFIER LETTER SMALL V WITH RIGHT HOOK 107B2..107BA ; Diacritic # Lm [9] MODIFIER LETTER SMALL CAPITAL Y..MODIFIER LETTER SMALL S WITH CURL +10A38..10A3A ; Diacritic # Mn [3] KHAROSHTHI SIGN BAR ABOVE..KHAROSHTHI SIGN DOT BELOW +10A3F ; Diacritic # Mn KHAROSHTHI VIRAMA 10AE5..10AE6 ; Diacritic # Mn [2] MANICHAEAN ABBREVIATION MARK ABOVE..MANICHAEAN ABBREVIATION MARK BELOW 10D22..10D23 ; Diacritic # Lo [2] HANIFI ROHINGYA MARK SAKIN..HANIFI ROHINGYA MARK NA KHONNA 10D24..10D27 ; Diacritic # Mn [4] HANIFI ROHINGYA SIGN HARBAHAY..HANIFI ROHINGYA SIGN TASSI +10D4E ; Diacritic # Lm GARAY VOWEL LENGTH MARK +10D69..10D6D ; Diacritic # Mn [5] GARAY VOWEL SIGN E..GARAY CONSONANT NASALIZATION MARK 10EFD..10EFF ; Diacritic # Mn [3] ARABIC SMALL LOW WORD SAKTA..ARABIC SMALL LOW WORD MADDA 10F46..10F50 ; Diacritic # Mn [11] SOGDIAN COMBINING DOT BELOW..SOGDIAN COMBINING STROKE BELOW 10F82..10F85 ; Diacritic # Mn [4] OLD UYGHUR COMBINING DOT ABOVE..OLD UYGHUR COMBINING TWO DOTS BELOW @@ -1055,10 +1090,16 @@ FFE3 ; Diacritic # Sk FULLWIDTH MACRON 11235 ; Diacritic # Mc KHOJKI SIGN VIRAMA 11236 ; Diacritic # Mn KHOJKI SIGN NUKTA 112E9..112EA ; Diacritic # Mn [2] KHUDAWADI SIGN NUKTA..KHUDAWADI SIGN VIRAMA -1133C ; Diacritic # Mn GRANTHA SIGN NUKTA +1133B..1133C ; Diacritic # Mn [2] COMBINING BINDU BELOW..GRANTHA SIGN NUKTA 1134D ; Diacritic # Mc GRANTHA SIGN VIRAMA 11366..1136C ; Diacritic # Mn [7] COMBINING GRANTHA DIGIT ZERO..COMBINING GRANTHA DIGIT SIX 11370..11374 ; Diacritic # Mn [5] COMBINING GRANTHA LETTER A..COMBINING GRANTHA LETTER PA +113CE ; Diacritic # Mn TULU-TIGALARI SIGN VIRAMA +113CF ; Diacritic # Mc TULU-TIGALARI SIGN LOOPED VIRAMA +113D0 ; Diacritic # Mn TULU-TIGALARI CONJOINER +113D2 ; Diacritic # Mn TULU-TIGALARI GEMINATION MARK +113D3 ; Diacritic # Lo TULU-TIGALARI SIGN PLUTA +113E1..113E2 ; Diacritic # Mn [2] TULU-TIGALARI VEDIC TONE SVARITA..TULU-TIGALARI VEDIC TONE ANUDATTA 11442 ; Diacritic # Mn NEWA SIGN VIRAMA 11446 ; Diacritic # Mn NEWA SIGN NUKTA 114C2..114C3 ; Diacritic # Mn [2] TIRHUTA SIGN VIRAMA..TIRHUTA SIGN NUKTA @@ -1079,9 +1120,14 @@ FFE3 ; Diacritic # Sk FULLWIDTH MACRON 11D42 ; Diacritic # Mn MASARAM GONDI SIGN NUKTA 11D44..11D45 ; Diacritic # Mn [2] MASARAM GONDI SIGN HALANTA..MASARAM GONDI VIRAMA 11D97 ; Diacritic # Mn GUNJALA GONDI VIRAMA +11F41 ; Diacritic # Mc KAWI SIGN KILLER +11F42 ; Diacritic # Mn KAWI CONJOINER +11F5A ; Diacritic # Mn KAWI SIGN NUKTA 13447..13455 ; Diacritic # Mn [15] EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT TOP START..EGYPTIAN HIEROGLYPH MODIFIER DAMAGED +1612F ; Diacritic # Mn GURUNG KHEMA SIGN THOLHOMA 16AF0..16AF4 ; Diacritic # Mn [5] BASSA VAH COMBINING HIGH TONE..BASSA VAH COMBINING HIGH-LOW TONE 16B30..16B36 ; Diacritic # Mn [7] PAHAWH HMONG MARK CIM TUB..PAHAWH HMONG MARK CIM TAUM +16D6B..16D6C ; Diacritic # Lm [2] KIRAT RAI SIGN VIRAMA..KIRAT RAI SIGN SAAT 16F8F..16F92 ; Diacritic # Mn [4] MIAO TONE RIGHT..MIAO TONE BELOW 16F93..16F9F ; Diacritic # Lm [13] MIAO LETTER TONE-2..MIAO LETTER REFORMED TONE-8 16FF0..16FF1 ; Diacritic # Mc [2] VIETNAMESE ALTERNATE READING MARK CA..VIETNAMESE ALTERNATE READING MARK NHAY @@ -1099,11 +1145,12 @@ FFE3 ; Diacritic # Sk FULLWIDTH MACRON 1E130..1E136 ; Diacritic # Mn [7] NYIAKENG PUACHUE HMONG TONE-B..NYIAKENG PUACHUE HMONG TONE-D 1E2AE ; Diacritic # Mn TOTO SIGN RISING TONE 1E2EC..1E2EF ; Diacritic # Mn [4] WANCHO TONE TUP..WANCHO TONE KOINI +1E5EE..1E5EF ; Diacritic # Mn [2] OL ONAL SIGN MU..OL ONAL SIGN IKIR 1E8D0..1E8D6 ; Diacritic # Mn [7] MENDE KIKAKUI COMBINING NUMBER TEENS..MENDE KIKAKUI COMBINING NUMBER MILLIONS 1E944..1E946 ; Diacritic # Mn [3] ADLAM ALIF LENGTHENER..ADLAM GEMINATION MARK 1E948..1E94A ; Diacritic # Mn [3] ADLAM CONSONANT MODIFIER..ADLAM NUKTA -# Total code points: 1144 +# Total code points: 1178 # ================================================ @@ -1111,6 +1158,8 @@ FFE3 ; Diacritic # Sk FULLWIDTH MACRON 02D0..02D1 ; Extender # Lm [2] MODIFIER LETTER TRIANGULAR COLON..MODIFIER LETTER HALF TRIANGULAR COLON 0640 ; Extender # Lm ARABIC TATWEEL 07FA ; Extender # Lm NKO LAJANYALAN +0A71 ; Extender # Mn GURMUKHI ADDAK +0AFB ; Extender # Mn GUJARATI SIGN SHADDA 0B55 ; Extender # Mn ORIYA SIGN OVERLINE 0E46 ; Extender # Lm THAI CHARACTER MAIYAMOK 0EC6 ; Extender # Lm LAO KO LA @@ -1132,16 +1181,23 @@ AADD ; Extender # Lm TAI VIET SYMBOL SAM AAF3..AAF4 ; Extender # Lm [2] MEETEI MAYEK SYLLABLE REPETITION MARK..MEETEI MAYEK WORD REPETITION MARK FF70 ; Extender # Lm HALFWIDTH KATAKANA-HIRAGANA PROLONGED SOUND MARK 10781..10782 ; Extender # Lm [2] MODIFIER LETTER SUPERSCRIPT TRIANGULAR COLON..MODIFIER LETTER SUPERSCRIPT HALF TRIANGULAR COLON +10D4E ; Extender # Lm GARAY VOWEL LENGTH MARK +10D6A ; Extender # Mn GARAY CONSONANT GEMINATION MARK +10D6F ; Extender # Lm GARAY REDUPLICATION MARK +11237 ; Extender # Mn KHOJKI SIGN SHADDA 1135D ; Extender # Lo GRANTHA SIGN PLUTA +113D2 ; Extender # Mn TULU-TIGALARI GEMINATION MARK +113D3 ; Extender # Lo TULU-TIGALARI SIGN PLUTA 115C6..115C8 ; Extender # Po [3] SIDDHAM REPETITION MARK-1..SIDDHAM REPETITION MARK-3 11A98 ; Extender # Mn SOYOMBO GEMINATION MARK 16B42..16B43 ; Extender # Lm [2] PAHAWH HMONG SIGN VOS NRUA..PAHAWH HMONG SIGN IB YAM 16FE0..16FE1 ; Extender # Lm [2] TANGUT ITERATION MARK..NUSHU ITERATION MARK 16FE3 ; Extender # Lm OLD CHINESE ITERATION MARK 1E13C..1E13D ; Extender # Lm [2] NYIAKENG PUACHUE HMONG SIGN XW XW..NYIAKENG PUACHUE HMONG SYLLABLE LENGTHENER +1E5EF ; Extender # Mn OL ONAL SIGN IKIR 1E944..1E946 ; Extender # Mn [3] ADLAM ALIF LENGTHENER..ADLAM GEMINATION MARK -# Total code points: 50 +# Total code points: 59 # ================================================ @@ -1217,27 +1273,51 @@ FFFFE..FFFFF ; Noncharacter_Code_Point # Cn [2] <noncharacter-FFFFE>..<noncha 0B57 ; Other_Grapheme_Extend # Mc ORIYA AU LENGTH MARK 0BBE ; Other_Grapheme_Extend # Mc TAMIL VOWEL SIGN AA 0BD7 ; Other_Grapheme_Extend # Mc TAMIL AU LENGTH MARK +0CC0 ; Other_Grapheme_Extend # Mc KANNADA VOWEL SIGN II 0CC2 ; Other_Grapheme_Extend # Mc KANNADA VOWEL SIGN UU +0CC7..0CC8 ; Other_Grapheme_Extend # Mc [2] KANNADA VOWEL SIGN EE..KANNADA VOWEL SIGN AI +0CCA..0CCB ; Other_Grapheme_Extend # Mc [2] KANNADA VOWEL SIGN O..KANNADA VOWEL SIGN OO 0CD5..0CD6 ; Other_Grapheme_Extend # Mc [2] KANNADA LENGTH MARK..KANNADA AI LENGTH MARK 0D3E ; Other_Grapheme_Extend # Mc MALAYALAM VOWEL SIGN AA 0D57 ; Other_Grapheme_Extend # Mc MALAYALAM AU LENGTH MARK 0DCF ; Other_Grapheme_Extend # Mc SINHALA VOWEL SIGN AELA-PILLA 0DDF ; Other_Grapheme_Extend # Mc SINHALA VOWEL SIGN GAYANUKITTA +1715 ; Other_Grapheme_Extend # Mc TAGALOG SIGN PAMUDPOD +1734 ; Other_Grapheme_Extend # Mc HANUNOO SIGN PAMUDPOD 1B35 ; Other_Grapheme_Extend # Mc BALINESE VOWEL SIGN TEDUNG +1B3B ; Other_Grapheme_Extend # Mc BALINESE VOWEL SIGN RA REPA TEDUNG +1B3D ; Other_Grapheme_Extend # Mc BALINESE VOWEL SIGN LA LENGA TEDUNG +1B43..1B44 ; Other_Grapheme_Extend # Mc [2] BALINESE VOWEL SIGN PEPET TEDUNG..BALINESE ADEG ADEG +1BAA ; Other_Grapheme_Extend # Mc SUNDANESE SIGN PAMAAEH +1BF2..1BF3 ; Other_Grapheme_Extend # Mc [2] BATAK PANGOLAT..BATAK PANONGONAN 200C ; Other_Grapheme_Extend # Cf ZERO WIDTH NON-JOINER 302E..302F ; Other_Grapheme_Extend # Mc [2] HANGUL SINGLE DOT TONE MARK..HANGUL DOUBLE DOT TONE MARK +A953 ; Other_Grapheme_Extend # Mc REJANG VIRAMA +A9C0 ; Other_Grapheme_Extend # Mc JAVANESE PANGKON FF9E..FF9F ; Other_Grapheme_Extend # Lm [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HALFWIDTH KATAKANA SEMI-VOICED SOUND MARK +111C0 ; Other_Grapheme_Extend # Mc SHARADA SIGN VIRAMA +11235 ; Other_Grapheme_Extend # Mc KHOJKI SIGN VIRAMA 1133E ; Other_Grapheme_Extend # Mc GRANTHA VOWEL SIGN AA +1134D ; Other_Grapheme_Extend # Mc GRANTHA SIGN VIRAMA 11357 ; Other_Grapheme_Extend # Mc GRANTHA AU LENGTH MARK +113B8 ; Other_Grapheme_Extend # Mc TULU-TIGALARI VOWEL SIGN AA +113C2 ; Other_Grapheme_Extend # Mc TULU-TIGALARI VOWEL SIGN EE +113C5 ; Other_Grapheme_Extend # Mc TULU-TIGALARI VOWEL SIGN AI +113C7..113C9 ; Other_Grapheme_Extend # Mc [3] TULU-TIGALARI VOWEL SIGN OO..TULU-TIGALARI AU LENGTH MARK +113CF ; Other_Grapheme_Extend # Mc TULU-TIGALARI SIGN LOOPED VIRAMA 114B0 ; Other_Grapheme_Extend # Mc TIRHUTA VOWEL SIGN AA 114BD ; Other_Grapheme_Extend # Mc TIRHUTA VOWEL SIGN SHORT O 115AF ; Other_Grapheme_Extend # Mc SIDDHAM VOWEL SIGN AA +116B6 ; Other_Grapheme_Extend # Mc TAKRI SIGN VIRAMA 11930 ; Other_Grapheme_Extend # Mc DIVES AKURU VOWEL SIGN AA -1D165 ; Other_Grapheme_Extend # Mc MUSICAL SYMBOL COMBINING STEM -1D16E..1D172 ; Other_Grapheme_Extend # Mc [5] MUSICAL SYMBOL COMBINING FLAG-1..MUSICAL SYMBOL COMBINING FLAG-5 +1193D ; Other_Grapheme_Extend # Mc DIVES AKURU SIGN HALANTA +11F41 ; Other_Grapheme_Extend # Mc KAWI SIGN KILLER +16FF0..16FF1 ; Other_Grapheme_Extend # Mc [2] VIETNAMESE ALTERNATE READING MARK CA..VIETNAMESE ALTERNATE READING MARK NHAY +1D165..1D166 ; Other_Grapheme_Extend # Mc [2] MUSICAL SYMBOL COMBINING STEM..MUSICAL SYMBOL COMBINING SPRECHGESANG STEM +1D16D..1D172 ; Other_Grapheme_Extend # Mc [6] MUSICAL SYMBOL COMBINING AUGMENTATION DOT..MUSICAL SYMBOL COMBINING FLAG-5 E0020..E007F ; Other_Grapheme_Extend # Cf [96] TAG SPACE..CANCEL TAG -# Total code points: 127 +# Total code points: 160 # ================================================ @@ -1462,13 +1542,16 @@ FF65 ; Other_ID_Continue # Po HALFWIDTH KATAKANA MIDDLE DOT 1809 ; Sentence_Terminal # Po MONGOLIAN MANCHU FULL STOP 1944..1945 ; Sentence_Terminal # Po [2] LIMBU EXCLAMATION MARK..LIMBU QUESTION MARK 1AA8..1AAB ; Sentence_Terminal # Po [4] TAI THAM SIGN KAAN..TAI THAM SIGN SATKAANKUU +1B4E..1B4F ; Sentence_Terminal # Po [2] BALINESE INVERTED CARIK SIKI..BALINESE INVERTED CARIK PAREREN 1B5A..1B5B ; Sentence_Terminal # Po [2] BALINESE PANTI..BALINESE PAMADA 1B5E..1B5F ; Sentence_Terminal # Po [2] BALINESE CARIK SIKI..BALINESE CARIK PAREREN -1B7D..1B7E ; Sentence_Terminal # Po [2] BALINESE PANTI LANTANG..BALINESE PAMADA LANTANG +1B7D..1B7F ; Sentence_Terminal # Po [3] BALINESE PANTI LANTANG..BALINESE PANTI BAWAK 1C3B..1C3C ; Sentence_Terminal # Po [2] LEPCHA PUNCTUATION TA-ROL..LEPCHA PUNCTUATION NYET THYOOM TA-ROL 1C7E..1C7F ; Sentence_Terminal # Po [2] OL CHIKI PUNCTUATION MUCAAD..OL CHIKI PUNCTUATION DOUBLE MUCAAD +2024 ; Sentence_Terminal # Po ONE DOT LEADER 203C..203D ; Sentence_Terminal # Po [2] DOUBLE EXCLAMATION MARK..INTERROBANG 2047..2049 ; Sentence_Terminal # Po [3] DOUBLE QUESTION MARK..EXCLAMATION QUESTION MARK +2CF9..2CFB ; Sentence_Terminal # Po [3] COPTIC OLD NUBIAN FULL STOP..COPTIC OLD NUBIAN INDIRECT QUESTION MARK 2E2E ; Sentence_Terminal # Po REVERSED QUESTION MARK 2E3C ; Sentence_Terminal # Po STENOGRAPHIC FULL STOP 2E53..2E54 ; Sentence_Terminal # Po [2] MEDIEVAL EXCLAMATION MARK..MEDIEVAL QUESTION MARK @@ -1484,6 +1567,8 @@ A9C8..A9C9 ; Sentence_Terminal # Po [2] JAVANESE PADA LINGSA..JAVANESE PADA AA5D..AA5F ; Sentence_Terminal # Po [3] CHAM PUNCTUATION DANDA..CHAM PUNCTUATION TRIPLE DANDA AAF0..AAF1 ; Sentence_Terminal # Po [2] MEETEI MAYEK CHEIKHAN..MEETEI MAYEK AHANG KHUDAM ABEB ; Sentence_Terminal # Po MEETEI MAYEK CHEIKHEI +FE12 ; Sentence_Terminal # Po PRESENTATION FORM FOR VERTICAL IDEOGRAPHIC FULL STOP +FE15..FE16 ; Sentence_Terminal # Po [2] PRESENTATION FORM FOR VERTICAL EXCLAMATION MARK..PRESENTATION FORM FOR VERTICAL QUESTION MARK FE52 ; Sentence_Terminal # Po SMALL FULL STOP FE56..FE57 ; Sentence_Terminal # Po [2] SMALL QUESTION MARK..SMALL EXCLAMATION MARK FF01 ; Sentence_Terminal # Po FULLWIDTH EXCLAMATION MARK @@ -1502,6 +1587,7 @@ FF61 ; Sentence_Terminal # Po HALFWIDTH IDEOGRAPHIC FULL STOP 11238..11239 ; Sentence_Terminal # Po [2] KHOJKI DANDA..KHOJKI DOUBLE DANDA 1123B..1123C ; Sentence_Terminal # Po [2] KHOJKI SECTION MARK..KHOJKI DOUBLE SECTION MARK 112A9 ; Sentence_Terminal # Po MULTANI SECTION MARK +113D4..113D5 ; Sentence_Terminal # Po [2] TULU-TIGALARI DANDA..TULU-TIGALARI DOUBLE DANDA 1144B..1144C ; Sentence_Terminal # Po [2] NEWA DANDA..NEWA DOUBLE DANDA 115C2..115C3 ; Sentence_Terminal # Po [2] SIDDHAM DANDA..SIDDHAM DOUBLE DANDA 115C9..115D7 ; Sentence_Terminal # Po [15] SIDDHAM END OF TEXT MARK..SIDDHAM SECTION MARK WITH CIRCLES AND FOUR ENCLOSURES @@ -1518,11 +1604,12 @@ FF61 ; Sentence_Terminal # Po HALFWIDTH IDEOGRAPHIC FULL STOP 16AF5 ; Sentence_Terminal # Po BASSA VAH FULL STOP 16B37..16B38 ; Sentence_Terminal # Po [2] PAHAWH HMONG SIGN VOS THOM..PAHAWH HMONG SIGN VOS TSHAB CEEB 16B44 ; Sentence_Terminal # Po PAHAWH HMONG SIGN XAUS +16D6E..16D6F ; Sentence_Terminal # Po [2] KIRAT RAI DANDA..KIRAT RAI DOUBLE DANDA 16E98 ; Sentence_Terminal # Po MEDEFAIDRIN FULL STOP 1BC9F ; Sentence_Terminal # Po DUPLOYAN PUNCTUATION CHINOOK FULL STOP 1DA88 ; Sentence_Terminal # Po SIGNWRITING FULL STOP -# Total code points: 156 +# Total code points: 170 # ================================================ @@ -1640,8 +1727,8 @@ E0100..E01EF ; Variation_Selector # Mn [240] VARIATION SELECTOR-17..VARIATION S 239B..23B3 ; Pattern_Syntax # Sm [25] LEFT PARENTHESIS UPPER HOOK..SUMMATION BOTTOM 23B4..23DB ; Pattern_Syntax # So [40] TOP SQUARE BRACKET..FUSE 23DC..23E1 ; Pattern_Syntax # Sm [6] TOP PARENTHESIS..BOTTOM TORTOISE SHELL BRACKET -23E2..2426 ; Pattern_Syntax # So [69] WHITE TRAPEZIUM..SYMBOL FOR SUBSTITUTE FORM TWO -2427..243F ; Pattern_Syntax # Cn [25] <reserved-2427>..<reserved-243F> +23E2..2429 ; Pattern_Syntax # So [72] WHITE TRAPEZIUM..SYMBOL FOR DELETE MEDIUM SHADE FORM +242A..243F ; Pattern_Syntax # Cn [22] <reserved-242A>..<reserved-243F> 2440..244A ; Pattern_Syntax # So [11] OCR HOOK..OCR DOUBLE BACKSLASH 244B..245F ; Pattern_Syntax # Cn [21] <reserved-244B>..<reserved-245F> 2500..25B6 ; Pattern_Syntax # So [183] BOX DRAWINGS LIGHT HORIZONTAL..BLACK RIGHT-POINTING TRIANGLE @@ -1824,4 +1911,18 @@ FE45..FE46 ; Pattern_Syntax # Po [2] SESAME DOT..WHITE SESAME DOT # Total code points: 26 +# ================================================ + +0654..0655 ; Modifier_Combining_Mark # Mn [2] ARABIC HAMZA ABOVE..ARABIC HAMZA BELOW +0658 ; Modifier_Combining_Mark # Mn ARABIC MARK NOON GHUNNA +06DC ; Modifier_Combining_Mark # Mn ARABIC SMALL HIGH SEEN +06E3 ; Modifier_Combining_Mark # Mn ARABIC SMALL LOW SEEN +06E7..06E8 ; Modifier_Combining_Mark # Mn [2] ARABIC SMALL HIGH YEH..ARABIC SMALL HIGH NOON +08CA..08CB ; Modifier_Combining_Mark # Mn [2] ARABIC SMALL HIGH FARSI YEH..ARABIC SMALL HIGH YEH BARREE WITH TWO DOTS BELOW +08CD..08CF ; Modifier_Combining_Mark # Mn [3] ARABIC SMALL HIGH ZAH..ARABIC LARGE ROUND DOT BELOW +08D3 ; Modifier_Combining_Mark # Mn ARABIC SMALL LOW WAW +08F3 ; Modifier_Combining_Mark # Mn ARABIC SMALL HIGH WAW + +# Total code points: 14 + # EOF diff --git a/Master/texmf-dist/tex/generic/unicode-data/ScriptExtensions.txt b/Master/texmf-dist/tex/generic/unicode-data/ScriptExtensions.txt index 23141fb8241..140901a872c 100644 --- a/Master/texmf-dist/tex/generic/unicode-data/ScriptExtensions.txt +++ b/Master/texmf-dist/tex/generic/unicode-data/ScriptExtensions.txt @@ -1,8 +1,8 @@ -# ScriptExtensions-15.1.0.txt -# Date: 2023-02-01, 23:02:24 GMT -# © 2023 Unicode®, Inc. +# ScriptExtensions-16.0.0.txt +# Date: 2024-07-30, 19:38:00 GMT +# © 2024 Unicode®, Inc. # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries. -# For terms of use, see https://www.unicode.org/terms_of_use.html +# For terms of use and license, see https://www.unicode.org/terms_of_use.html # # Unicode Character Database # For documentation, see https://www.unicode.org/reports/tr44/ @@ -21,615 +21,213 @@ # values in that set is not material, but for stability in presentation # it is given here as alphabetical. # -# The Script_Extensions values are presented in sorted order in the file. -# They are sorted first by the number of Script property values in their sets, -# and then alphabetically by first differing Script property value. -# -# Following each distinct Script_Extensions value is the list of code -# points associated with that value, listed in code point order. -# # All code points not explicitly listed for Script_Extensions -# have as their value the corresponding Script property value +# have as their value the corresponding Script property value. # # @missing: 0000..10FFFF; <script> - -# ================================================ - -# Property: Script_Extensions - -# ================================================ - -# Script_Extensions=Beng - -1CF7 ; Beng # Mc VEDIC SIGN ATIKRAMA - -# Total code points: 1 - -# ================================================ - -# Script_Extensions=Deva - -1CD1 ; Deva # Mn VEDIC TONE SHARA -1CD4 ; Deva # Mn VEDIC SIGN YAJURVEDIC MIDLINE SVARITA -1CDB ; Deva # Mn VEDIC TONE TRIPLE SVARITA -1CDE..1CDF ; Deva # Mn [2] VEDIC TONE TWO DOTS BELOW..VEDIC TONE THREE DOTS BELOW -1CE2..1CE8 ; Deva # Mn [7] VEDIC SIGN VISARGA SVARITA..VEDIC SIGN VISARGA ANUDATTA WITH TAIL -1CEB..1CEC ; Deva # Lo [2] VEDIC SIGN ANUSVARA VAMAGOMUKHA..VEDIC SIGN ANUSVARA VAMAGOMUKHA WITH TAIL -1CEE..1CF1 ; Deva # Lo [4] VEDIC SIGN HEXIFORM LONG ANUSVARA..VEDIC SIGN ANUSVARA UBHAYATO MUKHA - -# Total code points: 18 - -# ================================================ - -# Script_Extensions=Dupl - -1BCA0..1BCA3 ; Dupl # Cf [4] SHORTHAND FORMAT LETTER OVERLAP..SHORTHAND FORMAT UP STEP - -# Total code points: 4 - -# ================================================ - -# Script_Extensions=Grek - -0342 ; Grek # Mn COMBINING GREEK PERISPOMENI -0345 ; Grek # Mn COMBINING GREEK YPOGEGRAMMENI -1DC0..1DC1 ; Grek # Mn [2] COMBINING DOTTED GRAVE ACCENT..COMBINING DOTTED ACUTE ACCENT - -# Total code points: 4 - -# ================================================ - -# Script_Extensions=Hani - -3006 ; Hani # Lo IDEOGRAPHIC CLOSING MARK -303E..303F ; Hani # So [2] IDEOGRAPHIC VARIATION INDICATOR..IDEOGRAPHIC HALF FILL SPACE -3190..3191 ; Hani # So [2] IDEOGRAPHIC ANNOTATION LINKING MARK..IDEOGRAPHIC ANNOTATION REVERSE MARK -3192..3195 ; Hani # No [4] IDEOGRAPHIC ANNOTATION ONE MARK..IDEOGRAPHIC ANNOTATION FOUR MARK -3196..319F ; Hani # So [10] IDEOGRAPHIC ANNOTATION TOP MARK..IDEOGRAPHIC ANNOTATION MAN MARK -31C0..31E3 ; Hani # So [36] CJK STROKE T..CJK STROKE Q -3220..3229 ; Hani # No [10] PARENTHESIZED IDEOGRAPH ONE..PARENTHESIZED IDEOGRAPH TEN -322A..3247 ; Hani # So [30] PARENTHESIZED IDEOGRAPH MOON..CIRCLED IDEOGRAPH KOTO -3280..3289 ; Hani # No [10] CIRCLED IDEOGRAPH ONE..CIRCLED IDEOGRAPH TEN -328A..32B0 ; Hani # So [39] CIRCLED IDEOGRAPH MOON..CIRCLED IDEOGRAPH NIGHT -32C0..32CB ; Hani # So [12] IDEOGRAPHIC TELEGRAPH SYMBOL FOR JANUARY..IDEOGRAPHIC TELEGRAPH SYMBOL FOR DECEMBER -32FF ; Hani # So SQUARE ERA NAME REIWA -3358..3370 ; Hani # So [25] IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR ZERO..IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWENTY-FOUR -337B..337F ; Hani # So [5] SQUARE ERA NAME HEISEI..SQUARE CORPORATION -33E0..33FE ; Hani # So [31] IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY ONE..IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY THIRTY-ONE -1D360..1D371 ; Hani # No [18] COUNTING ROD UNIT DIGIT ONE..COUNTING ROD TENS DIGIT NINE -1F250..1F251 ; Hani # So [2] CIRCLED IDEOGRAPH ADVANTAGE..CIRCLED IDEOGRAPH ACCEPT - -# Total code points: 238 - -# ================================================ - -# Script_Extensions=Latn - -0363..036F ; Latn # Mn [13] COMBINING LATIN SMALL LETTER A..COMBINING LATIN SMALL LETTER X - -# Total code points: 13 - -# ================================================ - -# Script_Extensions=Nand - -1CFA ; Nand # Lo VEDIC SIGN DOUBLE ANUSVARA ANTARGOMUKHA - -# Total code points: 1 - -# ================================================ - -# Script_Extensions=Syrc - -1DFA ; Syrc # Mn COMBINING DOT BELOW LEFT - -# Total code points: 1 - -# ================================================ - -# Script_Extensions=Arab Copt - -102E0 ; Arab Copt # Mn COPTIC EPACT THOUSANDS MARK -102E1..102FB ; Arab Copt # No [27] COPTIC EPACT DIGIT ONE..COPTIC EPACT NUMBER NINE HUNDRED - -# Total code points: 28 - -# ================================================ - -# Script_Extensions=Arab Nkoo - -FD3E ; Arab Nkoo # Pe ORNATE LEFT PARENTHESIS -FD3F ; Arab Nkoo # Ps ORNATE RIGHT PARENTHESIS - -# Total code points: 2 - -# ================================================ - -# Script_Extensions=Arab Rohg - -06D4 ; Arab Rohg # Po ARABIC FULL STOP - -# Total code points: 1 - -# ================================================ - -# Script_Extensions=Arab Syrc - -064B..0655 ; Arab Syrc # Mn [11] ARABIC FATHATAN..ARABIC HAMZA BELOW -0670 ; Arab Syrc # Mn ARABIC LETTER SUPERSCRIPT ALEF - -# Total code points: 12 - -# ================================================ - -# Script_Extensions=Arab Thaa - -FDF2 ; Arab Thaa # Lo ARABIC LIGATURE ALLAH ISOLATED FORM -FDFD ; Arab Thaa # So ARABIC LIGATURE BISMILLAH AR-RAHMAN AR-RAHEEM - -# Total code points: 2 - -# ================================================ - -# Script_Extensions=Beng Deva - -1CD5..1CD6 ; Beng Deva # Mn [2] VEDIC TONE YAJURVEDIC AGGRAVATED INDEPENDENT SVARITA..VEDIC TONE YAJURVEDIC INDEPENDENT SVARITA -1CD8 ; Beng Deva # Mn VEDIC TONE CANDRA BELOW -1CE1 ; Beng Deva # Mc VEDIC TONE ATHARVAVEDIC INDEPENDENT SVARITA -1CEA ; Beng Deva # Lo VEDIC SIGN ANUSVARA BAHIRGOMUKHA -1CED ; Beng Deva # Mn VEDIC SIGN TIRYAK -1CF5..1CF6 ; Beng Deva # Lo [2] VEDIC SIGN JIHVAMULIYA..VEDIC SIGN UPADHMANIYA -A8F1 ; Beng Deva # Mn COMBINING DEVANAGARI SIGN AVAGRAHA - -# Total code points: 9 - -# ================================================ - -# Script_Extensions=Bopo Hani - -302A..302D ; Bopo Hani # Mn [4] IDEOGRAPHIC LEVEL TONE MARK..IDEOGRAPHIC ENTERING TONE MARK - -# Total code points: 4 - -# ================================================ - -# Script_Extensions=Bugi Java - -A9CF ; Bugi Java # Lm JAVANESE PANGRANGKEP - -# Total code points: 1 - -# ================================================ - -# Script_Extensions=Cprt Linb - -10102 ; Cprt Linb # Po AEGEAN CHECK MARK -10137..1013F ; Cprt Linb # So [9] AEGEAN WEIGHT BASE UNIT..AEGEAN MEASURE THIRD SUBUNIT - -# Total code points: 10 - -# ================================================ - -# Script_Extensions=Cyrl Glag - -0484 ; Cyrl Glag # Mn COMBINING CYRILLIC PALATALIZATION -0487 ; Cyrl Glag # Mn COMBINING CYRILLIC POKRYTIE -2E43 ; Cyrl Glag # Po DASH WITH LEFT UPTURN -A66F ; Cyrl Glag # Mn COMBINING CYRILLIC VZMET - -# Total code points: 4 - -# ================================================ - -# Script_Extensions=Cyrl Latn - -0485..0486 ; Cyrl Latn # Mn [2] COMBINING CYRILLIC DASIA PNEUMATA..COMBINING CYRILLIC PSILI PNEUMATA - -# Total code points: 2 - -# ================================================ - -# Script_Extensions=Cyrl Perm - -0483 ; Cyrl Perm # Mn COMBINING CYRILLIC TITLO - -# Total code points: 1 - -# ================================================ - -# Script_Extensions=Cyrl Syrc - -1DF8 ; Cyrl Syrc # Mn COMBINING DOT ABOVE LEFT - -# Total code points: 1 - -# ================================================ - -# Script_Extensions=Deva Gran - -1CD3 ; Deva Gran # Po VEDIC SIGN NIHSHVASA -1CF3 ; Deva Gran # Lo VEDIC SIGN ROTATED ARDHAVISARGA -1CF8..1CF9 ; Deva Gran # Mn [2] VEDIC TONE RING ABOVE..VEDIC TONE DOUBLE RING ABOVE - -# Total code points: 4 - -# ================================================ - -# Script_Extensions=Deva Nand - -1CE9 ; Deva Nand # Lo VEDIC SIGN ANUSVARA ANTARGOMUKHA - -# Total code points: 1 - -# ================================================ - -# Script_Extensions=Deva Shrd - -1CD7 ; Deva Shrd # Mn VEDIC TONE YAJURVEDIC KATHAKA INDEPENDENT SVARITA -1CD9 ; Deva Shrd # Mn VEDIC TONE YAJURVEDIC KATHAKA INDEPENDENT SVARITA SCHROEDER -1CDC..1CDD ; Deva Shrd # Mn [2] VEDIC TONE KATHAKA ANUDATTA..VEDIC TONE DOT BELOW -1CE0 ; Deva Shrd # Mn VEDIC TONE RIGVEDIC KASHMIRI INDEPENDENT SVARITA - -# Total code points: 5 - -# ================================================ - -# Script_Extensions=Deva Taml - -A8F3 ; Deva Taml # Lo DEVANAGARI SIGN CANDRABINDU VIRAMA - -# Total code points: 1 - -# ================================================ - -# Script_Extensions=Geor Latn - -10FB ; Geor Latn # Po GEORGIAN PARAGRAPH SEPARATOR - -# Total code points: 1 - -# ================================================ - -# Script_Extensions=Gran Taml - -0BE6..0BEF ; Gran Taml # Nd [10] TAMIL DIGIT ZERO..TAMIL DIGIT NINE -0BF0..0BF2 ; Gran Taml # No [3] TAMIL NUMBER TEN..TAMIL NUMBER ONE THOUSAND -0BF3 ; Gran Taml # So TAMIL DAY SIGN -11301 ; Gran Taml # Mn GRANTHA SIGN CANDRABINDU -11303 ; Gran Taml # Mc GRANTHA SIGN VISARGA -1133B..1133C ; Gran Taml # Mn [2] COMBINING BINDU BELOW..GRANTHA SIGN NUKTA -11FD0..11FD1 ; Gran Taml # No [2] TAMIL FRACTION ONE QUARTER..TAMIL FRACTION ONE HALF-1 -11FD3 ; Gran Taml # No TAMIL FRACTION THREE QUARTERS - -# Total code points: 21 - -# ================================================ - -# Script_Extensions=Gujr Khoj - -0AE6..0AEF ; Gujr Khoj # Nd [10] GUJARATI DIGIT ZERO..GUJARATI DIGIT NINE - -# Total code points: 10 - -# ================================================ - -# Script_Extensions=Guru Mult - -0A66..0A6F ; Guru Mult # Nd [10] GURMUKHI DIGIT ZERO..GURMUKHI DIGIT NINE - -# Total code points: 10 - -# ================================================ - -# Script_Extensions=Hani Latn - -A700..A707 ; Hani Latn # Sk [8] MODIFIER LETTER CHINESE TONE YIN PING..MODIFIER LETTER CHINESE TONE YANG RU - -# Total code points: 8 - -# ================================================ - -# Script_Extensions=Hira Kana - -3031..3035 ; Hira Kana # Lm [5] VERTICAL KANA REPEAT MARK..VERTICAL KANA REPEAT MARK LOWER HALF -3099..309A ; Hira Kana # Mn [2] COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK..COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK -309B..309C ; Hira Kana # Sk [2] KATAKANA-HIRAGANA VOICED SOUND MARK..KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK -30A0 ; Hira Kana # Pd KATAKANA-HIRAGANA DOUBLE HYPHEN -30FC ; Hira Kana # Lm KATAKANA-HIRAGANA PROLONGED SOUND MARK -FF70 ; Hira Kana # Lm HALFWIDTH KATAKANA-HIRAGANA PROLONGED SOUND MARK -FF9E..FF9F ; Hira Kana # Lm [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HALFWIDTH KATAKANA SEMI-VOICED SOUND MARK - -# Total code points: 14 - -# ================================================ - -# Script_Extensions=Knda Nand - -0CE6..0CEF ; Knda Nand # Nd [10] KANNADA DIGIT ZERO..KANNADA DIGIT NINE - -# Total code points: 10 - -# ================================================ - -# Script_Extensions=Latn Mong - -202F ; Latn Mong # Zs NARROW NO-BREAK SPACE - -# Total code points: 1 - -# ================================================ - -# Script_Extensions=Mani Ougr - -10AF2 ; Mani Ougr # Po MANICHAEAN PUNCTUATION DOUBLE DOT WITHIN DOT - -# Total code points: 1 - -# ================================================ - -# Script_Extensions=Mong Phag - -1802..1803 ; Mong Phag # Po [2] MONGOLIAN COMMA..MONGOLIAN FULL STOP -1805 ; Mong Phag # Po MONGOLIAN FOUR DOTS - -# Total code points: 3 - -# ================================================ - -# Script_Extensions=Arab Syrc Thaa - -061C ; Arab Syrc Thaa # Cf ARABIC LETTER MARK - -# Total code points: 1 - -# ================================================ - -# Script_Extensions=Arab Thaa Yezi - -0660..0669 ; Arab Thaa Yezi # Nd [10] ARABIC-INDIC DIGIT ZERO..ARABIC-INDIC DIGIT NINE - -# Total code points: 10 - -# ================================================ - -# Script_Extensions=Beng Cakm Sylo - -09E6..09EF ; Beng Cakm Sylo # Nd [10] BENGALI DIGIT ZERO..BENGALI DIGIT NINE - -# Total code points: 10 - -# ================================================ - -# Script_Extensions=Cakm Mymr Tale - -1040..1049 ; Cakm Mymr Tale # Nd [10] MYANMAR DIGIT ZERO..MYANMAR DIGIT NINE - -# Total code points: 10 - -# ================================================ - -# Script_Extensions=Cpmn Cprt Linb - -10100..10101 ; Cpmn Cprt Linb # Po [2] AEGEAN WORD SEPARATOR LINE..AEGEAN WORD SEPARATOR DOT - -# Total code points: 2 - -# ================================================ - -# Script_Extensions=Cprt Lina Linb - -10107..10133 ; Cprt Lina Linb # No [45] AEGEAN NUMBER ONE..AEGEAN NUMBER NINETY THOUSAND - -# Total code points: 45 - -# ================================================ - -# Script_Extensions=Deva Gran Knda - -1CF4 ; Deva Gran Knda # Mn VEDIC TONE CANDRA ABOVE - -# Total code points: 1 - -# ================================================ - -# Script_Extensions=Deva Gran Latn - -20F0 ; Deva Gran Latn # Mn COMBINING ASTERISK ABOVE - -# Total code points: 1 - -# ================================================ - -# Script_Extensions=Hani Hira Kana - -303C ; Hani Hira Kana # Lo MASU MARK -303D ; Hani Hira Kana # Po PART ALTERNATION MARK - -# Total code points: 2 - -# ================================================ - -# Script_Extensions=Kali Latn Mymr - -A92E ; Kali Latn Mymr # Po KAYAH LI SIGN CWI - -# Total code points: 1 - -# ================================================ - -# Script_Extensions=Beng Deva Gran Knda - -1CD0 ; Beng Deva Gran Knda # Mn VEDIC TONE KARSHANA -1CD2 ; Beng Deva Gran Knda # Mn VEDIC TONE PRENKHA - -# Total code points: 2 - -# ================================================ - -# Script_Extensions=Buhd Hano Tagb Tglg - -1735..1736 ; Buhd Hano Tagb Tglg # Po [2] PHILIPPINE SINGLE PUNCTUATION..PHILIPPINE DOUBLE PUNCTUATION - -# Total code points: 2 - -# ================================================ - -# Script_Extensions=Deva Dogr Kthi Mahj - -0966..096F ; Deva Dogr Kthi Mahj # Nd [10] DEVANAGARI DIGIT ZERO..DEVANAGARI DIGIT NINE - -# Total code points: 10 - -# ================================================ - -# Script_Extensions=Bopo Hang Hani Hira Kana - -3003 ; Bopo Hang Hani Hira Kana # Po DITTO MARK -3013 ; Bopo Hang Hani Hira Kana # So GETA MARK -301C ; Bopo Hang Hani Hira Kana # Pd WAVE DASH -301D ; Bopo Hang Hani Hira Kana # Ps REVERSED DOUBLE PRIME QUOTATION MARK -301E..301F ; Bopo Hang Hani Hira Kana # Pe [2] DOUBLE PRIME QUOTATION MARK..LOW DOUBLE PRIME QUOTATION MARK -3030 ; Bopo Hang Hani Hira Kana # Pd WAVY DASH -3037 ; Bopo Hang Hani Hira Kana # So IDEOGRAPHIC TELEGRAPH LINE FEED SEPARATOR SYMBOL -FE45..FE46 ; Bopo Hang Hani Hira Kana # Po [2] SESAME DOT..WHITE SESAME DOT - -# Total code points: 10 - -# ================================================ - -# Script_Extensions=Arab Nkoo Rohg Syrc Thaa Yezi - -060C ; Arab Nkoo Rohg Syrc Thaa Yezi # Po ARABIC COMMA -061B ; Arab Nkoo Rohg Syrc Thaa Yezi # Po ARABIC SEMICOLON - -# Total code points: 2 - -# ================================================ - -# Script_Extensions=Bopo Hang Hani Hira Kana Yiii - -3001..3002 ; Bopo Hang Hani Hira Kana Yiii # Po [2] IDEOGRAPHIC COMMA..IDEOGRAPHIC FULL STOP -3008 ; Bopo Hang Hani Hira Kana Yiii # Ps LEFT ANGLE BRACKET -3009 ; Bopo Hang Hani Hira Kana Yiii # Pe RIGHT ANGLE BRACKET -300A ; Bopo Hang Hani Hira Kana Yiii # Ps LEFT DOUBLE ANGLE BRACKET -300B ; Bopo Hang Hani Hira Kana Yiii # Pe RIGHT DOUBLE ANGLE BRACKET -300C ; Bopo Hang Hani Hira Kana Yiii # Ps LEFT CORNER BRACKET -300D ; Bopo Hang Hani Hira Kana Yiii # Pe RIGHT CORNER BRACKET -300E ; Bopo Hang Hani Hira Kana Yiii # Ps LEFT WHITE CORNER BRACKET -300F ; Bopo Hang Hani Hira Kana Yiii # Pe RIGHT WHITE CORNER BRACKET -3010 ; Bopo Hang Hani Hira Kana Yiii # Ps LEFT BLACK LENTICULAR BRACKET -3011 ; Bopo Hang Hani Hira Kana Yiii # Pe RIGHT BLACK LENTICULAR BRACKET -3014 ; Bopo Hang Hani Hira Kana Yiii # Ps LEFT TORTOISE SHELL BRACKET -3015 ; Bopo Hang Hani Hira Kana Yiii # Pe RIGHT TORTOISE SHELL BRACKET -3016 ; Bopo Hang Hani Hira Kana Yiii # Ps LEFT WHITE LENTICULAR BRACKET -3017 ; Bopo Hang Hani Hira Kana Yiii # Pe RIGHT WHITE LENTICULAR BRACKET -3018 ; Bopo Hang Hani Hira Kana Yiii # Ps LEFT WHITE TORTOISE SHELL BRACKET -3019 ; Bopo Hang Hani Hira Kana Yiii # Pe RIGHT WHITE TORTOISE SHELL BRACKET -301A ; Bopo Hang Hani Hira Kana Yiii # Ps LEFT WHITE SQUARE BRACKET -301B ; Bopo Hang Hani Hira Kana Yiii # Pe RIGHT WHITE SQUARE BRACKET -30FB ; Bopo Hang Hani Hira Kana Yiii # Po KATAKANA MIDDLE DOT -FF61 ; Bopo Hang Hani Hira Kana Yiii # Po HALFWIDTH IDEOGRAPHIC FULL STOP -FF62 ; Bopo Hang Hani Hira Kana Yiii # Ps HALFWIDTH LEFT CORNER BRACKET -FF63 ; Bopo Hang Hani Hira Kana Yiii # Pe HALFWIDTH RIGHT CORNER BRACKET -FF64..FF65 ; Bopo Hang Hani Hira Kana Yiii # Po [2] HALFWIDTH IDEOGRAPHIC COMMA..HALFWIDTH KATAKANA MIDDLE DOT - -# Total code points: 26 - -# ================================================ - -# Script_Extensions=Deva Knda Mlym Orya Taml Telu - -1CDA ; Deva Knda Mlym Orya Taml Telu # Mn VEDIC TONE DOUBLE SVARITA - -# Total code points: 1 - -# ================================================ - -# Script_Extensions=Adlm Arab Nkoo Rohg Syrc Thaa Yezi - -061F ; Adlm Arab Nkoo Rohg Syrc Thaa Yezi # Po ARABIC QUESTION MARK - -# Total code points: 1 - -# ================================================ - -# Script_Extensions=Adlm Arab Mand Mani Ougr Phlp Rohg Sogd Syrc - -0640 ; Adlm Arab Mand Mani Ougr Phlp Rohg Sogd Syrc # Lm ARABIC TATWEEL - -# Total code points: 1 - -# ================================================ - -# Script_Extensions=Beng Deva Gran Knda Mlym Nand Orya Sinh Telu Tirh - -1CF2 ; Beng Deva Gran Knda Mlym Nand Orya Sinh Telu Tirh # Lo VEDIC SIGN ARDHAVISARGA - -# Total code points: 1 - -# ================================================ - -# Script_Extensions=Deva Dogr Gujr Guru Khoj Kthi Mahj Modi Sind Takr Tirh - -A836..A837 ; Deva Dogr Gujr Guru Khoj Kthi Mahj Modi Sind Takr Tirh # So [2] NORTH INDIC QUARTER MARK..NORTH INDIC PLACEHOLDER MARK -A839 ; Deva Dogr Gujr Guru Khoj Kthi Mahj Modi Sind Takr Tirh # So NORTH INDIC QUANTITY MARK - -# Total code points: 3 - -# ================================================ - -# Script_Extensions=Beng Deva Gran Gujr Guru Knda Latn Mlym Orya Taml Telu Tirh - -0952 ; Beng Deva Gran Gujr Guru Knda Latn Mlym Orya Taml Telu Tirh # Mn DEVANAGARI STRESS SIGN ANUDATTA - -# Total code points: 1 - -# ================================================ - -# Script_Extensions=Deva Dogr Gujr Guru Khoj Kthi Mahj Modi Shrd Sind Takr Tirh - -A838 ; Deva Dogr Gujr Guru Khoj Kthi Mahj Modi Shrd Sind Takr Tirh # Sc NORTH INDIC RUPEE MARK - -# Total code points: 1 - -# ================================================ - -# Script_Extensions=Beng Deva Gran Gujr Guru Knda Latn Mlym Orya Shrd Taml Telu Tirh - -0951 ; Beng Deva Gran Gujr Guru Knda Latn Mlym Orya Shrd Taml Telu Tirh # Mn DEVANAGARI STRESS SIGN UDATTA - -# Total code points: 1 - -# ================================================ - -# Script_Extensions=Deva Dogr Gujr Guru Khoj Knda Kthi Mahj Modi Nand Shrd Sind Takr Tirh - -A833..A835 ; Deva Dogr Gujr Guru Khoj Knda Kthi Mahj Modi Nand Shrd Sind Takr Tirh # No [3] NORTH INDIC FRACTION ONE SIXTEENTH..NORTH INDIC FRACTION THREE SIXTEENTHS - -# Total code points: 3 - -# ================================================ - -# Script_Extensions=Deva Dogr Gujr Guru Khoj Knda Kthi Mahj Mlym Modi Nand Shrd Sind Takr Tirh - -A830..A832 ; Deva Dogr Gujr Guru Khoj Knda Kthi Mahj Mlym Modi Nand Shrd Sind Takr Tirh # No [3] NORTH INDIC FRACTION ONE QUARTER..NORTH INDIC FRACTION THREE QUARTERS - -# Total code points: 3 - -# ================================================ - -# Script_Extensions=Beng Deva Dogr Gong Gonm Gran Gujr Guru Knda Mahj Mlym Nand Orya Sind Sinh Sylo Takr Taml Telu Tirh - -0964 ; Beng Deva Dogr Gong Gonm Gran Gujr Guru Knda Mahj Mlym Nand Orya Sind Sinh Sylo Takr Taml Telu Tirh # Po DEVANAGARI DANDA - -# Total code points: 1 - -# ================================================ - -# Script_Extensions=Beng Deva Dogr Gong Gonm Gran Gujr Guru Knda Limb Mahj Mlym Nand Orya Sind Sinh Sylo Takr Taml Telu Tirh - -0965 ; Beng Deva Dogr Gong Gonm Gran Gujr Guru Knda Limb Mahj Mlym Nand Orya Sind Sinh Sylo Takr Taml Telu Tirh # Po DEVANAGARI DOUBLE DANDA - -# Total code points: 1 +00B7 ; Avst Cari Copt Dupl Elba Geor Glag Gong Goth Grek Hani Latn Lydi Mahj Perm Shaw #Po MIDDLE DOT +02BC ; Beng Cyrl Deva Latn Lisu Thai Toto #Lm MODIFIER LETTER APOSTROPHE +02C7 ; Bopo Latn # Lm CARON +02C9..02CB ; Bopo Latn # Lm [3] MODIFIER LETTER MACRON..MODIFIER LETTER GRAVE ACCENT +02CD ; Latn Lisu # Lm MODIFIER LETTER LOW MACRON +02D7 ; Latn Thai # Sk MODIFIER LETTER MINUS SIGN +02D9 ; Bopo Latn # Sk DOT ABOVE +0300 ; Cher Copt Cyrl Grek Latn Perm Sunu Tale #Mn COMBINING GRAVE ACCENT +0301 ; Cher Cyrl Grek Latn Osge Sunu Tale Todr #Mn COMBINING ACUTE ACCENT +0302 ; Cher Cyrl Latn Tfng # Mn COMBINING CIRCUMFLEX ACCENT +0303 ; Glag Latn Sunu Syrc Thai # Mn COMBINING TILDE +0304 ; Aghb Cher Copt Cyrl Goth Grek Latn Osge Syrc Tfng Todr #Mn COMBINING MACRON +0305 ; Copt Elba Glag Goth Kana Latn # Mn COMBINING OVERLINE +0306 ; Cyrl Grek Latn Perm # Mn COMBINING BREVE +0307 ; Copt Dupl Hebr Latn Perm Syrc Tale Tfng Todr #Mn COMBINING DOT ABOVE +0308 ; Armn Cyrl Dupl Goth Grek Hebr Latn Perm Syrc Tale #Mn COMBINING DIAERESIS +0309 ; Latn Tfng # Mn COMBINING HOOK ABOVE +030A ; Dupl Latn Syrc # Mn COMBINING RING ABOVE +030B ; Cher Cyrl Latn Osge # Mn COMBINING DOUBLE ACUTE ACCENT +030C ; Cher Latn Tale # Mn COMBINING CARON +030D ; Latn Sunu # Mn COMBINING VERTICAL LINE ABOVE +030E ; Ethi Latn # Mn COMBINING DOUBLE VERTICAL LINE ABOVE +0310 ; Latn Sunu # Mn COMBINING CANDRABINDU +0311 ; Cyrl Latn Todr # Mn COMBINING INVERTED BREVE +0313 ; Grek Latn Perm Todr # Mn COMBINING COMMA ABOVE +0320 ; Latn Syrc # Mn COMBINING MINUS SIGN BELOW +0323 ; Cher Dupl Kana Latn Syrc # Mn COMBINING DOT BELOW +0324 ; Cher Dupl Latn Syrc # Mn COMBINING DIAERESIS BELOW +0325 ; Latn Syrc # Mn COMBINING RING BELOW +032D ; Latn Sunu Syrc # Mn COMBINING CIRCUMFLEX ACCENT BELOW +032E ; Latn Syrc # Mn COMBINING BREVE BELOW +0330 ; Cher Latn Syrc # Mn COMBINING TILDE BELOW +0331 ; Aghb Cher Goth Latn Sunu Thai # Mn COMBINING MACRON BELOW +0342 ; Grek # Mn COMBINING GREEK PERISPOMENI +0345 ; Grek # Mn COMBINING GREEK YPOGEGRAMMENI +0358 ; Latn Osge # Mn COMBINING DOT ABOVE RIGHT +035E ; Aghb Latn Todr # Mn COMBINING DOUBLE MACRON +0363..036F ; Latn # Mn [13] COMBINING LATIN SMALL LETTER A..COMBINING LATIN SMALL LETTER X +0374 ; Copt Grek # Lm GREEK NUMERAL SIGN +0375 ; Copt Grek # Sk GREEK LOWER NUMERAL SIGN +0483 ; Cyrl Perm # Mn COMBINING CYRILLIC TITLO +0484 ; Cyrl Glag # Mn COMBINING CYRILLIC PALATALIZATION +0485..0486 ; Cyrl Latn # Mn [2] COMBINING CYRILLIC DASIA PNEUMATA..COMBINING CYRILLIC PSILI PNEUMATA +0487 ; Cyrl Glag # Mn COMBINING CYRILLIC POKRYTIE +0589 ; Armn Geor Glag # Po ARMENIAN FULL STOP +060C ; Arab Gara Nkoo Rohg Syrc Thaa Yezi #Po ARABIC COMMA +061B ; Arab Gara Nkoo Rohg Syrc Thaa Yezi #Po ARABIC SEMICOLON +061C ; Arab Syrc Thaa # Cf ARABIC LETTER MARK +061F ; Adlm Arab Gara Nkoo Rohg Syrc Thaa Yezi #Po ARABIC QUESTION MARK +0640 ; Adlm Arab Mand Mani Ougr Phlp Rohg Sogd Syrc #Lm ARABIC TATWEEL +064B..0655 ; Arab Syrc # Mn [11] ARABIC FATHATAN..ARABIC HAMZA BELOW +0660..0669 ; Arab Thaa Yezi # Nd [10] ARABIC-INDIC DIGIT ZERO..ARABIC-INDIC DIGIT NINE +0670 ; Arab Syrc # Mn ARABIC LETTER SUPERSCRIPT ALEF +06D4 ; Arab Rohg # Po ARABIC FULL STOP +0951 ; Beng Deva Gran Gujr Guru Knda Latn Mlym Orya Shrd Taml Telu Tirh #Mn DEVANAGARI STRESS SIGN UDATTA +0952 ; Beng Deva Gran Gujr Guru Knda Latn Mlym Orya Taml Telu Tirh #Mn DEVANAGARI STRESS SIGN ANUDATTA +0964 ; Beng Deva Dogr Gong Gonm Gran Gujr Guru Knda Mahj Mlym Nand Onao Orya Sind Sinh Sylo Takr Taml Telu Tirh #Po DEVANAGARI DANDA +0965 ; Beng Deva Dogr Gong Gonm Gran Gujr Gukh Guru Knda Limb Mahj Mlym Nand Onao Orya Sind Sinh Sylo Takr Taml Telu Tirh #Po DEVANAGARI DOUBLE DANDA +0966..096F ; Deva Dogr Kthi Mahj # Nd [10] DEVANAGARI DIGIT ZERO..DEVANAGARI DIGIT NINE +09E6..09EF ; Beng Cakm Sylo # Nd [10] BENGALI DIGIT ZERO..BENGALI DIGIT NINE +0A66..0A6F ; Guru Mult # Nd [10] GURMUKHI DIGIT ZERO..GURMUKHI DIGIT NINE +0AE6..0AEF ; Gujr Khoj # Nd [10] GUJARATI DIGIT ZERO..GUJARATI DIGIT NINE +0BE6..0BEF ; Gran Taml # Nd [10] TAMIL DIGIT ZERO..TAMIL DIGIT NINE +0BF0..0BF2 ; Gran Taml # No [3] TAMIL NUMBER TEN..TAMIL NUMBER ONE THOUSAND +0BF3 ; Gran Taml # So TAMIL DAY SIGN +0CE6..0CEF ; Knda Nand Tutg # Nd [10] KANNADA DIGIT ZERO..KANNADA DIGIT NINE +1040..1049 ; Cakm Mymr Tale # Nd [10] MYANMAR DIGIT ZERO..MYANMAR DIGIT NINE +10FB ; Geor Glag Latn # Po GEORGIAN PARAGRAPH SEPARATOR +16EB..16ED ; Runr # Po [3] RUNIC SINGLE PUNCTUATION..RUNIC CROSS PUNCTUATION +1735..1736 ; Buhd Hano Tagb Tglg # Po [2] PHILIPPINE SINGLE PUNCTUATION..PHILIPPINE DOUBLE PUNCTUATION +1802..1803 ; Mong Phag # Po [2] MONGOLIAN COMMA..MONGOLIAN FULL STOP +1805 ; Mong Phag # Po MONGOLIAN FOUR DOTS +1CD0 ; Beng Deva Gran Knda # Mn VEDIC TONE KARSHANA +1CD1 ; Deva # Mn VEDIC TONE SHARA +1CD2 ; Beng Deva Gran Knda # Mn VEDIC TONE PRENKHA +1CD3 ; Deva Gran Knda # Po VEDIC SIGN NIHSHVASA +1CD4 ; Deva # Mn VEDIC SIGN YAJURVEDIC MIDLINE SVARITA +1CD5..1CD6 ; Beng Deva # Mn [2] VEDIC TONE YAJURVEDIC AGGRAVATED INDEPENDENT SVARITA..VEDIC TONE YAJURVEDIC INDEPENDENT SVARITA +1CD7 ; Deva Shrd # Mn VEDIC TONE YAJURVEDIC KATHAKA INDEPENDENT SVARITA +1CD8 ; Beng Deva # Mn VEDIC TONE CANDRA BELOW +1CD9 ; Deva Shrd # Mn VEDIC TONE YAJURVEDIC KATHAKA INDEPENDENT SVARITA SCHROEDER +1CDA ; Deva Knda Mlym Orya Taml Telu # Mn VEDIC TONE DOUBLE SVARITA +1CDB ; Deva # Mn VEDIC TONE TRIPLE SVARITA +1CDC..1CDD ; Deva Shrd # Mn [2] VEDIC TONE KATHAKA ANUDATTA..VEDIC TONE DOT BELOW +1CDE..1CDF ; Deva # Mn [2] VEDIC TONE TWO DOTS BELOW..VEDIC TONE THREE DOTS BELOW +1CE0 ; Deva Shrd # Mn VEDIC TONE RIGVEDIC KASHMIRI INDEPENDENT SVARITA +1CE1 ; Beng Deva # Mc VEDIC TONE ATHARVAVEDIC INDEPENDENT SVARITA +1CE2..1CE8 ; Deva # Mn [7] VEDIC SIGN VISARGA SVARITA..VEDIC SIGN VISARGA ANUDATTA WITH TAIL +1CE9 ; Deva Nand # Lo VEDIC SIGN ANUSVARA ANTARGOMUKHA +1CEA ; Beng Deva # Lo VEDIC SIGN ANUSVARA BAHIRGOMUKHA +1CEB..1CEC ; Deva # Lo [2] VEDIC SIGN ANUSVARA VAMAGOMUKHA..VEDIC SIGN ANUSVARA VAMAGOMUKHA WITH TAIL +1CED ; Beng Deva # Mn VEDIC SIGN TIRYAK +1CEE..1CF1 ; Deva # Lo [4] VEDIC SIGN HEXIFORM LONG ANUSVARA..VEDIC SIGN ANUSVARA UBHAYATO MUKHA +1CF2 ; Beng Deva Gran Knda Mlym Nand Orya Sinh Telu Tirh Tutg #Lo VEDIC SIGN ARDHAVISARGA +1CF3 ; Deva Gran # Lo VEDIC SIGN ROTATED ARDHAVISARGA +1CF4 ; Deva Gran Knda Tutg # Mn VEDIC TONE CANDRA ABOVE +1CF5..1CF6 ; Beng Deva # Lo [2] VEDIC SIGN JIHVAMULIYA..VEDIC SIGN UPADHMANIYA +1CF7 ; Beng # Mc VEDIC SIGN ATIKRAMA +1CF8..1CF9 ; Deva Gran # Mn [2] VEDIC TONE RING ABOVE..VEDIC TONE DOUBLE RING ABOVE +1CFA ; Nand # Lo VEDIC SIGN DOUBLE ANUSVARA ANTARGOMUKHA +1DC0..1DC1 ; Grek # Mn [2] COMBINING DOTTED GRAVE ACCENT..COMBINING DOTTED ACUTE ACCENT +1DF8 ; Cyrl Latn Syrc # Mn COMBINING DOT ABOVE LEFT +1DFA ; Syrc # Mn COMBINING DOT BELOW LEFT +202F ; Latn Mong Phag # Zs NARROW NO-BREAK SPACE +204F ; Adlm Arab # Po REVERSED SEMICOLON +205A ; Cari Geor Glag Hung Lyci Orkh # Po TWO DOT PUNCTUATION +205D ; Cari Grek Hung Mero # Po TRICOLON +20F0 ; Deva Gran Latn # Mn COMBINING ASTERISK ABOVE +2E17 ; Copt Latn # Pd DOUBLE OBLIQUE HYPHEN +2E30 ; Avst Orkh # Po RING POINT +2E31 ; Avst Cari Geor Hung Kthi Lydi Samr #Po WORD SEPARATOR MIDDLE DOT +2E3C ; Dupl # Po STENOGRAPHIC FULL STOP +2E41 ; Adlm Arab Hung # Po REVERSED COMMA +2E43 ; Cyrl Glag # Po DASH WITH LEFT UPTURN +2FF0..2FFF ; Hani Tang # So [16] IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT..IDEOGRAPHIC DESCRIPTION CHARACTER ROTATION +3001 ; Bopo Hang Hani Hira Kana Mong Yiii #Po IDEOGRAPHIC COMMA +3002 ; Bopo Hang Hani Hira Kana Mong Phag Yiii #Po IDEOGRAPHIC FULL STOP +3003 ; Bopo Hang Hani Hira Kana # Po DITTO MARK +3006 ; Hani # Lo IDEOGRAPHIC CLOSING MARK +3008 ; Bopo Hang Hani Hira Kana Mong Tibt Yiii #Ps LEFT ANGLE BRACKET +3009 ; Bopo Hang Hani Hira Kana Mong Tibt Yiii #Pe RIGHT ANGLE BRACKET +300A ; Bopo Hang Hani Hira Kana Lisu Mong Tibt Yiii #Ps LEFT DOUBLE ANGLE BRACKET +300B ; Bopo Hang Hani Hira Kana Lisu Mong Tibt Yiii #Pe RIGHT DOUBLE ANGLE BRACKET +300C ; Bopo Hang Hani Hira Kana Yiii # Ps LEFT CORNER BRACKET +300D ; Bopo Hang Hani Hira Kana Yiii # Pe RIGHT CORNER BRACKET +300E ; Bopo Hang Hani Hira Kana Yiii # Ps LEFT WHITE CORNER BRACKET +300F ; Bopo Hang Hani Hira Kana Yiii # Pe RIGHT WHITE CORNER BRACKET +3010 ; Bopo Hang Hani Hira Kana Yiii # Ps LEFT BLACK LENTICULAR BRACKET +3011 ; Bopo Hang Hani Hira Kana Yiii # Pe RIGHT BLACK LENTICULAR BRACKET +3013 ; Bopo Hang Hani Hira Kana # So GETA MARK +3014 ; Bopo Hang Hani Hira Kana Yiii # Ps LEFT TORTOISE SHELL BRACKET +3015 ; Bopo Hang Hani Hira Kana Yiii # Pe RIGHT TORTOISE SHELL BRACKET +3016 ; Bopo Hang Hani Hira Kana Yiii # Ps LEFT WHITE LENTICULAR BRACKET +3017 ; Bopo Hang Hani Hira Kana Yiii # Pe RIGHT WHITE LENTICULAR BRACKET +3018 ; Bopo Hang Hani Hira Kana Yiii # Ps LEFT WHITE TORTOISE SHELL BRACKET +3019 ; Bopo Hang Hani Hira Kana Yiii # Pe RIGHT WHITE TORTOISE SHELL BRACKET +301A ; Bopo Hang Hani Hira Kana Yiii # Ps LEFT WHITE SQUARE BRACKET +301B ; Bopo Hang Hani Hira Kana Yiii # Pe RIGHT WHITE SQUARE BRACKET +301C ; Bopo Hang Hani Hira Kana # Pd WAVE DASH +301D ; Bopo Hang Hani Hira Kana # Ps REVERSED DOUBLE PRIME QUOTATION MARK +301E..301F ; Bopo Hang Hani Hira Kana # Pe [2] DOUBLE PRIME QUOTATION MARK..LOW DOUBLE PRIME QUOTATION MARK +302A..302D ; Bopo Hani # Mn [4] IDEOGRAPHIC LEVEL TONE MARK..IDEOGRAPHIC ENTERING TONE MARK +3030 ; Bopo Hang Hani Hira Kana # Pd WAVY DASH +3031..3035 ; Hira Kana # Lm [5] VERTICAL KANA REPEAT MARK..VERTICAL KANA REPEAT MARK LOWER HALF +3037 ; Bopo Hang Hani Hira Kana # So IDEOGRAPHIC TELEGRAPH LINE FEED SEPARATOR SYMBOL +303C ; Hani Hira Kana # Lo MASU MARK +303D ; Hani Hira Kana # Po PART ALTERNATION MARK +303E..303F ; Hani # So [2] IDEOGRAPHIC VARIATION INDICATOR..IDEOGRAPHIC HALF FILL SPACE +3099..309A ; Hira Kana # Mn [2] COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK..COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK +309B..309C ; Hira Kana # Sk [2] KATAKANA-HIRAGANA VOICED SOUND MARK..KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK +30A0 ; Hira Kana # Pd KATAKANA-HIRAGANA DOUBLE HYPHEN +30FB ; Bopo Hang Hani Hira Kana Yiii # Po KATAKANA MIDDLE DOT +30FC ; Hira Kana # Lm KATAKANA-HIRAGANA PROLONGED SOUND MARK +3190..3191 ; Hani # So [2] IDEOGRAPHIC ANNOTATION LINKING MARK..IDEOGRAPHIC ANNOTATION REVERSE MARK +3192..3195 ; Hani # No [4] IDEOGRAPHIC ANNOTATION ONE MARK..IDEOGRAPHIC ANNOTATION FOUR MARK +3196..319F ; Hani # So [10] IDEOGRAPHIC ANNOTATION TOP MARK..IDEOGRAPHIC ANNOTATION MAN MARK +31C0..31E5 ; Hani # So [38] CJK STROKE T..CJK STROKE SZP +31EF ; Hani Tang # So IDEOGRAPHIC DESCRIPTION CHARACTER SUBTRACTION +3220..3229 ; Hani # No [10] PARENTHESIZED IDEOGRAPH ONE..PARENTHESIZED IDEOGRAPH TEN +322A..3247 ; Hani # So [30] PARENTHESIZED IDEOGRAPH MOON..CIRCLED IDEOGRAPH KOTO +3280..3289 ; Hani # No [10] CIRCLED IDEOGRAPH ONE..CIRCLED IDEOGRAPH TEN +328A..32B0 ; Hani # So [39] CIRCLED IDEOGRAPH MOON..CIRCLED IDEOGRAPH NIGHT +32C0..32CB ; Hani # So [12] IDEOGRAPHIC TELEGRAPH SYMBOL FOR JANUARY..IDEOGRAPHIC TELEGRAPH SYMBOL FOR DECEMBER +32FF ; Hani # So SQUARE ERA NAME REIWA +3358..3370 ; Hani # So [25] IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR ZERO..IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWENTY-FOUR +337B..337F ; Hani # So [5] SQUARE ERA NAME HEISEI..SQUARE CORPORATION +33E0..33FE ; Hani # So [31] IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY ONE..IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY THIRTY-ONE +A66F ; Cyrl Glag # Mn COMBINING CYRILLIC VZMET +A700..A707 ; Hani Latn # Sk [8] MODIFIER LETTER CHINESE TONE YIN PING..MODIFIER LETTER CHINESE TONE YANG RU +A830..A832 ; Deva Dogr Gujr Guru Khoj Knda Kthi Mahj Mlym Modi Nand Shrd Sind Takr Tirh Tutg #No [3] NORTH INDIC FRACTION ONE QUARTER..NORTH INDIC FRACTION THREE QUARTERS +A833..A835 ; Deva Dogr Gujr Guru Khoj Knda Kthi Mahj Modi Nand Shrd Sind Takr Tirh Tutg #No [3] NORTH INDIC FRACTION ONE SIXTEENTH..NORTH INDIC FRACTION THREE SIXTEENTHS +A836..A837 ; Deva Dogr Gujr Guru Khoj Kthi Mahj Modi Sind Takr Tirh #So [2] NORTH INDIC QUARTER MARK..NORTH INDIC PLACEHOLDER MARK +A838 ; Deva Dogr Gujr Guru Khoj Kthi Mahj Modi Shrd Sind Takr Tirh #Sc NORTH INDIC RUPEE MARK +A839 ; Deva Dogr Gujr Guru Khoj Kthi Mahj Modi Sind Takr Tirh #So NORTH INDIC QUANTITY MARK +A8F1 ; Beng Deva Tutg # Mn COMBINING DEVANAGARI SIGN AVAGRAHA +A8F3 ; Deva Taml # Lo DEVANAGARI SIGN CANDRABINDU VIRAMA +A92E ; Kali Latn Mymr # Po KAYAH LI SIGN CWI +A9CF ; Bugi Java # Lm JAVANESE PANGRANGKEP +FD3E ; Arab Nkoo # Pe ORNATE LEFT PARENTHESIS +FD3F ; Arab Nkoo # Ps ORNATE RIGHT PARENTHESIS +FDF2 ; Arab Thaa # Lo ARABIC LIGATURE ALLAH ISOLATED FORM +FDFD ; Arab Thaa # So ARABIC LIGATURE BISMILLAH AR-RAHMAN AR-RAHEEM +FE45..FE46 ; Bopo Hang Hani Hira Kana # Po [2] SESAME DOT..WHITE SESAME DOT +FF61 ; Bopo Hang Hani Hira Kana Yiii # Po HALFWIDTH IDEOGRAPHIC FULL STOP +FF62 ; Bopo Hang Hani Hira Kana Yiii # Ps HALFWIDTH LEFT CORNER BRACKET +FF63 ; Bopo Hang Hani Hira Kana Yiii # Pe HALFWIDTH RIGHT CORNER BRACKET +FF64..FF65 ; Bopo Hang Hani Hira Kana Yiii # Po [2] HALFWIDTH IDEOGRAPHIC COMMA..HALFWIDTH KATAKANA MIDDLE DOT +FF70 ; Hira Kana # Lm HALFWIDTH KATAKANA-HIRAGANA PROLONGED SOUND MARK +FF9E..FF9F ; Hira Kana # Lm [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HALFWIDTH KATAKANA SEMI-VOICED SOUND MARK +10100..10101 ; Cpmn Cprt Linb # Po [2] AEGEAN WORD SEPARATOR LINE..AEGEAN WORD SEPARATOR DOT +10102 ; Cprt Linb # Po AEGEAN CHECK MARK +10107..10133 ; Cprt Lina Linb # No [45] AEGEAN NUMBER ONE..AEGEAN NUMBER NINETY THOUSAND +10137..1013F ; Cprt Linb # So [9] AEGEAN WEIGHT BASE UNIT..AEGEAN MEASURE THIRD SUBUNIT +102E0 ; Arab Copt # Mn COPTIC EPACT THOUSANDS MARK +102E1..102FB ; Arab Copt # No [27] COPTIC EPACT DIGIT ONE..COPTIC EPACT NUMBER NINE HUNDRED +10AF2 ; Mani Ougr # Po MANICHAEAN PUNCTUATION DOUBLE DOT WITHIN DOT +11301 ; Gran Taml # Mn GRANTHA SIGN CANDRABINDU +11303 ; Gran Taml # Mc GRANTHA SIGN VISARGA +1133B..1133C ; Gran Taml # Mn [2] COMBINING BINDU BELOW..GRANTHA SIGN NUKTA +11FD0..11FD1 ; Gran Taml # No [2] TAMIL FRACTION ONE QUARTER..TAMIL FRACTION ONE HALF-1 +11FD3 ; Gran Taml # No TAMIL FRACTION THREE QUARTERS +1BCA0..1BCA3 ; Dupl # Cf [4] SHORTHAND FORMAT LETTER OVERLAP..SHORTHAND FORMAT UP STEP +1D360..1D371 ; Hani # No [18] COUNTING ROD UNIT DIGIT ONE..COUNTING ROD TENS DIGIT NINE +1F250..1F251 ; Hani # So [2] CIRCLED IDEOGRAPH ADVANTAGE..CIRCLED IDEOGRAPH ACCEPT # EOF diff --git a/Master/texmf-dist/tex/generic/unicode-data/Scripts.txt b/Master/texmf-dist/tex/generic/unicode-data/Scripts.txt index 0b3f717cb20..443a6d2dd61 100644 --- a/Master/texmf-dist/tex/generic/unicode-data/Scripts.txt +++ b/Master/texmf-dist/tex/generic/unicode-data/Scripts.txt @@ -1,8 +1,8 @@ -# Scripts-15.1.0.txt -# Date: 2023-07-28, 16:01:07 GMT -# © 2023 Unicode®, Inc. +# Scripts-16.0.0.txt +# Date: 2024-04-30, 21:48:40 GMT +# © 2024 Unicode®, Inc. # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries. -# For terms of use, see https://www.unicode.org/terms_of_use.html +# For terms of use and license, see https://www.unicode.org/terms_of_use.html # # Unicode Character Database # For documentation, see https://www.unicode.org/reports/tr44/ @@ -224,7 +224,7 @@ 239B..23B3 ; Common # Sm [25] LEFT PARENTHESIS UPPER HOOK..SUMMATION BOTTOM 23B4..23DB ; Common # So [40] TOP SQUARE BRACKET..FUSE 23DC..23E1 ; Common # Sm [6] TOP PARENTHESIS..BOTTOM TORTOISE SHELL BRACKET -23E2..2426 ; Common # So [69] WHITE TRAPEZIUM..SYMBOL FOR SUBSTITUTE FORM TWO +23E2..2429 ; Common # So [72] WHITE TRAPEZIUM..SYMBOL FOR DELETE MEDIUM SHADE FORM 2440..244A ; Common # So [11] OCR HOOK..OCR DOUBLE BACKSLASH 2460..249B ; Common # No [60] CIRCLED DIGIT ONE..NUMBER TWENTY FULL STOP 249C..24E9 ; Common # So [78] PARENTHESIZED LATIN SMALL LETTER A..CIRCLED LATIN SMALL LETTER Z @@ -398,7 +398,7 @@ 3190..3191 ; Common # So [2] IDEOGRAPHIC ANNOTATION LINKING MARK..IDEOGRAPHIC ANNOTATION REVERSE MARK 3192..3195 ; Common # No [4] IDEOGRAPHIC ANNOTATION ONE MARK..IDEOGRAPHIC ANNOTATION FOUR MARK 3196..319F ; Common # So [10] IDEOGRAPHIC ANNOTATION TOP MARK..IDEOGRAPHIC ANNOTATION MAN MARK -31C0..31E3 ; Common # So [36] CJK STROKE T..CJK STROKE Q +31C0..31E5 ; Common # So [38] CJK STROKE T..CJK STROKE SZP 31EF ; Common # So IDEOGRAPHIC DESCRIPTION CHARACTER SUBTRACTION 3220..3229 ; Common # No [10] PARENTHESIZED IDEOGRAPH ONE..PARENTHESIZED IDEOGRAPH TEN 322A..3247 ; Common # So [30] PARENTHESIZED IDEOGRAPH MOON..CIRCLED IDEOGRAPH KOTO @@ -522,6 +522,9 @@ FFFC..FFFD ; Common # So [2] OBJECT REPLACEMENT CHARACTER..REPLACEMENT CHAR 101D0..101FC ; Common # So [45] PHAISTOS DISC SIGN PEDESTRIAN..PHAISTOS DISC SIGN WAVY BAND 102E1..102FB ; Common # No [27] COPTIC EPACT DIGIT ONE..COPTIC EPACT NUMBER NINE HUNDRED 1BCA0..1BCA3 ; Common # Cf [4] SHORTHAND FORMAT LETTER OVERLAP..SHORTHAND FORMAT UP STEP +1CC00..1CCEF ; Common # So [240] UP-POINTING GO-KART..OUTLINED LATIN CAPITAL LETTER Z +1CCF0..1CCF9 ; Common # Nd [10] OUTLINED DIGIT ZERO..OUTLINED DIGIT NINE +1CD00..1CEB3 ; Common # So [436] BLOCK OCTANT-3..BLACK RIGHT TRIANGLE CARET 1CF50..1CFC3 ; Common # So [116] ZNAMENNY NEUME KRYUK..ZNAMENNY NEUME PAUK 1D000..1D0F5 ; Common # So [246] BYZANTINE MUSICAL SYMBOL PSILI..BYZANTINE MUSICAL SYMBOL GORGON NEO KATO 1D100..1D126 ; Common # So [39] MUSICAL SYMBOL SINGLE BARLINE..MUSICAL SYMBOL DRUM CLEF-2 @@ -614,23 +617,23 @@ FFFC..FFFD ; Common # So [2] OBJECT REPLACEMENT CHARACTER..REPLACEMENT CHAR 1F850..1F859 ; Common # So [10] LEFTWARDS SANS-SERIF ARROW..UP DOWN SANS-SERIF ARROW 1F860..1F887 ; Common # So [40] WIDE-HEADED LEFTWARDS LIGHT BARB ARROW..WIDE-HEADED SOUTH WEST VERY HEAVY BARB ARROW 1F890..1F8AD ; Common # So [30] LEFTWARDS TRIANGLE ARROWHEAD..WHITE ARROW SHAFT WIDTH TWO THIRDS -1F8B0..1F8B1 ; Common # So [2] ARROW POINTING UPWARDS THEN NORTH WEST..ARROW POINTING RIGHTWARDS THEN CURVING SOUTH WEST +1F8B0..1F8BB ; Common # So [12] ARROW POINTING UPWARDS THEN NORTH WEST..SOUTH WEST ARROW FROM BAR +1F8C0..1F8C1 ; Common # So [2] LEFTWARDS ARROW FROM DOWNWARDS ARROW..RIGHTWARDS ARROW FROM DOWNWARDS ARROW 1F900..1FA53 ; Common # So [340] CIRCLED CROSS FORMEE WITH FOUR DOTS..BLACK CHESS KNIGHT-BISHOP 1FA60..1FA6D ; Common # So [14] XIANGQI RED GENERAL..XIANGQI BLACK SOLDIER 1FA70..1FA7C ; Common # So [13] BALLET SHOES..CRUTCH -1FA80..1FA88 ; Common # So [9] YO-YO..FLUTE -1FA90..1FABD ; Common # So [46] RINGED PLANET..WING -1FABF..1FAC5 ; Common # So [7] GOOSE..PERSON WITH CROWN -1FACE..1FADB ; Common # So [14] MOOSE..PEA POD -1FAE0..1FAE8 ; Common # So [9] MELTING FACE..SHAKING FACE +1FA80..1FA89 ; Common # So [10] YO-YO..HARP +1FA8F..1FAC6 ; Common # So [56] SHOVEL..FINGERPRINT +1FACE..1FADC ; Common # So [15] MOOSE..ROOT VEGETABLE +1FADF..1FAE9 ; Common # So [11] SPLATTER..FACE WITH BAGS UNDER EYES 1FAF0..1FAF8 ; Common # So [9] HAND WITH INDEX FINGER AND THUMB CROSSED..RIGHTWARDS PUSHING HAND 1FB00..1FB92 ; Common # So [147] BLOCK SEXTANT-1..UPPER HALF INVERSE MEDIUM SHADE AND LOWER HALF BLOCK -1FB94..1FBCA ; Common # So [55] LEFT HALF INVERSE MEDIUM SHADE AND RIGHT HALF BLOCK..WHITE UP-POINTING CHEVRON +1FB94..1FBEF ; Common # So [92] LEFT HALF INVERSE MEDIUM SHADE AND RIGHT HALF BLOCK..TOP LEFT JUSTIFIED LOWER RIGHT QUARTER BLACK CIRCLE 1FBF0..1FBF9 ; Common # Nd [10] SEGMENTED DIGIT ZERO..SEGMENTED DIGIT NINE E0001 ; Common # Cf LANGUAGE TAG E0020..E007F ; Common # Cf [96] TAG SPACE..CANCEL TAG -# Total code points: 8306 +# Total code points: 9053 # ================================================ @@ -673,10 +676,10 @@ A770 ; Latin # Lm MODIFIER LETTER US A771..A787 ; Latin # L& [23] LATIN SMALL LETTER DUM..LATIN SMALL LETTER INSULAR T A78B..A78E ; Latin # L& [4] LATIN CAPITAL LETTER SALTILLO..LATIN SMALL LETTER L WITH RETROFLEX HOOK AND BELT A78F ; Latin # Lo LATIN LETTER SINOLOGICAL DOT -A790..A7CA ; Latin # L& [59] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN SMALL LETTER S WITH SHORT STROKE OVERLAY +A790..A7CD ; Latin # L& [62] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN SMALL LETTER S WITH DIAGONAL STROKE A7D0..A7D1 ; Latin # L& [2] LATIN CAPITAL LETTER CLOSED INSULAR G..LATIN SMALL LETTER CLOSED INSULAR G A7D3 ; Latin # L& LATIN SMALL LETTER DOUBLE THORN -A7D5..A7D9 ; Latin # L& [5] LATIN SMALL LETTER DOUBLE WYNN..LATIN SMALL LETTER SIGMOID S +A7D5..A7DC ; Latin # L& [8] LATIN SMALL LETTER DOUBLE WYNN..LATIN CAPITAL LETTER LAMBDA WITH STROKE A7F2..A7F4 ; Latin # Lm [3] MODIFIER LETTER CAPITAL C..MODIFIER LETTER CAPITAL Q A7F5..A7F6 ; Latin # L& [2] LATIN CAPITAL LETTER REVERSED HALF H..LATIN SMALL LETTER REVERSED HALF H A7F7 ; Latin # Lo LATIN EPIGRAPHIC LETTER SIDEWAYS I @@ -699,7 +702,7 @@ FF41..FF5A ; Latin # L& [26] FULLWIDTH LATIN SMALL LETTER A..FULLWIDTH LATIN 1DF0B..1DF1E ; Latin # L& [20] LATIN SMALL LETTER ESH WITH DOUBLE BAR..LATIN SMALL LETTER S WITH CURL 1DF25..1DF2A ; Latin # L& [6] LATIN SMALL LETTER D WITH MID-HEIGHT LEFT HOOK..LATIN SMALL LETTER T WITH MID-HEIGHT LEFT HOOK -# Total code points: 1481 +# Total code points: 1487 # ================================================ @@ -769,7 +772,7 @@ AB65 ; Greek # L& GREEK LETTER SMALL CAPITAL OMEGA 0487 ; Cyrillic # Mn COMBINING CYRILLIC POKRYTIE 0488..0489 ; Cyrillic # Me [2] COMBINING CYRILLIC HUNDRED THOUSANDS SIGN..COMBINING CYRILLIC MILLIONS SIGN 048A..052F ; Cyrillic # L& [166] CYRILLIC CAPITAL LETTER SHORT I WITH TAIL..CYRILLIC SMALL LETTER EL WITH DESCENDER -1C80..1C88 ; Cyrillic # L& [9] CYRILLIC SMALL LETTER ROUNDED VE..CYRILLIC SMALL LETTER UNBLENDED UK +1C80..1C8A ; Cyrillic # L& [11] CYRILLIC SMALL LETTER ROUNDED VE..CYRILLIC SMALL LETTER TJE 1D2B ; Cyrillic # L& CYRILLIC LETTER SMALL CAPITAL EL 1D78 ; Cyrillic # Lm MODIFIER LETTER CYRILLIC EN 2DE0..2DFF ; Cyrillic # Mn [32] COMBINING CYRILLIC LETTER BE..COMBINING CYRILLIC LETTER IOTIFIED BIG YUS @@ -788,7 +791,7 @@ FE2E..FE2F ; Cyrillic # Mn [2] COMBINING CYRILLIC TITLO LEFT HALF..COMBININ 1E030..1E06D ; Cyrillic # Lm [62] MODIFIER LETTER CYRILLIC SMALL A..MODIFIER LETTER CYRILLIC SMALL STRAIGHT U WITH STROKE 1E08F ; Cyrillic # Mn COMBINING CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I -# Total code points: 506 +# Total code points: 508 # ================================================ @@ -868,7 +871,7 @@ FB46..FB4F ; Hebrew # Lo [10] HEBREW LETTER TSADI WITH DAGESH..HEBREW LIGATU 0888 ; Arabic # Sk ARABIC RAISED ROUND DOT 0889..088E ; Arabic # Lo [6] ARABIC LETTER NOON WITH INVERTED SMALL V..ARABIC VERTICAL TAIL 0890..0891 ; Arabic # Cf [2] ARABIC POUND MARK ABOVE..ARABIC PIASTRE MARK ABOVE -0898..089F ; Arabic # Mn [8] ARABIC SMALL HIGH WORD AL-JUZ..ARABIC HALF MADDA OVER MADDA +0897..089F ; Arabic # Mn [9] ARABIC PEPET..ARABIC HALF MADDA OVER MADDA 08A0..08C8 ; Arabic # Lo [41] ARABIC LETTER BEH WITH SMALL V BELOW..ARABIC LETTER GRAF 08C9 ; Arabic # Lm ARABIC SMALL FARSI YEH 08CA..08E1 ; Arabic # Mn [24] ARABIC SMALL HIGH FARSI YEH..ARABIC SMALL HIGH SIGN SAFHA @@ -886,7 +889,8 @@ FDFD..FDFF ; Arabic # So [3] ARABIC LIGATURE BISMILLAH AR-RAHMAN AR-RAHEEM. FE70..FE74 ; Arabic # Lo [5] ARABIC FATHATAN ISOLATED FORM..ARABIC KASRATAN ISOLATED FORM FE76..FEFC ; Arabic # Lo [135] ARABIC FATHA ISOLATED FORM..ARABIC LIGATURE LAM WITH ALEF FINAL FORM 10E60..10E7E ; Arabic # No [31] RUMI DIGIT ONE..RUMI FRACTION TWO THIRDS -10EFD..10EFF ; Arabic # Mn [3] ARABIC SMALL LOW WORD SAKTA..ARABIC SMALL LOW WORD MADDA +10EC2..10EC4 ; Arabic # Lo [3] ARABIC LETTER DAL WITH TWO DOTS VERTICALLY BELOW..ARABIC LETTER KAF WITH TWO DOTS VERTICALLY BELOW +10EFC..10EFF ; Arabic # Mn [4] ARABIC COMBINING ALEF OVERLAY..ARABIC SMALL LOW WORD MADDA 1EE00..1EE03 ; Arabic # Lo [4] ARABIC MATHEMATICAL ALEF..ARABIC MATHEMATICAL DAL 1EE05..1EE1F ; Arabic # Lo [27] ARABIC MATHEMATICAL WAW..ARABIC MATHEMATICAL DOTLESS QAF 1EE21..1EE22 ; Arabic # Lo [2] ARABIC MATHEMATICAL INITIAL BEH..ARABIC MATHEMATICAL INITIAL JEEM @@ -922,7 +926,7 @@ FE76..FEFC ; Arabic # Lo [135] ARABIC FATHA ISOLATED FORM..ARABIC LIGATURE LA 1EEAB..1EEBB ; Arabic # Lo [17] ARABIC MATHEMATICAL DOUBLE-STRUCK LAM..ARABIC MATHEMATICAL DOUBLE-STRUCK GHAIN 1EEF0..1EEF1 ; Arabic # Sm [2] ARABIC MATHEMATICAL OPERATOR MEEM WITH HAH WITH TATWEEL..ARABIC MATHEMATICAL OPERATOR HAH WITH DAL -# Total code points: 1368 +# Total code points: 1373 # ================================================ @@ -1369,8 +1373,9 @@ AA7B ; Myanmar # Mc MYANMAR SIGN PAO KAREN TONE AA7C ; Myanmar # Mn MYANMAR SIGN TAI LAING TONE-2 AA7D ; Myanmar # Mc MYANMAR SIGN TAI LAING TONE-5 AA7E..AA7F ; Myanmar # Lo [2] MYANMAR LETTER SHWE PALAUNG CHA..MYANMAR LETTER SHWE PALAUNG SHA +116D0..116E3 ; Myanmar # Nd [20] MYANMAR PAO DIGIT ZERO..MYANMAR EASTERN PWO KAREN DIGIT NINE -# Total code points: 223 +# Total code points: 243 # ================================================ @@ -1888,14 +1893,15 @@ A82C ; Syloti_Nagri # Mn SYLOTI NAGRI SIGN ALTERNATE HASANTA 1B42 ; Balinese # Mn BALINESE VOWEL SIGN PEPET 1B43..1B44 ; Balinese # Mc [2] BALINESE VOWEL SIGN PEPET TEDUNG..BALINESE ADEG ADEG 1B45..1B4C ; Balinese # Lo [8] BALINESE LETTER KAF SASAK..BALINESE LETTER ARCHAIC JNYA +1B4E..1B4F ; Balinese # Po [2] BALINESE INVERTED CARIK SIKI..BALINESE INVERTED CARIK PAREREN 1B50..1B59 ; Balinese # Nd [10] BALINESE DIGIT ZERO..BALINESE DIGIT NINE 1B5A..1B60 ; Balinese # Po [7] BALINESE PANTI..BALINESE PAMENENG 1B61..1B6A ; Balinese # So [10] BALINESE MUSICAL SYMBOL DONG..BALINESE MUSICAL SYMBOL DANG GEDE 1B6B..1B73 ; Balinese # Mn [9] BALINESE MUSICAL SYMBOL COMBINING TEGEH..BALINESE MUSICAL SYMBOL COMBINING GONG 1B74..1B7C ; Balinese # So [9] BALINESE MUSICAL SYMBOL RIGHT-HAND OPEN DUG..BALINESE MUSICAL SYMBOL LEFT-HAND OPEN PING -1B7D..1B7E ; Balinese # Po [2] BALINESE PANTI LANTANG..BALINESE PAMADA LANTANG +1B7D..1B7F ; Balinese # Po [3] BALINESE PANTI LANTANG..BALINESE PANTI BAWAK -# Total code points: 124 +# Total code points: 127 # ================================================ @@ -2108,8 +2114,9 @@ AADE..AADF ; Tai_Viet # Po [2] TAI VIET SYMBOL HO HOI..TAI VIET SYMBOL KOI 13440 ; Egyptian_Hieroglyphs # Mn EGYPTIAN HIEROGLYPH MIRROR HORIZONTALLY 13441..13446 ; Egyptian_Hieroglyphs # Lo [6] EGYPTIAN HIEROGLYPH FULL BLANK..EGYPTIAN HIEROGLYPH WIDE LOST SIGN 13447..13455 ; Egyptian_Hieroglyphs # Mn [15] EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT TOP START..EGYPTIAN HIEROGLYPH MODIFIER DAMAGED +13460..143FA ; Egyptian_Hieroglyphs # Lo [3995] EGYPTIAN HIEROGLYPH-13460..EGYPTIAN HIEROGLYPH-143FA -# Total code points: 1110 +# Total code points: 5105 # ================================================ @@ -2615,7 +2622,9 @@ ABF0..ABF9 ; Meetei_Mayek # Nd [10] MEETEI MAYEK DIGIT ZERO..MEETEI MAYEK DI # ================================================ 11700..1171A ; Ahom # Lo [27] AHOM LETTER KA..AHOM LETTER ALTERNATE BA -1171D..1171F ; Ahom # Mn [3] AHOM CONSONANT SIGN MEDIAL LA..AHOM CONSONANT SIGN MEDIAL LIGATING RA +1171D ; Ahom # Mn AHOM CONSONANT SIGN MEDIAL LA +1171E ; Ahom # Mc AHOM CONSONANT SIGN MEDIAL RA +1171F ; Ahom # Mn AHOM CONSONANT SIGN MEDIAL LIGATING RA 11720..11721 ; Ahom # Mc [2] AHOM VOWEL SIGN A..AHOM VOWEL SIGN AA 11722..11725 ; Ahom # Mn [4] AHOM VOWEL SIGN I..AHOM VOWEL SIGN UU 11726 ; Ahom # Mc AHOM VOWEL SIGN E @@ -2949,8 +2958,9 @@ ABF0..ABF9 ; Meetei_Mayek # Nd [10] MEETEI MAYEK DIGIT ZERO..MEETEI MAYEK DI 16FE4 ; Khitan_Small_Script # Mn KHITAN SMALL SCRIPT FILLER 18B00..18CD5 ; Khitan_Small_Script # Lo [470] KHITAN SMALL SCRIPT CHARACTER-18B00..KHITAN SMALL SCRIPT CHARACTER-18CD5 +18CFF ; Khitan_Small_Script # Lo KHITAN SMALL SCRIPT CHARACTER-18CFF -# Total code points: 471 +# Total code points: 472 # ================================================ @@ -3018,8 +3028,9 @@ ABF0..ABF9 ; Meetei_Mayek # Nd [10] MEETEI MAYEK DIGIT ZERO..MEETEI MAYEK DI 11F42 ; Kawi # Mn KAWI CONJOINER 11F43..11F4F ; Kawi # Po [13] KAWI DANDA..KAWI PUNCTUATION CLOSING SPIRAL 11F50..11F59 ; Kawi # Nd [10] KAWI DIGIT ZERO..KAWI DIGIT NINE +11F5A ; Kawi # Mn KAWI SIGN NUKTA -# Total code points: 86 +# Total code points: 87 # ================================================ @@ -3030,4 +3041,88 @@ ABF0..ABF9 ; Meetei_Mayek # Nd [10] MEETEI MAYEK DIGIT ZERO..MEETEI MAYEK DI # Total code points: 42 +# ================================================ + +10D40..10D49 ; Garay # Nd [10] GARAY DIGIT ZERO..GARAY DIGIT NINE +10D4A..10D4D ; Garay # Lo [4] GARAY VOWEL SIGN A..GARAY VOWEL SIGN EE +10D4E ; Garay # Lm GARAY VOWEL LENGTH MARK +10D4F ; Garay # Lo GARAY SUKUN +10D50..10D65 ; Garay # L& [22] GARAY CAPITAL LETTER A..GARAY CAPITAL LETTER OLD NA +10D69..10D6D ; Garay # Mn [5] GARAY VOWEL SIGN E..GARAY CONSONANT NASALIZATION MARK +10D6E ; Garay # Pd GARAY HYPHEN +10D6F ; Garay # Lm GARAY REDUPLICATION MARK +10D70..10D85 ; Garay # L& [22] GARAY SMALL LETTER A..GARAY SMALL LETTER OLD NA +10D8E..10D8F ; Garay # Sm [2] GARAY PLUS SIGN..GARAY MINUS SIGN + +# Total code points: 69 + +# ================================================ + +16100..1611D ; Gurung_Khema # Lo [30] GURUNG KHEMA LETTER A..GURUNG KHEMA LETTER SA +1611E..16129 ; Gurung_Khema # Mn [12] GURUNG KHEMA VOWEL SIGN AA..GURUNG KHEMA VOWEL LENGTH MARK +1612A..1612C ; Gurung_Khema # Mc [3] GURUNG KHEMA CONSONANT SIGN MEDIAL YA..GURUNG KHEMA CONSONANT SIGN MEDIAL HA +1612D..1612F ; Gurung_Khema # Mn [3] GURUNG KHEMA SIGN ANUSVARA..GURUNG KHEMA SIGN THOLHOMA +16130..16139 ; Gurung_Khema # Nd [10] GURUNG KHEMA DIGIT ZERO..GURUNG KHEMA DIGIT NINE + +# Total code points: 58 + +# ================================================ + +16D40..16D42 ; Kirat_Rai # Lm [3] KIRAT RAI SIGN ANUSVARA..KIRAT RAI SIGN VISARGA +16D43..16D6A ; Kirat_Rai # Lo [40] KIRAT RAI LETTER A..KIRAT RAI VOWEL SIGN AU +16D6B..16D6C ; Kirat_Rai # Lm [2] KIRAT RAI SIGN VIRAMA..KIRAT RAI SIGN SAAT +16D6D..16D6F ; Kirat_Rai # Po [3] KIRAT RAI SIGN YUPI..KIRAT RAI DOUBLE DANDA +16D70..16D79 ; Kirat_Rai # Nd [10] KIRAT RAI DIGIT ZERO..KIRAT RAI DIGIT NINE + +# Total code points: 58 + +# ================================================ + +1E5D0..1E5ED ; Ol_Onal # Lo [30] OL ONAL LETTER O..OL ONAL LETTER EG +1E5EE..1E5EF ; Ol_Onal # Mn [2] OL ONAL SIGN MU..OL ONAL SIGN IKIR +1E5F0 ; Ol_Onal # Lo OL ONAL SIGN HODDOND +1E5F1..1E5FA ; Ol_Onal # Nd [10] OL ONAL DIGIT ZERO..OL ONAL DIGIT NINE +1E5FF ; Ol_Onal # Po OL ONAL ABBREVIATION SIGN + +# Total code points: 44 + +# ================================================ + +11BC0..11BE0 ; Sunuwar # Lo [33] SUNUWAR LETTER DEVI..SUNUWAR LETTER KLOKO +11BE1 ; Sunuwar # Po SUNUWAR SIGN PVO +11BF0..11BF9 ; Sunuwar # Nd [10] SUNUWAR DIGIT ZERO..SUNUWAR DIGIT NINE + +# Total code points: 44 + +# ================================================ + +105C0..105F3 ; Todhri # Lo [52] TODHRI LETTER A..TODHRI LETTER OO + +# Total code points: 52 + +# ================================================ + +11380..11389 ; Tulu_Tigalari # Lo [10] TULU-TIGALARI LETTER A..TULU-TIGALARI LETTER VOCALIC LL +1138B ; Tulu_Tigalari # Lo TULU-TIGALARI LETTER EE +1138E ; Tulu_Tigalari # Lo TULU-TIGALARI LETTER AI +11390..113B5 ; Tulu_Tigalari # Lo [38] TULU-TIGALARI LETTER OO..TULU-TIGALARI LETTER LLLA +113B7 ; Tulu_Tigalari # Lo TULU-TIGALARI SIGN AVAGRAHA +113B8..113BA ; Tulu_Tigalari # Mc [3] TULU-TIGALARI VOWEL SIGN AA..TULU-TIGALARI VOWEL SIGN II +113BB..113C0 ; Tulu_Tigalari # Mn [6] TULU-TIGALARI VOWEL SIGN U..TULU-TIGALARI VOWEL SIGN VOCALIC LL +113C2 ; Tulu_Tigalari # Mc TULU-TIGALARI VOWEL SIGN EE +113C5 ; Tulu_Tigalari # Mc TULU-TIGALARI VOWEL SIGN AI +113C7..113CA ; Tulu_Tigalari # Mc [4] TULU-TIGALARI VOWEL SIGN OO..TULU-TIGALARI SIGN CANDRA ANUNASIKA +113CC..113CD ; Tulu_Tigalari # Mc [2] TULU-TIGALARI SIGN ANUSVARA..TULU-TIGALARI SIGN VISARGA +113CE ; Tulu_Tigalari # Mn TULU-TIGALARI SIGN VIRAMA +113CF ; Tulu_Tigalari # Mc TULU-TIGALARI SIGN LOOPED VIRAMA +113D0 ; Tulu_Tigalari # Mn TULU-TIGALARI CONJOINER +113D1 ; Tulu_Tigalari # Lo TULU-TIGALARI REPHA +113D2 ; Tulu_Tigalari # Mn TULU-TIGALARI GEMINATION MARK +113D3 ; Tulu_Tigalari # Lo TULU-TIGALARI SIGN PLUTA +113D4..113D5 ; Tulu_Tigalari # Po [2] TULU-TIGALARI DANDA..TULU-TIGALARI DOUBLE DANDA +113D7..113D8 ; Tulu_Tigalari # Po [2] TULU-TIGALARI SIGN OM PUSHPIKA..TULU-TIGALARI SIGN SHRII PUSHPIKA +113E1..113E2 ; Tulu_Tigalari # Mn [2] TULU-TIGALARI VEDIC TONE SVARITA..TULU-TIGALARI VEDIC TONE ANUDATTA + +# Total code points: 80 + # EOF diff --git a/Master/texmf-dist/tex/generic/unicode-data/SpecialCasing.txt b/Master/texmf-dist/tex/generic/unicode-data/SpecialCasing.txt index de08450a6b9..e83aba432f4 100644 --- a/Master/texmf-dist/tex/generic/unicode-data/SpecialCasing.txt +++ b/Master/texmf-dist/tex/generic/unicode-data/SpecialCasing.txt @@ -1,28 +1,28 @@ -# SpecialCasing-15.1.0.txt -# Date: 2023-01-05, 20:35:03 GMT -# © 2023 Unicode®, Inc. +# SpecialCasing-16.0.0.txt +# Date: 2024-05-10, 22:49:00 GMT +# © 2024 Unicode®, Inc. # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries. -# For terms of use, see https://www.unicode.org/terms_of_use.html +# For terms of use and license, see https://www.unicode.org/terms_of_use.html # # Unicode Character Database # For documentation, see https://www.unicode.org/reports/tr44/ # # Special Casing # -# This file is a supplement to the UnicodeData.txt file. It does not define any -# properties, but rather provides additional information about the casing of -# Unicode characters, for situations when casing incurs a change in string length -# or is dependent on context or locale. For compatibility, the UnicodeData.txt -# file only contains simple case mappings for characters where they are one-to-one -# and independent of context and language. The data in this file, combined with +# This file is a supplement to the UnicodeData.txt file. The data in this file, combined with # the simple case mappings in UnicodeData.txt, defines the full case mappings # Lowercase_Mapping (lc), Titlecase_Mapping (tc), and Uppercase_Mapping (uc). +# For compatibility, the UnicodeData.txt file only contains simple case mappings +# for characters where they are one-to-one (and independent of context and language). +# +# For historical reasons, this file also provides additional information about the casing +# of Unicode characters for selected situations when casing is dependent on context or locale. # # Note that the preferred mechanism for defining tailored casing operations is # the Unicode Common Locale Data Repository (CLDR). For more information, see the # discussion of case mappings and case algorithms in the Unicode Standard. # -# All code points not listed in this file that do not have a simple case mappings +# All code points not listed in this file that do not have simple case mappings # in UnicodeData.txt map to themselves. # ================================================================================ # Format diff --git a/Master/texmf-dist/tex/generic/unicode-data/UnicodeData.txt b/Master/texmf-dist/tex/generic/unicode-data/UnicodeData.txt index bdcc41850d7..64258a37395 100644 --- a/Master/texmf-dist/tex/generic/unicode-data/UnicodeData.txt +++ b/Master/texmf-dist/tex/generic/unicode-data/UnicodeData.txt @@ -409,7 +409,7 @@ 0198;LATIN CAPITAL LETTER K WITH HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER K HOOK;;;0199; 0199;LATIN SMALL LETTER K WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER K HOOK;;0198;;0198 019A;LATIN SMALL LETTER L WITH BAR;Ll;0;L;;;;;N;LATIN SMALL LETTER BARRED L;;023D;;023D -019B;LATIN SMALL LETTER LAMBDA WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER BARRED LAMBDA;;;; +019B;LATIN SMALL LETTER LAMBDA WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER BARRED LAMBDA;;A7DC;;A7DC 019C;LATIN CAPITAL LETTER TURNED M;Lu;0;L;;;;;N;;;;026F; 019D;LATIN CAPITAL LETTER N WITH LEFT HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER N HOOK;;;0272; 019E;LATIN SMALL LETTER N WITH LONG RIGHT LEG;Ll;0;L;;;;;N;;;0220;;0220 @@ -610,7 +610,7 @@ 0261;LATIN SMALL LETTER SCRIPT G;Ll;0;L;;;;;N;;;A7AC;;A7AC 0262;LATIN LETTER SMALL CAPITAL G;Ll;0;L;;;;;N;;;;; 0263;LATIN SMALL LETTER GAMMA;Ll;0;L;;;;;N;;;0194;;0194 -0264;LATIN SMALL LETTER RAMS HORN;Ll;0;L;;;;;N;LATIN SMALL LETTER BABY GAMMA;;;; +0264;LATIN SMALL LETTER RAMS HORN;Ll;0;L;;;;;N;LATIN SMALL LETTER BABY GAMMA;;A7CB;;A7CB 0265;LATIN SMALL LETTER TURNED H;Ll;0;L;;;;;N;;;A78D;;A78D 0266;LATIN SMALL LETTER H WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER H HOOK;;A7AA;;A7AA 0267;LATIN SMALL LETTER HENG WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER HENG HOOK;;;; @@ -2123,6 +2123,7 @@ 088E;ARABIC VERTICAL TAIL;Lo;0;AL;;;;;N;;;;; 0890;ARABIC POUND MARK ABOVE;Cf;0;AN;;;;;N;;;;; 0891;ARABIC PIASTRE MARK ABOVE;Cf;0;AN;;;;;N;;;;; +0897;ARABIC PEPET;Mn;230;NSM;;;;;N;;;;; 0898;ARABIC SMALL HIGH WORD AL-JUZ;Mn;230;NSM;;;;;N;;;;; 0899;ARABIC SMALL LOW WORD ISHMAAM;Mn;220;NSM;;;;;N;;;;; 089A;ARABIC SMALL LOW WORD IMAALA;Mn;220;NSM;;;;;N;;;;; @@ -6213,6 +6214,8 @@ 1B4A;BALINESE LETTER ZAL SASAK;Lo;0;L;;;;;N;;;;; 1B4B;BALINESE LETTER ASYURA SASAK;Lo;0;L;;;;;N;;;;; 1B4C;BALINESE LETTER ARCHAIC JNYA;Lo;0;L;;;;;N;;;;; +1B4E;BALINESE INVERTED CARIK SIKI;Po;0;L;;;;;N;;;;; +1B4F;BALINESE INVERTED CARIK PAREREN;Po;0;L;;;;;N;;;;; 1B50;BALINESE DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; 1B51;BALINESE DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; 1B52;BALINESE DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; @@ -6260,6 +6263,7 @@ 1B7C;BALINESE MUSICAL SYMBOL LEFT-HAND OPEN PING;So;0;L;;;;;N;;;;; 1B7D;BALINESE PANTI LANTANG;Po;0;L;;;;;N;;;;; 1B7E;BALINESE PAMADA LANTANG;Po;0;L;;;;;N;;;;; +1B7F;BALINESE PANTI BAWAK;Po;0;L;;;;;N;;;;; 1B80;SUNDANESE SIGN PANYECEK;Mn;0;NSM;;;;;N;;;;; 1B81;SUNDANESE SIGN PANGLAYAR;Mn;0;NSM;;;;;N;;;;; 1B82;SUNDANESE SIGN PANGWISAD;Mc;0;L;;;;;N;;;;; @@ -6511,6 +6515,8 @@ 1C86;CYRILLIC SMALL LETTER TALL HARD SIGN;Ll;0;L;;;;;N;;;042A;;042A 1C87;CYRILLIC SMALL LETTER TALL YAT;Ll;0;L;;;;;N;;;0462;;0462 1C88;CYRILLIC SMALL LETTER UNBLENDED UK;Ll;0;L;;;;;N;;;A64A;;A64A +1C89;CYRILLIC CAPITAL LETTER TJE;Lu;0;L;;;;;N;;;;1C8A; +1C8A;CYRILLIC SMALL LETTER TJE;Ll;0;L;;;;;N;;;1C89;;1C89 1C90;GEORGIAN MTAVRULI CAPITAL LETTER AN;Lu;0;L;;;;;N;;;;10D0; 1C91;GEORGIAN MTAVRULI CAPITAL LETTER BAN;Lu;0;L;;;;;N;;;;10D1; 1C92;GEORGIAN MTAVRULI CAPITAL LETTER GAN;Lu;0;L;;;;;N;;;;10D2; @@ -7933,7 +7939,7 @@ 226A;MUCH LESS-THAN;Sm;0;ON;;;;;Y;MUCH LESS THAN;;;; 226B;MUCH GREATER-THAN;Sm;0;ON;;;;;Y;MUCH GREATER THAN;;;; 226C;BETWEEN;Sm;0;ON;;;;;N;;;;; -226D;NOT EQUIVALENT TO;Sm;0;ON;224D 0338;;;;N;;;;; +226D;NOT EQUIVALENT TO;Sm;0;ON;224D 0338;;;;Y;;;;; 226E;NOT LESS-THAN;Sm;0;ON;003C 0338;;;;Y;NOT LESS THAN;;;; 226F;NOT GREATER-THAN;Sm;0;ON;003E 0338;;;;Y;NOT GREATER THAN;;;; 2270;NEITHER LESS-THAN NOR EQUAL TO;Sm;0;ON;2264 0338;;;;Y;NEITHER LESS THAN NOR EQUAL TO;;;; @@ -8375,6 +8381,9 @@ 2424;SYMBOL FOR NEWLINE;So;0;ON;;;;;N;GRAPHIC FOR NEWLINE;;;; 2425;SYMBOL FOR DELETE FORM TWO;So;0;ON;;;;;N;;;;; 2426;SYMBOL FOR SUBSTITUTE FORM TWO;So;0;ON;;;;;N;;;;; +2427;SYMBOL FOR DELETE SQUARE CHECKER BOARD FORM;So;0;ON;;;;;N;;;;; +2428;SYMBOL FOR DELETE RECTANGULAR CHECKER BOARD FORM;So;0;ON;;;;;N;;;;; +2429;SYMBOL FOR DELETE MEDIUM SHADE FORM;So;0;ON;;;;;N;;;;; 2440;OCR HOOK;So;0;ON;;;;;N;;;;; 2441;OCR CHAIR;So;0;ON;;;;;N;;;;; 2442;OCR FORK;So;0;ON;;;;;N;;;;; @@ -11709,6 +11718,8 @@ 31E1;CJK STROKE HZZZG;So;0;ON;;;;;N;;;;; 31E2;CJK STROKE PG;So;0;ON;;;;;N;;;;; 31E3;CJK STROKE Q;So;0;ON;;;;;N;;;;; +31E4;CJK STROKE HXG;So;0;ON;;;;;N;;;;; +31E5;CJK STROKE SZP;So;0;ON;;;;;N;;;;; 31EF;IDEOGRAPHIC DESCRIPTION CHARACTER SUBTRACTION;So;0;ON;;;;;N;;;;; 31F0;KATAKANA LETTER SMALL KU;Lo;0;L;;;;;N;;;;; 31F1;KATAKANA LETTER SMALL SI;Lo;0;L;;;;;N;;;;; @@ -14260,6 +14271,9 @@ A7C7;LATIN CAPITAL LETTER D WITH SHORT STROKE OVERLAY;Lu;0;L;;;;;N;;;;A7C8; A7C8;LATIN SMALL LETTER D WITH SHORT STROKE OVERLAY;Ll;0;L;;;;;N;;;A7C7;;A7C7 A7C9;LATIN CAPITAL LETTER S WITH SHORT STROKE OVERLAY;Lu;0;L;;;;;N;;;;A7CA; A7CA;LATIN SMALL LETTER S WITH SHORT STROKE OVERLAY;Ll;0;L;;;;;N;;;A7C9;;A7C9 +A7CB;LATIN CAPITAL LETTER RAMS HORN;Lu;0;L;;;;;N;;;;0264; +A7CC;LATIN CAPITAL LETTER S WITH DIAGONAL STROKE;Lu;0;L;;;;;N;;;;A7CD; +A7CD;LATIN SMALL LETTER S WITH DIAGONAL STROKE;Ll;0;L;;;;;N;;;A7CC;;A7CC A7D0;LATIN CAPITAL LETTER CLOSED INSULAR G;Lu;0;L;;;;;N;;;;A7D1; A7D1;LATIN SMALL LETTER CLOSED INSULAR G;Ll;0;L;;;;;N;;;A7D0;;A7D0 A7D3;LATIN SMALL LETTER DOUBLE THORN;Ll;0;L;;;;;N;;;;; @@ -14268,6 +14282,9 @@ A7D6;LATIN CAPITAL LETTER MIDDLE SCOTS S;Lu;0;L;;;;;N;;;;A7D7; A7D7;LATIN SMALL LETTER MIDDLE SCOTS S;Ll;0;L;;;;;N;;;A7D6;;A7D6 A7D8;LATIN CAPITAL LETTER SIGMOID S;Lu;0;L;;;;;N;;;;A7D9; A7D9;LATIN SMALL LETTER SIGMOID S;Ll;0;L;;;;;N;;;A7D8;;A7D8 +A7DA;LATIN CAPITAL LETTER LAMBDA;Lu;0;L;;;;;N;;;;A7DB; +A7DB;LATIN SMALL LETTER LAMBDA;Ll;0;L;;;;;N;;;A7DA;;A7DA +A7DC;LATIN CAPITAL LETTER LAMBDA WITH STROKE;Lu;0;L;;;;;N;;;;019B; A7F2;MODIFIER LETTER CAPITAL C;Lm;0;L;<super> 0043;;;;N;;;;; A7F3;MODIFIER LETTER CAPITAL F;Lm;0;L;<super> 0046;;;;N;;;;; A7F4;MODIFIER LETTER CAPITAL Q;Lm;0;L;<super> 0051;;;;N;;;;; @@ -18001,6 +18018,58 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 105B9;VITHKUQI SMALL LETTER XE;Ll;0;L;;;;;N;;;10592;;10592 105BB;VITHKUQI SMALL LETTER Y;Ll;0;L;;;;;N;;;10594;;10594 105BC;VITHKUQI SMALL LETTER ZE;Ll;0;L;;;;;N;;;10595;;10595 +105C0;TODHRI LETTER A;Lo;0;L;;;;;N;;;;; +105C1;TODHRI LETTER AS;Lo;0;L;;;;;N;;;;; +105C2;TODHRI LETTER BA;Lo;0;L;;;;;N;;;;; +105C3;TODHRI LETTER MBA;Lo;0;L;;;;;N;;;;; +105C4;TODHRI LETTER CA;Lo;0;L;;;;;N;;;;; +105C5;TODHRI LETTER CHA;Lo;0;L;;;;;N;;;;; +105C6;TODHRI LETTER DA;Lo;0;L;;;;;N;;;;; +105C7;TODHRI LETTER NDA;Lo;0;L;;;;;N;;;;; +105C8;TODHRI LETTER DHA;Lo;0;L;;;;;N;;;;; +105C9;TODHRI LETTER EI;Lo;0;L;105D2 0307;;;;N;;;;; +105CA;TODHRI LETTER E;Lo;0;L;;;;;N;;;;; +105CB;TODHRI LETTER FA;Lo;0;L;;;;;N;;;;; +105CC;TODHRI LETTER GA;Lo;0;L;;;;;N;;;;; +105CD;TODHRI LETTER NGA;Lo;0;L;;;;;N;;;;; +105CE;TODHRI LETTER GJA;Lo;0;L;;;;;N;;;;; +105CF;TODHRI LETTER NGJA;Lo;0;L;;;;;N;;;;; +105D0;TODHRI LETTER HA;Lo;0;L;;;;;N;;;;; +105D1;TODHRI LETTER HJA;Lo;0;L;;;;;N;;;;; +105D2;TODHRI LETTER I;Lo;0;L;;;;;N;;;;; +105D3;TODHRI LETTER JA;Lo;0;L;;;;;N;;;;; +105D4;TODHRI LETTER KA;Lo;0;L;;;;;N;;;;; +105D5;TODHRI LETTER LA;Lo;0;L;;;;;N;;;;; +105D6;TODHRI LETTER LLA;Lo;0;L;;;;;N;;;;; +105D7;TODHRI LETTER MA;Lo;0;L;;;;;N;;;;; +105D8;TODHRI LETTER NA;Lo;0;L;;;;;N;;;;; +105D9;TODHRI LETTER NJAN;Lo;0;L;;;;;N;;;;; +105DA;TODHRI LETTER O;Lo;0;L;;;;;N;;;;; +105DB;TODHRI LETTER PA;Lo;0;L;;;;;N;;;;; +105DC;TODHRI LETTER QA;Lo;0;L;;;;;N;;;;; +105DD;TODHRI LETTER RA;Lo;0;L;;;;;N;;;;; +105DE;TODHRI LETTER RRA;Lo;0;L;;;;;N;;;;; +105DF;TODHRI LETTER SA;Lo;0;L;;;;;N;;;;; +105E0;TODHRI LETTER SHA;Lo;0;L;;;;;N;;;;; +105E1;TODHRI LETTER SHTA;Lo;0;L;;;;;N;;;;; +105E2;TODHRI LETTER TA;Lo;0;L;;;;;N;;;;; +105E3;TODHRI LETTER THA;Lo;0;L;;;;;N;;;;; +105E4;TODHRI LETTER U;Lo;0;L;105DA 0307;;;;N;;;;; +105E5;TODHRI LETTER VA;Lo;0;L;;;;;N;;;;; +105E6;TODHRI LETTER XA;Lo;0;L;;;;;N;;;;; +105E7;TODHRI LETTER NXA;Lo;0;L;;;;;N;;;;; +105E8;TODHRI LETTER XHA;Lo;0;L;;;;;N;;;;; +105E9;TODHRI LETTER NXHA;Lo;0;L;;;;;N;;;;; +105EA;TODHRI LETTER Y;Lo;0;L;;;;;N;;;;; +105EB;TODHRI LETTER JY;Lo;0;L;;;;;N;;;;; +105EC;TODHRI LETTER ZA;Lo;0;L;;;;;N;;;;; +105ED;TODHRI LETTER ZHA;Lo;0;L;;;;;N;;;;; +105EE;TODHRI LETTER GHA;Lo;0;L;;;;;N;;;;; +105EF;TODHRI LETTER STA;Lo;0;L;;;;;N;;;;; +105F0;TODHRI LETTER SKAN;Lo;0;L;;;;;N;;;;; +105F1;TODHRI LETTER KHA;Lo;0;L;;;;;N;;;;; +105F2;TODHRI LETTER PSA;Lo;0;L;;;;;N;;;;; +105F3;TODHRI LETTER OO;Lo;0;L;;;;;N;;;;; 10600;LINEAR A SIGN AB001;Lo;0;L;;;;;N;;;;; 10601;LINEAR A SIGN AB002;Lo;0;L;;;;;N;;;;; 10602;LINEAR A SIGN AB003;Lo;0;L;;;;;N;;;;; @@ -19322,6 +19391,75 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 10D37;HANIFI ROHINGYA DIGIT SEVEN;Nd;0;AN;;7;7;7;N;;;;; 10D38;HANIFI ROHINGYA DIGIT EIGHT;Nd;0;AN;;8;8;8;N;;;;; 10D39;HANIFI ROHINGYA DIGIT NINE;Nd;0;AN;;9;9;9;N;;;;; +10D40;GARAY DIGIT ZERO;Nd;0;AN;;0;0;0;N;;;;; +10D41;GARAY DIGIT ONE;Nd;0;AN;;1;1;1;N;;;;; +10D42;GARAY DIGIT TWO;Nd;0;AN;;2;2;2;N;;;;; +10D43;GARAY DIGIT THREE;Nd;0;AN;;3;3;3;N;;;;; +10D44;GARAY DIGIT FOUR;Nd;0;AN;;4;4;4;N;;;;; +10D45;GARAY DIGIT FIVE;Nd;0;AN;;5;5;5;N;;;;; +10D46;GARAY DIGIT SIX;Nd;0;AN;;6;6;6;N;;;;; +10D47;GARAY DIGIT SEVEN;Nd;0;AN;;7;7;7;N;;;;; +10D48;GARAY DIGIT EIGHT;Nd;0;AN;;8;8;8;N;;;;; +10D49;GARAY DIGIT NINE;Nd;0;AN;;9;9;9;N;;;;; +10D4A;GARAY VOWEL SIGN A;Lo;0;R;;;;;N;;;;; +10D4B;GARAY VOWEL SIGN I;Lo;0;R;;;;;N;;;;; +10D4C;GARAY VOWEL SIGN O;Lo;0;R;;;;;N;;;;; +10D4D;GARAY VOWEL SIGN EE;Lo;0;R;;;;;N;;;;; +10D4E;GARAY VOWEL LENGTH MARK;Lm;0;R;;;;;N;;;;; +10D4F;GARAY SUKUN;Lo;0;R;;;;;N;;;;; +10D50;GARAY CAPITAL LETTER A;Lu;0;R;;;;;N;;;;10D70; +10D51;GARAY CAPITAL LETTER CA;Lu;0;R;;;;;N;;;;10D71; +10D52;GARAY CAPITAL LETTER MA;Lu;0;R;;;;;N;;;;10D72; +10D53;GARAY CAPITAL LETTER KA;Lu;0;R;;;;;N;;;;10D73; +10D54;GARAY CAPITAL LETTER BA;Lu;0;R;;;;;N;;;;10D74; +10D55;GARAY CAPITAL LETTER JA;Lu;0;R;;;;;N;;;;10D75; +10D56;GARAY CAPITAL LETTER SA;Lu;0;R;;;;;N;;;;10D76; +10D57;GARAY CAPITAL LETTER WA;Lu;0;R;;;;;N;;;;10D77; +10D58;GARAY CAPITAL LETTER LA;Lu;0;R;;;;;N;;;;10D78; +10D59;GARAY CAPITAL LETTER GA;Lu;0;R;;;;;N;;;;10D79; +10D5A;GARAY CAPITAL LETTER DA;Lu;0;R;;;;;N;;;;10D7A; +10D5B;GARAY CAPITAL LETTER XA;Lu;0;R;;;;;N;;;;10D7B; +10D5C;GARAY CAPITAL LETTER YA;Lu;0;R;;;;;N;;;;10D7C; +10D5D;GARAY CAPITAL LETTER TA;Lu;0;R;;;;;N;;;;10D7D; +10D5E;GARAY CAPITAL LETTER RA;Lu;0;R;;;;;N;;;;10D7E; +10D5F;GARAY CAPITAL LETTER NYA;Lu;0;R;;;;;N;;;;10D7F; +10D60;GARAY CAPITAL LETTER FA;Lu;0;R;;;;;N;;;;10D80; +10D61;GARAY CAPITAL LETTER NA;Lu;0;R;;;;;N;;;;10D81; +10D62;GARAY CAPITAL LETTER PA;Lu;0;R;;;;;N;;;;10D82; +10D63;GARAY CAPITAL LETTER HA;Lu;0;R;;;;;N;;;;10D83; +10D64;GARAY CAPITAL LETTER OLD KA;Lu;0;R;;;;;N;;;;10D84; +10D65;GARAY CAPITAL LETTER OLD NA;Lu;0;R;;;;;N;;;;10D85; +10D69;GARAY VOWEL SIGN E;Mn;230;NSM;;;;;N;;;;; +10D6A;GARAY CONSONANT GEMINATION MARK;Mn;230;NSM;;;;;N;;;;; +10D6B;GARAY COMBINING DOT ABOVE;Mn;230;NSM;;;;;N;;;;; +10D6C;GARAY COMBINING DOUBLE DOT ABOVE;Mn;230;NSM;;;;;N;;;;; +10D6D;GARAY CONSONANT NASALIZATION MARK;Mn;230;NSM;;;;;N;;;;; +10D6E;GARAY HYPHEN;Pd;0;ON;;;;;N;;;;; +10D6F;GARAY REDUPLICATION MARK;Lm;0;R;;;;;N;;;;; +10D70;GARAY SMALL LETTER A;Ll;0;R;;;;;N;;;10D50;;10D50 +10D71;GARAY SMALL LETTER CA;Ll;0;R;;;;;N;;;10D51;;10D51 +10D72;GARAY SMALL LETTER MA;Ll;0;R;;;;;N;;;10D52;;10D52 +10D73;GARAY SMALL LETTER KA;Ll;0;R;;;;;N;;;10D53;;10D53 +10D74;GARAY SMALL LETTER BA;Ll;0;R;;;;;N;;;10D54;;10D54 +10D75;GARAY SMALL LETTER JA;Ll;0;R;;;;;N;;;10D55;;10D55 +10D76;GARAY SMALL LETTER SA;Ll;0;R;;;;;N;;;10D56;;10D56 +10D77;GARAY SMALL LETTER WA;Ll;0;R;;;;;N;;;10D57;;10D57 +10D78;GARAY SMALL LETTER LA;Ll;0;R;;;;;N;;;10D58;;10D58 +10D79;GARAY SMALL LETTER GA;Ll;0;R;;;;;N;;;10D59;;10D59 +10D7A;GARAY SMALL LETTER DA;Ll;0;R;;;;;N;;;10D5A;;10D5A +10D7B;GARAY SMALL LETTER XA;Ll;0;R;;;;;N;;;10D5B;;10D5B +10D7C;GARAY SMALL LETTER YA;Ll;0;R;;;;;N;;;10D5C;;10D5C +10D7D;GARAY SMALL LETTER TA;Ll;0;R;;;;;N;;;10D5D;;10D5D +10D7E;GARAY SMALL LETTER RA;Ll;0;R;;;;;N;;;10D5E;;10D5E +10D7F;GARAY SMALL LETTER NYA;Ll;0;R;;;;;N;;;10D5F;;10D5F +10D80;GARAY SMALL LETTER FA;Ll;0;R;;;;;N;;;10D60;;10D60 +10D81;GARAY SMALL LETTER NA;Ll;0;R;;;;;N;;;10D61;;10D61 +10D82;GARAY SMALL LETTER PA;Ll;0;R;;;;;N;;;10D62;;10D62 +10D83;GARAY SMALL LETTER HA;Ll;0;R;;;;;N;;;10D63;;10D63 +10D84;GARAY SMALL LETTER OLD KA;Ll;0;R;;;;;N;;;10D64;;10D64 +10D85;GARAY SMALL LETTER OLD NA;Ll;0;R;;;;;N;;;10D65;;10D65 +10D8E;GARAY PLUS SIGN;Sm;0;R;;;;;N;;;;; +10D8F;GARAY MINUS SIGN;Sm;0;R;;;;;N;;;;; 10E60;RUMI DIGIT ONE;No;0;AN;;;1;1;N;;;;; 10E61;RUMI DIGIT TWO;No;0;AN;;;2;2;N;;;;; 10E62;RUMI DIGIT THREE;No;0;AN;;;3;3;N;;;;; @@ -19400,6 +19538,10 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 10EAD;YEZIDI HYPHENATION MARK;Pd;0;R;;;;;N;;;;; 10EB0;YEZIDI LETTER LAM WITH DOT ABOVE;Lo;0;R;;;;;N;;;;; 10EB1;YEZIDI LETTER YOT WITH CIRCUMFLEX ABOVE;Lo;0;R;;;;;N;;;;; +10EC2;ARABIC LETTER DAL WITH TWO DOTS VERTICALLY BELOW;Lo;0;AL;;;;;N;;;;; +10EC3;ARABIC LETTER TAH WITH TWO DOTS VERTICALLY BELOW;Lo;0;AL;;;;;N;;;;; +10EC4;ARABIC LETTER KAF WITH TWO DOTS VERTICALLY BELOW;Lo;0;AL;;;;;N;;;;; +10EFC;ARABIC COMBINING ALEF OVERLAY;Mn;0;NSM;;;;;N;;;;; 10EFD;ARABIC SMALL LOW WORD SAKTA;Mn;220;NSM;;;;;N;;;;; 10EFE;ARABIC SMALL LOW WORD QASR;Mn;220;NSM;;;;;N;;;;; 10EFF;ARABIC SMALL LOW WORD MADDA;Mn;220;NSM;;;;;N;;;;; @@ -20264,6 +20406,86 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 11372;COMBINING GRANTHA LETTER NA;Mn;230;NSM;;;;;N;;;;; 11373;COMBINING GRANTHA LETTER VI;Mn;230;NSM;;;;;N;;;;; 11374;COMBINING GRANTHA LETTER PA;Mn;230;NSM;;;;;N;;;;; +11380;TULU-TIGALARI LETTER A;Lo;0;L;;;;;N;;;;; +11381;TULU-TIGALARI LETTER AA;Lo;0;L;;;;;N;;;;; +11382;TULU-TIGALARI LETTER I;Lo;0;L;;;;;N;;;;; +11383;TULU-TIGALARI LETTER II;Lo;0;L;11382 113C9;;;;N;;;;; +11384;TULU-TIGALARI LETTER U;Lo;0;L;;;;;N;;;;; +11385;TULU-TIGALARI LETTER UU;Lo;0;L;11384 113BB;;;;N;;;;; +11386;TULU-TIGALARI LETTER VOCALIC R;Lo;0;L;;;;;N;;;;; +11387;TULU-TIGALARI LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;; +11388;TULU-TIGALARI LETTER VOCALIC L;Lo;0;L;;;;;N;;;;; +11389;TULU-TIGALARI LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;; +1138B;TULU-TIGALARI LETTER EE;Lo;0;L;;;;;N;;;;; +1138E;TULU-TIGALARI LETTER AI;Lo;0;L;1138B 113C2;;;;N;;;;; +11390;TULU-TIGALARI LETTER OO;Lo;0;L;;;;;N;;;;; +11391;TULU-TIGALARI LETTER AU;Lo;0;L;11390 113C9;;;;N;;;;; +11392;TULU-TIGALARI LETTER KA;Lo;0;L;;;;;N;;;;; +11393;TULU-TIGALARI LETTER KHA;Lo;0;L;;;;;N;;;;; +11394;TULU-TIGALARI LETTER GA;Lo;0;L;;;;;N;;;;; +11395;TULU-TIGALARI LETTER GHA;Lo;0;L;;;;;N;;;;; +11396;TULU-TIGALARI LETTER NGA;Lo;0;L;;;;;N;;;;; +11397;TULU-TIGALARI LETTER CA;Lo;0;L;;;;;N;;;;; +11398;TULU-TIGALARI LETTER CHA;Lo;0;L;;;;;N;;;;; +11399;TULU-TIGALARI LETTER JA;Lo;0;L;;;;;N;;;;; +1139A;TULU-TIGALARI LETTER JHA;Lo;0;L;;;;;N;;;;; +1139B;TULU-TIGALARI LETTER NYA;Lo;0;L;;;;;N;;;;; +1139C;TULU-TIGALARI LETTER TTA;Lo;0;L;;;;;N;;;;; +1139D;TULU-TIGALARI LETTER TTHA;Lo;0;L;;;;;N;;;;; +1139E;TULU-TIGALARI LETTER DDA;Lo;0;L;;;;;N;;;;; +1139F;TULU-TIGALARI LETTER DDHA;Lo;0;L;;;;;N;;;;; +113A0;TULU-TIGALARI LETTER NNA;Lo;0;L;;;;;N;;;;; +113A1;TULU-TIGALARI LETTER TA;Lo;0;L;;;;;N;;;;; +113A2;TULU-TIGALARI LETTER THA;Lo;0;L;;;;;N;;;;; +113A3;TULU-TIGALARI LETTER DA;Lo;0;L;;;;;N;;;;; +113A4;TULU-TIGALARI LETTER DHA;Lo;0;L;;;;;N;;;;; +113A5;TULU-TIGALARI LETTER NA;Lo;0;L;;;;;N;;;;; +113A6;TULU-TIGALARI LETTER PA;Lo;0;L;;;;;N;;;;; +113A7;TULU-TIGALARI LETTER PHA;Lo;0;L;;;;;N;;;;; +113A8;TULU-TIGALARI LETTER BA;Lo;0;L;;;;;N;;;;; +113A9;TULU-TIGALARI LETTER BHA;Lo;0;L;;;;;N;;;;; +113AA;TULU-TIGALARI LETTER MA;Lo;0;L;;;;;N;;;;; +113AB;TULU-TIGALARI LETTER YA;Lo;0;L;;;;;N;;;;; +113AC;TULU-TIGALARI LETTER RA;Lo;0;L;;;;;N;;;;; +113AD;TULU-TIGALARI LETTER LA;Lo;0;L;;;;;N;;;;; +113AE;TULU-TIGALARI LETTER VA;Lo;0;L;;;;;N;;;;; +113AF;TULU-TIGALARI LETTER SHA;Lo;0;L;;;;;N;;;;; +113B0;TULU-TIGALARI LETTER SSA;Lo;0;L;;;;;N;;;;; +113B1;TULU-TIGALARI LETTER SA;Lo;0;L;;;;;N;;;;; +113B2;TULU-TIGALARI LETTER HA;Lo;0;L;;;;;N;;;;; +113B3;TULU-TIGALARI LETTER LLA;Lo;0;L;;;;;N;;;;; +113B4;TULU-TIGALARI LETTER RRA;Lo;0;L;;;;;N;;;;; +113B5;TULU-TIGALARI LETTER LLLA;Lo;0;L;;;;;N;;;;; +113B7;TULU-TIGALARI SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;; +113B8;TULU-TIGALARI VOWEL SIGN AA;Mc;0;L;;;;;N;;;;; +113B9;TULU-TIGALARI VOWEL SIGN I;Mc;0;L;;;;;N;;;;; +113BA;TULU-TIGALARI VOWEL SIGN II;Mc;0;L;;;;;N;;;;; +113BB;TULU-TIGALARI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;; +113BC;TULU-TIGALARI VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;; +113BD;TULU-TIGALARI VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;; +113BE;TULU-TIGALARI VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;; +113BF;TULU-TIGALARI VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;; +113C0;TULU-TIGALARI VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;; +113C2;TULU-TIGALARI VOWEL SIGN EE;Mc;0;L;;;;;N;;;;; +113C5;TULU-TIGALARI VOWEL SIGN AI;Mc;0;L;113C2 113C2;;;;N;;;;; +113C7;TULU-TIGALARI VOWEL SIGN OO;Mc;0;L;113C2 113B8;;;;N;;;;; +113C8;TULU-TIGALARI VOWEL SIGN AU;Mc;0;L;113C2 113C9;;;;N;;;;; +113C9;TULU-TIGALARI AU LENGTH MARK;Mc;0;L;;;;;N;;;;; +113CA;TULU-TIGALARI SIGN CANDRA ANUNASIKA;Mc;0;L;;;;;N;;;;; +113CC;TULU-TIGALARI SIGN ANUSVARA;Mc;0;L;;;;;N;;;;; +113CD;TULU-TIGALARI SIGN VISARGA;Mc;0;L;;;;;N;;;;; +113CE;TULU-TIGALARI SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;; +113CF;TULU-TIGALARI SIGN LOOPED VIRAMA;Mc;9;L;;;;;N;;;;; +113D0;TULU-TIGALARI CONJOINER;Mn;9;NSM;;;;;N;;;;; +113D1;TULU-TIGALARI REPHA;Lo;0;L;;;;;N;;;;; +113D2;TULU-TIGALARI GEMINATION MARK;Mn;0;NSM;;;;;N;;;;; +113D3;TULU-TIGALARI SIGN PLUTA;Lo;0;L;;;;;N;;;;; +113D4;TULU-TIGALARI DANDA;Po;0;L;;;;;N;;;;; +113D5;TULU-TIGALARI DOUBLE DANDA;Po;0;L;;;;;N;;;;; +113D7;TULU-TIGALARI SIGN OM PUSHPIKA;Po;0;L;;;;;N;;;;; +113D8;TULU-TIGALARI SIGN SHRII PUSHPIKA;Po;0;L;;;;;N;;;;; +113E1;TULU-TIGALARI VEDIC TONE SVARITA;Mn;0;NSM;;;;;N;;;;; +113E2;TULU-TIGALARI VEDIC TONE ANUDATTA;Mn;0;NSM;;;;;N;;;;; 11400;NEWA LETTER A;Lo;0;L;;;;;N;;;;; 11401;NEWA LETTER AA;Lo;0;L;;;;;N;;;;; 11402;NEWA LETTER I;Lo;0;L;;;;;N;;;;; @@ -20695,6 +20917,26 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 116C7;TAKRI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; 116C8;TAKRI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; 116C9;TAKRI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +116D0;MYANMAR PAO DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +116D1;MYANMAR PAO DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +116D2;MYANMAR PAO DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +116D3;MYANMAR PAO DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +116D4;MYANMAR PAO DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +116D5;MYANMAR PAO DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +116D6;MYANMAR PAO DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +116D7;MYANMAR PAO DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +116D8;MYANMAR PAO DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +116D9;MYANMAR PAO DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +116DA;MYANMAR EASTERN PWO KAREN DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +116DB;MYANMAR EASTERN PWO KAREN DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +116DC;MYANMAR EASTERN PWO KAREN DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +116DD;MYANMAR EASTERN PWO KAREN DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +116DE;MYANMAR EASTERN PWO KAREN DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +116DF;MYANMAR EASTERN PWO KAREN DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +116E0;MYANMAR EASTERN PWO KAREN DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +116E1;MYANMAR EASTERN PWO KAREN DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +116E2;MYANMAR EASTERN PWO KAREN DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +116E3;MYANMAR EASTERN PWO KAREN DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; 11700;AHOM LETTER KA;Lo;0;L;;;;;N;;;;; 11701;AHOM LETTER KHA;Lo;0;L;;;;;N;;;;; 11702;AHOM LETTER NGA;Lo;0;L;;;;;N;;;;; @@ -20723,7 +20965,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 11719;AHOM LETTER JHA;Lo;0;L;;;;;N;;;;; 1171A;AHOM LETTER ALTERNATE BA;Lo;0;L;;;;;N;;;;; 1171D;AHOM CONSONANT SIGN MEDIAL LA;Mn;0;NSM;;;;;N;;;;; -1171E;AHOM CONSONANT SIGN MEDIAL RA;Mn;0;NSM;;;;;N;;;;; +1171E;AHOM CONSONANT SIGN MEDIAL RA;Mc;0;L;;;;;N;;;;; 1171F;AHOM CONSONANT SIGN MEDIAL LIGATING RA;Mn;0;NSM;;;;;N;;;;; 11720;AHOM VOWEL SIGN A;Mc;0;L;;;;;N;;;;; 11721;AHOM VOWEL SIGN AA;Mc;0;L;;;;;N;;;;; @@ -21279,6 +21521,50 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 11B07;DEVANAGARI SIGN WESTERN NINE-LIKE BHALE;Po;0;L;;;;;N;;;;; 11B08;DEVANAGARI SIGN REVERSED NINE-LIKE BHALE;Po;0;L;;;;;N;;;;; 11B09;DEVANAGARI SIGN MINDU;Po;0;L;;;;;N;;;;; +11BC0;SUNUWAR LETTER DEVI;Lo;0;L;;;;;N;;;;; +11BC1;SUNUWAR LETTER TASLA;Lo;0;L;;;;;N;;;;; +11BC2;SUNUWAR LETTER EKO;Lo;0;L;;;;;N;;;;; +11BC3;SUNUWAR LETTER IMAR;Lo;0;L;;;;;N;;;;; +11BC4;SUNUWAR LETTER REU;Lo;0;L;;;;;N;;;;; +11BC5;SUNUWAR LETTER UTTHI;Lo;0;L;;;;;N;;;;; +11BC6;SUNUWAR LETTER KIK;Lo;0;L;;;;;N;;;;; +11BC7;SUNUWAR LETTER MA;Lo;0;L;;;;;N;;;;; +11BC8;SUNUWAR LETTER APPHO;Lo;0;L;;;;;N;;;;; +11BC9;SUNUWAR LETTER PIP;Lo;0;L;;;;;N;;;;; +11BCA;SUNUWAR LETTER GIL;Lo;0;L;;;;;N;;;;; +11BCB;SUNUWAR LETTER HAMSO;Lo;0;L;;;;;N;;;;; +11BCC;SUNUWAR LETTER CARMI;Lo;0;L;;;;;N;;;;; +11BCD;SUNUWAR LETTER NAH;Lo;0;L;;;;;N;;;;; +11BCE;SUNUWAR LETTER BUR;Lo;0;L;;;;;N;;;;; +11BCF;SUNUWAR LETTER JYAH;Lo;0;L;;;;;N;;;;; +11BD0;SUNUWAR LETTER LOACHA;Lo;0;L;;;;;N;;;;; +11BD1;SUNUWAR LETTER OTTHI;Lo;0;L;;;;;N;;;;; +11BD2;SUNUWAR LETTER SHYELE;Lo;0;L;;;;;N;;;;; +11BD3;SUNUWAR LETTER VARCA;Lo;0;L;;;;;N;;;;; +11BD4;SUNUWAR LETTER YAT;Lo;0;L;;;;;N;;;;; +11BD5;SUNUWAR LETTER AVA;Lo;0;L;;;;;N;;;;; +11BD6;SUNUWAR LETTER AAL;Lo;0;L;;;;;N;;;;; +11BD7;SUNUWAR LETTER DONGA;Lo;0;L;;;;;N;;;;; +11BD8;SUNUWAR LETTER THARI;Lo;0;L;;;;;N;;;;; +11BD9;SUNUWAR LETTER PHAR;Lo;0;L;;;;;N;;;;; +11BDA;SUNUWAR LETTER NGAR;Lo;0;L;;;;;N;;;;; +11BDB;SUNUWAR LETTER KHA;Lo;0;L;;;;;N;;;;; +11BDC;SUNUWAR LETTER SHYER;Lo;0;L;;;;;N;;;;; +11BDD;SUNUWAR LETTER CHELAP;Lo;0;L;;;;;N;;;;; +11BDE;SUNUWAR LETTER TENTU;Lo;0;L;;;;;N;;;;; +11BDF;SUNUWAR LETTER THELE;Lo;0;L;;;;;N;;;;; +11BE0;SUNUWAR LETTER KLOKO;Lo;0;L;;;;;N;;;;; +11BE1;SUNUWAR SIGN PVO;Po;0;L;;;;;N;;;;; +11BF0;SUNUWAR DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +11BF1;SUNUWAR DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +11BF2;SUNUWAR DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +11BF3;SUNUWAR DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +11BF4;SUNUWAR DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +11BF5;SUNUWAR DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +11BF6;SUNUWAR DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +11BF7;SUNUWAR DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +11BF8;SUNUWAR DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +11BF9;SUNUWAR DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; 11C00;BHAIKSUKI LETTER A;Lo;0;L;;;;;N;;;;; 11C01;BHAIKSUKI LETTER AA;Lo;0;L;;;;;N;;;;; 11C02;BHAIKSUKI LETTER I;Lo;0;L;;;;;N;;;;; @@ -21693,6 +21979,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 11F57;KAWI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; 11F58;KAWI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; 11F59;KAWI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +11F5A;KAWI SIGN NUKTA;Mn;0;NSM;;;;;N;;;;; 11FB0;LISU LETTER YHA;Lo;0;L;;;;;N;;;;; 11FC0;TAMIL FRACTION ONE THREE-HUNDRED-AND-TWENTIETH;No;0;L;;;;1/320;N;;;;; 11FC1;TAMIL FRACTION ONE ONE-HUNDRED-AND-SIXTIETH;No;0;L;;;;1/160;N;;;;; @@ -24188,6 +24475,4001 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 13453;EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT TOP AND END;Mn;0;NSM;;;;;N;;;;; 13454;EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT BOTTOM AND END;Mn;0;NSM;;;;;N;;;;; 13455;EGYPTIAN HIEROGLYPH MODIFIER DAMAGED;Mn;0;NSM;;;;;N;;;;; +13460;EGYPTIAN HIEROGLYPH-13460;Lo;0;L;;;;;N;;;;; +13461;EGYPTIAN HIEROGLYPH-13461;Lo;0;L;;;;;N;;;;; +13462;EGYPTIAN HIEROGLYPH-13462;Lo;0;L;;;;;N;;;;; +13463;EGYPTIAN HIEROGLYPH-13463;Lo;0;L;;;;;N;;;;; +13464;EGYPTIAN HIEROGLYPH-13464;Lo;0;L;;;;;N;;;;; +13465;EGYPTIAN HIEROGLYPH-13465;Lo;0;L;;;;;N;;;;; +13466;EGYPTIAN HIEROGLYPH-13466;Lo;0;L;;;;;N;;;;; +13467;EGYPTIAN HIEROGLYPH-13467;Lo;0;L;;;;;N;;;;; +13468;EGYPTIAN HIEROGLYPH-13468;Lo;0;L;;;;;N;;;;; +13469;EGYPTIAN HIEROGLYPH-13469;Lo;0;L;;;;;N;;;;; +1346A;EGYPTIAN HIEROGLYPH-1346A;Lo;0;L;;;;;N;;;;; +1346B;EGYPTIAN HIEROGLYPH-1346B;Lo;0;L;;;;;N;;;;; +1346C;EGYPTIAN HIEROGLYPH-1346C;Lo;0;L;;;;;N;;;;; +1346D;EGYPTIAN HIEROGLYPH-1346D;Lo;0;L;;;;;N;;;;; +1346E;EGYPTIAN HIEROGLYPH-1346E;Lo;0;L;;;;;N;;;;; +1346F;EGYPTIAN HIEROGLYPH-1346F;Lo;0;L;;;;;N;;;;; +13470;EGYPTIAN HIEROGLYPH-13470;Lo;0;L;;;;;N;;;;; +13471;EGYPTIAN HIEROGLYPH-13471;Lo;0;L;;;;;N;;;;; +13472;EGYPTIAN HIEROGLYPH-13472;Lo;0;L;;;;;N;;;;; +13473;EGYPTIAN HIEROGLYPH-13473;Lo;0;L;;;;;N;;;;; +13474;EGYPTIAN HIEROGLYPH-13474;Lo;0;L;;;;;N;;;;; +13475;EGYPTIAN HIEROGLYPH-13475;Lo;0;L;;;;;N;;;;; +13476;EGYPTIAN HIEROGLYPH-13476;Lo;0;L;;;;;N;;;;; +13477;EGYPTIAN HIEROGLYPH-13477;Lo;0;L;;;;;N;;;;; +13478;EGYPTIAN HIEROGLYPH-13478;Lo;0;L;;;;;N;;;;; +13479;EGYPTIAN HIEROGLYPH-13479;Lo;0;L;;;;;N;;;;; +1347A;EGYPTIAN HIEROGLYPH-1347A;Lo;0;L;;;;;N;;;;; +1347B;EGYPTIAN HIEROGLYPH-1347B;Lo;0;L;;;;;N;;;;; +1347C;EGYPTIAN HIEROGLYPH-1347C;Lo;0;L;;;;;N;;;;; +1347D;EGYPTIAN HIEROGLYPH-1347D;Lo;0;L;;;;;N;;;;; +1347E;EGYPTIAN HIEROGLYPH-1347E;Lo;0;L;;;;;N;;;;; +1347F;EGYPTIAN HIEROGLYPH-1347F;Lo;0;L;;;;;N;;;;; +13480;EGYPTIAN HIEROGLYPH-13480;Lo;0;L;;;;;N;;;;; +13481;EGYPTIAN HIEROGLYPH-13481;Lo;0;L;;;;;N;;;;; +13482;EGYPTIAN HIEROGLYPH-13482;Lo;0;L;;;;;N;;;;; +13483;EGYPTIAN HIEROGLYPH-13483;Lo;0;L;;;;;N;;;;; +13484;EGYPTIAN HIEROGLYPH-13484;Lo;0;L;;;;;N;;;;; +13485;EGYPTIAN HIEROGLYPH-13485;Lo;0;L;;;;;N;;;;; +13486;EGYPTIAN HIEROGLYPH-13486;Lo;0;L;;;;;N;;;;; +13487;EGYPTIAN HIEROGLYPH-13487;Lo;0;L;;;;;N;;;;; +13488;EGYPTIAN HIEROGLYPH-13488;Lo;0;L;;;;;N;;;;; +13489;EGYPTIAN HIEROGLYPH-13489;Lo;0;L;;;;;N;;;;; +1348A;EGYPTIAN HIEROGLYPH-1348A;Lo;0;L;;;;;N;;;;; +1348B;EGYPTIAN HIEROGLYPH-1348B;Lo;0;L;;;;;N;;;;; +1348C;EGYPTIAN HIEROGLYPH-1348C;Lo;0;L;;;;;N;;;;; +1348D;EGYPTIAN HIEROGLYPH-1348D;Lo;0;L;;;;;N;;;;; +1348E;EGYPTIAN HIEROGLYPH-1348E;Lo;0;L;;;;;N;;;;; +1348F;EGYPTIAN HIEROGLYPH-1348F;Lo;0;L;;;;;N;;;;; +13490;EGYPTIAN HIEROGLYPH-13490;Lo;0;L;;;;;N;;;;; +13491;EGYPTIAN HIEROGLYPH-13491;Lo;0;L;;;;;N;;;;; +13492;EGYPTIAN HIEROGLYPH-13492;Lo;0;L;;;;;N;;;;; +13493;EGYPTIAN HIEROGLYPH-13493;Lo;0;L;;;;;N;;;;; +13494;EGYPTIAN HIEROGLYPH-13494;Lo;0;L;;;;;N;;;;; +13495;EGYPTIAN HIEROGLYPH-13495;Lo;0;L;;;;;N;;;;; +13496;EGYPTIAN HIEROGLYPH-13496;Lo;0;L;;;;;N;;;;; +13497;EGYPTIAN HIEROGLYPH-13497;Lo;0;L;;;;;N;;;;; +13498;EGYPTIAN HIEROGLYPH-13498;Lo;0;L;;;;;N;;;;; +13499;EGYPTIAN HIEROGLYPH-13499;Lo;0;L;;;;;N;;;;; +1349A;EGYPTIAN HIEROGLYPH-1349A;Lo;0;L;;;;;N;;;;; +1349B;EGYPTIAN HIEROGLYPH-1349B;Lo;0;L;;;;;N;;;;; +1349C;EGYPTIAN HIEROGLYPH-1349C;Lo;0;L;;;;;N;;;;; +1349D;EGYPTIAN HIEROGLYPH-1349D;Lo;0;L;;;;;N;;;;; +1349E;EGYPTIAN HIEROGLYPH-1349E;Lo;0;L;;;;;N;;;;; +1349F;EGYPTIAN HIEROGLYPH-1349F;Lo;0;L;;;;;N;;;;; +134A0;EGYPTIAN HIEROGLYPH-134A0;Lo;0;L;;;;;N;;;;; +134A1;EGYPTIAN HIEROGLYPH-134A1;Lo;0;L;;;;;N;;;;; +134A2;EGYPTIAN HIEROGLYPH-134A2;Lo;0;L;;;;;N;;;;; +134A3;EGYPTIAN HIEROGLYPH-134A3;Lo;0;L;;;;;N;;;;; +134A4;EGYPTIAN HIEROGLYPH-134A4;Lo;0;L;;;;;N;;;;; +134A5;EGYPTIAN HIEROGLYPH-134A5;Lo;0;L;;;;;N;;;;; +134A6;EGYPTIAN HIEROGLYPH-134A6;Lo;0;L;;;;;N;;;;; +134A7;EGYPTIAN HIEROGLYPH-134A7;Lo;0;L;;;;;N;;;;; +134A8;EGYPTIAN HIEROGLYPH-134A8;Lo;0;L;;;;;N;;;;; +134A9;EGYPTIAN HIEROGLYPH-134A9;Lo;0;L;;;;;N;;;;; +134AA;EGYPTIAN HIEROGLYPH-134AA;Lo;0;L;;;;;N;;;;; +134AB;EGYPTIAN HIEROGLYPH-134AB;Lo;0;L;;;;;N;;;;; +134AC;EGYPTIAN HIEROGLYPH-134AC;Lo;0;L;;;;;N;;;;; +134AD;EGYPTIAN HIEROGLYPH-134AD;Lo;0;L;;;;;N;;;;; +134AE;EGYPTIAN HIEROGLYPH-134AE;Lo;0;L;;;;;N;;;;; +134AF;EGYPTIAN HIEROGLYPH-134AF;Lo;0;L;;;;;N;;;;; +134B0;EGYPTIAN HIEROGLYPH-134B0;Lo;0;L;;;;;N;;;;; +134B1;EGYPTIAN HIEROGLYPH-134B1;Lo;0;L;;;;;N;;;;; +134B2;EGYPTIAN HIEROGLYPH-134B2;Lo;0;L;;;;;N;;;;; +134B3;EGYPTIAN HIEROGLYPH-134B3;Lo;0;L;;;;;N;;;;; +134B4;EGYPTIAN HIEROGLYPH-134B4;Lo;0;L;;;;;N;;;;; +134B5;EGYPTIAN HIEROGLYPH-134B5;Lo;0;L;;;;;N;;;;; +134B6;EGYPTIAN HIEROGLYPH-134B6;Lo;0;L;;;;;N;;;;; +134B7;EGYPTIAN HIEROGLYPH-134B7;Lo;0;L;;;;;N;;;;; +134B8;EGYPTIAN HIEROGLYPH-134B8;Lo;0;L;;;;;N;;;;; +134B9;EGYPTIAN HIEROGLYPH-134B9;Lo;0;L;;;;;N;;;;; +134BA;EGYPTIAN HIEROGLYPH-134BA;Lo;0;L;;;;;N;;;;; +134BB;EGYPTIAN HIEROGLYPH-134BB;Lo;0;L;;;;;N;;;;; +134BC;EGYPTIAN HIEROGLYPH-134BC;Lo;0;L;;;;;N;;;;; +134BD;EGYPTIAN HIEROGLYPH-134BD;Lo;0;L;;;;;N;;;;; +134BE;EGYPTIAN HIEROGLYPH-134BE;Lo;0;L;;;;;N;;;;; +134BF;EGYPTIAN HIEROGLYPH-134BF;Lo;0;L;;;;;N;;;;; +134C0;EGYPTIAN HIEROGLYPH-134C0;Lo;0;L;;;;;N;;;;; +134C1;EGYPTIAN HIEROGLYPH-134C1;Lo;0;L;;;;;N;;;;; +134C2;EGYPTIAN HIEROGLYPH-134C2;Lo;0;L;;;;;N;;;;; +134C3;EGYPTIAN HIEROGLYPH-134C3;Lo;0;L;;;;;N;;;;; +134C4;EGYPTIAN HIEROGLYPH-134C4;Lo;0;L;;;;;N;;;;; +134C5;EGYPTIAN HIEROGLYPH-134C5;Lo;0;L;;;;;N;;;;; +134C6;EGYPTIAN HIEROGLYPH-134C6;Lo;0;L;;;;;N;;;;; +134C7;EGYPTIAN HIEROGLYPH-134C7;Lo;0;L;;;;;N;;;;; +134C8;EGYPTIAN HIEROGLYPH-134C8;Lo;0;L;;;;;N;;;;; +134C9;EGYPTIAN HIEROGLYPH-134C9;Lo;0;L;;;;;N;;;;; +134CA;EGYPTIAN HIEROGLYPH-134CA;Lo;0;L;;;;;N;;;;; +134CB;EGYPTIAN HIEROGLYPH-134CB;Lo;0;L;;;;;N;;;;; +134CC;EGYPTIAN HIEROGLYPH-134CC;Lo;0;L;;;;;N;;;;; +134CD;EGYPTIAN HIEROGLYPH-134CD;Lo;0;L;;;;;N;;;;; +134CE;EGYPTIAN HIEROGLYPH-134CE;Lo;0;L;;;;;N;;;;; +134CF;EGYPTIAN HIEROGLYPH-134CF;Lo;0;L;;;;;N;;;;; +134D0;EGYPTIAN HIEROGLYPH-134D0;Lo;0;L;;;;;N;;;;; +134D1;EGYPTIAN HIEROGLYPH-134D1;Lo;0;L;;;;;N;;;;; +134D2;EGYPTIAN HIEROGLYPH-134D2;Lo;0;L;;;;;N;;;;; +134D3;EGYPTIAN HIEROGLYPH-134D3;Lo;0;L;;;;;N;;;;; +134D4;EGYPTIAN HIEROGLYPH-134D4;Lo;0;L;;;;;N;;;;; +134D5;EGYPTIAN HIEROGLYPH-134D5;Lo;0;L;;;;;N;;;;; +134D6;EGYPTIAN HIEROGLYPH-134D6;Lo;0;L;;;;;N;;;;; +134D7;EGYPTIAN HIEROGLYPH-134D7;Lo;0;L;;;;;N;;;;; +134D8;EGYPTIAN HIEROGLYPH-134D8;Lo;0;L;;;;;N;;;;; +134D9;EGYPTIAN HIEROGLYPH-134D9;Lo;0;L;;;;;N;;;;; +134DA;EGYPTIAN HIEROGLYPH-134DA;Lo;0;L;;;;;N;;;;; +134DB;EGYPTIAN HIEROGLYPH-134DB;Lo;0;L;;;;;N;;;;; +134DC;EGYPTIAN HIEROGLYPH-134DC;Lo;0;L;;;;;N;;;;; +134DD;EGYPTIAN HIEROGLYPH-134DD;Lo;0;L;;;;;N;;;;; +134DE;EGYPTIAN HIEROGLYPH-134DE;Lo;0;L;;;;;N;;;;; +134DF;EGYPTIAN HIEROGLYPH-134DF;Lo;0;L;;;;;N;;;;; +134E0;EGYPTIAN HIEROGLYPH-134E0;Lo;0;L;;;;;N;;;;; +134E1;EGYPTIAN HIEROGLYPH-134E1;Lo;0;L;;;;;N;;;;; +134E2;EGYPTIAN HIEROGLYPH-134E2;Lo;0;L;;;;;N;;;;; +134E3;EGYPTIAN HIEROGLYPH-134E3;Lo;0;L;;;;;N;;;;; +134E4;EGYPTIAN HIEROGLYPH-134E4;Lo;0;L;;;;;N;;;;; +134E5;EGYPTIAN HIEROGLYPH-134E5;Lo;0;L;;;;;N;;;;; +134E6;EGYPTIAN HIEROGLYPH-134E6;Lo;0;L;;;;;N;;;;; +134E7;EGYPTIAN HIEROGLYPH-134E7;Lo;0;L;;;;;N;;;;; +134E8;EGYPTIAN HIEROGLYPH-134E8;Lo;0;L;;;;;N;;;;; +134E9;EGYPTIAN HIEROGLYPH-134E9;Lo;0;L;;;;;N;;;;; +134EA;EGYPTIAN HIEROGLYPH-134EA;Lo;0;L;;;;;N;;;;; +134EB;EGYPTIAN HIEROGLYPH-134EB;Lo;0;L;;;;;N;;;;; +134EC;EGYPTIAN HIEROGLYPH-134EC;Lo;0;L;;;;;N;;;;; +134ED;EGYPTIAN HIEROGLYPH-134ED;Lo;0;L;;;;;N;;;;; +134EE;EGYPTIAN HIEROGLYPH-134EE;Lo;0;L;;;;;N;;;;; +134EF;EGYPTIAN HIEROGLYPH-134EF;Lo;0;L;;;;;N;;;;; +134F0;EGYPTIAN HIEROGLYPH-134F0;Lo;0;L;;;;;N;;;;; +134F1;EGYPTIAN HIEROGLYPH-134F1;Lo;0;L;;;;;N;;;;; +134F2;EGYPTIAN HIEROGLYPH-134F2;Lo;0;L;;;;;N;;;;; +134F3;EGYPTIAN HIEROGLYPH-134F3;Lo;0;L;;;;;N;;;;; +134F4;EGYPTIAN HIEROGLYPH-134F4;Lo;0;L;;;;;N;;;;; +134F5;EGYPTIAN HIEROGLYPH-134F5;Lo;0;L;;;;;N;;;;; +134F6;EGYPTIAN HIEROGLYPH-134F6;Lo;0;L;;;;;N;;;;; +134F7;EGYPTIAN HIEROGLYPH-134F7;Lo;0;L;;;;;N;;;;; +134F8;EGYPTIAN HIEROGLYPH-134F8;Lo;0;L;;;;;N;;;;; +134F9;EGYPTIAN HIEROGLYPH-134F9;Lo;0;L;;;;;N;;;;; +134FA;EGYPTIAN HIEROGLYPH-134FA;Lo;0;L;;;;;N;;;;; +134FB;EGYPTIAN HIEROGLYPH-134FB;Lo;0;L;;;;;N;;;;; +134FC;EGYPTIAN HIEROGLYPH-134FC;Lo;0;L;;;;;N;;;;; +134FD;EGYPTIAN HIEROGLYPH-134FD;Lo;0;L;;;;;N;;;;; +134FE;EGYPTIAN HIEROGLYPH-134FE;Lo;0;L;;;;;N;;;;; +134FF;EGYPTIAN HIEROGLYPH-134FF;Lo;0;L;;;;;N;;;;; +13500;EGYPTIAN HIEROGLYPH-13500;Lo;0;L;;;;;N;;;;; +13501;EGYPTIAN HIEROGLYPH-13501;Lo;0;L;;;;;N;;;;; +13502;EGYPTIAN HIEROGLYPH-13502;Lo;0;L;;;;;N;;;;; +13503;EGYPTIAN HIEROGLYPH-13503;Lo;0;L;;;;;N;;;;; +13504;EGYPTIAN HIEROGLYPH-13504;Lo;0;L;;;;;N;;;;; +13505;EGYPTIAN HIEROGLYPH-13505;Lo;0;L;;;;;N;;;;; +13506;EGYPTIAN HIEROGLYPH-13506;Lo;0;L;;;;;N;;;;; +13507;EGYPTIAN HIEROGLYPH-13507;Lo;0;L;;;;;N;;;;; +13508;EGYPTIAN HIEROGLYPH-13508;Lo;0;L;;;;;N;;;;; +13509;EGYPTIAN HIEROGLYPH-13509;Lo;0;L;;;;;N;;;;; +1350A;EGYPTIAN HIEROGLYPH-1350A;Lo;0;L;;;;;N;;;;; +1350B;EGYPTIAN HIEROGLYPH-1350B;Lo;0;L;;;;;N;;;;; +1350C;EGYPTIAN HIEROGLYPH-1350C;Lo;0;L;;;;;N;;;;; +1350D;EGYPTIAN HIEROGLYPH-1350D;Lo;0;L;;;;;N;;;;; +1350E;EGYPTIAN HIEROGLYPH-1350E;Lo;0;L;;;;;N;;;;; +1350F;EGYPTIAN HIEROGLYPH-1350F;Lo;0;L;;;;;N;;;;; +13510;EGYPTIAN HIEROGLYPH-13510;Lo;0;L;;;;;N;;;;; +13511;EGYPTIAN HIEROGLYPH-13511;Lo;0;L;;;;;N;;;;; +13512;EGYPTIAN HIEROGLYPH-13512;Lo;0;L;;;;;N;;;;; +13513;EGYPTIAN HIEROGLYPH-13513;Lo;0;L;;;;;N;;;;; +13514;EGYPTIAN HIEROGLYPH-13514;Lo;0;L;;;;;N;;;;; +13515;EGYPTIAN HIEROGLYPH-13515;Lo;0;L;;;;;N;;;;; +13516;EGYPTIAN HIEROGLYPH-13516;Lo;0;L;;;;;N;;;;; +13517;EGYPTIAN HIEROGLYPH-13517;Lo;0;L;;;;;N;;;;; +13518;EGYPTIAN HIEROGLYPH-13518;Lo;0;L;;;;;N;;;;; +13519;EGYPTIAN HIEROGLYPH-13519;Lo;0;L;;;;;N;;;;; +1351A;EGYPTIAN HIEROGLYPH-1351A;Lo;0;L;;;;;N;;;;; +1351B;EGYPTIAN HIEROGLYPH-1351B;Lo;0;L;;;;;N;;;;; +1351C;EGYPTIAN HIEROGLYPH-1351C;Lo;0;L;;;;;N;;;;; +1351D;EGYPTIAN HIEROGLYPH-1351D;Lo;0;L;;;;;N;;;;; +1351E;EGYPTIAN HIEROGLYPH-1351E;Lo;0;L;;;;;N;;;;; +1351F;EGYPTIAN HIEROGLYPH-1351F;Lo;0;L;;;;;N;;;;; +13520;EGYPTIAN HIEROGLYPH-13520;Lo;0;L;;;;;N;;;;; +13521;EGYPTIAN HIEROGLYPH-13521;Lo;0;L;;;;;N;;;;; +13522;EGYPTIAN HIEROGLYPH-13522;Lo;0;L;;;;;N;;;;; +13523;EGYPTIAN HIEROGLYPH-13523;Lo;0;L;;;;;N;;;;; +13524;EGYPTIAN HIEROGLYPH-13524;Lo;0;L;;;;;N;;;;; +13525;EGYPTIAN HIEROGLYPH-13525;Lo;0;L;;;;;N;;;;; +13526;EGYPTIAN HIEROGLYPH-13526;Lo;0;L;;;;;N;;;;; +13527;EGYPTIAN HIEROGLYPH-13527;Lo;0;L;;;;;N;;;;; +13528;EGYPTIAN HIEROGLYPH-13528;Lo;0;L;;;;;N;;;;; +13529;EGYPTIAN HIEROGLYPH-13529;Lo;0;L;;;;;N;;;;; +1352A;EGYPTIAN HIEROGLYPH-1352A;Lo;0;L;;;;;N;;;;; +1352B;EGYPTIAN HIEROGLYPH-1352B;Lo;0;L;;;;;N;;;;; +1352C;EGYPTIAN HIEROGLYPH-1352C;Lo;0;L;;;;;N;;;;; +1352D;EGYPTIAN HIEROGLYPH-1352D;Lo;0;L;;;;;N;;;;; +1352E;EGYPTIAN HIEROGLYPH-1352E;Lo;0;L;;;;;N;;;;; +1352F;EGYPTIAN HIEROGLYPH-1352F;Lo;0;L;;;;;N;;;;; +13530;EGYPTIAN HIEROGLYPH-13530;Lo;0;L;;;;;N;;;;; +13531;EGYPTIAN HIEROGLYPH-13531;Lo;0;L;;;;;N;;;;; +13532;EGYPTIAN HIEROGLYPH-13532;Lo;0;L;;;;;N;;;;; +13533;EGYPTIAN HIEROGLYPH-13533;Lo;0;L;;;;;N;;;;; +13534;EGYPTIAN HIEROGLYPH-13534;Lo;0;L;;;;;N;;;;; +13535;EGYPTIAN HIEROGLYPH-13535;Lo;0;L;;;;;N;;;;; +13536;EGYPTIAN HIEROGLYPH-13536;Lo;0;L;;;;;N;;;;; +13537;EGYPTIAN HIEROGLYPH-13537;Lo;0;L;;;;;N;;;;; +13538;EGYPTIAN HIEROGLYPH-13538;Lo;0;L;;;;;N;;;;; +13539;EGYPTIAN HIEROGLYPH-13539;Lo;0;L;;;;;N;;;;; +1353A;EGYPTIAN HIEROGLYPH-1353A;Lo;0;L;;;;;N;;;;; +1353B;EGYPTIAN HIEROGLYPH-1353B;Lo;0;L;;;;;N;;;;; +1353C;EGYPTIAN HIEROGLYPH-1353C;Lo;0;L;;;;;N;;;;; +1353D;EGYPTIAN HIEROGLYPH-1353D;Lo;0;L;;;;;N;;;;; +1353E;EGYPTIAN HIEROGLYPH-1353E;Lo;0;L;;;;;N;;;;; +1353F;EGYPTIAN HIEROGLYPH-1353F;Lo;0;L;;;;;N;;;;; +13540;EGYPTIAN HIEROGLYPH-13540;Lo;0;L;;;;;N;;;;; +13541;EGYPTIAN HIEROGLYPH-13541;Lo;0;L;;;;;N;;;;; +13542;EGYPTIAN HIEROGLYPH-13542;Lo;0;L;;;;;N;;;;; +13543;EGYPTIAN HIEROGLYPH-13543;Lo;0;L;;;;;N;;;;; +13544;EGYPTIAN HIEROGLYPH-13544;Lo;0;L;;;;;N;;;;; +13545;EGYPTIAN HIEROGLYPH-13545;Lo;0;L;;;;;N;;;;; +13546;EGYPTIAN HIEROGLYPH-13546;Lo;0;L;;;;;N;;;;; +13547;EGYPTIAN HIEROGLYPH-13547;Lo;0;L;;;;;N;;;;; +13548;EGYPTIAN HIEROGLYPH-13548;Lo;0;L;;;;;N;;;;; +13549;EGYPTIAN HIEROGLYPH-13549;Lo;0;L;;;;;N;;;;; +1354A;EGYPTIAN HIEROGLYPH-1354A;Lo;0;L;;;;;N;;;;; +1354B;EGYPTIAN HIEROGLYPH-1354B;Lo;0;L;;;;;N;;;;; +1354C;EGYPTIAN HIEROGLYPH-1354C;Lo;0;L;;;;;N;;;;; +1354D;EGYPTIAN HIEROGLYPH-1354D;Lo;0;L;;;;;N;;;;; +1354E;EGYPTIAN HIEROGLYPH-1354E;Lo;0;L;;;;;N;;;;; +1354F;EGYPTIAN HIEROGLYPH-1354F;Lo;0;L;;;;;N;;;;; +13550;EGYPTIAN HIEROGLYPH-13550;Lo;0;L;;;;;N;;;;; +13551;EGYPTIAN HIEROGLYPH-13551;Lo;0;L;;;;;N;;;;; +13552;EGYPTIAN HIEROGLYPH-13552;Lo;0;L;;;;;N;;;;; +13553;EGYPTIAN HIEROGLYPH-13553;Lo;0;L;;;;;N;;;;; +13554;EGYPTIAN HIEROGLYPH-13554;Lo;0;L;;;;;N;;;;; +13555;EGYPTIAN HIEROGLYPH-13555;Lo;0;L;;;;;N;;;;; +13556;EGYPTIAN HIEROGLYPH-13556;Lo;0;L;;;;;N;;;;; +13557;EGYPTIAN HIEROGLYPH-13557;Lo;0;L;;;;;N;;;;; +13558;EGYPTIAN HIEROGLYPH-13558;Lo;0;L;;;;;N;;;;; +13559;EGYPTIAN HIEROGLYPH-13559;Lo;0;L;;;;;N;;;;; +1355A;EGYPTIAN HIEROGLYPH-1355A;Lo;0;L;;;;;N;;;;; +1355B;EGYPTIAN HIEROGLYPH-1355B;Lo;0;L;;;;;N;;;;; +1355C;EGYPTIAN HIEROGLYPH-1355C;Lo;0;L;;;;;N;;;;; +1355D;EGYPTIAN HIEROGLYPH-1355D;Lo;0;L;;;;;N;;;;; +1355E;EGYPTIAN HIEROGLYPH-1355E;Lo;0;L;;;;;N;;;;; +1355F;EGYPTIAN HIEROGLYPH-1355F;Lo;0;L;;;;;N;;;;; +13560;EGYPTIAN HIEROGLYPH-13560;Lo;0;L;;;;;N;;;;; +13561;EGYPTIAN HIEROGLYPH-13561;Lo;0;L;;;;;N;;;;; +13562;EGYPTIAN HIEROGLYPH-13562;Lo;0;L;;;;;N;;;;; +13563;EGYPTIAN HIEROGLYPH-13563;Lo;0;L;;;;;N;;;;; +13564;EGYPTIAN HIEROGLYPH-13564;Lo;0;L;;;;;N;;;;; +13565;EGYPTIAN HIEROGLYPH-13565;Lo;0;L;;;;;N;;;;; +13566;EGYPTIAN HIEROGLYPH-13566;Lo;0;L;;;;;N;;;;; +13567;EGYPTIAN HIEROGLYPH-13567;Lo;0;L;;;;;N;;;;; +13568;EGYPTIAN HIEROGLYPH-13568;Lo;0;L;;;;;N;;;;; +13569;EGYPTIAN HIEROGLYPH-13569;Lo;0;L;;;;;N;;;;; +1356A;EGYPTIAN HIEROGLYPH-1356A;Lo;0;L;;;;;N;;;;; +1356B;EGYPTIAN HIEROGLYPH-1356B;Lo;0;L;;;;;N;;;;; +1356C;EGYPTIAN HIEROGLYPH-1356C;Lo;0;L;;;;;N;;;;; +1356D;EGYPTIAN HIEROGLYPH-1356D;Lo;0;L;;;;;N;;;;; +1356E;EGYPTIAN HIEROGLYPH-1356E;Lo;0;L;;;;;N;;;;; +1356F;EGYPTIAN HIEROGLYPH-1356F;Lo;0;L;;;;;N;;;;; +13570;EGYPTIAN HIEROGLYPH-13570;Lo;0;L;;;;;N;;;;; +13571;EGYPTIAN HIEROGLYPH-13571;Lo;0;L;;;;;N;;;;; +13572;EGYPTIAN HIEROGLYPH-13572;Lo;0;L;;;;;N;;;;; +13573;EGYPTIAN HIEROGLYPH-13573;Lo;0;L;;;;;N;;;;; +13574;EGYPTIAN HIEROGLYPH-13574;Lo;0;L;;;;;N;;;;; +13575;EGYPTIAN HIEROGLYPH-13575;Lo;0;L;;;;;N;;;;; +13576;EGYPTIAN HIEROGLYPH-13576;Lo;0;L;;;;;N;;;;; +13577;EGYPTIAN HIEROGLYPH-13577;Lo;0;L;;;;;N;;;;; +13578;EGYPTIAN HIEROGLYPH-13578;Lo;0;L;;;;;N;;;;; +13579;EGYPTIAN HIEROGLYPH-13579;Lo;0;L;;;;;N;;;;; +1357A;EGYPTIAN HIEROGLYPH-1357A;Lo;0;L;;;;;N;;;;; +1357B;EGYPTIAN HIEROGLYPH-1357B;Lo;0;L;;;;;N;;;;; +1357C;EGYPTIAN HIEROGLYPH-1357C;Lo;0;L;;;;;N;;;;; +1357D;EGYPTIAN HIEROGLYPH-1357D;Lo;0;L;;;;;N;;;;; +1357E;EGYPTIAN HIEROGLYPH-1357E;Lo;0;L;;;;;N;;;;; +1357F;EGYPTIAN HIEROGLYPH-1357F;Lo;0;L;;;;;N;;;;; +13580;EGYPTIAN HIEROGLYPH-13580;Lo;0;L;;;;;N;;;;; +13581;EGYPTIAN HIEROGLYPH-13581;Lo;0;L;;;;;N;;;;; +13582;EGYPTIAN HIEROGLYPH-13582;Lo;0;L;;;;;N;;;;; +13583;EGYPTIAN HIEROGLYPH-13583;Lo;0;L;;;;;N;;;;; +13584;EGYPTIAN HIEROGLYPH-13584;Lo;0;L;;;;;N;;;;; +13585;EGYPTIAN HIEROGLYPH-13585;Lo;0;L;;;;;N;;;;; +13586;EGYPTIAN HIEROGLYPH-13586;Lo;0;L;;;;;N;;;;; +13587;EGYPTIAN HIEROGLYPH-13587;Lo;0;L;;;;;N;;;;; +13588;EGYPTIAN HIEROGLYPH-13588;Lo;0;L;;;;;N;;;;; +13589;EGYPTIAN HIEROGLYPH-13589;Lo;0;L;;;;;N;;;;; +1358A;EGYPTIAN HIEROGLYPH-1358A;Lo;0;L;;;;;N;;;;; +1358B;EGYPTIAN HIEROGLYPH-1358B;Lo;0;L;;;;;N;;;;; +1358C;EGYPTIAN HIEROGLYPH-1358C;Lo;0;L;;;;;N;;;;; +1358D;EGYPTIAN HIEROGLYPH-1358D;Lo;0;L;;;;;N;;;;; +1358E;EGYPTIAN HIEROGLYPH-1358E;Lo;0;L;;;;;N;;;;; +1358F;EGYPTIAN HIEROGLYPH-1358F;Lo;0;L;;;;;N;;;;; +13590;EGYPTIAN HIEROGLYPH-13590;Lo;0;L;;;;;N;;;;; +13591;EGYPTIAN HIEROGLYPH-13591;Lo;0;L;;;;;N;;;;; +13592;EGYPTIAN HIEROGLYPH-13592;Lo;0;L;;;;;N;;;;; +13593;EGYPTIAN HIEROGLYPH-13593;Lo;0;L;;;;;N;;;;; +13594;EGYPTIAN HIEROGLYPH-13594;Lo;0;L;;;;;N;;;;; +13595;EGYPTIAN HIEROGLYPH-13595;Lo;0;L;;;;;N;;;;; +13596;EGYPTIAN HIEROGLYPH-13596;Lo;0;L;;;;;N;;;;; +13597;EGYPTIAN HIEROGLYPH-13597;Lo;0;L;;;;;N;;;;; +13598;EGYPTIAN HIEROGLYPH-13598;Lo;0;L;;;;;N;;;;; +13599;EGYPTIAN HIEROGLYPH-13599;Lo;0;L;;;;;N;;;;; +1359A;EGYPTIAN HIEROGLYPH-1359A;Lo;0;L;;;;;N;;;;; +1359B;EGYPTIAN HIEROGLYPH-1359B;Lo;0;L;;;;;N;;;;; +1359C;EGYPTIAN HIEROGLYPH-1359C;Lo;0;L;;;;;N;;;;; +1359D;EGYPTIAN HIEROGLYPH-1359D;Lo;0;L;;;;;N;;;;; +1359E;EGYPTIAN HIEROGLYPH-1359E;Lo;0;L;;;;;N;;;;; +1359F;EGYPTIAN HIEROGLYPH-1359F;Lo;0;L;;;;;N;;;;; +135A0;EGYPTIAN HIEROGLYPH-135A0;Lo;0;L;;;;;N;;;;; +135A1;EGYPTIAN HIEROGLYPH-135A1;Lo;0;L;;;;;N;;;;; +135A2;EGYPTIAN HIEROGLYPH-135A2;Lo;0;L;;;;;N;;;;; +135A3;EGYPTIAN HIEROGLYPH-135A3;Lo;0;L;;;;;N;;;;; +135A4;EGYPTIAN HIEROGLYPH-135A4;Lo;0;L;;;;;N;;;;; +135A5;EGYPTIAN HIEROGLYPH-135A5;Lo;0;L;;;;;N;;;;; +135A6;EGYPTIAN HIEROGLYPH-135A6;Lo;0;L;;;;;N;;;;; +135A7;EGYPTIAN HIEROGLYPH-135A7;Lo;0;L;;;;;N;;;;; +135A8;EGYPTIAN HIEROGLYPH-135A8;Lo;0;L;;;;;N;;;;; +135A9;EGYPTIAN HIEROGLYPH-135A9;Lo;0;L;;;;;N;;;;; +135AA;EGYPTIAN HIEROGLYPH-135AA;Lo;0;L;;;;;N;;;;; +135AB;EGYPTIAN HIEROGLYPH-135AB;Lo;0;L;;;;;N;;;;; +135AC;EGYPTIAN HIEROGLYPH-135AC;Lo;0;L;;;;;N;;;;; +135AD;EGYPTIAN HIEROGLYPH-135AD;Lo;0;L;;;;;N;;;;; +135AE;EGYPTIAN HIEROGLYPH-135AE;Lo;0;L;;;;;N;;;;; +135AF;EGYPTIAN HIEROGLYPH-135AF;Lo;0;L;;;;;N;;;;; +135B0;EGYPTIAN HIEROGLYPH-135B0;Lo;0;L;;;;;N;;;;; +135B1;EGYPTIAN HIEROGLYPH-135B1;Lo;0;L;;;;;N;;;;; +135B2;EGYPTIAN HIEROGLYPH-135B2;Lo;0;L;;;;;N;;;;; +135B3;EGYPTIAN HIEROGLYPH-135B3;Lo;0;L;;;;;N;;;;; +135B4;EGYPTIAN HIEROGLYPH-135B4;Lo;0;L;;;;;N;;;;; +135B5;EGYPTIAN HIEROGLYPH-135B5;Lo;0;L;;;;;N;;;;; +135B6;EGYPTIAN HIEROGLYPH-135B6;Lo;0;L;;;;;N;;;;; +135B7;EGYPTIAN HIEROGLYPH-135B7;Lo;0;L;;;;;N;;;;; +135B8;EGYPTIAN HIEROGLYPH-135B8;Lo;0;L;;;;;N;;;;; +135B9;EGYPTIAN HIEROGLYPH-135B9;Lo;0;L;;;;;N;;;;; +135BA;EGYPTIAN HIEROGLYPH-135BA;Lo;0;L;;;;;N;;;;; +135BB;EGYPTIAN HIEROGLYPH-135BB;Lo;0;L;;;;;N;;;;; +135BC;EGYPTIAN HIEROGLYPH-135BC;Lo;0;L;;;;;N;;;;; +135BD;EGYPTIAN HIEROGLYPH-135BD;Lo;0;L;;;;;N;;;;; +135BE;EGYPTIAN HIEROGLYPH-135BE;Lo;0;L;;;;;N;;;;; +135BF;EGYPTIAN HIEROGLYPH-135BF;Lo;0;L;;;;;N;;;;; +135C0;EGYPTIAN HIEROGLYPH-135C0;Lo;0;L;;;;;N;;;;; +135C1;EGYPTIAN HIEROGLYPH-135C1;Lo;0;L;;;;;N;;;;; +135C2;EGYPTIAN HIEROGLYPH-135C2;Lo;0;L;;;;;N;;;;; +135C3;EGYPTIAN HIEROGLYPH-135C3;Lo;0;L;;;;;N;;;;; +135C4;EGYPTIAN HIEROGLYPH-135C4;Lo;0;L;;;;;N;;;;; +135C5;EGYPTIAN HIEROGLYPH-135C5;Lo;0;L;;;;;N;;;;; +135C6;EGYPTIAN HIEROGLYPH-135C6;Lo;0;L;;;;;N;;;;; +135C7;EGYPTIAN HIEROGLYPH-135C7;Lo;0;L;;;;;N;;;;; +135C8;EGYPTIAN HIEROGLYPH-135C8;Lo;0;L;;;;;N;;;;; +135C9;EGYPTIAN HIEROGLYPH-135C9;Lo;0;L;;;;;N;;;;; +135CA;EGYPTIAN HIEROGLYPH-135CA;Lo;0;L;;;;;N;;;;; +135CB;EGYPTIAN HIEROGLYPH-135CB;Lo;0;L;;;;;N;;;;; +135CC;EGYPTIAN HIEROGLYPH-135CC;Lo;0;L;;;;;N;;;;; +135CD;EGYPTIAN HIEROGLYPH-135CD;Lo;0;L;;;;;N;;;;; +135CE;EGYPTIAN HIEROGLYPH-135CE;Lo;0;L;;;;;N;;;;; +135CF;EGYPTIAN HIEROGLYPH-135CF;Lo;0;L;;;;;N;;;;; +135D0;EGYPTIAN HIEROGLYPH-135D0;Lo;0;L;;;;;N;;;;; +135D1;EGYPTIAN HIEROGLYPH-135D1;Lo;0;L;;;;;N;;;;; +135D2;EGYPTIAN HIEROGLYPH-135D2;Lo;0;L;;;;;N;;;;; +135D3;EGYPTIAN HIEROGLYPH-135D3;Lo;0;L;;;;;N;;;;; +135D4;EGYPTIAN HIEROGLYPH-135D4;Lo;0;L;;;;;N;;;;; +135D5;EGYPTIAN HIEROGLYPH-135D5;Lo;0;L;;;;;N;;;;; +135D6;EGYPTIAN HIEROGLYPH-135D6;Lo;0;L;;;;;N;;;;; +135D7;EGYPTIAN HIEROGLYPH-135D7;Lo;0;L;;;;;N;;;;; +135D8;EGYPTIAN HIEROGLYPH-135D8;Lo;0;L;;;;;N;;;;; +135D9;EGYPTIAN HIEROGLYPH-135D9;Lo;0;L;;;;;N;;;;; +135DA;EGYPTIAN HIEROGLYPH-135DA;Lo;0;L;;;;;N;;;;; +135DB;EGYPTIAN HIEROGLYPH-135DB;Lo;0;L;;;;;N;;;;; +135DC;EGYPTIAN HIEROGLYPH-135DC;Lo;0;L;;;;;N;;;;; +135DD;EGYPTIAN HIEROGLYPH-135DD;Lo;0;L;;;;;N;;;;; +135DE;EGYPTIAN HIEROGLYPH-135DE;Lo;0;L;;;;;N;;;;; +135DF;EGYPTIAN HIEROGLYPH-135DF;Lo;0;L;;;;;N;;;;; +135E0;EGYPTIAN HIEROGLYPH-135E0;Lo;0;L;;;;;N;;;;; +135E1;EGYPTIAN HIEROGLYPH-135E1;Lo;0;L;;;;;N;;;;; +135E2;EGYPTIAN HIEROGLYPH-135E2;Lo;0;L;;;;;N;;;;; +135E3;EGYPTIAN HIEROGLYPH-135E3;Lo;0;L;;;;;N;;;;; +135E4;EGYPTIAN HIEROGLYPH-135E4;Lo;0;L;;;;;N;;;;; +135E5;EGYPTIAN HIEROGLYPH-135E5;Lo;0;L;;;;;N;;;;; +135E6;EGYPTIAN HIEROGLYPH-135E6;Lo;0;L;;;;;N;;;;; +135E7;EGYPTIAN HIEROGLYPH-135E7;Lo;0;L;;;;;N;;;;; +135E8;EGYPTIAN HIEROGLYPH-135E8;Lo;0;L;;;;;N;;;;; +135E9;EGYPTIAN HIEROGLYPH-135E9;Lo;0;L;;;;;N;;;;; +135EA;EGYPTIAN HIEROGLYPH-135EA;Lo;0;L;;;;;N;;;;; +135EB;EGYPTIAN HIEROGLYPH-135EB;Lo;0;L;;;;;N;;;;; +135EC;EGYPTIAN HIEROGLYPH-135EC;Lo;0;L;;;;;N;;;;; +135ED;EGYPTIAN HIEROGLYPH-135ED;Lo;0;L;;;;;N;;;;; +135EE;EGYPTIAN HIEROGLYPH-135EE;Lo;0;L;;;;;N;;;;; +135EF;EGYPTIAN HIEROGLYPH-135EF;Lo;0;L;;;;;N;;;;; +135F0;EGYPTIAN HIEROGLYPH-135F0;Lo;0;L;;;;;N;;;;; +135F1;EGYPTIAN HIEROGLYPH-135F1;Lo;0;L;;;;;N;;;;; +135F2;EGYPTIAN HIEROGLYPH-135F2;Lo;0;L;;;;;N;;;;; +135F3;EGYPTIAN HIEROGLYPH-135F3;Lo;0;L;;;;;N;;;;; +135F4;EGYPTIAN HIEROGLYPH-135F4;Lo;0;L;;;;;N;;;;; +135F5;EGYPTIAN HIEROGLYPH-135F5;Lo;0;L;;;;;N;;;;; +135F6;EGYPTIAN HIEROGLYPH-135F6;Lo;0;L;;;;;N;;;;; +135F7;EGYPTIAN HIEROGLYPH-135F7;Lo;0;L;;;;;N;;;;; +135F8;EGYPTIAN HIEROGLYPH-135F8;Lo;0;L;;;;;N;;;;; +135F9;EGYPTIAN HIEROGLYPH-135F9;Lo;0;L;;;;;N;;;;; +135FA;EGYPTIAN HIEROGLYPH-135FA;Lo;0;L;;;;;N;;;;; +135FB;EGYPTIAN HIEROGLYPH-135FB;Lo;0;L;;;;;N;;;;; +135FC;EGYPTIAN HIEROGLYPH-135FC;Lo;0;L;;;;;N;;;;; +135FD;EGYPTIAN HIEROGLYPH-135FD;Lo;0;L;;;;;N;;;;; +135FE;EGYPTIAN HIEROGLYPH-135FE;Lo;0;L;;;;;N;;;;; +135FF;EGYPTIAN HIEROGLYPH-135FF;Lo;0;L;;;;;N;;;;; +13600;EGYPTIAN HIEROGLYPH-13600;Lo;0;L;;;;;N;;;;; +13601;EGYPTIAN HIEROGLYPH-13601;Lo;0;L;;;;;N;;;;; +13602;EGYPTIAN HIEROGLYPH-13602;Lo;0;L;;;;;N;;;;; +13603;EGYPTIAN HIEROGLYPH-13603;Lo;0;L;;;;;N;;;;; +13604;EGYPTIAN HIEROGLYPH-13604;Lo;0;L;;;;;N;;;;; +13605;EGYPTIAN HIEROGLYPH-13605;Lo;0;L;;;;;N;;;;; +13606;EGYPTIAN HIEROGLYPH-13606;Lo;0;L;;;;;N;;;;; +13607;EGYPTIAN HIEROGLYPH-13607;Lo;0;L;;;;;N;;;;; +13608;EGYPTIAN HIEROGLYPH-13608;Lo;0;L;;;;;N;;;;; +13609;EGYPTIAN HIEROGLYPH-13609;Lo;0;L;;;;;N;;;;; +1360A;EGYPTIAN HIEROGLYPH-1360A;Lo;0;L;;;;;N;;;;; +1360B;EGYPTIAN HIEROGLYPH-1360B;Lo;0;L;;;;;N;;;;; +1360C;EGYPTIAN HIEROGLYPH-1360C;Lo;0;L;;;;;N;;;;; +1360D;EGYPTIAN HIEROGLYPH-1360D;Lo;0;L;;;;;N;;;;; +1360E;EGYPTIAN HIEROGLYPH-1360E;Lo;0;L;;;;;N;;;;; +1360F;EGYPTIAN HIEROGLYPH-1360F;Lo;0;L;;;;;N;;;;; +13610;EGYPTIAN HIEROGLYPH-13610;Lo;0;L;;;;;N;;;;; +13611;EGYPTIAN HIEROGLYPH-13611;Lo;0;L;;;;;N;;;;; +13612;EGYPTIAN HIEROGLYPH-13612;Lo;0;L;;;;;N;;;;; +13613;EGYPTIAN HIEROGLYPH-13613;Lo;0;L;;;;;N;;;;; +13614;EGYPTIAN HIEROGLYPH-13614;Lo;0;L;;;;;N;;;;; +13615;EGYPTIAN HIEROGLYPH-13615;Lo;0;L;;;;;N;;;;; +13616;EGYPTIAN HIEROGLYPH-13616;Lo;0;L;;;;;N;;;;; +13617;EGYPTIAN HIEROGLYPH-13617;Lo;0;L;;;;;N;;;;; +13618;EGYPTIAN HIEROGLYPH-13618;Lo;0;L;;;;;N;;;;; +13619;EGYPTIAN HIEROGLYPH-13619;Lo;0;L;;;;;N;;;;; +1361A;EGYPTIAN HIEROGLYPH-1361A;Lo;0;L;;;;;N;;;;; +1361B;EGYPTIAN HIEROGLYPH-1361B;Lo;0;L;;;;;N;;;;; +1361C;EGYPTIAN HIEROGLYPH-1361C;Lo;0;L;;;;;N;;;;; +1361D;EGYPTIAN HIEROGLYPH-1361D;Lo;0;L;;;;;N;;;;; +1361E;EGYPTIAN HIEROGLYPH-1361E;Lo;0;L;;;;;N;;;;; +1361F;EGYPTIAN HIEROGLYPH-1361F;Lo;0;L;;;;;N;;;;; +13620;EGYPTIAN HIEROGLYPH-13620;Lo;0;L;;;;;N;;;;; +13621;EGYPTIAN HIEROGLYPH-13621;Lo;0;L;;;;;N;;;;; +13622;EGYPTIAN HIEROGLYPH-13622;Lo;0;L;;;;;N;;;;; +13623;EGYPTIAN HIEROGLYPH-13623;Lo;0;L;;;;;N;;;;; +13624;EGYPTIAN HIEROGLYPH-13624;Lo;0;L;;;;;N;;;;; +13625;EGYPTIAN HIEROGLYPH-13625;Lo;0;L;;;;;N;;;;; +13626;EGYPTIAN HIEROGLYPH-13626;Lo;0;L;;;;;N;;;;; +13627;EGYPTIAN HIEROGLYPH-13627;Lo;0;L;;;;;N;;;;; +13628;EGYPTIAN HIEROGLYPH-13628;Lo;0;L;;;;;N;;;;; +13629;EGYPTIAN HIEROGLYPH-13629;Lo;0;L;;;;;N;;;;; +1362A;EGYPTIAN HIEROGLYPH-1362A;Lo;0;L;;;;;N;;;;; +1362B;EGYPTIAN HIEROGLYPH-1362B;Lo;0;L;;;;;N;;;;; +1362C;EGYPTIAN HIEROGLYPH-1362C;Lo;0;L;;;;;N;;;;; +1362D;EGYPTIAN HIEROGLYPH-1362D;Lo;0;L;;;;;N;;;;; +1362E;EGYPTIAN HIEROGLYPH-1362E;Lo;0;L;;;;;N;;;;; +1362F;EGYPTIAN HIEROGLYPH-1362F;Lo;0;L;;;;;N;;;;; +13630;EGYPTIAN HIEROGLYPH-13630;Lo;0;L;;;;;N;;;;; +13631;EGYPTIAN HIEROGLYPH-13631;Lo;0;L;;;;;N;;;;; +13632;EGYPTIAN HIEROGLYPH-13632;Lo;0;L;;;;;N;;;;; +13633;EGYPTIAN HIEROGLYPH-13633;Lo;0;L;;;;;N;;;;; +13634;EGYPTIAN HIEROGLYPH-13634;Lo;0;L;;;;;N;;;;; +13635;EGYPTIAN HIEROGLYPH-13635;Lo;0;L;;;;;N;;;;; +13636;EGYPTIAN HIEROGLYPH-13636;Lo;0;L;;;;;N;;;;; +13637;EGYPTIAN HIEROGLYPH-13637;Lo;0;L;;;;;N;;;;; +13638;EGYPTIAN HIEROGLYPH-13638;Lo;0;L;;;;;N;;;;; +13639;EGYPTIAN HIEROGLYPH-13639;Lo;0;L;;;;;N;;;;; +1363A;EGYPTIAN HIEROGLYPH-1363A;Lo;0;L;;;;;N;;;;; +1363B;EGYPTIAN HIEROGLYPH-1363B;Lo;0;L;;;;;N;;;;; +1363C;EGYPTIAN HIEROGLYPH-1363C;Lo;0;L;;;;;N;;;;; +1363D;EGYPTIAN HIEROGLYPH-1363D;Lo;0;L;;;;;N;;;;; +1363E;EGYPTIAN HIEROGLYPH-1363E;Lo;0;L;;;;;N;;;;; +1363F;EGYPTIAN HIEROGLYPH-1363F;Lo;0;L;;;;;N;;;;; +13640;EGYPTIAN HIEROGLYPH-13640;Lo;0;L;;;;;N;;;;; +13641;EGYPTIAN HIEROGLYPH-13641;Lo;0;L;;;;;N;;;;; +13642;EGYPTIAN HIEROGLYPH-13642;Lo;0;L;;;;;N;;;;; +13643;EGYPTIAN HIEROGLYPH-13643;Lo;0;L;;;;;N;;;;; +13644;EGYPTIAN HIEROGLYPH-13644;Lo;0;L;;;;;N;;;;; +13645;EGYPTIAN HIEROGLYPH-13645;Lo;0;L;;;;;N;;;;; +13646;EGYPTIAN HIEROGLYPH-13646;Lo;0;L;;;;;N;;;;; +13647;EGYPTIAN HIEROGLYPH-13647;Lo;0;L;;;;;N;;;;; +13648;EGYPTIAN HIEROGLYPH-13648;Lo;0;L;;;;;N;;;;; +13649;EGYPTIAN HIEROGLYPH-13649;Lo;0;L;;;;;N;;;;; +1364A;EGYPTIAN HIEROGLYPH-1364A;Lo;0;L;;;;;N;;;;; +1364B;EGYPTIAN HIEROGLYPH-1364B;Lo;0;L;;;;;N;;;;; +1364C;EGYPTIAN HIEROGLYPH-1364C;Lo;0;L;;;;;N;;;;; +1364D;EGYPTIAN HIEROGLYPH-1364D;Lo;0;L;;;;;N;;;;; +1364E;EGYPTIAN HIEROGLYPH-1364E;Lo;0;L;;;;;N;;;;; +1364F;EGYPTIAN HIEROGLYPH-1364F;Lo;0;L;;;;;N;;;;; +13650;EGYPTIAN HIEROGLYPH-13650;Lo;0;L;;;;;N;;;;; +13651;EGYPTIAN HIEROGLYPH-13651;Lo;0;L;;;;;N;;;;; +13652;EGYPTIAN HIEROGLYPH-13652;Lo;0;L;;;;;N;;;;; +13653;EGYPTIAN HIEROGLYPH-13653;Lo;0;L;;;;;N;;;;; +13654;EGYPTIAN HIEROGLYPH-13654;Lo;0;L;;;;;N;;;;; +13655;EGYPTIAN HIEROGLYPH-13655;Lo;0;L;;;;;N;;;;; +13656;EGYPTIAN HIEROGLYPH-13656;Lo;0;L;;;;;N;;;;; +13657;EGYPTIAN HIEROGLYPH-13657;Lo;0;L;;;;;N;;;;; +13658;EGYPTIAN HIEROGLYPH-13658;Lo;0;L;;;;;N;;;;; +13659;EGYPTIAN HIEROGLYPH-13659;Lo;0;L;;;;;N;;;;; +1365A;EGYPTIAN HIEROGLYPH-1365A;Lo;0;L;;;;;N;;;;; +1365B;EGYPTIAN HIEROGLYPH-1365B;Lo;0;L;;;;;N;;;;; +1365C;EGYPTIAN HIEROGLYPH-1365C;Lo;0;L;;;;;N;;;;; +1365D;EGYPTIAN HIEROGLYPH-1365D;Lo;0;L;;;;;N;;;;; +1365E;EGYPTIAN HIEROGLYPH-1365E;Lo;0;L;;;;;N;;;;; +1365F;EGYPTIAN HIEROGLYPH-1365F;Lo;0;L;;;;;N;;;;; +13660;EGYPTIAN HIEROGLYPH-13660;Lo;0;L;;;;;N;;;;; +13661;EGYPTIAN HIEROGLYPH-13661;Lo;0;L;;;;;N;;;;; +13662;EGYPTIAN HIEROGLYPH-13662;Lo;0;L;;;;;N;;;;; +13663;EGYPTIAN HIEROGLYPH-13663;Lo;0;L;;;;;N;;;;; +13664;EGYPTIAN HIEROGLYPH-13664;Lo;0;L;;;;;N;;;;; +13665;EGYPTIAN HIEROGLYPH-13665;Lo;0;L;;;;;N;;;;; +13666;EGYPTIAN HIEROGLYPH-13666;Lo;0;L;;;;;N;;;;; +13667;EGYPTIAN HIEROGLYPH-13667;Lo;0;L;;;;;N;;;;; +13668;EGYPTIAN HIEROGLYPH-13668;Lo;0;L;;;;;N;;;;; +13669;EGYPTIAN HIEROGLYPH-13669;Lo;0;L;;;;;N;;;;; +1366A;EGYPTIAN HIEROGLYPH-1366A;Lo;0;L;;;;;N;;;;; +1366B;EGYPTIAN HIEROGLYPH-1366B;Lo;0;L;;;;;N;;;;; +1366C;EGYPTIAN HIEROGLYPH-1366C;Lo;0;L;;;;;N;;;;; +1366D;EGYPTIAN HIEROGLYPH-1366D;Lo;0;L;;;;;N;;;;; +1366E;EGYPTIAN HIEROGLYPH-1366E;Lo;0;L;;;;;N;;;;; +1366F;EGYPTIAN HIEROGLYPH-1366F;Lo;0;L;;;;;N;;;;; +13670;EGYPTIAN HIEROGLYPH-13670;Lo;0;L;;;;;N;;;;; +13671;EGYPTIAN HIEROGLYPH-13671;Lo;0;L;;;;;N;;;;; +13672;EGYPTIAN HIEROGLYPH-13672;Lo;0;L;;;;;N;;;;; +13673;EGYPTIAN HIEROGLYPH-13673;Lo;0;L;;;;;N;;;;; +13674;EGYPTIAN HIEROGLYPH-13674;Lo;0;L;;;;;N;;;;; +13675;EGYPTIAN HIEROGLYPH-13675;Lo;0;L;;;;;N;;;;; +13676;EGYPTIAN HIEROGLYPH-13676;Lo;0;L;;;;;N;;;;; +13677;EGYPTIAN HIEROGLYPH-13677;Lo;0;L;;;;;N;;;;; +13678;EGYPTIAN HIEROGLYPH-13678;Lo;0;L;;;;;N;;;;; +13679;EGYPTIAN HIEROGLYPH-13679;Lo;0;L;;;;;N;;;;; +1367A;EGYPTIAN HIEROGLYPH-1367A;Lo;0;L;;;;;N;;;;; +1367B;EGYPTIAN HIEROGLYPH-1367B;Lo;0;L;;;;;N;;;;; +1367C;EGYPTIAN HIEROGLYPH-1367C;Lo;0;L;;;;;N;;;;; +1367D;EGYPTIAN HIEROGLYPH-1367D;Lo;0;L;;;;;N;;;;; +1367E;EGYPTIAN HIEROGLYPH-1367E;Lo;0;L;;;;;N;;;;; +1367F;EGYPTIAN HIEROGLYPH-1367F;Lo;0;L;;;;;N;;;;; +13680;EGYPTIAN HIEROGLYPH-13680;Lo;0;L;;;;;N;;;;; +13681;EGYPTIAN HIEROGLYPH-13681;Lo;0;L;;;;;N;;;;; +13682;EGYPTIAN HIEROGLYPH-13682;Lo;0;L;;;;;N;;;;; +13683;EGYPTIAN HIEROGLYPH-13683;Lo;0;L;;;;;N;;;;; +13684;EGYPTIAN HIEROGLYPH-13684;Lo;0;L;;;;;N;;;;; +13685;EGYPTIAN HIEROGLYPH-13685;Lo;0;L;;;;;N;;;;; +13686;EGYPTIAN HIEROGLYPH-13686;Lo;0;L;;;;;N;;;;; +13687;EGYPTIAN HIEROGLYPH-13687;Lo;0;L;;;;;N;;;;; +13688;EGYPTIAN HIEROGLYPH-13688;Lo;0;L;;;;;N;;;;; +13689;EGYPTIAN HIEROGLYPH-13689;Lo;0;L;;;;;N;;;;; +1368A;EGYPTIAN HIEROGLYPH-1368A;Lo;0;L;;;;;N;;;;; +1368B;EGYPTIAN HIEROGLYPH-1368B;Lo;0;L;;;;;N;;;;; +1368C;EGYPTIAN HIEROGLYPH-1368C;Lo;0;L;;;;;N;;;;; +1368D;EGYPTIAN HIEROGLYPH-1368D;Lo;0;L;;;;;N;;;;; +1368E;EGYPTIAN HIEROGLYPH-1368E;Lo;0;L;;;;;N;;;;; +1368F;EGYPTIAN HIEROGLYPH-1368F;Lo;0;L;;;;;N;;;;; +13690;EGYPTIAN HIEROGLYPH-13690;Lo;0;L;;;;;N;;;;; +13691;EGYPTIAN HIEROGLYPH-13691;Lo;0;L;;;;;N;;;;; +13692;EGYPTIAN HIEROGLYPH-13692;Lo;0;L;;;;;N;;;;; +13693;EGYPTIAN HIEROGLYPH-13693;Lo;0;L;;;;;N;;;;; +13694;EGYPTIAN HIEROGLYPH-13694;Lo;0;L;;;;;N;;;;; +13695;EGYPTIAN HIEROGLYPH-13695;Lo;0;L;;;;;N;;;;; +13696;EGYPTIAN HIEROGLYPH-13696;Lo;0;L;;;;;N;;;;; +13697;EGYPTIAN HIEROGLYPH-13697;Lo;0;L;;;;;N;;;;; +13698;EGYPTIAN HIEROGLYPH-13698;Lo;0;L;;;;;N;;;;; +13699;EGYPTIAN HIEROGLYPH-13699;Lo;0;L;;;;;N;;;;; +1369A;EGYPTIAN HIEROGLYPH-1369A;Lo;0;L;;;;;N;;;;; +1369B;EGYPTIAN HIEROGLYPH-1369B;Lo;0;L;;;;;N;;;;; +1369C;EGYPTIAN HIEROGLYPH-1369C;Lo;0;L;;;;;N;;;;; +1369D;EGYPTIAN HIEROGLYPH-1369D;Lo;0;L;;;;;N;;;;; +1369E;EGYPTIAN HIEROGLYPH-1369E;Lo;0;L;;;;;N;;;;; +1369F;EGYPTIAN HIEROGLYPH-1369F;Lo;0;L;;;;;N;;;;; +136A0;EGYPTIAN HIEROGLYPH-136A0;Lo;0;L;;;;;N;;;;; +136A1;EGYPTIAN HIEROGLYPH-136A1;Lo;0;L;;;;;N;;;;; +136A2;EGYPTIAN HIEROGLYPH-136A2;Lo;0;L;;;;;N;;;;; +136A3;EGYPTIAN HIEROGLYPH-136A3;Lo;0;L;;;;;N;;;;; +136A4;EGYPTIAN HIEROGLYPH-136A4;Lo;0;L;;;;;N;;;;; +136A5;EGYPTIAN HIEROGLYPH-136A5;Lo;0;L;;;;;N;;;;; +136A6;EGYPTIAN HIEROGLYPH-136A6;Lo;0;L;;;;;N;;;;; +136A7;EGYPTIAN HIEROGLYPH-136A7;Lo;0;L;;;;;N;;;;; +136A8;EGYPTIAN HIEROGLYPH-136A8;Lo;0;L;;;;;N;;;;; +136A9;EGYPTIAN HIEROGLYPH-136A9;Lo;0;L;;;;;N;;;;; +136AA;EGYPTIAN HIEROGLYPH-136AA;Lo;0;L;;;;;N;;;;; +136AB;EGYPTIAN HIEROGLYPH-136AB;Lo;0;L;;;;;N;;;;; +136AC;EGYPTIAN HIEROGLYPH-136AC;Lo;0;L;;;;;N;;;;; +136AD;EGYPTIAN HIEROGLYPH-136AD;Lo;0;L;;;;;N;;;;; +136AE;EGYPTIAN HIEROGLYPH-136AE;Lo;0;L;;;;;N;;;;; +136AF;EGYPTIAN HIEROGLYPH-136AF;Lo;0;L;;;;;N;;;;; +136B0;EGYPTIAN HIEROGLYPH-136B0;Lo;0;L;;;;;N;;;;; +136B1;EGYPTIAN HIEROGLYPH-136B1;Lo;0;L;;;;;N;;;;; +136B2;EGYPTIAN HIEROGLYPH-136B2;Lo;0;L;;;;;N;;;;; +136B3;EGYPTIAN HIEROGLYPH-136B3;Lo;0;L;;;;;N;;;;; +136B4;EGYPTIAN HIEROGLYPH-136B4;Lo;0;L;;;;;N;;;;; +136B5;EGYPTIAN HIEROGLYPH-136B5;Lo;0;L;;;;;N;;;;; +136B6;EGYPTIAN HIEROGLYPH-136B6;Lo;0;L;;;;;N;;;;; +136B7;EGYPTIAN HIEROGLYPH-136B7;Lo;0;L;;;;;N;;;;; +136B8;EGYPTIAN HIEROGLYPH-136B8;Lo;0;L;;;;;N;;;;; +136B9;EGYPTIAN HIEROGLYPH-136B9;Lo;0;L;;;;;N;;;;; +136BA;EGYPTIAN HIEROGLYPH-136BA;Lo;0;L;;;;;N;;;;; +136BB;EGYPTIAN HIEROGLYPH-136BB;Lo;0;L;;;;;N;;;;; +136BC;EGYPTIAN HIEROGLYPH-136BC;Lo;0;L;;;;;N;;;;; +136BD;EGYPTIAN HIEROGLYPH-136BD;Lo;0;L;;;;;N;;;;; +136BE;EGYPTIAN HIEROGLYPH-136BE;Lo;0;L;;;;;N;;;;; +136BF;EGYPTIAN HIEROGLYPH-136BF;Lo;0;L;;;;;N;;;;; +136C0;EGYPTIAN HIEROGLYPH-136C0;Lo;0;L;;;;;N;;;;; +136C1;EGYPTIAN HIEROGLYPH-136C1;Lo;0;L;;;;;N;;;;; +136C2;EGYPTIAN HIEROGLYPH-136C2;Lo;0;L;;;;;N;;;;; +136C3;EGYPTIAN HIEROGLYPH-136C3;Lo;0;L;;;;;N;;;;; +136C4;EGYPTIAN HIEROGLYPH-136C4;Lo;0;L;;;;;N;;;;; +136C5;EGYPTIAN HIEROGLYPH-136C5;Lo;0;L;;;;;N;;;;; +136C6;EGYPTIAN HIEROGLYPH-136C6;Lo;0;L;;;;;N;;;;; +136C7;EGYPTIAN HIEROGLYPH-136C7;Lo;0;L;;;;;N;;;;; +136C8;EGYPTIAN HIEROGLYPH-136C8;Lo;0;L;;;;;N;;;;; +136C9;EGYPTIAN HIEROGLYPH-136C9;Lo;0;L;;;;;N;;;;; +136CA;EGYPTIAN HIEROGLYPH-136CA;Lo;0;L;;;;;N;;;;; +136CB;EGYPTIAN HIEROGLYPH-136CB;Lo;0;L;;;;;N;;;;; +136CC;EGYPTIAN HIEROGLYPH-136CC;Lo;0;L;;;;;N;;;;; +136CD;EGYPTIAN HIEROGLYPH-136CD;Lo;0;L;;;;;N;;;;; +136CE;EGYPTIAN HIEROGLYPH-136CE;Lo;0;L;;;;;N;;;;; +136CF;EGYPTIAN HIEROGLYPH-136CF;Lo;0;L;;;;;N;;;;; +136D0;EGYPTIAN HIEROGLYPH-136D0;Lo;0;L;;;;;N;;;;; +136D1;EGYPTIAN HIEROGLYPH-136D1;Lo;0;L;;;;;N;;;;; +136D2;EGYPTIAN HIEROGLYPH-136D2;Lo;0;L;;;;;N;;;;; +136D3;EGYPTIAN HIEROGLYPH-136D3;Lo;0;L;;;;;N;;;;; +136D4;EGYPTIAN HIEROGLYPH-136D4;Lo;0;L;;;;;N;;;;; +136D5;EGYPTIAN HIEROGLYPH-136D5;Lo;0;L;;;;;N;;;;; +136D6;EGYPTIAN HIEROGLYPH-136D6;Lo;0;L;;;;;N;;;;; +136D7;EGYPTIAN HIEROGLYPH-136D7;Lo;0;L;;;;;N;;;;; +136D8;EGYPTIAN HIEROGLYPH-136D8;Lo;0;L;;;;;N;;;;; +136D9;EGYPTIAN HIEROGLYPH-136D9;Lo;0;L;;;;;N;;;;; +136DA;EGYPTIAN HIEROGLYPH-136DA;Lo;0;L;;;;;N;;;;; +136DB;EGYPTIAN HIEROGLYPH-136DB;Lo;0;L;;;;;N;;;;; +136DC;EGYPTIAN HIEROGLYPH-136DC;Lo;0;L;;;;;N;;;;; +136DD;EGYPTIAN HIEROGLYPH-136DD;Lo;0;L;;;;;N;;;;; +136DE;EGYPTIAN HIEROGLYPH-136DE;Lo;0;L;;;;;N;;;;; +136DF;EGYPTIAN HIEROGLYPH-136DF;Lo;0;L;;;;;N;;;;; +136E0;EGYPTIAN HIEROGLYPH-136E0;Lo;0;L;;;;;N;;;;; +136E1;EGYPTIAN HIEROGLYPH-136E1;Lo;0;L;;;;;N;;;;; +136E2;EGYPTIAN HIEROGLYPH-136E2;Lo;0;L;;;;;N;;;;; +136E3;EGYPTIAN HIEROGLYPH-136E3;Lo;0;L;;;;;N;;;;; +136E4;EGYPTIAN HIEROGLYPH-136E4;Lo;0;L;;;;;N;;;;; +136E5;EGYPTIAN HIEROGLYPH-136E5;Lo;0;L;;;;;N;;;;; +136E6;EGYPTIAN HIEROGLYPH-136E6;Lo;0;L;;;;;N;;;;; +136E7;EGYPTIAN HIEROGLYPH-136E7;Lo;0;L;;;;;N;;;;; +136E8;EGYPTIAN HIEROGLYPH-136E8;Lo;0;L;;;;;N;;;;; +136E9;EGYPTIAN HIEROGLYPH-136E9;Lo;0;L;;;;;N;;;;; +136EA;EGYPTIAN HIEROGLYPH-136EA;Lo;0;L;;;;;N;;;;; +136EB;EGYPTIAN HIEROGLYPH-136EB;Lo;0;L;;;;;N;;;;; +136EC;EGYPTIAN HIEROGLYPH-136EC;Lo;0;L;;;;;N;;;;; +136ED;EGYPTIAN HIEROGLYPH-136ED;Lo;0;L;;;;;N;;;;; +136EE;EGYPTIAN HIEROGLYPH-136EE;Lo;0;L;;;;;N;;;;; +136EF;EGYPTIAN HIEROGLYPH-136EF;Lo;0;L;;;;;N;;;;; +136F0;EGYPTIAN HIEROGLYPH-136F0;Lo;0;L;;;;;N;;;;; +136F1;EGYPTIAN HIEROGLYPH-136F1;Lo;0;L;;;;;N;;;;; +136F2;EGYPTIAN HIEROGLYPH-136F2;Lo;0;L;;;;;N;;;;; +136F3;EGYPTIAN HIEROGLYPH-136F3;Lo;0;L;;;;;N;;;;; +136F4;EGYPTIAN HIEROGLYPH-136F4;Lo;0;L;;;;;N;;;;; +136F5;EGYPTIAN HIEROGLYPH-136F5;Lo;0;L;;;;;N;;;;; +136F6;EGYPTIAN HIEROGLYPH-136F6;Lo;0;L;;;;;N;;;;; +136F7;EGYPTIAN HIEROGLYPH-136F7;Lo;0;L;;;;;N;;;;; +136F8;EGYPTIAN HIEROGLYPH-136F8;Lo;0;L;;;;;N;;;;; +136F9;EGYPTIAN HIEROGLYPH-136F9;Lo;0;L;;;;;N;;;;; +136FA;EGYPTIAN HIEROGLYPH-136FA;Lo;0;L;;;;;N;;;;; +136FB;EGYPTIAN HIEROGLYPH-136FB;Lo;0;L;;;;;N;;;;; +136FC;EGYPTIAN HIEROGLYPH-136FC;Lo;0;L;;;;;N;;;;; +136FD;EGYPTIAN HIEROGLYPH-136FD;Lo;0;L;;;;;N;;;;; +136FE;EGYPTIAN HIEROGLYPH-136FE;Lo;0;L;;;;;N;;;;; +136FF;EGYPTIAN HIEROGLYPH-136FF;Lo;0;L;;;;;N;;;;; +13700;EGYPTIAN HIEROGLYPH-13700;Lo;0;L;;;;;N;;;;; +13701;EGYPTIAN HIEROGLYPH-13701;Lo;0;L;;;;;N;;;;; +13702;EGYPTIAN HIEROGLYPH-13702;Lo;0;L;;;;;N;;;;; +13703;EGYPTIAN HIEROGLYPH-13703;Lo;0;L;;;;;N;;;;; +13704;EGYPTIAN HIEROGLYPH-13704;Lo;0;L;;;;;N;;;;; +13705;EGYPTIAN HIEROGLYPH-13705;Lo;0;L;;;;;N;;;;; +13706;EGYPTIAN HIEROGLYPH-13706;Lo;0;L;;;;;N;;;;; +13707;EGYPTIAN HIEROGLYPH-13707;Lo;0;L;;;;;N;;;;; +13708;EGYPTIAN HIEROGLYPH-13708;Lo;0;L;;;;;N;;;;; +13709;EGYPTIAN HIEROGLYPH-13709;Lo;0;L;;;;;N;;;;; +1370A;EGYPTIAN HIEROGLYPH-1370A;Lo;0;L;;;;;N;;;;; +1370B;EGYPTIAN HIEROGLYPH-1370B;Lo;0;L;;;;;N;;;;; +1370C;EGYPTIAN HIEROGLYPH-1370C;Lo;0;L;;;;;N;;;;; +1370D;EGYPTIAN HIEROGLYPH-1370D;Lo;0;L;;;;;N;;;;; +1370E;EGYPTIAN HIEROGLYPH-1370E;Lo;0;L;;;;;N;;;;; +1370F;EGYPTIAN HIEROGLYPH-1370F;Lo;0;L;;;;;N;;;;; +13710;EGYPTIAN HIEROGLYPH-13710;Lo;0;L;;;;;N;;;;; +13711;EGYPTIAN HIEROGLYPH-13711;Lo;0;L;;;;;N;;;;; +13712;EGYPTIAN HIEROGLYPH-13712;Lo;0;L;;;;;N;;;;; +13713;EGYPTIAN HIEROGLYPH-13713;Lo;0;L;;;;;N;;;;; +13714;EGYPTIAN HIEROGLYPH-13714;Lo;0;L;;;;;N;;;;; +13715;EGYPTIAN HIEROGLYPH-13715;Lo;0;L;;;;;N;;;;; +13716;EGYPTIAN HIEROGLYPH-13716;Lo;0;L;;;;;N;;;;; +13717;EGYPTIAN HIEROGLYPH-13717;Lo;0;L;;;;;N;;;;; +13718;EGYPTIAN HIEROGLYPH-13718;Lo;0;L;;;;;N;;;;; +13719;EGYPTIAN HIEROGLYPH-13719;Lo;0;L;;;;;N;;;;; +1371A;EGYPTIAN HIEROGLYPH-1371A;Lo;0;L;;;;;N;;;;; +1371B;EGYPTIAN HIEROGLYPH-1371B;Lo;0;L;;;;;N;;;;; +1371C;EGYPTIAN HIEROGLYPH-1371C;Lo;0;L;;;;;N;;;;; +1371D;EGYPTIAN HIEROGLYPH-1371D;Lo;0;L;;;;;N;;;;; +1371E;EGYPTIAN HIEROGLYPH-1371E;Lo;0;L;;;;;N;;;;; +1371F;EGYPTIAN HIEROGLYPH-1371F;Lo;0;L;;;;;N;;;;; +13720;EGYPTIAN HIEROGLYPH-13720;Lo;0;L;;;;;N;;;;; +13721;EGYPTIAN HIEROGLYPH-13721;Lo;0;L;;;;;N;;;;; +13722;EGYPTIAN HIEROGLYPH-13722;Lo;0;L;;;;;N;;;;; +13723;EGYPTIAN HIEROGLYPH-13723;Lo;0;L;;;;;N;;;;; +13724;EGYPTIAN HIEROGLYPH-13724;Lo;0;L;;;;;N;;;;; +13725;EGYPTIAN HIEROGLYPH-13725;Lo;0;L;;;;;N;;;;; +13726;EGYPTIAN HIEROGLYPH-13726;Lo;0;L;;;;;N;;;;; +13727;EGYPTIAN HIEROGLYPH-13727;Lo;0;L;;;;;N;;;;; +13728;EGYPTIAN HIEROGLYPH-13728;Lo;0;L;;;;;N;;;;; +13729;EGYPTIAN HIEROGLYPH-13729;Lo;0;L;;;;;N;;;;; +1372A;EGYPTIAN HIEROGLYPH-1372A;Lo;0;L;;;;;N;;;;; +1372B;EGYPTIAN HIEROGLYPH-1372B;Lo;0;L;;;;;N;;;;; +1372C;EGYPTIAN HIEROGLYPH-1372C;Lo;0;L;;;;;N;;;;; +1372D;EGYPTIAN HIEROGLYPH-1372D;Lo;0;L;;;;;N;;;;; +1372E;EGYPTIAN HIEROGLYPH-1372E;Lo;0;L;;;;;N;;;;; +1372F;EGYPTIAN HIEROGLYPH-1372F;Lo;0;L;;;;;N;;;;; +13730;EGYPTIAN HIEROGLYPH-13730;Lo;0;L;;;;;N;;;;; +13731;EGYPTIAN HIEROGLYPH-13731;Lo;0;L;;;;;N;;;;; +13732;EGYPTIAN HIEROGLYPH-13732;Lo;0;L;;;;;N;;;;; +13733;EGYPTIAN HIEROGLYPH-13733;Lo;0;L;;;;;N;;;;; +13734;EGYPTIAN HIEROGLYPH-13734;Lo;0;L;;;;;N;;;;; +13735;EGYPTIAN HIEROGLYPH-13735;Lo;0;L;;;;;N;;;;; +13736;EGYPTIAN HIEROGLYPH-13736;Lo;0;L;;;;;N;;;;; +13737;EGYPTIAN HIEROGLYPH-13737;Lo;0;L;;;;;N;;;;; +13738;EGYPTIAN HIEROGLYPH-13738;Lo;0;L;;;;;N;;;;; +13739;EGYPTIAN HIEROGLYPH-13739;Lo;0;L;;;;;N;;;;; +1373A;EGYPTIAN HIEROGLYPH-1373A;Lo;0;L;;;;;N;;;;; +1373B;EGYPTIAN HIEROGLYPH-1373B;Lo;0;L;;;;;N;;;;; +1373C;EGYPTIAN HIEROGLYPH-1373C;Lo;0;L;;;;;N;;;;; +1373D;EGYPTIAN HIEROGLYPH-1373D;Lo;0;L;;;;;N;;;;; +1373E;EGYPTIAN HIEROGLYPH-1373E;Lo;0;L;;;;;N;;;;; +1373F;EGYPTIAN HIEROGLYPH-1373F;Lo;0;L;;;;;N;;;;; +13740;EGYPTIAN HIEROGLYPH-13740;Lo;0;L;;;;;N;;;;; +13741;EGYPTIAN HIEROGLYPH-13741;Lo;0;L;;;;;N;;;;; +13742;EGYPTIAN HIEROGLYPH-13742;Lo;0;L;;;;;N;;;;; +13743;EGYPTIAN HIEROGLYPH-13743;Lo;0;L;;;;;N;;;;; +13744;EGYPTIAN HIEROGLYPH-13744;Lo;0;L;;;;;N;;;;; +13745;EGYPTIAN HIEROGLYPH-13745;Lo;0;L;;;;;N;;;;; +13746;EGYPTIAN HIEROGLYPH-13746;Lo;0;L;;;;;N;;;;; +13747;EGYPTIAN HIEROGLYPH-13747;Lo;0;L;;;;;N;;;;; +13748;EGYPTIAN HIEROGLYPH-13748;Lo;0;L;;;;;N;;;;; +13749;EGYPTIAN HIEROGLYPH-13749;Lo;0;L;;;;;N;;;;; +1374A;EGYPTIAN HIEROGLYPH-1374A;Lo;0;L;;;;;N;;;;; +1374B;EGYPTIAN HIEROGLYPH-1374B;Lo;0;L;;;;;N;;;;; +1374C;EGYPTIAN HIEROGLYPH-1374C;Lo;0;L;;;;;N;;;;; +1374D;EGYPTIAN HIEROGLYPH-1374D;Lo;0;L;;;;;N;;;;; +1374E;EGYPTIAN HIEROGLYPH-1374E;Lo;0;L;;;;;N;;;;; +1374F;EGYPTIAN HIEROGLYPH-1374F;Lo;0;L;;;;;N;;;;; +13750;EGYPTIAN HIEROGLYPH-13750;Lo;0;L;;;;;N;;;;; +13751;EGYPTIAN HIEROGLYPH-13751;Lo;0;L;;;;;N;;;;; +13752;EGYPTIAN HIEROGLYPH-13752;Lo;0;L;;;;;N;;;;; +13753;EGYPTIAN HIEROGLYPH-13753;Lo;0;L;;;;;N;;;;; +13754;EGYPTIAN HIEROGLYPH-13754;Lo;0;L;;;;;N;;;;; +13755;EGYPTIAN HIEROGLYPH-13755;Lo;0;L;;;;;N;;;;; +13756;EGYPTIAN HIEROGLYPH-13756;Lo;0;L;;;;;N;;;;; +13757;EGYPTIAN HIEROGLYPH-13757;Lo;0;L;;;;;N;;;;; +13758;EGYPTIAN HIEROGLYPH-13758;Lo;0;L;;;;;N;;;;; +13759;EGYPTIAN HIEROGLYPH-13759;Lo;0;L;;;;;N;;;;; +1375A;EGYPTIAN HIEROGLYPH-1375A;Lo;0;L;;;;;N;;;;; +1375B;EGYPTIAN HIEROGLYPH-1375B;Lo;0;L;;;;;N;;;;; +1375C;EGYPTIAN HIEROGLYPH-1375C;Lo;0;L;;;;;N;;;;; +1375D;EGYPTIAN HIEROGLYPH-1375D;Lo;0;L;;;;;N;;;;; +1375E;EGYPTIAN HIEROGLYPH-1375E;Lo;0;L;;;;;N;;;;; +1375F;EGYPTIAN HIEROGLYPH-1375F;Lo;0;L;;;;;N;;;;; +13760;EGYPTIAN HIEROGLYPH-13760;Lo;0;L;;;;;N;;;;; +13761;EGYPTIAN HIEROGLYPH-13761;Lo;0;L;;;;;N;;;;; +13762;EGYPTIAN HIEROGLYPH-13762;Lo;0;L;;;;;N;;;;; +13763;EGYPTIAN HIEROGLYPH-13763;Lo;0;L;;;;;N;;;;; +13764;EGYPTIAN HIEROGLYPH-13764;Lo;0;L;;;;;N;;;;; +13765;EGYPTIAN HIEROGLYPH-13765;Lo;0;L;;;;;N;;;;; +13766;EGYPTIAN HIEROGLYPH-13766;Lo;0;L;;;;;N;;;;; +13767;EGYPTIAN HIEROGLYPH-13767;Lo;0;L;;;;;N;;;;; +13768;EGYPTIAN HIEROGLYPH-13768;Lo;0;L;;;;;N;;;;; +13769;EGYPTIAN HIEROGLYPH-13769;Lo;0;L;;;;;N;;;;; +1376A;EGYPTIAN HIEROGLYPH-1376A;Lo;0;L;;;;;N;;;;; +1376B;EGYPTIAN HIEROGLYPH-1376B;Lo;0;L;;;;;N;;;;; +1376C;EGYPTIAN HIEROGLYPH-1376C;Lo;0;L;;;;;N;;;;; +1376D;EGYPTIAN HIEROGLYPH-1376D;Lo;0;L;;;;;N;;;;; +1376E;EGYPTIAN HIEROGLYPH-1376E;Lo;0;L;;;;;N;;;;; +1376F;EGYPTIAN HIEROGLYPH-1376F;Lo;0;L;;;;;N;;;;; +13770;EGYPTIAN HIEROGLYPH-13770;Lo;0;L;;;;;N;;;;; +13771;EGYPTIAN HIEROGLYPH-13771;Lo;0;L;;;;;N;;;;; +13772;EGYPTIAN HIEROGLYPH-13772;Lo;0;L;;;;;N;;;;; +13773;EGYPTIAN HIEROGLYPH-13773;Lo;0;L;;;;;N;;;;; +13774;EGYPTIAN HIEROGLYPH-13774;Lo;0;L;;;;;N;;;;; +13775;EGYPTIAN HIEROGLYPH-13775;Lo;0;L;;;;;N;;;;; +13776;EGYPTIAN HIEROGLYPH-13776;Lo;0;L;;;;;N;;;;; +13777;EGYPTIAN HIEROGLYPH-13777;Lo;0;L;;;;;N;;;;; +13778;EGYPTIAN HIEROGLYPH-13778;Lo;0;L;;;;;N;;;;; +13779;EGYPTIAN HIEROGLYPH-13779;Lo;0;L;;;;;N;;;;; +1377A;EGYPTIAN HIEROGLYPH-1377A;Lo;0;L;;;;;N;;;;; +1377B;EGYPTIAN HIEROGLYPH-1377B;Lo;0;L;;;;;N;;;;; +1377C;EGYPTIAN HIEROGLYPH-1377C;Lo;0;L;;;;;N;;;;; +1377D;EGYPTIAN HIEROGLYPH-1377D;Lo;0;L;;;;;N;;;;; +1377E;EGYPTIAN HIEROGLYPH-1377E;Lo;0;L;;;;;N;;;;; +1377F;EGYPTIAN HIEROGLYPH-1377F;Lo;0;L;;;;;N;;;;; +13780;EGYPTIAN HIEROGLYPH-13780;Lo;0;L;;;;;N;;;;; +13781;EGYPTIAN HIEROGLYPH-13781;Lo;0;L;;;;;N;;;;; +13782;EGYPTIAN HIEROGLYPH-13782;Lo;0;L;;;;;N;;;;; +13783;EGYPTIAN HIEROGLYPH-13783;Lo;0;L;;;;;N;;;;; +13784;EGYPTIAN HIEROGLYPH-13784;Lo;0;L;;;;;N;;;;; +13785;EGYPTIAN HIEROGLYPH-13785;Lo;0;L;;;;;N;;;;; +13786;EGYPTIAN HIEROGLYPH-13786;Lo;0;L;;;;;N;;;;; +13787;EGYPTIAN HIEROGLYPH-13787;Lo;0;L;;;;;N;;;;; +13788;EGYPTIAN HIEROGLYPH-13788;Lo;0;L;;;;;N;;;;; +13789;EGYPTIAN HIEROGLYPH-13789;Lo;0;L;;;;;N;;;;; +1378A;EGYPTIAN HIEROGLYPH-1378A;Lo;0;L;;;;;N;;;;; +1378B;EGYPTIAN HIEROGLYPH-1378B;Lo;0;L;;;;;N;;;;; +1378C;EGYPTIAN HIEROGLYPH-1378C;Lo;0;L;;;;;N;;;;; +1378D;EGYPTIAN HIEROGLYPH-1378D;Lo;0;L;;;;;N;;;;; +1378E;EGYPTIAN HIEROGLYPH-1378E;Lo;0;L;;;;;N;;;;; +1378F;EGYPTIAN HIEROGLYPH-1378F;Lo;0;L;;;;;N;;;;; +13790;EGYPTIAN HIEROGLYPH-13790;Lo;0;L;;;;;N;;;;; +13791;EGYPTIAN HIEROGLYPH-13791;Lo;0;L;;;;;N;;;;; +13792;EGYPTIAN HIEROGLYPH-13792;Lo;0;L;;;;;N;;;;; +13793;EGYPTIAN HIEROGLYPH-13793;Lo;0;L;;;;;N;;;;; +13794;EGYPTIAN HIEROGLYPH-13794;Lo;0;L;;;;;N;;;;; +13795;EGYPTIAN HIEROGLYPH-13795;Lo;0;L;;;;;N;;;;; +13796;EGYPTIAN HIEROGLYPH-13796;Lo;0;L;;;;;N;;;;; +13797;EGYPTIAN HIEROGLYPH-13797;Lo;0;L;;;;;N;;;;; +13798;EGYPTIAN HIEROGLYPH-13798;Lo;0;L;;;;;N;;;;; +13799;EGYPTIAN HIEROGLYPH-13799;Lo;0;L;;;;;N;;;;; +1379A;EGYPTIAN HIEROGLYPH-1379A;Lo;0;L;;;;;N;;;;; +1379B;EGYPTIAN HIEROGLYPH-1379B;Lo;0;L;;;;;N;;;;; +1379C;EGYPTIAN HIEROGLYPH-1379C;Lo;0;L;;;;;N;;;;; +1379D;EGYPTIAN HIEROGLYPH-1379D;Lo;0;L;;;;;N;;;;; +1379E;EGYPTIAN HIEROGLYPH-1379E;Lo;0;L;;;;;N;;;;; +1379F;EGYPTIAN HIEROGLYPH-1379F;Lo;0;L;;;;;N;;;;; +137A0;EGYPTIAN HIEROGLYPH-137A0;Lo;0;L;;;;;N;;;;; +137A1;EGYPTIAN HIEROGLYPH-137A1;Lo;0;L;;;;;N;;;;; +137A2;EGYPTIAN HIEROGLYPH-137A2;Lo;0;L;;;;;N;;;;; +137A3;EGYPTIAN HIEROGLYPH-137A3;Lo;0;L;;;;;N;;;;; +137A4;EGYPTIAN HIEROGLYPH-137A4;Lo;0;L;;;;;N;;;;; +137A5;EGYPTIAN HIEROGLYPH-137A5;Lo;0;L;;;;;N;;;;; +137A6;EGYPTIAN HIEROGLYPH-137A6;Lo;0;L;;;;;N;;;;; +137A7;EGYPTIAN HIEROGLYPH-137A7;Lo;0;L;;;;;N;;;;; +137A8;EGYPTIAN HIEROGLYPH-137A8;Lo;0;L;;;;;N;;;;; +137A9;EGYPTIAN HIEROGLYPH-137A9;Lo;0;L;;;;;N;;;;; +137AA;EGYPTIAN HIEROGLYPH-137AA;Lo;0;L;;;;;N;;;;; +137AB;EGYPTIAN HIEROGLYPH-137AB;Lo;0;L;;;;;N;;;;; +137AC;EGYPTIAN HIEROGLYPH-137AC;Lo;0;L;;;;;N;;;;; +137AD;EGYPTIAN HIEROGLYPH-137AD;Lo;0;L;;;;;N;;;;; +137AE;EGYPTIAN HIEROGLYPH-137AE;Lo;0;L;;;;;N;;;;; +137AF;EGYPTIAN HIEROGLYPH-137AF;Lo;0;L;;;;;N;;;;; +137B0;EGYPTIAN HIEROGLYPH-137B0;Lo;0;L;;;;;N;;;;; +137B1;EGYPTIAN HIEROGLYPH-137B1;Lo;0;L;;;;;N;;;;; +137B2;EGYPTIAN HIEROGLYPH-137B2;Lo;0;L;;;;;N;;;;; +137B3;EGYPTIAN HIEROGLYPH-137B3;Lo;0;L;;;;;N;;;;; +137B4;EGYPTIAN HIEROGLYPH-137B4;Lo;0;L;;;;;N;;;;; +137B5;EGYPTIAN HIEROGLYPH-137B5;Lo;0;L;;;;;N;;;;; +137B6;EGYPTIAN HIEROGLYPH-137B6;Lo;0;L;;;;;N;;;;; +137B7;EGYPTIAN HIEROGLYPH-137B7;Lo;0;L;;;;;N;;;;; +137B8;EGYPTIAN HIEROGLYPH-137B8;Lo;0;L;;;;;N;;;;; +137B9;EGYPTIAN HIEROGLYPH-137B9;Lo;0;L;;;;;N;;;;; +137BA;EGYPTIAN HIEROGLYPH-137BA;Lo;0;L;;;;;N;;;;; +137BB;EGYPTIAN HIEROGLYPH-137BB;Lo;0;L;;;;;N;;;;; +137BC;EGYPTIAN HIEROGLYPH-137BC;Lo;0;L;;;;;N;;;;; +137BD;EGYPTIAN HIEROGLYPH-137BD;Lo;0;L;;;;;N;;;;; +137BE;EGYPTIAN HIEROGLYPH-137BE;Lo;0;L;;;;;N;;;;; +137BF;EGYPTIAN HIEROGLYPH-137BF;Lo;0;L;;;;;N;;;;; +137C0;EGYPTIAN HIEROGLYPH-137C0;Lo;0;L;;;;;N;;;;; +137C1;EGYPTIAN HIEROGLYPH-137C1;Lo;0;L;;;;;N;;;;; +137C2;EGYPTIAN HIEROGLYPH-137C2;Lo;0;L;;;;;N;;;;; +137C3;EGYPTIAN HIEROGLYPH-137C3;Lo;0;L;;;;;N;;;;; +137C4;EGYPTIAN HIEROGLYPH-137C4;Lo;0;L;;;;;N;;;;; +137C5;EGYPTIAN HIEROGLYPH-137C5;Lo;0;L;;;;;N;;;;; +137C6;EGYPTIAN HIEROGLYPH-137C6;Lo;0;L;;;;;N;;;;; +137C7;EGYPTIAN HIEROGLYPH-137C7;Lo;0;L;;;;;N;;;;; +137C8;EGYPTIAN HIEROGLYPH-137C8;Lo;0;L;;;;;N;;;;; +137C9;EGYPTIAN HIEROGLYPH-137C9;Lo;0;L;;;;;N;;;;; +137CA;EGYPTIAN HIEROGLYPH-137CA;Lo;0;L;;;;;N;;;;; +137CB;EGYPTIAN HIEROGLYPH-137CB;Lo;0;L;;;;;N;;;;; +137CC;EGYPTIAN HIEROGLYPH-137CC;Lo;0;L;;;;;N;;;;; +137CD;EGYPTIAN HIEROGLYPH-137CD;Lo;0;L;;;;;N;;;;; +137CE;EGYPTIAN HIEROGLYPH-137CE;Lo;0;L;;;;;N;;;;; +137CF;EGYPTIAN HIEROGLYPH-137CF;Lo;0;L;;;;;N;;;;; +137D0;EGYPTIAN HIEROGLYPH-137D0;Lo;0;L;;;;;N;;;;; +137D1;EGYPTIAN HIEROGLYPH-137D1;Lo;0;L;;;;;N;;;;; +137D2;EGYPTIAN HIEROGLYPH-137D2;Lo;0;L;;;;;N;;;;; +137D3;EGYPTIAN HIEROGLYPH-137D3;Lo;0;L;;;;;N;;;;; +137D4;EGYPTIAN HIEROGLYPH-137D4;Lo;0;L;;;;;N;;;;; +137D5;EGYPTIAN HIEROGLYPH-137D5;Lo;0;L;;;;;N;;;;; +137D6;EGYPTIAN HIEROGLYPH-137D6;Lo;0;L;;;;;N;;;;; +137D7;EGYPTIAN HIEROGLYPH-137D7;Lo;0;L;;;;;N;;;;; +137D8;EGYPTIAN HIEROGLYPH-137D8;Lo;0;L;;;;;N;;;;; +137D9;EGYPTIAN HIEROGLYPH-137D9;Lo;0;L;;;;;N;;;;; +137DA;EGYPTIAN HIEROGLYPH-137DA;Lo;0;L;;;;;N;;;;; +137DB;EGYPTIAN HIEROGLYPH-137DB;Lo;0;L;;;;;N;;;;; +137DC;EGYPTIAN HIEROGLYPH-137DC;Lo;0;L;;;;;N;;;;; +137DD;EGYPTIAN HIEROGLYPH-137DD;Lo;0;L;;;;;N;;;;; +137DE;EGYPTIAN HIEROGLYPH-137DE;Lo;0;L;;;;;N;;;;; +137DF;EGYPTIAN HIEROGLYPH-137DF;Lo;0;L;;;;;N;;;;; +137E0;EGYPTIAN HIEROGLYPH-137E0;Lo;0;L;;;;;N;;;;; +137E1;EGYPTIAN HIEROGLYPH-137E1;Lo;0;L;;;;;N;;;;; +137E2;EGYPTIAN HIEROGLYPH-137E2;Lo;0;L;;;;;N;;;;; +137E3;EGYPTIAN HIEROGLYPH-137E3;Lo;0;L;;;;;N;;;;; +137E4;EGYPTIAN HIEROGLYPH-137E4;Lo;0;L;;;;;N;;;;; +137E5;EGYPTIAN HIEROGLYPH-137E5;Lo;0;L;;;;;N;;;;; +137E6;EGYPTIAN HIEROGLYPH-137E6;Lo;0;L;;;;;N;;;;; +137E7;EGYPTIAN HIEROGLYPH-137E7;Lo;0;L;;;;;N;;;;; +137E8;EGYPTIAN HIEROGLYPH-137E8;Lo;0;L;;;;;N;;;;; +137E9;EGYPTIAN HIEROGLYPH-137E9;Lo;0;L;;;;;N;;;;; +137EA;EGYPTIAN HIEROGLYPH-137EA;Lo;0;L;;;;;N;;;;; +137EB;EGYPTIAN HIEROGLYPH-137EB;Lo;0;L;;;;;N;;;;; +137EC;EGYPTIAN HIEROGLYPH-137EC;Lo;0;L;;;;;N;;;;; +137ED;EGYPTIAN HIEROGLYPH-137ED;Lo;0;L;;;;;N;;;;; +137EE;EGYPTIAN HIEROGLYPH-137EE;Lo;0;L;;;;;N;;;;; +137EF;EGYPTIAN HIEROGLYPH-137EF;Lo;0;L;;;;;N;;;;; +137F0;EGYPTIAN HIEROGLYPH-137F0;Lo;0;L;;;;;N;;;;; +137F1;EGYPTIAN HIEROGLYPH-137F1;Lo;0;L;;;;;N;;;;; +137F2;EGYPTIAN HIEROGLYPH-137F2;Lo;0;L;;;;;N;;;;; +137F3;EGYPTIAN HIEROGLYPH-137F3;Lo;0;L;;;;;N;;;;; +137F4;EGYPTIAN HIEROGLYPH-137F4;Lo;0;L;;;;;N;;;;; +137F5;EGYPTIAN HIEROGLYPH-137F5;Lo;0;L;;;;;N;;;;; +137F6;EGYPTIAN HIEROGLYPH-137F6;Lo;0;L;;;;;N;;;;; +137F7;EGYPTIAN HIEROGLYPH-137F7;Lo;0;L;;;;;N;;;;; +137F8;EGYPTIAN HIEROGLYPH-137F8;Lo;0;L;;;;;N;;;;; +137F9;EGYPTIAN HIEROGLYPH-137F9;Lo;0;L;;;;;N;;;;; +137FA;EGYPTIAN HIEROGLYPH-137FA;Lo;0;L;;;;;N;;;;; +137FB;EGYPTIAN HIEROGLYPH-137FB;Lo;0;L;;;;;N;;;;; +137FC;EGYPTIAN HIEROGLYPH-137FC;Lo;0;L;;;;;N;;;;; +137FD;EGYPTIAN HIEROGLYPH-137FD;Lo;0;L;;;;;N;;;;; +137FE;EGYPTIAN HIEROGLYPH-137FE;Lo;0;L;;;;;N;;;;; +137FF;EGYPTIAN HIEROGLYPH-137FF;Lo;0;L;;;;;N;;;;; +13800;EGYPTIAN HIEROGLYPH-13800;Lo;0;L;;;;;N;;;;; +13801;EGYPTIAN HIEROGLYPH-13801;Lo;0;L;;;;;N;;;;; +13802;EGYPTIAN HIEROGLYPH-13802;Lo;0;L;;;;;N;;;;; +13803;EGYPTIAN HIEROGLYPH-13803;Lo;0;L;;;;;N;;;;; +13804;EGYPTIAN HIEROGLYPH-13804;Lo;0;L;;;;;N;;;;; +13805;EGYPTIAN HIEROGLYPH-13805;Lo;0;L;;;;;N;;;;; +13806;EGYPTIAN HIEROGLYPH-13806;Lo;0;L;;;;;N;;;;; +13807;EGYPTIAN HIEROGLYPH-13807;Lo;0;L;;;;;N;;;;; +13808;EGYPTIAN HIEROGLYPH-13808;Lo;0;L;;;;;N;;;;; +13809;EGYPTIAN HIEROGLYPH-13809;Lo;0;L;;;;;N;;;;; +1380A;EGYPTIAN HIEROGLYPH-1380A;Lo;0;L;;;;;N;;;;; +1380B;EGYPTIAN HIEROGLYPH-1380B;Lo;0;L;;;;;N;;;;; +1380C;EGYPTIAN HIEROGLYPH-1380C;Lo;0;L;;;;;N;;;;; +1380D;EGYPTIAN HIEROGLYPH-1380D;Lo;0;L;;;;;N;;;;; +1380E;EGYPTIAN HIEROGLYPH-1380E;Lo;0;L;;;;;N;;;;; +1380F;EGYPTIAN HIEROGLYPH-1380F;Lo;0;L;;;;;N;;;;; +13810;EGYPTIAN HIEROGLYPH-13810;Lo;0;L;;;;;N;;;;; +13811;EGYPTIAN HIEROGLYPH-13811;Lo;0;L;;;;;N;;;;; +13812;EGYPTIAN HIEROGLYPH-13812;Lo;0;L;;;;;N;;;;; +13813;EGYPTIAN HIEROGLYPH-13813;Lo;0;L;;;;;N;;;;; +13814;EGYPTIAN HIEROGLYPH-13814;Lo;0;L;;;;;N;;;;; +13815;EGYPTIAN HIEROGLYPH-13815;Lo;0;L;;;;;N;;;;; +13816;EGYPTIAN HIEROGLYPH-13816;Lo;0;L;;;;;N;;;;; +13817;EGYPTIAN HIEROGLYPH-13817;Lo;0;L;;;;;N;;;;; +13818;EGYPTIAN HIEROGLYPH-13818;Lo;0;L;;;;;N;;;;; +13819;EGYPTIAN HIEROGLYPH-13819;Lo;0;L;;;;;N;;;;; +1381A;EGYPTIAN HIEROGLYPH-1381A;Lo;0;L;;;;;N;;;;; +1381B;EGYPTIAN HIEROGLYPH-1381B;Lo;0;L;;;;;N;;;;; +1381C;EGYPTIAN HIEROGLYPH-1381C;Lo;0;L;;;;;N;;;;; +1381D;EGYPTIAN HIEROGLYPH-1381D;Lo;0;L;;;;;N;;;;; +1381E;EGYPTIAN HIEROGLYPH-1381E;Lo;0;L;;;;;N;;;;; +1381F;EGYPTIAN HIEROGLYPH-1381F;Lo;0;L;;;;;N;;;;; +13820;EGYPTIAN HIEROGLYPH-13820;Lo;0;L;;;;;N;;;;; +13821;EGYPTIAN HIEROGLYPH-13821;Lo;0;L;;;;;N;;;;; +13822;EGYPTIAN HIEROGLYPH-13822;Lo;0;L;;;;;N;;;;; +13823;EGYPTIAN HIEROGLYPH-13823;Lo;0;L;;;;;N;;;;; +13824;EGYPTIAN HIEROGLYPH-13824;Lo;0;L;;;;;N;;;;; +13825;EGYPTIAN HIEROGLYPH-13825;Lo;0;L;;;;;N;;;;; +13826;EGYPTIAN HIEROGLYPH-13826;Lo;0;L;;;;;N;;;;; +13827;EGYPTIAN HIEROGLYPH-13827;Lo;0;L;;;;;N;;;;; +13828;EGYPTIAN HIEROGLYPH-13828;Lo;0;L;;;;;N;;;;; +13829;EGYPTIAN HIEROGLYPH-13829;Lo;0;L;;;;;N;;;;; +1382A;EGYPTIAN HIEROGLYPH-1382A;Lo;0;L;;;;;N;;;;; +1382B;EGYPTIAN HIEROGLYPH-1382B;Lo;0;L;;;;;N;;;;; +1382C;EGYPTIAN HIEROGLYPH-1382C;Lo;0;L;;;;;N;;;;; +1382D;EGYPTIAN HIEROGLYPH-1382D;Lo;0;L;;;;;N;;;;; +1382E;EGYPTIAN HIEROGLYPH-1382E;Lo;0;L;;;;;N;;;;; +1382F;EGYPTIAN HIEROGLYPH-1382F;Lo;0;L;;;;;N;;;;; +13830;EGYPTIAN HIEROGLYPH-13830;Lo;0;L;;;;;N;;;;; +13831;EGYPTIAN HIEROGLYPH-13831;Lo;0;L;;;;;N;;;;; +13832;EGYPTIAN HIEROGLYPH-13832;Lo;0;L;;;;;N;;;;; +13833;EGYPTIAN HIEROGLYPH-13833;Lo;0;L;;;;;N;;;;; +13834;EGYPTIAN HIEROGLYPH-13834;Lo;0;L;;;;;N;;;;; +13835;EGYPTIAN HIEROGLYPH-13835;Lo;0;L;;;;;N;;;;; +13836;EGYPTIAN HIEROGLYPH-13836;Lo;0;L;;;;;N;;;;; +13837;EGYPTIAN HIEROGLYPH-13837;Lo;0;L;;;;;N;;;;; +13838;EGYPTIAN HIEROGLYPH-13838;Lo;0;L;;;;;N;;;;; +13839;EGYPTIAN HIEROGLYPH-13839;Lo;0;L;;;;;N;;;;; +1383A;EGYPTIAN HIEROGLYPH-1383A;Lo;0;L;;;;;N;;;;; +1383B;EGYPTIAN HIEROGLYPH-1383B;Lo;0;L;;;;;N;;;;; +1383C;EGYPTIAN HIEROGLYPH-1383C;Lo;0;L;;;;;N;;;;; +1383D;EGYPTIAN HIEROGLYPH-1383D;Lo;0;L;;;;;N;;;;; +1383E;EGYPTIAN HIEROGLYPH-1383E;Lo;0;L;;;;;N;;;;; +1383F;EGYPTIAN HIEROGLYPH-1383F;Lo;0;L;;;;;N;;;;; +13840;EGYPTIAN HIEROGLYPH-13840;Lo;0;L;;;;;N;;;;; +13841;EGYPTIAN HIEROGLYPH-13841;Lo;0;L;;;;;N;;;;; +13842;EGYPTIAN HIEROGLYPH-13842;Lo;0;L;;;;;N;;;;; +13843;EGYPTIAN HIEROGLYPH-13843;Lo;0;L;;;;;N;;;;; +13844;EGYPTIAN HIEROGLYPH-13844;Lo;0;L;;;;;N;;;;; +13845;EGYPTIAN HIEROGLYPH-13845;Lo;0;L;;;;;N;;;;; +13846;EGYPTIAN HIEROGLYPH-13846;Lo;0;L;;;;;N;;;;; +13847;EGYPTIAN HIEROGLYPH-13847;Lo;0;L;;;;;N;;;;; +13848;EGYPTIAN HIEROGLYPH-13848;Lo;0;L;;;;;N;;;;; +13849;EGYPTIAN HIEROGLYPH-13849;Lo;0;L;;;;;N;;;;; +1384A;EGYPTIAN HIEROGLYPH-1384A;Lo;0;L;;;;;N;;;;; +1384B;EGYPTIAN HIEROGLYPH-1384B;Lo;0;L;;;;;N;;;;; +1384C;EGYPTIAN HIEROGLYPH-1384C;Lo;0;L;;;;;N;;;;; +1384D;EGYPTIAN HIEROGLYPH-1384D;Lo;0;L;;;;;N;;;;; +1384E;EGYPTIAN HIEROGLYPH-1384E;Lo;0;L;;;;;N;;;;; +1384F;EGYPTIAN HIEROGLYPH-1384F;Lo;0;L;;;;;N;;;;; +13850;EGYPTIAN HIEROGLYPH-13850;Lo;0;L;;;;;N;;;;; +13851;EGYPTIAN HIEROGLYPH-13851;Lo;0;L;;;;;N;;;;; +13852;EGYPTIAN HIEROGLYPH-13852;Lo;0;L;;;;;N;;;;; +13853;EGYPTIAN HIEROGLYPH-13853;Lo;0;L;;;;;N;;;;; +13854;EGYPTIAN HIEROGLYPH-13854;Lo;0;L;;;;;N;;;;; +13855;EGYPTIAN HIEROGLYPH-13855;Lo;0;L;;;;;N;;;;; +13856;EGYPTIAN HIEROGLYPH-13856;Lo;0;L;;;;;N;;;;; +13857;EGYPTIAN HIEROGLYPH-13857;Lo;0;L;;;;;N;;;;; +13858;EGYPTIAN HIEROGLYPH-13858;Lo;0;L;;;;;N;;;;; +13859;EGYPTIAN HIEROGLYPH-13859;Lo;0;L;;;;;N;;;;; +1385A;EGYPTIAN HIEROGLYPH-1385A;Lo;0;L;;;;;N;;;;; +1385B;EGYPTIAN HIEROGLYPH-1385B;Lo;0;L;;;;;N;;;;; +1385C;EGYPTIAN HIEROGLYPH-1385C;Lo;0;L;;;;;N;;;;; +1385D;EGYPTIAN HIEROGLYPH-1385D;Lo;0;L;;;;;N;;;;; +1385E;EGYPTIAN HIEROGLYPH-1385E;Lo;0;L;;;;;N;;;;; +1385F;EGYPTIAN HIEROGLYPH-1385F;Lo;0;L;;;;;N;;;;; +13860;EGYPTIAN HIEROGLYPH-13860;Lo;0;L;;;;;N;;;;; +13861;EGYPTIAN HIEROGLYPH-13861;Lo;0;L;;;;;N;;;;; +13862;EGYPTIAN HIEROGLYPH-13862;Lo;0;L;;;;;N;;;;; +13863;EGYPTIAN HIEROGLYPH-13863;Lo;0;L;;;;;N;;;;; +13864;EGYPTIAN HIEROGLYPH-13864;Lo;0;L;;;;;N;;;;; +13865;EGYPTIAN HIEROGLYPH-13865;Lo;0;L;;;;;N;;;;; +13866;EGYPTIAN HIEROGLYPH-13866;Lo;0;L;;;;;N;;;;; +13867;EGYPTIAN HIEROGLYPH-13867;Lo;0;L;;;;;N;;;;; +13868;EGYPTIAN HIEROGLYPH-13868;Lo;0;L;;;;;N;;;;; +13869;EGYPTIAN HIEROGLYPH-13869;Lo;0;L;;;;;N;;;;; +1386A;EGYPTIAN HIEROGLYPH-1386A;Lo;0;L;;;;;N;;;;; +1386B;EGYPTIAN HIEROGLYPH-1386B;Lo;0;L;;;;;N;;;;; +1386C;EGYPTIAN HIEROGLYPH-1386C;Lo;0;L;;;;;N;;;;; +1386D;EGYPTIAN HIEROGLYPH-1386D;Lo;0;L;;;;;N;;;;; +1386E;EGYPTIAN HIEROGLYPH-1386E;Lo;0;L;;;;;N;;;;; +1386F;EGYPTIAN HIEROGLYPH-1386F;Lo;0;L;;;;;N;;;;; +13870;EGYPTIAN HIEROGLYPH-13870;Lo;0;L;;;;;N;;;;; +13871;EGYPTIAN HIEROGLYPH-13871;Lo;0;L;;;;;N;;;;; +13872;EGYPTIAN HIEROGLYPH-13872;Lo;0;L;;;;;N;;;;; +13873;EGYPTIAN HIEROGLYPH-13873;Lo;0;L;;;;;N;;;;; +13874;EGYPTIAN HIEROGLYPH-13874;Lo;0;L;;;;;N;;;;; +13875;EGYPTIAN HIEROGLYPH-13875;Lo;0;L;;;;;N;;;;; +13876;EGYPTIAN HIEROGLYPH-13876;Lo;0;L;;;;;N;;;;; +13877;EGYPTIAN HIEROGLYPH-13877;Lo;0;L;;;;;N;;;;; +13878;EGYPTIAN HIEROGLYPH-13878;Lo;0;L;;;;;N;;;;; +13879;EGYPTIAN HIEROGLYPH-13879;Lo;0;L;;;;;N;;;;; +1387A;EGYPTIAN HIEROGLYPH-1387A;Lo;0;L;;;;;N;;;;; +1387B;EGYPTIAN HIEROGLYPH-1387B;Lo;0;L;;;;;N;;;;; +1387C;EGYPTIAN HIEROGLYPH-1387C;Lo;0;L;;;;;N;;;;; +1387D;EGYPTIAN HIEROGLYPH-1387D;Lo;0;L;;;;;N;;;;; +1387E;EGYPTIAN HIEROGLYPH-1387E;Lo;0;L;;;;;N;;;;; +1387F;EGYPTIAN HIEROGLYPH-1387F;Lo;0;L;;;;;N;;;;; +13880;EGYPTIAN HIEROGLYPH-13880;Lo;0;L;;;;;N;;;;; +13881;EGYPTIAN HIEROGLYPH-13881;Lo;0;L;;;;;N;;;;; +13882;EGYPTIAN HIEROGLYPH-13882;Lo;0;L;;;;;N;;;;; +13883;EGYPTIAN HIEROGLYPH-13883;Lo;0;L;;;;;N;;;;; +13884;EGYPTIAN HIEROGLYPH-13884;Lo;0;L;;;;;N;;;;; +13885;EGYPTIAN HIEROGLYPH-13885;Lo;0;L;;;;;N;;;;; +13886;EGYPTIAN HIEROGLYPH-13886;Lo;0;L;;;;;N;;;;; +13887;EGYPTIAN HIEROGLYPH-13887;Lo;0;L;;;;;N;;;;; +13888;EGYPTIAN HIEROGLYPH-13888;Lo;0;L;;;;;N;;;;; +13889;EGYPTIAN HIEROGLYPH-13889;Lo;0;L;;;;;N;;;;; +1388A;EGYPTIAN HIEROGLYPH-1388A;Lo;0;L;;;;;N;;;;; +1388B;EGYPTIAN HIEROGLYPH-1388B;Lo;0;L;;;;;N;;;;; +1388C;EGYPTIAN HIEROGLYPH-1388C;Lo;0;L;;;;;N;;;;; +1388D;EGYPTIAN HIEROGLYPH-1388D;Lo;0;L;;;;;N;;;;; +1388E;EGYPTIAN HIEROGLYPH-1388E;Lo;0;L;;;;;N;;;;; +1388F;EGYPTIAN HIEROGLYPH-1388F;Lo;0;L;;;;;N;;;;; +13890;EGYPTIAN HIEROGLYPH-13890;Lo;0;L;;;;;N;;;;; +13891;EGYPTIAN HIEROGLYPH-13891;Lo;0;L;;;;;N;;;;; +13892;EGYPTIAN HIEROGLYPH-13892;Lo;0;L;;;;;N;;;;; +13893;EGYPTIAN HIEROGLYPH-13893;Lo;0;L;;;;;N;;;;; +13894;EGYPTIAN HIEROGLYPH-13894;Lo;0;L;;;;;N;;;;; +13895;EGYPTIAN HIEROGLYPH-13895;Lo;0;L;;;;;N;;;;; +13896;EGYPTIAN HIEROGLYPH-13896;Lo;0;L;;;;;N;;;;; +13897;EGYPTIAN HIEROGLYPH-13897;Lo;0;L;;;;;N;;;;; +13898;EGYPTIAN HIEROGLYPH-13898;Lo;0;L;;;;;N;;;;; +13899;EGYPTIAN HIEROGLYPH-13899;Lo;0;L;;;;;N;;;;; +1389A;EGYPTIAN HIEROGLYPH-1389A;Lo;0;L;;;;;N;;;;; +1389B;EGYPTIAN HIEROGLYPH-1389B;Lo;0;L;;;;;N;;;;; +1389C;EGYPTIAN HIEROGLYPH-1389C;Lo;0;L;;;;;N;;;;; +1389D;EGYPTIAN HIEROGLYPH-1389D;Lo;0;L;;;;;N;;;;; +1389E;EGYPTIAN HIEROGLYPH-1389E;Lo;0;L;;;;;N;;;;; +1389F;EGYPTIAN HIEROGLYPH-1389F;Lo;0;L;;;;;N;;;;; +138A0;EGYPTIAN HIEROGLYPH-138A0;Lo;0;L;;;;;N;;;;; +138A1;EGYPTIAN HIEROGLYPH-138A1;Lo;0;L;;;;;N;;;;; +138A2;EGYPTIAN HIEROGLYPH-138A2;Lo;0;L;;;;;N;;;;; +138A3;EGYPTIAN HIEROGLYPH-138A3;Lo;0;L;;;;;N;;;;; +138A4;EGYPTIAN HIEROGLYPH-138A4;Lo;0;L;;;;;N;;;;; +138A5;EGYPTIAN HIEROGLYPH-138A5;Lo;0;L;;;;;N;;;;; +138A6;EGYPTIAN HIEROGLYPH-138A6;Lo;0;L;;;;;N;;;;; +138A7;EGYPTIAN HIEROGLYPH-138A7;Lo;0;L;;;;;N;;;;; +138A8;EGYPTIAN HIEROGLYPH-138A8;Lo;0;L;;;;;N;;;;; +138A9;EGYPTIAN HIEROGLYPH-138A9;Lo;0;L;;;;;N;;;;; +138AA;EGYPTIAN HIEROGLYPH-138AA;Lo;0;L;;;;;N;;;;; +138AB;EGYPTIAN HIEROGLYPH-138AB;Lo;0;L;;;;;N;;;;; +138AC;EGYPTIAN HIEROGLYPH-138AC;Lo;0;L;;;;;N;;;;; +138AD;EGYPTIAN HIEROGLYPH-138AD;Lo;0;L;;;;;N;;;;; +138AE;EGYPTIAN HIEROGLYPH-138AE;Lo;0;L;;;;;N;;;;; +138AF;EGYPTIAN HIEROGLYPH-138AF;Lo;0;L;;;;;N;;;;; +138B0;EGYPTIAN HIEROGLYPH-138B0;Lo;0;L;;;;;N;;;;; +138B1;EGYPTIAN HIEROGLYPH-138B1;Lo;0;L;;;;;N;;;;; +138B2;EGYPTIAN HIEROGLYPH-138B2;Lo;0;L;;;;;N;;;;; +138B3;EGYPTIAN HIEROGLYPH-138B3;Lo;0;L;;;;;N;;;;; +138B4;EGYPTIAN HIEROGLYPH-138B4;Lo;0;L;;;;;N;;;;; +138B5;EGYPTIAN HIEROGLYPH-138B5;Lo;0;L;;;;;N;;;;; +138B6;EGYPTIAN HIEROGLYPH-138B6;Lo;0;L;;;;;N;;;;; +138B7;EGYPTIAN HIEROGLYPH-138B7;Lo;0;L;;;;;N;;;;; +138B8;EGYPTIAN HIEROGLYPH-138B8;Lo;0;L;;;;;N;;;;; +138B9;EGYPTIAN HIEROGLYPH-138B9;Lo;0;L;;;;;N;;;;; +138BA;EGYPTIAN HIEROGLYPH-138BA;Lo;0;L;;;;;N;;;;; +138BB;EGYPTIAN HIEROGLYPH-138BB;Lo;0;L;;;;;N;;;;; +138BC;EGYPTIAN HIEROGLYPH-138BC;Lo;0;L;;;;;N;;;;; +138BD;EGYPTIAN HIEROGLYPH-138BD;Lo;0;L;;;;;N;;;;; +138BE;EGYPTIAN HIEROGLYPH-138BE;Lo;0;L;;;;;N;;;;; +138BF;EGYPTIAN HIEROGLYPH-138BF;Lo;0;L;;;;;N;;;;; +138C0;EGYPTIAN HIEROGLYPH-138C0;Lo;0;L;;;;;N;;;;; +138C1;EGYPTIAN HIEROGLYPH-138C1;Lo;0;L;;;;;N;;;;; +138C2;EGYPTIAN HIEROGLYPH-138C2;Lo;0;L;;;;;N;;;;; +138C3;EGYPTIAN HIEROGLYPH-138C3;Lo;0;L;;;;;N;;;;; +138C4;EGYPTIAN HIEROGLYPH-138C4;Lo;0;L;;;;;N;;;;; +138C5;EGYPTIAN HIEROGLYPH-138C5;Lo;0;L;;;;;N;;;;; +138C6;EGYPTIAN HIEROGLYPH-138C6;Lo;0;L;;;;;N;;;;; +138C7;EGYPTIAN HIEROGLYPH-138C7;Lo;0;L;;;;;N;;;;; +138C8;EGYPTIAN HIEROGLYPH-138C8;Lo;0;L;;;;;N;;;;; +138C9;EGYPTIAN HIEROGLYPH-138C9;Lo;0;L;;;;;N;;;;; +138CA;EGYPTIAN HIEROGLYPH-138CA;Lo;0;L;;;;;N;;;;; +138CB;EGYPTIAN HIEROGLYPH-138CB;Lo;0;L;;;;;N;;;;; +138CC;EGYPTIAN HIEROGLYPH-138CC;Lo;0;L;;;;;N;;;;; +138CD;EGYPTIAN HIEROGLYPH-138CD;Lo;0;L;;;;;N;;;;; +138CE;EGYPTIAN HIEROGLYPH-138CE;Lo;0;L;;;;;N;;;;; +138CF;EGYPTIAN HIEROGLYPH-138CF;Lo;0;L;;;;;N;;;;; +138D0;EGYPTIAN HIEROGLYPH-138D0;Lo;0;L;;;;;N;;;;; +138D1;EGYPTIAN HIEROGLYPH-138D1;Lo;0;L;;;;;N;;;;; +138D2;EGYPTIAN HIEROGLYPH-138D2;Lo;0;L;;;;;N;;;;; +138D3;EGYPTIAN HIEROGLYPH-138D3;Lo;0;L;;;;;N;;;;; +138D4;EGYPTIAN HIEROGLYPH-138D4;Lo;0;L;;;;;N;;;;; +138D5;EGYPTIAN HIEROGLYPH-138D5;Lo;0;L;;;;;N;;;;; +138D6;EGYPTIAN HIEROGLYPH-138D6;Lo;0;L;;;;;N;;;;; +138D7;EGYPTIAN HIEROGLYPH-138D7;Lo;0;L;;;;;N;;;;; +138D8;EGYPTIAN HIEROGLYPH-138D8;Lo;0;L;;;;;N;;;;; +138D9;EGYPTIAN HIEROGLYPH-138D9;Lo;0;L;;;;;N;;;;; +138DA;EGYPTIAN HIEROGLYPH-138DA;Lo;0;L;;;;;N;;;;; +138DB;EGYPTIAN HIEROGLYPH-138DB;Lo;0;L;;;;;N;;;;; +138DC;EGYPTIAN HIEROGLYPH-138DC;Lo;0;L;;;;;N;;;;; +138DD;EGYPTIAN HIEROGLYPH-138DD;Lo;0;L;;;;;N;;;;; +138DE;EGYPTIAN HIEROGLYPH-138DE;Lo;0;L;;;;;N;;;;; +138DF;EGYPTIAN HIEROGLYPH-138DF;Lo;0;L;;;;;N;;;;; +138E0;EGYPTIAN HIEROGLYPH-138E0;Lo;0;L;;;;;N;;;;; +138E1;EGYPTIAN HIEROGLYPH-138E1;Lo;0;L;;;;;N;;;;; +138E2;EGYPTIAN HIEROGLYPH-138E2;Lo;0;L;;;;;N;;;;; +138E3;EGYPTIAN HIEROGLYPH-138E3;Lo;0;L;;;;;N;;;;; +138E4;EGYPTIAN HIEROGLYPH-138E4;Lo;0;L;;;;;N;;;;; +138E5;EGYPTIAN HIEROGLYPH-138E5;Lo;0;L;;;;;N;;;;; +138E6;EGYPTIAN HIEROGLYPH-138E6;Lo;0;L;;;;;N;;;;; +138E7;EGYPTIAN HIEROGLYPH-138E7;Lo;0;L;;;;;N;;;;; +138E8;EGYPTIAN HIEROGLYPH-138E8;Lo;0;L;;;;;N;;;;; +138E9;EGYPTIAN HIEROGLYPH-138E9;Lo;0;L;;;;;N;;;;; +138EA;EGYPTIAN HIEROGLYPH-138EA;Lo;0;L;;;;;N;;;;; +138EB;EGYPTIAN HIEROGLYPH-138EB;Lo;0;L;;;;;N;;;;; +138EC;EGYPTIAN HIEROGLYPH-138EC;Lo;0;L;;;;;N;;;;; +138ED;EGYPTIAN HIEROGLYPH-138ED;Lo;0;L;;;;;N;;;;; +138EE;EGYPTIAN HIEROGLYPH-138EE;Lo;0;L;;;;;N;;;;; +138EF;EGYPTIAN HIEROGLYPH-138EF;Lo;0;L;;;;;N;;;;; +138F0;EGYPTIAN HIEROGLYPH-138F0;Lo;0;L;;;;;N;;;;; +138F1;EGYPTIAN HIEROGLYPH-138F1;Lo;0;L;;;;;N;;;;; +138F2;EGYPTIAN HIEROGLYPH-138F2;Lo;0;L;;;;;N;;;;; +138F3;EGYPTIAN HIEROGLYPH-138F3;Lo;0;L;;;;;N;;;;; +138F4;EGYPTIAN HIEROGLYPH-138F4;Lo;0;L;;;;;N;;;;; +138F5;EGYPTIAN HIEROGLYPH-138F5;Lo;0;L;;;;;N;;;;; +138F6;EGYPTIAN HIEROGLYPH-138F6;Lo;0;L;;;;;N;;;;; +138F7;EGYPTIAN HIEROGLYPH-138F7;Lo;0;L;;;;;N;;;;; +138F8;EGYPTIAN HIEROGLYPH-138F8;Lo;0;L;;;;;N;;;;; +138F9;EGYPTIAN HIEROGLYPH-138F9;Lo;0;L;;;;;N;;;;; +138FA;EGYPTIAN HIEROGLYPH-138FA;Lo;0;L;;;;;N;;;;; +138FB;EGYPTIAN HIEROGLYPH-138FB;Lo;0;L;;;;;N;;;;; +138FC;EGYPTIAN HIEROGLYPH-138FC;Lo;0;L;;;;;N;;;;; +138FD;EGYPTIAN HIEROGLYPH-138FD;Lo;0;L;;;;;N;;;;; +138FE;EGYPTIAN HIEROGLYPH-138FE;Lo;0;L;;;;;N;;;;; +138FF;EGYPTIAN HIEROGLYPH-138FF;Lo;0;L;;;;;N;;;;; +13900;EGYPTIAN HIEROGLYPH-13900;Lo;0;L;;;;;N;;;;; +13901;EGYPTIAN HIEROGLYPH-13901;Lo;0;L;;;;;N;;;;; +13902;EGYPTIAN HIEROGLYPH-13902;Lo;0;L;;;;;N;;;;; +13903;EGYPTIAN HIEROGLYPH-13903;Lo;0;L;;;;;N;;;;; +13904;EGYPTIAN HIEROGLYPH-13904;Lo;0;L;;;;;N;;;;; +13905;EGYPTIAN HIEROGLYPH-13905;Lo;0;L;;;;;N;;;;; +13906;EGYPTIAN HIEROGLYPH-13906;Lo;0;L;;;;;N;;;;; +13907;EGYPTIAN HIEROGLYPH-13907;Lo;0;L;;;;;N;;;;; +13908;EGYPTIAN HIEROGLYPH-13908;Lo;0;L;;;;;N;;;;; +13909;EGYPTIAN HIEROGLYPH-13909;Lo;0;L;;;;;N;;;;; +1390A;EGYPTIAN HIEROGLYPH-1390A;Lo;0;L;;;;;N;;;;; +1390B;EGYPTIAN HIEROGLYPH-1390B;Lo;0;L;;;;;N;;;;; +1390C;EGYPTIAN HIEROGLYPH-1390C;Lo;0;L;;;;;N;;;;; +1390D;EGYPTIAN HIEROGLYPH-1390D;Lo;0;L;;;;;N;;;;; +1390E;EGYPTIAN HIEROGLYPH-1390E;Lo;0;L;;;;;N;;;;; +1390F;EGYPTIAN HIEROGLYPH-1390F;Lo;0;L;;;;;N;;;;; +13910;EGYPTIAN HIEROGLYPH-13910;Lo;0;L;;;;;N;;;;; +13911;EGYPTIAN HIEROGLYPH-13911;Lo;0;L;;;;;N;;;;; +13912;EGYPTIAN HIEROGLYPH-13912;Lo;0;L;;;;;N;;;;; +13913;EGYPTIAN HIEROGLYPH-13913;Lo;0;L;;;;;N;;;;; +13914;EGYPTIAN HIEROGLYPH-13914;Lo;0;L;;;;;N;;;;; +13915;EGYPTIAN HIEROGLYPH-13915;Lo;0;L;;;;;N;;;;; +13916;EGYPTIAN HIEROGLYPH-13916;Lo;0;L;;;;;N;;;;; +13917;EGYPTIAN HIEROGLYPH-13917;Lo;0;L;;;;;N;;;;; +13918;EGYPTIAN HIEROGLYPH-13918;Lo;0;L;;;;;N;;;;; +13919;EGYPTIAN HIEROGLYPH-13919;Lo;0;L;;;;;N;;;;; +1391A;EGYPTIAN HIEROGLYPH-1391A;Lo;0;L;;;;;N;;;;; +1391B;EGYPTIAN HIEROGLYPH-1391B;Lo;0;L;;;;;N;;;;; +1391C;EGYPTIAN HIEROGLYPH-1391C;Lo;0;L;;;;;N;;;;; +1391D;EGYPTIAN HIEROGLYPH-1391D;Lo;0;L;;;;;N;;;;; +1391E;EGYPTIAN HIEROGLYPH-1391E;Lo;0;L;;;;;N;;;;; +1391F;EGYPTIAN HIEROGLYPH-1391F;Lo;0;L;;;;;N;;;;; +13920;EGYPTIAN HIEROGLYPH-13920;Lo;0;L;;;;;N;;;;; +13921;EGYPTIAN HIEROGLYPH-13921;Lo;0;L;;;;;N;;;;; +13922;EGYPTIAN HIEROGLYPH-13922;Lo;0;L;;;;;N;;;;; +13923;EGYPTIAN HIEROGLYPH-13923;Lo;0;L;;;;;N;;;;; +13924;EGYPTIAN HIEROGLYPH-13924;Lo;0;L;;;;;N;;;;; +13925;EGYPTIAN HIEROGLYPH-13925;Lo;0;L;;;;;N;;;;; +13926;EGYPTIAN HIEROGLYPH-13926;Lo;0;L;;;;;N;;;;; +13927;EGYPTIAN HIEROGLYPH-13927;Lo;0;L;;;;;N;;;;; +13928;EGYPTIAN HIEROGLYPH-13928;Lo;0;L;;;;;N;;;;; +13929;EGYPTIAN HIEROGLYPH-13929;Lo;0;L;;;;;N;;;;; +1392A;EGYPTIAN HIEROGLYPH-1392A;Lo;0;L;;;;;N;;;;; +1392B;EGYPTIAN HIEROGLYPH-1392B;Lo;0;L;;;;;N;;;;; +1392C;EGYPTIAN HIEROGLYPH-1392C;Lo;0;L;;;;;N;;;;; +1392D;EGYPTIAN HIEROGLYPH-1392D;Lo;0;L;;;;;N;;;;; +1392E;EGYPTIAN HIEROGLYPH-1392E;Lo;0;L;;;;;N;;;;; +1392F;EGYPTIAN HIEROGLYPH-1392F;Lo;0;L;;;;;N;;;;; +13930;EGYPTIAN HIEROGLYPH-13930;Lo;0;L;;;;;N;;;;; +13931;EGYPTIAN HIEROGLYPH-13931;Lo;0;L;;;;;N;;;;; +13932;EGYPTIAN HIEROGLYPH-13932;Lo;0;L;;;;;N;;;;; +13933;EGYPTIAN HIEROGLYPH-13933;Lo;0;L;;;;;N;;;;; +13934;EGYPTIAN HIEROGLYPH-13934;Lo;0;L;;;;;N;;;;; +13935;EGYPTIAN HIEROGLYPH-13935;Lo;0;L;;;;;N;;;;; +13936;EGYPTIAN HIEROGLYPH-13936;Lo;0;L;;;;;N;;;;; +13937;EGYPTIAN HIEROGLYPH-13937;Lo;0;L;;;;;N;;;;; +13938;EGYPTIAN HIEROGLYPH-13938;Lo;0;L;;;;;N;;;;; +13939;EGYPTIAN HIEROGLYPH-13939;Lo;0;L;;;;;N;;;;; +1393A;EGYPTIAN HIEROGLYPH-1393A;Lo;0;L;;;;;N;;;;; +1393B;EGYPTIAN HIEROGLYPH-1393B;Lo;0;L;;;;;N;;;;; +1393C;EGYPTIAN HIEROGLYPH-1393C;Lo;0;L;;;;;N;;;;; +1393D;EGYPTIAN HIEROGLYPH-1393D;Lo;0;L;;;;;N;;;;; +1393E;EGYPTIAN HIEROGLYPH-1393E;Lo;0;L;;;;;N;;;;; +1393F;EGYPTIAN HIEROGLYPH-1393F;Lo;0;L;;;;;N;;;;; +13940;EGYPTIAN HIEROGLYPH-13940;Lo;0;L;;;;;N;;;;; +13941;EGYPTIAN HIEROGLYPH-13941;Lo;0;L;;;;;N;;;;; +13942;EGYPTIAN HIEROGLYPH-13942;Lo;0;L;;;;;N;;;;; +13943;EGYPTIAN HIEROGLYPH-13943;Lo;0;L;;;;;N;;;;; +13944;EGYPTIAN HIEROGLYPH-13944;Lo;0;L;;;;;N;;;;; +13945;EGYPTIAN HIEROGLYPH-13945;Lo;0;L;;;;;N;;;;; +13946;EGYPTIAN HIEROGLYPH-13946;Lo;0;L;;;;;N;;;;; +13947;EGYPTIAN HIEROGLYPH-13947;Lo;0;L;;;;;N;;;;; +13948;EGYPTIAN HIEROGLYPH-13948;Lo;0;L;;;;;N;;;;; +13949;EGYPTIAN HIEROGLYPH-13949;Lo;0;L;;;;;N;;;;; +1394A;EGYPTIAN HIEROGLYPH-1394A;Lo;0;L;;;;;N;;;;; +1394B;EGYPTIAN HIEROGLYPH-1394B;Lo;0;L;;;;;N;;;;; +1394C;EGYPTIAN HIEROGLYPH-1394C;Lo;0;L;;;;;N;;;;; +1394D;EGYPTIAN HIEROGLYPH-1394D;Lo;0;L;;;;;N;;;;; +1394E;EGYPTIAN HIEROGLYPH-1394E;Lo;0;L;;;;;N;;;;; +1394F;EGYPTIAN HIEROGLYPH-1394F;Lo;0;L;;;;;N;;;;; +13950;EGYPTIAN HIEROGLYPH-13950;Lo;0;L;;;;;N;;;;; +13951;EGYPTIAN HIEROGLYPH-13951;Lo;0;L;;;;;N;;;;; +13952;EGYPTIAN HIEROGLYPH-13952;Lo;0;L;;;;;N;;;;; +13953;EGYPTIAN HIEROGLYPH-13953;Lo;0;L;;;;;N;;;;; +13954;EGYPTIAN HIEROGLYPH-13954;Lo;0;L;;;;;N;;;;; +13955;EGYPTIAN HIEROGLYPH-13955;Lo;0;L;;;;;N;;;;; +13956;EGYPTIAN HIEROGLYPH-13956;Lo;0;L;;;;;N;;;;; +13957;EGYPTIAN HIEROGLYPH-13957;Lo;0;L;;;;;N;;;;; +13958;EGYPTIAN HIEROGLYPH-13958;Lo;0;L;;;;;N;;;;; +13959;EGYPTIAN HIEROGLYPH-13959;Lo;0;L;;;;;N;;;;; +1395A;EGYPTIAN HIEROGLYPH-1395A;Lo;0;L;;;;;N;;;;; +1395B;EGYPTIAN HIEROGLYPH-1395B;Lo;0;L;;;;;N;;;;; +1395C;EGYPTIAN HIEROGLYPH-1395C;Lo;0;L;;;;;N;;;;; +1395D;EGYPTIAN HIEROGLYPH-1395D;Lo;0;L;;;;;N;;;;; +1395E;EGYPTIAN HIEROGLYPH-1395E;Lo;0;L;;;;;N;;;;; +1395F;EGYPTIAN HIEROGLYPH-1395F;Lo;0;L;;;;;N;;;;; +13960;EGYPTIAN HIEROGLYPH-13960;Lo;0;L;;;;;N;;;;; +13961;EGYPTIAN HIEROGLYPH-13961;Lo;0;L;;;;;N;;;;; +13962;EGYPTIAN HIEROGLYPH-13962;Lo;0;L;;;;;N;;;;; +13963;EGYPTIAN HIEROGLYPH-13963;Lo;0;L;;;;;N;;;;; +13964;EGYPTIAN HIEROGLYPH-13964;Lo;0;L;;;;;N;;;;; +13965;EGYPTIAN HIEROGLYPH-13965;Lo;0;L;;;;;N;;;;; +13966;EGYPTIAN HIEROGLYPH-13966;Lo;0;L;;;;;N;;;;; +13967;EGYPTIAN HIEROGLYPH-13967;Lo;0;L;;;;;N;;;;; +13968;EGYPTIAN HIEROGLYPH-13968;Lo;0;L;;;;;N;;;;; +13969;EGYPTIAN HIEROGLYPH-13969;Lo;0;L;;;;;N;;;;; +1396A;EGYPTIAN HIEROGLYPH-1396A;Lo;0;L;;;;;N;;;;; +1396B;EGYPTIAN HIEROGLYPH-1396B;Lo;0;L;;;;;N;;;;; +1396C;EGYPTIAN HIEROGLYPH-1396C;Lo;0;L;;;;;N;;;;; +1396D;EGYPTIAN HIEROGLYPH-1396D;Lo;0;L;;;;;N;;;;; +1396E;EGYPTIAN HIEROGLYPH-1396E;Lo;0;L;;;;;N;;;;; +1396F;EGYPTIAN HIEROGLYPH-1396F;Lo;0;L;;;;;N;;;;; +13970;EGYPTIAN HIEROGLYPH-13970;Lo;0;L;;;;;N;;;;; +13971;EGYPTIAN HIEROGLYPH-13971;Lo;0;L;;;;;N;;;;; +13972;EGYPTIAN HIEROGLYPH-13972;Lo;0;L;;;;;N;;;;; +13973;EGYPTIAN HIEROGLYPH-13973;Lo;0;L;;;;;N;;;;; +13974;EGYPTIAN HIEROGLYPH-13974;Lo;0;L;;;;;N;;;;; +13975;EGYPTIAN HIEROGLYPH-13975;Lo;0;L;;;;;N;;;;; +13976;EGYPTIAN HIEROGLYPH-13976;Lo;0;L;;;;;N;;;;; +13977;EGYPTIAN HIEROGLYPH-13977;Lo;0;L;;;;;N;;;;; +13978;EGYPTIAN HIEROGLYPH-13978;Lo;0;L;;;;;N;;;;; +13979;EGYPTIAN HIEROGLYPH-13979;Lo;0;L;;;;;N;;;;; +1397A;EGYPTIAN HIEROGLYPH-1397A;Lo;0;L;;;;;N;;;;; +1397B;EGYPTIAN HIEROGLYPH-1397B;Lo;0;L;;;;;N;;;;; +1397C;EGYPTIAN HIEROGLYPH-1397C;Lo;0;L;;;;;N;;;;; +1397D;EGYPTIAN HIEROGLYPH-1397D;Lo;0;L;;;;;N;;;;; +1397E;EGYPTIAN HIEROGLYPH-1397E;Lo;0;L;;;;;N;;;;; +1397F;EGYPTIAN HIEROGLYPH-1397F;Lo;0;L;;;;;N;;;;; +13980;EGYPTIAN HIEROGLYPH-13980;Lo;0;L;;;;;N;;;;; +13981;EGYPTIAN HIEROGLYPH-13981;Lo;0;L;;;;;N;;;;; +13982;EGYPTIAN HIEROGLYPH-13982;Lo;0;L;;;;;N;;;;; +13983;EGYPTIAN HIEROGLYPH-13983;Lo;0;L;;;;;N;;;;; +13984;EGYPTIAN HIEROGLYPH-13984;Lo;0;L;;;;;N;;;;; +13985;EGYPTIAN HIEROGLYPH-13985;Lo;0;L;;;;;N;;;;; +13986;EGYPTIAN HIEROGLYPH-13986;Lo;0;L;;;;;N;;;;; +13987;EGYPTIAN HIEROGLYPH-13987;Lo;0;L;;;;;N;;;;; +13988;EGYPTIAN HIEROGLYPH-13988;Lo;0;L;;;;;N;;;;; +13989;EGYPTIAN HIEROGLYPH-13989;Lo;0;L;;;;;N;;;;; +1398A;EGYPTIAN HIEROGLYPH-1398A;Lo;0;L;;;;;N;;;;; +1398B;EGYPTIAN HIEROGLYPH-1398B;Lo;0;L;;;;;N;;;;; +1398C;EGYPTIAN HIEROGLYPH-1398C;Lo;0;L;;;;;N;;;;; +1398D;EGYPTIAN HIEROGLYPH-1398D;Lo;0;L;;;;;N;;;;; +1398E;EGYPTIAN HIEROGLYPH-1398E;Lo;0;L;;;;;N;;;;; +1398F;EGYPTIAN HIEROGLYPH-1398F;Lo;0;L;;;;;N;;;;; +13990;EGYPTIAN HIEROGLYPH-13990;Lo;0;L;;;;;N;;;;; +13991;EGYPTIAN HIEROGLYPH-13991;Lo;0;L;;;;;N;;;;; +13992;EGYPTIAN HIEROGLYPH-13992;Lo;0;L;;;;;N;;;;; +13993;EGYPTIAN HIEROGLYPH-13993;Lo;0;L;;;;;N;;;;; +13994;EGYPTIAN HIEROGLYPH-13994;Lo;0;L;;;;;N;;;;; +13995;EGYPTIAN HIEROGLYPH-13995;Lo;0;L;;;;;N;;;;; +13996;EGYPTIAN HIEROGLYPH-13996;Lo;0;L;;;;;N;;;;; +13997;EGYPTIAN HIEROGLYPH-13997;Lo;0;L;;;;;N;;;;; +13998;EGYPTIAN HIEROGLYPH-13998;Lo;0;L;;;;;N;;;;; +13999;EGYPTIAN HIEROGLYPH-13999;Lo;0;L;;;;;N;;;;; +1399A;EGYPTIAN HIEROGLYPH-1399A;Lo;0;L;;;;;N;;;;; +1399B;EGYPTIAN HIEROGLYPH-1399B;Lo;0;L;;;;;N;;;;; +1399C;EGYPTIAN HIEROGLYPH-1399C;Lo;0;L;;;;;N;;;;; +1399D;EGYPTIAN HIEROGLYPH-1399D;Lo;0;L;;;;;N;;;;; +1399E;EGYPTIAN HIEROGLYPH-1399E;Lo;0;L;;;;;N;;;;; +1399F;EGYPTIAN HIEROGLYPH-1399F;Lo;0;L;;;;;N;;;;; +139A0;EGYPTIAN HIEROGLYPH-139A0;Lo;0;L;;;;;N;;;;; +139A1;EGYPTIAN HIEROGLYPH-139A1;Lo;0;L;;;;;N;;;;; +139A2;EGYPTIAN HIEROGLYPH-139A2;Lo;0;L;;;;;N;;;;; +139A3;EGYPTIAN HIEROGLYPH-139A3;Lo;0;L;;;;;N;;;;; +139A4;EGYPTIAN HIEROGLYPH-139A4;Lo;0;L;;;;;N;;;;; +139A5;EGYPTIAN HIEROGLYPH-139A5;Lo;0;L;;;;;N;;;;; +139A6;EGYPTIAN HIEROGLYPH-139A6;Lo;0;L;;;;;N;;;;; +139A7;EGYPTIAN HIEROGLYPH-139A7;Lo;0;L;;;;;N;;;;; +139A8;EGYPTIAN HIEROGLYPH-139A8;Lo;0;L;;;;;N;;;;; +139A9;EGYPTIAN HIEROGLYPH-139A9;Lo;0;L;;;;;N;;;;; +139AA;EGYPTIAN HIEROGLYPH-139AA;Lo;0;L;;;;;N;;;;; +139AB;EGYPTIAN HIEROGLYPH-139AB;Lo;0;L;;;;;N;;;;; +139AC;EGYPTIAN HIEROGLYPH-139AC;Lo;0;L;;;;;N;;;;; +139AD;EGYPTIAN HIEROGLYPH-139AD;Lo;0;L;;;;;N;;;;; +139AE;EGYPTIAN HIEROGLYPH-139AE;Lo;0;L;;;;;N;;;;; +139AF;EGYPTIAN HIEROGLYPH-139AF;Lo;0;L;;;;;N;;;;; +139B0;EGYPTIAN HIEROGLYPH-139B0;Lo;0;L;;;;;N;;;;; +139B1;EGYPTIAN HIEROGLYPH-139B1;Lo;0;L;;;;;N;;;;; +139B2;EGYPTIAN HIEROGLYPH-139B2;Lo;0;L;;;;;N;;;;; +139B3;EGYPTIAN HIEROGLYPH-139B3;Lo;0;L;;;;;N;;;;; +139B4;EGYPTIAN HIEROGLYPH-139B4;Lo;0;L;;;;;N;;;;; +139B5;EGYPTIAN HIEROGLYPH-139B5;Lo;0;L;;;;;N;;;;; +139B6;EGYPTIAN HIEROGLYPH-139B6;Lo;0;L;;;;;N;;;;; +139B7;EGYPTIAN HIEROGLYPH-139B7;Lo;0;L;;;;;N;;;;; +139B8;EGYPTIAN HIEROGLYPH-139B8;Lo;0;L;;;;;N;;;;; +139B9;EGYPTIAN HIEROGLYPH-139B9;Lo;0;L;;;;;N;;;;; +139BA;EGYPTIAN HIEROGLYPH-139BA;Lo;0;L;;;;;N;;;;; +139BB;EGYPTIAN HIEROGLYPH-139BB;Lo;0;L;;;;;N;;;;; +139BC;EGYPTIAN HIEROGLYPH-139BC;Lo;0;L;;;;;N;;;;; +139BD;EGYPTIAN HIEROGLYPH-139BD;Lo;0;L;;;;;N;;;;; +139BE;EGYPTIAN HIEROGLYPH-139BE;Lo;0;L;;;;;N;;;;; +139BF;EGYPTIAN HIEROGLYPH-139BF;Lo;0;L;;;;;N;;;;; +139C0;EGYPTIAN HIEROGLYPH-139C0;Lo;0;L;;;;;N;;;;; +139C1;EGYPTIAN HIEROGLYPH-139C1;Lo;0;L;;;;;N;;;;; +139C2;EGYPTIAN HIEROGLYPH-139C2;Lo;0;L;;;;;N;;;;; +139C3;EGYPTIAN HIEROGLYPH-139C3;Lo;0;L;;;;;N;;;;; +139C4;EGYPTIAN HIEROGLYPH-139C4;Lo;0;L;;;;;N;;;;; +139C5;EGYPTIAN HIEROGLYPH-139C5;Lo;0;L;;;;;N;;;;; +139C6;EGYPTIAN HIEROGLYPH-139C6;Lo;0;L;;;;;N;;;;; +139C7;EGYPTIAN HIEROGLYPH-139C7;Lo;0;L;;;;;N;;;;; +139C8;EGYPTIAN HIEROGLYPH-139C8;Lo;0;L;;;;;N;;;;; +139C9;EGYPTIAN HIEROGLYPH-139C9;Lo;0;L;;;;;N;;;;; +139CA;EGYPTIAN HIEROGLYPH-139CA;Lo;0;L;;;;;N;;;;; +139CB;EGYPTIAN HIEROGLYPH-139CB;Lo;0;L;;;;;N;;;;; +139CC;EGYPTIAN HIEROGLYPH-139CC;Lo;0;L;;;;;N;;;;; +139CD;EGYPTIAN HIEROGLYPH-139CD;Lo;0;L;;;;;N;;;;; +139CE;EGYPTIAN HIEROGLYPH-139CE;Lo;0;L;;;;;N;;;;; +139CF;EGYPTIAN HIEROGLYPH-139CF;Lo;0;L;;;;;N;;;;; +139D0;EGYPTIAN HIEROGLYPH-139D0;Lo;0;L;;;;;N;;;;; +139D1;EGYPTIAN HIEROGLYPH-139D1;Lo;0;L;;;;;N;;;;; +139D2;EGYPTIAN HIEROGLYPH-139D2;Lo;0;L;;;;;N;;;;; +139D3;EGYPTIAN HIEROGLYPH-139D3;Lo;0;L;;;;;N;;;;; +139D4;EGYPTIAN HIEROGLYPH-139D4;Lo;0;L;;;;;N;;;;; +139D5;EGYPTIAN HIEROGLYPH-139D5;Lo;0;L;;;;;N;;;;; +139D6;EGYPTIAN HIEROGLYPH-139D6;Lo;0;L;;;;;N;;;;; +139D7;EGYPTIAN HIEROGLYPH-139D7;Lo;0;L;;;;;N;;;;; +139D8;EGYPTIAN HIEROGLYPH-139D8;Lo;0;L;;;;;N;;;;; +139D9;EGYPTIAN HIEROGLYPH-139D9;Lo;0;L;;;;;N;;;;; +139DA;EGYPTIAN HIEROGLYPH-139DA;Lo;0;L;;;;;N;;;;; +139DB;EGYPTIAN HIEROGLYPH-139DB;Lo;0;L;;;;;N;;;;; +139DC;EGYPTIAN HIEROGLYPH-139DC;Lo;0;L;;;;;N;;;;; +139DD;EGYPTIAN HIEROGLYPH-139DD;Lo;0;L;;;;;N;;;;; +139DE;EGYPTIAN HIEROGLYPH-139DE;Lo;0;L;;;;;N;;;;; +139DF;EGYPTIAN HIEROGLYPH-139DF;Lo;0;L;;;;;N;;;;; +139E0;EGYPTIAN HIEROGLYPH-139E0;Lo;0;L;;;;;N;;;;; +139E1;EGYPTIAN HIEROGLYPH-139E1;Lo;0;L;;;;;N;;;;; +139E2;EGYPTIAN HIEROGLYPH-139E2;Lo;0;L;;;;;N;;;;; +139E3;EGYPTIAN HIEROGLYPH-139E3;Lo;0;L;;;;;N;;;;; +139E4;EGYPTIAN HIEROGLYPH-139E4;Lo;0;L;;;;;N;;;;; +139E5;EGYPTIAN HIEROGLYPH-139E5;Lo;0;L;;;;;N;;;;; +139E6;EGYPTIAN HIEROGLYPH-139E6;Lo;0;L;;;;;N;;;;; +139E7;EGYPTIAN HIEROGLYPH-139E7;Lo;0;L;;;;;N;;;;; +139E8;EGYPTIAN HIEROGLYPH-139E8;Lo;0;L;;;;;N;;;;; +139E9;EGYPTIAN HIEROGLYPH-139E9;Lo;0;L;;;;;N;;;;; +139EA;EGYPTIAN HIEROGLYPH-139EA;Lo;0;L;;;;;N;;;;; +139EB;EGYPTIAN HIEROGLYPH-139EB;Lo;0;L;;;;;N;;;;; +139EC;EGYPTIAN HIEROGLYPH-139EC;Lo;0;L;;;;;N;;;;; +139ED;EGYPTIAN HIEROGLYPH-139ED;Lo;0;L;;;;;N;;;;; +139EE;EGYPTIAN HIEROGLYPH-139EE;Lo;0;L;;;;;N;;;;; +139EF;EGYPTIAN HIEROGLYPH-139EF;Lo;0;L;;;;;N;;;;; +139F0;EGYPTIAN HIEROGLYPH-139F0;Lo;0;L;;;;;N;;;;; +139F1;EGYPTIAN HIEROGLYPH-139F1;Lo;0;L;;;;;N;;;;; +139F2;EGYPTIAN HIEROGLYPH-139F2;Lo;0;L;;;;;N;;;;; +139F3;EGYPTIAN HIEROGLYPH-139F3;Lo;0;L;;;;;N;;;;; +139F4;EGYPTIAN HIEROGLYPH-139F4;Lo;0;L;;;;;N;;;;; +139F5;EGYPTIAN HIEROGLYPH-139F5;Lo;0;L;;;;;N;;;;; +139F6;EGYPTIAN HIEROGLYPH-139F6;Lo;0;L;;;;;N;;;;; +139F7;EGYPTIAN HIEROGLYPH-139F7;Lo;0;L;;;;;N;;;;; +139F8;EGYPTIAN HIEROGLYPH-139F8;Lo;0;L;;;;;N;;;;; +139F9;EGYPTIAN HIEROGLYPH-139F9;Lo;0;L;;;;;N;;;;; +139FA;EGYPTIAN HIEROGLYPH-139FA;Lo;0;L;;;;;N;;;;; +139FB;EGYPTIAN HIEROGLYPH-139FB;Lo;0;L;;;;;N;;;;; +139FC;EGYPTIAN HIEROGLYPH-139FC;Lo;0;L;;;;;N;;;;; +139FD;EGYPTIAN HIEROGLYPH-139FD;Lo;0;L;;;;;N;;;;; +139FE;EGYPTIAN HIEROGLYPH-139FE;Lo;0;L;;;;;N;;;;; +139FF;EGYPTIAN HIEROGLYPH-139FF;Lo;0;L;;;;;N;;;;; +13A00;EGYPTIAN HIEROGLYPH-13A00;Lo;0;L;;;;;N;;;;; +13A01;EGYPTIAN HIEROGLYPH-13A01;Lo;0;L;;;;;N;;;;; +13A02;EGYPTIAN HIEROGLYPH-13A02;Lo;0;L;;;;;N;;;;; +13A03;EGYPTIAN HIEROGLYPH-13A03;Lo;0;L;;;;;N;;;;; +13A04;EGYPTIAN HIEROGLYPH-13A04;Lo;0;L;;;;;N;;;;; +13A05;EGYPTIAN HIEROGLYPH-13A05;Lo;0;L;;;;;N;;;;; +13A06;EGYPTIAN HIEROGLYPH-13A06;Lo;0;L;;;;;N;;;;; +13A07;EGYPTIAN HIEROGLYPH-13A07;Lo;0;L;;;;;N;;;;; +13A08;EGYPTIAN HIEROGLYPH-13A08;Lo;0;L;;;;;N;;;;; +13A09;EGYPTIAN HIEROGLYPH-13A09;Lo;0;L;;;;;N;;;;; +13A0A;EGYPTIAN HIEROGLYPH-13A0A;Lo;0;L;;;;;N;;;;; +13A0B;EGYPTIAN HIEROGLYPH-13A0B;Lo;0;L;;;;;N;;;;; +13A0C;EGYPTIAN HIEROGLYPH-13A0C;Lo;0;L;;;;;N;;;;; +13A0D;EGYPTIAN HIEROGLYPH-13A0D;Lo;0;L;;;;;N;;;;; +13A0E;EGYPTIAN HIEROGLYPH-13A0E;Lo;0;L;;;;;N;;;;; +13A0F;EGYPTIAN HIEROGLYPH-13A0F;Lo;0;L;;;;;N;;;;; +13A10;EGYPTIAN HIEROGLYPH-13A10;Lo;0;L;;;;;N;;;;; +13A11;EGYPTIAN HIEROGLYPH-13A11;Lo;0;L;;;;;N;;;;; +13A12;EGYPTIAN HIEROGLYPH-13A12;Lo;0;L;;;;;N;;;;; +13A13;EGYPTIAN HIEROGLYPH-13A13;Lo;0;L;;;;;N;;;;; +13A14;EGYPTIAN HIEROGLYPH-13A14;Lo;0;L;;;;;N;;;;; +13A15;EGYPTIAN HIEROGLYPH-13A15;Lo;0;L;;;;;N;;;;; +13A16;EGYPTIAN HIEROGLYPH-13A16;Lo;0;L;;;;;N;;;;; +13A17;EGYPTIAN HIEROGLYPH-13A17;Lo;0;L;;;;;N;;;;; +13A18;EGYPTIAN HIEROGLYPH-13A18;Lo;0;L;;;;;N;;;;; +13A19;EGYPTIAN HIEROGLYPH-13A19;Lo;0;L;;;;;N;;;;; +13A1A;EGYPTIAN HIEROGLYPH-13A1A;Lo;0;L;;;;;N;;;;; +13A1B;EGYPTIAN HIEROGLYPH-13A1B;Lo;0;L;;;;;N;;;;; +13A1C;EGYPTIAN HIEROGLYPH-13A1C;Lo;0;L;;;;;N;;;;; +13A1D;EGYPTIAN HIEROGLYPH-13A1D;Lo;0;L;;;;;N;;;;; +13A1E;EGYPTIAN HIEROGLYPH-13A1E;Lo;0;L;;;;;N;;;;; +13A1F;EGYPTIAN HIEROGLYPH-13A1F;Lo;0;L;;;;;N;;;;; +13A20;EGYPTIAN HIEROGLYPH-13A20;Lo;0;L;;;;;N;;;;; +13A21;EGYPTIAN HIEROGLYPH-13A21;Lo;0;L;;;;;N;;;;; +13A22;EGYPTIAN HIEROGLYPH-13A22;Lo;0;L;;;;;N;;;;; +13A23;EGYPTIAN HIEROGLYPH-13A23;Lo;0;L;;;;;N;;;;; +13A24;EGYPTIAN HIEROGLYPH-13A24;Lo;0;L;;;;;N;;;;; +13A25;EGYPTIAN HIEROGLYPH-13A25;Lo;0;L;;;;;N;;;;; +13A26;EGYPTIAN HIEROGLYPH-13A26;Lo;0;L;;;;;N;;;;; +13A27;EGYPTIAN HIEROGLYPH-13A27;Lo;0;L;;;;;N;;;;; +13A28;EGYPTIAN HIEROGLYPH-13A28;Lo;0;L;;;;;N;;;;; +13A29;EGYPTIAN HIEROGLYPH-13A29;Lo;0;L;;;;;N;;;;; +13A2A;EGYPTIAN HIEROGLYPH-13A2A;Lo;0;L;;;;;N;;;;; +13A2B;EGYPTIAN HIEROGLYPH-13A2B;Lo;0;L;;;;;N;;;;; +13A2C;EGYPTIAN HIEROGLYPH-13A2C;Lo;0;L;;;;;N;;;;; +13A2D;EGYPTIAN HIEROGLYPH-13A2D;Lo;0;L;;;;;N;;;;; +13A2E;EGYPTIAN HIEROGLYPH-13A2E;Lo;0;L;;;;;N;;;;; +13A2F;EGYPTIAN HIEROGLYPH-13A2F;Lo;0;L;;;;;N;;;;; +13A30;EGYPTIAN HIEROGLYPH-13A30;Lo;0;L;;;;;N;;;;; +13A31;EGYPTIAN HIEROGLYPH-13A31;Lo;0;L;;;;;N;;;;; +13A32;EGYPTIAN HIEROGLYPH-13A32;Lo;0;L;;;;;N;;;;; +13A33;EGYPTIAN HIEROGLYPH-13A33;Lo;0;L;;;;;N;;;;; +13A34;EGYPTIAN HIEROGLYPH-13A34;Lo;0;L;;;;;N;;;;; +13A35;EGYPTIAN HIEROGLYPH-13A35;Lo;0;L;;;;;N;;;;; +13A36;EGYPTIAN HIEROGLYPH-13A36;Lo;0;L;;;;;N;;;;; +13A37;EGYPTIAN HIEROGLYPH-13A37;Lo;0;L;;;;;N;;;;; +13A38;EGYPTIAN HIEROGLYPH-13A38;Lo;0;L;;;;;N;;;;; +13A39;EGYPTIAN HIEROGLYPH-13A39;Lo;0;L;;;;;N;;;;; +13A3A;EGYPTIAN HIEROGLYPH-13A3A;Lo;0;L;;;;;N;;;;; +13A3B;EGYPTIAN HIEROGLYPH-13A3B;Lo;0;L;;;;;N;;;;; +13A3C;EGYPTIAN HIEROGLYPH-13A3C;Lo;0;L;;;;;N;;;;; +13A3D;EGYPTIAN HIEROGLYPH-13A3D;Lo;0;L;;;;;N;;;;; +13A3E;EGYPTIAN HIEROGLYPH-13A3E;Lo;0;L;;;;;N;;;;; +13A3F;EGYPTIAN HIEROGLYPH-13A3F;Lo;0;L;;;;;N;;;;; +13A40;EGYPTIAN HIEROGLYPH-13A40;Lo;0;L;;;;;N;;;;; +13A41;EGYPTIAN HIEROGLYPH-13A41;Lo;0;L;;;;;N;;;;; +13A42;EGYPTIAN HIEROGLYPH-13A42;Lo;0;L;;;;;N;;;;; +13A43;EGYPTIAN HIEROGLYPH-13A43;Lo;0;L;;;;;N;;;;; +13A44;EGYPTIAN HIEROGLYPH-13A44;Lo;0;L;;;;;N;;;;; +13A45;EGYPTIAN HIEROGLYPH-13A45;Lo;0;L;;;;;N;;;;; +13A46;EGYPTIAN HIEROGLYPH-13A46;Lo;0;L;;;;;N;;;;; +13A47;EGYPTIAN HIEROGLYPH-13A47;Lo;0;L;;;;;N;;;;; +13A48;EGYPTIAN HIEROGLYPH-13A48;Lo;0;L;;;;;N;;;;; +13A49;EGYPTIAN HIEROGLYPH-13A49;Lo;0;L;;;;;N;;;;; +13A4A;EGYPTIAN HIEROGLYPH-13A4A;Lo;0;L;;;;;N;;;;; +13A4B;EGYPTIAN HIEROGLYPH-13A4B;Lo;0;L;;;;;N;;;;; +13A4C;EGYPTIAN HIEROGLYPH-13A4C;Lo;0;L;;;;;N;;;;; +13A4D;EGYPTIAN HIEROGLYPH-13A4D;Lo;0;L;;;;;N;;;;; +13A4E;EGYPTIAN HIEROGLYPH-13A4E;Lo;0;L;;;;;N;;;;; +13A4F;EGYPTIAN HIEROGLYPH-13A4F;Lo;0;L;;;;;N;;;;; +13A50;EGYPTIAN HIEROGLYPH-13A50;Lo;0;L;;;;;N;;;;; +13A51;EGYPTIAN HIEROGLYPH-13A51;Lo;0;L;;;;;N;;;;; +13A52;EGYPTIAN HIEROGLYPH-13A52;Lo;0;L;;;;;N;;;;; +13A53;EGYPTIAN HIEROGLYPH-13A53;Lo;0;L;;;;;N;;;;; +13A54;EGYPTIAN HIEROGLYPH-13A54;Lo;0;L;;;;;N;;;;; +13A55;EGYPTIAN HIEROGLYPH-13A55;Lo;0;L;;;;;N;;;;; +13A56;EGYPTIAN HIEROGLYPH-13A56;Lo;0;L;;;;;N;;;;; +13A57;EGYPTIAN HIEROGLYPH-13A57;Lo;0;L;;;;;N;;;;; +13A58;EGYPTIAN HIEROGLYPH-13A58;Lo;0;L;;;;;N;;;;; +13A59;EGYPTIAN HIEROGLYPH-13A59;Lo;0;L;;;;;N;;;;; +13A5A;EGYPTIAN HIEROGLYPH-13A5A;Lo;0;L;;;;;N;;;;; +13A5B;EGYPTIAN HIEROGLYPH-13A5B;Lo;0;L;;;;;N;;;;; +13A5C;EGYPTIAN HIEROGLYPH-13A5C;Lo;0;L;;;;;N;;;;; +13A5D;EGYPTIAN HIEROGLYPH-13A5D;Lo;0;L;;;;;N;;;;; +13A5E;EGYPTIAN HIEROGLYPH-13A5E;Lo;0;L;;;;;N;;;;; +13A5F;EGYPTIAN HIEROGLYPH-13A5F;Lo;0;L;;;;;N;;;;; +13A60;EGYPTIAN HIEROGLYPH-13A60;Lo;0;L;;;;;N;;;;; +13A61;EGYPTIAN HIEROGLYPH-13A61;Lo;0;L;;;;;N;;;;; +13A62;EGYPTIAN HIEROGLYPH-13A62;Lo;0;L;;;;;N;;;;; +13A63;EGYPTIAN HIEROGLYPH-13A63;Lo;0;L;;;;;N;;;;; +13A64;EGYPTIAN HIEROGLYPH-13A64;Lo;0;L;;;;;N;;;;; +13A65;EGYPTIAN HIEROGLYPH-13A65;Lo;0;L;;;;;N;;;;; +13A66;EGYPTIAN HIEROGLYPH-13A66;Lo;0;L;;;;;N;;;;; +13A67;EGYPTIAN HIEROGLYPH-13A67;Lo;0;L;;;;;N;;;;; +13A68;EGYPTIAN HIEROGLYPH-13A68;Lo;0;L;;;;;N;;;;; +13A69;EGYPTIAN HIEROGLYPH-13A69;Lo;0;L;;;;;N;;;;; +13A6A;EGYPTIAN HIEROGLYPH-13A6A;Lo;0;L;;;;;N;;;;; +13A6B;EGYPTIAN HIEROGLYPH-13A6B;Lo;0;L;;;;;N;;;;; +13A6C;EGYPTIAN HIEROGLYPH-13A6C;Lo;0;L;;;;;N;;;;; +13A6D;EGYPTIAN HIEROGLYPH-13A6D;Lo;0;L;;;;;N;;;;; +13A6E;EGYPTIAN HIEROGLYPH-13A6E;Lo;0;L;;;;;N;;;;; +13A6F;EGYPTIAN HIEROGLYPH-13A6F;Lo;0;L;;;;;N;;;;; +13A70;EGYPTIAN HIEROGLYPH-13A70;Lo;0;L;;;;;N;;;;; +13A71;EGYPTIAN HIEROGLYPH-13A71;Lo;0;L;;;;;N;;;;; +13A72;EGYPTIAN HIEROGLYPH-13A72;Lo;0;L;;;;;N;;;;; +13A73;EGYPTIAN HIEROGLYPH-13A73;Lo;0;L;;;;;N;;;;; +13A74;EGYPTIAN HIEROGLYPH-13A74;Lo;0;L;;;;;N;;;;; +13A75;EGYPTIAN HIEROGLYPH-13A75;Lo;0;L;;;;;N;;;;; +13A76;EGYPTIAN HIEROGLYPH-13A76;Lo;0;L;;;;;N;;;;; +13A77;EGYPTIAN HIEROGLYPH-13A77;Lo;0;L;;;;;N;;;;; +13A78;EGYPTIAN HIEROGLYPH-13A78;Lo;0;L;;;;;N;;;;; +13A79;EGYPTIAN HIEROGLYPH-13A79;Lo;0;L;;;;;N;;;;; +13A7A;EGYPTIAN HIEROGLYPH-13A7A;Lo;0;L;;;;;N;;;;; +13A7B;EGYPTIAN HIEROGLYPH-13A7B;Lo;0;L;;;;;N;;;;; +13A7C;EGYPTIAN HIEROGLYPH-13A7C;Lo;0;L;;;;;N;;;;; +13A7D;EGYPTIAN HIEROGLYPH-13A7D;Lo;0;L;;;;;N;;;;; +13A7E;EGYPTIAN HIEROGLYPH-13A7E;Lo;0;L;;;;;N;;;;; +13A7F;EGYPTIAN HIEROGLYPH-13A7F;Lo;0;L;;;;;N;;;;; +13A80;EGYPTIAN HIEROGLYPH-13A80;Lo;0;L;;;;;N;;;;; +13A81;EGYPTIAN HIEROGLYPH-13A81;Lo;0;L;;;;;N;;;;; +13A82;EGYPTIAN HIEROGLYPH-13A82;Lo;0;L;;;;;N;;;;; +13A83;EGYPTIAN HIEROGLYPH-13A83;Lo;0;L;;;;;N;;;;; +13A84;EGYPTIAN HIEROGLYPH-13A84;Lo;0;L;;;;;N;;;;; +13A85;EGYPTIAN HIEROGLYPH-13A85;Lo;0;L;;;;;N;;;;; +13A86;EGYPTIAN HIEROGLYPH-13A86;Lo;0;L;;;;;N;;;;; +13A87;EGYPTIAN HIEROGLYPH-13A87;Lo;0;L;;;;;N;;;;; +13A88;EGYPTIAN HIEROGLYPH-13A88;Lo;0;L;;;;;N;;;;; +13A89;EGYPTIAN HIEROGLYPH-13A89;Lo;0;L;;;;;N;;;;; +13A8A;EGYPTIAN HIEROGLYPH-13A8A;Lo;0;L;;;;;N;;;;; +13A8B;EGYPTIAN HIEROGLYPH-13A8B;Lo;0;L;;;;;N;;;;; +13A8C;EGYPTIAN HIEROGLYPH-13A8C;Lo;0;L;;;;;N;;;;; +13A8D;EGYPTIAN HIEROGLYPH-13A8D;Lo;0;L;;;;;N;;;;; +13A8E;EGYPTIAN HIEROGLYPH-13A8E;Lo;0;L;;;;;N;;;;; +13A8F;EGYPTIAN HIEROGLYPH-13A8F;Lo;0;L;;;;;N;;;;; +13A90;EGYPTIAN HIEROGLYPH-13A90;Lo;0;L;;;;;N;;;;; +13A91;EGYPTIAN HIEROGLYPH-13A91;Lo;0;L;;;;;N;;;;; +13A92;EGYPTIAN HIEROGLYPH-13A92;Lo;0;L;;;;;N;;;;; +13A93;EGYPTIAN HIEROGLYPH-13A93;Lo;0;L;;;;;N;;;;; +13A94;EGYPTIAN HIEROGLYPH-13A94;Lo;0;L;;;;;N;;;;; +13A95;EGYPTIAN HIEROGLYPH-13A95;Lo;0;L;;;;;N;;;;; +13A96;EGYPTIAN HIEROGLYPH-13A96;Lo;0;L;;;;;N;;;;; +13A97;EGYPTIAN HIEROGLYPH-13A97;Lo;0;L;;;;;N;;;;; +13A98;EGYPTIAN HIEROGLYPH-13A98;Lo;0;L;;;;;N;;;;; +13A99;EGYPTIAN HIEROGLYPH-13A99;Lo;0;L;;;;;N;;;;; +13A9A;EGYPTIAN HIEROGLYPH-13A9A;Lo;0;L;;;;;N;;;;; +13A9B;EGYPTIAN HIEROGLYPH-13A9B;Lo;0;L;;;;;N;;;;; +13A9C;EGYPTIAN HIEROGLYPH-13A9C;Lo;0;L;;;;;N;;;;; +13A9D;EGYPTIAN HIEROGLYPH-13A9D;Lo;0;L;;;;;N;;;;; +13A9E;EGYPTIAN HIEROGLYPH-13A9E;Lo;0;L;;;;;N;;;;; +13A9F;EGYPTIAN HIEROGLYPH-13A9F;Lo;0;L;;;;;N;;;;; +13AA0;EGYPTIAN HIEROGLYPH-13AA0;Lo;0;L;;;;;N;;;;; +13AA1;EGYPTIAN HIEROGLYPH-13AA1;Lo;0;L;;;;;N;;;;; +13AA2;EGYPTIAN HIEROGLYPH-13AA2;Lo;0;L;;;;;N;;;;; +13AA3;EGYPTIAN HIEROGLYPH-13AA3;Lo;0;L;;;;;N;;;;; +13AA4;EGYPTIAN HIEROGLYPH-13AA4;Lo;0;L;;;;;N;;;;; +13AA5;EGYPTIAN HIEROGLYPH-13AA5;Lo;0;L;;;;;N;;;;; +13AA6;EGYPTIAN HIEROGLYPH-13AA6;Lo;0;L;;;;;N;;;;; +13AA7;EGYPTIAN HIEROGLYPH-13AA7;Lo;0;L;;;;;N;;;;; +13AA8;EGYPTIAN HIEROGLYPH-13AA8;Lo;0;L;;;;;N;;;;; +13AA9;EGYPTIAN HIEROGLYPH-13AA9;Lo;0;L;;;;;N;;;;; +13AAA;EGYPTIAN HIEROGLYPH-13AAA;Lo;0;L;;;;;N;;;;; +13AAB;EGYPTIAN HIEROGLYPH-13AAB;Lo;0;L;;;;;N;;;;; +13AAC;EGYPTIAN HIEROGLYPH-13AAC;Lo;0;L;;;;;N;;;;; +13AAD;EGYPTIAN HIEROGLYPH-13AAD;Lo;0;L;;;;;N;;;;; +13AAE;EGYPTIAN HIEROGLYPH-13AAE;Lo;0;L;;;;;N;;;;; +13AAF;EGYPTIAN HIEROGLYPH-13AAF;Lo;0;L;;;;;N;;;;; +13AB0;EGYPTIAN HIEROGLYPH-13AB0;Lo;0;L;;;;;N;;;;; +13AB1;EGYPTIAN HIEROGLYPH-13AB1;Lo;0;L;;;;;N;;;;; +13AB2;EGYPTIAN HIEROGLYPH-13AB2;Lo;0;L;;;;;N;;;;; +13AB3;EGYPTIAN HIEROGLYPH-13AB3;Lo;0;L;;;;;N;;;;; +13AB4;EGYPTIAN HIEROGLYPH-13AB4;Lo;0;L;;;;;N;;;;; +13AB5;EGYPTIAN HIEROGLYPH-13AB5;Lo;0;L;;;;;N;;;;; +13AB6;EGYPTIAN HIEROGLYPH-13AB6;Lo;0;L;;;;;N;;;;; +13AB7;EGYPTIAN HIEROGLYPH-13AB7;Lo;0;L;;;;;N;;;;; +13AB8;EGYPTIAN HIEROGLYPH-13AB8;Lo;0;L;;;;;N;;;;; +13AB9;EGYPTIAN HIEROGLYPH-13AB9;Lo;0;L;;;;;N;;;;; +13ABA;EGYPTIAN HIEROGLYPH-13ABA;Lo;0;L;;;;;N;;;;; +13ABB;EGYPTIAN HIEROGLYPH-13ABB;Lo;0;L;;;;;N;;;;; +13ABC;EGYPTIAN HIEROGLYPH-13ABC;Lo;0;L;;;;;N;;;;; +13ABD;EGYPTIAN HIEROGLYPH-13ABD;Lo;0;L;;;;;N;;;;; +13ABE;EGYPTIAN HIEROGLYPH-13ABE;Lo;0;L;;;;;N;;;;; +13ABF;EGYPTIAN HIEROGLYPH-13ABF;Lo;0;L;;;;;N;;;;; +13AC0;EGYPTIAN HIEROGLYPH-13AC0;Lo;0;L;;;;;N;;;;; +13AC1;EGYPTIAN HIEROGLYPH-13AC1;Lo;0;L;;;;;N;;;;; +13AC2;EGYPTIAN HIEROGLYPH-13AC2;Lo;0;L;;;;;N;;;;; +13AC3;EGYPTIAN HIEROGLYPH-13AC3;Lo;0;L;;;;;N;;;;; +13AC4;EGYPTIAN HIEROGLYPH-13AC4;Lo;0;L;;;;;N;;;;; +13AC5;EGYPTIAN HIEROGLYPH-13AC5;Lo;0;L;;;;;N;;;;; +13AC6;EGYPTIAN HIEROGLYPH-13AC6;Lo;0;L;;;;;N;;;;; +13AC7;EGYPTIAN HIEROGLYPH-13AC7;Lo;0;L;;;;;N;;;;; +13AC8;EGYPTIAN HIEROGLYPH-13AC8;Lo;0;L;;;;;N;;;;; +13AC9;EGYPTIAN HIEROGLYPH-13AC9;Lo;0;L;;;;;N;;;;; +13ACA;EGYPTIAN HIEROGLYPH-13ACA;Lo;0;L;;;;;N;;;;; +13ACB;EGYPTIAN HIEROGLYPH-13ACB;Lo;0;L;;;;;N;;;;; +13ACC;EGYPTIAN HIEROGLYPH-13ACC;Lo;0;L;;;;;N;;;;; +13ACD;EGYPTIAN HIEROGLYPH-13ACD;Lo;0;L;;;;;N;;;;; +13ACE;EGYPTIAN HIEROGLYPH-13ACE;Lo;0;L;;;;;N;;;;; +13ACF;EGYPTIAN HIEROGLYPH-13ACF;Lo;0;L;;;;;N;;;;; +13AD0;EGYPTIAN HIEROGLYPH-13AD0;Lo;0;L;;;;;N;;;;; +13AD1;EGYPTIAN HIEROGLYPH-13AD1;Lo;0;L;;;;;N;;;;; +13AD2;EGYPTIAN HIEROGLYPH-13AD2;Lo;0;L;;;;;N;;;;; +13AD3;EGYPTIAN HIEROGLYPH-13AD3;Lo;0;L;;;;;N;;;;; +13AD4;EGYPTIAN HIEROGLYPH-13AD4;Lo;0;L;;;;;N;;;;; +13AD5;EGYPTIAN HIEROGLYPH-13AD5;Lo;0;L;;;;;N;;;;; +13AD6;EGYPTIAN HIEROGLYPH-13AD6;Lo;0;L;;;;;N;;;;; +13AD7;EGYPTIAN HIEROGLYPH-13AD7;Lo;0;L;;;;;N;;;;; +13AD8;EGYPTIAN HIEROGLYPH-13AD8;Lo;0;L;;;;;N;;;;; +13AD9;EGYPTIAN HIEROGLYPH-13AD9;Lo;0;L;;;;;N;;;;; +13ADA;EGYPTIAN HIEROGLYPH-13ADA;Lo;0;L;;;;;N;;;;; +13ADB;EGYPTIAN HIEROGLYPH-13ADB;Lo;0;L;;;;;N;;;;; +13ADC;EGYPTIAN HIEROGLYPH-13ADC;Lo;0;L;;;;;N;;;;; +13ADD;EGYPTIAN HIEROGLYPH-13ADD;Lo;0;L;;;;;N;;;;; +13ADE;EGYPTIAN HIEROGLYPH-13ADE;Lo;0;L;;;;;N;;;;; +13ADF;EGYPTIAN HIEROGLYPH-13ADF;Lo;0;L;;;;;N;;;;; +13AE0;EGYPTIAN HIEROGLYPH-13AE0;Lo;0;L;;;;;N;;;;; +13AE1;EGYPTIAN HIEROGLYPH-13AE1;Lo;0;L;;;;;N;;;;; +13AE2;EGYPTIAN HIEROGLYPH-13AE2;Lo;0;L;;;;;N;;;;; +13AE3;EGYPTIAN HIEROGLYPH-13AE3;Lo;0;L;;;;;N;;;;; +13AE4;EGYPTIAN HIEROGLYPH-13AE4;Lo;0;L;;;;;N;;;;; +13AE5;EGYPTIAN HIEROGLYPH-13AE5;Lo;0;L;;;;;N;;;;; +13AE6;EGYPTIAN HIEROGLYPH-13AE6;Lo;0;L;;;;;N;;;;; +13AE7;EGYPTIAN HIEROGLYPH-13AE7;Lo;0;L;;;;;N;;;;; +13AE8;EGYPTIAN HIEROGLYPH-13AE8;Lo;0;L;;;;;N;;;;; +13AE9;EGYPTIAN HIEROGLYPH-13AE9;Lo;0;L;;;;;N;;;;; +13AEA;EGYPTIAN HIEROGLYPH-13AEA;Lo;0;L;;;;;N;;;;; +13AEB;EGYPTIAN HIEROGLYPH-13AEB;Lo;0;L;;;;;N;;;;; +13AEC;EGYPTIAN HIEROGLYPH-13AEC;Lo;0;L;;;;;N;;;;; +13AED;EGYPTIAN HIEROGLYPH-13AED;Lo;0;L;;;;;N;;;;; +13AEE;EGYPTIAN HIEROGLYPH-13AEE;Lo;0;L;;;;;N;;;;; +13AEF;EGYPTIAN HIEROGLYPH-13AEF;Lo;0;L;;;;;N;;;;; +13AF0;EGYPTIAN HIEROGLYPH-13AF0;Lo;0;L;;;;;N;;;;; +13AF1;EGYPTIAN HIEROGLYPH-13AF1;Lo;0;L;;;;;N;;;;; +13AF2;EGYPTIAN HIEROGLYPH-13AF2;Lo;0;L;;;;;N;;;;; +13AF3;EGYPTIAN HIEROGLYPH-13AF3;Lo;0;L;;;;;N;;;;; +13AF4;EGYPTIAN HIEROGLYPH-13AF4;Lo;0;L;;;;;N;;;;; +13AF5;EGYPTIAN HIEROGLYPH-13AF5;Lo;0;L;;;;;N;;;;; +13AF6;EGYPTIAN HIEROGLYPH-13AF6;Lo;0;L;;;;;N;;;;; +13AF7;EGYPTIAN HIEROGLYPH-13AF7;Lo;0;L;;;;;N;;;;; +13AF8;EGYPTIAN HIEROGLYPH-13AF8;Lo;0;L;;;;;N;;;;; +13AF9;EGYPTIAN HIEROGLYPH-13AF9;Lo;0;L;;;;;N;;;;; +13AFA;EGYPTIAN HIEROGLYPH-13AFA;Lo;0;L;;;;;N;;;;; +13AFB;EGYPTIAN HIEROGLYPH-13AFB;Lo;0;L;;;;;N;;;;; +13AFC;EGYPTIAN HIEROGLYPH-13AFC;Lo;0;L;;;;;N;;;;; +13AFD;EGYPTIAN HIEROGLYPH-13AFD;Lo;0;L;;;;;N;;;;; +13AFE;EGYPTIAN HIEROGLYPH-13AFE;Lo;0;L;;;;;N;;;;; +13AFF;EGYPTIAN HIEROGLYPH-13AFF;Lo;0;L;;;;;N;;;;; +13B00;EGYPTIAN HIEROGLYPH-13B00;Lo;0;L;;;;;N;;;;; +13B01;EGYPTIAN HIEROGLYPH-13B01;Lo;0;L;;;;;N;;;;; +13B02;EGYPTIAN HIEROGLYPH-13B02;Lo;0;L;;;;;N;;;;; +13B03;EGYPTIAN HIEROGLYPH-13B03;Lo;0;L;;;;;N;;;;; +13B04;EGYPTIAN HIEROGLYPH-13B04;Lo;0;L;;;;;N;;;;; +13B05;EGYPTIAN HIEROGLYPH-13B05;Lo;0;L;;;;;N;;;;; +13B06;EGYPTIAN HIEROGLYPH-13B06;Lo;0;L;;;;;N;;;;; +13B07;EGYPTIAN HIEROGLYPH-13B07;Lo;0;L;;;;;N;;;;; +13B08;EGYPTIAN HIEROGLYPH-13B08;Lo;0;L;;;;;N;;;;; +13B09;EGYPTIAN HIEROGLYPH-13B09;Lo;0;L;;;;;N;;;;; +13B0A;EGYPTIAN HIEROGLYPH-13B0A;Lo;0;L;;;;;N;;;;; +13B0B;EGYPTIAN HIEROGLYPH-13B0B;Lo;0;L;;;;;N;;;;; +13B0C;EGYPTIAN HIEROGLYPH-13B0C;Lo;0;L;;;;;N;;;;; +13B0D;EGYPTIAN HIEROGLYPH-13B0D;Lo;0;L;;;;;N;;;;; +13B0E;EGYPTIAN HIEROGLYPH-13B0E;Lo;0;L;;;;;N;;;;; +13B0F;EGYPTIAN HIEROGLYPH-13B0F;Lo;0;L;;;;;N;;;;; +13B10;EGYPTIAN HIEROGLYPH-13B10;Lo;0;L;;;;;N;;;;; +13B11;EGYPTIAN HIEROGLYPH-13B11;Lo;0;L;;;;;N;;;;; +13B12;EGYPTIAN HIEROGLYPH-13B12;Lo;0;L;;;;;N;;;;; +13B13;EGYPTIAN HIEROGLYPH-13B13;Lo;0;L;;;;;N;;;;; +13B14;EGYPTIAN HIEROGLYPH-13B14;Lo;0;L;;;;;N;;;;; +13B15;EGYPTIAN HIEROGLYPH-13B15;Lo;0;L;;;;;N;;;;; +13B16;EGYPTIAN HIEROGLYPH-13B16;Lo;0;L;;;;;N;;;;; +13B17;EGYPTIAN HIEROGLYPH-13B17;Lo;0;L;;;;;N;;;;; +13B18;EGYPTIAN HIEROGLYPH-13B18;Lo;0;L;;;;;N;;;;; +13B19;EGYPTIAN HIEROGLYPH-13B19;Lo;0;L;;;;;N;;;;; +13B1A;EGYPTIAN HIEROGLYPH-13B1A;Lo;0;L;;;;;N;;;;; +13B1B;EGYPTIAN HIEROGLYPH-13B1B;Lo;0;L;;;;;N;;;;; +13B1C;EGYPTIAN HIEROGLYPH-13B1C;Lo;0;L;;;;;N;;;;; +13B1D;EGYPTIAN HIEROGLYPH-13B1D;Lo;0;L;;;;;N;;;;; +13B1E;EGYPTIAN HIEROGLYPH-13B1E;Lo;0;L;;;;;N;;;;; +13B1F;EGYPTIAN HIEROGLYPH-13B1F;Lo;0;L;;;;;N;;;;; +13B20;EGYPTIAN HIEROGLYPH-13B20;Lo;0;L;;;;;N;;;;; +13B21;EGYPTIAN HIEROGLYPH-13B21;Lo;0;L;;;;;N;;;;; +13B22;EGYPTIAN HIEROGLYPH-13B22;Lo;0;L;;;;;N;;;;; +13B23;EGYPTIAN HIEROGLYPH-13B23;Lo;0;L;;;;;N;;;;; +13B24;EGYPTIAN HIEROGLYPH-13B24;Lo;0;L;;;;;N;;;;; +13B25;EGYPTIAN HIEROGLYPH-13B25;Lo;0;L;;;;;N;;;;; +13B26;EGYPTIAN HIEROGLYPH-13B26;Lo;0;L;;;;;N;;;;; +13B27;EGYPTIAN HIEROGLYPH-13B27;Lo;0;L;;;;;N;;;;; +13B28;EGYPTIAN HIEROGLYPH-13B28;Lo;0;L;;;;;N;;;;; +13B29;EGYPTIAN HIEROGLYPH-13B29;Lo;0;L;;;;;N;;;;; +13B2A;EGYPTIAN HIEROGLYPH-13B2A;Lo;0;L;;;;;N;;;;; +13B2B;EGYPTIAN HIEROGLYPH-13B2B;Lo;0;L;;;;;N;;;;; +13B2C;EGYPTIAN HIEROGLYPH-13B2C;Lo;0;L;;;;;N;;;;; +13B2D;EGYPTIAN HIEROGLYPH-13B2D;Lo;0;L;;;;;N;;;;; +13B2E;EGYPTIAN HIEROGLYPH-13B2E;Lo;0;L;;;;;N;;;;; +13B2F;EGYPTIAN HIEROGLYPH-13B2F;Lo;0;L;;;;;N;;;;; +13B30;EGYPTIAN HIEROGLYPH-13B30;Lo;0;L;;;;;N;;;;; +13B31;EGYPTIAN HIEROGLYPH-13B31;Lo;0;L;;;;;N;;;;; +13B32;EGYPTIAN HIEROGLYPH-13B32;Lo;0;L;;;;;N;;;;; +13B33;EGYPTIAN HIEROGLYPH-13B33;Lo;0;L;;;;;N;;;;; +13B34;EGYPTIAN HIEROGLYPH-13B34;Lo;0;L;;;;;N;;;;; +13B35;EGYPTIAN HIEROGLYPH-13B35;Lo;0;L;;;;;N;;;;; +13B36;EGYPTIAN HIEROGLYPH-13B36;Lo;0;L;;;;;N;;;;; +13B37;EGYPTIAN HIEROGLYPH-13B37;Lo;0;L;;;;;N;;;;; +13B38;EGYPTIAN HIEROGLYPH-13B38;Lo;0;L;;;;;N;;;;; +13B39;EGYPTIAN HIEROGLYPH-13B39;Lo;0;L;;;;;N;;;;; +13B3A;EGYPTIAN HIEROGLYPH-13B3A;Lo;0;L;;;;;N;;;;; +13B3B;EGYPTIAN HIEROGLYPH-13B3B;Lo;0;L;;;;;N;;;;; +13B3C;EGYPTIAN HIEROGLYPH-13B3C;Lo;0;L;;;;;N;;;;; +13B3D;EGYPTIAN HIEROGLYPH-13B3D;Lo;0;L;;;;;N;;;;; +13B3E;EGYPTIAN HIEROGLYPH-13B3E;Lo;0;L;;;;;N;;;;; +13B3F;EGYPTIAN HIEROGLYPH-13B3F;Lo;0;L;;;;;N;;;;; +13B40;EGYPTIAN HIEROGLYPH-13B40;Lo;0;L;;;;;N;;;;; +13B41;EGYPTIAN HIEROGLYPH-13B41;Lo;0;L;;;;;N;;;;; +13B42;EGYPTIAN HIEROGLYPH-13B42;Lo;0;L;;;;;N;;;;; +13B43;EGYPTIAN HIEROGLYPH-13B43;Lo;0;L;;;;;N;;;;; +13B44;EGYPTIAN HIEROGLYPH-13B44;Lo;0;L;;;;;N;;;;; +13B45;EGYPTIAN HIEROGLYPH-13B45;Lo;0;L;;;;;N;;;;; +13B46;EGYPTIAN HIEROGLYPH-13B46;Lo;0;L;;;;;N;;;;; +13B47;EGYPTIAN HIEROGLYPH-13B47;Lo;0;L;;;;;N;;;;; +13B48;EGYPTIAN HIEROGLYPH-13B48;Lo;0;L;;;;;N;;;;; +13B49;EGYPTIAN HIEROGLYPH-13B49;Lo;0;L;;;;;N;;;;; +13B4A;EGYPTIAN HIEROGLYPH-13B4A;Lo;0;L;;;;;N;;;;; +13B4B;EGYPTIAN HIEROGLYPH-13B4B;Lo;0;L;;;;;N;;;;; +13B4C;EGYPTIAN HIEROGLYPH-13B4C;Lo;0;L;;;;;N;;;;; +13B4D;EGYPTIAN HIEROGLYPH-13B4D;Lo;0;L;;;;;N;;;;; +13B4E;EGYPTIAN HIEROGLYPH-13B4E;Lo;0;L;;;;;N;;;;; +13B4F;EGYPTIAN HIEROGLYPH-13B4F;Lo;0;L;;;;;N;;;;; +13B50;EGYPTIAN HIEROGLYPH-13B50;Lo;0;L;;;;;N;;;;; +13B51;EGYPTIAN HIEROGLYPH-13B51;Lo;0;L;;;;;N;;;;; +13B52;EGYPTIAN HIEROGLYPH-13B52;Lo;0;L;;;;;N;;;;; +13B53;EGYPTIAN HIEROGLYPH-13B53;Lo;0;L;;;;;N;;;;; +13B54;EGYPTIAN HIEROGLYPH-13B54;Lo;0;L;;;;;N;;;;; +13B55;EGYPTIAN HIEROGLYPH-13B55;Lo;0;L;;;;;N;;;;; +13B56;EGYPTIAN HIEROGLYPH-13B56;Lo;0;L;;;;;N;;;;; +13B57;EGYPTIAN HIEROGLYPH-13B57;Lo;0;L;;;;;N;;;;; +13B58;EGYPTIAN HIEROGLYPH-13B58;Lo;0;L;;;;;N;;;;; +13B59;EGYPTIAN HIEROGLYPH-13B59;Lo;0;L;;;;;N;;;;; +13B5A;EGYPTIAN HIEROGLYPH-13B5A;Lo;0;L;;;;;N;;;;; +13B5B;EGYPTIAN HIEROGLYPH-13B5B;Lo;0;L;;;;;N;;;;; +13B5C;EGYPTIAN HIEROGLYPH-13B5C;Lo;0;L;;;;;N;;;;; +13B5D;EGYPTIAN HIEROGLYPH-13B5D;Lo;0;L;;;;;N;;;;; +13B5E;EGYPTIAN HIEROGLYPH-13B5E;Lo;0;L;;;;;N;;;;; +13B5F;EGYPTIAN HIEROGLYPH-13B5F;Lo;0;L;;;;;N;;;;; +13B60;EGYPTIAN HIEROGLYPH-13B60;Lo;0;L;;;;;N;;;;; +13B61;EGYPTIAN HIEROGLYPH-13B61;Lo;0;L;;;;;N;;;;; +13B62;EGYPTIAN HIEROGLYPH-13B62;Lo;0;L;;;;;N;;;;; +13B63;EGYPTIAN HIEROGLYPH-13B63;Lo;0;L;;;;;N;;;;; +13B64;EGYPTIAN HIEROGLYPH-13B64;Lo;0;L;;;;;N;;;;; +13B65;EGYPTIAN HIEROGLYPH-13B65;Lo;0;L;;;;;N;;;;; +13B66;EGYPTIAN HIEROGLYPH-13B66;Lo;0;L;;;;;N;;;;; +13B67;EGYPTIAN HIEROGLYPH-13B67;Lo;0;L;;;;;N;;;;; +13B68;EGYPTIAN HIEROGLYPH-13B68;Lo;0;L;;;;;N;;;;; +13B69;EGYPTIAN HIEROGLYPH-13B69;Lo;0;L;;;;;N;;;;; +13B6A;EGYPTIAN HIEROGLYPH-13B6A;Lo;0;L;;;;;N;;;;; +13B6B;EGYPTIAN HIEROGLYPH-13B6B;Lo;0;L;;;;;N;;;;; +13B6C;EGYPTIAN HIEROGLYPH-13B6C;Lo;0;L;;;;;N;;;;; +13B6D;EGYPTIAN HIEROGLYPH-13B6D;Lo;0;L;;;;;N;;;;; +13B6E;EGYPTIAN HIEROGLYPH-13B6E;Lo;0;L;;;;;N;;;;; +13B6F;EGYPTIAN HIEROGLYPH-13B6F;Lo;0;L;;;;;N;;;;; +13B70;EGYPTIAN HIEROGLYPH-13B70;Lo;0;L;;;;;N;;;;; +13B71;EGYPTIAN HIEROGLYPH-13B71;Lo;0;L;;;;;N;;;;; +13B72;EGYPTIAN HIEROGLYPH-13B72;Lo;0;L;;;;;N;;;;; +13B73;EGYPTIAN HIEROGLYPH-13B73;Lo;0;L;;;;;N;;;;; +13B74;EGYPTIAN HIEROGLYPH-13B74;Lo;0;L;;;;;N;;;;; +13B75;EGYPTIAN HIEROGLYPH-13B75;Lo;0;L;;;;;N;;;;; +13B76;EGYPTIAN HIEROGLYPH-13B76;Lo;0;L;;;;;N;;;;; +13B77;EGYPTIAN HIEROGLYPH-13B77;Lo;0;L;;;;;N;;;;; +13B78;EGYPTIAN HIEROGLYPH-13B78;Lo;0;L;;;;;N;;;;; +13B79;EGYPTIAN HIEROGLYPH-13B79;Lo;0;L;;;;;N;;;;; +13B7A;EGYPTIAN HIEROGLYPH-13B7A;Lo;0;L;;;;;N;;;;; +13B7B;EGYPTIAN HIEROGLYPH-13B7B;Lo;0;L;;;;;N;;;;; +13B7C;EGYPTIAN HIEROGLYPH-13B7C;Lo;0;L;;;;;N;;;;; +13B7D;EGYPTIAN HIEROGLYPH-13B7D;Lo;0;L;;;;;N;;;;; +13B7E;EGYPTIAN HIEROGLYPH-13B7E;Lo;0;L;;;;;N;;;;; +13B7F;EGYPTIAN HIEROGLYPH-13B7F;Lo;0;L;;;;;N;;;;; +13B80;EGYPTIAN HIEROGLYPH-13B80;Lo;0;L;;;;;N;;;;; +13B81;EGYPTIAN HIEROGLYPH-13B81;Lo;0;L;;;;;N;;;;; +13B82;EGYPTIAN HIEROGLYPH-13B82;Lo;0;L;;;;;N;;;;; +13B83;EGYPTIAN HIEROGLYPH-13B83;Lo;0;L;;;;;N;;;;; +13B84;EGYPTIAN HIEROGLYPH-13B84;Lo;0;L;;;;;N;;;;; +13B85;EGYPTIAN HIEROGLYPH-13B85;Lo;0;L;;;;;N;;;;; +13B86;EGYPTIAN HIEROGLYPH-13B86;Lo;0;L;;;;;N;;;;; +13B87;EGYPTIAN HIEROGLYPH-13B87;Lo;0;L;;;;;N;;;;; +13B88;EGYPTIAN HIEROGLYPH-13B88;Lo;0;L;;;;;N;;;;; +13B89;EGYPTIAN HIEROGLYPH-13B89;Lo;0;L;;;;;N;;;;; +13B8A;EGYPTIAN HIEROGLYPH-13B8A;Lo;0;L;;;;;N;;;;; +13B8B;EGYPTIAN HIEROGLYPH-13B8B;Lo;0;L;;;;;N;;;;; +13B8C;EGYPTIAN HIEROGLYPH-13B8C;Lo;0;L;;;;;N;;;;; +13B8D;EGYPTIAN HIEROGLYPH-13B8D;Lo;0;L;;;;;N;;;;; +13B8E;EGYPTIAN HIEROGLYPH-13B8E;Lo;0;L;;;;;N;;;;; +13B8F;EGYPTIAN HIEROGLYPH-13B8F;Lo;0;L;;;;;N;;;;; +13B90;EGYPTIAN HIEROGLYPH-13B90;Lo;0;L;;;;;N;;;;; +13B91;EGYPTIAN HIEROGLYPH-13B91;Lo;0;L;;;;;N;;;;; +13B92;EGYPTIAN HIEROGLYPH-13B92;Lo;0;L;;;;;N;;;;; +13B93;EGYPTIAN HIEROGLYPH-13B93;Lo;0;L;;;;;N;;;;; +13B94;EGYPTIAN HIEROGLYPH-13B94;Lo;0;L;;;;;N;;;;; +13B95;EGYPTIAN HIEROGLYPH-13B95;Lo;0;L;;;;;N;;;;; +13B96;EGYPTIAN HIEROGLYPH-13B96;Lo;0;L;;;;;N;;;;; +13B97;EGYPTIAN HIEROGLYPH-13B97;Lo;0;L;;;;;N;;;;; +13B98;EGYPTIAN HIEROGLYPH-13B98;Lo;0;L;;;;;N;;;;; +13B99;EGYPTIAN HIEROGLYPH-13B99;Lo;0;L;;;;;N;;;;; +13B9A;EGYPTIAN HIEROGLYPH-13B9A;Lo;0;L;;;;;N;;;;; +13B9B;EGYPTIAN HIEROGLYPH-13B9B;Lo;0;L;;;;;N;;;;; +13B9C;EGYPTIAN HIEROGLYPH-13B9C;Lo;0;L;;;;;N;;;;; +13B9D;EGYPTIAN HIEROGLYPH-13B9D;Lo;0;L;;;;;N;;;;; +13B9E;EGYPTIAN HIEROGLYPH-13B9E;Lo;0;L;;;;;N;;;;; +13B9F;EGYPTIAN HIEROGLYPH-13B9F;Lo;0;L;;;;;N;;;;; +13BA0;EGYPTIAN HIEROGLYPH-13BA0;Lo;0;L;;;;;N;;;;; +13BA1;EGYPTIAN HIEROGLYPH-13BA1;Lo;0;L;;;;;N;;;;; +13BA2;EGYPTIAN HIEROGLYPH-13BA2;Lo;0;L;;;;;N;;;;; +13BA3;EGYPTIAN HIEROGLYPH-13BA3;Lo;0;L;;;;;N;;;;; +13BA4;EGYPTIAN HIEROGLYPH-13BA4;Lo;0;L;;;;;N;;;;; +13BA5;EGYPTIAN HIEROGLYPH-13BA5;Lo;0;L;;;;;N;;;;; +13BA6;EGYPTIAN HIEROGLYPH-13BA6;Lo;0;L;;;;;N;;;;; +13BA7;EGYPTIAN HIEROGLYPH-13BA7;Lo;0;L;;;;;N;;;;; +13BA8;EGYPTIAN HIEROGLYPH-13BA8;Lo;0;L;;;;;N;;;;; +13BA9;EGYPTIAN HIEROGLYPH-13BA9;Lo;0;L;;;;;N;;;;; +13BAA;EGYPTIAN HIEROGLYPH-13BAA;Lo;0;L;;;;;N;;;;; +13BAB;EGYPTIAN HIEROGLYPH-13BAB;Lo;0;L;;;;;N;;;;; +13BAC;EGYPTIAN HIEROGLYPH-13BAC;Lo;0;L;;;;;N;;;;; +13BAD;EGYPTIAN HIEROGLYPH-13BAD;Lo;0;L;;;;;N;;;;; +13BAE;EGYPTIAN HIEROGLYPH-13BAE;Lo;0;L;;;;;N;;;;; +13BAF;EGYPTIAN HIEROGLYPH-13BAF;Lo;0;L;;;;;N;;;;; +13BB0;EGYPTIAN HIEROGLYPH-13BB0;Lo;0;L;;;;;N;;;;; +13BB1;EGYPTIAN HIEROGLYPH-13BB1;Lo;0;L;;;;;N;;;;; +13BB2;EGYPTIAN HIEROGLYPH-13BB2;Lo;0;L;;;;;N;;;;; +13BB3;EGYPTIAN HIEROGLYPH-13BB3;Lo;0;L;;;;;N;;;;; +13BB4;EGYPTIAN HIEROGLYPH-13BB4;Lo;0;L;;;;;N;;;;; +13BB5;EGYPTIAN HIEROGLYPH-13BB5;Lo;0;L;;;;;N;;;;; +13BB6;EGYPTIAN HIEROGLYPH-13BB6;Lo;0;L;;;;;N;;;;; +13BB7;EGYPTIAN HIEROGLYPH-13BB7;Lo;0;L;;;;;N;;;;; +13BB8;EGYPTIAN HIEROGLYPH-13BB8;Lo;0;L;;;;;N;;;;; +13BB9;EGYPTIAN HIEROGLYPH-13BB9;Lo;0;L;;;;;N;;;;; +13BBA;EGYPTIAN HIEROGLYPH-13BBA;Lo;0;L;;;;;N;;;;; +13BBB;EGYPTIAN HIEROGLYPH-13BBB;Lo;0;L;;;;;N;;;;; +13BBC;EGYPTIAN HIEROGLYPH-13BBC;Lo;0;L;;;;;N;;;;; +13BBD;EGYPTIAN HIEROGLYPH-13BBD;Lo;0;L;;;;;N;;;;; +13BBE;EGYPTIAN HIEROGLYPH-13BBE;Lo;0;L;;;;;N;;;;; +13BBF;EGYPTIAN HIEROGLYPH-13BBF;Lo;0;L;;;;;N;;;;; +13BC0;EGYPTIAN HIEROGLYPH-13BC0;Lo;0;L;;;;;N;;;;; +13BC1;EGYPTIAN HIEROGLYPH-13BC1;Lo;0;L;;;;;N;;;;; +13BC2;EGYPTIAN HIEROGLYPH-13BC2;Lo;0;L;;;;;N;;;;; +13BC3;EGYPTIAN HIEROGLYPH-13BC3;Lo;0;L;;;;;N;;;;; +13BC4;EGYPTIAN HIEROGLYPH-13BC4;Lo;0;L;;;;;N;;;;; +13BC5;EGYPTIAN HIEROGLYPH-13BC5;Lo;0;L;;;;;N;;;;; +13BC6;EGYPTIAN HIEROGLYPH-13BC6;Lo;0;L;;;;;N;;;;; +13BC7;EGYPTIAN HIEROGLYPH-13BC7;Lo;0;L;;;;;N;;;;; +13BC8;EGYPTIAN HIEROGLYPH-13BC8;Lo;0;L;;;;;N;;;;; +13BC9;EGYPTIAN HIEROGLYPH-13BC9;Lo;0;L;;;;;N;;;;; +13BCA;EGYPTIAN HIEROGLYPH-13BCA;Lo;0;L;;;;;N;;;;; +13BCB;EGYPTIAN HIEROGLYPH-13BCB;Lo;0;L;;;;;N;;;;; +13BCC;EGYPTIAN HIEROGLYPH-13BCC;Lo;0;L;;;;;N;;;;; +13BCD;EGYPTIAN HIEROGLYPH-13BCD;Lo;0;L;;;;;N;;;;; +13BCE;EGYPTIAN HIEROGLYPH-13BCE;Lo;0;L;;;;;N;;;;; +13BCF;EGYPTIAN HIEROGLYPH-13BCF;Lo;0;L;;;;;N;;;;; +13BD0;EGYPTIAN HIEROGLYPH-13BD0;Lo;0;L;;;;;N;;;;; +13BD1;EGYPTIAN HIEROGLYPH-13BD1;Lo;0;L;;;;;N;;;;; +13BD2;EGYPTIAN HIEROGLYPH-13BD2;Lo;0;L;;;;;N;;;;; +13BD3;EGYPTIAN HIEROGLYPH-13BD3;Lo;0;L;;;;;N;;;;; +13BD4;EGYPTIAN HIEROGLYPH-13BD4;Lo;0;L;;;;;N;;;;; +13BD5;EGYPTIAN HIEROGLYPH-13BD5;Lo;0;L;;;;;N;;;;; +13BD6;EGYPTIAN HIEROGLYPH-13BD6;Lo;0;L;;;;;N;;;;; +13BD7;EGYPTIAN HIEROGLYPH-13BD7;Lo;0;L;;;;;N;;;;; +13BD8;EGYPTIAN HIEROGLYPH-13BD8;Lo;0;L;;;;;N;;;;; +13BD9;EGYPTIAN HIEROGLYPH-13BD9;Lo;0;L;;;;;N;;;;; +13BDA;EGYPTIAN HIEROGLYPH-13BDA;Lo;0;L;;;;;N;;;;; +13BDB;EGYPTIAN HIEROGLYPH-13BDB;Lo;0;L;;;;;N;;;;; +13BDC;EGYPTIAN HIEROGLYPH-13BDC;Lo;0;L;;;;;N;;;;; +13BDD;EGYPTIAN HIEROGLYPH-13BDD;Lo;0;L;;;;;N;;;;; +13BDE;EGYPTIAN HIEROGLYPH-13BDE;Lo;0;L;;;;;N;;;;; +13BDF;EGYPTIAN HIEROGLYPH-13BDF;Lo;0;L;;;;;N;;;;; +13BE0;EGYPTIAN HIEROGLYPH-13BE0;Lo;0;L;;;;;N;;;;; +13BE1;EGYPTIAN HIEROGLYPH-13BE1;Lo;0;L;;;;;N;;;;; +13BE2;EGYPTIAN HIEROGLYPH-13BE2;Lo;0;L;;;;;N;;;;; +13BE3;EGYPTIAN HIEROGLYPH-13BE3;Lo;0;L;;;;;N;;;;; +13BE4;EGYPTIAN HIEROGLYPH-13BE4;Lo;0;L;;;;;N;;;;; +13BE5;EGYPTIAN HIEROGLYPH-13BE5;Lo;0;L;;;;;N;;;;; +13BE6;EGYPTIAN HIEROGLYPH-13BE6;Lo;0;L;;;;;N;;;;; +13BE7;EGYPTIAN HIEROGLYPH-13BE7;Lo;0;L;;;;;N;;;;; +13BE8;EGYPTIAN HIEROGLYPH-13BE8;Lo;0;L;;;;;N;;;;; +13BE9;EGYPTIAN HIEROGLYPH-13BE9;Lo;0;L;;;;;N;;;;; +13BEA;EGYPTIAN HIEROGLYPH-13BEA;Lo;0;L;;;;;N;;;;; +13BEB;EGYPTIAN HIEROGLYPH-13BEB;Lo;0;L;;;;;N;;;;; +13BEC;EGYPTIAN HIEROGLYPH-13BEC;Lo;0;L;;;;;N;;;;; +13BED;EGYPTIAN HIEROGLYPH-13BED;Lo;0;L;;;;;N;;;;; +13BEE;EGYPTIAN HIEROGLYPH-13BEE;Lo;0;L;;;;;N;;;;; +13BEF;EGYPTIAN HIEROGLYPH-13BEF;Lo;0;L;;;;;N;;;;; +13BF0;EGYPTIAN HIEROGLYPH-13BF0;Lo;0;L;;;;;N;;;;; +13BF1;EGYPTIAN HIEROGLYPH-13BF1;Lo;0;L;;;;;N;;;;; +13BF2;EGYPTIAN HIEROGLYPH-13BF2;Lo;0;L;;;;;N;;;;; +13BF3;EGYPTIAN HIEROGLYPH-13BF3;Lo;0;L;;;;;N;;;;; +13BF4;EGYPTIAN HIEROGLYPH-13BF4;Lo;0;L;;;;;N;;;;; +13BF5;EGYPTIAN HIEROGLYPH-13BF5;Lo;0;L;;;;;N;;;;; +13BF6;EGYPTIAN HIEROGLYPH-13BF6;Lo;0;L;;;;;N;;;;; +13BF7;EGYPTIAN HIEROGLYPH-13BF7;Lo;0;L;;;;;N;;;;; +13BF8;EGYPTIAN HIEROGLYPH-13BF8;Lo;0;L;;;;;N;;;;; +13BF9;EGYPTIAN HIEROGLYPH-13BF9;Lo;0;L;;;;;N;;;;; +13BFA;EGYPTIAN HIEROGLYPH-13BFA;Lo;0;L;;;;;N;;;;; +13BFB;EGYPTIAN HIEROGLYPH-13BFB;Lo;0;L;;;;;N;;;;; +13BFC;EGYPTIAN HIEROGLYPH-13BFC;Lo;0;L;;;;;N;;;;; +13BFD;EGYPTIAN HIEROGLYPH-13BFD;Lo;0;L;;;;;N;;;;; +13BFE;EGYPTIAN HIEROGLYPH-13BFE;Lo;0;L;;;;;N;;;;; +13BFF;EGYPTIAN HIEROGLYPH-13BFF;Lo;0;L;;;;;N;;;;; +13C00;EGYPTIAN HIEROGLYPH-13C00;Lo;0;L;;;;;N;;;;; +13C01;EGYPTIAN HIEROGLYPH-13C01;Lo;0;L;;;;;N;;;;; +13C02;EGYPTIAN HIEROGLYPH-13C02;Lo;0;L;;;;;N;;;;; +13C03;EGYPTIAN HIEROGLYPH-13C03;Lo;0;L;;;;;N;;;;; +13C04;EGYPTIAN HIEROGLYPH-13C04;Lo;0;L;;;;;N;;;;; +13C05;EGYPTIAN HIEROGLYPH-13C05;Lo;0;L;;;;;N;;;;; +13C06;EGYPTIAN HIEROGLYPH-13C06;Lo;0;L;;;;;N;;;;; +13C07;EGYPTIAN HIEROGLYPH-13C07;Lo;0;L;;;;;N;;;;; +13C08;EGYPTIAN HIEROGLYPH-13C08;Lo;0;L;;;;;N;;;;; +13C09;EGYPTIAN HIEROGLYPH-13C09;Lo;0;L;;;;;N;;;;; +13C0A;EGYPTIAN HIEROGLYPH-13C0A;Lo;0;L;;;;;N;;;;; +13C0B;EGYPTIAN HIEROGLYPH-13C0B;Lo;0;L;;;;;N;;;;; +13C0C;EGYPTIAN HIEROGLYPH-13C0C;Lo;0;L;;;;;N;;;;; +13C0D;EGYPTIAN HIEROGLYPH-13C0D;Lo;0;L;;;;;N;;;;; +13C0E;EGYPTIAN HIEROGLYPH-13C0E;Lo;0;L;;;;;N;;;;; +13C0F;EGYPTIAN HIEROGLYPH-13C0F;Lo;0;L;;;;;N;;;;; +13C10;EGYPTIAN HIEROGLYPH-13C10;Lo;0;L;;;;;N;;;;; +13C11;EGYPTIAN HIEROGLYPH-13C11;Lo;0;L;;;;;N;;;;; +13C12;EGYPTIAN HIEROGLYPH-13C12;Lo;0;L;;;;;N;;;;; +13C13;EGYPTIAN HIEROGLYPH-13C13;Lo;0;L;;;;;N;;;;; +13C14;EGYPTIAN HIEROGLYPH-13C14;Lo;0;L;;;;;N;;;;; +13C15;EGYPTIAN HIEROGLYPH-13C15;Lo;0;L;;;;;N;;;;; +13C16;EGYPTIAN HIEROGLYPH-13C16;Lo;0;L;;;;;N;;;;; +13C17;EGYPTIAN HIEROGLYPH-13C17;Lo;0;L;;;;;N;;;;; +13C18;EGYPTIAN HIEROGLYPH-13C18;Lo;0;L;;;;;N;;;;; +13C19;EGYPTIAN HIEROGLYPH-13C19;Lo;0;L;;;;;N;;;;; +13C1A;EGYPTIAN HIEROGLYPH-13C1A;Lo;0;L;;;;;N;;;;; +13C1B;EGYPTIAN HIEROGLYPH-13C1B;Lo;0;L;;;;;N;;;;; +13C1C;EGYPTIAN HIEROGLYPH-13C1C;Lo;0;L;;;;;N;;;;; +13C1D;EGYPTIAN HIEROGLYPH-13C1D;Lo;0;L;;;;;N;;;;; +13C1E;EGYPTIAN HIEROGLYPH-13C1E;Lo;0;L;;;;;N;;;;; +13C1F;EGYPTIAN HIEROGLYPH-13C1F;Lo;0;L;;;;;N;;;;; +13C20;EGYPTIAN HIEROGLYPH-13C20;Lo;0;L;;;;;N;;;;; +13C21;EGYPTIAN HIEROGLYPH-13C21;Lo;0;L;;;;;N;;;;; +13C22;EGYPTIAN HIEROGLYPH-13C22;Lo;0;L;;;;;N;;;;; +13C23;EGYPTIAN HIEROGLYPH-13C23;Lo;0;L;;;;;N;;;;; +13C24;EGYPTIAN HIEROGLYPH-13C24;Lo;0;L;;;;;N;;;;; +13C25;EGYPTIAN HIEROGLYPH-13C25;Lo;0;L;;;;;N;;;;; +13C26;EGYPTIAN HIEROGLYPH-13C26;Lo;0;L;;;;;N;;;;; +13C27;EGYPTIAN HIEROGLYPH-13C27;Lo;0;L;;;;;N;;;;; +13C28;EGYPTIAN HIEROGLYPH-13C28;Lo;0;L;;;;;N;;;;; +13C29;EGYPTIAN HIEROGLYPH-13C29;Lo;0;L;;;;;N;;;;; +13C2A;EGYPTIAN HIEROGLYPH-13C2A;Lo;0;L;;;;;N;;;;; +13C2B;EGYPTIAN HIEROGLYPH-13C2B;Lo;0;L;;;;;N;;;;; +13C2C;EGYPTIAN HIEROGLYPH-13C2C;Lo;0;L;;;;;N;;;;; +13C2D;EGYPTIAN HIEROGLYPH-13C2D;Lo;0;L;;;;;N;;;;; +13C2E;EGYPTIAN HIEROGLYPH-13C2E;Lo;0;L;;;;;N;;;;; +13C2F;EGYPTIAN HIEROGLYPH-13C2F;Lo;0;L;;;;;N;;;;; +13C30;EGYPTIAN HIEROGLYPH-13C30;Lo;0;L;;;;;N;;;;; +13C31;EGYPTIAN HIEROGLYPH-13C31;Lo;0;L;;;;;N;;;;; +13C32;EGYPTIAN HIEROGLYPH-13C32;Lo;0;L;;;;;N;;;;; +13C33;EGYPTIAN HIEROGLYPH-13C33;Lo;0;L;;;;;N;;;;; +13C34;EGYPTIAN HIEROGLYPH-13C34;Lo;0;L;;;;;N;;;;; +13C35;EGYPTIAN HIEROGLYPH-13C35;Lo;0;L;;;;;N;;;;; +13C36;EGYPTIAN HIEROGLYPH-13C36;Lo;0;L;;;;;N;;;;; +13C37;EGYPTIAN HIEROGLYPH-13C37;Lo;0;L;;;;;N;;;;; +13C38;EGYPTIAN HIEROGLYPH-13C38;Lo;0;L;;;;;N;;;;; +13C39;EGYPTIAN HIEROGLYPH-13C39;Lo;0;L;;;;;N;;;;; +13C3A;EGYPTIAN HIEROGLYPH-13C3A;Lo;0;L;;;;;N;;;;; +13C3B;EGYPTIAN HIEROGLYPH-13C3B;Lo;0;L;;;;;N;;;;; +13C3C;EGYPTIAN HIEROGLYPH-13C3C;Lo;0;L;;;;;N;;;;; +13C3D;EGYPTIAN HIEROGLYPH-13C3D;Lo;0;L;;;;;N;;;;; +13C3E;EGYPTIAN HIEROGLYPH-13C3E;Lo;0;L;;;;;N;;;;; +13C3F;EGYPTIAN HIEROGLYPH-13C3F;Lo;0;L;;;;;N;;;;; +13C40;EGYPTIAN HIEROGLYPH-13C40;Lo;0;L;;;;;N;;;;; +13C41;EGYPTIAN HIEROGLYPH-13C41;Lo;0;L;;;;;N;;;;; +13C42;EGYPTIAN HIEROGLYPH-13C42;Lo;0;L;;;;;N;;;;; +13C43;EGYPTIAN HIEROGLYPH-13C43;Lo;0;L;;;;;N;;;;; +13C44;EGYPTIAN HIEROGLYPH-13C44;Lo;0;L;;;;;N;;;;; +13C45;EGYPTIAN HIEROGLYPH-13C45;Lo;0;L;;;;;N;;;;; +13C46;EGYPTIAN HIEROGLYPH-13C46;Lo;0;L;;;;;N;;;;; +13C47;EGYPTIAN HIEROGLYPH-13C47;Lo;0;L;;;;;N;;;;; +13C48;EGYPTIAN HIEROGLYPH-13C48;Lo;0;L;;;;;N;;;;; +13C49;EGYPTIAN HIEROGLYPH-13C49;Lo;0;L;;;;;N;;;;; +13C4A;EGYPTIAN HIEROGLYPH-13C4A;Lo;0;L;;;;;N;;;;; +13C4B;EGYPTIAN HIEROGLYPH-13C4B;Lo;0;L;;;;;N;;;;; +13C4C;EGYPTIAN HIEROGLYPH-13C4C;Lo;0;L;;;;;N;;;;; +13C4D;EGYPTIAN HIEROGLYPH-13C4D;Lo;0;L;;;;;N;;;;; +13C4E;EGYPTIAN HIEROGLYPH-13C4E;Lo;0;L;;;;;N;;;;; +13C4F;EGYPTIAN HIEROGLYPH-13C4F;Lo;0;L;;;;;N;;;;; +13C50;EGYPTIAN HIEROGLYPH-13C50;Lo;0;L;;;;;N;;;;; +13C51;EGYPTIAN HIEROGLYPH-13C51;Lo;0;L;;;;;N;;;;; +13C52;EGYPTIAN HIEROGLYPH-13C52;Lo;0;L;;;;;N;;;;; +13C53;EGYPTIAN HIEROGLYPH-13C53;Lo;0;L;;;;;N;;;;; +13C54;EGYPTIAN HIEROGLYPH-13C54;Lo;0;L;;;;;N;;;;; +13C55;EGYPTIAN HIEROGLYPH-13C55;Lo;0;L;;;;;N;;;;; +13C56;EGYPTIAN HIEROGLYPH-13C56;Lo;0;L;;;;;N;;;;; +13C57;EGYPTIAN HIEROGLYPH-13C57;Lo;0;L;;;;;N;;;;; +13C58;EGYPTIAN HIEROGLYPH-13C58;Lo;0;L;;;;;N;;;;; +13C59;EGYPTIAN HIEROGLYPH-13C59;Lo;0;L;;;;;N;;;;; +13C5A;EGYPTIAN HIEROGLYPH-13C5A;Lo;0;L;;;;;N;;;;; +13C5B;EGYPTIAN HIEROGLYPH-13C5B;Lo;0;L;;;;;N;;;;; +13C5C;EGYPTIAN HIEROGLYPH-13C5C;Lo;0;L;;;;;N;;;;; +13C5D;EGYPTIAN HIEROGLYPH-13C5D;Lo;0;L;;;;;N;;;;; +13C5E;EGYPTIAN HIEROGLYPH-13C5E;Lo;0;L;;;;;N;;;;; +13C5F;EGYPTIAN HIEROGLYPH-13C5F;Lo;0;L;;;;;N;;;;; +13C60;EGYPTIAN HIEROGLYPH-13C60;Lo;0;L;;;;;N;;;;; +13C61;EGYPTIAN HIEROGLYPH-13C61;Lo;0;L;;;;;N;;;;; +13C62;EGYPTIAN HIEROGLYPH-13C62;Lo;0;L;;;;;N;;;;; +13C63;EGYPTIAN HIEROGLYPH-13C63;Lo;0;L;;;;;N;;;;; +13C64;EGYPTIAN HIEROGLYPH-13C64;Lo;0;L;;;;;N;;;;; +13C65;EGYPTIAN HIEROGLYPH-13C65;Lo;0;L;;;;;N;;;;; +13C66;EGYPTIAN HIEROGLYPH-13C66;Lo;0;L;;;;;N;;;;; +13C67;EGYPTIAN HIEROGLYPH-13C67;Lo;0;L;;;;;N;;;;; +13C68;EGYPTIAN HIEROGLYPH-13C68;Lo;0;L;;;;;N;;;;; +13C69;EGYPTIAN HIEROGLYPH-13C69;Lo;0;L;;;;;N;;;;; +13C6A;EGYPTIAN HIEROGLYPH-13C6A;Lo;0;L;;;;;N;;;;; +13C6B;EGYPTIAN HIEROGLYPH-13C6B;Lo;0;L;;;;;N;;;;; +13C6C;EGYPTIAN HIEROGLYPH-13C6C;Lo;0;L;;;;;N;;;;; +13C6D;EGYPTIAN HIEROGLYPH-13C6D;Lo;0;L;;;;;N;;;;; +13C6E;EGYPTIAN HIEROGLYPH-13C6E;Lo;0;L;;;;;N;;;;; +13C6F;EGYPTIAN HIEROGLYPH-13C6F;Lo;0;L;;;;;N;;;;; +13C70;EGYPTIAN HIEROGLYPH-13C70;Lo;0;L;;;;;N;;;;; +13C71;EGYPTIAN HIEROGLYPH-13C71;Lo;0;L;;;;;N;;;;; +13C72;EGYPTIAN HIEROGLYPH-13C72;Lo;0;L;;;;;N;;;;; +13C73;EGYPTIAN HIEROGLYPH-13C73;Lo;0;L;;;;;N;;;;; +13C74;EGYPTIAN HIEROGLYPH-13C74;Lo;0;L;;;;;N;;;;; +13C75;EGYPTIAN HIEROGLYPH-13C75;Lo;0;L;;;;;N;;;;; +13C76;EGYPTIAN HIEROGLYPH-13C76;Lo;0;L;;;;;N;;;;; +13C77;EGYPTIAN HIEROGLYPH-13C77;Lo;0;L;;;;;N;;;;; +13C78;EGYPTIAN HIEROGLYPH-13C78;Lo;0;L;;;;;N;;;;; +13C79;EGYPTIAN HIEROGLYPH-13C79;Lo;0;L;;;;;N;;;;; +13C7A;EGYPTIAN HIEROGLYPH-13C7A;Lo;0;L;;;;;N;;;;; +13C7B;EGYPTIAN HIEROGLYPH-13C7B;Lo;0;L;;;;;N;;;;; +13C7C;EGYPTIAN HIEROGLYPH-13C7C;Lo;0;L;;;;;N;;;;; +13C7D;EGYPTIAN HIEROGLYPH-13C7D;Lo;0;L;;;;;N;;;;; +13C7E;EGYPTIAN HIEROGLYPH-13C7E;Lo;0;L;;;;;N;;;;; +13C7F;EGYPTIAN HIEROGLYPH-13C7F;Lo;0;L;;;;;N;;;;; +13C80;EGYPTIAN HIEROGLYPH-13C80;Lo;0;L;;;;;N;;;;; +13C81;EGYPTIAN HIEROGLYPH-13C81;Lo;0;L;;;;;N;;;;; +13C82;EGYPTIAN HIEROGLYPH-13C82;Lo;0;L;;;;;N;;;;; +13C83;EGYPTIAN HIEROGLYPH-13C83;Lo;0;L;;;;;N;;;;; +13C84;EGYPTIAN HIEROGLYPH-13C84;Lo;0;L;;;;;N;;;;; +13C85;EGYPTIAN HIEROGLYPH-13C85;Lo;0;L;;;;;N;;;;; +13C86;EGYPTIAN HIEROGLYPH-13C86;Lo;0;L;;;;;N;;;;; +13C87;EGYPTIAN HIEROGLYPH-13C87;Lo;0;L;;;;;N;;;;; +13C88;EGYPTIAN HIEROGLYPH-13C88;Lo;0;L;;;;;N;;;;; +13C89;EGYPTIAN HIEROGLYPH-13C89;Lo;0;L;;;;;N;;;;; +13C8A;EGYPTIAN HIEROGLYPH-13C8A;Lo;0;L;;;;;N;;;;; +13C8B;EGYPTIAN HIEROGLYPH-13C8B;Lo;0;L;;;;;N;;;;; +13C8C;EGYPTIAN HIEROGLYPH-13C8C;Lo;0;L;;;;;N;;;;; +13C8D;EGYPTIAN HIEROGLYPH-13C8D;Lo;0;L;;;;;N;;;;; +13C8E;EGYPTIAN HIEROGLYPH-13C8E;Lo;0;L;;;;;N;;;;; +13C8F;EGYPTIAN HIEROGLYPH-13C8F;Lo;0;L;;;;;N;;;;; +13C90;EGYPTIAN HIEROGLYPH-13C90;Lo;0;L;;;;;N;;;;; +13C91;EGYPTIAN HIEROGLYPH-13C91;Lo;0;L;;;;;N;;;;; +13C92;EGYPTIAN HIEROGLYPH-13C92;Lo;0;L;;;;;N;;;;; +13C93;EGYPTIAN HIEROGLYPH-13C93;Lo;0;L;;;;;N;;;;; +13C94;EGYPTIAN HIEROGLYPH-13C94;Lo;0;L;;;;;N;;;;; +13C95;EGYPTIAN HIEROGLYPH-13C95;Lo;0;L;;;;;N;;;;; +13C96;EGYPTIAN HIEROGLYPH-13C96;Lo;0;L;;;;;N;;;;; +13C97;EGYPTIAN HIEROGLYPH-13C97;Lo;0;L;;;;;N;;;;; +13C98;EGYPTIAN HIEROGLYPH-13C98;Lo;0;L;;;;;N;;;;; +13C99;EGYPTIAN HIEROGLYPH-13C99;Lo;0;L;;;;;N;;;;; +13C9A;EGYPTIAN HIEROGLYPH-13C9A;Lo;0;L;;;;;N;;;;; +13C9B;EGYPTIAN HIEROGLYPH-13C9B;Lo;0;L;;;;;N;;;;; +13C9C;EGYPTIAN HIEROGLYPH-13C9C;Lo;0;L;;;;;N;;;;; +13C9D;EGYPTIAN HIEROGLYPH-13C9D;Lo;0;L;;;;;N;;;;; +13C9E;EGYPTIAN HIEROGLYPH-13C9E;Lo;0;L;;;;;N;;;;; +13C9F;EGYPTIAN HIEROGLYPH-13C9F;Lo;0;L;;;;;N;;;;; +13CA0;EGYPTIAN HIEROGLYPH-13CA0;Lo;0;L;;;;;N;;;;; +13CA1;EGYPTIAN HIEROGLYPH-13CA1;Lo;0;L;;;;;N;;;;; +13CA2;EGYPTIAN HIEROGLYPH-13CA2;Lo;0;L;;;;;N;;;;; +13CA3;EGYPTIAN HIEROGLYPH-13CA3;Lo;0;L;;;;;N;;;;; +13CA4;EGYPTIAN HIEROGLYPH-13CA4;Lo;0;L;;;;;N;;;;; +13CA5;EGYPTIAN HIEROGLYPH-13CA5;Lo;0;L;;;;;N;;;;; +13CA6;EGYPTIAN HIEROGLYPH-13CA6;Lo;0;L;;;;;N;;;;; +13CA7;EGYPTIAN HIEROGLYPH-13CA7;Lo;0;L;;;;;N;;;;; +13CA8;EGYPTIAN HIEROGLYPH-13CA8;Lo;0;L;;;;;N;;;;; +13CA9;EGYPTIAN HIEROGLYPH-13CA9;Lo;0;L;;;;;N;;;;; +13CAA;EGYPTIAN HIEROGLYPH-13CAA;Lo;0;L;;;;;N;;;;; +13CAB;EGYPTIAN HIEROGLYPH-13CAB;Lo;0;L;;;;;N;;;;; +13CAC;EGYPTIAN HIEROGLYPH-13CAC;Lo;0;L;;;;;N;;;;; +13CAD;EGYPTIAN HIEROGLYPH-13CAD;Lo;0;L;;;;;N;;;;; +13CAE;EGYPTIAN HIEROGLYPH-13CAE;Lo;0;L;;;;;N;;;;; +13CAF;EGYPTIAN HIEROGLYPH-13CAF;Lo;0;L;;;;;N;;;;; +13CB0;EGYPTIAN HIEROGLYPH-13CB0;Lo;0;L;;;;;N;;;;; +13CB1;EGYPTIAN HIEROGLYPH-13CB1;Lo;0;L;;;;;N;;;;; +13CB2;EGYPTIAN HIEROGLYPH-13CB2;Lo;0;L;;;;;N;;;;; +13CB3;EGYPTIAN HIEROGLYPH-13CB3;Lo;0;L;;;;;N;;;;; +13CB4;EGYPTIAN HIEROGLYPH-13CB4;Lo;0;L;;;;;N;;;;; +13CB5;EGYPTIAN HIEROGLYPH-13CB5;Lo;0;L;;;;;N;;;;; +13CB6;EGYPTIAN HIEROGLYPH-13CB6;Lo;0;L;;;;;N;;;;; +13CB7;EGYPTIAN HIEROGLYPH-13CB7;Lo;0;L;;;;;N;;;;; +13CB8;EGYPTIAN HIEROGLYPH-13CB8;Lo;0;L;;;;;N;;;;; +13CB9;EGYPTIAN HIEROGLYPH-13CB9;Lo;0;L;;;;;N;;;;; +13CBA;EGYPTIAN HIEROGLYPH-13CBA;Lo;0;L;;;;;N;;;;; +13CBB;EGYPTIAN HIEROGLYPH-13CBB;Lo;0;L;;;;;N;;;;; +13CBC;EGYPTIAN HIEROGLYPH-13CBC;Lo;0;L;;;;;N;;;;; +13CBD;EGYPTIAN HIEROGLYPH-13CBD;Lo;0;L;;;;;N;;;;; +13CBE;EGYPTIAN HIEROGLYPH-13CBE;Lo;0;L;;;;;N;;;;; +13CBF;EGYPTIAN HIEROGLYPH-13CBF;Lo;0;L;;;;;N;;;;; +13CC0;EGYPTIAN HIEROGLYPH-13CC0;Lo;0;L;;;;;N;;;;; +13CC1;EGYPTIAN HIEROGLYPH-13CC1;Lo;0;L;;;;;N;;;;; +13CC2;EGYPTIAN HIEROGLYPH-13CC2;Lo;0;L;;;;;N;;;;; +13CC3;EGYPTIAN HIEROGLYPH-13CC3;Lo;0;L;;;;;N;;;;; +13CC4;EGYPTIAN HIEROGLYPH-13CC4;Lo;0;L;;;;;N;;;;; +13CC5;EGYPTIAN HIEROGLYPH-13CC5;Lo;0;L;;;;;N;;;;; +13CC6;EGYPTIAN HIEROGLYPH-13CC6;Lo;0;L;;;;;N;;;;; +13CC7;EGYPTIAN HIEROGLYPH-13CC7;Lo;0;L;;;;;N;;;;; +13CC8;EGYPTIAN HIEROGLYPH-13CC8;Lo;0;L;;;;;N;;;;; +13CC9;EGYPTIAN HIEROGLYPH-13CC9;Lo;0;L;;;;;N;;;;; +13CCA;EGYPTIAN HIEROGLYPH-13CCA;Lo;0;L;;;;;N;;;;; +13CCB;EGYPTIAN HIEROGLYPH-13CCB;Lo;0;L;;;;;N;;;;; +13CCC;EGYPTIAN HIEROGLYPH-13CCC;Lo;0;L;;;;;N;;;;; +13CCD;EGYPTIAN HIEROGLYPH-13CCD;Lo;0;L;;;;;N;;;;; +13CCE;EGYPTIAN HIEROGLYPH-13CCE;Lo;0;L;;;;;N;;;;; +13CCF;EGYPTIAN HIEROGLYPH-13CCF;Lo;0;L;;;;;N;;;;; +13CD0;EGYPTIAN HIEROGLYPH-13CD0;Lo;0;L;;;;;N;;;;; +13CD1;EGYPTIAN HIEROGLYPH-13CD1;Lo;0;L;;;;;N;;;;; +13CD2;EGYPTIAN HIEROGLYPH-13CD2;Lo;0;L;;;;;N;;;;; +13CD3;EGYPTIAN HIEROGLYPH-13CD3;Lo;0;L;;;;;N;;;;; +13CD4;EGYPTIAN HIEROGLYPH-13CD4;Lo;0;L;;;;;N;;;;; +13CD5;EGYPTIAN HIEROGLYPH-13CD5;Lo;0;L;;;;;N;;;;; +13CD6;EGYPTIAN HIEROGLYPH-13CD6;Lo;0;L;;;;;N;;;;; +13CD7;EGYPTIAN HIEROGLYPH-13CD7;Lo;0;L;;;;;N;;;;; +13CD8;EGYPTIAN HIEROGLYPH-13CD8;Lo;0;L;;;;;N;;;;; +13CD9;EGYPTIAN HIEROGLYPH-13CD9;Lo;0;L;;;;;N;;;;; +13CDA;EGYPTIAN HIEROGLYPH-13CDA;Lo;0;L;;;;;N;;;;; +13CDB;EGYPTIAN HIEROGLYPH-13CDB;Lo;0;L;;;;;N;;;;; +13CDC;EGYPTIAN HIEROGLYPH-13CDC;Lo;0;L;;;;;N;;;;; +13CDD;EGYPTIAN HIEROGLYPH-13CDD;Lo;0;L;;;;;N;;;;; +13CDE;EGYPTIAN HIEROGLYPH-13CDE;Lo;0;L;;;;;N;;;;; +13CDF;EGYPTIAN HIEROGLYPH-13CDF;Lo;0;L;;;;;N;;;;; +13CE0;EGYPTIAN HIEROGLYPH-13CE0;Lo;0;L;;;;;N;;;;; +13CE1;EGYPTIAN HIEROGLYPH-13CE1;Lo;0;L;;;;;N;;;;; +13CE2;EGYPTIAN HIEROGLYPH-13CE2;Lo;0;L;;;;;N;;;;; +13CE3;EGYPTIAN HIEROGLYPH-13CE3;Lo;0;L;;;;;N;;;;; +13CE4;EGYPTIAN HIEROGLYPH-13CE4;Lo;0;L;;;;;N;;;;; +13CE5;EGYPTIAN HIEROGLYPH-13CE5;Lo;0;L;;;;;N;;;;; +13CE6;EGYPTIAN HIEROGLYPH-13CE6;Lo;0;L;;;;;N;;;;; +13CE7;EGYPTIAN HIEROGLYPH-13CE7;Lo;0;L;;;;;N;;;;; +13CE8;EGYPTIAN HIEROGLYPH-13CE8;Lo;0;L;;;;;N;;;;; +13CE9;EGYPTIAN HIEROGLYPH-13CE9;Lo;0;L;;;;;N;;;;; +13CEA;EGYPTIAN HIEROGLYPH-13CEA;Lo;0;L;;;;;N;;;;; +13CEB;EGYPTIAN HIEROGLYPH-13CEB;Lo;0;L;;;;;N;;;;; +13CEC;EGYPTIAN HIEROGLYPH-13CEC;Lo;0;L;;;;;N;;;;; +13CED;EGYPTIAN HIEROGLYPH-13CED;Lo;0;L;;;;;N;;;;; +13CEE;EGYPTIAN HIEROGLYPH-13CEE;Lo;0;L;;;;;N;;;;; +13CEF;EGYPTIAN HIEROGLYPH-13CEF;Lo;0;L;;;;;N;;;;; +13CF0;EGYPTIAN HIEROGLYPH-13CF0;Lo;0;L;;;;;N;;;;; +13CF1;EGYPTIAN HIEROGLYPH-13CF1;Lo;0;L;;;;;N;;;;; +13CF2;EGYPTIAN HIEROGLYPH-13CF2;Lo;0;L;;;;;N;;;;; +13CF3;EGYPTIAN HIEROGLYPH-13CF3;Lo;0;L;;;;;N;;;;; +13CF4;EGYPTIAN HIEROGLYPH-13CF4;Lo;0;L;;;;;N;;;;; +13CF5;EGYPTIAN HIEROGLYPH-13CF5;Lo;0;L;;;;;N;;;;; +13CF6;EGYPTIAN HIEROGLYPH-13CF6;Lo;0;L;;;;;N;;;;; +13CF7;EGYPTIAN HIEROGLYPH-13CF7;Lo;0;L;;;;;N;;;;; +13CF8;EGYPTIAN HIEROGLYPH-13CF8;Lo;0;L;;;;;N;;;;; +13CF9;EGYPTIAN HIEROGLYPH-13CF9;Lo;0;L;;;;;N;;;;; +13CFA;EGYPTIAN HIEROGLYPH-13CFA;Lo;0;L;;;;;N;;;;; +13CFB;EGYPTIAN HIEROGLYPH-13CFB;Lo;0;L;;;;;N;;;;; +13CFC;EGYPTIAN HIEROGLYPH-13CFC;Lo;0;L;;;;;N;;;;; +13CFD;EGYPTIAN HIEROGLYPH-13CFD;Lo;0;L;;;;;N;;;;; +13CFE;EGYPTIAN HIEROGLYPH-13CFE;Lo;0;L;;;;;N;;;;; +13CFF;EGYPTIAN HIEROGLYPH-13CFF;Lo;0;L;;;;;N;;;;; +13D00;EGYPTIAN HIEROGLYPH-13D00;Lo;0;L;;;;;N;;;;; +13D01;EGYPTIAN HIEROGLYPH-13D01;Lo;0;L;;;;;N;;;;; +13D02;EGYPTIAN HIEROGLYPH-13D02;Lo;0;L;;;;;N;;;;; +13D03;EGYPTIAN HIEROGLYPH-13D03;Lo;0;L;;;;;N;;;;; +13D04;EGYPTIAN HIEROGLYPH-13D04;Lo;0;L;;;;;N;;;;; +13D05;EGYPTIAN HIEROGLYPH-13D05;Lo;0;L;;;;;N;;;;; +13D06;EGYPTIAN HIEROGLYPH-13D06;Lo;0;L;;;;;N;;;;; +13D07;EGYPTIAN HIEROGLYPH-13D07;Lo;0;L;;;;;N;;;;; +13D08;EGYPTIAN HIEROGLYPH-13D08;Lo;0;L;;;;;N;;;;; +13D09;EGYPTIAN HIEROGLYPH-13D09;Lo;0;L;;;;;N;;;;; +13D0A;EGYPTIAN HIEROGLYPH-13D0A;Lo;0;L;;;;;N;;;;; +13D0B;EGYPTIAN HIEROGLYPH-13D0B;Lo;0;L;;;;;N;;;;; +13D0C;EGYPTIAN HIEROGLYPH-13D0C;Lo;0;L;;;;;N;;;;; +13D0D;EGYPTIAN HIEROGLYPH-13D0D;Lo;0;L;;;;;N;;;;; +13D0E;EGYPTIAN HIEROGLYPH-13D0E;Lo;0;L;;;;;N;;;;; +13D0F;EGYPTIAN HIEROGLYPH-13D0F;Lo;0;L;;;;;N;;;;; +13D10;EGYPTIAN HIEROGLYPH-13D10;Lo;0;L;;;;;N;;;;; +13D11;EGYPTIAN HIEROGLYPH-13D11;Lo;0;L;;;;;N;;;;; +13D12;EGYPTIAN HIEROGLYPH-13D12;Lo;0;L;;;;;N;;;;; +13D13;EGYPTIAN HIEROGLYPH-13D13;Lo;0;L;;;;;N;;;;; +13D14;EGYPTIAN HIEROGLYPH-13D14;Lo;0;L;;;;;N;;;;; +13D15;EGYPTIAN HIEROGLYPH-13D15;Lo;0;L;;;;;N;;;;; +13D16;EGYPTIAN HIEROGLYPH-13D16;Lo;0;L;;;;;N;;;;; +13D17;EGYPTIAN HIEROGLYPH-13D17;Lo;0;L;;;;;N;;;;; +13D18;EGYPTIAN HIEROGLYPH-13D18;Lo;0;L;;;;;N;;;;; +13D19;EGYPTIAN HIEROGLYPH-13D19;Lo;0;L;;;;;N;;;;; +13D1A;EGYPTIAN HIEROGLYPH-13D1A;Lo;0;L;;;;;N;;;;; +13D1B;EGYPTIAN HIEROGLYPH-13D1B;Lo;0;L;;;;;N;;;;; +13D1C;EGYPTIAN HIEROGLYPH-13D1C;Lo;0;L;;;;;N;;;;; +13D1D;EGYPTIAN HIEROGLYPH-13D1D;Lo;0;L;;;;;N;;;;; +13D1E;EGYPTIAN HIEROGLYPH-13D1E;Lo;0;L;;;;;N;;;;; +13D1F;EGYPTIAN HIEROGLYPH-13D1F;Lo;0;L;;;;;N;;;;; +13D20;EGYPTIAN HIEROGLYPH-13D20;Lo;0;L;;;;;N;;;;; +13D21;EGYPTIAN HIEROGLYPH-13D21;Lo;0;L;;;;;N;;;;; +13D22;EGYPTIAN HIEROGLYPH-13D22;Lo;0;L;;;;;N;;;;; +13D23;EGYPTIAN HIEROGLYPH-13D23;Lo;0;L;;;;;N;;;;; +13D24;EGYPTIAN HIEROGLYPH-13D24;Lo;0;L;;;;;N;;;;; +13D25;EGYPTIAN HIEROGLYPH-13D25;Lo;0;L;;;;;N;;;;; +13D26;EGYPTIAN HIEROGLYPH-13D26;Lo;0;L;;;;;N;;;;; +13D27;EGYPTIAN HIEROGLYPH-13D27;Lo;0;L;;;;;N;;;;; +13D28;EGYPTIAN HIEROGLYPH-13D28;Lo;0;L;;;;;N;;;;; +13D29;EGYPTIAN HIEROGLYPH-13D29;Lo;0;L;;;;;N;;;;; +13D2A;EGYPTIAN HIEROGLYPH-13D2A;Lo;0;L;;;;;N;;;;; +13D2B;EGYPTIAN HIEROGLYPH-13D2B;Lo;0;L;;;;;N;;;;; +13D2C;EGYPTIAN HIEROGLYPH-13D2C;Lo;0;L;;;;;N;;;;; +13D2D;EGYPTIAN HIEROGLYPH-13D2D;Lo;0;L;;;;;N;;;;; +13D2E;EGYPTIAN HIEROGLYPH-13D2E;Lo;0;L;;;;;N;;;;; +13D2F;EGYPTIAN HIEROGLYPH-13D2F;Lo;0;L;;;;;N;;;;; +13D30;EGYPTIAN HIEROGLYPH-13D30;Lo;0;L;;;;;N;;;;; +13D31;EGYPTIAN HIEROGLYPH-13D31;Lo;0;L;;;;;N;;;;; +13D32;EGYPTIAN HIEROGLYPH-13D32;Lo;0;L;;;;;N;;;;; +13D33;EGYPTIAN HIEROGLYPH-13D33;Lo;0;L;;;;;N;;;;; +13D34;EGYPTIAN HIEROGLYPH-13D34;Lo;0;L;;;;;N;;;;; +13D35;EGYPTIAN HIEROGLYPH-13D35;Lo;0;L;;;;;N;;;;; +13D36;EGYPTIAN HIEROGLYPH-13D36;Lo;0;L;;;;;N;;;;; +13D37;EGYPTIAN HIEROGLYPH-13D37;Lo;0;L;;;;;N;;;;; +13D38;EGYPTIAN HIEROGLYPH-13D38;Lo;0;L;;;;;N;;;;; +13D39;EGYPTIAN HIEROGLYPH-13D39;Lo;0;L;;;;;N;;;;; +13D3A;EGYPTIAN HIEROGLYPH-13D3A;Lo;0;L;;;;;N;;;;; +13D3B;EGYPTIAN HIEROGLYPH-13D3B;Lo;0;L;;;;;N;;;;; +13D3C;EGYPTIAN HIEROGLYPH-13D3C;Lo;0;L;;;;;N;;;;; +13D3D;EGYPTIAN HIEROGLYPH-13D3D;Lo;0;L;;;;;N;;;;; +13D3E;EGYPTIAN HIEROGLYPH-13D3E;Lo;0;L;;;;;N;;;;; +13D3F;EGYPTIAN HIEROGLYPH-13D3F;Lo;0;L;;;;;N;;;;; +13D40;EGYPTIAN HIEROGLYPH-13D40;Lo;0;L;;;;;N;;;;; +13D41;EGYPTIAN HIEROGLYPH-13D41;Lo;0;L;;;;;N;;;;; +13D42;EGYPTIAN HIEROGLYPH-13D42;Lo;0;L;;;;;N;;;;; +13D43;EGYPTIAN HIEROGLYPH-13D43;Lo;0;L;;;;;N;;;;; +13D44;EGYPTIAN HIEROGLYPH-13D44;Lo;0;L;;;;;N;;;;; +13D45;EGYPTIAN HIEROGLYPH-13D45;Lo;0;L;;;;;N;;;;; +13D46;EGYPTIAN HIEROGLYPH-13D46;Lo;0;L;;;;;N;;;;; +13D47;EGYPTIAN HIEROGLYPH-13D47;Lo;0;L;;;;;N;;;;; +13D48;EGYPTIAN HIEROGLYPH-13D48;Lo;0;L;;;;;N;;;;; +13D49;EGYPTIAN HIEROGLYPH-13D49;Lo;0;L;;;;;N;;;;; +13D4A;EGYPTIAN HIEROGLYPH-13D4A;Lo;0;L;;;;;N;;;;; +13D4B;EGYPTIAN HIEROGLYPH-13D4B;Lo;0;L;;;;;N;;;;; +13D4C;EGYPTIAN HIEROGLYPH-13D4C;Lo;0;L;;;;;N;;;;; +13D4D;EGYPTIAN HIEROGLYPH-13D4D;Lo;0;L;;;;;N;;;;; +13D4E;EGYPTIAN HIEROGLYPH-13D4E;Lo;0;L;;;;;N;;;;; +13D4F;EGYPTIAN HIEROGLYPH-13D4F;Lo;0;L;;;;;N;;;;; +13D50;EGYPTIAN HIEROGLYPH-13D50;Lo;0;L;;;;;N;;;;; +13D51;EGYPTIAN HIEROGLYPH-13D51;Lo;0;L;;;;;N;;;;; +13D52;EGYPTIAN HIEROGLYPH-13D52;Lo;0;L;;;;;N;;;;; +13D53;EGYPTIAN HIEROGLYPH-13D53;Lo;0;L;;;;;N;;;;; +13D54;EGYPTIAN HIEROGLYPH-13D54;Lo;0;L;;;;;N;;;;; +13D55;EGYPTIAN HIEROGLYPH-13D55;Lo;0;L;;;;;N;;;;; +13D56;EGYPTIAN HIEROGLYPH-13D56;Lo;0;L;;;;;N;;;;; +13D57;EGYPTIAN HIEROGLYPH-13D57;Lo;0;L;;;;;N;;;;; +13D58;EGYPTIAN HIEROGLYPH-13D58;Lo;0;L;;;;;N;;;;; +13D59;EGYPTIAN HIEROGLYPH-13D59;Lo;0;L;;;;;N;;;;; +13D5A;EGYPTIAN HIEROGLYPH-13D5A;Lo;0;L;;;;;N;;;;; +13D5B;EGYPTIAN HIEROGLYPH-13D5B;Lo;0;L;;;;;N;;;;; +13D5C;EGYPTIAN HIEROGLYPH-13D5C;Lo;0;L;;;;;N;;;;; +13D5D;EGYPTIAN HIEROGLYPH-13D5D;Lo;0;L;;;;;N;;;;; +13D5E;EGYPTIAN HIEROGLYPH-13D5E;Lo;0;L;;;;;N;;;;; +13D5F;EGYPTIAN HIEROGLYPH-13D5F;Lo;0;L;;;;;N;;;;; +13D60;EGYPTIAN HIEROGLYPH-13D60;Lo;0;L;;;;;N;;;;; +13D61;EGYPTIAN HIEROGLYPH-13D61;Lo;0;L;;;;;N;;;;; +13D62;EGYPTIAN HIEROGLYPH-13D62;Lo;0;L;;;;;N;;;;; +13D63;EGYPTIAN HIEROGLYPH-13D63;Lo;0;L;;;;;N;;;;; +13D64;EGYPTIAN HIEROGLYPH-13D64;Lo;0;L;;;;;N;;;;; +13D65;EGYPTIAN HIEROGLYPH-13D65;Lo;0;L;;;;;N;;;;; +13D66;EGYPTIAN HIEROGLYPH-13D66;Lo;0;L;;;;;N;;;;; +13D67;EGYPTIAN HIEROGLYPH-13D67;Lo;0;L;;;;;N;;;;; +13D68;EGYPTIAN HIEROGLYPH-13D68;Lo;0;L;;;;;N;;;;; +13D69;EGYPTIAN HIEROGLYPH-13D69;Lo;0;L;;;;;N;;;;; +13D6A;EGYPTIAN HIEROGLYPH-13D6A;Lo;0;L;;;;;N;;;;; +13D6B;EGYPTIAN HIEROGLYPH-13D6B;Lo;0;L;;;;;N;;;;; +13D6C;EGYPTIAN HIEROGLYPH-13D6C;Lo;0;L;;;;;N;;;;; +13D6D;EGYPTIAN HIEROGLYPH-13D6D;Lo;0;L;;;;;N;;;;; +13D6E;EGYPTIAN HIEROGLYPH-13D6E;Lo;0;L;;;;;N;;;;; +13D6F;EGYPTIAN HIEROGLYPH-13D6F;Lo;0;L;;;;;N;;;;; +13D70;EGYPTIAN HIEROGLYPH-13D70;Lo;0;L;;;;;N;;;;; +13D71;EGYPTIAN HIEROGLYPH-13D71;Lo;0;L;;;;;N;;;;; +13D72;EGYPTIAN HIEROGLYPH-13D72;Lo;0;L;;;;;N;;;;; +13D73;EGYPTIAN HIEROGLYPH-13D73;Lo;0;L;;;;;N;;;;; +13D74;EGYPTIAN HIEROGLYPH-13D74;Lo;0;L;;;;;N;;;;; +13D75;EGYPTIAN HIEROGLYPH-13D75;Lo;0;L;;;;;N;;;;; +13D76;EGYPTIAN HIEROGLYPH-13D76;Lo;0;L;;;;;N;;;;; +13D77;EGYPTIAN HIEROGLYPH-13D77;Lo;0;L;;;;;N;;;;; +13D78;EGYPTIAN HIEROGLYPH-13D78;Lo;0;L;;;;;N;;;;; +13D79;EGYPTIAN HIEROGLYPH-13D79;Lo;0;L;;;;;N;;;;; +13D7A;EGYPTIAN HIEROGLYPH-13D7A;Lo;0;L;;;;;N;;;;; +13D7B;EGYPTIAN HIEROGLYPH-13D7B;Lo;0;L;;;;;N;;;;; +13D7C;EGYPTIAN HIEROGLYPH-13D7C;Lo;0;L;;;;;N;;;;; +13D7D;EGYPTIAN HIEROGLYPH-13D7D;Lo;0;L;;;;;N;;;;; +13D7E;EGYPTIAN HIEROGLYPH-13D7E;Lo;0;L;;;;;N;;;;; +13D7F;EGYPTIAN HIEROGLYPH-13D7F;Lo;0;L;;;;;N;;;;; +13D80;EGYPTIAN HIEROGLYPH-13D80;Lo;0;L;;;;;N;;;;; +13D81;EGYPTIAN HIEROGLYPH-13D81;Lo;0;L;;;;;N;;;;; +13D82;EGYPTIAN HIEROGLYPH-13D82;Lo;0;L;;;;;N;;;;; +13D83;EGYPTIAN HIEROGLYPH-13D83;Lo;0;L;;;;;N;;;;; +13D84;EGYPTIAN HIEROGLYPH-13D84;Lo;0;L;;;;;N;;;;; +13D85;EGYPTIAN HIEROGLYPH-13D85;Lo;0;L;;;;;N;;;;; +13D86;EGYPTIAN HIEROGLYPH-13D86;Lo;0;L;;;;;N;;;;; +13D87;EGYPTIAN HIEROGLYPH-13D87;Lo;0;L;;;;;N;;;;; +13D88;EGYPTIAN HIEROGLYPH-13D88;Lo;0;L;;;;;N;;;;; +13D89;EGYPTIAN HIEROGLYPH-13D89;Lo;0;L;;;;;N;;;;; +13D8A;EGYPTIAN HIEROGLYPH-13D8A;Lo;0;L;;;;;N;;;;; +13D8B;EGYPTIAN HIEROGLYPH-13D8B;Lo;0;L;;;;;N;;;;; +13D8C;EGYPTIAN HIEROGLYPH-13D8C;Lo;0;L;;;;;N;;;;; +13D8D;EGYPTIAN HIEROGLYPH-13D8D;Lo;0;L;;;;;N;;;;; +13D8E;EGYPTIAN HIEROGLYPH-13D8E;Lo;0;L;;;;;N;;;;; +13D8F;EGYPTIAN HIEROGLYPH-13D8F;Lo;0;L;;;;;N;;;;; +13D90;EGYPTIAN HIEROGLYPH-13D90;Lo;0;L;;;;;N;;;;; +13D91;EGYPTIAN HIEROGLYPH-13D91;Lo;0;L;;;;;N;;;;; +13D92;EGYPTIAN HIEROGLYPH-13D92;Lo;0;L;;;;;N;;;;; +13D93;EGYPTIAN HIEROGLYPH-13D93;Lo;0;L;;;;;N;;;;; +13D94;EGYPTIAN HIEROGLYPH-13D94;Lo;0;L;;;;;N;;;;; +13D95;EGYPTIAN HIEROGLYPH-13D95;Lo;0;L;;;;;N;;;;; +13D96;EGYPTIAN HIEROGLYPH-13D96;Lo;0;L;;;;;N;;;;; +13D97;EGYPTIAN HIEROGLYPH-13D97;Lo;0;L;;;;;N;;;;; +13D98;EGYPTIAN HIEROGLYPH-13D98;Lo;0;L;;;;;N;;;;; +13D99;EGYPTIAN HIEROGLYPH-13D99;Lo;0;L;;;;;N;;;;; +13D9A;EGYPTIAN HIEROGLYPH-13D9A;Lo;0;L;;;;;N;;;;; +13D9B;EGYPTIAN HIEROGLYPH-13D9B;Lo;0;L;;;;;N;;;;; +13D9C;EGYPTIAN HIEROGLYPH-13D9C;Lo;0;L;;;;;N;;;;; +13D9D;EGYPTIAN HIEROGLYPH-13D9D;Lo;0;L;;;;;N;;;;; +13D9E;EGYPTIAN HIEROGLYPH-13D9E;Lo;0;L;;;;;N;;;;; +13D9F;EGYPTIAN HIEROGLYPH-13D9F;Lo;0;L;;;;;N;;;;; +13DA0;EGYPTIAN HIEROGLYPH-13DA0;Lo;0;L;;;;;N;;;;; +13DA1;EGYPTIAN HIEROGLYPH-13DA1;Lo;0;L;;;;;N;;;;; +13DA2;EGYPTIAN HIEROGLYPH-13DA2;Lo;0;L;;;;;N;;;;; +13DA3;EGYPTIAN HIEROGLYPH-13DA3;Lo;0;L;;;;;N;;;;; +13DA4;EGYPTIAN HIEROGLYPH-13DA4;Lo;0;L;;;;;N;;;;; +13DA5;EGYPTIAN HIEROGLYPH-13DA5;Lo;0;L;;;;;N;;;;; +13DA6;EGYPTIAN HIEROGLYPH-13DA6;Lo;0;L;;;;;N;;;;; +13DA7;EGYPTIAN HIEROGLYPH-13DA7;Lo;0;L;;;;;N;;;;; +13DA8;EGYPTIAN HIEROGLYPH-13DA8;Lo;0;L;;;;;N;;;;; +13DA9;EGYPTIAN HIEROGLYPH-13DA9;Lo;0;L;;;;;N;;;;; +13DAA;EGYPTIAN HIEROGLYPH-13DAA;Lo;0;L;;;;;N;;;;; +13DAB;EGYPTIAN HIEROGLYPH-13DAB;Lo;0;L;;;;;N;;;;; +13DAC;EGYPTIAN HIEROGLYPH-13DAC;Lo;0;L;;;;;N;;;;; +13DAD;EGYPTIAN HIEROGLYPH-13DAD;Lo;0;L;;;;;N;;;;; +13DAE;EGYPTIAN HIEROGLYPH-13DAE;Lo;0;L;;;;;N;;;;; +13DAF;EGYPTIAN HIEROGLYPH-13DAF;Lo;0;L;;;;;N;;;;; +13DB0;EGYPTIAN HIEROGLYPH-13DB0;Lo;0;L;;;;;N;;;;; +13DB1;EGYPTIAN HIEROGLYPH-13DB1;Lo;0;L;;;;;N;;;;; +13DB2;EGYPTIAN HIEROGLYPH-13DB2;Lo;0;L;;;;;N;;;;; +13DB3;EGYPTIAN HIEROGLYPH-13DB3;Lo;0;L;;;;;N;;;;; +13DB4;EGYPTIAN HIEROGLYPH-13DB4;Lo;0;L;;;;;N;;;;; +13DB5;EGYPTIAN HIEROGLYPH-13DB5;Lo;0;L;;;;;N;;;;; +13DB6;EGYPTIAN HIEROGLYPH-13DB6;Lo;0;L;;;;;N;;;;; +13DB7;EGYPTIAN HIEROGLYPH-13DB7;Lo;0;L;;;;;N;;;;; +13DB8;EGYPTIAN HIEROGLYPH-13DB8;Lo;0;L;;;;;N;;;;; +13DB9;EGYPTIAN HIEROGLYPH-13DB9;Lo;0;L;;;;;N;;;;; +13DBA;EGYPTIAN HIEROGLYPH-13DBA;Lo;0;L;;;;;N;;;;; +13DBB;EGYPTIAN HIEROGLYPH-13DBB;Lo;0;L;;;;;N;;;;; +13DBC;EGYPTIAN HIEROGLYPH-13DBC;Lo;0;L;;;;;N;;;;; +13DBD;EGYPTIAN HIEROGLYPH-13DBD;Lo;0;L;;;;;N;;;;; +13DBE;EGYPTIAN HIEROGLYPH-13DBE;Lo;0;L;;;;;N;;;;; +13DBF;EGYPTIAN HIEROGLYPH-13DBF;Lo;0;L;;;;;N;;;;; +13DC0;EGYPTIAN HIEROGLYPH-13DC0;Lo;0;L;;;;;N;;;;; +13DC1;EGYPTIAN HIEROGLYPH-13DC1;Lo;0;L;;;;;N;;;;; +13DC2;EGYPTIAN HIEROGLYPH-13DC2;Lo;0;L;;;;;N;;;;; +13DC3;EGYPTIAN HIEROGLYPH-13DC3;Lo;0;L;;;;;N;;;;; +13DC4;EGYPTIAN HIEROGLYPH-13DC4;Lo;0;L;;;;;N;;;;; +13DC5;EGYPTIAN HIEROGLYPH-13DC5;Lo;0;L;;;;;N;;;;; +13DC6;EGYPTIAN HIEROGLYPH-13DC6;Lo;0;L;;;;;N;;;;; +13DC7;EGYPTIAN HIEROGLYPH-13DC7;Lo;0;L;;;;;N;;;;; +13DC8;EGYPTIAN HIEROGLYPH-13DC8;Lo;0;L;;;;;N;;;;; +13DC9;EGYPTIAN HIEROGLYPH-13DC9;Lo;0;L;;;;;N;;;;; +13DCA;EGYPTIAN HIEROGLYPH-13DCA;Lo;0;L;;;;;N;;;;; +13DCB;EGYPTIAN HIEROGLYPH-13DCB;Lo;0;L;;;;;N;;;;; +13DCC;EGYPTIAN HIEROGLYPH-13DCC;Lo;0;L;;;;;N;;;;; +13DCD;EGYPTIAN HIEROGLYPH-13DCD;Lo;0;L;;;;;N;;;;; +13DCE;EGYPTIAN HIEROGLYPH-13DCE;Lo;0;L;;;;;N;;;;; +13DCF;EGYPTIAN HIEROGLYPH-13DCF;Lo;0;L;;;;;N;;;;; +13DD0;EGYPTIAN HIEROGLYPH-13DD0;Lo;0;L;;;;;N;;;;; +13DD1;EGYPTIAN HIEROGLYPH-13DD1;Lo;0;L;;;;;N;;;;; +13DD2;EGYPTIAN HIEROGLYPH-13DD2;Lo;0;L;;;;;N;;;;; +13DD3;EGYPTIAN HIEROGLYPH-13DD3;Lo;0;L;;;;;N;;;;; +13DD4;EGYPTIAN HIEROGLYPH-13DD4;Lo;0;L;;;;;N;;;;; +13DD5;EGYPTIAN HIEROGLYPH-13DD5;Lo;0;L;;;;;N;;;;; +13DD6;EGYPTIAN HIEROGLYPH-13DD6;Lo;0;L;;;;;N;;;;; +13DD7;EGYPTIAN HIEROGLYPH-13DD7;Lo;0;L;;;;;N;;;;; +13DD8;EGYPTIAN HIEROGLYPH-13DD8;Lo;0;L;;;;;N;;;;; +13DD9;EGYPTIAN HIEROGLYPH-13DD9;Lo;0;L;;;;;N;;;;; +13DDA;EGYPTIAN HIEROGLYPH-13DDA;Lo;0;L;;;;;N;;;;; +13DDB;EGYPTIAN HIEROGLYPH-13DDB;Lo;0;L;;;;;N;;;;; +13DDC;EGYPTIAN HIEROGLYPH-13DDC;Lo;0;L;;;;;N;;;;; +13DDD;EGYPTIAN HIEROGLYPH-13DDD;Lo;0;L;;;;;N;;;;; +13DDE;EGYPTIAN HIEROGLYPH-13DDE;Lo;0;L;;;;;N;;;;; +13DDF;EGYPTIAN HIEROGLYPH-13DDF;Lo;0;L;;;;;N;;;;; +13DE0;EGYPTIAN HIEROGLYPH-13DE0;Lo;0;L;;;;;N;;;;; +13DE1;EGYPTIAN HIEROGLYPH-13DE1;Lo;0;L;;;;;N;;;;; +13DE2;EGYPTIAN HIEROGLYPH-13DE2;Lo;0;L;;;;;N;;;;; +13DE3;EGYPTIAN HIEROGLYPH-13DE3;Lo;0;L;;;;;N;;;;; +13DE4;EGYPTIAN HIEROGLYPH-13DE4;Lo;0;L;;;;;N;;;;; +13DE5;EGYPTIAN HIEROGLYPH-13DE5;Lo;0;L;;;;;N;;;;; +13DE6;EGYPTIAN HIEROGLYPH-13DE6;Lo;0;L;;;;;N;;;;; +13DE7;EGYPTIAN HIEROGLYPH-13DE7;Lo;0;L;;;;;N;;;;; +13DE8;EGYPTIAN HIEROGLYPH-13DE8;Lo;0;L;;;;;N;;;;; +13DE9;EGYPTIAN HIEROGLYPH-13DE9;Lo;0;L;;;;;N;;;;; +13DEA;EGYPTIAN HIEROGLYPH-13DEA;Lo;0;L;;;;;N;;;;; +13DEB;EGYPTIAN HIEROGLYPH-13DEB;Lo;0;L;;;;;N;;;;; +13DEC;EGYPTIAN HIEROGLYPH-13DEC;Lo;0;L;;;;;N;;;;; +13DED;EGYPTIAN HIEROGLYPH-13DED;Lo;0;L;;;;;N;;;;; +13DEE;EGYPTIAN HIEROGLYPH-13DEE;Lo;0;L;;;;;N;;;;; +13DEF;EGYPTIAN HIEROGLYPH-13DEF;Lo;0;L;;;;;N;;;;; +13DF0;EGYPTIAN HIEROGLYPH-13DF0;Lo;0;L;;;;;N;;;;; +13DF1;EGYPTIAN HIEROGLYPH-13DF1;Lo;0;L;;;;;N;;;;; +13DF2;EGYPTIAN HIEROGLYPH-13DF2;Lo;0;L;;;;;N;;;;; +13DF3;EGYPTIAN HIEROGLYPH-13DF3;Lo;0;L;;;;;N;;;;; +13DF4;EGYPTIAN HIEROGLYPH-13DF4;Lo;0;L;;;;;N;;;;; +13DF5;EGYPTIAN HIEROGLYPH-13DF5;Lo;0;L;;;;;N;;;;; +13DF6;EGYPTIAN HIEROGLYPH-13DF6;Lo;0;L;;;;;N;;;;; +13DF7;EGYPTIAN HIEROGLYPH-13DF7;Lo;0;L;;;;;N;;;;; +13DF8;EGYPTIAN HIEROGLYPH-13DF8;Lo;0;L;;;;;N;;;;; +13DF9;EGYPTIAN HIEROGLYPH-13DF9;Lo;0;L;;;;;N;;;;; +13DFA;EGYPTIAN HIEROGLYPH-13DFA;Lo;0;L;;;;;N;;;;; +13DFB;EGYPTIAN HIEROGLYPH-13DFB;Lo;0;L;;;;;N;;;;; +13DFC;EGYPTIAN HIEROGLYPH-13DFC;Lo;0;L;;;;;N;;;;; +13DFD;EGYPTIAN HIEROGLYPH-13DFD;Lo;0;L;;;;;N;;;;; +13DFE;EGYPTIAN HIEROGLYPH-13DFE;Lo;0;L;;;;;N;;;;; +13DFF;EGYPTIAN HIEROGLYPH-13DFF;Lo;0;L;;;;;N;;;;; +13E00;EGYPTIAN HIEROGLYPH-13E00;Lo;0;L;;;;;N;;;;; +13E01;EGYPTIAN HIEROGLYPH-13E01;Lo;0;L;;;;;N;;;;; +13E02;EGYPTIAN HIEROGLYPH-13E02;Lo;0;L;;;;;N;;;;; +13E03;EGYPTIAN HIEROGLYPH-13E03;Lo;0;L;;;;;N;;;;; +13E04;EGYPTIAN HIEROGLYPH-13E04;Lo;0;L;;;;;N;;;;; +13E05;EGYPTIAN HIEROGLYPH-13E05;Lo;0;L;;;;;N;;;;; +13E06;EGYPTIAN HIEROGLYPH-13E06;Lo;0;L;;;;;N;;;;; +13E07;EGYPTIAN HIEROGLYPH-13E07;Lo;0;L;;;;;N;;;;; +13E08;EGYPTIAN HIEROGLYPH-13E08;Lo;0;L;;;;;N;;;;; +13E09;EGYPTIAN HIEROGLYPH-13E09;Lo;0;L;;;;;N;;;;; +13E0A;EGYPTIAN HIEROGLYPH-13E0A;Lo;0;L;;;;;N;;;;; +13E0B;EGYPTIAN HIEROGLYPH-13E0B;Lo;0;L;;;;;N;;;;; +13E0C;EGYPTIAN HIEROGLYPH-13E0C;Lo;0;L;;;;;N;;;;; +13E0D;EGYPTIAN HIEROGLYPH-13E0D;Lo;0;L;;;;;N;;;;; +13E0E;EGYPTIAN HIEROGLYPH-13E0E;Lo;0;L;;;;;N;;;;; +13E0F;EGYPTIAN HIEROGLYPH-13E0F;Lo;0;L;;;;;N;;;;; +13E10;EGYPTIAN HIEROGLYPH-13E10;Lo;0;L;;;;;N;;;;; +13E11;EGYPTIAN HIEROGLYPH-13E11;Lo;0;L;;;;;N;;;;; +13E12;EGYPTIAN HIEROGLYPH-13E12;Lo;0;L;;;;;N;;;;; +13E13;EGYPTIAN HIEROGLYPH-13E13;Lo;0;L;;;;;N;;;;; +13E14;EGYPTIAN HIEROGLYPH-13E14;Lo;0;L;;;;;N;;;;; +13E15;EGYPTIAN HIEROGLYPH-13E15;Lo;0;L;;;;;N;;;;; +13E16;EGYPTIAN HIEROGLYPH-13E16;Lo;0;L;;;;;N;;;;; +13E17;EGYPTIAN HIEROGLYPH-13E17;Lo;0;L;;;;;N;;;;; +13E18;EGYPTIAN HIEROGLYPH-13E18;Lo;0;L;;;;;N;;;;; +13E19;EGYPTIAN HIEROGLYPH-13E19;Lo;0;L;;;;;N;;;;; +13E1A;EGYPTIAN HIEROGLYPH-13E1A;Lo;0;L;;;;;N;;;;; +13E1B;EGYPTIAN HIEROGLYPH-13E1B;Lo;0;L;;;;;N;;;;; +13E1C;EGYPTIAN HIEROGLYPH-13E1C;Lo;0;L;;;;;N;;;;; +13E1D;EGYPTIAN HIEROGLYPH-13E1D;Lo;0;L;;;;;N;;;;; +13E1E;EGYPTIAN HIEROGLYPH-13E1E;Lo;0;L;;;;;N;;;;; +13E1F;EGYPTIAN HIEROGLYPH-13E1F;Lo;0;L;;;;;N;;;;; +13E20;EGYPTIAN HIEROGLYPH-13E20;Lo;0;L;;;;;N;;;;; +13E21;EGYPTIAN HIEROGLYPH-13E21;Lo;0;L;;;;;N;;;;; +13E22;EGYPTIAN HIEROGLYPH-13E22;Lo;0;L;;;;;N;;;;; +13E23;EGYPTIAN HIEROGLYPH-13E23;Lo;0;L;;;;;N;;;;; +13E24;EGYPTIAN HIEROGLYPH-13E24;Lo;0;L;;;;;N;;;;; +13E25;EGYPTIAN HIEROGLYPH-13E25;Lo;0;L;;;;;N;;;;; +13E26;EGYPTIAN HIEROGLYPH-13E26;Lo;0;L;;;;;N;;;;; +13E27;EGYPTIAN HIEROGLYPH-13E27;Lo;0;L;;;;;N;;;;; +13E28;EGYPTIAN HIEROGLYPH-13E28;Lo;0;L;;;;;N;;;;; +13E29;EGYPTIAN HIEROGLYPH-13E29;Lo;0;L;;;;;N;;;;; +13E2A;EGYPTIAN HIEROGLYPH-13E2A;Lo;0;L;;;;;N;;;;; +13E2B;EGYPTIAN HIEROGLYPH-13E2B;Lo;0;L;;;;;N;;;;; +13E2C;EGYPTIAN HIEROGLYPH-13E2C;Lo;0;L;;;;;N;;;;; +13E2D;EGYPTIAN HIEROGLYPH-13E2D;Lo;0;L;;;;;N;;;;; +13E2E;EGYPTIAN HIEROGLYPH-13E2E;Lo;0;L;;;;;N;;;;; +13E2F;EGYPTIAN HIEROGLYPH-13E2F;Lo;0;L;;;;;N;;;;; +13E30;EGYPTIAN HIEROGLYPH-13E30;Lo;0;L;;;;;N;;;;; +13E31;EGYPTIAN HIEROGLYPH-13E31;Lo;0;L;;;;;N;;;;; +13E32;EGYPTIAN HIEROGLYPH-13E32;Lo;0;L;;;;;N;;;;; +13E33;EGYPTIAN HIEROGLYPH-13E33;Lo;0;L;;;;;N;;;;; +13E34;EGYPTIAN HIEROGLYPH-13E34;Lo;0;L;;;;;N;;;;; +13E35;EGYPTIAN HIEROGLYPH-13E35;Lo;0;L;;;;;N;;;;; +13E36;EGYPTIAN HIEROGLYPH-13E36;Lo;0;L;;;;;N;;;;; +13E37;EGYPTIAN HIEROGLYPH-13E37;Lo;0;L;;;;;N;;;;; +13E38;EGYPTIAN HIEROGLYPH-13E38;Lo;0;L;;;;;N;;;;; +13E39;EGYPTIAN HIEROGLYPH-13E39;Lo;0;L;;;;;N;;;;; +13E3A;EGYPTIAN HIEROGLYPH-13E3A;Lo;0;L;;;;;N;;;;; +13E3B;EGYPTIAN HIEROGLYPH-13E3B;Lo;0;L;;;;;N;;;;; +13E3C;EGYPTIAN HIEROGLYPH-13E3C;Lo;0;L;;;;;N;;;;; +13E3D;EGYPTIAN HIEROGLYPH-13E3D;Lo;0;L;;;;;N;;;;; +13E3E;EGYPTIAN HIEROGLYPH-13E3E;Lo;0;L;;;;;N;;;;; +13E3F;EGYPTIAN HIEROGLYPH-13E3F;Lo;0;L;;;;;N;;;;; +13E40;EGYPTIAN HIEROGLYPH-13E40;Lo;0;L;;;;;N;;;;; +13E41;EGYPTIAN HIEROGLYPH-13E41;Lo;0;L;;;;;N;;;;; +13E42;EGYPTIAN HIEROGLYPH-13E42;Lo;0;L;;;;;N;;;;; +13E43;EGYPTIAN HIEROGLYPH-13E43;Lo;0;L;;;;;N;;;;; +13E44;EGYPTIAN HIEROGLYPH-13E44;Lo;0;L;;;;;N;;;;; +13E45;EGYPTIAN HIEROGLYPH-13E45;Lo;0;L;;;;;N;;;;; +13E46;EGYPTIAN HIEROGLYPH-13E46;Lo;0;L;;;;;N;;;;; +13E47;EGYPTIAN HIEROGLYPH-13E47;Lo;0;L;;;;;N;;;;; +13E48;EGYPTIAN HIEROGLYPH-13E48;Lo;0;L;;;;;N;;;;; +13E49;EGYPTIAN HIEROGLYPH-13E49;Lo;0;L;;;;;N;;;;; +13E4A;EGYPTIAN HIEROGLYPH-13E4A;Lo;0;L;;;;;N;;;;; +13E4B;EGYPTIAN HIEROGLYPH-13E4B;Lo;0;L;;;;;N;;;;; +13E4C;EGYPTIAN HIEROGLYPH-13E4C;Lo;0;L;;;;;N;;;;; +13E4D;EGYPTIAN HIEROGLYPH-13E4D;Lo;0;L;;;;;N;;;;; +13E4E;EGYPTIAN HIEROGLYPH-13E4E;Lo;0;L;;;;;N;;;;; +13E4F;EGYPTIAN HIEROGLYPH-13E4F;Lo;0;L;;;;;N;;;;; +13E50;EGYPTIAN HIEROGLYPH-13E50;Lo;0;L;;;;;N;;;;; +13E51;EGYPTIAN HIEROGLYPH-13E51;Lo;0;L;;;;;N;;;;; +13E52;EGYPTIAN HIEROGLYPH-13E52;Lo;0;L;;;;;N;;;;; +13E53;EGYPTIAN HIEROGLYPH-13E53;Lo;0;L;;;;;N;;;;; +13E54;EGYPTIAN HIEROGLYPH-13E54;Lo;0;L;;;;;N;;;;; +13E55;EGYPTIAN HIEROGLYPH-13E55;Lo;0;L;;;;;N;;;;; +13E56;EGYPTIAN HIEROGLYPH-13E56;Lo;0;L;;;;;N;;;;; +13E57;EGYPTIAN HIEROGLYPH-13E57;Lo;0;L;;;;;N;;;;; +13E58;EGYPTIAN HIEROGLYPH-13E58;Lo;0;L;;;;;N;;;;; +13E59;EGYPTIAN HIEROGLYPH-13E59;Lo;0;L;;;;;N;;;;; +13E5A;EGYPTIAN HIEROGLYPH-13E5A;Lo;0;L;;;;;N;;;;; +13E5B;EGYPTIAN HIEROGLYPH-13E5B;Lo;0;L;;;;;N;;;;; +13E5C;EGYPTIAN HIEROGLYPH-13E5C;Lo;0;L;;;;;N;;;;; +13E5D;EGYPTIAN HIEROGLYPH-13E5D;Lo;0;L;;;;;N;;;;; +13E5E;EGYPTIAN HIEROGLYPH-13E5E;Lo;0;L;;;;;N;;;;; +13E5F;EGYPTIAN HIEROGLYPH-13E5F;Lo;0;L;;;;;N;;;;; +13E60;EGYPTIAN HIEROGLYPH-13E60;Lo;0;L;;;;;N;;;;; +13E61;EGYPTIAN HIEROGLYPH-13E61;Lo;0;L;;;;;N;;;;; +13E62;EGYPTIAN HIEROGLYPH-13E62;Lo;0;L;;;;;N;;;;; +13E63;EGYPTIAN HIEROGLYPH-13E63;Lo;0;L;;;;;N;;;;; +13E64;EGYPTIAN HIEROGLYPH-13E64;Lo;0;L;;;;;N;;;;; +13E65;EGYPTIAN HIEROGLYPH-13E65;Lo;0;L;;;;;N;;;;; +13E66;EGYPTIAN HIEROGLYPH-13E66;Lo;0;L;;;;;N;;;;; +13E67;EGYPTIAN HIEROGLYPH-13E67;Lo;0;L;;;;;N;;;;; +13E68;EGYPTIAN HIEROGLYPH-13E68;Lo;0;L;;;;;N;;;;; +13E69;EGYPTIAN HIEROGLYPH-13E69;Lo;0;L;;;;;N;;;;; +13E6A;EGYPTIAN HIEROGLYPH-13E6A;Lo;0;L;;;;;N;;;;; +13E6B;EGYPTIAN HIEROGLYPH-13E6B;Lo;0;L;;;;;N;;;;; +13E6C;EGYPTIAN HIEROGLYPH-13E6C;Lo;0;L;;;;;N;;;;; +13E6D;EGYPTIAN HIEROGLYPH-13E6D;Lo;0;L;;;;;N;;;;; +13E6E;EGYPTIAN HIEROGLYPH-13E6E;Lo;0;L;;;;;N;;;;; +13E6F;EGYPTIAN HIEROGLYPH-13E6F;Lo;0;L;;;;;N;;;;; +13E70;EGYPTIAN HIEROGLYPH-13E70;Lo;0;L;;;;;N;;;;; +13E71;EGYPTIAN HIEROGLYPH-13E71;Lo;0;L;;;;;N;;;;; +13E72;EGYPTIAN HIEROGLYPH-13E72;Lo;0;L;;;;;N;;;;; +13E73;EGYPTIAN HIEROGLYPH-13E73;Lo;0;L;;;;;N;;;;; +13E74;EGYPTIAN HIEROGLYPH-13E74;Lo;0;L;;;;;N;;;;; +13E75;EGYPTIAN HIEROGLYPH-13E75;Lo;0;L;;;;;N;;;;; +13E76;EGYPTIAN HIEROGLYPH-13E76;Lo;0;L;;;;;N;;;;; +13E77;EGYPTIAN HIEROGLYPH-13E77;Lo;0;L;;;;;N;;;;; +13E78;EGYPTIAN HIEROGLYPH-13E78;Lo;0;L;;;;;N;;;;; +13E79;EGYPTIAN HIEROGLYPH-13E79;Lo;0;L;;;;;N;;;;; +13E7A;EGYPTIAN HIEROGLYPH-13E7A;Lo;0;L;;;;;N;;;;; +13E7B;EGYPTIAN HIEROGLYPH-13E7B;Lo;0;L;;;;;N;;;;; +13E7C;EGYPTIAN HIEROGLYPH-13E7C;Lo;0;L;;;;;N;;;;; +13E7D;EGYPTIAN HIEROGLYPH-13E7D;Lo;0;L;;;;;N;;;;; +13E7E;EGYPTIAN HIEROGLYPH-13E7E;Lo;0;L;;;;;N;;;;; +13E7F;EGYPTIAN HIEROGLYPH-13E7F;Lo;0;L;;;;;N;;;;; +13E80;EGYPTIAN HIEROGLYPH-13E80;Lo;0;L;;;;;N;;;;; +13E81;EGYPTIAN HIEROGLYPH-13E81;Lo;0;L;;;;;N;;;;; +13E82;EGYPTIAN HIEROGLYPH-13E82;Lo;0;L;;;;;N;;;;; +13E83;EGYPTIAN HIEROGLYPH-13E83;Lo;0;L;;;;;N;;;;; +13E84;EGYPTIAN HIEROGLYPH-13E84;Lo;0;L;;;;;N;;;;; +13E85;EGYPTIAN HIEROGLYPH-13E85;Lo;0;L;;;;;N;;;;; +13E86;EGYPTIAN HIEROGLYPH-13E86;Lo;0;L;;;;;N;;;;; +13E87;EGYPTIAN HIEROGLYPH-13E87;Lo;0;L;;;;;N;;;;; +13E88;EGYPTIAN HIEROGLYPH-13E88;Lo;0;L;;;;;N;;;;; +13E89;EGYPTIAN HIEROGLYPH-13E89;Lo;0;L;;;;;N;;;;; +13E8A;EGYPTIAN HIEROGLYPH-13E8A;Lo;0;L;;;;;N;;;;; +13E8B;EGYPTIAN HIEROGLYPH-13E8B;Lo;0;L;;;;;N;;;;; +13E8C;EGYPTIAN HIEROGLYPH-13E8C;Lo;0;L;;;;;N;;;;; +13E8D;EGYPTIAN HIEROGLYPH-13E8D;Lo;0;L;;;;;N;;;;; +13E8E;EGYPTIAN HIEROGLYPH-13E8E;Lo;0;L;;;;;N;;;;; +13E8F;EGYPTIAN HIEROGLYPH-13E8F;Lo;0;L;;;;;N;;;;; +13E90;EGYPTIAN HIEROGLYPH-13E90;Lo;0;L;;;;;N;;;;; +13E91;EGYPTIAN HIEROGLYPH-13E91;Lo;0;L;;;;;N;;;;; +13E92;EGYPTIAN HIEROGLYPH-13E92;Lo;0;L;;;;;N;;;;; +13E93;EGYPTIAN HIEROGLYPH-13E93;Lo;0;L;;;;;N;;;;; +13E94;EGYPTIAN HIEROGLYPH-13E94;Lo;0;L;;;;;N;;;;; +13E95;EGYPTIAN HIEROGLYPH-13E95;Lo;0;L;;;;;N;;;;; +13E96;EGYPTIAN HIEROGLYPH-13E96;Lo;0;L;;;;;N;;;;; +13E97;EGYPTIAN HIEROGLYPH-13E97;Lo;0;L;;;;;N;;;;; +13E98;EGYPTIAN HIEROGLYPH-13E98;Lo;0;L;;;;;N;;;;; +13E99;EGYPTIAN HIEROGLYPH-13E99;Lo;0;L;;;;;N;;;;; +13E9A;EGYPTIAN HIEROGLYPH-13E9A;Lo;0;L;;;;;N;;;;; +13E9B;EGYPTIAN HIEROGLYPH-13E9B;Lo;0;L;;;;;N;;;;; +13E9C;EGYPTIAN HIEROGLYPH-13E9C;Lo;0;L;;;;;N;;;;; +13E9D;EGYPTIAN HIEROGLYPH-13E9D;Lo;0;L;;;;;N;;;;; +13E9E;EGYPTIAN HIEROGLYPH-13E9E;Lo;0;L;;;;;N;;;;; +13E9F;EGYPTIAN HIEROGLYPH-13E9F;Lo;0;L;;;;;N;;;;; +13EA0;EGYPTIAN HIEROGLYPH-13EA0;Lo;0;L;;;;;N;;;;; +13EA1;EGYPTIAN HIEROGLYPH-13EA1;Lo;0;L;;;;;N;;;;; +13EA2;EGYPTIAN HIEROGLYPH-13EA2;Lo;0;L;;;;;N;;;;; +13EA3;EGYPTIAN HIEROGLYPH-13EA3;Lo;0;L;;;;;N;;;;; +13EA4;EGYPTIAN HIEROGLYPH-13EA4;Lo;0;L;;;;;N;;;;; +13EA5;EGYPTIAN HIEROGLYPH-13EA5;Lo;0;L;;;;;N;;;;; +13EA6;EGYPTIAN HIEROGLYPH-13EA6;Lo;0;L;;;;;N;;;;; +13EA7;EGYPTIAN HIEROGLYPH-13EA7;Lo;0;L;;;;;N;;;;; +13EA8;EGYPTIAN HIEROGLYPH-13EA8;Lo;0;L;;;;;N;;;;; +13EA9;EGYPTIAN HIEROGLYPH-13EA9;Lo;0;L;;;;;N;;;;; +13EAA;EGYPTIAN HIEROGLYPH-13EAA;Lo;0;L;;;;;N;;;;; +13EAB;EGYPTIAN HIEROGLYPH-13EAB;Lo;0;L;;;;;N;;;;; +13EAC;EGYPTIAN HIEROGLYPH-13EAC;Lo;0;L;;;;;N;;;;; +13EAD;EGYPTIAN HIEROGLYPH-13EAD;Lo;0;L;;;;;N;;;;; +13EAE;EGYPTIAN HIEROGLYPH-13EAE;Lo;0;L;;;;;N;;;;; +13EAF;EGYPTIAN HIEROGLYPH-13EAF;Lo;0;L;;;;;N;;;;; +13EB0;EGYPTIAN HIEROGLYPH-13EB0;Lo;0;L;;;;;N;;;;; +13EB1;EGYPTIAN HIEROGLYPH-13EB1;Lo;0;L;;;;;N;;;;; +13EB2;EGYPTIAN HIEROGLYPH-13EB2;Lo;0;L;;;;;N;;;;; +13EB3;EGYPTIAN HIEROGLYPH-13EB3;Lo;0;L;;;;;N;;;;; +13EB4;EGYPTIAN HIEROGLYPH-13EB4;Lo;0;L;;;;;N;;;;; +13EB5;EGYPTIAN HIEROGLYPH-13EB5;Lo;0;L;;;;;N;;;;; +13EB6;EGYPTIAN HIEROGLYPH-13EB6;Lo;0;L;;;;;N;;;;; +13EB7;EGYPTIAN HIEROGLYPH-13EB7;Lo;0;L;;;;;N;;;;; +13EB8;EGYPTIAN HIEROGLYPH-13EB8;Lo;0;L;;;;;N;;;;; +13EB9;EGYPTIAN HIEROGLYPH-13EB9;Lo;0;L;;;;;N;;;;; +13EBA;EGYPTIAN HIEROGLYPH-13EBA;Lo;0;L;;;;;N;;;;; +13EBB;EGYPTIAN HIEROGLYPH-13EBB;Lo;0;L;;;;;N;;;;; +13EBC;EGYPTIAN HIEROGLYPH-13EBC;Lo;0;L;;;;;N;;;;; +13EBD;EGYPTIAN HIEROGLYPH-13EBD;Lo;0;L;;;;;N;;;;; +13EBE;EGYPTIAN HIEROGLYPH-13EBE;Lo;0;L;;;;;N;;;;; +13EBF;EGYPTIAN HIEROGLYPH-13EBF;Lo;0;L;;;;;N;;;;; +13EC0;EGYPTIAN HIEROGLYPH-13EC0;Lo;0;L;;;;;N;;;;; +13EC1;EGYPTIAN HIEROGLYPH-13EC1;Lo;0;L;;;;;N;;;;; +13EC2;EGYPTIAN HIEROGLYPH-13EC2;Lo;0;L;;;;;N;;;;; +13EC3;EGYPTIAN HIEROGLYPH-13EC3;Lo;0;L;;;;;N;;;;; +13EC4;EGYPTIAN HIEROGLYPH-13EC4;Lo;0;L;;;;;N;;;;; +13EC5;EGYPTIAN HIEROGLYPH-13EC5;Lo;0;L;;;;;N;;;;; +13EC6;EGYPTIAN HIEROGLYPH-13EC6;Lo;0;L;;;;;N;;;;; +13EC7;EGYPTIAN HIEROGLYPH-13EC7;Lo;0;L;;;;;N;;;;; +13EC8;EGYPTIAN HIEROGLYPH-13EC8;Lo;0;L;;;;;N;;;;; +13EC9;EGYPTIAN HIEROGLYPH-13EC9;Lo;0;L;;;;;N;;;;; +13ECA;EGYPTIAN HIEROGLYPH-13ECA;Lo;0;L;;;;;N;;;;; +13ECB;EGYPTIAN HIEROGLYPH-13ECB;Lo;0;L;;;;;N;;;;; +13ECC;EGYPTIAN HIEROGLYPH-13ECC;Lo;0;L;;;;;N;;;;; +13ECD;EGYPTIAN HIEROGLYPH-13ECD;Lo;0;L;;;;;N;;;;; +13ECE;EGYPTIAN HIEROGLYPH-13ECE;Lo;0;L;;;;;N;;;;; +13ECF;EGYPTIAN HIEROGLYPH-13ECF;Lo;0;L;;;;;N;;;;; +13ED0;EGYPTIAN HIEROGLYPH-13ED0;Lo;0;L;;;;;N;;;;; +13ED1;EGYPTIAN HIEROGLYPH-13ED1;Lo;0;L;;;;;N;;;;; +13ED2;EGYPTIAN HIEROGLYPH-13ED2;Lo;0;L;;;;;N;;;;; +13ED3;EGYPTIAN HIEROGLYPH-13ED3;Lo;0;L;;;;;N;;;;; +13ED4;EGYPTIAN HIEROGLYPH-13ED4;Lo;0;L;;;;;N;;;;; +13ED5;EGYPTIAN HIEROGLYPH-13ED5;Lo;0;L;;;;;N;;;;; +13ED6;EGYPTIAN HIEROGLYPH-13ED6;Lo;0;L;;;;;N;;;;; +13ED7;EGYPTIAN HIEROGLYPH-13ED7;Lo;0;L;;;;;N;;;;; +13ED8;EGYPTIAN HIEROGLYPH-13ED8;Lo;0;L;;;;;N;;;;; +13ED9;EGYPTIAN HIEROGLYPH-13ED9;Lo;0;L;;;;;N;;;;; +13EDA;EGYPTIAN HIEROGLYPH-13EDA;Lo;0;L;;;;;N;;;;; +13EDB;EGYPTIAN HIEROGLYPH-13EDB;Lo;0;L;;;;;N;;;;; +13EDC;EGYPTIAN HIEROGLYPH-13EDC;Lo;0;L;;;;;N;;;;; +13EDD;EGYPTIAN HIEROGLYPH-13EDD;Lo;0;L;;;;;N;;;;; +13EDE;EGYPTIAN HIEROGLYPH-13EDE;Lo;0;L;;;;;N;;;;; +13EDF;EGYPTIAN HIEROGLYPH-13EDF;Lo;0;L;;;;;N;;;;; +13EE0;EGYPTIAN HIEROGLYPH-13EE0;Lo;0;L;;;;;N;;;;; +13EE1;EGYPTIAN HIEROGLYPH-13EE1;Lo;0;L;;;;;N;;;;; +13EE2;EGYPTIAN HIEROGLYPH-13EE2;Lo;0;L;;;;;N;;;;; +13EE3;EGYPTIAN HIEROGLYPH-13EE3;Lo;0;L;;;;;N;;;;; +13EE4;EGYPTIAN HIEROGLYPH-13EE4;Lo;0;L;;;;;N;;;;; +13EE5;EGYPTIAN HIEROGLYPH-13EE5;Lo;0;L;;;;;N;;;;; +13EE6;EGYPTIAN HIEROGLYPH-13EE6;Lo;0;L;;;;;N;;;;; +13EE7;EGYPTIAN HIEROGLYPH-13EE7;Lo;0;L;;;;;N;;;;; +13EE8;EGYPTIAN HIEROGLYPH-13EE8;Lo;0;L;;;;;N;;;;; +13EE9;EGYPTIAN HIEROGLYPH-13EE9;Lo;0;L;;;;;N;;;;; +13EEA;EGYPTIAN HIEROGLYPH-13EEA;Lo;0;L;;;;;N;;;;; +13EEB;EGYPTIAN HIEROGLYPH-13EEB;Lo;0;L;;;;;N;;;;; +13EEC;EGYPTIAN HIEROGLYPH-13EEC;Lo;0;L;;;;;N;;;;; +13EED;EGYPTIAN HIEROGLYPH-13EED;Lo;0;L;;;;;N;;;;; +13EEE;EGYPTIAN HIEROGLYPH-13EEE;Lo;0;L;;;;;N;;;;; +13EEF;EGYPTIAN HIEROGLYPH-13EEF;Lo;0;L;;;;;N;;;;; +13EF0;EGYPTIAN HIEROGLYPH-13EF0;Lo;0;L;;;;;N;;;;; +13EF1;EGYPTIAN HIEROGLYPH-13EF1;Lo;0;L;;;;;N;;;;; +13EF2;EGYPTIAN HIEROGLYPH-13EF2;Lo;0;L;;;;;N;;;;; +13EF3;EGYPTIAN HIEROGLYPH-13EF3;Lo;0;L;;;;;N;;;;; +13EF4;EGYPTIAN HIEROGLYPH-13EF4;Lo;0;L;;;;;N;;;;; +13EF5;EGYPTIAN HIEROGLYPH-13EF5;Lo;0;L;;;;;N;;;;; +13EF6;EGYPTIAN HIEROGLYPH-13EF6;Lo;0;L;;;;;N;;;;; +13EF7;EGYPTIAN HIEROGLYPH-13EF7;Lo;0;L;;;;;N;;;;; +13EF8;EGYPTIAN HIEROGLYPH-13EF8;Lo;0;L;;;;;N;;;;; +13EF9;EGYPTIAN HIEROGLYPH-13EF9;Lo;0;L;;;;;N;;;;; +13EFA;EGYPTIAN HIEROGLYPH-13EFA;Lo;0;L;;;;;N;;;;; +13EFB;EGYPTIAN HIEROGLYPH-13EFB;Lo;0;L;;;;;N;;;;; +13EFC;EGYPTIAN HIEROGLYPH-13EFC;Lo;0;L;;;;;N;;;;; +13EFD;EGYPTIAN HIEROGLYPH-13EFD;Lo;0;L;;;;;N;;;;; +13EFE;EGYPTIAN HIEROGLYPH-13EFE;Lo;0;L;;;;;N;;;;; +13EFF;EGYPTIAN HIEROGLYPH-13EFF;Lo;0;L;;;;;N;;;;; +13F00;EGYPTIAN HIEROGLYPH-13F00;Lo;0;L;;;;;N;;;;; +13F01;EGYPTIAN HIEROGLYPH-13F01;Lo;0;L;;;;;N;;;;; +13F02;EGYPTIAN HIEROGLYPH-13F02;Lo;0;L;;;;;N;;;;; +13F03;EGYPTIAN HIEROGLYPH-13F03;Lo;0;L;;;;;N;;;;; +13F04;EGYPTIAN HIEROGLYPH-13F04;Lo;0;L;;;;;N;;;;; +13F05;EGYPTIAN HIEROGLYPH-13F05;Lo;0;L;;;;;N;;;;; +13F06;EGYPTIAN HIEROGLYPH-13F06;Lo;0;L;;;;;N;;;;; +13F07;EGYPTIAN HIEROGLYPH-13F07;Lo;0;L;;;;;N;;;;; +13F08;EGYPTIAN HIEROGLYPH-13F08;Lo;0;L;;;;;N;;;;; +13F09;EGYPTIAN HIEROGLYPH-13F09;Lo;0;L;;;;;N;;;;; +13F0A;EGYPTIAN HIEROGLYPH-13F0A;Lo;0;L;;;;;N;;;;; +13F0B;EGYPTIAN HIEROGLYPH-13F0B;Lo;0;L;;;;;N;;;;; +13F0C;EGYPTIAN HIEROGLYPH-13F0C;Lo;0;L;;;;;N;;;;; +13F0D;EGYPTIAN HIEROGLYPH-13F0D;Lo;0;L;;;;;N;;;;; +13F0E;EGYPTIAN HIEROGLYPH-13F0E;Lo;0;L;;;;;N;;;;; +13F0F;EGYPTIAN HIEROGLYPH-13F0F;Lo;0;L;;;;;N;;;;; +13F10;EGYPTIAN HIEROGLYPH-13F10;Lo;0;L;;;;;N;;;;; +13F11;EGYPTIAN HIEROGLYPH-13F11;Lo;0;L;;;;;N;;;;; +13F12;EGYPTIAN HIEROGLYPH-13F12;Lo;0;L;;;;;N;;;;; +13F13;EGYPTIAN HIEROGLYPH-13F13;Lo;0;L;;;;;N;;;;; +13F14;EGYPTIAN HIEROGLYPH-13F14;Lo;0;L;;;;;N;;;;; +13F15;EGYPTIAN HIEROGLYPH-13F15;Lo;0;L;;;;;N;;;;; +13F16;EGYPTIAN HIEROGLYPH-13F16;Lo;0;L;;;;;N;;;;; +13F17;EGYPTIAN HIEROGLYPH-13F17;Lo;0;L;;;;;N;;;;; +13F18;EGYPTIAN HIEROGLYPH-13F18;Lo;0;L;;;;;N;;;;; +13F19;EGYPTIAN HIEROGLYPH-13F19;Lo;0;L;;;;;N;;;;; +13F1A;EGYPTIAN HIEROGLYPH-13F1A;Lo;0;L;;;;;N;;;;; +13F1B;EGYPTIAN HIEROGLYPH-13F1B;Lo;0;L;;;;;N;;;;; +13F1C;EGYPTIAN HIEROGLYPH-13F1C;Lo;0;L;;;;;N;;;;; +13F1D;EGYPTIAN HIEROGLYPH-13F1D;Lo;0;L;;;;;N;;;;; +13F1E;EGYPTIAN HIEROGLYPH-13F1E;Lo;0;L;;;;;N;;;;; +13F1F;EGYPTIAN HIEROGLYPH-13F1F;Lo;0;L;;;;;N;;;;; +13F20;EGYPTIAN HIEROGLYPH-13F20;Lo;0;L;;;;;N;;;;; +13F21;EGYPTIAN HIEROGLYPH-13F21;Lo;0;L;;;;;N;;;;; +13F22;EGYPTIAN HIEROGLYPH-13F22;Lo;0;L;;;;;N;;;;; +13F23;EGYPTIAN HIEROGLYPH-13F23;Lo;0;L;;;;;N;;;;; +13F24;EGYPTIAN HIEROGLYPH-13F24;Lo;0;L;;;;;N;;;;; +13F25;EGYPTIAN HIEROGLYPH-13F25;Lo;0;L;;;;;N;;;;; +13F26;EGYPTIAN HIEROGLYPH-13F26;Lo;0;L;;;;;N;;;;; +13F27;EGYPTIAN HIEROGLYPH-13F27;Lo;0;L;;;;;N;;;;; +13F28;EGYPTIAN HIEROGLYPH-13F28;Lo;0;L;;;;;N;;;;; +13F29;EGYPTIAN HIEROGLYPH-13F29;Lo;0;L;;;;;N;;;;; +13F2A;EGYPTIAN HIEROGLYPH-13F2A;Lo;0;L;;;;;N;;;;; +13F2B;EGYPTIAN HIEROGLYPH-13F2B;Lo;0;L;;;;;N;;;;; +13F2C;EGYPTIAN HIEROGLYPH-13F2C;Lo;0;L;;;;;N;;;;; +13F2D;EGYPTIAN HIEROGLYPH-13F2D;Lo;0;L;;;;;N;;;;; +13F2E;EGYPTIAN HIEROGLYPH-13F2E;Lo;0;L;;;;;N;;;;; +13F2F;EGYPTIAN HIEROGLYPH-13F2F;Lo;0;L;;;;;N;;;;; +13F30;EGYPTIAN HIEROGLYPH-13F30;Lo;0;L;;;;;N;;;;; +13F31;EGYPTIAN HIEROGLYPH-13F31;Lo;0;L;;;;;N;;;;; +13F32;EGYPTIAN HIEROGLYPH-13F32;Lo;0;L;;;;;N;;;;; +13F33;EGYPTIAN HIEROGLYPH-13F33;Lo;0;L;;;;;N;;;;; +13F34;EGYPTIAN HIEROGLYPH-13F34;Lo;0;L;;;;;N;;;;; +13F35;EGYPTIAN HIEROGLYPH-13F35;Lo;0;L;;;;;N;;;;; +13F36;EGYPTIAN HIEROGLYPH-13F36;Lo;0;L;;;;;N;;;;; +13F37;EGYPTIAN HIEROGLYPH-13F37;Lo;0;L;;;;;N;;;;; +13F38;EGYPTIAN HIEROGLYPH-13F38;Lo;0;L;;;;;N;;;;; +13F39;EGYPTIAN HIEROGLYPH-13F39;Lo;0;L;;;;;N;;;;; +13F3A;EGYPTIAN HIEROGLYPH-13F3A;Lo;0;L;;;;;N;;;;; +13F3B;EGYPTIAN HIEROGLYPH-13F3B;Lo;0;L;;;;;N;;;;; +13F3C;EGYPTIAN HIEROGLYPH-13F3C;Lo;0;L;;;;;N;;;;; +13F3D;EGYPTIAN HIEROGLYPH-13F3D;Lo;0;L;;;;;N;;;;; +13F3E;EGYPTIAN HIEROGLYPH-13F3E;Lo;0;L;;;;;N;;;;; +13F3F;EGYPTIAN HIEROGLYPH-13F3F;Lo;0;L;;;;;N;;;;; +13F40;EGYPTIAN HIEROGLYPH-13F40;Lo;0;L;;;;;N;;;;; +13F41;EGYPTIAN HIEROGLYPH-13F41;Lo;0;L;;;;;N;;;;; +13F42;EGYPTIAN HIEROGLYPH-13F42;Lo;0;L;;;;;N;;;;; +13F43;EGYPTIAN HIEROGLYPH-13F43;Lo;0;L;;;;;N;;;;; +13F44;EGYPTIAN HIEROGLYPH-13F44;Lo;0;L;;;;;N;;;;; +13F45;EGYPTIAN HIEROGLYPH-13F45;Lo;0;L;;;;;N;;;;; +13F46;EGYPTIAN HIEROGLYPH-13F46;Lo;0;L;;;;;N;;;;; +13F47;EGYPTIAN HIEROGLYPH-13F47;Lo;0;L;;;;;N;;;;; +13F48;EGYPTIAN HIEROGLYPH-13F48;Lo;0;L;;;;;N;;;;; +13F49;EGYPTIAN HIEROGLYPH-13F49;Lo;0;L;;;;;N;;;;; +13F4A;EGYPTIAN HIEROGLYPH-13F4A;Lo;0;L;;;;;N;;;;; +13F4B;EGYPTIAN HIEROGLYPH-13F4B;Lo;0;L;;;;;N;;;;; +13F4C;EGYPTIAN HIEROGLYPH-13F4C;Lo;0;L;;;;;N;;;;; +13F4D;EGYPTIAN HIEROGLYPH-13F4D;Lo;0;L;;;;;N;;;;; +13F4E;EGYPTIAN HIEROGLYPH-13F4E;Lo;0;L;;;;;N;;;;; +13F4F;EGYPTIAN HIEROGLYPH-13F4F;Lo;0;L;;;;;N;;;;; +13F50;EGYPTIAN HIEROGLYPH-13F50;Lo;0;L;;;;;N;;;;; +13F51;EGYPTIAN HIEROGLYPH-13F51;Lo;0;L;;;;;N;;;;; +13F52;EGYPTIAN HIEROGLYPH-13F52;Lo;0;L;;;;;N;;;;; +13F53;EGYPTIAN HIEROGLYPH-13F53;Lo;0;L;;;;;N;;;;; +13F54;EGYPTIAN HIEROGLYPH-13F54;Lo;0;L;;;;;N;;;;; +13F55;EGYPTIAN HIEROGLYPH-13F55;Lo;0;L;;;;;N;;;;; +13F56;EGYPTIAN HIEROGLYPH-13F56;Lo;0;L;;;;;N;;;;; +13F57;EGYPTIAN HIEROGLYPH-13F57;Lo;0;L;;;;;N;;;;; +13F58;EGYPTIAN HIEROGLYPH-13F58;Lo;0;L;;;;;N;;;;; +13F59;EGYPTIAN HIEROGLYPH-13F59;Lo;0;L;;;;;N;;;;; +13F5A;EGYPTIAN HIEROGLYPH-13F5A;Lo;0;L;;;;;N;;;;; +13F5B;EGYPTIAN HIEROGLYPH-13F5B;Lo;0;L;;;;;N;;;;; +13F5C;EGYPTIAN HIEROGLYPH-13F5C;Lo;0;L;;;;;N;;;;; +13F5D;EGYPTIAN HIEROGLYPH-13F5D;Lo;0;L;;;;;N;;;;; +13F5E;EGYPTIAN HIEROGLYPH-13F5E;Lo;0;L;;;;;N;;;;; +13F5F;EGYPTIAN HIEROGLYPH-13F5F;Lo;0;L;;;;;N;;;;; +13F60;EGYPTIAN HIEROGLYPH-13F60;Lo;0;L;;;;;N;;;;; +13F61;EGYPTIAN HIEROGLYPH-13F61;Lo;0;L;;;;;N;;;;; +13F62;EGYPTIAN HIEROGLYPH-13F62;Lo;0;L;;;;;N;;;;; +13F63;EGYPTIAN HIEROGLYPH-13F63;Lo;0;L;;;;;N;;;;; +13F64;EGYPTIAN HIEROGLYPH-13F64;Lo;0;L;;;;;N;;;;; +13F65;EGYPTIAN HIEROGLYPH-13F65;Lo;0;L;;;;;N;;;;; +13F66;EGYPTIAN HIEROGLYPH-13F66;Lo;0;L;;;;;N;;;;; +13F67;EGYPTIAN HIEROGLYPH-13F67;Lo;0;L;;;;;N;;;;; +13F68;EGYPTIAN HIEROGLYPH-13F68;Lo;0;L;;;;;N;;;;; +13F69;EGYPTIAN HIEROGLYPH-13F69;Lo;0;L;;;;;N;;;;; +13F6A;EGYPTIAN HIEROGLYPH-13F6A;Lo;0;L;;;;;N;;;;; +13F6B;EGYPTIAN HIEROGLYPH-13F6B;Lo;0;L;;;;;N;;;;; +13F6C;EGYPTIAN HIEROGLYPH-13F6C;Lo;0;L;;;;;N;;;;; +13F6D;EGYPTIAN HIEROGLYPH-13F6D;Lo;0;L;;;;;N;;;;; +13F6E;EGYPTIAN HIEROGLYPH-13F6E;Lo;0;L;;;;;N;;;;; +13F6F;EGYPTIAN HIEROGLYPH-13F6F;Lo;0;L;;;;;N;;;;; +13F70;EGYPTIAN HIEROGLYPH-13F70;Lo;0;L;;;;;N;;;;; +13F71;EGYPTIAN HIEROGLYPH-13F71;Lo;0;L;;;;;N;;;;; +13F72;EGYPTIAN HIEROGLYPH-13F72;Lo;0;L;;;;;N;;;;; +13F73;EGYPTIAN HIEROGLYPH-13F73;Lo;0;L;;;;;N;;;;; +13F74;EGYPTIAN HIEROGLYPH-13F74;Lo;0;L;;;;;N;;;;; +13F75;EGYPTIAN HIEROGLYPH-13F75;Lo;0;L;;;;;N;;;;; +13F76;EGYPTIAN HIEROGLYPH-13F76;Lo;0;L;;;;;N;;;;; +13F77;EGYPTIAN HIEROGLYPH-13F77;Lo;0;L;;;;;N;;;;; +13F78;EGYPTIAN HIEROGLYPH-13F78;Lo;0;L;;;;;N;;;;; +13F79;EGYPTIAN HIEROGLYPH-13F79;Lo;0;L;;;;;N;;;;; +13F7A;EGYPTIAN HIEROGLYPH-13F7A;Lo;0;L;;;;;N;;;;; +13F7B;EGYPTIAN HIEROGLYPH-13F7B;Lo;0;L;;;;;N;;;;; +13F7C;EGYPTIAN HIEROGLYPH-13F7C;Lo;0;L;;;;;N;;;;; +13F7D;EGYPTIAN HIEROGLYPH-13F7D;Lo;0;L;;;;;N;;;;; +13F7E;EGYPTIAN HIEROGLYPH-13F7E;Lo;0;L;;;;;N;;;;; +13F7F;EGYPTIAN HIEROGLYPH-13F7F;Lo;0;L;;;;;N;;;;; +13F80;EGYPTIAN HIEROGLYPH-13F80;Lo;0;L;;;;;N;;;;; +13F81;EGYPTIAN HIEROGLYPH-13F81;Lo;0;L;;;;;N;;;;; +13F82;EGYPTIAN HIEROGLYPH-13F82;Lo;0;L;;;;;N;;;;; +13F83;EGYPTIAN HIEROGLYPH-13F83;Lo;0;L;;;;;N;;;;; +13F84;EGYPTIAN HIEROGLYPH-13F84;Lo;0;L;;;;;N;;;;; +13F85;EGYPTIAN HIEROGLYPH-13F85;Lo;0;L;;;;;N;;;;; +13F86;EGYPTIAN HIEROGLYPH-13F86;Lo;0;L;;;;;N;;;;; +13F87;EGYPTIAN HIEROGLYPH-13F87;Lo;0;L;;;;;N;;;;; +13F88;EGYPTIAN HIEROGLYPH-13F88;Lo;0;L;;;;;N;;;;; +13F89;EGYPTIAN HIEROGLYPH-13F89;Lo;0;L;;;;;N;;;;; +13F8A;EGYPTIAN HIEROGLYPH-13F8A;Lo;0;L;;;;;N;;;;; +13F8B;EGYPTIAN HIEROGLYPH-13F8B;Lo;0;L;;;;;N;;;;; +13F8C;EGYPTIAN HIEROGLYPH-13F8C;Lo;0;L;;;;;N;;;;; +13F8D;EGYPTIAN HIEROGLYPH-13F8D;Lo;0;L;;;;;N;;;;; +13F8E;EGYPTIAN HIEROGLYPH-13F8E;Lo;0;L;;;;;N;;;;; +13F8F;EGYPTIAN HIEROGLYPH-13F8F;Lo;0;L;;;;;N;;;;; +13F90;EGYPTIAN HIEROGLYPH-13F90;Lo;0;L;;;;;N;;;;; +13F91;EGYPTIAN HIEROGLYPH-13F91;Lo;0;L;;;;;N;;;;; +13F92;EGYPTIAN HIEROGLYPH-13F92;Lo;0;L;;;;;N;;;;; +13F93;EGYPTIAN HIEROGLYPH-13F93;Lo;0;L;;;;;N;;;;; +13F94;EGYPTIAN HIEROGLYPH-13F94;Lo;0;L;;;;;N;;;;; +13F95;EGYPTIAN HIEROGLYPH-13F95;Lo;0;L;;;;;N;;;;; +13F96;EGYPTIAN HIEROGLYPH-13F96;Lo;0;L;;;;;N;;;;; +13F97;EGYPTIAN HIEROGLYPH-13F97;Lo;0;L;;;;;N;;;;; +13F98;EGYPTIAN HIEROGLYPH-13F98;Lo;0;L;;;;;N;;;;; +13F99;EGYPTIAN HIEROGLYPH-13F99;Lo;0;L;;;;;N;;;;; +13F9A;EGYPTIAN HIEROGLYPH-13F9A;Lo;0;L;;;;;N;;;;; +13F9B;EGYPTIAN HIEROGLYPH-13F9B;Lo;0;L;;;;;N;;;;; +13F9C;EGYPTIAN HIEROGLYPH-13F9C;Lo;0;L;;;;;N;;;;; +13F9D;EGYPTIAN HIEROGLYPH-13F9D;Lo;0;L;;;;;N;;;;; +13F9E;EGYPTIAN HIEROGLYPH-13F9E;Lo;0;L;;;;;N;;;;; +13F9F;EGYPTIAN HIEROGLYPH-13F9F;Lo;0;L;;;;;N;;;;; +13FA0;EGYPTIAN HIEROGLYPH-13FA0;Lo;0;L;;;;;N;;;;; +13FA1;EGYPTIAN HIEROGLYPH-13FA1;Lo;0;L;;;;;N;;;;; +13FA2;EGYPTIAN HIEROGLYPH-13FA2;Lo;0;L;;;;;N;;;;; +13FA3;EGYPTIAN HIEROGLYPH-13FA3;Lo;0;L;;;;;N;;;;; +13FA4;EGYPTIAN HIEROGLYPH-13FA4;Lo;0;L;;;;;N;;;;; +13FA5;EGYPTIAN HIEROGLYPH-13FA5;Lo;0;L;;;;;N;;;;; +13FA6;EGYPTIAN HIEROGLYPH-13FA6;Lo;0;L;;;;;N;;;;; +13FA7;EGYPTIAN HIEROGLYPH-13FA7;Lo;0;L;;;;;N;;;;; +13FA8;EGYPTIAN HIEROGLYPH-13FA8;Lo;0;L;;;;;N;;;;; +13FA9;EGYPTIAN HIEROGLYPH-13FA9;Lo;0;L;;;;;N;;;;; +13FAA;EGYPTIAN HIEROGLYPH-13FAA;Lo;0;L;;;;;N;;;;; +13FAB;EGYPTIAN HIEROGLYPH-13FAB;Lo;0;L;;;;;N;;;;; +13FAC;EGYPTIAN HIEROGLYPH-13FAC;Lo;0;L;;;;;N;;;;; +13FAD;EGYPTIAN HIEROGLYPH-13FAD;Lo;0;L;;;;;N;;;;; +13FAE;EGYPTIAN HIEROGLYPH-13FAE;Lo;0;L;;;;;N;;;;; +13FAF;EGYPTIAN HIEROGLYPH-13FAF;Lo;0;L;;;;;N;;;;; +13FB0;EGYPTIAN HIEROGLYPH-13FB0;Lo;0;L;;;;;N;;;;; +13FB1;EGYPTIAN HIEROGLYPH-13FB1;Lo;0;L;;;;;N;;;;; +13FB2;EGYPTIAN HIEROGLYPH-13FB2;Lo;0;L;;;;;N;;;;; +13FB3;EGYPTIAN HIEROGLYPH-13FB3;Lo;0;L;;;;;N;;;;; +13FB4;EGYPTIAN HIEROGLYPH-13FB4;Lo;0;L;;;;;N;;;;; +13FB5;EGYPTIAN HIEROGLYPH-13FB5;Lo;0;L;;;;;N;;;;; +13FB6;EGYPTIAN HIEROGLYPH-13FB6;Lo;0;L;;;;;N;;;;; +13FB7;EGYPTIAN HIEROGLYPH-13FB7;Lo;0;L;;;;;N;;;;; +13FB8;EGYPTIAN HIEROGLYPH-13FB8;Lo;0;L;;;;;N;;;;; +13FB9;EGYPTIAN HIEROGLYPH-13FB9;Lo;0;L;;;;;N;;;;; +13FBA;EGYPTIAN HIEROGLYPH-13FBA;Lo;0;L;;;;;N;;;;; +13FBB;EGYPTIAN HIEROGLYPH-13FBB;Lo;0;L;;;;;N;;;;; +13FBC;EGYPTIAN HIEROGLYPH-13FBC;Lo;0;L;;;;;N;;;;; +13FBD;EGYPTIAN HIEROGLYPH-13FBD;Lo;0;L;;;;;N;;;;; +13FBE;EGYPTIAN HIEROGLYPH-13FBE;Lo;0;L;;;;;N;;;;; +13FBF;EGYPTIAN HIEROGLYPH-13FBF;Lo;0;L;;;;;N;;;;; +13FC0;EGYPTIAN HIEROGLYPH-13FC0;Lo;0;L;;;;;N;;;;; +13FC1;EGYPTIAN HIEROGLYPH-13FC1;Lo;0;L;;;;;N;;;;; +13FC2;EGYPTIAN HIEROGLYPH-13FC2;Lo;0;L;;;;;N;;;;; +13FC3;EGYPTIAN HIEROGLYPH-13FC3;Lo;0;L;;;;;N;;;;; +13FC4;EGYPTIAN HIEROGLYPH-13FC4;Lo;0;L;;;;;N;;;;; +13FC5;EGYPTIAN HIEROGLYPH-13FC5;Lo;0;L;;;;;N;;;;; +13FC6;EGYPTIAN HIEROGLYPH-13FC6;Lo;0;L;;;;;N;;;;; +13FC7;EGYPTIAN HIEROGLYPH-13FC7;Lo;0;L;;;;;N;;;;; +13FC8;EGYPTIAN HIEROGLYPH-13FC8;Lo;0;L;;;;;N;;;;; +13FC9;EGYPTIAN HIEROGLYPH-13FC9;Lo;0;L;;;;;N;;;;; +13FCA;EGYPTIAN HIEROGLYPH-13FCA;Lo;0;L;;;;;N;;;;; +13FCB;EGYPTIAN HIEROGLYPH-13FCB;Lo;0;L;;;;;N;;;;; +13FCC;EGYPTIAN HIEROGLYPH-13FCC;Lo;0;L;;;;;N;;;;; +13FCD;EGYPTIAN HIEROGLYPH-13FCD;Lo;0;L;;;;;N;;;;; +13FCE;EGYPTIAN HIEROGLYPH-13FCE;Lo;0;L;;;;;N;;;;; +13FCF;EGYPTIAN HIEROGLYPH-13FCF;Lo;0;L;;;;;N;;;;; +13FD0;EGYPTIAN HIEROGLYPH-13FD0;Lo;0;L;;;;;N;;;;; +13FD1;EGYPTIAN HIEROGLYPH-13FD1;Lo;0;L;;;;;N;;;;; +13FD2;EGYPTIAN HIEROGLYPH-13FD2;Lo;0;L;;;;;N;;;;; +13FD3;EGYPTIAN HIEROGLYPH-13FD3;Lo;0;L;;;;;N;;;;; +13FD4;EGYPTIAN HIEROGLYPH-13FD4;Lo;0;L;;;;;N;;;;; +13FD5;EGYPTIAN HIEROGLYPH-13FD5;Lo;0;L;;;;;N;;;;; +13FD6;EGYPTIAN HIEROGLYPH-13FD6;Lo;0;L;;;;;N;;;;; +13FD7;EGYPTIAN HIEROGLYPH-13FD7;Lo;0;L;;;;;N;;;;; +13FD8;EGYPTIAN HIEROGLYPH-13FD8;Lo;0;L;;;;;N;;;;; +13FD9;EGYPTIAN HIEROGLYPH-13FD9;Lo;0;L;;;;;N;;;;; +13FDA;EGYPTIAN HIEROGLYPH-13FDA;Lo;0;L;;;;;N;;;;; +13FDB;EGYPTIAN HIEROGLYPH-13FDB;Lo;0;L;;;;;N;;;;; +13FDC;EGYPTIAN HIEROGLYPH-13FDC;Lo;0;L;;;;;N;;;;; +13FDD;EGYPTIAN HIEROGLYPH-13FDD;Lo;0;L;;;;;N;;;;; +13FDE;EGYPTIAN HIEROGLYPH-13FDE;Lo;0;L;;;;;N;;;;; +13FDF;EGYPTIAN HIEROGLYPH-13FDF;Lo;0;L;;;;;N;;;;; +13FE0;EGYPTIAN HIEROGLYPH-13FE0;Lo;0;L;;;;;N;;;;; +13FE1;EGYPTIAN HIEROGLYPH-13FE1;Lo;0;L;;;;;N;;;;; +13FE2;EGYPTIAN HIEROGLYPH-13FE2;Lo;0;L;;;;;N;;;;; +13FE3;EGYPTIAN HIEROGLYPH-13FE3;Lo;0;L;;;;;N;;;;; +13FE4;EGYPTIAN HIEROGLYPH-13FE4;Lo;0;L;;;;;N;;;;; +13FE5;EGYPTIAN HIEROGLYPH-13FE5;Lo;0;L;;;;;N;;;;; +13FE6;EGYPTIAN HIEROGLYPH-13FE6;Lo;0;L;;;;;N;;;;; +13FE7;EGYPTIAN HIEROGLYPH-13FE7;Lo;0;L;;;;;N;;;;; +13FE8;EGYPTIAN HIEROGLYPH-13FE8;Lo;0;L;;;;;N;;;;; +13FE9;EGYPTIAN HIEROGLYPH-13FE9;Lo;0;L;;;;;N;;;;; +13FEA;EGYPTIAN HIEROGLYPH-13FEA;Lo;0;L;;;;;N;;;;; +13FEB;EGYPTIAN HIEROGLYPH-13FEB;Lo;0;L;;;;;N;;;;; +13FEC;EGYPTIAN HIEROGLYPH-13FEC;Lo;0;L;;;;;N;;;;; +13FED;EGYPTIAN HIEROGLYPH-13FED;Lo;0;L;;;;;N;;;;; +13FEE;EGYPTIAN HIEROGLYPH-13FEE;Lo;0;L;;;;;N;;;;; +13FEF;EGYPTIAN HIEROGLYPH-13FEF;Lo;0;L;;;;;N;;;;; +13FF0;EGYPTIAN HIEROGLYPH-13FF0;Lo;0;L;;;;;N;;;;; +13FF1;EGYPTIAN HIEROGLYPH-13FF1;Lo;0;L;;;;;N;;;;; +13FF2;EGYPTIAN HIEROGLYPH-13FF2;Lo;0;L;;;;;N;;;;; +13FF3;EGYPTIAN HIEROGLYPH-13FF3;Lo;0;L;;;;;N;;;;; +13FF4;EGYPTIAN HIEROGLYPH-13FF4;Lo;0;L;;;;;N;;;;; +13FF5;EGYPTIAN HIEROGLYPH-13FF5;Lo;0;L;;;;;N;;;;; +13FF6;EGYPTIAN HIEROGLYPH-13FF6;Lo;0;L;;;;;N;;;;; +13FF7;EGYPTIAN HIEROGLYPH-13FF7;Lo;0;L;;;;;N;;;;; +13FF8;EGYPTIAN HIEROGLYPH-13FF8;Lo;0;L;;;;;N;;;;; +13FF9;EGYPTIAN HIEROGLYPH-13FF9;Lo;0;L;;;;;N;;;;; +13FFA;EGYPTIAN HIEROGLYPH-13FFA;Lo;0;L;;;;;N;;;;; +13FFB;EGYPTIAN HIEROGLYPH-13FFB;Lo;0;L;;;;;N;;;;; +13FFC;EGYPTIAN HIEROGLYPH-13FFC;Lo;0;L;;;;;N;;;;; +13FFD;EGYPTIAN HIEROGLYPH-13FFD;Lo;0;L;;;;;N;;;;; +13FFE;EGYPTIAN HIEROGLYPH-13FFE;Lo;0;L;;;;;N;;;;; +13FFF;EGYPTIAN HIEROGLYPH-13FFF;Lo;0;L;;;;;N;;;;; +14000;EGYPTIAN HIEROGLYPH-14000;Lo;0;L;;;;;N;;;;; +14001;EGYPTIAN HIEROGLYPH-14001;Lo;0;L;;;;;N;;;;; +14002;EGYPTIAN HIEROGLYPH-14002;Lo;0;L;;;;;N;;;;; +14003;EGYPTIAN HIEROGLYPH-14003;Lo;0;L;;;;;N;;;;; +14004;EGYPTIAN HIEROGLYPH-14004;Lo;0;L;;;;;N;;;;; +14005;EGYPTIAN HIEROGLYPH-14005;Lo;0;L;;;;;N;;;;; +14006;EGYPTIAN HIEROGLYPH-14006;Lo;0;L;;;;;N;;;;; +14007;EGYPTIAN HIEROGLYPH-14007;Lo;0;L;;;;;N;;;;; +14008;EGYPTIAN HIEROGLYPH-14008;Lo;0;L;;;;;N;;;;; +14009;EGYPTIAN HIEROGLYPH-14009;Lo;0;L;;;;;N;;;;; +1400A;EGYPTIAN HIEROGLYPH-1400A;Lo;0;L;;;;;N;;;;; +1400B;EGYPTIAN HIEROGLYPH-1400B;Lo;0;L;;;;;N;;;;; +1400C;EGYPTIAN HIEROGLYPH-1400C;Lo;0;L;;;;;N;;;;; +1400D;EGYPTIAN HIEROGLYPH-1400D;Lo;0;L;;;;;N;;;;; +1400E;EGYPTIAN HIEROGLYPH-1400E;Lo;0;L;;;;;N;;;;; +1400F;EGYPTIAN HIEROGLYPH-1400F;Lo;0;L;;;;;N;;;;; +14010;EGYPTIAN HIEROGLYPH-14010;Lo;0;L;;;;;N;;;;; +14011;EGYPTIAN HIEROGLYPH-14011;Lo;0;L;;;;;N;;;;; +14012;EGYPTIAN HIEROGLYPH-14012;Lo;0;L;;;;;N;;;;; +14013;EGYPTIAN HIEROGLYPH-14013;Lo;0;L;;;;;N;;;;; +14014;EGYPTIAN HIEROGLYPH-14014;Lo;0;L;;;;;N;;;;; +14015;EGYPTIAN HIEROGLYPH-14015;Lo;0;L;;;;;N;;;;; +14016;EGYPTIAN HIEROGLYPH-14016;Lo;0;L;;;;;N;;;;; +14017;EGYPTIAN HIEROGLYPH-14017;Lo;0;L;;;;;N;;;;; +14018;EGYPTIAN HIEROGLYPH-14018;Lo;0;L;;;;;N;;;;; +14019;EGYPTIAN HIEROGLYPH-14019;Lo;0;L;;;;;N;;;;; +1401A;EGYPTIAN HIEROGLYPH-1401A;Lo;0;L;;;;;N;;;;; +1401B;EGYPTIAN HIEROGLYPH-1401B;Lo;0;L;;;;;N;;;;; +1401C;EGYPTIAN HIEROGLYPH-1401C;Lo;0;L;;;;;N;;;;; +1401D;EGYPTIAN HIEROGLYPH-1401D;Lo;0;L;;;;;N;;;;; +1401E;EGYPTIAN HIEROGLYPH-1401E;Lo;0;L;;;;;N;;;;; +1401F;EGYPTIAN HIEROGLYPH-1401F;Lo;0;L;;;;;N;;;;; +14020;EGYPTIAN HIEROGLYPH-14020;Lo;0;L;;;;;N;;;;; +14021;EGYPTIAN HIEROGLYPH-14021;Lo;0;L;;;;;N;;;;; +14022;EGYPTIAN HIEROGLYPH-14022;Lo;0;L;;;;;N;;;;; +14023;EGYPTIAN HIEROGLYPH-14023;Lo;0;L;;;;;N;;;;; +14024;EGYPTIAN HIEROGLYPH-14024;Lo;0;L;;;;;N;;;;; +14025;EGYPTIAN HIEROGLYPH-14025;Lo;0;L;;;;;N;;;;; +14026;EGYPTIAN HIEROGLYPH-14026;Lo;0;L;;;;;N;;;;; +14027;EGYPTIAN HIEROGLYPH-14027;Lo;0;L;;;;;N;;;;; +14028;EGYPTIAN HIEROGLYPH-14028;Lo;0;L;;;;;N;;;;; +14029;EGYPTIAN HIEROGLYPH-14029;Lo;0;L;;;;;N;;;;; +1402A;EGYPTIAN HIEROGLYPH-1402A;Lo;0;L;;;;;N;;;;; +1402B;EGYPTIAN HIEROGLYPH-1402B;Lo;0;L;;;;;N;;;;; +1402C;EGYPTIAN HIEROGLYPH-1402C;Lo;0;L;;;;;N;;;;; +1402D;EGYPTIAN HIEROGLYPH-1402D;Lo;0;L;;;;;N;;;;; +1402E;EGYPTIAN HIEROGLYPH-1402E;Lo;0;L;;;;;N;;;;; +1402F;EGYPTIAN HIEROGLYPH-1402F;Lo;0;L;;;;;N;;;;; +14030;EGYPTIAN HIEROGLYPH-14030;Lo;0;L;;;;;N;;;;; +14031;EGYPTIAN HIEROGLYPH-14031;Lo;0;L;;;;;N;;;;; +14032;EGYPTIAN HIEROGLYPH-14032;Lo;0;L;;;;;N;;;;; +14033;EGYPTIAN HIEROGLYPH-14033;Lo;0;L;;;;;N;;;;; +14034;EGYPTIAN HIEROGLYPH-14034;Lo;0;L;;;;;N;;;;; +14035;EGYPTIAN HIEROGLYPH-14035;Lo;0;L;;;;;N;;;;; +14036;EGYPTIAN HIEROGLYPH-14036;Lo;0;L;;;;;N;;;;; +14037;EGYPTIAN HIEROGLYPH-14037;Lo;0;L;;;;;N;;;;; +14038;EGYPTIAN HIEROGLYPH-14038;Lo;0;L;;;;;N;;;;; +14039;EGYPTIAN HIEROGLYPH-14039;Lo;0;L;;;;;N;;;;; +1403A;EGYPTIAN HIEROGLYPH-1403A;Lo;0;L;;;;;N;;;;; +1403B;EGYPTIAN HIEROGLYPH-1403B;Lo;0;L;;;;;N;;;;; +1403C;EGYPTIAN HIEROGLYPH-1403C;Lo;0;L;;;;;N;;;;; +1403D;EGYPTIAN HIEROGLYPH-1403D;Lo;0;L;;;;;N;;;;; +1403E;EGYPTIAN HIEROGLYPH-1403E;Lo;0;L;;;;;N;;;;; +1403F;EGYPTIAN HIEROGLYPH-1403F;Lo;0;L;;;;;N;;;;; +14040;EGYPTIAN HIEROGLYPH-14040;Lo;0;L;;;;;N;;;;; +14041;EGYPTIAN HIEROGLYPH-14041;Lo;0;L;;;;;N;;;;; +14042;EGYPTIAN HIEROGLYPH-14042;Lo;0;L;;;;;N;;;;; +14043;EGYPTIAN HIEROGLYPH-14043;Lo;0;L;;;;;N;;;;; +14044;EGYPTIAN HIEROGLYPH-14044;Lo;0;L;;;;;N;;;;; +14045;EGYPTIAN HIEROGLYPH-14045;Lo;0;L;;;;;N;;;;; +14046;EGYPTIAN HIEROGLYPH-14046;Lo;0;L;;;;;N;;;;; +14047;EGYPTIAN HIEROGLYPH-14047;Lo;0;L;;;;;N;;;;; +14048;EGYPTIAN HIEROGLYPH-14048;Lo;0;L;;;;;N;;;;; +14049;EGYPTIAN HIEROGLYPH-14049;Lo;0;L;;;;;N;;;;; +1404A;EGYPTIAN HIEROGLYPH-1404A;Lo;0;L;;;;;N;;;;; +1404B;EGYPTIAN HIEROGLYPH-1404B;Lo;0;L;;;;;N;;;;; +1404C;EGYPTIAN HIEROGLYPH-1404C;Lo;0;L;;;;;N;;;;; +1404D;EGYPTIAN HIEROGLYPH-1404D;Lo;0;L;;;;;N;;;;; +1404E;EGYPTIAN HIEROGLYPH-1404E;Lo;0;L;;;;;N;;;;; +1404F;EGYPTIAN HIEROGLYPH-1404F;Lo;0;L;;;;;N;;;;; +14050;EGYPTIAN HIEROGLYPH-14050;Lo;0;L;;;;;N;;;;; +14051;EGYPTIAN HIEROGLYPH-14051;Lo;0;L;;;;;N;;;;; +14052;EGYPTIAN HIEROGLYPH-14052;Lo;0;L;;;;;N;;;;; +14053;EGYPTIAN HIEROGLYPH-14053;Lo;0;L;;;;;N;;;;; +14054;EGYPTIAN HIEROGLYPH-14054;Lo;0;L;;;;;N;;;;; +14055;EGYPTIAN HIEROGLYPH-14055;Lo;0;L;;;;;N;;;;; +14056;EGYPTIAN HIEROGLYPH-14056;Lo;0;L;;;;;N;;;;; +14057;EGYPTIAN HIEROGLYPH-14057;Lo;0;L;;;;;N;;;;; +14058;EGYPTIAN HIEROGLYPH-14058;Lo;0;L;;;;;N;;;;; +14059;EGYPTIAN HIEROGLYPH-14059;Lo;0;L;;;;;N;;;;; +1405A;EGYPTIAN HIEROGLYPH-1405A;Lo;0;L;;;;;N;;;;; +1405B;EGYPTIAN HIEROGLYPH-1405B;Lo;0;L;;;;;N;;;;; +1405C;EGYPTIAN HIEROGLYPH-1405C;Lo;0;L;;;;;N;;;;; +1405D;EGYPTIAN HIEROGLYPH-1405D;Lo;0;L;;;;;N;;;;; +1405E;EGYPTIAN HIEROGLYPH-1405E;Lo;0;L;;;;;N;;;;; +1405F;EGYPTIAN HIEROGLYPH-1405F;Lo;0;L;;;;;N;;;;; +14060;EGYPTIAN HIEROGLYPH-14060;Lo;0;L;;;;;N;;;;; +14061;EGYPTIAN HIEROGLYPH-14061;Lo;0;L;;;;;N;;;;; +14062;EGYPTIAN HIEROGLYPH-14062;Lo;0;L;;;;;N;;;;; +14063;EGYPTIAN HIEROGLYPH-14063;Lo;0;L;;;;;N;;;;; +14064;EGYPTIAN HIEROGLYPH-14064;Lo;0;L;;;;;N;;;;; +14065;EGYPTIAN HIEROGLYPH-14065;Lo;0;L;;;;;N;;;;; +14066;EGYPTIAN HIEROGLYPH-14066;Lo;0;L;;;;;N;;;;; +14067;EGYPTIAN HIEROGLYPH-14067;Lo;0;L;;;;;N;;;;; +14068;EGYPTIAN HIEROGLYPH-14068;Lo;0;L;;;;;N;;;;; +14069;EGYPTIAN HIEROGLYPH-14069;Lo;0;L;;;;;N;;;;; +1406A;EGYPTIAN HIEROGLYPH-1406A;Lo;0;L;;;;;N;;;;; +1406B;EGYPTIAN HIEROGLYPH-1406B;Lo;0;L;;;;;N;;;;; +1406C;EGYPTIAN HIEROGLYPH-1406C;Lo;0;L;;;;;N;;;;; +1406D;EGYPTIAN HIEROGLYPH-1406D;Lo;0;L;;;;;N;;;;; +1406E;EGYPTIAN HIEROGLYPH-1406E;Lo;0;L;;;;;N;;;;; +1406F;EGYPTIAN HIEROGLYPH-1406F;Lo;0;L;;;;;N;;;;; +14070;EGYPTIAN HIEROGLYPH-14070;Lo;0;L;;;;;N;;;;; +14071;EGYPTIAN HIEROGLYPH-14071;Lo;0;L;;;;;N;;;;; +14072;EGYPTIAN HIEROGLYPH-14072;Lo;0;L;;;;;N;;;;; +14073;EGYPTIAN HIEROGLYPH-14073;Lo;0;L;;;;;N;;;;; +14074;EGYPTIAN HIEROGLYPH-14074;Lo;0;L;;;;;N;;;;; +14075;EGYPTIAN HIEROGLYPH-14075;Lo;0;L;;;;;N;;;;; +14076;EGYPTIAN HIEROGLYPH-14076;Lo;0;L;;;;;N;;;;; +14077;EGYPTIAN HIEROGLYPH-14077;Lo;0;L;;;;;N;;;;; +14078;EGYPTIAN HIEROGLYPH-14078;Lo;0;L;;;;;N;;;;; +14079;EGYPTIAN HIEROGLYPH-14079;Lo;0;L;;;;;N;;;;; +1407A;EGYPTIAN HIEROGLYPH-1407A;Lo;0;L;;;;;N;;;;; +1407B;EGYPTIAN HIEROGLYPH-1407B;Lo;0;L;;;;;N;;;;; +1407C;EGYPTIAN HIEROGLYPH-1407C;Lo;0;L;;;;;N;;;;; +1407D;EGYPTIAN HIEROGLYPH-1407D;Lo;0;L;;;;;N;;;;; +1407E;EGYPTIAN HIEROGLYPH-1407E;Lo;0;L;;;;;N;;;;; +1407F;EGYPTIAN HIEROGLYPH-1407F;Lo;0;L;;;;;N;;;;; +14080;EGYPTIAN HIEROGLYPH-14080;Lo;0;L;;;;;N;;;;; +14081;EGYPTIAN HIEROGLYPH-14081;Lo;0;L;;;;;N;;;;; +14082;EGYPTIAN HIEROGLYPH-14082;Lo;0;L;;;;;N;;;;; +14083;EGYPTIAN HIEROGLYPH-14083;Lo;0;L;;;;;N;;;;; +14084;EGYPTIAN HIEROGLYPH-14084;Lo;0;L;;;;;N;;;;; +14085;EGYPTIAN HIEROGLYPH-14085;Lo;0;L;;;;;N;;;;; +14086;EGYPTIAN HIEROGLYPH-14086;Lo;0;L;;;;;N;;;;; +14087;EGYPTIAN HIEROGLYPH-14087;Lo;0;L;;;;;N;;;;; +14088;EGYPTIAN HIEROGLYPH-14088;Lo;0;L;;;;;N;;;;; +14089;EGYPTIAN HIEROGLYPH-14089;Lo;0;L;;;;;N;;;;; +1408A;EGYPTIAN HIEROGLYPH-1408A;Lo;0;L;;;;;N;;;;; +1408B;EGYPTIAN HIEROGLYPH-1408B;Lo;0;L;;;;;N;;;;; +1408C;EGYPTIAN HIEROGLYPH-1408C;Lo;0;L;;;;;N;;;;; +1408D;EGYPTIAN HIEROGLYPH-1408D;Lo;0;L;;;;;N;;;;; +1408E;EGYPTIAN HIEROGLYPH-1408E;Lo;0;L;;;;;N;;;;; +1408F;EGYPTIAN HIEROGLYPH-1408F;Lo;0;L;;;;;N;;;;; +14090;EGYPTIAN HIEROGLYPH-14090;Lo;0;L;;;;;N;;;;; +14091;EGYPTIAN HIEROGLYPH-14091;Lo;0;L;;;;;N;;;;; +14092;EGYPTIAN HIEROGLYPH-14092;Lo;0;L;;;;;N;;;;; +14093;EGYPTIAN HIEROGLYPH-14093;Lo;0;L;;;;;N;;;;; +14094;EGYPTIAN HIEROGLYPH-14094;Lo;0;L;;;;;N;;;;; +14095;EGYPTIAN HIEROGLYPH-14095;Lo;0;L;;;;;N;;;;; +14096;EGYPTIAN HIEROGLYPH-14096;Lo;0;L;;;;;N;;;;; +14097;EGYPTIAN HIEROGLYPH-14097;Lo;0;L;;;;;N;;;;; +14098;EGYPTIAN HIEROGLYPH-14098;Lo;0;L;;;;;N;;;;; +14099;EGYPTIAN HIEROGLYPH-14099;Lo;0;L;;;;;N;;;;; +1409A;EGYPTIAN HIEROGLYPH-1409A;Lo;0;L;;;;;N;;;;; +1409B;EGYPTIAN HIEROGLYPH-1409B;Lo;0;L;;;;;N;;;;; +1409C;EGYPTIAN HIEROGLYPH-1409C;Lo;0;L;;;;;N;;;;; +1409D;EGYPTIAN HIEROGLYPH-1409D;Lo;0;L;;;;;N;;;;; +1409E;EGYPTIAN HIEROGLYPH-1409E;Lo;0;L;;;;;N;;;;; +1409F;EGYPTIAN HIEROGLYPH-1409F;Lo;0;L;;;;;N;;;;; +140A0;EGYPTIAN HIEROGLYPH-140A0;Lo;0;L;;;;;N;;;;; +140A1;EGYPTIAN HIEROGLYPH-140A1;Lo;0;L;;;;;N;;;;; +140A2;EGYPTIAN HIEROGLYPH-140A2;Lo;0;L;;;;;N;;;;; +140A3;EGYPTIAN HIEROGLYPH-140A3;Lo;0;L;;;;;N;;;;; +140A4;EGYPTIAN HIEROGLYPH-140A4;Lo;0;L;;;;;N;;;;; +140A5;EGYPTIAN HIEROGLYPH-140A5;Lo;0;L;;;;;N;;;;; +140A6;EGYPTIAN HIEROGLYPH-140A6;Lo;0;L;;;;;N;;;;; +140A7;EGYPTIAN HIEROGLYPH-140A7;Lo;0;L;;;;;N;;;;; +140A8;EGYPTIAN HIEROGLYPH-140A8;Lo;0;L;;;;;N;;;;; +140A9;EGYPTIAN HIEROGLYPH-140A9;Lo;0;L;;;;;N;;;;; +140AA;EGYPTIAN HIEROGLYPH-140AA;Lo;0;L;;;;;N;;;;; +140AB;EGYPTIAN HIEROGLYPH-140AB;Lo;0;L;;;;;N;;;;; +140AC;EGYPTIAN HIEROGLYPH-140AC;Lo;0;L;;;;;N;;;;; +140AD;EGYPTIAN HIEROGLYPH-140AD;Lo;0;L;;;;;N;;;;; +140AE;EGYPTIAN HIEROGLYPH-140AE;Lo;0;L;;;;;N;;;;; +140AF;EGYPTIAN HIEROGLYPH-140AF;Lo;0;L;;;;;N;;;;; +140B0;EGYPTIAN HIEROGLYPH-140B0;Lo;0;L;;;;;N;;;;; +140B1;EGYPTIAN HIEROGLYPH-140B1;Lo;0;L;;;;;N;;;;; +140B2;EGYPTIAN HIEROGLYPH-140B2;Lo;0;L;;;;;N;;;;; +140B3;EGYPTIAN HIEROGLYPH-140B3;Lo;0;L;;;;;N;;;;; +140B4;EGYPTIAN HIEROGLYPH-140B4;Lo;0;L;;;;;N;;;;; +140B5;EGYPTIAN HIEROGLYPH-140B5;Lo;0;L;;;;;N;;;;; +140B6;EGYPTIAN HIEROGLYPH-140B6;Lo;0;L;;;;;N;;;;; +140B7;EGYPTIAN HIEROGLYPH-140B7;Lo;0;L;;;;;N;;;;; +140B8;EGYPTIAN HIEROGLYPH-140B8;Lo;0;L;;;;;N;;;;; +140B9;EGYPTIAN HIEROGLYPH-140B9;Lo;0;L;;;;;N;;;;; +140BA;EGYPTIAN HIEROGLYPH-140BA;Lo;0;L;;;;;N;;;;; +140BB;EGYPTIAN HIEROGLYPH-140BB;Lo;0;L;;;;;N;;;;; +140BC;EGYPTIAN HIEROGLYPH-140BC;Lo;0;L;;;;;N;;;;; +140BD;EGYPTIAN HIEROGLYPH-140BD;Lo;0;L;;;;;N;;;;; +140BE;EGYPTIAN HIEROGLYPH-140BE;Lo;0;L;;;;;N;;;;; +140BF;EGYPTIAN HIEROGLYPH-140BF;Lo;0;L;;;;;N;;;;; +140C0;EGYPTIAN HIEROGLYPH-140C0;Lo;0;L;;;;;N;;;;; +140C1;EGYPTIAN HIEROGLYPH-140C1;Lo;0;L;;;;;N;;;;; +140C2;EGYPTIAN HIEROGLYPH-140C2;Lo;0;L;;;;;N;;;;; +140C3;EGYPTIAN HIEROGLYPH-140C3;Lo;0;L;;;;;N;;;;; +140C4;EGYPTIAN HIEROGLYPH-140C4;Lo;0;L;;;;;N;;;;; +140C5;EGYPTIAN HIEROGLYPH-140C5;Lo;0;L;;;;;N;;;;; +140C6;EGYPTIAN HIEROGLYPH-140C6;Lo;0;L;;;;;N;;;;; +140C7;EGYPTIAN HIEROGLYPH-140C7;Lo;0;L;;;;;N;;;;; +140C8;EGYPTIAN HIEROGLYPH-140C8;Lo;0;L;;;;;N;;;;; +140C9;EGYPTIAN HIEROGLYPH-140C9;Lo;0;L;;;;;N;;;;; +140CA;EGYPTIAN HIEROGLYPH-140CA;Lo;0;L;;;;;N;;;;; +140CB;EGYPTIAN HIEROGLYPH-140CB;Lo;0;L;;;;;N;;;;; +140CC;EGYPTIAN HIEROGLYPH-140CC;Lo;0;L;;;;;N;;;;; +140CD;EGYPTIAN HIEROGLYPH-140CD;Lo;0;L;;;;;N;;;;; +140CE;EGYPTIAN HIEROGLYPH-140CE;Lo;0;L;;;;;N;;;;; +140CF;EGYPTIAN HIEROGLYPH-140CF;Lo;0;L;;;;;N;;;;; +140D0;EGYPTIAN HIEROGLYPH-140D0;Lo;0;L;;;;;N;;;;; +140D1;EGYPTIAN HIEROGLYPH-140D1;Lo;0;L;;;;;N;;;;; +140D2;EGYPTIAN HIEROGLYPH-140D2;Lo;0;L;;;;;N;;;;; +140D3;EGYPTIAN HIEROGLYPH-140D3;Lo;0;L;;;;;N;;;;; +140D4;EGYPTIAN HIEROGLYPH-140D4;Lo;0;L;;;;;N;;;;; +140D5;EGYPTIAN HIEROGLYPH-140D5;Lo;0;L;;;;;N;;;;; +140D6;EGYPTIAN HIEROGLYPH-140D6;Lo;0;L;;;;;N;;;;; +140D7;EGYPTIAN HIEROGLYPH-140D7;Lo;0;L;;;;;N;;;;; +140D8;EGYPTIAN HIEROGLYPH-140D8;Lo;0;L;;;;;N;;;;; +140D9;EGYPTIAN HIEROGLYPH-140D9;Lo;0;L;;;;;N;;;;; +140DA;EGYPTIAN HIEROGLYPH-140DA;Lo;0;L;;;;;N;;;;; +140DB;EGYPTIAN HIEROGLYPH-140DB;Lo;0;L;;;;;N;;;;; +140DC;EGYPTIAN HIEROGLYPH-140DC;Lo;0;L;;;;;N;;;;; +140DD;EGYPTIAN HIEROGLYPH-140DD;Lo;0;L;;;;;N;;;;; +140DE;EGYPTIAN HIEROGLYPH-140DE;Lo;0;L;;;;;N;;;;; +140DF;EGYPTIAN HIEROGLYPH-140DF;Lo;0;L;;;;;N;;;;; +140E0;EGYPTIAN HIEROGLYPH-140E0;Lo;0;L;;;;;N;;;;; +140E1;EGYPTIAN HIEROGLYPH-140E1;Lo;0;L;;;;;N;;;;; +140E2;EGYPTIAN HIEROGLYPH-140E2;Lo;0;L;;;;;N;;;;; +140E3;EGYPTIAN HIEROGLYPH-140E3;Lo;0;L;;;;;N;;;;; +140E4;EGYPTIAN HIEROGLYPH-140E4;Lo;0;L;;;;;N;;;;; +140E5;EGYPTIAN HIEROGLYPH-140E5;Lo;0;L;;;;;N;;;;; +140E6;EGYPTIAN HIEROGLYPH-140E6;Lo;0;L;;;;;N;;;;; +140E7;EGYPTIAN HIEROGLYPH-140E7;Lo;0;L;;;;;N;;;;; +140E8;EGYPTIAN HIEROGLYPH-140E8;Lo;0;L;;;;;N;;;;; +140E9;EGYPTIAN HIEROGLYPH-140E9;Lo;0;L;;;;;N;;;;; +140EA;EGYPTIAN HIEROGLYPH-140EA;Lo;0;L;;;;;N;;;;; +140EB;EGYPTIAN HIEROGLYPH-140EB;Lo;0;L;;;;;N;;;;; +140EC;EGYPTIAN HIEROGLYPH-140EC;Lo;0;L;;;;;N;;;;; +140ED;EGYPTIAN HIEROGLYPH-140ED;Lo;0;L;;;;;N;;;;; +140EE;EGYPTIAN HIEROGLYPH-140EE;Lo;0;L;;;;;N;;;;; +140EF;EGYPTIAN HIEROGLYPH-140EF;Lo;0;L;;;;;N;;;;; +140F0;EGYPTIAN HIEROGLYPH-140F0;Lo;0;L;;;;;N;;;;; +140F1;EGYPTIAN HIEROGLYPH-140F1;Lo;0;L;;;;;N;;;;; +140F2;EGYPTIAN HIEROGLYPH-140F2;Lo;0;L;;;;;N;;;;; +140F3;EGYPTIAN HIEROGLYPH-140F3;Lo;0;L;;;;;N;;;;; +140F4;EGYPTIAN HIEROGLYPH-140F4;Lo;0;L;;;;;N;;;;; +140F5;EGYPTIAN HIEROGLYPH-140F5;Lo;0;L;;;;;N;;;;; +140F6;EGYPTIAN HIEROGLYPH-140F6;Lo;0;L;;;;;N;;;;; +140F7;EGYPTIAN HIEROGLYPH-140F7;Lo;0;L;;;;;N;;;;; +140F8;EGYPTIAN HIEROGLYPH-140F8;Lo;0;L;;;;;N;;;;; +140F9;EGYPTIAN HIEROGLYPH-140F9;Lo;0;L;;;;;N;;;;; +140FA;EGYPTIAN HIEROGLYPH-140FA;Lo;0;L;;;;;N;;;;; +140FB;EGYPTIAN HIEROGLYPH-140FB;Lo;0;L;;;;;N;;;;; +140FC;EGYPTIAN HIEROGLYPH-140FC;Lo;0;L;;;;;N;;;;; +140FD;EGYPTIAN HIEROGLYPH-140FD;Lo;0;L;;;;;N;;;;; +140FE;EGYPTIAN HIEROGLYPH-140FE;Lo;0;L;;;;;N;;;;; +140FF;EGYPTIAN HIEROGLYPH-140FF;Lo;0;L;;;;;N;;;;; +14100;EGYPTIAN HIEROGLYPH-14100;Lo;0;L;;;;;N;;;;; +14101;EGYPTIAN HIEROGLYPH-14101;Lo;0;L;;;;;N;;;;; +14102;EGYPTIAN HIEROGLYPH-14102;Lo;0;L;;;;;N;;;;; +14103;EGYPTIAN HIEROGLYPH-14103;Lo;0;L;;;;;N;;;;; +14104;EGYPTIAN HIEROGLYPH-14104;Lo;0;L;;;;;N;;;;; +14105;EGYPTIAN HIEROGLYPH-14105;Lo;0;L;;;;;N;;;;; +14106;EGYPTIAN HIEROGLYPH-14106;Lo;0;L;;;;;N;;;;; +14107;EGYPTIAN HIEROGLYPH-14107;Lo;0;L;;;;;N;;;;; +14108;EGYPTIAN HIEROGLYPH-14108;Lo;0;L;;;;;N;;;;; +14109;EGYPTIAN HIEROGLYPH-14109;Lo;0;L;;;;;N;;;;; +1410A;EGYPTIAN HIEROGLYPH-1410A;Lo;0;L;;;;;N;;;;; +1410B;EGYPTIAN HIEROGLYPH-1410B;Lo;0;L;;;;;N;;;;; +1410C;EGYPTIAN HIEROGLYPH-1410C;Lo;0;L;;;;;N;;;;; +1410D;EGYPTIAN HIEROGLYPH-1410D;Lo;0;L;;;;;N;;;;; +1410E;EGYPTIAN HIEROGLYPH-1410E;Lo;0;L;;;;;N;;;;; +1410F;EGYPTIAN HIEROGLYPH-1410F;Lo;0;L;;;;;N;;;;; +14110;EGYPTIAN HIEROGLYPH-14110;Lo;0;L;;;;;N;;;;; +14111;EGYPTIAN HIEROGLYPH-14111;Lo;0;L;;;;;N;;;;; +14112;EGYPTIAN HIEROGLYPH-14112;Lo;0;L;;;;;N;;;;; +14113;EGYPTIAN HIEROGLYPH-14113;Lo;0;L;;;;;N;;;;; +14114;EGYPTIAN HIEROGLYPH-14114;Lo;0;L;;;;;N;;;;; +14115;EGYPTIAN HIEROGLYPH-14115;Lo;0;L;;;;;N;;;;; +14116;EGYPTIAN HIEROGLYPH-14116;Lo;0;L;;;;;N;;;;; +14117;EGYPTIAN HIEROGLYPH-14117;Lo;0;L;;;;;N;;;;; +14118;EGYPTIAN HIEROGLYPH-14118;Lo;0;L;;;;;N;;;;; +14119;EGYPTIAN HIEROGLYPH-14119;Lo;0;L;;;;;N;;;;; +1411A;EGYPTIAN HIEROGLYPH-1411A;Lo;0;L;;;;;N;;;;; +1411B;EGYPTIAN HIEROGLYPH-1411B;Lo;0;L;;;;;N;;;;; +1411C;EGYPTIAN HIEROGLYPH-1411C;Lo;0;L;;;;;N;;;;; +1411D;EGYPTIAN HIEROGLYPH-1411D;Lo;0;L;;;;;N;;;;; +1411E;EGYPTIAN HIEROGLYPH-1411E;Lo;0;L;;;;;N;;;;; +1411F;EGYPTIAN HIEROGLYPH-1411F;Lo;0;L;;;;;N;;;;; +14120;EGYPTIAN HIEROGLYPH-14120;Lo;0;L;;;;;N;;;;; +14121;EGYPTIAN HIEROGLYPH-14121;Lo;0;L;;;;;N;;;;; +14122;EGYPTIAN HIEROGLYPH-14122;Lo;0;L;;;;;N;;;;; +14123;EGYPTIAN HIEROGLYPH-14123;Lo;0;L;;;;;N;;;;; +14124;EGYPTIAN HIEROGLYPH-14124;Lo;0;L;;;;;N;;;;; +14125;EGYPTIAN HIEROGLYPH-14125;Lo;0;L;;;;;N;;;;; +14126;EGYPTIAN HIEROGLYPH-14126;Lo;0;L;;;;;N;;;;; +14127;EGYPTIAN HIEROGLYPH-14127;Lo;0;L;;;;;N;;;;; +14128;EGYPTIAN HIEROGLYPH-14128;Lo;0;L;;;;;N;;;;; +14129;EGYPTIAN HIEROGLYPH-14129;Lo;0;L;;;;;N;;;;; +1412A;EGYPTIAN HIEROGLYPH-1412A;Lo;0;L;;;;;N;;;;; +1412B;EGYPTIAN HIEROGLYPH-1412B;Lo;0;L;;;;;N;;;;; +1412C;EGYPTIAN HIEROGLYPH-1412C;Lo;0;L;;;;;N;;;;; +1412D;EGYPTIAN HIEROGLYPH-1412D;Lo;0;L;;;;;N;;;;; +1412E;EGYPTIAN HIEROGLYPH-1412E;Lo;0;L;;;;;N;;;;; +1412F;EGYPTIAN HIEROGLYPH-1412F;Lo;0;L;;;;;N;;;;; +14130;EGYPTIAN HIEROGLYPH-14130;Lo;0;L;;;;;N;;;;; +14131;EGYPTIAN HIEROGLYPH-14131;Lo;0;L;;;;;N;;;;; +14132;EGYPTIAN HIEROGLYPH-14132;Lo;0;L;;;;;N;;;;; +14133;EGYPTIAN HIEROGLYPH-14133;Lo;0;L;;;;;N;;;;; +14134;EGYPTIAN HIEROGLYPH-14134;Lo;0;L;;;;;N;;;;; +14135;EGYPTIAN HIEROGLYPH-14135;Lo;0;L;;;;;N;;;;; +14136;EGYPTIAN HIEROGLYPH-14136;Lo;0;L;;;;;N;;;;; +14137;EGYPTIAN HIEROGLYPH-14137;Lo;0;L;;;;;N;;;;; +14138;EGYPTIAN HIEROGLYPH-14138;Lo;0;L;;;;;N;;;;; +14139;EGYPTIAN HIEROGLYPH-14139;Lo;0;L;;;;;N;;;;; +1413A;EGYPTIAN HIEROGLYPH-1413A;Lo;0;L;;;;;N;;;;; +1413B;EGYPTIAN HIEROGLYPH-1413B;Lo;0;L;;;;;N;;;;; +1413C;EGYPTIAN HIEROGLYPH-1413C;Lo;0;L;;;;;N;;;;; +1413D;EGYPTIAN HIEROGLYPH-1413D;Lo;0;L;;;;;N;;;;; +1413E;EGYPTIAN HIEROGLYPH-1413E;Lo;0;L;;;;;N;;;;; +1413F;EGYPTIAN HIEROGLYPH-1413F;Lo;0;L;;;;;N;;;;; +14140;EGYPTIAN HIEROGLYPH-14140;Lo;0;L;;;;;N;;;;; +14141;EGYPTIAN HIEROGLYPH-14141;Lo;0;L;;;;;N;;;;; +14142;EGYPTIAN HIEROGLYPH-14142;Lo;0;L;;;;;N;;;;; +14143;EGYPTIAN HIEROGLYPH-14143;Lo;0;L;;;;;N;;;;; +14144;EGYPTIAN HIEROGLYPH-14144;Lo;0;L;;;;;N;;;;; +14145;EGYPTIAN HIEROGLYPH-14145;Lo;0;L;;;;;N;;;;; +14146;EGYPTIAN HIEROGLYPH-14146;Lo;0;L;;;;;N;;;;; +14147;EGYPTIAN HIEROGLYPH-14147;Lo;0;L;;;;;N;;;;; +14148;EGYPTIAN HIEROGLYPH-14148;Lo;0;L;;;;;N;;;;; +14149;EGYPTIAN HIEROGLYPH-14149;Lo;0;L;;;;;N;;;;; +1414A;EGYPTIAN HIEROGLYPH-1414A;Lo;0;L;;;;;N;;;;; +1414B;EGYPTIAN HIEROGLYPH-1414B;Lo;0;L;;;;;N;;;;; +1414C;EGYPTIAN HIEROGLYPH-1414C;Lo;0;L;;;;;N;;;;; +1414D;EGYPTIAN HIEROGLYPH-1414D;Lo;0;L;;;;;N;;;;; +1414E;EGYPTIAN HIEROGLYPH-1414E;Lo;0;L;;;;;N;;;;; +1414F;EGYPTIAN HIEROGLYPH-1414F;Lo;0;L;;;;;N;;;;; +14150;EGYPTIAN HIEROGLYPH-14150;Lo;0;L;;;;;N;;;;; +14151;EGYPTIAN HIEROGLYPH-14151;Lo;0;L;;;;;N;;;;; +14152;EGYPTIAN HIEROGLYPH-14152;Lo;0;L;;;;;N;;;;; +14153;EGYPTIAN HIEROGLYPH-14153;Lo;0;L;;;;;N;;;;; +14154;EGYPTIAN HIEROGLYPH-14154;Lo;0;L;;;;;N;;;;; +14155;EGYPTIAN HIEROGLYPH-14155;Lo;0;L;;;;;N;;;;; +14156;EGYPTIAN HIEROGLYPH-14156;Lo;0;L;;;;;N;;;;; +14157;EGYPTIAN HIEROGLYPH-14157;Lo;0;L;;;;;N;;;;; +14158;EGYPTIAN HIEROGLYPH-14158;Lo;0;L;;;;;N;;;;; +14159;EGYPTIAN HIEROGLYPH-14159;Lo;0;L;;;;;N;;;;; +1415A;EGYPTIAN HIEROGLYPH-1415A;Lo;0;L;;;;;N;;;;; +1415B;EGYPTIAN HIEROGLYPH-1415B;Lo;0;L;;;;;N;;;;; +1415C;EGYPTIAN HIEROGLYPH-1415C;Lo;0;L;;;;;N;;;;; +1415D;EGYPTIAN HIEROGLYPH-1415D;Lo;0;L;;;;;N;;;;; +1415E;EGYPTIAN HIEROGLYPH-1415E;Lo;0;L;;;;;N;;;;; +1415F;EGYPTIAN HIEROGLYPH-1415F;Lo;0;L;;;;;N;;;;; +14160;EGYPTIAN HIEROGLYPH-14160;Lo;0;L;;;;;N;;;;; +14161;EGYPTIAN HIEROGLYPH-14161;Lo;0;L;;;;;N;;;;; +14162;EGYPTIAN HIEROGLYPH-14162;Lo;0;L;;;;;N;;;;; +14163;EGYPTIAN HIEROGLYPH-14163;Lo;0;L;;;;;N;;;;; +14164;EGYPTIAN HIEROGLYPH-14164;Lo;0;L;;;;;N;;;;; +14165;EGYPTIAN HIEROGLYPH-14165;Lo;0;L;;;;;N;;;;; +14166;EGYPTIAN HIEROGLYPH-14166;Lo;0;L;;;;;N;;;;; +14167;EGYPTIAN HIEROGLYPH-14167;Lo;0;L;;;;;N;;;;; +14168;EGYPTIAN HIEROGLYPH-14168;Lo;0;L;;;;;N;;;;; +14169;EGYPTIAN HIEROGLYPH-14169;Lo;0;L;;;;;N;;;;; +1416A;EGYPTIAN HIEROGLYPH-1416A;Lo;0;L;;;;;N;;;;; +1416B;EGYPTIAN HIEROGLYPH-1416B;Lo;0;L;;;;;N;;;;; +1416C;EGYPTIAN HIEROGLYPH-1416C;Lo;0;L;;;;;N;;;;; +1416D;EGYPTIAN HIEROGLYPH-1416D;Lo;0;L;;;;;N;;;;; +1416E;EGYPTIAN HIEROGLYPH-1416E;Lo;0;L;;;;;N;;;;; +1416F;EGYPTIAN HIEROGLYPH-1416F;Lo;0;L;;;;;N;;;;; +14170;EGYPTIAN HIEROGLYPH-14170;Lo;0;L;;;;;N;;;;; +14171;EGYPTIAN HIEROGLYPH-14171;Lo;0;L;;;;;N;;;;; +14172;EGYPTIAN HIEROGLYPH-14172;Lo;0;L;;;;;N;;;;; +14173;EGYPTIAN HIEROGLYPH-14173;Lo;0;L;;;;;N;;;;; +14174;EGYPTIAN HIEROGLYPH-14174;Lo;0;L;;;;;N;;;;; +14175;EGYPTIAN HIEROGLYPH-14175;Lo;0;L;;;;;N;;;;; +14176;EGYPTIAN HIEROGLYPH-14176;Lo;0;L;;;;;N;;;;; +14177;EGYPTIAN HIEROGLYPH-14177;Lo;0;L;;;;;N;;;;; +14178;EGYPTIAN HIEROGLYPH-14178;Lo;0;L;;;;;N;;;;; +14179;EGYPTIAN HIEROGLYPH-14179;Lo;0;L;;;;;N;;;;; +1417A;EGYPTIAN HIEROGLYPH-1417A;Lo;0;L;;;;;N;;;;; +1417B;EGYPTIAN HIEROGLYPH-1417B;Lo;0;L;;;;;N;;;;; +1417C;EGYPTIAN HIEROGLYPH-1417C;Lo;0;L;;;;;N;;;;; +1417D;EGYPTIAN HIEROGLYPH-1417D;Lo;0;L;;;;;N;;;;; +1417E;EGYPTIAN HIEROGLYPH-1417E;Lo;0;L;;;;;N;;;;; +1417F;EGYPTIAN HIEROGLYPH-1417F;Lo;0;L;;;;;N;;;;; +14180;EGYPTIAN HIEROGLYPH-14180;Lo;0;L;;;;;N;;;;; +14181;EGYPTIAN HIEROGLYPH-14181;Lo;0;L;;;;;N;;;;; +14182;EGYPTIAN HIEROGLYPH-14182;Lo;0;L;;;;;N;;;;; +14183;EGYPTIAN HIEROGLYPH-14183;Lo;0;L;;;;;N;;;;; +14184;EGYPTIAN HIEROGLYPH-14184;Lo;0;L;;;;;N;;;;; +14185;EGYPTIAN HIEROGLYPH-14185;Lo;0;L;;;;;N;;;;; +14186;EGYPTIAN HIEROGLYPH-14186;Lo;0;L;;;;;N;;;;; +14187;EGYPTIAN HIEROGLYPH-14187;Lo;0;L;;;;;N;;;;; +14188;EGYPTIAN HIEROGLYPH-14188;Lo;0;L;;;;;N;;;;; +14189;EGYPTIAN HIEROGLYPH-14189;Lo;0;L;;;;;N;;;;; +1418A;EGYPTIAN HIEROGLYPH-1418A;Lo;0;L;;;;;N;;;;; +1418B;EGYPTIAN HIEROGLYPH-1418B;Lo;0;L;;;;;N;;;;; +1418C;EGYPTIAN HIEROGLYPH-1418C;Lo;0;L;;;;;N;;;;; +1418D;EGYPTIAN HIEROGLYPH-1418D;Lo;0;L;;;;;N;;;;; +1418E;EGYPTIAN HIEROGLYPH-1418E;Lo;0;L;;;;;N;;;;; +1418F;EGYPTIAN HIEROGLYPH-1418F;Lo;0;L;;;;;N;;;;; +14190;EGYPTIAN HIEROGLYPH-14190;Lo;0;L;;;;;N;;;;; +14191;EGYPTIAN HIEROGLYPH-14191;Lo;0;L;;;;;N;;;;; +14192;EGYPTIAN HIEROGLYPH-14192;Lo;0;L;;;;;N;;;;; +14193;EGYPTIAN HIEROGLYPH-14193;Lo;0;L;;;;;N;;;;; +14194;EGYPTIAN HIEROGLYPH-14194;Lo;0;L;;;;;N;;;;; +14195;EGYPTIAN HIEROGLYPH-14195;Lo;0;L;;;;;N;;;;; +14196;EGYPTIAN HIEROGLYPH-14196;Lo;0;L;;;;;N;;;;; +14197;EGYPTIAN HIEROGLYPH-14197;Lo;0;L;;;;;N;;;;; +14198;EGYPTIAN HIEROGLYPH-14198;Lo;0;L;;;;;N;;;;; +14199;EGYPTIAN HIEROGLYPH-14199;Lo;0;L;;;;;N;;;;; +1419A;EGYPTIAN HIEROGLYPH-1419A;Lo;0;L;;;;;N;;;;; +1419B;EGYPTIAN HIEROGLYPH-1419B;Lo;0;L;;;;;N;;;;; +1419C;EGYPTIAN HIEROGLYPH-1419C;Lo;0;L;;;;;N;;;;; +1419D;EGYPTIAN HIEROGLYPH-1419D;Lo;0;L;;;;;N;;;;; +1419E;EGYPTIAN HIEROGLYPH-1419E;Lo;0;L;;;;;N;;;;; +1419F;EGYPTIAN HIEROGLYPH-1419F;Lo;0;L;;;;;N;;;;; +141A0;EGYPTIAN HIEROGLYPH-141A0;Lo;0;L;;;;;N;;;;; +141A1;EGYPTIAN HIEROGLYPH-141A1;Lo;0;L;;;;;N;;;;; +141A2;EGYPTIAN HIEROGLYPH-141A2;Lo;0;L;;;;;N;;;;; +141A3;EGYPTIAN HIEROGLYPH-141A3;Lo;0;L;;;;;N;;;;; +141A4;EGYPTIAN HIEROGLYPH-141A4;Lo;0;L;;;;;N;;;;; +141A5;EGYPTIAN HIEROGLYPH-141A5;Lo;0;L;;;;;N;;;;; +141A6;EGYPTIAN HIEROGLYPH-141A6;Lo;0;L;;;;;N;;;;; +141A7;EGYPTIAN HIEROGLYPH-141A7;Lo;0;L;;;;;N;;;;; +141A8;EGYPTIAN HIEROGLYPH-141A8;Lo;0;L;;;;;N;;;;; +141A9;EGYPTIAN HIEROGLYPH-141A9;Lo;0;L;;;;;N;;;;; +141AA;EGYPTIAN HIEROGLYPH-141AA;Lo;0;L;;;;;N;;;;; +141AB;EGYPTIAN HIEROGLYPH-141AB;Lo;0;L;;;;;N;;;;; +141AC;EGYPTIAN HIEROGLYPH-141AC;Lo;0;L;;;;;N;;;;; +141AD;EGYPTIAN HIEROGLYPH-141AD;Lo;0;L;;;;;N;;;;; +141AE;EGYPTIAN HIEROGLYPH-141AE;Lo;0;L;;;;;N;;;;; +141AF;EGYPTIAN HIEROGLYPH-141AF;Lo;0;L;;;;;N;;;;; +141B0;EGYPTIAN HIEROGLYPH-141B0;Lo;0;L;;;;;N;;;;; +141B1;EGYPTIAN HIEROGLYPH-141B1;Lo;0;L;;;;;N;;;;; +141B2;EGYPTIAN HIEROGLYPH-141B2;Lo;0;L;;;;;N;;;;; +141B3;EGYPTIAN HIEROGLYPH-141B3;Lo;0;L;;;;;N;;;;; +141B4;EGYPTIAN HIEROGLYPH-141B4;Lo;0;L;;;;;N;;;;; +141B5;EGYPTIAN HIEROGLYPH-141B5;Lo;0;L;;;;;N;;;;; +141B6;EGYPTIAN HIEROGLYPH-141B6;Lo;0;L;;;;;N;;;;; +141B7;EGYPTIAN HIEROGLYPH-141B7;Lo;0;L;;;;;N;;;;; +141B8;EGYPTIAN HIEROGLYPH-141B8;Lo;0;L;;;;;N;;;;; +141B9;EGYPTIAN HIEROGLYPH-141B9;Lo;0;L;;;;;N;;;;; +141BA;EGYPTIAN HIEROGLYPH-141BA;Lo;0;L;;;;;N;;;;; +141BB;EGYPTIAN HIEROGLYPH-141BB;Lo;0;L;;;;;N;;;;; +141BC;EGYPTIAN HIEROGLYPH-141BC;Lo;0;L;;;;;N;;;;; +141BD;EGYPTIAN HIEROGLYPH-141BD;Lo;0;L;;;;;N;;;;; +141BE;EGYPTIAN HIEROGLYPH-141BE;Lo;0;L;;;;;N;;;;; +141BF;EGYPTIAN HIEROGLYPH-141BF;Lo;0;L;;;;;N;;;;; +141C0;EGYPTIAN HIEROGLYPH-141C0;Lo;0;L;;;;;N;;;;; +141C1;EGYPTIAN HIEROGLYPH-141C1;Lo;0;L;;;;;N;;;;; +141C2;EGYPTIAN HIEROGLYPH-141C2;Lo;0;L;;;;;N;;;;; +141C3;EGYPTIAN HIEROGLYPH-141C3;Lo;0;L;;;;;N;;;;; +141C4;EGYPTIAN HIEROGLYPH-141C4;Lo;0;L;;;;;N;;;;; +141C5;EGYPTIAN HIEROGLYPH-141C5;Lo;0;L;;;;;N;;;;; +141C6;EGYPTIAN HIEROGLYPH-141C6;Lo;0;L;;;;;N;;;;; +141C7;EGYPTIAN HIEROGLYPH-141C7;Lo;0;L;;;;;N;;;;; +141C8;EGYPTIAN HIEROGLYPH-141C8;Lo;0;L;;;;;N;;;;; +141C9;EGYPTIAN HIEROGLYPH-141C9;Lo;0;L;;;;;N;;;;; +141CA;EGYPTIAN HIEROGLYPH-141CA;Lo;0;L;;;;;N;;;;; +141CB;EGYPTIAN HIEROGLYPH-141CB;Lo;0;L;;;;;N;;;;; +141CC;EGYPTIAN HIEROGLYPH-141CC;Lo;0;L;;;;;N;;;;; +141CD;EGYPTIAN HIEROGLYPH-141CD;Lo;0;L;;;;;N;;;;; +141CE;EGYPTIAN HIEROGLYPH-141CE;Lo;0;L;;;;;N;;;;; +141CF;EGYPTIAN HIEROGLYPH-141CF;Lo;0;L;;;;;N;;;;; +141D0;EGYPTIAN HIEROGLYPH-141D0;Lo;0;L;;;;;N;;;;; +141D1;EGYPTIAN HIEROGLYPH-141D1;Lo;0;L;;;;;N;;;;; +141D2;EGYPTIAN HIEROGLYPH-141D2;Lo;0;L;;;;;N;;;;; +141D3;EGYPTIAN HIEROGLYPH-141D3;Lo;0;L;;;;;N;;;;; +141D4;EGYPTIAN HIEROGLYPH-141D4;Lo;0;L;;;;;N;;;;; +141D5;EGYPTIAN HIEROGLYPH-141D5;Lo;0;L;;;;;N;;;;; +141D6;EGYPTIAN HIEROGLYPH-141D6;Lo;0;L;;;;;N;;;;; +141D7;EGYPTIAN HIEROGLYPH-141D7;Lo;0;L;;;;;N;;;;; +141D8;EGYPTIAN HIEROGLYPH-141D8;Lo;0;L;;;;;N;;;;; +141D9;EGYPTIAN HIEROGLYPH-141D9;Lo;0;L;;;;;N;;;;; +141DA;EGYPTIAN HIEROGLYPH-141DA;Lo;0;L;;;;;N;;;;; +141DB;EGYPTIAN HIEROGLYPH-141DB;Lo;0;L;;;;;N;;;;; +141DC;EGYPTIAN HIEROGLYPH-141DC;Lo;0;L;;;;;N;;;;; +141DD;EGYPTIAN HIEROGLYPH-141DD;Lo;0;L;;;;;N;;;;; +141DE;EGYPTIAN HIEROGLYPH-141DE;Lo;0;L;;;;;N;;;;; +141DF;EGYPTIAN HIEROGLYPH-141DF;Lo;0;L;;;;;N;;;;; +141E0;EGYPTIAN HIEROGLYPH-141E0;Lo;0;L;;;;;N;;;;; +141E1;EGYPTIAN HIEROGLYPH-141E1;Lo;0;L;;;;;N;;;;; +141E2;EGYPTIAN HIEROGLYPH-141E2;Lo;0;L;;;;;N;;;;; +141E3;EGYPTIAN HIEROGLYPH-141E3;Lo;0;L;;;;;N;;;;; +141E4;EGYPTIAN HIEROGLYPH-141E4;Lo;0;L;;;;;N;;;;; +141E5;EGYPTIAN HIEROGLYPH-141E5;Lo;0;L;;;;;N;;;;; +141E6;EGYPTIAN HIEROGLYPH-141E6;Lo;0;L;;;;;N;;;;; +141E7;EGYPTIAN HIEROGLYPH-141E7;Lo;0;L;;;;;N;;;;; +141E8;EGYPTIAN HIEROGLYPH-141E8;Lo;0;L;;;;;N;;;;; +141E9;EGYPTIAN HIEROGLYPH-141E9;Lo;0;L;;;;;N;;;;; +141EA;EGYPTIAN HIEROGLYPH-141EA;Lo;0;L;;;;;N;;;;; +141EB;EGYPTIAN HIEROGLYPH-141EB;Lo;0;L;;;;;N;;;;; +141EC;EGYPTIAN HIEROGLYPH-141EC;Lo;0;L;;;;;N;;;;; +141ED;EGYPTIAN HIEROGLYPH-141ED;Lo;0;L;;;;;N;;;;; +141EE;EGYPTIAN HIEROGLYPH-141EE;Lo;0;L;;;;;N;;;;; +141EF;EGYPTIAN HIEROGLYPH-141EF;Lo;0;L;;;;;N;;;;; +141F0;EGYPTIAN HIEROGLYPH-141F0;Lo;0;L;;;;;N;;;;; +141F1;EGYPTIAN HIEROGLYPH-141F1;Lo;0;L;;;;;N;;;;; +141F2;EGYPTIAN HIEROGLYPH-141F2;Lo;0;L;;;;;N;;;;; +141F3;EGYPTIAN HIEROGLYPH-141F3;Lo;0;L;;;;;N;;;;; +141F4;EGYPTIAN HIEROGLYPH-141F4;Lo;0;L;;;;;N;;;;; +141F5;EGYPTIAN HIEROGLYPH-141F5;Lo;0;L;;;;;N;;;;; +141F6;EGYPTIAN HIEROGLYPH-141F6;Lo;0;L;;;;;N;;;;; +141F7;EGYPTIAN HIEROGLYPH-141F7;Lo;0;L;;;;;N;;;;; +141F8;EGYPTIAN HIEROGLYPH-141F8;Lo;0;L;;;;;N;;;;; +141F9;EGYPTIAN HIEROGLYPH-141F9;Lo;0;L;;;;;N;;;;; +141FA;EGYPTIAN HIEROGLYPH-141FA;Lo;0;L;;;;;N;;;;; +141FB;EGYPTIAN HIEROGLYPH-141FB;Lo;0;L;;;;;N;;;;; +141FC;EGYPTIAN HIEROGLYPH-141FC;Lo;0;L;;;;;N;;;;; +141FD;EGYPTIAN HIEROGLYPH-141FD;Lo;0;L;;;;;N;;;;; +141FE;EGYPTIAN HIEROGLYPH-141FE;Lo;0;L;;;;;N;;;;; +141FF;EGYPTIAN HIEROGLYPH-141FF;Lo;0;L;;;;;N;;;;; +14200;EGYPTIAN HIEROGLYPH-14200;Lo;0;L;;;;;N;;;;; +14201;EGYPTIAN HIEROGLYPH-14201;Lo;0;L;;;;;N;;;;; +14202;EGYPTIAN HIEROGLYPH-14202;Lo;0;L;;;;;N;;;;; +14203;EGYPTIAN HIEROGLYPH-14203;Lo;0;L;;;;;N;;;;; +14204;EGYPTIAN HIEROGLYPH-14204;Lo;0;L;;;;;N;;;;; +14205;EGYPTIAN HIEROGLYPH-14205;Lo;0;L;;;;;N;;;;; +14206;EGYPTIAN HIEROGLYPH-14206;Lo;0;L;;;;;N;;;;; +14207;EGYPTIAN HIEROGLYPH-14207;Lo;0;L;;;;;N;;;;; +14208;EGYPTIAN HIEROGLYPH-14208;Lo;0;L;;;;;N;;;;; +14209;EGYPTIAN HIEROGLYPH-14209;Lo;0;L;;;;;N;;;;; +1420A;EGYPTIAN HIEROGLYPH-1420A;Lo;0;L;;;;;N;;;;; +1420B;EGYPTIAN HIEROGLYPH-1420B;Lo;0;L;;;;;N;;;;; +1420C;EGYPTIAN HIEROGLYPH-1420C;Lo;0;L;;;;;N;;;;; +1420D;EGYPTIAN HIEROGLYPH-1420D;Lo;0;L;;;;;N;;;;; +1420E;EGYPTIAN HIEROGLYPH-1420E;Lo;0;L;;;;;N;;;;; +1420F;EGYPTIAN HIEROGLYPH-1420F;Lo;0;L;;;;;N;;;;; +14210;EGYPTIAN HIEROGLYPH-14210;Lo;0;L;;;;;N;;;;; +14211;EGYPTIAN HIEROGLYPH-14211;Lo;0;L;;;;;N;;;;; +14212;EGYPTIAN HIEROGLYPH-14212;Lo;0;L;;;;;N;;;;; +14213;EGYPTIAN HIEROGLYPH-14213;Lo;0;L;;;;;N;;;;; +14214;EGYPTIAN HIEROGLYPH-14214;Lo;0;L;;;;;N;;;;; +14215;EGYPTIAN HIEROGLYPH-14215;Lo;0;L;;;;;N;;;;; +14216;EGYPTIAN HIEROGLYPH-14216;Lo;0;L;;;;;N;;;;; +14217;EGYPTIAN HIEROGLYPH-14217;Lo;0;L;;;;;N;;;;; +14218;EGYPTIAN HIEROGLYPH-14218;Lo;0;L;;;;;N;;;;; +14219;EGYPTIAN HIEROGLYPH-14219;Lo;0;L;;;;;N;;;;; +1421A;EGYPTIAN HIEROGLYPH-1421A;Lo;0;L;;;;;N;;;;; +1421B;EGYPTIAN HIEROGLYPH-1421B;Lo;0;L;;;;;N;;;;; +1421C;EGYPTIAN HIEROGLYPH-1421C;Lo;0;L;;;;;N;;;;; +1421D;EGYPTIAN HIEROGLYPH-1421D;Lo;0;L;;;;;N;;;;; +1421E;EGYPTIAN HIEROGLYPH-1421E;Lo;0;L;;;;;N;;;;; +1421F;EGYPTIAN HIEROGLYPH-1421F;Lo;0;L;;;;;N;;;;; +14220;EGYPTIAN HIEROGLYPH-14220;Lo;0;L;;;;;N;;;;; +14221;EGYPTIAN HIEROGLYPH-14221;Lo;0;L;;;;;N;;;;; +14222;EGYPTIAN HIEROGLYPH-14222;Lo;0;L;;;;;N;;;;; +14223;EGYPTIAN HIEROGLYPH-14223;Lo;0;L;;;;;N;;;;; +14224;EGYPTIAN HIEROGLYPH-14224;Lo;0;L;;;;;N;;;;; +14225;EGYPTIAN HIEROGLYPH-14225;Lo;0;L;;;;;N;;;;; +14226;EGYPTIAN HIEROGLYPH-14226;Lo;0;L;;;;;N;;;;; +14227;EGYPTIAN HIEROGLYPH-14227;Lo;0;L;;;;;N;;;;; +14228;EGYPTIAN HIEROGLYPH-14228;Lo;0;L;;;;;N;;;;; +14229;EGYPTIAN HIEROGLYPH-14229;Lo;0;L;;;;;N;;;;; +1422A;EGYPTIAN HIEROGLYPH-1422A;Lo;0;L;;;;;N;;;;; +1422B;EGYPTIAN HIEROGLYPH-1422B;Lo;0;L;;;;;N;;;;; +1422C;EGYPTIAN HIEROGLYPH-1422C;Lo;0;L;;;;;N;;;;; +1422D;EGYPTIAN HIEROGLYPH-1422D;Lo;0;L;;;;;N;;;;; +1422E;EGYPTIAN HIEROGLYPH-1422E;Lo;0;L;;;;;N;;;;; +1422F;EGYPTIAN HIEROGLYPH-1422F;Lo;0;L;;;;;N;;;;; +14230;EGYPTIAN HIEROGLYPH-14230;Lo;0;L;;;;;N;;;;; +14231;EGYPTIAN HIEROGLYPH-14231;Lo;0;L;;;;;N;;;;; +14232;EGYPTIAN HIEROGLYPH-14232;Lo;0;L;;;;;N;;;;; +14233;EGYPTIAN HIEROGLYPH-14233;Lo;0;L;;;;;N;;;;; +14234;EGYPTIAN HIEROGLYPH-14234;Lo;0;L;;;;;N;;;;; +14235;EGYPTIAN HIEROGLYPH-14235;Lo;0;L;;;;;N;;;;; +14236;EGYPTIAN HIEROGLYPH-14236;Lo;0;L;;;;;N;;;;; +14237;EGYPTIAN HIEROGLYPH-14237;Lo;0;L;;;;;N;;;;; +14238;EGYPTIAN HIEROGLYPH-14238;Lo;0;L;;;;;N;;;;; +14239;EGYPTIAN HIEROGLYPH-14239;Lo;0;L;;;;;N;;;;; +1423A;EGYPTIAN HIEROGLYPH-1423A;Lo;0;L;;;;;N;;;;; +1423B;EGYPTIAN HIEROGLYPH-1423B;Lo;0;L;;;;;N;;;;; +1423C;EGYPTIAN HIEROGLYPH-1423C;Lo;0;L;;;;;N;;;;; +1423D;EGYPTIAN HIEROGLYPH-1423D;Lo;0;L;;;;;N;;;;; +1423E;EGYPTIAN HIEROGLYPH-1423E;Lo;0;L;;;;;N;;;;; +1423F;EGYPTIAN HIEROGLYPH-1423F;Lo;0;L;;;;;N;;;;; +14240;EGYPTIAN HIEROGLYPH-14240;Lo;0;L;;;;;N;;;;; +14241;EGYPTIAN HIEROGLYPH-14241;Lo;0;L;;;;;N;;;;; +14242;EGYPTIAN HIEROGLYPH-14242;Lo;0;L;;;;;N;;;;; +14243;EGYPTIAN HIEROGLYPH-14243;Lo;0;L;;;;;N;;;;; +14244;EGYPTIAN HIEROGLYPH-14244;Lo;0;L;;;;;N;;;;; +14245;EGYPTIAN HIEROGLYPH-14245;Lo;0;L;;;;;N;;;;; +14246;EGYPTIAN HIEROGLYPH-14246;Lo;0;L;;;;;N;;;;; +14247;EGYPTIAN HIEROGLYPH-14247;Lo;0;L;;;;;N;;;;; +14248;EGYPTIAN HIEROGLYPH-14248;Lo;0;L;;;;;N;;;;; +14249;EGYPTIAN HIEROGLYPH-14249;Lo;0;L;;;;;N;;;;; +1424A;EGYPTIAN HIEROGLYPH-1424A;Lo;0;L;;;;;N;;;;; +1424B;EGYPTIAN HIEROGLYPH-1424B;Lo;0;L;;;;;N;;;;; +1424C;EGYPTIAN HIEROGLYPH-1424C;Lo;0;L;;;;;N;;;;; +1424D;EGYPTIAN HIEROGLYPH-1424D;Lo;0;L;;;;;N;;;;; +1424E;EGYPTIAN HIEROGLYPH-1424E;Lo;0;L;;;;;N;;;;; +1424F;EGYPTIAN HIEROGLYPH-1424F;Lo;0;L;;;;;N;;;;; +14250;EGYPTIAN HIEROGLYPH-14250;Lo;0;L;;;;;N;;;;; +14251;EGYPTIAN HIEROGLYPH-14251;Lo;0;L;;;;;N;;;;; +14252;EGYPTIAN HIEROGLYPH-14252;Lo;0;L;;;;;N;;;;; +14253;EGYPTIAN HIEROGLYPH-14253;Lo;0;L;;;;;N;;;;; +14254;EGYPTIAN HIEROGLYPH-14254;Lo;0;L;;;;;N;;;;; +14255;EGYPTIAN HIEROGLYPH-14255;Lo;0;L;;;;;N;;;;; +14256;EGYPTIAN HIEROGLYPH-14256;Lo;0;L;;;;;N;;;;; +14257;EGYPTIAN HIEROGLYPH-14257;Lo;0;L;;;;;N;;;;; +14258;EGYPTIAN HIEROGLYPH-14258;Lo;0;L;;;;;N;;;;; +14259;EGYPTIAN HIEROGLYPH-14259;Lo;0;L;;;;;N;;;;; +1425A;EGYPTIAN HIEROGLYPH-1425A;Lo;0;L;;;;;N;;;;; +1425B;EGYPTIAN HIEROGLYPH-1425B;Lo;0;L;;;;;N;;;;; +1425C;EGYPTIAN HIEROGLYPH-1425C;Lo;0;L;;;;;N;;;;; +1425D;EGYPTIAN HIEROGLYPH-1425D;Lo;0;L;;;;;N;;;;; +1425E;EGYPTIAN HIEROGLYPH-1425E;Lo;0;L;;;;;N;;;;; +1425F;EGYPTIAN HIEROGLYPH-1425F;Lo;0;L;;;;;N;;;;; +14260;EGYPTIAN HIEROGLYPH-14260;Lo;0;L;;;;;N;;;;; +14261;EGYPTIAN HIEROGLYPH-14261;Lo;0;L;;;;;N;;;;; +14262;EGYPTIAN HIEROGLYPH-14262;Lo;0;L;;;;;N;;;;; +14263;EGYPTIAN HIEROGLYPH-14263;Lo;0;L;;;;;N;;;;; +14264;EGYPTIAN HIEROGLYPH-14264;Lo;0;L;;;;;N;;;;; +14265;EGYPTIAN HIEROGLYPH-14265;Lo;0;L;;;;;N;;;;; +14266;EGYPTIAN HIEROGLYPH-14266;Lo;0;L;;;;;N;;;;; +14267;EGYPTIAN HIEROGLYPH-14267;Lo;0;L;;;;;N;;;;; +14268;EGYPTIAN HIEROGLYPH-14268;Lo;0;L;;;;;N;;;;; +14269;EGYPTIAN HIEROGLYPH-14269;Lo;0;L;;;;;N;;;;; +1426A;EGYPTIAN HIEROGLYPH-1426A;Lo;0;L;;;;;N;;;;; +1426B;EGYPTIAN HIEROGLYPH-1426B;Lo;0;L;;;;;N;;;;; +1426C;EGYPTIAN HIEROGLYPH-1426C;Lo;0;L;;;;;N;;;;; +1426D;EGYPTIAN HIEROGLYPH-1426D;Lo;0;L;;;;;N;;;;; +1426E;EGYPTIAN HIEROGLYPH-1426E;Lo;0;L;;;;;N;;;;; +1426F;EGYPTIAN HIEROGLYPH-1426F;Lo;0;L;;;;;N;;;;; +14270;EGYPTIAN HIEROGLYPH-14270;Lo;0;L;;;;;N;;;;; +14271;EGYPTIAN HIEROGLYPH-14271;Lo;0;L;;;;;N;;;;; +14272;EGYPTIAN HIEROGLYPH-14272;Lo;0;L;;;;;N;;;;; +14273;EGYPTIAN HIEROGLYPH-14273;Lo;0;L;;;;;N;;;;; +14274;EGYPTIAN HIEROGLYPH-14274;Lo;0;L;;;;;N;;;;; +14275;EGYPTIAN HIEROGLYPH-14275;Lo;0;L;;;;;N;;;;; +14276;EGYPTIAN HIEROGLYPH-14276;Lo;0;L;;;;;N;;;;; +14277;EGYPTIAN HIEROGLYPH-14277;Lo;0;L;;;;;N;;;;; +14278;EGYPTIAN HIEROGLYPH-14278;Lo;0;L;;;;;N;;;;; +14279;EGYPTIAN HIEROGLYPH-14279;Lo;0;L;;;;;N;;;;; +1427A;EGYPTIAN HIEROGLYPH-1427A;Lo;0;L;;;;;N;;;;; +1427B;EGYPTIAN HIEROGLYPH-1427B;Lo;0;L;;;;;N;;;;; +1427C;EGYPTIAN HIEROGLYPH-1427C;Lo;0;L;;;;;N;;;;; +1427D;EGYPTIAN HIEROGLYPH-1427D;Lo;0;L;;;;;N;;;;; +1427E;EGYPTIAN HIEROGLYPH-1427E;Lo;0;L;;;;;N;;;;; +1427F;EGYPTIAN HIEROGLYPH-1427F;Lo;0;L;;;;;N;;;;; +14280;EGYPTIAN HIEROGLYPH-14280;Lo;0;L;;;;;N;;;;; +14281;EGYPTIAN HIEROGLYPH-14281;Lo;0;L;;;;;N;;;;; +14282;EGYPTIAN HIEROGLYPH-14282;Lo;0;L;;;;;N;;;;; +14283;EGYPTIAN HIEROGLYPH-14283;Lo;0;L;;;;;N;;;;; +14284;EGYPTIAN HIEROGLYPH-14284;Lo;0;L;;;;;N;;;;; +14285;EGYPTIAN HIEROGLYPH-14285;Lo;0;L;;;;;N;;;;; +14286;EGYPTIAN HIEROGLYPH-14286;Lo;0;L;;;;;N;;;;; +14287;EGYPTIAN HIEROGLYPH-14287;Lo;0;L;;;;;N;;;;; +14288;EGYPTIAN HIEROGLYPH-14288;Lo;0;L;;;;;N;;;;; +14289;EGYPTIAN HIEROGLYPH-14289;Lo;0;L;;;;;N;;;;; +1428A;EGYPTIAN HIEROGLYPH-1428A;Lo;0;L;;;;;N;;;;; +1428B;EGYPTIAN HIEROGLYPH-1428B;Lo;0;L;;;;;N;;;;; +1428C;EGYPTIAN HIEROGLYPH-1428C;Lo;0;L;;;;;N;;;;; +1428D;EGYPTIAN HIEROGLYPH-1428D;Lo;0;L;;;;;N;;;;; +1428E;EGYPTIAN HIEROGLYPH-1428E;Lo;0;L;;;;;N;;;;; +1428F;EGYPTIAN HIEROGLYPH-1428F;Lo;0;L;;;;;N;;;;; +14290;EGYPTIAN HIEROGLYPH-14290;Lo;0;L;;;;;N;;;;; +14291;EGYPTIAN HIEROGLYPH-14291;Lo;0;L;;;;;N;;;;; +14292;EGYPTIAN HIEROGLYPH-14292;Lo;0;L;;;;;N;;;;; +14293;EGYPTIAN HIEROGLYPH-14293;Lo;0;L;;;;;N;;;;; +14294;EGYPTIAN HIEROGLYPH-14294;Lo;0;L;;;;;N;;;;; +14295;EGYPTIAN HIEROGLYPH-14295;Lo;0;L;;;;;N;;;;; +14296;EGYPTIAN HIEROGLYPH-14296;Lo;0;L;;;;;N;;;;; +14297;EGYPTIAN HIEROGLYPH-14297;Lo;0;L;;;;;N;;;;; +14298;EGYPTIAN HIEROGLYPH-14298;Lo;0;L;;;;;N;;;;; +14299;EGYPTIAN HIEROGLYPH-14299;Lo;0;L;;;;;N;;;;; +1429A;EGYPTIAN HIEROGLYPH-1429A;Lo;0;L;;;;;N;;;;; +1429B;EGYPTIAN HIEROGLYPH-1429B;Lo;0;L;;;;;N;;;;; +1429C;EGYPTIAN HIEROGLYPH-1429C;Lo;0;L;;;;;N;;;;; +1429D;EGYPTIAN HIEROGLYPH-1429D;Lo;0;L;;;;;N;;;;; +1429E;EGYPTIAN HIEROGLYPH-1429E;Lo;0;L;;;;;N;;;;; +1429F;EGYPTIAN HIEROGLYPH-1429F;Lo;0;L;;;;;N;;;;; +142A0;EGYPTIAN HIEROGLYPH-142A0;Lo;0;L;;;;;N;;;;; +142A1;EGYPTIAN HIEROGLYPH-142A1;Lo;0;L;;;;;N;;;;; +142A2;EGYPTIAN HIEROGLYPH-142A2;Lo;0;L;;;;;N;;;;; +142A3;EGYPTIAN HIEROGLYPH-142A3;Lo;0;L;;;;;N;;;;; +142A4;EGYPTIAN HIEROGLYPH-142A4;Lo;0;L;;;;;N;;;;; +142A5;EGYPTIAN HIEROGLYPH-142A5;Lo;0;L;;;;;N;;;;; +142A6;EGYPTIAN HIEROGLYPH-142A6;Lo;0;L;;;;;N;;;;; +142A7;EGYPTIAN HIEROGLYPH-142A7;Lo;0;L;;;;;N;;;;; +142A8;EGYPTIAN HIEROGLYPH-142A8;Lo;0;L;;;;;N;;;;; +142A9;EGYPTIAN HIEROGLYPH-142A9;Lo;0;L;;;;;N;;;;; +142AA;EGYPTIAN HIEROGLYPH-142AA;Lo;0;L;;;;;N;;;;; +142AB;EGYPTIAN HIEROGLYPH-142AB;Lo;0;L;;;;;N;;;;; +142AC;EGYPTIAN HIEROGLYPH-142AC;Lo;0;L;;;;;N;;;;; +142AD;EGYPTIAN HIEROGLYPH-142AD;Lo;0;L;;;;;N;;;;; +142AE;EGYPTIAN HIEROGLYPH-142AE;Lo;0;L;;;;;N;;;;; +142AF;EGYPTIAN HIEROGLYPH-142AF;Lo;0;L;;;;;N;;;;; +142B0;EGYPTIAN HIEROGLYPH-142B0;Lo;0;L;;;;;N;;;;; +142B1;EGYPTIAN HIEROGLYPH-142B1;Lo;0;L;;;;;N;;;;; +142B2;EGYPTIAN HIEROGLYPH-142B2;Lo;0;L;;;;;N;;;;; +142B3;EGYPTIAN HIEROGLYPH-142B3;Lo;0;L;;;;;N;;;;; +142B4;EGYPTIAN HIEROGLYPH-142B4;Lo;0;L;;;;;N;;;;; +142B5;EGYPTIAN HIEROGLYPH-142B5;Lo;0;L;;;;;N;;;;; +142B6;EGYPTIAN HIEROGLYPH-142B6;Lo;0;L;;;;;N;;;;; +142B7;EGYPTIAN HIEROGLYPH-142B7;Lo;0;L;;;;;N;;;;; +142B8;EGYPTIAN HIEROGLYPH-142B8;Lo;0;L;;;;;N;;;;; +142B9;EGYPTIAN HIEROGLYPH-142B9;Lo;0;L;;;;;N;;;;; +142BA;EGYPTIAN HIEROGLYPH-142BA;Lo;0;L;;;;;N;;;;; +142BB;EGYPTIAN HIEROGLYPH-142BB;Lo;0;L;;;;;N;;;;; +142BC;EGYPTIAN HIEROGLYPH-142BC;Lo;0;L;;;;;N;;;;; +142BD;EGYPTIAN HIEROGLYPH-142BD;Lo;0;L;;;;;N;;;;; +142BE;EGYPTIAN HIEROGLYPH-142BE;Lo;0;L;;;;;N;;;;; +142BF;EGYPTIAN HIEROGLYPH-142BF;Lo;0;L;;;;;N;;;;; +142C0;EGYPTIAN HIEROGLYPH-142C0;Lo;0;L;;;;;N;;;;; +142C1;EGYPTIAN HIEROGLYPH-142C1;Lo;0;L;;;;;N;;;;; +142C2;EGYPTIAN HIEROGLYPH-142C2;Lo;0;L;;;;;N;;;;; +142C3;EGYPTIAN HIEROGLYPH-142C3;Lo;0;L;;;;;N;;;;; +142C4;EGYPTIAN HIEROGLYPH-142C4;Lo;0;L;;;;;N;;;;; +142C5;EGYPTIAN HIEROGLYPH-142C5;Lo;0;L;;;;;N;;;;; +142C6;EGYPTIAN HIEROGLYPH-142C6;Lo;0;L;;;;;N;;;;; +142C7;EGYPTIAN HIEROGLYPH-142C7;Lo;0;L;;;;;N;;;;; +142C8;EGYPTIAN HIEROGLYPH-142C8;Lo;0;L;;;;;N;;;;; +142C9;EGYPTIAN HIEROGLYPH-142C9;Lo;0;L;;;;;N;;;;; +142CA;EGYPTIAN HIEROGLYPH-142CA;Lo;0;L;;;;;N;;;;; +142CB;EGYPTIAN HIEROGLYPH-142CB;Lo;0;L;;;;;N;;;;; +142CC;EGYPTIAN HIEROGLYPH-142CC;Lo;0;L;;;;;N;;;;; +142CD;EGYPTIAN HIEROGLYPH-142CD;Lo;0;L;;;;;N;;;;; +142CE;EGYPTIAN HIEROGLYPH-142CE;Lo;0;L;;;;;N;;;;; +142CF;EGYPTIAN HIEROGLYPH-142CF;Lo;0;L;;;;;N;;;;; +142D0;EGYPTIAN HIEROGLYPH-142D0;Lo;0;L;;;;;N;;;;; +142D1;EGYPTIAN HIEROGLYPH-142D1;Lo;0;L;;;;;N;;;;; +142D2;EGYPTIAN HIEROGLYPH-142D2;Lo;0;L;;;;;N;;;;; +142D3;EGYPTIAN HIEROGLYPH-142D3;Lo;0;L;;;;;N;;;;; +142D4;EGYPTIAN HIEROGLYPH-142D4;Lo;0;L;;;;;N;;;;; +142D5;EGYPTIAN HIEROGLYPH-142D5;Lo;0;L;;;;;N;;;;; +142D6;EGYPTIAN HIEROGLYPH-142D6;Lo;0;L;;;;;N;;;;; +142D7;EGYPTIAN HIEROGLYPH-142D7;Lo;0;L;;;;;N;;;;; +142D8;EGYPTIAN HIEROGLYPH-142D8;Lo;0;L;;;;;N;;;;; +142D9;EGYPTIAN HIEROGLYPH-142D9;Lo;0;L;;;;;N;;;;; +142DA;EGYPTIAN HIEROGLYPH-142DA;Lo;0;L;;;;;N;;;;; +142DB;EGYPTIAN HIEROGLYPH-142DB;Lo;0;L;;;;;N;;;;; +142DC;EGYPTIAN HIEROGLYPH-142DC;Lo;0;L;;;;;N;;;;; +142DD;EGYPTIAN HIEROGLYPH-142DD;Lo;0;L;;;;;N;;;;; +142DE;EGYPTIAN HIEROGLYPH-142DE;Lo;0;L;;;;;N;;;;; +142DF;EGYPTIAN HIEROGLYPH-142DF;Lo;0;L;;;;;N;;;;; +142E0;EGYPTIAN HIEROGLYPH-142E0;Lo;0;L;;;;;N;;;;; +142E1;EGYPTIAN HIEROGLYPH-142E1;Lo;0;L;;;;;N;;;;; +142E2;EGYPTIAN HIEROGLYPH-142E2;Lo;0;L;;;;;N;;;;; +142E3;EGYPTIAN HIEROGLYPH-142E3;Lo;0;L;;;;;N;;;;; +142E4;EGYPTIAN HIEROGLYPH-142E4;Lo;0;L;;;;;N;;;;; +142E5;EGYPTIAN HIEROGLYPH-142E5;Lo;0;L;;;;;N;;;;; +142E6;EGYPTIAN HIEROGLYPH-142E6;Lo;0;L;;;;;N;;;;; +142E7;EGYPTIAN HIEROGLYPH-142E7;Lo;0;L;;;;;N;;;;; +142E8;EGYPTIAN HIEROGLYPH-142E8;Lo;0;L;;;;;N;;;;; +142E9;EGYPTIAN HIEROGLYPH-142E9;Lo;0;L;;;;;N;;;;; +142EA;EGYPTIAN HIEROGLYPH-142EA;Lo;0;L;;;;;N;;;;; +142EB;EGYPTIAN HIEROGLYPH-142EB;Lo;0;L;;;;;N;;;;; +142EC;EGYPTIAN HIEROGLYPH-142EC;Lo;0;L;;;;;N;;;;; +142ED;EGYPTIAN HIEROGLYPH-142ED;Lo;0;L;;;;;N;;;;; +142EE;EGYPTIAN HIEROGLYPH-142EE;Lo;0;L;;;;;N;;;;; +142EF;EGYPTIAN HIEROGLYPH-142EF;Lo;0;L;;;;;N;;;;; +142F0;EGYPTIAN HIEROGLYPH-142F0;Lo;0;L;;;;;N;;;;; +142F1;EGYPTIAN HIEROGLYPH-142F1;Lo;0;L;;;;;N;;;;; +142F2;EGYPTIAN HIEROGLYPH-142F2;Lo;0;L;;;;;N;;;;; +142F3;EGYPTIAN HIEROGLYPH-142F3;Lo;0;L;;;;;N;;;;; +142F4;EGYPTIAN HIEROGLYPH-142F4;Lo;0;L;;;;;N;;;;; +142F5;EGYPTIAN HIEROGLYPH-142F5;Lo;0;L;;;;;N;;;;; +142F6;EGYPTIAN HIEROGLYPH-142F6;Lo;0;L;;;;;N;;;;; +142F7;EGYPTIAN HIEROGLYPH-142F7;Lo;0;L;;;;;N;;;;; +142F8;EGYPTIAN HIEROGLYPH-142F8;Lo;0;L;;;;;N;;;;; +142F9;EGYPTIAN HIEROGLYPH-142F9;Lo;0;L;;;;;N;;;;; +142FA;EGYPTIAN HIEROGLYPH-142FA;Lo;0;L;;;;;N;;;;; +142FB;EGYPTIAN HIEROGLYPH-142FB;Lo;0;L;;;;;N;;;;; +142FC;EGYPTIAN HIEROGLYPH-142FC;Lo;0;L;;;;;N;;;;; +142FD;EGYPTIAN HIEROGLYPH-142FD;Lo;0;L;;;;;N;;;;; +142FE;EGYPTIAN HIEROGLYPH-142FE;Lo;0;L;;;;;N;;;;; +142FF;EGYPTIAN HIEROGLYPH-142FF;Lo;0;L;;;;;N;;;;; +14300;EGYPTIAN HIEROGLYPH-14300;Lo;0;L;;;;;N;;;;; +14301;EGYPTIAN HIEROGLYPH-14301;Lo;0;L;;;;;N;;;;; +14302;EGYPTIAN HIEROGLYPH-14302;Lo;0;L;;;;;N;;;;; +14303;EGYPTIAN HIEROGLYPH-14303;Lo;0;L;;;;;N;;;;; +14304;EGYPTIAN HIEROGLYPH-14304;Lo;0;L;;;;;N;;;;; +14305;EGYPTIAN HIEROGLYPH-14305;Lo;0;L;;;;;N;;;;; +14306;EGYPTIAN HIEROGLYPH-14306;Lo;0;L;;;;;N;;;;; +14307;EGYPTIAN HIEROGLYPH-14307;Lo;0;L;;;;;N;;;;; +14308;EGYPTIAN HIEROGLYPH-14308;Lo;0;L;;;;;N;;;;; +14309;EGYPTIAN HIEROGLYPH-14309;Lo;0;L;;;;;N;;;;; +1430A;EGYPTIAN HIEROGLYPH-1430A;Lo;0;L;;;;;N;;;;; +1430B;EGYPTIAN HIEROGLYPH-1430B;Lo;0;L;;;;;N;;;;; +1430C;EGYPTIAN HIEROGLYPH-1430C;Lo;0;L;;;;;N;;;;; +1430D;EGYPTIAN HIEROGLYPH-1430D;Lo;0;L;;;;;N;;;;; +1430E;EGYPTIAN HIEROGLYPH-1430E;Lo;0;L;;;;;N;;;;; +1430F;EGYPTIAN HIEROGLYPH-1430F;Lo;0;L;;;;;N;;;;; +14310;EGYPTIAN HIEROGLYPH-14310;Lo;0;L;;;;;N;;;;; +14311;EGYPTIAN HIEROGLYPH-14311;Lo;0;L;;;;;N;;;;; +14312;EGYPTIAN HIEROGLYPH-14312;Lo;0;L;;;;;N;;;;; +14313;EGYPTIAN HIEROGLYPH-14313;Lo;0;L;;;;;N;;;;; +14314;EGYPTIAN HIEROGLYPH-14314;Lo;0;L;;;;;N;;;;; +14315;EGYPTIAN HIEROGLYPH-14315;Lo;0;L;;;;;N;;;;; +14316;EGYPTIAN HIEROGLYPH-14316;Lo;0;L;;;;;N;;;;; +14317;EGYPTIAN HIEROGLYPH-14317;Lo;0;L;;;;;N;;;;; +14318;EGYPTIAN HIEROGLYPH-14318;Lo;0;L;;;;;N;;;;; +14319;EGYPTIAN HIEROGLYPH-14319;Lo;0;L;;;;;N;;;;; +1431A;EGYPTIAN HIEROGLYPH-1431A;Lo;0;L;;;;;N;;;;; +1431B;EGYPTIAN HIEROGLYPH-1431B;Lo;0;L;;;;;N;;;;; +1431C;EGYPTIAN HIEROGLYPH-1431C;Lo;0;L;;;;;N;;;;; +1431D;EGYPTIAN HIEROGLYPH-1431D;Lo;0;L;;;;;N;;;;; +1431E;EGYPTIAN HIEROGLYPH-1431E;Lo;0;L;;;;;N;;;;; +1431F;EGYPTIAN HIEROGLYPH-1431F;Lo;0;L;;;;;N;;;;; +14320;EGYPTIAN HIEROGLYPH-14320;Lo;0;L;;;;;N;;;;; +14321;EGYPTIAN HIEROGLYPH-14321;Lo;0;L;;;;;N;;;;; +14322;EGYPTIAN HIEROGLYPH-14322;Lo;0;L;;;;;N;;;;; +14323;EGYPTIAN HIEROGLYPH-14323;Lo;0;L;;;;;N;;;;; +14324;EGYPTIAN HIEROGLYPH-14324;Lo;0;L;;;;;N;;;;; +14325;EGYPTIAN HIEROGLYPH-14325;Lo;0;L;;;;;N;;;;; +14326;EGYPTIAN HIEROGLYPH-14326;Lo;0;L;;;;;N;;;;; +14327;EGYPTIAN HIEROGLYPH-14327;Lo;0;L;;;;;N;;;;; +14328;EGYPTIAN HIEROGLYPH-14328;Lo;0;L;;;;;N;;;;; +14329;EGYPTIAN HIEROGLYPH-14329;Lo;0;L;;;;;N;;;;; +1432A;EGYPTIAN HIEROGLYPH-1432A;Lo;0;L;;;;;N;;;;; +1432B;EGYPTIAN HIEROGLYPH-1432B;Lo;0;L;;;;;N;;;;; +1432C;EGYPTIAN HIEROGLYPH-1432C;Lo;0;L;;;;;N;;;;; +1432D;EGYPTIAN HIEROGLYPH-1432D;Lo;0;L;;;;;N;;;;; +1432E;EGYPTIAN HIEROGLYPH-1432E;Lo;0;L;;;;;N;;;;; +1432F;EGYPTIAN HIEROGLYPH-1432F;Lo;0;L;;;;;N;;;;; +14330;EGYPTIAN HIEROGLYPH-14330;Lo;0;L;;;;;N;;;;; +14331;EGYPTIAN HIEROGLYPH-14331;Lo;0;L;;;;;N;;;;; +14332;EGYPTIAN HIEROGLYPH-14332;Lo;0;L;;;;;N;;;;; +14333;EGYPTIAN HIEROGLYPH-14333;Lo;0;L;;;;;N;;;;; +14334;EGYPTIAN HIEROGLYPH-14334;Lo;0;L;;;;;N;;;;; +14335;EGYPTIAN HIEROGLYPH-14335;Lo;0;L;;;;;N;;;;; +14336;EGYPTIAN HIEROGLYPH-14336;Lo;0;L;;;;;N;;;;; +14337;EGYPTIAN HIEROGLYPH-14337;Lo;0;L;;;;;N;;;;; +14338;EGYPTIAN HIEROGLYPH-14338;Lo;0;L;;;;;N;;;;; +14339;EGYPTIAN HIEROGLYPH-14339;Lo;0;L;;;;;N;;;;; +1433A;EGYPTIAN HIEROGLYPH-1433A;Lo;0;L;;;;;N;;;;; +1433B;EGYPTIAN HIEROGLYPH-1433B;Lo;0;L;;;;;N;;;;; +1433C;EGYPTIAN HIEROGLYPH-1433C;Lo;0;L;;;;;N;;;;; +1433D;EGYPTIAN HIEROGLYPH-1433D;Lo;0;L;;;;;N;;;;; +1433E;EGYPTIAN HIEROGLYPH-1433E;Lo;0;L;;;;;N;;;;; +1433F;EGYPTIAN HIEROGLYPH-1433F;Lo;0;L;;;;;N;;;;; +14340;EGYPTIAN HIEROGLYPH-14340;Lo;0;L;;;;;N;;;;; +14341;EGYPTIAN HIEROGLYPH-14341;Lo;0;L;;;;;N;;;;; +14342;EGYPTIAN HIEROGLYPH-14342;Lo;0;L;;;;;N;;;;; +14343;EGYPTIAN HIEROGLYPH-14343;Lo;0;L;;;;;N;;;;; +14344;EGYPTIAN HIEROGLYPH-14344;Lo;0;L;;;;;N;;;;; +14345;EGYPTIAN HIEROGLYPH-14345;Lo;0;L;;;;;N;;;;; +14346;EGYPTIAN HIEROGLYPH-14346;Lo;0;L;;;;;N;;;;; +14347;EGYPTIAN HIEROGLYPH-14347;Lo;0;L;;;;;N;;;;; +14348;EGYPTIAN HIEROGLYPH-14348;Lo;0;L;;;;;N;;;;; +14349;EGYPTIAN HIEROGLYPH-14349;Lo;0;L;;;;;N;;;;; +1434A;EGYPTIAN HIEROGLYPH-1434A;Lo;0;L;;;;;N;;;;; +1434B;EGYPTIAN HIEROGLYPH-1434B;Lo;0;L;;;;;N;;;;; +1434C;EGYPTIAN HIEROGLYPH-1434C;Lo;0;L;;;;;N;;;;; +1434D;EGYPTIAN HIEROGLYPH-1434D;Lo;0;L;;;;;N;;;;; +1434E;EGYPTIAN HIEROGLYPH-1434E;Lo;0;L;;;;;N;;;;; +1434F;EGYPTIAN HIEROGLYPH-1434F;Lo;0;L;;;;;N;;;;; +14350;EGYPTIAN HIEROGLYPH-14350;Lo;0;L;;;;;N;;;;; +14351;EGYPTIAN HIEROGLYPH-14351;Lo;0;L;;;;;N;;;;; +14352;EGYPTIAN HIEROGLYPH-14352;Lo;0;L;;;;;N;;;;; +14353;EGYPTIAN HIEROGLYPH-14353;Lo;0;L;;;;;N;;;;; +14354;EGYPTIAN HIEROGLYPH-14354;Lo;0;L;;;;;N;;;;; +14355;EGYPTIAN HIEROGLYPH-14355;Lo;0;L;;;;;N;;;;; +14356;EGYPTIAN HIEROGLYPH-14356;Lo;0;L;;;;;N;;;;; +14357;EGYPTIAN HIEROGLYPH-14357;Lo;0;L;;;;;N;;;;; +14358;EGYPTIAN HIEROGLYPH-14358;Lo;0;L;;;;;N;;;;; +14359;EGYPTIAN HIEROGLYPH-14359;Lo;0;L;;;;;N;;;;; +1435A;EGYPTIAN HIEROGLYPH-1435A;Lo;0;L;;;;;N;;;;; +1435B;EGYPTIAN HIEROGLYPH-1435B;Lo;0;L;;;;;N;;;;; +1435C;EGYPTIAN HIEROGLYPH-1435C;Lo;0;L;;;;;N;;;;; +1435D;EGYPTIAN HIEROGLYPH-1435D;Lo;0;L;;;;;N;;;;; +1435E;EGYPTIAN HIEROGLYPH-1435E;Lo;0;L;;;;;N;;;;; +1435F;EGYPTIAN HIEROGLYPH-1435F;Lo;0;L;;;;;N;;;;; +14360;EGYPTIAN HIEROGLYPH-14360;Lo;0;L;;;;;N;;;;; +14361;EGYPTIAN HIEROGLYPH-14361;Lo;0;L;;;;;N;;;;; +14362;EGYPTIAN HIEROGLYPH-14362;Lo;0;L;;;;;N;;;;; +14363;EGYPTIAN HIEROGLYPH-14363;Lo;0;L;;;;;N;;;;; +14364;EGYPTIAN HIEROGLYPH-14364;Lo;0;L;;;;;N;;;;; +14365;EGYPTIAN HIEROGLYPH-14365;Lo;0;L;;;;;N;;;;; +14366;EGYPTIAN HIEROGLYPH-14366;Lo;0;L;;;;;N;;;;; +14367;EGYPTIAN HIEROGLYPH-14367;Lo;0;L;;;;;N;;;;; +14368;EGYPTIAN HIEROGLYPH-14368;Lo;0;L;;;;;N;;;;; +14369;EGYPTIAN HIEROGLYPH-14369;Lo;0;L;;;;;N;;;;; +1436A;EGYPTIAN HIEROGLYPH-1436A;Lo;0;L;;;;;N;;;;; +1436B;EGYPTIAN HIEROGLYPH-1436B;Lo;0;L;;;;;N;;;;; +1436C;EGYPTIAN HIEROGLYPH-1436C;Lo;0;L;;;;;N;;;;; +1436D;EGYPTIAN HIEROGLYPH-1436D;Lo;0;L;;;;;N;;;;; +1436E;EGYPTIAN HIEROGLYPH-1436E;Lo;0;L;;;;;N;;;;; +1436F;EGYPTIAN HIEROGLYPH-1436F;Lo;0;L;;;;;N;;;;; +14370;EGYPTIAN HIEROGLYPH-14370;Lo;0;L;;;;;N;;;;; +14371;EGYPTIAN HIEROGLYPH-14371;Lo;0;L;;;;;N;;;;; +14372;EGYPTIAN HIEROGLYPH-14372;Lo;0;L;;;;;N;;;;; +14373;EGYPTIAN HIEROGLYPH-14373;Lo;0;L;;;;;N;;;;; +14374;EGYPTIAN HIEROGLYPH-14374;Lo;0;L;;;;;N;;;;; +14375;EGYPTIAN HIEROGLYPH-14375;Lo;0;L;;;;;N;;;;; +14376;EGYPTIAN HIEROGLYPH-14376;Lo;0;L;;;;;N;;;;; +14377;EGYPTIAN HIEROGLYPH-14377;Lo;0;L;;;;;N;;;;; +14378;EGYPTIAN HIEROGLYPH-14378;Lo;0;L;;;;;N;;;;; +14379;EGYPTIAN HIEROGLYPH-14379;Lo;0;L;;;;;N;;;;; +1437A;EGYPTIAN HIEROGLYPH-1437A;Lo;0;L;;;;;N;;;;; +1437B;EGYPTIAN HIEROGLYPH-1437B;Lo;0;L;;;;;N;;;;; +1437C;EGYPTIAN HIEROGLYPH-1437C;Lo;0;L;;;;;N;;;;; +1437D;EGYPTIAN HIEROGLYPH-1437D;Lo;0;L;;;;;N;;;;; +1437E;EGYPTIAN HIEROGLYPH-1437E;Lo;0;L;;;;;N;;;;; +1437F;EGYPTIAN HIEROGLYPH-1437F;Lo;0;L;;;;;N;;;;; +14380;EGYPTIAN HIEROGLYPH-14380;Lo;0;L;;;;;N;;;;; +14381;EGYPTIAN HIEROGLYPH-14381;Lo;0;L;;;;;N;;;;; +14382;EGYPTIAN HIEROGLYPH-14382;Lo;0;L;;;;;N;;;;; +14383;EGYPTIAN HIEROGLYPH-14383;Lo;0;L;;;;;N;;;;; +14384;EGYPTIAN HIEROGLYPH-14384;Lo;0;L;;;;;N;;;;; +14385;EGYPTIAN HIEROGLYPH-14385;Lo;0;L;;;;;N;;;;; +14386;EGYPTIAN HIEROGLYPH-14386;Lo;0;L;;;;;N;;;;; +14387;EGYPTIAN HIEROGLYPH-14387;Lo;0;L;;;;;N;;;;; +14388;EGYPTIAN HIEROGLYPH-14388;Lo;0;L;;;;;N;;;;; +14389;EGYPTIAN HIEROGLYPH-14389;Lo;0;L;;;;;N;;;;; +1438A;EGYPTIAN HIEROGLYPH-1438A;Lo;0;L;;;;;N;;;;; +1438B;EGYPTIAN HIEROGLYPH-1438B;Lo;0;L;;;;;N;;;;; +1438C;EGYPTIAN HIEROGLYPH-1438C;Lo;0;L;;;;;N;;;;; +1438D;EGYPTIAN HIEROGLYPH-1438D;Lo;0;L;;;;;N;;;;; +1438E;EGYPTIAN HIEROGLYPH-1438E;Lo;0;L;;;;;N;;;;; +1438F;EGYPTIAN HIEROGLYPH-1438F;Lo;0;L;;;;;N;;;;; +14390;EGYPTIAN HIEROGLYPH-14390;Lo;0;L;;;;;N;;;;; +14391;EGYPTIAN HIEROGLYPH-14391;Lo;0;L;;;;;N;;;;; +14392;EGYPTIAN HIEROGLYPH-14392;Lo;0;L;;;;;N;;;;; +14393;EGYPTIAN HIEROGLYPH-14393;Lo;0;L;;;;;N;;;;; +14394;EGYPTIAN HIEROGLYPH-14394;Lo;0;L;;;;;N;;;;; +14395;EGYPTIAN HIEROGLYPH-14395;Lo;0;L;;;;;N;;;;; +14396;EGYPTIAN HIEROGLYPH-14396;Lo;0;L;;;;;N;;;;; +14397;EGYPTIAN HIEROGLYPH-14397;Lo;0;L;;;;;N;;;;; +14398;EGYPTIAN HIEROGLYPH-14398;Lo;0;L;;;;;N;;;;; +14399;EGYPTIAN HIEROGLYPH-14399;Lo;0;L;;;;;N;;;;; +1439A;EGYPTIAN HIEROGLYPH-1439A;Lo;0;L;;;;;N;;;;; +1439B;EGYPTIAN HIEROGLYPH-1439B;Lo;0;L;;;;;N;;;;; +1439C;EGYPTIAN HIEROGLYPH-1439C;Lo;0;L;;;;;N;;;;; +1439D;EGYPTIAN HIEROGLYPH-1439D;Lo;0;L;;;;;N;;;;; +1439E;EGYPTIAN HIEROGLYPH-1439E;Lo;0;L;;;;;N;;;;; +1439F;EGYPTIAN HIEROGLYPH-1439F;Lo;0;L;;;;;N;;;;; +143A0;EGYPTIAN HIEROGLYPH-143A0;Lo;0;L;;;;;N;;;;; +143A1;EGYPTIAN HIEROGLYPH-143A1;Lo;0;L;;;;;N;;;;; +143A2;EGYPTIAN HIEROGLYPH-143A2;Lo;0;L;;;;;N;;;;; +143A3;EGYPTIAN HIEROGLYPH-143A3;Lo;0;L;;;;;N;;;;; +143A4;EGYPTIAN HIEROGLYPH-143A4;Lo;0;L;;;;;N;;;;; +143A5;EGYPTIAN HIEROGLYPH-143A5;Lo;0;L;;;;;N;;;;; +143A6;EGYPTIAN HIEROGLYPH-143A6;Lo;0;L;;;;;N;;;;; +143A7;EGYPTIAN HIEROGLYPH-143A7;Lo;0;L;;;;;N;;;;; +143A8;EGYPTIAN HIEROGLYPH-143A8;Lo;0;L;;;;;N;;;;; +143A9;EGYPTIAN HIEROGLYPH-143A9;Lo;0;L;;;;;N;;;;; +143AA;EGYPTIAN HIEROGLYPH-143AA;Lo;0;L;;;;;N;;;;; +143AB;EGYPTIAN HIEROGLYPH-143AB;Lo;0;L;;;;;N;;;;; +143AC;EGYPTIAN HIEROGLYPH-143AC;Lo;0;L;;;;;N;;;;; +143AD;EGYPTIAN HIEROGLYPH-143AD;Lo;0;L;;;;;N;;;;; +143AE;EGYPTIAN HIEROGLYPH-143AE;Lo;0;L;;;;;N;;;;; +143AF;EGYPTIAN HIEROGLYPH-143AF;Lo;0;L;;;;;N;;;;; +143B0;EGYPTIAN HIEROGLYPH-143B0;Lo;0;L;;;;;N;;;;; +143B1;EGYPTIAN HIEROGLYPH-143B1;Lo;0;L;;;;;N;;;;; +143B2;EGYPTIAN HIEROGLYPH-143B2;Lo;0;L;;;;;N;;;;; +143B3;EGYPTIAN HIEROGLYPH-143B3;Lo;0;L;;;;;N;;;;; +143B4;EGYPTIAN HIEROGLYPH-143B4;Lo;0;L;;;;;N;;;;; +143B5;EGYPTIAN HIEROGLYPH-143B5;Lo;0;L;;;;;N;;;;; +143B6;EGYPTIAN HIEROGLYPH-143B6;Lo;0;L;;;;;N;;;;; +143B7;EGYPTIAN HIEROGLYPH-143B7;Lo;0;L;;;;;N;;;;; +143B8;EGYPTIAN HIEROGLYPH-143B8;Lo;0;L;;;;;N;;;;; +143B9;EGYPTIAN HIEROGLYPH-143B9;Lo;0;L;;;;;N;;;;; +143BA;EGYPTIAN HIEROGLYPH-143BA;Lo;0;L;;;;;N;;;;; +143BB;EGYPTIAN HIEROGLYPH-143BB;Lo;0;L;;;;;N;;;;; +143BC;EGYPTIAN HIEROGLYPH-143BC;Lo;0;L;;;;;N;;;;; +143BD;EGYPTIAN HIEROGLYPH-143BD;Lo;0;L;;;;;N;;;;; +143BE;EGYPTIAN HIEROGLYPH-143BE;Lo;0;L;;;;;N;;;;; +143BF;EGYPTIAN HIEROGLYPH-143BF;Lo;0;L;;;;;N;;;;; +143C0;EGYPTIAN HIEROGLYPH-143C0;Lo;0;L;;;;;N;;;;; +143C1;EGYPTIAN HIEROGLYPH-143C1;Lo;0;L;;;;;N;;;;; +143C2;EGYPTIAN HIEROGLYPH-143C2;Lo;0;L;;;;;N;;;;; +143C3;EGYPTIAN HIEROGLYPH-143C3;Lo;0;L;;;;;N;;;;; +143C4;EGYPTIAN HIEROGLYPH-143C4;Lo;0;L;;;;;N;;;;; +143C5;EGYPTIAN HIEROGLYPH-143C5;Lo;0;L;;;;;N;;;;; +143C6;EGYPTIAN HIEROGLYPH-143C6;Lo;0;L;;;;;N;;;;; +143C7;EGYPTIAN HIEROGLYPH-143C7;Lo;0;L;;;;;N;;;;; +143C8;EGYPTIAN HIEROGLYPH-143C8;Lo;0;L;;;;;N;;;;; +143C9;EGYPTIAN HIEROGLYPH-143C9;Lo;0;L;;;;;N;;;;; +143CA;EGYPTIAN HIEROGLYPH-143CA;Lo;0;L;;;;;N;;;;; +143CB;EGYPTIAN HIEROGLYPH-143CB;Lo;0;L;;;;;N;;;;; +143CC;EGYPTIAN HIEROGLYPH-143CC;Lo;0;L;;;;;N;;;;; +143CD;EGYPTIAN HIEROGLYPH-143CD;Lo;0;L;;;;;N;;;;; +143CE;EGYPTIAN HIEROGLYPH-143CE;Lo;0;L;;;;;N;;;;; +143CF;EGYPTIAN HIEROGLYPH-143CF;Lo;0;L;;;;;N;;;;; +143D0;EGYPTIAN HIEROGLYPH-143D0;Lo;0;L;;;;;N;;;;; +143D1;EGYPTIAN HIEROGLYPH-143D1;Lo;0;L;;;;;N;;;;; +143D2;EGYPTIAN HIEROGLYPH-143D2;Lo;0;L;;;;;N;;;;; +143D3;EGYPTIAN HIEROGLYPH-143D3;Lo;0;L;;;;;N;;;;; +143D4;EGYPTIAN HIEROGLYPH-143D4;Lo;0;L;;;;;N;;;;; +143D5;EGYPTIAN HIEROGLYPH-143D5;Lo;0;L;;;;;N;;;;; +143D6;EGYPTIAN HIEROGLYPH-143D6;Lo;0;L;;;;;N;;;;; +143D7;EGYPTIAN HIEROGLYPH-143D7;Lo;0;L;;;;;N;;;;; +143D8;EGYPTIAN HIEROGLYPH-143D8;Lo;0;L;;;;;N;;;;; +143D9;EGYPTIAN HIEROGLYPH-143D9;Lo;0;L;;;;;N;;;;; +143DA;EGYPTIAN HIEROGLYPH-143DA;Lo;0;L;;;;;N;;;;; +143DB;EGYPTIAN HIEROGLYPH-143DB;Lo;0;L;;;;;N;;;;; +143DC;EGYPTIAN HIEROGLYPH-143DC;Lo;0;L;;;;;N;;;;; +143DD;EGYPTIAN HIEROGLYPH-143DD;Lo;0;L;;;;;N;;;;; +143DE;EGYPTIAN HIEROGLYPH-143DE;Lo;0;L;;;;;N;;;;; +143DF;EGYPTIAN HIEROGLYPH-143DF;Lo;0;L;;;;;N;;;;; +143E0;EGYPTIAN HIEROGLYPH-143E0;Lo;0;L;;;;;N;;;;; +143E1;EGYPTIAN HIEROGLYPH-143E1;Lo;0;L;;;;;N;;;;; +143E2;EGYPTIAN HIEROGLYPH-143E2;Lo;0;L;;;;;N;;;;; +143E3;EGYPTIAN HIEROGLYPH-143E3;Lo;0;L;;;;;N;;;;; +143E4;EGYPTIAN HIEROGLYPH-143E4;Lo;0;L;;;;;N;;;;; +143E5;EGYPTIAN HIEROGLYPH-143E5;Lo;0;L;;;;;N;;;;; +143E6;EGYPTIAN HIEROGLYPH-143E6;Lo;0;L;;;;;N;;;;; +143E7;EGYPTIAN HIEROGLYPH-143E7;Lo;0;L;;;;;N;;;;; +143E8;EGYPTIAN HIEROGLYPH-143E8;Lo;0;L;;;;;N;;;;; +143E9;EGYPTIAN HIEROGLYPH-143E9;Lo;0;L;;;;;N;;;;; +143EA;EGYPTIAN HIEROGLYPH-143EA;Lo;0;L;;;;;N;;;;; +143EB;EGYPTIAN HIEROGLYPH-143EB;Lo;0;L;;;;;N;;;;; +143EC;EGYPTIAN HIEROGLYPH-143EC;Lo;0;L;;;;;N;;;;; +143ED;EGYPTIAN HIEROGLYPH-143ED;Lo;0;L;;;;;N;;;;; +143EE;EGYPTIAN HIEROGLYPH-143EE;Lo;0;L;;;;;N;;;;; +143EF;EGYPTIAN HIEROGLYPH-143EF;Lo;0;L;;;;;N;;;;; +143F0;EGYPTIAN HIEROGLYPH-143F0;Lo;0;L;;;;;N;;;;; +143F1;EGYPTIAN HIEROGLYPH-143F1;Lo;0;L;;;;;N;;;;; +143F2;EGYPTIAN HIEROGLYPH-143F2;Lo;0;L;;;;;N;;;;; +143F3;EGYPTIAN HIEROGLYPH-143F3;Lo;0;L;;;;;N;;;;; +143F4;EGYPTIAN HIEROGLYPH-143F4;Lo;0;L;;;;;N;;;;; +143F5;EGYPTIAN HIEROGLYPH-143F5;Lo;0;L;;;;;N;;;;; +143F6;EGYPTIAN HIEROGLYPH-143F6;Lo;0;L;;;;;N;;;;; +143F7;EGYPTIAN HIEROGLYPH-143F7;Lo;0;L;;;;;N;;;;; +143F8;EGYPTIAN HIEROGLYPH-143F8;Lo;0;L;;;;;N;;;;; +143F9;EGYPTIAN HIEROGLYPH-143F9;Lo;0;L;;;;;N;;;;; +143FA;EGYPTIAN HIEROGLYPH-143FA;Lo;0;L;;;;;N;;;;; 14400;ANATOLIAN HIEROGLYPH A001;Lo;0;L;;;;;N;;;;; 14401;ANATOLIAN HIEROGLYPH A002;Lo;0;L;;;;;N;;;;; 14402;ANATOLIAN HIEROGLYPH A003;Lo;0;L;;;;;N;;;;; @@ -24771,6 +29053,64 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 14644;ANATOLIAN HIEROGLYPH A528;Lo;0;L;;;;;N;;;;; 14645;ANATOLIAN HIEROGLYPH A529;Lo;0;L;;;;;N;;;;; 14646;ANATOLIAN HIEROGLYPH A530;Lo;0;L;;;;;N;;;;; +16100;GURUNG KHEMA LETTER A;Lo;0;L;;;;;N;;;;; +16101;GURUNG KHEMA LETTER KA;Lo;0;L;;;;;N;;;;; +16102;GURUNG KHEMA LETTER KHA;Lo;0;L;;;;;N;;;;; +16103;GURUNG KHEMA LETTER GA;Lo;0;L;;;;;N;;;;; +16104;GURUNG KHEMA LETTER GHA;Lo;0;L;;;;;N;;;;; +16105;GURUNG KHEMA LETTER NGA;Lo;0;L;;;;;N;;;;; +16106;GURUNG KHEMA LETTER CA;Lo;0;L;;;;;N;;;;; +16107;GURUNG KHEMA LETTER CHA;Lo;0;L;;;;;N;;;;; +16108;GURUNG KHEMA LETTER JA;Lo;0;L;;;;;N;;;;; +16109;GURUNG KHEMA LETTER JHA;Lo;0;L;;;;;N;;;;; +1610A;GURUNG KHEMA LETTER HA;Lo;0;L;;;;;N;;;;; +1610B;GURUNG KHEMA LETTER TTA;Lo;0;L;;;;;N;;;;; +1610C;GURUNG KHEMA LETTER TTHA;Lo;0;L;;;;;N;;;;; +1610D;GURUNG KHEMA LETTER DDA;Lo;0;L;;;;;N;;;;; +1610E;GURUNG KHEMA LETTER DDHA;Lo;0;L;;;;;N;;;;; +1610F;GURUNG KHEMA LETTER VA;Lo;0;L;;;;;N;;;;; +16110;GURUNG KHEMA LETTER TA;Lo;0;L;;;;;N;;;;; +16111;GURUNG KHEMA LETTER THA;Lo;0;L;;;;;N;;;;; +16112;GURUNG KHEMA LETTER DA;Lo;0;L;;;;;N;;;;; +16113;GURUNG KHEMA LETTER DHA;Lo;0;L;;;;;N;;;;; +16114;GURUNG KHEMA LETTER NA;Lo;0;L;;;;;N;;;;; +16115;GURUNG KHEMA LETTER PA;Lo;0;L;;;;;N;;;;; +16116;GURUNG KHEMA LETTER PHA;Lo;0;L;;;;;N;;;;; +16117;GURUNG KHEMA LETTER BA;Lo;0;L;;;;;N;;;;; +16118;GURUNG KHEMA LETTER BHA;Lo;0;L;;;;;N;;;;; +16119;GURUNG KHEMA LETTER MA;Lo;0;L;;;;;N;;;;; +1611A;GURUNG KHEMA LETTER YA;Lo;0;L;;;;;N;;;;; +1611B;GURUNG KHEMA LETTER RA;Lo;0;L;;;;;N;;;;; +1611C;GURUNG KHEMA LETTER LA;Lo;0;L;;;;;N;;;;; +1611D;GURUNG KHEMA LETTER SA;Lo;0;L;;;;;N;;;;; +1611E;GURUNG KHEMA VOWEL SIGN AA;Mn;0;NSM;;;;;N;;;;; +1611F;GURUNG KHEMA VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;; +16120;GURUNG KHEMA VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;; +16121;GURUNG KHEMA VOWEL SIGN U;Mn;0;NSM;1611E 1611E;;;;N;;;;; +16122;GURUNG KHEMA VOWEL SIGN UU;Mn;0;NSM;1611E 16129;;;;N;;;;; +16123;GURUNG KHEMA VOWEL SIGN E;Mn;0;NSM;1611E 1611F;;;;N;;;;; +16124;GURUNG KHEMA VOWEL SIGN EE;Mn;0;NSM;16129 1611F;;;;N;;;;; +16125;GURUNG KHEMA VOWEL SIGN AI;Mn;0;NSM;1611E 16120;;;;N;;;;; +16126;GURUNG KHEMA VOWEL SIGN O;Mn;0;NSM;16121 1611F;;;;N;;;;; +16127;GURUNG KHEMA VOWEL SIGN OO;Mn;0;NSM;16122 1611F;;;;N;;;;; +16128;GURUNG KHEMA VOWEL SIGN AU;Mn;0;NSM;16121 16120;;;;N;;;;; +16129;GURUNG KHEMA VOWEL LENGTH MARK;Mn;0;NSM;;;;;N;;;;; +1612A;GURUNG KHEMA CONSONANT SIGN MEDIAL YA;Mc;0;L;;;;;N;;;;; +1612B;GURUNG KHEMA CONSONANT SIGN MEDIAL VA;Mc;0;L;;;;;N;;;;; +1612C;GURUNG KHEMA CONSONANT SIGN MEDIAL HA;Mc;0;L;;;;;N;;;;; +1612D;GURUNG KHEMA SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;; +1612E;GURUNG KHEMA CONSONANT SIGN MEDIAL RA;Mn;0;NSM;;;;;N;;;;; +1612F;GURUNG KHEMA SIGN THOLHOMA;Mn;9;NSM;;;;;N;;;;; +16130;GURUNG KHEMA DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +16131;GURUNG KHEMA DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +16132;GURUNG KHEMA DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +16133;GURUNG KHEMA DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +16134;GURUNG KHEMA DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +16135;GURUNG KHEMA DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +16136;GURUNG KHEMA DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +16137;GURUNG KHEMA DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +16138;GURUNG KHEMA DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +16139;GURUNG KHEMA DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; 16800;BAMUM LETTER PHASE-A NGKUE MFON;Lo;0;L;;;;;N;;;;; 16801;BAMUM LETTER PHASE-A GBIEE FON;Lo;0;L;;;;;N;;;;; 16802;BAMUM LETTER PHASE-A PON MFON PIPAEMGBIEE;Lo;0;L;;;;;N;;;;; @@ -25635,6 +29975,64 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 16B8D;PAHAWH HMONG CLAN SIGN TSWB;Lo;0;L;;;;;N;;;;; 16B8E;PAHAWH HMONG CLAN SIGN KWM;Lo;0;L;;;;;N;;;;; 16B8F;PAHAWH HMONG CLAN SIGN VWJ;Lo;0;L;;;;;N;;;;; +16D40;KIRAT RAI SIGN ANUSVARA;Lm;0;L;;;;;N;;;;; +16D41;KIRAT RAI SIGN TONPI;Lm;0;L;;;;;N;;;;; +16D42;KIRAT RAI SIGN VISARGA;Lm;0;L;;;;;N;;;;; +16D43;KIRAT RAI LETTER A;Lo;0;L;;;;;N;;;;; +16D44;KIRAT RAI LETTER KA;Lo;0;L;;;;;N;;;;; +16D45;KIRAT RAI LETTER KHA;Lo;0;L;;;;;N;;;;; +16D46;KIRAT RAI LETTER GA;Lo;0;L;;;;;N;;;;; +16D47;KIRAT RAI LETTER GHA;Lo;0;L;;;;;N;;;;; +16D48;KIRAT RAI LETTER NGA;Lo;0;L;;;;;N;;;;; +16D49;KIRAT RAI LETTER CA;Lo;0;L;;;;;N;;;;; +16D4A;KIRAT RAI LETTER CHA;Lo;0;L;;;;;N;;;;; +16D4B;KIRAT RAI LETTER JA;Lo;0;L;;;;;N;;;;; +16D4C;KIRAT RAI LETTER JHA;Lo;0;L;;;;;N;;;;; +16D4D;KIRAT RAI LETTER NYA;Lo;0;L;;;;;N;;;;; +16D4E;KIRAT RAI LETTER TTA;Lo;0;L;;;;;N;;;;; +16D4F;KIRAT RAI LETTER TTHA;Lo;0;L;;;;;N;;;;; +16D50;KIRAT RAI LETTER DDA;Lo;0;L;;;;;N;;;;; +16D51;KIRAT RAI LETTER DDHA;Lo;0;L;;;;;N;;;;; +16D52;KIRAT RAI LETTER TA;Lo;0;L;;;;;N;;;;; +16D53;KIRAT RAI LETTER THA;Lo;0;L;;;;;N;;;;; +16D54;KIRAT RAI LETTER DA;Lo;0;L;;;;;N;;;;; +16D55;KIRAT RAI LETTER DHA;Lo;0;L;;;;;N;;;;; +16D56;KIRAT RAI LETTER NA;Lo;0;L;;;;;N;;;;; +16D57;KIRAT RAI LETTER PA;Lo;0;L;;;;;N;;;;; +16D58;KIRAT RAI LETTER PHA;Lo;0;L;;;;;N;;;;; +16D59;KIRAT RAI LETTER BA;Lo;0;L;;;;;N;;;;; +16D5A;KIRAT RAI LETTER BHA;Lo;0;L;;;;;N;;;;; +16D5B;KIRAT RAI LETTER MA;Lo;0;L;;;;;N;;;;; +16D5C;KIRAT RAI LETTER YA;Lo;0;L;;;;;N;;;;; +16D5D;KIRAT RAI LETTER RA;Lo;0;L;;;;;N;;;;; +16D5E;KIRAT RAI LETTER LA;Lo;0;L;;;;;N;;;;; +16D5F;KIRAT RAI LETTER VA;Lo;0;L;;;;;N;;;;; +16D60;KIRAT RAI LETTER SA;Lo;0;L;;;;;N;;;;; +16D61;KIRAT RAI LETTER SHA;Lo;0;L;;;;;N;;;;; +16D62;KIRAT RAI LETTER HA;Lo;0;L;;;;;N;;;;; +16D63;KIRAT RAI VOWEL SIGN AA;Lo;0;L;;;;;N;;;;; +16D64;KIRAT RAI VOWEL SIGN I;Lo;0;L;;;;;N;;;;; +16D65;KIRAT RAI VOWEL SIGN U;Lo;0;L;;;;;N;;;;; +16D66;KIRAT RAI VOWEL SIGN UE;Lo;0;L;;;;;N;;;;; +16D67;KIRAT RAI VOWEL SIGN E;Lo;0;L;;;;;N;;;;; +16D68;KIRAT RAI VOWEL SIGN AI;Lo;0;L;16D67 16D67;;;;N;;;;; +16D69;KIRAT RAI VOWEL SIGN O;Lo;0;L;16D63 16D67;;;;N;;;;; +16D6A;KIRAT RAI VOWEL SIGN AU;Lo;0;L;16D69 16D67;;;;N;;;;; +16D6B;KIRAT RAI SIGN VIRAMA;Lm;0;L;;;;;N;;;;; +16D6C;KIRAT RAI SIGN SAAT;Lm;0;L;;;;;N;;;;; +16D6D;KIRAT RAI SIGN YUPI;Po;0;L;;;;;N;;;;; +16D6E;KIRAT RAI DANDA;Po;0;L;;;;;N;;;;; +16D6F;KIRAT RAI DOUBLE DANDA;Po;0;L;;;;;N;;;;; +16D70;KIRAT RAI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +16D71;KIRAT RAI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +16D72;KIRAT RAI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +16D73;KIRAT RAI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +16D74;KIRAT RAI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +16D75;KIRAT RAI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +16D76;KIRAT RAI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +16D77;KIRAT RAI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +16D78;KIRAT RAI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +16D79;KIRAT RAI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; 16E40;MEDEFAIDRIN CAPITAL LETTER M;Lu;0;L;;;;;N;;;;16E60; 16E41;MEDEFAIDRIN CAPITAL LETTER S;Lu;0;L;;;;;N;;;;16E61; 16E42;MEDEFAIDRIN CAPITAL LETTER V;Lu;0;L;;;;;N;;;;16E62; @@ -27122,6 +31520,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 18CD3;KHITAN SMALL SCRIPT CHARACTER-18CD3;Lo;0;L;;;;;N;;;;; 18CD4;KHITAN SMALL SCRIPT CHARACTER-18CD4;Lo;0;L;;;;;N;;;;; 18CD5;KHITAN SMALL SCRIPT CHARACTER-18CD5;Lo;0;L;;;;;N;;;;; +18CFF;KHITAN SMALL SCRIPT CHARACTER-18CFF;Lo;0;L;;;;;N;;;;; 18D00;<Tangut Ideograph Supplement, First>;Lo;0;L;;;;;N;;;;; 18D08;<Tangut Ideograph Supplement, Last>;Lo;0;L;;;;;N;;;;; 1AFF0;KATAKANA LETTER MINNAN TONE-2;Lm;0;L;;;;;N;;;;; @@ -27980,6 +32379,692 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1BCA1;SHORTHAND FORMAT CONTINUING OVERLAP;Cf;0;BN;;;;;N;;;;; 1BCA2;SHORTHAND FORMAT DOWN STEP;Cf;0;BN;;;;;N;;;;; 1BCA3;SHORTHAND FORMAT UP STEP;Cf;0;BN;;;;;N;;;;; +1CC00;UP-POINTING GO-KART;So;0;ON;;;;;N;;;;; +1CC01;RIGHT-POINTING GO-KART;So;0;ON;;;;;N;;;;; +1CC02;LEFT-POINTING STICK FIGURE;So;0;ON;;;;;N;;;;; +1CC03;RIGHT-POINTING STICK FIGURE;So;0;ON;;;;;N;;;;; +1CC04;DOWN-POINTING STICK FIGURE;So;0;ON;;;;;N;;;;; +1CC05;LOWER HORIZONTAL RULER SEGMENT;So;0;ON;;;;;N;;;;; +1CC06;RIGHT VERTICAL RULER SEGMENT;So;0;ON;;;;;N;;;;; +1CC07;LOWER RIGHT RULER SEGMENT;So;0;ON;;;;;N;;;;; +1CC08;ANTENNA;So;0;ON;;;;;N;;;;; +1CC09;HORIZONTAL RESISTOR SEGMENT;So;0;ON;;;;;N;;;;; +1CC0A;VERTICAL RESISTOR SEGMENT;So;0;ON;;;;;N;;;;; +1CC0B;LEFT THIRD INDUCTOR;So;0;ON;;;;;N;;;;; +1CC0C;MIDDLE THIRD INDUCTOR;So;0;ON;;;;;N;;;;; +1CC0D;RIGHT THIRD INDUCTOR;So;0;ON;;;;;N;;;;; +1CC0E;LEFT-POINTING DIODE;So;0;ON;;;;;N;;;;; +1CC0F;RIGHT-POINTING DIODE;So;0;ON;;;;;N;;;;; +1CC10;NPN TRANSISTOR;So;0;ON;;;;;N;;;;; +1CC11;PNP TRANSISTOR;So;0;ON;;;;;N;;;;; +1CC12;RECEPTACLE;So;0;ON;;;;;N;;;;; +1CC13;HORIZONTAL CAPACITOR;So;0;ON;;;;;N;;;;; +1CC14;VERTICAL CAPACITOR;So;0;ON;;;;;N;;;;; +1CC15;LOGIC GATE OR;So;0;ON;;;;;N;;;;; +1CC16;LOGIC GATE AND;So;0;ON;;;;;N;;;;; +1CC17;LOGIC GATE INVERTED INPUTS;So;0;ON;;;;;N;;;;; +1CC18;LOGIC GATE INVERTED OUTPUT;So;0;ON;;;;;N;;;;; +1CC19;LOGIC GATE BUFFER;So;0;ON;;;;;N;;;;; +1CC1A;LOGIC GATE BUFFER WITH INVERTED INPUT;So;0;ON;;;;;N;;;;; +1CC1B;BOX DRAWINGS LIGHT HORIZONTAL AND UPPER RIGHT;So;0;ON;;;;;N;;;;; +1CC1C;BOX DRAWINGS LIGHT HORIZONTAL AND LOWER RIGHT;So;0;ON;;;;;N;;;;; +1CC1D;BOX DRAWINGS LIGHT TOP AND UPPER LEFT;So;0;ON;;;;;N;;;;; +1CC1E;BOX DRAWINGS LIGHT BOTTOM AND LOWER LEFT;So;0;ON;;;;;N;;;;; +1CC1F;BOX DRAWINGS DOUBLE DIAGONAL UPPER RIGHT TO LOWER LEFT;So;0;ON;;;;;N;;;;; +1CC20;BOX DRAWINGS DOUBLE DIAGONAL UPPER LEFT TO LOWER RIGHT;So;0;ON;;;;;N;;;;; +1CC21;SEPARATED BLOCK QUADRANT-1;So;0;ON;;;;;N;;;;; +1CC22;SEPARATED BLOCK QUADRANT-2;So;0;ON;;;;;N;;;;; +1CC23;SEPARATED BLOCK QUADRANT-12;So;0;ON;;;;;N;;;;; +1CC24;SEPARATED BLOCK QUADRANT-3;So;0;ON;;;;;N;;;;; +1CC25;SEPARATED BLOCK QUADRANT-13;So;0;ON;;;;;N;;;;; +1CC26;SEPARATED BLOCK QUADRANT-23;So;0;ON;;;;;N;;;;; +1CC27;SEPARATED BLOCK QUADRANT-123;So;0;ON;;;;;N;;;;; +1CC28;SEPARATED BLOCK QUADRANT-4;So;0;ON;;;;;N;;;;; +1CC29;SEPARATED BLOCK QUADRANT-14;So;0;ON;;;;;N;;;;; +1CC2A;SEPARATED BLOCK QUADRANT-24;So;0;ON;;;;;N;;;;; +1CC2B;SEPARATED BLOCK QUADRANT-124;So;0;ON;;;;;N;;;;; +1CC2C;SEPARATED BLOCK QUADRANT-34;So;0;ON;;;;;N;;;;; +1CC2D;SEPARATED BLOCK QUADRANT-134;So;0;ON;;;;;N;;;;; +1CC2E;SEPARATED BLOCK QUADRANT-234;So;0;ON;;;;;N;;;;; +1CC2F;SEPARATED BLOCK QUADRANT-1234;So;0;ON;;;;;N;;;;; +1CC30;UPPER LEFT TWELFTH CIRCLE;So;0;ON;;;;;N;;;;; +1CC31;UPPER CENTRE LEFT TWELFTH CIRCLE;So;0;ON;;;;;N;;;;; +1CC32;UPPER CENTRE RIGHT TWELFTH CIRCLE;So;0;ON;;;;;N;;;;; +1CC33;UPPER RIGHT TWELFTH CIRCLE;So;0;ON;;;;;N;;;;; +1CC34;UPPER MIDDLE LEFT TWELFTH CIRCLE;So;0;ON;;;;;N;;;;; +1CC35;UPPER LEFT QUARTER CIRCLE;So;0;ON;;;;;N;;;;; +1CC36;UPPER RIGHT QUARTER CIRCLE;So;0;ON;;;;;N;;;;; +1CC37;UPPER MIDDLE RIGHT TWELFTH CIRCLE;So;0;ON;;;;;N;;;;; +1CC38;LOWER MIDDLE LEFT TWELFTH CIRCLE;So;0;ON;;;;;N;;;;; +1CC39;LOWER LEFT QUARTER CIRCLE;So;0;ON;;;;;N;;;;; +1CC3A;LOWER RIGHT QUARTER CIRCLE;So;0;ON;;;;;N;;;;; +1CC3B;LOWER MIDDLE RIGHT TWELFTH CIRCLE;So;0;ON;;;;;N;;;;; +1CC3C;LOWER LEFT TWELFTH CIRCLE;So;0;ON;;;;;N;;;;; +1CC3D;LOWER CENTRE LEFT TWELFTH CIRCLE;So;0;ON;;;;;N;;;;; +1CC3E;LOWER CENTRE RIGHT TWELFTH CIRCLE;So;0;ON;;;;;N;;;;; +1CC3F;LOWER RIGHT TWELFTH CIRCLE;So;0;ON;;;;;N;;;;; +1CC40;SPARSE HORIZONTAL FILL;So;0;ON;;;;;N;;;;; +1CC41;SPARSE VERTICAL FILL;So;0;ON;;;;;N;;;;; +1CC42;ORTHOGONAL CROSSHATCH FILL;So;0;ON;;;;;N;;;;; +1CC43;DIAGONAL CROSSHATCH FILL;So;0;ON;;;;;N;;;;; +1CC44;DENSE VERTICAL FILL;So;0;ON;;;;;N;;;;; +1CC45;DENSE HORIZONTAL FILL;So;0;ON;;;;;N;;;;; +1CC46;SPECKLE FILL FRAME-1;So;0;ON;;;;;N;;;;; +1CC47;SPECKLE FILL FRAME-2;So;0;ON;;;;;N;;;;; +1CC48;LEFT-FACING BASSINET;So;0;ON;;;;;N;;;;; +1CC49;RIGHT-FACING BASSINET;So;0;ON;;;;;N;;;;; +1CC4A;FLYING SAUCER WITH BEAMS;So;0;ON;;;;;N;;;;; +1CC4B;FLYING SAUCER WITHOUT BEAMS;So;0;ON;;;;;N;;;;; +1CC4C;ALIEN MONSTER OPEN JAWS;So;0;ON;;;;;N;;;;; +1CC4D;ALIEN MONSTER CLOSED JAWS;So;0;ON;;;;;N;;;;; +1CC4E;ALIEN SQUID OPEN TENTACLES;So;0;ON;;;;;N;;;;; +1CC4F;ALIEN SQUID CLOSED TENTACLES;So;0;ON;;;;;N;;;;; +1CC50;ALIEN CRAB STEPPING RIGHT;So;0;ON;;;;;N;;;;; +1CC51;ALIEN CRAB STEPPING LEFT;So;0;ON;;;;;N;;;;; +1CC52;ALIEN SPIDER CROUCHING;So;0;ON;;;;;N;;;;; +1CC53;ALIEN SPIDER SPREAD;So;0;ON;;;;;N;;;;; +1CC54;ALIEN MONSTER STEP-1;So;0;ON;;;;;N;;;;; +1CC55;ALIEN MONSTER STEP-2;So;0;ON;;;;;N;;;;; +1CC56;LEFT-POINTING ROCKET SHIP;So;0;ON;;;;;N;;;;; +1CC57;UP-POINTING ROCKET SHIP;So;0;ON;;;;;N;;;;; +1CC58;RIGHT-POINTING ROCKET SHIP;So;0;ON;;;;;N;;;;; +1CC59;DOWN-POINTING ROCKET SHIP;So;0;ON;;;;;N;;;;; +1CC5A;TOP HALF LEFT-FACING ROBOT;So;0;ON;;;;;N;;;;; +1CC5B;TOP HALF FORWARD-FACING ROBOT;So;0;ON;;;;;N;;;;; +1CC5C;TOP HALF RIGHT-FACING ROBOT;So;0;ON;;;;;N;;;;; +1CC5D;BOTTOM HALF LEFT-FACING ROBOT;So;0;ON;;;;;N;;;;; +1CC5E;BOTTOM HALF FORWARD-FACING ROBOT;So;0;ON;;;;;N;;;;; +1CC5F;BOTTOM HALF RIGHT-FACING ROBOT;So;0;ON;;;;;N;;;;; +1CC60;LEFT-POINTING ATOMIC BOMB;So;0;ON;;;;;N;;;;; +1CC61;UP-POINTING ATOMIC BOMB;So;0;ON;;;;;N;;;;; +1CC62;RIGHT-POINTING ATOMIC BOMB;So;0;ON;;;;;N;;;;; +1CC63;DOWN-POINTING ATOMIC BOMB;So;0;ON;;;;;N;;;;; +1CC64;MUSHROOM CLOUD;So;0;ON;;;;;N;;;;; +1CC65;LEFT-POINTING RIFLE;So;0;ON;;;;;N;;;;; +1CC66;UP-POINTING RIFLE;So;0;ON;;;;;N;;;;; +1CC67;RIGHT-POINTING RIFLE;So;0;ON;;;;;N;;;;; +1CC68;DOWN-POINTING RIFLE;So;0;ON;;;;;N;;;;; +1CC69;EIGHT RAYS INWARD;So;0;ON;;;;;N;;;;; +1CC6A;EIGHT RAYS OUTWARD;So;0;ON;;;;;N;;;;; +1CC6B;BLACK LARGE CIRCLE MINUS LEFT QUARTER SECTION;So;0;ON;;;;;N;;;;; +1CC6C;BLACK LARGE CIRCLE MINUS UPPER QUARTER SECTION;So;0;ON;;;;;N;;;;; +1CC6D;BLACK LARGE CIRCLE MINUS RIGHT QUARTER SECTION;So;0;ON;;;;;N;;;;; +1CC6E;BLACK LARGE CIRCLE MINUS LOWER QUARTER SECTION;So;0;ON;;;;;N;;;;; +1CC6F;BLACK NEUTRAL FACE;So;0;ON;;;;;N;;;;; +1CC70;LEFT-FACING SNAKE HEAD WITH OPEN MOUTH;So;0;ON;;;;;N;;;;; +1CC71;UP-FACING SNAKE HEAD WITH OPEN MOUTH;So;0;ON;;;;;N;;;;; +1CC72;RIGHT-FACING SNAKE HEAD WITH OPEN MOUTH;So;0;ON;;;;;N;;;;; +1CC73;DOWN-FACING SNAKE HEAD WITH OPEN MOUTH;So;0;ON;;;;;N;;;;; +1CC74;LEFT-FACING SNAKE HEAD WITH CLOSED MOUTH;So;0;ON;;;;;N;;;;; +1CC75;UP-FACING SNAKE HEAD WITH CLOSED MOUTH;So;0;ON;;;;;N;;;;; +1CC76;RIGHT-FACING SNAKE HEAD WITH CLOSED MOUTH;So;0;ON;;;;;N;;;;; +1CC77;DOWN-FACING SNAKE HEAD WITH CLOSED MOUTH;So;0;ON;;;;;N;;;;; +1CC78;LEFT-POINTING ENERGY WAVE;So;0;ON;;;;;N;;;;; +1CC79;UP-POINTING ENERGY WAVE;So;0;ON;;;;;N;;;;; +1CC7A;RIGHT-POINTING ENERGY WAVE;So;0;ON;;;;;N;;;;; +1CC7B;DOWN-POINTING ENERGY WAVE;So;0;ON;;;;;N;;;;; +1CC7C;SQUARE SPIRAL FROM TOP LEFT;So;0;ON;;;;;N;;;;; +1CC7D;SQUARE SPIRAL FROM TOP RIGHT;So;0;ON;;;;;N;;;;; +1CC7E;SQUARE SPIRAL FROM BOTTOM RIGHT;So;0;ON;;;;;N;;;;; +1CC7F;SQUARE SPIRAL FROM BOTTOM LEFT;So;0;ON;;;;;N;;;;; +1CC80;STRIPED LEFT-POINTING TRIANGLE;So;0;ON;;;;;N;;;;; +1CC81;STRIPED UP-POINTING TRIANGLE;So;0;ON;;;;;N;;;;; +1CC82;STRIPED RIGHT-POINTING TRIANGLE;So;0;ON;;;;;N;;;;; +1CC83;STRIPED DOWN-POINTING TRIANGLE;So;0;ON;;;;;N;;;;; +1CC84;VERTICAL LADDER;So;0;ON;;;;;N;;;;; +1CC85;HORIZONTAL LADDER;So;0;ON;;;;;N;;;;; +1CC86;WHITE LOWER LEFT POINTER;So;0;ON;;;;;N;;;;; +1CC87;WHITE LOWER RIGHT POINTER;So;0;ON;;;;;N;;;;; +1CC88;TWO RINGS ALIGNED HORIZONTALLY;So;0;ON;;;;;N;;;;; +1CC89;SQUARE FOUR CORNER SALTIRES;So;0;ON;;;;;N;;;;; +1CC8A;SQUARE FOUR CORNER DIAGONALS;So;0;ON;;;;;N;;;;; +1CC8B;SQUARE FOUR CORNER BLACK TRIANGLES;So;0;ON;;;;;N;;;;; +1CC8C;SQUARE APERTURE;So;0;ON;;;;;N;;;;; +1CC8D;INVERSE BLACK DIAMOND;So;0;ON;;;;;N;;;;; +1CC8E;LEFT AND UPPER ONE EIGHTH BLOCK CONTAINING BLACK SMALL SQUARE;So;0;ON;;;;;N;;;;; +1CC8F;INVERSE BLACK SMALL SQUARE;So;0;ON;;;;;N;;;;; +1CC90;VERTICAL LINE WITH FOUR TICK MARKS;So;0;ON;;;;;N;;;;; +1CC91;HORIZONTAL LINE WITH FOUR TICK MARKS;So;0;ON;;;;;N;;;;; +1CC92;LEFT-FACING FISH;So;0;ON;;;;;N;;;;; +1CC93;RIGHT-FACING FISH;So;0;ON;;;;;N;;;;; +1CC94;LEFT-FACING FISH WITH OPEN MOUTH;So;0;ON;;;;;N;;;;; +1CC95;RIGHT-FACING FISH WITH OPEN MOUTH;So;0;ON;;;;;N;;;;; +1CC96;FLAPPING BIRD;So;0;ON;;;;;N;;;;; +1CC97;LEFT-POINTING RACING CAR;So;0;ON;;;;;N;;;;; +1CC98;UP-POINTING RACING CAR;So;0;ON;;;;;N;;;;; +1CC99;RIGHT-POINTING RACING CAR;So;0;ON;;;;;N;;;;; +1CC9A;DOWN-POINTING RACING CAR;So;0;ON;;;;;N;;;;; +1CC9B;HORIZONTAL RACING CAR;So;0;ON;;;;;N;;;;; +1CC9C;VERTICAL RACING CAR;So;0;ON;;;;;N;;;;; +1CC9D;VERTICAL GO-KART;So;0;ON;;;;;N;;;;; +1CC9E;LEFT-POINTING TANK;So;0;ON;;;;;N;;;;; +1CC9F;RIGHT-POINTING TANK;So;0;ON;;;;;N;;;;; +1CCA0;LEFT-POINTING ROCKET BOOSTER;So;0;ON;;;;;N;;;;; +1CCA1;RIGHT-POINTING ROCKET BOOSTER;So;0;ON;;;;;N;;;;; +1CCA2;LEFT-POINTING ROLLER COASTER CAR;So;0;ON;;;;;N;;;;; +1CCA3;RIGHT-POINTING ROLLER COASTER CAR;So;0;ON;;;;;N;;;;; +1CCA4;LEFT HALF FLYING SAUCER;So;0;ON;;;;;N;;;;; +1CCA5;RIGHT HALF FLYING SAUCER;So;0;ON;;;;;N;;;;; +1CCA6;UPPER LEFT QUADRANT FACE WITH OPEN EYES;So;0;ON;;;;;N;;;;; +1CCA7;UPPER RIGHT QUADRANT FACE WITH OPEN EYES;So;0;ON;;;;;N;;;;; +1CCA8;UPPER LEFT QUADRANT FACE WITH CLOSED EYES;So;0;ON;;;;;N;;;;; +1CCA9;UPPER RIGHT QUADRANT FACE WITH CLOSED EYES;So;0;ON;;;;;N;;;;; +1CCAA;LOWER LEFT QUADRANT SMILING FACE;So;0;ON;;;;;N;;;;; +1CCAB;LOWER RIGHT QUADRANT SMILING FACE;So;0;ON;;;;;N;;;;; +1CCAC;LOWER LEFT QUADRANT NEUTRAL FACE;So;0;ON;;;;;N;;;;; +1CCAD;LOWER RIGHT QUADRANT NEUTRAL FACE;So;0;ON;;;;;N;;;;; +1CCAE;LOWER LEFT QUADRANT FACE WITH OPEN MOUTH;So;0;ON;;;;;N;;;;; +1CCAF;LOWER RIGHT QUADRANT FACE WITH OPEN MOUTH;So;0;ON;;;;;N;;;;; +1CCB0;LOWER LEFT QUADRANT FROWNING FACE;So;0;ON;;;;;N;;;;; +1CCB1;LOWER RIGHT QUADRANT FROWNING FACE;So;0;ON;;;;;N;;;;; +1CCB2;UPPER LEFT QUADRANT TELEVISION;So;0;ON;;;;;N;;;;; +1CCB3;UPPER RIGHT QUADRANT TELEVISION;So;0;ON;;;;;N;;;;; +1CCB4;LOWER LEFT QUADRANT TELEVISION;So;0;ON;;;;;N;;;;; +1CCB5;LOWER RIGHT QUADRANT TELEVISION;So;0;ON;;;;;N;;;;; +1CCB6;UPPER LEFT QUADRANT MICROCOMPUTER;So;0;ON;;;;;N;;;;; +1CCB7;UPPER RIGHT QUADRANT MICROCOMPUTER;So;0;ON;;;;;N;;;;; +1CCB8;LOWER LEFT QUADRANT MICROCOMPUTER;So;0;ON;;;;;N;;;;; +1CCB9;LOWER RIGHT QUADRANT MICROCOMPUTER;So;0;ON;;;;;N;;;;; +1CCBA;UPPER LEFT QUADRANT CHESS KING;So;0;ON;;;;;N;;;;; +1CCBB;UPPER RIGHT QUADRANT CHESS KING;So;0;ON;;;;;N;;;;; +1CCBC;LOWER LEFT QUADRANT CHESS KING;So;0;ON;;;;;N;;;;; +1CCBD;LOWER RIGHT QUADRANT CHESS KING;So;0;ON;;;;;N;;;;; +1CCBE;UPPER LEFT QUADRANT CHESS QUEEN;So;0;ON;;;;;N;;;;; +1CCBF;UPPER RIGHT QUADRANT CHESS QUEEN;So;0;ON;;;;;N;;;;; +1CCC0;LOWER LEFT QUADRANT CHESS QUEEN;So;0;ON;;;;;N;;;;; +1CCC1;LOWER RIGHT QUADRANT CHESS QUEEN;So;0;ON;;;;;N;;;;; +1CCC2;UPPER LEFT QUADRANT CHESS ROOK;So;0;ON;;;;;N;;;;; +1CCC3;UPPER RIGHT QUADRANT CHESS ROOK;So;0;ON;;;;;N;;;;; +1CCC4;LOWER LEFT QUADRANT CHESS ROOK;So;0;ON;;;;;N;;;;; +1CCC5;LOWER RIGHT QUADRANT CHESS ROOK;So;0;ON;;;;;N;;;;; +1CCC6;UPPER LEFT QUADRANT CHESS BISHOP;So;0;ON;;;;;N;;;;; +1CCC7;UPPER RIGHT QUADRANT CHESS BISHOP;So;0;ON;;;;;N;;;;; +1CCC8;LOWER LEFT QUADRANT CHESS BISHOP;So;0;ON;;;;;N;;;;; +1CCC9;LOWER RIGHT QUADRANT CHESS BISHOP;So;0;ON;;;;;N;;;;; +1CCCA;UPPER LEFT QUADRANT CHESS KNIGHT;So;0;ON;;;;;N;;;;; +1CCCB;UPPER RIGHT QUADRANT CHESS KNIGHT;So;0;ON;;;;;N;;;;; +1CCCC;LOWER LEFT QUADRANT CHESS KNIGHT;So;0;ON;;;;;N;;;;; +1CCCD;LOWER RIGHT QUADRANT CHESS KNIGHT;So;0;ON;;;;;N;;;;; +1CCCE;UPPER LEFT QUADRANT CHESS PAWN;So;0;ON;;;;;N;;;;; +1CCCF;UPPER RIGHT QUADRANT CHESS PAWN;So;0;ON;;;;;N;;;;; +1CCD0;LOWER LEFT QUADRANT CHESS PAWN;So;0;ON;;;;;N;;;;; +1CCD1;LOWER RIGHT QUADRANT CHESS PAWN;So;0;ON;;;;;N;;;;; +1CCD2;UPPER LEFT QUADRANT STANDING KNIGHT;So;0;ON;;;;;N;;;;; +1CCD3;UPPER RIGHT QUADRANT STANDING KNIGHT;So;0;ON;;;;;N;;;;; +1CCD4;LOWER LEFT QUADRANT STANDING KNIGHT;So;0;ON;;;;;N;;;;; +1CCD5;LOWER RIGHT QUADRANT STANDING KNIGHT;So;0;ON;;;;;N;;;;; +1CCD6;OUTLINED LATIN CAPITAL LETTER A;So;0;L;<font> 0041;;;;N;;;;; +1CCD7;OUTLINED LATIN CAPITAL LETTER B;So;0;L;<font> 0042;;;;N;;;;; +1CCD8;OUTLINED LATIN CAPITAL LETTER C;So;0;L;<font> 0043;;;;N;;;;; +1CCD9;OUTLINED LATIN CAPITAL LETTER D;So;0;L;<font> 0044;;;;N;;;;; +1CCDA;OUTLINED LATIN CAPITAL LETTER E;So;0;L;<font> 0045;;;;N;;;;; +1CCDB;OUTLINED LATIN CAPITAL LETTER F;So;0;L;<font> 0046;;;;N;;;;; +1CCDC;OUTLINED LATIN CAPITAL LETTER G;So;0;L;<font> 0047;;;;N;;;;; +1CCDD;OUTLINED LATIN CAPITAL LETTER H;So;0;L;<font> 0048;;;;N;;;;; +1CCDE;OUTLINED LATIN CAPITAL LETTER I;So;0;L;<font> 0049;;;;N;;;;; +1CCDF;OUTLINED LATIN CAPITAL LETTER J;So;0;L;<font> 004A;;;;N;;;;; +1CCE0;OUTLINED LATIN CAPITAL LETTER K;So;0;L;<font> 004B;;;;N;;;;; +1CCE1;OUTLINED LATIN CAPITAL LETTER L;So;0;L;<font> 004C;;;;N;;;;; +1CCE2;OUTLINED LATIN CAPITAL LETTER M;So;0;L;<font> 004D;;;;N;;;;; +1CCE3;OUTLINED LATIN CAPITAL LETTER N;So;0;L;<font> 004E;;;;N;;;;; +1CCE4;OUTLINED LATIN CAPITAL LETTER O;So;0;L;<font> 004F;;;;N;;;;; +1CCE5;OUTLINED LATIN CAPITAL LETTER P;So;0;L;<font> 0050;;;;N;;;;; +1CCE6;OUTLINED LATIN CAPITAL LETTER Q;So;0;L;<font> 0051;;;;N;;;;; +1CCE7;OUTLINED LATIN CAPITAL LETTER R;So;0;L;<font> 0052;;;;N;;;;; +1CCE8;OUTLINED LATIN CAPITAL LETTER S;So;0;L;<font> 0053;;;;N;;;;; +1CCE9;OUTLINED LATIN CAPITAL LETTER T;So;0;L;<font> 0054;;;;N;;;;; +1CCEA;OUTLINED LATIN CAPITAL LETTER U;So;0;L;<font> 0055;;;;N;;;;; +1CCEB;OUTLINED LATIN CAPITAL LETTER V;So;0;L;<font> 0056;;;;N;;;;; +1CCEC;OUTLINED LATIN CAPITAL LETTER W;So;0;L;<font> 0057;;;;N;;;;; +1CCED;OUTLINED LATIN CAPITAL LETTER X;So;0;L;<font> 0058;;;;N;;;;; +1CCEE;OUTLINED LATIN CAPITAL LETTER Y;So;0;L;<font> 0059;;;;N;;;;; +1CCEF;OUTLINED LATIN CAPITAL LETTER Z;So;0;L;<font> 005A;;;;N;;;;; +1CCF0;OUTLINED DIGIT ZERO;Nd;0;EN;<font> 0030;0;0;0;N;;;;; +1CCF1;OUTLINED DIGIT ONE;Nd;0;EN;<font> 0031;1;1;1;N;;;;; +1CCF2;OUTLINED DIGIT TWO;Nd;0;EN;<font> 0032;2;2;2;N;;;;; +1CCF3;OUTLINED DIGIT THREE;Nd;0;EN;<font> 0033;3;3;3;N;;;;; +1CCF4;OUTLINED DIGIT FOUR;Nd;0;EN;<font> 0034;4;4;4;N;;;;; +1CCF5;OUTLINED DIGIT FIVE;Nd;0;EN;<font> 0035;5;5;5;N;;;;; +1CCF6;OUTLINED DIGIT SIX;Nd;0;EN;<font> 0036;6;6;6;N;;;;; +1CCF7;OUTLINED DIGIT SEVEN;Nd;0;EN;<font> 0037;7;7;7;N;;;;; +1CCF8;OUTLINED DIGIT EIGHT;Nd;0;EN;<font> 0038;8;8;8;N;;;;; +1CCF9;OUTLINED DIGIT NINE;Nd;0;EN;<font> 0039;9;9;9;N;;;;; +1CD00;BLOCK OCTANT-3;So;0;ON;;;;;N;;;;; +1CD01;BLOCK OCTANT-23;So;0;ON;;;;;N;;;;; +1CD02;BLOCK OCTANT-123;So;0;ON;;;;;N;;;;; +1CD03;BLOCK OCTANT-4;So;0;ON;;;;;N;;;;; +1CD04;BLOCK OCTANT-14;So;0;ON;;;;;N;;;;; +1CD05;BLOCK OCTANT-124;So;0;ON;;;;;N;;;;; +1CD06;BLOCK OCTANT-34;So;0;ON;;;;;N;;;;; +1CD07;BLOCK OCTANT-134;So;0;ON;;;;;N;;;;; +1CD08;BLOCK OCTANT-234;So;0;ON;;;;;N;;;;; +1CD09;BLOCK OCTANT-5;So;0;ON;;;;;N;;;;; +1CD0A;BLOCK OCTANT-15;So;0;ON;;;;;N;;;;; +1CD0B;BLOCK OCTANT-25;So;0;ON;;;;;N;;;;; +1CD0C;BLOCK OCTANT-125;So;0;ON;;;;;N;;;;; +1CD0D;BLOCK OCTANT-135;So;0;ON;;;;;N;;;;; +1CD0E;BLOCK OCTANT-235;So;0;ON;;;;;N;;;;; +1CD0F;BLOCK OCTANT-1235;So;0;ON;;;;;N;;;;; +1CD10;BLOCK OCTANT-45;So;0;ON;;;;;N;;;;; +1CD11;BLOCK OCTANT-145;So;0;ON;;;;;N;;;;; +1CD12;BLOCK OCTANT-245;So;0;ON;;;;;N;;;;; +1CD13;BLOCK OCTANT-1245;So;0;ON;;;;;N;;;;; +1CD14;BLOCK OCTANT-345;So;0;ON;;;;;N;;;;; +1CD15;BLOCK OCTANT-1345;So;0;ON;;;;;N;;;;; +1CD16;BLOCK OCTANT-2345;So;0;ON;;;;;N;;;;; +1CD17;BLOCK OCTANT-12345;So;0;ON;;;;;N;;;;; +1CD18;BLOCK OCTANT-6;So;0;ON;;;;;N;;;;; +1CD19;BLOCK OCTANT-16;So;0;ON;;;;;N;;;;; +1CD1A;BLOCK OCTANT-26;So;0;ON;;;;;N;;;;; +1CD1B;BLOCK OCTANT-126;So;0;ON;;;;;N;;;;; +1CD1C;BLOCK OCTANT-36;So;0;ON;;;;;N;;;;; +1CD1D;BLOCK OCTANT-136;So;0;ON;;;;;N;;;;; +1CD1E;BLOCK OCTANT-236;So;0;ON;;;;;N;;;;; +1CD1F;BLOCK OCTANT-1236;So;0;ON;;;;;N;;;;; +1CD20;BLOCK OCTANT-146;So;0;ON;;;;;N;;;;; +1CD21;BLOCK OCTANT-246;So;0;ON;;;;;N;;;;; +1CD22;BLOCK OCTANT-1246;So;0;ON;;;;;N;;;;; +1CD23;BLOCK OCTANT-346;So;0;ON;;;;;N;;;;; +1CD24;BLOCK OCTANT-1346;So;0;ON;;;;;N;;;;; +1CD25;BLOCK OCTANT-2346;So;0;ON;;;;;N;;;;; +1CD26;BLOCK OCTANT-12346;So;0;ON;;;;;N;;;;; +1CD27;BLOCK OCTANT-56;So;0;ON;;;;;N;;;;; +1CD28;BLOCK OCTANT-156;So;0;ON;;;;;N;;;;; +1CD29;BLOCK OCTANT-256;So;0;ON;;;;;N;;;;; +1CD2A;BLOCK OCTANT-1256;So;0;ON;;;;;N;;;;; +1CD2B;BLOCK OCTANT-356;So;0;ON;;;;;N;;;;; +1CD2C;BLOCK OCTANT-1356;So;0;ON;;;;;N;;;;; +1CD2D;BLOCK OCTANT-2356;So;0;ON;;;;;N;;;;; +1CD2E;BLOCK OCTANT-12356;So;0;ON;;;;;N;;;;; +1CD2F;BLOCK OCTANT-456;So;0;ON;;;;;N;;;;; +1CD30;BLOCK OCTANT-1456;So;0;ON;;;;;N;;;;; +1CD31;BLOCK OCTANT-2456;So;0;ON;;;;;N;;;;; +1CD32;BLOCK OCTANT-12456;So;0;ON;;;;;N;;;;; +1CD33;BLOCK OCTANT-3456;So;0;ON;;;;;N;;;;; +1CD34;BLOCK OCTANT-13456;So;0;ON;;;;;N;;;;; +1CD35;BLOCK OCTANT-23456;So;0;ON;;;;;N;;;;; +1CD36;BLOCK OCTANT-17;So;0;ON;;;;;N;;;;; +1CD37;BLOCK OCTANT-27;So;0;ON;;;;;N;;;;; +1CD38;BLOCK OCTANT-127;So;0;ON;;;;;N;;;;; +1CD39;BLOCK OCTANT-37;So;0;ON;;;;;N;;;;; +1CD3A;BLOCK OCTANT-137;So;0;ON;;;;;N;;;;; +1CD3B;BLOCK OCTANT-237;So;0;ON;;;;;N;;;;; +1CD3C;BLOCK OCTANT-1237;So;0;ON;;;;;N;;;;; +1CD3D;BLOCK OCTANT-47;So;0;ON;;;;;N;;;;; +1CD3E;BLOCK OCTANT-147;So;0;ON;;;;;N;;;;; +1CD3F;BLOCK OCTANT-247;So;0;ON;;;;;N;;;;; +1CD40;BLOCK OCTANT-1247;So;0;ON;;;;;N;;;;; +1CD41;BLOCK OCTANT-347;So;0;ON;;;;;N;;;;; +1CD42;BLOCK OCTANT-1347;So;0;ON;;;;;N;;;;; +1CD43;BLOCK OCTANT-2347;So;0;ON;;;;;N;;;;; +1CD44;BLOCK OCTANT-12347;So;0;ON;;;;;N;;;;; +1CD45;BLOCK OCTANT-157;So;0;ON;;;;;N;;;;; +1CD46;BLOCK OCTANT-257;So;0;ON;;;;;N;;;;; +1CD47;BLOCK OCTANT-1257;So;0;ON;;;;;N;;;;; +1CD48;BLOCK OCTANT-357;So;0;ON;;;;;N;;;;; +1CD49;BLOCK OCTANT-2357;So;0;ON;;;;;N;;;;; +1CD4A;BLOCK OCTANT-12357;So;0;ON;;;;;N;;;;; +1CD4B;BLOCK OCTANT-457;So;0;ON;;;;;N;;;;; +1CD4C;BLOCK OCTANT-1457;So;0;ON;;;;;N;;;;; +1CD4D;BLOCK OCTANT-12457;So;0;ON;;;;;N;;;;; +1CD4E;BLOCK OCTANT-3457;So;0;ON;;;;;N;;;;; +1CD4F;BLOCK OCTANT-13457;So;0;ON;;;;;N;;;;; +1CD50;BLOCK OCTANT-23457;So;0;ON;;;;;N;;;;; +1CD51;BLOCK OCTANT-67;So;0;ON;;;;;N;;;;; +1CD52;BLOCK OCTANT-167;So;0;ON;;;;;N;;;;; +1CD53;BLOCK OCTANT-267;So;0;ON;;;;;N;;;;; +1CD54;BLOCK OCTANT-1267;So;0;ON;;;;;N;;;;; +1CD55;BLOCK OCTANT-367;So;0;ON;;;;;N;;;;; +1CD56;BLOCK OCTANT-1367;So;0;ON;;;;;N;;;;; +1CD57;BLOCK OCTANT-2367;So;0;ON;;;;;N;;;;; +1CD58;BLOCK OCTANT-12367;So;0;ON;;;;;N;;;;; +1CD59;BLOCK OCTANT-467;So;0;ON;;;;;N;;;;; +1CD5A;BLOCK OCTANT-1467;So;0;ON;;;;;N;;;;; +1CD5B;BLOCK OCTANT-2467;So;0;ON;;;;;N;;;;; +1CD5C;BLOCK OCTANT-12467;So;0;ON;;;;;N;;;;; +1CD5D;BLOCK OCTANT-3467;So;0;ON;;;;;N;;;;; +1CD5E;BLOCK OCTANT-13467;So;0;ON;;;;;N;;;;; +1CD5F;BLOCK OCTANT-23467;So;0;ON;;;;;N;;;;; +1CD60;BLOCK OCTANT-123467;So;0;ON;;;;;N;;;;; +1CD61;BLOCK OCTANT-567;So;0;ON;;;;;N;;;;; +1CD62;BLOCK OCTANT-1567;So;0;ON;;;;;N;;;;; +1CD63;BLOCK OCTANT-2567;So;0;ON;;;;;N;;;;; +1CD64;BLOCK OCTANT-12567;So;0;ON;;;;;N;;;;; +1CD65;BLOCK OCTANT-3567;So;0;ON;;;;;N;;;;; +1CD66;BLOCK OCTANT-13567;So;0;ON;;;;;N;;;;; +1CD67;BLOCK OCTANT-23567;So;0;ON;;;;;N;;;;; +1CD68;BLOCK OCTANT-123567;So;0;ON;;;;;N;;;;; +1CD69;BLOCK OCTANT-4567;So;0;ON;;;;;N;;;;; +1CD6A;BLOCK OCTANT-14567;So;0;ON;;;;;N;;;;; +1CD6B;BLOCK OCTANT-24567;So;0;ON;;;;;N;;;;; +1CD6C;BLOCK OCTANT-124567;So;0;ON;;;;;N;;;;; +1CD6D;BLOCK OCTANT-34567;So;0;ON;;;;;N;;;;; +1CD6E;BLOCK OCTANT-134567;So;0;ON;;;;;N;;;;; +1CD6F;BLOCK OCTANT-234567;So;0;ON;;;;;N;;;;; +1CD70;BLOCK OCTANT-1234567;So;0;ON;;;;;N;;;;; +1CD71;BLOCK OCTANT-18;So;0;ON;;;;;N;;;;; +1CD72;BLOCK OCTANT-28;So;0;ON;;;;;N;;;;; +1CD73;BLOCK OCTANT-128;So;0;ON;;;;;N;;;;; +1CD74;BLOCK OCTANT-38;So;0;ON;;;;;N;;;;; +1CD75;BLOCK OCTANT-138;So;0;ON;;;;;N;;;;; +1CD76;BLOCK OCTANT-238;So;0;ON;;;;;N;;;;; +1CD77;BLOCK OCTANT-1238;So;0;ON;;;;;N;;;;; +1CD78;BLOCK OCTANT-48;So;0;ON;;;;;N;;;;; +1CD79;BLOCK OCTANT-148;So;0;ON;;;;;N;;;;; +1CD7A;BLOCK OCTANT-248;So;0;ON;;;;;N;;;;; +1CD7B;BLOCK OCTANT-1248;So;0;ON;;;;;N;;;;; +1CD7C;BLOCK OCTANT-348;So;0;ON;;;;;N;;;;; +1CD7D;BLOCK OCTANT-1348;So;0;ON;;;;;N;;;;; +1CD7E;BLOCK OCTANT-2348;So;0;ON;;;;;N;;;;; +1CD7F;BLOCK OCTANT-12348;So;0;ON;;;;;N;;;;; +1CD80;BLOCK OCTANT-58;So;0;ON;;;;;N;;;;; +1CD81;BLOCK OCTANT-158;So;0;ON;;;;;N;;;;; +1CD82;BLOCK OCTANT-258;So;0;ON;;;;;N;;;;; +1CD83;BLOCK OCTANT-1258;So;0;ON;;;;;N;;;;; +1CD84;BLOCK OCTANT-358;So;0;ON;;;;;N;;;;; +1CD85;BLOCK OCTANT-1358;So;0;ON;;;;;N;;;;; +1CD86;BLOCK OCTANT-2358;So;0;ON;;;;;N;;;;; +1CD87;BLOCK OCTANT-12358;So;0;ON;;;;;N;;;;; +1CD88;BLOCK OCTANT-458;So;0;ON;;;;;N;;;;; +1CD89;BLOCK OCTANT-1458;So;0;ON;;;;;N;;;;; +1CD8A;BLOCK OCTANT-2458;So;0;ON;;;;;N;;;;; +1CD8B;BLOCK OCTANT-12458;So;0;ON;;;;;N;;;;; +1CD8C;BLOCK OCTANT-3458;So;0;ON;;;;;N;;;;; +1CD8D;BLOCK OCTANT-13458;So;0;ON;;;;;N;;;;; +1CD8E;BLOCK OCTANT-23458;So;0;ON;;;;;N;;;;; +1CD8F;BLOCK OCTANT-123458;So;0;ON;;;;;N;;;;; +1CD90;BLOCK OCTANT-168;So;0;ON;;;;;N;;;;; +1CD91;BLOCK OCTANT-268;So;0;ON;;;;;N;;;;; +1CD92;BLOCK OCTANT-1268;So;0;ON;;;;;N;;;;; +1CD93;BLOCK OCTANT-368;So;0;ON;;;;;N;;;;; +1CD94;BLOCK OCTANT-2368;So;0;ON;;;;;N;;;;; +1CD95;BLOCK OCTANT-12368;So;0;ON;;;;;N;;;;; +1CD96;BLOCK OCTANT-468;So;0;ON;;;;;N;;;;; +1CD97;BLOCK OCTANT-1468;So;0;ON;;;;;N;;;;; +1CD98;BLOCK OCTANT-12468;So;0;ON;;;;;N;;;;; +1CD99;BLOCK OCTANT-3468;So;0;ON;;;;;N;;;;; +1CD9A;BLOCK OCTANT-13468;So;0;ON;;;;;N;;;;; +1CD9B;BLOCK OCTANT-23468;So;0;ON;;;;;N;;;;; +1CD9C;BLOCK OCTANT-568;So;0;ON;;;;;N;;;;; +1CD9D;BLOCK OCTANT-1568;So;0;ON;;;;;N;;;;; +1CD9E;BLOCK OCTANT-2568;So;0;ON;;;;;N;;;;; +1CD9F;BLOCK OCTANT-12568;So;0;ON;;;;;N;;;;; +1CDA0;BLOCK OCTANT-3568;So;0;ON;;;;;N;;;;; +1CDA1;BLOCK OCTANT-13568;So;0;ON;;;;;N;;;;; +1CDA2;BLOCK OCTANT-23568;So;0;ON;;;;;N;;;;; +1CDA3;BLOCK OCTANT-123568;So;0;ON;;;;;N;;;;; +1CDA4;BLOCK OCTANT-4568;So;0;ON;;;;;N;;;;; +1CDA5;BLOCK OCTANT-14568;So;0;ON;;;;;N;;;;; +1CDA6;BLOCK OCTANT-24568;So;0;ON;;;;;N;;;;; +1CDA7;BLOCK OCTANT-124568;So;0;ON;;;;;N;;;;; +1CDA8;BLOCK OCTANT-34568;So;0;ON;;;;;N;;;;; +1CDA9;BLOCK OCTANT-134568;So;0;ON;;;;;N;;;;; +1CDAA;BLOCK OCTANT-234568;So;0;ON;;;;;N;;;;; +1CDAB;BLOCK OCTANT-1234568;So;0;ON;;;;;N;;;;; +1CDAC;BLOCK OCTANT-178;So;0;ON;;;;;N;;;;; +1CDAD;BLOCK OCTANT-278;So;0;ON;;;;;N;;;;; +1CDAE;BLOCK OCTANT-1278;So;0;ON;;;;;N;;;;; +1CDAF;BLOCK OCTANT-378;So;0;ON;;;;;N;;;;; +1CDB0;BLOCK OCTANT-1378;So;0;ON;;;;;N;;;;; +1CDB1;BLOCK OCTANT-2378;So;0;ON;;;;;N;;;;; +1CDB2;BLOCK OCTANT-12378;So;0;ON;;;;;N;;;;; +1CDB3;BLOCK OCTANT-478;So;0;ON;;;;;N;;;;; +1CDB4;BLOCK OCTANT-1478;So;0;ON;;;;;N;;;;; +1CDB5;BLOCK OCTANT-2478;So;0;ON;;;;;N;;;;; +1CDB6;BLOCK OCTANT-12478;So;0;ON;;;;;N;;;;; +1CDB7;BLOCK OCTANT-3478;So;0;ON;;;;;N;;;;; +1CDB8;BLOCK OCTANT-13478;So;0;ON;;;;;N;;;;; +1CDB9;BLOCK OCTANT-23478;So;0;ON;;;;;N;;;;; +1CDBA;BLOCK OCTANT-123478;So;0;ON;;;;;N;;;;; +1CDBB;BLOCK OCTANT-578;So;0;ON;;;;;N;;;;; +1CDBC;BLOCK OCTANT-1578;So;0;ON;;;;;N;;;;; +1CDBD;BLOCK OCTANT-2578;So;0;ON;;;;;N;;;;; +1CDBE;BLOCK OCTANT-12578;So;0;ON;;;;;N;;;;; +1CDBF;BLOCK OCTANT-3578;So;0;ON;;;;;N;;;;; +1CDC0;BLOCK OCTANT-13578;So;0;ON;;;;;N;;;;; +1CDC1;BLOCK OCTANT-23578;So;0;ON;;;;;N;;;;; +1CDC2;BLOCK OCTANT-123578;So;0;ON;;;;;N;;;;; +1CDC3;BLOCK OCTANT-4578;So;0;ON;;;;;N;;;;; +1CDC4;BLOCK OCTANT-14578;So;0;ON;;;;;N;;;;; +1CDC5;BLOCK OCTANT-24578;So;0;ON;;;;;N;;;;; +1CDC6;BLOCK OCTANT-124578;So;0;ON;;;;;N;;;;; +1CDC7;BLOCK OCTANT-34578;So;0;ON;;;;;N;;;;; +1CDC8;BLOCK OCTANT-134578;So;0;ON;;;;;N;;;;; +1CDC9;BLOCK OCTANT-234578;So;0;ON;;;;;N;;;;; +1CDCA;BLOCK OCTANT-1234578;So;0;ON;;;;;N;;;;; +1CDCB;BLOCK OCTANT-678;So;0;ON;;;;;N;;;;; +1CDCC;BLOCK OCTANT-1678;So;0;ON;;;;;N;;;;; +1CDCD;BLOCK OCTANT-2678;So;0;ON;;;;;N;;;;; +1CDCE;BLOCK OCTANT-12678;So;0;ON;;;;;N;;;;; +1CDCF;BLOCK OCTANT-3678;So;0;ON;;;;;N;;;;; +1CDD0;BLOCK OCTANT-13678;So;0;ON;;;;;N;;;;; +1CDD1;BLOCK OCTANT-23678;So;0;ON;;;;;N;;;;; +1CDD2;BLOCK OCTANT-123678;So;0;ON;;;;;N;;;;; +1CDD3;BLOCK OCTANT-4678;So;0;ON;;;;;N;;;;; +1CDD4;BLOCK OCTANT-14678;So;0;ON;;;;;N;;;;; +1CDD5;BLOCK OCTANT-24678;So;0;ON;;;;;N;;;;; +1CDD6;BLOCK OCTANT-124678;So;0;ON;;;;;N;;;;; +1CDD7;BLOCK OCTANT-34678;So;0;ON;;;;;N;;;;; +1CDD8;BLOCK OCTANT-134678;So;0;ON;;;;;N;;;;; +1CDD9;BLOCK OCTANT-234678;So;0;ON;;;;;N;;;;; +1CDDA;BLOCK OCTANT-1234678;So;0;ON;;;;;N;;;;; +1CDDB;BLOCK OCTANT-15678;So;0;ON;;;;;N;;;;; +1CDDC;BLOCK OCTANT-25678;So;0;ON;;;;;N;;;;; +1CDDD;BLOCK OCTANT-125678;So;0;ON;;;;;N;;;;; +1CDDE;BLOCK OCTANT-35678;So;0;ON;;;;;N;;;;; +1CDDF;BLOCK OCTANT-235678;So;0;ON;;;;;N;;;;; +1CDE0;BLOCK OCTANT-1235678;So;0;ON;;;;;N;;;;; +1CDE1;BLOCK OCTANT-45678;So;0;ON;;;;;N;;;;; +1CDE2;BLOCK OCTANT-145678;So;0;ON;;;;;N;;;;; +1CDE3;BLOCK OCTANT-1245678;So;0;ON;;;;;N;;;;; +1CDE4;BLOCK OCTANT-1345678;So;0;ON;;;;;N;;;;; +1CDE5;BLOCK OCTANT-2345678;So;0;ON;;;;;N;;;;; +1CDE6;TOP HALF STANDING PERSON;So;0;ON;;;;;N;;;;; +1CDE7;BOTTOM HALF STANDING PERSON;So;0;ON;;;;;N;;;;; +1CDE8;TOP HALF RIGHT-FACING RUNNER FRAME-1;So;0;ON;;;;;N;;;;; +1CDE9;BOTTOM HALF RIGHT-FACING RUNNER FRAME-1;So;0;ON;;;;;N;;;;; +1CDEA;TOP HALF RIGHT-FACING RUNNER FRAME-2;So;0;ON;;;;;N;;;;; +1CDEB;BOTTOM HALF RIGHT-FACING RUNNER FRAME-2;So;0;ON;;;;;N;;;;; +1CDEC;TOP HALF LEFT-FACING RUNNER FRAME-1;So;0;ON;;;;;N;;;;; +1CDED;BOTTOM HALF LEFT-FACING RUNNER FRAME-1;So;0;ON;;;;;N;;;;; +1CDEE;TOP HALF LEFT-FACING RUNNER FRAME-2;So;0;ON;;;;;N;;;;; +1CDEF;BOTTOM HALF LEFT-FACING RUNNER FRAME-2;So;0;ON;;;;;N;;;;; +1CDF0;TOP HALF FORWARD-FACING RUNNER;So;0;ON;;;;;N;;;;; +1CDF1;BOTTOM HALF FORWARD-FACING RUNNER FRAME-1;So;0;ON;;;;;N;;;;; +1CDF2;BOTTOM HALF FORWARD-FACING RUNNER FRAME-2;So;0;ON;;;;;N;;;;; +1CDF3;BOTTOM HALF FORWARD-FACING RUNNER FRAME-3;So;0;ON;;;;;N;;;;; +1CDF4;BOTTOM HALF FORWARD-FACING RUNNER FRAME-4;So;0;ON;;;;;N;;;;; +1CDF5;MOON LANDER;So;0;ON;;;;;N;;;;; +1CDF6;TOP HALF FLAILING ROBOT FRAME-1;So;0;ON;;;;;N;;;;; +1CDF7;TOP HALF FLAILING ROBOT FRAME-2;So;0;ON;;;;;N;;;;; +1CDF8;DOWN-POINTING AIRPLANE;So;0;ON;;;;;N;;;;; +1CDF9;LEFT-POINTING AIRPLANE;So;0;ON;;;;;N;;;;; +1CDFA;SMALL UP-POINTING AIRPLANE;So;0;ON;;;;;N;;;;; +1CDFB;UP-POINTING FROG;So;0;ON;;;;;N;;;;; +1CDFC;DOWN-POINTING FROG;So;0;ON;;;;;N;;;;; +1CDFD;EXPLOSION FRAME-1;So;0;ON;;;;;N;;;;; +1CDFE;EXPLOSION FRAME-2;So;0;ON;;;;;N;;;;; +1CDFF;EXPLOSION FRAME-3;So;0;ON;;;;;N;;;;; +1CE00;RIGHT HALF AND LEFT HALF WHITE CIRCLE;So;0;ON;;;;;N;;;;; +1CE01;LOWER HALF AND UPPER HALF WHITE CIRCLE;So;0;ON;;;;;N;;;;; +1CE02;EXPLOSION AT HORIZON;So;0;ON;;;;;N;;;;; +1CE03;UPPER HALF HEAVY WHITE SQUARE;So;0;ON;;;;;N;;;;; +1CE04;LOWER HALF HEAVY WHITE SQUARE;So;0;ON;;;;;N;;;;; +1CE05;HEAVY WHITE SQUARE CONTAINING BLACK VERY SMALL SQUARE;So;0;ON;;;;;N;;;;; +1CE06;WHITE VERTICAL RECTANGLE WITH HORIZONTAL BAR;So;0;ON;;;;;N;;;;; +1CE07;TOP LEFT BLACK LEFT-POINTING SMALL TRIANGLE;So;0;ON;;;;;N;;;;; +1CE08;FUNNEL;So;0;ON;;;;;N;;;;; +1CE09;BOX DRAWINGS DOUBLE DIAGONAL LOWER LEFT TO MIDDLE CENTRE TO LOWER RIGHT;So;0;ON;;;;;N;;;;; +1CE0A;BOX DRAWINGS DOUBLE DIAGONAL UPPER LEFT TO MIDDLE CENTRE TO UPPER RIGHT;So;0;ON;;;;;N;;;;; +1CE0B;LEFT HALF WHITE ELLIPSE;So;0;ON;;;;;N;;;;; +1CE0C;RIGHT HALF WHITE ELLIPSE;So;0;ON;;;;;N;;;;; +1CE0D;LEFT HALF TRIPLE DASH HORIZONTAL;So;0;ON;;;;;N;;;;; +1CE0E;RIGHT HALF TRIPLE DASH HORIZONTAL;So;0;ON;;;;;N;;;;; +1CE0F;HORIZONTAL LINE WITH TICK MARK;So;0;ON;;;;;N;;;;; +1CE10;LEFT HALF HORIZONTAL LINE WITH THREE TICK MARKS;So;0;ON;;;;;N;;;;; +1CE11;RIGHT HALF HORIZONTAL LINE WITH THREE TICK MARKS;So;0;ON;;;;;N;;;;; +1CE12;HORIZONTAL LINE WITH THREE TICK MARKS;So;0;ON;;;;;N;;;;; +1CE13;LOWER HALF VERTICAL LINE WITH THREE TICK MARKS;So;0;ON;;;;;N;;;;; +1CE14;UPPER HALF VERTICAL LINE WITH THREE TICK MARKS;So;0;ON;;;;;N;;;;; +1CE15;VERTICAL LINE WITH THREE TICK MARKS;So;0;ON;;;;;N;;;;; +1CE16;BOX DRAWINGS LIGHT VERTICAL AND TOP RIGHT;So;0;ON;;;;;N;;;;; +1CE17;BOX DRAWINGS LIGHT VERTICAL AND BOTTOM RIGHT;So;0;ON;;;;;N;;;;; +1CE18;BOX DRAWINGS LIGHT VERTICAL AND TOP LEFT;So;0;ON;;;;;N;;;;; +1CE19;BOX DRAWINGS LIGHT VERTICAL AND BOTTOM LEFT;So;0;ON;;;;;N;;;;; +1CE1A;LARGE TYPE PIECE UPPER LEFT ARC;So;0;ON;;;;;N;;;;; +1CE1B;LARGE TYPE PIECE UPPER LEFT CORNER;So;0;ON;;;;;N;;;;; +1CE1C;LARGE TYPE PIECE UPPER TERMINAL;So;0;ON;;;;;N;;;;; +1CE1D;LARGE TYPE PIECE UPPER LEFT CROTCH;So;0;ON;;;;;N;;;;; +1CE1E;LARGE TYPE PIECE LEFT ARM;So;0;ON;;;;;N;;;;; +1CE1F;LARGE TYPE PIECE CROSSBAR;So;0;ON;;;;;N;;;;; +1CE20;LARGE TYPE PIECE CROSSBAR WITH LOWER STEM;So;0;ON;;;;;N;;;;; +1CE21;LARGE TYPE PIECE UPPER HALF VERTEX OF M;So;0;ON;;;;;N;;;;; +1CE22;LARGE TYPE PIECE DIAGONAL LOWER LEFT;So;0;ON;;;;;N;;;;; +1CE23;LARGE TYPE PIECE SHORT UPPER TERMINAL;So;0;ON;;;;;N;;;;; +1CE24;LARGE TYPE PIECE UPPER RIGHT ARC;So;0;ON;;;;;N;;;;; +1CE25;LARGE TYPE PIECE RIGHT ARM;So;0;ON;;;;;N;;;;; +1CE26;LARGE TYPE PIECE UPPER RIGHT CROTCH;So;0;ON;;;;;N;;;;; +1CE27;LARGE TYPE PIECE UPPER RIGHT CORNER;So;0;ON;;;;;N;;;;; +1CE28;LARGE TYPE PIECE STEM WITH RIGHT CROSSBAR;So;0;ON;;;;;N;;;;; +1CE29;LARGE TYPE PIECE STEM;So;0;ON;;;;;N;;;;; +1CE2A;LARGE TYPE PIECE DIAGONAL UPPER RIGHT AND LOWER RIGHT;So;0;ON;;;;;N;;;;; +1CE2B;LARGE TYPE PIECE DIAGONAL UPPER RIGHT;So;0;ON;;;;;N;;;;; +1CE2C;LARGE TYPE PIECE DIAGONAL LOWER RIGHT;So;0;ON;;;;;N;;;;; +1CE2D;LARGE TYPE PIECE SHORT LOWER TERMINAL;So;0;ON;;;;;N;;;;; +1CE2E;LARGE TYPE PIECE LOWER LEFT AND UPPER LEFT ARC;So;0;ON;;;;;N;;;;; +1CE2F;LARGE TYPE PIECE CENTRE OF K;So;0;ON;;;;;N;;;;; +1CE30;LARGE TYPE PIECE LOWER HALF VERTEX OF M;So;0;ON;;;;;N;;;;; +1CE31;LARGE TYPE PIECE UPPER HALF VERTEX OF W;So;0;ON;;;;;N;;;;; +1CE32;LARGE TYPE PIECE CENTRE OF X;So;0;ON;;;;;N;;;;; +1CE33;LARGE TYPE PIECE CENTRE OF Y;So;0;ON;;;;;N;;;;; +1CE34;LARGE TYPE PIECE CENTRE OF Z WITH CROSSBAR;So;0;ON;;;;;N;;;;; +1CE35;LARGE TYPE PIECE RAISED UPPER LEFT ARC;So;0;ON;;;;;N;;;;; +1CE36;LARGE TYPE PIECE STEM WITH LEFT CROSSBAR;So;0;ON;;;;;N;;;;; +1CE37;LARGE TYPE PIECE LOWER RIGHT AND UPPER RIGHT ARC;So;0;ON;;;;;N;;;;; +1CE38;LARGE TYPE PIECE DIAGONAL UPPER LEFT AND LOWER LEFT;So;0;ON;;;;;N;;;;; +1CE39;LARGE TYPE PIECE STEM WITH LEFT JOINT;So;0;ON;;;;;N;;;;; +1CE3A;LARGE TYPE PIECE STEM WITH CROSSBAR;So;0;ON;;;;;N;;;;; +1CE3B;LARGE TYPE PIECE DIAGONAL UPPER LEFT;So;0;ON;;;;;N;;;;; +1CE3C;LARGE TYPE PIECE LOWER TERMINAL;So;0;ON;;;;;N;;;;; +1CE3D;LARGE TYPE PIECE LOWER LEFT CORNER;So;0;ON;;;;;N;;;;; +1CE3E;LARGE TYPE PIECE LOWER LEFT ARC;So;0;ON;;;;;N;;;;; +1CE3F;LARGE TYPE PIECE LOWER LEFT CROTCH;So;0;ON;;;;;N;;;;; +1CE40;LARGE TYPE PIECE CROSSBAR WITH UPPER STEM;So;0;ON;;;;;N;;;;; +1CE41;LARGE TYPE PIECE VERTEX OF V;So;0;ON;;;;;N;;;;; +1CE42;LARGE TYPE PIECE LOWER HALF VERTEX OF W;So;0;ON;;;;;N;;;;; +1CE43;LARGE TYPE PIECE LOWER RIGHT ARC;So;0;ON;;;;;N;;;;; +1CE44;LARGE TYPE PIECE LOWER RIGHT CORNER;So;0;ON;;;;;N;;;;; +1CE45;LARGE TYPE PIECE LOWER RIGHT ARC WITH TAIL;So;0;ON;;;;;N;;;;; +1CE46;LARGE TYPE PIECE LOWER RIGHT CROTCH;So;0;ON;;;;;N;;;;; +1CE47;LARGE TYPE PIECE STEM-45;So;0;ON;;;;;N;;;;; +1CE48;LARGE TYPE PIECE STEM-2345;So;0;ON;;;;;N;;;;; +1CE49;LARGE TYPE PIECE STEM-4;So;0;ON;;;;;N;;;;; +1CE4A;LARGE TYPE PIECE STEM-34;So;0;ON;;;;;N;;;;; +1CE4B;LARGE TYPE PIECE STEM-234;So;0;ON;;;;;N;;;;; +1CE4C;LARGE TYPE PIECE STEM-1234;So;0;ON;;;;;N;;;;; +1CE4D;LARGE TYPE PIECE STEM-3;So;0;ON;;;;;N;;;;; +1CE4E;LARGE TYPE PIECE STEM-23;So;0;ON;;;;;N;;;;; +1CE4F;LARGE TYPE PIECE STEM-2;So;0;ON;;;;;N;;;;; +1CE50;LARGE TYPE PIECE STEM-12;So;0;ON;;;;;N;;;;; +1CE51;SEPARATED BLOCK SEXTANT-1;So;0;ON;;;;;N;;;;; +1CE52;SEPARATED BLOCK SEXTANT-2;So;0;ON;;;;;N;;;;; +1CE53;SEPARATED BLOCK SEXTANT-12;So;0;ON;;;;;N;;;;; +1CE54;SEPARATED BLOCK SEXTANT-3;So;0;ON;;;;;N;;;;; +1CE55;SEPARATED BLOCK SEXTANT-13;So;0;ON;;;;;N;;;;; +1CE56;SEPARATED BLOCK SEXTANT-23;So;0;ON;;;;;N;;;;; +1CE57;SEPARATED BLOCK SEXTANT-123;So;0;ON;;;;;N;;;;; +1CE58;SEPARATED BLOCK SEXTANT-4;So;0;ON;;;;;N;;;;; +1CE59;SEPARATED BLOCK SEXTANT-14;So;0;ON;;;;;N;;;;; +1CE5A;SEPARATED BLOCK SEXTANT-24;So;0;ON;;;;;N;;;;; +1CE5B;SEPARATED BLOCK SEXTANT-124;So;0;ON;;;;;N;;;;; +1CE5C;SEPARATED BLOCK SEXTANT-34;So;0;ON;;;;;N;;;;; +1CE5D;SEPARATED BLOCK SEXTANT-134;So;0;ON;;;;;N;;;;; +1CE5E;SEPARATED BLOCK SEXTANT-234;So;0;ON;;;;;N;;;;; +1CE5F;SEPARATED BLOCK SEXTANT-1234;So;0;ON;;;;;N;;;;; +1CE60;SEPARATED BLOCK SEXTANT-5;So;0;ON;;;;;N;;;;; +1CE61;SEPARATED BLOCK SEXTANT-15;So;0;ON;;;;;N;;;;; +1CE62;SEPARATED BLOCK SEXTANT-25;So;0;ON;;;;;N;;;;; +1CE63;SEPARATED BLOCK SEXTANT-125;So;0;ON;;;;;N;;;;; +1CE64;SEPARATED BLOCK SEXTANT-35;So;0;ON;;;;;N;;;;; +1CE65;SEPARATED BLOCK SEXTANT-135;So;0;ON;;;;;N;;;;; +1CE66;SEPARATED BLOCK SEXTANT-235;So;0;ON;;;;;N;;;;; +1CE67;SEPARATED BLOCK SEXTANT-1235;So;0;ON;;;;;N;;;;; +1CE68;SEPARATED BLOCK SEXTANT-45;So;0;ON;;;;;N;;;;; +1CE69;SEPARATED BLOCK SEXTANT-145;So;0;ON;;;;;N;;;;; +1CE6A;SEPARATED BLOCK SEXTANT-245;So;0;ON;;;;;N;;;;; +1CE6B;SEPARATED BLOCK SEXTANT-1245;So;0;ON;;;;;N;;;;; +1CE6C;SEPARATED BLOCK SEXTANT-345;So;0;ON;;;;;N;;;;; +1CE6D;SEPARATED BLOCK SEXTANT-1345;So;0;ON;;;;;N;;;;; +1CE6E;SEPARATED BLOCK SEXTANT-2345;So;0;ON;;;;;N;;;;; +1CE6F;SEPARATED BLOCK SEXTANT-12345;So;0;ON;;;;;N;;;;; +1CE70;SEPARATED BLOCK SEXTANT-6;So;0;ON;;;;;N;;;;; +1CE71;SEPARATED BLOCK SEXTANT-16;So;0;ON;;;;;N;;;;; +1CE72;SEPARATED BLOCK SEXTANT-26;So;0;ON;;;;;N;;;;; +1CE73;SEPARATED BLOCK SEXTANT-126;So;0;ON;;;;;N;;;;; +1CE74;SEPARATED BLOCK SEXTANT-36;So;0;ON;;;;;N;;;;; +1CE75;SEPARATED BLOCK SEXTANT-136;So;0;ON;;;;;N;;;;; +1CE76;SEPARATED BLOCK SEXTANT-236;So;0;ON;;;;;N;;;;; +1CE77;SEPARATED BLOCK SEXTANT-1236;So;0;ON;;;;;N;;;;; +1CE78;SEPARATED BLOCK SEXTANT-46;So;0;ON;;;;;N;;;;; +1CE79;SEPARATED BLOCK SEXTANT-146;So;0;ON;;;;;N;;;;; +1CE7A;SEPARATED BLOCK SEXTANT-246;So;0;ON;;;;;N;;;;; +1CE7B;SEPARATED BLOCK SEXTANT-1246;So;0;ON;;;;;N;;;;; +1CE7C;SEPARATED BLOCK SEXTANT-346;So;0;ON;;;;;N;;;;; +1CE7D;SEPARATED BLOCK SEXTANT-1346;So;0;ON;;;;;N;;;;; +1CE7E;SEPARATED BLOCK SEXTANT-2346;So;0;ON;;;;;N;;;;; +1CE7F;SEPARATED BLOCK SEXTANT-12346;So;0;ON;;;;;N;;;;; +1CE80;SEPARATED BLOCK SEXTANT-56;So;0;ON;;;;;N;;;;; +1CE81;SEPARATED BLOCK SEXTANT-156;So;0;ON;;;;;N;;;;; +1CE82;SEPARATED BLOCK SEXTANT-256;So;0;ON;;;;;N;;;;; +1CE83;SEPARATED BLOCK SEXTANT-1256;So;0;ON;;;;;N;;;;; +1CE84;SEPARATED BLOCK SEXTANT-356;So;0;ON;;;;;N;;;;; +1CE85;SEPARATED BLOCK SEXTANT-1356;So;0;ON;;;;;N;;;;; +1CE86;SEPARATED BLOCK SEXTANT-2356;So;0;ON;;;;;N;;;;; +1CE87;SEPARATED BLOCK SEXTANT-12356;So;0;ON;;;;;N;;;;; +1CE88;SEPARATED BLOCK SEXTANT-456;So;0;ON;;;;;N;;;;; +1CE89;SEPARATED BLOCK SEXTANT-1456;So;0;ON;;;;;N;;;;; +1CE8A;SEPARATED BLOCK SEXTANT-2456;So;0;ON;;;;;N;;;;; +1CE8B;SEPARATED BLOCK SEXTANT-12456;So;0;ON;;;;;N;;;;; +1CE8C;SEPARATED BLOCK SEXTANT-3456;So;0;ON;;;;;N;;;;; +1CE8D;SEPARATED BLOCK SEXTANT-13456;So;0;ON;;;;;N;;;;; +1CE8E;SEPARATED BLOCK SEXTANT-23456;So;0;ON;;;;;N;;;;; +1CE8F;SEPARATED BLOCK SEXTANT-123456;So;0;ON;;;;;N;;;;; +1CE90;UPPER LEFT ONE SIXTEENTH BLOCK;So;0;ON;;;;;N;;;;; +1CE91;UPPER CENTRE LEFT ONE SIXTEENTH BLOCK;So;0;ON;;;;;N;;;;; +1CE92;UPPER CENTRE RIGHT ONE SIXTEENTH BLOCK;So;0;ON;;;;;N;;;;; +1CE93;UPPER RIGHT ONE SIXTEENTH BLOCK;So;0;ON;;;;;N;;;;; +1CE94;UPPER MIDDLE LEFT ONE SIXTEENTH BLOCK;So;0;ON;;;;;N;;;;; +1CE95;UPPER MIDDLE CENTRE LEFT ONE SIXTEENTH BLOCK;So;0;ON;;;;;N;;;;; +1CE96;UPPER MIDDLE CENTRE RIGHT ONE SIXTEENTH BLOCK;So;0;ON;;;;;N;;;;; +1CE97;UPPER MIDDLE RIGHT ONE SIXTEENTH BLOCK;So;0;ON;;;;;N;;;;; +1CE98;LOWER MIDDLE LEFT ONE SIXTEENTH BLOCK;So;0;ON;;;;;N;;;;; +1CE99;LOWER MIDDLE CENTRE LEFT ONE SIXTEENTH BLOCK;So;0;ON;;;;;N;;;;; +1CE9A;LOWER MIDDLE CENTRE RIGHT ONE SIXTEENTH BLOCK;So;0;ON;;;;;N;;;;; +1CE9B;LOWER MIDDLE RIGHT ONE SIXTEENTH BLOCK;So;0;ON;;;;;N;;;;; +1CE9C;LOWER LEFT ONE SIXTEENTH BLOCK;So;0;ON;;;;;N;;;;; +1CE9D;LOWER CENTRE LEFT ONE SIXTEENTH BLOCK;So;0;ON;;;;;N;;;;; +1CE9E;LOWER CENTRE RIGHT ONE SIXTEENTH BLOCK;So;0;ON;;;;;N;;;;; +1CE9F;LOWER RIGHT ONE SIXTEENTH BLOCK;So;0;ON;;;;;N;;;;; +1CEA0;RIGHT HALF LOWER ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1CEA1;RIGHT THREE QUARTERS LOWER ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1CEA2;LEFT THREE QUARTERS LOWER ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1CEA3;LEFT HALF LOWER ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1CEA4;LOWER HALF LEFT ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1CEA5;LOWER THREE QUARTERS LEFT ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1CEA6;UPPER THREE QUARTERS LEFT ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1CEA7;UPPER HALF LEFT ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1CEA8;LEFT HALF UPPER ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1CEA9;LEFT THREE QUARTERS UPPER ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1CEAA;RIGHT THREE QUARTERS UPPER ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1CEAB;RIGHT HALF UPPER ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1CEAC;UPPER HALF RIGHT ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1CEAD;UPPER THREE QUARTERS RIGHT ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1CEAE;LOWER THREE QUARTERS RIGHT ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1CEAF;LOWER HALF RIGHT ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1CEB0;HORIZONTAL ZIGZAG LINE;So;0;ON;;;;;N;;;;; +1CEB1;KEYHOLE;So;0;ON;;;;;N;;;;; +1CEB2;OLD PERSONAL COMPUTER WITH MONITOR IN PORTRAIT ORIENTATION;So;0;ON;;;;;N;;;;; +1CEB3;BLACK RIGHT TRIANGLE CARET;So;0;ON;;;;;N;;;;; 1CF00;ZNAMENNY COMBINING MARK GORAZDO NIZKO S KRYZHEM ON LEFT;Mn;0;NSM;;;;;N;;;;; 1CF01;ZNAMENNY COMBINING MARK NIZKO S KRYZHEM ON LEFT;Mn;0;NSM;;;;;N;;;;; 1CF02;ZNAMENNY COMBINING MARK TSATA ON LEFT;Mn;0;NSM;;;;;N;;;;; @@ -29545,7 +34630,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1D6BE;MATHEMATICAL BOLD CAPITAL CHI;Lu;0;L;<font> 03A7;;;;N;;;;; 1D6BF;MATHEMATICAL BOLD CAPITAL PSI;Lu;0;L;<font> 03A8;;;;N;;;;; 1D6C0;MATHEMATICAL BOLD CAPITAL OMEGA;Lu;0;L;<font> 03A9;;;;N;;;;; -1D6C1;MATHEMATICAL BOLD NABLA;Sm;0;L;<font> 2207;;;;N;;;;; +1D6C1;MATHEMATICAL BOLD NABLA;Sm;0;ON;<font> 2207;;;;N;;;;; 1D6C2;MATHEMATICAL BOLD SMALL ALPHA;Ll;0;L;<font> 03B1;;;;N;;;;; 1D6C3;MATHEMATICAL BOLD SMALL BETA;Ll;0;L;<font> 03B2;;;;N;;;;; 1D6C4;MATHEMATICAL BOLD SMALL GAMMA;Ll;0;L;<font> 03B3;;;;N;;;;; @@ -29603,7 +34688,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1D6F8;MATHEMATICAL ITALIC CAPITAL CHI;Lu;0;L;<font> 03A7;;;;N;;;;; 1D6F9;MATHEMATICAL ITALIC CAPITAL PSI;Lu;0;L;<font> 03A8;;;;N;;;;; 1D6FA;MATHEMATICAL ITALIC CAPITAL OMEGA;Lu;0;L;<font> 03A9;;;;N;;;;; -1D6FB;MATHEMATICAL ITALIC NABLA;Sm;0;L;<font> 2207;;;;N;;;;; +1D6FB;MATHEMATICAL ITALIC NABLA;Sm;0;ON;<font> 2207;;;;N;;;;; 1D6FC;MATHEMATICAL ITALIC SMALL ALPHA;Ll;0;L;<font> 03B1;;;;N;;;;; 1D6FD;MATHEMATICAL ITALIC SMALL BETA;Ll;0;L;<font> 03B2;;;;N;;;;; 1D6FE;MATHEMATICAL ITALIC SMALL GAMMA;Ll;0;L;<font> 03B3;;;;N;;;;; @@ -29661,7 +34746,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1D732;MATHEMATICAL BOLD ITALIC CAPITAL CHI;Lu;0;L;<font> 03A7;;;;N;;;;; 1D733;MATHEMATICAL BOLD ITALIC CAPITAL PSI;Lu;0;L;<font> 03A8;;;;N;;;;; 1D734;MATHEMATICAL BOLD ITALIC CAPITAL OMEGA;Lu;0;L;<font> 03A9;;;;N;;;;; -1D735;MATHEMATICAL BOLD ITALIC NABLA;Sm;0;L;<font> 2207;;;;N;;;;; +1D735;MATHEMATICAL BOLD ITALIC NABLA;Sm;0;ON;<font> 2207;;;;N;;;;; 1D736;MATHEMATICAL BOLD ITALIC SMALL ALPHA;Ll;0;L;<font> 03B1;;;;N;;;;; 1D737;MATHEMATICAL BOLD ITALIC SMALL BETA;Ll;0;L;<font> 03B2;;;;N;;;;; 1D738;MATHEMATICAL BOLD ITALIC SMALL GAMMA;Ll;0;L;<font> 03B3;;;;N;;;;; @@ -29719,7 +34804,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1D76C;MATHEMATICAL SANS-SERIF BOLD CAPITAL CHI;Lu;0;L;<font> 03A7;;;;N;;;;; 1D76D;MATHEMATICAL SANS-SERIF BOLD CAPITAL PSI;Lu;0;L;<font> 03A8;;;;N;;;;; 1D76E;MATHEMATICAL SANS-SERIF BOLD CAPITAL OMEGA;Lu;0;L;<font> 03A9;;;;N;;;;; -1D76F;MATHEMATICAL SANS-SERIF BOLD NABLA;Sm;0;L;<font> 2207;;;;N;;;;; +1D76F;MATHEMATICAL SANS-SERIF BOLD NABLA;Sm;0;ON;<font> 2207;;;;N;;;;; 1D770;MATHEMATICAL SANS-SERIF BOLD SMALL ALPHA;Ll;0;L;<font> 03B1;;;;N;;;;; 1D771;MATHEMATICAL SANS-SERIF BOLD SMALL BETA;Ll;0;L;<font> 03B2;;;;N;;;;; 1D772;MATHEMATICAL SANS-SERIF BOLD SMALL GAMMA;Ll;0;L;<font> 03B3;;;;N;;;;; @@ -29777,7 +34862,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1D7A6;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL CHI;Lu;0;L;<font> 03A7;;;;N;;;;; 1D7A7;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL PSI;Lu;0;L;<font> 03A8;;;;N;;;;; 1D7A8;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL OMEGA;Lu;0;L;<font> 03A9;;;;N;;;;; -1D7A9;MATHEMATICAL SANS-SERIF BOLD ITALIC NABLA;Sm;0;L;<font> 2207;;;;N;;;;; +1D7A9;MATHEMATICAL SANS-SERIF BOLD ITALIC NABLA;Sm;0;ON;<font> 2207;;;;N;;;;; 1D7AA;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL ALPHA;Ll;0;L;<font> 03B1;;;;N;;;;; 1D7AB;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL BETA;Ll;0;L;<font> 03B2;;;;N;;;;; 1D7AC;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL GAMMA;Ll;0;L;<font> 03B3;;;;N;;;;; @@ -30875,6 +35960,50 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1E4F7;NAG MUNDARI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; 1E4F8;NAG MUNDARI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; 1E4F9;NAG MUNDARI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +1E5D0;OL ONAL LETTER O;Lo;0;L;;;;;N;;;;; +1E5D1;OL ONAL LETTER OM;Lo;0;L;;;;;N;;;;; +1E5D2;OL ONAL LETTER ONG;Lo;0;L;;;;;N;;;;; +1E5D3;OL ONAL LETTER ORR;Lo;0;L;;;;;N;;;;; +1E5D4;OL ONAL LETTER OO;Lo;0;L;;;;;N;;;;; +1E5D5;OL ONAL LETTER OY;Lo;0;L;;;;;N;;;;; +1E5D6;OL ONAL LETTER A;Lo;0;L;;;;;N;;;;; +1E5D7;OL ONAL LETTER AD;Lo;0;L;;;;;N;;;;; +1E5D8;OL ONAL LETTER AB;Lo;0;L;;;;;N;;;;; +1E5D9;OL ONAL LETTER AH;Lo;0;L;;;;;N;;;;; +1E5DA;OL ONAL LETTER AL;Lo;0;L;;;;;N;;;;; +1E5DB;OL ONAL LETTER AW;Lo;0;L;;;;;N;;;;; +1E5DC;OL ONAL LETTER I;Lo;0;L;;;;;N;;;;; +1E5DD;OL ONAL LETTER IT;Lo;0;L;;;;;N;;;;; +1E5DE;OL ONAL LETTER IP;Lo;0;L;;;;;N;;;;; +1E5DF;OL ONAL LETTER ITT;Lo;0;L;;;;;N;;;;; +1E5E0;OL ONAL LETTER ID;Lo;0;L;;;;;N;;;;; +1E5E1;OL ONAL LETTER IN;Lo;0;L;;;;;N;;;;; +1E5E2;OL ONAL LETTER U;Lo;0;L;;;;;N;;;;; +1E5E3;OL ONAL LETTER UK;Lo;0;L;;;;;N;;;;; +1E5E4;OL ONAL LETTER UDD;Lo;0;L;;;;;N;;;;; +1E5E5;OL ONAL LETTER UJ;Lo;0;L;;;;;N;;;;; +1E5E6;OL ONAL LETTER UNY;Lo;0;L;;;;;N;;;;; +1E5E7;OL ONAL LETTER UR;Lo;0;L;;;;;N;;;;; +1E5E8;OL ONAL LETTER E;Lo;0;L;;;;;N;;;;; +1E5E9;OL ONAL LETTER ES;Lo;0;L;;;;;N;;;;; +1E5EA;OL ONAL LETTER EH;Lo;0;L;;;;;N;;;;; +1E5EB;OL ONAL LETTER EC;Lo;0;L;;;;;N;;;;; +1E5EC;OL ONAL LETTER ENN;Lo;0;L;;;;;N;;;;; +1E5ED;OL ONAL LETTER EG;Lo;0;L;;;;;N;;;;; +1E5EE;OL ONAL SIGN MU;Mn;230;NSM;;;;;N;;;;; +1E5EF;OL ONAL SIGN IKIR;Mn;220;NSM;;;;;N;;;;; +1E5F0;OL ONAL SIGN HODDOND;Lo;0;L;;;;;N;;;;; +1E5F1;OL ONAL DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +1E5F2;OL ONAL DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +1E5F3;OL ONAL DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +1E5F4;OL ONAL DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +1E5F5;OL ONAL DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +1E5F6;OL ONAL DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +1E5F7;OL ONAL DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +1E5F8;OL ONAL DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +1E5F9;OL ONAL DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +1E5FA;OL ONAL DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +1E5FF;OL ONAL ABBREVIATION SIGN;Po;0;L;;;;;N;;;;; 1E7E0;ETHIOPIC SYLLABLE HHYA;Lo;0;L;;;;;N;;;;; 1E7E1;ETHIOPIC SYLLABLE HHYU;Lo;0;L;;;;;N;;;;; 1E7E2;ETHIOPIC SYLLABLE HHYI;Lo;0;L;;;;;N;;;;; @@ -33357,6 +38486,18 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1F8AD;WHITE ARROW SHAFT WIDTH TWO THIRDS;So;0;ON;;;;;N;;;;; 1F8B0;ARROW POINTING UPWARDS THEN NORTH WEST;So;0;ON;;;;;N;;;;; 1F8B1;ARROW POINTING RIGHTWARDS THEN CURVING SOUTH WEST;So;0;ON;;;;;N;;;;; +1F8B2;RIGHTWARDS ARROW WITH LOWER HOOK;So;0;ON;;;;;N;;;;; +1F8B3;DOWNWARDS BLACK ARROW TO BAR;So;0;ON;;;;;N;;;;; +1F8B4;NEGATIVE SQUARED LEFTWARDS ARROW;So;0;ON;;;;;N;;;;; +1F8B5;NEGATIVE SQUARED UPWARDS ARROW;So;0;ON;;;;;N;;;;; +1F8B6;NEGATIVE SQUARED RIGHTWARDS ARROW;So;0;ON;;;;;N;;;;; +1F8B7;NEGATIVE SQUARED DOWNWARDS ARROW;So;0;ON;;;;;N;;;;; +1F8B8;NORTH WEST ARROW FROM BAR;So;0;ON;;;;;N;;;;; +1F8B9;NORTH EAST ARROW FROM BAR;So;0;ON;;;;;N;;;;; +1F8BA;SOUTH EAST ARROW FROM BAR;So;0;ON;;;;;N;;;;; +1F8BB;SOUTH WEST ARROW FROM BAR;So;0;ON;;;;;N;;;;; +1F8C0;LEFTWARDS ARROW FROM DOWNWARDS ARROW;So;0;ON;;;;;N;;;;; +1F8C1;RIGHTWARDS ARROW FROM DOWNWARDS ARROW;So;0;ON;;;;;N;;;;; 1F900;CIRCLED CROSS FORMEE WITH FOUR DOTS;So;0;ON;;;;;N;;;;; 1F901;CIRCLED CROSS FORMEE WITH TWO DOTS;So;0;ON;;;;;N;;;;; 1F902;CIRCLED CROSS FORMEE;So;0;ON;;;;;N;;;;; @@ -33733,6 +38874,8 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1FA86;NESTING DOLLS;So;0;ON;;;;;N;;;;; 1FA87;MARACAS;So;0;ON;;;;;N;;;;; 1FA88;FLUTE;So;0;ON;;;;;N;;;;; +1FA89;HARP;So;0;ON;;;;;N;;;;; +1FA8F;SHOVEL;So;0;ON;;;;;N;;;;; 1FA90;RINGED PLANET;So;0;ON;;;;;N;;;;; 1FA91;CHAIR;So;0;ON;;;;;N;;;;; 1FA92;RAZOR;So;0;ON;;;;;N;;;;; @@ -33779,6 +38922,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1FABB;HYACINTH;So;0;ON;;;;;N;;;;; 1FABC;JELLYFISH;So;0;ON;;;;;N;;;;; 1FABD;WING;So;0;ON;;;;;N;;;;; +1FABE;LEAFLESS TREE;So;0;ON;;;;;N;;;;; 1FABF;GOOSE;So;0;ON;;;;;N;;;;; 1FAC0;ANATOMICAL HEART;So;0;ON;;;;;N;;;;; 1FAC1;LUNGS;So;0;ON;;;;;N;;;;; @@ -33786,6 +38930,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1FAC3;PREGNANT MAN;So;0;ON;;;;;N;;;;; 1FAC4;PREGNANT PERSON;So;0;ON;;;;;N;;;;; 1FAC5;PERSON WITH CROWN;So;0;ON;;;;;N;;;;; +1FAC6;FINGERPRINT;So;0;ON;;;;;N;;;;; 1FACE;MOOSE;So;0;ON;;;;;N;;;;; 1FACF;DONKEY;So;0;ON;;;;;N;;;;; 1FAD0;BLUEBERRIES;So;0;ON;;;;;N;;;;; @@ -33800,6 +38945,8 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1FAD9;JAR;So;0;ON;;;;;N;;;;; 1FADA;GINGER ROOT;So;0;ON;;;;;N;;;;; 1FADB;PEA POD;So;0;ON;;;;;N;;;;; +1FADC;ROOT VEGETABLE;So;0;ON;;;;;N;;;;; +1FADF;SPLATTER;So;0;ON;;;;;N;;;;; 1FAE0;MELTING FACE;So;0;ON;;;;;N;;;;; 1FAE1;SALUTING FACE;So;0;ON;;;;;N;;;;; 1FAE2;FACE WITH OPEN EYES AND HAND OVER MOUTH;So;0;ON;;;;;N;;;;; @@ -33809,6 +38956,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1FAE6;BITING LIP;So;0;ON;;;;;N;;;;; 1FAE7;BUBBLES;So;0;ON;;;;;N;;;;; 1FAE8;SHAKING FACE;So;0;ON;;;;;N;;;;; +1FAE9;FACE WITH BAGS UNDER EYES;So;0;ON;;;;;N;;;;; 1FAF0;HAND WITH INDEX FINGER AND THUMB CROSSED;So;0;ON;;;;;N;;;;; 1FAF1;RIGHTWARDS HAND;So;0;ON;;;;;N;;;;; 1FAF2;LEFTWARDS HAND;So;0;ON;;;;;N;;;;; @@ -34020,6 +39168,43 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1FBC8;STICK FIGURE LEANING RIGHT;So;0;ON;;;;;N;;;;; 1FBC9;STICK FIGURE WITH DRESS;So;0;ON;;;;;N;;;;; 1FBCA;WHITE UP-POINTING CHEVRON;So;0;ON;;;;;N;;;;; +1FBCB;WHITE CROSS MARK;So;0;ON;;;;;N;;;;; +1FBCC;RAISED SMALL LEFT SQUARE BRACKET;So;0;ON;;;;;N;;;;; +1FBCD;BLACK SMALL UP-POINTING CHEVRON;So;0;ON;;;;;N;;;;; +1FBCE;LEFT TWO THIRDS BLOCK;So;0;ON;;;;;N;;;;; +1FBCF;LEFT ONE THIRD BLOCK;So;0;ON;;;;;N;;;;; +1FBD0;BOX DRAWINGS LIGHT DIAGONAL MIDDLE RIGHT TO LOWER LEFT;So;0;ON;;;;;N;;;;; +1FBD1;BOX DRAWINGS LIGHT DIAGONAL UPPER RIGHT TO MIDDLE LEFT;So;0;ON;;;;;N;;;;; +1FBD2;BOX DRAWINGS LIGHT DIAGONAL UPPER LEFT TO MIDDLE RIGHT;So;0;ON;;;;;N;;;;; +1FBD3;BOX DRAWINGS LIGHT DIAGONAL MIDDLE LEFT TO LOWER RIGHT;So;0;ON;;;;;N;;;;; +1FBD4;BOX DRAWINGS LIGHT DIAGONAL UPPER LEFT TO LOWER CENTRE;So;0;ON;;;;;N;;;;; +1FBD5;BOX DRAWINGS LIGHT DIAGONAL UPPER CENTRE TO LOWER RIGHT;So;0;ON;;;;;N;;;;; +1FBD6;BOX DRAWINGS LIGHT DIAGONAL UPPER RIGHT TO LOWER CENTRE;So;0;ON;;;;;N;;;;; +1FBD7;BOX DRAWINGS LIGHT DIAGONAL UPPER CENTRE TO LOWER LEFT;So;0;ON;;;;;N;;;;; +1FBD8;BOX DRAWINGS LIGHT DIAGONAL UPPER LEFT TO MIDDLE CENTRE TO UPPER RIGHT;So;0;ON;;;;;N;;;;; +1FBD9;BOX DRAWINGS LIGHT DIAGONAL UPPER RIGHT TO MIDDLE CENTRE TO LOWER RIGHT;So;0;ON;;;;;N;;;;; +1FBDA;BOX DRAWINGS LIGHT DIAGONAL LOWER LEFT TO MIDDLE CENTRE TO LOWER RIGHT;So;0;ON;;;;;N;;;;; +1FBDB;BOX DRAWINGS LIGHT DIAGONAL UPPER LEFT TO MIDDLE CENTRE TO LOWER LEFT;So;0;ON;;;;;N;;;;; +1FBDC;BOX DRAWINGS LIGHT DIAGONAL UPPER LEFT TO LOWER CENTRE TO UPPER RIGHT;So;0;ON;;;;;N;;;;; +1FBDD;BOX DRAWINGS LIGHT DIAGONAL UPPER RIGHT TO MIDDLE LEFT TO LOWER RIGHT;So;0;ON;;;;;N;;;;; +1FBDE;BOX DRAWINGS LIGHT DIAGONAL LOWER LEFT TO UPPER CENTRE TO LOWER RIGHT;So;0;ON;;;;;N;;;;; +1FBDF;BOX DRAWINGS LIGHT DIAGONAL UPPER LEFT TO MIDDLE RIGHT TO LOWER LEFT;So;0;ON;;;;;N;;;;; +1FBE0;TOP JUSTIFIED LOWER HALF WHITE CIRCLE;So;0;ON;;;;;N;;;;; +1FBE1;RIGHT JUSTIFIED LEFT HALF WHITE CIRCLE;So;0;ON;;;;;N;;;;; +1FBE2;BOTTOM JUSTIFIED UPPER HALF WHITE CIRCLE;So;0;ON;;;;;N;;;;; +1FBE3;LEFT JUSTIFIED RIGHT HALF WHITE CIRCLE;So;0;ON;;;;;N;;;;; +1FBE4;UPPER CENTRE ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1FBE5;LOWER CENTRE ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1FBE6;MIDDLE LEFT ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1FBE7;MIDDLE RIGHT ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1FBE8;TOP JUSTIFIED LOWER HALF BLACK CIRCLE;So;0;ON;;;;;N;;;;; +1FBE9;RIGHT JUSTIFIED LEFT HALF BLACK CIRCLE;So;0;ON;;;;;N;;;;; +1FBEA;BOTTOM JUSTIFIED UPPER HALF BLACK CIRCLE;So;0;ON;;;;;N;;;;; +1FBEB;LEFT JUSTIFIED RIGHT HALF BLACK CIRCLE;So;0;ON;;;;;N;;;;; +1FBEC;TOP RIGHT JUSTIFIED LOWER LEFT QUARTER BLACK CIRCLE;So;0;ON;;;;;N;;;;; +1FBED;BOTTOM LEFT JUSTIFIED UPPER RIGHT QUARTER BLACK CIRCLE;So;0;ON;;;;;N;;;;; +1FBEE;BOTTOM RIGHT JUSTIFIED UPPER LEFT QUARTER BLACK CIRCLE;So;0;ON;;;;;N;;;;; +1FBEF;TOP LEFT JUSTIFIED LOWER RIGHT QUARTER BLACK CIRCLE;So;0;ON;;;;;N;;;;; 1FBF0;SEGMENTED DIGIT ZERO;Nd;0;EN;<font> 0030;0;0;0;N;;;;; 1FBF1;SEGMENTED DIGIT ONE;Nd;0;EN;<font> 0031;1;1;1;N;;;;; 1FBF2;SEGMENTED DIGIT TWO;Nd;0;EN;<font> 0032;2;2;2;N;;;;; diff --git a/Master/texmf-dist/tex/generic/unicode-data/WordBreakProperty.txt b/Master/texmf-dist/tex/generic/unicode-data/WordBreakProperty.txt index 302a2769b39..e557c3d0ded 100644 --- a/Master/texmf-dist/tex/generic/unicode-data/WordBreakProperty.txt +++ b/Master/texmf-dist/tex/generic/unicode-data/WordBreakProperty.txt @@ -1,8 +1,8 @@ -# WordBreakProperty-15.1.0.txt -# Date: 2023-03-31, 03:19:05 GMT -# © 2023 Unicode®, Inc. +# WordBreakProperty-16.0.0.txt +# Date: 2024-07-29, 16:27:36 GMT +# © 2024 Unicode®, Inc. # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries. -# For terms of use, see https://www.unicode.org/terms_of_use.html +# For terms of use and license, see https://www.unicode.org/terms_of_use.html # # Unicode Character Database # For documentation, see https://www.unicode.org/reports/tr44/ @@ -91,7 +91,7 @@ FB46..FB4F ; Hebrew_Letter # Lo [10] HEBREW LETTER TSADI WITH DAGESH..HEBREW 0825..0827 ; Extend # Mn [3] SAMARITAN VOWEL SIGN SHORT A..SAMARITAN VOWEL SIGN U 0829..082D ; Extend # Mn [5] SAMARITAN VOWEL SIGN LONG I..SAMARITAN MARK NEQUDAA 0859..085B ; Extend # Mn [3] MANDAIC AFFRICATION MARK..MANDAIC GEMINATION MARK -0898..089F ; Extend # Mn [8] ARABIC SMALL HIGH WORD AL-JUZ..ARABIC HALF MADDA OVER MADDA +0897..089F ; Extend # Mn [9] ARABIC PEPET..ARABIC HALF MADDA OVER MADDA 08CA..08E1 ; Extend # Mn [24] ARABIC SMALL HIGH FARSI YEH..ARABIC SMALL HIGH SIGN SAFHA 08E3..0902 ; Extend # Mn [32] ARABIC TURNED DAMMA BELOW..DEVANAGARI SIGN ANUSVARA 0903 ; Extend # Mc DEVANAGARI SIGN VISARGA @@ -407,8 +407,9 @@ FF9E..FF9F ; Extend # Lm [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HALFWIDT 10A3F ; Extend # Mn KHAROSHTHI VIRAMA 10AE5..10AE6 ; Extend # Mn [2] MANICHAEAN ABBREVIATION MARK ABOVE..MANICHAEAN ABBREVIATION MARK BELOW 10D24..10D27 ; Extend # Mn [4] HANIFI ROHINGYA SIGN HARBAHAY..HANIFI ROHINGYA SIGN TASSI +10D69..10D6D ; Extend # Mn [5] GARAY VOWEL SIGN E..GARAY CONSONANT NASALIZATION MARK 10EAB..10EAC ; Extend # Mn [2] YEZIDI COMBINING HAMZA MARK..YEZIDI COMBINING MADDA MARK -10EFD..10EFF ; Extend # Mn [3] ARABIC SMALL LOW WORD SAKTA..ARABIC SMALL LOW WORD MADDA +10EFC..10EFF ; Extend # Mn [4] ARABIC COMBINING ALEF OVERLAY..ARABIC SMALL LOW WORD MADDA 10F46..10F50 ; Extend # Mn [11] SOGDIAN COMBINING DOT BELOW..SOGDIAN COMBINING STROKE BELOW 10F82..10F85 ; Extend # Mn [4] OLD UYGHUR COMBINING DOT ABOVE..OLD UYGHUR COMBINING TWO DOTS BELOW 11000 ; Extend # Mc BRAHMI SIGN CANDRABINDU @@ -461,6 +462,17 @@ FF9E..FF9F ; Extend # Lm [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HALFWIDT 11362..11363 ; Extend # Mc [2] GRANTHA VOWEL SIGN VOCALIC L..GRANTHA VOWEL SIGN VOCALIC LL 11366..1136C ; Extend # Mn [7] COMBINING GRANTHA DIGIT ZERO..COMBINING GRANTHA DIGIT SIX 11370..11374 ; Extend # Mn [5] COMBINING GRANTHA LETTER A..COMBINING GRANTHA LETTER PA +113B8..113BA ; Extend # Mc [3] TULU-TIGALARI VOWEL SIGN AA..TULU-TIGALARI VOWEL SIGN II +113BB..113C0 ; Extend # Mn [6] TULU-TIGALARI VOWEL SIGN U..TULU-TIGALARI VOWEL SIGN VOCALIC LL +113C2 ; Extend # Mc TULU-TIGALARI VOWEL SIGN EE +113C5 ; Extend # Mc TULU-TIGALARI VOWEL SIGN AI +113C7..113CA ; Extend # Mc [4] TULU-TIGALARI VOWEL SIGN OO..TULU-TIGALARI SIGN CANDRA ANUNASIKA +113CC..113CD ; Extend # Mc [2] TULU-TIGALARI SIGN ANUSVARA..TULU-TIGALARI SIGN VISARGA +113CE ; Extend # Mn TULU-TIGALARI SIGN VIRAMA +113CF ; Extend # Mc TULU-TIGALARI SIGN LOOPED VIRAMA +113D0 ; Extend # Mn TULU-TIGALARI CONJOINER +113D2 ; Extend # Mn TULU-TIGALARI GEMINATION MARK +113E1..113E2 ; Extend # Mn [2] TULU-TIGALARI VEDIC TONE SVARITA..TULU-TIGALARI VEDIC TONE ANUDATTA 11435..11437 ; Extend # Mc [3] NEWA VOWEL SIGN AA..NEWA VOWEL SIGN II 11438..1143F ; Extend # Mn [8] NEWA VOWEL SIGN U..NEWA VOWEL SIGN AI 11440..11441 ; Extend # Mc [2] NEWA VOWEL SIGN O..NEWA VOWEL SIGN AU @@ -496,7 +508,9 @@ FF9E..FF9F ; Extend # Lm [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HALFWIDT 116B0..116B5 ; Extend # Mn [6] TAKRI VOWEL SIGN U..TAKRI VOWEL SIGN AU 116B6 ; Extend # Mc TAKRI SIGN VIRAMA 116B7 ; Extend # Mn TAKRI SIGN NUKTA -1171D..1171F ; Extend # Mn [3] AHOM CONSONANT SIGN MEDIAL LA..AHOM CONSONANT SIGN MEDIAL LIGATING RA +1171D ; Extend # Mn AHOM CONSONANT SIGN MEDIAL LA +1171E ; Extend # Mc AHOM CONSONANT SIGN MEDIAL RA +1171F ; Extend # Mn AHOM CONSONANT SIGN MEDIAL LIGATING RA 11720..11721 ; Extend # Mc [2] AHOM VOWEL SIGN A..AHOM VOWEL SIGN AA 11722..11725 ; Extend # Mn [4] AHOM VOWEL SIGN I..AHOM VOWEL SIGN UU 11726 ; Extend # Mc AHOM VOWEL SIGN E @@ -563,8 +577,12 @@ FF9E..FF9F ; Extend # Lm [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HALFWIDT 11F40 ; Extend # Mn KAWI VOWEL SIGN EU 11F41 ; Extend # Mc KAWI SIGN KILLER 11F42 ; Extend # Mn KAWI CONJOINER +11F5A ; Extend # Mn KAWI SIGN NUKTA 13440 ; Extend # Mn EGYPTIAN HIEROGLYPH MIRROR HORIZONTALLY 13447..13455 ; Extend # Mn [15] EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT TOP START..EGYPTIAN HIEROGLYPH MODIFIER DAMAGED +1611E..16129 ; Extend # Mn [12] GURUNG KHEMA VOWEL SIGN AA..GURUNG KHEMA VOWEL LENGTH MARK +1612A..1612C ; Extend # Mc [3] GURUNG KHEMA CONSONANT SIGN MEDIAL YA..GURUNG KHEMA CONSONANT SIGN MEDIAL HA +1612D..1612F ; Extend # Mn [3] GURUNG KHEMA SIGN ANUSVARA..GURUNG KHEMA SIGN THOLHOMA 16AF0..16AF4 ; Extend # Mn [5] BASSA VAH COMBINING HIGH TONE..BASSA VAH COMBINING HIGH-LOW TONE 16B30..16B36 ; Extend # Mn [7] PAHAWH HMONG MARK CIM TUB..PAHAWH HMONG MARK CIM TAUM 16F4F ; Extend # Mn MIAO SIGN CONSONANT MODIFIER BAR @@ -598,13 +616,14 @@ FF9E..FF9F ; Extend # Lm [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HALFWIDT 1E2AE ; Extend # Mn TOTO SIGN RISING TONE 1E2EC..1E2EF ; Extend # Mn [4] WANCHO TONE TUP..WANCHO TONE KOINI 1E4EC..1E4EF ; Extend # Mn [4] NAG MUNDARI SIGN MUHOR..NAG MUNDARI SIGN SUTUH +1E5EE..1E5EF ; Extend # Mn [2] OL ONAL SIGN MU..OL ONAL SIGN IKIR 1E8D0..1E8D6 ; Extend # Mn [7] MENDE KIKAKUI COMBINING NUMBER TEENS..MENDE KIKAKUI COMBINING NUMBER MILLIONS 1E944..1E94A ; Extend # Mn [7] ADLAM ALIF LENGTHENER..ADLAM NUKTA 1F3FB..1F3FF ; Extend # Sk [5] EMOJI MODIFIER FITZPATRICK TYPE-1-2..EMOJI MODIFIER FITZPATRICK TYPE-6 E0020..E007F ; Extend # Cf [96] TAG SPACE..CANCEL TAG E0100..E01EF ; Extend # Mn [240] VARIATION SELECTOR-17..VARIATION SELECTOR-256 -# Total code points: 2554 +# Total code points: 2605 # ================================================ @@ -877,7 +896,7 @@ FF71..FF9D ; Katakana # Lo [45] HALFWIDTH KATAKANA LETTER A..HALFWIDTH KATAK 1C4D..1C4F ; ALetter # Lo [3] LEPCHA LETTER TTA..LEPCHA LETTER DDA 1C5A..1C77 ; ALetter # Lo [30] OL CHIKI LETTER LA..OL CHIKI LETTER OH 1C78..1C7D ; ALetter # Lm [6] OL CHIKI MU TTUDDAG..OL CHIKI AHAD -1C80..1C88 ; ALetter # L& [9] CYRILLIC SMALL LETTER ROUNDED VE..CYRILLIC SMALL LETTER UNBLENDED UK +1C80..1C8A ; ALetter # L& [11] CYRILLIC SMALL LETTER ROUNDED VE..CYRILLIC SMALL LETTER TJE 1C90..1CBA ; ALetter # L& [43] GEORGIAN MTAVRULI CAPITAL LETTER AN..GEORGIAN MTAVRULI CAPITAL LETTER AIN 1CBD..1CBF ; ALetter # L& [3] GEORGIAN MTAVRULI CAPITAL LETTER AEN..GEORGIAN MTAVRULI CAPITAL LETTER LABIAL SIGN 1CE9..1CEC ; ALetter # Lo [4] VEDIC SIGN ANUSVARA ANTARGOMUKHA..VEDIC SIGN ANUSVARA VAMAGOMUKHA WITH TAIL @@ -983,10 +1002,10 @@ A788 ; ALetter # Lm MODIFIER LETTER LOW CIRCUMFLEX ACCENT A789..A78A ; ALetter # Sk [2] MODIFIER LETTER COLON..MODIFIER LETTER SHORT EQUALS SIGN A78B..A78E ; ALetter # L& [4] LATIN CAPITAL LETTER SALTILLO..LATIN SMALL LETTER L WITH RETROFLEX HOOK AND BELT A78F ; ALetter # Lo LATIN LETTER SINOLOGICAL DOT -A790..A7CA ; ALetter # L& [59] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN SMALL LETTER S WITH SHORT STROKE OVERLAY +A790..A7CD ; ALetter # L& [62] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN SMALL LETTER S WITH DIAGONAL STROKE A7D0..A7D1 ; ALetter # L& [2] LATIN CAPITAL LETTER CLOSED INSULAR G..LATIN SMALL LETTER CLOSED INSULAR G A7D3 ; ALetter # L& LATIN SMALL LETTER DOUBLE THORN -A7D5..A7D9 ; ALetter # L& [5] LATIN SMALL LETTER DOUBLE WYNN..LATIN SMALL LETTER SIGMOID S +A7D5..A7DC ; ALetter # L& [8] LATIN SMALL LETTER DOUBLE WYNN..LATIN CAPITAL LETTER LAMBDA WITH STROKE A7F2..A7F4 ; ALetter # Lm [3] MODIFIER LETTER CAPITAL C..MODIFIER LETTER CAPITAL Q A7F5..A7F6 ; ALetter # L& [2] LATIN CAPITAL LETTER REVERSED HALF H..LATIN SMALL LETTER REVERSED HALF H A7F7 ; ALetter # Lo LATIN EPIGRAPHIC LETTER SIDEWAYS I @@ -1077,6 +1096,7 @@ FFDA..FFDC ; ALetter # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL 105A3..105B1 ; ALetter # L& [15] VITHKUQI SMALL LETTER HA..VITHKUQI SMALL LETTER RE 105B3..105B9 ; ALetter # L& [7] VITHKUQI SMALL LETTER SE..VITHKUQI SMALL LETTER XE 105BB..105BC ; ALetter # L& [2] VITHKUQI SMALL LETTER Y..VITHKUQI SMALL LETTER ZE +105C0..105F3 ; ALetter # Lo [52] TODHRI LETTER A..TODHRI LETTER OO 10600..10736 ; ALetter # Lo [311] LINEAR A SIGN AB001..LINEAR A SIGN A664 10740..10755 ; ALetter # Lo [22] LINEAR A SIGN A701 A..LINEAR A SIGN A732 JE 10760..10767 ; ALetter # Lo [8] LINEAR A SIGN A800..LINEAR A SIGN A807 @@ -1113,8 +1133,15 @@ FFDA..FFDC ; ALetter # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL 10C80..10CB2 ; ALetter # L& [51] OLD HUNGARIAN CAPITAL LETTER A..OLD HUNGARIAN CAPITAL LETTER US 10CC0..10CF2 ; ALetter # L& [51] OLD HUNGARIAN SMALL LETTER A..OLD HUNGARIAN SMALL LETTER US 10D00..10D23 ; ALetter # Lo [36] HANIFI ROHINGYA LETTER A..HANIFI ROHINGYA MARK NA KHONNA +10D4A..10D4D ; ALetter # Lo [4] GARAY VOWEL SIGN A..GARAY VOWEL SIGN EE +10D4E ; ALetter # Lm GARAY VOWEL LENGTH MARK +10D4F ; ALetter # Lo GARAY SUKUN +10D50..10D65 ; ALetter # L& [22] GARAY CAPITAL LETTER A..GARAY CAPITAL LETTER OLD NA +10D6F ; ALetter # Lm GARAY REDUPLICATION MARK +10D70..10D85 ; ALetter # L& [22] GARAY SMALL LETTER A..GARAY SMALL LETTER OLD NA 10E80..10EA9 ; ALetter # Lo [42] YEZIDI LETTER ELIF..YEZIDI LETTER ET 10EB0..10EB1 ; ALetter # Lo [2] YEZIDI LETTER LAM WITH DOT ABOVE..YEZIDI LETTER YOT WITH CIRCUMFLEX ABOVE +10EC2..10EC4 ; ALetter # Lo [3] ARABIC LETTER DAL WITH TWO DOTS VERTICALLY BELOW..ARABIC LETTER KAF WITH TWO DOTS VERTICALLY BELOW 10F00..10F1C ; ALetter # Lo [29] OLD SOGDIAN LETTER ALEPH..OLD SOGDIAN LETTER FINAL TAW WITH VERTICAL TAIL 10F27 ; ALetter # Lo OLD SOGDIAN LIGATURE AYIN-DALETH 10F30..10F45 ; ALetter # Lo [22] SOGDIAN LETTER ALEPH..SOGDIAN INDEPENDENT SHIN @@ -1153,6 +1180,13 @@ FFDA..FFDC ; ALetter # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL 1133D ; ALetter # Lo GRANTHA SIGN AVAGRAHA 11350 ; ALetter # Lo GRANTHA OM 1135D..11361 ; ALetter # Lo [5] GRANTHA SIGN PLUTA..GRANTHA LETTER VOCALIC LL +11380..11389 ; ALetter # Lo [10] TULU-TIGALARI LETTER A..TULU-TIGALARI LETTER VOCALIC LL +1138B ; ALetter # Lo TULU-TIGALARI LETTER EE +1138E ; ALetter # Lo TULU-TIGALARI LETTER AI +11390..113B5 ; ALetter # Lo [38] TULU-TIGALARI LETTER OO..TULU-TIGALARI LETTER LLLA +113B7 ; ALetter # Lo TULU-TIGALARI SIGN AVAGRAHA +113D1 ; ALetter # Lo TULU-TIGALARI REPHA +113D3 ; ALetter # Lo TULU-TIGALARI SIGN PLUTA 11400..11434 ; ALetter # Lo [53] NEWA LETTER A..NEWA LETTER HA 11447..1144A ; ALetter # Lo [4] NEWA SIGN AVAGRAHA..NEWA SIDDHI 1145F..11461 ; ALetter # Lo [3] NEWA LETTER VEDIC ANUSVARA..NEWA SIGN UPADHMANIYA @@ -1185,6 +1219,7 @@ FFDA..FFDC ; ALetter # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL 11A5C..11A89 ; ALetter # Lo [46] SOYOMBO LETTER KA..SOYOMBO CLUSTER-INITIAL LETTER SA 11A9D ; ALetter # Lo SOYOMBO MARK PLUTA 11AB0..11AF8 ; ALetter # Lo [73] CANADIAN SYLLABICS NATTILIK HI..PAU CIN HAU GLOTTAL STOP FINAL +11BC0..11BE0 ; ALetter # Lo [33] SUNUWAR LETTER DEVI..SUNUWAR LETTER KLOKO 11C00..11C08 ; ALetter # Lo [9] BHAIKSUKI LETTER A..BHAIKSUKI LETTER VOCALIC L 11C0A..11C2E ; ALetter # Lo [37] BHAIKSUKI LETTER E..BHAIKSUKI LETTER HA 11C40 ; ALetter # Lo BHAIKSUKI SIGN AVAGRAHA @@ -1208,7 +1243,9 @@ FFDA..FFDC ; ALetter # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL 12F90..12FF0 ; ALetter # Lo [97] CYPRO-MINOAN SIGN CM001..CYPRO-MINOAN SIGN CM114 13000..1342F ; ALetter # Lo [1072] EGYPTIAN HIEROGLYPH A001..EGYPTIAN HIEROGLYPH V011D 13441..13446 ; ALetter # Lo [6] EGYPTIAN HIEROGLYPH FULL BLANK..EGYPTIAN HIEROGLYPH WIDE LOST SIGN +13460..143FA ; ALetter # Lo [3995] EGYPTIAN HIEROGLYPH-13460..EGYPTIAN HIEROGLYPH-143FA 14400..14646 ; ALetter # Lo [583] ANATOLIAN HIEROGLYPH A001..ANATOLIAN HIEROGLYPH A530 +16100..1611D ; ALetter # Lo [30] GURUNG KHEMA LETTER A..GURUNG KHEMA LETTER SA 16800..16A38 ; ALetter # Lo [569] BAMUM LETTER PHASE-A NGKUE MFON..BAMUM LETTER PHASE-F VUEQ 16A40..16A5E ; ALetter # Lo [31] MRO LETTER TA..MRO LETTER TEK 16A70..16ABE ; ALetter # Lo [79] TANGSA LETTER OZ..TANGSA LETTER ZA @@ -1217,6 +1254,9 @@ FFDA..FFDC ; ALetter # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL 16B40..16B43 ; ALetter # Lm [4] PAHAWH HMONG SIGN VOS SEEV..PAHAWH HMONG SIGN IB YAM 16B63..16B77 ; ALetter # Lo [21] PAHAWH HMONG SIGN VOS LUB..PAHAWH HMONG SIGN CIM NRES TOS 16B7D..16B8F ; ALetter # Lo [19] PAHAWH HMONG CLAN SIGN TSHEEJ..PAHAWH HMONG CLAN SIGN VWJ +16D40..16D42 ; ALetter # Lm [3] KIRAT RAI SIGN ANUSVARA..KIRAT RAI SIGN VISARGA +16D43..16D6A ; ALetter # Lo [40] KIRAT RAI LETTER A..KIRAT RAI VOWEL SIGN AU +16D6B..16D6C ; ALetter # Lm [2] KIRAT RAI SIGN VIRAMA..KIRAT RAI SIGN SAAT 16E40..16E7F ; ALetter # L& [64] MEDEFAIDRIN CAPITAL LETTER M..MEDEFAIDRIN SMALL LETTER Y 16F00..16F4A ; ALetter # Lo [75] MIAO LETTER PA..MIAO LETTER RTE 16F50 ; ALetter # Lo MIAO LETTER NASALIZATION @@ -1269,6 +1309,8 @@ FFDA..FFDC ; ALetter # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL 1E2C0..1E2EB ; ALetter # Lo [44] WANCHO LETTER AA..WANCHO LETTER YIH 1E4D0..1E4EA ; ALetter # Lo [27] NAG MUNDARI LETTER O..NAG MUNDARI LETTER ELL 1E4EB ; ALetter # Lm NAG MUNDARI SIGN OJOD +1E5D0..1E5ED ; ALetter # Lo [30] OL ONAL LETTER O..OL ONAL LETTER EG +1E5F0 ; ALetter # Lo OL ONAL SIGN HODDOND 1E7E0..1E7E6 ; ALetter # Lo [7] ETHIOPIC SYLLABLE HHYA..ETHIOPIC SYLLABLE HHYO 1E7E8..1E7EB ; ALetter # Lo [4] ETHIOPIC SYLLABLE GURAGE HHWA..ETHIOPIC SYLLABLE HHWE 1E7ED..1E7EE ; ALetter # Lo [2] ETHIOPIC SYLLABLE GURAGE MWI..ETHIOPIC SYLLABLE GURAGE MWEE @@ -1313,7 +1355,7 @@ FFDA..FFDC ; ALetter # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL 1F150..1F169 ; ALetter # So [26] NEGATIVE CIRCLED LATIN CAPITAL LETTER A..NEGATIVE CIRCLED LATIN CAPITAL LETTER Z 1F170..1F189 ; ALetter # So [26] NEGATIVE SQUARED LATIN CAPITAL LETTER A..NEGATIVE SQUARED LATIN CAPITAL LETTER Z -# Total code points: 29490 +# Total code points: 33791 # ================================================ @@ -1339,14 +1381,12 @@ FF1A ; MidLetter # Po FULLWIDTH COLON 066C ; MidNum # Po ARABIC THOUSANDS SEPARATOR 07F8 ; MidNum # Po NKO COMMA 2044 ; MidNum # Sm FRACTION SLASH -FE10 ; MidNum # Po PRESENTATION FORM FOR VERTICAL COMMA -FE14 ; MidNum # Po PRESENTATION FORM FOR VERTICAL SEMICOLON FE50 ; MidNum # Po SMALL COMMA FE54 ; MidNum # Po SMALL SEMICOLON FF0C ; MidNum # Po FULLWIDTH COMMA FF1B ; MidNum # Po FULLWIDTH SEMICOLON -# Total code points: 15 +# Total code points: 13 # ================================================ @@ -1390,6 +1430,7 @@ FF0E ; MidNumLet # Po FULLWIDTH FULL STOP 1810..1819 ; Numeric # Nd [10] MONGOLIAN DIGIT ZERO..MONGOLIAN DIGIT NINE 1946..194F ; Numeric # Nd [10] LIMBU DIGIT ZERO..LIMBU DIGIT NINE 19D0..19D9 ; Numeric # Nd [10] NEW TAI LUE DIGIT ZERO..NEW TAI LUE DIGIT NINE +19DA ; Numeric # No NEW TAI LUE THAM DIGIT ONE 1A80..1A89 ; Numeric # Nd [10] TAI THAM HORA DIGIT ZERO..TAI THAM HORA DIGIT NINE 1A90..1A99 ; Numeric # Nd [10] TAI THAM THAM DIGIT ZERO..TAI THAM THAM DIGIT NINE 1B50..1B59 ; Numeric # Nd [10] BALINESE DIGIT ZERO..BALINESE DIGIT NINE @@ -1406,6 +1447,7 @@ ABF0..ABF9 ; Numeric # Nd [10] MEETEI MAYEK DIGIT ZERO..MEETEI MAYEK DIGIT N FF10..FF19 ; Numeric # Nd [10] FULLWIDTH DIGIT ZERO..FULLWIDTH DIGIT NINE 104A0..104A9 ; Numeric # Nd [10] OSMANYA DIGIT ZERO..OSMANYA DIGIT NINE 10D30..10D39 ; Numeric # Nd [10] HANIFI ROHINGYA DIGIT ZERO..HANIFI ROHINGYA DIGIT NINE +10D40..10D49 ; Numeric # Nd [10] GARAY DIGIT ZERO..GARAY DIGIT NINE 11066..1106F ; Numeric # Nd [10] BRAHMI DIGIT ZERO..BRAHMI DIGIT NINE 110BD ; Numeric # Cf KAITHI NUMBER SIGN 110CD ; Numeric # Cf KAITHI NUMBER SIGN ABOVE @@ -1417,24 +1459,30 @@ FF10..FF19 ; Numeric # Nd [10] FULLWIDTH DIGIT ZERO..FULLWIDTH DIGIT NINE 114D0..114D9 ; Numeric # Nd [10] TIRHUTA DIGIT ZERO..TIRHUTA DIGIT NINE 11650..11659 ; Numeric # Nd [10] MODI DIGIT ZERO..MODI DIGIT NINE 116C0..116C9 ; Numeric # Nd [10] TAKRI DIGIT ZERO..TAKRI DIGIT NINE +116D0..116E3 ; Numeric # Nd [20] MYANMAR PAO DIGIT ZERO..MYANMAR EASTERN PWO KAREN DIGIT NINE 11730..11739 ; Numeric # Nd [10] AHOM DIGIT ZERO..AHOM DIGIT NINE 118E0..118E9 ; Numeric # Nd [10] WARANG CITI DIGIT ZERO..WARANG CITI DIGIT NINE 11950..11959 ; Numeric # Nd [10] DIVES AKURU DIGIT ZERO..DIVES AKURU DIGIT NINE +11BF0..11BF9 ; Numeric # Nd [10] SUNUWAR DIGIT ZERO..SUNUWAR DIGIT NINE 11C50..11C59 ; Numeric # Nd [10] BHAIKSUKI DIGIT ZERO..BHAIKSUKI DIGIT NINE 11D50..11D59 ; Numeric # Nd [10] MASARAM GONDI DIGIT ZERO..MASARAM GONDI DIGIT NINE 11DA0..11DA9 ; Numeric # Nd [10] GUNJALA GONDI DIGIT ZERO..GUNJALA GONDI DIGIT NINE 11F50..11F59 ; Numeric # Nd [10] KAWI DIGIT ZERO..KAWI DIGIT NINE +16130..16139 ; Numeric # Nd [10] GURUNG KHEMA DIGIT ZERO..GURUNG KHEMA DIGIT NINE 16A60..16A69 ; Numeric # Nd [10] MRO DIGIT ZERO..MRO DIGIT NINE 16AC0..16AC9 ; Numeric # Nd [10] TANGSA DIGIT ZERO..TANGSA DIGIT NINE 16B50..16B59 ; Numeric # Nd [10] PAHAWH HMONG DIGIT ZERO..PAHAWH HMONG DIGIT NINE +16D70..16D79 ; Numeric # Nd [10] KIRAT RAI DIGIT ZERO..KIRAT RAI DIGIT NINE +1CCF0..1CCF9 ; Numeric # Nd [10] OUTLINED DIGIT ZERO..OUTLINED DIGIT NINE 1D7CE..1D7FF ; Numeric # Nd [50] MATHEMATICAL BOLD DIGIT ZERO..MATHEMATICAL MONOSPACE DIGIT NINE 1E140..1E149 ; Numeric # Nd [10] NYIAKENG PUACHUE HMONG DIGIT ZERO..NYIAKENG PUACHUE HMONG DIGIT NINE 1E2F0..1E2F9 ; Numeric # Nd [10] WANCHO DIGIT ZERO..WANCHO DIGIT NINE 1E4F0..1E4F9 ; Numeric # Nd [10] NAG MUNDARI DIGIT ZERO..NAG MUNDARI DIGIT NINE +1E5F1..1E5FA ; Numeric # Nd [10] OL ONAL DIGIT ZERO..OL ONAL DIGIT NINE 1E950..1E959 ; Numeric # Nd [10] ADLAM DIGIT ZERO..ADLAM DIGIT NINE 1FBF0..1FBF9 ; Numeric # Nd [10] SEGMENTED DIGIT ZERO..SEGMENTED DIGIT NINE -# Total code points: 693 +# Total code points: 774 # ================================================ diff --git a/Master/texmf-dist/tex/generic/unicode-data/emoji-data.txt b/Master/texmf-dist/tex/generic/unicode-data/emoji-data.txt index 0ba10e9ce4c..ff99028248b 100644 --- a/Master/texmf-dist/tex/generic/unicode-data/emoji-data.txt +++ b/Master/texmf-dist/tex/generic/unicode-data/emoji-data.txt @@ -1,11 +1,11 @@ # emoji-data.txt -# Date: 2023-02-01, 02:22:54 GMT -# © 2023 Unicode®, Inc. +# Date: 2024-05-01, 21:25:24 GMT +# © 2024 Unicode®, Inc. # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries. -# For terms of use, see https://www.unicode.org/terms_of_use.html +# For terms of use and license, see https://www.unicode.org/terms_of_use.html # # Emoji Data for UTS #51 -# Used with Emoji Version 15.1 and subsequent minor revisions (if any) +# Used with Emoji Version 16.0 and subsequent minor revisions (if any) # # For documentation and usage, see https://www.unicode.org/reports/tr51 # @@ -407,6 +407,8 @@ 1FA80..1FA82 ; Emoji # E12.0 [3] (🪀..🪂) yo-yo..parachute 1FA83..1FA86 ; Emoji # E13.0 [4] (🪃..🪆) boomerang..nesting dolls 1FA87..1FA88 ; Emoji # E15.0 [2] (🪇..🪈) maracas..flute +1FA89 ; Emoji # E16.0 [1] () harp +1FA8F ; Emoji # E16.0 [1] () shovel 1FA90..1FA95 ; Emoji # E12.0 [6] (🪐..🪕) ringed planet..banjo 1FA96..1FAA8 ; Emoji # E13.0 [19] (🪖..🪨) military helmet..rock 1FAA9..1FAAC ; Emoji # E14.0 [4] (🪩..🪬) mirror ball..hamsa @@ -414,19 +416,24 @@ 1FAB0..1FAB6 ; Emoji # E13.0 [7] (🪰..🪶) fly..feather 1FAB7..1FABA ; Emoji # E14.0 [4] (🪷..🪺) lotus..nest with eggs 1FABB..1FABD ; Emoji # E15.0 [3] (🪻..🪽) hyacinth..wing +1FABE ; Emoji # E16.0 [1] () leafless tree 1FABF ; Emoji # E15.0 [1] (🪿) goose 1FAC0..1FAC2 ; Emoji # E13.0 [3] (🫀..🫂) anatomical heart..people hugging 1FAC3..1FAC5 ; Emoji # E14.0 [3] (🫃..🫅) pregnant man..person with crown +1FAC6 ; Emoji # E16.0 [1] () fingerprint 1FACE..1FACF ; Emoji # E15.0 [2] (🫎..🫏) moose..donkey 1FAD0..1FAD6 ; Emoji # E13.0 [7] (🫐..🫖) blueberries..teapot 1FAD7..1FAD9 ; Emoji # E14.0 [3] (🫗..🫙) pouring liquid..jar 1FADA..1FADB ; Emoji # E15.0 [2] (🫚..🫛) ginger root..pea pod +1FADC ; Emoji # E16.0 [1] () root vegetable +1FADF ; Emoji # E16.0 [1] () splatter 1FAE0..1FAE7 ; Emoji # E14.0 [8] (🫠..🫧) melting face..bubbles 1FAE8 ; Emoji # E15.0 [1] (🫨) shaking face +1FAE9 ; Emoji # E16.0 [1] () face with bags under eyes 1FAF0..1FAF6 ; Emoji # E14.0 [7] (🫰..🫶) hand with index finger and thumb crossed..heart hands 1FAF7..1FAF8 ; Emoji # E15.0 [2] (🫷..🫸) leftwards pushing hand..rightwards pushing hand -# Total elements: 1424 +# Total elements: 1431 # ================================================ @@ -696,6 +703,8 @@ 1FA80..1FA82 ; Emoji_Presentation # E12.0 [3] (🪀..🪂) yo-yo..parachute 1FA83..1FA86 ; Emoji_Presentation # E13.0 [4] (🪃..🪆) boomerang..nesting dolls 1FA87..1FA88 ; Emoji_Presentation # E15.0 [2] (🪇..🪈) maracas..flute +1FA89 ; Emoji_Presentation # E16.0 [1] () harp +1FA8F ; Emoji_Presentation # E16.0 [1] () shovel 1FA90..1FA95 ; Emoji_Presentation # E12.0 [6] (🪐..🪕) ringed planet..banjo 1FA96..1FAA8 ; Emoji_Presentation # E13.0 [19] (🪖..🪨) military helmet..rock 1FAA9..1FAAC ; Emoji_Presentation # E14.0 [4] (🪩..🪬) mirror ball..hamsa @@ -703,19 +712,24 @@ 1FAB0..1FAB6 ; Emoji_Presentation # E13.0 [7] (🪰..🪶) fly..feather 1FAB7..1FABA ; Emoji_Presentation # E14.0 [4] (🪷..🪺) lotus..nest with eggs 1FABB..1FABD ; Emoji_Presentation # E15.0 [3] (🪻..🪽) hyacinth..wing +1FABE ; Emoji_Presentation # E16.0 [1] () leafless tree 1FABF ; Emoji_Presentation # E15.0 [1] (🪿) goose 1FAC0..1FAC2 ; Emoji_Presentation # E13.0 [3] (🫀..🫂) anatomical heart..people hugging 1FAC3..1FAC5 ; Emoji_Presentation # E14.0 [3] (🫃..🫅) pregnant man..person with crown +1FAC6 ; Emoji_Presentation # E16.0 [1] () fingerprint 1FACE..1FACF ; Emoji_Presentation # E15.0 [2] (🫎..🫏) moose..donkey 1FAD0..1FAD6 ; Emoji_Presentation # E13.0 [7] (🫐..🫖) blueberries..teapot 1FAD7..1FAD9 ; Emoji_Presentation # E14.0 [3] (🫗..🫙) pouring liquid..jar 1FADA..1FADB ; Emoji_Presentation # E15.0 [2] (🫚..🫛) ginger root..pea pod +1FADC ; Emoji_Presentation # E16.0 [1] () root vegetable +1FADF ; Emoji_Presentation # E16.0 [1] () splatter 1FAE0..1FAE7 ; Emoji_Presentation # E14.0 [8] (🫠..🫧) melting face..bubbles 1FAE8 ; Emoji_Presentation # E15.0 [1] (🫨) shaking face +1FAE9 ; Emoji_Presentation # E16.0 [1] () face with bags under eyes 1FAF0..1FAF6 ; Emoji_Presentation # E14.0 [7] (🫰..🫶) hand with index finger and thumb crossed..heart hands 1FAF7..1FAF8 ; Emoji_Presentation # E15.0 [2] (🫷..🫸) leftwards pushing hand..rightwards pushing hand -# Total elements: 1205 +# Total elements: 1212 # ================================================ @@ -1289,7 +1303,9 @@ E0020..E007F ; Emoji_Component # E0.0 [96] (..) tag space..c 1FA80..1FA82 ; Extended_Pictographic# E12.0 [3] (🪀..🪂) yo-yo..parachute 1FA83..1FA86 ; Extended_Pictographic# E13.0 [4] (🪃..🪆) boomerang..nesting dolls 1FA87..1FA88 ; Extended_Pictographic# E15.0 [2] (🪇..🪈) maracas..flute -1FA89..1FA8F ; Extended_Pictographic# E0.0 [7] (..) <reserved-1FA89>..<reserved-1FA8F> +1FA89 ; Extended_Pictographic# E16.0 [1] () harp +1FA8A..1FA8E ; Extended_Pictographic# E0.0 [5] (..) <reserved-1FA8A>..<reserved-1FA8E> +1FA8F ; Extended_Pictographic# E16.0 [1] () shovel 1FA90..1FA95 ; Extended_Pictographic# E12.0 [6] (🪐..🪕) ringed planet..banjo 1FA96..1FAA8 ; Extended_Pictographic# E13.0 [19] (🪖..🪨) military helmet..rock 1FAA9..1FAAC ; Extended_Pictographic# E14.0 [4] (🪩..🪬) mirror ball..hamsa @@ -1297,19 +1313,23 @@ E0020..E007F ; Emoji_Component # E0.0 [96] (..) tag space..c 1FAB0..1FAB6 ; Extended_Pictographic# E13.0 [7] (🪰..🪶) fly..feather 1FAB7..1FABA ; Extended_Pictographic# E14.0 [4] (🪷..🪺) lotus..nest with eggs 1FABB..1FABD ; Extended_Pictographic# E15.0 [3] (🪻..🪽) hyacinth..wing -1FABE ; Extended_Pictographic# E0.0 [1] () <reserved-1FABE> +1FABE ; Extended_Pictographic# E16.0 [1] () leafless tree 1FABF ; Extended_Pictographic# E15.0 [1] (🪿) goose 1FAC0..1FAC2 ; Extended_Pictographic# E13.0 [3] (🫀..🫂) anatomical heart..people hugging 1FAC3..1FAC5 ; Extended_Pictographic# E14.0 [3] (🫃..🫅) pregnant man..person with crown -1FAC6..1FACD ; Extended_Pictographic# E0.0 [8] (..) <reserved-1FAC6>..<reserved-1FACD> +1FAC6 ; Extended_Pictographic# E16.0 [1] () fingerprint +1FAC7..1FACD ; Extended_Pictographic# E0.0 [7] (..) <reserved-1FAC7>..<reserved-1FACD> 1FACE..1FACF ; Extended_Pictographic# E15.0 [2] (🫎..🫏) moose..donkey 1FAD0..1FAD6 ; Extended_Pictographic# E13.0 [7] (🫐..🫖) blueberries..teapot 1FAD7..1FAD9 ; Extended_Pictographic# E14.0 [3] (🫗..🫙) pouring liquid..jar 1FADA..1FADB ; Extended_Pictographic# E15.0 [2] (🫚..🫛) ginger root..pea pod -1FADC..1FADF ; Extended_Pictographic# E0.0 [4] (..) <reserved-1FADC>..<reserved-1FADF> +1FADC ; Extended_Pictographic# E16.0 [1] () root vegetable +1FADD..1FADE ; Extended_Pictographic# E0.0 [2] (..) <reserved-1FADD>..<reserved-1FADE> +1FADF ; Extended_Pictographic# E16.0 [1] () splatter 1FAE0..1FAE7 ; Extended_Pictographic# E14.0 [8] (🫠..🫧) melting face..bubbles 1FAE8 ; Extended_Pictographic# E15.0 [1] (🫨) shaking face -1FAE9..1FAEF ; Extended_Pictographic# E0.0 [7] (..) <reserved-1FAE9>..<reserved-1FAEF> +1FAE9 ; Extended_Pictographic# E16.0 [1] () face with bags under eyes +1FAEA..1FAEF ; Extended_Pictographic# E0.0 [6] (..) <reserved-1FAEA>..<reserved-1FAEF> 1FAF0..1FAF6 ; Extended_Pictographic# E14.0 [7] (🫰..🫶) hand with index finger and thumb crossed..heart hands 1FAF7..1FAF8 ; Extended_Pictographic# E15.0 [2] (🫷..🫸) leftwards pushing hand..rightwards pushing hand 1FAF9..1FAFF ; Extended_Pictographic# E0.0 [7] (..) <reserved-1FAF9>..<reserved-1FAFF> diff --git a/Master/texmf-dist/tex/generic/unicode-data/load-unicode-data.tex b/Master/texmf-dist/tex/generic/unicode-data/load-unicode-data.tex index d95e1f99ebc..d525e050432 100644 --- a/Master/texmf-dist/tex/generic/unicode-data/load-unicode-data.tex +++ b/Master/texmf-dist/tex/generic/unicode-data/load-unicode-data.tex @@ -1,6 +1,6 @@ % File load-unicode-data.tex % -% Copyright 2015-2023 The LaTeX Project +% Copyright 2015-2025 The LaTeX Project % % It may be distributed and/or modified under the conditions of % the LaTeX Project Public License (LPPL), either version 1.3c of @@ -57,7 +57,7 @@ \catcode`\^=7 % \newlinechar=`\^^J % \message{^^J}% - \message{load-unicode-data.tex v1.17 (2023-09-18)^^J}% + \message{load-unicode-data.tex v1.18 (2025-01-07)^^J}% \message{Reading Unicode data^^J}% % The first stage of parsing is dealing with the fact that there are lots of % data items separated by |;|. Of those, only a few are needed so they are @@ -175,10 +175,10 @@ }% \let\repeat\fi % There is no version data in |UnicodeData.txt|: log that it is being used with -% a hard-coded date (the modification date from ftp.unicode.org). This obviously +% a hard-coded date (the modification date from www.unicode.org/Public/). This obviously % needs to be updated when a new download takes place! - \message{\string# UnicodeData-15.1.0.txt^^J}% - \message{\string# Modified 2023-09-18 08:45:00 GMT [JAW]^^J}% + \message{\string# UnicodeData-16.0.0.txt^^J}% + \message{\string# Modified 2024-08-25 18:05 GMT [JAW]^^J}% % Actually loading the file requires an input stream, done directly. % There is a blank line at the end of the data source so there is a check % here for a |\par|. diff --git a/Master/texmf-dist/tex/generic/unicode-data/load-unicode-math-classes.tex b/Master/texmf-dist/tex/generic/unicode-data/load-unicode-math-classes.tex index 4e8ef04b7a2..c0195dd9cb7 100644 --- a/Master/texmf-dist/tex/generic/unicode-data/load-unicode-math-classes.tex +++ b/Master/texmf-dist/tex/generic/unicode-data/load-unicode-math-classes.tex @@ -1,6 +1,6 @@ % File load-unicode-math-classes.tex % -% Copyright 2015-2023 The LaTeX Project +% Copyright 2015-2025 The LaTeX Project % % It may be distributed and/or modified under the conditions of % the LaTeX Project Public License (LPPL), either version 1.3c of @@ -48,7 +48,7 @@ \catcode`\^=7 % \newlinechar=`\^^J % \message{^^J}% - \message{load-unicode-math-classes.tex v1.17 (2023-09-18)^^J}% + \message{load-unicode-math-classes.tex v1.18 (2025-01-07)^^J}% \message{Reading math class data^^J}% % The parser for data lines starts by skipping any comments (which start with % a |#| and which will be category code~$12$). diff --git a/Master/texmf-dist/tex/generic/unicode-data/load-unicode-xetex-classes.tex b/Master/texmf-dist/tex/generic/unicode-data/load-unicode-xetex-classes.tex index 1eb383beae0..ca62581ae18 100644 --- a/Master/texmf-dist/tex/generic/unicode-data/load-unicode-xetex-classes.tex +++ b/Master/texmf-dist/tex/generic/unicode-data/load-unicode-xetex-classes.tex @@ -1,6 +1,6 @@ % File load-unicode-xetex-classes.tex % -% Copyright 2015-2023 The LaTeX Project +% Copyright 2015-2025 The LaTeX Project % % It may be distributed and/or modified under the conditions of % the LaTeX Project Public License (LPPL), either version 1.3c of @@ -64,7 +64,7 @@ \catcode`\^=7 % \newlinechar=`\^^J % \message{^^J}% - \message{load-unicode-xetex-classes.tex v1.17 (2023-09-18)^^J}% + \message{load-unicode-xetex-classes.tex v1.18 (2025-01-07)^^J}% \message{Reading Unicode east Asian character class data^^J}% % A string version of |#| will be needed to look for comment lines in the % source. Once that is done proper parsing can begin. diff --git a/Master/texmf-dist/tex/latex/acmart/acmart-tagged.cls b/Master/texmf-dist/tex/latex/acmart/acmart-tagged.cls index 12aa43897f3..851d327f25b 100644 --- a/Master/texmf-dist/tex/latex/acmart/acmart-tagged.cls +++ b/Master/texmf-dist/tex/latex/acmart/acmart-tagged.cls @@ -38,7 +38,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesClass{acmart-tagged} -[2024/12/07 v2.11 Typesetting articles for the Association for Computing Machinery] +[2024/12/28 v2.12 Typesetting articles for the Association for Computing Machinery] \def\@classname{acmart-tagged} \InputIfFileExists{acmart-preload-hook.tex}{% \ClassWarning{\@classname}{% @@ -293,7 +293,6 @@ \RequirePackage{setspace} \onehalfspacing \fi -\RequirePackage{textcase} \if@ACM@acmcp \RequirePackage{framed} \RequirePackage{zref-savepos, zref-user} @@ -778,21 +777,23 @@ have the newtxmath package installed. Please upgrade your TeX}\@ACM@newfontsfalse} \if@ACM@newfonts - \RequirePackage[T1]{fontenc} % Note that the order in which packages are loaded matters, % and the correct order depends on the LaTeX engine used. % See https://github.com/borisveytsman/acmart/issues/402 % and https://github.com/borisveytsman/acmart/issues/410 \ifxetex - \RequirePackage[libertine]{newtxmath} + \RequirePackage{unicode-math} + \setmathfont[Scale=MatchUppercase]{libertinusmath-regular.otf} \RequirePackage[tt=false]{libertine} \setmonofont[StylisticSet=3]{inconsolata} \else \ifluatex - \RequirePackage[libertine]{newtxmath} + \RequirePackage{unicode-math} + \setmathfont[Scale=MatchUppercase]{libertinusmath-regular.otf} \RequirePackage[tt=false]{libertine} \setmonofont[StylisticSet=3]{inconsolata} \else + \RequirePackage[T1]{fontenc} \RequirePackage[tt=false, type1=true]{libertine} \RequirePackage[varqu]{zi4} \RequirePackage[libertine]{newtxmath} @@ -1555,7 +1556,7 @@ \def\position##1{\ignorespaces}% \def\institution##1{##1\ignorespaces}% \def\department{\@ifnextchar[{\@department}{\@department[]}}% - \def\@department[##1]##2{\unskip, ##2\ignorespaces}% + \def\@department[##1]##2{##2, \ignorespaces}% \let\city\position \let\state\position \let\country\position @@ -2166,7 +2167,9 @@ \if@printcopyright \copyright\ \@copyrightyear\ \@copyrightowner\\ \else - \@copyrightyear.\ + \ifx\@copyrightyear\@empty\else + \@copyrightyear.\ + \fi \fi \if@ACM@manuscript Manuscript submitted to ACM\\ @@ -2282,6 +2285,7 @@ \fi \ifx\@empty\@authorsaddresses\else\bigskip\@setauthorsaddresses\fi \zsaveposy{@ACM@acmcpbox@y}% + \par } \egroup} \def\@specialsection#1{% @@ -2599,9 +2603,9 @@ \global\let\and\@typeset@author@line \def\@author##1{% \ifx\@currentauthors\@empty - \gdef\@currentauthors{\@authorfont\MakeTextUppercase{##1}}% + \gdef\@currentauthors{\@authorfont\MakeUppercase{##1}}% \else - \g@addto@macro{\@currentauthors}{\and\MakeTextUppercase{##1}}% + \g@addto@macro{\@currentauthors}{\and\MakeUppercase{##1}}% \fi \gdef\and{}}% \def\email##1##2{}% diff --git a/Master/texmf-dist/tex/latex/acmart/acmart.cls b/Master/texmf-dist/tex/latex/acmart/acmart.cls index 65504d35432..5694f3083bc 100644 --- a/Master/texmf-dist/tex/latex/acmart/acmart.cls +++ b/Master/texmf-dist/tex/latex/acmart/acmart.cls @@ -38,7 +38,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesClass{acmart} -[2024/12/07 v2.11 Typesetting articles for the Association for Computing Machinery] +[2024/12/28 v2.12 Typesetting articles for the Association for Computing Machinery] \def\@classname{acmart} \InputIfFileExists{acmart-preload-hook.tex}{% \ClassWarning{\@classname}{% @@ -289,7 +289,6 @@ \RequirePackage{setspace} \onehalfspacing \fi -\RequirePackage{textcase} \if@ACM@acmcp \RequirePackage{framed} \RequirePackage{zref-savepos, zref-user} @@ -859,21 +858,23 @@ have the newtxmath package installed. Please upgrade your TeX}\@ACM@newfontsfalse} \if@ACM@newfonts - \RequirePackage[T1]{fontenc} % Note that the order in which packages are loaded matters, % and the correct order depends on the LaTeX engine used. % See https://github.com/borisveytsman/acmart/issues/402 % and https://github.com/borisveytsman/acmart/issues/410 \ifxetex - \RequirePackage[libertine]{newtxmath} + \RequirePackage{unicode-math} + \setmathfont[Scale=MatchUppercase]{libertinusmath-regular.otf} \RequirePackage[tt=false]{libertine} \setmonofont[StylisticSet=3]{inconsolata} \else \ifluatex - \RequirePackage[libertine]{newtxmath} + \RequirePackage{unicode-math} + \setmathfont[Scale=MatchUppercase]{libertinusmath-regular.otf} \RequirePackage[tt=false]{libertine} \setmonofont[StylisticSet=3]{inconsolata} \else + \RequirePackage[T1]{fontenc} \RequirePackage[tt=false, type1=true]{libertine} \RequirePackage[varqu]{zi4} \RequirePackage[libertine]{newtxmath} @@ -1636,7 +1637,7 @@ \def\position##1{\ignorespaces}% \def\institution##1{##1\ignorespaces}% \def\department{\@ifnextchar[{\@department}{\@department[]}}% - \def\@department[##1]##2{\unskip, ##2\ignorespaces}% + \def\@department[##1]##2{##2, \ignorespaces}% \let\city\position \let\state\position \let\country\position @@ -2247,7 +2248,9 @@ \if@printcopyright \copyright\ \@copyrightyear\ \@copyrightowner\\ \else - \@copyrightyear.\ + \ifx\@copyrightyear\@empty\else + \@copyrightyear.\ + \fi \fi \if@ACM@manuscript Manuscript submitted to ACM\\ @@ -2363,6 +2366,7 @@ \fi \ifx\@empty\@authorsaddresses\else\bigskip\@setauthorsaddresses\fi \zsaveposy{@ACM@acmcpbox@y}% + \par } \egroup} \def\@specialsection#1{% @@ -2680,9 +2684,9 @@ \global\let\and\@typeset@author@line \def\@author##1{% \ifx\@currentauthors\@empty - \gdef\@currentauthors{\@authorfont\MakeTextUppercase{##1}}% + \gdef\@currentauthors{\@authorfont\MakeUppercase{##1}}% \else - \g@addto@macro{\@currentauthors}{\and\MakeTextUppercase{##1}}% + \g@addto@macro{\@currentauthors}{\and\MakeUppercase{##1}}% \fi \gdef\and{}}% \def\email##1##2{}% diff --git a/Master/texmf-dist/tex/latex/aomart/aom_orcid_logo.eps b/Master/texmf-dist/tex/latex/aomart/aom_orcid_logo.eps new file mode 100644 index 00000000000..067a8f185a0 --- /dev/null +++ b/Master/texmf-dist/tex/latex/aomart/aom_orcid_logo.eps @@ -0,0 +1,518 @@ +%!PS-Adobe-3.0 EPSF-3.0 +%Produced by poppler pdftops version: 24.04.0 (http://poppler.freedesktop.org) +%%Creator: TeX +%%LanguageLevel: 2 +%%DocumentSuppliedResources: (atend) +%%BoundingBox: 0 0 194 193 +%%HiResBoundingBox: 0 0 194 193 +%%DocumentSuppliedResources: (atend) +%%EndComments +%%BeginProlog +%%BeginResource: procset xpdf 3.00 0 +%%Copyright: Copyright 1996-2011, 2022 Glyph & Cog, LLC +/xpdf 75 dict def xpdf begin +% PDF special state +/pdfDictSize 15 def +/pdfSetup { + /setpagedevice where { + pop 2 dict begin + /Policies 1 dict dup begin /PageSize 6 def end def + { /Duplex true def } if + currentdict end setpagedevice + } { + pop + } ifelse +} def +/pdfSetupPaper { + % Change paper size, but only if different from previous paper size otherwise + % duplex fails. PLRM specifies a tolerance of 5 pts when matching paper size + % so we use the same when checking if the size changes. + /setpagedevice where { + pop currentpagedevice + /PageSize known { + 2 copy + currentpagedevice /PageSize get aload pop + exch 4 1 roll + sub abs 5 gt + 3 1 roll + sub abs 5 gt + or + } { + true + } ifelse + { + 2 array astore + 2 dict begin + /PageSize exch def + /ImagingBBox null def + currentdict end + setpagedevice + } { + pop pop + } ifelse + } { + pop + } ifelse +} def +/pdfStartPage { + pdfDictSize dict begin + /pdfFillCS [] def + /pdfFillXform {} def + /pdfStrokeCS [] def + /pdfStrokeXform {} def + /pdfFill [0] def + /pdfStroke [0] def + /pdfFillOP false def + /pdfStrokeOP false def + /pdfLastFill false def + /pdfLastStroke false def + /pdfTextMat [1 0 0 1 0 0] def + /pdfFontSize 0 def + /pdfCharSpacing 0 def + /pdfTextRender 0 def + /pdfPatternCS false def + /pdfTextRise 0 def + /pdfWordSpacing 0 def + /pdfHorizScaling 1 def + /pdfTextClipPath [] def +} def +/pdfEndPage { end } def +% PDF color state +/cs { /pdfFillXform exch def dup /pdfFillCS exch def + setcolorspace } def +/CS { /pdfStrokeXform exch def dup /pdfStrokeCS exch def + setcolorspace } def +/sc { pdfLastFill not { pdfFillCS setcolorspace } if + dup /pdfFill exch def aload pop pdfFillXform setcolor + /pdfLastFill true def /pdfLastStroke false def } def +/SC { pdfLastStroke not { pdfStrokeCS setcolorspace } if + dup /pdfStroke exch def aload pop pdfStrokeXform setcolor + /pdfLastStroke true def /pdfLastFill false def } def +/op { /pdfFillOP exch def + pdfLastFill { pdfFillOP setoverprint } if } def +/OP { /pdfStrokeOP exch def + pdfLastStroke { pdfStrokeOP setoverprint } if } def +/fCol { + pdfLastFill not { + pdfFillCS setcolorspace + pdfFill aload pop pdfFillXform setcolor + pdfFillOP setoverprint + /pdfLastFill true def /pdfLastStroke false def + } if +} def +/sCol { + pdfLastStroke not { + pdfStrokeCS setcolorspace + pdfStroke aload pop pdfStrokeXform setcolor + pdfStrokeOP setoverprint + /pdfLastStroke true def /pdfLastFill false def + } if +} def +% build a font +/pdfMakeFont { + 4 3 roll findfont + 4 2 roll matrix scale makefont + dup length dict begin + { 1 index /FID ne { def } { pop pop } ifelse } forall + /Encoding exch def + currentdict + end + definefont pop +} def +/pdfMakeFont16 { + exch findfont + dup length dict begin + { 1 index /FID ne { def } { pop pop } ifelse } forall + /WMode exch def + currentdict + end + definefont pop +} def +% graphics state operators +/q { gsave pdfDictSize dict begin } def +/Q { + end grestore + /pdfLastFill where { + pop + pdfLastFill { + pdfFillOP setoverprint + } { + pdfStrokeOP setoverprint + } ifelse + } if +} def +/cm { concat } def +/d { setdash } def +/i { setflat } def +/j { setlinejoin } def +/J { setlinecap } def +/M { setmiterlimit } def +/w { setlinewidth } def +% path segment operators +/m { moveto } def +/l { lineto } def +/c { curveto } def +/re { 4 2 roll moveto 1 index 0 rlineto 0 exch rlineto + neg 0 rlineto closepath } def +/h { closepath } def +% path painting operators +/S { sCol stroke } def +/Sf { fCol stroke } def +/f { fCol fill } def +/f* { fCol eofill } def +% clipping operators +/W { clip newpath } def +/W* { eoclip newpath } def +/Ws { strokepath clip newpath } def +% text state operators +/Tc { /pdfCharSpacing exch def } def +/Tf { dup /pdfFontSize exch def + dup pdfHorizScaling mul exch matrix scale + pdfTextMat matrix concatmatrix dup 4 0 put dup 5 0 put + exch findfont exch makefont setfont } def +/Tr { /pdfTextRender exch def } def +/Tp { /pdfPatternCS exch def } def +/Ts { /pdfTextRise exch def } def +/Tw { /pdfWordSpacing exch def } def +/Tz { /pdfHorizScaling exch def } def +% text positioning operators +/Td { pdfTextMat transform moveto } def +/Tm { /pdfTextMat exch def } def +% text string operators +/xyshow where { + pop + /xyshow2 { + dup length array + 0 2 2 index length 1 sub { + 2 index 1 index 2 copy get 3 1 roll 1 add get + pdfTextMat dtransform + 4 2 roll 2 copy 6 5 roll put 1 add 3 1 roll dup 4 2 roll put + } for + exch pop + xyshow + } def +}{ + /xyshow2 { + currentfont /FontType get 0 eq { + 0 2 3 index length 1 sub { + currentpoint 4 index 3 index 2 getinterval show moveto + 2 copy get 2 index 3 2 roll 1 add get + pdfTextMat dtransform rmoveto + } for + } { + 0 1 3 index length 1 sub { + currentpoint 4 index 3 index 1 getinterval show moveto + 2 copy 2 mul get 2 index 3 2 roll 2 mul 1 add get + pdfTextMat dtransform rmoveto + } for + } ifelse + pop pop + } def +} ifelse +/cshow where { + pop + /xycp { + 0 3 2 roll + { + pop pop currentpoint 3 2 roll + 1 string dup 0 4 3 roll put false charpath moveto + 2 copy get 2 index 2 index 1 add get + pdfTextMat dtransform rmoveto + 2 add + } exch cshow + pop pop + } def +}{ + /xycp { + currentfont /FontType get 0 eq { + 0 2 3 index length 1 sub { + currentpoint 4 index 3 index 2 getinterval false charpath moveto + 2 copy get 2 index 3 2 roll 1 add get + pdfTextMat dtransform rmoveto + } for + } { + 0 1 3 index length 1 sub { + currentpoint 4 index 3 index 1 getinterval false charpath moveto + 2 copy 2 mul get 2 index 3 2 roll 2 mul 1 add get + pdfTextMat dtransform rmoveto + } for + } ifelse + pop pop + } def +} ifelse +/Tj { + fCol + 0 pdfTextRise pdfTextMat dtransform rmoveto + currentpoint 4 2 roll + pdfTextRender 1 and 0 eq { + 2 copy xyshow2 + } if + pdfTextRender 3 and dup 1 eq exch 2 eq or { + 3 index 3 index moveto + 2 copy + currentfont /FontType get 3 eq { fCol } { sCol } ifelse + xycp currentpoint stroke moveto + } if + pdfTextRender 4 and 0 ne { + 4 2 roll moveto xycp + /pdfTextClipPath [ pdfTextClipPath aload pop + {/moveto cvx} + {/lineto cvx} + {/curveto cvx} + {/closepath cvx} + pathforall ] def + currentpoint newpath moveto + } { + pop pop pop pop + } ifelse + 0 pdfTextRise neg pdfTextMat dtransform rmoveto +} def +/TJm { 0.001 mul pdfFontSize mul pdfHorizScaling mul neg 0 + pdfTextMat dtransform rmoveto } def +/TJmV { 0.001 mul pdfFontSize mul neg 0 exch + pdfTextMat dtransform rmoveto } def +/Tclip { pdfTextClipPath cvx exec clip newpath + /pdfTextClipPath [] def } def +/Tclip* { pdfTextClipPath cvx exec eoclip newpath + /pdfTextClipPath [] def } def +% Level 2/3 image operators +/pdfImBuf 100 string def +/pdfImStr { + 2 copy exch length lt { + 2 copy get exch 1 add exch + } { + () + } ifelse +} def +/skipEOD { + { currentfile pdfImBuf readline + not { pop exit } if + (%-EOD-) eq { exit } if } loop +} def +/pdfIm { image skipEOD } def +/pdfImM { fCol imagemask skipEOD } def +/pr { 2 index 2 index 3 2 roll putinterval 4 add } def +/pdfImClip { + gsave + 0 2 4 index length 1 sub { + dup 4 index exch 2 copy + get 5 index div put + 1 add 3 index exch 2 copy + get 3 index div put + } for + pop pop rectclip +} def +/pdfImClipEnd { grestore } def +% shading operators +/colordelta { + false 0 1 3 index length 1 sub { + dup 4 index exch get 3 index 3 2 roll get sub abs 0.004 gt { + pop true + } if + } for + exch pop exch pop +} def +/funcCol { func n array astore } def +/funcSH { + dup 0 eq { + true + } { + dup 6 eq { + false + } { + 4 index 4 index funcCol dup + 6 index 4 index funcCol dup + 3 1 roll colordelta 3 1 roll + 5 index 5 index funcCol dup + 3 1 roll colordelta 3 1 roll + 6 index 8 index funcCol dup + 3 1 roll colordelta 3 1 roll + colordelta or or or + } ifelse + } ifelse + { + 1 add + 4 index 3 index add 0.5 mul exch 4 index 3 index add 0.5 mul exch + 6 index 6 index 4 index 4 index 4 index funcSH + 2 index 6 index 6 index 4 index 4 index funcSH + 6 index 2 index 4 index 6 index 4 index funcSH + 5 3 roll 3 2 roll funcSH pop pop + } { + pop 3 index 2 index add 0.5 mul 3 index 2 index add 0.5 mul + funcCol sc + dup 4 index exch mat transform m + 3 index 3 index mat transform l + 1 index 3 index mat transform l + mat transform l pop pop h f* + } ifelse +} def +/axialCol { + dup 0 lt { + pop t0 + } { + dup 1 gt { + pop t1 + } { + dt mul t0 add + } ifelse + } ifelse + func n array astore +} def +/axialSH { + dup 0 eq { + true + } { + dup 8 eq { + false + } { + 2 index axialCol 2 index axialCol colordelta + } ifelse + } ifelse + { + 1 add 3 1 roll 2 copy add 0.5 mul + dup 4 3 roll exch 4 index axialSH + exch 3 2 roll axialSH + } { + pop 2 copy add 0.5 mul + axialCol sc + exch dup dx mul x0 add exch dy mul y0 add + 3 2 roll dup dx mul x0 add exch dy mul y0 add + dx abs dy abs ge { + 2 copy yMin sub dy mul dx div add yMin m + yMax sub dy mul dx div add yMax l + 2 copy yMax sub dy mul dx div add yMax l + yMin sub dy mul dx div add yMin l + h f* + } { + exch 2 copy xMin sub dx mul dy div add xMin exch m + xMax sub dx mul dy div add xMax exch l + exch 2 copy xMax sub dx mul dy div add xMax exch l + xMin sub dx mul dy div add xMin exch l + h f* + } ifelse + } ifelse +} def +/radialCol { + dup t0 lt { + pop t0 + } { + dup t1 gt { + pop t1 + } if + } ifelse + func n array astore +} def +/radialSH { + dup 0 eq { + true + } { + dup 8 eq { + false + } { + 2 index dt mul t0 add radialCol + 2 index dt mul t0 add radialCol colordelta + } ifelse + } ifelse + { + 1 add 3 1 roll 2 copy add 0.5 mul + dup 4 3 roll exch 4 index radialSH + exch 3 2 roll radialSH + } { + pop 2 copy add 0.5 mul dt mul t0 add + radialCol sc + encl { + exch dup dx mul x0 add exch dup dy mul y0 add exch dr mul r0 add + 0 360 arc h + dup dx mul x0 add exch dup dy mul y0 add exch dr mul r0 add + 360 0 arcn h f + } { + 2 copy + dup dx mul x0 add exch dup dy mul y0 add exch dr mul r0 add + a1 a2 arcn + dup dx mul x0 add exch dup dy mul y0 add exch dr mul r0 add + a2 a1 arcn h + dup dx mul x0 add exch dup dy mul y0 add exch dr mul r0 add + a1 a2 arc + dup dx mul x0 add exch dup dy mul y0 add exch dr mul r0 add + a2 a1 arc h f + } ifelse + } ifelse +} def +end +%%EndResource +%%EndProlog +%%BeginSetup +xpdf begin +%%EndSetup +pdfStartPage +%%EndPageSetup +[] 0 d +1 i +0 j +0 J +10 M +1 w +/DeviceGray {} cs +[0] sc +/DeviceGray {} CS +[0] SC +false op +false OP +{} settransfer +0 0 194 193 re +W +q +q +[1 0 0 1 1 0] cm +q +[1 0 0 1 0 0] cm +0 0 191.99999 192.000012 re +W +[1 0 0 -1 0 192.000012] cm +q +/DeviceRGB {} cs +[0.651 0.8078 0.2235] sc +192 96 m +192 149.023 149.023 192 96 192 c +42.977 192 0 149.023 0 96 c +0 42.977 42.977 0 96 0 c +149.023 0 192 42.977 192 96 c +h +f +/DeviceRGB {} cs +[1 1 1] sc +53.176 59.324 11.551 80.324 re +f +81.676 59.324 m +112.875 59.324 l +142.574 59.324 155.625 80.551 155.625 99.523 c +155.625 120.148 139.5 139.727 113.023 139.727 c +81.676 139.727 l +81.676 59.324 l +h +93.227 129.301 m +111.602 129.301 l +137.773 129.301 143.773 109.426 143.773 99.523 c +143.773 83.398 133.5 69.75 111 69.75 c +93.227 69.75 l +93.227 129.301 l +h +f +66.523 42.602 m +66.523 46.727 63.148 50.176 58.949 50.176 c +54.75 50.176 51.375 46.727 51.375 42.602 c +51.375 38.398 54.75 35.023 58.949 35.023 c +63.148 35.023 66.523 38.477 66.523 42.602 c +h +f +Q +Q +Q +Q +showpage +%%PageTrailer +pdfEndPage +%%Trailer +end +%%DocumentSuppliedResources: +%%EOF diff --git a/Master/texmf-dist/tex/latex/aomart/aom_orcid_logo.pdf b/Master/texmf-dist/tex/latex/aomart/aom_orcid_logo.pdf Binary files differnew file mode 100644 index 00000000000..97fb31c0380 --- /dev/null +++ b/Master/texmf-dist/tex/latex/aomart/aom_orcid_logo.pdf diff --git a/Master/texmf-dist/tex/latex/baskervaldx/ly1minbaskervaldx.fd b/Master/texmf-dist/tex/latex/baskervaldx/ly1minbaskervaldx.fd new file mode 100644 index 00000000000..adbcd9e134d --- /dev/null +++ b/Master/texmf-dist/tex/latex/baskervaldx/ly1minbaskervaldx.fd @@ -0,0 +1,136 @@ +%% Generated by msharpe on 2022/01/20 +%% +\ProvidesFile{ly1minbaskervaldx.fd} + [2022/01/20 (msharpe) Font definitions for LY1/minbaskervaldx.] + +\expandafter\ifx\csname ntxmath@scaled\endcsname\relax + \let\ntxmath@scaled\@empty +\fi + +\ifdefined\@Baskervaldx@swfalse % +\else + \expandafter\newif\csname if@Baskervaldx@sw\endcsname +\fi + +\DeclareFontFamily{LY1}{minbaskervaldx}{} + +\DeclareFontShape{LY1}{minbaskervaldx}{b}{sc}{ + <-> \ntxmath@scaled Baskervaldx-Bol-tlf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{minbaskervaldx}{b}{scit}{ + <-> \ntxmath@scaled Baskervaldx-BolIta-tlf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{minbaskervaldx}{b}{sw}{ + <-> \ntxmath@scaled Baskervaldx-BolIta-tlf-swash-ly1 +}{} + +\DeclareFontShape{LY1}{minbaskervaldx}{b}{nw}{ + <-> \ntxmath@scaled Baskervaldx-Bol-tlf-swash-ly1 +}{} + +\DeclareFontShape{LY1}{minbaskervaldx}{b}{scsl}{ + <-> ssub * minbaskervaldx/b/scit +}{} + +\DeclareFontShape{LY1}{minbaskervaldx}{b}{sl}{ + <-> ssub * minbaskervaldx/b/it +}{} + +\DeclareFontShape{LY1}{minbaskervaldx}{m}{sc}{ + <-> \ntxmath@scaled Baskervaldx-Reg-tlf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{minbaskervaldx}{m}{scit}{ + <-> \ntxmath@scaled Baskervaldx-Ita-tlf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{minbaskervaldx}{m}{sw}{ + <-> \ntxmath@scaled Baskervaldx-Ita-tlf-swash-ly1 +}{} + +\DeclareFontShape{LY1}{minbaskervaldx}{m}{nw}{ + <-> \ntxmath@scaled Baskervaldx-Reg-tlf-swash-ly1 +}{} + +\DeclareFontShape{LY1}{minbaskervaldx}{m}{scsl}{ + <-> ssub * minbaskervaldx/m/scit +}{} + +\DeclareFontShape{LY1}{minbaskervaldx}{m}{sl}{ + <-> ssub * minbaskervaldx/m/it +}{} + +\DeclareFontShape{LY1}{minbaskervaldx}{bx}{scsl}{ + <-> ssub * minbaskervaldx/b/scsl +}{} + +\DeclareFontShape{LY1}{minbaskervaldx}{bx}{sc}{ + <-> ssub * minbaskervaldx/b/sc +}{} + +\DeclareFontShape{LY1}{minbaskervaldx}{bx}{n}{ + <-> ssub * minbaskervaldx/b/n +}{} + +\DeclareFontShape{LY1}{minbaskervaldx}{bx}{it}{ + <-> ssub * minbaskervaldx/b/it +}{} + +\DeclareFontShape{LY1}{minbaskervaldx}{bx}{sw}{ + <-> ssub * minbaskervaldx/b/sw +}{} + +\DeclareFontShape{LY1}{minbaskervaldx}{bx}{sl}{ + <-> ssub * minbaskervaldx/b/sl +}{} + +\DeclareFontShape{LY1}{minbaskervaldx}{bx}{scit}{ + <-> ssub * minbaskervaldx/b/scit +}{} + +\DeclareFontShape{LY1}{minbaskervaldx}{bx}{nw}{ + <-> ssub * minbaskervaldx/b/nw +}{} + +\if@Baskervaldx@sw % swash is default + + \DeclareFontShape{LY1}{minbaskervaldx}{b}{n}{ + <-> ssub * minbaskervaldx/b/nw + }{} + + \DeclareFontShape{LY1}{minbaskervaldx}{b}{it}{ + <-> ssub * minbaskervaldx/b/sw + }{} + + + \DeclareFontShape{LY1}{minbaskervaldx}{m}{n}{ + <-> ssub * minbaskervaldx/m/nw + }{} + + \DeclareFontShape{LY1}{minbaskervaldx}{m}{it}{ + <-> ssub * minbaskervaldx/m/sw + }{} + +\else %default is no swash + + \DeclareFontShape{LY1}{minbaskervaldx}{b}{n}{ + <-> \ntxmath@scaled Baskervaldx-Bol-tlf-ly1 + }{} + + \DeclareFontShape{LY1}{minbaskervaldx}{b}{it}{ + <-> \ntxmath@scaled Baskervaldx-BolIta-tlf-ly1 + }{} + + \DeclareFontShape{LY1}{minbaskervaldx}{m}{n}{ + <-> \ntxmath@scaled Baskervaldx-Reg-tlf-ly1 + }{} + + \DeclareFontShape{LY1}{minbaskervaldx}{m}{it}{ + <-> \ntxmath@scaled Baskervaldx-Ita-tlf-ly1 + }{} + +\fi + +\endinput diff --git a/Master/texmf-dist/tex/latex/baskervaldx/ot1minbaskervaldx.fd b/Master/texmf-dist/tex/latex/baskervaldx/ot1minbaskervaldx.fd new file mode 100644 index 00000000000..bf81ed57a66 --- /dev/null +++ b/Master/texmf-dist/tex/latex/baskervaldx/ot1minbaskervaldx.fd @@ -0,0 +1,132 @@ +%% Generated by msharpe on 2022/01/20 +%% +\ProvidesFile{ot1minbaskervaldx.fd} + [2022/01/20 (msharpe) Font definitions for OT1/minbaskervaldx.] + + +\expandafter\ifx\csname ntxmath@scaled\endcsname\relax + \let\ntxmath@scaled\@empty +\fi + +\DeclareFontFamily{OT1}{minbaskervaldx}{} + +\DeclareFontShape{OT1}{minbaskervaldx}{b}{sc}{ + <-> \ntxmath@scaled Baskervaldx-Bol-tlf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{minbaskervaldx}{b}{scit}{ + <-> \ntxmath@scaled Baskervaldx-BolIta-tlf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{minbaskervaldx}{b}{sw}{ + <-> \ntxmath@scaled Baskervaldx-BolIta-tlf-swash-ot1 +}{} + +\DeclareFontShape{OT1}{minbaskervaldx}{b}{nw}{ + <-> \ntxmath@scaled Baskervaldx-Bol-tlf-swash-ot1 +}{} + +\DeclareFontShape{OT1}{minbaskervaldx}{b}{scsl}{ + <-> ssub * minbaskervaldx/b/scit +}{} + +\DeclareFontShape{OT1}{minbaskervaldx}{b}{sl}{ + <-> ssub * minbaskervaldx/b/it +}{} + +\DeclareFontShape{OT1}{minbaskervaldx}{m}{sc}{ + <-> \ntxmath@scaled Baskervaldx-Reg-tlf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{minbaskervaldx}{m}{scit}{ + <-> \ntxmath@scaled Baskervaldx-Ita-tlf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{minbaskervaldx}{m}{sw}{ + <-> \ntxmath@scaled Baskervaldx-Ita-tlf-swash-ot1 +}{} + +\DeclareFontShape{OT1}{minbaskervaldx}{m}{nw}{ + <-> \ntxmath@scaled Baskervaldx-Reg-tlf-swash-ot1 +}{} + +\DeclareFontShape{OT1}{minbaskervaldx}{m}{scsl}{ + <-> ssub * minbaskervaldx/m/scit +}{} + +\DeclareFontShape{OT1}{minbaskervaldx}{m}{sl}{ + <-> ssub * minbaskervaldx/m/it +}{} + +\DeclareFontShape{OT1}{minbaskervaldx}{bx}{scsl}{ + <-> ssub * minbaskervaldx/b/scsl +}{} + +\DeclareFontShape{OT1}{minbaskervaldx}{bx}{sc}{ + <-> ssub * minbaskervaldx/b/sc +}{} + +\DeclareFontShape{OT1}{minbaskervaldx}{bx}{n}{ + <-> ssub * minbaskervaldx/b/n +}{} + +\DeclareFontShape{OT1}{minbaskervaldx}{bx}{it}{ + <-> ssub * minbaskervaldx/b/it +}{} + +\DeclareFontShape{OT1}{minbaskervaldx}{bx}{sw}{ + <-> ssub * minbaskervaldx/b/sw +}{} + +\DeclareFontShape{OT1}{minbaskervaldx}{bx}{sl}{ + <-> ssub * minbaskervaldx/b/sl +}{} + +\DeclareFontShape{OT1}{minbaskervaldx}{bx}{scit}{ + <-> ssub * minbaskervaldx/b/scit +}{} + +\DeclareFontShape{OT1}{minbaskervaldx}{bx}{nw}{ + <-> ssub * minbaskervaldx/b/nw +}{} + +\if@Baskervaldx@sw % swash is default + + \DeclareFontShape{OT1}{minbaskervaldx}{b}{n}{ + <-> ssub * minbaskervaldx/b/nw + }{} + + \DeclareFontShape{OT1}{minbaskervaldx}{b}{it}{ + <-> ssub * minbaskervaldx/b/sw + }{} + + + \DeclareFontShape{OT1}{minbaskervaldx}{m}{n}{ + <-> ssub * minbaskervaldx/m/nw + }{} + + \DeclareFontShape{OT1}{minbaskervaldx}{m}{it}{ + <-> ssub * minbaskervaldx/m/sw + }{} + +\else %default is no swash + + \DeclareFontShape{OT1}{minbaskervaldx}{b}{n}{ + <-> \ntxmath@scaled Baskervaldx-Bol-tlf-ot1 + }{} + + \DeclareFontShape{OT1}{minbaskervaldx}{b}{it}{ + <-> \ntxmath@scaled Baskervaldx-BolIta-tlf-ot1 + }{} + + \DeclareFontShape{OT1}{minbaskervaldx}{m}{n}{ + <-> \ntxmath@scaled Baskervaldx-Reg-tlf-ot1 + }{} + + \DeclareFontShape{OT1}{minbaskervaldx}{m}{it}{ + <-> \ntxmath@scaled Baskervaldx-Ita-tlf-ot1 + }{} + +\fi + +\endinput diff --git a/Master/texmf-dist/tex/latex/baskervaldx/t1minbaskervaldx.fd b/Master/texmf-dist/tex/latex/baskervaldx/t1minbaskervaldx.fd new file mode 100644 index 00000000000..73a7365b226 --- /dev/null +++ b/Master/texmf-dist/tex/latex/baskervaldx/t1minbaskervaldx.fd @@ -0,0 +1,135 @@ +%% Generated by msharpe on 2022/01/20 +%% +\ProvidesFile{t1minbaskervaldx.fd} + [2022/01/20 (msharpe) Font definitions for T1/minbaskervaldx.] + +\expandafter\ifx\csname ntxmath@scaled\endcsname\relax + \let\ntxmath@scaled\@empty +\fi + +\ifdefined\@Baskervaldx@swfalse % +\else + \expandafter\newif\csname if@Baskervaldx@sw\endcsname +\fi + +\DeclareFontFamily{T1}{minbaskervaldx}{} + +\DeclareFontShape{T1}{minbaskervaldx}{b}{sc}{ + <-> \ntxmath@scaled Baskervaldx-Bol-tlf-sc-t1 +}{} + +\DeclareFontShape{T1}{minbaskervaldx}{b}{scit}{ + <-> \ntxmath@scaled Baskervaldx-BolIta-tlf-sc-t1 +}{} + +\DeclareFontShape{T1}{minbaskervaldx}{b}{sw}{ + <-> \ntxmath@scaled Baskervaldx-BolIta-tlf-swash-t1 +}{} + +\DeclareFontShape{T1}{minbaskervaldx}{b}{nw}{ + <-> \ntxmath@scaled Baskervaldx-Bol-tlf-swash-t1 +}{} + +\DeclareFontShape{T1}{minbaskervaldx}{b}{scsl}{ + <-> ssub * minbaskervaldx/b/scit +}{} + +\DeclareFontShape{T1}{minbaskervaldx}{b}{sl}{ + <-> ssub * minbaskervaldx/b/it +}{} + +\DeclareFontShape{T1}{minbaskervaldx}{m}{sc}{ + <-> \ntxmath@scaled Baskervaldx-Reg-tlf-sc-t1 +}{} + +\DeclareFontShape{T1}{minbaskervaldx}{m}{scit}{ + <-> \ntxmath@scaled Baskervaldx-Ita-tlf-sc-t1 +}{} + +\DeclareFontShape{T1}{minbaskervaldx}{m}{sw}{ + <-> \ntxmath@scaled Baskervaldx-Ita-tlf-swash-t1 +}{} + +\DeclareFontShape{T1}{minbaskervaldx}{m}{nw}{ + <-> \ntxmath@scaled Baskervaldx-Reg-tlf-swash-t1 +}{} + +\DeclareFontShape{T1}{minbaskervaldx}{m}{scsl}{ + <-> ssub * minbaskervaldx/m/scit +}{} + +\DeclareFontShape{T1}{minbaskervaldx}{m}{sl}{ + <-> ssub * minbaskervaldx/m/it +}{} + +\DeclareFontShape{T1}{minbaskervaldx}{bx}{scsl}{ + <-> ssub * minbaskervaldx/b/scsl +}{} + +\DeclareFontShape{T1}{minbaskervaldx}{bx}{sc}{ + <-> ssub * minbaskervaldx/b/sc +}{} + +\DeclareFontShape{T1}{minbaskervaldx}{bx}{n}{ + <-> ssub * minbaskervaldx/b/n +}{} + +\DeclareFontShape{T1}{minbaskervaldx}{bx}{it}{ + <-> ssub * minbaskervaldx/b/it +}{} + +\DeclareFontShape{T1}{minbaskervaldx}{bx}{sw}{ + <-> ssub * minbaskervaldx/b/sw +}{} + +\DeclareFontShape{T1}{minbaskervaldx}{bx}{sl}{ + <-> ssub * minbaskervaldx/b/sl +}{} + +\DeclareFontShape{T1}{minbaskervaldx}{bx}{scit}{ + <-> ssub * minbaskervaldx/b/scit +}{} + +\DeclareFontShape{T1}{minbaskervaldx}{bx}{nw}{ + <-> ssub * minbaskervaldx/b/nw +}{} + +\if@Baskervaldx@sw % swash is default + + \DeclareFontShape{T1}{minbaskervaldx}{b}{n}{ + <-> ssub * minbaskervaldx/b/nw + }{} + + \DeclareFontShape{T1}{minbaskervaldx}{b}{it}{ + <-> ssub * minbaskervaldx/b/sw + }{} + + + \DeclareFontShape{T1}{minbaskervaldx}{m}{n}{ + <-> ssub * minbaskervaldx/m/nw + }{} + + \DeclareFontShape{T1}{minbaskervaldx}{m}{it}{ + <-> ssub * minbaskervaldx/m/sw + }{} + +\else %default is no swash + + \DeclareFontShape{T1}{minbaskervaldx}{b}{n}{ + <-> \ntxmath@scaled Baskervaldx-Bol-tlf-t1 + }{} + + \DeclareFontShape{T1}{minbaskervaldx}{b}{it}{ + <-> \ntxmath@scaled Baskervaldx-BolIta-tlf-t1 + }{} + + \DeclareFontShape{T1}{minbaskervaldx}{m}{n}{ + <-> \ntxmath@scaled Baskervaldx-Reg-tlf-t1 + }{} + + \DeclareFontShape{T1}{minbaskervaldx}{m}{it}{ + <-> \ntxmath@scaled Baskervaldx-Ita-tlf-t1 + }{} +\fi + +\endinput diff --git a/Master/texmf-dist/tex/latex/baskervillef/ly1minbaskervillef.fd b/Master/texmf-dist/tex/latex/baskervillef/ly1minbaskervillef.fd new file mode 100644 index 00000000000..97a61809f2f --- /dev/null +++ b/Master/texmf-dist/tex/latex/baskervillef/ly1minbaskervillef.fd @@ -0,0 +1,107 @@ +%% Generated by msharpe on 2022/01/20 +%% +\ProvidesFile{ly1minbaskervillef.fd} + [2022/01/20 (msharpe) Font definitions for LY1/minbaskervillef.] + +\expandafter\ifx\csname ntxmath@scaled\endcsname\relax + \let\ntxmath@scaled\@empty +\fi + +\DeclareFontFamily{LY1}{minbaskervillef}{\providecommand{\BaskervilleF@spc}{}\BaskervilleF@spc} + +\DeclareFontShape{LY1}{minbaskervillef}{m}{it}{ + <-> \ntxmath@scaled BaskervilleF-Italic-tlf-ly1 +}{} +\DeclareFontShape{LY1}{minbaskervillef}{m}{sl}{ + <-> \ntxmath@scaled BaskervilleF-Italic-tlf-th-ly1 +}{} + +\DeclareFontShape{LY1}{minbaskervillef}{m}{nw}{ + <-> \ntxmath@scaled BaskervilleF-Regular-tlf-swash-ly1 +}{} + +\DeclareFontShape{LY1}{minbaskervillef}{m}{n}{ + <-> \ntxmath@scaled BaskervilleF-Regular-tlf-ly1 +}{} + +\DeclareFontShape{LY1}{minbaskervillef}{m}{scit}{ + <-> \ntxmath@scaled BaskervilleF-Italic-tlf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{minbaskervillef}{m}{sw}{ + <-> \ntxmath@scaled BaskervilleF-Italic-tlf-swash-ly1 +}{} + +\DeclareFontShape{LY1}{minbaskervillef}{m}{sc}{ + <-> \ntxmath@scaled BaskervilleF-Regular-tlf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{minbaskervillef}{m}{scsl}{ + <-> ssub * minbaskervillef/m/scit +}{} + +\DeclareFontShape{LY1}{minbaskervillef}{b}{nw}{ + <-> \ntxmath@scaled BaskervilleF-Bold-tlf-swash-ly1 +}{} + +\DeclareFontShape{LY1}{minbaskervillef}{b}{it}{ + <-> \ntxmath@scaled BaskervilleF-BoldItalic-tlf-ly1 +}{} + +\DeclareFontShape{LY1}{minbaskervillef}{b}{sc}{ + <-> \ntxmath@scaled BaskervilleF-Bold-tlf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{minbaskervillef}{b}{sw}{ + <-> \ntxmath@scaled BaskervilleF-BoldItalic-tlf-swash-ly1 +}{} + +\DeclareFontShape{LY1}{minbaskervillef}{b}{n}{ + <-> \ntxmath@scaled BaskervilleF-Bold-tlf-ly1 +}{} + +\DeclareFontShape{LY1}{minbaskervillef}{b}{scit}{ + <-> \ntxmath@scaled BaskervilleF-BoldItalic-tlf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{minbaskervillef}{b}{scsl}{ + <-> ssub * minbaskervillef/b/scit +}{} + +\DeclareFontShape{LY1}{minbaskervillef}{b}{sl}{ + <-> ssub * minbaskervillef/m/sl +}{} + +\DeclareFontShape{LY1}{minbaskervillef}{bx}{sw}{ + <-> ssub * minbaskervillef/b/sw +}{} + +\DeclareFontShape{LY1}{minbaskervillef}{bx}{scit}{ + <-> ssub * minbaskervillef/b/scit +}{} + +\DeclareFontShape{LY1}{minbaskervillef}{bx}{n}{ + <-> ssub * minbaskervillef/b/n +}{} + +\DeclareFontShape{LY1}{minbaskervillef}{bx}{sl}{ + <-> ssub * minbaskervillef/m/sl +}{} + +\DeclareFontShape{LY1}{minbaskervillef}{bx}{nw}{ + <-> ssub * minbaskervillef/b/nw +}{} + +\DeclareFontShape{LY1}{minbaskervillef}{bx}{scsl}{ + <-> ssub * minbaskervillef/b/scsl +}{} + +\DeclareFontShape{LY1}{minbaskervillef}{bx}{sc}{ + <-> ssub * minbaskervillef/b/sc +}{} + +\DeclareFontShape{LY1}{minbaskervillef}{bx}{it}{ + <-> ssub * minbaskervillef/b/it +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/baskervillef/ot1minbaskervillef.fd b/Master/texmf-dist/tex/latex/baskervillef/ot1minbaskervillef.fd new file mode 100644 index 00000000000..341fffcfe0e --- /dev/null +++ b/Master/texmf-dist/tex/latex/baskervillef/ot1minbaskervillef.fd @@ -0,0 +1,107 @@ +%% Generated by msharpe on 2022/01/20 +%% +\ProvidesFile{ot1minbaskervillef.fd} + [2022/01/20 (msharpe) Font definitions for OT1/minbaskervillef.] + +\expandafter\ifx\csname ntxmath@scaled\endcsname\relax + \let\ntxmath@scaled\@empty +\fi + +\DeclareFontFamily{OT1}{minbaskervillef}{\providecommand{\BaskervilleF@spc}{}\BaskervilleF@spc} + +\DeclareFontShape{OT1}{minbaskervillef}{m}{sc}{ + <-> \ntxmath@scaled BaskervilleF-Regular-tlf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{minbaskervillef}{m}{n}{ + <-> \ntxmath@scaled BaskervilleF-Regular-tlf-ot1G +}{} + +\DeclareFontShape{OT1}{minbaskervillef}{m}{scit}{ + <-> \ntxmath@scaled BaskervilleF-Italic-tlf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{minbaskervillef}{m}{sw}{ + <-> \ntxmath@scaled BaskervilleF-Italic-tlf-swash-ot1 +}{} + +\DeclareFontShape{OT1}{minbaskervillef}{m}{nw}{ + <-> \ntxmath@scaled BaskervilleF-Regular-tlf-swash-ot1 +}{} + +\DeclareFontShape{OT1}{minbaskervillef}{m}{it}{ + <-> \ntxmath@scaled BaskervilleF-Italic-tlf-ot1G +}{} +\DeclareFontShape{OT1}{minbaskervillef}{m}{sl}{ + <-> \ntxmath@scaled BaskervilleF-Italic-tlf-th-ot1 +}{} + +\DeclareFontShape{OT1}{minbaskervillef}{m}{scsl}{ + <-> ssub * minbaskervillef/m/scit +}{} + +\DeclareFontShape{OT1}{minbaskervillef}{b}{nw}{ + <-> \ntxmath@scaled BaskervilleF-Bold-tlf-swash-ot1 +}{} + +\DeclareFontShape{OT1}{minbaskervillef}{b}{it}{ + <-> \ntxmath@scaled BaskervilleF-BoldItalic-tlf-ot1G +}{} + +\DeclareFontShape{OT1}{minbaskervillef}{b}{sc}{ + <-> \ntxmath@scaled BaskervilleF-Bold-tlf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{minbaskervillef}{b}{n}{ + <-> \ntxmath@scaled BaskervilleF-Bold-tlf-ot1G +}{} + +\DeclareFontShape{OT1}{minbaskervillef}{b}{sw}{ + <-> \ntxmath@scaled BaskervilleF-BoldItalic-tlf-swash-ot1 +}{} + +\DeclareFontShape{OT1}{minbaskervillef}{b}{scit}{ + <-> \ntxmath@scaled BaskervilleF-BoldItalic-tlf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{minbaskervillef}{b}{scsl}{ + <-> ssub * minbaskervillef/b/scit +}{} + +\DeclareFontShape{OT1}{minbaskervillef}{b}{sl}{ + <-> ssub * minbaskervillef/m/sl +}{} + +\DeclareFontShape{OT1}{minbaskervillef}{bx}{sl}{ + <-> ssub * minbaskervillef/m/sl +}{} + +\DeclareFontShape{OT1}{minbaskervillef}{bx}{scit}{ + <-> ssub * minbaskervillef/b/scit +}{} + +\DeclareFontShape{OT1}{minbaskervillef}{bx}{sw}{ + <-> ssub * minbaskervillef/b/sw +}{} + +\DeclareFontShape{OT1}{minbaskervillef}{bx}{n}{ + <-> ssub * minbaskervillef/b/n +}{} + +\DeclareFontShape{OT1}{minbaskervillef}{bx}{nw}{ + <-> ssub * minbaskervillef/b/nw +}{} + +\DeclareFontShape{OT1}{minbaskervillef}{bx}{sc}{ + <-> ssub * minbaskervillef/b/sc +}{} + +\DeclareFontShape{OT1}{minbaskervillef}{bx}{scsl}{ + <-> ssub * minbaskervillef/b/scsl +}{} + +\DeclareFontShape{OT1}{minbaskervillef}{bx}{it}{ + <-> ssub * minbaskervillef/b/it +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/baskervillef/t1minbaskervillef.fd b/Master/texmf-dist/tex/latex/baskervillef/t1minbaskervillef.fd new file mode 100644 index 00000000000..69a9748583f --- /dev/null +++ b/Master/texmf-dist/tex/latex/baskervillef/t1minbaskervillef.fd @@ -0,0 +1,107 @@ +%% Generated by msharpe on 2022/01/20 +%% +\ProvidesFile{t1minbaskervillef.fd} + [2022/01/20 (msharpe) Font definitions for T1/minbaskervillef.] + +\expandafter\ifx\csname ntxmath@scaled\endcsname\relax + \let\ntxmath@scaled\@empty +\fi + +\DeclareFontFamily{T1}{minbaskervillef}{\providecommand{\BaskervilleF@spc}{}\BaskervilleF@spc} + +\DeclareFontShape{T1}{minbaskervillef}{m}{it}{ + <-> \ntxmath@scaled BaskervilleF-Italic-tlf-t1 +}{} +\DeclareFontShape{T1}{minbaskervillef}{m}{sl}{ + <-> \ntxmath@scaled BaskervilleF-Italic-tlf-th-t1 +}{} + +\DeclareFontShape{T1}{minbaskervillef}{m}{nw}{ + <-> \ntxmath@scaled BaskervilleF-Regular-tlf-swash-t1 +}{} + +\DeclareFontShape{T1}{minbaskervillef}{m}{sw}{ + <-> \ntxmath@scaled BaskervilleF-Italic-tlf-swash-t1 +}{} + +\DeclareFontShape{T1}{minbaskervillef}{m}{n}{ + <-> \ntxmath@scaled BaskervilleF-Regular-tlf-t1 +}{} + +\DeclareFontShape{T1}{minbaskervillef}{m}{scit}{ + <-> \ntxmath@scaled BaskervilleF-Italic-tlf-sc-t1 +}{} + +\DeclareFontShape{T1}{minbaskervillef}{m}{sc}{ + <-> \ntxmath@scaled BaskervilleF-Regular-tlf-sc-t1 +}{} + +\DeclareFontShape{T1}{minbaskervillef}{m}{scsl}{ + <-> ssub * minbaskervillef/m/scit +}{} + +\DeclareFontShape{T1}{minbaskervillef}{b}{sc}{ + <-> \ntxmath@scaled BaskervilleF-Bold-tlf-sc-t1 +}{} + +\DeclareFontShape{T1}{minbaskervillef}{b}{scit}{ + <-> \ntxmath@scaled BaskervilleF-BoldItalic-tlf-sc-t1 +}{} + +\DeclareFontShape{T1}{minbaskervillef}{b}{sw}{ + <-> \ntxmath@scaled BaskervilleF-BoldItalic-tlf-swash-t1 +}{} + +\DeclareFontShape{T1}{minbaskervillef}{b}{n}{ + <-> \ntxmath@scaled BaskervilleF-Bold-tlf-t1 +}{} + +\DeclareFontShape{T1}{minbaskervillef}{b}{nw}{ + <-> \ntxmath@scaled BaskervilleF-Bold-tlf-swash-t1 +}{} + +\DeclareFontShape{T1}{minbaskervillef}{b}{it}{ + <-> \ntxmath@scaled BaskervilleF-BoldItalic-tlf-t1 +}{} + +\DeclareFontShape{T1}{minbaskervillef}{b}{scsl}{ + <-> ssub * minbaskervillef/b/scit +}{} + +\DeclareFontShape{T1}{minbaskervillef}{b}{sl}{ + <-> ssub * minbaskervillef/m/sl +}{} + +\DeclareFontShape{T1}{minbaskervillef}{bx}{n}{ + <-> ssub * minbaskervillef/b/n +}{} + +\DeclareFontShape{T1}{minbaskervillef}{bx}{scit}{ + <-> ssub * minbaskervillef/b/scit +}{} + +\DeclareFontShape{T1}{minbaskervillef}{bx}{sw}{ + <-> ssub * minbaskervillef/b/sw +}{} + +\DeclareFontShape{T1}{minbaskervillef}{bx}{sl}{ + <-> ssub * minbaskervillef/m/sl +}{} + +\DeclareFontShape{T1}{minbaskervillef}{bx}{nw}{ + <-> ssub * minbaskervillef/b/nw +}{} + +\DeclareFontShape{T1}{minbaskervillef}{bx}{scsl}{ + <-> ssub * minbaskervillef/b/scsl +}{} + +\DeclareFontShape{T1}{minbaskervillef}{bx}{sc}{ + <-> ssub * minbaskervillef/b/sc +}{} + +\DeclareFontShape{T1}{minbaskervillef}{bx}{it}{ + <-> ssub * minbaskervillef/b/it +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/beamertheme-simpleplus/beamercolorthemeSimplePlus.sty b/Master/texmf-dist/tex/latex/beamertheme-simpleplus/beamercolorthemeSimplePlus.sty index 906498e4078..5ab1413ee0d 100644 --- a/Master/texmf-dist/tex/latex/beamertheme-simpleplus/beamercolorthemeSimplePlus.sty +++ b/Master/texmf-dist/tex/latex/beamertheme-simpleplus/beamercolorthemeSimplePlus.sty @@ -1,33 +1,37 @@ -% !TEX TS-program = xelatex -% !TEX encoding = UTF-8 Unicode +%------------------------------------------------------------- +% Package: beamertheme-SimplePlus +% Author: Pin-Yen Huang (pyhuang97@gmail.com) +% Version: 1.1, 2025-01-07 +% Link: https://github.com/pm25/SimplePlus-BeamerTheme +% This is free and unencumbered software released into the +% public domain; see <http://unlicense.org> for details. +%------------------------------------------------------------- -%---------------------------------------------------------------------------------------- -% Package: beamertheme-SimplePlus -% Author: Pin-Yen Huang (pyhuang97@gmail.com) -% Version: 1.0, 2021-12-16 -% Link: https://github.com/PM25/SimplePlus-BeamerTheme -% This is free and unencumbered software released into the -% public domain; see <http://unlicense.org> for details. -%---------------------------------------------------------------------------------------- +%-------------------------------------- +% Color Settings +%-------------------------------------- -% define color -\definecolor{InvisibleRed}{rgb}{0.97, 0.92, 0.92} -\definecolor{InvisibleGreen}{rgb}{0.92, 0.97, 0.92} -\definecolor{InvisibleBlue}{rgb}{0.92, 0.92, 0.97} +% define custom colors +\definecolor{MutedRed}{rgb}{0.97, 0.92, 0.92} +\definecolor{MutedGreen}{rgb}{0.92, 0.97, 0.92} +\definecolor{MutedBlue}{rgb}{0.92, 0.92, 0.97} +\definecolor{MutedBlack}{rgb}{0.95, 0.95, 0.95} \definecolor{MediumRed}{rgb}{0.925, 0.345, 0.345} \definecolor{MediumGreen}{rgb}{0.37, 0.7, 0.66} \definecolor{MediumBlue}{rgb}{0.015, 0.315, 0.45} +\definecolor{MediumBlack}{rgb}{0.219, 0.259, 0.349} -\definecolor{DarkBlue}{rgb}{0.05, 0.15, 0.35} +\definecolor{DarkBlue}{rgb}{0.05, 0.15, 0.35} -% set color +% set beamer color themes \usecolortheme[named=DarkBlue]{structure} +% customize colors for elements \setbeamercolor{titlelike}{parent=structure} -\setbeamercolor{block title}{bg=MediumBlue} -\setbeamercolor{block body}{bg=InvisibleBlue} -\setbeamercolor{block title example}{bg=MediumGreen} -\setbeamercolor{block body example}{bg=InvisibleGreen} -\setbeamercolor{block title alerted}{bg=MediumRed} -\setbeamercolor{block body alerted}{bg=InvisibleRed}
\ No newline at end of file +\setbeamercolor{block title}{fg=white,bg=MediumBlue} +\setbeamercolor{block body}{fg=black,bg=MutedBlue} +\setbeamercolor{block title example}{fg=white,bg=MediumGreen} +\setbeamercolor{block body example}{fg=black,bg=MutedGreen} +\setbeamercolor{block title alerted}{fg=white,bg=MediumRed} +\setbeamercolor{block body alerted}{fg=black,bg=MutedRed}
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/beamertheme-simpleplus/beamerfontthemeSimplePlus.sty b/Master/texmf-dist/tex/latex/beamertheme-simpleplus/beamerfontthemeSimplePlus.sty index 9c57bc7cc32..840a09a6792 100644 --- a/Master/texmf-dist/tex/latex/beamertheme-simpleplus/beamerfontthemeSimplePlus.sty +++ b/Master/texmf-dist/tex/latex/beamertheme-simpleplus/beamerfontthemeSimplePlus.sty @@ -1,38 +1,32 @@ -% !TEX TS-program = xelatex -% !TEX encoding = UTF-8 Unicode - -%---------------------------------------------------------------------------------------- -% Package: beamertheme-SimplePlus -% Author: Pin-Yen Huang (pyhuang97@gmail.com) -% Version: 1.0, 2021-12-16 -% Link: https://github.com/PM25/SimplePlus-BeamerTheme -% This is free and unencumbered software released into the -% public domain; see <http://unlicense.org> for details. -%---------------------------------------------------------------------------------------- - -\mode<presentation> - -%%%%%%%%%%%% fonts +%------------------------------------------------------------- +% Package: beamertheme-SimplePlus +% Author: Pin-Yen Huang (pyhuang97@gmail.com) +% Version: 1.1, 2025-01-07 +% Link: https://github.com/pm25/SimplePlus-BeamerTheme +% This is free and unencumbered software released into the +% public domain; see <http://unlicense.org> for details. +%------------------------------------------------------------- + +%-------------------------------------- +% Font Settings +%-------------------------------------- \setbeamerfont{structure}{family=\sffamily,series=\mdseries} -\setbeamerfont{title}{size=\huge,series=\bfseries,parent=structure} +\setbeamerfont{title}{size=\LARGE,series=\bfseries,parent=structure} \setbeamerfont{subtitle}{size=\normalsize,parent=title} \setbeamerfont{date}{size=\scriptsize,series=\mdseries,parent=structure} \setbeamerfont{author}{size=\large,series=\mdseries,parent=structure} \setbeamerfont{institute}{size=\scriptsize,series=\mdseries,parent=structure} -\setbeamerfont{section in toc}{size=\Large,series=\bfseries,parent=structure} +\setbeamerfont{section in toc}{size=\large,series=\bfseries,parent=structure} \setbeamerfont{section in head/foot}{size=\tiny,parent=structure} \setbeamerfont{subsection in toc}{size=\small,series=\mdseries,parent={section in toc}} -\setbeamerfont{frametitle}{size=\LARGE,series=\bfseries,parent=structure} -\setbeamerfont{framesubtitle}{parent=frametitle,size=\Large} +\setbeamerfont{frametitle}{size=\Large,series=\bfseries,parent=structure} +\setbeamerfont{framesubtitle}{parent=frametitle,size=\large} \setbeamerfont{caption}{size=\footnotesize} \setbeamerfont{item}{parent=structure,series=\mdseries} -\setbeamerfont{block title}{size=\large,series=\mdseries,parent={structure,block body}} - -\mode -<all> +\setbeamerfont{block title}{size=\large,series=\mdseries,parent={structure,block body}}
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/beamertheme-simpleplus/beamerinnerthemeSimplePlus.sty b/Master/texmf-dist/tex/latex/beamertheme-simpleplus/beamerinnerthemeSimplePlus.sty index 43ab163d188..f6475f09489 100644 --- a/Master/texmf-dist/tex/latex/beamertheme-simpleplus/beamerinnerthemeSimplePlus.sty +++ b/Master/texmf-dist/tex/latex/beamertheme-simpleplus/beamerinnerthemeSimplePlus.sty @@ -1,60 +1,78 @@ -% !TEX TS-program = xelatex -% !TEX encoding = UTF-8 Unicode - -%---------------------------------------------------------------------------------------- -% Package: beamertheme-SimplePlus -% Author: Pin-Yen Huang (pyhuang97@gmail.com) -% Version: 1.0, 2021-12-16 -% Link: https://github.com/PM25/SimplePlus-BeamerTheme -% This is free and unencumbered software released into the -% public domain; see <http://unlicense.org> for details. -%---------------------------------------------------------------------------------------- +%------------------------------------------------------------- +% Package: beamertheme-SimplePlus +% Author: Pin-Yen Huang (pyhuang97@gmail.com) +% Version: 1.1, 2025-01-07 +% Link: https://github.com/pm25/SimplePlus-BeamerTheme +% This is free and unencumbered software released into the +% public domain; see <http://unlicense.org> for details. +%------------------------------------------------------------- -\pgfdeclareverticalshading[lower.bg,upper.bg]{bmb@transition}{200cm}{% - color(0pt)=(lower.bg); color(2pt)=(lower.bg); color(4pt)=(lower.bg)} +%-------------------------------------- +% Inner Theme Settings +%-------------------------------------- -\setbeamersize{text margin left=2em,text margin right=2em} +\pgfdeclareverticalshading[lower.bg,upper.bg]{bmb@transition}{200cm}{% +color(0pt)=(lower.bg); color(2pt)=(lower.bg); color(4pt)=(lower.bg)} -% table of contents (overview) -\setbeamertemplate{section in toc}[sections numbered] -\setbeamertemplate{subsection in toc}{\leavevmode\leftskip=3.2em\rlap{\hskip-2em\inserttocsectionnumber.\inserttocsubsectionnumber}\inserttocsubsection\par} +\setbeamersize{text margin left=2em,text margin right=2em} \setbeamertemplate{footline}[frame number] \setbeamertemplate{navigation symbols}{} + \setbeamertemplate{blocks}[rounded][shadow=false] + \setbeamertemplate{enumerate items}[default] +\setbeamertemplate{enumerate subitem}[default] +\setbeamertemplate{itemize items}[circle] +\setbeamertemplate{itemize subitem}[circle] + +% table of contents (overview) settings +\setbeamertemplate{section in toc}[sections numbered] +\setbeamertemplate{subsection in toc}{% + \leavevmode + \leftskip=3.2em + \rlap{\hskip-2em\inserttocsectionnumber.\inserttocsubsectionnumber} + \inserttocsubsection\par +} -\setbeamertemplate{frametitle}{\vspace*{0.5em}\bfseries\insertframetitle\par\vskip-6pt\hrulefill\vspace{-0.1em}} +% frame title customization +\setbeamertemplate{frametitle}{% + \vspace*{0.5em} + \bfseries\insertframetitle\par + \vskip-6pt + \hrulefill\vspace{-0.1em} +} -\setbeamertemplate{title page}{ - \vspace{7em} +% title page customization +\setbeamertemplate{title page}{% + \vspace{6em} \begingroup - \centering - % ------------------------ - \begin{beamercolorbox}[sep=8pt,center]{title} + \centering + % ------------------------ + \begin{beamercolorbox}[sep=10pt,center]{title} \usebeamerfont{title}\inserttitle\par% \ifx\insertsubtitle\@empty% \else% - \vskip0.25em% - {\usebeamerfont{subtitle}\usebeamercolor[fg]{subtitle}\insertsubtitle\par}% - \fi% - \end{beamercolorbox}% - \vskip0.5em\par - % ------------------------ - \begin{beamercolorbox}[sep=8pt,center]{author} + \vskip0.25em% + {\usebeamerfont{subtitle}\usebeamercolor[fg]{subtitle}\insertsubtitle\par}% + \fi% + \end{beamercolorbox}% + \vskip0.5em\par + % ------------------------ + \begin{beamercolorbox}[sep=8pt,center]{author} \usebeamerfont{author}\insertauthor - \end{beamercolorbox} - \vskip-1em - % ------------------------ - \begin{beamercolorbox}[sep=8pt,center]{institute} + \end{beamercolorbox} + \vskip-1em + % ------------------------ + \begin{beamercolorbox}[sep=8pt,center]{institute} \usebeamerfont{institute}\insertinstitute - \end{beamercolorbox} - % ------------------------ - \begin{beamercolorbox}[sep=8pt,center]{date} + \end{beamercolorbox} + % ------------------------ + \begin{beamercolorbox}[sep=8pt,center]{date} \usebeamerfont{date}\insertdate - \end{beamercolorbox}\vskip0.5em - % ------------------------ - {\usebeamercolor[fg]{titlegraphic}\inserttitlegraphic\par} + \end{beamercolorbox}\vskip0.5em + % ------------------------ + {\usebeamercolor[fg]{titlegraphic}\inserttitlegraphic\par} \endgroup \vfill }
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/beamertheme-simpleplus/beamerthemeSimplePlus.sty b/Master/texmf-dist/tex/latex/beamertheme-simpleplus/beamerthemeSimplePlus.sty index 5ff53a743ed..01c94d97aac 100644 --- a/Master/texmf-dist/tex/latex/beamertheme-simpleplus/beamerthemeSimplePlus.sty +++ b/Master/texmf-dist/tex/latex/beamertheme-simpleplus/beamerthemeSimplePlus.sty @@ -1,21 +1,18 @@ -% !TEX TS-program = xelatex -% !TEX encoding = UTF-8 Unicode +%------------------------------------------------------------- +% Package: beamertheme-SimplePlus +% Author: Pin-Yen Huang (pyhuang97@gmail.com) +% Version: 1.1, 2025-01-07 +% Link: https://github.com/pm25/SimplePlus-BeamerTheme +% This is free and unencumbered software released into the +% public domain; see <http://unlicense.org> for details. +%------------------------------------------------------------- -%---------------------------------------------------------------------------------------- -% Package: beamertheme-SimplePlus -% Author: Pin-Yen Huang (pyhuang97@gmail.com) -% Version: 1.0, 2021-12-16 -% Link: https://github.com/PM25/SimplePlus-BeamerTheme -% This is free and unencumbered software released into the -% public domain; see <http://unlicense.org> for details. -%---------------------------------------------------------------------------------------- +%-------------------------------------- +% Beamer Settings +%-------------------------------------- \mode<presentation> -% Settings -\usetheme{Madrid} -\useinnertheme{circles} - \usefonttheme{SimplePlus} \usecolortheme{SimplePlus} \useinnertheme{SimplePlus} diff --git a/Master/texmf-dist/tex/latex/biblatex-cse/biblatex-cse.bbx b/Master/texmf-dist/tex/latex/biblatex-cse/biblatex-cse.bbx new file mode 100644 index 00000000000..e71f783e061 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-cse/biblatex-cse.bbx @@ -0,0 +1,135 @@ +%% This is file `biblatex-cse.bbx', +%% +%% Copyright (C) 2024 by João Lourenço <joao.lourenco@fct.unl.pt> +%% +%% This file may be distributed and/or modified under the conditions of +%% the LaTeX Project Public License, either version 1.3c of this license +%% or (at your option) any later version. The latest version of this +%% license is in: +%% +%% http://www.latex-project.org/lppl.txt +%% +%% and version 1.3c or later is part of all distributions of LaTeX +%% version 2006/05/20 or later. +%% +\def\fileversion{1.1.0} +\def\filedate {2025/01/01} +\edef\filename {biblatex-cse} + +\ProvidesFile{\filename.cbx}[% + \filedate\ v\fileversion (João M. Lourenço) Council of Science Editors bibliography style] + +\RequireBibliographyStyle{authoryear} + +% From: https://tex.stackexchange.com/questions/12254/biblatex-how-to-remove-the-parentheses-around-the-year-in-authoryear-style +% By courtesy of Enrico Gregorio (egreg) +\def\act@on@bibmacro#1#2{% + \expandafter#1\csname abx@macro@\detokenize{#2}\endcsname +} +\def\patchbibmacro{\act@on@bibmacro\patchcmd} +\def\pretobibmacro{\act@on@bibmacro\pretocmd} +\def\apptobibmacro{\act@on@bibmacro\apptocmd} +\def\showbibmacro{\act@on@bibmacro\show} + +\ExecuteBibliographyOptions{ + maxcitenames=2, + minbibnames=10, + maxbibnames=10, + dashed=false, + uniquelist=false, + giveninits=true, + urldate=iso, + date=year, + seconds=true, +} + +% \usepackage{xpatch} + +% Remove commas between family and given names +\DeclareNameAlias{sortname}{family-given} +\renewrobustcmd*{\revsdnamepunct}{} +\renewrobustcmd*{\bibinitdelim}{} + +% Remove commas between family and given names +\renewrobustcmd*{\revsdnamepunct}{} +\renewrobustcmd*{\bibinitdelim}{} + +% Remove dot after initials +\renewrobustcmd*{\bibinitperiod}{} + +% Remove quotation marks from title +\DeclareFieldFormat*{title}{#1} + +% Remove emphasized from titles +\DeclareFieldFormat*{journaltitle}{#1\isdot} +\DeclareFieldFormat{postnote}{#1} +\DeclareFieldFormat{multipostnote}{#1} +\renewcommand*{\bibpagespunct}{\addcolon} +\renewcommand{\postnotedelim}{% + \iffieldpages{postnote} + {\addcolon\space} + {\addspace}} + +% Remove "and" before last author +\DefineBibliographyExtras{english}{% + \DeclareFieldFormat{pages}{#1} + \DeclareDelimFormat{finalnamedelim}{% + \ifnumgreater{\value{liststop}}{2}{% + \printdelim{multinamedelim}}{\addspace\bibstring{and}\space}}} + +% Add dot after list of authors (and before year) and remove parentheses in date +% \xpatchbibmacro{date+extradate}{% +\patchbibmacro{date+extradate}{% + \printtext[parens]% +}{% + \setunit*{\addperiod\space}% + \printtext% +}{}{} + +% Remove "in:" prefix in journal title +\renewbibmacro{in:}{} + +% Cite as "family initials" +\DeclareNameFormat{labelname}{% + \ifcase\value{uniquename}% + \usebibmacro{name:family} + {\namepartfamily} + {\namepartgiven} + {\namepartprefix} + {\namepartsuffix}% + \or + \ifuseprefix + {\usebibmacro{name:family-given} + {\namepartfamily} + {\namepartgiveni} + {\namepartprefix} + {\namepartsuffixi}} + {\usebibmacro{name:family-given} + {\namepartfamily} + {\namepartgiveni} + {\namepartprefixi} + {\namepartsuffixi}}% + \or + \usebibmacro{name:family-given} + {\namepartfamily} + {\namepartgiven} + {\namepartprefix} + {\namepartsuffix}% + \fi + \usebibmacro{name:andothers}} + +% Always remove "and" before last author +\ifdefined\prebibhook% + \DeclareDelimFormat{finalnamedelim}{% + \printdelim{multinamedelim}% + }% +\else\ifdefined\bibliography% + \let\origbibliography=\bibliography% + \renewcommand{\bibliography}{% + \DeclareDelimFormat{finalnamedelim}{% + \printdelim{multinamedelim}% + }% + \origbibliography% + }% +\fi\fi + diff --git a/Master/texmf-dist/tex/latex/biblatex-cse/biblatex-cse.cbx b/Master/texmf-dist/tex/latex/biblatex-cse/biblatex-cse.cbx new file mode 100644 index 00000000000..45722ed88c5 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-cse/biblatex-cse.cbx @@ -0,0 +1,23 @@ +%% This is file `biblatex-cse.cbx', +%% +%% Copyright (C) 2024 by João Lourenço <joao.lourenco@fct.unl.pt> +%% +%% This file may be distributed and/or modified under the conditions of +%% the LaTeX Project Public License, either version 1.3c of this license +%% or (at your option) any later version. The latest version of this +%% license is in: +%% +%% http://www.latex-project.org/lppl.txt +%% +%% and version 1.3c or later is part of all distributions of LaTeX +%% version 2006/05/20 or later. +%% +\def\fileversion{1.1.0} +\def\filedate {2025/01/01} +\edef\filename {biblatex-cse} + +\ProvidesFile{\filename.cbx}[% + \filedate\ v\fileversion (João M. Lourenço) Council of Science Editors bibliography style] + +\RequireCitationStyle{authoryear} + diff --git a/Master/texmf-dist/tex/latex/biblatex-software/software.bbx b/Master/texmf-dist/tex/latex/biblatex-software/software.bbx index ad9edc60537..ec7570489bd 100644 --- a/Master/texmf-dist/tex/latex/biblatex-software/software.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-software/software.bbx @@ -154,7 +154,7 @@ \DeclareFieldFormat{eprint:swmath}{% \mkbibacro{SWMATH}\addcolon\addspace% \ifhyperref - {\href{https://www.swmath.org/software/#1}{% + {\href{https://www.zbmath.org/software/#1}{% \(\langle\)swmath\addcolon\nolinkurl{#1}\(\rangle\)% \iffieldundef{eprintclass} {} diff --git a/Master/texmf-dist/tex/latex/bithesis/bitbeamer.cls b/Master/texmf-dist/tex/latex/bithesis/bitbeamer.cls index 481ff09cfa0..781bf749871 100644 --- a/Master/texmf-dist/tex/latex/bithesis/bitbeamer.cls +++ b/Master/texmf-dist/tex/latex/bithesis/bitbeamer.cls @@ -27,7 +27,7 @@ %% \RequirePackage{expl3,l3keys2e} \ProvidesExplClass{bitbeamer} -{2024-10-07}{3.8.0}{BIT Thesis Templates} +{2025-01-03}{3.8.1}{BIT Thesis Templates} \keys_define:nn { bitbeamer } { titlegraphic .tl_set:N = \l_bit_titlegraphic_tl, diff --git a/Master/texmf-dist/tex/latex/bithesis/bithesis.cls b/Master/texmf-dist/tex/latex/bithesis/bithesis.cls index 4cdb085a59c..09897198323 100644 --- a/Master/texmf-dist/tex/latex/bithesis/bithesis.cls +++ b/Master/texmf-dist/tex/latex/bithesis/bithesis.cls @@ -27,7 +27,7 @@ %% \RequirePackage{expl3,l3keys2e} \ProvidesExplClass{bithesis} -{2024-10-07}{3.8.0}{BIT Thesis Templates} +{2025-01-03}{3.8.1}{BIT Thesis Templates} \int_new:N \g__bithesis_thesis_type_int \int_new:N \g__bithesis_head_zihao_int \bool_new:N \g__bithesis_twoside_bool @@ -2410,15 +2410,18 @@ % apply a clist \clist_map_function:nN {#1} \addpub } -\NewDocumentCommand \pubsection {m} { +\NewDocumentCommand \pubsection {s m} { { - % 自增计数器 - \par\stepcounter{pub} + \par + \IfBooleanF {#1} { + % 自增计数器 + \stepcounter{pub} + } % 设置小标题,暂时没有考虑英文模式 \noindent \textbf{ \heiti{ - \zhnumber{\thepub}、#1 + \IfBooleanF {#1} {\zhnumber{\thepub}、}#2 } }\par } diff --git a/Master/texmf-dist/tex/latex/bithesis/bitreport.cls b/Master/texmf-dist/tex/latex/bithesis/bitreport.cls index c08602e6116..d97d313388d 100644 --- a/Master/texmf-dist/tex/latex/bithesis/bitreport.cls +++ b/Master/texmf-dist/tex/latex/bithesis/bitreport.cls @@ -27,7 +27,7 @@ %% \RequirePackage{expl3,l3keys2e} \ProvidesExplClass{bitreport} -{2024-10-07}{3.8.0}{BIT Thesis Templates} +{2025-01-03}{3.8.1}{BIT Thesis Templates} \int_new:N \g__bithesis_report_type_int \clist_const:Nn \c__bithesis_report_type_clist { common, undergraduate_proposal} diff --git a/Master/texmf-dist/tex/latex/chuushaku/chuushaku.sty b/Master/texmf-dist/tex/latex/chuushaku/chuushaku.sty new file mode 100644 index 00000000000..479ab063b1b --- /dev/null +++ b/Master/texmf-dist/tex/latex/chuushaku/chuushaku.sty @@ -0,0 +1,59 @@ +\NeedsTeXFormat{LaTeX2e}% +\ProvidesPackage{chuushaku}[2024/12/30,Ver1.0.1]% + +\RequirePackage{tikz,amsmath,framed,calc}% +\usetikzlibrary{positioning,quotes}% + +\newcommand{\段落下げ}{\parindent=1zw}% +\def\zw{\dimexpr1zw\relax}% + +\newcounter{chuubangou}% +\setcounter{chuubangou}{0}% +\newcommand{\chuukigouprintA}{$\dag$}% +\newcommand{\chuukigouprintB}{▶\ignorespaces}% +\newcommand{\chuuhabaprint}{.68}% +\newcommand{\chuuakiprint}{.7}% +\newcommand{\chuukigou}[2]{\renewcommand{\chuukigouprintA}{#1}\renewcommand{\chuukigouprintB}{#2}}% +\newcommand{\chuuhaba}[1]{\renewcommand{\chuuhabaprint}{#1}}% +\newcommand{\chuuaki}[1]{\renewcommand{\chuuakiprint}{#1}}% +\newcommand{\chuu}[1]% + {% + \stepcounter{chuubangou}% + \nolinebreak$\!^{\text{\chuukigouprintA}}$% + \tikz[remember picture]{\coordinate (A\thechuubangou);}% + \expandafter\gdef\csname chuunote\thechuubangou\endcsname{#1}% + }% +\newcommand{\chuuprint}% + {% + \begin{tikzpicture}[overlay, remember picture] + \foreach \n in {1,...,\thechuubangou}% + {% + \node[sidenote] at (A\n -| B) {\csname chuunote\n\endcsname};% + \node[pointer] at (A\n -| B) {\footnotesize\chuukigouprintB};% + }% + \end{tikzpicture}% + }% +\NewDocumentEnvironment{chuushaku}{ O{\chuuhabaprint} D<>{\chuuakiprint} }% + {% + %TikZのスタイル定義 + \tikzset{sidenote/.style={anchor=north west, inner sep=0pt, text width={\linewidth-#1\linewidth-#2\zw-1\zw}, font=\footnotesize, yshift=.8em}}% + \tikzset{pointer/.style={left, inner sep=3pt, yshift=.3em}} + \begin{minipage}[t]{#1\linewidth}\begin{右辺点線囲み}% + }% + {% + \end{右辺点線囲み}% + \end{minipage}\begin{minipage}[t]{#2zw+1zw}% + ~% + \end{minipage}\begin{minipage}[t]{\linewidth-#1\linewidth-#2\zw}% + \tikz[remember picture]{\coordinate (B);}% + \end{minipage}% + \chuuprint\setcounter{chuubangou}{0}% + }% + +\newenvironment{右辺点線囲み}% + {% + \def\FrameCommand##1{##1\hspace{10pt}\vrule width .3pt}% + \MakeFramed {\advance\hsize-\width \FrameRestore}% + \段落下げ% + }% + {\endMakeFramed}
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/codehigh/codehigh.sty b/Master/texmf-dist/tex/latex/codehigh/codehigh.sty index 7f7a4a8a9ae..36463c7ca61 100644 --- a/Master/texmf-dist/tex/latex/codehigh/codehigh.sty +++ b/Master/texmf-dist/tex/latex/codehigh/codehigh.sty @@ -12,7 +12,7 @@ \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\ProvidesExplPackage{codehigh}{2024-11-20}{2024A} +\ProvidesExplPackage{codehigh}{2025-01-04}{2025A} {Highlight codes and demos with l3regex and lpeg} %\RequirePackage{xparse} @@ -274,6 +274,7 @@ \GetCodeHighStyle{code} \colorbox{codehigh@bg} {\box_use:N \g__codehigh_code_box} + \hfill } } } @@ -619,6 +620,7 @@ { \exp_after:wN \token_to_str:N ##1 } } { \exp_after:wN \token_to_str:N ##1 } + \/ % disable ligatures (#17) } \group_align_safe_end: \group_end: diff --git a/Master/texmf-dist/tex/latex/coloredtheorem/coloredtheorem.sty b/Master/texmf-dist/tex/latex/coloredtheorem/coloredtheorem.sty index 4d24f770564..20f23cc5900 100644 --- a/Master/texmf-dist/tex/latex/coloredtheorem/coloredtheorem.sty +++ b/Master/texmf-dist/tex/latex/coloredtheorem/coloredtheorem.sty @@ -12,29 +12,39 @@ %% and version 1.3c or later is part of all distributions of LaTeX %% version 2006/05/20 or later. %% -\NeedsTeXFormat{LaTeX2e}[2020/06/01] -\ProvidesPackage{coloredtheorem} - [2024/09/15 v1.0.4 - A colorful boxed theorem environment] +\def\cthfileversion{1.1.0} +\def\cthfiledate {2025/01/03} +\edef\cthfilename {\@currname} -\RequirePackage{tcolorbox} +\ProvidesPackage{coloredtheorem}[% + \cthfiledate\ v\cthfileversion (João M. Lourenço) - A colorful boxed theorem environment.] + +\RequirePackage[most]{tcolorbox} \tcbuselibrary{breakable} \gdef\tcbth{cth} -\expandafter\NewDocumentCommand\csname\tcbth newtheorem\endcsname { m m O{} }{% +\NewDocumentCommand{\TcbthNewDocumentCommand}{m}{% + \expandafter\NewDocumentCommand\csname\tcbth#1\endcsname} +\NewDocumentCommand{\TcbthNewDocumentEnvironment}{m}{% + \expandafter\NewDocumentEnvironment\expandafter{\tcbth#1}} +\NewDocumentCommand{\TcbthGdef}{O{\tcbth}mm}{% + \expandafter\gdef\csname#1#2\endcsname{#3}} + +\TcbthNewDocumentCommand{newtheorem} { m m O{} }{% \expandafter\newcounter\expandafter{\tcbth#1}% - \expandafter\gdef\csname\tcbth#1name\endcsname{#2}% - \expandafter\gdef\csname\tcbth list#1name\endcsname{List of #2s}% - \expandafter\gdef\csname#1autorefname\endcsname{#2}% + \TcbthGdef{#1name}{#2}% + \TcbthGdef{list#1name}{List of #2s}% + \TcbthGdef[]{#1autorefname}{#2}% \AtEndPreamble{% \ifdefined\crefname\expandafter\crefname\expandafter{\tcbth#1}{#2}{#2s}\fi}% - \expandafter\gdef\csname\tcbth listof#1s\endcsname + \TcbthGdef{listof#1s} {% \ifdefined\chapter\chapter*{\csname\tcbth list#1name\endcsname}% \else\section*{\csname\tcbth list#1name\endcsname}\fi% \expandafter\@starttoc\expandafter{lo#1}% } - \expandafter\NewDocumentEnvironment\expandafter{\tcbth#1} {O{} m O{}}% + \TcbthNewDocumentEnvironment{#1} {O{} m O{}}% {% \begin{tcb<SOMETHING>} \begin{center}% \ifx\relax##2\relax @@ -48,14 +58,28 @@ {\protect\numberline{\csname the\tcbth#1\endcsname}##1}% \fi \fi - \begin{tcolorbox}[breakable, + \begin{tcolorbox}[breakable,lowerbox=ignored,left=0mm,right=0mm,top=0mm,bottom=0mm, title={\textbf{\csname\tcbth#1name\endcsname \ifx\relax##2\relax\else ~\csname the\tcbth#1\endcsname\fi}~~##2}, #3, ##3, ]% - \let\origpar=\par% - \def\par{\origpar\medskip}% + % \let\origpar=\par% + % \def\par{\origpar\medskip}% + \ignorespaces% + }{% \end{tcb<SOMETHING>} + \end{tcolorbox}% + \end{center}% + }% + \TcbthNewDocumentEnvironment{#1*} {O{} m O{}}% + {% \begin{tcb<SOMETHING>} + \begin{center}% + \begin{tcolorbox}[breakable,lowerbox=ignored,left=0mm,right=0mm,top=0mm,bottom=0mm, + title={\textbf{\csname\tcbth#1name\endcsname}~~##2}, + #3, ##3, + ]% + % \let\origpar=\par% + % \def\par{\origpar\medskip}% \ignorespaces% }{% \end{tcb<SOMETHING>} \end{tcolorbox}% diff --git a/Master/texmf-dist/tex/latex/delimset/delimset.sty b/Master/texmf-dist/tex/latex/delimset/delimset.sty index 28ba8ba53e3..d5650adc0d6 100644 --- a/Master/texmf-dist/tex/latex/delimset/delimset.sty +++ b/Master/texmf-dist/tex/latex/delimset/delimset.sty @@ -6,18 +6,18 @@ %% %% delimset.dtx (with options: `package') %% -%% Copyright (C) 2016-2024 Niklas Beisert +%% Copyright (C) 2016-2025 Niklas Beisert %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 %% of this license or (at your option) any later version. %% The latest version of this license is in -%% http://www.latex-project.org/lppl.txt +%% https://www.latex-project.org/lppl.txt %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. %% \NeedsTeXFormat{LaTeX2e}[1996/12/01] -\ProvidesPackage{delimset}[2024/07/17 v2.0 convenient size control for delimiter sets] +\ProvidesPackage{delimset}[2025/01/05 v2.1 convenient size control for delimiter sets] \RequirePackage{amsmath} \RequirePackage{keyval} @@ -126,14 +126,23 @@ \newcommand{\dlm@var@pl}[1]{\dlm@var@l.\mathopen{#1}} \newcommand{\dlm@var@pr}[1]{\mathclose{#1}\dlm@var@r.} +\newcount\dlm@reg@lvl +\dlm@reg@lvl\z@ +\def\dlm@reg@dot{.} +\newcommand{\dlm@reg@set}[1]{\edef\dlm@reg@cur{#1}\ifx\dlm@reg@cur\dlm@reg@dot% + \edef\dlm@reg@cur{\dlm@reg@dot\the\dlm@reg@lvl}\fi} +\newcommand{\dlm@reg@step}[1]{\global\advance\dlm@reg@lvl#1% + \ifnum\dlm@reg@lvl<\z@\PackageError{delimset}{register stack exhausted}{}% + \dlm@reg@lvl\z@\fi} \newcommand{\dlm@reg@save@init}[1]{% \xdef#1{\delimsize\the\delimsize}\ifx\dlm@inner\mathinner% \expandafter\gdef\expandafter#1\expandafter{#1\dlm@enclose@inner}\fi} -\newcommand{\dlm@reg@save}[2]{% - \expandafter\dlm@reg@save@init\csname dlm@reg@init@#1\endcsname% - \expandafter\gdef\csname dlm@reg@sel@#1\endcsname{#2}} -\newcommand{\dlm@reg@init}[1]{\csname dlm@reg@init@#1\endcsname} -\newcommand{\dlm@reg@sel}[1]{\csname dlm@reg@sel@#1\endcsname} +\newcommand{\dlm@reg@save}[2]{\dlm@reg@set{#1}% + \expandafter\dlm@reg@save@init\csname dlm@reg@init@\dlm@reg@cur\endcsname% + \expandafter\gdef\csname dlm@reg@sel@\dlm@reg@cur\endcsname{#2}} +\newcommand{\dlm@reg@init}[1]{\dlm@reg@set{#1}% + \csname dlm@reg@init@\dlm@reg@cur\endcsname} +\newcommand{\dlm@reg@sel}{\csname dlm@reg@sel@\dlm@reg@cur\endcsname} \newcommand{\parsedelimflags}{\dlm@setsize{0.6}\let\dlm@phantom\@firstofone% \dlm@enclose@openclose\dlm@enclose@inline\dlm@parseflags} @@ -165,11 +174,13 @@ \dlm@parsedef{)}{}{\def\selecteddelim{9}#2} \dlm@parsedef{?}{#3}{\def\selecteddelim{#3}#2} -\dlm@parsedef{[}{}{\dlm@reg@save{.}{#2}\def\selecteddelim{0}#2} -\dlm@parsedef{]}{}{\dlm@reg@init{.}\def\selecteddelim{9}\dlm@reg@sel{.}} +\dlm@parsedef{[}{}{\dlm@reg@step\@ne\dlm@reg@save\dlm@reg@dot{#2}% + \def\selecteddelim{0}#2} +\dlm@parsedef{]}{}{\dlm@reg@init\dlm@reg@dot\dlm@reg@step\m@ne% + \def\selecteddelim{9}\dlm@reg@sel} \dlm@parsedef{>}{#3}{\dlm@reg@save{#3}{#2}} \dlm@parsedef{<}{#3}{\dlm@reg@init{#3}\dlm@parseflags% - {\PackageError{delimset}{must select delimiter}{}}{\dlm@reg@sel{#3}}} + {\PackageError{delimset}{must select delimiter}{}}{\dlm@reg@sel}} \dlm@parsedef{.}{}{#1} \dlm@parsedef{:}{}{\dlm@enclose@block\dlm@parseflags{#1}{#2}} @@ -218,8 +229,14 @@ \newcommand{\dlm@sel@delimtriple}[4]{\ifcase\selecteddelim\selectdeliml#1% \or\selectdelim#2\or\selectdelim#3\else\selectdelimr#4\fi} -\newcommand{\usedelim}{\@ifnextchar]{\parsedelimflags{}{}}{\parsedelimflags% - {\PackageError{delimset}{must select delimiter}{}}{}<}} +\newcommand{\usedelim}{% + \@ifnextchar]{\parsedelimflags{}{}}{% + \@ifnextchar({\parsedelimflags{}{}<.}{% + \@ifnextchar|{\parsedelimflags{}{}<.}{% + \@ifnextchar,{\parsedelimflags{}{}<.}{% + \@ifnextchar){\parsedelimflags{}{}<.}{% + \@ifnextchar?{\parsedelimflags{}{}<.}{% + \parsedelimflags{}{}<}}}}}}} \ifdlm@std \providecommand{\brk}[1][r]{\begingroup\def\dlm@use{\delim()}% diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty index ff5fefec1df..8ce53f9bbea 100644 --- a/Master/texmf-dist/tex/latex/easybook/easybase.sty +++ b/Master/texmf-dist/tex/latex/easybook/easybase.sty @@ -20,7 +20,7 @@ %% This work has the LPPL maintenance status `maintained'. \NeedsTeXFormat{LaTeX2e}[2021/11/15] \RequirePackage{etoolbox} -\ProvidesExplPackage{easybase}{2024/12/26}{2024last} +\ProvidesExplPackage{easybase}{2025/01/03}{2025b} {Easily typesetting Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -1767,7 +1767,7 @@ \group_begin: \tl_set_eq:NN \eb@toc@title \indexname \cs_set_eq:NN \imki@indexlevel \use_none:n - \IfValueT{#3}{\keys_set:nn { eb/tocouter } {#3}} + \eb_toc_kv_set:nn { idx } {#3} \cs_set_protected:Npn \imki@indexheaders { \eb_toc_title_level_cmd:n {#1} @@ -2353,7 +2353,7 @@ { \group_begin: \tl_set_eq:NN \eb@toc@title \bibname - \IfValueT{##3}{ \keys_set:nn { eb/tocouter } {##3} } + \eb_toc_kv_set:nn { bbl } {##3} \cs_set_protected:Npn \bibsection { \eb_toc_title_level_cmd:n {##1} diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls index 50c963152d0..824792951e0 100644 --- a/Master/texmf-dist/tex/latex/easybook/easybook.cls +++ b/Master/texmf-dist/tex/latex/easybook/easybook.cls @@ -19,7 +19,7 @@ %% %% This work has the LPPL maintenance status `maintained'. \NeedsTeXFormat{LaTeX2e}[2021/11/15] -\ProvidesExplClass{easybook}{2024/12/26}{2024last} +\ProvidesExplClass{easybook}{2025/01/03}{2025b} {Easily typesetting Chinese theses or books} \bool_new:N \l__eb_compile_draft_bool diff --git a/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg b/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg index 381eefe5a07..7c68060d023 100644 --- a/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg +++ b/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg @@ -18,7 +18,7 @@ %% LaTeX version 2005/12/01 or later. %% %% This work has the LPPL maintenance status `maintained'. -\ProvidesExplFile{eb-tcolorbox.cfg}{2024/12/26}{2024last} +\ProvidesExplFile{eb-tcolorbox.cfg}{2025/01/03}{2025b} {Customization of tcolorbox for easybook} \cs_set_protected:Npn \addtotcbstyle #1#2 diff --git a/Master/texmf-dist/tex/latex/fancyhdr/extramarks-v4.sty b/Master/texmf-dist/tex/latex/fancyhdr/extramarks-v4.sty new file mode 100644 index 00000000000..fcac77f5ac8 --- /dev/null +++ b/Master/texmf-dist/tex/latex/fancyhdr/extramarks-v4.sty @@ -0,0 +1,135 @@ +%% +%% This is file `extramarks-v4.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% fancyhdr.dtx (with options: `extramarks-v4') +%% +%% This is a generated file. +%% +%% This file may be distributed and/or modified under the conditions of +%% the LaTeX Project Public License, either version 1.3 of this license +%% or (at your option) any later version. The latest version of this +%% license is in: +%% +%% http://www.latex-project.org/lppl.txt +%% +%% and version 1.3 or later is part of all distributions of LaTeX version +%% 2005/12/01 or later. +%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{extramarks} + [2024/11/30 v4.5 + Legacy version of extramarks for LaTeX] +% Copyright (C) 1994-2024 by Pieter van Oostrum <pieter@vanoostrum.org> +%% +%% This is a legacy version (v4) of extramarks.sty +%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\ifx\@temptokenb\undefined \csname newtoks\endcsname\@temptokenb\fi +\providecommand\unrestored@protected@xdef{% + \let\protect\@unexpandable@protect \xdef} +\ifdefined\ExplSyntaxOn +\ExplSyntaxOn +\DeclareRobustCommand*\markboth[2]{% + \begingroup + \let\label\relax \let\index\relax \let\glossary\relax + \expandafter\@markboth\@themark{#1}{#2}% + \@temptokena \expandafter{\@themark}% + \ifdefined\mark_insert:nn + % 3 new lines to set the new marks + \mark_insert:nn{2e-left}{#1} + \mark_insert:nn{2e-right}{#2} + \tl_if_empty:nF{#2}{ \mark_insert:nn{2e-right-nonempty}{#2} } + \fi + \mark{\the\@temptokena}% + \endgroup + \if@nobreak\ifvmode\nobreak\fi\fi} +\ExplSyntaxOff +\else +\def\markboth#1#2{% + \begingroup + \let\label\relax \let\index\relax \let\glossary\relax + \expandafter\@markboth\@themark{#1}{#2}% + \@temptokena \expandafter{\@themark}% + \mark{\the\@temptokena}% + \endgroup + \if@nobreak\ifvmode\nobreak\fi\fi} +\fi +\ifx\@mkboth\@gobbletwo\else\def\@mkboth{\protect\markboth}\fi +\def\@markboth#1#2#3#4#5#6{\@temptokena{{#3}{#4}}% + \unrestored@protected@xdef\@themark{{#5}{#6}\the\@temptokena}} +\def\@markright#1#2#3#4#5{\@temptokena{#1}\@temptokenb{{#3}{#4}}% + \unrestored@protected@xdef\@themark{{\the\@temptokena}{#5}\the\@temptokenb}} + +\def\@leftmark#1#2#3#4{#1} +\def\@rightmark#1#2#3#4{#2} +\providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion} +\IfFormatAtLeastTF{2025-06-01}{}{% + \def\leftmark{\expandafter\@leftmark + \botmark\@empty\@empty\@empty\@empty} + \def\rightmark{\expandafter\@rightmark + \firstmark\@empty\@empty\@empty\@empty} +} +\def\firstleftmark{\expandafter\@leftmark + \firstmark\@empty\@empty\@empty\@empty} +\def\lastrightmark{\expandafter\@rightmark + \botmark\@empty\@empty\@empty\@empty} +\let\firstrightmark \rightmark +\let\lastleftmark \leftmark + +\def\@themark{{}{}{}{}} + +\newcommand\extramarks[2]{% + \begingroup + \let\label\relax \let\index\relax \let\glossary\relax + \expandafter\@markextra\@themark{#1}{#2}% + \@temptokena \expandafter{\@themark}% + \mark{\the\@temptokena}% + \endgroup + \if@nobreak\ifvmode\nobreak\fi\fi} +\def\@markextra#1#2#3#4#5#6{\@temptokena {{#1}{#2}}% + \unrestored@protected@xdef\@themark{\the\@temptokena{#5}{#6}}} +\def\extramarksleft#1{% + \begingroup + \let\label\relax \let\index\relax \let\glossary\relax + \expandafter\@markextraleft\@themark{#1}% + \@temptokena \expandafter{\@themark}% + \mark{\the\@temptokena}% + \endgroup + \if@nobreak\ifvmode\nobreak\fi\fi} +\def\@markextraleft#1#2#3#4#5{\@temptokena {{#1}{#2}}% + \@temptokenb {{#4}}% + \unrestored@protected@xdef\@themark{\the\@temptokena{#5}\the\@temptokenb}} +\def\extramarksright#1{% + \begingroup + \let\label\relax \let\index\relax \let\glossary\relax + \expandafter\@markextraright\@themark{#1}% + \@temptokena \expandafter{\@themark}% + \mark{\the\@temptokena}% + \endgroup + \if@nobreak\ifvmode\nobreak\fi\fi} +\def\@markextraright#1#2#3#4#5{\@temptokena {{#1}{#2}{#3}}% + \unrestored@protected@xdef\@themark{\the\@temptokena{#5}}} +\def\firstleftxmark{\expandafter\@leftxmark + \firstmark\@empty\@empty\@empty\@empty} +\def\firstrightxmark{\expandafter\@rightxmark + \firstmark\@empty\@empty\@empty\@empty} +\def\topleftxmark{\expandafter\@leftxmark + \topmark\@empty\@empty\@empty\@empty} +\def\toprightxmark{\expandafter\@rightxmark + \topmark\@empty\@empty\@empty\@empty} +\def\lastleftxmark{\expandafter\@leftxmark + \botmark\@empty\@empty\@empty\@empty} +\def\lastrightxmark{\expandafter\@rightxmark + \botmark\@empty\@empty\@empty\@empty} +\let\firstxmark\firstleftxmark +\let\lastxmark\lastrightxmark +\let\topxmark\topleftxmark +\def\@leftxmark#1#2#3#4{#3} +\def\@rightxmark#1#2#3#4{#4} +\endinput +%% +%% End of file `extramarks-v4.sty'. diff --git a/Master/texmf-dist/tex/latex/fancyhdr/extramarks.sty b/Master/texmf-dist/tex/latex/fancyhdr/extramarks.sty index ea9c753c233..8cd63b9d55c 100644 --- a/Master/texmf-dist/tex/latex/fancyhdr/extramarks.sty +++ b/Master/texmf-dist/tex/latex/fancyhdr/extramarks.sty @@ -21,112 +21,65 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{extramarks} - [2024/12/09 v4.5 + [2025/01/06 v5.1 Extra marks for LaTeX] -% Copyright (C) 1994-2024 by Pieter van Oostrum <pieter@vanoostrum.org> +% Copyright (C) 1994-2025 by Pieter van Oostrum <pieter@vanoostrum.org> %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\newtoks\@temptokenb -\providecommand\unrestored@protected@xdef{% - \let\protect\@unexpandable@protect \xdef} -\ifdefined\ExplSyntaxOn -\ExplSyntaxOn -\DeclareRobustCommand*\markboth[2]{% - \begingroup - \let\label\relax \let\index\relax \let\glossary\relax - \expandafter\@markboth\@themark{#1}{#2}% - \@temptokena \expandafter{\@themark}% - \ifdefined\mark_insert:nn - % 3 new lines to set the new marks - \mark_insert:nn{2e-left}{#1} - \mark_insert:nn{2e-right}{#2} - \tl_if_empty:nF{#2}{ \mark_insert:nn{2e-right-nonempty}{#2} } - \fi - \mark{\the\@temptokena}% - \endgroup - \if@nobreak\ifvmode\nobreak\fi\fi} -\ExplSyntaxOff -\else -\def\markboth#1#2{% - \begingroup - \let\label\relax \let\index\relax \let\glossary\relax - \expandafter\@markboth\@themark{#1}{#2}% - \@temptokena \expandafter{\@themark}% - \mark{\the\@temptokena}% - \endgroup - \if@nobreak\ifvmode\nobreak\fi\fi} -\fi -\ifx\@mkboth\@gobbletwo\else\def\@mkboth{\protect\markboth}\fi -\def\@markboth#1#2#3#4#5#6{\@temptokena{{#3}{#4}}% - \unrestored@protected@xdef\@themark{{#5}{#6}\the\@temptokena}} -\def\@markright#1#2#3#4#5{\@temptokena{#1}\@temptokenb{{#3}{#4}}% - \unrestored@protected@xdef\@themark{{\the\@temptokena}{#5}\the\@temptokenb}} - -\def\@leftmark#1#2#3#4{#1} -\def\@rightmark#1#2#3#4{#2} -\providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion} -\IfFormatAtLeastTF{2025-06-01}{}{% - \def\leftmark{\expandafter\@leftmark - \botmark\@empty\@empty\@empty\@empty} - \def\rightmark{\expandafter\@rightmark - \firstmark\@empty\@empty\@empty\@empty} +\providecommand\DeclareRelease[3]{} +\providecommand\DeclareCurrentRelease[2]{} +\DeclareRelease{v4}{2024/11/30}{extramarks-v4.sty} +\DeclareCurrentRelease{}{2025/01/06} +\@ifundefined{NewMarkClass} + {\PackageWarningNoLine{extramarks}{% +**************************************************\MessageBreak +Your LaTeX installation is too old for extramarks version 5.\MessageBreak +We will fallback to extramarks version 4 now.\MessageBreak +Please note that some commands will not be available,\MessageBreak +and that the functionality may be slightly different.\MessageBreak +You are advised to update your LaTeX installation.\MessageBreak +**************************************************} + \RequirePackage{extramarks-v4}\endinput}{} +\AtBeginDocument{% + \IfPackageLoadedT{multicol}% + {\IfPackageAtLeastF{multicol}{2024-11-21}{% + \PackageWarningNoLine{extramarks}{% + You are using package `extramarks' with a version\MessageBreak + of `multicol' that is too old. The new version\MessageBreak + of `multicol' will be released on June 1, 2025.\MessageBreak + We will fallback to extramarks version 4 now.}% + \let\extramarks\undefined + \RequirePackage{extramarks-v4} + }% + }% } -\def\firstleftmark{\expandafter\@leftmark - \firstmark\@empty\@empty\@empty\@empty} -\def\lastrightmark{\expandafter\@rightmark - \botmark\@empty\@empty\@empty\@empty} +\ifx\@mkboth\@gobbletwo\else\def\@mkboth{\protect\markboth}\fi +\NewMarkClass{extramarks-left} +\NewMarkClass{extramarks-right} +\newcommand\extramarks[2]{% + \InsertMark{extramarks-left}{#1}% + \InsertMark{extramarks-right}{#2}} +\newcommand\extramarksleft[1]{% + \InsertMark{extramarks-left}{#1}} +\newcommand\extramarksright[1]{% + \InsertMark{extramarks-right}{#1}} +\newcommand\firstleftmark{\FirstMark{2e-left}} +\newcommand\lastrightmark{\LastMark{2e-right}} +\newcommand\firstrightmark{\rightmark} \let\firstrightmark \rightmark +\newcommand\lastleftmark{\leftmark} \let\lastleftmark \leftmark - -\def\@themark{{}{}{}{}} - -\newcommand\extramarks[2]{% - \begingroup - \let\label\relax \let\index\relax \let\glossary\relax - \expandafter\@markextra\@themark{#1}{#2}% - \@temptokena \expandafter{\@themark}% - \mark{\the\@temptokena}% - \endgroup - \if@nobreak\ifvmode\nobreak\fi\fi} -\def\@markextra#1#2#3#4#5#6{\@temptokena {{#1}{#2}}% - \unrestored@protected@xdef\@themark{\the\@temptokena{#5}{#6}}} -\def\extramarksleft#1{% - \begingroup - \let\label\relax \let\index\relax \let\glossary\relax - \expandafter\@markextraleft\@themark{#1}% - \@temptokena \expandafter{\@themark}% - \mark{\the\@temptokena}% - \endgroup - \if@nobreak\ifvmode\nobreak\fi\fi} -\def\@markextraleft#1#2#3#4#5{\@temptokena {{#1}{#2}}% - \@temptokenb {{#4}}% - \unrestored@protected@xdef\@themark{\the\@temptokena{#5}\the\@temptokenb}} -\def\extramarksright#1{% - \begingroup - \let\label\relax \let\index\relax \let\glossary\relax - \expandafter\@markextraright\@themark{#1}% - \@temptokena \expandafter{\@themark}% - \mark{\the\@temptokena}% - \endgroup - \if@nobreak\ifvmode\nobreak\fi\fi} -\def\@markextraright#1#2#3#4#5{\@temptokena {{#1}{#2}{#3}}% - \unrestored@protected@xdef\@themark{\the\@temptokena{#5}}} -\def\firstleftxmark{\expandafter\@leftxmark - \firstmark\@empty\@empty\@empty\@empty} -\def\firstrightxmark{\expandafter\@rightxmark - \firstmark\@empty\@empty\@empty\@empty} -\def\topleftxmark{\expandafter\@leftxmark - \topmark\@empty\@empty\@empty\@empty} -\def\toprightxmark{\expandafter\@rightxmark - \topmark\@empty\@empty\@empty\@empty} -\def\lastleftxmark{\expandafter\@leftxmark - \botmark\@empty\@empty\@empty\@empty} -\def\lastrightxmark{\expandafter\@rightxmark - \botmark\@empty\@empty\@empty\@empty} +\newcommand\firstleftxmark{\FirstMark{extramarks-left}} +\newcommand\lastrightxmark{\LastMark{extramarks-right}} +\newcommand\firstrightxmark{\FirstMark{extramarks-right}} +\newcommand\topleftxmark{\TopMark{extramarks-left}} +\newcommand\toprightxmark{\TopMark{extramarks-right}} +\newcommand\lastleftxmark{\LastMark{extramarks-left}} +\newcommand\firstxmark{\firstleftxmark} \let\firstxmark\firstleftxmark +\newcommand\lastxmark{\lastrightxmark} \let\lastxmark\lastrightxmark +\newcommand\topxmark{\topleftxmark} \let\topxmark\topleftxmark -\def\@leftxmark#1#2#3#4{#3} -\def\@rightxmark#1#2#3#4{#4} \endinput %% %% End of file `extramarks.sty'. diff --git a/Master/texmf-dist/tex/latex/fancyhdr/fancyhdr.sty b/Master/texmf-dist/tex/latex/fancyhdr/fancyhdr.sty index 977698a1694..5371c91febb 100644 --- a/Master/texmf-dist/tex/latex/fancyhdr/fancyhdr.sty +++ b/Master/texmf-dist/tex/latex/fancyhdr/fancyhdr.sty @@ -21,9 +21,9 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{fancyhdr}% - [2024/12/09 v4.5 + [2025/01/06 v5.1 Extensive control of page headers and footers]% -% Copyright (C) 1994-2024 by Pieter van Oostrum <pieter@vanoostrum.org> +% Copyright (C) 1994-2025 by Pieter van Oostrum <pieter@vanoostrum.org> %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \newcommand\if@nch@mpty[1]{\def\temp@a{#1}\ifx\temp@a\@empty} \newif\iff@nch@check @@ -31,9 +31,13 @@ \DeclareOption{nocheck}{% \f@nch@checkfalse } -\newif\iff@nch@compatViii \let\f@nch@gbl\relax +\newif\iff@nch@compatViii \DeclareOption{compatV3}{% + \PackageWarningNoLine{fancyhdr}{The `compatV3' option is deprecated.\MessageBreak + It will disappear in one of the following releases.\MessageBreak + Please change your document to work\MessageBreak + without this option} \let\f@nch@gbl\global \f@nch@compatViiitrue } @@ -190,8 +194,41 @@ {\f@nch@forc\f@nch@lcr\f@nch@@lcr {\f@nch@forc\f@nch@hf\f@nch@@hf {\expandafter\setlength\csname - f@nch@O@\f@nch@eo\f@nch@lcr\f@nch@hf\endcsname {#4}}}}}% + f@nch@offset@\f@nch@eo\f@nch@lcr\f@nch@hf\endcsname {#4}}}}}% \f@nch@setoffs} +\newcommand{\fancyheadwidth}[2][]{\f@nch@fancyhfwidth\fancyheadwidth h[#1]{#2}}% +\newcommand{\fancyfootwidth}[2][]{\f@nch@fancyhfwidth\fancyfootwidth f[#1]{#2}}% +\newcommand{\fancyhfwidth}[2][]{\f@nch@fancyhfwidth\fancyhfwidth {}[#1]{#2}}% +\def\f@nch@fancyhfwidth#1#2[#3]#4{% + \setlength\@tempdima{#4}% + \def\temp@c{}% + \f@nch@forc\tmpf@ra{#3}% + {\expandafter\f@nch@ifin\tmpf@ra{eolcrhf,EOLCRHF}% + {}{\edef\temp@c{\temp@c\tmpf@ra}}}% + \ifx\@empty\temp@c\else \PackageError{fancyhdr}{Illegal char `\temp@c' in + \string#1 argument: [#3]}{}% + \fi \f@nch@for\temp@c{#3}% + {\f@nch@default\f@nch@@eo{eo}\temp@c + \f@nch@fancyhf@Echeck{#1}% + \f@nch@default\f@nch@@lcr{lcr}\temp@c + \f@nch@default\f@nch@@hf{hf}{#2\temp@c}% + \f@nch@forc\f@nch@eo\f@nch@@eo + {\f@nch@forc\f@nch@lcr\f@nch@@lcr + {\f@nch@forc\f@nch@hf\f@nch@@hf + {\expandafter\def\csname + f@nch@width@\f@nch@eo\f@nch@lcr\f@nch@hf\endcsname {#4}}}}}} +\def\f@nch@width@elh{\headwidth} +\def\f@nch@width@ech{\headwidth} +\def\f@nch@width@erh{\headwidth} +\def\f@nch@width@olh{\headwidth} +\def\f@nch@width@och{\headwidth} +\def\f@nch@width@orh{\headwidth} +\def\f@nch@width@elf{\headwidth} +\def\f@nch@width@ecf{\headwidth} +\def\f@nch@width@erf{\headwidth} +\def\f@nch@width@olf{\headwidth} +\def\f@nch@width@ocf{\headwidth} +\def\f@nch@width@orf{\headwidth} \newcommand{\lhead}[2][\f@nch@olh]% {\f@nch@def\f@nch@olh{#2}\f@nch@def\f@nch@elh{#1}} \newcommand{\chead}[2][\f@nch@och]% @@ -205,14 +242,14 @@ \newcommand{\rfoot}[2][\f@nch@orf]% {\f@nch@def\f@nch@orf{#2}\f@nch@def\f@nch@erf{#1}} \newlength{\f@nch@headwidth} \let\headwidth\f@nch@headwidth -\newlength{\f@nch@O@elh} -\newlength{\f@nch@O@erh} -\newlength{\f@nch@O@olh} -\newlength{\f@nch@O@orh} -\newlength{\f@nch@O@elf} -\newlength{\f@nch@O@erf} -\newlength{\f@nch@O@olf} -\newlength{\f@nch@O@orf} +\newlength{\f@nch@offset@elh} +\newlength{\f@nch@offset@erh} +\newlength{\f@nch@offset@olh} +\newlength{\f@nch@offset@orh} +\newlength{\f@nch@offset@elf} +\newlength{\f@nch@offset@erf} +\newlength{\f@nch@offset@olf} +\newlength{\f@nch@offset@orf} \newcommand{\headrulewidth}{0.4pt} \newcommand{\footrulewidth}{0pt} \f@nch@ifundefined{headruleskip}% @@ -232,26 +269,55 @@ \ExplSyntaxOn \providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion} \IfFormatAtLeastTF{2021-06-01}{ - \cs_new:Npn \f@nch@clear@par@hook:n #1{ - \tl_clear:c {__hook~#1} + \def\f@nch@saveclr@parhook #1{ + \expandafter\let\csname f@nch@__hook~#1\expandafter\endcsname + \csname __hook~#1\endcsname + \tl_gclear:c {__hook~#1} + \expandafter\let\csname f@nch@__hook_toplevel~#1\expandafter\endcsname + \csname __hook_toplevel~#1\endcsname + \tl_gclear:c {__hook_toplevel~#1} + \expandafter\let\csname f@nch@__hook_next~#1\expandafter\endcsname + \csname __hook_next~#1\endcsname + \tl_gclear:c {__hook_next~#1} + \expandafter\let\csname f@nch@g__hook_#1_code_prop\expandafter\endcsname + \csname g__hook_#1_code_prop\endcsname + \prop_gclear_new:c {g__hook_#1_code_prop} } - \newcommand\f@nch@resetpar{ + \def\f@nch@restore@parhook #1{ + \global\expandafter\let\csname __hook~#1\expandafter\endcsname + \csname f@nch@__hook~#1\endcsname + \global\expandafter\let\csname __hook_toplevel~#1\expandafter\endcsname + \csname f@nch@__hook_toplevel~#1\endcsname + \global\expandafter\let\csname __hook_next~#1\expandafter\endcsname + \csname f@nch@__hook_next~#1\endcsname + \global\expandafter\let\csname g__hook_#1_code_prop\expandafter\endcsname + \csname f@nch@g__hook_#1_code_prop\endcsname + } + \def\f@nch@resetpar{ \f@nch@everypar{} - \f@nch@clear@par@hook:n{para/before} - \f@nch@clear@par@hook:n{para/begin} - \f@nch@clear@par@hook:n{para/end} - \f@nch@clear@par@hook:n{para/after} + \f@nch@saveclr@parhook{para/before} + \f@nch@saveclr@parhook{para/begin} + \f@nch@saveclr@parhook{para/end} + \f@nch@saveclr@parhook{para/after} + } + \def\f@nch@restorepar{ + \f@nch@restore@parhook{para/before} + \f@nch@restore@parhook{para/begin} + \f@nch@restore@parhook{para/end} + \f@nch@restore@parhook{para/after} } }{ - \newcommand\f@nch@resetpar{ - \f@nch@everypar{} + \def\f@nch@resetpar{ + \f@nch@everypar{} + } + \def\f@nch@restorepar{} } -} \ExplSyntaxOff \else - \newcommand\f@nch@resetpar{% + \def\f@nch@resetpar{% \f@nch@everypar{}% } + \def\f@nch@restorepar{} \fi \newcommand\f@nch@noUppercase[2][]{#2} \def\f@nch@reset{\f@nch@resetpar\restorecr\endlinechar=13 @@ -321,8 +387,32 @@ \NewMirroredHookPair{fancyhdr/head/begin}{fancyhdr/head/end} \NewMirroredHookPair{fancyhdr/foot/begin}{fancyhdr/foot/end} \fi +\newlength\f@nch@height +\newlength\f@nch@footalignment +\newif\iff@nch@footalign\f@nch@footalignfalse +\newcommand{\fancyfootalign}[1]{% + \def\temp@a{#1}% + \ifx\temp@a\@empty + \f@nch@footalignfalse + \else + \f@nch@footaligntrue + \setlength\f@nch@footalignment{#1}% + \fi +} +\newcommand\fancyhdrsettoheight[2]{% + \expandafter\ifx\csname f@nch@#2\endcsname\fancyhdrsettoheight + \else\PackageError{fancyhdr}{Unknown parameter #2 in \string\fancyhdrsettoheight}{}\fi + \setbox\@tempboxa\hbox{{\f@nch@checkfalse\csname @#2\endcsname}}% + \setlength{#1}\f@nch@height + \setbox\@tempboxa\box\voidb@x +} +\let\f@nch@oddhead\fancyhdrsettoheight +\let\f@nch@evenhead\fancyhdrsettoheight +\let\f@nch@oddfoot\fancyhdrsettoheight +\let\f@nch@evenfoot\fancyhdrsettoheight \newcommand\f@nch@vbox[2]{% \setbox0\vbox{#2}% + \global\f@nch@height=\ht0 \ifdim\ht0>#1\relax \iff@nch@check \dimen0=#1\advance\dimen0-\ht0 @@ -335,43 +425,40 @@ This may cause the page layout to be inconsistent, however \fi \ifx#1\headheight .\MessageBreak - You might also make \topmargin smaller to compensate:\MessageBreak + You might also make \topmargin smaller:\MessageBreak \string\addtolength{\string\topmargin}{\the\dimen0}% \fi \@gobble }% - \fi - \iff@nch@compatViii - \dimen0=#1\relax - \global#1=\ht0\relax - \ht0=\dimen0 % + \iff@nch@compatViii + \dimen0=#1\relax + \global#1=\ht0\relax + \ht0=\dimen0 % + \else + \ht0=#1\relax + \fi \else - \ht0=#1% + \ht0=#1\relax \fi \fi \box0} -\newcommand\f@nch@head[5]{% +\newcommand\f@nch@head[8]{% \f@nch@reset \ifdefined\UseHook\UseHook{fancyhdr/before}\UseHook{fancyhdr/head/begin}\fi \f@nch@headinit\relax #1% \hbox to\headwidth{% \f@nch@vbox\headheight{% - \hbox{% - \rlap{\parbox[b]{\headwidth}{\raggedright\leavevmode\ignorespaces#2}}% - \hfill - \parbox[b]{\headwidth}{\centering\leavevmode\ignorespaces#3}% - \hfill - \llap{\parbox[b]{\headwidth}{\raggedleft\leavevmode\ignorespaces#4}}% - }% + \f@nch@hfbox{#2}{#3}{#4}{b}{#6}{#7}{#8}% \vskip\headruleskip\relax \headrule }% }% #5% \ifdefined\UseHook\UseHook{fancyhdr/head/end}\UseHook{fancyhdr/after}\fi + \f@nch@restorepar } -\newcommand\f@nch@foot[5]{% +\newcommand\f@nch@foot[8]{% \f@nch@reset \ifdefined\UseHook\UseHook{fancyhdr/before}\UseHook{fancyhdr/foot/begin}\fi \f@nch@footinit\relax @@ -380,18 +467,51 @@ \f@nch@vbox\footskip{% \setbox0=\vbox{\footrule}\unvbox0 \vskip\footruleskip - \hbox{% - \rlap{\parbox[t]{\headwidth}{\raggedright\leavevmode\ignorespaces#2}}% - \hfill - \parbox[t]{\headwidth}{\centering\leavevmode\ignorespaces#3}% - \hfill - \llap{\parbox[t]{\headwidth}{\raggedleft\leavevmode\ignorespaces#4}}% - }% + \f@nch@hfbox{#2}{#3}{#4}{t}{#6}{#7}{#8}% + \iff@nch@footalign \vskip\f@nch@footalignment \fi }% }% #5% \ifdefined\UseHook\UseHook{fancyhdr/foot/end}\UseHook{fancyhdr/after}\fi + \f@nch@restorepar } +\newlength\f@nch@widthL +\newlength\f@nch@widthC +\newlength\f@nch@widthR +\newcommand\f@nch@hfbox[7]{% + \setlength\f@nch@widthL{#5}% + \setlength\f@nch@widthC{#6}% + \setlength\f@nch@widthR{#7}% + \let\@tempa\f@nch@hfbox@center + \ifdim \dimexpr \f@nch@widthL+\f@nch@widthC+\f@nch@widthR>\headwidth + \else + \ifdim \dimexpr \f@nch@widthL+0.5\f@nch@widthC>0.5\headwidth + \let \@tempa\f@nch@hfbox@fit + \fi + \ifdim \dimexpr \f@nch@widthR+0.5\f@nch@widthC>0.5\headwidth + \let \@tempa\f@nch@hfbox@fit + \fi + \fi + \@tempa{#1}{#2}{#3}{#4}% +} +\newcommand\f@nch@hfbox@center[4]{% + \hbox to \headwidth{% + \rlap{\parbox[#4]{\f@nch@widthL}{\raggedright\leavevmode\ignorespaces#1}}% + \hfill + \parbox[#4]{\f@nch@widthC}{\centering\leavevmode\ignorespaces#2}% + \hfill + \llap{\parbox[#4]{\f@nch@widthR}{\raggedleft\leavevmode\ignorespaces#3}}% + }% +} +\newcommand\f@nch@hfbox@fit[4]{% + \hbox to \headwidth{% + \parbox[#4]{\f@nch@widthL}{\raggedright\leavevmode\ignorespaces#1}% + \hfill + \parbox[#4]{\f@nch@widthC}{\centering\leavevmode\ignorespaces#2}% + \hfill + \parbox[#4]{\f@nch@widthR}{\raggedleft\leavevmode\ignorespaces#3}% + }% +}% \f@nch@ifundefined{MakeUppercase}{\def\MakeUppercase{\uppercase}}{}% \f@nch@ifundefined{@chapapp}{\let\@chapapp\chaptername}{}% \def\f@nch@initialise{% @@ -442,7 +562,8 @@ \def\ps@f@nch@fancycore{% \f@nch@ps@empty \def\@mkboth{\protect\markboth}% - \def\f@nch@oddhead{\f@nch@head\f@nch@Oolh\f@nch@olh\f@nch@och\f@nch@orh\f@nch@Oorh}% + \def\f@nch@oddhead{\f@nch@head\f@nch@Oolh\f@nch@olh\f@nch@och\f@nch@orh\f@nch@Oorh + \f@nch@width@olh\f@nch@width@och\f@nch@width@orh}% \def\@oddhead{% \iff@nch@twoside \ifodd\c@page @@ -454,7 +575,8 @@ \f@nch@oddhead \fi } - \def\f@nch@oddfoot{\f@nch@foot\f@nch@Oolf\f@nch@olf\f@nch@ocf\f@nch@orf\f@nch@Oorf}% + \def\f@nch@oddfoot{\f@nch@foot\f@nch@Oolf\f@nch@olf\f@nch@ocf\f@nch@orf\f@nch@Oorf + \f@nch@width@olf\f@nch@width@ocf\f@nch@width@orf}% \def\@oddfoot{% \iff@nch@twoside \ifodd\c@page @@ -466,14 +588,11 @@ \f@nch@oddfoot \fi } - \def\@evenhead{\f@nch@head\f@nch@Oelh\f@nch@elh\f@nch@ech\f@nch@erh\f@nch@Oerh}% - \def\@evenfoot{\f@nch@foot\f@nch@Oelf\f@nch@elf\f@nch@ecf\f@nch@erf\f@nch@Oerf}% + \def\@evenhead{\f@nch@head\f@nch@Oelh\f@nch@elh\f@nch@ech\f@nch@erh\f@nch@Oerh + \f@nch@width@elh\f@nch@width@ech\f@nch@width@erh}% + \def\@evenfoot{\f@nch@foot\f@nch@Oelf\f@nch@elf\f@nch@ecf\f@nch@erf\f@nch@Oerf + \f@nch@width@elf\f@nch@width@ecf\f@nch@width@erf}% } -\def\ps@fancydefault{% - \f@nch@initialise - \ps@f@nch@fancyproto -} -\@namedef{f@nch@ps@fancydefault-is-fancyhdr}{} \def\f@nch@Oolh{\if@reversemargin\hss\else\relax\fi} \def\f@nch@Oorh{\if@reversemargin\relax\else\hss\fi} \let\f@nch@Oelh\f@nch@Oorh @@ -482,36 +601,45 @@ \let\f@nch@Oorf\f@nch@Oorh \let\f@nch@Oelf\f@nch@Oelh \let\f@nch@Oerf\f@nch@Oerh -\def\f@nch@offsolh{\headwidth=\textwidth\advance\headwidth\f@nch@O@olh - \advance\headwidth\f@nch@O@orh\hskip-\f@nch@O@olh} -\def\f@nch@offselh{\headwidth=\textwidth\advance\headwidth\f@nch@O@elh - \advance\headwidth\f@nch@O@erh\hskip-\f@nch@O@elh} -\def\f@nch@offsolf{\headwidth=\textwidth\advance\headwidth\f@nch@O@olf - \advance\headwidth\f@nch@O@orf\hskip-\f@nch@O@olf} -\def\f@nch@offself{\headwidth=\textwidth\advance\headwidth\f@nch@O@elf - \advance\headwidth\f@nch@O@erf\hskip-\f@nch@O@elf} +\def\f@nch@offsolh{\headwidth=\textwidth\advance\headwidth\f@nch@offset@olh + \advance\headwidth\f@nch@offset@orh\hskip-\f@nch@offset@olh} +\def\f@nch@offselh{\headwidth=\textwidth\advance\headwidth\f@nch@offset@elh + \advance\headwidth\f@nch@offset@erh\hskip-\f@nch@offset@elh} +\def\f@nch@offsolf{\headwidth=\textwidth\advance\headwidth\f@nch@offset@olf + \advance\headwidth\f@nch@offset@orf\hskip-\f@nch@offset@olf} +\def\f@nch@offself{\headwidth=\textwidth\advance\headwidth\f@nch@offset@elf + \advance\headwidth\f@nch@offset@erf\hskip-\f@nch@offset@elf} \def\f@nch@setoffs{% \f@nch@gbl\let\headwidth\f@nch@headwidth - \f@nch@gbl\let\f@nch@Oolh\f@nch@offsolh - \f@nch@gbl\let\f@nch@Oelh\f@nch@offselh \f@nch@gbl\let\f@nch@Oorh\hss - \f@nch@gbl\let\f@nch@Oerh\hss \f@nch@gbl\let\f@nch@Oolf\f@nch@offsolf - \f@nch@gbl\let\f@nch@Oelf\f@nch@offself \f@nch@gbl\let\f@nch@Oorf\hss - \f@nch@gbl\let\f@nch@Oerf\hss + \f@nch@gbl\def\f@nch@Oolh{\f@nch@offsolh}% + \f@nch@gbl\def\f@nch@Oelh{\f@nch@offselh}% + \f@nch@gbl\def\f@nch@Oorh{\hss}% + \f@nch@gbl\def\f@nch@Oerh{\hss}% + \f@nch@gbl\def\f@nch@Oolf{\f@nch@offsolf}% + \f@nch@gbl\def\f@nch@Oelf{\f@nch@offself}% + \f@nch@gbl\def\f@nch@Oorf{\hss}% + \f@nch@gbl\def\f@nch@Oerf{\hss}% } \newif\iff@nch@footnote \AtBeginDocument{% \let\latex@makecol\@makecol \def\@makecol{\ifvoid\footins\f@nch@footnotefalse\else\f@nch@footnotetrue\fi - \let\topfloat\@toplist\let\botfloat\@botlist\latex@makecol}% + \let\f@nch@topfloat\@toplist\let\f@nch@botfloat\@botlist\latex@makecol}% } -\newcommand\iftopfloat[2]{\ifx\topfloat\@empty #2\else #1\fi}% -\newcommand\ifbotfloat[2]{\ifx\botfloat\@empty #2\else #1\fi}% +\newcommand\iftopfloat[2]{\ifx\f@nch@topfloat\@empty #2\else #1\fi}% +\newcommand\ifbotfloat[2]{\ifx\f@nch@botfloat\@empty #2\else #1\fi}% \newcommand\iffloatpage[2]{\if@fcolmade #1\else #2\fi}% \newcommand\iffootnote[2]{\iff@nch@footnote #1\else #2\fi}% -\newcommand{\fancypagestyle}[1]{% - \@ifnextchar[{\f@nch@pagestyle{#1}}{\f@nch@pagestyle{#1}[f@nch@fancyproto]}% +\ifx\@temptokenb\undefined \csname newtoks\endcsname\@temptokenb\fi +\newif\iff@nch@pagestyle@star +\newcommand\fancypagestyle{% + \@ifstar{\f@nch@pagestyle@startrue\f@nch@pagestyle}% + {\f@nch@pagestyle@starfalse\f@nch@pagestyle}% +} +\newcommand\f@nch@pagestyle[1]{% + \@ifnextchar[{\f@nch@@pagestyle{#1}}{\f@nch@@pagestyle{#1}[f@nch@fancyproto]}% } -\long\def\f@nch@pagestyle#1[#2]#3{% +\long\def\f@nch@@pagestyle#1[#2]#3{% \f@nch@ifundefined{ps@#2}{% \PackageError{fancyhdr}{\string\fancypagestyle: Unknown base page style `#2'}{}% }{% @@ -519,11 +647,150 @@ \PackageError{fancyhdr}{\string\fancypagestyle: Base page style `#2' is not fancyhdr-based}{}% }% {% - \@namedef{ps@#1}{\let\f@nch@gbl\relax\@nameuse{ps@#2}#3\relax}% + \f@nch@pagestyle@setup + \def\temp@b{\@namedef{ps@#1}}% + \expandafter\temp@b\expandafter{\the\@temptokenb + \let\f@nch@gbl\relax\@nameuse{ps@#2}#3\relax}% \@namedef{f@nch@ps@#1-is-fancyhdr}{}% }% }% -}% +} +\newcommand\f@nch@pagestyle@setup{% + \iff@nch@pagestyle@star + \iff@nch@check\@temptokenb={\f@nch@checktrue}\else\@temptokenb={\f@nch@checkfalse}\fi + \@tfor\temp@a:= + \f@nch@olh\f@nch@och\f@nch@orh\f@nch@elh\f@nch@ech\f@nch@erh + \f@nch@olf\f@nch@ocf\f@nch@orf\f@nch@elf\f@nch@ecf\f@nch@erf + \f@nch@width@elh\f@nch@width@ech\f@nch@width@erh\f@nch@width@olh + \f@nch@width@och\f@nch@width@orh\f@nch@width@elf\f@nch@width@ecf + \f@nch@width@erf\f@nch@width@olf\f@nch@width@ocf\f@nch@width@orf + \f@nch@Oolh\f@nch@Oorh\f@nch@Oelh\f@nch@Oerh + \f@nch@Oolf\f@nch@Oorf\f@nch@Oelf\f@nch@Oerf + \f@nch@headinit\f@nch@footinit + \headrule\headrulewidth\footrule\footrulewidth + \do {% + \toks@=\expandafter\expandafter\expandafter{\temp@a}% + \toks@=\expandafter\expandafter\expandafter{% + \expandafter\expandafter\expandafter\def + \expandafter\expandafter\temp@a\expandafter{\the\toks@}}% + \edef\temp@b{\@temptokenb={\the\@temptokenb\the\toks@}}% + \temp@b + }% + \@tfor\temp@a:= + \f@nch@offset@olh\f@nch@offset@orh\f@nch@offset@elh\f@nch@offset@erh + \f@nch@offset@olf\f@nch@offset@orf\f@nch@offset@elf\f@nch@offset@erf + \do {% + \toks@=\expandafter\expandafter\expandafter{\expandafter\the\temp@a}% + \toks@=\expandafter\expandafter\expandafter{% + \expandafter\expandafter\expandafter\setlength + \expandafter\expandafter\temp@a\expandafter{\the\toks@}}% + \edef\temp@b{\@temptokenb={\the\@temptokenb\the\toks@}}% + \temp@b + }% + \else + \@temptokenb={}% + \fi +} +\newcommand\fancypagestyleassign[2]{% + \f@nch@ifundefined{ps@#2}{% + \PackageError{fancyhdr}{\string\fancypagestyleassign: Unknown page style `#2'}{}% + }{% + \expandafter\let + \csname ps@#1\expandafter\endcsname + \csname ps@#2\endcsname + \f@nch@ifundefined{f@nch@ps@#2-is-fancyhdr}{% + \f@nch@ifundefined{f@nch@ps@#1-is-fancyhdr}{}{% + \PackageNote{fancyhdr}{% + \string\fancypagestyleassign: You overwrite the\MessageBreak + fancyhdr-based page style `#1' with the\MessageBreak + non-fancyhdr-based page style `#2'.\MessageBreak + This could cause unexpected problems if you\MessageBreak + use `#1' as the base style in \string\fancypagestyle}}% + \expandafter\let\csname f@nch@ps@#1-is-fancyhdr\endcsname\@undefined + }{% + \@namedef{f@nch@ps@#1-is-fancyhdr}{}% + }% + }% +} +\fancypagestyle*{fancydefault}{\f@nch@initialise} +\def\f@nchdrbox@topstrut{\vrule height\ht\strutbox width\z@} +\def\f@nchdrbox@botstrut{\vrule depth\dp\strutbox width\z@} +\def\f@nchdrbox@nostrut{\noalign{\vspace{0pt}}\let\f@nchdrbox@@crstrut\f@nchdrbox@botstrut} +\NewDocumentCommand{\fancyhdrbox}{ O{cl} o m }{% +\begingroup + \let\f@nchdrbox@@pre\f@nchdrbox@topstrut + \let\f@nchdrbox@@postx\f@nchdrbox@botstrut + \let\f@nchdrbox@@posty\relax + \let\f@nchdrbox@@crstrut\strut + \IfNoValueTF{#2}% + {\let\f@nchdrbox@@halignto\@empty}% + {\setlength\@tempdima{#2}% + \def\f@nchdrbox@@halignto{to\@tempdima}}% + \def\@tempa{#1}% + \ifx\@tempa\@empty + \f@nchdrbox@align cl\@nil{#3}% + \else + \f@nchdrbox@align #1\@nil{#3}% + \fi +\endgroup +} +\protected\def\f@nchdrbox@cr{% + {\ifnum0=`}\fi\@ifstar\@f@nchdrbox@xcr\@f@nchdrbox@xcr} + +\def\@f@nchdrbox@xcr{% + \unskip\f@nchdrbox@@crstrut + \@ifnextchar[\@f@nchdrbox@argc{\ifnum0=`{\fi}\cr}% +} + +\def\@f@nchdrbox@argc[#1]{% + \ifnum0=`{\fi}% + \ifdim #1>\z@ + \unskip\@f@nchdrbox@xargc{#1}% + \else + \@f@nchdrbox@yargc{#1}% + \fi} + +\def\@f@nchdrbox@xargc#1{\@tempdima #1\advance\@tempdima \dp \strutbox + \vrule \@height\z@ \@depth\@tempdima \@width\z@ \cr} + +\def\@f@nchdrbox@yargc#1{\cr\noalign{\setlength\@tempdima{#1}\vskip\@tempdima}} +\def\f@nchdrbox@T{\let\f@nchdrbox@@pre\f@nchdrbox@nostrut + \f@nchdrbox@t} +\def\f@nchdrbox@t{\def\f@nchdrbox@@v{t}\def\f@nchdrbox@@h{l}} +\def\f@nchdrbox@c{\def\f@nchdrbox@@v{c}\def\f@nchdrbox@@h{c}} +\def\f@nchdrbox@b{\def\f@nchdrbox@@v{b}\def\f@nchdrbox@@h{l}} +\def\f@nchdrbox@B{\let\f@nchdrbox@@postx\relax + \def\f@nchdrbox@@posty{\vspace{0pt}}% + \f@nchdrbox@b} +\long\def\f@nchdrbox@align#1#2\@nil#3{% + \f@nch@ifin{#1}{TtcbB}{% + \@nameuse{f@nchdrbox@#1}% + \def\@tempa{#2}% + \ifx\@tempa\@empty\else \def\f@nchdrbox@@h{#2}\fi + }% + {\def\f@nchdrbox@@v{c}\def\f@nchdrbox@@h{#1}}% + \let\\\f@nchdrbox@cr + \setbox0=\if \f@nchdrbox@@v t\vtop + \else \vbox + \fi + {% + \ialign \f@nchdrbox@@halignto + \bgroup \relax + {\if \f@nchdrbox@@h l\hskip 1sp\else \hfil \fi + \ignorespaces ##\unskip + \if\f@nchdrbox@@h r\else \hfil \fi + }% + \tabskip\z@skip \cr + \f@nchdrbox@@pre + #3\unskip \f@nchdrbox@@postx + \crcr + \egroup + \f@nchdrbox@@posty + }% + \if\f@nchdrbox@@v c\@tempdima=\ht0\advance\@tempdima\dp0% + \ht0=0.5\@tempdima\dp0=0.5\@tempdima\fi + \leavevmode \box0 +} \@ifclassloaded{newlfm} { \let\ps@@empty\f@nch@ps@empty diff --git a/Master/texmf-dist/tex/latex/ffcode/ffcode.sty b/Master/texmf-dist/tex/latex/ffcode/ffcode.sty index 9ecddd78e80..0e6c0d1e816 100644 --- a/Master/texmf-dist/tex/latex/ffcode/ffcode.sty +++ b/Master/texmf-dist/tex/latex/ffcode/ffcode.sty @@ -7,7 +7,7 @@ %% ffcode.dtx (with options: `package') %% (The MIT License) %% -%% Copyright (c) 2021-2024 Yegor Bugayenko +%% Copyright (c) 2021-2025 Yegor Bugayenko %% %% Permission is hereby granted, free of charge, to any person obtaining a copy %% of this software and associated documentation files (the 'Software'), to deal @@ -31,7 +31,9 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{ffcode} -[2024-03-23 0.9.3 Fixed Font Code] +[2025/01/05 0.10.1 Fixed Font Code] + + @@ -55,6 +57,7 @@ /ff/.cd, bold/.store in=\ff@bold, sf/.store in=\ff@sf, + samepage/.store in=\ff@samepage, noframes/.store in=\ff@noframes, nonumbers/.store in=\ff@nonumbers, nobars/.store in=\ff@nobars, @@ -64,30 +67,44 @@ \ProcessPgfPackageOptions{/ff} \RequirePackage{xcolor} + \RequirePackage{listings} \makeatletter \lst@AddToHook{Init}{\setlength{\lineskip}{0pt}} \makeatother \makeatletter +\newcommand\ff@set[1]{ + \lstset{breaklines} + \lstset{escapeinside={(*@}{@*)}} + \lstset{basicstyle={\ttfamily}} + \lstset{columns=fullflexible} + \ifdefined\ff@nonumbers\else + \lstset{numbers=left,numbersep=.8em,numberstyle={\tiny\sffamily\color{gray}}} + \fi + \ifdefined\ff@nobars\else + \lstset{frame=leftline,framerule=.05em,rulecolor={\color{gray}}} + \fi + \ifdefined\ff@nocn\else + \lstset{firstnumber=last} + \fi + \lstset{#1} +} +\makeatother + +\makeatletter \lstnewenvironment{ffcode}[1][] - { - \lstset{breaklines} - \lstset{escapeinside={(*@}{@*)}} - \lstset{basicstyle={\ttfamily}} - \lstset{columns=fullflexible} - \ifdefined\ff@nonumbers\else - \lstset{numbers=left,numbersep=.8em,numberstyle={\tiny\sffamily\color{gray}}} - \fi - \ifdefined\ff@nobars\else - \lstset{frame=leftline,framerule=.05em,rulecolor={\color{gray}}} - \fi - \ifdefined\ff@nocn\else - \lstset{firstnumber=last} - \fi - \lstset{#1} - } - {} + {\ff@set{#1}\ifdefined\ff@samepage\noindent\minipage{\linewidth}\fi} + {\ifdefined\ff@samepage\endminipage\fi} +\makeatother + +\makeatletter +\newcommand\ffinput[2][]{% + \ff@set{#1}% + \ifdefined\ff@samepage\noindent\minipage{\linewidth}\fi% + \lstinputlisting[#1]{#2}% + \ifdefined\ff@samepage\endminipage\fi% +} \makeatother \makeatletter diff --git a/Master/texmf-dist/tex/latex/fontscale/fontscale.sty b/Master/texmf-dist/tex/latex/fontscale/fontscale.sty index fe18d8d96a7..ca199157aad 100644 --- a/Master/texmf-dist/tex/latex/fontscale/fontscale.sty +++ b/Master/texmf-dist/tex/latex/fontscale/fontscale.sty @@ -1,5 +1,5 @@ % Package : fontscale -- A flexible interface for setting font sizes -% Copyright : 2024 (c) Oliver Beery <beeryoliver@gmail.com> +% Copyright : 2024-2025 (c) Oliver Beery <beeryoliver@gmail.com> % CTAN : https://ctan.org/pkg/fontscale % Repository: https://github.com/beeryoliver/fontscale % License : The LaTeX Project Public License 1.3c @@ -8,8 +8,8 @@ \NeedsTeXFormat{LaTeX2e}[2023-11-01] \ProvidesExplPackage {fontscale} - {2024-12-22} - {3.0.4} + {2025-01-03} + {3.0.5} {A flexible interface for setting font sizes} % l3kernel version 2023-10-10 added many 'e'-variants. @@ -26,6 +26,77 @@ % This package does not require any other packages! +% MESSAGES + +\msg_new:nnn { fontscale } { key-musical-base-out-of-bounds } + { + Invalid~ value~ '#1'~ \msg_line_context:. \\ + The~ value~ of~ the~ key~ 'musical / base'~ + must~ be~ a~ positive~ length. + } +\msg_new:nnn { fontscale } { key-musical-ratio-out-of-bounds } + { + Invalid~ value~ '#1'~ \msg_line_context:. \\ + The~ value~ of~ the~ key~ 'musical / ratio'~ + must~ be~ greater~ than~ 1. + } +\msg_new:nnn { fontscale } { key-musical-notes-out-of-bounds } + { + Invalid~ value~ '#1'~ \msg_line_context:. \\ + The~ value~ of~ the~ key~ 'musical / notes'~ + must~ be~ a~ positive~ integer. + } +\msg_new:nnn { fontscale } { key-font-scale-out-of-bounds } + { + Invalid~ value~ '#1'~ \msg_line_context:. \\ + The~ value~ of~ the~ key~ '#2 / scale'~ + must~ be~ positive. + } +\msg_new:nnn { fontscale } { key-font-size-out-of-bounds } + { + Invalid~ value~ '#1'~ \msg_line_context:. \\ + The~ value~ of~ the~ key~ '#2 / size'~ + must~ be~ a~ positive~ length. + } +\msg_new:nnn { fontscale } { key-font-scale-overwritten } + { + The~ font~ size~ set~ by~ the~ key~ '#1 / scale'~ + has~ been~ overwritten~ by~ the~ key~ '#1 / size'~ \msg_line_context:. + } +\msg_new:nnn { fontscale } { font-sizes-out-of-order } + { + The~ font~ sizes~ are~ not~ in~ the~ correct~ order~ \msg_line_context:. \\ + The~ lengths~ of~ the~ font~ sizes~ should~ be~ ordered~ from~ + \iow_char:N \\tiny~ to~ \iow_char:N \\Huge. + } + +% This package tests for math mode only at the user level because this is not +% necessary for programmers. To avoid confusion, this package issues a warning +% when \fontsize + \selectfont would be used in math mode because it would not +% change the math font size. +\msg_new:nnn { fontscale } { math-mode-warning } + { '#1'~ does~ nothing~ if~ used~ in~ math~ mode~ \msg_line_context:. } +% \@ and \par cannot be used in math mode. +\msg_new:nnn { fontscale } { math-mode-error } + { '#1'~ cannot~ be~ used~ in~ math~ mode~ \msg_line_context:. } +\msg_new:nnn { fontscale } { font-size-out-of-bounds } + { + Invalid~ font~ size~ '#1'~ \msg_line_context:. \\ + The~ font~ size~ must~ be~ a~ positive~ length. + } +\msg_new:nnn { fontscale } { font-step-out-of-bounds } + { + Invalid~ font~ step~ '#1'~ \msg_line_context:. \\ + The~ font~ step~ must~ equal~ the~ font~ step~ of~ + any~ font~ size~ command~ from~ \iow_char:N \\tiny~ to~ \iow_char:N \\Huge~ + unless~ the~ value~ of~ the~ key~ 'typographic-scale'~ is~ 'musical'. + } +\msg_new:nnn { fontscale } { current-font-step-out-of-bounds } + { + The~ new~ font~ step~ could~ not~ be~ calculated~ + because~ the~ current~ font~ step~ is~ undefined~ \msg_line_context:. + } + % SOME VARIABLES % Declares and initializes the font step, font scale, font size, and font @@ -119,7 +190,8 @@ % point expression by using \fp_set_eq:NN when the font size equals the font % size of any font size command from \tiny to \Huge. The case when the font % size equals that of \normalsize is optimized further because it is by far -% the most common case. +% the most common case. \f@size and \f@baselineskip are not used elsewhere in +% the code. \hook_gput_code:nnn { selectfont } { fontscale } { \__fontscale_hook_selectfont: } \cs_new_protected:Npn \__fontscale_hook_selectfont: @@ -186,13 +258,13 @@ } { \__fontscale_hook_selectfont_auxii: } } -% For speed, \__fontscale_hook_selectfont_auxii: uses \f@size instead of -% \l_fontscale_size_dim. The case where the base font size of the musical -% typographic scale equals the font size of \normalsize is optimized further. \cs_new_protected:Npn \__fontscale_hook_selectfont_auxii: { \fp_set:Nn \l_fontscale_scale_fp - { \f@size / \l__fontscale_normalsize_size_fp } + { + \dim_to_fp:n { \l_fontscale_size_dim } + * \l__fontscale_normalsize_size_reciprocal_fp + } \str_if_eq:VnTF \l__fontscale_typographic_scale_str { musical } { \fp_set:Nn \l_fontscale_step_fp @@ -203,7 +275,10 @@ \dim_compare:nNnTF \l__fontscale_musical_base_dim = \l_fontscale_normalsize_size_dim { \l_fontscale_scale_fp } - { \f@size / \l__fontscale_musical_base_fp } + { + \dim_to_fp:n { \l_fontscale_size_dim } + * \l__fontscale_musical_base_reciprocal_fp + } ) } } @@ -212,11 +287,15 @@ % Used only to speed up floating point calculations. \fp_new:N \l__fontscale_normalsize_size_fp -\fp_set:Nn \l__fontscale_normalsize_size_fp { 10 } +\fp_new:N \l__fontscale_normalsize_size_reciprocal_fp \fp_new:N \l__fontscale_musical_base_fp -\fp_new:N \l__fontscale_musical_notes_fp +\fp_new:N \l__fontscale_musical_base_reciprocal_fp +\fp_new:N \l__fontscale_musical_notes_reciprocal_fp \fp_new:N \l__fontscale_musical_selectfont_fp +\fp_set:Nn \l__fontscale_normalsize_size_fp { 10 } +\fp_set:Nn \l__fontscale_normalsize_size_reciprocal_fp { 0.1 } + % Scratch variable \fp_new:N \l__fontscale_tmp_fp @@ -248,17 +327,19 @@ } \cs_generate_variant:Nn \__fontscale_skip_set_from_user:Nn { c } % Argument processors -\dim_new:N \l__fontscale_arg_process_dim \cs_new_protected:Npn \__fontscale_arg_process_dim:n #1 { - \__fontscale_dim_set_from_user:Nn \l__fontscale_arg_process_dim {#1} - \tl_set:NV \ProcessedArgument \l__fontscale_arg_process_dim + \group_begin: + \__fontscale_dim_set_from_user:Nn \l_tmpa_dim {#1} + \exp_args:NNNV \group_end: + \tl_set:Nn \ProcessedArgument \l_tmpa_dim } -\skip_new:N \l__fontscale_arg_process_skip \cs_new_protected:Npn \__fontscale_arg_process_skip:n #1 { - \__fontscale_skip_set_from_user:Nn \l__fontscale_arg_process_skip {#1} - \tl_set:NV \ProcessedArgument \l__fontscale_arg_process_skip + \group_begin: + \__fontscale_skip_set_from_user:Nn \l_tmpa_skip {#1} + \exp_args:NNNV \group_end: + \tl_set:Nn \ProcessedArgument \l_tmpa_skip } % Used to define \tiny to \Huge. Sets \@currsize only for compatibility. Need % \dim_use:N only for compatibility with versions of the microtype package @@ -291,87 +372,19 @@ % Similar to \__fontscale_set_font_size:nn, except that it sets the font % baselineskip equal to the new font size times the baselineskip-size-ratio. \cs_new_protected:Npn \__fontscale_set_font_size:n #1 - { \exp_args:Ne \__fontscale_set_font_size_aux:n { \dim_to_decimal:n {#1} } } + { \exp_args:Ne \__fontscale_set_font_size_aux:n { \dim_eval:n {#1} } } \cs_new_protected:Npn \__fontscale_set_font_size_aux:n #1 { - \dim_compare:nNnTF { #1 pt } > \c_zero_dim + \dim_compare:nNnTF {#1} > \c_zero_dim { - \fontsize { #1 pt } - { \fp_to_dim:n { #1 * \l__fontscale_baselineskip_size_ratio_fp } } + \fontsize {#1} + { + \fp_to_dim:n + { \dim_to_fp:n {#1} * \l__fontscale_baselineskip_size_ratio_fp } + } \selectfont } - { \msg_error:nnn { fontscale } { font-size-out-of-bounds } { #1 pt } } - } - -% MESSAGES - -\msg_new:nnn { fontscale } { key-musical-base-out-of-bounds } - { - Invalid~ value~ '#1'~ \msg_line_context:. \\ - The~ value~ of~ the~ key~ 'musical / base'~ - must~ be~ a~ positive~ length. - } -\msg_new:nnn { fontscale } { key-musical-ratio-out-of-bounds } - { - Invalid~ value~ '#1'~ \msg_line_context:. \\ - The~ value~ of~ the~ key~ 'musical / ratio'~ - must~ be~ greater~ than~ 1. - } -\msg_new:nnn { fontscale } { key-musical-notes-out-of-bounds } - { - Invalid~ value~ '#1'~ \msg_line_context:. \\ - The~ value~ of~ the~ key~ 'musical / notes'~ - must~ be~ a~ positive~ integer. - } -\msg_new:nnn { fontscale } { key-font-scale-out-of-bounds } - { - Invalid~ value~ '#1'~ \msg_line_context:. \\ - The~ value~ of~ the~ key~ '#2 / scale'~ - must~ be~ positive. - } -\msg_new:nnn { fontscale } { key-font-size-out-of-bounds } - { - Invalid~ value~ '#1'~ \msg_line_context:. \\ - The~ value~ of~ the~ key~ '#2 / size'~ - must~ be~ a~ positive~ length. - } -\msg_new:nnn { fontscale } { key-font-scale-overwritten } - { - The~ font~ size~ set~ by~ the~ key~ '#1 / scale'~ - has~ been~ overwritten~ by~ the~ key~ '#1 / size'~ \msg_line_context:. - } -\msg_new:nnn { fontscale } { font-sizes-out-of-order } - { - The~ font~ sizes~ are~ not~ in~ the~ correct~ order~ \msg_line_context:. \\ - The~ lengths~ of~ the~ font~ sizes~ should~ be~ ordered~ from~ - \iow_char:N \\tiny~ to~ \iow_char:N \\Huge. - } - -% This package tests for math mode only at the user level because this is not -% necessary for programmers. To avoid confusion, this package issues a warning -% when \fontsize + \selectfont would be used in math mode because it would not -% change the math font size. -\msg_new:nnn { fontscale } { math-mode-warning } - { '#1'~ does~ nothing~ if~ used~ in~ math~ mode~ \msg_line_context:. } -% \@ and \par cannot be used in math mode. -\msg_new:nnn { fontscale } { math-mode-error } - { '#1'~ cannot~ be~ used~ in~ math~ mode~ \msg_line_context:. } -\msg_new:nnn { fontscale } { font-size-out-of-bounds } - { - Invalid~ font~ size~ '#1'~ \msg_line_context:. \\ - The~ font~ size~ must~ be~ a~ positive~ length. - } -\msg_new:nnn { fontscale } { font-step-out-of-bounds } - { - Invalid~ font~ step~ '#1'~ \msg_line_context:. \\ - The~ font~ step~ must~ equal~ the~ font~ step~ of~ - any~ font~ size~ command~ from~ \iow_char:N \\tiny~ to~ \iow_char:N \\Huge~ - unless~ the~ value~ of~ the~ key~ 'typographic-scale'~ is~ 'musical'. - } -\msg_new:nnn { fontscale } { current-font-step-out-of-bounds } - { - The~ new~ font~ step~ could~ not~ be~ calculated~ - because~ the~ current~ font~ step~ is~ undefined~ \msg_line_context:. + { \msg_error:nnn { fontscale } { font-size-out-of-bounds } {#1} } } % DEFINE KEYS @@ -393,10 +406,7 @@ \cs_new_protected:Npn \__fontscale_keys_code_name: { \tl_if_in:NnTF \l_keys_value_tl { / } - { - \exp_last_unbraced:NV \__fontscale_keys_code_name:ww \l_keys_value_tl - \q_stop - } + { \exp_after:wN \__fontscale_keys_code_name:ww \l_keys_value_tl \q_stop } { \tl_set_eq:cN { l__fontscale_ \l_keys_key_str _size_tl } \l_keys_value_tl @@ -713,7 +723,9 @@ } } \fp_set:Nn \l__fontscale_normalsize_size_fp - { \l_fontscale_normalsize_size_dim } + { \dim_to_fp:n { \l_fontscale_normalsize_size_dim } } + \fp_set:Nn \l__fontscale_normalsize_size_reciprocal_fp + { \c_one_fp / \l__fontscale_normalsize_size_fp } \quark_if_no_value:NTF \l__fontscale_normalsize_baselineskip_tl { \skip_set:Nn \l_fontscale_normalsize_baselineskip_skip @@ -784,7 +796,7 @@ { \l__fontscale_musical_base_fp * \l__fontscale_musical_ratio_fp ^ ( \use:c { c_fontscale_#1_step_fp } - / \l__fontscale_musical_notes_fp ) + * \l__fontscale_musical_notes_reciprocal_fp ) } } % Sets the font size, font scale, and font baselineskip of the other font size @@ -812,13 +824,25 @@ { \cs_set_eq:NN \__fontscale_keys_process_other_fn_aux:n \__fontscale_keys_process_other_musical:n - \fp_set:Nn \l__fontscale_musical_base_fp - { \l__fontscale_musical_base_dim } - \fp_set:Nn \l__fontscale_musical_notes_fp - { \l__fontscale_musical_notes_int } + \dim_compare:nNnTF \l__fontscale_musical_base_dim = + \l_fontscale_normalsize_size_dim + { + \fp_set_eq:NN \l__fontscale_musical_base_fp + \l__fontscale_normalsize_size_fp + \fp_set_eq:NN \l__fontscale_musical_base_reciprocal_fp + \l__fontscale_normalsize_size_reciprocal_fp + } + { + \fp_set:Nn \l__fontscale_musical_base_fp + { \dim_to_fp:n { \l__fontscale_musical_base_dim } } + \fp_set:Nn \l__fontscale_musical_base_reciprocal_fp + { \c_one_fp / \l__fontscale_musical_base_fp } + } + \fp_set:Nn \l__fontscale_musical_notes_reciprocal_fp + { \c_one_fp / \int_use:N \l__fontscale_musical_notes_int } \fp_set:Nn \l__fontscale_musical_selectfont_fp { - \l__fontscale_musical_notes_fp + \int_use:N \l__fontscale_musical_notes_int / ln ( \l__fontscale_musical_ratio_fp ) } } @@ -876,25 +900,23 @@ { \__fontscale_keys_process_other_fn_aux:n {#1} } \prg_break: \prg_break_point: + \fp_set:cn { l_fontscale_#1_scale_fp } + { + \dim_to_fp:n { \use:c { l_fontscale_#1_size_dim } } + * \l__fontscale_normalsize_size_reciprocal_fp + } \quark_if_no_value:cTF { l__fontscale_#1_baselineskip_tl } { - \fp_set:Nn \l__fontscale_tmp_fp { \use:c { l_fontscale_#1_size_dim } } - \fp_set:cn { l_fontscale_#1_scale_fp } - { \l__fontscale_tmp_fp / \l__fontscale_normalsize_size_fp } \skip_set:cn { l_fontscale_#1_baselineskip_skip } { \fp_to_dim:n { - \l__fontscale_tmp_fp * \l__fontscale_baselineskip_size_ratio_fp + \dim_to_fp:n { \use:c { l_fontscale_#1_size_dim } } + * \l__fontscale_baselineskip_size_ratio_fp } } } { - \fp_set:cn { l_fontscale_#1_scale_fp } - { - \use:c { l_fontscale_#1_size_dim } - / \l__fontscale_normalsize_size_fp - } \__fontscale_skip_set_from_user:cn { l_fontscale_#1_baselineskip_skip } { \use:c { l__fontscale_#1_baselineskip_tl } } } @@ -1100,8 +1122,6 @@ { \msg_error:nn { fontscale } { current-font-step-out-of-bounds } } { \__fontscale_set_font_step:n { (#1) + \l_fontscale_step_fp } } } -% Using \str_case: here is significantly faster (and easier to write) than -% repeatedly testing \fp_compare:. \cs_new_protected:Npn \__fontscale_set_font_step:n #1 { \fp_set:Nn \l__fontscale_tmp_fp { round ( #1 , 5 ) } @@ -1127,7 +1147,8 @@ { \l__fontscale_musical_base_fp * \l__fontscale_musical_ratio_fp - ^ ( \l__fontscale_tmp_fp / \l__fontscale_musical_notes_fp ) + ^ ( \l__fontscale_tmp_fp + * \l__fontscale_musical_notes_reciprocal_fp ) } } } @@ -1188,9 +1209,16 @@ { \fp_set:Nn \l__fontscale_tmp_fp {#1} \__fontscale_set_font_size:nn - { \fp_to_dim:n { \l__fontscale_tmp_fp * \l_fontscale_size_dim } } { - \fp_to_dim:n { \l__fontscale_tmp_fp * \l_fontscale_baselineskip_skip } + \fp_to_dim:n + { \l__fontscale_tmp_fp * \dim_to_fp:n { \l_fontscale_size_dim } } + } + { + \fp_to_dim:n + { + \l__fontscale_tmp_fp + * \dim_to_fp:n { \l_fontscale_baselineskip_skip } + } } } diff --git a/Master/texmf-dist/tex/latex/gelasiomath/t1mingelasio.fd b/Master/texmf-dist/tex/latex/gelasiomath/t1mingelasio.fd index da0a9da6553..2eace69615a 100644 --- a/Master/texmf-dist/tex/latex/gelasiomath/t1mingelasio.fd +++ b/Master/texmf-dist/tex/latex/gelasiomath/t1mingelasio.fd @@ -47,5 +47,4 @@ \DeclareFontShape{T1}{mingelasio}{bx}{it}{ <-> ssub * mingelasio/b/it }{} -\traceoff \endinput diff --git a/Master/texmf-dist/tex/latex/gelasiomath/untxmia.fd b/Master/texmf-dist/tex/latex/gelasiomath/untxmia.fd deleted file mode 100644 index 212e5b2386e..00000000000 --- a/Master/texmf-dist/tex/latex/gelasiomath/untxmia.fd +++ /dev/null @@ -1,139 +0,0 @@ -%Filename: untxmia.fd -%Created by: tex mia-drv -%Created using fontinst v1.933 - -%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY - -\ProvidesFile{untxmia.fd} - [2024/04/09 Fontinst v1.933 font definitions for U/ntxmia.] - -\expandafter\ifx\csname ntxmath@scaled\endcsname\relax - \let\ntxmath@scaled\@empty% -\fi - -\DeclareFontFamily{U}{ntxmia}{\skewchar \font =127} - -\iftx@libertine - \DeclareFontShape{U}{ntxmia}{m}{it}{ - <-> \ntxmath@scaled nxlmia - }{} - - \DeclareFontShape{U}{ntxmia}{b}{it}{ - <-> \ntxmath@scaled nxlbmia - }{} -\else - \iftx@minion - \DeclareFontShape{U}{ntxmia}{m}{it}{ - <-> \ntxmath@scaled zmnmia - }{} - - \DeclareFontShape{U}{ntxmia}{b}{it}{ - <-> \ntxmath@scaled zmnbmia - }{} - \else - \iftx@coch - \DeclareFontShape{U}{ntxmia}{m}{it}{ - <-> \ntxmath@scaled zcochmia - }{} - \DeclareFontShape{U}{ntxmia}{b}{it}{ - <-> \ntxmath@scaled zcochbmia - }{} - \else - \iftx@ch - \DeclareFontShape{U}{ntxmia}{m}{it}{ - <-> \ntxmath@scaled zchmia - }{} - \DeclareFontShape{U}{ntxmia}{b}{it}{ - <-> \ntxmath@scaled zchbmia - }{} - \else - \iftx@stxtwo - \DeclareFontShape{U}{ntxmia}{m}{it}{ - <-> \ntxmath@scaled ntxstx2mia - }{} - \DeclareFontShape{U}{ntxmia}{b}{it}{ - <-> \ntxmath@scaled ntxstx2bmia - }{} - - \else - \iftx@ebgm - \DeclareFontShape{U}{ntxmia}{m}{it}{ - <-> \ntxmath@scaled ntxebgmia - }{} - \DeclareFontShape{U}{ntxmia}{b}{it}{ - <-> \ntxmath@scaled ntxebgbmia - }{} - \else - \iftx@ut - \DeclareFontShape{U}{ntxmia}{m}{it}{ - <-> \ntxmath@scaled zutmia - }{} - \DeclareFontShape{U}{ntxmia}{b}{it}{ - <-> \ntxmath@scaled zutbmia - }{} - \else - \iftx@nc - \iftx@fourier - \DeclareFontShape{U}{ntxmia}{m}{it}{ - <-> \ntxmath@scaled zncfmia - }{} - \DeclareFontShape{U}{ntxmia}{b}{it}{ - <-> \ntxmath@scaled zncfbmia - }{} - \else - \DeclareFontShape{U}{ntxmia}{m}{it}{ - <-> \ntxmath@scaled zncmia - }{} - \DeclareFontShape{U}{ntxmia}{b}{it}{ - <-> \ntxmath@scaled zncbmia - }{} - \fi - \else - \iftx@noto - \DeclareFontShape{U}{ntxmia}{m}{it}{ - <-> \ntxmath@scaled notomia - }{} - \DeclareFontShape{U}{ntxmia}{b}{it}{ - <-> \ntxmath@scaled notobmia - }{} - \else - \iftx@notosans - \DeclareFontShape{U}{ntxmia}{m}{it}{ - <-> \ntxmath@scaled notosansmia - }{} - \DeclareFontShape{U}{ntxmia}{b}{it}{ - <-> \ntxmath@scaled notosansbmia - }{} - \else - \iftx@gel - \DeclareFontShape{U}{ntxmia}{m}{it}{ - <-> \ntxmath@scaled zgelmia - }{} - \DeclareFontShape{U}{ntxmia}{b}{it}{ - <-> \ntxmath@scaled zgelbmia - }{} - \else - - \DeclareFontShape{U}{ntxmia}{m}{it}{ - <-> \ntxmath@scaled ntxmia - }{} - \DeclareFontShape{U}{ntxmia}{b}{it}{ - <-> \ntxmath@scaled ntxbmia - }{} - \fi - \fi - \fi - \fi - \fi - \fi - \fi - \fi - \fi - \fi -\fi -\DeclareFontShape{U}{ntxmia}{m}{sl}{<->ssub * ntxmia/m/it}{} -\DeclareFontShape{U}{ntxmia}{bx}{it}{<->ssub * ntxmia/b/it}{} -\DeclareFontShape{U}{ntxmia}{b}{sl}{<->ssub * ntxmia/b/it}{} -\DeclareFontShape{U}{ntxmia}{bx}{sl}{<->ssub * ntxmia/b/sl}{} - -\endinput diff --git a/Master/texmf-dist/tex/latex/gentium-tug/gentium.sty b/Master/texmf-dist/tex/latex/gentium-tug/gentium.sty deleted file mode 100644 index 149866f8d8a..00000000000 --- a/Master/texmf-dist/tex/latex/gentium-tug/gentium.sty +++ /dev/null @@ -1,16 +0,0 @@ -% This file is part of the Gentium package for TeX. -% It is licensed under the Expat License, see doc//README for details. -% -\ProvidesPackage{gentium} [2022/05/09 Style file for gentium.] -% -% Options: -% [scaled=0.9] --> Scale = 0.9 -% -\RequirePackage{xkeyval} -\newcommand*{\gentium@scale}{1} -\DeclareOptionX{scaled}{\renewcommand*{\gentium@scale}{#1}} -\ProcessOptionsX\relax - -\renewcommand{\rmdefault}{gentium} - -\endinput diff --git a/Master/texmf-dist/tex/latex/gentium-tug/gentiumbook.sty b/Master/texmf-dist/tex/latex/gentium-tug/gentiumbook.sty deleted file mode 100644 index b6e126313eb..00000000000 --- a/Master/texmf-dist/tex/latex/gentium-tug/gentiumbook.sty +++ /dev/null @@ -1,16 +0,0 @@ -% This file is part of the Gentium package for TeX. -% It is licensed under the Expat License, see doc//README for details. -% -\ProvidesPackage{gentiumbook} [2022/05/09 Style file for gentiumbook.] -% -% Options: -% [scaled=0.9] --> Scale = 0.9 -% -\RequirePackage{xkeyval} -\newcommand*{\gentiumbook@scale}{1} -\DeclareOptionX{scaled}{\renewcommand*{\gentiumbook@scale}{#1}} -\ProcessOptionsX\relax - -\renewcommand{\rmdefault}{gentiumbook} - -\endinput diff --git a/Master/texmf-dist/tex/latex/gentium-tug/l7xgentium.fd b/Master/texmf-dist/tex/latex/gentium-tug/l7xgentium.fd deleted file mode 100644 index 41c59d1ea59..00000000000 --- a/Master/texmf-dist/tex/latex/gentium-tug/l7xgentium.fd +++ /dev/null @@ -1,90 +0,0 @@ -\ProvidesFile{l7xgentium.fd} - [2022/05/30 Font definitions for gentium.] - -\expandafter\ifx\csname gentium@scale\endcsname\relax - \let\gentium@@scale\@empty -\else - \edef\gentium@@scale{s*[\csname gentium@scale\endcsname]}% -\fi - -\DeclareFontFamily{L7x}{gentium}{} - -\DeclareFontShape{L7x}{gentium}{m}{n}{ - <-> \gentium@@scale l7x-gentiumplus-regular -}{} - -\DeclareFontShape{L7x}{gentium}{m}{it}{ - <-> \gentium@@scale l7x-gentiumplus-italic -}{} - -\DeclareFontShape{L7x}{gentium}{b}{n}{ - <-> \gentium@@scale l7x-gentiumplus-bold -}{} - -\DeclareFontShape{L7x}{gentium}{b}{it}{ - <-> \gentium@@scale l7x-gentiumplus-bolditalic -}{} - -\DeclareFontShape{L7x}{gentium}{sb}{n}{ - <-> \gentium@@scale l7x-gentiumbook-regular -}{} - -\DeclareFontShape{L7x}{gentium}{sb}{it}{ - <-> \gentium@@scale l7x-gentiumbook-italic -}{} - -\DeclareFontShape{L7x}{gentium}{eb}{n}{ - <-> \gentium@@scale l7x-gentiumbook-bold -}{} - -\DeclareFontShape{L7x}{gentium}{eb}{it}{ - <-> \gentium@@scale l7x-gentiumbook-bolditalic -}{} - -\DeclareFontShape{L7x}{gentium}{m}{sc}{ - <-> \gentium@@scale l7x-gentiumplus-regular-sc -}{} - -\DeclareFontShape{L7x}{gentium}{m}{scit}{ - <-> \gentium@@scale l7x-gentiumplus-italic-sc -}{} - -\DeclareFontShape{L7x}{gentium}{b}{sc}{ - <-> \gentium@@scale l7x-gentiumplus-bold-sc -}{} - -\DeclareFontShape{L7x}{gentium}{b}{scit}{ - <-> \gentium@@scale l7x-gentiumplus-bolditalic-sc -}{} - -\DeclareFontShape{L7x}{gentium}{sb}{sc}{ - <-> \gentium@@scale l7x-gentiumbook-regular-sc -}{} - -\DeclareFontShape{L7x}{gentium}{sb}{scit}{ - <-> \gentium@@scale l7x-gentiumbook-italic-sc -}{} - -\DeclareFontShape{L7x}{gentium}{eb}{sc}{ - <-> \gentium@@scale l7x-gentiumbook-bold-sc -}{} - -\DeclareFontShape{L7x}{gentium}{eb}{scit}{ - <-> \gentium@@scale l7x-gentiumbook-bolditalic-sc -}{} - -\DeclareFontShape{L7x}{gentium}{m}{sl}{<->ssub * gentium/m/it}{} -\DeclareFontShape{L7x}{gentium}{b}{sl}{<->ssub * gentium/b/it}{} -\DeclareFontShape{L7x}{gentium}{bx}{sl}{<->ssub * gentium/b/it}{} -\DeclareFontShape{L7x}{gentium}{bx}{it}{<->ssub * gentium/b/it}{} -\DeclareFontShape{L7x}{gentium}{bx}{n}{<->ssub * gentium/b/n}{} -\DeclareFontShape{L7x}{gentium}{sb}{sl}{<->ssub * gentium/sb/it}{} -\DeclareFontShape{L7x}{gentium}{sbx}{sl}{<->ssub * gentium/sb/it}{} -\DeclareFontShape{L7x}{gentium}{sbx}{it}{<->ssub * gentium/sb/it}{} -\DeclareFontShape{L7x}{gentium}{sbx}{n}{<->ssub * gentium/sb/n}{} -\DeclareFontShape{L7x}{gentium}{eb}{sl}{<->ssub * gentium/eb/it}{} -\DeclareFontShape{L7x}{gentium}{ebx}{sl}{<->ssub * gentium/eb/it}{} -\DeclareFontShape{L7x}{gentium}{ebx}{it}{<->ssub * gentium/eb/it}{} -\DeclareFontShape{L7x}{gentium}{ebx}{n}{<->ssub * gentium/eb/n}{} - -\endinput diff --git a/Master/texmf-dist/tex/latex/gentium-tug/l7xgentiumbook.fd b/Master/texmf-dist/tex/latex/gentium-tug/l7xgentiumbook.fd deleted file mode 100644 index 351972c61af..00000000000 --- a/Master/texmf-dist/tex/latex/gentium-tug/l7xgentiumbook.fd +++ /dev/null @@ -1,87 +0,0 @@ -\ProvidesFile{l7xgentiumbook.fd} - [2022/05/30 Font definitions for gentiumbook.] - -\expandafter\ifx\csname gentiumbook@scale\endcsname\relax - \let\gentiumbook@@scale\@empty -\else - \edef\gentiumbook@@scale{s*[\csname gentiumbook@scale\endcsname]}% -\fi - -\DeclareFontFamily{L7x}{gentiumbook}{} - -\DeclareFontShape{L7x}{gentiumbook}{m}{n}{ - <-> \gentiumbook@@scale l7x-gentiumbook-regular -}{} - -\DeclareFontShape{L7x}{gentiumbook}{m}{it}{ - <-> \gentiumbook@@scale l7x-gentiumbook-italic -}{} - -\DeclareFontShape{L7x}{gentiumbook}{b}{n}{ - <-> \gentiumbook@@scale l7x-gentiumbook-bold -}{} - -\DeclareFontShape{L7x}{gentiumbook}{b}{it}{ - <-> \gentiumbook@@scale l7x-gentiumbook-bolditalic -}{} - -\DeclareFontShape{L7x}{gentiumbook}{sl}{n}{ - <-> \gentiumbook@@scale l7x-gentiumplus-regular -}{} - -\DeclareFontShape{L7x}{gentiumbook}{sl}{it}{ - <-> \gentiumbook@@scale l7x-gentiumplus-italic -}{} - -\DeclareFontShape{L7x}{gentiumbook}{sb}{n}{ - <-> \gentiumbook@@scale l7x-gentiumplus-bold -}{} - -\DeclareFontShape{L7x}{gentiumbook}{sb}{it}{ - <-> \gentiumbook@@scale l7x-gentiumplus-bolditalic -}{} - -\DeclareFontShape{L7x}{gentiumbook}{m}{sc}{ - <-> \gentiumbook@@scale l7x-gentiumbook-regular-sc -}{} - -\DeclareFontShape{L7x}{gentiumbook}{m}{scit}{ - <-> \gentiumbook@@scale l7x-gentiumbook-italic-sc -}{} - -\DeclareFontShape{L7x}{gentiumbook}{b}{sc}{ - <-> \gentiumbook@@scale l7x-gentiumbook-bold-sc -}{} - -\DeclareFontShape{L7x}{gentiumbook}{b}{scit}{ - <-> \gentiumbook@@scale l7x-gentiumbook-bolditalic-sc -}{} - -\DeclareFontShape{L7x}{gentiumbook}{sl}{sc}{ - <-> \gentiumbook@@scale l7x-gentiumplus-regular-sc -}{} - -\DeclareFontShape{L7x}{gentiumbook}{sl}{scit}{ - <-> \gentiumbook@@scale l7x-gentiumplus-italic-sc -}{} - -\DeclareFontShape{L7x}{gentiumbook}{sb}{sc}{ - <-> \gentiumbook@@scale l7x-gentiumplus-bold-sc -}{} - -\DeclareFontShape{L7x}{gentiumbook}{sb}{scit}{ - <-> \gentiumbook@@scale l7x-gentiumplus-bolditalic-sc -}{} - -\DeclareFontShape{L7x}{gentiumbook}{m}{sl}{<->ssub * gentiumbook/m/it}{} -\DeclareFontShape{L7x}{gentiumbook}{b}{sl}{<->ssub * gentiumbook/b/it}{} -\DeclareFontShape{L7x}{gentiumbook}{bx}{sl}{<->ssub * gentiumbook/b/it}{} -\DeclareFontShape{L7x}{gentiumbook}{bx}{it}{<->ssub * gentiumbook/b/it}{} -\DeclareFontShape{L7x}{gentiumbook}{bx}{n}{<->ssub * gentiumbook/b/n}{} -\DeclareFontShape{L7x}{gentiumbook}{sl}{sl}{<->ssub * gentiumbook/sl/it}{} -\DeclareFontShape{L7x}{gentiumbook}{sb}{sl}{<->ssub * gentiumbook/sb/it}{} -\DeclareFontShape{L7x}{gentiumbook}{sbx}{sl}{<->ssub * gentiumbook/sb/it}{} -\DeclareFontShape{L7x}{gentiumbook}{sbx}{it}{<->ssub * gentiumbook/sb/it}{} -\DeclareFontShape{L7x}{gentiumbook}{sbx}{n}{<->ssub * gentiumbook/sb/n}{} - -\endinput diff --git a/Master/texmf-dist/tex/latex/gentium-tug/lgrgentium.fd b/Master/texmf-dist/tex/latex/gentium-tug/lgrgentium.fd deleted file mode 100644 index fd2caeae60f..00000000000 --- a/Master/texmf-dist/tex/latex/gentium-tug/lgrgentium.fd +++ /dev/null @@ -1,58 +0,0 @@ -\ProvidesFile{lgrgentium.fd} - [2022/05/30 Font definitions for gentium.] - -\expandafter\ifx\csname gentium@scale\endcsname\relax - \let\gentium@@scale\@empty -\else - \edef\gentium@@scale{s*[\csname gentium@scale\endcsname]}% -\fi - -\DeclareFontFamily{LGR}{gentium}{} - -\DeclareFontShape{LGR}{gentium}{m}{n}{ - <-> \gentium@@scale lgr-gentiumplus-regular -}{} - -\DeclareFontShape{LGR}{gentium}{m}{it}{ - <-> \gentium@@scale lgr-gentiumplus-italic -}{} - -\DeclareFontShape{LGR}{gentium}{b}{n}{ - <-> \gentium@@scale lgr-gentiumplus-bold -}{} - -\DeclareFontShape{LGR}{gentium}{b}{it}{ - <-> \gentium@@scale lgr-gentiumplus-bolditalic -}{} - -\DeclareFontShape{LGR}{gentium}{sb}{n}{ - <-> \gentium@@scale lgr-gentiumbook-regular -}{} - -\DeclareFontShape{LGR}{gentium}{sb}{it}{ - <-> \gentium@@scale lgr-gentiumbook-italic -}{} - -\DeclareFontShape{LGR}{gentium}{eb}{n}{ - <-> \gentium@@scale lgr-gentiumbook-bold -}{} - -\DeclareFontShape{LGR}{gentium}{eb}{it}{ - <-> \gentium@@scale lgr-gentiumbook-bolditalic -}{} - -\DeclareFontShape{LGR}{gentium}{m}{sl}{<->ssub * gentium/m/it}{} -\DeclareFontShape{LGR}{gentium}{b}{sl}{<->ssub * gentium/b/it}{} -\DeclareFontShape{LGR}{gentium}{bx}{sl}{<->ssub * gentium/b/it}{} -\DeclareFontShape{LGR}{gentium}{bx}{it}{<->ssub * gentium/b/it}{} -\DeclareFontShape{LGR}{gentium}{bx}{n}{<->ssub * gentium/b/n}{} -\DeclareFontShape{LGR}{gentium}{sb}{sl}{<->ssub * gentium/sb/it}{} -\DeclareFontShape{LGR}{gentium}{sbx}{sl}{<->ssub * gentium/sb/it}{} -\DeclareFontShape{LGR}{gentium}{sbx}{it}{<->ssub * gentium/sb/it}{} -\DeclareFontShape{LGR}{gentium}{sbx}{n}{<->ssub * gentium/sb/n}{} -\DeclareFontShape{LGR}{gentium}{eb}{sl}{<->ssub * gentium/eb/it}{} -\DeclareFontShape{LGR}{gentium}{ebx}{sl}{<->ssub * gentium/eb/it}{} -\DeclareFontShape{LGR}{gentium}{ebx}{it}{<->ssub * gentium/eb/it}{} -\DeclareFontShape{LGR}{gentium}{ebx}{n}{<->ssub * gentium/eb/n}{} - -\endinput diff --git a/Master/texmf-dist/tex/latex/gentium-tug/lgrgentiumbook.fd b/Master/texmf-dist/tex/latex/gentium-tug/lgrgentiumbook.fd deleted file mode 100644 index 9f40176617e..00000000000 --- a/Master/texmf-dist/tex/latex/gentium-tug/lgrgentiumbook.fd +++ /dev/null @@ -1,55 +0,0 @@ -\ProvidesFile{lgrgentiumbook.fd} - [2022/05/30 Font definitions for gentiumbook.] - -\expandafter\ifx\csname gentiumbook@scale\endcsname\relax - \let\gentiumbook@@scale\@empty -\else - \edef\gentiumbook@@scale{s*[\csname gentiumbook@scale\endcsname]}% -\fi - -\DeclareFontFamily{LGR}{gentiumbook}{} - -\DeclareFontShape{LGR}{gentiumbook}{m}{n}{ - <-> \gentiumbook@@scale lgr-gentiumbook-regular -}{} - -\DeclareFontShape{LGR}{gentiumbook}{m}{it}{ - <-> \gentiumbook@@scale lgr-gentiumbook-italic -}{} - -\DeclareFontShape{LGR}{gentiumbook}{b}{n}{ - <-> \gentiumbook@@scale lgr-gentiumbook-bold -}{} - -\DeclareFontShape{LGR}{gentiumbook}{b}{it}{ - <-> \gentiumbook@@scale lgr-gentiumbook-bolditalic -}{} - -\DeclareFontShape{LGR}{gentiumbook}{sl}{n}{ - <-> \gentiumbook@@scale lgr-gentiumplus-regular -}{} - -\DeclareFontShape{LGR}{gentiumbook}{sl}{it}{ - <-> \gentiumbook@@scale lgr-gentiumplus-italic -}{} - -\DeclareFontShape{LGR}{gentiumbook}{sb}{n}{ - <-> \gentiumbook@@scale lgr-gentiumplus-bold -}{} - -\DeclareFontShape{LGR}{gentiumbook}{sb}{it}{ - <-> \gentiumbook@@scale lgr-gentiumplus-bolditalic -}{} - -\DeclareFontShape{LGR}{gentiumbook}{m}{sl}{<->ssub * gentiumbook/m/it}{} -\DeclareFontShape{LGR}{gentiumbook}{b}{sl}{<->ssub * gentiumbook/b/it}{} -\DeclareFontShape{LGR}{gentiumbook}{bx}{sl}{<->ssub * gentiumbook/b/it}{} -\DeclareFontShape{LGR}{gentiumbook}{bx}{it}{<->ssub * gentiumbook/b/it}{} -\DeclareFontShape{LGR}{gentiumbook}{bx}{n}{<->ssub * gentiumbook/b/n}{} -\DeclareFontShape{LGR}{gentiumbook}{sl}{sl}{<->ssub * gentiumbook/sl/it}{} -\DeclareFontShape{LGR}{gentiumbook}{sb}{sl}{<->ssub * gentiumbook/sb/it}{} -\DeclareFontShape{LGR}{gentiumbook}{sbx}{sl}{<->ssub * gentiumbook/sb/it}{} -\DeclareFontShape{LGR}{gentiumbook}{sbx}{it}{<->ssub * gentiumbook/sb/it}{} -\DeclareFontShape{LGR}{gentiumbook}{sbx}{n}{<->ssub * gentiumbook/sb/n}{} - -\endinput diff --git a/Master/texmf-dist/tex/latex/gentium-tug/ly1gentium.fd b/Master/texmf-dist/tex/latex/gentium-tug/ly1gentium.fd deleted file mode 100644 index 5eb60baf4c5..00000000000 --- a/Master/texmf-dist/tex/latex/gentium-tug/ly1gentium.fd +++ /dev/null @@ -1,90 +0,0 @@ -\ProvidesFile{ly1gentium.fd} - [2022/05/30 Font definitions for gentium.] - -\expandafter\ifx\csname gentium@scale\endcsname\relax - \let\gentium@@scale\@empty -\else - \edef\gentium@@scale{s*[\csname gentium@scale\endcsname]}% -\fi - -\DeclareFontFamily{LY1}{gentium}{} - -\DeclareFontShape{LY1}{gentium}{m}{n}{ - <-> \gentium@@scale texnansi-gentiumplus-regular -}{} - -\DeclareFontShape{LY1}{gentium}{m}{it}{ - <-> \gentium@@scale texnansi-gentiumplus-italic -}{} - -\DeclareFontShape{LY1}{gentium}{b}{n}{ - <-> \gentium@@scale texnansi-gentiumplus-bold -}{} - -\DeclareFontShape{LY1}{gentium}{b}{it}{ - <-> \gentium@@scale texnansi-gentiumplus-bolditalic -}{} - -\DeclareFontShape{LY1}{gentium}{sb}{n}{ - <-> \gentium@@scale texnansi-gentiumbook-regular -}{} - -\DeclareFontShape{LY1}{gentium}{sb}{it}{ - <-> \gentium@@scale texnansi-gentiumbook-italic -}{} - -\DeclareFontShape{LY1}{gentium}{eb}{n}{ - <-> \gentium@@scale texnansi-gentiumbook-bold -}{} - -\DeclareFontShape{LY1}{gentium}{eb}{it}{ - <-> \gentium@@scale texnansi-gentiumbook-bolditalic -}{} - -\DeclareFontShape{LY1}{gentium}{m}{sc}{ - <-> \gentium@@scale texnansi-gentiumplus-regular-sc -}{} - -\DeclareFontShape{LY1}{gentium}{m}{scit}{ - <-> \gentium@@scale texnansi-gentiumplus-italic-sc -}{} - -\DeclareFontShape{LY1}{gentium}{b}{sc}{ - <-> \gentium@@scale texnansi-gentiumplus-bold-sc -}{} - -\DeclareFontShape{LY1}{gentium}{b}{scit}{ - <-> \gentium@@scale texnansi-gentiumplus-bolditalic-sc -}{} - -\DeclareFontShape{LY1}{gentium}{sb}{sc}{ - <-> \gentium@@scale texnansi-gentiumbook-regular-sc -}{} - -\DeclareFontShape{LY1}{gentium}{sb}{scit}{ - <-> \gentium@@scale texnansi-gentiumbook-italic-sc -}{} - -\DeclareFontShape{LY1}{gentium}{eb}{sc}{ - <-> \gentium@@scale texnansi-gentiumbook-bold-sc -}{} - -\DeclareFontShape{LY1}{gentium}{eb}{scit}{ - <-> \gentium@@scale texnansi-gentiumbook-bolditalic-sc -}{} - -\DeclareFontShape{LY1}{gentium}{m}{sl}{<->ssub * gentium/m/it}{} -\DeclareFontShape{LY1}{gentium}{b}{sl}{<->ssub * gentium/b/it}{} -\DeclareFontShape{LY1}{gentium}{bx}{sl}{<->ssub * gentium/b/it}{} -\DeclareFontShape{LY1}{gentium}{bx}{it}{<->ssub * gentium/b/it}{} -\DeclareFontShape{LY1}{gentium}{bx}{n}{<->ssub * gentium/b/n}{} -\DeclareFontShape{LY1}{gentium}{sb}{sl}{<->ssub * gentium/sb/it}{} -\DeclareFontShape{LY1}{gentium}{sbx}{sl}{<->ssub * gentium/sb/it}{} -\DeclareFontShape{LY1}{gentium}{sbx}{it}{<->ssub * gentium/sb/it}{} -\DeclareFontShape{LY1}{gentium}{sbx}{n}{<->ssub * gentium/sb/n}{} -\DeclareFontShape{LY1}{gentium}{eb}{sl}{<->ssub * gentium/eb/it}{} -\DeclareFontShape{LY1}{gentium}{ebx}{sl}{<->ssub * gentium/eb/it}{} -\DeclareFontShape{LY1}{gentium}{ebx}{it}{<->ssub * gentium/eb/it}{} -\DeclareFontShape{LY1}{gentium}{ebx}{n}{<->ssub * gentium/eb/n}{} - -\endinput diff --git a/Master/texmf-dist/tex/latex/gentium-tug/ly1gentiumbook.fd b/Master/texmf-dist/tex/latex/gentium-tug/ly1gentiumbook.fd deleted file mode 100644 index 7d5a9926a44..00000000000 --- a/Master/texmf-dist/tex/latex/gentium-tug/ly1gentiumbook.fd +++ /dev/null @@ -1,87 +0,0 @@ -\ProvidesFile{ly1gentiumbook.fd} - [2022/05/30 Font definitions for gentiumbook.] - -\expandafter\ifx\csname gentiumbook@scale\endcsname\relax - \let\gentiumbook@@scale\@empty -\else - \edef\gentiumbook@@scale{s*[\csname gentiumbook@scale\endcsname]}% -\fi - -\DeclareFontFamily{LY1}{gentiumbook}{} - -\DeclareFontShape{LY1}{gentiumbook}{m}{n}{ - <-> \gentiumbook@@scale texnansi-gentiumbook-regular -}{} - -\DeclareFontShape{LY1}{gentiumbook}{m}{it}{ - <-> \gentiumbook@@scale texnansi-gentiumbook-italic -}{} - -\DeclareFontShape{LY1}{gentiumbook}{b}{n}{ - <-> \gentiumbook@@scale texnansi-gentiumbook-bold -}{} - -\DeclareFontShape{LY1}{gentiumbook}{b}{it}{ - <-> \gentiumbook@@scale texnansi-gentiumbook-bolditalic -}{} - -\DeclareFontShape{LY1}{gentiumbook}{sl}{n}{ - <-> \gentiumbook@@scale texnansi-gentiumplus-regular -}{} - -\DeclareFontShape{LY1}{gentiumbook}{sl}{it}{ - <-> \gentiumbook@@scale texnansi-gentiumplus-italic -}{} - -\DeclareFontShape{LY1}{gentiumbook}{sb}{n}{ - <-> \gentiumbook@@scale texnansi-gentiumplus-bold -}{} - -\DeclareFontShape{LY1}{gentiumbook}{sb}{it}{ - <-> \gentiumbook@@scale texnansi-gentiumplus-bolditalic -}{} - -\DeclareFontShape{LY1}{gentiumbook}{m}{sc}{ - <-> \gentiumbook@@scale texnansi-gentiumbook-regular-sc -}{} - -\DeclareFontShape{LY1}{gentiumbook}{m}{scit}{ - <-> \gentiumbook@@scale texnansi-gentiumbook-italic-sc -}{} - -\DeclareFontShape{LY1}{gentiumbook}{b}{sc}{ - <-> \gentiumbook@@scale texnansi-gentiumbook-bold-sc -}{} - -\DeclareFontShape{LY1}{gentiumbook}{b}{scit}{ - <-> \gentiumbook@@scale texnansi-gentiumbook-bolditalic-sc -}{} - -\DeclareFontShape{LY1}{gentiumbook}{sl}{sc}{ - <-> \gentiumbook@@scale texnansi-gentiumplus-regular-sc -}{} - -\DeclareFontShape{LY1}{gentiumbook}{sl}{scit}{ - <-> \gentiumbook@@scale texnansi-gentiumplus-italic-sc -}{} - -\DeclareFontShape{LY1}{gentiumbook}{sb}{sc}{ - <-> \gentiumbook@@scale texnansi-gentiumplus-bold-sc -}{} - -\DeclareFontShape{LY1}{gentiumbook}{sb}{scit}{ - <-> \gentiumbook@@scale texnansi-gentiumplus-bolditalic-sc -}{} - -\DeclareFontShape{LY1}{gentiumbook}{m}{sl}{<->ssub * gentiumbook/m/it}{} -\DeclareFontShape{LY1}{gentiumbook}{b}{sl}{<->ssub * gentiumbook/b/it}{} -\DeclareFontShape{LY1}{gentiumbook}{bx}{sl}{<->ssub * gentiumbook/b/it}{} -\DeclareFontShape{LY1}{gentiumbook}{bx}{it}{<->ssub * gentiumbook/b/it}{} -\DeclareFontShape{LY1}{gentiumbook}{bx}{n}{<->ssub * gentiumbook/b/n}{} -\DeclareFontShape{LY1}{gentiumbook}{sl}{sl}{<->ssub * gentiumbook/sl/it}{} -\DeclareFontShape{LY1}{gentiumbook}{sb}{sl}{<->ssub * gentiumbook/sb/it}{} -\DeclareFontShape{LY1}{gentiumbook}{sbx}{sl}{<->ssub * gentiumbook/sb/it}{} -\DeclareFontShape{LY1}{gentiumbook}{sbx}{it}{<->ssub * gentiumbook/sb/it}{} -\DeclareFontShape{LY1}{gentiumbook}{sbx}{n}{<->ssub * gentiumbook/sb/n}{} - -\endinput diff --git a/Master/texmf-dist/tex/latex/gentium-tug/ot1gentium.fd b/Master/texmf-dist/tex/latex/gentium-tug/ot1gentium.fd deleted file mode 100644 index cfc420bfe8c..00000000000 --- a/Master/texmf-dist/tex/latex/gentium-tug/ot1gentium.fd +++ /dev/null @@ -1,90 +0,0 @@ -\ProvidesFile{ot1gentium.fd} - [2022/05/30 Font definitions for gentium.] - -\expandafter\ifx\csname gentium@scale\endcsname\relax - \let\gentium@@scale\@empty -\else - \edef\gentium@@scale{s*[\csname gentium@scale\endcsname]}% -\fi - -\DeclareFontFamily{OT1}{gentium}{} - -\DeclareFontShape{OT1}{gentium}{m}{n}{ - <-> \gentium@@scale ot1-gentiumplus-regular -}{} - -\DeclareFontShape{OT1}{gentium}{m}{it}{ - <-> \gentium@@scale ot1-gentiumplus-italic -}{} - -\DeclareFontShape{OT1}{gentium}{b}{n}{ - <-> \gentium@@scale ot1-gentiumplus-bold -}{} - -\DeclareFontShape{OT1}{gentium}{b}{it}{ - <-> \gentium@@scale ot1-gentiumplus-bolditalic -}{} - -\DeclareFontShape{OT1}{gentium}{sb}{n}{ - <-> \gentium@@scale ot1-gentiumbook-regular -}{} - -\DeclareFontShape{OT1}{gentium}{sb}{it}{ - <-> \gentium@@scale ot1-gentiumbook-italic -}{} - -\DeclareFontShape{OT1}{gentium}{eb}{n}{ - <-> \gentium@@scale ot1-gentiumbook-bold -}{} - -\DeclareFontShape{OT1}{gentium}{eb}{it}{ - <-> \gentium@@scale ot1-gentiumbook-bolditalic -}{} - -\DeclareFontShape{OT1}{gentium}{m}{sc}{ - <-> \gentium@@scale ot1-gentiumplus-regular-sc -}{} - -\DeclareFontShape{OT1}{gentium}{m}{scit}{ - <-> \gentium@@scale ot1-gentiumplus-italic-sc -}{} - -\DeclareFontShape{OT1}{gentium}{b}{sc}{ - <-> \gentium@@scale ot1-gentiumplus-bold-sc -}{} - -\DeclareFontShape{OT1}{gentium}{b}{scit}{ - <-> \gentium@@scale ot1-gentiumplus-bolditalic-sc -}{} - -\DeclareFontShape{OT1}{gentium}{sb}{sc}{ - <-> \gentium@@scale ot1-gentiumbook-regular-sc -}{} - -\DeclareFontShape{OT1}{gentium}{sb}{scit}{ - <-> \gentium@@scale ot1-gentiumbook-italic-sc -}{} - -\DeclareFontShape{OT1}{gentium}{eb}{sc}{ - <-> \gentium@@scale ot1-gentiumbook-bold-sc -}{} - -\DeclareFontShape{OT1}{gentium}{eb}{scit}{ - <-> \gentium@@scale ot1-gentiumbook-bolditalic-sc -}{} - -\DeclareFontShape{OT1}{gentium}{m}{sl}{<->ssub * gentium/m/it}{} -\DeclareFontShape{OT1}{gentium}{b}{sl}{<->ssub * gentium/b/it}{} -\DeclareFontShape{OT1}{gentium}{bx}{sl}{<->ssub * gentium/b/it}{} -\DeclareFontShape{OT1}{gentium}{bx}{it}{<->ssub * gentium/b/it}{} -\DeclareFontShape{OT1}{gentium}{bx}{n}{<->ssub * gentium/b/n}{} -\DeclareFontShape{OT1}{gentium}{sb}{sl}{<->ssub * gentium/sb/it}{} -\DeclareFontShape{OT1}{gentium}{sbx}{sl}{<->ssub * gentium/sb/it}{} -\DeclareFontShape{OT1}{gentium}{sbx}{it}{<->ssub * gentium/sb/it}{} -\DeclareFontShape{OT1}{gentium}{sbx}{n}{<->ssub * gentium/sb/n}{} -\DeclareFontShape{OT1}{gentium}{eb}{sl}{<->ssub * gentium/eb/it}{} -\DeclareFontShape{OT1}{gentium}{ebx}{sl}{<->ssub * gentium/eb/it}{} -\DeclareFontShape{OT1}{gentium}{ebx}{it}{<->ssub * gentium/eb/it}{} -\DeclareFontShape{OT1}{gentium}{ebx}{n}{<->ssub * gentium/eb/n}{} - -\endinput diff --git a/Master/texmf-dist/tex/latex/gentium-tug/ot1gentiumbook.fd b/Master/texmf-dist/tex/latex/gentium-tug/ot1gentiumbook.fd deleted file mode 100644 index 9816eb345a2..00000000000 --- a/Master/texmf-dist/tex/latex/gentium-tug/ot1gentiumbook.fd +++ /dev/null @@ -1,87 +0,0 @@ -\ProvidesFile{ot1gentiumbook.fd} - [2022/05/30 Font definitions for gentiumbook.] - -\expandafter\ifx\csname gentiumbook@scale\endcsname\relax - \let\gentiumbook@@scale\@empty -\else - \edef\gentiumbook@@scale{s*[\csname gentiumbook@scale\endcsname]}% -\fi - -\DeclareFontFamily{OT1}{gentiumbook}{} - -\DeclareFontShape{OT1}{gentiumbook}{m}{n}{ - <-> \gentiumbook@@scale ot1-gentiumbook-regular -}{} - -\DeclareFontShape{OT1}{gentiumbook}{m}{it}{ - <-> \gentiumbook@@scale ot1-gentiumbook-italic -}{} - -\DeclareFontShape{OT1}{gentiumbook}{b}{n}{ - <-> \gentiumbook@@scale ot1-gentiumbook-bold -}{} - -\DeclareFontShape{OT1}{gentiumbook}{b}{it}{ - <-> \gentiumbook@@scale ot1-gentiumbook-bolditalic -}{} - -\DeclareFontShape{OT1}{gentiumbook}{sl}{n}{ - <-> \gentiumbook@@scale ot1-gentiumplus-regular -}{} - -\DeclareFontShape{OT1}{gentiumbook}{sl}{it}{ - <-> \gentiumbook@@scale ot1-gentiumplus-italic -}{} - -\DeclareFontShape{OT1}{gentiumbook}{sb}{n}{ - <-> \gentiumbook@@scale ot1-gentiumplus-bold -}{} - -\DeclareFontShape{OT1}{gentiumbook}{sb}{it}{ - <-> \gentiumbook@@scale ot1-gentiumplus-bolditalic -}{} - -\DeclareFontShape{OT1}{gentiumbook}{m}{sc}{ - <-> \gentiumbook@@scale ot1-gentiumbook-regular-sc -}{} - -\DeclareFontShape{OT1}{gentiumbook}{m}{scit}{ - <-> \gentiumbook@@scale ot1-gentiumbook-italic-sc -}{} - -\DeclareFontShape{OT1}{gentiumbook}{b}{sc}{ - <-> \gentiumbook@@scale ot1-gentiumbook-bold-sc -}{} - -\DeclareFontShape{OT1}{gentiumbook}{b}{scit}{ - <-> \gentiumbook@@scale ot1-gentiumbook-bolditalic-sc -}{} - -\DeclareFontShape{OT1}{gentiumbook}{sl}{sc}{ - <-> \gentiumbook@@scale ot1-gentiumplus-regular-sc -}{} - -\DeclareFontShape{OT1}{gentiumbook}{sl}{scit}{ - <-> \gentiumbook@@scale ot1-gentiumplus-italic-sc -}{} - -\DeclareFontShape{OT1}{gentiumbook}{sb}{sc}{ - <-> \gentiumbook@@scale ot1-gentiumplus-bold-sc -}{} - -\DeclareFontShape{OT1}{gentiumbook}{sb}{scit}{ - <-> \gentiumbook@@scale ot1-gentiumplus-bolditalic-sc -}{} - -\DeclareFontShape{OT1}{gentiumbook}{m}{sl}{<->ssub * gentiumbook/m/it}{} -\DeclareFontShape{OT1}{gentiumbook}{b}{sl}{<->ssub * gentiumbook/b/it}{} -\DeclareFontShape{OT1}{gentiumbook}{bx}{sl}{<->ssub * gentiumbook/b/it}{} -\DeclareFontShape{OT1}{gentiumbook}{bx}{it}{<->ssub * gentiumbook/b/it}{} -\DeclareFontShape{OT1}{gentiumbook}{bx}{n}{<->ssub * gentiumbook/b/n}{} -\DeclareFontShape{OT1}{gentiumbook}{sl}{sl}{<->ssub * gentiumbook/sl/it}{} -\DeclareFontShape{OT1}{gentiumbook}{sb}{sl}{<->ssub * gentiumbook/sb/it}{} -\DeclareFontShape{OT1}{gentiumbook}{sbx}{sl}{<->ssub * gentiumbook/sb/it}{} -\DeclareFontShape{OT1}{gentiumbook}{sbx}{it}{<->ssub * gentiumbook/sb/it}{} -\DeclareFontShape{OT1}{gentiumbook}{sbx}{n}{<->ssub * gentiumbook/sb/n}{} - -\endinput diff --git a/Master/texmf-dist/tex/latex/gentium-tug/qxgentium.fd b/Master/texmf-dist/tex/latex/gentium-tug/qxgentium.fd deleted file mode 100644 index 0ab6644e08a..00000000000 --- a/Master/texmf-dist/tex/latex/gentium-tug/qxgentium.fd +++ /dev/null @@ -1,90 +0,0 @@ -\ProvidesFile{qxgentium.fd} - [2022/05/30 Font definitions for gentium.] - -\expandafter\ifx\csname gentium@scale\endcsname\relax - \let\gentium@@scale\@empty -\else - \edef\gentium@@scale{s*[\csname gentium@scale\endcsname]}% -\fi - -\DeclareFontFamily{QX}{gentium}{} - -\DeclareFontShape{QX}{gentium}{m}{n}{ - <-> \gentium@@scale qx-gentiumplus-regular -}{} - -\DeclareFontShape{QX}{gentium}{m}{it}{ - <-> \gentium@@scale qx-gentiumplus-italic -}{} - -\DeclareFontShape{QX}{gentium}{b}{n}{ - <-> \gentium@@scale qx-gentiumplus-bold -}{} - -\DeclareFontShape{QX}{gentium}{b}{it}{ - <-> \gentium@@scale qx-gentiumplus-bolditalic -}{} - -\DeclareFontShape{QX}{gentium}{sb}{n}{ - <-> \gentium@@scale qx-gentiumbook-regular -}{} - -\DeclareFontShape{QX}{gentium}{sb}{it}{ - <-> \gentium@@scale qx-gentiumbook-italic -}{} - -\DeclareFontShape{QX}{gentium}{eb}{n}{ - <-> \gentium@@scale qx-gentiumbook-bold -}{} - -\DeclareFontShape{QX}{gentium}{eb}{it}{ - <-> \gentium@@scale qx-gentiumbook-bolditalic -}{} - -\DeclareFontShape{QX}{gentium}{m}{sc}{ - <-> \gentium@@scale qx-gentiumplus-regular-sc -}{} - -\DeclareFontShape{QX}{gentium}{m}{scit}{ - <-> \gentium@@scale qx-gentiumplus-italic-sc -}{} - -\DeclareFontShape{QX}{gentium}{b}{sc}{ - <-> \gentium@@scale qx-gentiumplus-bold-sc -}{} - -\DeclareFontShape{QX}{gentium}{b}{scit}{ - <-> \gentium@@scale qx-gentiumplus-bolditalic-sc -}{} - -\DeclareFontShape{QX}{gentium}{sb}{sc}{ - <-> \gentium@@scale qx-gentiumbook-regular-sc -}{} - -\DeclareFontShape{QX}{gentium}{sb}{scit}{ - <-> \gentium@@scale qx-gentiumbook-italic-sc -}{} - -\DeclareFontShape{QX}{gentium}{eb}{sc}{ - <-> \gentium@@scale qx-gentiumbook-bold-sc -}{} - -\DeclareFontShape{QX}{gentium}{eb}{scit}{ - <-> \gentium@@scale qx-gentiumbook-bolditalic-sc -}{} - -\DeclareFontShape{QX}{gentium}{m}{sl}{<->ssub * gentium/m/it}{} -\DeclareFontShape{QX}{gentium}{b}{sl}{<->ssub * gentium/b/it}{} -\DeclareFontShape{QX}{gentium}{bx}{sl}{<->ssub * gentium/b/it}{} -\DeclareFontShape{QX}{gentium}{bx}{it}{<->ssub * gentium/b/it}{} -\DeclareFontShape{QX}{gentium}{bx}{n}{<->ssub * gentium/b/n}{} -\DeclareFontShape{QX}{gentium}{sb}{sl}{<->ssub * gentium/sb/it}{} -\DeclareFontShape{QX}{gentium}{sbx}{sl}{<->ssub * gentium/sb/it}{} -\DeclareFontShape{QX}{gentium}{sbx}{it}{<->ssub * gentium/sb/it}{} -\DeclareFontShape{QX}{gentium}{sbx}{n}{<->ssub * gentium/sb/n}{} -\DeclareFontShape{QX}{gentium}{eb}{sl}{<->ssub * gentium/eb/it}{} -\DeclareFontShape{QX}{gentium}{ebx}{sl}{<->ssub * gentium/eb/it}{} -\DeclareFontShape{QX}{gentium}{ebx}{it}{<->ssub * gentium/eb/it}{} -\DeclareFontShape{QX}{gentium}{ebx}{n}{<->ssub * gentium/eb/n}{} - -\endinput diff --git a/Master/texmf-dist/tex/latex/gentium-tug/qxgentiumbook.fd b/Master/texmf-dist/tex/latex/gentium-tug/qxgentiumbook.fd deleted file mode 100644 index 613f7897974..00000000000 --- a/Master/texmf-dist/tex/latex/gentium-tug/qxgentiumbook.fd +++ /dev/null @@ -1,87 +0,0 @@ -\ProvidesFile{qxgentiumbook.fd} - [2022/05/30 Font definitions for gentiumbook.] - -\expandafter\ifx\csname gentiumbook@scale\endcsname\relax - \let\gentiumbook@@scale\@empty -\else - \edef\gentiumbook@@scale{s*[\csname gentiumbook@scale\endcsname]}% -\fi - -\DeclareFontFamily{QX}{gentiumbook}{} - -\DeclareFontShape{QX}{gentiumbook}{m}{n}{ - <-> \gentiumbook@@scale qx-gentiumbook-regular -}{} - -\DeclareFontShape{QX}{gentiumbook}{m}{it}{ - <-> \gentiumbook@@scale qx-gentiumbook-italic -}{} - -\DeclareFontShape{QX}{gentiumbook}{b}{n}{ - <-> \gentiumbook@@scale qx-gentiumbook-bold -}{} - -\DeclareFontShape{QX}{gentiumbook}{b}{it}{ - <-> \gentiumbook@@scale qx-gentiumbook-bolditalic -}{} - -\DeclareFontShape{QX}{gentiumbook}{sl}{n}{ - <-> \gentiumbook@@scale qx-gentiumplus-regular -}{} - -\DeclareFontShape{QX}{gentiumbook}{sl}{it}{ - <-> \gentiumbook@@scale qx-gentiumplus-italic -}{} - -\DeclareFontShape{QX}{gentiumbook}{sb}{n}{ - <-> \gentiumbook@@scale qx-gentiumplus-bold -}{} - -\DeclareFontShape{QX}{gentiumbook}{sb}{it}{ - <-> \gentiumbook@@scale qx-gentiumplus-bolditalic -}{} - -\DeclareFontShape{QX}{gentiumbook}{m}{sc}{ - <-> \gentiumbook@@scale qx-gentiumbook-regular-sc -}{} - -\DeclareFontShape{QX}{gentiumbook}{m}{scit}{ - <-> \gentiumbook@@scale qx-gentiumbook-italic-sc -}{} - -\DeclareFontShape{QX}{gentiumbook}{b}{sc}{ - <-> \gentiumbook@@scale qx-gentiumbook-bold-sc -}{} - -\DeclareFontShape{QX}{gentiumbook}{b}{scit}{ - <-> \gentiumbook@@scale qx-gentiumbook-bolditalic-sc -}{} - -\DeclareFontShape{QX}{gentiumbook}{sl}{sc}{ - <-> \gentiumbook@@scale qx-gentiumplus-regular-sc -}{} - -\DeclareFontShape{QX}{gentiumbook}{sl}{scit}{ - <-> \gentiumbook@@scale qx-gentiumplus-italic-sc -}{} - -\DeclareFontShape{QX}{gentiumbook}{sb}{sc}{ - <-> \gentiumbook@@scale qx-gentiumplus-bold-sc -}{} - -\DeclareFontShape{QX}{gentiumbook}{sb}{scit}{ - <-> \gentiumbook@@scale qx-gentiumplus-bolditalic-sc -}{} - -\DeclareFontShape{QX}{gentiumbook}{m}{sl}{<->ssub * gentiumbook/m/it}{} -\DeclareFontShape{QX}{gentiumbook}{b}{sl}{<->ssub * gentiumbook/b/it}{} -\DeclareFontShape{QX}{gentiumbook}{bx}{sl}{<->ssub * gentiumbook/b/it}{} -\DeclareFontShape{QX}{gentiumbook}{bx}{it}{<->ssub * gentiumbook/b/it}{} -\DeclareFontShape{QX}{gentiumbook}{bx}{n}{<->ssub * gentiumbook/b/n}{} -\DeclareFontShape{QX}{gentiumbook}{sl}{sl}{<->ssub * gentiumbook/sl/it}{} -\DeclareFontShape{QX}{gentiumbook}{sb}{sl}{<->ssub * gentiumbook/sb/it}{} -\DeclareFontShape{QX}{gentiumbook}{sbx}{sl}{<->ssub * gentiumbook/sb/it}{} -\DeclareFontShape{QX}{gentiumbook}{sbx}{it}{<->ssub * gentiumbook/sb/it}{} -\DeclareFontShape{QX}{gentiumbook}{sbx}{n}{<->ssub * gentiumbook/sb/n}{} - -\endinput diff --git a/Master/texmf-dist/tex/latex/gentium-tug/t1gentium.fd b/Master/texmf-dist/tex/latex/gentium-tug/t1gentium.fd deleted file mode 100644 index 38d5d486231..00000000000 --- a/Master/texmf-dist/tex/latex/gentium-tug/t1gentium.fd +++ /dev/null @@ -1,90 +0,0 @@ -\ProvidesFile{t1gentium.fd} - [2022/05/30 Font definitions for gentium.] - -\expandafter\ifx\csname gentium@scale\endcsname\relax - \let\gentium@@scale\@empty -\else - \edef\gentium@@scale{s*[\csname gentium@scale\endcsname]}% -\fi - -\DeclareFontFamily{T1}{gentium}{} - -\DeclareFontShape{T1}{gentium}{m}{n}{ - <-> \gentium@@scale ec-gentiumplus-regular -}{} - -\DeclareFontShape{T1}{gentium}{m}{it}{ - <-> \gentium@@scale ec-gentiumplus-italic -}{} - -\DeclareFontShape{T1}{gentium}{b}{n}{ - <-> \gentium@@scale ec-gentiumplus-bold -}{} - -\DeclareFontShape{T1}{gentium}{b}{it}{ - <-> \gentium@@scale ec-gentiumplus-bolditalic -}{} - -\DeclareFontShape{T1}{gentium}{sb}{n}{ - <-> \gentium@@scale ec-gentiumbook-regular -}{} - -\DeclareFontShape{T1}{gentium}{sb}{it}{ - <-> \gentium@@scale ec-gentiumbook-italic -}{} - -\DeclareFontShape{T1}{gentium}{eb}{n}{ - <-> \gentium@@scale ec-gentiumbook-bold -}{} - -\DeclareFontShape{T1}{gentium}{eb}{it}{ - <-> \gentium@@scale ec-gentiumbook-bolditalic -}{} - -\DeclareFontShape{T1}{gentium}{m}{sc}{ - <-> \gentium@@scale ec-gentiumplus-regular-sc -}{} - -\DeclareFontShape{T1}{gentium}{m}{scit}{ - <-> \gentium@@scale ec-gentiumplus-italic-sc -}{} - -\DeclareFontShape{T1}{gentium}{b}{sc}{ - <-> \gentium@@scale ec-gentiumplus-bold-sc -}{} - -\DeclareFontShape{T1}{gentium}{b}{scit}{ - <-> \gentium@@scale ec-gentiumplus-bolditalic-sc -}{} - -\DeclareFontShape{T1}{gentium}{sb}{sc}{ - <-> \gentium@@scale ec-gentiumbook-regular-sc -}{} - -\DeclareFontShape{T1}{gentium}{sb}{scit}{ - <-> \gentium@@scale ec-gentiumbook-italic-sc -}{} - -\DeclareFontShape{T1}{gentium}{eb}{sc}{ - <-> \gentium@@scale ec-gentiumbook-bold-sc -}{} - -\DeclareFontShape{T1}{gentium}{eb}{scit}{ - <-> \gentium@@scale ec-gentiumbook-bolditalic-sc -}{} - -\DeclareFontShape{T1}{gentium}{m}{sl}{<->ssub * gentium/m/it}{} -\DeclareFontShape{T1}{gentium}{b}{sl}{<->ssub * gentium/b/it}{} -\DeclareFontShape{T1}{gentium}{bx}{sl}{<->ssub * gentium/b/it}{} -\DeclareFontShape{T1}{gentium}{bx}{it}{<->ssub * gentium/b/it}{} -\DeclareFontShape{T1}{gentium}{bx}{n}{<->ssub * gentium/b/n}{} -\DeclareFontShape{T1}{gentium}{sb}{sl}{<->ssub * gentium/sb/it}{} -\DeclareFontShape{T1}{gentium}{sbx}{sl}{<->ssub * gentium/sb/it}{} -\DeclareFontShape{T1}{gentium}{sbx}{it}{<->ssub * gentium/sb/it}{} -\DeclareFontShape{T1}{gentium}{sbx}{n}{<->ssub * gentium/sb/n}{} -\DeclareFontShape{T1}{gentium}{eb}{sl}{<->ssub * gentium/eb/it}{} -\DeclareFontShape{T1}{gentium}{ebx}{sl}{<->ssub * gentium/eb/it}{} -\DeclareFontShape{T1}{gentium}{ebx}{it}{<->ssub * gentium/eb/it}{} -\DeclareFontShape{T1}{gentium}{ebx}{n}{<->ssub * gentium/eb/n}{} - -\endinput diff --git a/Master/texmf-dist/tex/latex/gentium-tug/t1gentiumbook.fd b/Master/texmf-dist/tex/latex/gentium-tug/t1gentiumbook.fd deleted file mode 100644 index 06545a5c0a6..00000000000 --- a/Master/texmf-dist/tex/latex/gentium-tug/t1gentiumbook.fd +++ /dev/null @@ -1,87 +0,0 @@ -\ProvidesFile{t1gentiumbook.fd} - [2022/05/30 Font definitions for gentiumbook.] - -\expandafter\ifx\csname gentiumbook@scale\endcsname\relax - \let\gentiumbook@@scale\@empty -\else - \edef\gentiumbook@@scale{s*[\csname gentiumbook@scale\endcsname]}% -\fi - -\DeclareFontFamily{T1}{gentiumbook}{} - -\DeclareFontShape{T1}{gentiumbook}{m}{n}{ - <-> \gentiumbook@@scale ec-gentiumbook-regular -}{} - -\DeclareFontShape{T1}{gentiumbook}{m}{it}{ - <-> \gentiumbook@@scale ec-gentiumbook-italic -}{} - -\DeclareFontShape{T1}{gentiumbook}{b}{n}{ - <-> \gentiumbook@@scale ec-gentiumbook-bold -}{} - -\DeclareFontShape{T1}{gentiumbook}{b}{it}{ - <-> \gentiumbook@@scale ec-gentiumbook-bolditalic -}{} - -\DeclareFontShape{T1}{gentiumbook}{sl}{n}{ - <-> \gentiumbook@@scale ec-gentiumplus-regular -}{} - -\DeclareFontShape{T1}{gentiumbook}{sl}{it}{ - <-> \gentiumbook@@scale ec-gentiumplus-italic -}{} - -\DeclareFontShape{T1}{gentiumbook}{sb}{n}{ - <-> \gentiumbook@@scale ec-gentiumplus-bold -}{} - -\DeclareFontShape{T1}{gentiumbook}{sb}{it}{ - <-> \gentiumbook@@scale ec-gentiumplus-bolditalic -}{} - -\DeclareFontShape{T1}{gentiumbook}{m}{sc}{ - <-> \gentiumbook@@scale ec-gentiumbook-regular-sc -}{} - -\DeclareFontShape{T1}{gentiumbook}{m}{scit}{ - <-> \gentiumbook@@scale ec-gentiumbook-italic-sc -}{} - -\DeclareFontShape{T1}{gentiumbook}{b}{sc}{ - <-> \gentiumbook@@scale ec-gentiumbook-bold-sc -}{} - -\DeclareFontShape{T1}{gentiumbook}{b}{scit}{ - <-> \gentiumbook@@scale ec-gentiumbook-bolditalic-sc -}{} - -\DeclareFontShape{T1}{gentiumbook}{sl}{sc}{ - <-> \gentiumbook@@scale ec-gentiumplus-regular-sc -}{} - -\DeclareFontShape{T1}{gentiumbook}{sl}{scit}{ - <-> \gentiumbook@@scale ec-gentiumplus-italic-sc -}{} - -\DeclareFontShape{T1}{gentiumbook}{sb}{sc}{ - <-> \gentiumbook@@scale ec-gentiumplus-bold-sc -}{} - -\DeclareFontShape{T1}{gentiumbook}{sb}{scit}{ - <-> \gentiumbook@@scale ec-gentiumplus-bolditalic-sc -}{} - -\DeclareFontShape{T1}{gentiumbook}{m}{sl}{<->ssub * gentiumbook/m/it}{} -\DeclareFontShape{T1}{gentiumbook}{b}{sl}{<->ssub * gentiumbook/b/it}{} -\DeclareFontShape{T1}{gentiumbook}{bx}{sl}{<->ssub * gentiumbook/b/it}{} -\DeclareFontShape{T1}{gentiumbook}{bx}{it}{<->ssub * gentiumbook/b/it}{} -\DeclareFontShape{T1}{gentiumbook}{bx}{n}{<->ssub * gentiumbook/b/n}{} -\DeclareFontShape{T1}{gentiumbook}{sl}{sl}{<->ssub * gentiumbook/sl/it}{} -\DeclareFontShape{T1}{gentiumbook}{sb}{sl}{<->ssub * gentiumbook/sb/it}{} -\DeclareFontShape{T1}{gentiumbook}{sbx}{sl}{<->ssub * gentiumbook/sb/it}{} -\DeclareFontShape{T1}{gentiumbook}{sbx}{it}{<->ssub * gentiumbook/sb/it}{} -\DeclareFontShape{T1}{gentiumbook}{sbx}{n}{<->ssub * gentiumbook/sb/n}{} - -\endinput diff --git a/Master/texmf-dist/tex/latex/gentium-tug/t2agentium.fd b/Master/texmf-dist/tex/latex/gentium-tug/t2agentium.fd deleted file mode 100644 index b3eff907490..00000000000 --- a/Master/texmf-dist/tex/latex/gentium-tug/t2agentium.fd +++ /dev/null @@ -1,90 +0,0 @@ -\ProvidesFile{t2agentium.fd} - [2022/05/30 Font definitions for gentium.] - -\expandafter\ifx\csname gentium@scale\endcsname\relax - \let\gentium@@scale\@empty -\else - \edef\gentium@@scale{s*[\csname gentium@scale\endcsname]}% -\fi - -\DeclareFontFamily{T2A}{gentium}{} - -\DeclareFontShape{T2A}{gentium}{m}{n}{ - <-> \gentium@@scale t2a-gentiumplus-regular -}{} - -\DeclareFontShape{T2A}{gentium}{m}{it}{ - <-> \gentium@@scale t2a-gentiumplus-italic -}{} - -\DeclareFontShape{T2A}{gentium}{b}{n}{ - <-> \gentium@@scale t2a-gentiumplus-bold -}{} - -\DeclareFontShape{T2A}{gentium}{b}{it}{ - <-> \gentium@@scale t2a-gentiumplus-bolditalic -}{} - -\DeclareFontShape{T2A}{gentium}{sb}{n}{ - <-> \gentium@@scale t2a-gentiumbook-regular -}{} - -\DeclareFontShape{T2A}{gentium}{sb}{it}{ - <-> \gentium@@scale t2a-gentiumbook-italic -}{} - -\DeclareFontShape{T2A}{gentium}{eb}{n}{ - <-> \gentium@@scale t2a-gentiumbook-bold -}{} - -\DeclareFontShape{T2A}{gentium}{eb}{it}{ - <-> \gentium@@scale t2a-gentiumbook-bolditalic -}{} - -\DeclareFontShape{T2A}{gentium}{m}{sc}{ - <-> \gentium@@scale t2a-gentiumplus-regular-sc -}{} - -\DeclareFontShape{T2A}{gentium}{m}{scit}{ - <-> \gentium@@scale t2a-gentiumplus-italic-sc -}{} - -\DeclareFontShape{T2A}{gentium}{b}{sc}{ - <-> \gentium@@scale t2a-gentiumplus-bold-sc -}{} - -\DeclareFontShape{T2A}{gentium}{b}{scit}{ - <-> \gentium@@scale t2a-gentiumplus-bolditalic-sc -}{} - -\DeclareFontShape{T2A}{gentium}{sb}{sc}{ - <-> \gentium@@scale t2a-gentiumbook-regular-sc -}{} - -\DeclareFontShape{T2A}{gentium}{sb}{scit}{ - <-> \gentium@@scale t2a-gentiumbook-italic-sc -}{} - -\DeclareFontShape{T2A}{gentium}{eb}{sc}{ - <-> \gentium@@scale t2a-gentiumbook-bold-sc -}{} - -\DeclareFontShape{T2A}{gentium}{eb}{scit}{ - <-> \gentium@@scale t2a-gentiumbook-bolditalic-sc -}{} - -\DeclareFontShape{T2A}{gentium}{m}{sl}{<->ssub * gentium/m/it}{} -\DeclareFontShape{T2A}{gentium}{b}{sl}{<->ssub * gentium/b/it}{} -\DeclareFontShape{T2A}{gentium}{bx}{sl}{<->ssub * gentium/b/it}{} -\DeclareFontShape{T2A}{gentium}{bx}{it}{<->ssub * gentium/b/it}{} -\DeclareFontShape{T2A}{gentium}{bx}{n}{<->ssub * gentium/b/n}{} -\DeclareFontShape{T2A}{gentium}{sb}{sl}{<->ssub * gentium/sb/it}{} -\DeclareFontShape{T2A}{gentium}{sbx}{sl}{<->ssub * gentium/sb/it}{} -\DeclareFontShape{T2A}{gentium}{sbx}{it}{<->ssub * gentium/sb/it}{} -\DeclareFontShape{T2A}{gentium}{sbx}{n}{<->ssub * gentium/sb/n}{} -\DeclareFontShape{T2A}{gentium}{eb}{sl}{<->ssub * gentium/eb/it}{} -\DeclareFontShape{T2A}{gentium}{ebx}{sl}{<->ssub * gentium/eb/it}{} -\DeclareFontShape{T2A}{gentium}{ebx}{it}{<->ssub * gentium/eb/it}{} -\DeclareFontShape{T2A}{gentium}{ebx}{n}{<->ssub * gentium/eb/n}{} - -\endinput diff --git a/Master/texmf-dist/tex/latex/gentium-tug/t2agentiumbook.fd b/Master/texmf-dist/tex/latex/gentium-tug/t2agentiumbook.fd deleted file mode 100644 index 97f57699784..00000000000 --- a/Master/texmf-dist/tex/latex/gentium-tug/t2agentiumbook.fd +++ /dev/null @@ -1,87 +0,0 @@ -\ProvidesFile{t2agentiumbook.fd} - [2022/05/30 Font definitions for gentiumbook.] - -\expandafter\ifx\csname gentiumbook@scale\endcsname\relax - \let\gentiumbook@@scale\@empty -\else - \edef\gentiumbook@@scale{s*[\csname gentiumbook@scale\endcsname]}% -\fi - -\DeclareFontFamily{T2A}{gentiumbook}{} - -\DeclareFontShape{T2A}{gentiumbook}{m}{n}{ - <-> \gentiumbook@@scale t2a-gentiumbook-regular -}{} - -\DeclareFontShape{T2A}{gentiumbook}{m}{it}{ - <-> \gentiumbook@@scale t2a-gentiumbook-italic -}{} - -\DeclareFontShape{T2A}{gentiumbook}{b}{n}{ - <-> \gentiumbook@@scale t2a-gentiumbook-bold -}{} - -\DeclareFontShape{T2A}{gentiumbook}{b}{it}{ - <-> \gentiumbook@@scale t2a-gentiumbook-bolditalic -}{} - -\DeclareFontShape{T2A}{gentiumbook}{sl}{n}{ - <-> \gentiumbook@@scale t2a-gentiumplus-regular -}{} - -\DeclareFontShape{T2A}{gentiumbook}{sl}{it}{ - <-> \gentiumbook@@scale t2a-gentiumplus-italic -}{} - -\DeclareFontShape{T2A}{gentiumbook}{sb}{n}{ - <-> \gentiumbook@@scale t2a-gentiumplus-bold -}{} - -\DeclareFontShape{T2A}{gentiumbook}{sb}{it}{ - <-> \gentiumbook@@scale t2a-gentiumplus-bolditalic -}{} - -\DeclareFontShape{T2A}{gentiumbook}{m}{sc}{ - <-> \gentiumbook@@scale t2a-gentiumbook-regular-sc -}{} - -\DeclareFontShape{T2A}{gentiumbook}{m}{scit}{ - <-> \gentiumbook@@scale t2a-gentiumbook-italic-sc -}{} - -\DeclareFontShape{T2A}{gentiumbook}{b}{sc}{ - <-> \gentiumbook@@scale t2a-gentiumbook-bold-sc -}{} - -\DeclareFontShape{T2A}{gentiumbook}{b}{scit}{ - <-> \gentiumbook@@scale t2a-gentiumbook-bolditalic-sc -}{} - -\DeclareFontShape{T2A}{gentiumbook}{sl}{sc}{ - <-> \gentiumbook@@scale t2a-gentiumplus-regular-sc -}{} - -\DeclareFontShape{T2A}{gentiumbook}{sl}{scit}{ - <-> \gentiumbook@@scale t2a-gentiumplus-italic-sc -}{} - -\DeclareFontShape{T2A}{gentiumbook}{sb}{sc}{ - <-> \gentiumbook@@scale t2a-gentiumplus-bold-sc -}{} - -\DeclareFontShape{T2A}{gentiumbook}{sb}{scit}{ - <-> \gentiumbook@@scale t2a-gentiumplus-bolditalic-sc -}{} - -\DeclareFontShape{T2A}{gentiumbook}{m}{sl}{<->ssub * gentiumbook/m/it}{} -\DeclareFontShape{T2A}{gentiumbook}{b}{sl}{<->ssub * gentiumbook/b/it}{} -\DeclareFontShape{T2A}{gentiumbook}{bx}{sl}{<->ssub * gentiumbook/b/it}{} -\DeclareFontShape{T2A}{gentiumbook}{bx}{it}{<->ssub * gentiumbook/b/it}{} -\DeclareFontShape{T2A}{gentiumbook}{bx}{n}{<->ssub * gentiumbook/b/n}{} -\DeclareFontShape{T2A}{gentiumbook}{sl}{sl}{<->ssub * gentiumbook/sl/it}{} -\DeclareFontShape{T2A}{gentiumbook}{sb}{sl}{<->ssub * gentiumbook/sb/it}{} -\DeclareFontShape{T2A}{gentiumbook}{sbx}{sl}{<->ssub * gentiumbook/sb/it}{} -\DeclareFontShape{T2A}{gentiumbook}{sbx}{it}{<->ssub * gentiumbook/sb/it}{} -\DeclareFontShape{T2A}{gentiumbook}{sbx}{n}{<->ssub * gentiumbook/sb/n}{} - -\endinput diff --git a/Master/texmf-dist/tex/latex/gentium-tug/t2bgentium.fd b/Master/texmf-dist/tex/latex/gentium-tug/t2bgentium.fd deleted file mode 100644 index 256e54f399c..00000000000 --- a/Master/texmf-dist/tex/latex/gentium-tug/t2bgentium.fd +++ /dev/null @@ -1,90 +0,0 @@ -\ProvidesFile{t2bgentium.fd} - [2022/05/30 Font definitions for gentium.] - -\expandafter\ifx\csname gentium@scale\endcsname\relax - \let\gentium@@scale\@empty -\else - \edef\gentium@@scale{s*[\csname gentium@scale\endcsname]}% -\fi - -\DeclareFontFamily{T2B}{gentium}{} - -\DeclareFontShape{T2B}{gentium}{m}{n}{ - <-> \gentium@@scale t2b-gentiumplus-regular -}{} - -\DeclareFontShape{T2B}{gentium}{m}{it}{ - <-> \gentium@@scale t2b-gentiumplus-italic -}{} - -\DeclareFontShape{T2B}{gentium}{b}{n}{ - <-> \gentium@@scale t2b-gentiumplus-bold -}{} - -\DeclareFontShape{T2B}{gentium}{b}{it}{ - <-> \gentium@@scale t2b-gentiumplus-bolditalic -}{} - -\DeclareFontShape{T2B}{gentium}{sb}{n}{ - <-> \gentium@@scale t2b-gentiumbook-regular -}{} - -\DeclareFontShape{T2B}{gentium}{sb}{it}{ - <-> \gentium@@scale t2b-gentiumbook-italic -}{} - -\DeclareFontShape{T2B}{gentium}{eb}{n}{ - <-> \gentium@@scale t2b-gentiumbook-bold -}{} - -\DeclareFontShape{T2B}{gentium}{eb}{it}{ - <-> \gentium@@scale t2b-gentiumbook-bolditalic -}{} - -\DeclareFontShape{T2B}{gentium}{m}{sc}{ - <-> \gentium@@scale t2b-gentiumplus-regular-sc -}{} - -\DeclareFontShape{T2B}{gentium}{m}{scit}{ - <-> \gentium@@scale t2b-gentiumplus-italic-sc -}{} - -\DeclareFontShape{T2B}{gentium}{b}{sc}{ - <-> \gentium@@scale t2b-gentiumplus-bold-sc -}{} - -\DeclareFontShape{T2B}{gentium}{b}{scit}{ - <-> \gentium@@scale t2b-gentiumplus-bolditalic-sc -}{} - -\DeclareFontShape{T2B}{gentium}{sb}{sc}{ - <-> \gentium@@scale t2b-gentiumbook-regular-sc -}{} - -\DeclareFontShape{T2B}{gentium}{sb}{scit}{ - <-> \gentium@@scale t2b-gentiumbook-italic-sc -}{} - -\DeclareFontShape{T2B}{gentium}{eb}{sc}{ - <-> \gentium@@scale t2b-gentiumbook-bold-sc -}{} - -\DeclareFontShape{T2B}{gentium}{eb}{scit}{ - <-> \gentium@@scale t2b-gentiumbook-bolditalic-sc -}{} - -\DeclareFontShape{T2B}{gentium}{m}{sl}{<->ssub * gentium/m/it}{} -\DeclareFontShape{T2B}{gentium}{b}{sl}{<->ssub * gentium/b/it}{} -\DeclareFontShape{T2B}{gentium}{bx}{sl}{<->ssub * gentium/b/it}{} -\DeclareFontShape{T2B}{gentium}{bx}{it}{<->ssub * gentium/b/it}{} -\DeclareFontShape{T2B}{gentium}{bx}{n}{<->ssub * gentium/b/n}{} -\DeclareFontShape{T2B}{gentium}{sb}{sl}{<->ssub * gentium/sb/it}{} -\DeclareFontShape{T2B}{gentium}{sbx}{sl}{<->ssub * gentium/sb/it}{} -\DeclareFontShape{T2B}{gentium}{sbx}{it}{<->ssub * gentium/sb/it}{} -\DeclareFontShape{T2B}{gentium}{sbx}{n}{<->ssub * gentium/sb/n}{} -\DeclareFontShape{T2B}{gentium}{eb}{sl}{<->ssub * gentium/eb/it}{} -\DeclareFontShape{T2B}{gentium}{ebx}{sl}{<->ssub * gentium/eb/it}{} -\DeclareFontShape{T2B}{gentium}{ebx}{it}{<->ssub * gentium/eb/it}{} -\DeclareFontShape{T2B}{gentium}{ebx}{n}{<->ssub * gentium/eb/n}{} - -\endinput diff --git a/Master/texmf-dist/tex/latex/gentium-tug/t2bgentiumbook.fd b/Master/texmf-dist/tex/latex/gentium-tug/t2bgentiumbook.fd deleted file mode 100644 index 2d12d3c83d4..00000000000 --- a/Master/texmf-dist/tex/latex/gentium-tug/t2bgentiumbook.fd +++ /dev/null @@ -1,87 +0,0 @@ -\ProvidesFile{t2bgentiumbook.fd} - [2022/05/30 Font definitions for gentiumbook.] - -\expandafter\ifx\csname gentiumbook@scale\endcsname\relax - \let\gentiumbook@@scale\@empty -\else - \edef\gentiumbook@@scale{s*[\csname gentiumbook@scale\endcsname]}% -\fi - -\DeclareFontFamily{T2B}{gentiumbook}{} - -\DeclareFontShape{T2B}{gentiumbook}{m}{n}{ - <-> \gentiumbook@@scale t2b-gentiumbook-regular -}{} - -\DeclareFontShape{T2B}{gentiumbook}{m}{it}{ - <-> \gentiumbook@@scale t2b-gentiumbook-italic -}{} - -\DeclareFontShape{T2B}{gentiumbook}{b}{n}{ - <-> \gentiumbook@@scale t2b-gentiumbook-bold -}{} - -\DeclareFontShape{T2B}{gentiumbook}{b}{it}{ - <-> \gentiumbook@@scale t2b-gentiumbook-bolditalic -}{} - -\DeclareFontShape{T2B}{gentiumbook}{sl}{n}{ - <-> \gentiumbook@@scale t2b-gentiumplus-regular -}{} - -\DeclareFontShape{T2B}{gentiumbook}{sl}{it}{ - <-> \gentiumbook@@scale t2b-gentiumplus-italic -}{} - -\DeclareFontShape{T2B}{gentiumbook}{sb}{n}{ - <-> \gentiumbook@@scale t2b-gentiumplus-bold -}{} - -\DeclareFontShape{T2B}{gentiumbook}{sb}{it}{ - <-> \gentiumbook@@scale t2b-gentiumplus-bolditalic -}{} - -\DeclareFontShape{T2B}{gentiumbook}{m}{sc}{ - <-> \gentiumbook@@scale t2b-gentiumbook-regular-sc -}{} - -\DeclareFontShape{T2B}{gentiumbook}{m}{scit}{ - <-> \gentiumbook@@scale t2b-gentiumbook-italic-sc -}{} - -\DeclareFontShape{T2B}{gentiumbook}{b}{sc}{ - <-> \gentiumbook@@scale t2b-gentiumbook-bold-sc -}{} - -\DeclareFontShape{T2B}{gentiumbook}{b}{scit}{ - <-> \gentiumbook@@scale t2b-gentiumbook-bolditalic-sc -}{} - -\DeclareFontShape{T2B}{gentiumbook}{sl}{sc}{ - <-> \gentiumbook@@scale t2b-gentiumplus-regular-sc -}{} - -\DeclareFontShape{T2B}{gentiumbook}{sl}{scit}{ - <-> \gentiumbook@@scale t2b-gentiumplus-italic-sc -}{} - -\DeclareFontShape{T2B}{gentiumbook}{sb}{sc}{ - <-> \gentiumbook@@scale t2b-gentiumplus-bold-sc -}{} - -\DeclareFontShape{T2B}{gentiumbook}{sb}{scit}{ - <-> \gentiumbook@@scale t2b-gentiumplus-bolditalic-sc -}{} - -\DeclareFontShape{T2B}{gentiumbook}{m}{sl}{<->ssub * gentiumbook/m/it}{} -\DeclareFontShape{T2B}{gentiumbook}{b}{sl}{<->ssub * gentiumbook/b/it}{} -\DeclareFontShape{T2B}{gentiumbook}{bx}{sl}{<->ssub * gentiumbook/b/it}{} -\DeclareFontShape{T2B}{gentiumbook}{bx}{it}{<->ssub * gentiumbook/b/it}{} -\DeclareFontShape{T2B}{gentiumbook}{bx}{n}{<->ssub * gentiumbook/b/n}{} -\DeclareFontShape{T2B}{gentiumbook}{sl}{sl}{<->ssub * gentiumbook/sl/it}{} -\DeclareFontShape{T2B}{gentiumbook}{sb}{sl}{<->ssub * gentiumbook/sb/it}{} -\DeclareFontShape{T2B}{gentiumbook}{sbx}{sl}{<->ssub * gentiumbook/sb/it}{} -\DeclareFontShape{T2B}{gentiumbook}{sbx}{it}{<->ssub * gentiumbook/sb/it}{} -\DeclareFontShape{T2B}{gentiumbook}{sbx}{n}{<->ssub * gentiumbook/sb/n}{} - -\endinput diff --git a/Master/texmf-dist/tex/latex/gentium-tug/t2cgentium.fd b/Master/texmf-dist/tex/latex/gentium-tug/t2cgentium.fd deleted file mode 100644 index 6381b98b855..00000000000 --- a/Master/texmf-dist/tex/latex/gentium-tug/t2cgentium.fd +++ /dev/null @@ -1,90 +0,0 @@ -\ProvidesFile{t2cgentium.fd} - [2022/05/30 Font definitions for gentium.] - -\expandafter\ifx\csname gentium@scale\endcsname\relax - \let\gentium@@scale\@empty -\else - \edef\gentium@@scale{s*[\csname gentium@scale\endcsname]}% -\fi - -\DeclareFontFamily{T2C}{gentium}{} - -\DeclareFontShape{T2C}{gentium}{m}{n}{ - <-> \gentium@@scale t2c-gentiumplus-regular -}{} - -\DeclareFontShape{T2C}{gentium}{m}{it}{ - <-> \gentium@@scale t2c-gentiumplus-italic -}{} - -\DeclareFontShape{T2C}{gentium}{b}{n}{ - <-> \gentium@@scale t2c-gentiumplus-bold -}{} - -\DeclareFontShape{T2C}{gentium}{b}{it}{ - <-> \gentium@@scale t2c-gentiumplus-bolditalic -}{} - -\DeclareFontShape{T2C}{gentium}{sb}{n}{ - <-> \gentium@@scale t2c-gentiumbook-regular -}{} - -\DeclareFontShape{T2C}{gentium}{sb}{it}{ - <-> \gentium@@scale t2c-gentiumbook-italic -}{} - -\DeclareFontShape{T2C}{gentium}{eb}{n}{ - <-> \gentium@@scale t2c-gentiumbook-bold -}{} - -\DeclareFontShape{T2C}{gentium}{eb}{it}{ - <-> \gentium@@scale t2c-gentiumbook-bolditalic -}{} - -\DeclareFontShape{T2C}{gentium}{m}{sc}{ - <-> \gentium@@scale t2c-gentiumplus-regular-sc -}{} - -\DeclareFontShape{T2C}{gentium}{m}{scit}{ - <-> \gentium@@scale t2c-gentiumplus-italic-sc -}{} - -\DeclareFontShape{T2C}{gentium}{b}{sc}{ - <-> \gentium@@scale t2c-gentiumplus-bold-sc -}{} - -\DeclareFontShape{T2C}{gentium}{b}{scit}{ - <-> \gentium@@scale t2c-gentiumplus-bolditalic-sc -}{} - -\DeclareFontShape{T2C}{gentium}{sb}{sc}{ - <-> \gentium@@scale t2c-gentiumbook-regular-sc -}{} - -\DeclareFontShape{T2C}{gentium}{sb}{scit}{ - <-> \gentium@@scale t2c-gentiumbook-italic-sc -}{} - -\DeclareFontShape{T2C}{gentium}{eb}{sc}{ - <-> \gentium@@scale t2c-gentiumbook-bold-sc -}{} - -\DeclareFontShape{T2C}{gentium}{eb}{scit}{ - <-> \gentium@@scale t2c-gentiumbook-bolditalic-sc -}{} - -\DeclareFontShape{T2C}{gentium}{m}{sl}{<->ssub * gentium/m/it}{} -\DeclareFontShape{T2C}{gentium}{b}{sl}{<->ssub * gentium/b/it}{} -\DeclareFontShape{T2C}{gentium}{bx}{sl}{<->ssub * gentium/b/it}{} -\DeclareFontShape{T2C}{gentium}{bx}{it}{<->ssub * gentium/b/it}{} -\DeclareFontShape{T2C}{gentium}{bx}{n}{<->ssub * gentium/b/n}{} -\DeclareFontShape{T2C}{gentium}{sb}{sl}{<->ssub * gentium/sb/it}{} -\DeclareFontShape{T2C}{gentium}{sbx}{sl}{<->ssub * gentium/sb/it}{} -\DeclareFontShape{T2C}{gentium}{sbx}{it}{<->ssub * gentium/sb/it}{} -\DeclareFontShape{T2C}{gentium}{sbx}{n}{<->ssub * gentium/sb/n}{} -\DeclareFontShape{T2C}{gentium}{eb}{sl}{<->ssub * gentium/eb/it}{} -\DeclareFontShape{T2C}{gentium}{ebx}{sl}{<->ssub * gentium/eb/it}{} -\DeclareFontShape{T2C}{gentium}{ebx}{it}{<->ssub * gentium/eb/it}{} -\DeclareFontShape{T2C}{gentium}{ebx}{n}{<->ssub * gentium/eb/n}{} - -\endinput diff --git a/Master/texmf-dist/tex/latex/gentium-tug/t2cgentiumbook.fd b/Master/texmf-dist/tex/latex/gentium-tug/t2cgentiumbook.fd deleted file mode 100644 index a2177734046..00000000000 --- a/Master/texmf-dist/tex/latex/gentium-tug/t2cgentiumbook.fd +++ /dev/null @@ -1,87 +0,0 @@ -\ProvidesFile{t2cgentiumbook.fd} - [2022/05/30 Font definitions for gentiumbook.] - -\expandafter\ifx\csname gentiumbook@scale\endcsname\relax - \let\gentiumbook@@scale\@empty -\else - \edef\gentiumbook@@scale{s*[\csname gentiumbook@scale\endcsname]}% -\fi - -\DeclareFontFamily{T2C}{gentiumbook}{} - -\DeclareFontShape{T2C}{gentiumbook}{m}{n}{ - <-> \gentiumbook@@scale t2c-gentiumbook-regular -}{} - -\DeclareFontShape{T2C}{gentiumbook}{m}{it}{ - <-> \gentiumbook@@scale t2c-gentiumbook-italic -}{} - -\DeclareFontShape{T2C}{gentiumbook}{b}{n}{ - <-> \gentiumbook@@scale t2c-gentiumbook-bold -}{} - -\DeclareFontShape{T2C}{gentiumbook}{b}{it}{ - <-> \gentiumbook@@scale t2c-gentiumbook-bolditalic -}{} - -\DeclareFontShape{T2C}{gentiumbook}{sl}{n}{ - <-> \gentiumbook@@scale t2c-gentiumplus-regular -}{} - -\DeclareFontShape{T2C}{gentiumbook}{sl}{it}{ - <-> \gentiumbook@@scale t2c-gentiumplus-italic -}{} - -\DeclareFontShape{T2C}{gentiumbook}{sb}{n}{ - <-> \gentiumbook@@scale t2c-gentiumplus-bold -}{} - -\DeclareFontShape{T2C}{gentiumbook}{sb}{it}{ - <-> \gentiumbook@@scale t2c-gentiumplus-bolditalic -}{} - -\DeclareFontShape{T2C}{gentiumbook}{m}{sc}{ - <-> \gentiumbook@@scale t2c-gentiumbook-regular-sc -}{} - -\DeclareFontShape{T2C}{gentiumbook}{m}{scit}{ - <-> \gentiumbook@@scale t2c-gentiumbook-italic-sc -}{} - -\DeclareFontShape{T2C}{gentiumbook}{b}{sc}{ - <-> \gentiumbook@@scale t2c-gentiumbook-bold-sc -}{} - -\DeclareFontShape{T2C}{gentiumbook}{b}{scit}{ - <-> \gentiumbook@@scale t2c-gentiumbook-bolditalic-sc -}{} - -\DeclareFontShape{T2C}{gentiumbook}{sl}{sc}{ - <-> \gentiumbook@@scale t2c-gentiumplus-regular-sc -}{} - -\DeclareFontShape{T2C}{gentiumbook}{sl}{scit}{ - <-> \gentiumbook@@scale t2c-gentiumplus-italic-sc -}{} - -\DeclareFontShape{T2C}{gentiumbook}{sb}{sc}{ - <-> \gentiumbook@@scale t2c-gentiumplus-bold-sc -}{} - -\DeclareFontShape{T2C}{gentiumbook}{sb}{scit}{ - <-> \gentiumbook@@scale t2c-gentiumplus-bolditalic-sc -}{} - -\DeclareFontShape{T2C}{gentiumbook}{m}{sl}{<->ssub * gentiumbook/m/it}{} -\DeclareFontShape{T2C}{gentiumbook}{b}{sl}{<->ssub * gentiumbook/b/it}{} -\DeclareFontShape{T2C}{gentiumbook}{bx}{sl}{<->ssub * gentiumbook/b/it}{} -\DeclareFontShape{T2C}{gentiumbook}{bx}{it}{<->ssub * gentiumbook/b/it}{} -\DeclareFontShape{T2C}{gentiumbook}{bx}{n}{<->ssub * gentiumbook/b/n}{} -\DeclareFontShape{T2C}{gentiumbook}{sl}{sl}{<->ssub * gentiumbook/sl/it}{} -\DeclareFontShape{T2C}{gentiumbook}{sb}{sl}{<->ssub * gentiumbook/sb/it}{} -\DeclareFontShape{T2C}{gentiumbook}{sbx}{sl}{<->ssub * gentiumbook/sb/it}{} -\DeclareFontShape{T2C}{gentiumbook}{sbx}{it}{<->ssub * gentiumbook/sb/it}{} -\DeclareFontShape{T2C}{gentiumbook}{sbx}{n}{<->ssub * gentiumbook/sb/n}{} - -\endinput diff --git a/Master/texmf-dist/tex/latex/gentium-tug/t5gentium.fd b/Master/texmf-dist/tex/latex/gentium-tug/t5gentium.fd deleted file mode 100644 index a387d914675..00000000000 --- a/Master/texmf-dist/tex/latex/gentium-tug/t5gentium.fd +++ /dev/null @@ -1,90 +0,0 @@ -\ProvidesFile{t5gentium.fd} - [2022/05/30 Font definitions for gentium.] - -\expandafter\ifx\csname gentium@scale\endcsname\relax - \let\gentium@@scale\@empty -\else - \edef\gentium@@scale{s*[\csname gentium@scale\endcsname]}% -\fi - -\DeclareFontFamily{T5}{gentium}{} - -\DeclareFontShape{T5}{gentium}{m}{n}{ - <-> \gentium@@scale t5-gentiumplus-regular -}{} - -\DeclareFontShape{T5}{gentium}{m}{it}{ - <-> \gentium@@scale t5-gentiumplus-italic -}{} - -\DeclareFontShape{T5}{gentium}{b}{n}{ - <-> \gentium@@scale t5-gentiumplus-bold -}{} - -\DeclareFontShape{T5}{gentium}{b}{it}{ - <-> \gentium@@scale t5-gentiumplus-bolditalic -}{} - -\DeclareFontShape{T5}{gentium}{sb}{n}{ - <-> \gentium@@scale t5-gentiumbook-regular -}{} - -\DeclareFontShape{T5}{gentium}{sb}{it}{ - <-> \gentium@@scale t5-gentiumbook-italic -}{} - -\DeclareFontShape{T5}{gentium}{eb}{n}{ - <-> \gentium@@scale t5-gentiumbook-bold -}{} - -\DeclareFontShape{T5}{gentium}{eb}{it}{ - <-> \gentium@@scale t5-gentiumbook-bolditalic -}{} - -\DeclareFontShape{T5}{gentium}{m}{sc}{ - <-> \gentium@@scale t5-gentiumplus-regular-sc -}{} - -\DeclareFontShape{T5}{gentium}{m}{scit}{ - <-> \gentium@@scale t5-gentiumplus-italic-sc -}{} - -\DeclareFontShape{T5}{gentium}{b}{sc}{ - <-> \gentium@@scale t5-gentiumplus-bold-sc -}{} - -\DeclareFontShape{T5}{gentium}{b}{scit}{ - <-> \gentium@@scale t5-gentiumplus-bolditalic-sc -}{} - -\DeclareFontShape{T5}{gentium}{sb}{sc}{ - <-> \gentium@@scale t5-gentiumbook-regular-sc -}{} - -\DeclareFontShape{T5}{gentium}{sb}{scit}{ - <-> \gentium@@scale t5-gentiumbook-italic-sc -}{} - -\DeclareFontShape{T5}{gentium}{eb}{sc}{ - <-> \gentium@@scale t5-gentiumbook-bold-sc -}{} - -\DeclareFontShape{T5}{gentium}{eb}{scit}{ - <-> \gentium@@scale t5-gentiumbook-bolditalic-sc -}{} - -\DeclareFontShape{T5}{gentium}{m}{sl}{<->ssub * gentium/m/it}{} -\DeclareFontShape{T5}{gentium}{b}{sl}{<->ssub * gentium/b/it}{} -\DeclareFontShape{T5}{gentium}{bx}{sl}{<->ssub * gentium/b/it}{} -\DeclareFontShape{T5}{gentium}{bx}{it}{<->ssub * gentium/b/it}{} -\DeclareFontShape{T5}{gentium}{bx}{n}{<->ssub * gentium/b/n}{} -\DeclareFontShape{T5}{gentium}{sb}{sl}{<->ssub * gentium/sb/it}{} -\DeclareFontShape{T5}{gentium}{sbx}{sl}{<->ssub * gentium/sb/it}{} -\DeclareFontShape{T5}{gentium}{sbx}{it}{<->ssub * gentium/sb/it}{} -\DeclareFontShape{T5}{gentium}{sbx}{n}{<->ssub * gentium/sb/n}{} -\DeclareFontShape{T5}{gentium}{eb}{sl}{<->ssub * gentium/eb/it}{} -\DeclareFontShape{T5}{gentium}{ebx}{sl}{<->ssub * gentium/eb/it}{} -\DeclareFontShape{T5}{gentium}{ebx}{it}{<->ssub * gentium/eb/it}{} -\DeclareFontShape{T5}{gentium}{ebx}{n}{<->ssub * gentium/eb/n}{} - -\endinput diff --git a/Master/texmf-dist/tex/latex/gentium-tug/t5gentiumbook.fd b/Master/texmf-dist/tex/latex/gentium-tug/t5gentiumbook.fd deleted file mode 100644 index ca7c6d4a154..00000000000 --- a/Master/texmf-dist/tex/latex/gentium-tug/t5gentiumbook.fd +++ /dev/null @@ -1,87 +0,0 @@ -\ProvidesFile{t5gentiumbook.fd} - [2022/05/30 Font definitions for gentiumbook.] - -\expandafter\ifx\csname gentiumbook@scale\endcsname\relax - \let\gentiumbook@@scale\@empty -\else - \edef\gentiumbook@@scale{s*[\csname gentiumbook@scale\endcsname]}% -\fi - -\DeclareFontFamily{T5}{gentiumbook}{} - -\DeclareFontShape{T5}{gentiumbook}{m}{n}{ - <-> \gentiumbook@@scale t5-gentiumbook-regular -}{} - -\DeclareFontShape{T5}{gentiumbook}{m}{it}{ - <-> \gentiumbook@@scale t5-gentiumbook-italic -}{} - -\DeclareFontShape{T5}{gentiumbook}{b}{n}{ - <-> \gentiumbook@@scale t5-gentiumbook-bold -}{} - -\DeclareFontShape{T5}{gentiumbook}{b}{it}{ - <-> \gentiumbook@@scale t5-gentiumbook-bolditalic -}{} - -\DeclareFontShape{T5}{gentiumbook}{sl}{n}{ - <-> \gentiumbook@@scale t5-gentiumplus-regular -}{} - -\DeclareFontShape{T5}{gentiumbook}{sl}{it}{ - <-> \gentiumbook@@scale t5-gentiumplus-italic -}{} - -\DeclareFontShape{T5}{gentiumbook}{sb}{n}{ - <-> \gentiumbook@@scale t5-gentiumplus-bold -}{} - -\DeclareFontShape{T5}{gentiumbook}{sb}{it}{ - <-> \gentiumbook@@scale t5-gentiumplus-bolditalic -}{} - -\DeclareFontShape{T5}{gentiumbook}{m}{sc}{ - <-> \gentiumbook@@scale t5-gentiumbook-regular-sc -}{} - -\DeclareFontShape{T5}{gentiumbook}{m}{scit}{ - <-> \gentiumbook@@scale t5-gentiumbook-italic-sc -}{} - -\DeclareFontShape{T5}{gentiumbook}{b}{sc}{ - <-> \gentiumbook@@scale t5-gentiumbook-bold-sc -}{} - -\DeclareFontShape{T5}{gentiumbook}{b}{scit}{ - <-> \gentiumbook@@scale t5-gentiumbook-bolditalic-sc -}{} - -\DeclareFontShape{T5}{gentiumbook}{sl}{sc}{ - <-> \gentiumbook@@scale t5-gentiumplus-regular-sc -}{} - -\DeclareFontShape{T5}{gentiumbook}{sl}{scit}{ - <-> \gentiumbook@@scale t5-gentiumplus-italic-sc -}{} - -\DeclareFontShape{T5}{gentiumbook}{sb}{sc}{ - <-> \gentiumbook@@scale t5-gentiumplus-bold-sc -}{} - -\DeclareFontShape{T5}{gentiumbook}{sb}{scit}{ - <-> \gentiumbook@@scale t5-gentiumplus-bolditalic-sc -}{} - -\DeclareFontShape{T5}{gentiumbook}{m}{sl}{<->ssub * gentiumbook/m/it}{} -\DeclareFontShape{T5}{gentiumbook}{b}{sl}{<->ssub * gentiumbook/b/it}{} -\DeclareFontShape{T5}{gentiumbook}{bx}{sl}{<->ssub * gentiumbook/b/it}{} -\DeclareFontShape{T5}{gentiumbook}{bx}{it}{<->ssub * gentiumbook/b/it}{} -\DeclareFontShape{T5}{gentiumbook}{bx}{n}{<->ssub * gentiumbook/b/n}{} -\DeclareFontShape{T5}{gentiumbook}{sl}{sl}{<->ssub * gentiumbook/sl/it}{} -\DeclareFontShape{T5}{gentiumbook}{sb}{sl}{<->ssub * gentiumbook/sb/it}{} -\DeclareFontShape{T5}{gentiumbook}{sbx}{sl}{<->ssub * gentiumbook/sb/it}{} -\DeclareFontShape{T5}{gentiumbook}{sbx}{it}{<->ssub * gentiumbook/sb/it}{} -\DeclareFontShape{T5}{gentiumbook}{sbx}{n}{<->ssub * gentiumbook/sb/n}{} - -\endinput diff --git a/Master/texmf-dist/tex/latex/gentium-tug/ts1gentium.fd b/Master/texmf-dist/tex/latex/gentium-tug/ts1gentium.fd deleted file mode 100644 index 86cd1ee95c0..00000000000 --- a/Master/texmf-dist/tex/latex/gentium-tug/ts1gentium.fd +++ /dev/null @@ -1,58 +0,0 @@ -\ProvidesFile{ts1gentium.fd} - [2022/05/30 Font definitions for gentium.] - -\expandafter\ifx\csname gentium@scale\endcsname\relax - \let\gentium@@scale\@empty -\else - \edef\gentium@@scale{s*[\csname gentium@scale\endcsname]}% -\fi - -\DeclareFontFamily{TS1}{gentium}{} - -\DeclareFontShape{TS1}{gentium}{m}{n}{ - <-> \gentium@@scale ts1-gentiumplus-regular -}{} - -\DeclareFontShape{TS1}{gentium}{m}{it}{ - <-> \gentium@@scale ts1-gentiumplus-italic -}{} - -\DeclareFontShape{TS1}{gentium}{b}{n}{ - <-> \gentium@@scale ts1-gentiumplus-bold -}{} - -\DeclareFontShape{TS1}{gentium}{b}{it}{ - <-> \gentium@@scale ts1-gentiumplus-bolditalic -}{} - -\DeclareFontShape{TS1}{gentium}{sb}{n}{ - <-> \gentium@@scale ts1-gentiumbook-regular -}{} - -\DeclareFontShape{TS1}{gentium}{sb}{it}{ - <-> \gentium@@scale ts1-gentiumbook-italic -}{} - -\DeclareFontShape{TS1}{gentium}{eb}{n}{ - <-> \gentium@@scale ts1-gentiumbook-bold -}{} - -\DeclareFontShape{TS1}{gentium}{eb}{it}{ - <-> \gentium@@scale ts1-gentiumbook-bolditalic -}{} - -\DeclareFontShape{TS1}{gentium}{m}{sl}{<->ssub * gentium/m/it}{} -\DeclareFontShape{TS1}{gentium}{b}{sl}{<->ssub * gentium/b/it}{} -\DeclareFontShape{TS1}{gentium}{bx}{sl}{<->ssub * gentium/b/it}{} -\DeclareFontShape{TS1}{gentium}{bx}{it}{<->ssub * gentium/b/it}{} -\DeclareFontShape{TS1}{gentium}{bx}{n}{<->ssub * gentium/b/n}{} -\DeclareFontShape{TS1}{gentium}{sb}{sl}{<->ssub * gentium/sb/it}{} -\DeclareFontShape{TS1}{gentium}{sbx}{sl}{<->ssub * gentium/sb/it}{} -\DeclareFontShape{TS1}{gentium}{sbx}{it}{<->ssub * gentium/sb/it}{} -\DeclareFontShape{TS1}{gentium}{sbx}{n}{<->ssub * gentium/sb/n}{} -\DeclareFontShape{TS1}{gentium}{eb}{sl}{<->ssub * gentium/eb/it}{} -\DeclareFontShape{TS1}{gentium}{ebx}{sl}{<->ssub * gentium/eb/it}{} -\DeclareFontShape{TS1}{gentium}{ebx}{it}{<->ssub * gentium/eb/it}{} -\DeclareFontShape{TS1}{gentium}{ebx}{n}{<->ssub * gentium/eb/n}{} - -\endinput diff --git a/Master/texmf-dist/tex/latex/gentium-tug/ts1gentiumbook.fd b/Master/texmf-dist/tex/latex/gentium-tug/ts1gentiumbook.fd deleted file mode 100644 index d7ab1c50651..00000000000 --- a/Master/texmf-dist/tex/latex/gentium-tug/ts1gentiumbook.fd +++ /dev/null @@ -1,55 +0,0 @@ -\ProvidesFile{ts1gentiumbook.fd} - [2022/05/30 Font definitions for gentiumbook.] - -\expandafter\ifx\csname gentiumbook@scale\endcsname\relax - \let\gentiumbook@@scale\@empty -\else - \edef\gentiumbook@@scale{s*[\csname gentiumbook@scale\endcsname]}% -\fi - -\DeclareFontFamily{TS1}{gentiumbook}{} - -\DeclareFontShape{TS1}{gentiumbook}{m}{n}{ - <-> \gentiumbook@@scale ts1-gentiumbook-regular -}{} - -\DeclareFontShape{TS1}{gentiumbook}{m}{it}{ - <-> \gentiumbook@@scale ts1-gentiumbook-italic -}{} - -\DeclareFontShape{TS1}{gentiumbook}{b}{n}{ - <-> \gentiumbook@@scale ts1-gentiumbook-bold -}{} - -\DeclareFontShape{TS1}{gentiumbook}{b}{it}{ - <-> \gentiumbook@@scale ts1-gentiumbook-bolditalic -}{} - -\DeclareFontShape{TS1}{gentiumbook}{sl}{n}{ - <-> \gentiumbook@@scale ts1-gentiumplus-regular -}{} - -\DeclareFontShape{TS1}{gentiumbook}{sl}{it}{ - <-> \gentiumbook@@scale ts1-gentiumplus-italic -}{} - -\DeclareFontShape{TS1}{gentiumbook}{sb}{n}{ - <-> \gentiumbook@@scale ts1-gentiumplus-bold -}{} - -\DeclareFontShape{TS1}{gentiumbook}{sb}{it}{ - <-> \gentiumbook@@scale ts1-gentiumplus-bolditalic -}{} - -\DeclareFontShape{TS1}{gentiumbook}{m}{sl}{<->ssub * gentiumbook/m/it}{} -\DeclareFontShape{TS1}{gentiumbook}{b}{sl}{<->ssub * gentiumbook/b/it}{} -\DeclareFontShape{TS1}{gentiumbook}{bx}{sl}{<->ssub * gentiumbook/b/it}{} -\DeclareFontShape{TS1}{gentiumbook}{bx}{it}{<->ssub * gentiumbook/b/it}{} -\DeclareFontShape{TS1}{gentiumbook}{bx}{n}{<->ssub * gentiumbook/b/n}{} -\DeclareFontShape{TS1}{gentiumbook}{sl}{sl}{<->ssub * gentiumbook/sl/it}{} -\DeclareFontShape{TS1}{gentiumbook}{sb}{sl}{<->ssub * gentiumbook/sb/it}{} -\DeclareFontShape{TS1}{gentiumbook}{sbx}{sl}{<->ssub * gentiumbook/sb/it}{} -\DeclareFontShape{TS1}{gentiumbook}{sbx}{it}{<->ssub * gentiumbook/sb/it}{} -\DeclareFontShape{TS1}{gentiumbook}{sbx}{n}{<->ssub * gentiumbook/sb/n}{} - -\endinput diff --git a/Master/texmf-dist/tex/latex/gentium-tug/x2gentium.fd b/Master/texmf-dist/tex/latex/gentium-tug/x2gentium.fd deleted file mode 100644 index 5de43cb035b..00000000000 --- a/Master/texmf-dist/tex/latex/gentium-tug/x2gentium.fd +++ /dev/null @@ -1,90 +0,0 @@ -\ProvidesFile{x2gentium.fd} - [2022/05/30 Font definitions for gentium.] - -\expandafter\ifx\csname gentium@scale\endcsname\relax - \let\gentium@@scale\@empty -\else - \edef\gentium@@scale{s*[\csname gentium@scale\endcsname]}% -\fi - -\DeclareFontFamily{X2}{gentium}{} - -\DeclareFontShape{X2}{gentium}{m}{n}{ - <-> \gentium@@scale x2-gentiumplus-regular -}{} - -\DeclareFontShape{X2}{gentium}{m}{it}{ - <-> \gentium@@scale x2-gentiumplus-italic -}{} - -\DeclareFontShape{X2}{gentium}{b}{n}{ - <-> \gentium@@scale x2-gentiumplus-bold -}{} - -\DeclareFontShape{X2}{gentium}{b}{it}{ - <-> \gentium@@scale x2-gentiumplus-bolditalic -}{} - -\DeclareFontShape{X2}{gentium}{sb}{n}{ - <-> \gentium@@scale x2-gentiumbook-regular -}{} - -\DeclareFontShape{X2}{gentium}{sb}{it}{ - <-> \gentium@@scale x2-gentiumbook-italic -}{} - -\DeclareFontShape{X2}{gentium}{eb}{n}{ - <-> \gentium@@scale x2-gentiumbook-bold -}{} - -\DeclareFontShape{X2}{gentium}{eb}{it}{ - <-> \gentium@@scale x2-gentiumbook-bolditalic -}{} - -\DeclareFontShape{X2}{gentium}{m}{sc}{ - <-> \gentium@@scale x2-gentiumplus-regular-sc -}{} - -\DeclareFontShape{X2}{gentium}{m}{scit}{ - <-> \gentium@@scale x2-gentiumplus-italic-sc -}{} - -\DeclareFontShape{X2}{gentium}{b}{sc}{ - <-> \gentium@@scale x2-gentiumplus-bold-sc -}{} - -\DeclareFontShape{X2}{gentium}{b}{scit}{ - <-> \gentium@@scale x2-gentiumplus-bolditalic-sc -}{} - -\DeclareFontShape{X2}{gentium}{sb}{sc}{ - <-> \gentium@@scale x2-gentiumbook-regular-sc -}{} - -\DeclareFontShape{X2}{gentium}{sb}{scit}{ - <-> \gentium@@scale x2-gentiumbook-italic-sc -}{} - -\DeclareFontShape{X2}{gentium}{eb}{sc}{ - <-> \gentium@@scale x2-gentiumbook-bold-sc -}{} - -\DeclareFontShape{X2}{gentium}{eb}{scit}{ - <-> \gentium@@scale x2-gentiumbook-bolditalic-sc -}{} - -\DeclareFontShape{X2}{gentium}{m}{sl}{<->ssub * gentium/m/it}{} -\DeclareFontShape{X2}{gentium}{b}{sl}{<->ssub * gentium/b/it}{} -\DeclareFontShape{X2}{gentium}{bx}{sl}{<->ssub * gentium/b/it}{} -\DeclareFontShape{X2}{gentium}{bx}{it}{<->ssub * gentium/b/it}{} -\DeclareFontShape{X2}{gentium}{bx}{n}{<->ssub * gentium/b/n}{} -\DeclareFontShape{X2}{gentium}{sb}{sl}{<->ssub * gentium/sb/it}{} -\DeclareFontShape{X2}{gentium}{sbx}{sl}{<->ssub * gentium/sb/it}{} -\DeclareFontShape{X2}{gentium}{sbx}{it}{<->ssub * gentium/sb/it}{} -\DeclareFontShape{X2}{gentium}{sbx}{n}{<->ssub * gentium/sb/n}{} -\DeclareFontShape{X2}{gentium}{eb}{sl}{<->ssub * gentium/eb/it}{} -\DeclareFontShape{X2}{gentium}{ebx}{sl}{<->ssub * gentium/eb/it}{} -\DeclareFontShape{X2}{gentium}{ebx}{it}{<->ssub * gentium/eb/it}{} -\DeclareFontShape{X2}{gentium}{ebx}{n}{<->ssub * gentium/eb/n}{} - -\endinput diff --git a/Master/texmf-dist/tex/latex/gentium-tug/x2gentiumbook.fd b/Master/texmf-dist/tex/latex/gentium-tug/x2gentiumbook.fd deleted file mode 100644 index d1b7860265a..00000000000 --- a/Master/texmf-dist/tex/latex/gentium-tug/x2gentiumbook.fd +++ /dev/null @@ -1,87 +0,0 @@ -\ProvidesFile{x2gentiumbook.fd} - [2022/05/30 Font definitions for gentiumbook.] - -\expandafter\ifx\csname gentiumbook@scale\endcsname\relax - \let\gentiumbook@@scale\@empty -\else - \edef\gentiumbook@@scale{s*[\csname gentiumbook@scale\endcsname]}% -\fi - -\DeclareFontFamily{X2}{gentiumbook}{} - -\DeclareFontShape{X2}{gentiumbook}{m}{n}{ - <-> \gentiumbook@@scale x2-gentiumbook-regular -}{} - -\DeclareFontShape{X2}{gentiumbook}{m}{it}{ - <-> \gentiumbook@@scale x2-gentiumbook-italic -}{} - -\DeclareFontShape{X2}{gentiumbook}{b}{n}{ - <-> \gentiumbook@@scale x2-gentiumbook-bold -}{} - -\DeclareFontShape{X2}{gentiumbook}{b}{it}{ - <-> \gentiumbook@@scale x2-gentiumbook-bolditalic -}{} - -\DeclareFontShape{X2}{gentiumbook}{sl}{n}{ - <-> \gentiumbook@@scale x2-gentiumplus-regular -}{} - -\DeclareFontShape{X2}{gentiumbook}{sl}{it}{ - <-> \gentiumbook@@scale x2-gentiumplus-italic -}{} - -\DeclareFontShape{X2}{gentiumbook}{sb}{n}{ - <-> \gentiumbook@@scale x2-gentiumplus-bold -}{} - -\DeclareFontShape{X2}{gentiumbook}{sb}{it}{ - <-> \gentiumbook@@scale x2-gentiumplus-bolditalic -}{} - -\DeclareFontShape{X2}{gentiumbook}{m}{sc}{ - <-> \gentiumbook@@scale x2-gentiumbook-regular-sc -}{} - -\DeclareFontShape{X2}{gentiumbook}{m}{scit}{ - <-> \gentiumbook@@scale x2-gentiumbook-italic-sc -}{} - -\DeclareFontShape{X2}{gentiumbook}{b}{sc}{ - <-> \gentiumbook@@scale x2-gentiumbook-bold-sc -}{} - -\DeclareFontShape{X2}{gentiumbook}{b}{scit}{ - <-> \gentiumbook@@scale x2-gentiumbook-bolditalic-sc -}{} - -\DeclareFontShape{X2}{gentiumbook}{sl}{sc}{ - <-> \gentiumbook@@scale x2-gentiumplus-regular-sc -}{} - -\DeclareFontShape{X2}{gentiumbook}{sl}{scit}{ - <-> \gentiumbook@@scale x2-gentiumplus-italic-sc -}{} - -\DeclareFontShape{X2}{gentiumbook}{sb}{sc}{ - <-> \gentiumbook@@scale x2-gentiumplus-bold-sc -}{} - -\DeclareFontShape{X2}{gentiumbook}{sb}{scit}{ - <-> \gentiumbook@@scale x2-gentiumplus-bolditalic-sc -}{} - -\DeclareFontShape{X2}{gentiumbook}{m}{sl}{<->ssub * gentiumbook/m/it}{} -\DeclareFontShape{X2}{gentiumbook}{b}{sl}{<->ssub * gentiumbook/b/it}{} -\DeclareFontShape{X2}{gentiumbook}{bx}{sl}{<->ssub * gentiumbook/b/it}{} -\DeclareFontShape{X2}{gentiumbook}{bx}{it}{<->ssub * gentiumbook/b/it}{} -\DeclareFontShape{X2}{gentiumbook}{bx}{n}{<->ssub * gentiumbook/b/n}{} -\DeclareFontShape{X2}{gentiumbook}{sl}{sl}{<->ssub * gentiumbook/sl/it}{} -\DeclareFontShape{X2}{gentiumbook}{sb}{sl}{<->ssub * gentiumbook/sb/it}{} -\DeclareFontShape{X2}{gentiumbook}{sbx}{sl}{<->ssub * gentiumbook/sb/it}{} -\DeclareFontShape{X2}{gentiumbook}{sbx}{it}{<->ssub * gentiumbook/sb/it}{} -\DeclareFontShape{X2}{gentiumbook}{sbx}{n}{<->ssub * gentiumbook/sb/n}{} - -\endinput diff --git a/Master/texmf-dist/tex/latex/glossaries-extra/example-glossaries-xr.tex b/Master/texmf-dist/tex/latex/glossaries-extra/example-glossaries-xr.tex index 02d77a0e39b..24a8c0d2d73 100644 --- a/Master/texmf-dist/tex/latex/glossaries-extra/example-glossaries-xr.tex +++ b/Master/texmf-dist/tex/latex/glossaries-extra/example-glossaries-xr.tex @@ -7,7 +7,7 @@ %% glossaries-extra.dtx (with options: `example-glossaries-xr.tex,package') %% %% glossaries-extra.dtx -%% Copyright 2023 Nicola Talbot +%% Copyright 2025 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-2021-11-22.sty b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-2021-11-22.sty index 1758ebb8f6c..4e677a61d0f 100644 --- a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-2021-11-22.sty +++ b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-2021-11-22.sty @@ -7,7 +7,7 @@ %% glossaries-extra.dtx (with options: `glossaries-extra-2021-11-22.sty,package') %% %% glossaries-extra.dtx -%% Copyright 2023 Nicola Talbot +%% Copyright 2025 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-abbrstyles.def b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-abbrstyles.def index 38278ded3fa..a60b5878cf1 100644 --- a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-abbrstyles.def +++ b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-abbrstyles.def @@ -7,7 +7,7 @@ %% glossaries-extra.dtx (with options: `glossaries-extra-abbrstyles.def,package') %% %% glossaries-extra.dtx -%% Copyright 2023 Nicola Talbot +%% Copyright 2025 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -38,7 +38,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesFile{glossaries-extra-abbrstyles.def}[2023/06/28 v1.52 (NLCT)] +\ProvidesFile{glossaries-extra-abbrstyles.def}[2025/01/03 v1.54 (NLCT)] \newcommand*{\glsxtrlongshortname}{% \glsxpabbrvfont{\the\glsshorttok}{\glscategorylabel}% } @@ -4107,30 +4107,6 @@ \renewcommand*{\GLSxtrfullplformat}[2]{% \GLSxtrlongplformat{##1}{##2}{\glsfirstlonguserfont}% }% - \renewcommand*{\glsxtrinlinefullformat}[2]{% - \glsxtruserlongshortformat{##1}{##2}% - {\glsfirstlonguserfont}{\glsfirstabbrvscuserfont}% - }% - \renewcommand*{\glsxtrinlinefullplformat}[2]{% - \glsxtruserlongshortplformat{##1}{##2}% - {\glsfirstlonguserfont}{\glsfirstabbrvscuserfont}% - }% - \renewcommand*{\Glsxtrinlinefullformat}[2]{% - \Glsxtruserlongshortformat{##1}{##2}% - {\glsfirstlonguserfont}{\glsfirstabbrvscuserfont}% - }% - \renewcommand*{\Glsxtrinlinefullplformat}[2]{% - \Glsxtruserlongshortplformat{##1}{##2}% - {\glsfirstlonguserfont}{\glsfirstabbrvscuserfont}% - }% - \renewcommand*{\GLSxtrinlinefullformat}[2]{% - \GLSxtruserlongshortformat{##1}{##2}% - {\glsfirstlonguserfont}{\glsfirstabbrvscuserfont}% - }% - \renewcommand*{\GLSxtrinlinefullplformat}[2]{% - \GLSxtruserlongshortplformat{##1}{##2}% - {\glsfirstlonguserfont}{\glsfirstabbrvscuserfont}% - }% } \newcommand*{\glsxtrlongshortuserdescname}{% \protect\glslonguserfont{\the\glslongtok}% diff --git a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-bib2gls-2021-11-22.sty b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-bib2gls-2021-11-22.sty index 19c3d97561c..53340997e34 100644 --- a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-bib2gls-2021-11-22.sty +++ b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-bib2gls-2021-11-22.sty @@ -7,7 +7,7 @@ %% glossaries-extra.dtx (with options: `glossaries-extra-bib2gls-2021-11-22.sty,package') %% %% glossaries-extra.dtx -%% Copyright 2023 Nicola Talbot +%% Copyright 2025 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-bib2gls.sty b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-bib2gls.sty index d320836a2d5..07911716435 100644 --- a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-bib2gls.sty +++ b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-bib2gls.sty @@ -7,7 +7,7 @@ %% glossaries-extra.dtx (with options: `glossaries-extra-bib2gls.sty,package') %% %% glossaries-extra.dtx -%% Copyright 2023 Nicola Talbot +%% Copyright 2025 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -40,8 +40,8 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \DeclareRelease{v1.48}{2021-11-22}{glossaries-extra-bib2gls-2021-11-22.sty} -\DeclareCurrentRelease{v1.53}{2023-09-29} -\ProvidesPackage{glossaries-extra-bib2gls}[2023/09/29 v1.53 (NLCT)] +\DeclareCurrentRelease{v1.54}{2025-01-03} +\ProvidesPackage{glossaries-extra-bib2gls}[2025/01/03 v1.54 (NLCT)] \ifglsacronym \providecommand*{\printunsrtacronyms}[1][]{% \printunsrtglossary[type=\acronymtype,#1]}% @@ -78,6 +78,7 @@ \robustify\glsdisplaynumberlist \renewcommand*{\glsentrynumberlist}[1]{\glsxtrusefield{#1}{location}} \providecommand{\IfTeXParserLib}[2]{#2} +\providecommand{\IfNotBibGls}[2]{#1} \newcommand*{\glshex}{\string\u} \newcommand*{\glscapturedgroup}{\string\$} \ifdef\glshashchar @@ -215,6 +216,16 @@ \setentrycounter[#1]{#2}% \glsxtrmultisupplocation{#5}{#4}{#3}% } +\ExplSyntaxOn +\cs_new:Npn \glsxtr@setlocationanchor #1 #2 + { + \group_begin: + \glswrglossdisableanchorcmds + \exp_args:NNNe + \group_end: + \tl_set:Nn #1 { \text_purify:n { #2 } } + } +\ExplSyntaxOff \ifundef\hyperlink { \newcommand*{\glsxtrdisplaylocnameref}[8]{% @@ -224,7 +235,7 @@ { \newcommand*{\glsxtrdisplaylocnameref}[8]{% \def\glsxtrrecentanchor{#6}% - \def\glsxtrlocationanchor{#2.#7}% + \glsxtr@setlocationanchor\glsxtrlocationanchor{#2.#7}% \let\glsxtractualanchor\glsxtrlocationanchor \glsxtrsetactualanchor{#2}% \ifcsdef{glsxtr#2locfmt}% @@ -939,6 +950,30 @@ \string=\glshex 0099\string=\glshex 009A\string=\glshex 009B\string=\glshex 009C \string=\glshex 009D\string=\glshex 009E\string=\glshex 009F } +\newcommand*{\glsxtrcontrolIrules}{% + \string'\glshex 200B\string'\string=\glshex 200C\string=\glshex 200D + \string=\glshex 200E\string=\glshex 200F\string=\glshex 0001 + \string=\glshex 0002\string=\glshex 0003\string=\glshex 0004\string=\glshex 0005 + \string=\glshex 0006\string=\glshex 0007\string=\glshex 0008 + \string=\string'\glshex 0009\string'\string=\string'\glshex 000B\string' + \string=\glshex 000E\string=\glshex 000F\string=\string'\glshex +0010\string'\string=\glshex 0011 + \string=\glshex 0012\string=\glshex 0013\string=\glshex 0014\string=\glshex 0015 + \string=\glshex 0016\string=\glshex 0017\string=\glshex 0018\string=\glshex 0019 + \string=\glshex 001A\string=\glshex 001B\string=\glshex 0080 + \string=\glshex 0081\string=\glshex 0082\string=\glshex 0083\string=\glshex 0084 + \string=\glshex 0085\string=\glshex 0086\string=\glshex 0087\string=\glshex 0088 + \string=\glshex 0089\string=\glshex 008A\string=\glshex 008B\string=\glshex 008C + \string=\glshex 008D\string=\glshex 008E\string=\glshex 008F\string=\glshex 0090 + \string=\glshex 0091\string=\glshex 0092\string=\glshex 0093\string=\glshex 0094 + \string=\glshex 0095\string=\glshex 0096\string=\glshex 0097\string=\glshex 0098 + \string=\glshex 0099\string=\glshex 009A\string=\glshex 009B\string=\glshex 009C + \string=\glshex 009D\string=\glshex 009E\string=\glshex 009F +} +\newcommand*{\glsxtrcontrolIIrules}{% + \glshex 001C\string<\glshex 001D + \string<\glshex 001E\string<\glshex 001F +} \newcommand*{\glsxtrspacerules}{% \string' \string'\string; \string'\glshex 00A0\string'\string; diff --git a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-stylemods-2021-11-22.sty b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-stylemods-2021-11-22.sty index 9bd57a68124..1f2259b4d72 100644 --- a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-stylemods-2021-11-22.sty +++ b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-stylemods-2021-11-22.sty @@ -7,7 +7,7 @@ %% glossaries-extra.dtx (with options: `glossaries-extra-stylemods-2021-11-22.sty,package') %% %% glossaries-extra.dtx -%% Copyright 2023 Nicola Talbot +%% Copyright 2025 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-stylemods.sty b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-stylemods.sty index eb132de50b9..14b0c5a7691 100644 --- a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-stylemods.sty +++ b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-stylemods.sty @@ -7,7 +7,7 @@ %% glossaries-extra.dtx (with options: `glossaries-extra-stylemods.sty,package') %% %% glossaries-extra.dtx -%% Copyright 2023 Nicola Talbot +%% Copyright 2025 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -40,8 +40,8 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \DeclareRelease{v1.48}{2021-11-22}{glossaries-extra-stylemods-2021-11-22.sty} -\DeclareCurrentRelease{v1.53}{2023-09-29} -\ProvidesPackage{glossaries-extra-stylemods}[2023/09/29 v1.53 (NLCT)] +\DeclareCurrentRelease{v1.54}{2025-01-03} +\ProvidesPackage{glossaries-extra-stylemods}[2025/01/03 v1.54 (NLCT)] \newcommand*{\@glsxtr@loadstyles}{} \DeclareOption{all}{% \appto\@glsxtr@loadstyles{% diff --git a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty index 3e49330d312..68dd84a7ebc 100644 --- a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty +++ b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty @@ -7,7 +7,7 @@ %% glossaries-extra.dtx (with options: `glossaries-extra.sty,package') %% %% glossaries-extra.dtx -%% Copyright 2023 Nicola Talbot +%% Copyright 2025 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -40,8 +40,8 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \DeclareRelease{v1.48}{2021-11-22}{glossaries-extra-2021-11-22.sty} -\DeclareCurrentRelease{v1.53}{2023-09-29} -\ProvidesPackage{glossaries-extra}[2023/09/29 v1.53 (NLCT)] +\DeclareCurrentRelease{v1.54}{2025-01-03} +\ProvidesPackage{glossaries-extra}[2025/01/03 v1.54 (NLCT)] \RequirePackage{xkeyval} \RequirePackage{etoolbox} \@ifpackageloaded{glossaries} @@ -978,9 +978,12 @@ \providecommand{\glssentencecase}[1]{\makefirstuc{#1}} \providecommand{\glslowercase}[1]{\MakeTextLowercase{#1}} \providecommand{\glsuppercase}[1]{\mfirstucMakeUppercase{#1}} -\providecommand{\@Glsentryfield}[2]{% +\ExplSyntaxOn +\providecommand{\glspdfsentencecase}[1]{ \exp_args:Ne \MFUsentencecase { #1 } } +\ExplSyntaxOff +\def\@Glsentryfield#1#2{% \glstexorpdfstring{\@Gls@entry@field{#1}{#2}}% - {\MFUsentencecase{\@gls@entry@field{#1}{#2}}}% + {\glspdfsentencecase{\@gls@entry@field{#1}{#2}}}% } \ifdef\glstexorpdfstring {} @@ -1199,19 +1202,23 @@ #2% }% } +\ExplSyntaxOn +\clist_new:N \__glossariesxtr_glolist_clist \newcommand*{\GlsXtrIfInGlossary}[4]{% - \ifcsdef{glolist@#2}% - {% - \protected@edef\@glsxtr@tmp{#1}% - \letcs\@glsxtr@tmplist{glolist@#2}% - \expandafter\DTLifinlist\expandafter{\@glsxtr@tmp}{\@glsxtr@tmplist}% - {#3}{#4}% - }% - {% - \glsxtrundefaction{Glossary type `#1' doesn't exist}{}% - #4% - }% + \tl_if_exist:cTF { glolist@#2 } + { + \exp_args:NNv \clist_set:Nn + \__glossariesxtr_glolist_clist { glolist@#2 } + \clist_if_in:NnTF + \__glossariesxtr_glolist_clist { #1 } + { #3 } { #4 } + } + { + \glsxtrundefaction{Glossary ~ type ~ `#1' ~ doesn't ~ exist}{} + #4 + } } +\ExplSyntaxOff \newcommand*{\glsxtrifkeydefined}[3]{% \key@ifundefined{glossentry}{#1}{#3}{#2}% } @@ -5040,9 +5047,17 @@ }% } -\newcommand{\glsxtrhyperlink}[2]{% - \glsdoshowtarget{#1}{\hyperlink{#1}{#2}}% -}% +\ifdef\glsdohyperlinkhook +{ + \newcommand{\glsxtrhyperlink}[2]{% + \glsdoshowtarget{#1}{\glsdohyperlinkhook{#1}{#2}\hyperlink{#1}{#2}}% + }% +} +{ + \newcommand{\glsxtrhyperlink}[2]{% + \glsdoshowtarget{#1}{\hyperlink{#1}{#2}}% + }% +} \renewrobustcmd*{\glshyperlink}[2][\glsentrytext{\@glo@label}]{% \glsdoifexists{#2}% {% @@ -6910,6 +6925,11 @@ \GlsXtrNoGlsWarningTail } \newcommand*{\GlsXtrDefaultResourceOptions}{} +\NewDocumentCommand\BibGlsOptions{m}{% + \protected@write\@auxout{}{\string\bibgls@options{#1}}% +} +\newcommand{\bibgls@options}[1]{} +\@onlypreamble\BibGlsOptions \newcommand*{\glsxtrresourcefile}[2][]{% \@glsxtr@if@record@only {\renewcommand{\glsindexingsetting}{bib2gls}}% @@ -6993,6 +7013,10 @@ \newcommand*{\glsxtr@pluralsuffixes}[4]{} \newcommand*{\glsxtr@shortcutsval}[1]{} \newcommand*{\glsxtr@linkprefix}[1]{} +\ifglsautomake + \providecommand{\@gls@run@unrestricted@shell}[1]{\immediate\write18{#1}} + \providecommand{\@gls@run@output@dir}[1]{} +\fi \newcommand*{\glsxtr@writefields}{% \protected@write\@auxout{}% {\string\providecommand*{\string\glsxtr@fields}[1]{}}% @@ -7037,7 +7061,9 @@ \let\glsxtr@writefields\relax \ifglsautomake \IfFileExists{\jobname.aux}% - {\immediate\write18{bib2gls \jobname}}{}% + {% + \@gls@run@unrestricted@shell{bib2gls \@gls@run@output@dir{--dir} \jobname}% + }{}% \ifx\@gls@doautomake\@gls@doautomake@err \let\@gls@doautomake\relax \fi @@ -7114,6 +7140,39 @@ \newcommand*{\GlsXtrStandaloneEntryName}[1]{% \glstarget{#1}{\glossentryname{#1}}% } +\newcommand*{\Glsxtrglossentry}[1]{% + \glsxtrtitleorpdforheading + {\@Glsxtrglossentry{#1}}% + {\GlsXtrStandaloneEntryPdfNameFirstUc{#1}}% + {\GlsXtrStandaloneEntryHeadNameFirstUc{#1}}% +} +\newrobustcmd*{\@Glsxtrglossentry}[1]{% + \glsxtrtitleorpdforheading + {% + \glsdoifexists{#1}% + {% + \begingroup + \protected@edef\glscurrententrylabel{\glsdetoklabel{#1}}% + \protected@edef\currentglossary{\GlsXtrStandaloneGlossaryType}% + \ifglshasparent{#1}% + {\GlsXtrStandaloneSubEntryItem{#1}}% + {\glsentryitem{#1}}% + \GlsXtrStandaloneEntryNameFirstUc{#1}% + \endgroup + }% + }% + {\GlsXtrStandaloneEntryPdfNameFirstUc{#1}}% + {\GlsXtrStandaloneEntryHeadNameFirstUc{#1}}% +} +\newcommand*{\GlsXtrStandaloneEntryHeadNameFirstUc}[1]{% + \Glsxtrheadname{#1}% +} +\newcommand*{\GlsXtrStandaloneEntryPdfNameFirstUc}[1]{% + \Glsentryname{#1}% +} +\newcommand*{\GlsXtrStandaloneEntryNameFirstUc}[1]{% + \glstarget{#1}{\Glossentryname{#1}}% +} \newcommand{\GlsXtrStandaloneGlossaryType}{\glsentrytype{\glscurrententrylabel}} \newcommand*{\GlsXtrStandaloneSubEntryItem}[1]{% \GlsXtrIfFieldEqNum{level}{#1}{1}{\glssubentryitem{#1}}{}% @@ -7133,6 +7192,24 @@ {#1}% }% } +\newrobustcmd*{\@glsxtrglossentryother}[3]{% + \glsxtrtitleorpdforheading + {% + \glsdoifexists{#1}% + {% + \begingroup + \protected@edef\glscurrententrylabel{\glsdetoklabel{#1}}% + \protected@edef\currentglossary{\GlsXtrStandaloneGlossaryType}% + \ifglshasparent{#1}% + {\GlsXtrStandaloneSubEntryItem{#1}}% + {\glsentryitem{#1}}% + \GlsXtrStandaloneEntryOther{#1}{#2}% + \endgroup + }% + }% + {\GlsXtrStandaloneEntryPdfOther{#1}{#2}}% + {#3}% +} \newcommand*{\GlsXtrStandaloneEntryHeadOther}[2]{% \ifcsdef{glsxtrhead#2}% {\csuse{glsxtrhead#2}{#1}}% @@ -7141,7 +7218,25 @@ \newcommand*{\GlsXtrStandaloneEntryPdfOther}[2]{% \@gls@entry@field{#1}{#2}% } -\newrobustcmd*{\@glsxtrglossentryother}[3]{% +\newcommand*{\GlsXtrStandaloneEntryOther}[2]{% + \glstarget{#1}{\glossentrynameother{#1}{#2}}% +} +\newcommand*{\Glsxtrglossentryother}[3]{% + \ifstrempty{#1}% + {% + \glsxtrtitleorpdforheading + {\@Glsxtrglossentryother{#2}{#3}{\GlsXtrStandaloneEntryHeadOtherFirstUc{#3}{#2}}}% + {\GlsXtrStandaloneEntryPdfOtherFirstUc{#2}{#3}}% + {\GlsXtrStandaloneEntryHeadOtherFirstUc{#3}{#2}}% + }% + {% + \glsxtrtitleorpdforheading + {\@Glsxtrglossentryother{#2}{#3}{#1}}% + {\GlsXtrStandaloneEntryPdfOtherFirstUc{#2}{#3}}% + {#1}% + }% +} +\newrobustcmd*{\@Glsxtrglossentryother}[3]{% \glsxtrtitleorpdforheading {% \glsdoifexists{#1}% @@ -7152,23 +7247,33 @@ \ifglshasparent{#1}% {\GlsXtrStandaloneSubEntryItem{#1}}% {\glsentryitem{#1}}% - \GlsXtrStandaloneEntryOther{#1}{#2}% + \GlsXtrStandaloneEntryOtherFirstUc{#1}{#2}% \endgroup }% }% - {\GlsXtrStandaloneEntryPdfOther{#1}{#2}}% + {\GlsXtrStandaloneEntryPdfOtherFirstUc{#1}{#2}}% {#3}% } -\newcommand*{\GlsXtrStandaloneEntryOther}[2]{% - \glstarget{#1}{\glossentrynameother{#1}{#2}}% +\newcommand*{\GlsXtrStandaloneEntryHeadOtherFirstUc}[2]{% + \ifcsdef{glsxtrhead#2}% + {\csuse{glsxtrhead#2}{#1}}% + {\@Gls@entry@field{\NoCaseChange{#1}}{#2}}% +} +\newcommand*{\GlsXtrStandaloneEntryPdfOtherFirstUc}[2]{% + \MFUsentencecase{\@gls@entry@field{#1}{#2}}% +} +\newcommand*{\GlsXtrStandaloneEntryOtherFirstUc}[2]{% + \glstarget{#1}{\Glossentrynameother{#1}{#2}}% } \newcommand{\glsxtrtarget}[2]{% \GlsXtrIfFieldUndef{\glsxtrtargetfield}{#1}% {% \@glstarget{\glolinkprefix #1}{#2}% \xGlsXtrSetField{#1}{\glsxtrtargetfield}{\glolinkprefix #1}% - }{#2}% + }% + {\glsxtrtargetdup{#1}{#2}}% } +\newcommand{\glsxtrtargetdup}[2]{#2} \newcommand{\glsxtrtargetfield}{target} \ifdef\@printgloss@checkexists { @@ -9825,6 +9930,7 @@ defined}{}% \@glsdoifexistsorwarn{#1}% {% \glssetabbrvfmt{\glscategory{#1}}% + \glsxtrprenamehook{#1}% \glshasattribute{#1}{glossnamefont}% {% \protected@edef\@glsxtr@attrval{\glsgetattribute{#1}{glossnamefont}}% @@ -9887,6 +9993,7 @@ defined}{}% \@glsdoifexistsorwarn{#1}% {% \glssetabbrvfmt{\glscategory{#1}}% + \glsxtrprenamehook{#1}% \glshasattribute{#1}{glossnamefont}% {% \protected@edef\@glsxtr@attrval{\glsgetattribute{#1}{glossnamefont}}% @@ -9934,6 +10041,7 @@ defined}{}% \@glsdoifexistsorwarn{#1}% {% \glssetabbrvfmt{\glscategory{#1}}% + \glsxtrprenamehook{#1}% \glshasattribute{#1}{glossnamefont}% {% \protected@edef\@glsxtr@attrval{\glsgetattribute{#1}{glossnamefont}}% @@ -9963,6 +10071,7 @@ defined}{}% \@glsdoifexistsorwarn{#1}% {% \glssetabbrvfmt{\glscategory{#1}}% + \glsxtrprenamehook{#1}% \glshasattribute{#1}{glossnamefont}% {% \protected@edef\@glsxtr@attrval{\glsgetattribute{#1}{glossnamefont}}% @@ -9983,6 +10092,7 @@ defined}{}% }% } } +\newcommand*{\glsxtrprenamehook}[1]{} \newcommand*{\glsxtrpostnamehook}[1]{% \let\@glsnumberformat\@glsxtr@defaultnumberformat \glsxtrdoautoindexname{#1}{indexname}% @@ -10024,6 +10134,7 @@ defined}{}% {% \glsxtr@setaccessdisplay{#2}% \glssetabbrvfmt{\glscategory{#1}}% + \glsxtrprenamehook{#1}% \glshasattribute{#1}{glossnamefont}% {% \protected@edef\@glsxtr@attrval{\glsgetattribute{#1}{glossnamefont}}% @@ -10072,6 +10183,33 @@ defined}{}% \glsxtrpostnamehook{#1}% }% } +\newrobustcmd*{\Glossentrynameother}[2]{% + \@glsdoifexistsorwarn{#1}% + {% + \glsxtr@setaccessdisplay{#2}% + \glssetabbrvfmt{\glscategory{#1}}% + \glsxtrprenamehook{#1}% + \glshasattribute{#1}{glossnamefont}% + {% + \protected@edef\@glsxtr@attrval{\glsgetattribute{#1}{glossnamefont}}% + \ifcsdef{\@glsxtr@attrval}% + {% + \letcs{\@glsxtr@glossnamefont}{\@glsxtr@attrval}% + }% + {% + \GlossariesExtraWarning{Unknown control sequence name + `\@glsxtr@attrval' supplied in glossnamefont attribute + for entry `#1'. Reverting to default \string\glsnamefont}% + \let\@glsxtr@glossnamefont\glsnamefont + }% + }% + {\let\@glsxtr@glossnamefont\glsnamefont}% + \@glsxtr@accessdisplay + {\@glsxtr@glossnamefont{\@Gls@entry@field{#1}{#2}}}% + {#1}% + \glsxtrpostnamehook{#1}% + }% +} \newif\if@glsxtr@format@override \@glsxtr@format@overridefalse \@ifpackageloaded{hyperref} @@ -12354,7 +12492,7 @@ defined}{}% \newcommand*{\Glsfmtlong}[1]{% \glstexorpdfstring {\Glsxtrtitlelong{#1}}% - {\MFUsentencecase{\glsentrylong{#1}}}% + {\glspdfsentencecase{\glsentrylong{#1}}}% } \glsmfuaddmap{\glsfmtlong}{\Glsfmtlong} \newcommand*{\GLSfmtlong}[1]{% @@ -12371,7 +12509,7 @@ defined}{}% \newcommand*{\Glsfmtlongpl}[1]{% \glstexorpdfstring {\Glsxtrtitlelongpl{#1}}% - {\MFUsentencecase{\glsentrylongpl{#1}}}% + {\glspdfsentencecase{\glsentrylongpl{#1}}}% } \glsmfuaddmap{\glsfmtlongpl}{\Glsfmtlongpl} \newcommand*{\GLSfmtlongpl}[1]{% @@ -12390,7 +12528,7 @@ defined}{}% \newcommand*{\Glsfmtfull}[1]{% \glstexorpdfstring {\Glsxtrtitlefull{#1}}% - {\MFUsentencecase{\glspdffmtfull{#1}{}}}% + {\glspdfsentencecase{\glspdffmtfull{#1}{}}}% } \glsmfuaddmap{\glsfmtfull}{\Glsfmtfull} \ExplSyntaxOn @@ -12409,7 +12547,7 @@ defined}{}% \newcommand*{\Glsfmtfullpl}[1]{% \glstexorpdfstring {\Glsxtrtitlefullpl{#1}}% - {\MFUsentencecase{\glspdffmtfullpl{#1}{}}}% + {\glspdfsentencecase{\glspdffmtfullpl{#1}{}}}% } \glsmfuaddmap{\glsfmtfullpl}{\Glsfmtfullpl} \ExplSyntaxOn @@ -12558,7 +12696,7 @@ defined}{}% \newcommand*{\Pglsfmtshort}[1]{% \glstexorpdfstring {\Pglsxtrtitleshort{#1}}% - {\MFUsentencecase{% + {\glspdfsentencecase{% \pglsprefix{#1}{prefix}% \glsentryshort{#1}}% }% @@ -12579,7 +12717,7 @@ defined}{}% \newcommand*{\Pglsfmtshortpl}[1]{% \glstexorpdfstring {\Pglsxtrtitleshortpl{#1}}% - {\MFUsentencecase + {\glspdfsentencecase {% \pglsprefix{#1}{prefixplural}% \glsentryshortpl{#1}% @@ -12602,7 +12740,7 @@ defined}{}% \newcommand*{\Pglsfmtlong}[1]{% \glstexorpdfstring {\Pglsxtrtitlelong{#1}}% - {\MFUsentencecase{% + {\glspdfsentencecase{% \pglsprefix{#1}{prefixfirst}% \glsentrylong{#1}}% }% @@ -12623,7 +12761,7 @@ defined}{}% \newcommand*{\Pglsfmtlongpl}[1]{% \glstexorpdfstring {\Pglsxtrtitlelongpl{#1}}% - {\MFUsentencecase + {\glspdfsentencecase {% \pglsprefix{#1}{prefixfirstplural}% \glsentrylongpl{#1}% @@ -14022,33 +14160,45 @@ defined}{}% {\string\mglsWriteSeparateRefsFalse\space can only be used before the first instance of any \string\mgls-like command}}% } -\newcommand{\glsxtr@newmgls}[5]{% +\newcommand{\glsxtr@newmgls}[6][]{% \edef\@glsxr@newmgls@do{% - \noexpand\newrobustcmd*{\expandonce{\csname #1\endcsname}}% - {\noexpand\@gls@hyp@opt\expandonce{\csname ns@glsxtr@#1\endcsname}}% - \noexpand\newcommand*{\expandonce{\csname ns@glsxtr@#1\endcsname}}[2][]{% + \noexpand\newrobustcmd*{\expandonce{\csname #2\endcsname}}% + {\noexpand\@gls@hyp@opt\expandonce{\csname ns@glsxtr@#2\endcsname}}% + \noexpand\newcommand*{\expandonce{\csname ns@glsxtr@#2\endcsname}}[2][]{% \noexpand\new@ifnextchar[% - {\expandonce{\csname glsxtr@#1\endcsname}{####1}{####2}}% - {\expandonce{\csname glsxtr@#1\endcsname}{####1}{####2}[]}% + {\expandonce{\csname glsxtr@#2\endcsname}{####1}{####2}}% + {\expandonce{\csname glsxtr@#2\endcsname}{####1}{####2}[]}% }% - \noexpand\def\expandonce{\csname glsxtr@#1\endcsname}####1####2[####3]{% - \noexpand\def\noexpand\glsxtrcurrentmglscsname{#1}% + \noexpand\def\expandonce{\csname glsxtr@#2\endcsname}####1####2[####3]{% + \noexpand\@glsxtr@mgls@linkdefs{\unexpanded{#1}}% + \noexpand\def\noexpand\glsxtrcurrentmglscsname{#2}% \noexpand\glsxtr@mgls@inner{####1}{####2}{####3}% - {\noexpand#2}{\noexpand#3}{\noexpand#4}{\noexpand#5}% + {\noexpand#3}{\noexpand#4}{\noexpand#5}{\noexpand#6}% }% }% \@glsxr@newmgls@do \ifx\@glsxtr@record@setting\@glsxtr@record@setting@off \else \ifdef\@glsxtr@mglslikelist - {\xappto\@glsxtr@mglslikelist{,#1}}% + {\xappto\@glsxtr@mglslikelist{,#2}}% {% - \gdef\@glsxtr@mglslikelist{#1}% + \gdef\@glsxtr@mglslikelist{#2}% \AtEndDocument{\immediate\protected@write\@auxout{}% {\string\@glsxtr@mglslike{\@glsxtr@mglslikelist}}}% }% \fi } +\newcommand{\@glsxtr@mgls@linkdefs}[1]{% + \ifstrempty{#1}% + {% + \let\glsxtrifwasglslike\@firstoftwo + \def\glsxtrcurrentfield{}% + }% + {% + \let\glsxtrifwasglslike\@secondoftwo + \def\glsxtrcurrentfield{#1}% + }% +} \newcommand*{\@glsxtr@mglslike}[1]{} \newcommand*{\GlsXtrMglsOrGls}[2]{% \def\@glsxtr@mgls@or@gls@mcs{#1}% @@ -14124,27 +14274,27 @@ defined}{}% \def\@Glsfullorfirst#1#2[#3]{% \ifglshasshort{#2}{\@Glsxtr@full{#1}{#2}[#3]}{\@Glsfirst@{#1}{#2}[#3]}% } -\glsxtr@newmgls{mglsshort}% +\glsxtr@newmgls[short]{mglsshort}% {\@glsshortortext}{\@glsshortortext}{\@glsshortortext}{\@glsshortortext}% -\glsxtr@newmgls{mglslong}% +\glsxtr@newmgls[long]{mglslong}% {\@glslongortext}{\@glslongortext}{\@glslongortext}{\@glslongortext}% -\glsxtr@newmgls{mglsfull}% +\glsxtr@newmgls[first]{mglsfull}% {\@glsfullorfirst}{\@glsfullorfirst}{\@glsfullorfirst}{\@glsfullorfirst}% -\glsxtr@newmgls{Mglsshort}% +\glsxtr@newmgls[short]{Mglsshort}% {\@Glsshortortext}{\@glsshortortext}{\@Glsshortortext}{\@glsshortortext}% \glsmfuaddmap{\mglsshort}{\Mglsshort} -\glsxtr@newmgls{Mglslong}% +\glsxtr@newmgls[long]{Mglslong}% {\@Glslongortext}{\@glslongortext}{\@Glslongortext}{\@glslongortext}% \glsmfuaddmap{\mglslong}{\Mglslong} -\glsxtr@newmgls{Mglsfull}% +\glsxtr@newmgls[first]{Mglsfull}% {\@Glsfullorfirst}{\@glsfullorfirst}{\@Glsfullorfirst}{\@glsfullorfirst}% \glsmfuaddmap{\mglsfull}{\Mglsfull} -\glsxtr@newmgls{mglsname}% +\glsxtr@newmgls[name]{mglsname}% {\@glsname@}{\@glsname@}{\@glsname@}{\@glsname@}% -\glsxtr@newmgls{Mglsname}% +\glsxtr@newmgls[name]{Mglsname}% {\@Glsname@}{\@glsname@}{\@Glsname@}{\@glsname@}% \glsmfuaddmap{\mglsname}{\Mglsname} -\glsxtr@newmgls{MGlsname}% +\glsxtr@newmgls[name]{MGlsname}% {\@Glsname@}{\@Glsname@}{\@Glsname@}{\@Glsname@}% \glsmfublocker{\MGlsname} \def\@glssymbolorgls#1#2[#3]{% @@ -14153,12 +14303,12 @@ defined}{}% \def\@glssymbolorGls#1#2[#3]{% \ifglshassymbol{#2}{\@glssymbol@{#1}{#2}[#3]}{\@Gls@{#1}{#2}[#3]}% } -\glsxtr@newmgls{mglssymbol}% +\glsxtr@newmgls[symbol]{mglssymbol}% {\@glssymbolorgls}{\@glssymbolorgls}{\@glssymbolorgls}{\@glssymbolorgls}% -\glsxtr@newmgls{Mglssymbol}% +\glsxtr@newmgls[symbol]{Mglssymbol}% {\@glssymbolorGls}{\@glssymbolorgls}{\@glssymbolorGls}{\@glssymbolorgls}% \glsmfuaddmap{\mglssymbol}{\Mglssymbol} -\glsxtr@newmgls{MGlssymbol}% +\glsxtr@newmgls[symbol]{MGlssymbol}% {\@glssymbolorGls}{\@glssymbolorGls}{\@glssymbolorGls}{\@glssymbolorGls}% \glsmfublocker{\MGlssymbol} \newcommand{\mglsfield}{useri} @@ -14173,12 +14323,12 @@ defined}{}% \expandafter\glssentencecase\expandafter{\glscurrentfieldvalue#3}}}% {\@Gls@{#1}{#2}[#3]}% } -\glsxtr@newmgls{mglsusefield}% +\glsxtr@newmgls[\mglsfield]{mglsusefield}% {\@glsfieldorgls}{\@glsfieldorgls}{\@glsfieldorgls}{\@glsfieldorgls}% -\glsxtr@newmgls{Mglsusefield}% +\glsxtr@newmgls[\mglsfield]{Mglsusefield}% {\@Glsfieldorgls}{\@glsfieldorgls}{\@Glsfieldorgls}{\@glsfieldorgls}% \glsmfuaddmap{\mglsusefield}{\Mglsusefield} -\glsxtr@newmgls{MGlsusefield}% +\glsxtr@newmgls[\mglsfield]{MGlsusefield}% {\@Glsfieldorgls}{\@Glsfieldorgls}{\@Glsfieldorgls}{\@Glsfieldorgls}% \glsmfublocker{\MGlsusefield} \newcommand*{\mpglsWarning}{% diff --git a/Master/texmf-dist/tex/latex/glossaries-extra/glossary-bookindex-2021-11-22.sty b/Master/texmf-dist/tex/latex/glossaries-extra/glossary-bookindex-2021-11-22.sty index 45ce9dfc835..247528db1c5 100644 --- a/Master/texmf-dist/tex/latex/glossaries-extra/glossary-bookindex-2021-11-22.sty +++ b/Master/texmf-dist/tex/latex/glossaries-extra/glossary-bookindex-2021-11-22.sty @@ -7,7 +7,7 @@ %% glossaries-extra.dtx (with options: `glossary-bookindex-2021-11-22.sty,package') %% %% glossaries-extra.dtx -%% Copyright 2023 Nicola Talbot +%% Copyright 2025 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/glossaries-extra/glossary-bookindex.sty b/Master/texmf-dist/tex/latex/glossaries-extra/glossary-bookindex.sty index 89a30b762b4..e5369e5aa0f 100644 --- a/Master/texmf-dist/tex/latex/glossaries-extra/glossary-bookindex.sty +++ b/Master/texmf-dist/tex/latex/glossaries-extra/glossary-bookindex.sty @@ -7,7 +7,7 @@ %% glossaries-extra.dtx (with options: `glossary-bookindex.sty,package') %% %% glossaries-extra.dtx -%% Copyright 2023 Nicola Talbot +%% Copyright 2025 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -40,11 +40,13 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \DeclareRelease{v1.48}{2021-11-22}{glossary-bookindex-2021-11-22.sty} -\DeclareCurrentRelease{v1.53}{2023-09-29} -\ProvidesPackage{glossary-bookindex}[2023/09/29 v1.53 (NLCT)] +\DeclareCurrentRelease{v1.54}{2025-01-03} +\ProvidesPackage{glossary-bookindex}[2025/01/03 v1.54 (NLCT)] \RequirePackage{multicol} \RequirePackage{glossary-tree} \newcommand{\glsxtrbookindexcols}{2} +\newcommand*{\glsxtrbookindextarget}[2]{\glstarget{#1}{#2}} +\newcommand*{\glsxtrbookindexsubtarget}[2]{\glsxtrbookindextarget{#1}{#2}} \newcommand*{\glsxtrbookindexname}[1]{\glossentryname{#1}} \newcommand*{\glsxtrbookindexsubname}[1]{\glsxtrbookindexname{#1}} \providecommand*{\glsxtrprelocation}{\space} @@ -72,12 +74,13 @@ \newcommand{\glsxtrbookindexpostgroupskip}{\indexspace} \newcommand{\glsxtrbookindexpresubgroupskip}[3]{\par\medskip} \newcommand{\glsxtrbookindexpostsubgroupskip}[2]{\par\medskip} +\newcommand{\glsxtrbookindexsubsubitem}[1]{\glstreesubsubitem} \newcommand*{\glsxtrbookindexformatheader}[1]{% \par{\centering\glstreegroupheaderfmt{#1}\par}% } \newcommand*{\glsxtrbookindexformatsubheader}[5]{% \ifnum#2>1\relax - \glstreesubsubitem\glstreegroupheaderfmt{#5}% + \glsxtrbookindexsubsubitem{#2}\glstreegroupheaderfmt{#5}% \else \glstreesubitem\glstreegroupheaderfmt{#5}% \fi @@ -171,7 +174,7 @@ \let\@glsxtr@bookindex@subsubatendgroup\relax \glstreeitem \glsentryitem{##1}% - \glstarget{##1}{\glsxtrbookindexname{##1}}% + \glsxtrbookindextarget{##1}{\glsxtrbookindexname{##1}}% \glsxtrbookindexprelocation{##1}% \glsxtrbookindexlocation{##1}{##2}% }% @@ -202,9 +205,9 @@ \edef\@glsxtr@bookindex@atsubsubendgroup{% \noexpand\glsxtrbookindexatsubsubendgroup{##1}% }% - \glstreesubsubitem + \glsxtrbookindexsubsubitem{##1}% \fi - \glstarget{##2}{\glsxtrbookindexsubname{##2}}% + \glsxtrbookindexsubtarget{##2}{\glsxtrbookindexsubname{##2}}% \glsxtrbookindexsubprelocation{##2}% \glsxtrbookindexsublocation{##2}{##3}% }% diff --git a/Master/texmf-dist/tex/latex/glossaries-extra/glossary-longextra-2021-11-22.sty b/Master/texmf-dist/tex/latex/glossaries-extra/glossary-longextra-2021-11-22.sty index 88cd6f37a5f..4460b463501 100644 --- a/Master/texmf-dist/tex/latex/glossaries-extra/glossary-longextra-2021-11-22.sty +++ b/Master/texmf-dist/tex/latex/glossaries-extra/glossary-longextra-2021-11-22.sty @@ -7,7 +7,7 @@ %% glossaries-extra.dtx (with options: `glossary-longextra-2021-11-22.sty,package') %% %% glossaries-extra.dtx -%% Copyright 2023 Nicola Talbot +%% Copyright 2025 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/glossaries-extra/glossary-longextra.sty b/Master/texmf-dist/tex/latex/glossaries-extra/glossary-longextra.sty index c6e9c4c12db..265ede1dad9 100644 --- a/Master/texmf-dist/tex/latex/glossaries-extra/glossary-longextra.sty +++ b/Master/texmf-dist/tex/latex/glossaries-extra/glossary-longextra.sty @@ -7,7 +7,7 @@ %% glossaries-extra.dtx (with options: `glossary-longextra.sty,package') %% %% glossaries-extra.dtx -%% Copyright 2023 Nicola Talbot +%% Copyright 2025 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -40,8 +40,8 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \DeclareRelease{v1.48}{2021-11-22}{glossary-longextra-2021-11-22.sty} -\DeclareCurrentRelease{v1.53}{2023-09-29} -\ProvidesPackage{glossary-longextra}[2023/09/29 v1.53 (NLCT)] +\DeclareCurrentRelease{v1.54}{2025-01-03} +\ProvidesPackage{glossary-longextra}[2025/01/03 v1.54 (NLCT)] \RequirePackage{glossary-longbooktabs} \newcommand{\glslongextraNameFmt}[1]{% \glsentryitem{#1}\glstarget{#1}{\glossentryname{#1}}% diff --git a/Master/texmf-dist/tex/latex/glossaries-extra/glossary-table.sty b/Master/texmf-dist/tex/latex/glossaries-extra/glossary-table.sty index 529e7c904ed..9c70599a6b1 100644 --- a/Master/texmf-dist/tex/latex/glossaries-extra/glossary-table.sty +++ b/Master/texmf-dist/tex/latex/glossaries-extra/glossary-table.sty @@ -7,7 +7,7 @@ %% glossaries-extra.dtx (with options: `glossary-table.sty,package') %% %% glossaries-extra.dtx -%% Copyright 2023 Nicola Talbot +%% Copyright 2025 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossary-table}[2023/09/29 v1.53 (NLCT)] +\ProvidesPackage{glossary-table}[2025/01/03 v1.54 (NLCT)] \RequirePackage{longtable} \RequirePackage{array} \RequirePackage{booktabs} diff --git a/Master/texmf-dist/tex/latex/glossaries-extra/glossary-topic-2021-11-22.sty b/Master/texmf-dist/tex/latex/glossaries-extra/glossary-topic-2021-11-22.sty index 3b8e06b179b..bbb89f53581 100644 --- a/Master/texmf-dist/tex/latex/glossaries-extra/glossary-topic-2021-11-22.sty +++ b/Master/texmf-dist/tex/latex/glossaries-extra/glossary-topic-2021-11-22.sty @@ -7,7 +7,7 @@ %% glossaries-extra.dtx (with options: `glossary-topic-2021-11-22.sty,package') %% %% glossaries-extra.dtx -%% Copyright 2023 Nicola Talbot +%% Copyright 2025 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/glossaries-extra/glossary-topic.sty b/Master/texmf-dist/tex/latex/glossaries-extra/glossary-topic.sty index 010a949ed8a..b9f63032401 100644 --- a/Master/texmf-dist/tex/latex/glossaries-extra/glossary-topic.sty +++ b/Master/texmf-dist/tex/latex/glossaries-extra/glossary-topic.sty @@ -7,7 +7,7 @@ %% glossaries-extra.dtx (with options: `glossary-topic.sty,package') %% %% glossaries-extra.dtx -%% Copyright 2023 Nicola Talbot +%% Copyright 2025 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -40,8 +40,8 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \DeclareRelease{v1.48}{2021-11-22}{glossary-topic-2021-11-22.sty} -\DeclareCurrentRelease{v1.53}{2023-09-29} -\ProvidesPackage{glossary-topic}[2023/09/29 v1.53 (NLCT)] +\DeclareCurrentRelease{v1.54}{2025-01-03} +\ProvidesPackage{glossary-topic}[2025/01/03 v1.54 (NLCT)] \RequirePackage{multicol} \newglossarystyle{topic}{% \renewenvironment{theglossary}% diff --git a/Master/texmf-dist/tex/latex/kdpcover/kdpcover.cls b/Master/texmf-dist/tex/latex/kdpcover/kdpcover.cls index 125fa6c0526..5ec4f4ac5e4 100644 --- a/Master/texmf-dist/tex/latex/kdpcover/kdpcover.cls +++ b/Master/texmf-dist/tex/latex/kdpcover/kdpcover.cls @@ -7,7 +7,7 @@ %% kdpcover.dtx (with options: `class') %% (The MIT License) %% -%% Copyright (c) 2021-2022 Yegor Bugayenko +%% Copyright (c) 2021-2024 Yegor Bugayenko %% %% Permission is hereby granted, free of charge, to any person obtaining a copy %% of this software and associated documentation files (the 'Software'), to deal @@ -31,7 +31,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesClass{kdpcover} -[2022.11.30 0.5.1 Cover for Kindle Direct Publishing books] +[2025/01/02 0.6.0 Cover for Kindle Direct Publishing books] @@ -58,35 +58,47 @@ \LoadClass{article} \makeatletter -\newcommand*\kdp@pages{100} +\newcount\kdp@pages + \kdp@pages=100 \newlength\kdp@xsize -\setlength\kdp@xsize{6in} + \setlength\kdp@xsize{6in} \newlength\kdp@ysize -\setlength\kdp@ysize{9in} + \setlength\kdp@ysize{9in} \makeatother \RequirePackage{iexec} -\RequirePackage{xkeyval} +\RequirePackage{pgfopts} \makeatletter -\DeclareOptionX{6x9} - {\setlength\kdp@xsize{6in}\setlength\kdp@ysize{9in}} -\DeclareOptionX{7x10} - {\setlength\kdp@xsize{7in}\setlength\kdp@ysize{10in}} -\DeclareOptionX{8x10} - {\setlength\kdp@xsize{8in}\setlength\kdp@ysize{10in}} -\DeclareOptionX{pages} - {\renewcommand*\kdp@pages{#1}} -\newif\ifkdp@barless -\DeclareOptionX{barless}{\kdp@barlesstrue} -\DeclareOptionX{pdf}{% - \iexec[trace,quiet,stdout=kdpcover-pages-count.txt] - {qpdf --show-npages #1 | tr -d '[[:space:]]' | \{ cat; echo \%; \}}% - \newread\kdp@pagescount% - \openin\kdp@pagescount=kdpcover-pages-count.txt - \read\kdp@pagescount to \kdp@pages% +\pgfkeys{ + /kdp/.cd, + barless/.store in = \kdp@barless, + pdf/.code = { + \iexec[trace,quiet,stdout=kdpcover-pages-count.txt] + {qpdf --show-npages --no-warn #1 | tr -d '[[:space:]]'} + \openin1=kdpcover-pages-count.txt + \read1 to \temp + \closein1 + \kdp@pages=\temp + }, + 6x9/.code = { + \setlength\kdp@xsize{6in} + \setlength\kdp@ysize{9in} + }, + 7x10/.code = { + \setlength\kdp@xsize{7in} + \setlength\kdp@ysize{10in} + }, + 8x10/.code = { + \setlength\kdp@xsize{8in} + \setlength\kdp@ysize{10in} + }, + pages/.code = { + \kdp@pages=#1 + } } -\ProcessOptionsX\relax\makeatother +\ProcessPgfPackageOptions{/kdp} +\makeatother \RequirePackage{anyfontsize} \RequirePackage{tikz} @@ -99,26 +111,33 @@ \setstretch{1.2} \makeatletter - \newlength\kdp@height +\newlength\kdp@height \setlength\kdp@height{0.125in + \kdp@ysize + 0.125in} - \newlength\kdp@width +\newlength\kdp@width \setlength\kdp@width{ 0.125in + \kdp@xsize - + 0.0025in * \kdp@pages - + \kdp@xsize + 0.125in} + + 0.125in + \kdp@xsize + + 0.0025in * \kdp@pages} \makeatother \RequirePackage{geometry} \makeatletter -\geometry{paperwidth=\kdp@width,paperheight=\kdp@height, - left=0pt,right=0pt,top=0pt,bottom=0pt} +\geometry{ + paperwidth=\kdp@width, + paperheight=\kdp@height, + left=0pt, + right=0pt, + top=0pt, + bottom=0pt +} \makeatother \RequirePackage[absolute]{textpos} \TPGrid{16}{16} -\makeatletter\newcommand\putSpine[2][kdpcover-signature]{% - \ifkdp@barless\else +\makeatletter +\newcommand\putSpine[2][kdpcover-signature]{% + \ifdefined\kdp@barless\else% \begin{textblock}{2.4}[0.5,0](8,0)% \begin{tikzpicture}% \node [rectangle, inner sep=0em, fill=black, @@ -126,19 +145,20 @@ minimum height=16\TPVertModule] at (0,0) {}; \end{tikzpicture}% \end{textblock}% - \fi + \fi% \begin{textblock}{1}[0.5,0](8,2)% \begin{tikzpicture}% \node [color=white, inner sep=0cm, outer sep=0cm, rotate=270, minimum height=\TPHorizModule] at (0,0) { - \Large #2 - };% + \Large #2% + }; \end{tikzpicture}% \end{textblock}% \begin{textblock}{2.4}[0.5,1](8,14)% \centerline{\includegraphics[width=0.32in]{#1}}% \end{textblock}% -}\makeatother +} +\makeatother \newcommand\putPicture[1]{% \begin{textblock}{4}(10,2)% @@ -148,54 +168,54 @@ \newcommand\putVolume[1]{% \begin{textblock}{2}[1,1](15,14)% - \raggedleft - \includegraphics[height=0.4in]{kdpcover-vol-#1} + \raggedleft% + \includegraphics[height=0.4in]{kdpcover-vol-#1}% \end{textblock}% } \newcommand\putPrice[1]{% \begin{textblock}{4}[0,1](1,2)% - \small #1 + \small #1% \end{textblock}% } \newcommand\putBack[1]{% \begin{textblock}{5}[0,0](1,3)% - \small #1 + \small #1% \end{textblock}% } \newcommand\putTitle[1]{% \begin{textblock}{5}(10,9)% - \fontsize{32}{32}\selectfont #1 + \fontsize{32}{32}\selectfont #1% \end{textblock}% } \newcommand\putAuthor[1]{% \begin{textblock}{4}(10,10)% - \large by #1 + \large by #1% \end{textblock}% } \newcommand\putTLDR[1]{% \begin{textblock}{5}(10,11)% - TL;DR #1 + TL;DR #1% \end{textblock}% } \newcommand\putVersion[1]{% \begin{textblock}{4}[0,1](10,14)% - #1 + #1% \IfFileExists{.git} {\quad\iexec{git log -n 1 --pretty='format:\%ad' --date='format:\%e-\%b-\%Y'}} - {} + {}% \end{textblock}% } \newcommand\putCopyright[2]{% \begin{textblock}{4}[0,1](1,14)% - \small (c) - #1 #2 + \small (c)% + #1 #2% \end{textblock}% } @@ -206,8 +226,6 @@ \setlength\parskip{0pt}% \interfootnotelinepenalty=10000% } - - \endinput %% %% End of file `kdpcover.cls'. diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex index ee46de3b465..fd8da0a356d 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex +++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex @@ -75,7 +75,7 @@ %% and all files in that bundle must be distributed together. %% %% File: expl3.dtx -\def\ExplFileDate{2024-12-09}% +\def\ExplFileDate{2024-12-25}% \begingroup \def\next{\endgroup}% \expandafter\ifx\csname PackageError\endcsname\relax @@ -3473,7 +3473,7 @@ Type H <return> for immediate help}\def~{\errmessage{% \__kernel_chk_if_free_cs:N #1 \cs_gset_nopar:Npe #1 { \__kernel_exp_not:w {#2} } } -\cs_generate_variant:Nn \tl_const:Nn { Ne , c , ce } +\cs_generate_variant:Nn \tl_const:Nn { NV , Ne , c , cV , ce } \cs_generate_variant:Nn \tl_const:Nn { Nx , cx } \cs_new_protected:Npn \tl_clear:N #1 { \tex_let:D #1 = ~ \c_empty_tl } @@ -12474,6 +12474,8 @@ Type H <return> for immediate help}\def~{\errmessage{% {#3} } } +\cs_new_protected:Npn \file_forget:n #1 + { \cs_undefine:c { __file_seen_ \file_full_name:n {#1} : } } \cs_new_protected:Npn \file_get_full_name:nN #1#2 { \file_get_full_name:nNF {#1} #2 @@ -30678,11 +30680,19 @@ Type H <return> for immediate help}\def~{\errmessage{% } \cs_new_protected:Npn \color_select:nn #1#2 { - \__color_select_main:Nw \l__color_current_tl - #1 / / \s__color_mark #2 / / \s__color_stop + \__color_select_main:Nnn \l__color_current_tl {#1} {#2} \__color_finalise_current: \__color_select:N \l__color_current_tl } +\cs_new_protected:Npn \__color_select_main:Nnn #1#2#3 + { + \use:e + { + \exp_not:N \__color_select_main:Nw \exp_not:N #1 + \exp_not:n {#2} / / \exp_not:N \s__color_mark + #3 / / \exp_not:N \s__color_stop + } + } \cs_new_protected:Npn \__color_select_main:Nw #1 #2 / #3 / #4 \s__color_mark #5 / #6 / #7 \s__color_stop { @@ -30729,10 +30739,7 @@ Type H <return> for immediate help}\def~{\errmessage{% \cs_new_protected:Npn \color_math:nnn #1#2#3 { \__color_math:nn {#3} - { - \__color_select_main:Nw \l__color_current_tl - #1 / / \s__color_mark #2 / / \s__color_stop - } + { \__color_select_main:Nnn \l__color_current_tl {#1} {#2} } } \cs_new_protected:Npn \__color_math:nn #1#2 { @@ -30830,14 +30837,12 @@ Type H <return> for immediate help}\def~{\errmessage{% } \cs_new_protected:Npn \color_fill:nn #1#2 { - \__color_select_main:Nw \l__color_current_tl - #1 / / \s__color_mark #2 / / \s__color_stop + \__color_select_main:Nnn \l__color_current_tl {#1} {#2} \exp_after:wN \__color_draw:nnn \l__color_current_tl { fill } } \cs_new_protected:Npn \color_stroke:nn #1#2 { - \__color_select_main:Nw \l__color_current_tl - #1 / / \s__color_mark #2 / / \s__color_stop + \__color_select_main:Nnn \l__color_current_tl {#1} {#2} \exp_after:wN \__color_draw:nnn \l__color_current_tl { stroke } } \cs_new_protected:Npn \__color_draw:nnn #1#2#3 @@ -30966,6 +30971,8 @@ Type H <return> for immediate help}\def~{\errmessage{% \prop_new:c { l__color_named_._prop } \tl_new:c { l__color_named_._tl } \tl_set:ce { l__color_named_._tl } { \__color_model:N \l__color_current_tl } +\prop_put:cve { l__color_named_._prop } { l__color_named_._tl } + { \__color_values:N \l__color_current_tl } \cs_new_protected:Npn \color_export:nnN #1#2#3 { \group_begin: @@ -30978,8 +30985,7 @@ Type H <return> for immediate help}\def~{\errmessage{% } \cs_new_protected:Npn \color_export:nnnN #1#2#3#4 { - \__color_select_main:Nw #4 - #1 / / \s__color_mark #2 / / \s__color_stop + \__color_select_main:Nnn #4 {#1} {#2} \__color_export:nN {#3} #4 } \cs_new_protected:Npn \__color_export:nN #1#2 diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex index 3e221f84262..e63ad6c9a29 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex +++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: expl3.dtx -\def\ExplFileDate{2024-12-09}% +\def\ExplFileDate{2024-12-25}% \let\ExplLoaderFileDate\ExplFileDate \begingroup \catcode`\_=11 diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx b/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx index 704ecfd2ff8..29b9700c170 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx +++ b/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: expl3.dtx -\def\ExplFileDate{2024-12-09}% +\def\ExplFileDate{2024-12-25}% \let\ExplLoaderFileDate\ExplFileDate \begingroup \catcode`\_=11 diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty index aa6217f3f5e..7f73b6bdd6f 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty +++ b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: expl3.dtx -\def\ExplFileDate{2024-12-09}% +\def\ExplFileDate{2024-12-25}% \let\ExplLoaderFileDate\ExplFileDate \ProvidesPackage{expl3} [% diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3debug.def b/Master/texmf-dist/tex/latex/l3kernel/l3debug.def index 6361b7c36c2..7b5724918d0 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3debug.def +++ b/Master/texmf-dist/tex/latex/l3kernel/l3debug.def @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: l3debug.dtx -\ProvidesExplFile{l3debug.def}{2024-12-09}{}{L3 Debugging support} +\ProvidesExplFile{l3debug.def}{2024-12-25}{}{L3 Debugging support} \scan_new:N \s__debug_stop \cs_new:Npn \__debug_use_i_delimit_by_s_stop:nw #1 #2 \s__debug_stop {#1} \quark_new:N \q__debug_recursion_tail diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls b/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls index 33d0a1c401f..0649af9fbbd 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls +++ b/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls @@ -20,7 +20,7 @@ %% %% File: l3doc.dtx \RequirePackage{calc} -\ProvidesExplClass{l3doc}{2024-12-09}{} +\ProvidesExplClass{l3doc}{2024-12-25}{} {L3 Experimental documentation class} \clist_new:N \g_docinput_clist \seq_new:N \g_doc_functions_seq diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerifDisplay-LF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerifDisplay-LF.fd new file mode 100644 index 00000000000..675b5c520b0 --- /dev/null +++ b/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerifDisplay-LF.fd @@ -0,0 +1,36 @@ +%% Generated by autoinst on 2025/01/06 +%% +\ProvidesFile{LY1LibertinusSerifDisplay-LF.fd} + [2025/01/06 (autoinst) Font definitions for LY1/LibertinusSerifDisplay-LF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname LibertinusSerifDisplay@scale\endcsname\relax + \let\LibertinusSerifDisplay@@scale\@empty +\else + \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}% +\fi + +\DeclareFontFamily{LY1}{LibertinusSerifDisplay-LF}{} + + +% ---- m = regular ---- + +\DeclareFontShape{LY1}{LibertinusSerifDisplay-LF}{m}{n}{ + <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-lf-ly1 +}{} + +\DeclareFontShape{LY1}{LibertinusSerifDisplay-LF}{regular}{n}{ + <-> alias * LibertinusSerifDisplay-LF/m/n +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\endinput diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerifDisplay-OsF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerifDisplay-OsF.fd new file mode 100644 index 00000000000..0585155d823 --- /dev/null +++ b/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerifDisplay-OsF.fd @@ -0,0 +1,36 @@ +%% Generated by autoinst on 2025/01/06 +%% +\ProvidesFile{LY1LibertinusSerifDisplay-OsF.fd} + [2025/01/06 (autoinst) Font definitions for LY1/LibertinusSerifDisplay-OsF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname LibertinusSerifDisplay@scale\endcsname\relax + \let\LibertinusSerifDisplay@@scale\@empty +\else + \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}% +\fi + +\DeclareFontFamily{LY1}{LibertinusSerifDisplay-OsF}{} + + +% ---- m = regular ---- + +\DeclareFontShape{LY1}{LibertinusSerifDisplay-OsF}{m}{n}{ + <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-osf-ly1 +}{} + +\DeclareFontShape{LY1}{LibertinusSerifDisplay-OsF}{regular}{n}{ + <-> alias * LibertinusSerifDisplay-OsF/m/n +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\endinput diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerifDisplay-Sup.fd b/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerifDisplay-Sup.fd new file mode 100644 index 00000000000..c6245ad52fc --- /dev/null +++ b/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerifDisplay-Sup.fd @@ -0,0 +1,36 @@ +%% Generated by autoinst on 2025/01/06 +%% +\ProvidesFile{LY1LibertinusSerifDisplay-Sup.fd} + [2025/01/06 (autoinst) Font definitions for LY1/LibertinusSerifDisplay-Sup.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname LibertinusSerifDisplay@scale\endcsname\relax + \let\LibertinusSerifDisplay@@scale\@empty +\else + \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}% +\fi + +\DeclareFontFamily{LY1}{LibertinusSerifDisplay-Sup}{} + + +% ---- m = regular ---- + +\DeclareFontShape{LY1}{LibertinusSerifDisplay-Sup}{m}{n}{ + <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-sup-ly1 +}{} + +\DeclareFontShape{LY1}{LibertinusSerifDisplay-Sup}{regular}{n}{ + <-> alias * LibertinusSerifDisplay-Sup/m/n +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\endinput diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerifDisplay-TLF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerifDisplay-TLF.fd new file mode 100644 index 00000000000..4dbd5ed45df --- /dev/null +++ b/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerifDisplay-TLF.fd @@ -0,0 +1,36 @@ +%% Generated by autoinst on 2025/01/06 +%% +\ProvidesFile{LY1LibertinusSerifDisplay-TLF.fd} + [2025/01/06 (autoinst) Font definitions for LY1/LibertinusSerifDisplay-TLF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname LibertinusSerifDisplay@scale\endcsname\relax + \let\LibertinusSerifDisplay@@scale\@empty +\else + \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}% +\fi + +\DeclareFontFamily{LY1}{LibertinusSerifDisplay-TLF}{} + + +% ---- m = regular ---- + +\DeclareFontShape{LY1}{LibertinusSerifDisplay-TLF}{m}{n}{ + <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-tlf-ly1 +}{} + +\DeclareFontShape{LY1}{LibertinusSerifDisplay-TLF}{regular}{n}{ + <-> alias * LibertinusSerifDisplay-TLF/m/n +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\endinput diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerifDisplay-TOsF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerifDisplay-TOsF.fd new file mode 100644 index 00000000000..9daa7c9def8 --- /dev/null +++ b/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerifDisplay-TOsF.fd @@ -0,0 +1,36 @@ +%% Generated by autoinst on 2025/01/06 +%% +\ProvidesFile{LY1LibertinusSerifDisplay-TOsF.fd} + [2025/01/06 (autoinst) Font definitions for LY1/LibertinusSerifDisplay-TOsF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname LibertinusSerifDisplay@scale\endcsname\relax + \let\LibertinusSerifDisplay@@scale\@empty +\else + \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}% +\fi + +\DeclareFontFamily{LY1}{LibertinusSerifDisplay-TOsF}{} + + +% ---- m = regular ---- + +\DeclareFontShape{LY1}{LibertinusSerifDisplay-TOsF}{m}{n}{ + <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-tosf-ly1 +}{} + +\DeclareFontShape{LY1}{LibertinusSerifDisplay-TOsF}{regular}{n}{ + <-> alias * LibertinusSerifDisplay-TOsF/m/n +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\endinput diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerifDisplay-LF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerifDisplay-LF.fd new file mode 100644 index 00000000000..18e075c4c17 --- /dev/null +++ b/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerifDisplay-LF.fd @@ -0,0 +1,36 @@ +%% Generated by autoinst on 2025/01/06 +%% +\ProvidesFile{OT1LibertinusSerifDisplay-LF.fd} + [2025/01/06 (autoinst) Font definitions for OT1/LibertinusSerifDisplay-LF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname LibertinusSerifDisplay@scale\endcsname\relax + \let\LibertinusSerifDisplay@@scale\@empty +\else + \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}% +\fi + +\DeclareFontFamily{OT1}{LibertinusSerifDisplay-LF}{} + + +% ---- m = regular ---- + +\DeclareFontShape{OT1}{LibertinusSerifDisplay-LF}{m}{n}{ + <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-lf-ot1 +}{} + +\DeclareFontShape{OT1}{LibertinusSerifDisplay-LF}{regular}{n}{ + <-> alias * LibertinusSerifDisplay-LF/m/n +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\endinput diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerifDisplay-OsF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerifDisplay-OsF.fd new file mode 100644 index 00000000000..1a93dc4556f --- /dev/null +++ b/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerifDisplay-OsF.fd @@ -0,0 +1,36 @@ +%% Generated by autoinst on 2025/01/06 +%% +\ProvidesFile{OT1LibertinusSerifDisplay-OsF.fd} + [2025/01/06 (autoinst) Font definitions for OT1/LibertinusSerifDisplay-OsF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname LibertinusSerifDisplay@scale\endcsname\relax + \let\LibertinusSerifDisplay@@scale\@empty +\else + \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}% +\fi + +\DeclareFontFamily{OT1}{LibertinusSerifDisplay-OsF}{} + + +% ---- m = regular ---- + +\DeclareFontShape{OT1}{LibertinusSerifDisplay-OsF}{m}{n}{ + <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-osf-ot1 +}{} + +\DeclareFontShape{OT1}{LibertinusSerifDisplay-OsF}{regular}{n}{ + <-> alias * LibertinusSerifDisplay-OsF/m/n +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\endinput diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerifDisplay-Sup.fd b/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerifDisplay-Sup.fd new file mode 100644 index 00000000000..94017ea5ea9 --- /dev/null +++ b/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerifDisplay-Sup.fd @@ -0,0 +1,36 @@ +%% Generated by autoinst on 2025/01/06 +%% +\ProvidesFile{OT1LibertinusSerifDisplay-Sup.fd} + [2025/01/06 (autoinst) Font definitions for OT1/LibertinusSerifDisplay-Sup.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname LibertinusSerifDisplay@scale\endcsname\relax + \let\LibertinusSerifDisplay@@scale\@empty +\else + \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}% +\fi + +\DeclareFontFamily{OT1}{LibertinusSerifDisplay-Sup}{} + + +% ---- m = regular ---- + +\DeclareFontShape{OT1}{LibertinusSerifDisplay-Sup}{m}{n}{ + <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-sup-ot1 +}{} + +\DeclareFontShape{OT1}{LibertinusSerifDisplay-Sup}{regular}{n}{ + <-> alias * LibertinusSerifDisplay-Sup/m/n +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\endinput diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerifDisplay-TLF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerifDisplay-TLF.fd new file mode 100644 index 00000000000..d28a6d314e4 --- /dev/null +++ b/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerifDisplay-TLF.fd @@ -0,0 +1,36 @@ +%% Generated by autoinst on 2025/01/06 +%% +\ProvidesFile{OT1LibertinusSerifDisplay-TLF.fd} + [2025/01/06 (autoinst) Font definitions for OT1/LibertinusSerifDisplay-TLF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname LibertinusSerifDisplay@scale\endcsname\relax + \let\LibertinusSerifDisplay@@scale\@empty +\else + \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}% +\fi + +\DeclareFontFamily{OT1}{LibertinusSerifDisplay-TLF}{} + + +% ---- m = regular ---- + +\DeclareFontShape{OT1}{LibertinusSerifDisplay-TLF}{m}{n}{ + <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-tlf-ot1 +}{} + +\DeclareFontShape{OT1}{LibertinusSerifDisplay-TLF}{regular}{n}{ + <-> alias * LibertinusSerifDisplay-TLF/m/n +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\endinput diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerifDisplay-TOsF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerifDisplay-TOsF.fd new file mode 100644 index 00000000000..665713dd765 --- /dev/null +++ b/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerifDisplay-TOsF.fd @@ -0,0 +1,36 @@ +%% Generated by autoinst on 2025/01/06 +%% +\ProvidesFile{OT1LibertinusSerifDisplay-TOsF.fd} + [2025/01/06 (autoinst) Font definitions for OT1/LibertinusSerifDisplay-TOsF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname LibertinusSerifDisplay@scale\endcsname\relax + \let\LibertinusSerifDisplay@@scale\@empty +\else + \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}% +\fi + +\DeclareFontFamily{OT1}{LibertinusSerifDisplay-TOsF}{} + + +% ---- m = regular ---- + +\DeclareFontShape{OT1}{LibertinusSerifDisplay-TOsF}{m}{n}{ + <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-tosf-ot1 +}{} + +\DeclareFontShape{OT1}{LibertinusSerifDisplay-TOsF}{regular}{n}{ + <-> alias * LibertinusSerifDisplay-TOsF/m/n +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\endinput diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerifDisplay-LF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerifDisplay-LF.fd new file mode 100644 index 00000000000..0969b057446 --- /dev/null +++ b/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerifDisplay-LF.fd @@ -0,0 +1,36 @@ +%% Generated by autoinst on 2025/01/06 +%% +\ProvidesFile{T1LibertinusSerifDisplay-LF.fd} + [2025/01/06 (autoinst) Font definitions for T1/LibertinusSerifDisplay-LF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname LibertinusSerifDisplay@scale\endcsname\relax + \let\LibertinusSerifDisplay@@scale\@empty +\else + \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}% +\fi + +\DeclareFontFamily{T1}{LibertinusSerifDisplay-LF}{} + + +% ---- m = regular ---- + +\DeclareFontShape{T1}{LibertinusSerifDisplay-LF}{m}{n}{ + <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-lf-t1 +}{} + +\DeclareFontShape{T1}{LibertinusSerifDisplay-LF}{regular}{n}{ + <-> alias * LibertinusSerifDisplay-LF/m/n +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\endinput diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerifDisplay-OsF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerifDisplay-OsF.fd new file mode 100644 index 00000000000..e7f27072c1d --- /dev/null +++ b/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerifDisplay-OsF.fd @@ -0,0 +1,36 @@ +%% Generated by autoinst on 2025/01/06 +%% +\ProvidesFile{T1LibertinusSerifDisplay-OsF.fd} + [2025/01/06 (autoinst) Font definitions for T1/LibertinusSerifDisplay-OsF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname LibertinusSerifDisplay@scale\endcsname\relax + \let\LibertinusSerifDisplay@@scale\@empty +\else + \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}% +\fi + +\DeclareFontFamily{T1}{LibertinusSerifDisplay-OsF}{} + + +% ---- m = regular ---- + +\DeclareFontShape{T1}{LibertinusSerifDisplay-OsF}{m}{n}{ + <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-osf-t1 +}{} + +\DeclareFontShape{T1}{LibertinusSerifDisplay-OsF}{regular}{n}{ + <-> alias * LibertinusSerifDisplay-OsF/m/n +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\endinput diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerifDisplay-Sup.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerifDisplay-Sup.fd new file mode 100644 index 00000000000..c8be09520a5 --- /dev/null +++ b/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerifDisplay-Sup.fd @@ -0,0 +1,36 @@ +%% Generated by autoinst on 2025/01/06 +%% +\ProvidesFile{T1LibertinusSerifDisplay-Sup.fd} + [2025/01/06 (autoinst) Font definitions for T1/LibertinusSerifDisplay-Sup.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname LibertinusSerifDisplay@scale\endcsname\relax + \let\LibertinusSerifDisplay@@scale\@empty +\else + \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}% +\fi + +\DeclareFontFamily{T1}{LibertinusSerifDisplay-Sup}{} + + +% ---- m = regular ---- + +\DeclareFontShape{T1}{LibertinusSerifDisplay-Sup}{m}{n}{ + <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-sup-t1 +}{} + +\DeclareFontShape{T1}{LibertinusSerifDisplay-Sup}{regular}{n}{ + <-> alias * LibertinusSerifDisplay-Sup/m/n +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\endinput diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerifDisplay-TLF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerifDisplay-TLF.fd new file mode 100644 index 00000000000..c1ab0fca6b3 --- /dev/null +++ b/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerifDisplay-TLF.fd @@ -0,0 +1,36 @@ +%% Generated by autoinst on 2025/01/06 +%% +\ProvidesFile{T1LibertinusSerifDisplay-TLF.fd} + [2025/01/06 (autoinst) Font definitions for T1/LibertinusSerifDisplay-TLF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname LibertinusSerifDisplay@scale\endcsname\relax + \let\LibertinusSerifDisplay@@scale\@empty +\else + \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}% +\fi + +\DeclareFontFamily{T1}{LibertinusSerifDisplay-TLF}{} + + +% ---- m = regular ---- + +\DeclareFontShape{T1}{LibertinusSerifDisplay-TLF}{m}{n}{ + <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-tlf-t1 +}{} + +\DeclareFontShape{T1}{LibertinusSerifDisplay-TLF}{regular}{n}{ + <-> alias * LibertinusSerifDisplay-TLF/m/n +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\endinput diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerifDisplay-TOsF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerifDisplay-TOsF.fd new file mode 100644 index 00000000000..4c7f62718b9 --- /dev/null +++ b/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerifDisplay-TOsF.fd @@ -0,0 +1,36 @@ +%% Generated by autoinst on 2025/01/06 +%% +\ProvidesFile{T1LibertinusSerifDisplay-TOsF.fd} + [2025/01/06 (autoinst) Font definitions for T1/LibertinusSerifDisplay-TOsF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname LibertinusSerifDisplay@scale\endcsname\relax + \let\LibertinusSerifDisplay@@scale\@empty +\else + \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}% +\fi + +\DeclareFontFamily{T1}{LibertinusSerifDisplay-TOsF}{} + + +% ---- m = regular ---- + +\DeclareFontShape{T1}{LibertinusSerifDisplay-TOsF}{m}{n}{ + <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-tosf-t1 +}{} + +\DeclareFontShape{T1}{LibertinusSerifDisplay-TOsF}{regular}{n}{ + <-> alias * LibertinusSerifDisplay-TOsF/m/n +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\endinput diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSerifDisplay-LF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSerifDisplay-LF.fd new file mode 100644 index 00000000000..c4294297aef --- /dev/null +++ b/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSerifDisplay-LF.fd @@ -0,0 +1,36 @@ +%% Generated by autoinst on 2025/01/06 +%% +\ProvidesFile{TS1LibertinusSerifDisplay-LF.fd} + [2025/01/06 (autoinst) Font definitions for TS1/LibertinusSerifDisplay-LF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname LibertinusSerifDisplay@scale\endcsname\relax + \let\LibertinusSerifDisplay@@scale\@empty +\else + \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}% +\fi + +\DeclareFontFamily{TS1}{LibertinusSerifDisplay-LF}{} + + +% ---- m = regular ---- + +\DeclareFontShape{TS1}{LibertinusSerifDisplay-LF}{m}{n}{ + <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-lf-ts1 +}{} + +\DeclareFontShape{TS1}{LibertinusSerifDisplay-LF}{regular}{n}{ + <-> alias * LibertinusSerifDisplay-LF/m/n +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\endinput diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSerifDisplay-OsF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSerifDisplay-OsF.fd new file mode 100644 index 00000000000..10f8081082e --- /dev/null +++ b/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSerifDisplay-OsF.fd @@ -0,0 +1,36 @@ +%% Generated by autoinst on 2025/01/06 +%% +\ProvidesFile{TS1LibertinusSerifDisplay-OsF.fd} + [2025/01/06 (autoinst) Font definitions for TS1/LibertinusSerifDisplay-OsF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname LibertinusSerifDisplay@scale\endcsname\relax + \let\LibertinusSerifDisplay@@scale\@empty +\else + \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}% +\fi + +\DeclareFontFamily{TS1}{LibertinusSerifDisplay-OsF}{} + + +% ---- m = regular ---- + +\DeclareFontShape{TS1}{LibertinusSerifDisplay-OsF}{m}{n}{ + <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-osf-ts1 +}{} + +\DeclareFontShape{TS1}{LibertinusSerifDisplay-OsF}{regular}{n}{ + <-> alias * LibertinusSerifDisplay-OsF/m/n +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\endinput diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSerifDisplay-TLF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSerifDisplay-TLF.fd new file mode 100644 index 00000000000..2ebdfae07b6 --- /dev/null +++ b/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSerifDisplay-TLF.fd @@ -0,0 +1,36 @@ +%% Generated by autoinst on 2025/01/06 +%% +\ProvidesFile{TS1LibertinusSerifDisplay-TLF.fd} + [2025/01/06 (autoinst) Font definitions for TS1/LibertinusSerifDisplay-TLF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname LibertinusSerifDisplay@scale\endcsname\relax + \let\LibertinusSerifDisplay@@scale\@empty +\else + \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}% +\fi + +\DeclareFontFamily{TS1}{LibertinusSerifDisplay-TLF}{} + + +% ---- m = regular ---- + +\DeclareFontShape{TS1}{LibertinusSerifDisplay-TLF}{m}{n}{ + <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-tlf-ts1 +}{} + +\DeclareFontShape{TS1}{LibertinusSerifDisplay-TLF}{regular}{n}{ + <-> alias * LibertinusSerifDisplay-TLF/m/n +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\endinput diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSerifDisplay-TOsF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSerifDisplay-TOsF.fd new file mode 100644 index 00000000000..b85286beaa2 --- /dev/null +++ b/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSerifDisplay-TOsF.fd @@ -0,0 +1,36 @@ +%% Generated by autoinst on 2025/01/06 +%% +\ProvidesFile{TS1LibertinusSerifDisplay-TOsF.fd} + [2025/01/06 (autoinst) Font definitions for TS1/LibertinusSerifDisplay-TOsF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname LibertinusSerifDisplay@scale\endcsname\relax + \let\LibertinusSerifDisplay@@scale\@empty +\else + \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}% +\fi + +\DeclareFontFamily{TS1}{LibertinusSerifDisplay-TOsF}{} + + +% ---- m = regular ---- + +\DeclareFontShape{TS1}{LibertinusSerifDisplay-TOsF}{m}{n}{ + <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-tosf-ts1 +}{} + +\DeclareFontShape{TS1}{LibertinusSerifDisplay-TOsF}{regular}{n}{ + <-> alias * LibertinusSerifDisplay-TOsF/m/n +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\endinput diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/libertinus-type1.sty b/Master/texmf-dist/tex/latex/libertinus-type1/libertinus-type1.sty index 0ace2a84ef8..c809d41b796 100644 --- a/Master/texmf-dist/tex/latex/libertinus-type1/libertinus-type1.sty +++ b/Master/texmf-dist/tex/latex/libertinus-type1/libertinus-type1.sty @@ -1,5 +1,5 @@ \ProvidesPackage{libertinus-type1}[% - 2024/09/22 (Bob Tennent) Supports libertinus fonts for latex/pdflatex.] + 2025/01/06 (Bob Tennent) Supports libertinus fonts for latex/pdflatex.] \RequirePackage{ifxetex,ifluatex,xkeyval,textcomp} \newif\iflibertinus@otf @@ -208,5 +208,7 @@ use libertinus.sty or libertinus-otf.sty.\MessageBreak \DeclareTextFontCommand{\textsup}{\sufigures} \let\textsuperior\textsup +\providecommand*\libertinusDisplay{\fontfamily{LibertinusSerifDisplay-\libertinusserif@figurealign\libertinusserif@figurestyle}\selectfont} + \def\libertinusseriflgr{\fontencoding{LGR}\fontfamily{\libertinusserif@family}\selectfont} \def\libertinussanslgr{\fontencoding{LGR}\fontfamily{\libertinussans@family}\selectfont} diff --git a/Master/texmf-dist/tex/latex/liederbuch/liederbuch.sty b/Master/texmf-dist/tex/latex/liederbuch/liederbuch.sty new file mode 100644 index 00000000000..4dced01307e --- /dev/null +++ b/Master/texmf-dist/tex/latex/liederbuch/liederbuch.sty @@ -0,0 +1,569 @@ +\ProvidesPackage{liederbuch} +\RequirePackage{etoolbox} +\RequirePackage{environ} +\RequirePackage{xparse} +\RequirePackage{pgfmath} + + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%% Special music characters %%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\newcommand{\repeatleft}{\raisebox{-0.28em}{\hspace{0.075em}\rule{0.075em}{1em}\hspace{0.075em}\rule{0.025em}{1em}\hspace{-0.01em}}:} +\newcommand{\repeatright}{:\raisebox{-0.28em}{\hspace{-0.01em}\rule{0.025em}{1em}\hspace{0.075em}\rule{0.075em}{1em}\hspace{0.075em}}} + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%% Handling of the meta data %%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%% parse meta data +%unpackages a list of data in the form of [first=xy & second = xz& third= som3thing ...] +%This creates the macros: +%\GFM@LB@lied@<songbookname>@<song variant>@<song number>@first{xy} +%\GFM@LB@lied@<songbookname>@<song variant>@<song number>@second{xz} +%\GFM@LB@lied@<songbookname>@<song variant>@<song number>@third{som3thing} +%... +\NewDocumentCommand{\GFM@LB@unpackage}{m}{{% + %As '=' is not available in the tag text, we make it available again. & stays available via \& + \gdef\equals{=}% + \@ifundefined{inputList}{% + \DeclareListParser{\inputList}{&}% + }{}% + % + % + % + {% + \newcount\ipp\relax% + \ipp=0\relax% + \renewcommand{\do}[1]{% + \csdef{tempList\the\ipp}{##1&}% + \global\advance\ipp by1\relax% + }% + \inputList{#1}% + \def\choppyA##1=##2&{##1}% + \def\choppyB##1=##2&{##2}% + \newif\iflooping\relax% + \loopingtrue\relax% + \ipp=0\relax% + \loop% + \ifnum\ipp>1000\relax% + \loopingfalse\relax% + \wlog{Error: Too much meta data (>1000 Elements)}% + \fi% + \expandafter\ifx\csname tempList\the\ipp\endcsname\relax% + \loopingfalse\relax% + \else% + \edef\temp{\csuse{tempList\the\ipp}}% + \edef\tempA{\expandafter\choppyA\temp}% + \edef\tempB{\expandafter\choppyB\temp}% + \trim@spaces@in{\tempA}% + \trim@spaces@in{\tempB}% + % + %Most important line is here: + % + \global\csedef{GFM@LB@lied@\GFM@LB@LiederbuchNameTmp @\GFM@LB@LiederbuchVariantTmp @\GFM@LB@LiederbuchNumberTmp @\tempA}{\expandafter\noexpand\tempB}%songbook@song variant@song number + \advance\ipp by1\relax% + \fi% + \iflooping\repeat% + }% +}}% + + +%tweakMetadata allows completing or editing meta data of a certain song. +\def\tweakMetadata#1#2#3#4{{%structure is analogue to \LBsong + \def\GFM@LB@LiederbuchNameTmp{#1}%songbook + \def\GFM@LB@LiederbuchNumberTmp{#2}%song number + \def\GFM@LB@LiederbuchVariantTmp{#3}%song variant + \GFM@LB@unpackage{#4}% +}}% + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%% Environment and commands for %%% +%%% notes + lyrics in native LaTeX font %%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\newdimen\GFM@LB@NT@tempDimA% +\newdimen\GFM@LB@NT@tempDimB% +\newdimen\GFM@LB@NT@tempDimC% + + +\newcommand{\GFM@LB@songLyrics}[1]{% + \vskip 0pt%backwards compability + \nopagebreak[4]% + {% make commands local + \nopagebreak[4]% + \GFM@LB@NT@tempDimA=0pt% + \noindent% + %If no unit is given (i.e. [10] instead of [10pt]), + %percent linewidth is assumed ([10] = 0.1\linewidth) + \DeclareDocumentCommand{\nspace}{s m}{% + \pgfmathparse{##2}% + \ifpgfmathunitsdeclared% + \ifx##1\BooleanTrue% + \hspace*{##2}% + \else% + \hspace{##2}% + \fi% + \else% + \GFM@LB@NT@tempDimC=0.01\linewidth\relax% + \ifx##1\BooleanTrue% + \hspace*{##2\GFM@LB@NT@tempDimC}% + \else% + \hspace{##2\GFM@LB@NT@tempDimC}% + \fi% + \fi% + }% + \DeclareDocumentCommand{\ns}{s O{0 pt}}{% + \pgfmathparse{##2}% + \ifpgfmathunitsdeclared% + \GFM@LB@NT@tempDimB=\dimexpr##2\relax% + \else% + \GFM@LB@NT@tempDimB=##2\linewidth\relax% + \divide\GFM@LB@NT@tempDimB by 100\relax% + \fi% + \ifx##1\BooleanTrue% + {% + \divide\GFM@LB@NT@tempDimA by2\relax% + \divide\GFM@LB@NT@tempDimB by2\relax% + \hskip 0pt plus 1fill minus 1fill\relax% + \hspace{\dimexpr\GFM@LB@NT@tempDimB - \GFM@LB@NT@tempDimA}% + -% + \hspace{\dimexpr\GFM@LB@NT@tempDimB - \GFM@LB@NT@tempDimA}% + \hskip 0pt plus 1fill minus 1fill\relax% + }% + \else% + \hspace*{0.5\dimexpr\f@size pt}% + %compensates the - in ns* (not totally) + \hskip 0pt plus 2fill minus 2fill% + \hspace{\dimexpr\GFM@LB@NT@tempDimB - \GFM@LB@NT@tempDimA}% + \fi% + \global\GFM@LB@NT@tempDimA=\dimexpr\GFM@LB@NT@tempDimB\relax% + }%\ns + %%%%%%%%%% most important line is here: + \makebox[\linewidth]{% + \GFM@LB@NT@tempDimC=\dimexpr\f@size pt\relax% +% \parbox[t][0.5\GFM@LB@NT@tempDimC]{0pt}{}% orig. statt 0.5 war 1.65 + #1}% + %%%%%%%%%% most important line END + \GFM@LB@NT@tempDimA=0pt% + %reset to avoid sideeffects otherwhere. + \pagebreak[3]% + }% END make commands local + \pagebreak[3]% + \vskip 0pt\relax%backward compatibility? +}% + +\newdimen\tempdimA% + +\newcounter{staveLineNumber}% +\setcounter{staveLineNumber}{1}% + +\newcounter{GFM@staveLineNumberBreakPointA}% +\newcounter{GFM@staveLineNumberBreakPointB}% +\newcounter{GFM@staveLineNumberBreakPointC}% +\newcounter{GFM@staveLineNumberBreakPointD}% +\newcounter{GFM@staveLineNumberBreakPointE}% +\newcounter{GFM@staveLineNumberBreakPointF}% + + +%usage: \forcePageBreakAfterStaveLine{3}[4][2]... +\NewDocumentCommand\forcePageBreakAfterStaveLine{m O{0} O{0} O{0} O{0} O{0}}{ +\setcounter{GFM@staveLineNumberBreakPointA}{#1} +\setcounter{GFM@staveLineNumberBreakPointB}{#2} +\setcounter{GFM@staveLineNumberBreakPointC}{#3} +\setcounter{GFM@staveLineNumberBreakPointD}{#4} +\setcounter{GFM@staveLineNumberBreakPointE}{#5} +\setcounter{GFM@staveLineNumberBreakPointF}{#6} +} + + +\NewDocumentCommand\notenzeile{O{\linewidth} m m O{\empty} O{\empty} O{\empty} O{\empty} O{\empty}}{% + {% + %Multilines + \ifx\multiline\undefined% + \NewDocumentCommand{\multiline}{m m m O{\empty} O{\empty} O{\empty} O{\empty}}{% + \parbox[c]{##1}{% + \newdimen\temp% + \temp=\dimexpr\f@size pt% + \vskip 0.27\temp\relax% + \makebox[\linewidth]{##2}% + \spaceBetweenSongLyrics% + \makebox[\linewidth]{##3}% + \ifx##4\empty% + \else% + \spaceBetweenSongLyrics% + \makebox[\linewidth]{##4}% + \fi% + \ifx##5\empty% + \else% + \spaceBetweenSongLyrics% + \makebox[\linewidth]{##5}% + \fi% + \ifx##6\empty% + \else% + \spaceBetweenSongLyrics% + \makebox[\linewidth]{##6}% + \fi% + \ifx##7\empty% + \else% + \spaceBetweenSongLyrics% + \makebox[\linewidth]{##7}% + \fi% +% \vskip 0.27\temp%% + }% + }% + \fi% multiline undefined? + % + \noindent% + \begin{minipage}{#1}% + \relax% + \spaceBeforeNotes% + \makebox[\linewidth]{#2}% + \relax\mbox{}\spaceAfterNotes% + \spaceBeforeSongLyrics% + \GFM@LB@songLyrics{#3}% + \ifx#4\empty% + \else% + \spaceBetweenSongLyrics% + \GFM@LB@songLyrics{#4}% + \fi% + \ifx#5\empty% + \else% + \spaceBetweenSongLyrics% + \GFM@LB@songLyrics{#5}% + \fi% + \ifx#6\empty% + \else% + \spaceBetweenSongLyrics% + \GFM@LB@songLyrics{#6}% + \fi% + \ifx#7\empty% + \else% + \spaceBetweenSongLyrics% + \GFM@LB@songLyrics{#7}% + \fi% + \ifx#8\empty% + \else% + \spaceBetweenSongLyrics% + \GFM@LB@songLyrics{#8}% + \fi% + \spaceAfterSongLyrics% + \end{minipage}\vskip0pt% + \ifnum\c@GFM@staveLineNumberBreakPointA=\c@staveLineNumber\relax% + \newpage% + \fi% + \ifnum\c@GFM@staveLineNumberBreakPointB=\c@staveLineNumber\relax% + \newpage% + \fi% + \ifnum\c@GFM@staveLineNumberBreakPointC=\c@staveLineNumber\relax% + \newpage% + \fi% + \ifnum\c@GFM@staveLineNumberBreakPointD=\c@staveLineNumber\relax% + \newpage% + \fi% + \ifnum\c@GFM@staveLineNumberBreakPointE=\c@staveLineNumber\relax% + \newpage% + \fi% + \ifnum\c@GFM@staveLineNumberBreakPointF=\c@staveLineNumber\relax% + \newpage% + \fi% + \stepcounter{staveLineNumber}%Counter for the current stave line + }% +} + + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%% Environment for strophes %%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + +%%% Control of the page break in strophes +\newif\ifpageBreakAllowed +\pageBreakAllowedfalse %default +\newlength{\GFM@LB@indent@temp@length} + +\newcounter{GFM@strophe@counter} +\setcounter{GFM@strophe@counter}{-1} + +\newcounter{GFM@stropheNumberBreakPointA} +\newcounter{GFM@stropheNumberBreakPointB} +\newcounter{GFM@stropheNumberBreakPointC} +\newcounter{GFM@stropheNumberBreakPointD} +\newcounter{GFM@stropheNumberBreakPointE} +\newcounter{GFM@stropheNumberBreakPointF} + + +%usage: \forcePageBreakAfterStrophe{3}[4][2]... +\NewDocumentCommand\forcePageBreakAfterStrophe{m O{0} O{0} O{0} O{0} O{0}}{ +\setcounter{GFM@stropheNumberBreakPointA}{#1} +\setcounter{GFM@stropheNumberBreakPointB}{#2} +\setcounter{GFM@stropheNumberBreakPointC}{#3} +\setcounter{GFM@stropheNumberBreakPointD}{#4} +\setcounter{GFM@stropheNumberBreakPointE}{#5} +\setcounter{GFM@stropheNumberBreakPointF}{#6} +} + + +%automatic strophe numbering + +\NewEnviron{strophe}[1][-1]{ + \ifnum#1=-1% + %leer + \else% + \setcounter{GFM@strophe@counter}{#1}% + \fi% + \penalty-1500\relax% + \ifpageBreakAllowed% + \penalty1500\relax% + \spaceBeforeStrophe% + \arabic{GFM@strophe@counter}.~\BODY% + \penalty1500\relax% + \spaceAfterStrophe% + \else% +%% Alternative (worse) implementation: +%% \GFM@LB@indent@temp@length\parindent% +%% \noindent% +%% \parbox{\linewidth}{% + \begin{samepage}% + \parindent \GFM@LB@indent@temp@length\indent% + \penalty1500\relax% + \spaceBeforeStrophe% + \arabic{GFM@strophe@counter}.~\BODY% + \penalty1500\relax% + \spaceAfterStrophe% +%% }%parbox + \end{samepage}% + \fi% + \ifnum\c@GFM@stropheNumberBreakPointA=\c@GFM@strophe@counter\relax% + \newpage% + \fi% + \ifnum\c@GFM@stropheNumberBreakPointB=\c@GFM@strophe@counter\relax% + \newpage% + \fi% + \ifnum\c@GFM@stropheNumberBreakPointC=\c@GFM@strophe@counter\relax% + \newpage% + \fi% + \ifnum\c@GFM@stropheNumberBreakPointD=\c@GFM@strophe@counter\relax% + \newpage% + \fi% + \ifnum\c@GFM@stropheNumberBreakPointE=\c@GFM@strophe@counter\relax% + \newpage% + \fi% + \ifnum\c@GFM@stropheNumberBreakPointF=\c@GFM@strophe@counter\relax% + \newpage% + \fi% + \stepcounter{GFM@strophe@counter}% +}% + + + +%%%%%%%%%%%%%%% +%%% Spacing %%% +%%%%%%%%%%%%%%% + +%%% Head +\def\setSpaceBeforeHeadValue#1{\def\spaceBeforeHeadValue{#1}} +\def\setSpaceAfterHeadValue#1{\def\spaceAfterHeadValue{#1}} + +%%% Notes +\def\setSpaceBeforeNotesValue#1{\def\spaceBeforeNotesValue{#1}} +\def\setSpaceAfterNotesValue#1{\def\spaceAfterNotesValue{#1}} + +%%% Strophes +\def\setSpaceBeforeStropheValue#1{\def\spaceBeforeStropheValue{#1}} +\def\setSpaceAfterStropheValue#1{\def\spaceAfterStropheValue{#1}} + +%%% Song lyrics +\def\setSpaceBeforeSongLyricsValue#1{\def\spaceBeforeSongLyricsValue{#1}} +\def\setSpaceBetweenSongLyricsValue#1{\def\spaceBetweenSongLyricsValue{#1}} +\def\setSpaceAfterSongLyricsValue#1{\def\spaceAfterSongLyricsValue{#1}} + + +%%% Foot +\def\setSpaceBeforeFootValue#1{\def\spaceBeforeFootValue{#1}} +\def\setSpaceAfterFootValue#1{\def\spaceAfterFootValue{#1}} + + + + +%%% Horizontal spacing +\def\setSpaceStropheIndentValue#1{\def\spaceStropheIndentValue{#1}} +\def\setSpaceHeadIndentValue#1{\def\spaceHeadIndentValue{#1}} +\def\setSpaceFootIndentValue#1{\def\spaceFootIndentValue{#1}} + + +%%% Arranging the space values +\def\spaceBeforeHead{\vskip\spaceBeforeHeadValue\relax\noindent\mbox{}\hskip\spaceHeadIndentValue\mbox{}} + +\def\spaceAfterHead{\relax\vskip\spaceAfterHeadValue\relax} + +\def\spaceBeforeNotes{\relax\vskip\spaceBeforeNotesValue\relax} + +\def\spaceAfterNotes{\relax\vskip\spaceAfterNotesValue\relax} + +\def\spaceBeforeStrophe{\relax\vskip\spaceBeforeStropheValue\noindent\hskip\spaceStropheIndentValue\relax} + +\def\spaceAfterStrophe{\relax\vskip\spaceAfterStropheValue\relax} + +\def\spaceBeforeSongLyrics{\relax\vskip\spaceBeforeSongLyricsValue\relax} + +\def\spaceBetweenSongLyrics{\relax\vskip\spaceBetweenSongLyricsValue\relax} + +\def\spaceAfterSongLyrics{\relax\vskip\spaceAfterSongLyricsValue \relax} + +\def\spaceBeforeFoot{\relax\vskip\spaceBeforeFootValue \noindent \hskip\spaceFootIndentValue\relax} + +\def\spaceAfterFoot{\relax\vskip\spaceAfterFootValue\relax} + + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%% Styling of header and footer %%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\newcommand{\LBHead}[1]{% +\long\def\GFM@LB@Head{\spaceBeforeHead #1\relax\spaceAfterHead\mbox{}}% +}% + + +\newcommand{\LBFoot}[1]{% +\long\def\GFM@LB@Foot{\spaceBeforeFoot #1\relax\spaceAfterFoot}% +}% + + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%% Environments for creating %%% +%%% the songbooks (liederbuch) %%% +%%% and the songs (lied) %%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%liederbuch environment +\NewEnviron{liederbuch}[2][]{% +\def\GFM@LB@LiederbuchNameTmp{#2}% +%%lied environment %cslet +\NewEnviron{lied}[3][]{% +%##1=meta data ##2=variant ##3=nummer +\def\GFM@LB@LiederbuchVariantTmp{##2}% +\def\GFM@LB@LiederbuchNumberTmp{##3}% +\GFM@LB@unpackage{##1}% +\GFM@LB@unpackage{#1}% +\global\cslet{liedBody;\GFM@LB@LiederbuchNameTmp;##2;##3}\BODY% +}% +\BODY% Without this, the command sequences inside the environment won't be defined. That means, the whole content of the songbook (liederbuch) is thrown away. +} + + +%Forward onto environment +\newcommand{\LBsong}[3]{% +%#1=songbook #2=number #3=variant +{%local +\setlength{\parindent}{0pt}% +\setlength{\parskip}{0pt}% +% +% +\NewDocumentCommand{\print}{O{\empty} m}{% + \expandafter\ifx\csname GFM@LB@lied@#1@#3@#2@##2\endcsname\relax% + \else% + ##1% + \fi% + \csname GFM@LB@lied@#1@#3@#2@##2\endcsname% + \mbox{}% +}% +\GFM@LB@Head% +% +\setcounter{staveLineNumber}{1}%reset note line counter +% +%%%%%%%%%%%%%%%%%%%%%%%%%% +\csuse{liedBody;#1;#3;#2}% +%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%reset page break points = no page breaks: +\setcounter{GFM@staveLineNumberBreakPointA}{0}% +\setcounter{GFM@staveLineNumberBreakPointB}{0}% +\setcounter{GFM@staveLineNumberBreakPointC}{0}% +\setcounter{GFM@staveLineNumberBreakPointD}{0}% +\setcounter{GFM@staveLineNumberBreakPointE}{0}% +\setcounter{GFM@staveLineNumberBreakPointF}{0}% +\setcounter{GFM@stropheNumberBreakPointA}{0}% +\setcounter{GFM@stropheNumberBreakPointB}{0}% +\setcounter{GFM@stropheNumberBreakPointC}{0}% +\setcounter{GFM@stropheNumberBreakPointD}{0}% +\setcounter{GFM@stropheNumberBreakPointE}{0}% +\setcounter{GFM@stropheNumberBreakPointF}{0}% +% +% +\GFM@LB@Foot% +% +% +}%local +\penalty-3500% +}% + + +%%%%%%%%%%%%%%%%%%%%%% +%%% %%% +%%% Default values %%% +%%% %%% +%%%%%%%%%%%%%%%%%%%%%% + + +%%% Default header and footer %%% +\long\def\GFM@LB@Head{\spaceBeforeHead\mbox{}\print{title} \ \newline \print{composer}\spaceAfterHead }%Standardwerte +\long\def\GFM@LB@Foot{\spaceBeforeFoot\mbox{}\print{source} \hfill \print{date}\spaceAfterFoot}%Standardwerte + +\setSpaceBeforeHeadValue{0pt plus 3pt} +\setSpaceAfterHeadValue{0pt plus 3pt} +\setSpaceBeforeNotesValue{0pt plus 1pt} +\setSpaceAfterNotesValue{0pt plus 1pt} +\setSpaceBeforeStropheValue{0pt plus 1pt} +\setSpaceAfterStropheValue{0pt plus 3pt} +\setSpaceBetweenSongLyricsValue{0pt plus 3pt} +\setSpaceBeforeSongLyricsValue{0pt plus 1pt} +\setSpaceAfterSongLyricsValue{0pt plus 3pt} +\setSpaceBeforeFootValue{0pt plus 3pt} +\setSpaceAfterFootValue{0pt plus 70pt} + +\setSpaceStropheIndentValue{0pt} +\setSpaceHeadIndentValue{0pt} +\setSpaceFootIndentValue{0pt} + + + + + +%%%%%%%%%%%%%% +%%% Styles %%% +%%%%%%%%%%%%%% + +%\moderncvstyle{casual} +%\moderncvcolor{blue} +% +%\def\GFMliederbuchStyle#1#2{% +%%openStyle +% +% +% +% +%%test if +%} +% +%\GFM@LB@color#1#2{% +%%if #1 = '0' => ifndef \farbzähler => def + \fz=0 : \fz=0 : \fz++ +% +%} + +%number of colors used in a style. It has to match the number defined in the color scheme +\newcount\GFM@LB@numberOfColors +\GFM@LB@numberOfColors=3 + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%Altlasten +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + + diff --git a/Master/texmf-dist/tex/latex/liederbuch/printliederbuch.sty b/Master/texmf-dist/tex/latex/liederbuch/printliederbuch.sty new file mode 100644 index 00000000000..7ef940258e4 --- /dev/null +++ b/Master/texmf-dist/tex/latex/liederbuch/printliederbuch.sty @@ -0,0 +1,56 @@ +\ProvidesPackage{printLiederbuch} + +\RequirePackage{liederbuch} +\RequirePackage{hyperref} + +%toc @ begin +%\AtBeginDocument{\tableofcontents} + +\ExplSyntaxOn + + +\newcommand{\printLiederbuch}[1]{ +\section{#1} + \fbox + { + \begin{tabular}{l l} + Meta ~ data ~ name & Meta ~ data ~ value ~ \\ + \hline + \tl_use:N \csuse{liederbuchMeta;#1} + \end{tabular} + }%fbox + +\csuse{liederbuchBody;#1} +} + + +\RenewEnviron{Liederbuch}[2][]{ + \gdef\equals{=} + \global\cslet{liederbuchBody;#2}\BODY + \tl_set:Nn \l_tmpa_tl { #1 } + \tl_replace_all:Nnn \l_tmpa_tl { & } { \\ } + \tl_replace_all:Nnn \l_tmpa_tl { = } { & } + \global\cslet{liederbuchMeta;#2}\l_tmpa_tl +} + + +\NewDocumentEnvironment{Lied}{O{}mm +b} + { + \subsection{#3\ --\ Variant:\ #2} + \tl_set:Nn \l_tmpa_tl { #1 } + \tl_replace_all:Nnn \l_tmpa_tl { & } { \\ } + \tl_replace_all:Nnn \l_tmpa_tl { = } { & } + \fbox + { + \begin{tabular}{l l} + Meta ~ data ~ name & Meta ~ data ~ value ~ \\ + \hline + \tl_use:N \l_tmpa_tl + \end{tabular} + }%fbox + \par#4\par +}{} +\ExplSyntaxOff + + + diff --git a/Master/texmf-dist/tex/latex/newtx/newtx.sty b/Master/texmf-dist/tex/latex/newtx/newtx.sty index 8d86b9aeaf4..248532224ac 100644 --- a/Master/texmf-dist/tex/latex/newtx/newtx.sty +++ b/Master/texmf-dist/tex/latex/newtx/newtx.sty @@ -1,8 +1,8 @@ \NeedsTeXFormat{LaTeX2e} %Package to simplify loading of newtxmath with a text font family such as newtxtext for all latex engines, or for newtxtext and an otf math package. -\def\fileversion{1.751} -\def\filedate{2024/06/22} +\def\fileversion{1.755} +\def\filedate{2025/01/06} \ProvidesPackage{newtx}[% \filedate\space v\fileversion (Michael Sharpe) latex and unicode latex support for newtxmath and a supported text font family, or for newtxtext and an otf math package] @@ -208,10 +208,10 @@ propmathfigs,curlybraces,cochrho,cochf,alty,alth,liby,nochvw} \def\ntx@sc{BaskervilleF@scale}\def\ntx@TF{baskervillef} \let\ntx@MF\ntx@TF\def\ntx@id{7}\def\ntx@minfam{minbaskervillef}\fi} \DeclareOptionX{baskervaldx}[true]{\@nameuse{if#1} - \def\ntx@sc{Baskervaldx@scale}\def\ntx@TF{baskervaldx} + \def\ntx@sc{Baskervaldx@scale}\def\ntx@TF{Baskervaldx} \let\ntx@MF\ntx@TF\def\ntx@id{8}\def\ntx@minfam{minbaskervaldx}\fi} \DeclareOptionX{Baskervaldx}[true]{\@nameuse{if#1} - \def\ntx@sc{Baskervaldx@scale}\def\ntx@TF{baskervaldx} + \def\ntx@sc{Baskervaldx@scale}\def\ntx@TF{Baskervaldx} \let\ntx@MF\ntx@TF\def\ntx@id{8}\def\ntx@minfam{minbaskervaldx}\fi} %\DeclareOptionX{utopia}[true]{% % \@nameuse{if#1}\def\ntx@TF{utopia}\let\ntx@MF\ntx@TF\def\ntx@id{0}\def\ntx@minfam{}\fi} @@ -804,11 +804,8 @@ propmathfigs,curlybraces,cochrho,cochf,alty,alth,liby,nochvw} %\fi %\DeclareTextFontCommand{\textlf}{\liningnums} %\fi % end ifcase -\ifnum\ntx@id=16\relax -\else % create \textsmsmde for other than minion and gelasio -% We move the small font to the text baseline and scale it by \tx@sfrSC, for use only in the \textsfrac macro. -\ifnum\ntx@id=4\relax -\else +\ifthenelse{\equal{}{\tx@sfrac}\OR\ntx@id=16\OR\ntx@id=4}{}{% +%case \textsfrac defined, not minion nor gelasio \ifnum\tx@debase=0 \newcommand*{\textsmde}[1]{% \setbox0=\hbox{\scalebox\tx@sfrSC{\textde{#1}}}\box0} @@ -816,13 +813,22 @@ propmathfigs,curlybraces,cochrho,cochf,alty,alth,liby,nochvw} \newdimen\tx@u \newdimen\tx@v \tx@u=-\tx@debase pt \tx@toex{\strip@pt\tx@u}\tx@y=\tx@x - %\showthe\tx@y - \tx@v=\strip@pt\tx@y ex + \tx@v=\strip@pt\tx@y ex \newcommand*{\textsmde}[1]{% \setbox2=\hbox{\textde{#1}}% \setbox1=\hbox{\raise \tx@v \box2}% \setbox0=\hbox{\scalebox{\tx@sfrSC}{\box1}}\box0} \fi %\ifnum\tx@debase=0 -\fi %\ifnum\ntx@id=4 -\fi %\ifnum\ntx@id=16 +} +%\def\tx@mksmde{% +%\ifnum\ntx@id=16\relax +%\else % create \textsmsmde for other than minion and gelasio +%% We move the small font to the text baseline and scale it by \tx@sfrSC, for use only in the \textsfrac macro. +%\ifnum\ntx@id=4\relax +%\else +%\fi %\ifnum\ntx@id=4 +%\fi %\ifnum\ntx@id=16 +%} +%\if X\tx@sfrac\tx@mksmde\fi + \endinput diff --git a/Master/texmf-dist/tex/latex/nlctdoc/nlctdoc.cls b/Master/texmf-dist/tex/latex/nlctdoc/nlctdoc.cls index d03ef8dda25..f93416bb066 100644 --- a/Master/texmf-dist/tex/latex/nlctdoc/nlctdoc.cls +++ b/Master/texmf-dist/tex/latex/nlctdoc/nlctdoc.cls @@ -4,7 +4,7 @@ % copy the code here to another file and modify it for your own purposes. % There's no guarantee that it will work with other packages. % -% Copyright 2013-2024 Nicola Talbot +% Copyright 2013-2025 Nicola Talbot % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -18,7 +18,7 @@ % for existing documents that use it. \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{nlctdoc}[2024/11/09 v1.11 (NLCT)] +\ProvidesClass{nlctdoc}[2025/01/03 v1.12 (NLCT)] \RequirePackage{ifpdf} \RequirePackage{ifxetex} % tex4ht stopped working with koma during TL2013. diff --git a/Master/texmf-dist/tex/latex/nlctdoc/nlctuserguide.sty b/Master/texmf-dist/tex/latex/nlctdoc/nlctuserguide.sty index f2dc355469b..35e50dd8bc9 100644 --- a/Master/texmf-dist/tex/latex/nlctdoc/nlctuserguide.sty +++ b/Master/texmf-dist/tex/latex/nlctdoc/nlctuserguide.sty @@ -4,7 +4,7 @@ % copy the code here to another file and modify it for your own purposes. % There's no guarantee that it will work with other packages. % -% Copyright 2022-2024 Nicola Talbot +% Copyright 2022-2025 Nicola Talbot % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -15,7 +15,7 @@ % version 2005/12/01 or later. \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{nlctuserguide}[2024/11/09 v1.11 (NLCT)] +\ProvidesPackage{nlctuserguide}[2025/01/03 v1.12 (NLCT)] \newcommand{\nlctdoc@loadxr}{} \DeclareOption{xr}{\renewcommand{\nlctdoc@loadxr}{\RequirePackage{xr-hyper}}} @@ -573,8 +573,10 @@ \newrobustcmd{\mExampleref}[1]{\Exampleref{#1}\examplemarginref{#1}} \newrobustcmd{\mexampleref}[1]{\exampleref{#1}\examplemarginref{#1}} +\newcommand{\exmarginfont}{\color{black}\footnotesize}% v1.12 + \newrobustcmd{\examplemarginref}[1]{% - \marginpar{\footnotesize\hyperref[#1]{\codesym}\ref{#1}\plabel{#1-backref}}% + \marginpar{\exmarginfont\hyperref[#1]{\codesym}\ref{#1}\plabel{#1-backref}}% } \newcommand*{\plabel}[2][]{\protected@edef\@currentlabelname{#1}\label{#2}} @@ -923,6 +925,7 @@ engine (\XeLaTeX\ or \LuaLaTeX)} % inline \newcommand{\code}[1]{\texorpdfstring{\@code{#1}}{#1}} \newrobustcmd{\@code}[1]{{\setupcodeenvfmts\codefont\obeyspaces #1}} +\newcommand{\smcode}[1]{\@code{\small #1}} \definecolor{codebackground}{gray}{0.95} @@ -1992,6 +1995,7 @@ to find out if the example files are installed on your device.\par \newcommand*{\oarg}[1]{\discretionary{}{}{}[#1]} \newcommand*{\oargm}[1]{\oarg{\meta{#1}}} +\newcommand*{\oargnobr}[1]{\discretionary{}{}{}\mbox{[#1]}}% v1.12 % To prevent lonely [ and ] from upsetting the syntax highlighter: \newrobustcmd*{\nlctopensqbracket}{[} @@ -2306,6 +2310,8 @@ to find out if the example files are installed on your device.\par \glsxtrifhasfield{syntax}{opt.#2}{\dequals\glscurrentfieldvalue}{}}% } +\newcommand{\summarytagfill}{\space\allowbreak\mbox{}\nolinebreak\hfill}% v1.12 + \newcommand{\@cmddef@init}{% \let\csfmtfont\@firstofone \def\cmdfont##1{\textbf{\texttt{##1}}}% @@ -2321,7 +2327,7 @@ to find out if the example files are installed on your device.\par \gathermodifiers{#2}% \gathervariants{#2}% \cmddefsyntax{#1}{#2}% - \def\tagsep{\hfill}% + \def\tagsep{\summarytagfill}% \ifdefempty\nlctmodifierlist {% \ifdefempty\nlctvariantlist @@ -2604,7 +2610,7 @@ to find out if the example files are installed on your device.\par \def\optfmt##1{\textbf{\texttt{##1}}}% \mainglsadd{opt.#1}{optdef}\glsxtrglossentry{opt.#1}% \glsxtrifhasfield{syntax}{opt.#1}{\texttt{=\glscurrentfieldvalue}}{}% - \ifdefempty\initordefval{}{\hfill\initordefval}% + \ifdefempty\initordefval{}{\summarytagfill\initordefval}% \glsxtrifhasfield*{note}{opt.#1}% {% \ifx\optnotefmt\@gobble @@ -2746,7 +2752,7 @@ to find out if the example files are installed on your device.\par \par\medskip\ignorespaces } -\newrobustcmd*{\summarytagfmt}[1]{\textnormal{\em #1:} } +\newrobustcmd*{\summarytagfmt}[1]{\textnormal{\em #1:}~} \newcommand*{\getinitordefval}[1]{% \let\currentsyntax\@empty @@ -3279,7 +3285,7 @@ to find out if the example files are installed on your device.\par \gathermodifiers{#1}% \ifdefempty\nlctmodifierlist{} {% - \hfill\summarytagfmt{\nlctmodifiertag}\nlctmodifierlist + \summarytagfill\summarytagfmt{\nlctmodifiertag}\nlctmodifierlist \gdef\summaryentry@post@fill{\quad }% }% } @@ -3291,7 +3297,7 @@ to find out if the example files are installed on your device.\par \syntax{#1}% \glsxtrifhasfield{initvalue}{#1}% {% - \hfill\summarytagfmt{initial}\glscurrentfieldvalue + \summarytagfill\summarytagfmt{initial}\glscurrentfieldvalue \gdef\summaryentry@post@fill{\quad }% }% {% @@ -3302,12 +3308,12 @@ to find out if the example files are installed on your device.\par \ifdefempty\nlctvariantlist {}% {% - \hfill\summarytagfmt{\nlctvarianttag}\nlctvariantlist + \summarytagfill\summarytagfmt{\nlctvarianttag}\nlctvariantlist \gdef\summaryentry@post@fill{\quad }% }% }% {% - \hfill\summarytagfmt{\nlctmodifiertag}\nlctmodifierlist + \summarytagfill\summarytagfmt{\nlctmodifiertag}\nlctmodifierlist \gdef\summaryentry@post@fill{\quad }% }% }% @@ -3333,7 +3339,7 @@ to find out if the example files are installed on your device.\par \def\optiontag{#1}% \textbf{\linkedentryname{#2}}% \ifdefempty\currentsyntax{}{\dequals\currentsyntax}% - \hfill + \summarytagfill \textrm{\ifdefempty\initordefval{}{\initordefval}% \ifdefempty\optiontag{}{ \optiontag}}% \gdef\summaryentry@post@fill{ }% @@ -3344,7 +3350,7 @@ to find out if the example files are installed on your device.\par \getinitordefval{#1}% \textbf{\linkedentryname{#1}}% \ifdefempty\currentsyntax{}{\dequals\currentsyntax}% - \hfill + \summarytagfill \textrm{\ifdefempty\initordefval{}{\initordefval}% \ifdefempty\settingstitle{}{ \settingstitle}}% \gdef\summaryentry@post@fill{ }% diff --git a/Master/texmf-dist/tex/latex/pixelarttikz/PixelArtTikz.sty b/Master/texmf-dist/tex/latex/pixelarttikz/PixelArtTikz.sty index aacfcb12414..bcd4f6c79a1 100644 --- a/Master/texmf-dist/tex/latex/pixelarttikz/PixelArtTikz.sty +++ b/Master/texmf-dist/tex/latex/pixelarttikz/PixelArtTikz.sty @@ -1,8 +1,9 @@ % Author.........: C. Pierquet -% licence........: Released under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txtf +% licence........: Released under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txt \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{PixelArtTikz}[2024/10/31 v0.1.5 PixelArts with csv and TikZ] +\ProvidesPackage{PixelArtTikz}[2025/01/04 v0.1.6 PixelArts with csv and TikZ] +% 0.1.6 Ajout d'un style pour les traits + utilisation de datatool (plus rapide ?) % 0.1.5 Amélioration du code interne + possibilité de créer des grilles avec des symboles choisis dans une liste % 0.1.4 Cylinder anamorphic pixelart % 0.1.3 Split PA into grid @@ -25,8 +26,6 @@ \RequirePackage{multicol} \RequirePackage{listofitems} \RequirePackage{ifthen} -%librairies tikz -%\usetikzlibrary{calc,shapes.geometric} %cvs \if@csvii \RequirePackage[legacy]{csvsimple} @@ -35,6 +34,11 @@ \RequirePackage[l3]{csvsimple} \fi +%------Styles tikz +\tikzset{pixlarttrait/.style={}} +\tikzset{pixlarttraitdecoup/.style={thick,purple}} +\tikzset{pixlartnoticedecoup/.style={font=\large\sffamily}} + \NewDocumentCommand\TraiteListeSymbPixelArt{ m }{% \IfSubStr{#1}{§}% {% @@ -79,22 +83,12 @@ \csvloop{file=#4,no head,command={% \foreach \l [count=\n] in \csvline {% \StrDel{\l}{ }[\l]% - %\setsepchar{,}% - %\readlist*\LCPA\PATcouleurs% \StrPosition{\PATlettres}{\l}[\pixcnt]% \ifnum\pixcnt>0% \ifboolKV[pixelarttkz]{BordCases}% {\draw[fill={\LCPA[\pixcnt]}] ({\n-0.5},{-\thecsvrow+0.5}) rectangle ({\n+0.5},{-\thecsvrow-0.5}) ;}% {\filldraw[{\LCPA[\pixcnt]}] ({\n-0.5},{-\thecsvrow+0.5}) rectangle ({\n+0.5},{-\thecsvrow-0.5}) ;}% \fi% - %\xintifboolexpr{\pixcnt>0}% - % {% - % %\itemtomacro\LCPA[\pixcnt]\pixcol% - % \ifboolKV[pixelarttkz]{BordCases}% - % {\draw[fill={\LCPA[\pixcnt]}] ({\n-0.5},{-\thecsvrow+0.5}) rectangle ({\n+0.5},{-\thecsvrow-0.5}) ;}% - % {\filldraw[{\LCPA[\pixcnt]}] ({\n-0.5},{-\thecsvrow+0.5}) rectangle ({\n+0.5},{-\thecsvrow-0.5}) ;}% - % }% - % {}% }% }% }% @@ -105,8 +99,6 @@ \csvloop{file=#4,no head,command={% \foreach \l [count=\n] in \csvline {% \StrDel{\l}{ }[\l]% - %\setsepchar{,}% - %\readlist*\LCNA\PATchiffres% \StrPosition{\PATlettres}{\l}[\pixpos]% \xintifboolexpr{\pixpos>0}% {% @@ -142,8 +134,8 @@ \IfSubStr{\PATdecoup}{x}% {% \StrCut{\PATdecoup}{x}{\NbLigBloc}{\NbColBloc}%tracés des traits - \foreach \i in {0,\NbLigBloc,...,\NbLigTot}{\draw[thick,purple] ({0.5-0.33},{-\i-0.5}) -- ({\thecsvcolumncount+0.5+0.33},{-\i-0.5}) ;}% - \foreach \j in {0,\NbColBloc,...,\NbColTot}{\draw[thick,purple] ({\j+0.5},{-0.5+0.33}) -- ({\j+0.5},{-\thecsvinputline+0.5-0.33}) ;}% + \foreach \i in {0,\NbLigBloc,...,\NbLigTot}{\draw[pixlarttraitdecoup] ({0.5-0.33},{-\i-0.5}) -- ({\thecsvcolumncount+0.5+0.33},{-\i-0.5}) ;}% + \foreach \j in {0,\NbColBloc,...,\NbColTot}{\draw[pixlarttraitdecoup] ({\j+0.5},{-0.5+0.33}) -- ({\j+0.5},{-\thecsvinputline+0.5-0.33}) ;}% }% {}% \IfSubStr{\PATdecoup}{+}% @@ -151,8 +143,8 @@ \StrCut{\PATdecoup}{+}{\NbBlocLIG}{\NbBlocCOL}% \def\NbLigBloc{\xintieval{(\NbLigTot-1)/\NbBlocLIG}}% \def\NbColBloc{\xintieval{(\NbColTot)/\NbBlocCOL}}% - \foreach \i in {0,\NbLigBloc,...,\NbLigTot}{\draw[thick,purple] ({0.5-0.33},{-\i-0.5}) -- ({\thecsvcolumncount+0.5+0.33},{-\i-0.5}) ;}% - \foreach \j in {0,\NbColBloc,...,\NbColTot}{\draw[thick,purple] ({\j+0.5},{-0.5+0.33}) -- ({\j+0.5},{-\thecsvinputline+0.5-0.33}) ;}% + \foreach \i in {0,\NbLigBloc,...,\NbLigTot}{\draw[pixlarttraitdecoup] ({0.5-0.33},{-\i-0.5}) -- ({\thecsvcolumncount+0.5+0.33},{-\i-0.5}) ;}% + \foreach \j in {0,\NbColBloc,...,\NbColTot}{\draw[pixlarttraitdecoup] ({\j+0.5},{-0.5+0.33}) -- ({\j+0.5},{-\thecsvinputline+0.5-0.33}) ;}% }% {}% }% @@ -171,8 +163,6 @@ \csvloop{file=#3,no head,command={% \foreach \l [count=\n] in \csvline {% \StrDel{\l}{ }[\l]% - %\setsepchar{,}% - %\readlist*\LCPA\PATcouleurs% \StrPosition{\PATlettres}{\l}[\pixcnt]% \xintifboolexpr{\pixcnt>0}% {% @@ -192,8 +182,6 @@ \csvloop{file=#3,no head,command={% \foreach \l [count=\n] in \csvline {% \StrDel{\l}{ }[\l]% - %\setsepchar{,}% - %\readlist*\LCNA\PATchiffres% \StrPosition{\PATlettres}{\l}[\pixpos]% \xintifboolexpr{\pixpos>0}% {% @@ -254,8 +242,6 @@ \csvloop{file=#4,no head,command={% \foreach \l [count=\n] in \csvline {% \StrDel{\l}{ }[\l]% - %\setsepchar{,}% - %\readlist*\LCPA\PATcouleurs% \StrPosition{\PATlettres}{\l}[\pixcnt]% \xintifboolexpr{\pixcnt>0}% {% @@ -275,8 +261,6 @@ \csvloop{file=#4,no head,command={% \foreach \l [count=\n] in \csvline {% \StrDel{\l}{ }[\l]% - %\setsepchar{,}% - %\readlist*\LCNA\PATchiffres% \StrPosition{\PATlettres}{\l}[\pixpos]% \xintifboolexpr{\pixpos>0}% {% @@ -341,8 +325,6 @@ \csvloop{file=#3,no head,command={% \foreach \l [count=\n] in \csvline {% \StrDel{\l}{ }[\l]% - %\setsepchar{,}% - %\readlist*\LCPA\PATcouleurs% \StrPosition{\PATlettres}{\l}[\pixcnt]% \xintifboolexpr{\pixcnt>0}% {% @@ -362,8 +344,6 @@ \csvloop{file=#3,no head,command={% \foreach \l [count=\n] in \csvline {% \StrDel{\l}{ }[\l]% - %\setsepchar{,}% - %\readlist*\LCNA\PATchiffres% \StrPosition{\PATlettres}{\l}[\pixpos]% \xintifboolexpr{\pixpos>0}% {% @@ -500,6 +480,8 @@ \StrCut{#5}{/}{\NumBlocLig}{\NumBlocCol}% \xdef\PAfirstline{\xinteval{\NbLigBloc*(\NumBlocLig-1)+1}}% \xdef\PAlastline{\xinteval{\NbLigBloc*(\NumBlocLig-1)+\NbLigBloc}}% + \xdef\PAblocmin{\xinteval{(\NbColBloc*(\NumBlocCol-1)+1)}}% + \xdef\PAblocmax{\xinteval{(\NbColBloc*(\NumBlocCol-1)+\NbColBloc)}}% %affichage du corrigé / display of correction \begin{tikzpicture}[x=\PATunit cm,y=\PATunit cm,#2] \ifboolKV[pixelarttkz]{Correction}% @@ -507,7 +489,7 @@ \readlist*\LCPA\PATcouleurs% \csvloop{file=#3,range=\PAfirstline-\PAlastline,no head,command={% \foreach \l [count=\n] in \csvline {% - \xintifboolexpr{ \n >= (\NbColBloc*(\NumBlocCol-1)+1) 'and' \n <= (\NbColBloc*(\NumBlocCol-1)+\NbColBloc)}% + \xintifboolexpr{ \n >= \PAblocmin 'and' \n <= \PAblocmax}% {% \StrDel{\l}{ }[\l]% \setsepchar{,}% @@ -532,7 +514,7 @@ \readlist*\LCNA\PATchiffres% \csvloop{file=#3,range=\PAfirstline-\PAlastline,no head,command={% \foreach \l [count=\n] in \csvline {% - \xintifboolexpr{ \n >= (\NbColBloc*(\NumBlocCol-1)+1) 'and' \n <= (\NbColBloc*(\NumBlocCol-1)+\NbColBloc)}% + \xintifboolexpr{ \n >= \PAblocmin 'and' \n <= \PAblocmax}% {% \StrDel{\l}{ }[\l]% \setsepchar{,}% @@ -553,7 +535,7 @@ {%affichage du pixelart versions lettres ou chiffres simples (<=9) / display of letters/symbols PixelArt \csvloop{file=#3,range=\PAfirstline-\PAlastline,no head,command={% \foreach \l [count=\n] in \csvline {% - \xintifboolexpr{ \n >= (\NbColBloc*(\NumBlocCol-1)+1) 'and' \n <= (\NbColBloc*(\NumBlocCol-1)+\NbColBloc)}% + \xintifboolexpr{ \n >= \PAblocmin 'and' \n <= \PAblocmax}% {% \StrDel{\l}{ }[\l]% \IfSubStr{\PATlettres}{\l}% @@ -623,7 +605,7 @@ \begin{tikzpicture}[scale=#2,transform shape] \xintFor* ##1 in {\xintSeq{1}{\NbTotLig}}\do{% \xintFor* ##2 in {\xintSeq{1}{\NbTotCol}}\do{% - \draw[semithick] (##2,-##1) rectangle++(1,-1) node[midway] {\IfBooleanTF{#1}{##1.}{\StrChar{\PAalphabet}{##1}}##2} ; + \draw[semithick] (##2,-##1) rectangle++(1,-1) node[midway,pixlartnoticedecoup] {\IfBooleanTF{#1}{##1.}{\StrChar{\PAalphabet}{##1}}##2} ; }% }% \end{tikzpicture}% @@ -655,6 +637,8 @@ \StrCut{#5}{/}{\NumBlocLig}{\NumBlocCol}% \xdef\PAfirstline{\xinteval{\NbLigBloc*(\NumBlocLig-1)+1}}% \xdef\PAlastline{\xinteval{\NbLigBloc*(\NumBlocLig-1)+\NbLigBloc}}% + \xdef\PAblocmin{\xinteval{(\NbColBloc*(\NumBlocCol-1)+1)}}% + \xdef\PAblocmax{\xinteval{(\NbColBloc*(\NumBlocCol-1)+\NbColBloc)}}% %affichage du corrigé / display of correction \begin{tikzpicture}[x=\PATunit cm,y=\PATunit cm,#2] \ifboolKV[pixelarttkzen]{Correction}% @@ -662,7 +646,7 @@ \readlist*\LCPA\PATcouleurs% \csvloop{file=#3,range=\PAfirstline-\PAlastline,no head,command={% \foreach \l [count=\n] in \csvline {% - \xintifboolexpr{ \n >= (\NbColBloc*(\NumBlocCol-1)+1) 'and' \n <= (\NbColBloc*(\NumBlocCol-1)+\NbColBloc)}% + \xintifboolexpr{ \n >= \PAblocmin 'and' \n <= \PAblocmax}% {% \StrDel{\l}{ }[\l]% \setsepchar{,}% @@ -687,7 +671,7 @@ \readlist*\LCNA\PATchiffres% \csvloop{file=#3,range=\PAfirstline-\PAlastline,no head,command={% \foreach \l [count=\n] in \csvline {% - \xintifboolexpr{ \n >= (\NbColBloc*(\NumBlocCol-1)+1) 'and' \n <= (\NbColBloc*(\NumBlocCol-1)+\NbColBloc)}% + \xintifboolexpr{ \n >= \PAblocmin 'and' \n <= \PAblocmax}% {% \StrDel{\l}{ }[\l]% \setsepchar{,}% @@ -708,7 +692,7 @@ {%affichage du pixelart versions lettres ou chiffres simples (<=9) / display of letters/symbols PixelArt \csvloop{file=#3,range=\PAfirstline-\PAlastline,no head,command={% \foreach \l [count=\n] in \csvline {% - \xintifboolexpr{ \n >= (\NbColBloc*(\NumBlocCol-1)+1) 'and' \n <= (\NbColBloc*(\NumBlocCol-1)+\NbColBloc)}% + \xintifboolexpr{ \n >= \PAblocmin 'and' \n <= \PAblocmax}% {% \StrDel{\l}{ }[\l]% \IfSubStr{\PATlettres}{\l}% @@ -1065,5 +1049,199 @@ }% } +%-----With datatool, faster ? +\RequirePackage{datatool} + +\NewDocumentCommand\readdtcsv{ m m }{% + \DTLsetseparator{|}% + \DTLloaddb[noheader,keys={cvsline}]{#2}{#1}% +} + +\NewDocumentCommand\dtpixlarttikz{ O{} D<>{} m }{%commande autonome + \useKVdefault[pixelarttkz]% + \setKV[pixelarttkz]{#1}% + %affichage du corrigé / display of correction + \begin{tikzpicture}[x=\PATunit cm,y=\PATunit cm,#2] + \ifboolKV[pixelarttkz]{Correction}% + {% + \readlist*\LCPA\PATcouleurs% + \DTLforeach*{#3}{\csvline=cvsline}{% + \setsepchar{,}% + \readlist*\tmpcsvline\csvline% + \foreachitem\PAchar\in\tmpcsvline{% + \StrPosition{\PATlettres}{\PAchar}[\pixcnt]% + \ifnum\pixcnt>0% + \ifboolKV[pixelarttkz]{BordCases}% + {\draw[fill={\LCPA[\pixcnt]}] ({\PAcharcnt-0.5},{-\theDTLrowi+0.5}) rectangle++(1,-1) ;}% + {\filldraw[{\LCPA[\pixcnt]}] ({\PAcharcnt-0.5},{-\theDTLrowi+0.5}) rectangle++(1,-1) ;}% + \fi% + } + % \foreach \l [count=\n] in \csvline {%old vesion, with foreach ? + % \StrPosition{\PATlettres}{\l}[\pixcnt]% + % \ifnum\pixcnt>0% + % \ifboolKV[pixelarttkz]{BordCases}% + % {\draw[fill={\LCPA[\pixcnt]}] ({\n-0.5},{-\theDTLrowi+0.5}) rectangle ({\n+0.5},{-\theDTLrowi-0.5}) ;}% + % {\filldraw[{\LCPA[\pixcnt]}] ({\n-0.5},{-\theDTLrowi+0.5}) rectangle ({\n+0.5},{-\theDTLrowi-0.5}) ;}% + % \fi% + % }% + }% + }% + {% + \ifboolKV[pixelarttkz]{Symb}% + {%affichage du pixelart versions chiffres si besoin + \readlist*\LCNA\PATchiffres% + \DTLforeach*{#3}{\csvline=cvsline}{% + \setsepchar{,}% + \readlist*\tmpcsvline\csvline% + \foreachitem\PAchar\in\tmpcsvline{% + \StrPosition{\PATlettres}{\PAchar}[\pixpos]% + \xintifboolexpr{\pixpos>0}% + {% + \itemtomacro\LCNA[\pixpos]\pixchf% + \draw ({\PAcharcnt-0.5},{-\theDTLrowi+0.5}) rectangle++(1,-1) node[inner sep=0,midway,font=\PATtaille] {\TraiteListeSymbPixelArt{\pixchf}} ;% + }% + {}% + } + }% + }% + {%affichage du pixelart versions lettres ou chiffres simples (<=9) / display of letters/symbols PixelArt + \DTLforeach*{#3}{\csvline=cvsline}{% + \setsepchar{,}% + \readlist*\tmpcsvline\csvline% + \foreachitem\PAchar\in\tmpcsvline{% + \IfSubStr{\PATlettres}{\PAchar}% + {% + \draw ({\PAcharcnt-0.5},{-\theDTLrowi+0.5}) rectangle++(1,-1) node[inner sep=0,midway,font=\PATtaille] {\PAchar};% + }% + {}% + }% + }% + }% + }% + %affichage des découpages éventuels + \IfStrEq{\PATdecoup}{}% + {}% + {% + \xdef\NbLigTot{\DTLrowcount{#3}}% + \DTLgetvalue{\myvalrowone}{#3}{1}{1}% + \StrCount{\myvalrowone}{,}[\NbColTot]% + \xdef\NbColTot{\inteval{\NbColTot+1}}% + \IfSubStr{\PATdecoup}{x}% + {% + \StrCut{\PATdecoup}{x}{\NbLigBloc}{\NbColBloc}%tracés des traits + \foreach \i in {0,\NbLigBloc,...,\NbLigTot}{\draw[pixlarttraitdecoup] ({0.5-0.33},{-\i-0.5}) -- ({\NbColTot+0.5+0.33},{-\i-0.5}) ;}% + \foreach \j in {0,\NbColBloc,...,\NbColTot}{\draw[pixlarttraitdecoup] ({\j+0.5},{-0.5+0.33}) -- ({\j+0.5},{-\NbLigTot-0.5-0.33}) ;}% + }% + {}% + \IfSubStr{\PATdecoup}{+}% + {% + \StrCut{\PATdecoup}{+}{\NbBlocLIG}{\NbBlocCOL}% + \def\NbLigBloc{\xintieval{(\NbLigTot-1)/\NbBlocLIG}}% + \def\NbColBloc{\xintieval{(\NbColTot)/\NbBlocCOL}}% + \foreach \i in {0,\NbLigBloc,...,\NbLigTot}{\draw[pixlarttraitdecoup] ({0.5-0.33},{-\i-0.5}) -- ({\NbColTot+0.5+0.33},{-\i-0.5}) ;}% + \foreach \j in {0,\NbColBloc,...,\NbColTot}{\draw[pixlarttraitdecoup] ({\j+0.5},{-0.5+0.33}) -- ({\j+0.5},{-\NbLigTot-0.5-0.33}) ;}% + }% + {}% + }% + \end{tikzpicture}% +} + +\NewDocumentCommand\dtpixlarttikzblock{ O{} D<>{} m m m }{%commande individuelle avec loi & datatool... + %3=fichier + %4=taille blocs (LxC) ou nombre de blocs (L+C) + %5=numbloc + \useKVdefault[pixelarttkz]% + \setKV[pixelarttkz]{#1}% + \xdef\NbLigTot{\DTLrowcount{#3}}% + \DTLgetvalue{\myvalrowone}{#3}{1}{1}% + \StrCount{\myvalrowone}{,}[\NbColTot]% + \xdef\NbColTot{\inteval{\NbColTot+1}}% + \IfSubStr{#4}{x}% + {% + \StrCut{#4}{x}{\NbLigBloc}{\NbColBloc}% + }% + {}% + \IfSubStr{#4}{+}% + {% + \StrCut{#4}{+}{\NbBlocLIG}{\NbBlocCOL}% + \xdef\NbLigBloc{\xinteval{(\NbLigTot-1)/\NbBlocLIG}}% + \xdef\NbColBloc{\xinteval{(\NbColTot)/\NbBlocCOL}}% + }% + {}% + \StrCut{#5}{/}{\NumBlocLig}{\NumBlocCol}% + \xdef\PAfirstline{\xinteval{\NbLigBloc*(\NumBlocLig-1)+1}}% + \xdef\PAlastline{\xinteval{\NbLigBloc*(\NumBlocLig-1)+\NbLigBloc}}% + \xdef\PAblocmin{\xinteval{(\NbColBloc*(\NumBlocCol-1)+1)}}% + \xdef\PAblocmax{\xinteval{(\NbColBloc*(\NumBlocCol-1)+\NbColBloc)}}% + %affichage du corrigé / display of correction + \begin{tikzpicture}[x=\PATunit cm,y=\PATunit cm,#2] + \ifboolKV[pixelarttkz]{Correction}% + {% + \readlist*\LCPA\PATcouleurs% + \foreach \line in {\PAfirstline,...,\PAlastline}{% + \DTLgetvalue{\csvline}{#3}{\line}{1}% + \setsepchar{,}% + \readlist*\tmpcsvline\csvline% + \foreachitem\PAchar\in\tmpcsvline{% + \xintifboolexpr{ \PAcharcnt >= \PAblocmin 'and' \PAcharcnt <= \PAblocmax}% + {% + \StrPosition{\PATlettres}{\PAchar}[\pixcnt]% + \xintifboolexpr{\pixcnt>0}% + {% + \itemtomacro\LCPA[\pixcnt]\pixcol% + \ifboolKV[pixelarttkz]{BordCases}% + {\draw[fill=\pixcol] ({\PAcharcnt-0.5},{-\line+0.5}) rectangle++(1,-1) ;}% + {\filldraw[\pixcol] ({\PAcharcnt-0.5},{-\line+0.5}) rectangle++(1,-1) ;}% + }% + {}% + }% + {}% + }% + }% + }% + {% + \ifboolKV[pixelarttkz]{Symb}% + {%affichage du pixelart versions chiffres si besoin + \readlist*\LCNA\PATchiffres% + \foreach \line in {\PAfirstline,...,\PAlastline}{% + \DTLgetvalue{\csvline}{#3}{\line}{1}% + \setsepchar{,}% + \readlist*\tmpcsvline\csvline% + \foreachitem\PAchar\in\tmpcsvline{% + \xintifboolexpr{ \PAcharcnt >= \PAblocmin 'and' \PAcharcnt <= \PAblocmax}% + {% + \StrPosition{\PATlettres}{\PAchar}[\pixpos]% + \xintifboolexpr{\pixpos>0}% + {% + \itemtomacro\LCNA[\pixpos]\pixchf% + \draw ({\PAcharcnt-0.5},{-\line+0.5}) rectangle++(1,-1) node[inner sep=0,midway,font=\PATtaille] {\TraiteListeSymbPixelArt{\pixchf}} ;% + }% + {}% + }% + {}% + }% + }% + }% + {%affichage du pixelart versions lettres ou chiffres simples (<=9) / display of letters/symbols PixelArt + \foreach \line in {\PAfirstline,...,\PAlastline}{% + \DTLgetvalue{\csvline}{#3}{\line}{1}% + \setsepchar{,}% + \readlist*\tmpcsvline\csvline% + \foreachitem\PAchar\in\tmpcsvline{% + \xintifboolexpr{ \PAcharcnt >= \PAblocmin 'and' \PAcharcnt <= \PAblocmax}% + {% + \IfSubStr{\PATlettres}{\PAchar}% + {% + \draw ({\PAcharcnt-0.5},{-\line+0.5}) rectangle++(1,-1) node[inner sep=0,midway,font=\PATtaille] {\PAchar};% + }% + {}% + }% + {}% + }% + }% + }% + }% + \end{tikzpicture}% +} \endinput
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/plex-otf/plex-otf.sty b/Master/texmf-dist/tex/latex/plex-otf/plex-otf.sty index dbfbd819cf8..8d1dda9b56b 100644 --- a/Master/texmf-dist/tex/latex/plex-otf/plex-otf.sty +++ b/Master/texmf-dist/tex/latex/plex-otf/plex-otf.sty @@ -1,13 +1,13 @@ -%% $Id: plex-otf.sty 1041 2024-12-05 18:54:53Z herbert $ +%% $Id: plex-otf.sty 1052 2025-01-02 12:10:37Z herbert $ %% %% This file is distributed under the terms of the LaTeX Project Public %% License from CTAN archives in directory macros/latex/base/lppl.txt. %% Either version 1.3 or, at your option, any later version. %% -% Copyright 2023-2024 Herbert Voss hvoss@tug.org +% Copyright 2023-2025 Herbert Voss hvoss@tug.org %% \ProvidesPackage{plex-otf}[% - 2024/12/06 v. 0.09 (Herbert Voss) Supports plex OpenType for lualatex/xelatex.] + 2025/01/03 v. 0.10 (Herbert Voss) Supports plex OpenType for lualatex/xelatex.] % \RequirePackage{iftex,xkeyval,textcomp} \RequirePackage{unicode-math} @@ -379,10 +379,10 @@ \ifPlex@math \ifxetex \expandafter\setmathfont\expandafter[\PlexMM@features,version=normal]{IBMPlexMath-Regular.otf}% - \expandafter\setmathfont\expandafter[\PlexMM@features,FakeBold=3,version=bold]{IBMPlexMath-Regularath.otf}% + \expandafter\setmathfont\expandafter[\PlexMM@features,FakeBold=3,version=bold]{IBMPlexMath-Regular.otf}% \else - \expandafter\setmathfont\expandafter[\PlexMM@features,version=normal]{IBMPlexMath-Regular}% - \expandafter\setmathfont\expandafter[\PlexMM@features,FakeBold=3,version=bold]{IBMPlexMath-Regular}% + \expandafter\setmathfont\expandafter[\PlexMM@features,version=normal]{IBMPlexMath-Regular.otf}% + \expandafter\setmathfont\expandafter[\PlexMM@features,FakeBold=3,version=bold]{IBMPlexMath-Regular.otf}% \fi \mathversion{normal}% \fi% End ifMath diff --git a/Master/texmf-dist/tex/latex/profsio/ProfSio.sty b/Master/texmf-dist/tex/latex/profsio/ProfSio.sty index 3b70f9a1e38..b815329444c 100644 --- a/Master/texmf-dist/tex/latex/profsio/ProfSio.sty +++ b/Master/texmf-dist/tex/latex/profsio/ProfSio.sty @@ -1,9 +1,10 @@ % Author : C. Pierquet -% licence : Released under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txtf +% licence : Released under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txt % : Luatruthtable from Chetan Shirore and Dr. Ajit Kumar https://ctan.org/pkg/luatruthtable \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{ProfSio}[2024/05/18 0.2.8 Pour les enseignants de Maths en BTS SIO] +\ProvidesPackage{ProfSio}[2025/01/04 0.2.9 Pour les enseignants de Maths en BTS SIO] +%0.2.9 Correction d'un bug dans les simplifications de Karnaugh %0.2.8 Ajout des grilles de CCF (E2) %0.2.7 Correction d'un bug dans les simplifications de Karnaugh %0.2.6 Corrections dans les simplifications de Karnaugh @@ -39,7 +40,8 @@ \RequirePackage{calc} \RequirePackage{nicematrix} %------Librairies -\usetikzlibrary{positioning,decorations.pathreplacing,decorations.markings,arrows,arrows.meta,calc,babel,shapes,shapes.geometric} +\usetikzlibrary{positioning,decorations.pathreplacing,decorations.markings,arrows,arrows.meta,calc,shapes,shapes.geometric} +\usetikzlibrary{babel} %------Divers \def\§{\mkern1.5mu\relax} @@ -2041,32 +2043,32 @@ end %calculs pour 1 lettre \IfSubStr{\knghbintransf}{(AA)}{\xdef\knghbinres{\inteval{\knghbinres+11110000}}}{}% \IfSubStr{\knghbintransf}{(BB)}{\xdef\knghbinres{\inteval{\knghbinres+11001100}}}{}% - \IfSubStr{\knghbintransf}{(CC)}{\xdef\knghbinres{\inteval{\knghbinres+01100110}}}{}% + \IfSubStr{\knghbintransf}{(CC)}{\xdef\knghbinres{\inteval{\knghbinres+01100110}}}{}%version c intérieure !! \IfSubStr{\knghbintransf}{(AA*)}{\xdef\knghbinres{\inteval{\knghbinres+00001111}}}{}% \IfSubStr{\knghbintransf}{(BB*)}{\xdef\knghbinres{\inteval{\knghbinres+00110011}}}{}% - \IfSubStr{\knghbintransf}{(CC*)}{\xdef\knghbinres{\inteval{\knghbinres+10011001}}}{}% + \IfSubStr{\knghbintransf}{(CC*)}{\xdef\knghbinres{\inteval{\knghbinres+10011001}}}{}%version bar(c) extérieure %calculs pour 2 lettres \IfSubStr{\knghbintransf}{(AABB)}{\xdef\knghbinres{\inteval{\knghbinres+11000000}}}{}% - \IfSubStr{\knghbintransf}{(AACC*)}{\xdef\knghbinres{\inteval{\knghbinres+01100000}}}{}% + \IfSubStr{\knghbintransf}{(AACC*)}{\xdef\knghbinres{\inteval{\knghbinres+10010000}}}{}%=====! \IfSubStr{\knghbintransf}{(AABB*)}{\xdef\knghbinres{\inteval{\knghbinres+00110000}}}{}% \IfSubStr{\knghbintransf}{(AA*BB)}{\xdef\knghbinres{\inteval{\knghbinres+00001100}}}{}% - \IfSubStr{\knghbintransf}{(AA*CC*)}{\xdef\knghbinres{\inteval{\knghbinres+00000110}}}{}% + \IfSubStr{\knghbintransf}{(AA*CC*)}{\xdef\knghbinres{\inteval{\knghbinres+00001001}}}{}%=====! \IfSubStr{\knghbintransf}{(AA*BB*)}{\xdef\knghbinres{\inteval{\knghbinres+00000011}}}{}% - \IfSubStr{\knghbintransf}{(AACC)}{\xdef\knghbinres{\inteval{\knghbinres+10010000}}}{}% - \IfSubStr{\knghbintransf}{(AA*CC)}{\xdef\knghbinres{\inteval{\knghbinres+00001001}}}{}% - \IfSubStr{\knghbintransf}{(BBCC)}{\xdef\knghbinres{\inteval{\knghbinres+10001000}}}{}% - \IfSubStr{\knghbintransf}{(BBCC*)}{\xdef\knghbinres{\inteval{\knghbinres+01000100}}}{}% - \IfSubStr{\knghbintransf}{(BB*CC*)}{\xdef\knghbinres{\inteval{\knghbinres+00100010}}}{}% - \IfSubStr{\knghbintransf}{(BB*CC)}{\xdef\knghbinres{\inteval{\knghbinres+00010001}}}{}% + \IfSubStr{\knghbintransf}{(AACC)}{\xdef\knghbinres{\inteval{\knghbinres+01100000}}}{}%=====! + \IfSubStr{\knghbintransf}{(AA*CC)}{\xdef\knghbinres{\inteval{\knghbinres+00000110}}}{}%=====! + \IfSubStr{\knghbintransf}{(BBCC)}{\xdef\knghbinres{\inteval{\knghbinres+01000100}}}{}%=====! + \IfSubStr{\knghbintransf}{(BBCC*)}{\xdef\knghbinres{\inteval{\knghbinres+10001000}}}{}%=====! + \IfSubStr{\knghbintransf}{(BB*CC*)}{\xdef\knghbinres{\inteval{\knghbinres+00010001}}}{}%=====! + \IfSubStr{\knghbintransf}{(BB*CC)}{\xdef\knghbinres{\inteval{\knghbinres+00100010}}}{}%=====! %calculs pour 3 lettres - \IfSubStr{\knghbintransf}{(AABBCC)}{\xdef\knghbinres{\inteval{\knghbinres+10000000}}}{}% - \IfSubStr{\knghbintransf}{(AABBCC*)}{\xdef\knghbinres{\inteval{\knghbinres+01000000}}}{}% - \IfSubStr{\knghbintransf}{(AABB*CC*)}{\xdef\knghbinres{\inteval{\knghbinres+00100000}}}{}% - \IfSubStr{\knghbintransf}{(AABB*CC)}{\xdef\knghbinres{\inteval{\knghbinres+00010000}}}{}% - \IfSubStr{\knghbintransf}{(AA*BBCC)}{\xdef\knghbinres{\inteval{\knghbinres+00001000}}}{}% - \IfSubStr{\knghbintransf}{(AA*BBCC*)}{\xdef\knghbinres{\inteval{\knghbinres+00000100}}}{}% - \IfSubStr{\knghbintransf}{(AA*BB*CC*)}{\xdef\knghbinres{\inteval{\knghbinres+00000010}}}{}% - \IfSubStr{\knghbintransf}{(AA*BB*CC)}{\xdef\knghbinres{\inteval{\knghbinres+00000001}}}{}% + \IfSubStr{\knghbintransf}{(AABBCC)}{\xdef\knghbinres{\inteval{\knghbinres+01000000}}}{}%=====! + \IfSubStr{\knghbintransf}{(AABBCC*)}{\xdef\knghbinres{\inteval{\knghbinres+10000000}}}{}%=====! + \IfSubStr{\knghbintransf}{(AABB*CC*)}{\xdef\knghbinres{\inteval{\knghbinres+00010000}}}{}%=====! + \IfSubStr{\knghbintransf}{(AABB*CC)}{\xdef\knghbinres{\inteval{\knghbinres+00100000}}}{}%=====! + \IfSubStr{\knghbintransf}{(AA*BBCC)}{\xdef\knghbinres{\inteval{\knghbinres+00000100}}}{}%=====! + \IfSubStr{\knghbintransf}{(AA*BBCC*)}{\xdef\knghbinres{\inteval{\knghbinres+00001000}}}{}%=====! + \IfSubStr{\knghbintransf}{(AA*BB*CC*)}{\xdef\knghbinres{\inteval{\knghbinres+00000001}}}{}%=====! + \IfSubStr{\knghbintransf}{(AA*BB*CC)}{\xdef\knghbinres{\inteval{\knghbinres+00000010}}}{}%=====! %on complète \StrLen{\knghbinres}[\knghbinresnbchiffres] \ifnum\knghbinresnbchiffres<8% diff --git a/Master/texmf-dist/tex/latex/randintlist/randintlist.sty b/Master/texmf-dist/tex/latex/randintlist/randintlist.sty index 28fdb560e17..daffc7cd011 100644 --- a/Master/texmf-dist/tex/latex/randintlist/randintlist.sty +++ b/Master/texmf-dist/tex/latex/randintlist/randintlist.sty @@ -1,10 +1,11 @@ % Author : C. Pierquet -% licence : Released under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txtf +% licence : Released under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txt \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{randintlist}[2024/10/24 0.1.2 Create a list of random numbers with or without multiple values] +\ProvidesPackage{randintlist}[2025/01/04 0.1.3 Create a list of random numbers with or without multiple values] %------History +% 0.1.3 new usage of extracting element (with storing \macro) % 0.1.2 Changing name of macro % 0.1.1 Possibility to exclude values % 0.1.0 Initial version @@ -136,8 +137,8 @@ } %-----Macro for extracting -\NewDocumentCommand\getitemfromrandintlist{ O{,} m m }{% - \IfEq{#1}{/}% +\NewDocumentCommand\getitemfromrandintlist{ O{,} m m o }{% + \IfStrEq{#1}{/}% {% \setsepchar[.]{#1}% }% @@ -145,7 +146,7 @@ \setsepchar{#1}% }% \readlist*\TMPLISTRANDINT{#2}% - \TMPLISTRANDINT[#3]% + \IfNoValueTF{#4}{\TMPLISTRANDINT[#3]}{\itemtomacro\TMPLISTRANDINT[#3]#4}% } %-----french version @@ -232,8 +233,8 @@ } %-----Macro for extracting -\NewDocumentCommand\ExtraireEltListeRandint{ O{,} m m }{% - \IfEq{#1}{/}% +\NewDocumentCommand\ExtraireEltListeRandint{ O{,} m m o }{% + \IfStrEq{#1}{/}% {% \setsepchar[.]{#1}% }% @@ -241,7 +242,7 @@ \setsepchar{#1}% }% \readlist*\TMPLISTRANDINT{#2}% - \TMPLISTRANDINT[#3]% + \IfNoValueTF{#4}{\TMPLISTRANDINT[#3]}{\itemtomacro\TMPLISTRANDINT[#3]#4}% } \endinput
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty index bb7171dfa6d..db3e2b57ca8 100644 --- a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty +++ b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty @@ -37,7 +37,7 @@ %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2024/05/11 v2.40.1 typesetting critical editions]% +\ProvidesPackage{reledmac}[2025/01/07 v2.40.2 typesetting critical editions]% \RequirePackage{xargs}% \RequirePackage{xparse}[2017/03/07]% \RequirePackage{etoolbox}% @@ -577,6 +577,7 @@ \ifl@dpairing% \unless\ifl@dpaging% \global\c@pstartL=\c@pstart% + \global\c@pstartR=\c@pstart% \fi% \fi% \fi% diff --git a/Master/texmf-dist/tex/latex/scaletextbullet/scaletextbullet.sty b/Master/texmf-dist/tex/latex/scaletextbullet/scaletextbullet.sty index 1bb7c321d90..fdc80b73895 100644 --- a/Master/texmf-dist/tex/latex/scaletextbullet/scaletextbullet.sty +++ b/Master/texmf-dist/tex/latex/scaletextbullet/scaletextbullet.sty @@ -1,6 +1,6 @@ % Package : scaletextbullet -- Resize the \textbullet without changing its % vertical center -% Copyright : 2024 (c) Oliver Beery <beeryoliver@gmail.com> +% Copyright : 2024-2025 (c) Oliver Beery <beeryoliver@gmail.com> % CTAN : https://ctan.org/pkg/scaletextbullet % Repository: https://github.com/beeryoliver/scaletextbullet % License : The LaTeX Project Public License 1.3c @@ -9,8 +9,8 @@ \NeedsTeXFormat{LaTeX2e}[2023-11-01] \ProvidesExplPackage {scaletextbullet} - {2024-12-09} - {1.0.3} + {2025-01-03} + {1.0.4} {Resize the \noexpand\textbullet without changing its vertical center.} % l3kernel version 2023-10-10 added many 'e'-variants. @@ -27,16 +27,26 @@ % This package does not require any other packages! +% MESSAGES + +\msg_new:nnn { scaletextbullet } { factor-out-of-bounds } + { Invalid~ \iow_char:N \\textbullet~ factor~ '#1'~ \msg_line_context:. } +\msg_new:nnn { scaletextbullet } { scale-out-of-bounds } + { Invalid~ scale~ factor~ '#1'~ \msg_line_context:. } +\msg_new:nnn { scaletextbullet } { count-out-of-bounds } + { + Invalid~ number~ of~ \iow_char:N \\textbullet s~ '#1'~ \msg_line_context:. + } + % SOME VARIABLES -\tl_new:N \l__scaletextbullet_factor_tl -\tl_set:Nn \l__scaletextbullet_factor_tl { 0.4 } +\fp_new:N \l__scaletextbullet_factor_fp +\fp_set:Nn \l__scaletextbullet_factor_fp { 0.4 } -% Used to speed up \ScaleTextBullets{2}, \ScaleTextBullets{3}, and -% \ScaleTextBullets{4}. -\fp_const:Nn \c__scaletextbullet_ii_fp { 2 ^ -0.5 } -\fp_const:Nn \c__scaletextbullet_iii_fp { 3 ^ -0.5 } -\fp_const:Nn \c__scaletextbullet_iv_fp { 0.5 } +% Used only to speed up floating point calculations. +\fp_const:Nn \c__scaletextbullet_one_half_fp { 0.5 } +\fp_const:Nn \c__scaletextbullet_scaletextbullets_two_fp { 2 ^ -0.5 } +\fp_const:Nn \c__scaletextbullet_scaletextbullets_three_fp { 3 ^ -0.5 } % Scratch variables \int_new:N \l__scaletextbullet_tmp_int @@ -54,12 +64,12 @@ \q_stop } % Argument processor -\int_new:N \l__scaletextbullet_arg_process_int \cs_new_protected:Npn \__scaletextbullet_arg_process_int:n #1 { - \__scaletextbullet_int_set_from_user:Nn \l__scaletextbullet_arg_process_int - {#1} - \tl_set:NV \ProcessedArgument \l__scaletextbullet_arg_process_int + \group_begin: + \__scaletextbullet_int_set_from_user:Nn \l_tmpa_int {#1} + \exp_args:NNNV \group_end: + \tl_set:Nn \ProcessedArgument \l_tmpa_int } % Lowers the \textbullet to the baseline, scales it by a factor of #2, and % then raises it back to the vertical center. @@ -71,9 +81,19 @@ { \hbox_set:Nn #1 { \textbullet } \dim_set:Nn \l__scaletextbullet_bottom_dim - { \box_ht:N #1 - \l__scaletextbullet_factor_tl \box_wd:N #1 } + { + \box_ht:N #1 + - \fp_to_dim:n + { \l__scaletextbullet_factor_fp * \dim_to_fp:n { \box_wd:N #1 } } + } \dim_set:Nn \l__scaletextbullet_center_dim - { ( \box_ht:N #1 + \l__scaletextbullet_bottom_dim ) / 2 } + { + \fp_to_dim:n + { + \dim_to_fp:n { \box_ht:N #1 + \l__scaletextbullet_bottom_dim } + * \c__scaletextbullet_one_half_fp + } + } \hbox_set:Nn #1 { \box_move_down:nn { \l__scaletextbullet_bottom_dim } { \box_use:N #1 } @@ -81,37 +101,29 @@ \box_scale:Nnn #1 {#2} {#2} \hbox_set:Nn #1 { - \box_move_up:nn { \l__scaletextbullet_center_dim - 0.5 \box_ht:N #1 } + \box_move_up:nn + { + \l__scaletextbullet_center_dim + - \fp_to_dim:n + { + \dim_to_fp:n { \box_ht:N #1 } * \c__scaletextbullet_one_half_fp + } + } { \box_use:N #1 } } } -% MESSAGES - -\msg_new:nnn { scaletextbullet } { factor-out-of-bounds } - { Invalid~ \iow_char:N \\textbullet~ factor~ '#1'~ \msg_line_context:. } -\msg_new:nnn { scaletextbullet } { scale-out-of-bounds } - { Invalid~ scale~ factor~ '#1'~ \msg_line_context:. } -\msg_new:nnn { scaletextbullet } { count-out-of-bounds } - { - Invalid~ number~ of~ \iow_char:N \\textbullet s~ '#1'~ \msg_line_context:. - } - % DOCUMENT COMMANDS \NewDocumentCommand \SetTextBulletFactor { m } { \__scaletextbullet_set_factor:n {#1} } \cs_new_protected:Npn \__scaletextbullet_set_factor:n #1 { - \fp_set:Nn \l__scaletextbullet_tmp_fp {#1} - \fp_compare:nTF { \c_zero_fp < \l__scaletextbullet_tmp_fp <= \c_one_fp } - { - \tl_set:Ne \l__scaletextbullet_factor_tl - { \fp_use:N \l__scaletextbullet_tmp_fp } - } + \fp_set:Nn \l__scaletextbullet_factor_fp {#1} + \fp_compare:nF { \c_zero_fp < \l__scaletextbullet_factor_fp <= \c_one_fp } { \msg_error:nne { scaletextbullet } { factor-out-of-bounds } - { \fp_use:N \l__scaletextbullet_tmp_fp } + { \fp_use:N \l__scaletextbullet_factor_fp } } } @@ -124,7 +136,7 @@ { \__scaletextbullet_box_scale:Nn \l__scaletextbullet_tmp_box { \l__scaletextbullet_tmp_fp } - \box_use_drop:N \l__scaletextbullet_tmp_box + \box_use:N \l__scaletextbullet_tmp_box } { \fp_compare:nNnF \l__scaletextbullet_tmp_fp = \c_zero_fp @@ -155,22 +167,22 @@ { 2 } { \fp_set_eq:NN \l__scaletextbullet_tmp_fp - \c__scaletextbullet_ii_fp + \c__scaletextbullet_scaletextbullets_two_fp } { 3 } { \fp_set_eq:NN \l__scaletextbullet_tmp_fp - \c__scaletextbullet_iii_fp + \c__scaletextbullet_scaletextbullets_three_fp } { 4 } { \fp_set_eq:NN \l__scaletextbullet_tmp_fp - \c__scaletextbullet_iv_fp + \c__scaletextbullet_one_half_fp } } { \fp_set:Nn \l__scaletextbullet_tmp_fp - { \l__scaletextbullet_tmp_int ^ -0.5 } + { \int_use:N \l__scaletextbullet_tmp_int ^ -0.5 } } \__scaletextbullet_box_scale:Nn \l__scaletextbullet_tmp_box { \l__scaletextbullet_tmp_fp } @@ -178,7 +190,7 @@ { \box_use:N \l__scaletextbullet_tmp_box } } { - \int_compare:nNnF \l__scaletextbullet_tmp_int = 0 + \int_if_zero:nF { \l__scaletextbullet_tmp_int } { \msg_error:nnV { scaletextbullet } { count-out-of-bounds } \l__scaletextbullet_tmp_int @@ -199,7 +211,7 @@ { \box_use:N \l__scaletextbullet_tmp_box } } { - \int_compare:nNnF \l__scaletextbullet_tmp_int = 0 + \int_if_zero:nF { \l__scaletextbullet_tmp_int } { \msg_error:nnV { scaletextbullet } { count-out-of-bounds } \l__scaletextbullet_tmp_int @@ -226,12 +238,17 @@ \fp_set:Nn \l__scaletextbullet_tmp_fp { ##1 ^ -0.5 } \__scaletextbullet_box_scale:Nn \l__scaletextbullet_tmp_box { \l__scaletextbullet_tmp_fp } - \box_use_drop:N \l__scaletextbullet_tmp_box + \box_use:N \l__scaletextbullet_tmp_box } \, \group_begin: \dim_set:Nn \fboxrule { 0.1pt } \dim_zero:N \fboxsep - \framebox [ \l__scaletextbullet_factor_tl \width ] { \textbullet } + \framebox + [ + \fp_to_dim:n + { \l__scaletextbullet_factor_fp * \dim_to_fp:n { \width } } + ] + { \textbullet } \group_end: }
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/scripture/scripture.sty b/Master/texmf-dist/tex/latex/scripture/scripture.sty index 5cdbca4dce9..512dcccca7b 100644 --- a/Master/texmf-dist/tex/latex/scripture/scripture.sty +++ b/Master/texmf-dist/tex/latex/scripture/scripture.sty @@ -25,8 +25,17 @@ %% and the derived files scripture.sty and scripture.pdf %% \NeedsTeXFormat{LaTeX2e}[2022-11-01] -\ProvidesExplPackage{scripture}{2023/12/27}{2.0} +\ProvidesExplPackage{scripture}{2025/01/02}{2.1} {Format Scripture Quotations (DCP)} +\bool_new:N \l__scripture_textdir_change_in_group_bool +\cs_new_protected:Nn \__scripture_set_textdirection: + { + \sys_if_engine_luatex:T + { + \textdirection \int_use:N \textdirection + \bool_set_true:N \l__scripture_textdir_change_in_group_bool + } + } \msg_new:nnnn { scripture } { nested-environment } { Nesting~of~scripture~environments~not~supported. } { You~have~tried~to~nest~a~scripture~environment~or \\ @@ -39,6 +48,12 @@ { Language~requested~without~support. } { You~have~requested~language=#1,~but~neither~babel~nor~polyglossia~ have~been~loaded~and~set~up.~Ignoring~option~language=#1. } +\msg_new:nnnn { scripture } { heading-error } + { \token_to_str:N \heading \c_space_tl not~support~within~inner~ + environments. } + { You~have~tried~to~use~\token_to_str:N \heading \c_space_tl within~the~ + `#1'~environment,~but~this~macro~is~only~supported~in~the~main~ + `scripture'~environment. } \msg_new:nnnn { scripture } { unknown-style } { Style~#1~not~defined. } { You~have~requested~style=#1,~but~it~has~not~been~defined.~ @@ -55,6 +70,12 @@ , added / format .cs_set:Np = \__scripture_added_format:n #1 , added / format .value_required:n = true , added / format .initial:n = \emph { #1 } + , after .tl_set:N = \l__scripture_after_tl + , after .value_required:n = true + , after .initial:n = + , before .tl_set:N = \l__scripture_before_tl + , before .value_required:n = true + , before .initial:n = , belowskip .tl_set:N = \l__scripture_belowskip_tl , belowskip .value_required:n = true , belowskip .initial:n = \c_zero_skip @@ -65,6 +86,26 @@ , compact .bool_set:N = \l__scripture_compact_bool , compact .default:n = true , compact .initial:n = false + , chapter / align .choices:nn = { left, right } + { + \tl_if_exist:NF \l__scripture_chapter_align_tl + { \tl_new:N \l__scripture_chapter_align_tl } + \str_case:Vn \l_keys_choice_tl + { + { left } + { + \tl_set:Nn \l__scripture_chapter_align_tl + { l } + } + { right } + { + \tl_set:Nn \l__scripture_chapter_align_tl + { r } + } + } + } + , chapter / align .value_required:n = true + , chapter / align .initial:n = left , chapter / font .tl_set:N = \l__scripture_chap_font_tl , chapter / font .value_required:n = true , chapter / font .initial:n = \bfseries @@ -82,21 +123,115 @@ , chapter / hide .default:n = true , chapter / nodrop .bool_set_inverse:N = \l__scripture_chap_drop_bool , chapter / nodrop .default:n = true + , chapter / para .bool_set:N = \l__scripture_chap_para_bool + , chapter / para .default:n = true + , chapter / para .initial:n = false + , chapter / para / aboveskip .tl_set:N = \l__scripture_chap_para_aboveskip_tl + , chapter / para / aboveskip .value_required:n = true + , chapter / para / aboveskip .initial:n = \bigskipamount + , chapter / para / belowskip .tl_set:N = \l__scripture_chap_para_belowskip_tl + , chapter / para / belowskip .value_required:n = true + , chapter / para / belowskip .initial:n = \medskipamount + , chapter / para / indent .code:n = { + \bool_set:Nn + \l__scripture_chap_para_afterindent_bool + { \str_if_eq_p:nn { #1 } { true } } + } + , chapter / para / indent .default:n = true + , chapter / para / indent .initial:n = true , chapter / sep .tl_set:N = \l__scripture_chap_sep_tl , chapter / sep .value_required:n = true - , chapter / sep .initial:n = 0.5 em + , chapter / sep .initial:n = 0.5em , chapter / show .bool_set:N = \l__scripture_chap_show_bool , chapter / show .default:n = true , chapter / show .initial:n = true , chapter / showverse .bool_set:N = \l__scripture_chap_show_verse_bool , chapter / showverse .default:n = true , chapter / showverse .initial:n = false + , chapter / smash .bool_set:N = \l__scripture_chap_smash_bool + , chapter / smash .default:n = true + , chapter / smash .initial:n = false + , chapter / valign .choices:nn = { bottom, middle, top } + { + \tl_if_exist:NF \l__scripture_chapter_valign_tl + { \tl_new:N \l__scripture_chapter_valign_tl } + \str_case:Vn \l_keys_choice_tl + { + { bottom } + { + \tl_set:Nn \l__scripture_chapter_valign_tl + { b } + } + { middle } + { + \tl_set:Nn \l__scripture_chapter_valign_tl + { vc } + } + { top } + { + \tl_set:Nn \l__scripture_chapter_valign_tl + { t } + } + } + } + , chapter / valign .value_required:n = true + , chapter / valign .initial:n = bottom + , chapter / xchar .tl_set:N = \l__scripture_X_char_tl + , chapter / xchar .value_required:n = true + , chapter / xchar .initial:n = X + , defaults .code:n = \cs_if_exist_use:N \__scripture_setup_reset_defaults: + , defaults .value_forbidden:n = true , extraskip .tl_set:N = \l__scripture_extraskip_tl , extraskip .value_required:n = true , extraskip .initial:n = \medskipamount , font .tl_set:N = \l__scripture_font_tl , font .value_required:n = true , font .initial:n = + , heading / aboveskip .tl_set:N = \l__scripture_heading_aboveskip_tl + , heading / aboveskip .value_required:n = true + , heading / aboveskip .initial:n = \bigskipamount + , heading / afterindent .bool_set:N = \l__scripture_heading_afterindent_bool + , heading / afterindent .default:n = true + , heading / afterindent .initial:n = false + , heading / align .choices:nn = { left, right, center } + { + \tl_if_exist:NF \l__scripture_heading_align_tl + { \tl_new:N \l__scripture_heading_align_tl } + \str_case:Vn \l_keys_choice_tl + { + { left } + { + \tl_set:Nn \l__scripture_heading_align_tl + { \raggedright } + } + { right } + { + \tl_set:Nn \l__scripture_heading_align_tl + { \raggedleft } + } + { center } + { + \tl_set:Nn \l__scripture_heading_align_tl + { \centering } + } + } + } + , heading / align .value_required:n = true + , heading / align .initial:n = left + , heading / belowskip .tl_set:N = \l__scripture_heading_belowskip_tl + , heading / belowskip .value_required:n = true + , heading / belowskip .initial:n = \medskipamount + , heading / font .tl_set:N = \l__scripture_heading_font_tl + , heading / font .value_required:n = true + , heading / font .initial:n = \small\itshape + , heading / format .cs_set:Np = \__scripture_heading_format:n #1 + , heading / format .value_required:n = true + , heading / format .initial:n = #1 + , heading / hide .bool_set_inverse:N = \l__scripture_heading_show_bool + , heading / hide .default:n = true + , heading / show .bool_set:N = \l__scripture_heading_show_bool + , heading / show .default:n = true + , heading / show .initial:n = true , indent .bool_set:N = \l__scripture_indent_bool , indent .default:n = true , indent .initial:n = true @@ -105,16 +240,16 @@ , inline .initial:n = false , inline / begin .tl_set:N = \l__scripture_inline_begin_tl , inline / begin .value_required:n = true - , inline / begin .initial:n = ``\, + , inline / begin .initial:n = `` , inline / end .tl_set:N = \l__scripture_inline_end_tl , inline / end .value_required:n = true - , inline / end .initial:n = \,'' + , inline / end .initial:n = '' , inline / reference / format .cs_set:Np = \__scripture_inline_ref_format:n #1 , inline / reference / format .value_required:n = true , inline / reference / format .initial:n = (#1) , inline / reference / sep .tl_set:N = \l__scripture_inline_ref_sep_tl , inline / reference / sep .value_required:n = true - , inline / reference / sep .initial:n = 0.5 em + , inline / reference / sep .initial:n = 0.5em , inline / version / delim .tl_set:N = \l__scripture_inline_version_delim_tl , inline / version / delim .value_required:n = true , inline / version / delim .initial:n = \c_space_tl @@ -144,6 +279,12 @@ , parskip .tl_set:N = \l__scripture_parskip_tl , parskip .value_required:n = true , parskip .initial:n = \parskip + , pilcrow .bool_set:N = \l__scripture_pilcrow_bool + , pilcrow .default:n = true + , pilcrow .initial:n = false + , pilcrow / sep .tl_set:N = \l__scripture_pilcrow_sep_tl + , pilcrow / sep .value_required:n = true + , pilcrow / sep .initial:n = 0.25em , redletter .bool_set:N = \l__scripture_red_letter_bool , redletter .default:n = true , redletter .initial:n = false @@ -171,9 +312,28 @@ , reference / format .initial:n = #1 , reference / newline .meta:n = { reference / sep = \linewidth } , reference / newline .value_forbidden:n = true + , reference / position .choices:nn = { start, end } + { + \tl_if_exist:NF \l__scripture_ref_position_tl + { \tl_new:N \l__scripture_ref_position_tl } + \tl_set_eq:NN \l__scripture_ref_position_tl \l_keys_choice_tl + } + , reference / position .value_required:n = true + , reference / position .initial:n = end , reference / sep .tl_set:N = \l__scripture_ref_sep_tl , reference / sep .value_required:n = true - , reference / sep .initial:n = 2 em + , reference / sep .initial:n = 2em + , reference / start / inline .bool_set_inverse:N = \l__scripture_ref_start_newline_bool + , reference / start / inline .default:n = true + , reference / start / newline .bool_set:N = \l__scripture_ref_start_newline_bool + , reference / start / newline .default:n = true + , reference / start / newline .initial:n = false + , reference / start / sep .tl_set:N = \l__scripture_ref_start_sep_tl + , reference / start / sep .value_required:n = true + , reference / start / sep .initial:n = 1em + , reference / start / vsep .tl_set:N = \l__scripture_ref_vertical_sep_tl + , reference / start / vsep .value_required:n = true + , reference / start / vsep .initial:n = 0pt , rightmargin .tl_set:N = \l__scripture_rightmargin_tl , rightmargin .value_required:n = true , rightmargin .initial:n = \c_zero_dim @@ -188,7 +348,7 @@ , selah / format .initial:n = #1 , selah / sep .tl_set:N = \l__scripture_selah_sep_tl , selah / sep .value_required:n = true - , selah / sep .initial:n = 1 em + , selah / sep .initial:n = 1em , style .choice: , style / unknown .code:n = \msg_error:nnx { scripture } @@ -196,7 +356,7 @@ { \exp_not:n {#1} } , textright / sep .tl_set:N = \l__scripture_text_right_sep_tl , textright / sep .value_required:n = true - , textright / sep .initial:n = 1 em + , textright / sep .initial:n = 1em , verse / colour .tl_set:N = \l__scripture_verse_colour_tl , verse / colour .value_required:n = true , verse / colour .initial:n = . @@ -218,9 +378,15 @@ , verse / format .initial:n = \textsuperscript{#1} , verse / hide .bool_set_inverse:N = \l__scripture_verse_show_bool , verse / hide .default:n = true + , verse / para .bool_set:N = \l__scripture_verse_para_bool + , verse / para .default:n = true + , verse / para .initial:n = false + , verse / para / indent .tl_set:N = \l__scripture_para_indent_tl + , verse / para / indent .value_required:n = true + , verse / para / indent .initial:n = \l__scripture_parindent_tl , verse / sep .tl_set:N = \l__scripture_verse_sep_tl , verse / sep .value_required:n = true - , verse / sep .initial:n = 0.05 em + , verse / sep .initial:n = 0.05em , verse / show .bool_set:N = \l__scripture_verse_show_bool , verse / show .default:n = true , verse / show .initial:n = true @@ -233,6 +399,14 @@ , version / format .cs_set:Np = \__scripture_version_format:n #1 , version / format .value_required:n = true , version / format .initial:n = (#1) + , version / position .choices:nn = { withref, end } + { + \tl_if_exist:NF \l__scripture_version_position_tl + { \tl_new:N \l__scripture_version_position_tl } + \tl_set_eq:NN \l__scripture_version_position_tl \l_keys_choice_tl + } + , version / position .value_required:n = true + , version / position .initial:n = withref , center / aboveskip .tl_set:N = \l__scripture_center_aboveskip_tl , center / aboveskip .value_required:n = true , center / aboveskip .initial:n = \medskipamount @@ -263,15 +437,26 @@ , hanging / belowskip .tl_set:N = \l__scripture_hanging_belowskip_tl , hanging / belowskip .value_required:n = true , hanging / belowskip .initial:n = \medskipamount + , hanging / chapter / indent .bool_set:N = \l__scripture_hanging_chapter_indent_bool + , hanging / chapter / indent .default:n = true + , hanging / chapter / indent .initial:n = true , hanging / hang .tl_set:N = \l__scripture_hanging_hang_tl , hanging / hang .value_required:n = true - , hanging / hang .initial:n = 2 em + , hanging / hang .initial:n = 2em , hanging / leftmargin .tl_set:N = \l__scripture_hanging_leftmargin_tl , hanging / leftmargin .value_required:n = true - , hanging / leftmargin .initial:n = 1 em + , hanging / leftmargin .initial:n = 1em , hanging / rightmargin .tl_set:N = \l__scripture_hanging_rightmargin_tl , hanging / rightmargin .value_required:n = true , hanging / rightmargin .initial:n = \c_zero_dim + , hanging / verse / left .bool_set_inverse:N = \l__scripture_hanging_verse_right_bool + , hanging / verse / left .default:n = true + , hanging / verse / right .bool_set:N = \l__scripture_hanging_verse_right_bool + , hanging / verse / right .default:n = true + , hanging / verse / right .initial:n = true + , hanging / verse / sep .tl_set:N = \l__scripture_hanging_verse_sep_tl + , hanging / verse / sep .value_required:n = true + , hanging / verse / sep .initial:n = 0.05em , midparachap / hideverse .bool_set_inverse:N = \l__scripture_midparachap_show_verse_bool , midparachap / hideverse .default:n = true , midparachap / showverse .bool_set:N = \l__scripture_midparachap_show_verse_bool @@ -285,10 +470,10 @@ , narrow / belowskip .initial:n = \medskipamount , narrow / leftmargin .tl_set:N = \l__scripture_narrow_leftmargin_tl , narrow / leftmargin .value_required:n = true - , narrow / leftmargin .initial:n = 1 em + , narrow / leftmargin .initial:n = 1em , narrow / rightmargin .tl_set:N = \l__scripture_narrow_rightmargin_tl , narrow / rightmargin .value_required:n = true - , narrow / rightmargin .initial:n = 1 em + , narrow / rightmargin .initial:n = 1em , poetry / aboveskip .tl_set:N = \l__scripture_poetry_aboveskip_tl , poetry / aboveskip .value_required:n = true , poetry / aboveskip .initial:n = \medskipamount @@ -297,13 +482,13 @@ , poetry / belowskip .initial:n = \medskipamount , poetry / bigindent .tl_set:N = \l__scripture_poetry_big_indent_tl , poetry / bigindent .value_required:n = true - , poetry / bigindent .initial:n = 4 em + , poetry / bigindent .initial:n = 4em , poetry / indent .tl_set:N = \l__scripture_poetry_indent_tl , poetry / indent .value_required:n = true - , poetry / indent .initial:n = 1 em + , poetry / indent .initial:n = 1em , poetry / leftmargin .tl_set:N = \l__scripture_poetry_leftmargin_tl , poetry / leftmargin .value_required:n = true - , poetry / leftmargin .initial:n = 1 em + , poetry / leftmargin .initial:n = 1em , poetry / rightmargin .tl_set:N = \l__scripture_poetry_rightmargin_tl , poetry / rightmargin .value_required:n = true , poetry / rightmargin .initial:n = \c_zero_dim @@ -314,9 +499,127 @@ , poetry / verse / right .initial:n = true , poetry / verse / sep .tl_set:N = \l__scripture_poetry_verse_sep_tl , poetry / verse / sep .value_required:n = true - , poetry / verse / sep .initial:n = 0.05 em + , poetry / verse / sep .initial:n = 0.05em } \ProcessKeyOptions +\tl_new:N \l__scripture_default_options_tl +\keys_precompile:nnN { scripture } + { + , aboveskip = \c_zero_skip + , added / font = + , added / format = \emph { #1 } + , after = + , before = + , belowskip = \c_zero_skip + , colour = . + , compact = false + , chapter / align = left + , chapter / font = \bfseries + , chapter / colour = . + , chapter / drop = true + , chapter / format = #1 + , chapter / para = false + , chapter / para / aboveskip = \bigskipamount + , chapter / para / belowskip = \medskipamount + , chapter / para / indent = true + , chapter / sep = 0.5em + , chapter / show = true + , chapter / showverse = false + , chapter / smash = false + , chapter / valign = bottom + , chapter / xchar = X + , extraskip = \medskipamount + , font = + , heading / aboveskip = \bigskipamount + , heading / afterindent = false + , heading / align = left + , heading / belowskip = \medskipamount + , heading / font = \small\itshape + , heading / format = #1 + , heading / show = true + , indent = true + , inline = false + , inline / begin = `` + , inline / end = '' + , inline / reference / format = (#1) + , inline / reference / sep = 0.5em + , inline / version / delim = \c_space_tl + , inline / version / format = #1 + , language = + , language / variant = + , leftmargin = \c_zero_dim + , name / font = \scshape + , name / format = #1 + , parindent = \parindent + , parskip = \parskip + , pilcrow = false + , pilcrow / sep = 0.25em + , redletter = false + , redletter / colour = red!80!black + , reference / align = right + , reference / colour = . + , reference / font = \bfseries + , reference / format = #1 + , reference / position = end + , reference / sep = 2em + , reference / start / newline = false + , reference / start / sep = 1em + , reference / start / vsep = 0pt + , rightmargin = \c_zero_dim + , selah / text = Selah + , selah / font = \itshape + , selah / format = #1 + , selah / sep = 1em + , textright / sep = 1em + , verse / colour = . + , verse / first = false + , verse / firstformat = #1 + , verse / firstsep = 0.5em + , verse / font = + , verse / format = \textsuperscript{#1} + , verse / para = false + , verse / para / indent = \l__scripture_parindent_tl + , verse / sep = 0.05em + , verse / show = true + , version = + , version / delim = \c_space_tl + , version / format = (#1) + , version / position = withref + , center / aboveskip = \medskipamount + , center / belowskip = \medskipamount + , center / leftmargin = \c_zero_dim + , center / rightmargin = \c_zero_dim + , flushright / aboveskip = \medskipamount + , flushright / belowskip = \medskipamount + , flushright / leftmargin = \c_zero_dim + , flushright / rightmargin = \c_zero_dim + , hanging / aboveskip = \medskipamount + , hanging / belowskip = \medskipamount + , hanging / chapter / indent = true + , hanging / hang = 2em + , hanging / leftmargin = 1em + , hanging / rightmargin = \c_zero_dim + , hanging / verse / right = true + , hanging / verse / sep = 0.05em + , midparachap / showverse = true + , narrow / aboveskip = \medskipamount + , narrow / belowskip = \medskipamount + , narrow / leftmargin = 1em + , narrow / rightmargin = 1em + , poetry / aboveskip = \medskipamount + , poetry / belowskip = \medskipamount + , poetry / bigindent = 4em + , poetry / indent = 1em + , poetry / leftmargin = 1em + , poetry / rightmargin = \c_zero_dim + , poetry / verse / right = true + , poetry / verse / sep = 0.05em + } + \l__scripture_default_options_tl +\cs_new_protected:Nn \__scripture_setup_reset_defaults: + { + \l__scripture_default_options_tl + } \cs_new_protected:Nn \__scripture_setup_style:nnn { \bool_if:NTF #1 @@ -335,22 +638,43 @@ \cs_generate_variant:Nn \__scripture_setup_style:nnn { nne } \hook_new_pair:nn { scripture / chap / before } { scripture / chap / after } \hook_new_pair:nn { scripture / verse / before } { scripture / verse / after } +\hook_new:n { scripture / pilcrow } +\hook_new:n { scripture / poetry / pilcrow } \bool_new:N \l__scripture_active_bool \bool_new:N \l__scripture_active_inner_bool +\bool_new:N \g__scripture_mode_vertical_inner_bool \int_new:N \l__scripture_clubpenalty_saved_int \skip_new:N \g__scripture_prev_inner_below_skip \dim_new:N \l__scripture_outer_itemindent_dim \cs_new_protected_nopar:Nn \__scripture_setup_list_noindent:n { - \legacy_if:nT {@newlist} + \legacy_if:nT { @newlist } { \cs_set_protected_nopar:Npn \noindent { \skip_horizontal:n { -#1 } + \bool_if:NT \l__scripture_verse_para_bool + { + \peek_meaning:NTF \vs + { + \bool_gset_true:N \g__scripture_suppress_next_verse_para_bool + \__scripture_set_pilcrow_hook: + } + { + \str_if_eq:VnF \l__scripture_currenvir_str { poetry } + { \__scripture_pilcrow_output: } + } + } } \hook_gput_next_code:nn { para / end } { - \cs_gset_eq:NN \noindent \tex_noindent:D + \bool_if:NTF \l__scripture_verse_para_bool + { + \str_if_eq:VnTF \l__scripture_currenvir_str { poetry } + { \cs_set_eq:NN \noindent \tex_noindent:D } + { \cs_set_eq:NN \noindent \__scripture_para_noindent: } + } + { \cs_set_eq:NN \noindent \tex_noindent:D } } } } @@ -367,6 +691,7 @@ } \cs_new_protected:Nn \__scripture_extra_skip: { + \mode_if_vertical:F \para_end: \int_compare:nNnT \g__scripture_chap_par_prevgraf_int = 1 { @@ -409,7 +734,7 @@ } } \box_new:N \l__scripture_ref_box -\cs_new_protected:Nn \__scripture_format_full_ref:n +\cs_new_protected:Nn \__scripture_format_full_ref:nn { \group_begin: \l__scripture_ref_font_tl @@ -418,11 +743,11 @@ \__scripture_ref_format:n { #1 - \tl_if_empty:NF \l__scripture_version_tl + \tl_if_empty:oF { #2 } { - \tl_if_empty:nF { #1 } + \tl_if_empty:oF { #1 } { \l__scripture_version_delim_tl } - \__scripture_version_format:n { \l__scripture_version_tl } + \__scripture_version_format:n { #2 } } } \group_end: @@ -431,7 +756,7 @@ { \hbox_set:Nn \l__scripture_ref_box { - \__scripture_format_full_ref:n { #1 } + \__scripture_format_full_ref:nn { #1 } \l__scripture_version_tl } \dim_compare:nNnT { \box_wd:N \l__scripture_ref_box + \g__scripture_final_line_dim + \l__scripture_ref_sep_tl } @@ -456,6 +781,337 @@ } \box_use:N \l__scripture_ref_box } +\cs_new_protected:Nn \__scripture_reference_start_inline: + { + \tl_if_empty:NF \l__scripture_ref_tl + { + \tl_if_eq:NnTF \l__scripture_version_position_tl { withref } + { \__scripture_format_full_ref:nn { \l__scripture_ref_tl } { \l__scripture_version_tl } } + { \__scripture_format_full_ref:nn { \l__scripture_ref_tl } { } } + \skip_horizontal:N \l__scripture_ref_start_sep_tl + } + } +\cs_new_protected:Nn \__scripture_reference_start_newline: + { + \tl_if_empty:NF \l__scripture_ref_tl + { + \bool_gset_eq:NN \g_tmpa_bool \g__scripture_suppress_next_pilcrow_bool + \bool_gset_true:N \g__scripture_suppress_next_pilcrow_bool + \noindent + \bool_gset_eq:NN \g__scripture_suppress_next_pilcrow_bool \g_tmpa_bool + \str_if_eq:VnF \l__scripture_currenvir_str { scripture } + { \skip_horizontal:n { -\leftmargin } } + \tl_if_eq:NnTF \l__scripture_version_position_tl { withref } + { \__scripture_format_full_ref:nn { \l__scripture_ref_tl } { \l__scripture_version_tl } } + { \__scripture_format_full_ref:nn { \l__scripture_ref_tl } { } } + \bool_lazy_or:nnT + { \str_if_eq_p:Vn \l__scripture_currenvir_str { flushright } } + { \str_if_eq_p:Vn \l__scripture_currenvir_str { center } } + { + \hfill + \strut + } + \bool_if:NTF \l__scripture_compact_bool + { \para_end: } + { + \bool_lazy_all:nTF + { + { \l__scripture_verse_para_bool } + { \bool_not_p:n { \str_if_eq_p:Vn \l__scripture_currenvir_str { hanging } } } + { \bool_not_p:n { \str_if_eq_p:Vn \l__scripture_currenvir_str { poetry } } } + } + { \para_end: } + { \par } + } + \nobreak + \@afterheading + \addvspace { \l__scripture_ref_vertical_sep_tl } + } + } +\cs_new_protected:Nn \__scripture_reference_start_peek: + { + \peek_remove_spaces:n + { + \bool_lazy_and:nnTF + { \str_if_eq_p:Vn \l__scripture_ref_position_tl { start } } + { \bool_not_p:n { \tl_if_empty_p:N \l__scripture_ref_tl } } + { + \bool_lazy_or:nnF + { \str_if_eq_p:Vn \l__scripture_currenvir_str { scripture } } + { \str_if_eq_p:Vn \l__scripture_currenvir_str { midparachap } } + { + \bool_if:NF \l__scripture_compact_bool + { \bool_set_true:N \l__scripture_ref_start_newline_bool } + } + \peek_analysis_map_inline:n + { + \bool_case:nF + { + { \exp_args:No \token_if_eq_meaning_p:NN { ##1 } \heading } + { \__scripture_reference_start_newline: } + { \exp_args:No \token_if_eq_meaning_p:NN { ##1 } \noindent } + { + \bool_if:NTF \l__scripture_ref_start_newline_bool + { \__scripture_reference_start_newline: } + { \__scripture_reference_start_inline: } + } + { \exp_args:No \token_if_eq_meaning_p:NN { ##1 } \nohang } + { + \bool_if:NTF \l__scripture_ref_start_newline_bool + { \__scripture_reference_start_newline: } + { \__scripture_reference_start_inline: } + } + { \exp_args:No \token_if_eq_meaning_p:NN { ##1 } \nopilcrow } + { + \bool_if:NTF \l__scripture_ref_start_newline_bool + { \__scripture_reference_start_newline: } + { \__scripture_reference_start_inline: } + \peek_analysis_map_break:n + { + ##1 + \__scripture_fix_protrusion:n { } + } + } + { \exp_args:No \token_if_eq_meaning_p:NN { ##1 } \begin } + { + \bool_if:NF \l__scripture_indent_bool + { + \hook_gput_next_code:nn { para / begin } + { + \bool_lazy_or:nnT + { \str_if_eq_p:Vn \l__scripture_currenvir_str { midparachap } } + { \str_if_eq_p:Vn \l__scripture_currenvir_str { scripture } } + { \para_omit_indent: } + } + } + } + { \exp_args:No \token_if_eq_meaning_p:NN { ##1 } \ch } + { + \bool_if:NTF \l__scripture_ref_start_newline_bool + { \__scripture_reference_start_newline: } + { + \cs_set_eq:NN \__scripture_temp_ch \ch + \RenewDocumentCommand \ch { s o m } + { + \tl_if_novalue:nF { ##2 } + { + \tl_set:Nn \l__scripture_X_char_tl { ##2 } + } + \cs_set_eq:NN \ch \__scripture_temp_ch + } + \__scripture_reference_start_inline: + } + } + { \exp_args:No \token_if_eq_meaning_p:NN { ##1 } \vs } + { + \bool_if:NTF \l__scripture_ref_start_newline_bool + { \__scripture_reference_start_newline: } + { + \cs_set_eq:NN \__scripture_temp_vs \vs + \RenewDocumentCommand \vs { m } + { \cs_set_eq:NN \vs \__scripture_temp_vs } + \__scripture_reference_start_inline: + } + } + } + { + \bool_if:NTF \l__scripture_ref_start_newline_bool + { + \__scripture_reference_start_newline: + \bool_if:NTF \l__scripture_compact_bool + { + \bool_if:NT \g__scripture_mode_vertical_inner_bool + { \__scripture_pilcrow_output: } + } + { + \str_if_eq:VnF \l__scripture_currenvir_str { poetry } + { \__scripture_pilcrow_output: } + } + } + { \__scripture_reference_start_inline: } + } + \exp_args:No \token_if_eq_meaning:NNF { ##1 } \begin + { + \tl_clear:N \l__scripture_ref_tl + \tl_if_eq:NnF \l__scripture_version_position_tl { end } + { \tl_clear:N \l__scripture_version_tl } + } + \peek_analysis_map_break:n + { \__scripture_fix_protrusion:o { ##1 } } + } + } + { + \peek_analysis_map_inline:n + { + \bool_case:nF + { + { \exp_args:No \token_if_eq_meaning_p:NN { ##1 } \heading } + { } + { \exp_args:No \token_if_eq_meaning_p:NN { ##1 } \noindent } + { } + { \exp_args:No \token_if_eq_meaning_p:NN { ##1 } \nohang } + { } + { \exp_args:No \token_if_eq_meaning_p:NN { ##1 } \nopilcrow } + { + \peek_analysis_map_break:n + { + ##1 + \__scripture_fix_protrusion:n { } + } + } + { \exp_args:No \token_if_eq_meaning_p:NN { ##1 } \begin } + { + \bool_if:NF \l__scripture_indent_bool + { + \hook_gput_next_code:nn { para / begin } + { + \bool_lazy_or:nnT + { \str_if_eq_p:Vn \l__scripture_currenvir_str { midparachap } } + { \str_if_eq_p:Vn \l__scripture_currenvir_str { scripture } } + { \para_omit_indent: } + } + } + } + { \exp_args:No \token_if_eq_meaning_p:NN { ##1 } \ch } + { } + { \exp_args:No \token_if_eq_meaning_p:NN { ##1 } \vs } + { + \mode_if_vertical:F + { \__scripture_set_pilcrow_hook: } + } + } + { + \bool_if:NTF \l__scripture_compact_bool + { + \bool_if:NT \g__scripture_mode_vertical_inner_bool + { \__scripture_pilcrow_output: } + } + { + \str_if_eq:VnF \l__scripture_currenvir_str { poetry } + { \__scripture_pilcrow_output: } + } + } + \peek_analysis_map_break:n + { + \__scripture_fix_protrusion:o { ##1 } + } + } + } + } + } +\cs_new_protected:Nn \__scripture_compact_par: + { + \bool_gset_false:N \g__scripture_mode_vertical_inner_bool + \dim_set:Nn \parindent { \l__scripture_parindent_tl } + \peek_remove_spaces:n + { + \peek_analysis_map_inline:n + { + \bool_case:n + { + { \exp_args:No \token_if_eq_meaning_p:NN { ##1 } \begin } + { \bool_gset_true:N \g__scripture_mode_vertical_inner_bool } + { \str_if_eq_p:Vn \l__scripture_currenvir_str { poetry } } + { } + { \exp_args:No \token_if_letter_p:N { ##1 } } + { \__scripture_pilcrow_output: } + { \exp_args:No \token_if_active_p:N { ##1 } } + { \__scripture_pilcrow_output: } + { \exp_args:No \token_if_eq_meaning_p:NN { ##1 } \vs } + { \__scripture_set_pilcrow_hook: } + } + \peek_analysis_map_break:n { ##1 } + } + } + } +\cs_new_protected:Nn \__scripture_para_noindent: + { + \legacy_if:nTF { @newlist } + { + \tex_noindent:D + \peek_meaning:NTF \vs + { + \bool_gset_true:N \g__scripture_suppress_next_verse_para_bool + \__scripture_set_pilcrow_hook: + } + { \__scripture_pilcrow_output: } + } + { + \peek_meaning:NTF \vs + { + \bool_if:NT \l__scripture_verse_para_bool + { \para_end: } + \tex_noindent:D + \bool_gset_true:N \g__scripture_suppress_next_verse_para_bool + \__scripture_set_pilcrow_hook: + } + { \__scripture_pilcrow_output: } + } + } +\bool_new:N \g__scripture_para_mode_vertical_bool +\box_new:N \g__scripture_post_env_indent_box +\cs_new_protected:Nn \__scripture_para_par: + { + \bool_gset_true:N \g__scripture_para_mode_vertical_bool + \dim_set:Nn \parindent { \l__scripture_parindent_tl } + \peek_remove_spaces:n + { + \peek_analysis_map_inline:n + { + \bool_case:n + { + { \exp_args:No \token_if_letter_p:N { ##1 } } + { \__scripture_pilcrow_output: } + { \exp_args:No \token_if_active_p:N { ##1 } } + { \__scripture_pilcrow_output: } + { \exp_args:No \token_if_eq_meaning_p:NN { ##1 } \vs } + { \__scripture_set_pilcrow_hook: } + } + \peek_analysis_map_break:n { ##1 } + } + } + } +\cs_new_protected:Nn \__scripture_doendpe: + { + \box_gclear:N \g__scripture_post_env_indent_box + \legacy_if_set_true:n { @endpe } + \cs_set_nopar:Npn \par + { + \@restorepar + \clubpenalty \@clubpenalty + \everypar { } + \par + \legacy_if_set_false:n { @endpe } + \bool_gset_false:N \g__scripture_suppress_next_pilcrow_bool + \__scripture_para_par: + } + \everypar + { + \box_gset_to_last:N \g__scripture_post_env_indent_box + \hook_gput_next_code:nn { para / after } + { \box_gclear:N \g__scripture_post_env_indent_box } + \everypar { } + \legacy_if_set_false:n { @endpe } + \bool_gset_true:N \g__scripture_suppress_next_pilcrow_bool + \bool_if:NT \l__scripture_verse_para_bool + { + \box_set_wd:Nn + \g__scripture_post_env_indent_box + { \l__scripture_para_indent_tl } + } + } + } +\cs_new_protected:Nn \__scripture_fix_protrusion:n + { + \bool_if:NTF \l__scripture_compact_bool + { + \str_if_eq:VnT \l__scripture_currenvir_str { scripture } + { \cs_if_exist_use:N \leftprotrusion } + } + { \cs_if_exist_use:N \leftprotrusion } + #1 + } +\cs_generate_variant:Nn \__scripture_fix_protrusion:n { o } \bool_new:N \g__scripture_red_letter_active_bool \cs_new_protected:Nn \__scripture_red_letter_on: { @@ -493,6 +1149,7 @@ { \@ifpackageloaded { babel } { + \__scripture_set_textdirection: \selectlanguage { \l__scripture_language_tl } } { @@ -530,16 +1187,23 @@ \box_new:N \l__scripture_chap_tmp_box \dim_new:N \l__scripture_chap_fontsize_dim \dim_new:N \l__scripture_chap_height_dim -\dim_new:N \l__scripture_chap_width_dim +\dim_new:N \g__scripture_chap_width_dim \int_new:N \g__scripture_chap_par_prevgraf_int \dim_new:N \l__scripture_chap_X_height_dim +\dim_new:N \l__scripture_para_chap_indent_dim +\coffin_new:N \l__scripture_nodrop_chap_coffin +\dim_new:N \l__scripture_nodrop_chap_voffset_dim +\cs_new_protected:Nn \__scripture_get_X_height: + { + \hbox_set:Nn \l__scripture_chap_tmp_box { \l__scripture_X_char_tl } + \dim_set:Nn \l__scripture_chap_X_height_dim + { \box_ht:N \l__scripture_chap_tmp_box } + } \cs_new_protected:Nn \__scripture_drop_chap_set_up:n { \cs_gset_nopar:Npn \scripturecurrentchapter { #1 } \cs_gset_nopar:Npn \scripturecurrentverse { 1 } - \hbox_set:Nn \l__scripture_chap_tmp_box { X } - \dim_set:Nn \l__scripture_chap_X_height_dim - { \box_ht:N \l__scripture_chap_tmp_box } + \__scripture_get_X_height: \dim_set:Nn \l__scripture_chap_height_dim { \baselineskip + \l__scripture_chap_X_height_dim } \dim_set:Nn \l__scripture_chap_fontsize_dim @@ -560,31 +1224,44 @@ { \exp_args:NV \color_select:n \l__scripture_chapter_colour_tl } \__scripture_chap_format:n { #1 } } - \dim_set:Nn \l__scripture_chap_width_dim + \dim_gset:Nn \g__scripture_chap_width_dim { \box_wd:N \l__scripture_chap_tmp_box } \int_set_eq:NN \l__scripture_clubpenalty_saved_int \clubpenalty \clubpenalty 10000 - \hook_gput_next_code:nn { para / after } - { - \int_gset_eq:NN \g__scripture_chap_par_prevgraf_int \prevgraf - \int_compare:nNnT \g__scripture_chap_par_prevgraf_int = 1 - { \penalty 10000 } - \hook_gput_next_code:nn { para / before } - { \int_set_eq:NN \clubpenalty \l__scripture_clubpenalty_saved_int } - } + \bool_if:NF \l__scripture_verse_para_bool + { + \hook_gput_next_code:nn { para / after } + { + \int_gset_eq:NN \g__scripture_chap_par_prevgraf_int \prevgraf + \int_compare:nNnT \g__scripture_chap_par_prevgraf_int = 1 + { \penalty 10000 } + \hook_gput_next_code:nn { para / before } + { \int_set_eq:NN \clubpenalty \l__scripture_clubpenalty_saved_int } + } + } } \cs_new_protected:Nn \__scripture_drop_chap_output: { - \noindent + \bool_gset_true:N \g__scripture_suppress_next_pilcrow_bool + \cs_if_eq:NNTF \noindent \__scripture_para_noindent: + { + \legacy_if:nTF { @newlist } + { + \skip_horizontal:n { -\l__scripture_parindent_tl } + } + { \tex_noindent:D } + \__scripture_pilcrow_output: + } + { \noindent } \parshape 3 ~ \dim_eval:n - { \@totalleftmargin + \l__scripture_chap_width_dim + \l__scripture_chap_sep_tl } ~ + { \@totalleftmargin + \g__scripture_chap_width_dim + \l__scripture_chap_sep_tl } ~ \dim_eval:n - { \linewidth - \l__scripture_chap_width_dim - \l__scripture_chap_sep_tl } ~ + { \linewidth - \g__scripture_chap_width_dim - \l__scripture_chap_sep_tl } ~ \dim_eval:n - { \@totalleftmargin + \l__scripture_chap_width_dim + \l__scripture_chap_sep_tl } ~ + { \@totalleftmargin + \g__scripture_chap_width_dim + \l__scripture_chap_sep_tl } ~ \dim_eval:n - { \linewidth - \l__scripture_chap_width_dim - \l__scripture_chap_sep_tl } ~ + { \linewidth - \g__scripture_chap_width_dim - \l__scripture_chap_sep_tl } ~ \@totalleftmargin ~ \linewidth \group_begin: @@ -594,27 +1271,76 @@ \group_end: \bool_if:NT \l__scripture_chap_show_verse_bool { \__scripture_verse_output:n { 1 } } + \bool_if:NT \l__scripture_verse_para_bool + { + \hook_gput_next_code:nn { para / after } + { + \int_gset_eq:NN \g__scripture_chap_par_prevgraf_int \prevgraf + \int_compare:nNnT \g__scripture_chap_par_prevgraf_int = 1 + { \penalty 10000 } + \hook_gput_next_code:nn { para / before } + { \int_set_eq:NN \clubpenalty \l__scripture_clubpenalty_saved_int } + } + } + \hook_gclear_next_code:n { scripture / pilcrow } } \cs_new_protected:Nn \__scripture_nodrop_chap:n { \cs_gset_nopar:Npn \scripturecurrentchapter { #1 } \cs_gset_nopar:Npn \scripturecurrentverse { 1 } \group_begin: + \bool_if:NT \l__scripture_verse_para_bool + { + \legacy_if:nF { @newlist } + { \mode_if_vertical:F \para_end: } + } \bool_if:NTF \l__scripture_chap_show_bool { + \__scripture_get_X_height: + \hcoffin_set:Nn \l__scripture_nodrop_chap_coffin + { + \str_if_eq:VnF \l__scripture_chapter_colour_tl { . } + { \exp_args:NV \color_select:n \l__scripture_chapter_colour_tl } + \l__scripture_chap_font_tl + \__scripture_chap_format:n { #1 } + \kern \l__scripture_chap_sep_tl + } + \dim_zero:N \l__scripture_nodrop_chap_voffset_dim + \tl_if_eq:NnT \l__scripture_chapter_valign_tl { t } + { \dim_set_eq:NN \l__scripture_nodrop_chap_voffset_dim \l__scripture_chap_X_height_dim } + \tl_if_eq:NnT \l__scripture_chapter_valign_tl { vc } + { \dim_set:Nn \l__scripture_nodrop_chap_voffset_dim { 0.5 \l__scripture_chap_X_height_dim } } \hook_use:n { scripture / chap / before } - \group_begin: - \str_if_eq:VnF \l__scripture_chapter_colour_tl { . } - { \exp_args:NV \color_select:n \l__scripture_chapter_colour_tl } - \l__scripture_chap_font_tl - \__scripture_chap_format:n { #1 } - \group_end: - \skip_horizontal:N \l__scripture_chap_sep_tl + \bool_if:NTF \l__scripture_chap_smash_bool + { + \mode_leave_vertical: + \smash + { + \exp_args:NNoo + \coffin_typeset:Nnnnn \l__scripture_nodrop_chap_coffin + { \l__scripture_chapter_align_tl } + { \l__scripture_chapter_valign_tl } + { 0pt } + { \l__scripture_nodrop_chap_voffset_dim } + } + } + { + \exp_args:NNoo + \coffin_typeset:Nnnnn \l__scripture_nodrop_chap_coffin + { \l__scripture_chapter_align_tl } + { \l__scripture_chapter_valign_tl } + { 0pt } + { \l__scripture_nodrop_chap_voffset_dim } + } + \nobreak + \skip_horizontal:N \c_zero_skip \hook_use:n { scripture / chap / after } \bool_if:NT \l__scripture_chap_show_verse_bool { \__scripture_verse_output:n { 1 } } + \str_if_eq:VnF \l__scripture_currenvir_str { midparachap } + { \__scripture_pilcrow_output: } } { \hook_use:n { scripture / chap / before } @@ -622,6 +1348,87 @@ \vs { 1 } } \group_end: + \parshape 1 ~ \@totalleftmargin ~ \linewidth + \hook_gclear_next_code:n { scripture / pilcrow } + } +\cs_new_protected:Nn \__scripture_para_chap:n + { + \cs_gset_nopar:Npn \scripturecurrentchapter { #1 } + \cs_gset_nopar:Npn \scripturecurrentverse { 1 } + \group_begin: + \skip_zero:N \parskip + \bool_if:NTF \l__scripture_chap_show_bool + { + \dim_set_eq:NN \l__scripture_para_chap_indent_dim \linewidth + \str_if_eq:VnTF \l__scripture_currenvir_str { scripture } + { + \dim_set:Nn \l__scripture_para_chap_indent_dim { 0.5 \l__scripture_para_chap_indent_dim } + } + { + \dim_add:Nn \l__scripture_para_chap_indent_dim { \leftmargin + \rightmargin } + \dim_set:Nn \l__scripture_para_chap_indent_dim { 0.5 \l__scripture_para_chap_indent_dim } + \dim_sub:Nn \l__scripture_para_chap_indent_dim \leftmargin + } + \mode_if_vertical:F \para_end: + \addvspace { \l__scripture_chap_para_aboveskip_tl } + \bool_gset_eq:NN \g_tmpa_bool \g__scripture_suppress_next_pilcrow_bool + \bool_gset_true:N \g__scripture_suppress_next_pilcrow_bool + \str_if_eq:VnTF \l__scripture_currenvir_str { midparachap } + { \tex_noindent:D } + { \noindent } + \bool_gset_eq:NN \g__scripture_suppress_next_pilcrow_bool \g_tmpa_bool + \skip_horizontal:N \l__scripture_para_chap_indent_dim + \hbox_overlap_center:n + { + \hook_use:n { scripture / chap / before } + \group_begin: + \str_if_eq:VnF \l__scripture_chapter_colour_tl { . } + { \exp_args:NV \color_select:n \l__scripture_chapter_colour_tl } + \l__scripture_chap_font_tl + \__scripture_chap_format:n { #1 } + \group_end: + \hook_use:n { scripture / chap / after } + } + \para_end: + \nobreak + \bool_lazy_any:nTF + { + { \str_if_eq_p:Vn \l__scripture_currenvir_str { scripture } } + { \str_if_eq_p:Vn \l__scripture_currenvir_str { midparachap } } + { \str_if_eq_p:Vn \l__scripture_currenvir_str { narrow } } + } + { \legacy_if_set:nn { @afterindent } { \l__scripture_chap_para_afterindent_bool } } + { \legacy_if_set_true:n { @afterindent } } + \@afterheading + } + { + \hook_use:n { scripture / chap / before } + \hook_use:n { scripture / chap / after } + } + \peek_meaning:NTF \c_space_token + { + \addvspace { \l__scripture_chap_para_belowskip_tl } + \group_end: + \hook_use:n { scripture / poetry / pilcrow } + } + { + \addvspace { \l__scripture_chap_para_belowskip_tl } + \cs_if_eq:NNTF \vs \__scripture_poetry_mode_vertical_verse:n + { + \bool_gset_eq:NN \g_tmpa_bool \g__scripture_suppress_next_pilcrow_bool + \bool_gset_true:N \g__scripture_suppress_next_pilcrow_bool + \noindent + \vs { 1 } + \bool_gset_eq:NN \g__scripture_suppress_next_pilcrow_bool \g_tmpa_bool + } + { + \str_if_eq:VnT \l__scripture_currenvir_str { midparachap } + { \bool_gset_true:N \g__scripture_suppress_next_pilcrow_bool } + \vs { 1 } + } + \group_end: + \hook_use:n { scripture / poetry / pilcrow } + } } \cs_new_protected:Nn \__scripture_chap:n { @@ -643,15 +1450,29 @@ \bool_if:NTF \l__scripture_mid_para_chap_bool { \__scripture_mid_para_drop_chap_output: } { - \par + \para_end: \__scripture_drop_chap_output: + \str_if_eq:VnF \l__scripture_currenvir_str { midparachap } + { \__scripture_pilcrow_output: } } \hook_gput_next_code:nn { para / before } { \legacy_if:nF { @newlist } { \int_compare:nNnT \g__scripture_chap_par_prevgraf_int = 1 - { \extraskip } + { + \dim_compare:nNnT \parskip < \baselineskip + { + \dim_compare:nNnT { \g__scripture_chap_width_dim + \l__scripture_chap_sep_tl } > \parindent + { + \hook_gput_next_code:nn { para / begin } + { + \para_omit_indent: + \skip_horizontal:n {\g__scripture_chap_width_dim + \l__scripture_chap_sep_tl } + } + } + } + } \int_gzero:N \g__scripture_chap_par_prevgraf_int } \parshape 1 ~ \@totalleftmargin ~ \linewidth @@ -659,6 +1480,7 @@ } \bool_new:N \l__scripture_verse_par_start_bool \bool_new:N \l__scripture_no_verse_first_bool +\bool_new:N \g__scripture_suppress_next_verse_para_bool \cs_new_protected:Nn \__scripture_verse_output:n { \cs_gset_nopar:Npn \scripturecurrentverse { #1 } @@ -674,6 +1496,11 @@ \bool_set_false:N \l__scripture_no_verse_first_bool } \group_begin: + \bool_if:NT \l__scripture_verse_para_bool + { + \box_if_empty:NF \g__scripture_post_env_indent_box + { \box_use_drop:N \g__scripture_post_env_indent_box } + } \hook_use:n { scripture / verse / before } \bool_if:NT \l__scripture_verse_show_bool { @@ -697,10 +1524,87 @@ \group_end: \kern \l__scripture_verse_sep_tl } + \nobreak + \skip_horizontal:N \c_zero_skip } \hook_use:n { scripture / verse / after } + \hook_use:n { scripture / pilcrow } \group_end: } +\cs_new_protected:Nn \__scripture_verse_compact_output:n + { + \mode_if_vertical:T + { \__scripture_set_pilcrow_hook: } + \__scripture_verse_output:n { #1 } + } +\cs_new_protected:Nn \__scripture_verse_para_output:n + { + \mode_if_vertical:T + { \__scripture_set_pilcrow_hook: } + \hook_if_empty:nT { scripture / pilcrow } + { \dim_set:Nn \parindent \l__scripture_para_indent_tl } + \bool_if:NTF \g__scripture_suppress_next_verse_para_bool + { \bool_gset_false:N \g__scripture_suppress_next_verse_para_bool } + { + \legacy_if:nF { @newlist } + { + \mode_if_vertical:F + { + \para_end: + \parshape 1 ~ \@totalleftmargin ~ \linewidth + } + } + } + \__scripture_verse_output:n { #1 } + } +\cs_new_protected:Nn \__scripture_hanging_verse_para:n + { + \mode_if_vertical:T + { \__scripture_set_pilcrow_hook: } + \bool_if:NF \g__scripture_suppress_next_verse_para_bool + { + \legacy_if:nF { @newlist } + { + \mode_if_vertical:F + { + \bool_gset_true:N \g__scripture_suppress_next_pilcrow_bool + \hook_gput_next_code:nn { para / begin } + { \parshape 1 ~ \@totalleftmargin ~ \linewidth } + \par + \tex_noindent:D + } + } + } + \bool_gset_false:N \g__scripture_suppress_next_verse_para_bool + \__scripture_hanging_verse:n { #1 } + } +\bool_new:N \g__scripture_suppress_next_pilcrow_bool +\cs_new_protected:Nn \__scripture_set_pilcrow_hook: + { + \hook_if_empty:nT { scripture / pilcrow } + { + \hook_gput_next_code:nn { scripture / pilcrow } { \__scripture_pilcrow_output: } + } + } +\cs_new_protected:Nn \__scripture_pilcrow_output: + { + \bool_gset_false:N \g__scripture_para_mode_vertical_bool + \bool_gset_false:N \g__scripture_mode_vertical_inner_bool + \bool_if:NT \l__scripture_pilcrow_bool + { + \bool_lazy_or:nnT \l__scripture_verse_para_bool \l__scripture_compact_bool + { + \bool_if:NTF \g__scripture_suppress_next_pilcrow_bool + { \bool_gset_false:N \g__scripture_suppress_next_pilcrow_bool } + { + \P + \kern \l__scripture_pilcrow_sep_tl + \nobreak + \skip_horizontal:N \c_zero_skip + } + } + } + } \dim_new:N \g__scripture_final_line_dim \cs_new_protected:Nn \__scripture_calc_final_line_length: { @@ -709,25 +1613,35 @@ \skip_zero:N \belowdisplayshortskip \skip_zero:N \belowdisplayskip $$ - \dim_compare:nNnT \predisplaysize > \c_zero_dim + \hook_use:n { para / after } + \dim_compare:nNnTF \predisplaysize > \c_zero_dim { \dim_gset:Nn \g__scripture_final_line_dim - { \predisplaysize - 2 em } + { \predisplaysize - 2em } + } + { + \bool_if:NT \l__scripture_textdir_change_in_group_bool + { + \str_if_eq:VnT \l__scripture_currenvir_str { scripture } + { \int_set:Nn \prevgraf { \int_use:N \prevgraf - 1 } } + } } \cs_gset_nopar:Nx \__scripture_reset_spacing: { \dim_set:Nn \predisplaysize { \dim_use:N \predisplaysize } \int_set:Nn \prevgraf { \int_use:N \prevgraf } + \int_gset:Nn \g__scripture_chap_par_prevgraf_int { \int_use:N \g__scripture_chap_par_prevgraf_int } } $$ \__scripture_reset_spacing: \dim_compare:nNnT \g__scripture_final_line_dim > \paperwidth { \dim_gset:Nn \g__scripture_final_line_dim { \@totalleftmargin + \linewidth } } - \dim_compare:nNnT \g__scripture_final_line_dim > { \c_zero_dim - 1 sp } + \dim_compare:nNnT \g__scripture_final_line_dim > { \c_zero_dim - 1sp } { \skip_vertical:n { -\baselineskip - \parskip } } } \str_new:N \l__scripture_currenvir_str \skip_new:N \l__scripture_parskip_correction_skip +\tl_new:N \l__scripture_ref_tl \cs_new_protected_nopar:Nn \__scripture_added:n { \group_begin: @@ -735,6 +1649,52 @@ \__scripture_added_format:n { #1 } \group_end: } +\cs_new_protected_nopar:Nn \__scripture_heading:n + { + \str_if_eq:VnTF \l__scripture_currenvir_str { scripture } + { + \bool_if:NTF \l__scripture_heading_show_bool + { + \parshape 1 ~ \@totalleftmargin ~ \linewidth + \group_begin: + \bool_set_false:N \l__scripture_pilcrow_bool + \legacy_if:nTF { @newlist } + { + \skip_horizontal:n { -\parindent } + } + { + \__scripture_list_para_end: + \addvspace { \l__scripture_heading_aboveskip_tl } + \tex_noindent:D + } + \l__scripture_heading_align_tl + \l__scripture_heading_font_tl + \__scripture_heading_format:n { #1 } + \__scripture_list_para_end: + \group_end: + \bool_if:NTF \l__scripture_verse_para_bool + { + \cs_set_eq:NN \noindent \__scripture_para_noindent: + } + { + \cs_set_eq:NN \noindent \tex_noindent:D + } + \legacy_if_set:nn { @afterindent } \l__scripture_heading_afterindent_bool + \bool_if:NF \l__scripture_heading_afterindent_bool + { + \hook_gput_next_code:nn { para / before } + { \para_omit_indent: } + } + \nobreak + \@afterheading + \addvspace { \l__scripture_heading_belowskip_tl } + } + { \ignorespaces } + } + { + \msg_error:nnx { scripture } { heading-error } { \l__scripture_currenvir_str } + } + } \cs_new_protected_nopar:Nn \__scripture_name:n { \group_begin: @@ -753,7 +1713,9 @@ \bool_if:NTF \l__scripture_chap_drop_bool { \__scripture_chap:n { #2 } - \bool_if:nTF { #1 } + \bool_lazy_and:nnTF + { #1 } + { \bool_not_p:n { \l__scripture_compact_bool } } { \hook_gput_next_code:nn { para / after } { @@ -766,11 +1728,19 @@ { \int_gset_eq:NN \g__scripture_mid_para_chap_prevgraf_int \prevgraf } } } + { + \bool_if:NTF \l__scripture_chap_para_bool + { \__scripture_para_chap:n { #2 } } + { \__scripture_nodrop_chap:n { #2 } } + } + } + { + \bool_if:NTF \l__scripture_chap_para_bool + { \__scripture_para_chap:n { #2 } } { \__scripture_nodrop_chap:n { #2 } } } - { \__scripture_nodrop_chap:n { #2 } } } -\cs_new_protected:Nn \__scripture_begin:n +\cs_new_protected:Nn \__scripture_begin:nn { \cs_set_eq:NN \__scripture_noindent_saved: \noindent \bool_if:NT \l__scripture_active_bool @@ -778,11 +1748,14 @@ \msg_error:nn { scripture } { nested-environment } } \bool_set_true:N \l__scripture_active_bool - \tl_set:Nn \l__scripture_currenvir_str { scripture } \tl_if_novalue:nF { #1 } + { \tl_set:Nn \l__scripture_ref_tl { #1 } } + \str_set:Nn \l__scripture_currenvir_str { scripture } + \tl_if_novalue:nF { #2 } { - \keys_set:nn { scripture } { #1 } + \keys_set:nn { scripture } { #2 } } + \l__scripture_before_tl \__scripture_select_language: \int_gzero:N \g__scripture_chap_par_prevgraf_int \everydisplay { } @@ -794,10 +1767,25 @@ \cs_set_eq:NN \extraskip \__scripture_extra_skip: \cs_set_eq:NN \redletteron \__scripture_red_letter_on: \cs_set_eq:NN \redletteroff \__scripture_red_letter_off: - \DeclareDocumentCommand { \ch } { sm } - { \__scripture_ch_output:nn { ##1 } { ##2 } } + \cs_set:Npn \nopilcrow { \bool_gset_true:N \g__scripture_suppress_next_pilcrow_bool } + \bool_gset_false:N \g__scripture_suppress_next_pilcrow_bool + \bool_gset_false:N \g__scripture_suppress_next_verse_para_bool + \bool_gset_false:N \g__scripture_mode_vertical_inner_bool + \box_gclear:N \g__scripture_post_env_indent_box + \skip_gzero:N \g__scripture_prev_inner_below_skip + \bool_if:NT \l__scripture_chap_para_bool + { \bool_set_false:N \l__scripture_chap_drop_bool } + \DeclareDocumentCommand { \ch } { s o m } + { + \tl_if_novalue:nF { ##2 } + { + \tl_set:Nn \l__scripture_X_char_tl { ##2 } + } + \__scripture_ch_output:nn { ##1 } { ##3 } + } \cs_set_eq:NN \vs \__scripture_verse_output:n \cs_set_eq:NN \added \__scripture_added:n + \cs_set_eq:NN \heading \__scripture_heading:n \cs_set_eq:NN \name \__scripture_name:n \cs_set_protected_nopar:Npn \LORD { \name { Lord } } \cs_set_protected_nopar:Npn \GOD { \name { God } } @@ -805,7 +1793,10 @@ \cs_set_protected_nopar:Npn \textright ##1 { \__scripture_text_right:nn { \l__scripture_text_right_sep_tl } { ##1 } } \hook_gclear_next_code:n { para / before } + \hook_gclear_next_code:n { scripture / pilcow } + \hook_gclear_next_code:n { scripture / poetry / pilcow } \l__scripture_font_tl + \tl_set:Ne \l__scripture_parindent_tl { \dim_eval:n { \l__scripture_parindent_tl } } \exp_args:NnV \color_set:nn { scripture default colour } \l__scripture_colour_tl \str_if_eq:VnF \l__scripture_colour_tl { . } { \color_select:n { scripture default colour } } @@ -831,45 +1822,61 @@ { \hook_gput_next_code:nn { para / begin } { - \bool_lazy_any:nT + \bool_if:NTF \l__scripture_compact_bool + { \para_omit_indent: } { - { \str_if_eq_p:Vn \l__scripture_currenvir_str { midparachap } } - { \str_if_eq_p:Vn \l__scripture_currenvir_str { narrow } } - { \str_if_eq_p:Vn \l__scripture_currenvir_str { scripture } } - } - { - \legacy_if:nTF { @noparlist } - { \noindent } - { \para_omit_indent: } + \bool_lazy_any:nT + { + { \str_if_eq_p:Vn \l__scripture_currenvir_str { midparachap } } + { \str_if_eq_p:Vn \l__scripture_currenvir_str { narrow } } + { \str_if_eq_p:Vn \l__scripture_currenvir_str { scripture } } + } + { + \legacy_if:nTF { @noparlist } + { + \bool_lazy_and:nnF + { \str_if_eq_p:Vn \l__scripture_currenvir_str { narrow } } + { \str_if_eq_p:Vn \l__scripture_ref_position_tl { start } } + { \noindent } + } + { \para_omit_indent: } + } } } } } - \dim_set_eq:NN \parindent \l__scripture_parindent_tl + \cs_set_eq:NN \__scripture_list_para_end: \@par \item \relax } } -\cs_new_protected:Nn \__scripture_end:n +\cs_new_protected:Nn \__scripture_end: { + \tl_if_eq:NnT \l__scripture_ref_position_tl { start } + { + \tl_clear:N \l__scripture_ref_tl + \tl_if_eq:NnT \l__scripture_version_position_tl { withref } + { \tl_clear:N \l__scripture_version_tl } + } + \cs_set_eq:NN \noindent \tex_noindent:D \bool_if:NTF \l__scripture_inline_bool { \unskip \__scripture_red_letter_off: \l__scripture_inline_end_tl \bool_lazy_or:nnTF - { \tl_if_novalue_p:n { #1 } } - { \tl_if_empty_p:n { #1 } } + { \tl_if_novalue_p:n \l__scripture_ref_tl } + { \tl_if_empty_p:N \l__scripture_ref_tl } { \tl_if_empty:NF \l__scripture_version_tl { \skip_horizontal:N \l__scripture_ref_sep_tl - \__scripture_format_full_ref:n { } + \__scripture_format_full_ref:nn { } \l__scripture_version_tl } } { \skip_horizontal:N \l__scripture_ref_sep_tl - \__scripture_format_full_ref:n { #1 } + \__scripture_format_full_ref:nn \l__scripture_ref_tl \l__scripture_version_tl } } { @@ -882,23 +1889,85 @@ { \skip_zero:N \@topsepadd } { \skip_set:Nn \@topsepadd { \__scripture_skip_diff:NN \l__scripture_belowskip_tl \@outerparskip } } \int_compare:nNnT \prevgraf = \c_zero_int - { \skip_vertical:n { -\g__scripture_prev_inner_below_skip } } + { + \bool_if:NT \l__scripture_textdir_change_in_group_bool + { \skip_vertical:n { -\baselineskip } } + \skip_vertical:n { -\g__scripture_prev_inner_below_skip } + } \hook_gclear_next_code:n { para / before } - \parshape 1 ~ \@totalleftmargin ~ \linewidth \noindent \bool_lazy_or:nnTF - { \tl_if_novalue_p:n { #1 } } - { \tl_if_empty_p:n { #1 } } + { \tl_if_novalue_p:n \l__scripture_ref_tl } + { \tl_if_empty_p:N \l__scripture_ref_tl } { \tl_if_empty:NTF \l__scripture_version_tl { \hbox:n { } } { \__scripture_reference:n { } } } - { \__scripture_reference:n { #1 } } - \@noparlistfalse + { \__scripture_reference:n \l__scripture_ref_tl } + \parshape 1 ~ \@totalleftmargin ~ \linewidth + \legacy_if_set_false:n { @noparlist } \endlist } \cs_set_eq:NN \noindent \__scripture_noindent_saved: + \l__scripture_after_tl + } +\cs_new_protected:Nn \__scripture_compact_end_inner: + { + \bool_gset_false:N \g__scripture_mode_vertical_inner_bool + \str_if_eq:VnT \l__scripture_ref_position_tl { start } + { + \tl_gclear:N \l__scripture_ref_tl + } + \bool_lazy_and:nnT \l__scripture_verse_para_bool \l__scripture_chap_drop_bool + { + \cs_set_eq:NN \par \para_end: + \__scripture_calc_final_line_length: + \int_gset_eq:NN \g__scripture_mid_para_chap_prevgraf_int \g__scripture_chap_par_prevgraf_int + \tex_noindent:D + \bool_lazy_and:nnTF + { \bool_if_p:N \l__scripture_compact_bool } + { \int_compare_p:nNn \g__scripture_mid_para_chap_prevgraf_int = 1 } + { + \hook_gput_next_code:nn { env / \l__scripture_currenvir_str / after } + { + \parshape 3 ~ + \@totalleftmargin ~ \linewidth ~ + \dim_eval:n + { \@totalleftmargin + \g__scripture_chap_width_dim + \l__scripture_chap_sep_tl } ~ + \dim_eval:n + { \linewidth - \g__scripture_chap_width_dim - \l__scripture_chap_sep_tl } ~ + \@totalleftmargin ~ \linewidth + } + \hbox_to_wd:nn { \g__scripture_final_line_dim - \g__scripture_chap_width_dim - \l__scripture_chap_sep_tl } { } + } + { + \hbox_to_wd:nn \g__scripture_final_line_dim { } + } + \c_space_token + \kern 0pt + \cs_set_eq:NN \par \relax + \hook_gput_next_code:nn { para / before } + { + \int_compare:nNnT \g__scripture_mid_para_chap_prevgraf_int = 1 + { + \dim_compare:nNnT \parskip < \baselineskip + { + \dim_compare:nNnT { \g__scripture_chap_width_dim + \l__scripture_chap_sep_tl } > \parindent + { + \hook_gput_next_code:nn { para / begin } + { + \para_omit_indent: + \skip_horizontal:n {\g__scripture_chap_width_dim + \l__scripture_chap_sep_tl } + } + } + } + } + \int_gzero:N \g__scripture_chap_par_prevgraf_int + \parshape 1 ~ \@totalleftmargin ~ \linewidth + } + } + \unskip } \cs_new_protected:Nn \__scripture_center_begin:n { @@ -907,7 +1976,7 @@ \msg_error:nn { scripture } { nested-environment } } \bool_set_true:N \l__scripture_active_inner_bool - \tl_set:Nn \l__scripture_currenvir_str { center } + \str_set:Nn \l__scripture_currenvir_str { center } \tl_if_novalue:nF { #1 } { \keys_set:nn @@ -917,8 +1986,13 @@ \legacy_if:nTF { @newlist } { \dim_add:Nn \l__scripture_outer_itemindent_dim \itemindent } { \dim_zero:N \l__scripture_outer_itemindent_dim } + \cs_set_eq:NN \par \para_end: \list { } { + \bool_lazy_or:nnF + { \mode_if_vertical_p: } + { \g__scripture_para_mode_vertical_bool } + { \bool_gset_true:N \g__scripture_suppress_next_pilcrow_bool } \dim_zero:N \labelsep \dim_set_eq:NN \leftmargin \l__scripture_center_leftmargin_tl \dim_set_eq:NN \rightmargin \l__scripture_center_rightmargin_tl @@ -935,11 +2009,22 @@ { \addvspace { \baselineskip } } \int_gzero:N \g__scripture_chap_par_prevgraf_int \centering + \bool_if:NT \l__scripture_verse_para_bool + { + \cs_set_eq:NN \par \__scripture_para_par: + \cs_set_protected:Npn \\ + { + \mode_if_horizontal:TF + { \unskip } + { \@nolnerr } + } + } \item \relax } \cs_new_protected:Nn \__scripture_center_end: { + \cs_set_eq:NN \par \para_end: \dim_gset:Nn \g__scripture_final_line_dim { \@totalleftmargin + \linewidth } \dim_compare:nNnTF \@outerparskip > \l__scripture_center_belowskip_tl { \skip_zero:N \@topsepadd } @@ -947,6 +2032,7 @@ \skip_gset_eq:NN \g__scripture_prev_inner_below_skip \@topsepadd \legacy_if_set_false:n { @noparlist } \endlist + \bool_gset_true:N \g__scripture_suppress_next_pilcrow_bool } \cs_new_protected:Nn \__scripture_flushright_begin:n { @@ -955,7 +2041,7 @@ \msg_error:nn { scripture } { nested-environment } } \bool_set_true:N \l__scripture_active_inner_bool - \tl_set:Nn \l__scripture_currenvir_str { flushright } + \str_set:Nn \l__scripture_currenvir_str { flushright } \tl_if_novalue:nF { #1 } { \keys_set:nn @@ -965,8 +2051,13 @@ \legacy_if:nTF { @newlist } { \dim_add:Nn \l__scripture_outer_itemindent_dim \itemindent } { \dim_zero:N \l__scripture_outer_itemindent_dim } + \cs_set_eq:NN \par \para_end: \list { } { + \bool_lazy_or:nnF + { \mode_if_vertical_p: } + { \g__scripture_para_mode_vertical_bool } + { \bool_gset_true:N \g__scripture_suppress_next_pilcrow_bool } \dim_zero:N \labelsep \dim_set_eq:NN \leftmargin \l__scripture_flushright_leftmargin_tl \dim_set_eq:NN \rightmargin \l__scripture_flushright_rightmargin_tl @@ -983,11 +2074,22 @@ { \addvspace { \baselineskip } } \int_gzero:N \g__scripture_chap_par_prevgraf_int \raggedleft + \bool_if:NT \l__scripture_verse_para_bool + { + \cs_set_eq:NN \par \__scripture_para_par: + \cs_set_protected:Npn \\ + { + \mode_if_horizontal:TF + { \unskip } + { \@nolnerr } + } + } \item \relax } \cs_new_protected:Nn \__scripture_flushright_end: { + \cs_set_eq:NN \par \para_end: \dim_gset:Nn \g__scripture_final_line_dim { \@totalleftmargin + \linewidth } \dim_compare:nNnTF \@outerparskip > \l__scripture_flushright_belowskip_tl { \skip_zero:N \@topsepadd } @@ -995,62 +2097,105 @@ \skip_gset_eq:NN \g__scripture_prev_inner_below_skip \@topsepadd \legacy_if_set_false:n { @noparlist } \endlist + \bool_gset_true:N \g__scripture_suppress_next_pilcrow_bool } \dim_new:N \l__scripture_hanging_parindent_saved_dim \cs_new_protected:Nn \__scripture_hanging_ch:n { + \bool_gset_false:N \g__scripture_suppress_next_pilcrow_bool \bool_if:NTF \l__scripture_chap_show_bool { \bool_if:NTF \l__scripture_chap_drop_bool { \__scripture_hanging_chap:n { #1 } } + { + \bool_if:NTF \l__scripture_chap_para_bool + { \__scripture_para_chap:n { #1 } } + { \__scripture_nodrop_chap:n { #1 } } + } + } + { + \bool_if:NTF \l__scripture_chap_para_bool + { \__scripture_para_chap:n { #1 } } { \__scripture_nodrop_chap:n { #1 } } } - { \__scripture_nodrop_chap:n { #1 } } } \cs_new_protected:Nn \__scripture_hanging_chap:n { \__scripture_drop_chap_set_up:n { #1 } \dim_compare:nNnTF - \l__scripture_chap_width_dim < \leftmargin + { \g__scripture_chap_width_dim + \l__scripture_chap_sep_tl } < \leftmargin { - \tl_set:Nx \l__scripture_chap_sep_tl + \bool_if:NT \l__scripture_hanging_chapter_indent_bool { - \dim_eval:n { \leftmargin - \l__scripture_chap_width_dim } + \tl_set:Nx \l__scripture_chap_sep_tl + { + \dim_eval:n { \leftmargin - \g__scripture_chap_width_dim } + } } } { \parshape 3 ~ \dim_eval:n { - \@totalleftmargin - \leftmargin + \l__scripture_chap_width_dim + + \@totalleftmargin - \leftmargin + \g__scripture_chap_width_dim + \l__scripture_chap_sep_tl } ~ \dim_eval:n { - \linewidth + \leftmargin - \l__scripture_chap_width_dim - + \linewidth + \leftmargin - \g__scripture_chap_width_dim - \l__scripture_chap_sep_tl } ~ \dim_eval:n { - \@totalleftmargin - \leftmargin + \l__scripture_chap_width_dim + + \@totalleftmargin - \leftmargin + \g__scripture_chap_width_dim + \l__scripture_chap_sep_tl } ~ \dim_eval:n { - \linewidth + \leftmargin - \l__scripture_chap_width_dim - + \linewidth + \leftmargin - \g__scripture_chap_width_dim - \l__scripture_chap_sep_tl } ~ \@totalleftmargin ~ \linewidth } - \tl_set:Nx \l__scripture_chap_sep_tl + \par + \bool_if:NTF \l__scripture_hanging_chapter_indent_bool { - \dim_eval:n + \tl_set:Nx \l__scripture_chap_sep_tl { - \l__scripture_chap_sep_tl + \l__scripture_hanging_parindent_saved_dim + \dim_eval:n + { + \l__scripture_chap_sep_tl + \l__scripture_hanging_parindent_saved_dim + } + } + \__scripture_nohang: + } + { + \mode_leave_vertical: + \dim_compare:nNnTF + { \g__scripture_chap_width_dim + \l__scripture_chap_sep_tl } > \l__scripture_hanging_leftmargin_tl + { + \dim_compare:nNnTF + { \g__scripture_chap_width_dim + \l__scripture_chap_sep_tl } > \leftmargin + { + \skip_horizontal:n { \l__scripture_hanging_hang_tl } + } + { + \skip_horizontal:n + { + \l__scripture_chap_sep_tl + + \g__scripture_chap_width_dim - + \l__scripture_hanging_leftmargin_tl + } + } + } + { + \tl_set:Nx \l__scripture_chap_sep_tl + { + \dim_eval:n + { \l__scripture_hanging_leftmargin_tl - \g__scripture_chap_width_dim } + } } } - \par - \__scripture_nohang: \hbox_set:Nn \l__scripture_chap_box { \box_move_down:nn @@ -1074,25 +2219,114 @@ { \__scripture_verse_output:n { 1 } } + \__scripture_pilcrow_output: + \bool_if:NT \l__scripture_verse_para_bool + { + \hook_gput_next_code:nn { para / after } + { + \int_gset_eq:NN \g__scripture_chap_par_prevgraf_int \prevgraf + \int_compare:nNnT \g__scripture_chap_par_prevgraf_int = 1 + { \penalty 10000 } + \hook_gput_next_code:nn { para / before } + { + \int_set_eq:NN \clubpenalty \l__scripture_clubpenalty_saved_int + } + } + } \hook_gput_next_code:nn { para / begin } - { \parshape 1 ~ \@totalleftmargin ~ \linewidth } + { + \int_compare:nNnTF \g__scripture_chap_par_prevgraf_int = \c_one_int + { + \dim_compare:nNnTF + { \l__scripture_hanging_leftmargin_tl } < { \g__scripture_chap_width_dim + \l__scripture_chap_sep_tl } + { + \parshape 2 ~ + \dim_eval:n + { + \@totalleftmargin - \leftmargin + \g__scripture_chap_width_dim + + \l__scripture_chap_sep_tl + } ~ + \dim_eval:n + { + \linewidth + \leftmargin - \g__scripture_chap_width_dim - + \l__scripture_chap_sep_tl + } ~ + \@totalleftmargin ~ \linewidth + } + { \parshape 1 ~ \@totalleftmargin ~ \linewidth } + \hook_gput_next_code:nn { para / begin } + { \parshape 1 ~ \@totalleftmargin ~ \linewidth } + } + { \parshape 1 ~ \@totalleftmargin ~ \linewidth } + \int_gzero:N \g__scripture_chap_par_prevgraf_int + } } \cs_new_protected:Nn \__scripture_hanging_verse:n { \mode_if_vertical:TF { - \strut - \hbox_overlap_left:n + \tl_set_eq:NN \l_tmpa_tl \l__scripture_verse_sep_tl + \tl_set_eq:NN \l__scripture_verse_sep_tl \l__scripture_hanging_verse_sep_tl + \bool_lazy_and:nnTF + { \legacy_if_p:n { @newlist } } + { \g__scripture_suppress_next_pilcrow_bool } + { + \strut + \bool_if:NTF \l__scripture_hanging_verse_right_bool + { + \hbox_overlap_left:n + { + \__scripture_verse_output:n { #1 } + } + } + { + \hbox_overlap_left:n + { + \hbox_overlap_right:n + { + \__scripture_verse_output:n { #1 } + } + \skip_horizontal:N \l__scripture_hanging_leftmargin_tl + } + } + } { - \__scripture_verse_output:n { #1 } + \bool_gset_true:N \g__scripture_suppress_next_pilcrow_bool + \strut + \bool_if:NTF \l__scripture_hanging_verse_right_bool + { + \hbox_overlap_left:n + { + \__scripture_verse_output:n { #1 } + } + } + { + \hbox_overlap_left:n + { + \hbox_overlap_right:n + { + \__scripture_verse_output:n { #1 } + } + \skip_horizontal:N \l__scripture_hanging_leftmargin_tl + } + } + \__scripture_pilcrow_output: } + \tl_set_eq:NN \l__scripture_verse_sep_tl \l_tmpa_tl } { \__scripture_verse_output:n { #1 } } } \cs_new_protected_nopar:Nn \__scripture_nohang: { - \noindent + \legacy_if:nTF {@newlist} + { \skip_horizontal:n { \l__scripture_hanging_hang_tl } } + { \tex_noindent:D } \hbox_to_wd:nn { \l__scripture_hanging_parindent_saved_dim } { } + \peek_meaning:NT \vs + { + \bool_gset_true:N \g__scripture_suppress_next_verse_para_bool + \__scripture_set_pilcrow_hook: + } } \cs_new_protected:Nn \__scripture_hanging_begin:n { @@ -1101,22 +2335,37 @@ \msg_error:nn { scripture } { nested-environment } } \bool_set_true:N \l__scripture_active_inner_bool - \tl_set:Nn \l__scripture_currenvir_str { hanging } + \str_set:Nn \l__scripture_currenvir_str { hanging } \tl_if_novalue:nF { #1 } { \keys_set:nn { scripture / hanging } { #1 } } - \DeclareDocumentCommand { \ch } { sm } { \__scripture_hanging_ch:n { ##2 } } - \cs_set_eq:NN \vs \__scripture_hanging_verse:n + \DeclareDocumentCommand { \ch } { s o m } + { + \tl_if_novalue:nF { ##2 } + { + \tl_set:Nn \l__scripture_X_char_tl { ##2 } + } + \__scripture_hanging_ch:n { ##3 } + } + \bool_if:NTF \l__scripture_verse_para_bool + { \cs_set_eq:NN \vs \__scripture_hanging_verse_para:n } + { \cs_set_eq:NN \vs \__scripture_hanging_verse:n } \cs_set_eq:NN \nohang \__scripture_nohang: \dim_set_eq:NN \l__scripture_hanging_parindent_saved_dim \parindent \legacy_if:nTF { @newlist } { \dim_add:Nn \l__scripture_outer_itemindent_dim \itemindent } { \dim_zero:N \l__scripture_outer_itemindent_dim } + \cs_set_eq:NN \par \para_end: + \hook_gclear_next_code:n { para/ before } \list { } { + \bool_lazy_or:nnF + { \mode_if_vertical_p: } + { \g__scripture_para_mode_vertical_bool } + { \bool_gset_true:N \g__scripture_suppress_next_pilcrow_bool } \dim_zero:N \labelsep \dim_set:Nn \leftmargin { \l__scripture_hanging_leftmargin_tl + \l__scripture_hanging_hang_tl } \dim_set_eq:NN \rightmargin \l__scripture_hanging_rightmargin_tl @@ -1144,6 +2393,7 @@ \skip_gset_eq:NN \g__scripture_prev_inner_below_skip \@topsepadd \legacy_if_set_false:n { @noparlist } \endlist + \bool_gset_true:N \g__scripture_suppress_next_pilcrow_bool } \cs_new_protected:Npn \__scripture_vbox_set_top:Nw #1 { @@ -1158,6 +2408,27 @@ \int_new:N \g__scripture_mid_para_chap_prevgraf_int \box_new:N \l__scripture_mid_para_chap_snap_box \int_new:N \l__scripture_mid_para_chap_spacefactor_int +\cs_set_eq:Nc \__scripture_mid_para_chap_end_orig:n { end ~ } +\cs_new_nopar:Nn \__scripture_mid_para_chap_end:n + { + \__scripture_mid_para_chap_end_orig:n { #1 } + \bool_if:NT \l__scripture_compact_bool + { \c_space_token } + \peek_remove_spaces:n + { + \peek_analysis_map_inline:n + { + \bool_case:n + { + { \exp_args:No \token_if_letter_p:N { ##1 } } + { \__scripture_pilcrow_output: } + { \exp_args:No \token_if_eq_meaning_p:NN { ##1 } \vs } + { \__scripture_set_pilcrow_hook: } + } + \peek_analysis_map_break:n { ##1 } + } + } + } \box_new:N \l__scripture_mid_para_chap_box \box_new:N \l__scripture_mid_para_chap_split_box \box_new:N \l__scripture_mid_para_chap_split_top_box @@ -1179,11 +2450,11 @@ \dim_compare:nNnTF { \box_wd:N \l__scripture_mid_para_chap_snap_box + - \l__scripture_chap_width_dim + + \g__scripture_chap_width_dim + \l__scripture_chap_sep_tl } < - { \linewidth - \leftskip - \rightskip - 3 em } + { \linewidth - \leftskip - \rightskip - 3em } { \__scripture_drop_chap_output: \hbox_unpack_drop:N \l__scripture_mid_para_chap_snap_box @@ -1208,16 +2479,14 @@ } \cs_new_protected:Nn \__scripture_mid_para_chap_begin:n { - \tl_set:Nn \l__scripture_currenvir_str { midparachap } + \str_set:Nn \l__scripture_currenvir_str { midparachap } \tl_if_novalue:nF { #1 } { \keys_set:nn { scripture / midparachap } { #1 } } - \bool_lazy_and:nnT - { \bool_if_p:n \l__scripture_chap_show_verse_bool } - { \bool_if_p:n \l__scripture_chap_drop_bool } + \bool_lazy_and:nnT \l__scripture_chap_show_verse_bool \l__scripture_chap_drop_bool { \bool_set_true:N \l__scripture_midparachap_show_verse_bool \bool_set_false:N \l__scripture_chap_show_verse_bool @@ -1252,8 +2521,8 @@ \prevgraf < 3 { \noindent - \skip_horizontal:n { \l__scripture_chap_width_dim + \l__scripture_chap_sep_tl } - \dim_gadd:Nn \g__scripture_final_line_dim { \l__scripture_chap_width_dim + \l__scripture_chap_sep_tl } + \skip_horizontal:n { \g__scripture_chap_width_dim + \l__scripture_chap_sep_tl } + \dim_gadd:Nn \g__scripture_final_line_dim { \g__scripture_chap_width_dim + \l__scripture_chap_sep_tl } } \box_use_drop:N \l__scripture_mid_para_chap_line_box \vbox_set_end: @@ -1293,7 +2562,24 @@ \int_gset_eq:NN \g__scripture_chap_par_prevgraf_int \g__scripture_mid_para_chap_prevgraf_int \hook_gput_next_code:nn { para / before } { - \int_gzero:N \g__scripture_chap_par_prevgraf_int + \legacy_if:nF { @newlist } + { + \int_compare:nNnT \g__scripture_chap_par_prevgraf_int = 1 + { + \dim_compare:nNnT \parskip < \baselineskip + { + \dim_compare:nNnT { \g__scripture_chap_width_dim + \l__scripture_chap_sep_tl } > \parindent + { + \hook_gput_next_code:nn { para / begin } + { + \para_omit_indent: + \skip_horizontal:n {\g__scripture_chap_width_dim + \l__scripture_chap_sep_tl } + } + } + } + } + \int_gzero:N \g__scripture_chap_par_prevgraf_int + } \parshape 1 ~ \@totalleftmargin ~ \linewidth } } @@ -1304,7 +2590,7 @@ \msg_error:nn { scripture } { nested-environment } } \bool_set_true:N \l__scripture_active_inner_bool - \tl_set:Nn \l__scripture_currenvir_str { narrow } + \str_set:Nn \l__scripture_currenvir_str { narrow } \tl_if_novalue:nF { #1 } { \keys_set:nn @@ -1314,21 +2600,22 @@ \legacy_if:nTF { @newlist } { \dim_add:Nn \l__scripture_outer_itemindent_dim \itemindent } { \dim_zero:N \l__scripture_outer_itemindent_dim } + \cs_set_eq:NN \par \para_end: \list { } { - %\int_compare:nNnT \g__scripture_chap_par_prevgraf_int = 1 - % { \addvspace { \baselineskip } } - %\int_gzero:N \g__scripture_chap_par_prevgraf_int \dim_zero:N \labelsep \dim_set_eq:NN \leftmargin \l__scripture_narrow_leftmargin_tl \dim_set_eq:NN \rightmargin \l__scripture_narrow_rightmargin_tl \dim_set_eq:NN \listparindent \parindent - \mode_if_vertical:TF + \bool_lazy_or:nnTF + { \mode_if_vertical_p: } + { \g__scripture_para_mode_vertical_bool } { \dim_set:Nn \itemindent { \parindent - \l__scripture_outer_itemindent_dim } \__scripture_setup_list_noindent:n { \parindent } } { + \bool_gset_true:N \g__scripture_suppress_next_pilcrow_bool \dim_set:Nn \itemindent { -\l__scripture_outer_itemindent_dim } \__scripture_setup_list_noindent:n { \c_zero_dim } } @@ -1341,11 +2628,14 @@ \int_compare:nNnT \g__scripture_chap_par_prevgraf_int = 1 { \addvspace { \baselineskip } } \int_gzero:N \g__scripture_chap_par_prevgraf_int + \bool_if:NT \l__scripture_verse_para_bool + { \cs_set_eq:NN \par \__scripture_para_par: } \item \relax } \cs_new_protected:Nn \__scripture_narrow_end: { + \cs_set_eq:NN \par \para_end: \__scripture_calc_final_line_length: \dim_compare:nNnTF \@outerparskip > \l__scripture_narrow_belowskip_tl { \skip_zero:N \@topsepadd } @@ -1353,29 +2643,15 @@ \skip_gset_eq:NN \g__scripture_prev_inner_below_skip \@topsepadd \legacy_if_set_false:n { @noparlist } \endlist + \bool_gset_true:N \g__scripture_suppress_next_pilcrow_bool } \hook_new:n { scripture / poetry / para / after } \bool_new:N \g__scripture_poetry_end_bool -\bool_new:N \g__scripture_poetry_midparachap_show_verse_bool +\bool_new:N \l__scripture_poetry_midparachap_show_verse_bool \dim_new:N \l__scripture_poetry_chap_indent_dim \dim_new:N \l__scripture_poetry_chap_sep_dim \dim_new:N \l__scripture_poetry_chap_parshape_correction_dim \int_new:N \l__scripture_poetry_prevgraf_int -\cs_new_protected:Nn \__scripture_poetry_extra_skip: - { - \skip_vertical:n { \l__scripture_extraskip_tl - \baselineskip - \parskip } - \bool_gset_false:N \g__scripture_poetry_midparachap_show_verse_bool - \strut - \hook_gput_next_code:nn { para / after } - { - \hook_gput_next_code:nn { para / after } - { - \bool_gset_eq:NN - \g__scripture_poetry_midparachap_show_verse_bool - \l__scripture_midparachap_show_verse_bool - } - } - } \cs_new_protected:Nn \__scripture_poetry_text_right:nn { { @@ -1406,29 +2682,45 @@ { \bool_if:NTF \l__scripture_chap_drop_bool { \__scripture_poetry_chap:n { #1 } } + { + \bool_if:NTF \l__scripture_chap_para_bool + { \__scripture_para_chap:n { #1 } } + { \__scripture_poetry_nodrop_chap:n { #1 } } + } + } + { + \bool_if:NTF \l__scripture_chap_para_bool + { \__scripture_para_chap:n { #1 } } { \__scripture_poetry_nodrop_chap:n { #1 } } } - { \__scripture_poetry_nodrop_chap:n { #1 } } } \cs_new_protected:Nn \__scripture_poetry_chap:n { \__scripture_drop_chap_set_up:n { #1 } - \mode_if_vertical:TF + \hook_gput_next_code:nn { para / after } + { + \hook_gput_next_code:nn { para / after } + { \int_gzero:N \g__scripture_chap_par_prevgraf_int } + } + \cs_if_eq:NNTF \vs \__scripture_poetry_mode_vertical_verse:n + { + \dim_zero:N \l__scripture_poetry_chap_indent_dim + \noindent + } { \dim_set_eq:NN \l__scripture_poetry_chap_indent_dim \l__scripture_poetry_indent_tl \mode_leave_vertical: } - { \dim_zero:N \l__scripture_poetry_chap_indent_dim } \dim_set_eq:NN \l__scripture_poetry_chap_sep_dim \l__scripture_chap_sep_tl \dim_compare:nNnT - { \l__scripture_chap_width_dim + \l__scripture_chap_sep_tl } + { \g__scripture_chap_width_dim + \l__scripture_chap_sep_tl } < { \l__scripture_poetry_leftmargin_tl + \l__scripture_poetry_chap_indent_dim } { \dim_set:Nn \l__scripture_poetry_chap_sep_dim { \l__scripture_poetry_leftmargin_tl + \l__scripture_poetry_chap_indent_dim - - \l__scripture_chap_width_dim + \g__scripture_chap_width_dim } } \hbox_set:Nn \l__scripture_chap_box @@ -1447,7 +2739,7 @@ \box_set_dp:Nn \l__scripture_chap_box { \c_zero_dim } \dim_set:Nn \l__scripture_poetry_chap_parshape_correction_dim { - \l__scripture_chap_width_dim + \l__scripture_poetry_chap_sep_dim - + \g__scripture_chap_width_dim + \l__scripture_poetry_chap_sep_dim - \l__scripture_poetry_leftmargin_tl - \l__scripture_poetry_chap_indent_dim } \parshape 2 ~ @@ -1460,7 +2752,7 @@ \dim_eval:n { \linewidth - \l__scripture_poetry_big_indent_tl } \dim_compare:nNnT - { \l__scripture_chap_width_dim + \l__scripture_poetry_chap_sep_dim } + { \g__scripture_chap_width_dim + \l__scripture_poetry_chap_sep_dim } > \l__scripture_poetry_leftmargin_tl { @@ -1468,43 +2760,44 @@ { \int_compare:nNnT \l__scripture_poetry_prevgraf_int = 1 { - \dim_compare:nNnTF - { \l__scripture_chap_width_dim + \l__scripture_chap_sep_tl } - < - { \l__scripture_poetry_leftmargin_tl + \l__scripture_poetry_indent_tl } - { \dim_zero:N \l__scripture_poetry_chap_parshape_correction_dim } + \cs_if_eq:NNTF \vs \__scripture_poetry_mode_vertical_verse:n { - \dim_set:Nn \l__scripture_poetry_chap_parshape_correction_dim + \dim_compare:nNnTF + { \g__scripture_chap_width_dim + \l__scripture_chap_sep_tl } + < + \l__scripture_poetry_leftmargin_tl + { \dim_zero:N \l__scripture_poetry_chap_parshape_correction_dim } { - \l__scripture_chap_width_dim + \l__scripture_chap_sep_tl - - \l__scripture_poetry_leftmargin_tl - \l__scripture_poetry_indent_tl + \dim_set:Nn \l__scripture_poetry_chap_parshape_correction_dim + { + \g__scripture_chap_width_dim + \l__scripture_chap_sep_tl - + \l__scripture_poetry_leftmargin_tl + } + } + \int_compare:nNnT \g__scripture_chap_par_prevgraf_int = 1 + { + \parshape 2 ~ + \dim_eval:n + { \@totalleftmargin + \l__scripture_poetry_chap_parshape_correction_dim } ~ + \dim_eval:n + { \linewidth - \l__scripture_poetry_chap_parshape_correction_dim } ~ + \dim_eval:n + { \@totalleftmargin + \l__scripture_poetry_big_indent_tl } ~ + \dim_eval:n + { \linewidth - \l__scripture_poetry_big_indent_tl } } } - \parshape 2 ~ - \dim_eval:n - { \@totalleftmargin + \l__scripture_poetry_chap_parshape_correction_dim } ~ - \dim_eval:n - { \linewidth - \l__scripture_poetry_chap_parshape_correction_dim } ~ - \dim_eval:n - { \@totalleftmargin + \l__scripture_poetry_big_indent_tl } ~ - \dim_eval:n - { \linewidth - \l__scripture_poetry_big_indent_tl } - \hook_gput_next_code:nn { para / after } - { - \hook_gclear_next_code:n { scripture / poetry / para / after } - } - \hook_gput_next_code:nn { scripture / poetry / para / after } { \dim_compare:nNnTF - { \l__scripture_chap_width_dim + \l__scripture_chap_sep_tl } + { \g__scripture_chap_width_dim + \l__scripture_chap_sep_tl } < - \l__scripture_poetry_leftmargin_tl + { \l__scripture_poetry_leftmargin_tl + \l__scripture_poetry_indent_tl } { \dim_zero:N \l__scripture_poetry_chap_parshape_correction_dim } { \dim_set:Nn \l__scripture_poetry_chap_parshape_correction_dim { - \l__scripture_chap_width_dim + \l__scripture_chap_sep_tl - - \l__scripture_poetry_leftmargin_tl + \g__scripture_chap_width_dim + \l__scripture_chap_sep_tl - + \l__scripture_poetry_leftmargin_tl - \l__scripture_poetry_indent_tl } } \parshape 2 ~ @@ -1525,18 +2818,17 @@ \box_use:N \l__scripture_chap_box \hook_use:n { scripture / chap / after } \group_end: - \bool_lazy_or:nnT - { \bool_if_p:n \l__scripture_chap_show_verse_bool } - { \bool_if_p:n \g__scripture_poetry_midparachap_show_verse_bool } - { - \__scripture_verse_output:n { 1 } - } + \bool_lazy_or:nnT \l__scripture_chap_show_verse_bool \l__scripture_poetry_midparachap_show_verse_bool + { \__scripture_verse_output:n { 1 } } + \hook_use:n { scripture / poetry / pilcrow } } \cs_new_protected:Nn \__scripture_poetry_nodrop_chap:n { \cs_gset_nopar:Npn \scripturecurrentchapter { #1 } \cs_gset_nopar:Npn \scripturecurrentverse { 1 } \group_begin: + \cs_if_eq:NNT \vs \__scripture_poetry_mode_vertical_verse:n + { \noindent } \bool_if:NTF \l__scripture_chap_show_bool { \hbox_overlap_left:n @@ -1551,12 +2843,8 @@ \skip_horizontal:N \l__scripture_chap_sep_tl \hook_use:n { scripture / chap / after } } - \bool_lazy_or:nnT - { \bool_if_p:n \l__scripture_chap_show_verse_bool } - { \bool_if_p:n \g__scripture_poetry_midparachap_show_verse_bool } - { - \__scripture_verse_output:n { 1 } - } + \bool_lazy_or:nnT \l__scripture_chap_show_verse_bool \l__scripture_poetry_midparachap_show_verse_bool + { \__scripture_verse_output:n { 1 } } } { \hook_use:n { scripture / chap / before } @@ -1564,52 +2852,60 @@ \vs { 1 } } \group_end: + \hook_use:n { scripture / poetry / pilcrow } } \cs_new_protected:Nn \__scripture_poetry_mode_vertical_verse:n { \group_begin: \tl_set_eq:NN \l__scripture_verse_sep_tl \l__scripture_poetry_verse_sep_tl + \hook_gclear_next_code:n { scripture / pilcrow } \strut - \bool_if:NTF \l__scripture_poetry_verse_right_bool + \int_compare:nNnTF \g__scripture_chap_par_prevgraf_int = 1 { - \hbox_overlap_left:n - { - \__scripture_verse_output:n { #1 } - } + \__scripture_verse_output:n { #1 } } { - \hbox_overlap_left:n + \bool_if:NTF \l__scripture_poetry_verse_right_bool { - \hbox_overlap_right:n + \hbox_overlap_left:n { \__scripture_verse_output:n { #1 } } - \skip_horizontal:N \l__scripture_poetry_leftmargin_tl + } + { + \hbox_overlap_left:n + { + \hbox_overlap_right:n + { + \__scripture_verse_output:n { #1 } + } + \skip_horizontal:N \l__scripture_poetry_leftmargin_tl + } } } \group_end: + \bool_if:NF \g__scripture_suppress_next_pilcrow_bool + { \hook_use:n { scripture / poetry / pilcrow } } } \cs_new_protected:Nn \__scripture_poetry_mode_horizontal_verse:n { \group_begin: \tl_set_eq:NN \l__scripture_verse_sep_tl \l__scripture_poetry_verse_sep_tl - \skip_horizontal:n { -\listparindent } - \__scripture_poetry_mode_vertical_verse:n { #1 } - \skip_horizontal:N \listparindent - \group_end: - } -\cs_new_protected:Nn \__scripture_poetry_par: - { - \mode_if_vertical:TF + \int_compare:nNnTF \g__scripture_chap_par_prevgraf_int = 1 { - \cs_set_eq:NN \vs \__scripture_poetry_mode_vertical_verse:n - \noindent + \__scripture_poetry_mode_vertical_verse:n { #1 } } { - \cs_set_eq:NN \vs \__scripture_poetry_mode_horizontal_verse:n - \__scripture_tmp_para_end: - \int_set_eq:NN \l__scripture_poetry_prevgraf_int \prevgraf + \skip_horizontal:n { -\listparindent } + \__scripture_poetry_mode_vertical_verse:n { #1 } + \skip_horizontal:N \listparindent } + \group_end: + } +\cs_new_protected:Nn \__scripture_poetry_par: + { + \para_end: + \int_set:Nn \l__scripture_poetry_prevgraf_int { \int_use:N \prevgraf } \parshape 2 ~ \@totalleftmargin ~ \linewidth ~ @@ -1624,15 +2920,67 @@ \cs_gset_protected_nopar:Nn \__scripture_obeylines: % {% \char_set_catcode_active:N \^^M% - \cs_set_eq:NN ^^M \__scripture_obeylines_end:% + \cs_set_eq:NN ^^M \__scripture_obeylines_eol:% }% \group_end: -\cs_new_protected:Nn \__scripture_obeylines_end: +\cs_new_protected:Nn \__scripture_obeylines_eol: { - \peek_meaning:NF \end + \mode_if_vertical:TF { - \par - \int_set:Nn \l__scripture_poetry_prevgraf_int { \int_use:N \prevgraf } + \cs_set_eq:NN \vs \__scripture_poetry_mode_vertical_verse:n + \hook_gput_next_code:nn { scripture / poetry / para / after } + { \bool_set_false:N \l__scripture_poetry_midparachap_show_verse_bool } + } + { \cs_set_eq:NN \vs \__scripture_poetry_mode_horizontal_verse:n } + \peek_analysis_map_inline:n + { + \bool_case:nF + { + { \exp_args:No \token_if_eq_meaning_p:NN { ##1 } \ch } + { + \bool_set_eq:NN \l__scripture_poetry_midparachap_show_verse_bool \l__scripture_midparachap_show_verse_bool + \__scripture_poetry_par: + \peek_analysis_map_break:n { ##1 } + } + { \exp_args:No \token_if_eq_meaning_p:NN { ##1 } \end } + { \peek_analysis_map_break:n { ##1 } } + { \exp_args:No \token_if_eq_meaning_p:NN { ##1 } \extraskip } + { \peek_analysis_map_break:n { ##1 } } + { \exp_args:No \token_if_eq_meaning_p:NN { ##1 } \nopilcrow } + { + \__scripture_poetry_par: + \cs_if_eq:NNT \vs \__scripture_poetry_mode_vertical_verse:n + { \noindent } + \peek_analysis_map_break:n + { + \__scripture_fix_protrusion:o { ##1 } + } + } + { \exp_args:No \token_if_eq_meaning_p:NN { ##1 } \vs } + { + \__scripture_poetry_par: + \cs_if_eq:NNT \vs \__scripture_poetry_mode_vertical_verse:n + { \noindent } + \peek_analysis_map_break:n { ##1 } + } + { \exp_args:No \token_if_eq_meaning_p:NN { ##1 } \__scripture_obeylines_eol: } + { \cs_set_eq:NN \vs \__scripture_poetry_mode_vertical_verse:n } + } + { + \__scripture_poetry_par: + \cs_if_eq:NNT \vs \__scripture_poetry_mode_vertical_verse:n + { \noindent } + \bool_if:NT \l__scripture_verse_para_bool + { + \__scripture_pilcrow_output: + \bool_set_false:N \l__scripture_verse_para_bool + \bool_set_false:N \l__scripture_pilcrow_bool + } + \peek_analysis_map_break:n + { + \__scripture_fix_protrusion:o { ##1 } + } + } } } \cs_new_protected:Nn \__scripture_poetry_begin: @@ -1642,19 +2990,37 @@ \msg_error:nn { scripture } { nested-environment } } \bool_set_true:N \l__scripture_active_inner_bool - \tl_set:Nn \l__scripture_currenvir_str { poetry } + \str_set:Nn \l__scripture_currenvir_str { poetry } \bool_gset_false:N \g__scripture_poetry_midparachap_show_verse_bool - \DeclareDocumentCommand { \ch } { sm } { \__scripture_poetry_ch:n { ##2 } } + \DeclareDocumentCommand { \ch } { s o m } + { + \tl_if_novalue:nF { ##2 } + { + \tl_set:Nn \l__scripture_X_char_tl { ##2 } + } + \__scripture_poetry_ch:n { ##3 } + } \cs_set_eq:NN \vs \__scripture_poetry_mode_vertical_verse:n - \cs_set_eq:NN \extraskip \__scripture_poetry_extra_skip: \cs_set_eq:NN \selah \__scripture_selah_output: \cs_set_protected_nopar:Npn \textright ##1 { \__scripture_poetry_text_right:nn { \l__scripture_text_right_sep_tl } { ##1 } } \legacy_if:nTF { @newlist } { \dim_add:Nn \l__scripture_outer_itemindent_dim \itemindent } { \dim_zero:N \l__scripture_outer_itemindent_dim } + \cs_set_eq:NN \par \para_end: + \cs_set_eq:NN \noindent \tex_noindent:D + \hook_gput_next_code:nn { scripture / poetry / pilcrow } + { + \__scripture_pilcrow_output: + \bool_set_false:N \l__scripture_pilcrow_bool + \bool_set_false:N \l__scripture_verse_para_bool + } \list { } { + \bool_lazy_or:nnF + { \mode_if_vertical_p: } + { \g__scripture_para_mode_vertical_bool } + { \bool_gset_true:N \g__scripture_suppress_next_pilcrow_bool } \dim_zero:N \labelsep \dim_set_eq:NN \leftmargin \l__scripture_poetry_leftmargin_tl \dim_set_eq:NN \rightmargin \l__scripture_poetry_rightmargin_tl @@ -1674,10 +3040,6 @@ \dim_set_eq:NN \parindent \l__scripture_poetry_indent_tl \item \relax - \cs_set_eq:NN \__scripture_tmp_para_end: \par - \cs_set_eq:NN \par \__scripture_poetry_par: - \hook_gput_next_code:nn { para / after } - { \bool_gset_eq:NN \g__scripture_poetry_midparachap_show_verse_bool \l__scripture_midparachap_show_verse_bool } } \cs_new_protected:Nn \__scripture_poetry_end: { @@ -1688,6 +3050,8 @@ \skip_gset_eq:NN \g__scripture_prev_inner_below_skip \@topsepadd \legacy_if_set_false:n { @noparlist } \endlist + \bool_gset_true:N \g__scripture_suppress_next_pilcrow_bool + \hook_gclear_next_code:n { scripture / poetry / pilcrow } \bool_gset_true:N \g__scripture_poetry_end_bool \hook_gput_next_code:nn { para / begin } { \bool_gset_false:N \g__scripture_poetry_end_bool } @@ -1716,47 +3080,47 @@ } \NewDocumentEnvironment { scripture } { o o } { - \__scripture_begin:n { #2 } + \__scripture_begin:nn { #1 } { #2 } \DeclareDocumentEnvironment { center } { o } { \__scripture_center_begin:n { ##1 } - \ignorespaces + \__scripture_reference_start_peek: } { \__scripture_center_end: } \DeclareDocumentEnvironment { flushright } { o } { \__scripture_flushright_begin:n { ##1 } - \ignorespaces + \__scripture_reference_start_peek: } { \__scripture_flushright_end: } \DeclareDocumentEnvironment { hanging } { o } { \__scripture_hanging_begin:n { ##1 } - \ignorespaces + \__scripture_reference_start_peek: } { \__scripture_hanging_end: } \DeclareDocumentEnvironment { midparachap } { o } { \__scripture_mid_para_chap_begin:n { ##1 } - \ignorespaces + \__scripture_reference_start_peek: } { \__scripture_mid_para_chap_end: } \DeclareDocumentEnvironment { narrow } { o } { \__scripture_narrow_begin:n { ##1 } - \ignorespaces + \__scripture_reference_start_peek: } { \__scripture_narrow_end: } \DeclareDocumentEnvironment { poetryaux } { o } { \tl_if_novalue:nF { ##1 } - { - \keys_set:nn - { scripture / poetry } - { ##1 } - } + { + \keys_set:nn + { scripture / poetry } + { ##1 } + } \__scripture_poetry_begin: - \ignorespaces + \__scripture_reference_start_peek: } { \__scripture_poetry_end: } \DeclareDocumentEnvironment { poetry } { } @@ -1775,19 +3139,91 @@ \tl_set_eq:NN \l__scripture_ref_sep_tl \l__scripture_inline_ref_sep_tl \cs_set_eq:NN \__scripture_version_format:n \__scripture_inline_version_format:n \tl_set_eq:NN \l__scripture_version_delim_tl \l__scripture_inline_version_delim_tl + \bool_set_false:N \l__scripture_chap_para_bool \bool_set_true:N \l__scripture_compact_bool + \bool_set_false:N \l__scripture_heading_show_bool } - \bool_if:NT \l__scripture_compact_bool + \bool_if:NT \l__scripture_chap_para_bool { - \scripturesetup { chapter / nodrop } - \RenewDocumentEnvironment { center } { o } { \ignorespaces } { \unskip } - \RenewDocumentEnvironment { flushright } { o } { \ignorespaces } { \unskip } - \RenewDocumentEnvironment { hanging } { o } { \ignorespaces } { \unskip } \RenewDocumentEnvironment { midparachap } { o } { \ignorespaces } { \unskip } - \RenewDocumentEnvironment { narrow } { o } { \ignorespaces } { \unskip } - \RenewDocumentEnvironment { poetry } { o } { \ignorespaces } { \unskip } + } + \bool_if:NT \l__scripture_verse_para_bool + { + \cs_set_eq:NN \vs \__scripture_verse_para_output:n + \cs_set_eq:NN \par \__scripture_para_par: + \cs_set_eq:NN \@par \__scripture_para_par: + \cs_set_eq:NN \@doendpe \__scripture_doendpe: + \cs_set_eq:NN \noindent \__scripture_para_noindent: + \cs_set_protected:Npn \\ + { + \mode_if_horizontal:TF + { \unskip } + { \@nolnerr } + } + \RenewDocumentEnvironment { midparachap } { o } + { + \str_set:Nn \l__scripture_currenvir_str { midparachap } + \cs_set_eq:NN \noindent \tex_noindent:D + \cs_set_eq:cN { end ~ } \__scripture_mid_para_chap_end:n + \__scripture_reference_start_peek: + } + { + \para_end: + \bool_gset_false:N \g__scripture_suppress_next_pilcrow_bool + } + } + \bool_if:NT \l__scripture_compact_bool + { + \cs_set_eq:NN \noindent \__scripture_para_noindent: + \bool_if:NF \l__scripture_verse_para_bool + { + \bool_set_false:N \l__scripture_chap_drop_bool + \bool_set_false:N \l__scripture_chap_drop_llap_bool + \bool_set_false:N \l__scripture_chap_drop_smash_bool + \bool_set_false:N \l__scripture_chap_para_bool + \cs_set_eq:NN \vs \__scripture_verse_compact_output:n + } + \bool_gset:Nn \g__scripture_mode_vertical_inner_bool + { \mode_if_vertical_p: } + \RenewDocumentEnvironment { center } { o } + { + \str_set:Nn \l__scripture_currenvir_str { center } + \__scripture_reference_start_peek: + } + { \__scripture_compact_end_inner: } + \RenewDocumentEnvironment { flushright } { o } + { + \str_set:Nn \l__scripture_currenvir_str { flushright } + \__scripture_reference_start_peek: + } + { \__scripture_compact_end_inner: } + \RenewDocumentEnvironment { hanging } { o } + { + \str_set:Nn \l__scripture_currenvir_str { hanging } + \__scripture_reference_start_peek: + } + { \__scripture_compact_end_inner: } + \RenewDocumentEnvironment { midparachap } { o } + { + \str_set:Nn \l__scripture_currenvir_str { midparachap } + \cs_set_eq:cN { end ~ } \__scripture_mid_para_chap_end:n + \__scripture_reference_start_peek: + } + { \__scripture_compact_end_inner: } + \RenewDocumentEnvironment { narrow } { o } + { + \str_set:Nn \l__scripture_currenvir_str { narrow } + \__scripture_reference_start_peek: + } + { \__scripture_compact_end_inner: } + \RenewDocumentEnvironment { poetry } { o } + { + \str_set:Nn \l__scripture_currenvir_str { poetry } + \__scripture_reference_start_peek: + } + { \__scripture_compact_end_inner: } \cs_set_eq:NN \\ \unskip - \cs_set_eq:NN \par \relax + \cs_set_eq:NN \par \__scripture_compact_par: \cs_set_eq:NN \extraskip \relax \cs_set_eq:NN \nohang \relax \cs_set:Npn \selah @@ -1805,14 +3241,13 @@ \c_space_tl ##1 } - \mode_leave_vertical: } - \ignorespaces + \__scripture_reference_start_peek: } { - \bool_if:NT \l__scripture_compact_bool - { \cs_set_eq:NN \par \endgraf } - \__scripture_end:n { #1 } + \bool_lazy_or:nnT \l__scripture_compact_bool \l__scripture_verse_para_bool + { \cs_set_eq:NN \par \para_end: } + \__scripture_end: } %% %% diff --git a/Master/texmf-dist/tex/latex/scrlayer-fancyhdr/scrlayer-fancyhdr.sty b/Master/texmf-dist/tex/latex/scrlayer-fancyhdr/scrlayer-fancyhdr.sty index 285d5bc5e69..3bf4018e424 100644 --- a/Master/texmf-dist/tex/latex/scrlayer-fancyhdr/scrlayer-fancyhdr.sty +++ b/Master/texmf-dist/tex/latex/scrlayer-fancyhdr/scrlayer-fancyhdr.sty @@ -24,9 +24,10 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) %%% docstrip run: identify -\NeedsTeXFormat{LaTeX2e}[1995/12/01] -\ProvidesPackage{scrlayer-fancyhdr}[2022-07-08 v0.2.2 - combining fancyhdr with KOMA-Script's scrlayer] +\NeedsTeXFormat{LaTeX2e}[2020/10/01] +\ProvidesPackage{scrlayer-fancyhdr} + [2025-01-07 v0.3 + combining fancyhdr with KOMA-Script's scrlayer] %%% docstrip run: init \RequirePackage{scrlayer}[2021/02/15] %%% docstrip run: options @@ -35,34 +36,74 @@ \DeclareOption{compatV3}{\PassOptionsToPackage{compatV3}{fancyhdr}} \DeclareOption{myheadings}{\PassOptionsToPackage{myheadings}{fancyhdr}} \DeclareOption{headings}{\PassOptionsToPackage{headings}{fancyhdr}} +\DeclareOption{twoside}{\PassOptionsToPackage{twoside}{fancyhdr}} %%% docstrip run: body \KOMAProcessOptions \RequirePackage{fancyhdr} -\DeclareNewLayer[% - background,oddpage, - head, - contents={\hb@xt@ \layerwidth{% - \f@nch@head\f@nch@Oolh\f@nch@olh\f@nch@och\f@nch@orh\f@nch@Oorh}} -]{fancy.head.odd} -\DeclareNewLayer[% - background,evenpage, - head, - contents={\hb@xt@ \layerwidth{% - \f@nch@head\f@nch@Oelh\f@nch@elh\f@nch@ech\f@nch@erh\f@nch@Oerh}} -]{fancy.head.even} -\DeclareNewLayer[% - foreground,oddpage, - foot, - contents={\hb@xt@ \layerwidth{% - \f@nch@foot\f@nch@Oolf\f@nch@olf\f@nch@ocf\f@nch@orf\f@nch@Oorf}} -]{fancy.foot.odd} -\DeclareNewLayer[% - foreground,evenpage, - foot, - contents={\hb@xt@ \layerwidth{% - \f@nch@foot\f@nch@Oelf\f@nch@elf\f@nch@ecf\f@nch@erf\f@nch@Oerf}} -]{fancy.foot.even} -\@ifpackagelater{fancyhdr}{2019/03/21}{% +\IfPackageAtLeastTF{fancyhdr}{2025/01/01}{% + \DeclareNewLayer[% + background,oddpage, + head, + contents={\hb@xt@ \layerwidth{% + \f@nch@head\f@nch@Oolh\f@nch@olh\f@nch@och\f@nch@orh\f@nch@Oorh + \f@nch@width@olh\f@nch@width@och\f@nch@width@orh + }} + ]{fancy.head.odd} + \DeclareNewLayer[% + background,evenpage, + head, + contents={\hb@xt@ \layerwidth{% + f@nch@head\f@nch@Oelh\f@nch@elh\f@nch@ech\f@nch@erh\f@nch@Oerh + \f@nch@width@elh\f@nch@width@ech\f@nch@width@erh + }} + ]{fancy.head.even} + \DeclareNewLayer[% + foreground,oddpage, + foot, + contents={\hb@xt@ \layerwidth{% + \f@nch@foot\f@nch@Oolf\f@nch@olf\f@nch@ocf\f@nch@orf\f@nch@Oorf + \f@nch@width@olf\f@nch@width@ocf\f@nch@width@orf + }} + ]{fancy.foot.odd} + \DeclareNewLayer[% + foreground,evenpage, + foot, + contents={\hb@xt@ \layerwidth{% + f@nch@foot\f@nch@Oelf\f@nch@elf\f@nch@ecf\f@nch@erf\f@nch@Oerf + \f@nch@width@elf\f@nch@width@ecf\f@nch@width@erf + }} + ]{fancy.foot.even} +}{% + \DeclareNewLayer[% + background,oddpage, + head, + contents={\hb@xt@ \layerwidth{% + \f@nch@head\f@nch@Oolh\f@nch@olh\f@nch@och\f@nch@orh\f@nch@Oorh + }} + ]{fancy.head.odd} + \DeclareNewLayer[% + background,evenpage, + head, + contents={\hb@xt@ \layerwidth{% + \f@nch@head\f@nch@Oelh\f@nch@elh\f@nch@ech\f@nch@erh\f@nch@Oerh + }} + ]{fancy.head.even} + \DeclareNewLayer[% + foreground,oddpage, + foot, + contents={\hb@xt@ \layerwidth{% + \f@nch@foot\f@nch@Oolf\f@nch@olf\f@nch@ocf\f@nch@orf\f@nch@Oorf + }} + ]{fancy.foot.odd} + \DeclareNewLayer[% + foreground,evenpage, + foot, + contents={\hb@xt@ \layerwidth{% + \f@nch@foot\f@nch@Oelf\f@nch@elf\f@nch@ecf\f@nch@erf\f@nch@Oerf + }} + ]{fancy.foot.even} +} +\IfPackageAtLeastTF{fancyhdr}{2019/03/21}{% \DeclarePageStyleByLayers[ onselect={\def\@mkboth{\protect\markboth}}, ]{f@nch@fancycore}{% diff --git a/Master/texmf-dist/tex/latex/simpleicons/simpleicons.sty b/Master/texmf-dist/tex/latex/simpleicons/simpleicons.sty index 804a8e07114..4ab0c32becc 100644 --- a/Master/texmf-dist/tex/latex/simpleicons/simpleicons.sty +++ b/Master/texmf-dist/tex/latex/simpleicons/simpleicons.sty @@ -1,6 +1,6 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{simpleicons}[2024/12/27 14.0.0 Simple Icons 14.0.0 Logos] +\ProvidesPackage{simpleicons}[2025/01/03 14.0.1 Simple Icons 14.0.1 Logos] \RequirePackage{iftex} diff --git a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconseight.fd b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconseight.fd index 153a5d6c691..62b5a7815c6 100644 --- a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconseight.fd +++ b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconseight.fd @@ -1,5 +1,5 @@ - \ProvidesFile{usimpleiconseight.fd}[2024/12/27 Font definitions for U/simpleiconseight.] + \ProvidesFile{usimpleiconseight.fd}[2025/01/03 Font definitions for U/simpleiconseight.] \DeclareFontFamily{U}{simpleiconseight}{} \DeclareFontShape{U}{simpleiconseight}{m}{n}{<-> SimpleIcons--simpleiconseight}{} \endinput diff --git a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsfive.fd b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsfive.fd index e0ec884e84d..e404efbc6f9 100644 --- a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsfive.fd +++ b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsfive.fd @@ -1,5 +1,5 @@ - \ProvidesFile{usimpleiconsfive.fd}[2024/12/27 Font definitions for U/simpleiconsfive.] + \ProvidesFile{usimpleiconsfive.fd}[2025/01/03 Font definitions for U/simpleiconsfive.] \DeclareFontFamily{U}{simpleiconsfive}{} \DeclareFontShape{U}{simpleiconsfive}{m}{n}{<-> SimpleIcons--simpleiconsfive}{} \endinput diff --git a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsfour.fd b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsfour.fd index c6369f4c17d..ad9a6e31966 100644 --- a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsfour.fd +++ b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsfour.fd @@ -1,5 +1,5 @@ - \ProvidesFile{usimpleiconsfour.fd}[2024/12/27 Font definitions for U/simpleiconsfour.] + \ProvidesFile{usimpleiconsfour.fd}[2025/01/03 Font definitions for U/simpleiconsfour.] \DeclareFontFamily{U}{simpleiconsfour}{} \DeclareFontShape{U}{simpleiconsfour}{m}{n}{<-> SimpleIcons--simpleiconsfour}{} \endinput diff --git a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsnine.fd b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsnine.fd index cf9f2ae0e75..9c005bc9927 100644 --- a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsnine.fd +++ b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsnine.fd @@ -1,5 +1,5 @@ - \ProvidesFile{usimpleiconsnine.fd}[2024/12/27 Font definitions for U/simpleiconsnine.] + \ProvidesFile{usimpleiconsnine.fd}[2025/01/03 Font definitions for U/simpleiconsnine.] \DeclareFontFamily{U}{simpleiconsnine}{} \DeclareFontShape{U}{simpleiconsnine}{m}{n}{<-> SimpleIcons--simpleiconsnine}{} \endinput diff --git a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsone.fd b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsone.fd index 053a2ea7152..bb15c8b888d 100644 --- a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsone.fd +++ b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsone.fd @@ -1,5 +1,5 @@ - \ProvidesFile{usimpleiconsone.fd}[2024/12/27 Font definitions for U/simpleiconsone.] + \ProvidesFile{usimpleiconsone.fd}[2025/01/03 Font definitions for U/simpleiconsone.] \DeclareFontFamily{U}{simpleiconsone}{} \DeclareFontShape{U}{simpleiconsone}{m}{n}{<-> SimpleIcons--simpleiconsone}{} \endinput diff --git a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsoneone.fd b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsoneone.fd index fa74580c956..8a8089f50a4 100644 --- a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsoneone.fd +++ b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsoneone.fd @@ -1,5 +1,5 @@ - \ProvidesFile{usimpleiconsoneone.fd}[2024/12/27 Font definitions for U/simpleiconsoneone.] + \ProvidesFile{usimpleiconsoneone.fd}[2025/01/03 Font definitions for U/simpleiconsoneone.] \DeclareFontFamily{U}{simpleiconsoneone}{} \DeclareFontShape{U}{simpleiconsoneone}{m}{n}{<-> SimpleIcons--simpleiconsoneone}{} \endinput diff --git a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsonethree.fd b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsonethree.fd index c6b9cb7dcfe..665f0463270 100644 --- a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsonethree.fd +++ b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsonethree.fd @@ -1,5 +1,5 @@ - \ProvidesFile{usimpleiconsonethree.fd}[2024/12/27 Font definitions for U/simpleiconsonethree.] + \ProvidesFile{usimpleiconsonethree.fd}[2025/01/03 Font definitions for U/simpleiconsonethree.] \DeclareFontFamily{U}{simpleiconsonethree}{} \DeclareFontShape{U}{simpleiconsonethree}{m}{n}{<-> SimpleIcons--simpleiconsonethree}{} \endinput diff --git a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsonetwo.fd b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsonetwo.fd index d87db0e5f31..a6a0ed3797c 100644 --- a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsonetwo.fd +++ b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsonetwo.fd @@ -1,5 +1,5 @@ - \ProvidesFile{usimpleiconsonetwo.fd}[2024/12/27 Font definitions for U/simpleiconsonetwo.] + \ProvidesFile{usimpleiconsonetwo.fd}[2025/01/03 Font definitions for U/simpleiconsonetwo.] \DeclareFontFamily{U}{simpleiconsonetwo}{} \DeclareFontShape{U}{simpleiconsonetwo}{m}{n}{<-> SimpleIcons--simpleiconsonetwo}{} \endinput diff --git a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsonezero.fd b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsonezero.fd index 51fb4c7d51c..190ec48ad6e 100644 --- a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsonezero.fd +++ b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsonezero.fd @@ -1,5 +1,5 @@ - \ProvidesFile{usimpleiconsonezero.fd}[2024/12/27 Font definitions for U/simpleiconsonezero.] + \ProvidesFile{usimpleiconsonezero.fd}[2025/01/03 Font definitions for U/simpleiconsonezero.] \DeclareFontFamily{U}{simpleiconsonezero}{} \DeclareFontShape{U}{simpleiconsonezero}{m}{n}{<-> SimpleIcons--simpleiconsonezero}{} \endinput diff --git a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsseven.fd b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsseven.fd index fd1c646177b..f0dad942416 100644 --- a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsseven.fd +++ b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsseven.fd @@ -1,5 +1,5 @@ - \ProvidesFile{usimpleiconsseven.fd}[2024/12/27 Font definitions for U/simpleiconsseven.] + \ProvidesFile{usimpleiconsseven.fd}[2025/01/03 Font definitions for U/simpleiconsseven.] \DeclareFontFamily{U}{simpleiconsseven}{} \DeclareFontShape{U}{simpleiconsseven}{m}{n}{<-> SimpleIcons--simpleiconsseven}{} \endinput diff --git a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconssix.fd b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconssix.fd index a384654dbaa..965dd830c14 100644 --- a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconssix.fd +++ b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconssix.fd @@ -1,5 +1,5 @@ - \ProvidesFile{usimpleiconssix.fd}[2024/12/27 Font definitions for U/simpleiconssix.] + \ProvidesFile{usimpleiconssix.fd}[2025/01/03 Font definitions for U/simpleiconssix.] \DeclareFontFamily{U}{simpleiconssix}{} \DeclareFontShape{U}{simpleiconssix}{m}{n}{<-> SimpleIcons--simpleiconssix}{} \endinput diff --git a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsthree.fd b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsthree.fd index 476ccb76568..16e7b3f70a5 100644 --- a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsthree.fd +++ b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsthree.fd @@ -1,5 +1,5 @@ - \ProvidesFile{usimpleiconsthree.fd}[2024/12/27 Font definitions for U/simpleiconsthree.] + \ProvidesFile{usimpleiconsthree.fd}[2025/01/03 Font definitions for U/simpleiconsthree.] \DeclareFontFamily{U}{simpleiconsthree}{} \DeclareFontShape{U}{simpleiconsthree}{m}{n}{<-> SimpleIcons--simpleiconsthree}{} \endinput diff --git a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconstwo.fd b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconstwo.fd index 52858245909..cc98d8d87f4 100644 --- a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconstwo.fd +++ b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconstwo.fd @@ -1,5 +1,5 @@ - \ProvidesFile{usimpleiconstwo.fd}[2024/12/27 Font definitions for U/simpleiconstwo.] + \ProvidesFile{usimpleiconstwo.fd}[2025/01/03 Font definitions for U/simpleiconstwo.] \DeclareFontFamily{U}{simpleiconstwo}{} \DeclareFontShape{U}{simpleiconstwo}{m}{n}{<-> SimpleIcons--simpleiconstwo}{} \endinput diff --git a/Master/texmf-dist/tex/latex/tabularray-abnt/tabularray-abnt.sty b/Master/texmf-dist/tex/latex/tabularray-abnt/tabularray-abnt.sty new file mode 100644 index 00000000000..14eb5a86117 --- /dev/null +++ b/Master/texmf-dist/tex/latex/tabularray-abnt/tabularray-abnt.sty @@ -0,0 +1,485 @@ +%%% % -*- coding: utf-8 -*- +%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%% % tabularray-abnt.sty +%%% %---------------------------------------------------------------------- +%%% % copyright (C) January, 2025 by Sadao Massago +%%% % autor: +%%% % Sadao Massago +%%% % e-mail: sadao@ufscar.br +%%% % +%%% % Licença: LaTeX Project Public License versão 1.3c or (se for a sua escolha) qualquer versão posterior. +%%% % https://www.latex-project.org/lppl/ +%%% %---------------------------------------------------------------------- + +%% Need LaTeX 2e version 2020-10-01 or latter (due to AddToHoock) +\NeedsTeXFormat{LaTeX2e}[2020/10/01] + +%%% file name +\ProvidesFile{tabularray-abnt.sty} + [2025/01/06 tabularray-abnt style (require tabularray package)] +\typeout{tabularray-abnt style 2025-01-06 <January/2025>.} + +%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% It not works on older LaTeX compatibility mode (documentstyle) + +\if@compatibility + \PackageError{tabularray-abnt}{Not support older compatible mode (documentstyle)} + {Use documentclass instead of documentstyle} + \endinput +\else + %% OK +\fi + +%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% In way to adjust on memoir (ex. abntex2) or abntexto as document class + +\newif\if@tabularray@abnt@using@memoir +\newif\if@tabularray@abnt@using@abntexto +\@tabularray@abnt@using@memoirfalse +\@tabularray@abnt@using@abntextofalse +\@ifclassloaded{memoir}% Using memoir? +{\@tabularray@abnt@using@memoirtrue}% YES +{ + \@ifclassloaded{abntexto}% Using ABNTexto? + {\@tabularray@abnt@using@abntextotrue}% YES + { % generic class + \RequirePackage{float} + } +} + +%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% Required package + +\RequirePackage{tabularray} +\UseTblrLibrary{hook} + +%%% %---------------------- +%%> \section{ABNT theme} + +%% ABNT theme for table +\NewTblrTheme{abnt}{ + \DefTblrTemplate{caption-sep}{default}{\space ---\space}% default is ": \space" + \SetTblrTemplate{firsthead-text,lasthead-text,conthead-text}{abnt} + \SetTblrTemplate{caption,lasthead,capcont}{abnt} + \DefTblrTemplate{firstfoot,middlefoot}{default}{}% disabling the first and middle footnote + +%%% \SetTblrTemplate{lastfoot-text,lastfoot-text-note}{abnt} + + %% for abntexto, need to change lot write + \if@tabularray@abnt@using@abntexto + \SetTblrTemplate{caption-lot}{abnt} + \fi + + \SetTblrTemplate{remark-tag}{abnt} + \SetTblrTemplate{remark}{abnt} + + \SetTblrStyle{caption,lasthead,capcont}{font=\normalsize} + \SetTblrStyle{firsthead-text,lasthead-text,conthead-text}{font=\footnotesize} + \SetTblrStyle{lastfoot}{font=\footnotesize} +} + +%%% Example of how to insert value from parameter +%%% %\DefTblrTemplate{caption-text}{default}{\InsertTblrText{caption} + +%%% --------------------------------- +%% theme ``quadro'' (text only table) + +%%% % Caution: Avoid space between braces and parameters +\NewTblrTheme{quadro}{ + %% same as abnt theme of table + \DefTblrTemplate{caption-sep}{default}{\space ---\space}% default is ": \space" + \SetTblrTemplate{firsthead-text,lasthead-text,conthead-text}{abnt} + \SetTblrTemplate{caption,lasthead,capcont}{abnt} + \DefTblrTemplate{firstfoot,middlefoot}{default}{}% desabling first and middle footnote + +%%% \SetTblrTemplate{lastfoot-text,lastfoot-text-note}{abnt} + +%%% %% for abntexto, need to change lot write +%%% \if@tabularray@abnt@using@abntexto +%%% %%\SetTblrTemplate{caption-lot}{abnt} +%%% \fi + + \SetTblrTemplate{remark-tag}{abnt} + \SetTblrTemplate{remark}{abnt} + + \SetTblrStyle{caption,lasthead,capcont}{font=\normalsize} + \SetTblrStyle{firsthead-text,lasthead-text,conthead-text}{font=\footnotesize} + \SetTblrStyle{lastfoot}{font=\footnotesize} + + %% Change specific for ``quadro' + \SetTblrTemplate{caption-tag}{quadro} % caption change + \SetTblrTemplate{caption-lot}{quadro} % lot wire change +} + +%%% ----------------------------- +%%> \section{Setup table as ABNT} + +%% counter of table are not nested + +\ifdefined\chapter + \counterwithout{table}{chapter} +\else + \ifdefined\section + \counterwithout{table}{section} + \fi +\fi + +%% counting table and quadro together + +%%% \ExplSyntaxOn +\if@tabularray@abnt@using@abntexto + +%%% \newcommand{\tabularray@abnt@tblr@count@roman}{\romannumeral\inteval{\g__tblr_table_count_int + \countquadro}} + \newcommand{\tabularray@abnt@tblr@count@roman}{\romannumeral\inteval{\value{table} + \countquadro}} +\else + +%%% \newcommand{\tabularray@abnt@tblr@count@roman}{\romannumeral\inteval{\g__tblr_table_count_int + \value{quadro}}} + \newcommand{\tabularray@abnt@tblr@count@roman}{\romannumeral\inteval{\value{table} + \value{quadro}}} +\fi + +%%% \ExplSyntaxOff + +%% additional text for header +\DefTblrTemplate{firsthead-text}{abnt}{\par~\hfill(continua)} % first header +\DefTblrTemplate{lasthead-text}{abnt}{\par~\hfill(conclusão)} % last header +\DefTblrTemplate{conthead-text}{abnt}{\par~\hfill(continuação)} % middle header +%% first header +\DefTblrTemplate{caption}{abnt}{ + \UseTblrTemplate{caption-tag}{default} + \UseTblrTemplate{caption-sep}{default} + \UseTblrTemplate{caption-text}{default} + +%%% % like \ifdefined, but with csname + \ifcsname tabularray@abnt@tblr@spanpages@\tabularray@abnt@tblr@count@roman\endcsname % if span pages + \UseTblrTemplate{firsthead-text}{abnt} % add the firsthead-text + +%%% DEBUG:\tabularray@abnt@tblr@count@roman +%%% \else +%%% DEBUG (no span pages): \roman{tabularray@abnt@global@tblr@counter} + \fi +} + +%% redefine last head title +\DefTblrTemplate{lasthead}{abnt}{ + \UseTblrTemplate{caption-tag}{default} + \UseTblrTemplate{caption-sep}{default} + \UseTblrTemplate{caption-text}{default} + \UseTblrTemplate{lasthead-text}{abnt} % add lasthead-text +} +%% redefine middle head title +\DefTblrTemplate{capcont}{abnt}{ + \UseTblrTemplate{caption-tag}{default} + \UseTblrTemplate{caption-sep}{default} + \UseTblrTemplate{caption-text}{default} + \UseTblrTemplate{conthead-text}{abnt} +} + +%%% %------------------------------------------------- +%%> \section{To save ``page span'' status} + +\newif\if@tablularray@abnt@mark@spanpages + +%%% \AtBeginDocument{% + +%%% % \@tablularray@abnt@mark@spanpagesfalse % initially false +\global\let\if@tablularray@abnt@mark@spanpages\iffalse + +%%% } % \AtBeginDocument{% + +%%% hook tabularray not working as expected. Need more recente version of tabularray? +%%% \AddToHook{tabularray/table/before} +%%% { + +%%% % \@tablularray@abnt@mark@spanpagestrue +%%% \global\let\if@tablularray@abnt@mark@spanpages\iftrue +%%% } +%%% \AddToHook{tabularray/table/after} +%%% { + +%%%% \@tablularray@abnt@mark@spanpagesfalse +%%% \global\let\if@tablularray@abnt@mark@spanpages\iffalse +%%% } + +%%% % check page span status for longtblr +\AddToHook{env/longtblr/after}{ \global\let\if@tablularray@abnt@mark@spanpages\iftrue } +\AddToHook{env/longtblr/end}{ \global\let\if@tablularray@abnt@mark@spanpages\iffalse } + +%%% % check page span status for tblr (with possible long option) +\AddToHook{env/tblr/after}{ \global\let\if@tablularray@abnt@mark@spanpages\iftrue } +\AddToHook{env/tblr/end}{ \global\let\if@tablularray@abnt@mark@spanpages\iffalse } + +%%% % check page span status for tblr like env +%%% % Not work as exprected +%%% \AddToHook{tabularray/table/before}{ \global\let\if@tablularray@abnt@mark@spanpages\iftrue } +%%% \AddToHook{tabularray/table/after}{ \global\let\if@tablularray@abnt@mark@spanpages\iffalse } + +%%% { + + +%%% \AddToHook{env/longtblr/begin} +%%% { + +%%% % \@tablularray@abnt@mark@spanpagestrue +%%% \global\let\if@tablularray@abnt@mark@spanpages\iftrue +%%% } + +%%% \AddToHook{env/longtblr/end} +%%% { + +%%% \@tablularray@abnt@mark@spanpagesfalse +%%% \global\let\if@tablularray@abnt@mark@spanpages\iffalse +%%% } + +%%% % For tblr with long opcion +%%% \AddToHook{env/tblr/begin} +%%% { + +%%% % \@tablularray@abnt@mark@spanpagestrue +%%% \global\let\if@tablularray@abnt@mark@spanpages\iftrue +%%% } + +%%% \AddToHook{env/tblr/end} +%%% { + +%%% % \@tablularray@abnt@mark@spanpagesfalse +%%% \global\let\if@tablularray@abnt@mark@spanpages\iffalse +%% } + +%%% talltblr fit in single page (no hook) + +%% if change pages, mark as ``span pages'' on aux file + +%%% \AddToHook{shipout/after} +\AddToHook{shipout/after} +{ + \if@tablularray@abnt@mark@spanpages + %% to the associated commands act globally + %% tip from https://tex.stackexchange.com/questions/115932/on-the-basics-of-writing-to-reading-from-auxiliary-files-aux-toc-etc + \immediate\write\@auxout{\gdef\string\tabularray@abnt@tblr@spanpages@\tabularray@abnt@tblr@count@roman{true}} + +%%% \else % DEBUG +%%% \immediate\write\@auxout{\gdef\string\tabularray@abnt@tblr@spanpages@\tabularray@abnt@tblr@count@roman{false}} + +\fi + %% to the associated commands act globally + %% tip from https://tex.stackexchange.com/questions/566884/setting-a-newif-to-false-ignored-on-first-check-in-custom-itemize-environment + \global\let\if@tablularray@abnt@mark@spanpages\iffalse + +%%% % DEBUG: +%%% \immediate\write\@auxout{\gdef\string\tabularray@abnt@shipout@message{DEGUB: page=\thepage, tblrnum=\tabularray@abnt@tblr@count@roman}} +} + +%% For abntexto class, need change the form to write on ``lot'' +%% For others, only add global counter +\if@tabularray@abnt@using@abntexto + \ExplSyntaxOn + \DefTblrTemplate{caption-lot}{abnt} + { + \tl_if_empty:NTF \lTblrEntryTl + {\tl_set_eq:NN \l__tblr_caption_short_tl \lTblrCaptionTl} + {\tl_set_eq:NN \l__tblr_caption_short_tl \lTblrEntryTl} + %% \addcontentsline { lot } { table } + %% { \protect\numberline { \thetable } { \l__tblr_caption_short_tl } } + %% add on list of tables using command from abntexto + \addtoext{lot}{lofi}{\protect\lotlabelbox{\thetable}{\l__tblr_caption_short_tl}} + } + \ExplSyntaxOff +%%%\else% \if@tabularray@abnt@using@abntexto +%%% \ExplSyntaxOn +%%% \DefTblrTemplate {caption-lot}{abnt} +%%% { +%%% +%%% %% \stepcounter{tabularray@abnt@global@tblr@counter}% global table/quadro counter +%%% \tl_if_empty:NTF \lTblrEntryTl +%%% { \tl_set_eq:NN \l__tblr_caption_short_tl \lTblrCaptionTl } +%%% { \tl_set_eq:NN \l__tblr_caption_short_tl \lTblrEntryTl } +%%% \addcontentsline { lot } { table } +%%% { \protect\numberline { \thetable } { \l__tblr_caption_short_tl } } +%%% } +%%% \ExplSyntaxOff +\fi% \if@tabularray@abnt@using@abntexto + +%% Change remark to use for source and note as ABNT +\DefTblrTemplate{remark-tag}{abnt}{\InsertTblrRemarkTag} + +%% Change left margin using tip from +%% https://tex.stackexchange.com/questions/645175/how-to-indent-notes-in-tabularray +\newlength\tabularray@abnt@remark@labellength +\DefTblrTemplate{remark}{abnt}{% + \MapTblrRemarks{% + \settowidth{\tabularray@abnt@remark@labellength}{\UseTblrTemplate{remark-tag}{abnt}\UseTblrTemplate{remark-sep}{default}}% + \UseTblrTemplate{remark-tag}{abnt}\UseTblrTemplate{remark-sep}{default}% + \parbox[t]{\dimexpr\linewidth-\tabularray@abnt@remark@labellength}{\UseTblrTemplate{remark-text}{default}}% + \par}\medskip +} + +%%% %------------------- +%%> \section{``Quadro'' (text only table)} + +%%% %------------------ +%% On the abntexto class, create legend entry named ``quadro''. In other cases, create environment ``quadro''. + +%% Names +\providecommand{\quadroname}{Quadro} +\providecommand{\listquadroname}{Lista de quadros} +\@ifpackageloaded{babel}{ + \ifdefined\captionsportugese + \addto\captionsportugese{% portugese + \renewcommand{\quadroname}{Quadro} + \renewcommand{\listquadroname}{Lista de quadros} + } + \fi + \ifdefined\captionsbrazil + \addto\captionsbrazil{% brazilian portugese + \renewcommand{\quadroname}{Quadro} + \renewcommand{\listquadroname}{Lista de quadros} + } + \fi + \ifdefined\captionsbrazilian + \addto\captionsbrazilian{% brazilian portugese + \renewcommand{\quadroname}{Quadro} + \renewcommand{\listquadroname}{Lista de quadros} + } + \fi + \ifdefined\captionsenglish + \addto\captionsenglish{% English + \renewcommand{\quadroname}{Text table} + \renewcommand{\listquadroname}{List of text table} + } + \fi +}{} % \@ifpackageloaded{babel}{ + +%% define for each class + +%% ABNTexto class +\if@tabularray@abnt@using@abntexto % ABNTexto. + %% using command from ABNTexto + \definelegendplace{quadro}{Quadro}{quad.\,}{loq} % new legend entry + + \ifdefined\chapter + \newcommand{\listadequadros}{\notoc\nonum\chapter{\listquadroname}\makeloq} + \else + \newcommand{\listadequadros}{\notoc\nonum\section{\listquadroname}\makeloq} + \fi + %% Caution: don't put space between braces and parameters + \DefTblrTemplate{caption-tag}{quadro}{\quadroname\hspace{0.25em}\the\countquadro} + + \ExplSyntaxOn + \DefTblrTemplate{caption-lot}{quadro} + { + +%%% \stepcounter{tabularray@abnt@global@tblr@counter}% global table/quadro counter + \addtocounter{table}{-1}%Não contar como table + %% counter created by \definelegendplace{quadro} is not \c@quadro+, but \countquadro, and is necessary to use TeX command to increase + \global\advance\countquadro by 1% count as ``quadro'' + \tl_if_empty:NTF \lTblrEntryTl + {\tl_set_eq:NN \l__tblr_caption_short_tl \lTblrCaptionTl} + {\tl_set_eq:NN \l__tblr_caption_short_tl \lTblrEntryTl} + %% add to list of ``quadro'' using command from abntexto + \addtoext{loq}{loqi}{\protect\loqlabelbox{\the\countquadro} {\l__tblr_caption_short_tl}}% + } + \ExplSyntaxOff +\else %% memoir (ABNTeX2 or like) or generic class + \if@tabularray@abnt@using@memoir %% memoir (ABNTeX2 or like) + +%%% %\newfloat[chapter]{quadro}{loq}{\quadroname} +%%% %\counterwithout{quadro}{chapter} + %% using command from memoir + \newfloat{quadro}{loq}{\quadroname} + \newlistof{listadequadros}{loq}{\listquadroname} + +%%% %\newlistentry[chapter]{quadro}{loq}{0} + \newlistentry{quadro}{loq}{0} + + \cftsetindents{quadro}{0em}{2.3em} + \renewcommand{\cftquadroname}{\quadroname\space} + \renewcommand*{\cftquadroaftersnum}{\hfill\textendash\hfill} + \else %% generic class + %% using float package + \newcommand{\listadequadros}{\listof{quadro}{\listofquadrosname}} + \newfloat{quadro}{tbp}{loq}%[chapter] + +%%% %\counterwithout{quadro}{chapter} counter not nested frm chapter + \fi + +%%% % We need to use \hspace and \enskip, but not ~ or \space, +%%% % since we want a correct hangindent caption paragraph. + \DefTblrTemplate {caption-tag} {quadro} {\quadroname\hspace{0.25em}\thequadro} + + \ExplSyntaxOn + \DefTblrTemplate{caption-lot}{quadro} + { + +%%% \stepcounter{tabularray@abnt@global@tblr@counter}% global table/quadro counter + \addtocounter{table}{-1}% not count as table + \stepcounter{quadro}% count as quadro + \tl_if_empty:NTF \lTblrEntryTl + { \tl_set_eq:NN \l__tblr_caption_short_tl \lTblrCaptionTl } + { \tl_set_eq:NN \l__tblr_caption_short_tl \lTblrEntryTl } + \addcontentsline { loq } { table } + { \protect\numberline { \thequadro } { \l__tblr_caption_short_tl } } + } + \ExplSyntaxOff +\fi + +%%% %------------------------------ +%%> \section{New table environment} +%% New environment as wrapper for tblr, instead of new tblr, in way to support table font settings + +%% To set table font for new envrronment +\NewDocumentCommand{\SetAbntTblrFont}{+m} +{ + \gdef\@tabularray@abnt@tblr@font{#1} +} + +%%% % New environments for tables +\NewDocumentEnvironment{abnttblr}{+o +m +b}{ +\ifdefined\@tabularray@abnt@tblr@font \@tabularray@abnt@tblr@font \fi +\begin{tblr}[theme=abnt,#1]{#2} +#3 +\end{tblr} +}{} + +\NewDocumentEnvironment{tallabnttblr}{+o +m +b}{ + +%%% tallabnttblr begin +%%% \if@tablularray@abnt@mark@spanpages +%%% DEBUG: mark span pages active +%%% \fi +%%% table+quadro counter = \tabularray@abnt@tblr@count@roman +\ifdefined\@tabularray@abnt@tblr@font \@tabularray@abnt@tblr@font \fi +\begin{talltblr}[theme=abnt,#1]{#2} +#3 +\end{talltblr} + +%%% tallabnttblr end +%%% \if@tablularray@abnt@mark@spanpages +%%% DEBUG: mark span pages active +%%% \fi +%%% table+quadro counter = \tabularray@abnt@tblr@count@roman +}{} + +\NewDocumentEnvironment{longabnttblr}{+o +m +b}{ + +%%% longabnttblr begin +%%% \if@tablularray@abnt@mark@spanpages +%%% DEBUG: mark span pages active +%%% \fi +%%% table+quadro counter = \tabularray@abnt@tblr@count@roman +%%% \global\let\if@tablularray@abnt@mark@spanpages\iftrue +\ifdefined\@tabularray@abnt@tblr@font \@tabularray@abnt@tblr@font \fi +\begin{longtblr}[theme=abnt,#1]{#2} +#3 +\end{longtblr} + +%%% \global\let\if@tablularray@abnt@mark@spanpages\iffalse + +%%% longabnttblr end +%%% \if@tablularray@abnt@mark@spanpages +%%% DEBUG: mark span pages active +%%% \fi +%%% table+quadro counter = \tabularray@abnt@tblr@count@roman +}{} + +%% end: tabularray-abnt.sty + diff --git a/Master/texmf-dist/tex/latex/tikz-decofonts/tikz-decofonts.sty b/Master/texmf-dist/tex/latex/tikz-decofonts/tikz-decofonts.sty index 984ac0a5f94..61cf680863e 100644 --- a/Master/texmf-dist/tex/latex/tikz-decofonts/tikz-decofonts.sty +++ b/Master/texmf-dist/tex/latex/tikz-decofonts/tikz-decofonts.sty @@ -1,18 +1,20 @@ % Author : C. Pierquet -% licences : Released under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txtf +% licences : Released under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txt % : CC BY-SA 4.0 (https://tex.stackexchange.com/questions/475141/simulating-paintbrush-strokes-in-tikz from user121799) % : (https://tex.stackexchange.com/questions/460836/custom-line-cap-to-simulate-inked-line-in-tikz/460842#460842 from user121799) \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tikz-decofonts}[2024/10/14 0.1.0 Custom fonts, made with TikZ, with effects] +\ProvidesPackage{tikz-decofonts}[2025/01/04 0.1.1 Custom fonts, made with TikZ, with effects] %------History +% 0.1.1 Bicolor txt % 0.1.0 Initial version %------Packages and library \RequirePackage{tikz} \RequirePackage{xstring} \RequirePackage{xintexpr} +\RequirePackage{listofitems} \RequirePackage{simplekv} \usetikzlibrary{decorations,decorations.pathreplacing,calc,positioning,bbox,arrows.meta,bending} @@ -892,5 +894,83 @@ }% } +%====BICOLORTXT +\defKV[bicolortxt]{colors=\def\bicolortxtcols{#1},style=\def\bicolortxtsttyle{#1},intdelta=\def\bicolortxtdelta{#1},paralcolors=\def\bicolortxtcolstrapez{#1}} +\setKVdefault[bicolortxt]{colors={red/blue},style=midh,intdelta=0.66,paralcolors={red/blue/orange/gray}} + +\NewDocumentCommand\tkzbicolor{ O{} m }{% + \restoreKV[bicolortxt]% + \setKV[bicolortxt]{#1}% + \IfStrEq{\bicolortxtsttyle}{paral}% + {% + \setsepchar[.]{/}% + \readlist*\bicolortrapez{\bicolortxtcolstrapez}% + }% + {% + \StrCut{\bicolortxtcols}{/}{\bicolorabove}{\bicolorbelow}% + }% + \tikz[baseline=(l.base),inner sep=0pt,outer sep=0pt]{% + \node[inner sep=0pt,outer sep=0pt](l){\phantom{#2}}; + \coordinate (lnw) at ([shift={(-0.5\pgflinewidth,0.5\pgflinewidth)}]l.north west) ; + \coordinate (ln) at ([shift={(0,0.5\pgflinewidth)}]l.north) ; + \coordinate (lne) at ([shift={(0.5\pgflinewidth,0.5\pgflinewidth)}]l.north east) ; + \coordinate (le) at ([shift={(0.5\pgflinewidth,0)}]l.east) ; + \coordinate (lse) at ([shift={(0.5\pgflinewidth,-0.5\pgflinewidth)}]l.south east) ; + \coordinate (ls) at ([shift={(0,-0.5\pgflinewidth)}]l.south) ; + \coordinate (lsw) at ([shift={(-0.5\pgflinewidth,-0.5\pgflinewidth)}]l.south west) ; + \coordinate (lw) at ([shift={(-0.5\pgflinewidth,0)}]l.west) ; + \IfStrEqCase{\bicolortxtsttyle}{% + {ellips}% + {% + \coordinate (lcircn) at ($(l.center)!\bicolortxtdelta!(l.north)$) ; + \coordinate (lcirce) at ($(l.center)!\bicolortxtdelta!(l.east)$) ; + }% + {rect}% + {% + \coordinate (lrectnw) at ($(l.center)!\bicolortxtdelta!(l.north west)$) ; + \coordinate (lrectse) at ($(l.center)!\bicolortxtdelta!(l.south east)$) ; + }% + {paral}% + {% + \coordinate (ltrapna) at ($(l.north west)!0.333!(l.north east)$) ; + \coordinate (ltrapnb) at ($(l.north west)!0.666!(l.north east)$) ; + \coordinate (ltrapsa) at ($(l.south west)!0.333!(l.south east)$) ; + \coordinate (ltrapsb) at ($(l.south west)!0.666!(l.south east)$) ; + }% + }% + \begin{scope} + \IfStrEqCase{\bicolortxtsttyle}{% + {midh}{\clip(ls)rectangle(lnw);\node[\bicolorabove]at(l){#2};}% + {midv}{\clip(lnw)rectangle(le);\node[\bicolorabove]at(l){#2};}% + {ndiag}{\clip(lnw)--(lne)--(lse)--cycle;\node[\bicolorabove]at(l){#2};}% + {sdiag}{\clip(lsw)--(lnw)--(lne)--cycle;\node[\bicolorabove]at(l){#2};}% + {ellips}{\clip(lsw)rectangle(lne);\node[\bicolorabove]at(l){#2};}% + {rect}{\clip(lsw)rectangle(lne);\node[\bicolorabove]at(l){#2};}% + {paral}{\clip(lsw)--(lnw)--(ltrapna)--cycle;\node[{\bicolortrapez[1]}]at(l){#2};}% + }% + \end{scope} + \begin{scope} + \IfStrEqCase{\bicolortxtsttyle}{% + {midh}{\clip(ls)rectangle(lne);\node[\bicolorbelow]at(l){#2};}% + {midv}{\clip(lsw)rectangle(le);\node[\bicolorbelow]at(l){#2};}% + {ndiag}{\clip(lsw)--(lnw)--(lse)--cycle;\node[\bicolorbelow]at(l){#2};}% + {sdiag}{\clip(lsw)--(lne)--(lse)--cycle;\node[\bicolorbelow]at(l){#2};}% + {ellips}{\clip(lsw)rectangle(lne);\pgfpathellipse{\pgfpointanchor{l}{center}}{\pgfpointanchor{lcirce}{center}}{\pgfpointanchor{lcircn}{center}}\pgfusepath{clip}\node[\bicolorbelow]at(l){#2};}% + {rect}{\clip(lrectnw)rectangle(lrectse);\node[\bicolorbelow]at(l){#2};}% + {paral}{\clip(lsw)--(ltrapna)--(ltrapnb)--(ltrapsa)--cycle;\node[{\bicolortrapez[2]}]at(l){#2};}% + }% + \end{scope} + \IfStrEq{\bicolortxtsttyle}{paral}% + {% + \begin{scope}%3 + \clip(ltrapsa)--(ltrapnb)--(lne)--(ltrapsb)--cycle;\node[{\bicolortrapez[3]}]at(l){#2}; + \end{scope} + \begin{scope}% + \clip(ltrapsb)--(lne)--(lse)--cycle;\node[{\bicolortrapez[4]}]at(l){#2}; + \end{scope} + }% + {}% + }% +} \endinput
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/tikzlings/tikzlibrarytikzlings.code.tex b/Master/texmf-dist/tex/latex/tikzlings/tikzlibrarytikzlings.code.tex index 2c4d97db21c..7fcc0e83971 100644 --- a/Master/texmf-dist/tex/latex/tikzlings/tikzlibrarytikzlings.code.tex +++ b/Master/texmf-dist/tex/latex/tikzlings/tikzlibrarytikzlings.code.tex @@ -29,6 +29,6 @@ \tikzset{ tikzling/.pic={\tikzling}, - tikzling/.search also={,/tikz,/pgf,/thing}, - thing/.search also={,/tikz,/pgf}, + tikzling/.search also={,/tikz,/pgf,/thing}, + thing/.search also={,/tikz,/pgf}, }
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/tikzlings/tikzlings-addons.sty b/Master/texmf-dist/tex/latex/tikzlings/tikzlings-addons.sty index 6b5f2fc8a71..ef2fb63bebf 100644 --- a/Master/texmf-dist/tex/latex/tikzlings/tikzlings-addons.sty +++ b/Master/texmf-dist/tex/latex/tikzlings/tikzlings-addons.sty @@ -12,7 +12,7 @@ % See https://www.latex-project.org/lppl.txt % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\ProvidesPackage{tikzlings-addons}[2024/12/12 version v2.1 Draw additional items for the tikzlings] +\ProvidesPackage{tikzlings-addons}[2025/01/05 version v2.2 Draw additional items for the tikzlings] \RequirePackage{tikz} \usetikzlibrary{patterns} % for the wizard hat @@ -58,63 +58,81 @@ \end{scope}% } +\def\thing@listhead{} +\def\thing@listacces{} +\def\thing@headtext{head} +\def\thing@accesstext{acess} + +\ExplSyntaxOn +\NewDocumentCommand{\thing@ini}{om}{ + \expandafter\newif\csname ifthing@#2\endcsname + \def\thing@tmp{#1} + \ifx\thing@headtext\thing@tmp + \tl_put_right:Nn \thing@listhead { {#2} } + \fi + \ifx\thing@accesstext\thing@tmp + \tl_put_right:Nn \thing@listacces { {#2} } + \fi +} +\ExplSyntaxOff + % Hats %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\newif\ifthing@hat -\newif\ifthing@tophat -\newif\ifthing@beret -\newif\ifthing@strawhat -\newif\ifthing@harlequin -\newif\ifthing@witch -\newif\ifthing@magichat -\newif\ifthing@crown -\newif\ifthing@queencrown -\newif\ifthing@kingcrown -\newif\ifthing@santa -\newif\ifthing@chef -\newif\ifthing@graduate -\newif\ifthing@sombrero -\newif\ifthing@alien +\thing@ini[head]{hat} +\thing@ini[head]{tophat} +\thing@ini[head]{beret} +\thing@ini[head]{strawhat} +\thing@ini[head]{harlequin} +\thing@ini[head]{witch} +\thing@ini[head]{magichat} +\thing@ini[head]{crown} +\thing@ini[head]{queencrown} +\thing@ini[head]{kingcrown} +\thing@ini[head]{santa} +\thing@ini[head]{chef} +\thing@ini[head]{graduate} +\thing@ini[head]{sombrero} +\thing@ini[head]{alien} % Communication %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\newif\ifthing@book -\newif\ifthing@signpost +\thing@ini[acess]{book} +\thing@ini[acess]{signpost} \newif\ifthing@speech \newif\ifthing@think % Food %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\newif\ifthing@pizza +\thing@ini[acess]{pizza} \newif\ifthing@davidlikespineapplepizza -\newif\ifthing@cheese -\newif\ifthing@baguette -\newif\ifthing@cake -\newif\ifthing@icecream -\newif\ifthing@milkshake -\newif\ifthing@wine -\newif\ifthing@cocktail -\newif\ifthing@banana +\thing@ini[acess]{cheese} +\thing@ini[acess]{baguette} +\thing@ini[acess]{cake} +\thing@ini[acess]{icecream} +\thing@ini[acess]{milkshake} +\thing@ini[acess]{wine} +\thing@ini[acess]{cocktail} +\thing@ini[acess]{banana} % Sport %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\newif\ifthing@cricket -\newif\ifthing@hockey -\newif\ifthing@football +\thing@ini[acess]{cricket} +\thing@ini[acess]{hockey} +\thing@ini[acess]{football} % Other %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\newif\ifthing@crystalball -\newif\ifthing@magicwand -\newif\ifthing@rollingpin -\newif\ifthing@lightsaber -\newif\ifthing@torch -\newif\ifthing@basket -\newif\ifthing@easter -\newif\ifthing@crozier -\newif\ifthing@shovel -\newif\ifthing@pickaxe -\newif\ifthing@strawbroom -\newif\ifthing@broom -\newif\ifthing@umbrella -\newif\ifthing@umbrellaclosed -\newif\ifthing@handbag -\newif\ifthing@stick +\thing@ini[acess]{crystalball} +\thing@ini[acess]{magicwand} +\thing@ini[acess]{rollingpin} +\thing@ini[acess]{lightsaber} +\thing@ini[acess]{torch} +\thing@ini[acess]{basket} +\thing@ini[acess]{easter} +\thing@ini[acess]{crozier} +\thing@ini[acess]{shovel} +\thing@ini[acess]{pickaxe} +\thing@ini[acess]{strawbroom} +\thing@ini[acess]{broom} +\thing@ini[acess]{umbrella} +\thing@ini[acess]{umbrellaclosed} +\thing@ini[acess]{handbag} +\thing@ini[acess]{stick} \tikzset{% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - % + % % General % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -126,58 +144,58 @@ % Hats % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - hat/.code = \thing@hattrue + hat/.code = \thing@hattrue \def\thing@hat{#1}, - hat/.default = blue!40!black, - tophat/.code = \thing@tophattrue + hat/.default = blue!40!black, + tophat/.code = \thing@tophattrue \def\thing@tophat{#1}, top hat/.forward to = /thing/tophat, tophat/.default = black!90!white, - beret/.code = \thing@berettrue + beret/.code = \thing@berettrue \def\thing@beret{#1}, - beret/.default = black, + beret/.default = black, strawhat/.code = \thing@strawhattrue \def\thing@strawhat{#1}, straw hat/.forward to = /thing/strawhat, strawhat/.default = gray!30!white, ribbon/.code = \def\thing@ribbon{#1}, ribbon = black, - harlequin/.code = \thing@harlequintrue + harlequin/.code = \thing@harlequintrue \def\thing@harlequin{#1}, harlequin/.default = blue, - niuqelrah/.code = \def\thing@niuqelrah{#1}, - niuqelrah = red, - witch/.code = \thing@witchtrue - \def\thing@witch{#1}, - witch/.default = black, - magichat/.code = \thing@magichattrue + niuqelrah/.code = \def\thing@niuqelrah{#1}, + niuqelrah = red, + witch/.code = \thing@witchtrue + \def\thing@witch{#1}, + witch/.default = black, + magichat/.code = \thing@magichattrue \def\thing@magichat{#1}, magic hat/.forward to = /thing/magichat, magichat/.default = violet, magicstars/.code = \def\thing@magicstars{#1}, - magic stars/.forward to = /thing/magicstars, - magicstars = yellow!80!brown, - crown/.code = \thing@crowntrue + magic stars/.forward to = /thing/magicstars, + magicstars = yellow!80!brown, + crown/.code = \thing@crowntrue \def\thing@crown{#1}, - crown/.default = yellow!90!orange, - queencrown/.code = \thing@queencrowntrue + crown/.default = yellow!90!orange, + queencrown/.code = \thing@queencrowntrue \def\thing@queencrown{#1}, queen crown/.forward to = /thing/queencrown, queencrown/.default = yellow, - kingcrown/.code = \thing@kingcrowntrue + kingcrown/.code = \thing@kingcrowntrue \def\thing@kingcrown{#1}, king crown/.forward to = /thing/kingcrown, kingcrown/.default = gray, - santa/.code = \thing@santatrue + santa/.code = \thing@santatrue \def\thing@santa{#1}, santa/.default = red!80!black, - chef/.code = \thing@cheftrue - \def\thing@chef{#1}, - chef/.default = gray!20!white, - graduate/.code = \thing@graduatetrue + chef/.code = \thing@cheftrue + \def\thing@chef{#1}, + chef/.default = gray!20!white, + graduate/.code = \thing@graduatetrue \def\thing@graduate{#1}, graduate/.default = black, - tassel/.code = \def\thing@tassel{#1}, + tassel/.code = \def\thing@tassel{#1}, tassel = red, sombrero/.code = \thing@sombrerotrue \def\thing@sombrero{#1}, @@ -187,10 +205,10 @@ sombrerob/.code = \def\thing@sombrerob{#1}, sombrerob = red, sombreroc/.code = \def\thing@sombreroc{#1}, - sombreroc = blue, - alien/.code = \thing@alientrue + sombreroc = blue, + alien/.code = \thing@alientrue \def\thing@alien{#1}, - alien/.default = green, + alien/.default = green, %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % Communication @@ -203,17 +221,17 @@ book color/.forward to = /thing/bookcolour, bookcolor/.forward to = /thing/bookcolour, bookcolour = brown, - signpost/.code = \thing@signposttrue + signpost/.code = \thing@signposttrue \def\thing@signpost{#1}, sign post/.forward to = /thing/signpost, signcolour/.code = \def\thing@signcolour{#1}, sign colour/.forward to = /thing/signcolour, sign color/.forward to = /thing/signcolour, - signcolor/.forward to = /thing/signcolour, - signcolour = brown!50!black, + signcolor/.forward to = /thing/signcolour, + signcolour = brown!50!black, signback/.code = \def\thing@signback{#1}, sign back/.forward to = /thing/signback, - signback = green!40!black, + signback = green!40!black, speech/.code = \thing@speechtrue \def\thing@speech{#1}, think/.code = \thing@thinktrue @@ -221,7 +239,7 @@ bubblecolour/.code = \def\thing@bubblecolour{#1}, bubble colour/.forward to = /thing/bubblecolour, bubble color/.forward to = /thing/bubblecolour, - bubblecolor/.forward to = /thing/bubblecolour, + bubblecolor/.forward to = /thing/bubblecolour, bubblecolour = gray!30!white, %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % @@ -230,12 +248,12 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% pizza/.code = \thing@pizzatrue, davidlikespineapplepizza/.code = \thing@davidlikespineapplepizzatrue - \thing@speechtrue + \thing@speechtrue \def\thing@speech{\scalebox{\scalingfactor}{\scalebox{0.9}{\tiny ih, che schifo!}}}, david likes pineapple pizza/.forward to = /thing/davidlikespineapplepizza, cheese/.code = \thing@cheesetrue \def\thing@cheese{#1}, - cheese/.default = yellow!30!orange!60!white, + cheese/.default = yellow!30!orange!60!white, baguette/.code = \thing@baguettetrue \def\thing@baguette{#1}, baguette/.default = brown, @@ -254,17 +272,17 @@ flavourb = white!70!brown, flavourc/.code = \def\thing@flavourc{#1}, flavour c/.forward to = /thing/flavourc, - flavourc = red!50!white, + flavourc = red!50!white, milkshake/.code = \thing@milkshaketrue - \def\thing@milkshake{#1}, - milkshake/.default = red!20!white, + \def\thing@milkshake{#1}, + milkshake/.default = red!20!white, wine/.code = \thing@winetrue - \def\thing@wine{#1}, - wine/.default = red!70!black, - cocktail/.code = \thing@cocktailtrue, + \def\thing@wine{#1}, + wine/.default = red!70!black, + cocktail/.code = \thing@cocktailtrue, banana/.code = \thing@bananatrue \def\thing@banana{#1}, - banana/.default = yellow!80!orange, + banana/.default = yellow!80!orange, %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % Sport @@ -286,11 +304,11 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% crystalball/.code = \thing@crystalballtrue \def\thing@crystalball{#1}, - crystal ball/.forward to = /thing/crystalball, - crystalball/.default = cyan, + crystal ball/.forward to = /thing/crystalball, + crystalball/.default = cyan, magicwand/.code = \thing@magicwandtrue, magic want/.forward to = /thing/magicwand, - rollingpin/.code = \thing@rollingpintrue + rollingpin/.code = \thing@rollingpintrue \def\thing@rollingpin{#1}, rolling pin/.forward to = /thing/rollingpin, rollingpin/.default = brown, @@ -347,12 +365,12 @@ umbrella closed/.forward to = /thing/umbrellaclosed, handbag/.code = \thing@handbagtrue \def\thing@handbag{#1}, - handbag/.default = red!70!black, + handbag/.default = red!70!black, stick/.code = \thing@sticktrue \def\thing@stick{#1}, stick/.default = brown!50!black, leaf/.store in = \thing@leaf, - leaf = green!70!red, + leaf = green!70!red, } \def\thing@draw{% @@ -367,7 +385,7 @@ \pgfmathsetmacro{\scalingfactor}{sqrt(abs(\tmpscaleA*\tmpscaleD-\tmpscaleB*\tmpscaleC))*sqrt(abs((\pgf@xx/1cm)*(\pgf@yy/1cm)-(\pgf@xy/1cm)*(\pgf@yx/1cm)))}% \pgfmathsetmacro{\xscalefactor}{\tmpscaleA} \pgfmathsetmacro{\yscalefactor}{\tmpscaleD} -\pgfmathsetmacro{\decoscalefactor}{sign(\tmpscaleA)*sign(\tmpscaleD)*\scalingfactor}% +\pgfmathsetmacro{\decoscalefactor}{sign(\tmpscaleA)*sign(\tmpscaleD)*\scalingfactor}% % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % @@ -378,15 +396,15 @@ % Hat %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ifthing@hat \fill[\thing@hat,rotate around={-15:(-0.3,2.01)}] (-0.3,2.01) rectangle (0.46,2.31); - \fill[\thing@hat] (0.05,1.92) ellipse[x radius=0.6, y radius=0.1, rotate=-15]; - \fill[\thing@hat] (0.14,2.2) ellipse[x radius=0.37, y radius=0.08, rotate=-15]; + \fill[\thing@hat] (0.05,1.92) ellipse[x radius=0.6, y radius=0.1, rotate=-15]; + \fill[\thing@hat] (0.14,2.2) ellipse[x radius=0.37, y radius=0.08, rotate=-15]; \fi % % Tophat %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ifthing@tophat \fill[\thing@tophat] (0.1,1.94) ellipse[x radius=0.48, y radius=0.1, rotate=-15]; \fill[\thing@tophat,rotate around={-15:(0.15,2.165)}] (-0.17, 1.94) -- (0.46, 1.94) -- (0.52, 2.39) -- (-0.22, 2.39) -- cycle; - \fill[\thing@tophat] (0.21,2.385) ellipse[x radius=0.37, y radius=0.08, rotate=-15]; + \fill[\thing@tophat] (0.21,2.385) ellipse[x radius=0.37, y radius=0.08, rotate=-15]; \fi % % Beret %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -401,13 +419,13 @@ % Straw hat %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ifthing@strawhat \begin{scope}[xshift=-16,rotate=12,yshift=-1] - \fill[\thing@strawhat,rotate=-15] (0.44,2.0) ellipse[x radius=0.75, y radius=0.1]; + \fill[\thing@strawhat,rotate=-15] (0.44,2.0) ellipse[x radius=0.75, y radius=0.1]; \fill[\thing@strawhat,rotate=-15] (0.1,2.05) rectangle (0.78,2.5); - \fill[\thing@strawhat,rotate=-15] (0.44,2.5) ellipse[x radius=0.34, y radius=0.08]; + \fill[\thing@strawhat,rotate=-15] (0.44,2.5) ellipse[x radius=0.34, y radius=0.08]; \fill[\thing@strawhat,rotate=-15] (-0.3,2.02) -- (1.18,2.02) -- (0.78,2.2) -- (0.1,2.2) -- cycle; - \fill[\thing@ribbon,rotate=-15] (0.44,2.2) ellipse[x radius=0.34, y radius=0.08]; + \fill[\thing@ribbon,rotate=-15] (0.44,2.2) ellipse[x radius=0.34, y radius=0.08]; \fill[\thing@ribbon,rotate=-15] (0.1,2.2) rectangle (0.78,2.3); - \fill[\thing@strawhat,rotate=-15] (0.44,2.3) ellipse[x radius=0.34, y radius=0.08]; + \fill[\thing@strawhat,rotate=-15] (0.44,2.3) ellipse[x radius=0.34, y radius=0.08]; \end{scope} \fi % @@ -424,8 +442,8 @@ % % witch %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ifthing@witch - \begin{scope}[xshift=-26] - \fill[\thing@witch,rotate=-15] (0.44,2.13) ellipse[x radius=0.75, y radius=0.17]; + \begin{scope}[xshift=-26] + \fill[\thing@witch,rotate=-15] (0.44,2.13) ellipse[x radius=0.75, y radius=0.17]; \fill[\thing@witch,rotate=-15] (0.05,2.2)--(0.45,3.2)--(0.82,2.2); \end{scope} \fi @@ -433,9 +451,7 @@ % magic hat %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ifthing@magichat \begin{scope}[xshift=-26] - \path[preaction={fill, \thing@magichat!100},rotate=-5, - pattern=fivepointed stars, pattern color=\thing@magicstars!100] - (0.36,1.95)--(0.86,2.95)--(1.20,1.85); + \path[preaction={fill, \thing@magichat!100},rotate=-5,pattern=fivepointed stars, pattern color=\thing@magicstars!100] (0.36,1.95)--(0.86,2.95)--(1.20,1.85); \end{scope} \fi % @@ -502,17 +518,8 @@ % Santa %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ifthing@santa \begin{scope}[xshift=-26] - \fill[\thing@santa] - (0.430,1.803) .. controls (0.590,2.174) and (0.837,2.065) .. - (1.118,1.954) .. controls (1.679,1.731) and (1.328,1.193) .. - (1.647,1.057) .. controls (1.638,1.255) and (1.745,2.104) .. - (1.168,2.270) .. controls (0.867,2.356) and (0.536,2.280) .. - (0.430,1.803) -- cycle; - \fill[white!80!brown] - (0.44,1.733) .. controls (0.211,2.299) and (1.082,2.188) .. - (1.456,1.759) .. controls (1.534,1.637) and (1.480,1.545) .. - (1.400,1.566) .. controls (1.265,1.714) and (0.577,2.267) .. - (0.44,1.733) -- cycle; + \fill[\thing@santa] (0.430,1.803) .. controls (0.590,2.174) and (0.837,2.065) .. (1.118,1.954) .. controls (1.679,1.731) and (1.328,1.193) .. (1.647,1.057) .. controls (1.638,1.255) and (1.745,2.104) .. (1.168,2.270) .. controls (0.867,2.356) and (0.536,2.280) .. (0.430,1.803) -- cycle; + \fill[white!80!brown] (0.44,1.733) .. controls (0.211,2.299) and (1.082,2.188) .. (1.456,1.759) .. controls (1.534,1.637) and (1.480,1.545) .. (1.400,1.566) .. controls (1.265,1.714) and (0.577,2.267) .. (0.44,1.733) -- cycle; \fill[white!80!brown] (1.6,1.0) circle[radius=0.17]; \end{scope} \fi @@ -520,7 +527,7 @@ % Chef hat %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ifthing@chef \begin{scope}[xshift=-26] - \fill[\thing@chef,rotate=-15] (0.44,2.1) ellipse[x radius=0.37, y radius=0.08]; + \fill[\thing@chef,rotate=-15] (0.44,2.1) ellipse[x radius=0.37, y radius=0.08]; \fill[\thing@chef,rotate=-15] (0.07,2.1) rectangle (0.81,2.55); \fill[\thing@chef] (1.01,2.47) circle[radius=0.17]; \fill[\thing@chef] (1.24,2.35) circle[radius=0.15]; @@ -532,7 +539,7 @@ % graduate hat %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ifthing@graduate \begin{scope}[xshift=-26] - \fill[\thing@graduate,rotate=-15] (0.44,2.1) ellipse[x radius=0.37, y radius=0.1]; + \fill[\thing@graduate,rotate=-15] (0.44,2.1) ellipse[x radius=0.37, y radius=0.1]; \fill[\thing@graduate,rotate=-15] (0.07,2.1) rectangle (0.81,2.3); \fill[\thing@graduate] (0.3,2.25) -- (1.05,2.35) -- (1.7,1.95) -- (0.92,1.85) -- cycle; \fill[\thing@tassel,rounded corners=\scalingfactor*1] (1.12,1.89) -- (1.01,2.1) -- (1.09,2.11) -- (1.2,1.9) -- (1.2,1.3) -- (1.12,1.3) -- cycle; @@ -548,9 +555,9 @@ \draw[decorate,decoration={zigzag, amplitude=\decoscalefactor*1pt, segment length=\scalingfactor*6pt},\thing@sombreroa, line width=\scalingfactor*1pt] (-0.81, 1.8) .. controls (-0.30, 2.1) and (0.30, 2.1) .. ( 0.82, 1.8); \begin{scope} \clip (-.45,2) to[in=200] (0,2.8) to[out=-20] (.45,2) -- cycle; - \draw[decorate,decoration={zigzag, amplitude=\decoscalefactor*1pt, segment length=\scalingfactor*3pt},\thing@sombreroa, line width=\scalingfactor*1pt] (-.4,2.4) to[bend left] (.4,2.4); - \fill[decorate,decoration={shape backgrounds,shape=circle, shape size=\scalingfactor*2pt, shape evenly spread=7}, \thing@sombreroc] (-.3,2.6) to[bend left] (.3,2.6); - \fill[decorate,decoration={shape backgrounds,shape=circle,shape size=\scalingfactor*2pt,shape evenly spread=9},\thing@sombreroc] (-.4,2.18) to[bend left] (.4,2.18); + \draw[decorate,decoration={zigzag, amplitude=\decoscalefactor*1pt, segment length=\scalingfactor*3pt},\thing@sombreroa, line width=\scalingfactor*1pt] (-.4,2.4) to[bend left] (.4,2.4); + \fill[decorate,decoration={shape backgrounds,shape=circle, shape size=\scalingfactor*2pt, shape evenly spread=7}, \thing@sombreroc] (-.3,2.6) to[bend left] (.3,2.6); + \fill[decorate,decoration={shape backgrounds,shape=circle,shape size=\scalingfactor*2pt,shape evenly spread=9},\thing@sombreroc] (-.4,2.18) to[bend left] (.4,2.18); \end{scope} \fi % @@ -571,8 +578,7 @@ % book %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ifthing@book \begin{scope}[xshift=-25,yshift=1] - \fill[\thing@bookcolour,rotate=-20] - (0.40,1.20) rectangle (0.80,0.60); + \fill[\thing@bookcolour,rotate=-20] (0.40,1.20) rectangle (0.80,0.60); \node[rotate=-20*\yscalefactor/\xscalefactor, color=white] at (0.88,0.70) {\thing@book};% \end{scope} \fi @@ -599,7 +605,7 @@ % think bubble %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ifthing@think \begin{scope}[xshift=-26] - \fill[\thing@bubblecolour] (2,2.4) ellipse[x radius=0.7, y radius=0.35]; + \fill[\thing@bubblecolour] (2,2.4) ellipse[x radius=0.7, y radius=0.35]; \fill[\thing@bubblecolour] (1.55,2.35) circle[radius=0.25] (2.0,2.15) circle[radius=0.25] (2.4,2.25) circle[radius=0.25] (1.6,2.55) circle[radius=0.25] (2.0,2.6) circle[radius=0.25] (2.35,2.5) circle[radius=0.25] (1.65,1.95) circle[radius=0.1] (1.55,1.80) circle[radius=0.06] (1.47,1.70) circle[radius=0.03]; \node at (2,2.4) {\thing@think}; \end{scope} @@ -616,9 +622,9 @@ \begin{scope}[xshift=-28,yshift=2] \fill[brown] (1.00,0.60) ellipse[x radius=0.4, y radius=0.2]; \fill[red!70!black] (1.00,0.60) ellipse[x radius=0.34, y radius=0.16]; - \fill[white!85!yellow] (1.15,0.65) ellipse[x radius=0.065, y radius=0.04]; - \fill[white!85!yellow] (0.81,0.57) ellipse[x radius=0.065, y radius=0.04]; - \fill[white!85!yellow] (0.95,0.68) ellipse[x radius=0.065, y radius=0.04]; + \fill[white!85!yellow] (1.15,0.65) ellipse[x radius=0.065, y radius=0.04]; + \fill[white!85!yellow] (0.81,0.57) ellipse[x radius=0.065, y radius=0.04]; + \fill[white!85!yellow] (0.95,0.68) ellipse[x radius=0.065, y radius=0.04]; \fill[white!85!yellow] (1.02,0.54) ellipse[x radius=0.065, y radius=0.04]; \fill[green!40!brown] (1.09,0.54) ellipse[x radius=0.07, y radius=0.02]; \fill[green!40!brown,rotate=20] (1.0,0.34) ellipse[x radius=0.07, y radius=0.02]; @@ -631,18 +637,18 @@ \begin{scope}[xshift=-28,yshift=2] \fill[brown] (1.00,0.60) ellipse[x radius=0.4, y radius=0.2]; \fill[red!70!black] (1.00,0.60) ellipse[x radius=0.34, y radius=0.16]; - \fill[yellow!70!brown] (1.15,0.65) ellipse[x radius=0.08, y radius=0.06]; - \fill[red!70!black] (1.15,0.65) ellipse[x radius=0.04, y radius=0.03]; - \fill[yellow!70!brown] (0.81,0.57) ellipse[x radius=0.08, y radius=0.06]; - \fill[red!70!black] (0.81,0.57) ellipse[x radius=0.04, y radius=0.03]; - \fill[yellow!70!brown] (0.95,0.68) ellipse[x radius=0.08, y radius=0.06]; - \fill[red!70!black] (0.95,0.68) ellipse[x radius=0.04, y radius=0.03]; + \fill[yellow!70!brown] (1.15,0.65) ellipse[x radius=0.08, y radius=0.06]; + \fill[red!70!black] (1.15,0.65) ellipse[x radius=0.04, y radius=0.03]; + \fill[yellow!70!brown] (0.81,0.57) ellipse[x radius=0.08, y radius=0.06]; + \fill[red!70!black] (0.81,0.57) ellipse[x radius=0.04, y radius=0.03]; + \fill[yellow!70!brown] (0.95,0.68) ellipse[x radius=0.08, y radius=0.06]; + \fill[red!70!black] (0.95,0.68) ellipse[x radius=0.04, y radius=0.03]; \fill[yellow!70!brown] (1.02,0.54) ellipse[x radius=0.08, y radius=0.06]; - \fill[red!70!black] (1.02,0.54) ellipse[x radius=0.04, y radius=0.03]; + \fill[red!70!black] (1.02,0.54) ellipse[x radius=0.04, y radius=0.03]; \fill[green!40!brown] (1.09,0.54) ellipse[x radius=0.07, y radius=0.02]; \fill[green!40!brown,rotate=20] (1.0,0.34) ellipse[x radius=0.07, y radius=0.02]; \fill[green!40!brown,rotate=-20] (0.9,1.05) ellipse[x radius=0.07, y radius=0.02]; - \fill[green!40!brown] (1.00,0.60) ellipse[x radius=0.03, y radius=0.06]; + \fill[green!40!brown] (1.00,0.60) ellipse[x radius=0.03, y radius=0.06]; \end{scope} \fi % @@ -682,7 +688,7 @@ \fill[\thing@cone,rotate=-20] (0.35,1.20)--(0.50,0.60)--(0.75,1.20); \fill[\thing@flavoura] (0.85,1.03) circle[radius=0.12]; \fill[\thing@flavourb] (1.05,0.95) circle[radius=0.12]; - \fill[\thing@flavourc] (0.95,1.1) circle[radius=0.12]; + \fill[\thing@flavourc] (0.95,1.1) circle[radius=0.12]; \end{scope} \fi % @@ -692,7 +698,7 @@ \fill[cyan!10!white, rotate=-10] (0.8,0.50) ellipse[x radius=0.17, y radius=0.05]; \fill[cyan!10!white, rotate=-10] (0.8,0.55) ellipse[x radius=0.12, y radius=0.03]; \begin{scope} - \clip[rotate=-10] (0.58,0.5) rectangle (1.02,1.03); + \clip[rotate=-10] (0.58,0.5) rectangle (1.02,1.03); \fill[cyan!10!white, rotate=-10] (0.8,0.94) ellipse[x radius=0.18, y radius=0.4]; \fill[\thing@milkshake, rotate=-10] (0.8,0.94) ellipse[x radius=0.15, y radius=0.36]; \end{scope} @@ -700,7 +706,7 @@ \fill[red!90!black] (1.0,1.1) circle[radius=0.05]; \fill[white!85!yellow] (0.94,1.05) circle[radius=0.05] (1.03,1.03) circle[radius=0.05]; \fill[cyan!10!white, rotate=-10] (0.8,0.50) ellipse[x radius=0.17, y radius=0.05]; - \fill[red!90!black,rotate=20] (1.2,0.58) rectangle (1.22,0.85); + \fill[red!90!black,rotate=20] (1.2,0.58) rectangle (1.22,0.85); \end{scope} \fi % @@ -711,11 +717,11 @@ \fill[cyan!10!white, rotate=-10] (0.8,0.55) ellipse[x radius=0.12, y radius=0.03]; \fill[cyan!10!white, rotate=-10] (0.8,0.7) ellipse[x radius=0.03, y radius=0.2]; \begin{scope} - \clip[rotate=-10] (0.58,0.5) rectangle (1.02,1.03); + \clip[rotate=-10] (0.58,0.5) rectangle (1.02,1.03); \fill[cyan!10!white, rotate=-10] (0.8,1.1) ellipse[x radius=0.18, y radius=0.4]; \end{scope} \begin{scope} - \clip[rotate=-10] (0.58,0.5) rectangle (1.02,0.87); + \clip[rotate=-10] (0.58,0.5) rectangle (1.02,0.87); \fill[\thing@wine, rotate=-10] (0.8,1.1) ellipse[x radius=0.15, y radius=0.36]; \end{scope} \end{scope} @@ -790,7 +796,7 @@ \ifthing@crystalball \shade[ball color=\thing@crystalball,opacity=0.7] (0,0.8) circle[radius=0.33]; \fi -% +% % magic wand %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ifthing@magicwand \begin{scope}[xshift=-16,yshift=2] @@ -818,51 +824,36 @@ % torch %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ifthing@torch \begin{scope}[xshift=-26] - \fill[red!50!yellow] - (1.4338,1.025) .. controls (1.4308,0.8877) and (1.3468,0.8997) .. - (1.2447,0.748) .. controls (1.1427,0.8982) and (1.0721,0.8892) .. - (1.0646,1.024) .. controls (1.0541,1.1714) and (1.2642,1.1654) .. - (1.2492,1.386) .. controls (1.3093,1.3110) and (1.4383,1.2705) .. - (1.4338,1.025) -- cycle; - \fill[red!25!yellow, scale=0.67, xshift=17, yshift=15] - (1.4338,1.025) .. controls (1.4308,0.8877) and (1.3468,0.8997) .. - (1.2447,0.748) .. controls (1.1427,0.8982) and (1.0721,0.8892) .. - (1.0646,1.024) .. controls (1.0541,1.1714) and (1.2642,1.1654) .. - (1.2492,1.386) .. controls (1.3093,1.3110) and (1.4383,1.2705) .. - (1.4338,1.025) -- cycle; - \fill[white!50!yellow, scale=0.4, xshift=53.5, yshift=45.3] - (1.4338,1.025) .. controls (1.4308,0.8877) and (1.3468,0.8997) .. - (1.2447,0.748) .. controls (1.1427,0.8982) and (1.0721,0.8892) .. - (1.0646,1.024) .. controls (1.0541,1.1714) and (1.2642,1.1654) .. - (1.2492,1.386) .. controls (1.3093,1.3110) and (1.4383,1.2705) .. - (1.4338,1.025) -- cycle; + \fill[red!50!yellow] (1.4338,1.025) .. controls (1.4308,0.8877) and (1.3468,0.8997) .. (1.2447,0.748) .. controls (1.1427,0.8982) and (1.0721,0.8892) .. (1.0646,1.024) .. controls (1.0541,1.1714) and (1.2642,1.1654) .. (1.2492,1.386) .. controls (1.3093,1.3110) and (1.4383,1.2705) .. (1.4338,1.025) -- cycle; + \fill[red!25!yellow, scale=0.67, xshift=17, yshift=15] (1.4338,1.025) .. controls (1.4308,0.8877) and (1.3468,0.8997) .. (1.2447,0.748) .. controls (1.1427,0.8982) and (1.0721,0.8892) .. (1.0646,1.024) .. controls (1.0541,1.1714) and (1.2642,1.1654) .. (1.2492,1.386) .. controls (1.3093,1.3110) and (1.4383,1.2705) .. (1.4338,1.025) -- cycle; + \fill[white!50!yellow, scale=0.4, xshift=53.5, yshift=45.3] (1.4338,1.025) .. controls (1.4308,0.8877) and (1.3468,0.8997) .. (1.2447,0.748) .. controls (1.1427,0.8982) and (1.0721,0.8892) .. (1.0646,1.024) .. controls (1.0541,1.1714) and (1.2642,1.1654) .. (1.2492,1.386) .. controls (1.3093,1.3110) and (1.4383,1.2705) .. (1.4338,1.025) -- cycle; \fill[\thing@torch,rounded corners=\scalingfactor*1] (1.1,0.96) -- (0.77,0.25) -- (0.83,0.25) -- (1.3,0.86) -- cycle; \fill[\thing@torch,rotate=-28] (0.62,1.32) ellipse[x radius=0.2, y radius=0.08]; \end{scope} \fi% -% +% % basket %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ifthing@basket \begin{scope}[xshift=-28.5] \fill[\thing@basket, start angle=180, end angle=360, x radius=0.35, y radius=0.35] (0.65,0.61) arc -- cycle; \fill[\thing@basket, start angle=180, end angle=0, even odd rule] [x radius=0.35, y radius=0.5] (0.65,0.6) arc -- cycle [x radius=0.3, y radius=0.45] (0.7,0.6) arc -- cycle; - \fill[\thing@basket, even odd rule] (1,0.6) ellipse[x radius=0.35, y radius=0.1] (1,0.6) ellipse[x radius=0.3, y radius=0.07]; + \fill[\thing@basket, even odd rule] (1,0.6) ellipse[x radius=0.35, y radius=0.1] (1,0.6) ellipse[x radius=0.3, y radius=0.07]; \fill[\thing@basket!75!black] (1,0.6) ellipse[x radius=0.3, y radius=0.07]; - \end{scope} -\fi% + \end{scope} +\fi% % % easter basket %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ifthing@easter \begin{scope}[xshift=-28.5] \begin{scope} - \clip [start angle=180, end angle=0, x radius=0.3, y radius=0.45] (0.7,0.6) arc -- cycle [start angle=180, end angle=360, x radius=0.3, y radius=0.07] (0.7,0.6) arc -- cycle; + \clip [start angle=180, end angle=0, x radius=0.3, y radius=0.45] (0.7,0.6) arc -- cycle [start angle=180, end angle=360, x radius=0.3, y radius=0.07] (0.7,0.6) arc -- cycle; \fill[\thing@eggb, rotate=-5] (0.95,0.72) ellipse[x radius=0.09, y radius=0.13]; \fill[\thing@egga, rotate=10] (0.94,0.42) ellipse[x radius=0.09, y radius=0.13]; \fill[\thing@eggc, rotate=-30] (0.7,1.08) ellipse[x radius=0.09, y radius=0.13]; \end{scope} - \end{scope} -\fi% + \end{scope} +\fi% % % crozier %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ifthing@crozier @@ -871,7 +862,7 @@ \clip [rotate=-20] (0.6,2.3) rectangle (1.1,1.999); \fill[even odd rule,\thing@crozier] (1.5,1.6) circle[radius=0.2] (1.5,1.6) circle[radius=0.1]; \end{scope} - \fill[\thing@crozier,rotate=-20] (0.663,0.5) rectangle (0.763,2.0); + \fill[\thing@crozier,rotate=-20] (0.663,0.5) rectangle (0.763,2.0); \end{scope} \fi % @@ -935,9 +926,9 @@ \fill[\thing@leaf] (-0.01,0) .. controls (-0.1,0) and (-0.02, 0.2) .. (0,0.2) .. controls (0.02, 0.2) and (0.1,0) .. (0.01,0.0); \path[clip] (-0.04,-0.04)-- (-0.01,0) .. controls (-0.1,0) and (-0.02, 0.2) .. (0,0.2) .. controls (0.02, 0.2) and (0.1,0) .. (0.01,0)-- (0.04,-0.04) --cycle; \draw[\thing@leaf!80!, line width=0.1] (0,-0.04) -- (0,0.2) \foreach \i in {0.02,0.04,...,0.2} {(0,\i) -- ++(0.1,\i) (0,\i) -- ++(-0.1,\i)} ; - \end{scope} + \end{scope} %stick itself - \fill[\thing@stick!90!red] (-0.04,0.8) -- (-0.04,0.4) arc[start angle=345,end angle=270,radius=0.03] -- ++(0,-0.01) arc[start angle=90,end angle=15,radius=0.03] -- (-0.04,0) arc [start angle=180, end angle=360 ,x radius=0.04, y radius=0.02] -- (0.04, 0.4) arc [start angle=180, end angle=120, radius=0.08] arc [start angle=-90, end angle=90, x radius=0.02, y radius=0.04] arc [start angle=240, end angle=180, radius=0.08] -- (0.04,0.75) arc [start angle=0, end angle=120 ,x radius=0.04, y radius=0.02] --cycle; + \fill[\thing@stick!90!red] (-0.04,0.8) -- (-0.04,0.4) arc[start angle=345,end angle=270,radius=0.03] -- ++(0,-0.01) arc[start angle=90,end angle=15,radius=0.03] -- (-0.04,0) arc [start angle=180, end angle=360 ,x radius=0.04, y radius=0.02] -- (0.04, 0.4) arc [start angle=180, end angle=120, radius=0.08] arc [start angle=-90, end angle=90, x radius=0.02, y radius=0.04] arc [start angle=240, end angle=180, radius=0.08] -- (0.04,0.75) arc [start angle=0, end angle=120 ,x radius=0.04, y radius=0.02] --cycle; \fill[\thing@stick!90!] (0.08, 0.51) ellipse [x radius=0.02, y radius=0.04] (0,0.75) ellipse [x radius=0.04, y radius=0.02] ; \draw[\thing@stick!90!red, line width=0.06] (0.08, 0.51) ellipse [x radius=0.016, y radius=0.032] ellipse [x radius=0.012, y radius=0.024] ellipse [x radius=0.008, y radius=0.016] (0,0.75) ellipse [y radius=0.016, x radius=0.032] ellipse [y radius=0.012, x radius=0.024] ellipse [y radius=0.008, x radius=0.016] ; @@ -946,3 +937,19 @@ \fi % } + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% Random items +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\pgfmathdeclarerandomlist{head}{\thing@listhead} +\pgfmathdeclarerandomlist{accessories}{\thing@listacces} + +\def\shufflethings{% + \pgfmathrandomitem{\head}{head}% + \edef\randomhead{\head}% + \pgfmathrandomitem{\accessories}{accessories}% + \edef\randomaccessories{\accessories}% +} diff --git a/Master/texmf-dist/tex/latex/tikzlings/tikzlings-anteaters.sty b/Master/texmf-dist/tex/latex/tikzlings/tikzlings-anteaters.sty index 752231cc5b5..a8dfafb0b69 100644 --- a/Master/texmf-dist/tex/latex/tikzlings/tikzlings-anteaters.sty +++ b/Master/texmf-dist/tex/latex/tikzlings/tikzlings-anteaters.sty @@ -12,7 +12,7 @@ %% See https://www.latex-project.org/lppl.txt %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\ProvidesPackage{tikzlings-anteaters}[2024/12/12 version v2.1 Drawing anteaters in TikZ] +\ProvidesPackage{tikzlings-anteaters}[2025/01/05 version v2.2 Drawing anteaters in TikZ] \RequirePackage{tikz} \RequirePackage{tikzlings-addons} @@ -50,28 +50,28 @@ body/.store in = \anteater@body, body = red!55!green!75!blue!66!white, eye/.store in = \anteater@eye, - eye = \anteater@body!70!brown!50!darkgray, + eye = \anteater@body!70!brown!50!darkgray, %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % options % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - 3D/.code = \anteater@threeDtrue, + 3D/.code = \anteater@threeDtrue, leftstep/.code = \anteater@leftsteptrue, left step/.forward to = /anteater/leftstep, rightstep/.code = \anteater@rightsteptrue, - right step/.forward to = /anteater/rightstep, - back/.code = \anteater@backtrue, + right step/.forward to = /anteater/rightstep, + back/.code = \anteater@backtrue, contour/.code = \anteater@contourtrue \def\anteater@contour{#1}, - contour/.default = black, - outline/.forward to = /anteater/contour, + contour/.default = black, + outline/.forward to = /anteater/contour, } \def\anteater@draw{% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % - % minimal bounding box size + % minimal bounding box size % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \path (-0.75,0.1) rectangle (1.12,2.26); @@ -89,7 +89,7 @@ \pgfmathsetmacro{\yscalefactor}{\tmpscaleD} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - % + % % switch between 2D, 3D and contours, from % https://chat.stackexchange.com/transcript/message/45991801#45991801 % @@ -107,25 +107,25 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % Body parts - % + % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \csname anteaterhookbackground\endcsname \csname tikzlinghookbackground\endcsname - % + % % Feet %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ifanteater@leftstep - \anteater@part@draw[\anteater@body!70!brown!50!darkgray] (-0.255,0.25) ellipse[x radius=0.23, y radius=0.09]; + \anteater@part@draw[\anteater@body!70!brown!50!darkgray] (-0.255,0.25) ellipse[x radius=0.23, y radius=0.09]; \else% step - \anteater@part@draw[\anteater@body!70!brown!50!darkgray] (-0.255,0.2) ellipse[x radius=0.23, y radius=0.09]; + \anteater@part@draw[\anteater@body!70!brown!50!darkgray] (-0.255,0.2) ellipse[x radius=0.23, y radius=0.09]; \fi% step % \ifanteater@rightstep \anteater@part@draw[\anteater@body!70!brown!50!darkgray] (0.255,0.25) ellipse[x radius=0.23, y radius=0.09]; \else% step \anteater@part@draw[\anteater@body!70!brown!50!darkgray] (0.255,0.2) ellipse[x radius=0.23, y radius=0.09]; - \fi% step + \fi% step % % Tail %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \unless\ifanteater@back @@ -140,9 +140,8 @@ % % Collar %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ifanteater@back - \anteater@part@draw[\anteater@body!45!white!95!orange] (-0,1.47) ellipse [x radius=0.36, y radius=0.28]; - \anteater@part@draw[\anteater@body!70!brown!50!darkgray] - (-0,1.47) ellipse [x radius=0.35, y radius=0.23]; + \anteater@part@draw[\anteater@body!45!white!95!orange] (-0,1.47) ellipse [x radius=0.36, y radius=0.28]; + \anteater@part@draw[\anteater@body!70!brown!50!darkgray] (-0,1.47) ellipse [x radius=0.35, y radius=0.23]; \else% back \anteater@part@draw[\anteater@body!45!white!95!orange] (0.33, 1.55) -- (-0.33, 1.55) .. controls (-0.5, 1.05) and (-0.1, 0.95) .. (0, 0.60) .. controls (0.1, 0.95) and (0.5, 1.05) .. (0.33, 1.55) -- cycle; \anteater@part@draw[\anteater@body!70!brown!50!darkgray] (0.33, 1.55) -- (-0.33, 1.55) .. controls (-0.45, 1.1) and (-0.1, 1) .. (0, 0.70) .. controls (0.1, 1) and (0.45, 1.1) .. (0.33, 1.55) -- cycle; @@ -151,15 +150,15 @@ % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \csname anteaterhookbelly\endcsname \csname tikzlinghookbelly\endcsname - % + % \ifanteater@back % Head %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \anteater@part@draw[\anteater@body] (-0,1.73) ellipse [x radius=0.36, y radius=0.33]; % % Ears %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \anteater@part@draw[\anteater@body!70!brown!50!darkgray] (0.5551, 2.2281) .. controls (0.4961, 2.2273) and (0.4390, 2.2093) .. (0.3831, 2.1919) .. controls (0.3282, 2.173) and (0.2725, 2.1539) .. (0.2231, 2.1228) .. controls (0.1875, 2.0984) and (0.1524, 2.0637) .. (0.1470, 2.0187) .. controls (0.1446, 2.0028) and (0.1518, 1.9881) .. (0.1584, 1.9744) .. controls (0.1706, 1.9343) and (0.2090, 1.9063) .. (0.25, 1.9017) .. controls (0.3079, 1.8943) and (0.3684, 1.9134) .. (0.4132, 1.9504) .. controls (0.4657, 1.9988) and (0.5111, 2.0545) .. (0.5513, 2.1133) .. controls (0.5692, 2.1404) and (0.5854, 2.1692) .. (0.5945, 2.2004) .. controls (0.5989, 2.2232) and (0.5717, 2.2282) .. (0.5551, 2.2281) -- cycle; - \anteater@part@draw[\anteater@body!70!brown!50!darkgray] (-0.5551, 2.2281) .. controls (-0.4961, 2.2273) and (-0.4390, 2.2093) .. (-0.3831, 2.1919) .. controls (-0.3282, 2.173) and (-0.2725, 2.1539) .. (-0.2231, 2.1228) .. controls (-0.1875, 2.0984) and (-0.1524, 2.0637) .. (-0.1470, 2.0187) .. controls (-0.1446, 2.0028) and (-0.1518, 1.9881) .. (-0.1584, 1.9744) .. controls (-0.1706, 1.9343) and (-0.2090, 1.9063) .. (-0.25, 1.9017) .. controls (-0.3079, 1.8943) and (-0.3684, 1.9134) .. (-0.4132, 1.9504) .. controls (-0.4657, 1.9988) and (-0.5111, 2.0545) .. (-0.5513, 2.1133) .. controls (-0.5692, 2.1404) and (-0.5854, 2.1692) .. (-0.5945, 2.2004) .. controls (-0.5989, 2.2232) and (-0.5717, 2.2282) .. (-0.5551, 2.2281) -- cycle; - % + \anteater@part@draw[\anteater@body!70!brown!50!darkgray] (0.5551, 2.2281) .. controls (0.4961, 2.2273) and (0.4390, 2.2093) .. (0.3831, 2.1919) .. controls (0.3282, 2.173) and (0.2725, 2.1539) .. (0.2231, 2.1228) .. controls (0.1875, 2.0984) and (0.1524, 2.0637) .. (0.1470, 2.0187) .. controls (0.1446, 2.0028) and (0.1518, 1.9881) .. (0.1584, 1.9744) .. controls (0.1706, 1.9343) and (0.2090, 1.9063) .. (0.25, 1.9017) .. controls (0.3079, 1.8943) and (0.3684, 1.9134) .. (0.4132, 1.9504) .. controls (0.4657, 1.9988) and (0.5111, 2.0545) .. (0.5513, 2.1133) .. controls (0.5692, 2.1404) and (0.5854, 2.1692) .. (0.5945, 2.2004) .. controls (0.5989, 2.2232) and (0.5717, 2.2282) .. (0.5551, 2.2281) -- cycle; + \anteater@part@draw[\anteater@body!70!brown!50!darkgray] (-0.5551, 2.2281) .. controls (-0.4961, 2.2273) and (-0.4390, 2.2093) .. (-0.3831, 2.1919) .. controls (-0.3282, 2.173) and (-0.2725, 2.1539) .. (-0.2231, 2.1228) .. controls (-0.1875, 2.0984) and (-0.1524, 2.0637) .. (-0.1470, 2.0187) .. controls (-0.1446, 2.0028) and (-0.1518, 1.9881) .. (-0.1584, 1.9744) .. controls (-0.1706, 1.9343) and (-0.2090, 1.9063) .. (-0.25, 1.9017) .. controls (-0.3079, 1.8943) and (-0.3684, 1.9134) .. (-0.4132, 1.9504) .. controls (-0.4657, 1.9988) and (-0.5111, 2.0545) .. (-0.5513, 2.1133) .. controls (-0.5692, 2.1404) and (-0.5854, 2.1692) .. (-0.5945, 2.2004) .. controls (-0.5989, 2.2232) and (-0.5717, 2.2282) .. (-0.5551, 2.2281) -- cycle; + % \else% back % % Ears %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -169,19 +168,18 @@ (-0.4086, 1.9465) .. controls (-0.4679, 1.9952) and (-0.6205, 2.1813) .. (-0.5862, 2.2146) .. controls (-0.5517, 2.2477) and (-0.3434, 2.1152) .. (-0.2841, 2.0665) .. controls (-0.2249, 2.0177) and (-0.2048, 1.9515) .. (-0.2391, 1.9184) .. controls (-0.2736, 1.8853) and (-0.3494, 1.8979) .. (-0.40861, 1.9465) -- cycle; % % Head %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \anteater@part@draw[\anteater@body] - (0.33, 1.71) .. controls (0.16, 1.52) and (0.1, 1.5) .. (0.08, 1.05) .. controls (0.07, 1) and (-0.07, 1) .. (-0.08, 1.05) .. controls (-0.1, 1.5) and (-0.16, 1.52) .. (-0.33, 1.7) .. controls (-0.45, 1.85) and (-0.22, 2.05) .. (0, 2.05) .. controls (0.22, 2.05) and (0.45, 1.85) .. (0.33, 1.7) -- cycle; + \anteater@part@draw[\anteater@body] (0.33, 1.71) .. controls (0.16, 1.52) and (0.1, 1.5) .. (0.08, 1.05) .. controls (0.07, 1) and (-0.07, 1) .. (-0.08, 1.05) .. controls (-0.1, 1.5) and (-0.16, 1.52) .. (-0.33, 1.7) .. controls (-0.45, 1.85) and (-0.22, 2.05) .. (0, 2.05) .. controls (0.22, 2.05) and (0.45, 1.85) .. (0.33, 1.7) -- cycle; % % Cheeks %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \anteater@part@draw[\anteater@body!45!white!95!orange] (0.3508, 1.739) .. controls (0.3508, 1.739) and (0.2861, 1.8489) .. (0.1571, 1.7664) .. controls (0.0279, 1.684) and (0.0627, 1.0524) .. (0.0627, 1.0524) .. controls (0.0627, 1.0524) and (0.131, 1.3772) .. (0.2314, 1.44) .. controls (0.3599, 1.5206) and (0.3508, 1.739) .. (0.3508, 1.739) -- cycle (-0.3508, 1.739) .. controls (-0.3508, 1.739) and (-0.2861, 1.8489) .. (-0.1571, 1.7664) .. controls (-0.0279, 1.684) and (-0.0627, 1.0524) .. (-0.0627, 1.0524) .. controls (-0.0627, 1.0524) and (-0.131, 1.3772) .. (-0.2314, 1.44) .. controls (-0.3599, 1.5206) and (-0.3508, 1.739) .. (-0.3508, 1.739) -- cycle; - % + % % Nose %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \anteater@part@draw[\anteater@body!70!brown!50!darkgray] (0, 1.08) ellipse[x radius=0.08, y radius=0.05]; % % Eyes %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \anteater@part@draw[\anteater@eye] (0.23, 1.7) circle[radius=0.05]; - \anteater@part@draw[\anteater@eye] (-0.23, 1.7) circle[radius=0.05]; + \anteater@part@draw[\anteater@eye] (-0.23, 1.7) circle[radius=0.05]; \fi% back % % Tail if back %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -192,7 +190,7 @@ % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \csname anteaterhookbody\endcsname \csname tikzlinghookbody\endcsname - % + % } %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/latex/tikzlings/tikzlings-apes.sty b/Master/texmf-dist/tex/latex/tikzlings/tikzlings-apes.sty index 6f071aaa89b..58edf5c636a 100644 --- a/Master/texmf-dist/tex/latex/tikzlings/tikzlings-apes.sty +++ b/Master/texmf-dist/tex/latex/tikzlings/tikzlings-apes.sty @@ -12,7 +12,7 @@ %% See https://www.latex-project.org/lppl.txt %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\ProvidesPackage{tikzlings-apes}[2024/12/12 version v2.1 Drawing apes in TikZ] +\ProvidesPackage{tikzlings-apes}[2025/01/05 version v2.2 Drawing apes in TikZ] \RequirePackage{tikz} \RequirePackage{tikzlings-addons} @@ -54,8 +54,8 @@ body/.store in = \ape@body, body = red!15!brown!80!black, eye/.store in = \ape@eye, - eye = \ape@body!40!black, - eyes/.forward to = /ape/eye, + eye = \ape@body!40!black, + eyes/.forward to = /ape/eye, skin/.store in = \ape@skin, skin = \ape@body!50!gray, nose/.store in = \ape@nose, @@ -73,29 +73,30 @@ % options % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - 3D/.code = \ape@threeDtrue, + 3D/.code = \ape@threeDtrue, handposition/.code = \csname ape@handposition@#1true\endcsname, - kikazaru/.code = \ape@handposition@hearnoeviltrue, + kikazaru/.code = \ape@handposition@hearnoeviltrue, mizaru/.code = \ape@handposition@seenoeviltrue, iwazaru/.code = \ape@handposition@speaknoeviltrue, - %clap/.code = \ape@handposition@claptrue, %%% should we support this too? - %waving/.code = \ape@handposition@wavingtrue, %%% should we support this too? - hearnoevil/.code = \ape@handposition@hearnoeviltrue, - seenoevil/.code = \ape@handposition@seenoeviltrue, + %clap/.code = \ape@handposition@claptrue, %%% should we support this too? + %waving/.code = \ape@handposition@wavingtrue, %%% should we support this too? + hearnoevil/.code = \ape@handposition@hearnoeviltrue, + seenoevil/.code = \ape@handposition@seenoeviltrue, speaknoevil/.code = \ape@handposition@speaknoeviltrue, back/.code = \ape@backtrue, openmouth/.code = \ape@openmouthtrue, + open mouth/.forward to = /ape/openmouth, contour/.code = \ape@contourtrue \def\ape@contour{#1} \def\ape@mouth{#1}, - contour/.default = black, + contour/.default = black, outline/.forward to = /ape/contour, } \def\ape@draw{% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % - % minimal bounding box size + % minimal bounding box size % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \path (-1.435,0.1) rectangle (1.435, 2.27); @@ -112,7 +113,7 @@ \pgfmathsetmacro{\yscalefactor}{\tmpscaleD} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - % + % % switch between 2D, 3D and contours, from % https://chat.stackexchange.com/transcript/message/45991801#45991801 % @@ -130,12 +131,12 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % Body parts - % + % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \csname apehookbackground\endcsname - \csname tikzlinghookbackground\endcsname + \csname tikzlinghookbackground\endcsname % % Draw backside partially in reversed order %%%%%%%%%%%%%%%%%%%%%%%% \ifape@back @@ -149,19 +150,19 @@ \ape@part@draw[\ape@arms] (0.9,1.61) ellipse[x radius=0.15, y radius=0.6, rotate=125]; % see-no-evil pose backside %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \else\ifape@handposition@seenoevil% - \ape@part@draw[\ape@skin!90!white] (-0.325,1.91) ++(390:0.3 and 0.1) arc [start angle=390, end angle=150,x radius=0.3, y radius=0.1] {[rotate=10] arc [start angle=150, end angle=-60,x radius=0.15, y radius=0.03] } -- cycle; + \ape@part@draw[\ape@skin!90!white] (-0.325,1.91) ++(390:0.3 and 0.1) arc [start angle=390, end angle=150,x radius=0.3, y radius=0.1] {[rotate=10] arc [start angle=150, end angle=-60,x radius=0.15, y radius=0.03] } -- cycle; \ape@part@draw[\ape@arms] (-0.59,1.97) arc [start angle=25, end angle=335,x radius=0.475, y radius=0.15] --cycle; \ape@part@draw[\ape@arms] (-0.93,1.70) ellipse[x radius=0.15, y radius=0.6, rotate=70]; - \ape@part@draw[\ape@skin!90!white] (0.325,1.91) ++(150:0.3 and 0.1) arc [start angle=150, end angle=390,x radius=0.3, y radius=0.1] {[rotate=-10] arc [start angle=30, end angle=240,x radius=0.15, y radius=0.03] } -- cycle; - \ape@part@draw[\ape@arms] (0.59,1.97) arc [start angle=155, end angle=-155,x radius=0.475, y radius=0.15] --cycle; + \ape@part@draw[\ape@skin!90!white] (0.325,1.91) ++(150:0.3 and 0.1) arc [start angle=150, end angle=390,x radius=0.3, y radius=0.1] {[rotate=-10] arc [start angle=30, end angle=240,x radius=0.15, y radius=0.03] } -- cycle; + \ape@part@draw[\ape@arms] (0.59,1.97) arc [start angle=155, end angle=-155,x radius=0.475, y radius=0.15] --cycle; \ape@part@draw[\ape@arms] (0.93,1.70) ellipse[x radius=0.15, y radius=0.6, rotate=110]; % speak-no-evil pose backside %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \else\ifape@handposition@speaknoevil% \ape@part@draw[\ape@arms] (-0.85,1.55) ellipse[x radius=0.15, y radius=0.6, rotate=-100]; - \ape@part@draw[\ape@skin!90!white] (-0.275,1.46) ++(390:0.3 and 0.1) arc [start angle=390, end angle=150,x radius=0.3, y radius=0.1] {[rotate=10] arc [start angle=150, end angle=-60,x radius=0.15, y radius=0.03] } -- cycle; + \ape@part@draw[\ape@skin!90!white] (-0.275,1.46) ++(390:0.3 and 0.1) arc [start angle=390, end angle=150,x radius=0.3, y radius=0.1] {[rotate=10] arc [start angle=150, end angle=-60,x radius=0.15, y radius=0.03] } -- cycle; \ape@part@draw[\ape@arms] (-0.53,1.52) {[rotate=-10] arc [start angle=15, end angle=335,x radius=0.475, y radius=0.15]} --cycle; \ape@part@draw[\ape@arms] (0.85,1.55) ellipse[x radius=0.15, y radius=0.6, rotate=100]; - \ape@part@draw[\ape@skin!90!white] (0.275,1.46) ++(150:0.3 and 0.1) arc [start angle=150, end angle=390,x radius=0.3, y radius=0.1] {[rotate=-10] arc [start angle=30, end angle=240,x radius=0.15, y radius=0.03] } -- cycle; + \ape@part@draw[\ape@skin!90!white] (0.275,1.46) ++(150:0.3 and 0.1) arc [start angle=150, end angle=390,x radius=0.3, y radius=0.1] {[rotate=-10] arc [start angle=30, end angle=240,x radius=0.15, y radius=0.03] } -- cycle; \ape@part@draw[\ape@arms] (0.53,1.52) {[rotate=10] arc [start angle=165, end angle=-155,x radius=0.475, y radius=0.15]} --cycle; % clapping hand pose backside %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \else\ifape@handposition@clap% @@ -173,9 +174,9 @@ \ape@part@draw[\ape@arms] (0.75,1.95) ellipse[x radius=0.15, y radius=0.6, rotate=150]; % waving left hand pose backside %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \else\ifape@handposition@waving% - \ape@part@draw[\ape@arms] (-0.53,1.115) {[rotate=5] arc [start angle=25, end angle=335,x radius=0.475, y radius=0.15]} --cycle; + \ape@part@draw[\ape@arms] (-0.53,1.115) {[rotate=5] arc [start angle=25, end angle=335,x radius=0.475, y radius=0.15]} --cycle; \ape@part@draw[\ape@arms] (-0.9,1.25) ellipse[x radius=0.15, y radius=0.6, rotate=-60]; - \ape@part@draw[\ape@skin!90!white] (0.97,3.2) ++(390:0.3 and 0.1) {[rotate=90] arc [start angle=390, end angle=150,x radius=0.3, y radius=0.1] {[rotate=10] arc [start angle=150, end angle=-60,x radius=0.15, y radius=0.03] } -- cycle}; + \ape@part@draw[\ape@skin!90!white] (0.97,3.2) ++(390:0.3 and 0.1) {[rotate=90] arc [start angle=390, end angle=150,x radius=0.3, y radius=0.1] {[rotate=10] arc [start angle=150, end angle=-60,x radius=0.15, y radius=0.03] } -- cycle}; \ape@part@draw[\ape@arms] (1.35,2.74) {[rotate=100] arc [start angle=335, end angle=25,x radius=0.475, y radius=0.15]} --cycle; \ape@part@draw[\ape@arms] (0.93,1.70) ellipse[x radius=0.15, y radius=0.6, rotate=-70]; % default pose backside %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -187,10 +188,10 @@ \fi\fi\fi\fi\fi % % legs / feet backside %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \ape@part@draw[\ape@skin] (1.2,0.27) ++(210:0.3 and 0.1) {[rotate=180] arc [start angle=210, end angle=-30,x radius=0.3, y radius=0.1] {[rotate=10] arc [start angle=-30, end angle=-240,x radius=0.15, y radius=0.03]}-- cycle}; + \ape@part@draw[\ape@skin] (1.2,0.27) ++(210:0.3 and 0.1) {[rotate=180] arc [start angle=210, end angle=-30,x radius=0.3, y radius=0.1] {[rotate=10] arc [start angle=-30, end angle=-240,x radius=0.15, y radius=0.03]}-- cycle}; \ape@part@draw[\ape@legs] (0.7,0.67) ellipse[x radius=0.15, y radius=0.6, rotate=-30]; \ape@part@draw[\ape@legs] (0.52,0.68) ellipse[x radius=0.15, y radius=0.7, rotate=-45]; - \ape@part@draw[\ape@skin] (-1.2,0.27) ++(-30:0.3 and 0.1) {[rotate=180] arc [start angle=-30, end angle=210,x radius=0.3, y radius=0.1] {[rotate=-10] arc [start angle=210, end angle=420,x radius=0.15, y radius=0.03]}-- cycle}; + \ape@part@draw[\ape@skin] (-1.2,0.27) ++(-30:0.3 and 0.1) {[rotate=180] arc [start angle=-30, end angle=210,x radius=0.3, y radius=0.1] {[rotate=-10] arc [start angle=210, end angle=420,x radius=0.15, y radius=0.03]}-- cycle}; \ape@part@draw[\ape@legs] (-0.7,0.67) ellipse[x radius=0.15, y radius=0.6, rotate=30]; \ape@part@draw[\ape@legs] (-0.52,0.68) ellipse[x radius=0.15, y radius=0.7, rotate=45]; % @@ -239,10 +240,8 @@ \fi % % Feet %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \ape@part@draw[\ape@skin] (0.675,0.2) ++(-30:0.3 and 0.1) arc [start angle=-30, end angle=210,x radius=0.3, y radius=0.1] {[rotate=-10] arc - [start angle=210, end angle=420,x radius=0.15, y radius=0.03]}-- cycle; - \ape@part@draw[\ape@skin] (-0.675,0.2) ++(210:0.3 and 0.1) arc [start angle=210, end angle=-30,x radius=0.3, y radius=0.1] {[rotate=10] arc - [start angle=-30, end angle=-240,x radius=0.15, y radius=0.03]}-- cycle; + \ape@part@draw[\ape@skin] (0.675,0.2) ++(-30:0.3 and 0.1) arc [start angle=-30, end angle=210,x radius=0.3, y radius=0.1] {[rotate=-10] arc [start angle=210, end angle=420,x radius=0.15, y radius=0.03]}-- cycle; + \ape@part@draw[\ape@skin] (-0.675,0.2) ++(210:0.3 and 0.1) arc [start angle=210, end angle=-30,x radius=0.3, y radius=0.1] {[rotate=10] arc [start angle=-30, end angle=-240,x radius=0.15, y radius=0.03]}-- cycle; % % Legs %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ape@part@draw[\ape@legs] (0.52,0.68) ellipse[x radius=0.15, y radius=0.7, rotate=-45]; @@ -261,18 +260,18 @@ % see-no-evil pose %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \else\ifape@handposition@seenoevil \ape@part@draw[\ape@arms] (-0.93,1.70) ellipse[x radius=0.15, y radius=0.6, rotate=70]; - \ape@part@draw[\ape@skin!90!white] (-0.325,1.91) ++(390:0.3 and 0.1) arc [start angle=390, end angle=150,x radius=0.3, y radius=0.1] {[rotate=10] arc [start angle=150, end angle=-60,x radius=0.15, y radius=0.03] } -- cycle; + \ape@part@draw[\ape@skin!90!white] (-0.325,1.91) ++(390:0.3 and 0.1) arc [start angle=390, end angle=150,x radius=0.3, y radius=0.1] {[rotate=10] arc [start angle=150, end angle=-60,x radius=0.15, y radius=0.03] } -- cycle; \ape@part@draw[\ape@arms] (-0.59,1.97) arc [start angle=25, end angle=335,x radius=0.475, y radius=0.15] --cycle; \ape@part@draw[\ape@arms] (0.93,1.70) ellipse[x radius=0.15, y radius=0.6, rotate=110]; - \ape@part@draw[\ape@skin!90!white] (0.325,1.91) ++(150:0.3 and 0.1) arc [start angle=150, end angle=390,x radius=0.3, y radius=0.1] {[rotate=-10] arc [start angle=30, end angle=240,x radius=0.15, y radius=0.03] } -- cycle; - \ape@part@draw[\ape@arms] (0.59,1.97) arc [start angle=155, end angle=-155,x radius=0.475, y radius=0.15] --cycle; + \ape@part@draw[\ape@skin!90!white] (0.325,1.91) ++(150:0.3 and 0.1) arc [start angle=150, end angle=390,x radius=0.3, y radius=0.1] {[rotate=-10] arc [start angle=30, end angle=240,x radius=0.15, y radius=0.03] } -- cycle; + \ape@part@draw[\ape@arms] (0.59,1.97) arc [start angle=155, end angle=-155,x radius=0.475, y radius=0.15] --cycle; % speak-no-evil pose %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \else\ifape@handposition@speaknoevil% \ape@part@draw[\ape@arms] (-0.85,1.55) ellipse[x radius=0.15, y radius=0.6, rotate=-100]; - \ape@part@draw[\ape@skin!90!white] (-0.275,1.46) ++(390:0.3 and 0.1) arc [start angle=390, end angle=150,x radius=0.3, y radius=0.1] {[rotate=10] arc [start angle=150, end angle=-60,x radius=0.15, y radius=0.03] } -- cycle; + \ape@part@draw[\ape@skin!90!white] (-0.275,1.46) ++(390:0.3 and 0.1) arc [start angle=390, end angle=150,x radius=0.3, y radius=0.1] {[rotate=10] arc [start angle=150, end angle=-60,x radius=0.15, y radius=0.03] } -- cycle; \ape@part@draw[\ape@arms] (-0.53,1.52) {[rotate=-10] arc [start angle=15, end angle=335,x radius=0.475, y radius=0.15]} --cycle; \ape@part@draw[\ape@arms] (0.85,1.55) ellipse[x radius=0.15, y radius=0.6, rotate=100]; - \ape@part@draw[\ape@skin!90!white] (0.275,1.46) ++(150:0.3 and 0.1) arc [start angle=150, end angle=390,x radius=0.3, y radius=0.1] {[rotate=-10] arc [start angle=30, end angle=240,x radius=0.15, y radius=0.03] } -- cycle; + \ape@part@draw[\ape@skin!90!white] (0.275,1.46) ++(150:0.3 and 0.1) arc [start angle=150, end angle=390,x radius=0.3, y radius=0.1] {[rotate=-10] arc [start angle=30, end angle=240,x radius=0.15, y radius=0.03] } -- cycle; \ape@part@draw[\ape@arms] (0.53,1.52) {[rotate=10] arc [start angle=165, end angle=-155,x radius=0.475, y radius=0.15]} --cycle; % clapping pose %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \else\ifape@handposition@clap% @@ -285,18 +284,18 @@ % waving hand pose %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \else\ifape@handposition@waving% \ape@part@draw[\ape@arms] (-0.93,1.70) ellipse[x radius=0.15, y radius=0.6, rotate=70]; - \ape@part@draw[\ape@skin!90!white] (-0.97,3.2) ++(150:0.3 and 0.1) {[rotate=-90] arc [start angle=150, end angle=390,x radius=0.3, y radius=0.1] {[rotate=-10] arc [start angle=30, end angle=240,x radius=0.15, y radius=0.03] } -- cycle}; + \ape@part@draw[\ape@skin!90!white] (-0.97,3.2) ++(150:0.3 and 0.1) {[rotate=-90] arc [start angle=150, end angle=390,x radius=0.3, y radius=0.1] {[rotate=-10] arc [start angle=30, end angle=240,x radius=0.15, y radius=0.03] } -- cycle}; \ape@part@draw[\ape@arms] (-1.35,2.74) {[rotate=80] arc [start angle=25, end angle=335,x radius=0.475, y radius=0.15]} --cycle; \ape@part@draw[\ape@arms] (0.9,1.25) ellipse[x radius=0.15, y radius=0.6, rotate=60]; - \ape@part@draw[\ape@skin!90!white] (0.325,1.05) ++(150:0.3 and 0.1) arc [start angle=150, end angle=390,x radius=0.3, y radius=0.1] {[rotate=-10] arc [start angle=30, end angle=240,x radius=0.15, y radius=0.03] } -- cycle; + \ape@part@draw[\ape@skin!90!white] (0.325,1.05) ++(150:0.3 and 0.1) arc [start angle=150, end angle=390,x radius=0.3, y radius=0.1] {[rotate=-10] arc [start angle=30, end angle=240,x radius=0.15, y radius=0.03] } -- cycle; \ape@part@draw[\ape@arms] (0.53,1.115) {[rotate=-5] arc [start angle=155, end angle=-155,x radius=0.475, y radius=0.15]} --cycle; % normal pose %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \else \ape@part@draw[\ape@arms] (-0.9,1.25) ellipse[x radius=0.15, y radius=0.6, rotate=-60]; - \ape@part@draw[\ape@skin!90!white] (-0.325,1.05) ++(390:0.3 and 0.1) arc [start angle=390, end angle=150,x radius=0.3, y radius=0.1] {[rotate=10] arc [start angle=150, end angle=-60,x radius=0.15, y radius=0.03] } -- cycle; + \ape@part@draw[\ape@skin!90!white] (-0.325,1.05) ++(390:0.3 and 0.1) arc [start angle=390, end angle=150,x radius=0.3, y radius=0.1] {[rotate=10] arc [start angle=150, end angle=-60,x radius=0.15, y radius=0.03] } -- cycle; \ape@part@draw[\ape@arms] (-0.53,1.115) {[rotate=5] arc [start angle=25, end angle=335,x radius=0.475, y radius=0.15]} --cycle; \ape@part@draw[\ape@arms] (0.9,1.25) ellipse[x radius=0.15, y radius=0.6, rotate=60]; - \ape@part@draw[\ape@skin!90!white] (0.325,1.05) ++(150:0.3 and 0.1) arc [start angle=150, end angle=390,x radius=0.3, y radius=0.1] {[rotate=-10] arc [start angle=30, end angle=240,x radius=0.15, y radius=0.03] } -- cycle; + \ape@part@draw[\ape@skin!90!white] (0.325,1.05) ++(150:0.3 and 0.1) arc [start angle=150, end angle=390,x radius=0.3, y radius=0.1] {[rotate=-10] arc [start angle=30, end angle=240,x radius=0.15, y radius=0.03] } -- cycle; \ape@part@draw[\ape@arms] (0.53,1.115) {[rotate=-5] arc [start angle=155, end angle=-155,x radius=0.475, y radius=0.15]} --cycle; \fi\fi\fi\fi\fi% \fi% @@ -340,7 +339,7 @@ %In addition to the colour of the body, the colour of various body parts can be adjusted: %\begin{tcblisting}{title={Eye colour}} %\ape[eye=red] -%\end{tcblisting} +%\end{tcblisting} %\begin{tcblisting}{title={Nose colour}} %\ape[nose=red] %\end{tcblisting} @@ -378,7 +377,7 @@ %\begin{tcblisting}{title={speak no evil}} %\ape[handposition=speaknoevil] %\end{tcblisting} -% As shortcuts, these three apes are also available via +% As shortcuts, these three apes are also available via %\saminline|\ape[seenoevil]|, \saminline|\ape[hearnoevil]|, \saminline|\ape[speaknoevil]| and \saminline|\ape[mizaru]|, \saminline|\ape[kikazaru]|, \saminline|\ape[iwazaru]|. % %To see a hooting ape: diff --git a/Master/texmf-dist/tex/latex/tikzlings/tikzlings-bats.sty b/Master/texmf-dist/tex/latex/tikzlings/tikzlings-bats.sty index 562fb80b62c..3c0880f950c 100644 --- a/Master/texmf-dist/tex/latex/tikzlings/tikzlings-bats.sty +++ b/Master/texmf-dist/tex/latex/tikzlings/tikzlings-bats.sty @@ -12,7 +12,7 @@ %% See https://www.latex-project.org/lppl.txt %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\ProvidesPackage{tikzlings-bats}[2024/12/12 version v2.1 Drawing bats in TikZ] +\ProvidesPackage{tikzlings-bats}[2025/01/05 version v2.2 Drawing bats in TikZ] \RequirePackage{tikz} \RequirePackage{tikzlings-addons} @@ -26,13 +26,14 @@ % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \csname bathookforeground\endcsname \csname tikzlinghookforeground\endcsname - % + % } \newif\ifbat@threeD \newif\ifbat@back \newif\ifbat@contour \newif\ifbat@teeth +\newif\ifbat@openmouth \tikzset{ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -50,39 +51,41 @@ body/.store in = \bat@body, body = black!75!white, ears/.store in = \bat@ears, - ears = \bat@body, + ears = \bat@body, eye/.store in = \bat@eye, eye = white, pupil/.store in = \bat@pupil, pupil = black, mouth/.store in = \bat@mouth, - mouth = black, + mouth = black, feet/.store in = \bat@feet, - feet = orange, + feet = orange, wings/.store in = \bat@wings, - wings = 1, + wings = 1, %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % options % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - teeth/.code = \bat@teethtrue - \def\bat@teeth{#1}, + teeth/.code = \bat@teethtrue + \def\bat@teeth{#1}, teeth/.default = white, - 3D/.code = \bat@threeDtrue, - back/.code = \bat@backtrue, + openmouth/.code = \bat@openmouthtrue, + open mouth/.forward to = /bat/openmouth, + 3D/.code = \bat@threeDtrue, + back/.code = \bat@backtrue, contour/.code = \bat@contourtrue \def\bat@contour{#1} \def\bat@antennas{#1} \def\bat@mouth{#1}, - contour/.default = black, - outline/.forward to = /bat/contour, + contour/.default = black, + outline/.forward to = /bat/contour, } \def\bat@draw{% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % - % minimal bounding box size + % minimal bounding box size % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \path (-0.44,0.0) rectangle (0.44, 2.2); @@ -99,7 +102,7 @@ \pgfmathsetmacro{\yscalefactor}{\tmpscaleD} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - % + % % switch between 2D, 3D and contours, from % https://chat.stackexchange.com/transcript/message/45991801#45991801 % @@ -117,7 +120,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % Body parts - % + % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -171,13 +174,17 @@ % % Teeth %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ifbat@teeth - \bat@part@draw[\bat@teeth] (-0.1,1.36) -- (-0.12,1.3) -- (-0.14,1.38) -- cycle; - \bat@part@draw[\bat@teeth] (0.1,1.36) -- (0.12,1.3) -- (0.14,1.38) -- cycle; + \bat@part@draw[\bat@teeth] (-0.1,1.36) -- (-0.12,1.3) -- (-0.14,1.38) -- cycle; + \bat@part@draw[\bat@teeth] (0.1,1.36) -- (0.12,1.3) -- (0.14,1.38) -- cycle; \fi % % Mouth %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \draw[\bat@mouth,line width=\scalingfactor*0.4pt] (0.18, 1.42) arc [start angle=-40, end angle=-140, radius=0.23]; - % + \ifbat@openmouth + \filldraw[\bat@mouth,line width=\scalingfactor*0.4pt] (0.18, 1.42) arc [start angle=-40, end angle=-140, radius=0.23]; + \else + \draw[\bat@mouth,line width=\scalingfactor*0.4pt] (0.18, 1.42) arc [start angle=-40, end angle=-140, radius=0.23]; + \fi + % % \fi% back % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -234,7 +241,12 @@ %\bat[feet=red] %\end{tcblisting} % -%The spread of the wings can be adjusted by passing values between 0 and 1 to the \saminline|wings| option: +% The bat can open its mouth: +%\begin{tcblisting}{title={Open mouth}} +%\bat[openmouth] +%\end{tcblisting} +% +%With the \saminline|wings| option, one can adjust the spread of the wings. It accepts values between~0 and~1: %\begin{tcblisting}{title={Wing span}} %\bat[wings=0.5] %\end{tcblisting} diff --git a/Master/texmf-dist/tex/latex/tikzlings/tikzlings-bears.sty b/Master/texmf-dist/tex/latex/tikzlings/tikzlings-bears.sty index 4c550dc729d..a85104c34ef 100644 --- a/Master/texmf-dist/tex/latex/tikzlings/tikzlings-bears.sty +++ b/Master/texmf-dist/tex/latex/tikzlings/tikzlings-bears.sty @@ -12,7 +12,7 @@ %% See https://www.latex-project.org/lppl.txt %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\ProvidesPackage{tikzlings-bears}[2024/12/12 version v2.1 Draw teddy bears in TikZ] +\ProvidesPackage{tikzlings-bears}[2025/01/05 version v2.2 Draw teddy bears in TikZ] \RequirePackage{tikz} \RequirePackage{tikzlings-addons} @@ -31,6 +31,7 @@ \newif\ifbear@threeD \newif\ifbear@back \newif\ifbear@contour +\newif\ifbear@openmouth \tikzset{ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -48,7 +49,7 @@ body/.store in = \bear@body, body = brown!70!black, eye/.store in = \bear@eye, - eye = \bear@body!42!black, + eye = \bear@body!42!black, mouth/.store in = \bear@mouth, mouth = \bear@body!42!black, %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -56,19 +57,21 @@ % options % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - 3D/.code = \bear@threeDtrue, - back/.code = \bear@backtrue, + openmouth/.code = \bear@openmouthtrue, + open mouth/.forward to = /bear/openmouth, + 3D/.code = \bear@threeDtrue, + back/.code = \bear@backtrue, contour/.code = \bear@contourtrue \def\bear@contour{#1} \def\bear@mouth{#1}, - contour/.default = black, - outline/.forward to = /bear/contour, + contour/.default = black, + outline/.forward to = /bear/contour, } \def\bear@draw{% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % - % minimal bounding box size + % minimal bounding box size % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \path (-0.8, 0.0) rectangle (0.8, 2.13); @@ -85,7 +88,7 @@ \pgfmathsetmacro{\yscalefactor}{\tmpscaleD} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - % + % % switch between 2D, 3D and contours, from % https://chat.stackexchange.com/transcript/message/45991801#45991801 % @@ -111,11 +114,11 @@ \pgfmathsetmacro{\bear@sat}{(array({\bear@hsbcolorspec},1))-0.38} \pgfmathsetmacro{\bear@bright}{(array({\bear@hsbcolorspec},2))+0.35} \definecolor{bear@bright}{hsb}{\bear@hue,\bear@sat,\bear@bright} - % + % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % Body parts - % + % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -128,12 +131,12 @@ % % Feet if back %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ifbear@back - \bear@part@draw[\bear@body] (0.425, 0.3) circle[radius=0.28]; + \bear@part@draw[\bear@body] (0.425, 0.3) circle[radius=0.28]; \bear@part@draw[\bear@body] (-0.425, 0.3) circle[radius=0.28]; \fi% back % % Body %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \bear@part@draw[\bear@body] (0,0.75) ellipse[x radius=0.55, y radius=0.65]; + \bear@part@draw[\bear@body] (0,0.75) ellipse[x radius=0.55, y radius=0.65]; \unless\ifbear@back \bear@part@draw[bear@bright] (0,0.7) ellipse[x radius=0.35, y radius=0.4]; \fi% back @@ -144,9 +147,9 @@ % % Feet %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \unless\ifbear@back - \bear@part@draw[\bear@body] (0.425, 0.3) circle[radius=0.28]; + \bear@part@draw[\bear@body] (0.425, 0.3) circle[radius=0.28]; \bear@part@draw[\bear@body] (-0.425, 0.3) circle[radius=0.28]; - \bear@part@draw[bear@bright] (0.425, 0.3) circle[radius=0.17]; + \bear@part@draw[bear@bright] (0.425, 0.3) circle[radius=0.17]; \bear@part@draw[bear@bright] (-0.425, 0.3) circle[radius=0.17]; \fi% back % @@ -159,21 +162,25 @@ \fi% back % % Head %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \bear@part@draw[\bear@body] (0, 1.55) circle[radius=0.5]; + \bear@part@draw[\bear@body] (0, 1.55) circle[radius=0.5]; % % Show details only from the front %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \unless\ifbear@back % % Muzzle %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \bear@part@draw[bear@bright] (0, 1.4) ellipse[x radius=0.28, y radius=0.2]; - \bear@part@draw[bear@bright!60!red] (0, 1.5) ellipse[x radius=0.15, y radius=0.08]; + \bear@part@draw[bear@bright] (0, 1.4) ellipse[x radius=0.28, y radius=0.2]; + \bear@part@draw[bear@bright!60!red] (0, 1.5) ellipse[x radius=0.15, y radius=0.08]; % % Eyes %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \bear@part@draw[\bear@eye] (-0.155, 1.7) circle[radius=0.05]; - \bear@part@draw[\bear@eye] (0.155, 1.7) circle[radius=0.05]; + \bear@part@draw[\bear@eye] (-0.155, 1.7) circle[radius=0.05]; + \bear@part@draw[\bear@eye] (0.155, 1.7) circle[radius=0.05]; % % Mouth %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \draw[\bear@mouth,line width=\scalingfactor*0.4pt] (0.145, 1.38) arc [start angle=-20, end angle=-160, radius=0.16]; + \ifbear@openmouth + \filldraw[\bear@mouth,line width=\scalingfactor*0.4pt] (0.145, 1.38) arc [start angle=-20, end angle=-160, radius=0.16]; + \else + \draw[\bear@mouth,line width=\scalingfactor*0.4pt] (0.145, 1.38) arc [start angle=-20, end angle=-160, radius=0.16]; + \fi % \fi% back % @@ -222,6 +229,11 @@ %\bear[mouth=red] %\end{tcblisting} % +% The bear can open its mouth: +%\begin{tcblisting}{title={Open mouth}} +%\bear[openmouth] +%\end{tcblisting} +% %To view the teddy bear from behind: %\begin{tcblisting}{title={Back view}} %\bear[back] @@ -247,9 +259,9 @@ %%\usepackage{bearwear} %\bear %\bearwear[ -% long sleeves, +% long sleeves, % shirt=red!80!black %] %\end{tcblisting} % -%Many more options and examples can be found in the package documentation \url{https://ctan.org/pkg/bearwear}. +%Many more options and examples can be found in the package documentation \url{https://ctan.org/pkg/bearwear}. diff --git a/Master/texmf-dist/tex/latex/tikzlings/tikzlings-bees.sty b/Master/texmf-dist/tex/latex/tikzlings/tikzlings-bees.sty index 160f01664ee..18d8ff9bcde 100644 --- a/Master/texmf-dist/tex/latex/tikzlings/tikzlings-bees.sty +++ b/Master/texmf-dist/tex/latex/tikzlings/tikzlings-bees.sty @@ -12,7 +12,7 @@ %% See https://www.latex-project.org/lppl.txt %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\ProvidesPackage{tikzlings-bees}[2024/12/12 version v2.1 Drawing bees in TikZ] +\ProvidesPackage{tikzlings-bees}[2025/01/05 version v2.2 Drawing bees in TikZ] \RequirePackage{tikz} \RequirePackage{tikzlings-addons} @@ -26,12 +26,13 @@ % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \csname beehookforeground\endcsname \csname tikzlinghookforeground\endcsname - % + % } \newif\ifbee@threeD \newif\ifbee@back \newif\ifbee@contour +\newif\ifbee@openmouth \tikzset{ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -49,36 +50,38 @@ body/.store in = \bee@body, body = yellow!70!orange, hands/.store in = \bee@hands, - hands = black, + hands = black, wings/.store in = \bee@wings, - wings = blue!20!cyan!30!white, + wings = blue!20!cyan!30!white, stripes/.store in = \bee@stripes, - stripes = black, + stripes = black, antennas/.store in = \bee@antennas, - antennas = black, + antennas = black, eye/.store in = \bee@eye, - eye = black, + eye = black, mouth/.store in = \bee@mouth, - mouth = black, + mouth = black, %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % options % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - 3D/.code = \bee@threeDtrue, - back/.code = \bee@backtrue, + openmouth/.code = \bee@openmouthtrue, + open mouth/.forward to = /bee/openmouth, + 3D/.code = \bee@threeDtrue, + back/.code = \bee@backtrue, contour/.code = \bee@contourtrue \def\bee@contour{#1} \def\bee@antennas{#1} \def\bee@mouth{#1}, - contour/.default = black, - outline/.forward to = /bee/contour, + contour/.default = black, + outline/.forward to = /bee/contour, } \def\bee@draw{% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % - % minimal bounding box size + % minimal bounding box size % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \path (-0.88,0.1) rectangle (0.88, 2.4); @@ -95,7 +98,7 @@ \pgfmathsetmacro{\yscalefactor}{\tmpscaleD} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - % + % % switch between 2D, 3D and contours, from % https://chat.stackexchange.com/transcript/message/45991801#45991801 % @@ -113,11 +116,11 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % Body parts - % + % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \csname beeshookbackground\endcsname + \csname beehookbackground\endcsname \csname tikzlinghookbackground\endcsname % \ifbee@back @@ -141,18 +144,11 @@ \fi% back % % Body %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \begin{scope} - \bee@part@draw[\bee@body] (0,2.1) to[out=180,in=140,looseness=1.2] (-0.3,1.5) to[out=-110,in=180,looseness=1.2] (0,0.15) to[out=00,in=-65,looseness=1.2] (0.3,1.5) to[out=40,in=0,looseness=1.2] cycle; - \clip (0,2.1) to[out=180,in=140,looseness=1.2] (-0.3,1.5) to[out=-110,in=180,looseness=1.2] (0,0.15) to[out=00,in=-65,looseness=1.2] (0.3,1.5) to[out=40,in=0,looseness=1.2] cycle; - % stripes - \bee@part@draw[\bee@stripes] (-0.475,1.3) arc(180:360:0.5 and 0.1) -- ++ (0,-0.15) arc(360:180:0.5 and 0.1) -- cycle - (-0.475,1.0) arc(180:360:0.5 and 0.1) -- ++ (0,-0.15) arc(360:180:0.5 and 0.1) -- cycle - (-0.475,0.65) arc(180:360:0.5 and 0.1) -- ++ (0,-0.15) arc(360:180:0.5 and 0.1) -- cycle - (-0.475,0.35) arc(180:360:0.5 and 0.1) -- ++ (0,-0.15) arc(360:180:0.5 and 0.1) -- cycle; - \end{scope} + \bee@part@draw[\bee@body] (0,2.1) to[out=180,in=140,looseness=1.2] (-0.3,1.5) to[out=-110,in=180,looseness=1.2] (0,0.15) to[out=00,in=-65,looseness=1.2] (0.3,1.5) to[out=40,in=0,looseness=1.2] cycle; + \bee@part@draw[\bee@stripes] (-0.3845, 1.2427).. controls (-0.3978, 1.1967) and (-0.4102, 1.1508) .. (-0.4213, 1.1051).. controls (-0.339, 1.0724) and (-0.1703, 1.05) .. (0.025, 1.05).. controls (0.2024, 1.05) and (0.3578, 1.0685) .. (0.4466, 1.0964).. controls (0.4345, 1.1426) and (0.4206, 1.1889) .. (0.4053, 1.2351).. controls (0.3136, 1.2136) and (0.1774, 1.2) .. (0.025, 1.2).. controls (-0.1445, 1.2) and (-0.2941, 1.2169) .. (-0.3845, 1.2427) -- cycle(-0.4505, 0.9692).. controls (-0.4588, 0.9242) and (-0.4654, 0.88) .. (-0.4704, 0.8366).. controls (-0.4375, 0.7877) and (-0.2284, 0.75) .. (0.025, 0.75).. controls (0.2433, 0.75) and (0.4285, 0.778) .. (0.4966, 0.817).. controls (0.4925, 0.8629) and (0.4858, 0.9099) .. (0.4772, 0.9575).. controls (0.3973, 0.9236) and (0.2251, 0.9) .. (0.025, 0.9).. controls (-0.1973, 0.9) and (-0.3855, 0.929) .. (-0.4505, 0.9692) -- cycle(-0.475, 0.65) -- (-0.475, 0.5798).. controls (-0.4712, 0.5424) and (-0.465, 0.5067) .. (-0.4563, 0.4729).. controls (-0.3973, 0.4309) and (-0.2042, 0.4) .. (0.025, 0.4).. controls (0.2141, 0.4) and (0.3785, 0.421) .. (0.4635, 0.452).. controls (0.4809, 0.5028) and (0.4921, 0.5583) .. (0.4975, 0.6175).. controls (0.43, 0.5782) and (0.2442, 0.55) .. (0.025, 0.55).. controls (-0.2511, 0.55) and (-0.475, 0.5947) .. (-0.475, 0.65) -- cycle(-0.3628, 0.2869).. controls (-0.2871, 0.2009) and (-0.1703, 0.15) .. (-0.0, 0.15).. controls (0.1603, 0.15) and (0.2765, 0.1965) .. (0.3564, 0.2753).. controls (0.2681, 0.2596) and (0.1523, 0.25) .. (0.025, 0.25).. controls (-0.1315, 0.25) and (-0.2711, 0.2644) .. (-0.3628, 0.2869) -- cycle; % % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \csname beeshookbelly\endcsname + \csname beehookbelly\endcsname \csname tikzlinghookbelly\endcsname % % Show details only from the front %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -171,16 +167,20 @@ \else% back % % Eyes %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \bee@part@draw[\bee@eye] (-0.15,1.8) circle[radius=0.05]; - \bee@part@draw[\bee@eye] (0.15,1.8) circle[radius=0.05]; + \bee@part@draw[\bee@eye] (-0.15,1.8) circle[radius=0.05]; + \bee@part@draw[\bee@eye] (0.15,1.8) circle[radius=0.05]; % % Arms %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \bee@part@draw[\bee@hands] (-0.25,0.88) circle[x radius=0.07,y radius=0.2, rotate=25]; \bee@part@draw[\bee@hands] (0.25,0.88) circle[x radius=0.07,y radius=0.2, rotate=-25]; % % Mouth %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \draw[\bee@mouth,line width=\scalingfactor*0.4pt] (0.115, 1.6) arc [start angle=-40, end angle=-140, radius=0.16]; - % + \ifbee@openmouth + \filldraw[\bee@mouth,line width=\scalingfactor*0.4pt] (0.115, 1.6) arc [start angle=-40, end angle=-140, radius=0.16]; + \else + \draw[\bee@mouth,line width=\scalingfactor*0.4pt] (0.115, 1.6) arc [start angle=-40, end angle=-140, radius=0.16]; + \fi + % % Antenna %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \fill[\bee@antennas,rotate around={15:(-0.175,2.115)}] (-0.2,1.93) rectangle (-0.15,2.3); \fill[\bee@antennas,rotate around={-15:(0.175,2.115)}] (0.2,1.93) rectangle (0.15,2.3); @@ -190,7 +190,7 @@ \fi% back % % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \csname beeshookbody\endcsname + \csname beehookbody\endcsname \csname tikzlinghookbody\endcsname % } @@ -246,6 +246,11 @@ %\bee[stripes=red] %\end{tcblisting} % +% The bee can open its mouth: +%\begin{tcblisting}{title={Open mouth}} +%\bee[openmouth] +%\end{tcblisting} +% %To view the bee from behind: %\begin{tcblisting}{title={back view}} %\bee[back] diff --git a/Master/texmf-dist/tex/latex/tikzlings/tikzlings-bugs.sty b/Master/texmf-dist/tex/latex/tikzlings/tikzlings-bugs.sty index fdf74195fb5..8f618899f58 100644 --- a/Master/texmf-dist/tex/latex/tikzlings/tikzlings-bugs.sty +++ b/Master/texmf-dist/tex/latex/tikzlings/tikzlings-bugs.sty @@ -12,7 +12,7 @@ %% See https://www.latex-project.org/lppl.txt %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\ProvidesPackage{tikzlings-bugs}[2024/12/12 version v2.1 Drawing bugs in TikZ] +\ProvidesPackage{tikzlings-bugs}[2025/01/05 version v2.2 Drawing bugs in TikZ] \RequirePackage{tikz} \RequirePackage{tikzlings-addons} @@ -26,7 +26,7 @@ % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \csname bughookforeground\endcsname \csname tikzlinghookforeground\endcsname - % + % } \newif\ifbug@threeD @@ -34,6 +34,7 @@ \newif\ifbug@rightstep \newif\ifbug@back \newif\ifbug@contour +\newif\ifbug@openmouth \tikzset{ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -51,21 +52,21 @@ body/.store in = \bug@body, body = black!90!white, arms/.store in = \bug@arms, - arms = red!80!black, + arms = red!80!black, wings/.store in = \bug@wings, - wings = red!80!black, + wings = red!80!black, dots/.store in = \bug@dots, - dots = black!90!white, + dots = black!90!white, antennas/.store in = \bug@antennas, - antennas = red!80!black, + antennas = red!80!black, eye/.store in = \bug@eye, eye = white, pupil/.store in = \bug@pupil, pupil = black, mouth/.store in = \bug@mouth, - mouth = red, + mouth = red, feet/.store in = \bug@feet, - feet = red!80!black, + feet = red!80!black, %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % options @@ -75,20 +76,22 @@ leftstep/.code = \bug@leftsteptrue, left step/.forward to = /bug/leftstep, rightstep/.code = \bug@rightsteptrue, - right step/.forward to = /bug/rightstep, - back/.code = \bug@backtrue, + right step/.forward to = /bug/rightstep, + openmouth/.code = \bug@openmouthtrue, + open mouth/.forward to = /bug/openmouth, + back/.code = \bug@backtrue, contour/.code = \bug@contourtrue \def\bug@contour{#1} \def\bug@antennas{#1} \def\bug@mouth{#1}, - contour/.default = black, - outline/.forward to = /bug/contour, + contour/.default = black, + outline/.forward to = /bug/contour, } \def\bug@draw{% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % - % minimal bounding box size + % minimal bounding box size % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \path (-0.92,0.02) rectangle (0.92, 2.36); @@ -105,7 +108,7 @@ \pgfmathsetmacro{\yscalefactor}{\tmpscaleD} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - % + % % switch between 2D, 3D and contours, from % https://chat.stackexchange.com/transcript/message/45991801#45991801 % @@ -123,7 +126,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % Body parts - % + % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -131,19 +134,19 @@ \csname tikzlinghookbackground\endcsname % \ifbug@back - % + % % Antenna %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \draw[\bug@antennas,line width=\scalingfactor*0.8pt] (0.1134, 1.911) .. controls (0.0917, 2.0537) and (0.0986, 2.1999) .. (0.1608, 2.2816) .. controls (0.245, 2.3919) and (0.3278, 2.3011) .. (0.3272, 2.2192) .. controls (0.3266, 2.1341) and (0.2237, 2.0423) .. (0.1978, 2.1538); \draw[\bug@antennas,line width=\scalingfactor*0.8pt] (-0.1134, 1.911) .. controls (-0.0917, 2.0537) and (-0.0986, 2.1999) .. (-0.1608, 2.2816) .. controls (-0.245, 2.3919) and (-0.3278, 2.3011) .. (-0.3272, 2.2192) .. controls (-0.3266, 2.1341) and (-0.2237, 2.0423) .. (-0.1978, 2.1538); \else% back % % Wings %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \bug@part@draw[\bug@wings] (-0.0955, 1.4222) .. controls (-0.2086, 1.6765) and (-0.692, 1.2508) .. (-0.8174, 1.0023) .. controls (-0.9304, 0.7786) and (-0.9533, 0.379) .. (-0.7355, 0.2548) .. controls (-0.5988, 0.1768) and (-0.4043, 0.3269) .. (-0.3054, 0.4494) .. controls (-0.097, 0.7075) and (0.0589, 1.0749) .. (-0.0955, 1.4222) -- cycle; + \bug@part@draw[\bug@wings] (-0.0955, 1.4222) .. controls (-0.2086, 1.6765) and (-0.692, 1.2508) .. (-0.8174, 1.0023) .. controls (-0.9304, 0.7786) and (-0.9533, 0.379) .. (-0.7355, 0.2548) .. controls (-0.5988, 0.1768) and (-0.4043, 0.3269) .. (-0.3054, 0.4494) .. controls (-0.097, 0.7075) and (0.0589, 1.0749) .. (-0.0955, 1.4222) -- cycle; \bug@part@draw[\bug@wings] (0.0955, 1.4222) .. controls (0.2086, 1.6765) and (0.692, 1.2508) .. (0.8174, 1.0023) .. controls (0.9304, 0.7786) and (0.9533, 0.379) .. (0.7355, 0.2548) .. controls (0.5988, 0.1768) and (0.4043, 0.3269) .. (0.3054, 0.4494) .. controls (0.097, 0.7075) and (-0.0589, 1.0749) .. (0.0955, 1.4222) -- cycle; \ifbug@contour - \bug@part@draw[\bug@dots] (-0.2,0.85) circle [radius=0.08] (-0.5,0.8) circle [radius=0.08] (-0.8,0.75) circle [radius=0.08] (-0.35,0.6) circle [radius=0.08] (-0.65,0.5) circle [radius=0.08] (-0.3,1.05) circle [radius=0.08] (-0.6,1.1) circle [radius=0.08] (-0.35,1.35) circle [radius=0.08] (0.2,0.85) circle [radius=0.08] (0.5,0.8) circle [radius=0.08] (0.8,0.75) circle [radius=0.08] (0.35,0.6) circle [radius=0.08] (0.65,0.5) circle [radius=0.08] (0.3,1.05) circle [radius=0.08] (0.6,1.1) circle [radius=0.08] (0.35,1.35) circle [radius=0.08]; - \else% contour - \fill[\bug@dots] (-0.2,0.85) circle [radius=0.08] (-0.5,0.8) circle [radius=0.08] (-0.8,0.75) circle [radius=0.08] (-0.35,0.6) circle [radius=0.08] (-0.65,0.5) circle [radius=0.08] (-0.3,1.05) circle [radius=0.08] (-0.6,1.1) circle [radius=0.08] (-0.35,1.35) circle [radius=0.08] (0.2,0.85) circle [radius=0.08] (0.5,0.8) circle [radius=0.08] (0.8,0.75) circle [radius=0.08] (0.35,0.6) circle [radius=0.08] (0.65,0.5) circle [radius=0.08] (0.3,1.05) circle [radius=0.08] (0.6,1.1) circle [radius=0.08] (0.35,1.35) circle [radius=0.08]; + \bug@part@draw[\bug@dots] (-0.2,0.85) circle [radius=0.08] (-0.5,0.8) circle [radius=0.08] (-0.8,0.75) circle [radius=0.08] (-0.35,0.6) circle [radius=0.08] (-0.65,0.5) circle [radius=0.08] (-0.3,1.05) circle [radius=0.08] (-0.6,1.1) circle [radius=0.08] (-0.35,1.35) circle [radius=0.08] (0.2,0.85) circle [radius=0.08] (0.5,0.8) circle [radius=0.08] (0.8,0.75) circle [radius=0.08] (0.35,0.6) circle [radius=0.08] (0.65,0.5) circle [radius=0.08] (0.3,1.05) circle [radius=0.08] (0.6,1.1) circle [radius=0.08] (0.35,1.35) circle [radius=0.08]; + \else% contour + \fill[\bug@dots] (-0.2,0.85) circle [radius=0.08] (-0.5,0.8) circle [radius=0.08] (-0.8,0.75) circle [radius=0.08] (-0.35,0.6) circle [radius=0.08] (-0.65,0.5) circle [radius=0.08] (-0.3,1.05) circle [radius=0.08] (-0.6,1.1) circle [radius=0.08] (-0.35,1.35) circle [radius=0.08] (0.2,0.85) circle [radius=0.08] (0.5,0.8) circle [radius=0.08] (0.8,0.75) circle [radius=0.08] (0.35,0.6) circle [radius=0.08] (0.65,0.5) circle [radius=0.08] (0.3,1.05) circle [radius=0.08] (0.6,1.1) circle [radius=0.08] (0.35,1.35) circle [radius=0.08]; \fi% contour \fi% back % @@ -152,12 +155,12 @@ \bug@part@draw[\bug@feet] (-0.2,0.12) ellipse[x radius=0.18, y radius=0.06]; \else% step \bug@part@draw[\bug@feet] (-0.2,0.1) ellipse[x radius=0.18, y radius=0.06]; - \fi% step + \fi% step \ifbug@rightstep \bug@part@draw[\bug@feet] (0.2,0.12) ellipse[x radius=0.18, y radius=0.06]; \else% step \bug@part@draw[\bug@feet] (0.2,0.1) ellipse[x radius=0.18, y radius=0.06]; - \fi% step + \fi% step % % Body %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \bug@part@draw[\bug@body] ( 0.55, 0.75) .. controls ( 0.55, 0.40) and ( 0.55, 0.08) .. ( 0.00, 0.08) .. controls (-0.55, 0.08) and (-0.55, 0.40) .. (-0.55, 0.75) .. controls (-0.55, 1.13) and (-0.30, 1.44) .. ( 0.00, 1.44) .. controls ( 0.30, 1.44) and ( 0.55, 1.13) .. ( 0.55, 0.75) -- cycle; @@ -173,12 +176,12 @@ \ifbug@back % % Wings %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \bug@part@draw[\bug@wings] (-0.0955, 1.4222) .. controls (-0.2086, 1.6765) and (-0.692, 1.2508) .. (-0.8174, 1.0023) .. controls (-0.9304, 0.7786) and (-0.9533, 0.379) .. (-0.7355, 0.2548) .. controls (-0.5988, 0.1768) and (-0.4043, 0.3269) .. (-0.3054, 0.4494) .. controls (-0.097, 0.7075) and (0.0589, 1.0749) .. (-0.0955, 1.4222) -- cycle; + \bug@part@draw[\bug@wings] (-0.0955, 1.4222) .. controls (-0.2086, 1.6765) and (-0.692, 1.2508) .. (-0.8174, 1.0023) .. controls (-0.9304, 0.7786) and (-0.9533, 0.379) .. (-0.7355, 0.2548) .. controls (-0.5988, 0.1768) and (-0.4043, 0.3269) .. (-0.3054, 0.4494) .. controls (-0.097, 0.7075) and (0.0589, 1.0749) .. (-0.0955, 1.4222) -- cycle; \bug@part@draw[\bug@wings] (0.0955, 1.4222) .. controls (0.2086, 1.6765) and (0.692, 1.2508) .. (0.8174, 1.0023) .. controls (0.9304, 0.7786) and (0.9533, 0.379) .. (0.7355, 0.2548) .. controls (0.5988, 0.1768) and (0.4043, 0.3269) .. (0.3054, 0.4494) .. controls (0.097, 0.7075) and (-0.0589, 1.0749) .. (0.0955, 1.4222) -- cycle; \ifbug@contour - \bug@part@draw[\bug@dots] (-0.2,0.85) circle [radius=0.08] (-0.5,0.8) circle [radius=0.08] (-0.8,0.75) circle [radius=0.08] (-0.35,0.6) circle [radius=0.08] (-0.65,0.5) circle [radius=0.08] (-0.3,1.05) circle [radius=0.08] (-0.6,1.1) circle [radius=0.08] (-0.35,1.35) circle [radius=0.08] (0.2,0.85) circle [radius=0.08] (0.5,0.8) circle [radius=0.08] (0.8,0.75) circle [radius=0.08] (0.35,0.6) circle [radius=0.08] (0.65,0.5) circle [radius=0.08] (0.3,1.05) circle [radius=0.08] (0.6,1.1) circle [radius=0.08] (0.35,1.35) circle [radius=0.08]; + \bug@part@draw[\bug@dots] (-0.2,0.85) circle [radius=0.08] (-0.5,0.8) circle [radius=0.08] (-0.8,0.75) circle [radius=0.08] (-0.35,0.6) circle [radius=0.08] (-0.65,0.5) circle [radius=0.08] (-0.3,1.05) circle [radius=0.08] (-0.6,1.1) circle [radius=0.08] (-0.35,1.35) circle [radius=0.08] (0.2,0.85) circle [radius=0.08] (0.5,0.8) circle [radius=0.08] (0.8,0.75) circle [radius=0.08] (0.35,0.6) circle [radius=0.08] (0.65,0.5) circle [radius=0.08] (0.3,1.05) circle [radius=0.08] (0.6,1.1) circle [radius=0.08] (0.35,1.35) circle [radius=0.08]; \else% contour - \fill[\bug@dots] (-0.2,0.85) circle [radius=0.08] (-0.5,0.8) circle [radius=0.08] (-0.8,0.75) circle [radius=0.08] (-0.35,0.6) circle [radius=0.08] (-0.65,0.5) circle [radius=0.08] (-0.3,1.05) circle [radius=0.08] (-0.6,1.1) circle [radius=0.08] (-0.35,1.35) circle [radius=0.08] (0.2,0.85) circle [radius=0.08] (0.5,0.8) circle [radius=0.08] (0.8,0.75) circle [radius=0.08] (0.35,0.6) circle [radius=0.08] (0.65,0.5) circle [radius=0.08] (0.3,1.05) circle [radius=0.08] (0.6,1.1) circle [radius=0.08] (0.35,1.35) circle [radius=0.08]; + \fill[\bug@dots] (-0.2,0.85) circle [radius=0.08] (-0.5,0.8) circle [radius=0.08] (-0.8,0.75) circle [radius=0.08] (-0.35,0.6) circle [radius=0.08] (-0.65,0.5) circle [radius=0.08] (-0.3,1.05) circle [radius=0.08] (-0.6,1.1) circle [radius=0.08] (-0.35,1.35) circle [radius=0.08] (0.2,0.85) circle [radius=0.08] (0.5,0.8) circle [radius=0.08] (0.8,0.75) circle [radius=0.08] (0.35,0.6) circle [radius=0.08] (0.65,0.5) circle [radius=0.08] (0.3,1.05) circle [radius=0.08] (0.6,1.1) circle [radius=0.08] (0.35,1.35) circle [radius=0.08]; \fi% contour \else% back % @@ -193,8 +196,12 @@ \bug@part@draw[\bug@arms] (0.25,0.88) circle[x radius=0.07,y radius=0.18, rotate=-35]; % % Mouth %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \draw[\bug@mouth,line width=\scalingfactor*0.4pt] (0.115, 1.56) arc [start angle=-40, end angle=-140, radius=0.16]; - % + \ifbug@openmouth + \filldraw[\bug@mouth,line width=\scalingfactor*0.4pt] (0.115, 1.56) arc [start angle=-40, end angle=-140, radius=0.16]; + \else + \draw[\bug@mouth,line width=\scalingfactor*0.4pt] (0.115, 1.56) arc [start angle=-40, end angle=-140, radius=0.16]; + \fi + % % Antenna %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \draw[\bug@antennas,line width=\scalingfactor*0.8pt] (0.1134, 1.911) .. controls (0.0917, 2.0537) and (0.0986, 2.1999) .. (0.1608, 2.2816) .. controls (0.245, 2.3919) and (0.3278, 2.3011) .. (0.3272, 2.2192) .. controls (0.3266, 2.1341) and (0.2237, 2.0423) .. (0.1978, 2.1538); \draw[\bug@antennas,line width=\scalingfactor*0.8pt] (-0.1134, 1.911) .. controls (-0.0917, 2.0537) and (-0.0986, 2.1999) .. (-0.1608, 2.2816) .. controls (-0.245, 2.3919) and (-0.3278, 2.3011) .. (-0.3272, 2.2192) .. controls (-0.3266, 2.1341) and (-0.2237, 2.0423) .. (-0.1978, 2.1538); @@ -261,6 +268,11 @@ %\bug[feet=blue] %\end{tcblisting} % +% The bug can open its mouth: +%\begin{tcblisting}{title={Open mouth}} +%\bug[openmouth] +%\end{tcblisting} +% %And the bug can lift its legs: %\begin{tcblisting}{title={Walking}} %\bug[leftstep] diff --git a/Master/texmf-dist/tex/latex/tikzlings/tikzlings-cats.sty b/Master/texmf-dist/tex/latex/tikzlings/tikzlings-cats.sty index a4c244794ee..41dc7521ad7 100644 --- a/Master/texmf-dist/tex/latex/tikzlings/tikzlings-cats.sty +++ b/Master/texmf-dist/tex/latex/tikzlings/tikzlings-cats.sty @@ -12,7 +12,7 @@ %% See https://www.latex-project.org/lppl.txt %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\ProvidesPackage{tikzlings-cats}[2024/12/12 version v2.1 Drawing cats in TikZ] +\ProvidesPackage{tikzlings-cats}[2025/01/05 version v2.2 Drawing cats in TikZ] \RequirePackage{tikz} \RequirePackage{tikzlings-addons} @@ -24,13 +24,13 @@ \else \ifdefined\pdfrandomseed % pdflatex \else - \ifdefined\randomseed + \ifdefined\randomseed \let\pdfrandomseed\randomseed % post TL19 xelatex and lualatex \else \let\pdfrandomseed\time % pre TL19 xelatex \fi \fi - \pgfmathsetseed{\number\pdfrandomseed} + \pgfmathsetseed{\number\pdfrandomseed} \fi \ExplSyntaxOff @@ -59,6 +59,7 @@ \newif\ifcat@schroedinger \newif\ifcat@back \newif\ifcat@contour +\newif\ifcat@openmouth \tikzset{ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -103,21 +104,23 @@ % options % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - 3D/.code = \cat@threeDtrue, schroedinger/.code = \cat@schroedingertrue, - back/.code = \cat@backtrue, + openmouth/.code = \cat@openmouthtrue, + open mouth/.forward to = /cat/openmouth, + 3D/.code = \cat@threeDtrue, + back/.code = \cat@backtrue, contour/.code = \cat@contourtrue \def\cat@contour{#1} \def\cat@whiskers{#1}, - contour/.default = black, - outline/.forward to = /cat/contour, + contour/.default = black, + outline/.forward to = /cat/contour, } \def\cat@draw{% % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % - % minimal bounding box size + % minimal bounding box size % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \path (-0.56,0.1) rectangle (1.63, 2.22); @@ -134,7 +137,7 @@ \pgfmathsetmacro{\yscalefactor}{\tmpscaleD} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - % + % % switch between 2D, 3D and contours, from % https://chat.stackexchange.com/transcript/message/45991801#45991801 % @@ -152,7 +155,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % Body parts - % + % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -164,7 +167,7 @@ % % Feet if back %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ifcat@back - \cat@part@draw[\cat@paws] (-0.255,0.3) circle[radius=0.18]; + \cat@part@draw[\cat@paws] (-0.255,0.3) circle[radius=0.18]; \cat@part@draw[\cat@paws] (0.255,0.3) circle[radius=0.18]; \fi% back % @@ -176,10 +179,8 @@ \csname tikzlinghookbelly\endcsname % % Ears %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \cat@part@draw[\cat@body] - (0.12, 2.0392) .. controls (0.16, 2.1584) and (0.37, 2.22) .. (0.37, 2.20) .. controls (0.37, 2.2) and (0.39, 1.9) .. (0.2721, 1.9) .. controls (0.1891, 1.88) and (0.12, 1.88) .. (0.12, 2.0392) -- cycle; - \cat@part@draw[\cat@body] - (-0.12, 2.0392) .. controls (-0.16, 2.1584) and (-0.37, 2.22) .. (-0.37, 2.20) .. controls (-0.37, 2.2) and (-0.39, 1.9) .. (-0.2721, 1.9) .. controls (-0.1891, 1.88) and (-0.12, 1.88) .. (-0.12, 2.0392) -- cycle; + \cat@part@draw[\cat@body] (0.12, 2.0392) .. controls (0.16, 2.1584) and (0.37, 2.22) .. (0.37, 2.20) .. controls (0.37, 2.2) and (0.39, 1.9) .. (0.2721, 1.9) .. controls (0.1891, 1.88) and (0.12, 1.88) .. (0.12, 2.0392) -- cycle; + \cat@part@draw[\cat@body] (-0.12, 2.0392) .. controls (-0.16, 2.1584) and (-0.37, 2.22) .. (-0.37, 2.20) .. controls (-0.37, 2.2) and (-0.39, 1.9) .. (-0.2721, 1.9) .. controls (-0.1891, 1.88) and (-0.12, 1.88) .. (-0.12, 2.0392) -- cycle; % % Head %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \cat@part@draw[\cat@body] (0,1.64) circle[radius=0.44]; @@ -196,7 +197,11 @@ \cat@part@draw[\cat@pupil] ( 0.1720, 1.8071) .. controls ( 0.1720+\cat@pupil@width, 1.7827+\cat@pupil@offset) and ( 0.1720+\cat@pupil@width, 1.7584-\cat@pupil@offset) .. ( 0.1720, 1.7341) .. controls ( 0.1720-\cat@pupil@width, 1.7584-\cat@pupil@offset) and ( 0.1720-\cat@pupil@width, 1.7827+\cat@pupil@offset) .. ( 0.1720, 1.8071) -- cycle; % % Mouth %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \draw[\cat@whiskers,line width=\scalingfactor*0.2pt] (-0.16, 1.527) .. controls (-0.16, 1.527) and (-0.062, 1.420) .. ( 0.000, 1.556) .. controls ( 0.062, 1.420) and ( 0.16, 1.527) .. ( 0.16, 1.527); + \ifcat@openmouth + \filldraw[\cat@whiskers,line width=\scalingfactor*0.2pt] (-0.16, 1.527) .. controls (-0.16, 1.527) and (-0.062, 1.420) .. ( 0.000, 1.556) .. controls ( 0.062, 1.420) and ( 0.16, 1.527) .. ( 0.16, 1.527) (0.16,1.527) arc [start angle=-20, end angle=-160, radius=0.17]; + \else + \draw[\cat@whiskers,line width=\scalingfactor*0.2pt] (-0.16, 1.527) .. controls (-0.16, 1.527) and (-0.062, 1.420) .. ( 0.000, 1.556) .. controls ( 0.062, 1.420) and ( 0.16, 1.527) .. ( 0.16, 1.527); + \fi % % Nose %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \cat@part@draw[\cat@nose] (-0.069, 1.6452) .. controls (-0.0524, 1.6613) and (0.0524, 1.6613) .. (0.069, 1.6452) .. controls (0.08, 1.625) and (0.0206, 1.55) .. (0, 1.55) .. controls (-0.0206, 1.55) and (-0.08, 1.625) .. (-0.069, 1.6452) -- cycle; @@ -210,8 +215,8 @@ \fill[\cat@whiskers] (-0.0671, 1.6243) .. controls (-0.1414, 1.6725) and (-0.2182, 1.6964) .. (-0.2925, 1.6482) -- (-0.2925, 1.6582) .. controls (-0.2179, 1.7066) and (-0.1417, 1.6727) .. (-0.0671, 1.6243) -- cycle; % % Feet %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \cat@part@draw[\cat@paws] (-0.255,0.3) circle[radius=0.18]; - \cat@part@draw[\cat@paws] (0.255,0.3) circle[radius=0.18]; + \cat@part@draw[\cat@paws] (-0.255,0.3) circle[radius=0.18]; + \cat@part@draw[\cat@paws] (0.255,0.3) circle[radius=0.18]; % \fi% back % @@ -224,7 +229,7 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % - % minimal bounding box size + % minimal bounding box size % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \path (-0.55,0.39) rectangle (0.55, 2.06); @@ -241,7 +246,7 @@ \pgfmathsetmacro{\yscalefactor}{\tmpscaleD} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - % + % % switch between 2D, 3D and contours, from % https://chat.stackexchange.com/transcript/message/45991801#45991801 % @@ -257,7 +262,7 @@ \fi% 3D % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - % + % % Drawing the tomebstone % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -343,6 +348,11 @@ %\cat[paws=red] %\end{tcblisting} % +% The cat can open its mouth: +%\begin{tcblisting}{title={Open mouth}} +%\cat[openmouth] +%\end{tcblisting} +% %The shape of the \saminline|pupil| can be changed with the \saminline|pupilwidth| option: %\begin{tcblisting}{title={Width of pupils}} %\cat[pupilwidth=0.015] @@ -358,7 +368,7 @@ %\cat[wide pupils] % %\cat[very wide pupils] -%\end{samcode} +%\end{samcode} % %\tcblower %\begin{tikzpicture}[yshift=2.4cm,xshift=1.8cm] diff --git a/Master/texmf-dist/tex/latex/tikzlings/tikzlings-chickens.sty b/Master/texmf-dist/tex/latex/tikzlings/tikzlings-chickens.sty index 41dc89c1939..ff770860fda 100644 --- a/Master/texmf-dist/tex/latex/tikzlings/tikzlings-chickens.sty +++ b/Master/texmf-dist/tex/latex/tikzlings/tikzlings-chickens.sty @@ -12,7 +12,7 @@ %% See https://www.latex-project.org/lppl.txt %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\ProvidesPackage{tikzlings-chickens}[2024/12/12 version v2.1 Draw chickens in TikZ] +\ProvidesPackage{tikzlings-chickens}[2025/01/05 version v2.2 Draw chickens in TikZ] \RequirePackage{tikz} \RequirePackage{tikzlings-addons} @@ -31,7 +31,7 @@ % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \csname chickenhookforeground\endcsname \csname tikzlinghookforeground\endcsname - % + % } \newif\ifchicken@threeD @@ -61,24 +61,24 @@ bill/.store in = \chicken@bill, bill = yellow, feet/.store in = \chicken@feet, - feet = orange!90!yellow, + feet = orange!90!yellow, comb/.store in = \chicken@comb, - comb = red, + comb = red, %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % options % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 3D/.code = \chicken@threeDtrue, - back/.code = \chicken@backtrue, + back/.code = \chicken@backtrue, contour/.code = \chicken@contourtrue \def\chicken@contour{#1}, - contour/.default = black, - outline/.forward to = /chicken/contour, + contour/.default = black, + outline/.forward to = /chicken/contour, baby/.code = \chicken@babytrue \def\chicken@baby{#1} \def\chicken@bill{\chicken@feet}, - baby/.default = yellow!80!orange, + baby/.default = yellow!80!orange, } %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -89,11 +89,11 @@ \def\chicken@draw{% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % - % minimal bounding box size + % minimal bounding box size % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \path (-0.96, 0.08) rectangle (0.96, 2.35); - % + % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % store the current scale factor @@ -106,7 +106,7 @@ \pgfmathsetmacro{\yscalefactor}{\tmpscaleD} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - % + % % switch between 2D, 3D and contours, from % https://chat.stackexchange.com/transcript/message/45991801#45991801 % @@ -136,7 +136,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % Body parts - % + % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -187,7 +187,7 @@ % Bill %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \unless\ifchicken@back \chicken@part@draw[\chicken@comb] (-0.04, 1.57) ellipse[x radius=0.04, y radius=0.08, rotate=-20]; - \chicken@part@draw[\chicken@comb] (0.04, 1.57) ellipse[x radius=0.04, y radius=0.08, rotate=20]; + \chicken@part@draw[\chicken@comb] (0.04, 1.57) ellipse[x radius=0.04, y radius=0.08, rotate=20]; \chicken@part@draw[\chicken@bill] (-0.09, 1.7) -- (0, 1.58) -- (0.09, 1.7) arc [start angle=50, end angle=130, radius=0.14] -- cycle; \fi% back % @@ -225,7 +225,7 @@ \def\chicken@drawbaby{% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % - % minimal bounding box size + % minimal bounding box size % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \path (-0.53, 0.1) rectangle (0.53, 1.22); @@ -242,7 +242,7 @@ \pgfmathsetmacro{\yscalefactor}{\tmpscaleD} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - % + % % switch between 2D, 3D and contours, from % https://chat.stackexchange.com/transcript/message/45991801#45991801 % @@ -260,7 +260,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % Body parts (center: x=0.925) - % + % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/latex/tikzlings/tikzlings-coatis.sty b/Master/texmf-dist/tex/latex/tikzlings/tikzlings-coatis.sty index b1fcf7747d1..1e5bba28a7b 100644 --- a/Master/texmf-dist/tex/latex/tikzlings/tikzlings-coatis.sty +++ b/Master/texmf-dist/tex/latex/tikzlings/tikzlings-coatis.sty @@ -12,7 +12,7 @@ %% See https://www.latex-project.org/lppl.txt %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\ProvidesPackage{tikzlings-coatis}[2024/12/12 version v2.1 Drawing coatis in TikZ] +\ProvidesPackage{tikzlings-coatis}[2025/01/05 version v2.2 Drawing coatis in TikZ] \RequirePackage{tikz} \RequirePackage{tikzlings-addons} @@ -51,7 +51,7 @@ body/.store in = \coati@body, body = brown!50!darkgray!97!yellow!50!darkgray, eye/.store in = \coati@eye, - eye = coati@bodybright!50!black, + eye = coati@bodybright!50!black, rotatehead/.store in = \coati@rotatehead, rotate head/.forward to = /coati/rotatehead, rotatehead = 0, @@ -60,23 +60,23 @@ % options % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - 3D/.code = \coati@threeDtrue, + 3D/.code = \coati@threeDtrue, sideward/.code = \coati@sidewardtrue, leftstep/.code = \coati@leftsteptrue, left step/.forward to = /coati/leftstep, rightstep/.code = \coati@rightsteptrue, - right step/.forward to = /coati/rightstep, - back/.code = \coati@backtrue, + right step/.forward to = /coati/rightstep, + back/.code = \coati@backtrue, contour/.code = \coati@contourtrue \def\coati@contour{#1}, - contour/.default = black, - outline/.forward to = /coati/contour, + contour/.default = black, + outline/.forward to = /coati/contour, } \def\coati@draw{% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % - % minimal bounding box size + % minimal bounding box size % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \path (-0.84,0.1) rectangle (1.63,2.26); @@ -93,7 +93,7 @@ \pgfmathsetmacro{\yscalefactor}{\tmpscaleD} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - % + % % switch between 2D, 3D and contours, from % https://chat.stackexchange.com/transcript/message/45991801#45991801 % @@ -120,44 +120,41 @@ \pgfmathsetmacro{\coati@sat}{(array({\coati@hsbcolorspec},1)+0.1)} \pgfmathsetmacro{\coati@bright}{(array({\coati@hsbcolorspec},2))+0.13} \definecolor{coati@bodybright}{hsb}{\coati@hue,\coati@sat,\coati@bright} - % + % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % Body parts - % + % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \csname coatihookbackground\endcsname \csname tikzlinghookbackground\endcsname - % + % % Feet %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ifcoati@leftstep \coati@part@draw[coati@bodybright!80!white] (-0.255,0.25) ellipse[x radius=0.23, y radius=0.09]; \else% step \coati@part@draw[coati@bodybright!80!white] (-0.255,0.2) ellipse[x radius=0.23, y radius=0.09]; - \fi% step + \fi% step \ifcoati@rightstep \coati@part@draw[coati@bodybright!80!white] (0.255,0.25) ellipse[x radius=0.23, y radius=0.09]; \else% step \coati@part@draw[coati@bodybright!80!white] (0.255,0.2) ellipse[x radius=0.23, y radius=0.09]; - \fi% step + \fi% step % % Tail %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \unless\ifcoati@back \coati@part@draw[\coati@body] (0.2845, 0.5595) .. controls (0.6382, 0.8326) and (0.7302, 1.5138) .. (1.0504, 1.6639) .. controls (1.3206, 1.7840) and (1.7609, 1.3537) .. (1.5608, 1.3437) .. controls (0.9203, 2.0442) and (0.8642, 0.6247) .. (0.5001, 0.3831) .. controls (0.3214, 0.2645) and (-0.1764, 0.1117) .. (-0.1408, 0.3245) .. controls (-0.1082, 0.5191) and (0.0508, 0.3791) .. (0.2845, 0.5595) -- cycle; - \begin{scope} - \clip (0.2845, 0.5595) .. controls (0.6382, 0.8326) and (0.7302, 1.5138) .. (1.0504, 1.6639) .. controls (1.3206, 1.7840) and (1.7609, 1.3537) .. (1.5608, 1.3437) .. controls (0.9203, 2.0442) and (0.8642, 0.6247) .. (0.5001, 0.3831) .. controls (0.3214, 0.2645) and (-0.1764, 0.1117) .. (-0.1408, 0.3245) .. controls (-0.1082, 0.5191) and (0.0508, 0.3791) .. (0.2845, 0.5595) -- cycle; - \coati@part@draw[coati@bodybright!45!white!95!orange,rotate around={-30:(0.8,1.15)}] (0.6,1.1) rectangle ++(0.4,0.1); - \coati@part@draw[coati@bodybright!45!white!95!orange,rotate around={-30:(0.9,1.35)}] (0.7,1.3) rectangle ++(0.4,0.1); - \coati@part@draw[coati@bodybright!45!white!95!orange,rotate around={-50:(1.0,1.5)}] (0.8,1.45) rectangle ++(0.4,0.1); - \coati@part@draw[coati@bodybright!45!white!95!orange,rotate around={-80:(1.2,1.6)}] (1.0,1.55) rectangle ++(0.4,0.1); - \coati@part@draw[coati@bodybright!45!white!95!orange,rotate around={-130:(1.5,1.5)}] (1.3,1.45) rectangle ++(0.4,0.1); - \coati@part@draw[coati@bodybright!45!white!95!orange,rotate around={-30:(0.55,0.65)}] (0.35,0.6) rectangle ++(0.4,0.1); - \coati@part@draw[coati@bodybright!45!white!95!orange,rotate around={-30:(0.65,0.9)}] (0.45,0.85) rectangle ++(0.4,0.1); - \coati@part@draw[coati@bodybright!45!white!95!orange,rotate around={-40:(0.35,0.45)}] (0.15,0.4) rectangle ++(0.4,0.1); - \coati@part@draw[coati@bodybright!45!white!95!orange,rotate around={-60:(0.05,0.3)}] (-0.15,0.25) rectangle ++(0.4,0.1); - \end{scope} + \coati@part@draw[coati@bodybright!45!white!95!orange] (1.48, 1.554) -- (1.4139, 1.4752).. controls (1.4389, 1.4583) and (1.4649, 1.4375) .. (1.492, 1.4127) -- (1.5537, 1.4862).. controls (1.5333, 1.5087) and (1.5084, 1.5318) .. (1.48, 1.554) -- cycle; + \coati@part@draw[coati@bodybright!45!white!95!orange] (1.2166, 1.6794) -- (1.2121, 1.5329).. controls (1.2432, 1.5385) and (1.2764, 1.5364) .. (1.3119, 1.5258) -- (1.3158, 1.6501).. controls (1.2832, 1.6633) and (1.2498, 1.6736) .. (1.2166, 1.6794) -- cycle; + \coati@part@draw[coati@bodybright!45!white!95!orange] (1.0093, 1.6405).. controls (0.9821, 1.6229) and (0.9566, 1.6014) .. (0.9325, 1.5765) -- (1.0545, 1.4296).. controls (1.0777, 1.4572) and (1.1021, 1.4801) .. (1.1281, 1.4976) -- (1.0093, 1.6405) -- cycle; + \coati@part@draw[coati@bodybright!45!white!95!orange](0.8327, 1.4466).. controls (0.8154, 1.4193) and (0.7988, 1.3901) .. (0.7823, 1.3602) -- (0.9497, 1.2635).. controls (0.9655, 1.2946) and (0.9818, 1.3236) .. (0.9987, 1.3507) -- (0.8327, 1.4466) -- cycle; + \coati@part@draw[coati@bodybright!45!white!95!orange] (0.7253, 1.2508).. controls (0.7107, 1.2213) and (0.6961, 1.1912) .. (0.6814, 1.1607) -- (0.859, 1.0582).. controls (0.8717, 1.0897) and (0.8844, 1.1212) .. (0.8975, 1.1514) -- (0.7253, 1.2508) -- cycle; + \coati@part@draw[coati@bodybright!45!white!95!orange] (0.5972, 0.9882).. controls (0.5821, 0.9583) and (0.5665, 0.9288) .. (0.5505, 0.8997) -- (0.7501, 0.7845).. controls (0.7627, 0.8154) and (0.7754, 0.8463) .. (0.7878, 0.8781) -- (0.5972, 0.9882) -- cycle; + \coati@part@draw[coati@bodybright!45!white!95!orange] (0.464, 0.7574).. controls (0.4448, 0.7293) and (0.4248, 0.7022) .. (0.4037, 0.6767) -- (0.6357, 0.5427).. controls (0.6519, 0.5703) and (0.6676, 0.5997) .. (0.6828, 0.6311) -- (0.464, 0.7574) -- cycle; + \coati@part@draw[coati@bodybright!45!white!95!orange](0.2881, 0.5624).. controls (0.2869, 0.5615) and (0.2857, 0.5604) .. (0.2845, 0.5595).. controls (0.2564, 0.5378) and (0.2295, 0.521) .. (0.2036, 0.5074) -- (0.3683, 0.3141).. controls (0.4022, 0.3288) and (0.4337, 0.3442) .. (0.461, 0.3595) -- (0.2881, 0.5624) -- cycle; + \coati@part@draw[coati@bodybright!45!white!95!orange] (0.0822, 0.4628).. controls (0.0453, 0.4543) and (0.0123, 0.4501) .. (-0.0164, 0.445) -- (0.039, 0.2211).. controls (0.0701, 0.2242) and (0.1034, 0.23) .. (0.1379, 0.2379) -- (0.0822, 0.4628) -- cycle; \fi% back % % Arms %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -170,26 +167,26 @@ % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \csname coatihookbelly\endcsname \csname tikzlinghookbelly\endcsname - % + % % Head %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \begin{scope}[rotate around={\coati@rotatehead:(0,1.68)}] % % Sidewards head %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ifcoati@sideward - % + % % Left Ear %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \coati@part@draw[coati@bodybright!45!white!95!orange] (-0.212, 2.135) ellipse[x radius=0.09, y radius=0.12, rotate=-16]; \unless\ifcoati@back \coati@part@draw[coati@bodybright!80!white] (-0.212, 2.135) ellipse[x radius=0.065, y radius=0.09, rotate=-16]; \fi% back - % + % % Head %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ifcoati@back \coati@part@draw[coati@bodybright!45!white!95!orange] (0.4569, 1.5608) .. controls (0.3680, 1.3594) and (0.0005, 1.2699) .. (-0.1826, 1.3507) .. controls (-0.3657, 1.4315) and (-0.5475, 1.7632) .. (-0.4587, 1.9646) .. controls (-0.1103, 2.3578) and (0.5123, 2.0832) .. (0.4569, 1.5608) -- cycle; \else% back \coati@part@draw[coati@bodybright!45!white!95!orange] (0.4808, 1.7911) .. controls (0.5682, 1.2837) and (-0.3468, 1.3575) .. (-0.6360, 1.3679) .. controls (-0.7582, 1.4729) and (-0.5198, 1.7911) .. (-0.5198, 1.7911) .. controls (-0.3597, 2.2914) and (0.3207, 2.2914) .. (0.4808, 1.7911) -- cycle; \fi% back - % + % % Cheek %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \unless\ifcoati@back \coati@part@draw[coati@bodybright!80!white] (0.30, 1.4552) .. controls (0.30, 1.4552) and (0.1016, 1.7565) .. (-0.0005, 1.7581) -- (-0.6360, 1.3679) .. controls (-0.3083, 1.3437) and (0.0283, 1.332) .. (0.30, 1.4552) -- cycle (-0.4166, 1.9824) .. controls (-0.4166, 1.9824) and (-0.2413, 1.9758) .. (-0.2226, 1.9112) -- (-0.6875, 1.4906) .. controls (-0.6875, 1.4906) and (-0.5712, 1.7549) .. (-0.4166, 1.9824) -- cycle; @@ -214,7 +211,7 @@ % % Normal Head %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \else% sidewards - % + % % Head %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ifcoati@back \coati@part@draw[coati@bodybright!45!white!95!orange] (0.5, 1.8) .. controls (0.5, 1.58) and (0.2, 1.35) .. (0, 1.35) .. controls (-0.2, 1.35) and (-0.5, 1.58) .. (-0.5, 1.8) .. controls (-0.34, 2.3) and (0.34, 2.3) .. (0.5, 1.8) -- cycle; @@ -228,7 +225,7 @@ \fi% back % % Nose %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \unless\ifcoati@back + \unless\ifcoati@back \coati@part@draw[coati@bodybright!50!black] (0, 1.248) circle[radius=0.09]; \fi% back % @@ -241,35 +238,32 @@ % Ears %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \coati@part@draw[coati@bodybright!45!white!95!orange] (0.44, 2.02) circle[radius=0.12]; \coati@part@draw[coati@bodybright!45!white!95!orange] (-0.44, 2.02) circle[radius=0.12]; - \unless\ifcoati@back - \coati@part@draw[coati@bodybright!80!white] (0.44, 2.02) circle[radius=0.09]; + \unless\ifcoati@back + \coati@part@draw[coati@bodybright!80!white] (0.44, 2.02) circle[radius=0.09]; \coati@part@draw[coati@bodybright!80!white] (-0.44, 2.02) circle[radius=0.09]; \fi% back - % + % \fi% sidewards \end{scope} % % Tail if back %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ifcoati@back \coati@part@draw[\coati@body] (0.2845, 0.5595) .. controls (0.6382, 0.8326) and (0.7302, 1.5138) .. (1.0504, 1.6639) .. controls (1.3206, 1.7840) and (1.7609, 1.3537) .. (1.5608, 1.3437) .. controls (0.9203, 2.0442) and (0.8642, 0.6247) .. (0.5001, 0.3831) .. controls (0.3214, 0.2645) and (-0.1764, 0.1117) .. (-0.1408, 0.3245) .. controls (-0.1082, 0.5191) and (0.0508, 0.3791) .. (0.2845, 0.5595) -- cycle; - \begin{scope} - \clip (0.2845, 0.5595) .. controls (0.6382, 0.8326) and (0.7302, 1.5138) .. (1.0504, 1.6639) .. controls (1.3206, 1.7840) and (1.7609, 1.3537) .. (1.5608, 1.3437) .. controls (0.9203, 2.0442) and (0.8642, 0.6247) .. (0.5001, 0.3831) .. controls (0.3214, 0.2645) and (-0.1764, 0.1117) .. (-0.1408, 0.3245) .. controls (-0.1082, 0.5191) and (0.0508, 0.3791) .. (0.2845, 0.5595) -- cycle; - \coati@part@draw[coati@bodybright!45!white!95!orange,rotate around={-30:(0.8,1.15)}] (0.6,1.1) rectangle ++(0.4,0.1); - \coati@part@draw[coati@bodybright!45!white!95!orange,rotate around={-30:(0.9,1.35)}] (0.7,1.3) rectangle ++(0.4,0.1); - \coati@part@draw[coati@bodybright!45!white!95!orange,rotate around={-50:(1.0,1.5)}] (0.8,1.45) rectangle ++(0.4,0.1); - \coati@part@draw[coati@bodybright!45!white!95!orange,rotate around={-80:(1.2,1.6)}] (1.0,1.55) rectangle ++(0.4,0.1); - \coati@part@draw[coati@bodybright!45!white!95!orange,rotate around={-130:(1.5,1.5)}] (1.3,1.45) rectangle ++(0.4,0.1); - \coati@part@draw[coati@bodybright!45!white!95!orange,rotate around={-30:(0.55,0.65)}] (0.35,0.6) rectangle ++(0.4,0.1); - \coati@part@draw[coati@bodybright!45!white!95!orange,rotate around={-30:(0.65,0.9)}] (0.45,0.85) rectangle ++(0.4,0.1); - \coati@part@draw[coati@bodybright!45!white!95!orange,rotate around={-40:(0.35,0.45)}] (0.15,0.4) rectangle ++(0.4,0.1); - \coati@part@draw[coati@bodybright!45!white!95!orange,rotate around={-60:(0.05,0.3)}] (-0.15,0.25) rectangle ++(0.4,0.1); - \end{scope} + \coati@part@draw[coati@bodybright!45!white!95!orange] (1.48, 1.554) -- (1.4139, 1.4752).. controls (1.4389, 1.4583) and (1.4649, 1.4375) .. (1.492, 1.4127) -- (1.5537, 1.4862).. controls (1.5333, 1.5087) and (1.5084, 1.5318) .. (1.48, 1.554) -- cycle; + \coati@part@draw[coati@bodybright!45!white!95!orange] (1.2166, 1.6794) -- (1.2121, 1.5329).. controls (1.2432, 1.5385) and (1.2764, 1.5364) .. (1.3119, 1.5258) -- (1.3158, 1.6501).. controls (1.2832, 1.6633) and (1.2498, 1.6736) .. (1.2166, 1.6794) -- cycle; + \coati@part@draw[coati@bodybright!45!white!95!orange] (1.0093, 1.6405).. controls (0.9821, 1.6229) and (0.9566, 1.6014) .. (0.9325, 1.5765) -- (1.0545, 1.4296).. controls (1.0777, 1.4572) and (1.1021, 1.4801) .. (1.1281, 1.4976) -- (1.0093, 1.6405) -- cycle; + \coati@part@draw[coati@bodybright!45!white!95!orange](0.8327, 1.4466).. controls (0.8154, 1.4193) and (0.7988, 1.3901) .. (0.7823, 1.3602) -- (0.9497, 1.2635).. controls (0.9655, 1.2946) and (0.9818, 1.3236) .. (0.9987, 1.3507) -- (0.8327, 1.4466) -- cycle; + \coati@part@draw[coati@bodybright!45!white!95!orange] (0.7253, 1.2508).. controls (0.7107, 1.2213) and (0.6961, 1.1912) .. (0.6814, 1.1607) -- (0.859, 1.0582).. controls (0.8717, 1.0897) and (0.8844, 1.1212) .. (0.8975, 1.1514) -- (0.7253, 1.2508) -- cycle; + \coati@part@draw[coati@bodybright!45!white!95!orange] (0.5972, 0.9882).. controls (0.5821, 0.9583) and (0.5665, 0.9288) .. (0.5505, 0.8997) -- (0.7501, 0.7845).. controls (0.7627, 0.8154) and (0.7754, 0.8463) .. (0.7878, 0.8781) -- (0.5972, 0.9882) -- cycle; + \coati@part@draw[coati@bodybright!45!white!95!orange] (0.464, 0.7574).. controls (0.4448, 0.7293) and (0.4248, 0.7022) .. (0.4037, 0.6767) -- (0.6357, 0.5427).. controls (0.6519, 0.5703) and (0.6676, 0.5997) .. (0.6828, 0.6311) -- (0.464, 0.7574) -- cycle; + \coati@part@draw[coati@bodybright!45!white!95!orange](0.2881, 0.5624).. controls (0.2869, 0.5615) and (0.2857, 0.5604) .. (0.2845, 0.5595).. controls (0.2564, 0.5378) and (0.2295, 0.521) .. (0.2036, 0.5074) -- (0.3683, 0.3141).. controls (0.4022, 0.3288) and (0.4337, 0.3442) .. (0.461, 0.3595) -- (0.2881, 0.5624) -- cycle; + \coati@part@draw[coati@bodybright!45!white!95!orange] (0.0822, 0.4628).. controls (0.0453, 0.4543) and (0.0123, 0.4501) .. (-0.0164, 0.445) -- (0.039, 0.2211).. controls (0.0701, 0.2242) and (0.1034, 0.23) .. (0.1379, 0.2379) -- (0.0822, 0.4628) -- cycle; \fi% back % % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \csname coatihookbody\endcsname \csname tikzlinghookbody\endcsname - % + % } %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/latex/tikzlings/tikzlings-elephants.sty b/Master/texmf-dist/tex/latex/tikzlings/tikzlings-elephants.sty index 0bfa9ffc50d..d846c1d9d45 100644 --- a/Master/texmf-dist/tex/latex/tikzlings/tikzlings-elephants.sty +++ b/Master/texmf-dist/tex/latex/tikzlings/tikzlings-elephants.sty @@ -12,7 +12,7 @@ %% See https://www.latex-project.org/lppl.txt %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\ProvidesPackage{tikzlings-elephants}[2024/12/12 version v2.1 Draw teddy elephants in TikZ] +\ProvidesPackage{tikzlings-elephants}[2025/01/05 version v2.2 Draw teddy elephants in TikZ] \RequirePackage{tikz} \RequirePackage{tikzlings-addons} @@ -50,32 +50,32 @@ eye/.store in = \elephant@eye, eye = \elephant@body!30!black, ears/.store in = \elephant@ears, - ears = \elephant@body!30!white, + ears = \elephant@body!30!white, feet/.store in = \elephant@feet, - feet = \elephant@body!30!white, + feet = \elephant@body!30!white, hands/.store in = \elephant@hands, - hands = \elephant@body!30!white, + hands = \elephant@body!30!white, belly/.store in = \elephant@belly, - belly = \elephant@body!30!white, + belly = \elephant@body!30!white, tail/.store in = \elephant@tail, - tail = \elephant@body!30!white, + tail = \elephant@body!30!white, %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % options % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - 3D/.code = \elephant@threeDtrue, - back/.code = \elephant@backtrue, + 3D/.code = \elephant@threeDtrue, + back/.code = \elephant@backtrue, contour/.code = \elephant@contourtrue \def\elephant@contour{#1}, - contour/.default = black, - outline/.forward to = /elephant/contour, + contour/.default = black, + outline/.forward to = /elephant/contour, } \def\elephant@draw{% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % - % minimal bounding box size + % minimal bounding box size % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \path (-0.86, 0.0) rectangle (0.86, 2.17); @@ -92,7 +92,7 @@ \pgfmathsetmacro{\yscalefactor}{\tmpscaleD} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - % + % % switch between 2D, 3D and contours, from % https://chat.stackexchange.com/transcript/message/45991801#45991801 % @@ -110,7 +110,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % Body parts - % + % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -123,14 +123,14 @@ % % Feet if back %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ifelephant@back - \elephant@part@draw[\elephant@body] (0.425, 0.3) circle[radius=0.28]; + \elephant@part@draw[\elephant@body] (0.425, 0.3) circle[radius=0.28]; \elephant@part@draw[\elephant@body] (-0.425, 0.3) circle[radius=0.28]; \elephant@part@draw[\elephant@body] (0.57,0.74) circle [radius=0.20]; \elephant@part@draw[\elephant@body] (-0.57,0.74) circle [radius=0.20]; \fi% back % % Body %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \elephant@part@draw[\elephant@body] (0,0.75) ellipse[x radius=0.55, y radius=0.65]; + \elephant@part@draw[\elephant@body] (0,0.75) ellipse[x radius=0.55, y radius=0.65]; \unless\ifelephant@back \elephant@part@draw[\elephant@belly] (0,0.7) ellipse[x radius=0.35, y radius=0.4]; \fi% back @@ -141,14 +141,14 @@ % % Feet %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \unless\ifelephant@back - \elephant@part@draw[\elephant@body] (0.425, 0.3) circle[radius=0.28]; + \elephant@part@draw[\elephant@body] (0.425, 0.3) circle[radius=0.28]; \elephant@part@draw[\elephant@body] (-0.425, 0.3) circle[radius=0.28]; - \elephant@part@draw[\elephant@feet] (0.425, 0.3) circle[radius=0.17]; + \elephant@part@draw[\elephant@feet] (0.425, 0.3) circle[radius=0.17]; \elephant@part@draw[\elephant@feet] (-0.425, 0.3) circle[radius=0.17]; - \elephant@part@draw[\elephant@body] (0.57,0.75) circle [radius=0.20]; + \elephant@part@draw[\elephant@body] (0.57,0.75) circle [radius=0.20]; \elephant@part@draw[\elephant@hands] (0.57,0.74) circle [radius=0.12]; \elephant@part@draw[\elephant@body] (-0.57,0.74) circle [radius=0.20]; - \elephant@part@draw[\elephant@hands] (-0.57,0.74) circle [radius=0.12]; + \elephant@part@draw[\elephant@hands] (-0.57,0.74) circle [radius=0.12]; \fi% back % % Ears %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -156,11 +156,11 @@ \elephant@part@draw[\elephant@body] (-0.5, 1.7) ellipse [x radius=0.35,y radius=0.45]; \unless\ifelephant@back \elephant@part@draw[\elephant@ears] (0.5, 1.7) ellipse [x radius=0.25,y radius=0.35]; - \elephant@part@draw[\elephant@ears] (-0.5, 1.7) ellipse [x radius=0.25,y radius=0.35]; + \elephant@part@draw[\elephant@ears] (-0.5, 1.7) ellipse [x radius=0.25,y radius=0.35]; \fi% back % % Head %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \elephant@part@draw[\elephant@body] (0, 1.55) circle[radius=0.5]; + \elephant@part@draw[\elephant@body] (0, 1.55) circle[radius=0.5]; % % Show details only from the front %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \unless\ifelephant@back @@ -175,8 +175,8 @@ \fi% 3D % % Eyes %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \elephant@part@draw[\elephant@eye] (-0.155, 1.7) circle[radius=0.05]; - \elephant@part@draw[\elephant@eye] (0.155, 1.7) circle[radius=0.05]; + \elephant@part@draw[\elephant@eye] (-0.155, 1.7) circle[radius=0.05]; + \elephant@part@draw[\elephant@eye] (0.155, 1.7) circle[radius=0.05]; % \fi% back % diff --git a/Master/texmf-dist/tex/latex/tikzlings/tikzlings-hippos.sty b/Master/texmf-dist/tex/latex/tikzlings/tikzlings-hippos.sty index 42fd5586e4e..22f48a85c03 100644 --- a/Master/texmf-dist/tex/latex/tikzlings/tikzlings-hippos.sty +++ b/Master/texmf-dist/tex/latex/tikzlings/tikzlings-hippos.sty @@ -12,7 +12,7 @@ %% See https://www.latex-project.org/lppl.txt %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\ProvidesPackage{tikzlings-hippos}[2024/12/12 version v2.1 Drawing hippos in TikZ] +\ProvidesPackage{tikzlings-hippos}[2025/01/05 version v2.2 Drawing hippos in TikZ] \RequirePackage{tikz} \RequirePackage{tikzlings-addons} @@ -31,6 +31,7 @@ \newif\ifhippo@threeD \newif\ifhippo@back \newif\ifhippo@contour +\newif\ifhippo@openmouth \tikzset{ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -48,9 +49,9 @@ body/.store in = \hippo@body, body = gray!55!white, eye/.store in = \hippo@eye, - eye = white, + eye = white, pupil/.store in = \hippo@pupil, - pupil = black, + pupil = black, toes/.store in = \hippo@toes, toes = \hippo@body, mouth/.store in = \hippo@mouth, @@ -60,19 +61,22 @@ % options % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - 3D/.code = \hippo@threeDtrue, + openmouth/.code = \hippo@openmouthtrue, + open mouth/.forward to = /hippo/openmouth, + 3D/.code = \hippo@threeDtrue + \def\hippo@mouth{black}, back/.code = \hippo@backtrue, contour/.code = \hippo@contourtrue \def\hippo@contour{#1} \def\hippo@mouth{#1}, - contour/.default = black, - outline/.forward to = /hippo/contour, + contour/.default = black, + outline/.forward to = /hippo/contour, } \def\hippo@draw{% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % - % minimal bounding box size + % minimal bounding box size % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \path (-0.625,0.1) rectangle (0.625, 2.17); @@ -89,7 +93,7 @@ \pgfmathsetmacro{\yscalefactor}{\tmpscaleD} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - % + % % switch between 2D, 3D and contours, from % https://chat.stackexchange.com/transcript/message/45991801#45991801 % @@ -107,12 +111,12 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % Body parts - % + % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \csname hippohookbackground\endcsname - \csname tikzlinghookbackground\endcsname + \csname tikzlinghookbackground\endcsname % % Ears %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \hippo@part@draw[\hippo@body!70!black] (0.23,2.03) ellipse[x radius=0.09, y radius=0.13, rotate=-30]; @@ -120,11 +124,8 @@ % % Feet if back %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ifhippo@back - \begin{scope} - \clip (-0.5,0.4) rectangle (0.5,0.13); - \hippo@part@draw[\hippo@body!70!black] (-0.25,0.15) ellipse[x radius=0.16, y radius=0.17]; - \hippo@part@draw[\hippo@body!70!black] (0.25,0.15) ellipse[x radius=0.16, y radius=0.17]; - \end{scope} + \hippo@part@draw[\hippo@body!70!black] (-0.08,0.13) arc [start angle=0, end angle=180, x radius=0.17, y radius=0.19] -- cycle; + \hippo@part@draw[\hippo@body!70!black](0.08,0.13) arc [start angle=180, end angle=0, x radius=0.17, y radius=0.19] -- cycle; \fi% back % % Nose if back %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -138,7 +139,7 @@ % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \csname hippohookbelly\endcsname \csname tikzlinghookbelly\endcsname - % + % % Arms %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \unless\ifhippo@back \hippo@part@draw[\hippo@body!70!black] (0.35,1.0) ellipse[x radius=0.24, y radius=0.13, rotate=90]; @@ -170,24 +171,21 @@ \hippo@part@draw[\hippo@mouth] (0.07, 1.63) circle[radius=0.035]; % % Mouth %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \ifhippo@threeD - \draw[black,line width=\scalingfactor*0.4pt] (0.125, 1.5) arc [start angle=-50, end angle=-130, radius=0.2] ; - \else% 3D + \ifhippo@openmouth + \filldraw[\hippo@mouth,line width=\scalingfactor*0.4pt] (0.125, 1.5) arc [start angle=-50, end angle=-130, radius=0.2]; + \else% open mouth \draw[\hippo@mouth,line width=\scalingfactor*0.4pt] (0.125, 1.5) arc [start angle=-50, end angle=-130, radius=0.2]; - \fi% 3D + \fi% open mouth % % Feet %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \begin{scope} - \clip (-0.5,0.4) rectangle (0.5,0.13); - \hippo@part@draw[\hippo@body!70!black] (-0.25,0.15) ellipse[x radius=0.16, y radius=0.17]; - \hippo@part@draw[\hippo@body!70!black] (0.25,0.15) ellipse[x radius=0.16, y radius=0.17]; - \hippo@part@draw[\hippo@toes] (0.25,0.13) ellipse[x radius=0.05, y radius=0.1]; - \hippo@part@draw[\hippo@toes] (0.13,0.11) ellipse[x radius=0.05, y radius=0.1]; - \hippo@part@draw[\hippo@toes] (0.37,0.11) ellipse[x radius=0.05, y radius=0.1]; - \hippo@part@draw[\hippo@toes] (-0.25,0.13) ellipse[x radius=0.05, y radius=0.1]; - \hippo@part@draw[\hippo@toes] (-0.13,0.11) ellipse[x radius=0.05, y radius=0.1]; - \hippo@part@draw[\hippo@toes] (-0.37,0.11) ellipse[x radius=0.05, y radius=0.1]; - \end{scope} + \hippo@part@draw[\hippo@body!70!black] (-0.08,0.13) arc [start angle=0, end angle=180, x radius=0.17, y radius=0.19] -- cycle; + \hippo@part@draw[\hippo@body!70!black](0.08,0.13) arc [start angle=180, end angle=0, x radius=0.17, y radius=0.19] -- cycle; + \hippo@part@draw[\hippo@toes] (-0.08,0.13) arc [start angle=0, end angle=180, x radius=0.05, y radius=0.08] -- cycle; + \hippo@part@draw[\hippo@toes] (-0.2,0.13) arc [start angle=0, end angle=180, x radius=0.05, y radius=0.1] -- cycle; + \hippo@part@draw[\hippo@toes] (-0.32,0.13) arc [start angle=0, end angle=180, x radius=0.05, y radius=0.08] -- cycle; + \hippo@part@draw[\hippo@toes] (0.08,0.13) arc [start angle=180, end angle=0, x radius=0.05, y radius=0.08] -- cycle; + \hippo@part@draw[\hippo@toes] (0.2,0.13) arc [start angle=180, end angle=0, x radius=0.05, y radius=0.1] -- cycle; + \hippo@part@draw[\hippo@toes] (0.32,0.13) arc [start angle=180, end angle=0, x radius=0.05, y radius=0.08] -- cycle; % \fi% back % @@ -239,6 +237,11 @@ %\hippo[mouth=red] %\end{tcblisting} % +% The hippo can open its mouth: +%\begin{tcblisting}{title={Open mouth}} +%\hippo[openmouth] +%\end{tcblisting} +% %The hippo can also do its nails: %\begin{tcblisting}{title={Toe colour}} %\hippo[toes=red] diff --git a/Master/texmf-dist/tex/latex/tikzlings/tikzlings-koalas.sty b/Master/texmf-dist/tex/latex/tikzlings/tikzlings-koalas.sty index 4d26d34f99a..3b3a2975177 100644 --- a/Master/texmf-dist/tex/latex/tikzlings/tikzlings-koalas.sty +++ b/Master/texmf-dist/tex/latex/tikzlings/tikzlings-koalas.sty @@ -12,12 +12,12 @@ %% See https://www.latex-project.org/lppl.txt %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\ProvidesPackage{tikzlings-koalas}[2024/12/12 version v2.1 Drawing koalas in TikZ] +\ProvidesPackage{tikzlings-koalas}[2025/01/05 version v2.2 Drawing koalas in TikZ] \RequirePackage{tikz} \RequirePackage{tikzlings-addons} \usetikzlibrary{shadows.blur} -\usetikzlibrary{fadings} +\usetikzlibrary{fadings} \tikzfading[name=koala@blush,inner color=transparent!50,outer color=transparent!100] @@ -38,6 +38,7 @@ \newif\ifkoala@threeD \newif\ifkoala@back \newif\ifkoala@contour +\newif\ifkoala@openmouth \tikzset{ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -55,7 +56,7 @@ body/.store in = \koala@body, body = gray!75!white, eye/.store in = \koala@eye, - eye = black, + eye = black, mouth/.store in = \koala@mouth, mouth = \koala@body!40!black, %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -65,23 +66,25 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% blush/.code = \koala@blushtrue \def\koala@blushcolor{#1}, - blush/.default = red, - sleeping/.code = \koala@sleepingtrue, + blush/.default = red, + sleeping/.code = \koala@sleepingtrue, + openmouth/.code = \koala@openmouthtrue, + open mouth/.forward to = /koala/openmouth, 3D/.code = \koala@threeDtrue - \def\koala@mouth{black}, - back/.code = \koala@backtrue, + \def\koala@mouth{black}, + back/.code = \koala@backtrue, contour/.code = \koala@contourtrue \def\koala@contour{#1} \def\koala@blushcolor{#1} \def\koala@mouth{#1}, - contour/.default = black, - outline/.forward to = /koala/contour, + contour/.default = black, + outline/.forward to = /koala/contour, } \def\koala@draw{% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % - % minimal bounding box size + % minimal bounding box size % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \path (-0.88,0.1) rectangle (0.88, 2.35); @@ -98,7 +101,7 @@ \pgfmathsetmacro{\yscalefactor}{\tmpscaleD} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - % + % % switch between 2D, 3D and contours, from % https://chat.stackexchange.com/transcript/message/45991801#45991801 % @@ -116,7 +119,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % Body parts - % + % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -124,7 +127,7 @@ \csname tikzlinghookbackground\endcsname % % Feet %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \koala@part@draw[\koala@body!50!black] (0.255,0.2) ellipse[x radius=0.23, y radius=0.09]; + \koala@part@draw[\koala@body!50!black] (0.255,0.2) ellipse[x radius=0.23, y radius=0.09]; \koala@part@draw[\koala@body!50!black] (-0.255,0.2) ellipse[x radius=0.23, y radius=0.09]; % % Ears %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -173,18 +176,22 @@ \fill[\koala@body!50!black,rotate around={-20:(-0.2925, 1.6925)}] (-0.29, 1.68) rectangle ++(-0.005, 0.03); \fill[\koala@body!50!black,rotate around={20:(-0.2143, 1.6925)}] (-0.2168, 1.68) rectangle ++(-0.005, 0.03); \fill[\koala@body!50!black,rotate around={-40:(-0.3255, 1.7025)}] (-0.323, 1.69) rectangle ++(-0.005, 0.03); - \fill[\koala@body!50!black,rotate around={40:(-0.1813, 1.7025)}] (-0.1838, 1.69) rectangle ++(-0.005, 0.03); + \fill[\koala@body!50!black,rotate around={40:(-0.1813, 1.7025)}] (-0.1838, 1.69) rectangle ++(-0.005, 0.03); \fill[\koala@body!50!black, even odd rule] (0.3331, 1.741) .. controls (0.3331, 1.685) and (0.1737, 1.685) .. (0.1737, 1.741) .. controls (0.1737, 1.848) and (0.3331, 1.848) .. (0.3331, 1.741) -- cycle (0.328, 1.741) .. controls (0.323, 1.705) and (0.184, 1.705) .. (0.179, 1.741) .. controls (0.184, 1.843) and (0.323, 1.843) .. (0.328, 1.741) -- cycle; \fill[\koala@body!50!black, even odd rule] (-0.3331, 1.741) .. controls (-0.3331, 1.685) and (-0.1737, 1.685) .. (-0.1737, 1.741) .. controls (-0.1737, 1.848) and (-0.3331, 1.848) .. (-0.3331, 1.741) -- cycle (-0.328, 1.741) .. controls (-0.323, 1.705) and (-0.184, 1.705) .. (-0.179, 1.741) .. controls (-0.184, 1.843) and (-0.323, 1.843) .. (-0.328, 1.741) -- cycle; \else% sleeping - \koala@part@draw[\koala@eye] (-0.255, 1.74) circle[radius=0.08]; - \koala@part@draw[\koala@eye] (0.255, 1.74) circle[radius=0.08]; - \fill[white] (-0.27, 1.76) circle[radius=0.015]; - \fill[white] (0.24, 1.76) circle[radius=0.015]; + \koala@part@draw[\koala@eye] (-0.255, 1.74) circle[radius=0.08]; + \koala@part@draw[\koala@eye] (0.255, 1.74) circle[radius=0.08]; + \fill[white] (-0.27, 1.76) circle[radius=0.015]; + \fill[white] (0.24, 1.76) circle[radius=0.015]; \fi% sleeping % % Mouth %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \draw[\koala@mouth,line width=\scalingfactor*0.4pt] (0.115, 1.39) arc [start angle=-40, end angle=-140, radius=0.16]; + \ifkoala@openmouth + \filldraw[\koala@mouth,line width=\scalingfactor*0.4pt] (0.115, 1.39) arc [start angle=-40, end angle=-140, radius=0.16]; + \else + \draw[\koala@mouth,line width=\scalingfactor*0.4pt] (0.115, 1.39) arc [start angle=-40, end angle=-140, radius=0.16]; + \fi % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % @@ -194,7 +201,7 @@ % % Blushed %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ifkoala@blush - \fill[\koala@blushcolor,path fading=koala@blush] (-0.3, 1.52) circle[radius=0.1]; + \fill[\koala@blushcolor,path fading=koala@blush] (-0.3, 1.52) circle[radius=0.1]; \fill[\koala@blushcolor,path fading=koala@blush] (0.3, 1.52) circle[radius=0.1]; \fi% blush % @@ -245,6 +252,11 @@ %\koala[mouth=red] %\end{tcblisting} % +% The koala can open its mouth: +%\begin{tcblisting}{title={Open mouth}} +%\koala[openmouth] +%\end{tcblisting} +% %It can also blush %\begin{tcblisting}{title={Blushing koala}} %\koala[blush=red] diff --git a/Master/texmf-dist/tex/latex/tikzlings/tikzlings-list.sty b/Master/texmf-dist/tex/latex/tikzlings/tikzlings-list.sty index 05f4a2de540..b8cd2cdb387 100644 --- a/Master/texmf-dist/tex/latex/tikzlings/tikzlings-list.sty +++ b/Master/texmf-dist/tex/latex/tikzlings/tikzlings-list.sty @@ -1,4 +1,4 @@ -\ProvidesPackage{tikzlings-list}[2024/12/12 version v2.1 Helper package for the tikzlings] +\ProvidesPackage{tikzlings-list}[2025/01/05 version v2.2 Helper package for the tikzlings] %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % diff --git a/Master/texmf-dist/tex/latex/tikzlings/tikzlings-marmots.sty b/Master/texmf-dist/tex/latex/tikzlings/tikzlings-marmots.sty index 04866b0eb01..8a274a550e8 100644 --- a/Master/texmf-dist/tex/latex/tikzlings/tikzlings-marmots.sty +++ b/Master/texmf-dist/tex/latex/tikzlings/tikzlings-marmots.sty @@ -12,12 +12,12 @@ %% See https://www.latex-project.org/lppl.txt %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\ProvidesPackage{tikzlings-marmots}[2024/12/12 version v2.1 Drawing marmots in TikZ] +\ProvidesPackage{tikzlings-marmots}[2025/01/05 version v2.2 Drawing marmots in TikZ] \RequirePackage{tikz} \RequirePackage{tikzlings-addons} \usetikzlibrary{shadows.blur} -\usetikzlibrary{fadings} +\usetikzlibrary{fadings} \tikzfading[name=marmot@blush,inner color=transparent!50,outer color=transparent!100] @@ -28,13 +28,13 @@ \else \ifdefined\pdfrandomseed % pdflatex \else - \ifdefined\randomseed + \ifdefined\randomseed \let\pdfrandomseed\randomseed % post TL19 xelatex and lualatex \else \let\pdfrandomseed\time % pre TL19 xelatex \fi \fi - \pgfmathsetseed{\number\pdfrandomseed} + \pgfmathsetseed{\number\pdfrandomseed} \fi \ExplSyntaxOff @@ -47,7 +47,7 @@ % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \csname marmothookforeground\endcsname \csname tikzlinghookforeground\endcsname - % + % } \newif\ifmarmot@blush @@ -60,6 +60,7 @@ \newif\ifmarmot@rightstep \newif\ifmarmot@back \newif\ifmarmot@contour +\newif\ifmarmot@openmouth \tikzset{ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -77,7 +78,7 @@ body/.store in = \marmot@body, body = brown, eye/.store in = \marmot@eye, - eye = \marmot@body!50!black, + eye = \marmot@body!50!black, mouth/.store in = \marmot@mouth, mouth = \marmot@body!50!black, %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -87,13 +88,15 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% blush/.code = \marmot@blushtrue \def\marmot@blushcolor{#1}, - blush/.default = red, - whiskers/.code = \marmot@whiskerstrue + blush/.default = red, + whiskers/.code = \marmot@whiskerstrue \def\marmot@whiskers{#1}, whiskers/.default = gray, - teeth/.code = \marmot@teethtrue - \def\marmot@teeth{#1}, + teeth/.code = \marmot@teethtrue + \def\marmot@teeth{#1}, teeth/.default = white, + openmouth/.code = \marmot@openmouthtrue, + open mouth/.forward to = /marmot/openmouth, 3D/.code = \marmot@threeDtrue, shadow/.code = \marmot@shadowtrue, askphil/.code = \marmot@askphiltrue, @@ -101,20 +104,20 @@ leftstep/.code = \marmot@leftsteptrue, left step/.forward to = /marmot/leftstep, rightstep/.code = \marmot@rightsteptrue, - right step/.forward to = /marmot/rightstep, - back/.code = \marmot@backtrue, + right step/.forward to = /marmot/rightstep, + back/.code = \marmot@backtrue, contour/.code = \marmot@contourtrue \def\marmot@contour{#1} \def\marmot@blushcolor{#1} \def\marmot@mouth{#1}, - contour/.default = black, - outline/.forward to = /marmot/contour, + contour/.default = black, + outline/.forward to = /marmot/contour, } \def\marmot@draw{% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % - % minimal bounding box size + % minimal bounding box size % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \path (-0.625,0.1) rectangle (0.905, 2.17); @@ -131,7 +134,7 @@ \pgfmathsetmacro{\yscalefactor}{\tmpscaleD} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - % + % % switch between 2D, 3D and contours, from % https://chat.stackexchange.com/transcript/message/45991801#45991801 % @@ -171,20 +174,20 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % Body parts - % + % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % Feet %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ifmarmot@leftstep - \marmot@part@draw[\marmot@body!50!black] (-0.255,0.25) ellipse[x radius=0.23, y radius=0.09]; + \marmot@part@draw[\marmot@body!50!black] (-0.255,0.25) ellipse[x radius=0.23, y radius=0.09]; \else% step - \marmot@part@draw[\marmot@body!50!black] (-0.255,0.2) ellipse[x radius=0.23, y radius=0.09]; + \marmot@part@draw[\marmot@body!50!black] (-0.255,0.2) ellipse[x radius=0.23, y radius=0.09]; \fi% step % \ifmarmot@rightstep - \marmot@part@draw[\marmot@body!50!black] (0.255,0.25) ellipse[x radius=0.23, y radius=0.09]; + \marmot@part@draw[\marmot@body!50!black] (0.255,0.25) ellipse[x radius=0.23, y radius=0.09]; \else% step - \marmot@part@draw[\marmot@body!50!black] (0.255,0.2) ellipse[x radius=0.23, y radius=0.09]; + \marmot@part@draw[\marmot@body!50!black] (0.255,0.2) ellipse[x radius=0.23, y radius=0.09]; \fi% step % % Ears %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -221,17 +224,21 @@ \marmot@part@draw[\marmot@body!50!black] (-0.385,0.93) ellipse[x radius=0.24, y radius=0.13, rotate=-70]; % % Muzzle %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \marmot@part@draw[\marmot@body!50!white] (0,1.47) ellipse[x radius=0.23, y radius=0.13]; + \marmot@part@draw[\marmot@body!50!white] (0,1.47) ellipse[x radius=0.23, y radius=0.13]; % % Nose %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \marmot@part@draw[\marmot@body!50!black] (0,1.6) circle[radius=0.08]; % % Eyes %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \marmot@part@draw[\marmot@eye] (-0.155,1.77) circle[radius=0.05]; - \marmot@part@draw[\marmot@eye] (0.155,1.77) circle[radius=0.05]; + \marmot@part@draw[\marmot@eye] (-0.155,1.77) circle[radius=0.05]; + \marmot@part@draw[\marmot@eye] (0.155,1.77) circle[radius=0.05]; % % Mouth %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \fill[\marmot@mouth] (0.145,1.51) arc [start angle=-20, end angle=-160, radius=0.16] -- (-0.14,1.51) -- (-0.14,1.51) arc [start angle=-160, end angle=-20, radius=0.144] -- cycle ; + \ifmarmot@openmouth + \filldraw[\marmot@mouth, line width=\scalingfactor*0.4pt] (0.145,1.51) arc [start angle=-20, end angle=-160, radius=0.155] (-0.145,1.51) arc [start angle=-120, end angle=-60, radius=0.29]; + \else + \draw[\marmot@mouth, line width=\scalingfactor*0.4pt] (0.145,1.51) arc [start angle=-20, end angle=-160, radius=0.16]; + \fi % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % @@ -241,8 +248,8 @@ % % Blushed %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ifmarmot@blush - \fill[\marmot@blushcolor,path fading=marmot@blush] (-0.295,1.6) circle[radius=0.1]; - \fill[\marmot@blushcolor,path fading=marmot@blush] (0.295,1.6) circle[radius=0.1]; + \fill[\marmot@blushcolor,path fading=marmot@blush] (-0.295,1.6) circle[radius=0.1]; + \fill[\marmot@blushcolor,path fading=marmot@blush] (0.295,1.6) circle[radius=0.1]; \fi% blush % % Wiskers %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -259,7 +266,7 @@ \ifmarmot@teeth \fill[\marmot@body!50!black] (0.048,1.413) rectangle (-0.048,1.373); \fill[\marmot@teeth] (-0.045,1.407) rectangle (-0.004,1.376); - \fill[\marmot@teeth] (0.045,1.407) rectangle (0.004,1.376); + \fill[\marmot@teeth] (0.045,1.407) rectangle (0.004,1.376); \fi% teeth % \fi% back @@ -309,6 +316,11 @@ %\marmot[mouth=red] %\end{tcblisting} % +% The marmot can open its mouth: +%\begin{tcblisting}{title={Open mouth}} +%\marmot[openmouth] +%\end{tcblisting} +% %The marmot can also blush %\begin{tcblisting}{title={Blushing marmot}} %\marmot[blush=red] @@ -334,7 +346,7 @@ %\marmot[askphil] %\end{tcblisting} % -%If a good weather prognosis is derived, the happy marmot can dance by lifting up its left and right foot: +%If a good weather prognosis is derived, the happy marmot can dance by lifting up its left and right foot: %\begin{tcblisting}{title={Walking}} %\marmot[leftstep] %\marmot[rightstep,xshift=2cm] diff --git a/Master/texmf-dist/tex/latex/tikzlings/tikzlings-meerkats.sty b/Master/texmf-dist/tex/latex/tikzlings/tikzlings-meerkats.sty index 8dba4e39bf9..42337105d62 100644 --- a/Master/texmf-dist/tex/latex/tikzlings/tikzlings-meerkats.sty +++ b/Master/texmf-dist/tex/latex/tikzlings/tikzlings-meerkats.sty @@ -12,7 +12,7 @@ %% See https://www.latex-project.org/lppl.txt %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\ProvidesPackage{tikzlings-meerkats}[2024/12/12 version v2.1 Drawing meerkats in TikZ] +\ProvidesPackage{tikzlings-meerkats}[2025/01/05 version v2.2 Drawing meerkats in TikZ] \RequirePackage{tikz} \RequirePackage{tikzlings-addons} @@ -26,13 +26,14 @@ % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \csname meerkathookforeground\endcsname \csname tikzlinghookforeground\endcsname - % + % } \newif\ifmeerkat@standing \newif\ifmeerkat@threeD \newif\ifmeerkat@back \newif\ifmeerkat@contour +\newif\ifmeerkat@openmouth \def\meerkat@shift{0} @@ -74,28 +75,30 @@ nose/.store in = \meerkat@nose, nose = \meerkat@body!50!black, mouth/.store in = \meerkat@mouth, - mouth = \meerkat@body!50!black, + mouth = \meerkat@body!50!black, %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % options % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + openmouth/.code = \meerkat@openmouthtrue, + open mouth/.forward to = /meerkat/openmouth, + standing/.code = \meerkat@standingtrue + \def\meerkat@shift{15}, 3D/.code = \meerkat@threeDtrue, - back/.code = \meerkat@backtrue, + back/.code = \meerkat@backtrue, contour/.code = \meerkat@contourtrue \def\meerkat@contour{#1} \def\meerkat@blushcolor{#1} \def\meerkat@mouth{#1}, - contour/.default = black, - outline/.forward to = /meerkat/contour, - standing/.code = \meerkat@standingtrue - \def\meerkat@shift{15}, + contour/.default = black, + outline/.forward to = /meerkat/contour, } \def\meerkat@draw{% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % - % minimal bounding box size + % minimal bounding box size % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ifmeerkat@standing @@ -116,7 +119,7 @@ \pgfmathsetmacro{\yscalefactor}{\tmpscaleD} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - % + % % switch between 2D, 3D and contours, from % https://chat.stackexchange.com/transcript/message/45991801#45991801 % @@ -134,7 +137,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % Body parts - % + % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -145,7 +148,7 @@ % \unless\ifmeerkat@back % Tail %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \meerkat@part@draw[\meerkat@tail] (0.0071, 1.0065).. controls (0.0949, 0.7556) and (0.2077, 0.5139) .. (0.3436, 0.2854).. controls (0.3809, 0.2966) and (0.4183, 0.3078) .. (0.4557, 0.319).. controls (0.3377, 0.5524) and (0.2434, 0.7968) .. (0.174, 1.049); + \meerkat@part@draw[\meerkat@tail] (0.0071, 1.0065).. controls (0.0949, 0.7556) and (0.2077, 0.5139) .. (0.3436, 0.2854).. controls (0.3809, 0.2966) and (0.4183, 0.3078) .. (0.4557, 0.319).. controls (0.3377, 0.5524) and (0.2434, 0.7968) .. (0.174, 1.049); % % Tip of tail %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \meerkat@part@draw[\meerkat@tip] (0.8483, 0.1284).. controls (0.7159, 0.1309) and (0.575, 0.1064) .. (0.4503, 0.163).. controls (0.3999, 0.1871) and (0.3617, 0.2328) .. (0.3436, 0.2854).. controls (0.3809, 0.2966) and (0.4183, 0.3078) .. (0.4557, 0.319).. controls (0.5224, 0.2163) and (0.6411, 0.1646) .. (0.7581, 0.145).. controls (0.7881, 0.1389) and (0.8182, 0.1337) .. (0.8483, 0.1284) -- cycle; @@ -157,11 +160,11 @@ % \ifmeerkat@back % Tail %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \meerkat@part@draw[\meerkat@tail] (0.0071, 1.0065).. controls (0.0949, 0.7556) and (0.2077, 0.5139) .. (0.3436, 0.2854).. controls (0.3809, 0.2966) and (0.4183, 0.3078) .. (0.4557, 0.319).. controls (0.3377, 0.5524) and (0.2434, 0.7968) .. (0.174, 1.049); + \meerkat@part@draw[\meerkat@tail] (0.0071, 1.0065).. controls (0.0949, 0.7556) and (0.2077, 0.5139) .. (0.3436, 0.2854).. controls (0.3809, 0.2966) and (0.4183, 0.3078) .. (0.4557, 0.319).. controls (0.3377, 0.5524) and (0.2434, 0.7968) .. (0.174, 1.049); % % Tip of tail %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \meerkat@part@draw[\meerkat@tip] (0.8483, 0.1284).. controls (0.7159, 0.1309) and (0.575, 0.1064) .. (0.4503, 0.163).. controls (0.3999, 0.1871) and (0.3617, 0.2328) .. (0.3436, 0.2854).. controls (0.3809, 0.2966) and (0.4183, 0.3078) .. (0.4557, 0.319).. controls (0.5224, 0.2163) and (0.6411, 0.1646) .. (0.7581, 0.145).. controls (0.7881, 0.1389) and (0.8182, 0.1337) .. (0.8483, 0.1284) -- cycle; - \fi %back + \fi %back \else % sitting meerkat % \unless\ifmeerkat@back @@ -190,7 +193,7 @@ % % Body %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \meerkat@part@draw[\meerkat@body] (0,0.77) circle [radius=0.35]; - % + % % Upper body %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ifmeerkat@back \meerkat@part@draw[\meerkat@upperbody] (-0.374, 1.32).. controls (-0.3892, 1.1462) and (-0.2287, 0.903) .. (-0.0859, 0.7515).. controls (-0.0594, 0.7213) and (-0.031, 0.691) .. (0.0, 0.66).. controls (0.031, 0.691) and (0.0595, 0.7213) .. (0.0859, 0.7515).. controls (0.2399, 0.9179) and (0.3892, 1.1462) .. (0.374, 1.32).. controls (0.374, 1.4277) and (0.1868, 1.582) .. (0.0, 1.65).. controls (-0.1876, 1.5817) and (-0.374, 1.4271) .. (-0.374, 1.32) -- cycle; @@ -223,8 +226,11 @@ \meerkat@part@draw[\meerkat@nose] (0.0176, 1.6987) -- (0.0437, 1.7439).. controls (0.0534, 1.7607) and (0.0455, 1.7743) .. (0.0261, 1.7743) -- (-0.0261, 1.7743).. controls (-0.0455, 1.7743) and (-0.0534, 1.7607) .. (-0.0437, 1.7439) -- (-0.0176, 1.6987).. controls (-0.0079, 1.6819) and (0.0079, 1.6819) .. (0.0176, 1.6987) -- cycle; % % Mouth %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \draw[\meerkat@mouth,line width=\scalingfactor*0.4pt] (0.0, 1.6871).. controls (0.0412, 1.6415) and (0.1351, 1.6616) .. (0.154, 1.7201); - \draw[\meerkat@mouth,line width=\scalingfactor*0.4pt](0.0, 1.6871).. controls (-0.0412, 1.6415) and (-0.1351, 1.6616) .. (-0.154, 1.7201); + \ifmeerkat@openmouth + \filldraw[\meerkat@mouth,line width=\scalingfactor*0.4pt] (-0.16, 1.727) .. controls (-0.16, 1.727) and (-0.062, 1.62) .. (0, 1.7) .. controls (0.062, 1.62) and (0.16, 1.727) .. (0.16, 1.727) (0.16, 1.727) arc [start angle=-20, end angle=-160, radius=0.17]; + \else + \draw[\meerkat@mouth,line width=\scalingfactor*0.4pt] (-0.16, 1.727) .. controls (-0.16, 1.727) and (-0.062, 1.62) .. (0, 1.7) .. controls (0.062, 1.62) and (0.16, 1.727) .. (0.16, 1.727); + \fi % % Eyes %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \meerkat@part@draw[\meerkat@eyecircles,rotate=30] (0.75,1.7) ellipse [x radius=0.14, y radius=0.08]; @@ -238,7 +244,7 @@ % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \csname meerkathookbody\endcsname \csname tikzlinghookbody\endcsname - % + % \end{scope}% body shift } @@ -308,6 +314,11 @@ %\meerkat[tip=red] %\end{tcblisting} % +% The meerkat can open its mouth: +%\begin{tcblisting}{title={Open mouth}} +%\meerkat[openmouth] +%\end{tcblisting} +% %The meerkat can also stand up %\begin{tcblisting}{title={Standing meerkat}} %\meerkat[standing] diff --git a/Master/texmf-dist/tex/latex/tikzlings/tikzlings-mice.sty b/Master/texmf-dist/tex/latex/tikzlings/tikzlings-mice.sty index 26424c00af9..f6bc29e3a14 100644 --- a/Master/texmf-dist/tex/latex/tikzlings/tikzlings-mice.sty +++ b/Master/texmf-dist/tex/latex/tikzlings/tikzlings-mice.sty @@ -12,7 +12,7 @@ %% See https://www.latex-project.org/lppl.txt %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\ProvidesPackage{tikzlings-mice}[2024/12/12 version v2.1 Drawing mice in TikZ] +\ProvidesPackage{tikzlings-mice}[2025/01/05 version v2.2 Drawing mice in TikZ] \RequirePackage{tikz} \RequirePackage{tikzlings-addons} @@ -26,7 +26,7 @@ % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \csname mousehookforeground\endcsname \csname tikzlinghookforeground\endcsname - % + % } \newif\ifmouse@threeD @@ -52,7 +52,7 @@ body/.store in = \mouse@body, body = gray!90!white, eye/.store in = \mouse@eye, - eye = \mouse@body!50!black, + eye = \mouse@body!50!black, whiskers/.store in = \mouse@whiskers, whiskers = \mouse@body!50!black, %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -68,19 +68,19 @@ leftstep/.code = \mouse@leftsteptrue, left step/.forward to = /mouse/leftstep, rightstep/.code = \mouse@rightsteptrue, - right step/.forward to = /mouse/rightstep, - back/.code = \mouse@backtrue, + right step/.forward to = /mouse/rightstep, + back/.code = \mouse@backtrue, contour/.code = \mouse@contourtrue \def\mouse@contour{#1} \def\mouse@whiskers{#1}, - contour/.default = black, - outline/.forward to = /mouse/contour, + contour/.default = black, + outline/.forward to = /mouse/contour, } \def\mouse@draw{% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % - % minimal bounding box size + % minimal bounding box size % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \path (-0.625,0.1) rectangle (0.905, 2.17); @@ -97,7 +97,7 @@ \pgfmathsetmacro{\yscalefactor}{\tmpscaleD} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - % + % % switch between 2D, 3D and contours, from % https://chat.stackexchange.com/transcript/message/45991801#45991801 % @@ -115,24 +115,24 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % Body parts - % + % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \csname mousehookbackground\endcsname \csname tikzlinghookbackground\endcsname - % + % % Feet %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ifmouse@leftstep - \mouse@part@draw[\mouse@body!65!white] (-0.255,0.25) ellipse[x radius=0.23, y radius=0.09]; + \mouse@part@draw[\mouse@body!65!white] (-0.255,0.25) ellipse[x radius=0.23, y radius=0.09]; \else% step - \mouse@part@draw[\mouse@body!65!white] (-0.255,0.2) ellipse[x radius=0.23, y radius=0.09]; + \mouse@part@draw[\mouse@body!65!white] (-0.255,0.2) ellipse[x radius=0.23, y radius=0.09]; \fi% step % \ifmouse@rightstep - \mouse@part@draw[\mouse@body!65!white] (0.255,0.25) ellipse[x radius=0.23, y radius=0.09]; + \mouse@part@draw[\mouse@body!65!white] (0.255,0.25) ellipse[x radius=0.23, y radius=0.09]; \else% step - \mouse@part@draw[\mouse@body!65!white] (0.255,0.2) ellipse[x radius=0.23, y radius=0.09]; + \mouse@part@draw[\mouse@body!65!white] (0.255,0.2) ellipse[x radius=0.23, y radius=0.09]; \fi% step % % Ears %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -154,7 +154,7 @@ % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \csname mousehookbelly\endcsname \csname tikzlinghookbelly\endcsname - % + % % Tail if back %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ifmouse@back \mouse@part@draw[\mouse@body!65!white] (1.0825, 1.6326) .. controls (1.3527, 1.7527) and (1.6609, 1.3164) .. (1.5928, 1.3124) .. controls (0.9164, 2.186) and (0.8338, 0.6325) .. (0.3708, 0.4451) .. controls (0.2529, 0.3974) and (-0.0064, 0.3874) .. (-0.0064, 0.3874) .. controls (-0.0776, 0.3765) and (-0.0862, 0.5026) .. (-0.0092, 0.5034) .. controls (-0.0092, 0.5034) and (0.0363, 0.4591) .. (0.3516, 0.54360) .. controls (0.6710, 0.6988) and (0.7613, 1.4825) .. (1.0825, 1.6326) -- cycle; @@ -162,11 +162,7 @@ % % Head %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ifmouse@back - \mouse@part@draw[\mouse@body!65!white] - (0.5, 1.8) .. controls (0.5, 1.58) and (0.2, 1.35) .. - (0, 1.35) .. controls (-0.2, 1.35) and (-0.5, 1.58) .. - (-0.5, 1.8) .. controls (-0.34, 2.3) and (0.34, 2.3) .. - (0.5, 1.8) -- cycle; + \mouse@part@draw[\mouse@body!65!white] (0.5, 1.8) .. controls (0.5, 1.58) and (0.2, 1.35) .. (0, 1.35) .. controls (-0.2, 1.35) and (-0.5, 1.58) .. (-0.5, 1.8) .. controls (-0.34, 2.3) and (0.34, 2.3) .. (0.5, 1.8) -- cycle; \else% back \mouse@part@draw[\mouse@body!65!white] (0.5, 1.8) .. controls (0.5, 1.58) and (0.2, 1.25) .. (0, 1.16) .. controls (-0.2, 1.25) and (-0.5, 1.58) .. (-0.5, 1.8) .. controls (-0.34, 2.3) and (0.34, 2.3) .. (0.5, 1.8) -- cycle; \fi% back @@ -198,7 +194,7 @@ % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \csname mousehookbody\endcsname \csname tikzlinghookbody\endcsname - % + % } %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/latex/tikzlings/tikzlings-moles.sty b/Master/texmf-dist/tex/latex/tikzlings/tikzlings-moles.sty index a5cc848713c..6363a8944cc 100644 --- a/Master/texmf-dist/tex/latex/tikzlings/tikzlings-moles.sty +++ b/Master/texmf-dist/tex/latex/tikzlings/tikzlings-moles.sty @@ -12,7 +12,7 @@ %% See https://www.latex-project.org/lppl.txt %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\ProvidesPackage{tikzlings-moles}[2024/12/12 version v2.1 Drawing moles in TikZ] +\ProvidesPackage{tikzlings-moles}[2025/01/05 version v2.2 Drawing moles in TikZ] \RequirePackage{tikz} \RequirePackage{tikzlings-addons} @@ -26,7 +26,7 @@ % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \csname moleshookforeground\endcsname \csname tikzlinghookforeground\endcsname - % + % } \newif\ifmoles@threeD @@ -34,6 +34,7 @@ \newif\ifmoles@rightstep \newif\ifmoles@back \newif\ifmoles@contour +\newif\ifmoles@openmouth \tikzset{ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -51,13 +52,13 @@ body/.store in = \moles@body, body = gray, eye/.store in = \moles@eye, - eye = \moles@body!60!black, + eye = \moles@body!60!black, feet/.store in = \moles@feet, feet = red!20!white!50!brown, hands/.store in = \moles@hands, - hands = red!20!white!50!brown, + hands = red!20!white!50!brown, muzzle/.store in = \moles@muzzle, - muzzle = red!20!white!50!brown, + muzzle = red!20!white!50!brown, mouth/.store in = \moles@mouth, mouth = \moles@body!60!black, %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -65,24 +66,26 @@ % options % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - 3D/.code = \moles@threeDtrue, + openmouth/.code = \moles@openmouthtrue, + open mouth/.forward to = /moles/openmouth, + 3D/.code = \moles@threeDtrue, leftstep/.code = \moles@leftsteptrue, left step/.forward to = /moles/leftstep, rightstep/.code = \moles@rightsteptrue, - right step/.forward to = /moles/rightstep, - back/.code = \moles@backtrue, + right step/.forward to = /moles/rightstep, + back/.code = \moles@backtrue, contour/.code = \moles@contourtrue \def\moles@contour{#1} \def\moles@mouth{#1} \def\moles@eye{#1}, - contour/.default = black, - outline/.forward to = /moles/contour, + contour/.default = black, + outline/.forward to = /moles/contour, } \def\moles@draw{% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % - % minimal bounding box size + % minimal bounding box size % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \path (-0.625,0.1) rectangle (0.905, 2.17); @@ -99,7 +102,7 @@ \pgfmathsetmacro{\yscalefactor}{\tmpscaleD} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - % + % % switch between 2D, 3D and contours, from % https://chat.stackexchange.com/transcript/message/45991801#45991801 % @@ -117,7 +120,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % Body parts - % + % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -126,15 +129,15 @@ % % Feet %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ifmoles@leftstep - \moles@part@draw[\moles@feet] (-0.255,0.25) ellipse[x radius=0.23, y radius=0.09]; + \moles@part@draw[\moles@feet] (-0.255,0.25) ellipse[x radius=0.23, y radius=0.09]; \else% step - \moles@part@draw[\moles@feet] (-0.255,0.2) ellipse[x radius=0.23, y radius=0.09]; - \fi% step + \moles@part@draw[\moles@feet] (-0.255,0.2) ellipse[x radius=0.23, y radius=0.09]; + \fi% step \ifmoles@rightstep - \moles@part@draw[\moles@feet] (0.255,0.25) ellipse[x radius=0.23, y radius=0.09]; + \moles@part@draw[\moles@feet] (0.255,0.25) ellipse[x radius=0.23, y radius=0.09]; \else% step - \moles@part@draw[\moles@feet] (0.255,0.2) ellipse[x radius=0.23, y radius=0.09]; - \fi% step + \moles@part@draw[\moles@feet] (0.255,0.2) ellipse[x radius=0.23, y radius=0.09]; + \fi% step % % Tail %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \unless\ifmoles@back @@ -187,15 +190,19 @@ % % Eyes %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ifmoles@threeD - \fill[\moles@eye] (-0.165,1.79) ellipse[x radius=0.055, y radius=0.015, rotate=-15]; - \fill[\moles@eye!50!black] (0.165,1.79) ellipse[x radius=0.055, y radius=0.015, rotate=15]; + \fill[\moles@eye] (-0.165,1.79) ellipse[x radius=0.055, y radius=0.015, rotate=-15]; + \fill[\moles@eye!50!black] (0.165,1.79) ellipse[x radius=0.055, y radius=0.015, rotate=15]; \else% 3D - \fill[\moles@eye] (-0.165,1.79) ellipse[x radius=0.055, y radius=0.015, rotate=-15]; - \fill[\moles@eye] (0.165,1.79) ellipse[x radius=0.055, y radius=0.015, rotate=15]; + \fill[\moles@eye] (-0.165,1.79) ellipse[x radius=0.055, y radius=0.015, rotate=-15]; + \fill[\moles@eye] (0.165,1.79) ellipse[x radius=0.055, y radius=0.015, rotate=15]; \fi% 3D % % Mouth %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \draw[\moles@mouth, line width=\scalingfactor*0.4pt] (0.145,1.51) arc [start angle=-20, end angle=-160, radius=0.16] ; + \ifmoles@openmouth + \filldraw[\moles@mouth, line width=\scalingfactor*0.4pt] (0.145,1.51) arc [start angle=-20, end angle=-160, radius=0.16] ; + \else + \draw[\moles@mouth, line width=\scalingfactor*0.4pt] (0.145,1.51) arc [start angle=-20, end angle=-160, radius=0.16]; + \fi % \fi% back % @@ -241,23 +248,24 @@ %\begin{tcblisting}{title={Eye colour}} %\moles[eye=red] %\end{tcblisting} -% %\begin{tcblisting}{title={Muzzle colour}} %\moles[muzzle=red] %\end{tcblisting} -% %\begin{tcblisting}{title={Hand colour}} %\moles[hands=red] %\end{tcblisting} -% %\begin{tcblisting}{title={Foot colour}} %\moles[feet=red] %\end{tcblisting} -% %\begin{tcblisting}{title={Mouth colour}} %\moles[mouth=red] %\end{tcblisting} % +% The mole can open its mouth: +%\begin{tcblisting}{title={Open mouth}} +%\moles[openmouth] +%\end{tcblisting} +% %And the mole can lift its legs: %\begin{tcblisting}{title={Walking}} %\moles[leftstep] diff --git a/Master/texmf-dist/tex/latex/tikzlings/tikzlings-owls.sty b/Master/texmf-dist/tex/latex/tikzlings/tikzlings-owls.sty index f74c7554960..23b9f0ff8e7 100644 --- a/Master/texmf-dist/tex/latex/tikzlings/tikzlings-owls.sty +++ b/Master/texmf-dist/tex/latex/tikzlings/tikzlings-owls.sty @@ -12,7 +12,7 @@ %% See https://www.latex-project.org/lppl.txt %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\ProvidesPackage{tikzlings-owls}[2024/12/12 version v2.1 Draw owls in TikZ] +\ProvidesPackage{tikzlings-owls}[2025/01/05 version v2.2 Draw owls in TikZ] \RequirePackage{tikz} \RequirePackage{tikzlings-addons} @@ -26,7 +26,7 @@ % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \csname owlhookforeground\endcsname \csname tikzlinghookforeground\endcsname - % + % } \newif\ifowl@threeD @@ -55,24 +55,24 @@ bill/.store in = \owl@bill, bill = orange, feet/.store in = \owl@feet, - feet = orange, + feet = orange, %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % options % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 3D/.code = \owl@threeDtrue, - back/.code = \owl@backtrue, + back/.code = \owl@backtrue, contour/.code = \owl@contourtrue \def\owl@contour{#1}, - contour/.default = black, - outline/.forward to = /owl/contour, + contour/.default = black, + outline/.forward to = /owl/contour, } \def\owl@draw{% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % - % minimal bounding box size + % minimal bounding box size % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \path (-0.73, 0.08) rectangle (0.73, 2.24); @@ -89,7 +89,7 @@ \pgfmathsetmacro{\yscalefactor}{\tmpscaleD} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - % + % % switch between 2D, 3D and contours, from % https://chat.stackexchange.com/transcript/message/45991801#45991801 % @@ -107,7 +107,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % Body parts - % + % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -116,7 +116,7 @@ % % Arms %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \owl@part@draw[\owl@body] (0.575,0.8) ellipse[x radius=0.38, y radius=0.1, rotate=-80]; - \owl@part@draw[\owl@body] (-0.575,0.8) ellipse[x radius=0.38, y radius=0.1, rotate=80]; + \owl@part@draw[\owl@body] (-0.575,0.8) ellipse[x radius=0.38, y radius=0.1, rotate=80]; % % Feet if back %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ifowl@back diff --git a/Master/texmf-dist/tex/latex/tikzlings/tikzlings-pandas.sty b/Master/texmf-dist/tex/latex/tikzlings/tikzlings-pandas.sty index c1c797be0d8..241f76a2a22 100644 --- a/Master/texmf-dist/tex/latex/tikzlings/tikzlings-pandas.sty +++ b/Master/texmf-dist/tex/latex/tikzlings/tikzlings-pandas.sty @@ -12,7 +12,7 @@ %% See https://www.latex-project.org/lppl.txt %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\ProvidesPackage{tikzlings-pandas}[2024/12/12 version v2.1 Drawing pandas in TikZ] +\ProvidesPackage{tikzlings-pandas}[2025/01/05 version v2.2 Drawing pandas in TikZ] \RequirePackage{tikz} \RequirePackage{tikzlings-addons} @@ -26,12 +26,13 @@ % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \csname pandahookforeground\endcsname \csname tikzlinghookforeground\endcsname - % + % } \newif\ifpanda@threeD \newif\ifpanda@back \newif\ifpanda@contour +\newif\ifpanda@openmouth \tikzset{ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -49,29 +50,31 @@ body/.store in = \panda@body, body = white!90!gray, eye/.store in = \panda@eye, - eye = white, + eye = white, pupil/.store in = \panda@pupil, - pupil = black, + pupil = black, mouth/.store in = \panda@mouth, - mouth = black, + mouth = black, %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % options % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - 3D/.code = \panda@threeDtrue, - back/.code = \panda@backtrue, + openmouth/.code = \panda@openmouthtrue, + open mouth/.forward to = /panda/openmouth, + 3D/.code = \panda@threeDtrue, + back/.code = \panda@backtrue, contour/.code = \panda@contourtrue \def\panda@contour{#1} \def\panda@mouth{#1}, - contour/.default = black, - outline/.forward to = /panda/contour, + contour/.default = black, + outline/.forward to = /panda/contour, } \def\panda@draw{% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % - % minimal bounding box size + % minimal bounding box size % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \path (-0.62,0.05) rectangle (0.62, 2.18); @@ -88,7 +91,7 @@ \pgfmathsetmacro{\yscalefactor}{\tmpscaleD} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - % + % % switch between 2D, 3D and contours, from % https://chat.stackexchange.com/transcript/message/45991801#45991801 % @@ -106,7 +109,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % Body parts - % + % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -115,7 +118,7 @@ % % Feet if back %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ifpanda@back - \panda@part@draw[black] (0.32, 0.27) circle[radius=0.2]; + \panda@part@draw[black] (0.32, 0.27) circle[radius=0.2]; \panda@part@draw[black] (-0.32, 0.27) circle[radius=0.2]; \fi% back % @@ -136,7 +139,7 @@ % % Feet %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \unless\ifpanda@back - \panda@part@draw[black] (0.32, 0.27) circle[radius=0.2]; + \panda@part@draw[black] (0.32, 0.27) circle[radius=0.2]; \panda@part@draw[black] (-0.32, 0.27) circle[radius=0.2]; \fi% back % @@ -159,7 +162,11 @@ \panda@part@draw[\panda@pupil] (-0.17, 1.695) circle[radius=0.02]; % % Mouth %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \draw[\panda@mouth,line width=\scalingfactor*0.2pt] (-0.16, 1.477) .. controls (-0.16, 1.477) and (-0.062, 1.37) .. (0, 1.506) .. controls (0.062, 1.37) and (0.16, 1.477) .. (0.16, 1.477); + \ifpanda@openmouth + \filldraw[\panda@mouth,line width=\scalingfactor*0.2pt] (-0.16, 1.477) .. controls (-0.16, 1.477) and (-0.062, 1.37) .. (0, 1.506) .. controls (0.062, 1.37) and (0.16, 1.477) .. (0.16, 1.477) (0.16,1.477) arc [start angle=-20, end angle=-160, radius=0.17]; + \else + \draw[\panda@mouth,line width=\scalingfactor*0.2pt] (-0.16, 1.477) .. controls (-0.16, 1.477) and (-0.062, 1.37) .. (0, 1.506) .. controls (0.062, 1.37) and (0.16, 1.477) .. (0.16, 1.477); + \fi % % Nose %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \panda@part@draw[black] (0,1.55) ellipse[x radius=0.07, y radius=0.04]; @@ -214,6 +221,11 @@ %\panda[mouth=red] %\end{tcblisting} % +% The panda can open its mouth: +%\begin{tcblisting}{title={Open mouth}} +%\panda[openmouth] +%\end{tcblisting} +% %To view the panda from behind: %\begin{tcblisting}{title={Back view}} %\panda[back] diff --git a/Master/texmf-dist/tex/latex/tikzlings/tikzlings-penguins.sty b/Master/texmf-dist/tex/latex/tikzlings/tikzlings-penguins.sty index cac37ccfbd7..93a76e7ab02 100644 --- a/Master/texmf-dist/tex/latex/tikzlings/tikzlings-penguins.sty +++ b/Master/texmf-dist/tex/latex/tikzlings/tikzlings-penguins.sty @@ -12,7 +12,7 @@ %% See https://www.latex-project.org/lppl.txt %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\ProvidesPackage{tikzlings-penguins}[2024/12/12 version v2.1 Draw penguins in TikZ] +\ProvidesPackage{tikzlings-penguins}[2025/01/05 version v2.2 Draw penguins in TikZ] \RequirePackage{tikz} \RequirePackage{tikzlings-addons} @@ -26,7 +26,7 @@ % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \csname penguinhookforeground\endcsname \csname tikzlinghookforeground\endcsname - % + % } \newif\ifpenguin@threeD @@ -53,28 +53,28 @@ feet/.store in = \penguin@feet, feet = yellow!50!orange, bill/.store in = \penguin@bill, - bill = orange, + bill = orange, eye/.store in = \penguin@eye, eye = white!95!black, pupil/.store in = \penguin@pupil, - pupil = black, + pupil = black, %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % options % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - 3D/.code = \penguin@threeDtrue, - back/.code = \penguin@backtrue, + 3D/.code = \penguin@threeDtrue, + back/.code = \penguin@backtrue, contour/.code = \penguin@contourtrue \def\penguin@contour{#1}, - contour/.default = black, - outline/.forward to = /penguin/contour, + contour/.default = black, + outline/.forward to = /penguin/contour, } \def\penguin@draw{% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % - % minimal bounding box size + % minimal bounding box size % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \path (-0.865, 0.15) rectangle (0.865, 2.13); @@ -91,7 +91,7 @@ \pgfmathsetmacro{\yscalefactor}{\tmpscaleD} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - % + % % switch between 2D, 3D and contours, from % https://chat.stackexchange.com/transcript/message/45991801#45991801 % @@ -109,7 +109,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % Body parts - % + % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -118,14 +118,12 @@ % % Arms %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \penguin@part@draw[\penguin@body] (0.575,1.2) ellipse[x radius=0.38, y radius=0.1, rotate=-50]; - \penguin@part@draw[\penguin@body] (-0.575,1.2) ellipse[x radius=0.38, y radius=0.1, rotate=50]; + \penguin@part@draw[\penguin@body] (-0.575,1.2) ellipse[x radius=0.38, y radius=0.1, rotate=50]; % % Feet if back %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ifpenguin@back - \penguin@part@draw[\penguin@feet] - (-0.265, 0.3941) .. controls (-0.283, 0.4505) and (-0.373, 0.6014) .. (-0.470, 0.6533) .. controls (-0.571, 0.7075) and (-0.576, 0.6369) .. (-0.554, 0.596) .. controls (-0.526, 0.5416) and (-0.573, 0.5302) .. (-0.602, 0.5384) .. controls (-0.695, 0.5653) and (-0.767, 0.5169) .. (-0.684, 0.434) .. controls (-0.664, 0.4137) and (-0.587, 0.3557) .. (-0.699, 0.3492) .. controls (-0.772, 0.345) and (-0.779, 0.268) .. (-0.689, 0.2445) .. controls (-0.597, 0.2206) and (-0.476, 0.2043) .. (-0.34, 0.2096) .. controls (-0.252, 0.2131) and (-0.237, 0.3059) .. (-0.265, 0.3941) -- cycle; - \penguin@part@draw[\penguin@feet] - (0.265, 0.3941) .. controls (0.283, 0.4505) and (0.3725, 0.6014) .. (0.469, 0.6533) .. controls (0.571, 0.7075) and (0.5756, 0.6369) .. (0.554, 0.596) .. controls (0.526, 0.5416) and (0.5733, 0.5302) .. (0.602, 0.5384) .. controls (0.695, 0.5653) and (0.7672, 0.5169) .. (0.684, 0.434) .. controls (0.663, 0.4137) and (0.587, 0.3557) .. (0.699, 0.3492) .. controls (0.772, 0.345) and (0.7789, 0.268) .. (0.689, 0.2445) .. controls (0.597, 0.2206) and (0.4764, 0.2043) .. (0.34, 0.2096) .. controls (0.252, 0.2131) and (0.2368, 0.3059) .. (0.265, 0.3941) -- cycle; + \penguin@part@draw[\penguin@feet] (-0.265, 0.3941) .. controls (-0.283, 0.4505) and (-0.373, 0.6014) .. (-0.470, 0.6533) .. controls (-0.571, 0.7075) and (-0.576, 0.6369) .. (-0.554, 0.596) .. controls (-0.526, 0.5416) and (-0.573, 0.5302) .. (-0.602, 0.5384) .. controls (-0.695, 0.5653) and (-0.767, 0.5169) .. (-0.684, 0.434) .. controls (-0.664, 0.4137) and (-0.587, 0.3557) .. (-0.699, 0.3492) .. controls (-0.772, 0.345) and (-0.779, 0.268) .. (-0.689, 0.2445) .. controls (-0.597, 0.2206) and (-0.476, 0.2043) .. (-0.34, 0.2096) .. controls (-0.252, 0.2131) and (-0.237, 0.3059) .. (-0.265, 0.3941) -- cycle; + \penguin@part@draw[\penguin@feet] (0.265, 0.3941) .. controls (0.283, 0.4505) and (0.3725, 0.6014) .. (0.469, 0.6533) .. controls (0.571, 0.7075) and (0.5756, 0.6369) .. (0.554, 0.596) .. controls (0.526, 0.5416) and (0.5733, 0.5302) .. (0.602, 0.5384) .. controls (0.695, 0.5653) and (0.7672, 0.5169) .. (0.684, 0.434) .. controls (0.663, 0.4137) and (0.587, 0.3557) .. (0.699, 0.3492) .. controls (0.772, 0.345) and (0.7789, 0.268) .. (0.689, 0.2445) .. controls (0.597, 0.2206) and (0.4764, 0.2043) .. (0.34, 0.2096) .. controls (0.252, 0.2131) and (0.2368, 0.3059) .. (0.265, 0.3941) -- cycle; \fi% back % % Body %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -142,10 +140,8 @@ % % Feet %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \unless\ifpenguin@back - \penguin@part@draw[\penguin@feet] - (-0.265, 0.3941) .. controls (-0.283, 0.4505) and (-0.373, 0.6014) .. (-0.470, 0.6533) .. controls (-0.571, 0.7075) and (-0.576, 0.6369) .. (-0.554, 0.596) .. controls (-0.526, 0.5416) and (-0.573, 0.5302) .. (-0.602, 0.5384) .. controls (-0.695, 0.5653) and (-0.767, 0.5169) .. (-0.684, 0.434) .. controls (-0.664, 0.4137) and (-0.587, 0.3557) .. (-0.699, 0.3492) .. controls (-0.772, 0.345) and (-0.779, 0.268) .. (-0.689, 0.2445) .. controls (-0.597, 0.2206) and (-0.476, 0.2043) .. (-0.34, 0.2096) .. controls (-0.252, 0.2131) and (-0.237, 0.3059) .. (-0.265, 0.3941) -- cycle; - \penguin@part@draw[\penguin@feet] - (0.265, 0.3941) .. controls (0.283, 0.4505) and (0.3725, 0.6014) .. (0.469, 0.6533) .. controls (0.571, 0.7075) and (0.5756, 0.6369) .. (0.554, 0.596) .. controls (0.526, 0.5416) and (0.5733, 0.5302) .. (0.602, 0.5384) .. controls (0.695, 0.5653) and (0.7672, 0.5169) .. (0.684, 0.434) .. controls (0.663, 0.4137) and (0.587, 0.3557) .. (0.699, 0.3492) .. controls (0.772, 0.345) and (0.7789, 0.268) .. (0.689, 0.2445) .. controls (0.597, 0.2206) and (0.4764, 0.2043) .. (0.34, 0.2096) .. controls (0.252, 0.2131) and (0.2368, 0.3059) .. (0.265, 0.3941) -- cycle; + \penguin@part@draw[\penguin@feet] (-0.265, 0.3941) .. controls (-0.283, 0.4505) and (-0.373, 0.6014) .. (-0.470, 0.6533) .. controls (-0.571, 0.7075) and (-0.576, 0.6369) .. (-0.554, 0.596) .. controls (-0.526, 0.5416) and (-0.573, 0.5302) .. (-0.602, 0.5384) .. controls (-0.695, 0.5653) and (-0.767, 0.5169) .. (-0.684, 0.434) .. controls (-0.664, 0.4137) and (-0.587, 0.3557) .. (-0.699, 0.3492) .. controls (-0.772, 0.345) and (-0.779, 0.268) .. (-0.689, 0.2445) .. controls (-0.597, 0.2206) and (-0.476, 0.2043) .. (-0.34, 0.2096) .. controls (-0.252, 0.2131) and (-0.237, 0.3059) .. (-0.265, 0.3941) -- cycle; + \penguin@part@draw[\penguin@feet] (0.265, 0.3941) .. controls (0.283, 0.4505) and (0.3725, 0.6014) .. (0.469, 0.6533) .. controls (0.571, 0.7075) and (0.5756, 0.6369) .. (0.554, 0.596) .. controls (0.526, 0.5416) and (0.5733, 0.5302) .. (0.602, 0.5384) .. controls (0.695, 0.5653) and (0.7672, 0.5169) .. (0.684, 0.434) .. controls (0.663, 0.4137) and (0.587, 0.3557) .. (0.699, 0.3492) .. controls (0.772, 0.345) and (0.7789, 0.268) .. (0.689, 0.2445) .. controls (0.597, 0.2206) and (0.4764, 0.2043) .. (0.34, 0.2096) .. controls (0.252, 0.2131) and (0.2368, 0.3059) .. (0.265, 0.3941) -- cycle; \fi% back % % Eyes %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/latex/tikzlings/tikzlings-pigs.sty b/Master/texmf-dist/tex/latex/tikzlings/tikzlings-pigs.sty index 00162b7424a..13845d86718 100644 --- a/Master/texmf-dist/tex/latex/tikzlings/tikzlings-pigs.sty +++ b/Master/texmf-dist/tex/latex/tikzlings/tikzlings-pigs.sty @@ -12,7 +12,7 @@ %% See https://www.latex-project.org/lppl.txt %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\ProvidesPackage{tikzlings-pigs}[2024/12/12 version v2.1 Drawing pigs in TikZ] +\ProvidesPackage{tikzlings-pigs}[2025/01/05 version v2.2 Drawing pigs in TikZ] \RequirePackage{tikz} \RequirePackage{tikzlings-addons} @@ -27,12 +27,13 @@ % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \csname pighookforeground\endcsname \csname tikzlinghookforeground\endcsname - % + % } \newif\ifpig@threeD \newif\ifpig@back \newif\ifpig@contour +\newif\ifpig@openmouth \tikzset{ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -50,9 +51,9 @@ body/.store in = \pig@body, body = piglight, eye/.store in = \pig@eye, - eye = gray, + eye = gray, tail/.store in = \pig@tail, - tail = pig@bodysat22, + tail = pig@bodysat22, mouth/.store in = \pig@mouth, mouth = gray, %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -60,21 +61,23 @@ % options % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + openmouth/.code = \pig@openmouthtrue, + open mouth/.forward to = /pig/openmouth, 3D/.code = \pig@threeDtrue - \def\pig@mouth{gray!70!black}, - back/.code = \pig@backtrue, + \def\pig@mouth{gray!70!black}, + back/.code = \pig@backtrue, contour/.code = \pig@contourtrue \def\pig@contour{#1} \def\pig@mouth{#1} \def\pig@tail{#1}, - contour/.default = black, - outline/.forward to = /pig/contour, + contour/.default = black, + outline/.forward to = /pig/contour, } \def\pig@draw{% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % - % minimal bounding box size + % minimal bounding box size % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \path (-0.625,0.1) rectangle (0.905, 2.27); @@ -91,7 +94,7 @@ \pgfmathsetmacro{\yscalefactor}{\tmpscaleD} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - % + % % switch between 2D, 3D and contours, from % https://chat.stackexchange.com/transcript/message/45991801#45991801 % @@ -168,7 +171,11 @@ \pig@part@draw[gray] ( 0.06, 1.62) circle[radius=0.035]; % % Mouth %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \draw[\pig@mouth,line width=\scalingfactor*0.4pt] (0.105, 1.46) arc [start angle=-50, end angle=-130, radius=0.16] ; + \ifpig@openmouth + \filldraw[\pig@mouth,line width=\scalingfactor*0.4pt] (0.105, 1.46) arc [start angle=-50, end angle=-130, radius=0.16]; + \else + \draw[\pig@mouth,line width=\scalingfactor*0.4pt] (0.105, 1.46) arc [start angle=-50, end angle=-130, radius=0.16]; + \fi % % Feet %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \pig@part@draw[pig@bodysat22] (0.3216,0.15) arc (-15:195:0.12) -- (0.16,0.15) to [bend left] (0.25,0.15) -- cycle; @@ -178,13 +185,13 @@ % % Ears %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \pig@part@draw[pig@bodysat22] (0.22, 2.0392) .. controls (0.22, 2.1584) and (0.49460, 2.255) .. (0.49460, 2.255) .. controls (0.49460, 2.255) and (0.5300, 1.86) .. (0.3721, 1.86) .. controls (0.2891, 1.86) and (0.22, 1.9201) .. (0.22, 2.0392) -- cycle; - \pig@part@draw[\pig@body] (0.22, 2.0392) .. controls (0.26, 2.1584) and (0.47, 2.22) .. (0.47, 2.20) .. controls (0.47, 2.2) and (0.49, 1.9) .. (0.3721, 1.9) .. controls (0.2891, 1.88) and (0.22, 1.88) .. (0.22, 2.0392) -- cycle; + \pig@part@draw[\pig@body] (0.22, 2.0392) .. controls (0.26, 2.1584) and (0.47, 2.22) .. (0.47, 2.20) .. controls (0.47, 2.2) and (0.49, 1.9) .. (0.3721, 1.9) .. controls (0.2891, 1.88) and (0.22, 1.88) .. (0.22, 2.0392) -- cycle; \pig@part@draw[pig@bodysat22] (-0.22, 2.0392) .. controls (-0.22, 2.1584) and (-0.49460, 2.255) .. (-0.49460, 2.255) .. controls (-0.49460, 2.255) and (-0.5300, 1.86) .. (-0.3721, 1.86) .. controls (-0.2891, 1.86) and (-0.22, 1.9201) .. (-0.22, 2.0392) -- cycle; - \pig@part@draw[\pig@body] (-0.22, 2.0392) .. controls (-0.26, 2.1584) and (-0.47, 2.22) .. (-0.47, 2.20) .. controls (-0.47, 2.2) and (-0.49, 1.9) .. (-0.3721, 1.9) .. controls (-0.2891, 1.88) and (-0.22, 1.88) .. (-0.22, 2.0392) -- cycle; - % + \pig@part@draw[\pig@body] (-0.22, 2.0392) .. controls (-0.26, 2.1584) and (-0.47, 2.22) .. (-0.47, 2.20) .. controls (-0.47, 2.2) and (-0.49, 1.9) .. (-0.3721, 1.9) .. controls (-0.2891, 1.88) and (-0.22, 1.88) .. (-0.22, 2.0392) -- cycle; + % % Tail if back %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ifpig@back - \draw[\pig@tail,line width=\scalingfactor*0.8pt] (0.8431, 0.583) .. controls (0.8609, 0.4063) and (0.7006, 0.361) .. (0.6384, 0.4293) .. controls (0.5762, 0.4976) and (0.5613, 0.6052) .. (0.6551, 0.629) .. controls (0.7537, 0.6541) and (0.7759, 0.5628) .. (0.7455, 0.4948) .. controls (0.6412, 0.2697) and (0.3543, 0.356) .. (0.2638, 0.4238) .. controls (0.1967, 0.4779) and (0.1788, 0.6076) .. (0.3192, 0.633) .. controls (0.6000, 0.6836) and (0.5130, 0.3048) .. (0.2098, 0.3322) .. controls (0.0809, 0.3438) and (0.0809, 0.5236) .. (0.0809, 0.5236); + \draw[\pig@tail,line width=\scalingfactor*0.8pt] (0.8431, 0.583) .. controls (0.8609, 0.4063) and (0.7006, 0.361) .. (0.6384, 0.4293) .. controls (0.5762, 0.4976) and (0.5613, 0.6052) .. (0.6551, 0.629) .. controls (0.7537, 0.6541) and (0.7759, 0.5628) .. (0.7455, 0.4948) .. controls (0.6412, 0.2697) and (0.3543, 0.356) .. (0.2638, 0.4238) .. controls (0.1967, 0.4779) and (0.1788, 0.6076) .. (0.3192, 0.633) .. controls (0.6000, 0.6836) and (0.5130, 0.3048) .. (0.2098, 0.3322) .. controls (0.0809, 0.3438) and (0.0809, 0.5236) .. (0.0809, 0.5236); \fi% back % % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -235,6 +242,11 @@ %\pig[mouth=red] %\end{tcblisting} % +% The pig can open its mouth: +%\begin{tcblisting}{title={Open mouth}} +%\pig[openmouth] +%\end{tcblisting} +% %To view the pig from behind: %\begin{tcblisting}{title={Back view}} %\pig[back] diff --git a/Master/texmf-dist/tex/latex/tikzlings/tikzlings-rhinos.sty b/Master/texmf-dist/tex/latex/tikzlings/tikzlings-rhinos.sty index a05fb3b38b3..47f868b0b71 100644 --- a/Master/texmf-dist/tex/latex/tikzlings/tikzlings-rhinos.sty +++ b/Master/texmf-dist/tex/latex/tikzlings/tikzlings-rhinos.sty @@ -12,7 +12,7 @@ %% See https://www.latex-project.org/lppl.txt %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\ProvidesPackage{tikzlings-rhinos}[2024/12/12 version v2.1 Drawing rhinos in TikZ] +\ProvidesPackage{tikzlings-rhinos}[2025/01/05 version v2.2 Drawing rhinos in TikZ] \RequirePackage{tikz} \RequirePackage{tikzlings-addons} @@ -26,12 +26,13 @@ % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \csname rhinohookforeground\endcsname \csname tikzlinghookforeground\endcsname - % + % } \newif\ifrhino@threeD \newif\ifrhino@back \newif\ifrhino@contour +\newif\ifrhino@openmouth \tikzset{ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -51,32 +52,34 @@ toes/.store in = \rhino@toes, toes = \rhino@body, eye/.store in = \rhino@eye, - eye = white, + eye = white, pupil/.store in = \rhino@pupil, - pupil = black, + pupil = black, mouth/.store in = \rhino@mouth, - mouth = \rhino@body!50!black, + mouth = \rhino@body!50!black, horn/.store in = \rhino@horn, - horn = white!95!yellow, + horn = white!95!yellow, %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % options % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + openmouth/.code = \rhino@openmouthtrue, + open mouth/.forward to = /rhino/openmouth, 3D/.code = \rhino@threeDtrue - \def\rhino@mouth{black}, - back/.code = \rhino@backtrue, + \def\rhino@mouth{black}, + back/.code = \rhino@backtrue, contour/.code = \rhino@contourtrue \def\rhino@contour{#1} \def\rhino@mouth{#1}, - contour/.default = black, - outline/.forward to = /rhino/contour, + contour/.default = black, + outline/.forward to = /rhino/contour, } \def\rhino@draw{% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % - % minimal bounding box size + % minimal bounding box size % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \path (-0.625,0.1) rectangle (0.625, 2.17); @@ -93,7 +96,7 @@ \pgfmathsetmacro{\yscalefactor}{\tmpscaleD} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - % + % % switch between 2D, 3D and contours, from % https://chat.stackexchange.com/transcript/message/45991801#45991801 % @@ -111,7 +114,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % Body parts - % + % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -124,11 +127,8 @@ % % Feet if back %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ifrhino@back - \begin{scope} - \clip (-0.5,0.4) rectangle (0.5,0.13); - \rhino@part@draw[\rhino@body!70!black] (-0.25,0.15) ellipse[x radius=0.16, y radius=0.17]; - \rhino@part@draw[\rhino@body!70!black] (0.25,0.15) ellipse[x radius=0.16, y radius=0.17]; - \end{scope} + \rhino@part@draw[\rhino@body!70!black] (-0.08,0.13) arc [start angle=0, end angle=180, x radius=0.17, y radius=0.19] -- cycle; + \rhino@part@draw[\rhino@body!70!black](0.08,0.13) arc [start angle=180, end angle=0, x radius=0.17, y radius=0.19] -- cycle; \fi% back % % Nose if back %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -175,20 +175,21 @@ \rhino@part@draw[\rhino@horn] (0, 1.7911) .. controls (-0.0231, 1.7372) and (-0.0463, 1.6832) .. (-0.0642, 1.6274) .. controls (-0.0687, 1.6132) and (-0.0724, 1.5981) .. (-0.0678, 1.5834) .. controls (-0.0603, 1.552) and (-0.0287, 1.5287) .. (0, 1.531) .. controls (0.0287, 1.5287) and (0.0603, 1.552) .. (0.0678, 1.5834) .. controls (0.0724, 1.5981) and (0.0687, 1.6132) .. (0.0642, 1.6274) .. controls (0.0463, 1.6832) and (0.0231, 1.7372) .. (0, 1.7911) -- cycle; % % Mouth %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \draw[\rhino@mouth,line width=\scalingfactor*0.4pt] (0.125, 1.5) arc [start angle=-50, end angle=-130, radius=0.2] ; + \ifrhino@openmouth + \filldraw[\rhino@mouth,line width=\scalingfactor*0.4pt] (0.125, 1.5) arc [start angle=-50, end angle=-130, radius=0.2]; + \else + \draw[\rhino@mouth,line width=\scalingfactor*0.4pt] (0.125, 1.5) arc [start angle=-50, end angle=-130, radius=0.2]; + \fi % % Feet %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \begin{scope} - \clip (-0.5,0.4) rectangle (0.5,0.13); - \rhino@part@draw[\rhino@body!70!black] (-0.25,0.15) ellipse[x radius=0.16, y radius=0.17]; - \rhino@part@draw[\rhino@body!70!black] (0.25,0.15) ellipse[x radius=0.16, y radius=0.17]; - \rhino@part@draw[\rhino@toes] (0.25,0.13) ellipse[x radius=0.05, y radius=0.1]; - \rhino@part@draw[\rhino@toes] (0.13,0.11) ellipse[x radius=0.05, y radius=0.1]; - \rhino@part@draw[\rhino@toes] (0.37,0.11) ellipse[x radius=0.05, y radius=0.1]; - \rhino@part@draw[\rhino@toes] (-0.25,0.13) ellipse[x radius=0.05, y radius=0.1]; - \rhino@part@draw[\rhino@toes] (-0.13,0.11) ellipse[x radius=0.05, y radius=0.1]; - \rhino@part@draw[\rhino@toes] (-0.37,0.11) ellipse[x radius=0.05, y radius=0.1]; - \end{scope} + \rhino@part@draw[\rhino@body!70!black] (-0.08,0.13) arc [start angle=0, end angle=180, x radius=0.17, y radius=0.19] -- cycle; + \rhino@part@draw[\rhino@toes] (-0.08,0.13) arc [start angle=0, end angle=180, x radius=0.05, y radius=0.08] -- cycle; + \rhino@part@draw[\rhino@toes] (-0.2,0.13) arc [start angle=0, end angle=180, x radius=0.05, y radius=0.1] -- cycle; + \rhino@part@draw[\rhino@toes] (-0.32,0.13) arc [start angle=0, end angle=180, x radius=0.05, y radius=0.08] -- cycle; + \rhino@part@draw[\rhino@body!70!black](0.08,0.13) arc [start angle=180, end angle=0, x radius=0.17, y radius=0.19] -- cycle; + \rhino@part@draw[\rhino@toes] (0.08,0.13) arc [start angle=180, end angle=0, x radius=0.05, y radius=0.08] -- cycle; + \rhino@part@draw[\rhino@toes] (0.2,0.13) arc [start angle=180, end angle=0, x radius=0.05, y radius=0.1] -- cycle; + \rhino@part@draw[\rhino@toes] (0.32,0.13) arc [start angle=180, end angle=0, x radius=0.05, y radius=0.08] -- cycle; % \fi% back % @@ -243,6 +244,11 @@ %\rhino[horn=red] %\end{tcblisting} % +% The rhino can open its mouth: +%\begin{tcblisting}{title={Open mouth}} +%\rhino[openmouth] +%\end{tcblisting} +% %The hippo can also do its nails: %\begin{tcblisting}{title={Toe colour}} %\rhino[toes=red] diff --git a/Master/texmf-dist/tex/latex/tikzlings/tikzlings-sheep.sty b/Master/texmf-dist/tex/latex/tikzlings/tikzlings-sheep.sty index ffb5aeff0cd..c412796adc6 100644 --- a/Master/texmf-dist/tex/latex/tikzlings/tikzlings-sheep.sty +++ b/Master/texmf-dist/tex/latex/tikzlings/tikzlings-sheep.sty @@ -12,7 +12,7 @@ %% See https://www.latex-project.org/lppl.txt %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\ProvidesPackage{tikzlings-sheep}[2024/12/12 version v2.1 Drawing sheep in TikZ] +\ProvidesPackage{tikzlings-sheep}[2025/01/05 version v2.2 Drawing sheep in TikZ] \RequirePackage{tikz} \RequirePackage{tikzlings-addons} @@ -54,7 +54,7 @@ body/.store in = \sheep@body, body = brown!50!darkgray!97!yellow!50!darkgray, eye/.store in = \sheep@eye, - eye = sheep@bright!50!black, + eye = sheep@bright!50!black, nose/.store in = \sheep@nose, nose = sheep@bright!50!black, %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -64,22 +64,22 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% blush/.code = \sheep@blushtrue \def\sheep@blushcolor{#1}, - blush/.default = red, + blush/.default = red, monocle/.code = \sheep@monocletrue, - 3D/.code = \sheep@threeDtrue, - back/.code = \sheep@backtrue, + 3D/.code = \sheep@threeDtrue, + back/.code = \sheep@backtrue, contour/.code = \sheep@contourtrue \def\sheep@contour{#1} \def\sheep@blushcolor{#1} \def\sheep@nose{#1}, - contour/.default = black, - outline/.forward to = /sheep/contour, + contour/.default = black, + outline/.forward to = /sheep/contour, } \def\sheep@draw{% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % - % minimal bounding box size + % minimal bounding box size % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \path (-0.7,0.08) rectangle (0.7,2.33); @@ -94,10 +94,10 @@ \pgfmathsetmacro{\scalingfactor}{sqrt(abs(\tmpscaleA*\tmpscaleD-\tmpscaleB*\tmpscaleC))*sqrt(abs((\pgf@xx/1cm)*(\pgf@yy/1cm)-(\pgf@xy/1cm)*(\pgf@yx/1cm)))}% \pgfmathsetmacro{\xscalefactor}{\tmpscaleA} \pgfmathsetmacro{\yscalefactor}{\tmpscaleD} - \pgfmathsetmacro{\decoscalefactor}{sign(\tmpscaleA)*sign(\tmpscaleD)*\scalingfactor}% + \pgfmathsetmacro{\decoscalefactor}{sign(\tmpscaleA)*sign(\tmpscaleD)*\scalingfactor}% % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - % + % % switch between 2D, 3D and contours, from % https://chat.stackexchange.com/transcript/message/45991801#45991801 % @@ -123,23 +123,23 @@ \pgfmathsetmacro{\sheep@sat}{(array({\sheep@hsbcolorspec},1))} \pgfmathsetmacro{\sheep@bright}{(array({\sheep@hsbcolorspec},2))+0.1} \definecolor{sheep@bright}{hsb}{\sheep@hue,\sheep@sat,\sheep@bright} - % + % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % Body parts - % + % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \csname sheephookbackground\endcsname \csname tikzlinghookbackground\endcsname - % + % % Ears %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \sheep@part@draw[sheep@bright] (0.22, 2.0392) .. controls (0.22, 2.1584) and (0.49460, 2.255) .. (0.49460, 2.255) .. controls (0.49460, 2.255) and (0.5300, 1.86) .. (0.3721, 1.86) .. controls (0.2891, 1.86) and (0.22, 1.9201) .. (0.22, 2.0392) -- cycle; - \sheep@part@draw[sheep@bright!55!white] (0.22, 2.0392) .. controls (0.26, 2.1584) and (0.47, 2.22) .. (0.47, 2.20) .. controls (0.47, 2.2) and (0.49, 1.9) .. (0.3721, 1.9) .. controls (0.2891, 1.88) and (0.22, 1.88) .. (0.22, 2.0392) -- cycle; + \sheep@part@draw[sheep@bright!55!white] (0.22, 2.0392) .. controls (0.26, 2.1584) and (0.47, 2.22) .. (0.47, 2.20) .. controls (0.47, 2.2) and (0.49, 1.9) .. (0.3721, 1.9) .. controls (0.2891, 1.88) and (0.22, 1.88) .. (0.22, 2.0392) -- cycle; \sheep@part@draw[sheep@bright] (-0.22, 2.0392) .. controls (-0.22, 2.1584) and (-0.49460, 2.255) .. (-0.49460, 2.255) .. controls (-0.49460, 2.255) and (-0.5300, 1.86) .. (-0.3721, 1.86) .. controls (-0.2891, 1.86) and (-0.22, 1.9201) .. (-0.22, 2.0392) -- cycle; - \sheep@part@draw[sheep@bright!55!white] (-0.22, 2.0392) .. controls (-0.26, 2.1584) and (-0.47, 2.22) .. (-0.47, 2.20) .. controls (-0.47, 2.2) and (-0.49, 1.9) .. (-0.3721, 1.9) .. controls (-0.2891, 1.88) and (-0.22, 1.88) .. (-0.22, 2.0392) -- cycle; - % + \sheep@part@draw[sheep@bright!55!white] (-0.22, 2.0392) .. controls (-0.26, 2.1584) and (-0.47, 2.22) .. (-0.47, 2.20) .. controls (-0.47, 2.2) and (-0.49, 1.9) .. (-0.3721, 1.9) .. controls (-0.2891, 1.88) and (-0.22, 1.88) .. (-0.22, 2.0392) -- cycle; + % % Feet if back %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ifsheep@back \sheep@part@draw[sheep@bright] (0.3216,0.15) arc (-15:195:0.12) -- (0.16,0.15) to [bend left] (0.25,0.15) -- cycle; @@ -175,10 +175,10 @@ % % Ears %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \sheep@part@draw[sheep@bright] (0.22, 2.0392) .. controls (0.22, 2.1584) and (0.49460, 2.255) .. (0.49460, 2.255) .. controls (0.49460, 2.255) and (0.5300, 1.86) .. (0.3721, 1.86) .. controls (0.2891, 1.86) and (0.22, 1.9201) .. (0.22, 2.0392) -- cycle; - \sheep@part@draw[sheep@bright!55!white] (0.22, 2.0392) .. controls (0.26, 2.1584) and (0.47, 2.22) .. (0.47, 2.20) .. controls (0.47, 2.2) and (0.49, 1.9) .. (0.3721, 1.9) .. controls (0.2891, 1.88) and (0.22, 1.88) .. (0.22, 2.0392) -- cycle; + \sheep@part@draw[sheep@bright!55!white] (0.22, 2.0392) .. controls (0.26, 2.1584) and (0.47, 2.22) .. (0.47, 2.20) .. controls (0.47, 2.2) and (0.49, 1.9) .. (0.3721, 1.9) .. controls (0.2891, 1.88) and (0.22, 1.88) .. (0.22, 2.0392) -- cycle; \sheep@part@draw[sheep@bright] (-0.22, 2.0392) .. controls (-0.22, 2.1584) and (-0.49460, 2.255) .. (-0.49460, 2.255) .. controls (-0.49460, 2.255) and (-0.5300, 1.86) .. (-0.3721, 1.86) .. controls (-0.2891, 1.86) and (-0.22, 1.9201) .. (-0.22, 2.0392) -- cycle; - \sheep@part@draw[sheep@bright!55!white] (-0.22, 2.0392) .. controls (-0.26, 2.1584) and (-0.47, 2.22) .. (-0.47, 2.20) .. controls (-0.47, 2.2) and (-0.49, 1.9) .. (-0.3721, 1.9) .. controls (-0.2891, 1.88) and (-0.22, 1.88) .. (-0.22, 2.0392) -- cycle; - % + \sheep@part@draw[sheep@bright!55!white] (-0.22, 2.0392) .. controls (-0.26, 2.1584) and (-0.47, 2.22) .. (-0.47, 2.20) .. controls (-0.47, 2.2) and (-0.49, 1.9) .. (-0.3721, 1.9) .. controls (-0.2891, 1.88) and (-0.22, 1.88) .. (-0.22, 2.0392) -- cycle; + % % Eyes %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \unless\ifsheep@back \sheep@part@draw[\sheep@eye] (0.2, 1.66) circle[radius=0.06]; @@ -197,7 +197,7 @@ % % Blush %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ifsheep@blush - \fill[\sheep@blushcolor,path fading=sheep@blush] (-0.25, 1.5) circle[radius=0.1]; + \fill[\sheep@blushcolor,path fading=sheep@blush] (-0.25, 1.5) circle[radius=0.1]; \fill[\sheep@blushcolor,path fading=sheep@blush] (0.25, 1.5) circle[radius=0.1]; \fi% blush % @@ -212,7 +212,7 @@ % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \csname sheephookbody\endcsname \csname tikzlinghookbody\endcsname - % + % } %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/latex/tikzlings/tikzlings-sloths.sty b/Master/texmf-dist/tex/latex/tikzlings/tikzlings-sloths.sty index 4ef859d6a34..514fd727316 100644 --- a/Master/texmf-dist/tex/latex/tikzlings/tikzlings-sloths.sty +++ b/Master/texmf-dist/tex/latex/tikzlings/tikzlings-sloths.sty @@ -12,7 +12,7 @@ %% See https://www.latex-project.org/lppl.txt %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\ProvidesPackage{tikzlings-sloths}[2024/12/12 version v2.1 Drawing sloths in TikZ] +\ProvidesPackage{tikzlings-sloths}[2025/01/05 version v2.2 Drawing sloths in TikZ] \RequirePackage{tikz} \RequirePackage{tikzlings-addons} @@ -28,13 +28,14 @@ % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \csname slothhookforeground\endcsname \csname tikzlinghookforeground\endcsname - % + % } \newif\ifsloth@sleeping \newif\ifsloth@threeD \newif\ifsloth@back \newif\ifsloth@contour +\newif\ifsloth@openmouth \tikzset{ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -52,7 +53,7 @@ body/.store in = \sloth@body, body = slothcol, eye/.store in = \sloth@eye, - eye = black, + eye = black, eyelid/.store in = \sloth@eyelid, eyelid = sloth@bright10!50!white, mouth/.store in = \sloth@mouth, @@ -62,21 +63,23 @@ % options % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - sleeping/.code = \sloth@sleepingtrue, - 3D/.code = \sloth@threeDtrue, - back/.code = \sloth@backtrue, + sleeping/.code = \sloth@sleepingtrue, + openmouth/.code = \sloth@openmouthtrue, + open mouth/.forward to = /sloth/openmouth, + 3D/.code = \sloth@threeDtrue, + back/.code = \sloth@backtrue, contour/.code = \sloth@contourtrue \def\sloth@contour{#1} \def\sloth@mouth{#1} \def\sloth@eyelid{#1}, - contour/.default = black, - outline/.forward to = /sloth/contour, + contour/.default = black, + outline/.forward to = /sloth/contour, } \def\sloth@draw{% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % - % minimal bounding box size + % minimal bounding box size % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \path (-0.7,0.12) rectangle (0.7, 2.27); @@ -93,7 +96,7 @@ \pgfmathsetmacro{\yscalefactor}{\tmpscaleD} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - % + % % switch between 2D, 3D and contours, from % https://chat.stackexchange.com/transcript/message/45991801#45991801 % @@ -119,11 +122,11 @@ \pgfmathsetmacro{\sloth@sat}{(array({\sloth@hsbcolorspec},1))} \pgfmathsetmacro{\sloth@bright}{(array({\sloth@hsbcolorspec},2))+0.1} \definecolor{sloth@bright10}{hsb}{\sloth@hue,\sloth@sat,\sloth@bright} - % + % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % Body parts - % + % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -133,7 +136,7 @@ % Arms if back %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ifsloth@back \sloth@part@draw[sloth@bright10] (0.53,0.95) ellipse[x radius=0.1, y radius=0.27, rotate=10]; - \sloth@part@draw[sloth@bright10] (-0.53,0.95) ellipse[x radius=0.1, y radius=0.27, rotate=-10]; + \sloth@part@draw[sloth@bright10] (-0.53,0.95) ellipse[x radius=0.1, y radius=0.27, rotate=-10]; \fi% back % % Feet if back%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -149,8 +152,7 @@ \fi% back % % Body %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \sloth@part@draw[\sloth@body] (0.53,0.85) .. controls (0.53,0.29) and (0.32,0.22) .. (0,0.22) .. controls (-0.32,0.22) and (-0.53,0.29) .. - (-0.53,0.85) .. controls (-0.53,1.41) and (-0.32,1.87) .. (0,1.87) .. controls (0.33,1.87) and (0.53,1.41) .. (0.53,0.85) -- cycle; + \sloth@part@draw[\sloth@body] (0.53,0.85) .. controls (0.53,0.29) and (0.32,0.22) .. (0,0.22) .. controls (-0.32,0.22) and (-0.53,0.29) .. (-0.53,0.85) .. controls (-0.53,1.41) and (-0.32,1.87) .. (0,1.87) .. controls (0.33,1.87) and (0.53,1.41) .. (0.53,0.85) -- cycle; % % Belly %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \unless\ifsloth@back @@ -165,11 +167,7 @@ \sloth@part@draw[sloth@bright10] (-0.1128,2.0724) .. controls (-0.1128,2.0724) and (-0.1499,2.2329) .. (-0.0972,2.2525) .. controls (-0.1082,2.1318) and (-0.0047,2.0839) .. (-0.0047,2.0839) .. controls (-0.0047,2.0839) and (-0.0219,2.1866) .. (0.0145,2.1933) .. controls (0.0142,2.1159) and (0.0770,2.0884) .. (0.0770,2.0884) -- cycle; % % Head %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \sloth@part@draw[sloth@bright10] - ( 0.50,1.67) .. controls ( 0.50,1.91) and ( 0.27,2.10) .. - ( 0.00,2.10) .. controls (-0.27,2.10) and (-0.50,1.91) .. (-0.50,1.67) .. controls (-0.50,1.43) and (-0.33,1.28) .. - ( 0.00,1.28) .. controls ( 0.33,1.28) and ( 0.50,1.43) .. - ( 0.50,1.67) -- cycle; + \sloth@part@draw[sloth@bright10] ( 0.50,1.67) .. controls ( 0.50,1.91) and ( 0.27,2.10) .. ( 0.00,2.10) .. controls (-0.27,2.10) and (-0.50,1.91) .. (-0.50,1.67) .. controls (-0.50,1.43) and (-0.33,1.28) .. ( 0.00,1.28) .. controls ( 0.33,1.28) and ( 0.50,1.43) .. ( 0.50,1.67) -- cycle; % % Show details only from the front %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \unless\ifsloth@back @@ -188,20 +186,20 @@ % % Eyes %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ifsloth@sleeping - \fill[\sloth@eyelid] (0.195, 1.705) rectangle ++(0.005, 0.02); - \fill[\sloth@eyelid,rotate around={22:(0.195, 1.76)}] (0.195, 1.705) rectangle ++(0.005, 0.02); - \fill[\sloth@eyelid,rotate around={44:(0.195, 1.76)}] (0.195, 1.701) rectangle ++(0.005, 0.02); - \fill[\sloth@eyelid,rotate around={-22:(0.195, 1.76)}] (0.195, 1.705) rectangle ++(0.005, 0.02); - \fill[\sloth@eyelid,rotate around={-44:(0.195, 1.76)}] (0.195, 1.705) rectangle ++(0.005, 0.02); + \fill[\sloth@eyelid] (0.195, 1.705) rectangle ++(0.005, 0.02); + \fill[\sloth@eyelid,rotate around={22:(0.195, 1.76)}] (0.195, 1.705) rectangle ++(0.005, 0.02); + \fill[\sloth@eyelid,rotate around={44:(0.195, 1.76)}] (0.195, 1.701) rectangle ++(0.005, 0.02); + \fill[\sloth@eyelid,rotate around={-22:(0.195, 1.76)}] (0.195, 1.705) rectangle ++(0.005, 0.02); + \fill[\sloth@eyelid,rotate around={-44:(0.195, 1.76)}] (0.195, 1.705) rectangle ++(0.005, 0.02); % - \fill[\sloth@eyelid] (-0.195, 1.705) rectangle ++(0.005, 0.02); - \fill[\sloth@eyelid,rotate around={22:(-0.195, 1.76)}] (-0.195, 1.705) rectangle ++(0.005, 0.02); - \fill[\sloth@eyelid,rotate around={44:(-0.195, 1.76)}] (-0.195, 1.705) rectangle ++(0.005, 0.02); - \fill[\sloth@eyelid,rotate around={-22:(-0.195, 1.76)}] (-0.195, 1.705) rectangle ++(0.005, 0.02); - \fill[\sloth@eyelid,rotate around={-44:(-0.195, 1.76)}] (-0.195, 1.701) rectangle ++(0.005, 0.02); + \fill[\sloth@eyelid] (-0.195, 1.705) rectangle ++(0.005, 0.02); + \fill[\sloth@eyelid,rotate around={22:(-0.195, 1.76)}] (-0.195, 1.705) rectangle ++(0.005, 0.02); + \fill[\sloth@eyelid,rotate around={44:(-0.195, 1.76)}] (-0.195, 1.705) rectangle ++(0.005, 0.02); + \fill[\sloth@eyelid,rotate around={-22:(-0.195, 1.76)}] (-0.195, 1.705) rectangle ++(0.005, 0.02); + \fill[\sloth@eyelid,rotate around={-44:(-0.195, 1.76)}] (-0.195, 1.701) rectangle ++(0.005, 0.02); % \sloth@part@draw[\sloth@eyelid] (0.237, 1.743) .. controls (0.237, 1.712) and (0.157, 1.712) .. (0.157, 1.743) .. controls (0.157, 1.802) and (0.237, 1.802) .. (0.237, 1.743) -- cycle; - \sloth@part@draw[\sloth@eyelid] (-0.237, 1.743) .. controls (-0.237, 1.712) and (-0.157, 1.712) .. (-0.157, 1.743) .. controls (-0.157, 1.802) and (-0.237, 1.802) .. (-0.237, 1.743) -- cycle; + \sloth@part@draw[\sloth@eyelid] (-0.237, 1.743) .. controls (-0.237, 1.712) and (-0.157, 1.712) .. (-0.157, 1.743) .. controls (-0.157, 1.802) and (-0.237, 1.802) .. (-0.237, 1.743) -- cycle; \else% sleeping \sloth@part@draw[\sloth@eye] (0.193,1.75) circle[radius=0.04]; \sloth@part@draw[\sloth@eye] (-0.193,1.75) circle[radius=0.04]; @@ -213,7 +211,11 @@ \sloth@part@draw[sloth@bright10!40!black] (0,1.665) ellipse[x radius=0.078, y radius=0.048]; % % Mouth %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \draw[\sloth@mouth,line width=\scalingfactor*0.4pt] (0.115, 1.55) arc [start angle=-40, end angle=-140, radius=0.16]; + \ifsloth@openmouth + \filldraw[\sloth@mouth,line width=\scalingfactor*0.4pt] (0.115, 1.55) arc [start angle=-40, end angle=-140, radius=0.16]; + \else + \draw[\sloth@mouth,line width=\scalingfactor*0.4pt] (0.115, 1.55) arc [start angle=-40, end angle=-140, radius=0.16]; + \fi % % Arms %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \sloth@part@draw[sloth@bright10] (-0.50, 1.24) .. controls (-0.54, 1.24) and (-0.55, 1.20) .. (-0.56, 1.17) .. controls (-0.61, 1.06) and (-0.63, 0.95) .. (-0.64, 0.83) .. controls (-0.64, 0.80) and (-0.64, 0.77) .. (-0.63, 0.74) .. controls (-0.57, 0.66) and (-0.47, 0.60) .. (-0.38, 0.56) .. controls (-0.31, 0.54) and (-0.23, 0.52) .. (-0.16, 0.54) .. controls (-0.12, 0.54) and (-0.10, 0.59) .. (-0.13, 0.61) .. controls (-0.17, 0.68) and (-0.24, 0.73) .. (-0.30, 0.77) .. controls (-0.34, 0.79) and (-0.38, 0.81) .. (-0.42, 0.83) .. controls (-0.41, 0.92) and (-0.41, 1.01) .. (-0.42, 1.09) .. controls (-0.43, 1.14) and (-0.44, 1.19) .. (-0.48, 1.23) .. controls (-0.48, 1.24) and (-0.49, 1.24) .. (-0.50, 1.24) -- cycle; @@ -304,6 +306,11 @@ %\sloth[mouth=red] %\end{tcblisting} % +% The sloth can open its mouth: +%\begin{tcblisting}{title={Open mouth}} +%\sloth[openmouth] +%\end{tcblisting} +% %If tired, the sloth can take a nap: %\begin{tcblisting}{title={Sleep}} %\sloth[sleeping] diff --git a/Master/texmf-dist/tex/latex/tikzlings/tikzlings-snowmen.sty b/Master/texmf-dist/tex/latex/tikzlings/tikzlings-snowmen.sty index 56dfd45859f..600b17227a2 100644 --- a/Master/texmf-dist/tex/latex/tikzlings/tikzlings-snowmen.sty +++ b/Master/texmf-dist/tex/latex/tikzlings/tikzlings-snowmen.sty @@ -12,7 +12,7 @@ %% See https://www.latex-project.org/lppl.txt %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\ProvidesPackage{tikzlings-snowmen}[2024/12/12 version v2.1 Draw snowmen in TikZ] +\ProvidesPackage{tikzlings-snowmen}[2025/01/05 version v2.2 Draw snowmen in TikZ] \RequirePackage{tikz} \RequirePackage{tikzlings-addons} @@ -26,13 +26,14 @@ % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \csname snowmanhookforeground\endcsname \csname tikzlinghookforeground\endcsname - % + % } \newif\ifsnowman@threeD \newif\ifsnowman@back \newif\ifsnowman@globalwarming \newif\ifsnowman@contour +\newif\ifsnowman@openmouth \tikzset{ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -56,29 +57,31 @@ mouth/.store in = \snowman@mouth, mouth = black, buttons/.store in = \snowman@buttons, - buttons = black, + buttons = black, %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % options % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - 3D/.code = \snowman@threeDtrue, + openmouth/.code = \snowman@openmouthtrue, + open mouth/.forward to = /snowman/openmouth, + 3D/.code = \snowman@threeDtrue, back/.code = \snowman@backtrue, globalwarming/.code= \snowman@globalwarmingtrue \def\snowman@globalwarming{#1}, - globalwarming/.default = blue!10!white, + globalwarming/.default = blue!10!white, global warming/.forward to = /snowman/globalwarming, contour/.code = \snowman@contourtrue \def\snowman@contour{#1} \def\snowman@mouth{#1}, - contour/.default = black, - outline/.forward to = /snowman/contour, + contour/.default = black, + outline/.forward to = /snowman/contour, } \def\snowman@draw{% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % - % minimal bounding box size + % minimal bounding box size % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \path (-0.75, 0.0) rectangle (0.75, 2.13); @@ -95,7 +98,7 @@ \pgfmathsetmacro{\yscalefactor}{\tmpscaleD} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - % + % % switch between 2D, 3D and contours, from % https://chat.stackexchange.com/transcript/message/45991801#45991801 % @@ -113,7 +116,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % Body parts - % + % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -135,25 +138,25 @@ \csname tikzlinghookbelly\endcsname % % Mouth %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \fill[\snowman@mouth] (0,1.23) circle[radius=0.025]; - \fill[\snowman@mouth] (0.06,1.3) circle[radius=0.025]; - \fill[\snowman@mouth] (-0.06,1.27) circle[radius=0.025]; - \fill[\snowman@mouth] (0.09,1.37) circle[radius=0.025]; - \fill[\snowman@mouth] (-0.18,1.28) circle[radius=0.025]; - \fill[\snowman@mouth] (0.2,1.28) circle[radius=0.025]; + \fill[\snowman@mouth] (0,1.23) circle[radius=0.025]; + \fill[\snowman@mouth] (0.06,1.3) circle[radius=0.025]; + \fill[\snowman@mouth] (-0.06,1.27) circle[radius=0.025]; + \fill[\snowman@mouth] (0.09,1.37) circle[radius=0.025]; + \fill[\snowman@mouth] (-0.18,1.28) circle[radius=0.025]; + \fill[\snowman@mouth] (0.2,1.28) circle[radius=0.025]; \fill[\snowman@mouth] (-0.25,1.2) circle[radius=0.025]; % % Eyes %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \snowman@part@draw[\snowman@eye] (-0.5,1.75) circle[radius=0.06]; - \snowman@part@draw[\snowman@eye] (-0.1,1.55) circle[radius=0.06]; + \snowman@part@draw[\snowman@eye] (-0.5,1.75) circle[radius=0.06]; + \snowman@part@draw[\snowman@eye] (-0.1,1.55) circle[radius=0.06]; % % Nose %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \snowman@part@draw[\snowman@nose] (-0.6,1.4) -- (-0.8,1.42) -- (-0.6,1.54) (-0.6,1.4) arc[radius=0.07, start angle=-90, end angle=90]; + \snowman@part@draw[\snowman@nose] (-0.6,1.4) -- (-0.8,1.42) -- (-0.6,1.54) (-0.6,1.4) arc[radius=0.07, start angle=-90, end angle=90]; % % Buttons %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \snowman@part@draw[\snowman@buttons] (0.1,0.8) circle[radius=0.06]; \snowman@part@draw[\snowman@buttons] (-0.15,0.55) circle[radius=0.06]; - \snowman@part@draw[\snowman@buttons] (0,0.25) circle[radius=0.06]; + \snowman@part@draw[\snowman@buttons] (0,0.25) circle[radius=0.06]; % % normal snowman %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \else% global warming @@ -165,7 +168,7 @@ % Body + Head %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \snowman@part@draw[\snowman@body] (0,0.5) ellipse[x radius=0.6, y radius=0.5]; \snowman@part@draw[\snowman@body] (0,1.1) ellipse[x radius=0.5, y radius=0.4]; - \snowman@part@draw[\snowman@body] (0,1.7) circle[radius=0.4]; + \snowman@part@draw[\snowman@body] (0,1.7) circle[radius=0.4]; % % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%% \csname snowmanhookbelly\endcsname @@ -182,18 +185,25 @@ \fill[\snowman@mouth] (-0.08,1.522) circle[radius=0.016]; \fill[\snowman@mouth] (0.12,1.543) circle[radius=0.016]; \fill[\snowman@mouth] (-0.12,1.543) circle[radius=0.016]; + \ifsnowman@openmouth + \fill[\snowman@mouth] (0,1.57) circle[radius=0.016]; + \fill[\snowman@mouth] (-0.04,1.565) circle[radius=0.016]; + \fill[\snowman@mouth] (-0.08,1.56) circle[radius=0.016]; + \fill[\snowman@mouth] (0.04,1.565) circle[radius=0.016]; + \fill[\snowman@mouth] (0.08,1.56) circle[radius=0.016]; + \fi % % Eyes %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \snowman@part@draw[\snowman@eye] (-0.155,1.8) circle[radius=0.04]; - \snowman@part@draw[\snowman@eye] (0.155,1.8) circle[radius=0.04]; + \snowman@part@draw[\snowman@eye] (-0.155,1.8) circle[radius=0.04]; + \snowman@part@draw[\snowman@eye] (0.155,1.8) circle[radius=0.04]; % % Nose %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \snowman@part@draw[\snowman@nose] (0,1.72) arc [radius=0.05, start angle=90, end angle=270] (0,1.62) -- (0.15,1.64) -- (0,1.72); % % Buttons %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \snowman@part@draw[\snowman@buttons] (0,1.15) circle[radius=0.04]; - \snowman@part@draw[\snowman@buttons] (0,0.95) circle[radius=0.04]; - \snowman@part@draw[\snowman@buttons] (0,0.75) circle[radius=0.04]; + \snowman@part@draw[\snowman@buttons] (0,1.15) circle[radius=0.04]; + \snowman@part@draw[\snowman@buttons] (0,0.95) circle[radius=0.04]; + \snowman@part@draw[\snowman@buttons] (0,0.75) circle[radius=0.04]; % \fi% back % @@ -250,6 +260,11 @@ %\snowman[buttons=red] %\end{tcblisting} % +% The snowman can open its mouth: +%\begin{tcblisting}{title={Open mouth}} +%\snowman[openmouth] +%\end{tcblisting} +% %The biggest enemy of the snowman are raising temperatures: %\begin{tcblisting}{title={Global warming}} %\snowman[globalwarming,tophat] diff --git a/Master/texmf-dist/tex/latex/tikzlings/tikzlings-squirrels.sty b/Master/texmf-dist/tex/latex/tikzlings/tikzlings-squirrels.sty index a15844ddfef..7f132d75853 100644 --- a/Master/texmf-dist/tex/latex/tikzlings/tikzlings-squirrels.sty +++ b/Master/texmf-dist/tex/latex/tikzlings/tikzlings-squirrels.sty @@ -12,7 +12,7 @@ %% See https://www.latex-project.org/lppl.txt %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\ProvidesPackage{tikzlings-squirrels}[2024/12/12 version v2.1 Drawing squirrels in TikZ] +\ProvidesPackage{tikzlings-squirrels}[2025/01/05 version v2.2 Drawing squirrels in TikZ] \RequirePackage{tikz} \RequirePackage{tikzlings-addons} @@ -33,6 +33,7 @@ \newif\ifsquirrel@rightstep \newif\ifsquirrel@back \newif\ifsquirrel@contour +\newif\ifsquirrel@openmouth \tikzset{ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -50,20 +51,25 @@ body/.store in = \squirrel@body, body = brown!40!gray!90!red, eye/.store in = \squirrel@eye, - eye = white, + eye = white, pupil/.store in = \squirrel@pupil, - pupil = black, + pupil = black, + mouth/.store in = \squirrel@mouth, + mouth = \squirrel@body!70!brown!60!black, %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % options % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - 3D/.code = \squirrel@threeDtrue, + openmouth/.code = \squirrel@openmouthtrue, + open mouth/.forward to = /squirrel/openmouth, + 3D/.code = \squirrel@threeDtrue + \def\squirrel@mouth{\squirrel@body!40!black}, leftstep/.code = \squirrel@leftsteptrue, left step/.forward to = /squirrel/leftstep, rightstep/.code = \squirrel@rightsteptrue, - right step/.forward to = /squirrel/rightstep, - back/.code = \squirrel@backtrue, + right step/.forward to = /squirrel/rightstep, + back/.code = \squirrel@backtrue, contour/.code = \squirrel@contourtrue \def\squirrel@contour{#1}, contour/.default = black, @@ -73,7 +79,7 @@ \def\squirrel@draw{% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % - % minimal bounding box size + % minimal bounding box size % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \path (-0.53,0.1) rectangle (1.12,2.15); % @@ -89,7 +95,7 @@ \pgfmathsetmacro{\yscalefactor}{\tmpscaleD} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - % + % % switch between 2D, 3D and contours, from % https://chat.stackexchange.com/transcript/message/45991801#45991801 % @@ -107,24 +113,24 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % Body parts - % + % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \csname squirrelhookbackground\endcsname \csname tikzlinghookbackground\endcsname - % + % % Feet %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ifsquirrel@leftstep \squirrel@part@draw[\squirrel@body!70!brown!50!darkgray] (-0.255,0.25) ellipse[x radius=0.23, y radius=0.09]; \else% step \squirrel@part@draw[\squirrel@body!70!brown!50!darkgray] (-0.255,0.2) ellipse[x radius=0.23, y radius=0.09]; - \fi% step + \fi% step \ifsquirrel@rightstep \squirrel@part@draw[\squirrel@body!70!brown!50!darkgray] (0.255,0.25) ellipse[x radius=0.23, y radius=0.09]; \else% step \squirrel@part@draw[\squirrel@body!70!brown!50!darkgray] (0.255,0.2) ellipse[x radius=0.23, y radius=0.09]; - \fi% step + \fi% step % % Tail %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \unless\ifsquirrel@back @@ -133,8 +139,7 @@ \fi% back % % Body %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \squirrel@part@draw[\squirrel@body] - (0.5,0.5) .. controls (0.5,0.09) and (-0.5,0.09) .. (-0.5,0.5) .. controls (-0.5,0.85) and (-0.25,1.6) .. (0,1.7) .. controls (0.25,1.6) and (0.5,0.85) .. (0.5,0.5) -- cycle; + \squirrel@part@draw[\squirrel@body] (0.5,0.5) .. controls (0.5,0.09) and (-0.5,0.09) .. (-0.5,0.5) .. controls (-0.5,0.85) and (-0.25,1.6) .. (0,1.7) .. controls (0.25,1.6) and (0.5,0.85) .. (0.5,0.5) -- cycle; % % Belly %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \unless\ifsquirrel@back @@ -146,17 +151,16 @@ \csname tikzlinghookbelly\endcsname % % Ears %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \squirrel@part@draw[\squirrel@body!70!brown!50!darkgray] (0.1920,1.9906) .. controls (0.1657,2.0780) and (0.1839,2.1332) .. (0.1839,2.1332) .. controls (0.1839,2.1332) and (0.1123,2.1773) .. (0.0941,2.0720) .. controls (0.0716,2.0156) and (0.0753,1.9519) .. (0.1023,1.9293) .. controls (0.1293,1.9068) and (0.1696,1.9342) .. (0.1920,1.9906) -- cycle; - \squirrel@part@draw[\squirrel@body!70!brown!50!darkgray] - (-0.1920,1.9906) .. controls (-0.1657,2.0780) and (-0.1839,2.1332) .. (-0.1839,2.1332) .. controls (-0.1839,2.1332) and (-0.1123,2.1773) .. (-0.0941,2.0720) .. controls (-0.0716,2.0156) and (-0.0753,1.9519) .. (-0.1023,1.9293) .. controls (-0.1293,1.9068) and (-0.1696,1.9342) .. (-0.1920,1.9906) -- cycle; + \squirrel@part@draw[\squirrel@body!70!brown!50!darkgray] (0.1920,1.9906) .. controls (0.1657,2.0780) and (0.1839,2.1332) .. (0.1839,2.1332) .. controls (0.1839,2.1332) and (0.1123,2.1773) .. (0.0941,2.0720) .. controls (0.0716,2.0156) and (0.0753,1.9519) .. (0.1023,1.9293) .. controls (0.1293,1.9068) and (0.1696,1.9342) .. (0.1920,1.9906) -- cycle; + \squirrel@part@draw[\squirrel@body!70!brown!50!darkgray] (-0.1920,1.9906) .. controls (-0.1657,2.0780) and (-0.1839,2.1332) .. (-0.1839,2.1332) .. controls (-0.1839,2.1332) and (-0.1123,2.1773) .. (-0.0941,2.0720) .. controls (-0.0716,2.0156) and (-0.0753,1.9519) .. (-0.1023,1.9293) .. controls (-0.1293,1.9068) and (-0.1696,1.9342) .. (-0.1920,1.9906) -- cycle; % % Head %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ifsquirrel@contour - \squirrel@part@draw[\squirrel@body] (0,1.75) circle[radius=0.3]; - \squirrel@part@draw[\squirrel@body] (0.2,1.6) circle[radius=0.15]; + \squirrel@part@draw[\squirrel@body] (0,1.75) circle[radius=0.3]; + \squirrel@part@draw[\squirrel@body] (0.2,1.6) circle[radius=0.15]; \squirrel@part@draw[\squirrel@body] (-0.2,1.6) circle[radius=0.15]; \ifsquirrel@back - \squirrel@part@draw[\squirrel@body] (0,1.75) circle[radius=0.3]; + \squirrel@part@draw[\squirrel@body] (0,1.75) circle[radius=0.3]; \fi% back \else% contour \squirrel@part@draw[\squirrel@body] (0,1.75) circle[radius=0.3] (0.2,1.6) circle[radius=0.15] (-0.2,1.6) circle[radius=0.15]; @@ -170,7 +174,7 @@ % % Nose %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \squirrel@part@draw[\squirrel@body!70!brown!60!black] (0,1.66) ellipse[x radius=0.06, y radius=0.03]; - % + % % Eyes %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \squirrel@part@draw[\squirrel@eye] (0.07,1.78) ellipse[x radius=0.05, y radius=0.07]; \squirrel@part@draw[\squirrel@eye] (-0.07,1.78) ellipse[x radius=0.05, y radius=0.07]; @@ -179,15 +183,19 @@ % % Mouth %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ifsquirrel@contour + \draw[\squirrel@contour,fill=white,line width=\scalingfactor*0.4pt] (-0.15,1.61) .. controls (-0.15,1.61) and (-0.15,1.52) .. (0.0,1.61) .. controls (0.15,1.52) and (0.15,1.61) .. (0.15,1.61) (0.15,1.61) arc [start angle=-20, end angle=-160, radius=0.16]; \draw[\squirrel@contour,fill=white,line width=\scalingfactor*0.4pt] (-0.025,1.567) rectangle ++(0.02,0.03); \draw[\squirrel@contour,fill=white,line width=\scalingfactor*0.4pt] (0.025,1.567) rectangle ++(-0.02,0.03); \draw[\squirrel@contour,line width=\scalingfactor*0.4pt] (-0.15,1.61) .. controls (-0.15,1.61) and (-0.15,1.52) .. (0.0,1.61) .. controls (0.15,1.52) and (0.15,1.61) .. (0.15,1.61); \else% contour + \ifsquirrel@openmouth + \filldraw[\squirrel@mouth,line width=\scalingfactor*0.4pt] (-0.15,1.61) .. controls (-0.15,1.61) and (-0.15,1.52) .. (0.0,1.61) .. controls (0.15,1.52) and (0.15,1.61) .. (0.15,1.61) (0.15,1.61) arc [start angle=-20, end angle=-160, radius=0.16]; + \fi% open mouth \fill[white] (-0.025,1.567) rectangle ++(0.02,0.03); \fill[white] (0.025,1.567) rectangle ++(-0.02,0.03); - \draw[\squirrel@body!70!brown!60!black,line width=\scalingfactor*0.4pt] (-0.15,1.61) .. controls (-0.15,1.61) and (-0.15,1.52) .. (0.0,1.61) .. controls (0.15,1.52) and (0.15,1.61) .. (0.15,1.61); + \draw[\squirrel@mouth,line width=\scalingfactor*0.4pt] (-0.15,1.61) .. controls (-0.15,1.61) and (-0.15,1.52) .. (0.0,1.61) .. controls (0.15,1.52) and (0.15,1.61) .. (0.15,1.61); \fi% contour - % + % % Arms %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \squirrel@part@draw[\squirrel@body!70!brown!50!darkgray] (0.2,0.85) ellipse[x radius=0.22, y radius=0.11, rotate=70]; \squirrel@part@draw[\squirrel@body!70!brown!50!darkgray] (-0.2,0.85) ellipse[x radius=0.22, y radius=0.11, rotate=-70]; @@ -197,7 +205,7 @@ % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \csname squirrelhookbody\endcsname \csname tikzlinghookbody\endcsname - % + % } %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -238,6 +246,14 @@ %\begin{tcblisting}{title={Pupil colour}} %\squirrel[pupil=red] %\end{tcblisting} +%\begin{tcblisting}{title={Mouth colour}} +%\squirrel[mouth=red] +%\end{tcblisting} +% +% The squirrel can open its mouth: +%\begin{tcblisting}{title={Open mouth}} +%\squirrel[openmouth] +%\end{tcblisting} % %And the squirrel can lift its legs: %\begin{tcblisting}{title={Walking}} diff --git a/Master/texmf-dist/tex/latex/tikzlings/tikzlings-wolves.sty b/Master/texmf-dist/tex/latex/tikzlings/tikzlings-wolves.sty index f55179ca06d..f4bf79719a9 100644 --- a/Master/texmf-dist/tex/latex/tikzlings/tikzlings-wolves.sty +++ b/Master/texmf-dist/tex/latex/tikzlings/tikzlings-wolves.sty @@ -12,7 +12,7 @@ %% See https://www.latex-project.org/lppl.txt %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\ProvidesPackage{tikzlings-wolves}[2024/12/12 version v2.1 Drawing wolves in TikZ] +\ProvidesPackage{tikzlings-wolves}[2025/01/05 version v2.2 Drawing wolves in TikZ] \RequirePackage{tikz} \RequirePackage{tikzlings-addons} @@ -27,7 +27,7 @@ % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \csname wolfhookforeground\endcsname \csname tikzlinghookforeground\endcsname - % + % } \newif\ifwolf@threeD @@ -53,9 +53,9 @@ body/.store in = \wolf@body, body = gray!90!white, eye/.store in = \wolf@eye, - eye = white, + eye = white, pupil/.store in = \wolf@pupil, - pupil = black, + pupil = black, %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % options @@ -69,18 +69,18 @@ leftstep/.code = \wolf@leftsteptrue, left step/.forward to = /wolf/leftstep, rightstep/.code = \wolf@rightsteptrue, - right step/.forward to = /wolf/rightstep, - back/.code = \wolf@backtrue, + right step/.forward to = /wolf/rightstep, + back/.code = \wolf@backtrue, contour/.code = \wolf@contourtrue \def\wolf@contour{#1}, - contour/.default = black, - outline/.forward to = /wolf/contour, + contour/.default = black, + outline/.forward to = /wolf/contour, } \def\wolf@draw{% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % - % minimal bounding box size + % minimal bounding box size % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \path (-0.625,0.1) rectangle (0.905, 2.17); @@ -97,7 +97,7 @@ \pgfmathsetmacro{\yscalefactor}{\tmpscaleD} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - % + % % switch between 2D, 3D and contours, from % https://chat.stackexchange.com/transcript/message/45991801#45991801 % @@ -115,32 +115,32 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % Body parts - % + % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \csname wolfhookbackground\endcsname \csname tikzlinghookbackground\endcsname - % + % % Feet %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ifwolf@leftstep - \wolf@part@draw[\wolf@body!65!white] (-0.255,0.25) ellipse[x radius=0.23, y radius=0.09]; + \wolf@part@draw[\wolf@body!65!white] (-0.255,0.25) ellipse[x radius=0.23, y radius=0.09]; \else% step - \wolf@part@draw[\wolf@body!65!white] (-0.255,0.2) ellipse[x radius=0.23, y radius=0.09]; + \wolf@part@draw[\wolf@body!65!white] (-0.255,0.2) ellipse[x radius=0.23, y radius=0.09]; \fi% step % \ifwolf@rightstep - \wolf@part@draw[\wolf@body!65!white] (0.255,0.25) ellipse[x radius=0.23, y radius=0.09]; + \wolf@part@draw[\wolf@body!65!white] (0.255,0.25) ellipse[x radius=0.23, y radius=0.09]; \else% step - \wolf@part@draw[\wolf@body!65!white] (0.255,0.2) ellipse[x radius=0.23, y radius=0.09]; + \wolf@part@draw[\wolf@body!65!white] (0.255,0.2) ellipse[x radius=0.23, y radius=0.09]; \fi% step % % Ears %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \wolf@part@draw[\wolf@body] (0.22, 2.0392) .. controls (0.22, 2.1584) and (0.49460, 2.255) .. (0.49460, 2.255) .. controls (0.49460, 2.255) and (0.5300, 1.86) .. (0.3721, 1.86) .. controls (0.2891, 1.86) and (0.22, 1.9201) .. (0.22, 2.0392) -- cycle; - \wolf@part@draw[\wolf@body!55!white] (0.22, 2.0392) .. controls (0.26, 2.1584) and (0.47, 2.22) .. (0.47, 2.20) .. controls (0.47, 2.2) and (0.49, 1.9) .. (0.3721, 1.9) .. controls (0.2891, 1.88) and (0.22, 1.88) .. (0.22, 2.0392) -- cycle; + \wolf@part@draw[\wolf@body!55!white] (0.22, 2.0392) .. controls (0.26, 2.1584) and (0.47, 2.22) .. (0.47, 2.20) .. controls (0.47, 2.2) and (0.49, 1.9) .. (0.3721, 1.9) .. controls (0.2891, 1.88) and (0.22, 1.88) .. (0.22, 2.0392) -- cycle; \wolf@part@draw[\wolf@body] (-0.22, 2.0392) .. controls (-0.22, 2.1584) and (-0.49460, 2.255) .. (-0.49460, 2.255) .. controls (-0.49460, 2.255) and (-0.5300, 1.86) .. (-0.3721, 1.86) .. controls (-0.2891, 1.86) and (-0.22, 1.9201) .. (-0.22, 2.0392) -- cycle; - \wolf@part@draw[\wolf@body!55!white] (-0.22, 2.0392) .. controls (-0.26, 2.1584) and (-0.47, 2.22) .. (-0.47, 2.20) .. controls (-0.47, 2.2) and (-0.49, 1.9) .. (-0.3721, 1.9) .. controls (-0.2891, 1.88) and (-0.22, 1.88) .. (-0.22, 2.0392) -- cycle; - % + \wolf@part@draw[\wolf@body!55!white] (-0.22, 2.0392) .. controls (-0.26, 2.1584) and (-0.47, 2.22) .. (-0.47, 2.20) .. controls (-0.47, 2.2) and (-0.49, 1.9) .. (-0.3721, 1.9) .. controls (-0.2891, 1.88) and (-0.22, 1.88) .. (-0.22, 2.0392) -- cycle; + % % Tail %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \unless\ifwolf@back \wolf@part@draw[\wolf@body!50!darkgray] (1.0893, 1.5779) .. controls (0.3433, 1.6612) and (0.4863, 0.6062) .. (-0.0243, 0.348) .. controls (1.0671, 0.068) and (0.8133, 1.1808) .. (1.0893, 1.5779) -- cycle; @@ -161,7 +161,7 @@ % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \csname wolfhookbelly\endcsname \csname tikzlinghookbelly\endcsname - % + % % Head %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ifwolf@back \wolf@part@draw[\wolf@body!70!white!95!brown] (0.5, 1.8) .. controls (0.5, 1.58) and (0.2, 1.35) .. (0, 1.35) .. controls (-0.2, 1.35) and (-0.5, 1.58) .. (-0.5, 1.8) .. controls (-0.34, 2.3) and (0.34, 2.3) .. (0.5, 1.8) -- cycle; @@ -202,7 +202,7 @@ % adding hook for users to customise %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \csname wolfhookbody\endcsname \csname tikzlinghookbody\endcsname - % + % } %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/latex/tikzlings/tikzlings.sty b/Master/texmf-dist/tex/latex/tikzlings/tikzlings.sty index d7ef80175d3..4db7af570ac 100644 --- a/Master/texmf-dist/tex/latex/tikzlings/tikzlings.sty +++ b/Master/texmf-dist/tex/latex/tikzlings/tikzlings.sty @@ -12,7 +12,7 @@ % See https://www.latex-project.org/lppl.txt % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\ProvidesPackage{tikzlings}[2024/12/12 version v2.1 Collection of packages to draw animals and other beings in TikZ] +\ProvidesPackage{tikzlings}[2025/01/05 version v2.2 Collection of packages to draw animals and other beings in TikZ] %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % @@ -49,13 +49,13 @@ \else \ifdefined\pdfrandomseed % pdflatex \else - \ifdefined\randomseed + \ifdefined\randomseed \let\pdfrandomseed\randomseed % post TL19 xelatex and lualatex \else \let\pdfrandomseed\time % pre TL19 xelatex \fi \fi - \pgfmathsetseed{\number\pdfrandomseed} + \pgfmathsetseed{\number\pdfrandomseed} \fi % #1: tikzling name. diff --git a/Master/texmf-dist/tex/latex/titlesec/titleps.sty b/Master/texmf-dist/tex/latex/titlesec/titleps.sty index 7e75a746fcd..b8682327ac7 100644 --- a/Master/texmf-dist/tex/latex/titlesec/titleps.sty +++ b/Master/texmf-dist/tex/latex/titlesec/titleps.sty @@ -1,5 +1,5 @@ % -% Copyright (C) 1998-2023 Javier Bezos http://www.texnia.com +% Copyright (C) 1998-2025 Javier Bezos http://www.texnia.com % % This file may be distributed and/or modified under the conditions of % the MIT License. A version can be found at the end of this file. @@ -13,7 +13,7 @@ \ifx\ttl@coreps\@empty\else % START code for package \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{titleps}[2023/10/27 v2.16 Page styles] +\ProvidesPackage{titleps}[2025/01/04 v2.17 Page styles] % This package is mainly a wrapper for the pagestyle macros provided % by titlesec, so that they can be used without it. Functionality is diff --git a/Master/texmf-dist/tex/latex/titlesec/titlesec.sty b/Master/texmf-dist/tex/latex/titlesec/titlesec.sty index 749a3fad7c6..5b928a76997 100644 --- a/Master/texmf-dist/tex/latex/titlesec/titlesec.sty +++ b/Master/texmf-dist/tex/latex/titlesec/titlesec.sty @@ -1,5 +1,5 @@ % -% Copyright (C) 1998-2023 Javier Bezos http://www.texnia.com +% Copyright (C) 1998-2025 Javier Bezos http://www.texnia.com % % This file may be distributed and/or modified under the conditions of % the MIT License. A version can be found at the end of this file. @@ -34,7 +34,7 @@ % ~~~~~~~ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{titlesec}[2023/10/27 v2.16 Sectioning titles] +\ProvidesPackage{titlesec}[2025/01/04 v2.17 Sectioning titles] % Initialization % ~~~~~~~~~~~~~~ diff --git a/Master/texmf-dist/tex/latex/titlesec/titletoc.sty b/Master/texmf-dist/tex/latex/titlesec/titletoc.sty index 7d3ac5e93a6..74e3f244524 100644 --- a/Master/texmf-dist/tex/latex/titlesec/titletoc.sty +++ b/Master/texmf-dist/tex/latex/titlesec/titletoc.sty @@ -1,5 +1,5 @@ % -% Copyright (C) 1998-2023 Javier Bezos http://www.texnia.com +% Copyright (C) 1998-2025 Javier Bezos http://www.texnia.com % % This file may be distributed and/or modified under the conditions of % the MIT License. A version can be found at the end of this file. @@ -7,7 +7,7 @@ % Repository: https://github.com/jbezos/titlesec % -\ProvidesPackage{titletoc}[2023/10/27 v2.16 TOC entries] +\ProvidesPackage{titletoc}[2025/01/04 v2.17 TOC entries] % The following tags are used: % ttl@ : the generic one, shared with titlesec @@ -102,22 +102,15 @@ \DeclareOption{rubberseps}{% \def\ttl@contentsstretch{\vskip\z@\@plus.1\p@}} +\newcommand\contentslabel{} \DeclareOption{leftlabels}{% \renewcommand\numberline[1]{\hb@xt@\@tempdima{#1\ttl@idot\hfil}}% - \newcommand\contentslabel[2][\thecontentslabel\ttl@idot]{% -% \let\ttl@a\thecontentslabel %%%%% For the star variant -% \def\thecontentslabel{#2}% %%% To be fully implemented... when? -% \setbox\z@\hbox{#1}% -% \dimen@\wd\z@ -% \let\thecontentslabel\ttl@a -% \hspace*{-\dimen@}\hb@xt@\dimen@{#1\hfil} -% \show\ttl@b \show\ttl@a + \renewcommand\contentslabel[2][\thecontentslabel\ttl@idot]{% \hspace*{-#2}\hb@xt@#2{#1\hfil}}} \DeclareOption{rightlabels}{% \renewcommand\numberline[1]{\hb@xt@\@tempdima{\hss#1\ttl@idot\enspace}}% - \let\contentslabel\relax - \newcommand\contentslabel[2][\thecontentslabel\ttl@idot\enspace]{% + \renewcommand\contentslabel[2][\thecontentslabel\ttl@idot\enspace]{% \hspace*{-#2}\hb@xt@#2{\hfil#1}}} \newcommand\contentspage[1][\thecontentspage]{% diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz-elements.sty b/Master/texmf-dist/tex/latex/tkz-elements/tkz-elements.sty index 821fe562258..f0b32574e1f 100644 --- a/Master/texmf-dist/tex/latex/tkz-elements/tkz-elements.sty +++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz-elements.sty @@ -11,14 +11,15 @@ % This work has the LPPL maintenance status “maintained”. % The Current Maintainer of this work is Alain Matthes. -\ProvidesPackage{tkz-elements}[2024/07/16 version 3.00 Graphic Object Library] +\ProvidesPackage{tkz-elements}[2025/01/06 version 3.10 Graphic Object Library] %\RequirePackage{luacode} \directlua{ require "tkz_elements_main" - tkz_epsilon=1e-8 - tkz_dc=2 - indirect = true + tkz_epsilon = 1e-8 + tkz_dc = 2 + indirect = true + inside = true init_elements()}% \newenvironment{tkzelements} @@ -52,7 +53,7 @@ tex.sprint("\string\\coordinate ("..K..") at ("..V.re..","..V.im..") ; \string\r") end}} -\def\tkzUseLua#1{\directlua{tex.print(tostring(#1))}} +\def\tkzUseLua#1{\directlua{tex.print(#1)}} \makeatletter \def\tkzDrawLuaEllipse{\pgfutil@ifnextchar[{\tkz@DrawLuaEllipse}{\tkz@DrawLuaEllipse[]}} \def\tkz@DrawLuaEllipse[#1](#2,#3,#4){% @@ -67,6 +68,7 @@ end}} \pgfmathprintnumber{#2} \endgroup } +\let\percentchar\@percentchar \makeatother \endinput diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_circle.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_circle.lua index 6bb0c7c4f04..7ed5e1839f9 100644 --- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_circle.lua +++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_circle.lua @@ -1,6 +1,6 @@ -- tkz_elements-circles.lua --- date 2024/07/16 --- version 3.00 +-- date 2025/01/06 +-- version 3.10 -- Copyright 2024 Alain Matthes -- This work may be distributed and/or modified under the -- conditions of the LaTeX Project Public License, either version 1.3 @@ -24,6 +24,8 @@ function circle: new (c, t) -- c --> center t --> through local east = c + point (radius,0) local north = c + point (0,radius) local west = c - point (radius,0) + local perimeter = 2*math.pi*radius + local area = 4*math.pi*radius*radius local o = { center = c, through = t, ct = ct, @@ -33,7 +35,9 @@ function circle: new (c, t) -- c --> center t --> through east = east, north = north, west = west, - type = type} + type = type, + perimeter = perimeter, + area = area} setmetatable(o, self) self.__index = self return o @@ -51,26 +55,12 @@ end ----------------------- -- boolean -- ----------------------- -function circle: in_out (pt) - local d - d = point.abs (pt - self.center) - if math.abs(d-self.radius) < tkz_epsilon - then - return true - else - return false - end +function circle:in_out(pt) + return math.abs(point.abs(pt - self.center) - self.radius) < tkz_epsilon end -function circle: in_out_disk (pt) - local d - d = point.abs (pt - self.center) - if d <= self.radius - then - return true - else - return false - end +function circle:in_out_disk(pt) + return point.abs(pt - self.center) <= self.radius end -- new version 1.80 added @@ -78,6 +68,16 @@ function circle : circles_position (C) return circles_position_ (self.center,self.radius,C.center,C.radius) end +function circle:is_tangent(l) + local a, b = intersection(self, l) + -- Checks whether the intersection produces valid points + if not a or not b then + return false + end + -- Checks whether the distance between the two intersection points is less than a given tolerance + return (point.abs(b - a) < tkz_epsilon) +end + ----------------------- -- real -- ----------------------- @@ -131,59 +131,64 @@ end ----------------------- -- lines -- ----------------------- -function circle: tangent_at (pt) - return line : new ( rotation_ (pt,math.pi/2,self.center),rotation_ (pt,-math.pi/2,self.center)) +function circle:tangent_at(pt) + return line:new( + rotation_(pt, math.pi / 2, self.center), + rotation_(pt, -math.pi / 2, self.center) + ) +end + + + function circle:tangent_from(pt) + local t1, t2 = tangent_from_(self.center, self.through, pt) + return line:new(pt, t1), line:new(pt, t2) end -function circle: tangent_from (pt) - local t1,t2 - t1,t2 = tangent_from_ (self.center,self.through,pt) - return line :new (pt,t1),line : new (pt,t2) + function circle:radical_axis(C) + local t1, t2 + if self.radius > C.radius then + t1, t2 = radical_axis_(self.center, self.through, C.center, C.through) + else + t1, t2 = radical_axis_(C.center, C.through, self.center, self.through) + end + return line:new(t1, t2) end - function circle: radical_axis (C) - local t1,t2 - if self.radius > C.radius then - t1,t2 = radical_axis_ (self.center,self.through,C.center,C.through) - else - t1,t2 = radical_axis_ (C.center,C.through,self.center,self.through) - end - return line :new (t1,t2) - end -function circle: radical_center (C1,C2) -if C2 == nil then - if self.radius > C1.radius then - return radical_center_ (self.center,self.through,C1.center,C1.through) - else - return radical_center_ (C1.center,C1.through,self.center,self.through) - end -else - return radical_center3 (self,C1,C2) -end -end + function circle:radical_center(C1, C2) + if C2 == nil then + if self.radius > C1.radius then + return radical_center_(self.center, self.through, C1.center, C1.through) + else + return radical_center_(C1.center, C1.through, self.center, self.through) + end + else + return radical_center3(self, C1, C2) + end + end -function circle : radical_circle (C1,C2) - local rc - if C2 == nil then - rc = self : radical_center (C1) - return self : orthogonal_from (rc) - else - rc = self : radical_center (C1,C2) - return C1 : orthogonal_from (rc) - end -end + function circle : radical_circle (C1,C2) + local rc + if C2 == nil then + rc = self : radical_center (C1) + return self : orthogonal_from (rc) + else + rc = self : radical_center (C1,C2) + return C1 : orthogonal_from (rc) + end + end - function circle : external_tangent(C) - local i,t1,t2,k,T1,T2 - i = barycenter_ ({C.center,self.radius},{self.center,-C.radius}) - t1,t2 = tangent_from_ (self.center,self.through,i) - k = point.mod((C.center-i)/(self.center-i)) - T1 = homothety_(i,k,t1) - T2 = homothety_(i,k,t2) - return line : new (t1,T1),line : new (t2,T2) + function circle:external_tangent(C) + local i, t1, t2, k, T1, T2 + i = barycenter_({C.center, self.radius}, {self.center, -C.radius}) + t1, t2 = tangent_from_(self.center, self.through, i) + k = point.mod((C.center - i) / (self.center - i)) + T1 = homothety_(i, k, t1) + T2 = homothety_(i, k, t2) + return line:new(t1, T1), line:new(t2, T2) end + function circle : internal_tangent(C) local i,t1,t2,k,T1,T2 i = barycenter_ ({C.center,self.radius},{self.center,C.radius}) @@ -221,54 +226,52 @@ function circle: orthogonal_through (pta,ptb) return circle : new (orthogonal_through_ (self.center,self.through,pta,ptb),pta) end - function circle: inversion_L (L) - local p,q - if L: in_out (self.center) then - return L - else - p = L: projection (self.center) - q = inversion_ (self.center,self.through,p) - return circle: new (midpoint_(self.center,q),q) - end + function circle:inversion_L(L) + if L:in_out(self.center) then + return L + else + local p = L:projection(self.center) + local q = inversion_(self.center, self.through, p) + return circle:new(midpoint_(self.center, q), q) + end end - - function circle: inversion_C (C) - local p,q,x,y - if C: in_out (self.center) then - p = C : antipode (self.center) - q = inversion_ (self.center,self.through,p) - x = ortho_from_ ( q , self.center , p ) - y = ortho_from_ ( q , p, self.center) - return line : new (x,y) - else - x,y = intersection_lc_ (self.center,C.center,C.center,C.through) - X = inversion_ (self.center,self.through,x) - Y = inversion_ (self.center,self.through,y) - return circle : new (midpoint_(X,Y),X) - end + + function circle:inversion_C(C) + local p, q, x, y, X, Y + if C:in_out(self.center) then + p = C:antipode(self.center) + q = inversion_(self.center, self.through, p) + x = ortho_from_(q, self.center, p) + y = ortho_from_(q, p, self.center) + return line:new(x, y) + else + x, y = intersection_lc_(self.center, C.center, C.center, C.through) + X = inversion_(self.center, self.through, x) + Y = inversion_(self.center, self.through, y) + return circle:new(midpoint_(X, Y), X) + end end -function circle: inversion (...) - local obj,nb,t - local tp = table.pack(...) - obj = tp[1] - nb = tp.n - if nb == 1 then - if obj.type == "point" then - return inversion_ (self.center,self.through,obj) - elseif obj.type == "line" then - return self: inversion_L (obj) - else - return self: inversion_C (obj) - end - else - t = {} - for i=1,tp.n do - table.insert( t , inversion_ (self.center,self.through , tp[i]) ) + function circle:inversion(...) + local tp = table.pack(...) + local obj = tp[1] + local nb = tp.n + if nb == 1 then + if obj.type == "point" then + return inversion_(self.center, self.through, obj) + elseif obj.type == "line" then + return self:inversion_L(obj) + else + return self:inversion_C(obj) end - return table.unpack ( t ) - end -end + else + local t = {} + for i = 1, nb do + table.insert(t, inversion_(self.center, self.through, tp[i])) + end + return table.unpack(t) + end + end function circle: draw () local x,y @@ -282,4 +285,111 @@ function circle: midcircle(C) return midcircle_ (self,C) end +-- ----------------------------------------------------------- +-- Circle tangent to a circle passing through two points +function circle : c_c_pp(a,b) + + -- test If one point is inside the disk and the other is outside, there is no solution. + if (self:in_out_disk(a) and not self:in_out_disk(b)) or ( self:in_out_disk(b) and not self:in_out_disk(a)) then + tex.error("An error has occurred", {"Bad configuration. Only one point is in the disk"}) +return end + +-- Find the mediator of the current line +local lab = line : new (a,b) +local lmed = lab : mediator() + +if self : is_tangent (lab) then + local c = intersection (self,lab) + local d = self : antipode (c) + + return circle:new (circum_circle_(a, b, d),a), + circle:new (circum_circle_(a, b, d),a) +end + +-- pb are (AB) tgt to circle A and B equidistant of O tgt and equidistant +if lab : is_equidistant (self.center) then + local t1,t2 = intersection (lmed,self) + return circle:new (circum_circle_(a, b, t1),t1), + circle:new (circum_circle_(a, b, t2),t2) +else + -- Create a circumcircle passing through a, b, and a point on C + local Cc = circle:new(circum_circle_(a, b, self.center), a) + -- Find the intersection points of C and Cc + local c, d = intersection(self, Cc) + -- Create a line passing through the two intersection points + local lcd = line:new(c, d) + -- Find the intersection of the current line (self) with the line lcd + local i = intersection(lab, lcd) + -- Create tangents from the intersection point to C + local lt, ltp = self:tangent_from(i) + -- Get the tangent points + local t, tp = lt.pb, ltp.pb + -- Return two new circles tangent to C and passing through the tangent points + return circle:new(intersection(lmed, line:new(self.center, t)), t), + circle:new(intersection(lmed, line:new(self.center, tp)), tp) +end +end + + +-- Circle tangent to two circles passing through a point +function circle : c_cc_p (C,p) + local i = self: external_similitude (C) + local lofcenters = line : new (self.center,C.center) + local u1,u2 = intersection (lofcenters,self) + local v1,v2 = intersection (lofcenters,C) + local u1,v1 = self : common_tangent (C) + local o = circum_circle_(u1,v1,p) + local a,b = intersection_lc_(i,p,o,p) + if (point.abs(a - b) < tkz_epsilon) then + local li = line:new (i,p) + return C : c_lc_p (li,a) + else + local q + -- problem if p == q ? + if (point.abs(a - p) < tkz_epsilon) then q = b else q=a end + return C : c_c_pp (p,q) + end +end + +-- Circle tangent to one circle, on line and passing through a point +function circle : c_lc_p (l,p,inside) + inside = inside or false + if self : in_out (p) then + local t1 = intersection_ll_( self.north,p,l.pa,l.pb) + local t2 = intersection_ll_( self.south,p,l.pa,l.pb) + local l1 = l : ortho_from (t1) + local l2 = l : ortho_from (t2) + local o1 = intersection_ll_( self.center,p,l1.pa,l1.pb) + local o2 = intersection_ll_( self.center,p,l2.pa,l2.pb) + return circle:new(o1,t1),circle:new(o2,t2) + else + if l : in_out (p) then + local i = l : projection (self.center) + local lortho = l : ortho_from (p) + local u = lortho : report (self.radius,p) + local v = lortho : report (-self.radius,p) + local ux,uy = mediator_ (self.center,u) + local vx,vy = mediator_ (self.center,v) + -- pb if c tgt l + local o1= intersection_ll_(u,v,ux,uy) + local o2 = intersection_ll_(u,v,vx,vy) + return circle:new(o1,p),circle:new(o2,p) + else -- genral case + local u = self.north + local v = self.south + local h = intersection_ll_(u,v,l.pa,l.pb) + if inside then + local o = circum_circle_(p,u,h) + local q = intersection_lc_(p,v,o,p) + return self : c_c_pp (p,q) + else + local o = circum_circle_(p,v,h) + local q = intersection_lc_(u,p,o,v) + return self : c_c_pp (p,q) + end + end + end +end + + return circle
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_class.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_class.lua index 6d5fae53ec3..3469a89c418 100644 --- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_class.lua +++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_class.lua @@ -1,6 +1,6 @@ -- tkz_elements_class.lua --- date 2024/07/16 --- version 3.00 +-- date 2025/01/06 +-- version 3.10 -- from class.lua (Simple Lua Classes from Lua-users wiki) -- Compatible with Lua 5.1 (not 5.0). -- http://lua-users.org/wiki/SimpleLuaClasses DavidManura diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_ellipse.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_ellipse.lua index cbc3a3969c9..9983ae3391e 100644 --- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_ellipse.lua +++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_ellipse.lua @@ -1,6 +1,6 @@ -- tkz_elements-ellipses.lua --- date 2024/07/16 --- version 3.00 +-- date 2025/01/06 +-- version 3.10 -- Copyright 2024 Alain Matthes -- This work may be distributed and/or modified under the -- conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_circles.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_circles.lua index 3208f7a5d3a..5dfece2eb38 100644 --- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_circles.lua +++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_circles.lua @@ -1,6 +1,6 @@ -- tkz_elements_functions_circles.lua --- date 2024/07/16 --- version 3.00 +-- date 2025/01/06 +-- version 3.10 -- Copyright 2024 Alain Matthes -- This work may be distributed and/or modified under the -- conditions of the LaTeX Project Public License, either version 1.3 @@ -37,45 +37,52 @@ function orthogonal_from_ (a,b,p) return tangent_from_ (a,b,p) end -function orthogonal_through_ (a,b,x,y) - local d,z - d = 1/point.mod(x-a) - z = a +(b-a)*d - return circum_center_ (x,y,z) +function orthogonal_through_(a, b, x, y) + local d = 1 / point.mod(x - a) + local z = a + (b - a) * d + return circum_center_(x, y, z) end -function inversion_ (c,p,pt) - local ry = point.abs(c-p) - local d = point.abs(c-pt) - local r = (ry*ry)/d - return c+polar_ (r,point.arg(pt-c)) +function inversion_(c, p, pt) + local ry = point.abs(c - p) + local d = point.abs(c - pt) + local r = (ry * ry) / d + return c + polar_(r, point.arg(pt - c)) end -function circles_position_ (c1,r1,c2,r2) - local d,max,min - d = point.mod(c1-c2) - max = r1+r2 - min = math.abs ( r1 - r2) - if d > max then return "outside" - elseif math.abs(d - max) < tkz_epsilon then return "outside tangent" -- epsilon - elseif math.abs(d - min) < tkz_epsilon then return "inside tangent" -- epsilon - elseif d < min then return "inside" - else return "intersect" - end +function circles_position_(c1, r1, c2, r2) + local d = point.mod(c1 - c2) + local max = r1 + r2 + local min = math.abs(r1 - r2) + + if d > max then + return "outside" + elseif math.abs(d - max) < tkz_epsilon then + return "outside tangent" + elseif math.abs(d - min) < tkz_epsilon then + return "inside tangent" + elseif d < min then + return "inside" + else + return "intersect" + end end + -function radical_axis_ (c1,p1,c2,p2) - local ci,cj - r1 = point.abs(c1-p1) - r2 = point.abs(c2-p2) - d = point.abs(c1-c2) - h = (r1*r1-r2*r2+d*d)/(2*d) - ck = radical_center_ (c1,p1,c2,p2) - cj = rotation_ (ck,-math.pi/2,c1) - ci = symmetry_ (ck,cj) - return cj,ci +function radical_axis_(c1, p1, c2, p2) + local r1 = point.abs(c1 - p1) + local r2 = point.abs(c2 - p2) + local d = point.abs(c1 - c2) + local h = (r1 * r1 - r2 * r2 + d * d) / (2 * d) + + local ck = radical_center_(c1, p1, c2, p2) + local cj = rotation_(ck, -math.pi / 2, c1) + local ci = symmetry_(ck, cj) + + return cj, ci end + function radical_center_ (c1,p1,c2,p2) local d,r1,r2,h r1 = point.abs(c1-p1) @@ -96,18 +103,16 @@ return intersection_ll_ (t1,t2,t3,t4) end end -function south_pole_ (c,p) - local r - r = point.abs (c-p) - return c - point (0,r) - end +function south_pole_(c, p) + return c - point(0, point.abs(c - p)) +end + -function north_pole_ (c,p) - local r - r = point.abs (c-p) - return c + point (0,r) +function north_pole_(c, p) + return c + point(0, point.abs(c - p)) end + function antipode_ (c,pt) return 2 * c - pt end @@ -126,42 +131,46 @@ function circlepoint_ (c,t,k) end function midcircle_(C1,C2) - local state,r,s,t1,t2,T1,T2,p,a,b,c,d,Cx,Cy,i,j - state = circles_position_(C1.center,C1.radius,C2.center,C2.radius) - i = barycenter_ ({C2.center,C1.radius},{C1.center,-C2.radius}) - j = barycenter_ ({C2.center,C1.radius},{C1.center,C2.radius}) - t1,t2 = tangent_from_ (C1.center,C1.through,i) - T1,T2 = tangent_from_ (C2.center,C2.through,i) + local state, r, s, t1, t2, T1, T2, p, a, b, c, d, Cx, Cy, i, j + state = circles_position_(C1.center, C1.radius, C2.center, C2.radius) + i = barycenter_({C2.center, C1.radius}, {C1.center, -C2.radius}) + j = barycenter_({C2.center, C1.radius}, {C1.center, C2.radius}) + t1, t2 = tangent_from_(C1.center, C1.through, i) + T1, T2 = tangent_from_(C2.center, C2.through, i) - if (state == 'outside') or (state == 'outside tangent')then - p = math.sqrt(point.mod(i-t1)*point.mod(i-T1)) - return circle : radius (i,p) - elseif state == 'intersect' then - r,s = intersection (C1,C2) - return circle : radius (i,point.mod(r-i)) , circle : radius (j,point.mod(r-j)) - elseif (state == 'inside') or (state == 'inside tangent') then - a,b = intersection_lc_ (C1.center,C2.center,C1.center,C1.through) - c,d = intersection_lc_ (C1.center,C2.center,C2.center,C2.through) - + if (state == 'outside') or (state == 'outside tangent') then + p = math.sqrt(point.mod(i - t1) * point.mod(i - T1)) + return circle:radius(i, p) + elseif state == 'intersect' then + r, s = intersection(C1, C2) + return circle:radius(i, point.mod(r - i)), circle:radius(j, point.mod(r - j)) + elseif (state == 'inside') or (state == 'inside tangent') then + a, b = intersection_lc_(C1.center, C2.center, C1.center, C1.through) + c, d = intersection_lc_(C1.center, C2.center, C2.center, C2.through) + + -- Ensure the smaller radius circle is used first if C1.radius < C2.radius then z.u, z.v, z.r, z.s = a, b, c, d else z.u, z.v, z.r, z.s = c, d, a, b end - if (in_segment_ (z.s,z.v,z.u) == true) - then - Cx = circle : diameter (z.r,z.v) - Cy = circle : diameter (z.u,z.s) - else - Cx = circle : diameter (z.s,z.v) - Cy = circle : diameter (z.u,z.r) - end - if (Cx.radius) < (Cy.radius) then - return Cy : orthogonal_from (j) - else - return Cx : orthogonal_from (j) - end - end + -- Determine circle orientation and return orthogonal from j + if in_segment_(z.s, z.v, z.u) then + Cx = circle:diameter(z.r, z.v) + Cy = circle:diameter(z.u, z.s) + else + Cx = circle:diameter(z.s, z.v) + Cy = circle:diameter(z.u, z.r) + end + + -- Return the circle with the smaller radius orthogonal from j + if Cx.radius < Cy.radius then + return Cy:orthogonal_from(j) + else + return Cx:orthogonal_from(j) + end + end end +
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_intersections.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_intersections.lua index 750bafe0784..cb318bb6d00 100644 --- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_intersections.lua +++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_intersections.lua @@ -1,6 +1,6 @@ -- tkz_elements_intersections.lua --- date 2024/07/16 --- version 3.00 +-- date 2025/01/06 +-- version 3.10 -- Copyright 2024 Alain Matthes -- This work may be distributed and/or modified under the -- conditions of the LaTeX Project Public License, either version 1.3 @@ -72,133 +72,142 @@ function intersection_le (L,E) end end -function intersection_ll_ (a,b,c,d) - local x1,x2,x3,x4,y1,y2,y3,y4,DN,NX,NY - x1 = a.re - y1 = a.im - x2 = b.re - y2 = b.im - x3 = c.re - y3 = c.im - x4 = d.re - y4 = d.im - DN = (x1-x2)*(y3-y4) - (y1-y2)*(x3-x4) - if math.abs ( DN ) < tkz_epsilon then - return false - else - NX = (x1*y2-y1*x2)*(x3-x4) - (x1-x2)*(x3*y4-y3*x4) - NY = (x1*y2-y1*x2)*(y3-y4) - (y1-y2)*(x3*y4-y3*x4) - return point (NX/DN,NY/DN) +function intersection_ll_(a, b, c, d) + local x1, y1, x2, y2, x3, y3, x4, y4 + local DN, NX, NY + + x1, y1 = a.re, a.im + x2, y2 = b.re, b.im + x3, y3 = c.re, c.im + x4, y4 = d.re, d.im + + DN = (x1 - x2) * (y3 - y4) - (y1 - y2) * (x3 - x4) + + if math.abs(DN) < tkz_epsilon then + return false end + + NX = (x1 * y2 - y1 * x2) * (x3 - x4) - (x1 - x2) * (x3 * y4 - y3 * x4) + NY = (x1 * y2 - y1 * x2) * (y3 - y4) - (y1 - y2) * (x3 * y4 - y3 * x4) + + return point(NX / DN, NY / DN) end -function intersection_lc_ (pa,pb,c,p) - local zh, dh, arg_ab, test, phi,c1,c2,r - r = point.mod (c-p) - zh = projection_ (pa,pb,c) - dh = point.abs (c - zh) - arg_ab = point.arg (pa - pb) - if dh < tkz_epsilon - then - return - c + polar_ (r , math.pi + arg_ab), -- through center - c + polar_ (r , arg_ab) - elseif math.abs (r - dh) < tkz_epsilon - then - return zh , zh -- tangent - elseif dh > r - then return false , false -- no intersection - else - phi = math.asin (dh / r) - -- phi = angle_normalize(phi) - test = (pa-pb) * point.conj (c-zh) - if test.im < 0 - then phi = math.pi + phi - end - c1 = angle_normalize (arg_ab + phi ) - c2 = angle_normalize (math.pi + arg_ab - phi ) - if c2 < c1 then - return - c + polar_ (r, c2) , - c + polar_ (r, c1) - else - return - c + polar_ (r, c1) , - c + polar_ (r, c2) - end -- if - end -- if +function intersection_lc_(pa, pb, c, p) + local zh, dh, arg_ab, phi, c1, c2, r, test -end -- function + r = point.mod(c - p) + zh = projection_(pa, pb, c) + dh = point.abs(c - zh) + arg_ab = point.arg(pa - pb) + + if dh < tkz_epsilon then + -- Le centre du cercle est sur la droite + return c + polar_(r, math.pi + arg_ab), c + polar_(r, arg_ab) + elseif math.abs(r - dh) < tkz_epsilon then + -- La droite est tangente au cercle + return zh, zh + elseif dh > r then + -- Aucune intersection + return false, false + else + -- Il y a une intersection, calcul de l'angle + phi = math.asin(dh / r) + test = (pa - pb) * point.conj(c - zh) + if test.im < 0 then + phi = math.pi + phi + end + + c1 = angle_normalize(arg_ab + phi) + c2 = angle_normalize(math.pi + arg_ab - phi) + + -- Retourner les deux points d'intersection + if c2 < c1 then + return c + polar_(r, c2), c + polar_(r, c1) + else + return c + polar_(r, c1), c + polar_(r, c2) + end + end +end -function intersection_cc_ (ca,pa,cb,pb ) - local d, cosphi, phi,ra,rb,c1,c2,epsilon +function intersection_cc_(ca, pa, cb, pb) + local d, cosphi, phi, ra, rb, c1, c2, epsilon + + -- Précision pour arrondir les résultats epsilon = 12 - d = point.abs (ca - cb) - ra = point.abs (ca - pa) - rb = point.abs (cb - pb) - cosphi = tkzround(((ra * ra + d * d - rb * rb) - /( 2 * ra * d )) , epsilon) - phi = tkzround (math.acos(cosphi),epsilon) - if not phi then - return false , false - elseif phi == 0 then - return ca + polar_ (ra, phi + point.arg (cb - ca)) , - ca + polar_ (ra, phi + point.arg (cb - ca)) - else - c1 = angle_normalize ( phi + point.arg(cb - ca)) - c2 = angle_normalize (-phi + point.arg(cb - ca)) - if c1 < c2 then - return - ca + polar_(ra, c1), - ca + polar_(ra, c2) -else - return - ca + polar_(ra, c2), - ca + polar_(ra, c1) - end -- if - end -- if - end -- function - -function intersection ( X , Y ) - local i,z1,z2 - local t = {} - - if X.type == 'circle' - then - if Y.type == 'circle' - then - z1,z2 = intersection_cc ( X , Y ) - table.insert (t , z1 ) - table.insert (t , z2 ) - else -- Y[i] est une droite - z1,z2 = intersection_lc ( Y , X ) - table.insert (t , z1 ) - table.insert (t , z2 ) - end -- if - else - if X.type == 'line' then - if Y.type == 'circle' - then - z1,z2 = intersection_lc ( X , Y ) - table.insert ( t , z1 ) - table.insert ( t , z2 ) - else - if Y.type == 'line' then - z1 = intersection_ll ( X , Y ) - table.insert (t , z1 ) - else -- ellipse - z1,z2 = intersection_le ( X , Y ) - table.insert ( t , z1 ) - table.insert ( t , z2 ) - end - end -- if - else - if X.type == 'ellipse' then - z1,z2 = intersection_le ( Y,X) - table.insert ( t , z1 ) - table.insert ( t , z2 ) - end + -- Distance entre les centres des cercles + d = point.abs(ca - cb) + -- Rayons des cercles + ra = point.abs(ca - pa) + rb = point.abs(cb - pb) + + -- Calcul du cosinus de l'angle phi entre les centres et les points sur les cercles + cosphi = tkzround((ra * ra + d * d - rb * rb) / (2 * ra * d), epsilon) + + -- Calcul de l'angle phi + phi = tkzround(math.acos(cosphi), epsilon) + + -- Si phi est invalide (par exemple, cosphi > 1 ou < -1), aucune intersection + if not phi then + return false, false + elseif phi == 0 then + -- Les cercles sont tangents l'un à l'autre, retourne le même point pour les deux intersections + return ca + polar_(ra, point.arg(cb - ca)), ca + polar_(ra, point.arg(cb - ca)) + else + -- Calcul des angles des points d'intersection + c1 = angle_normalize(phi + point.arg(cb - ca)) + c2 = angle_normalize(-phi + point.arg(cb - ca)) + + -- Retourner les points d'intersection dans l'ordre croissant des angles + if c1 < c2 then + return ca + polar_(ra, c1), ca + polar_(ra, c2) + else + return ca + polar_(ra, c2), ca + polar_(ra, c1) + end + end +end + +function intersection(X, Y) + local t = {} -- Tableau pour stocker les points d'intersection + + -- Cas où X est un cercle + if X.type == 'circle' then + if Y.type == 'circle' then + -- Intersection entre deux cercles + local z1, z2 = intersection_cc(X, Y) + table.insert(t, z1) + table.insert(t, z2) + else -- Y est une droite + local z1, z2 = intersection_lc(Y, X) -- Intersection entre un cercle et une droite + table.insert(t, z1) + table.insert(t, z2) + end + + -- Cas où X est une droite + elseif X.type == 'line' then + if Y.type == 'circle' then + -- Intersection entre une droite et un cercle + local z1, z2 = intersection_lc(X, Y) + table.insert(t, z1) + table.insert(t, z2) + elseif Y.type == 'line' then + -- Intersection entre deux droites + local z1 = intersection_ll(X, Y) + table.insert(t, z1) + else -- Y est une ellipse + local z1, z2 = intersection_le(X, Y) -- Intersection entre une droite et une ellipse + table.insert(t, z1) + table.insert(t, z2) end - end -- if - return table.unpack ( t ) -end -- function
\ No newline at end of file + + -- Cas où X est une ellipse + elseif X.type == 'ellipse' then + -- Intersection entre une ellipse et l'autre objet (cercle, droite ou ellipse) + local z1, z2 = intersection_le(Y, X) + table.insert(t, z1) + table.insert(t, z2) + end + + -- Retourner les résultats sous forme de valeurs distinctes + return table.unpack(t) +end diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_lines.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_lines.lua index 31c735df6f9..dfea7c4d3c6 100644 --- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_lines.lua +++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_lines.lua @@ -1,6 +1,6 @@ -- tkz_elements_functions_lines.lua --- date 2024/07/16 --- version 3.00 +-- date 2025/01/06 +-- version 3.10 -- Copyright 2024 Alain Matthes -- This work may be distributed and/or modified under the -- conditions of the LaTeX Project Public License, either version 1.3 @@ -15,16 +15,17 @@ --------------------------------------------------------------------------- -- Lines --------------------------------------------------------------------------- -function normalize_ (a,b) - return a+(b-a)/point.mod(b-a) +function normalize_(a, b) + return a + (b - a) / point.mod(b - a) end -function ortho_from_ ( p , a , b ) - return p+(b-a)*point(0,1) + +function ortho_from_(p, a, b) + return p + (b - a) * point(0, 1) end function ll_from_ ( p , a , b ) - return p+b-a + return p + b - a end function slope_ (a,b) @@ -32,7 +33,7 @@ function slope_ (a,b) end function gold_segment_ (a,b) - return a + (b-a)*tkzinvphi + return a + (b - a) * tkzinvphi end function online_ (a,b,t) @@ -52,26 +53,25 @@ function equilateral_tr_ (a,b) return rotation_ (a,math.pi/3,b) end -function isosceles_right_tr (a,b) - local pt - pt = rotation_ (a,math.pi/4,b) - return a + (pt-a) * math.sin(math.pi/4) +function isosceles_right_tr(a, b) + local pt = rotation_(a, math.pi / 4, b) + return a + (pt - a) * math.sin(math.pi / 4) end -function gold_tr (a,b) - local pt - pt = rotation_ (a,math.pi/2,b) - return a + (pt-a) * tkzinvphi + +function gold_tr(a, b) + local pt = rotation_(a, math.pi / 2, b) + return a + (pt - a) * tkzinvphi end + function euclide_tr (a,b) return rotation_ (a,math.pi/5,b) end function golden_tr (a,b) - local pt - pt = rotation_ (a,2*math.pi/5,b) - return a + (pt-a) * tkzphi + local pt = rotation_ (a,2*math.pi/5,b) + return a + (pt-a) * tkzphi end function div_harmonic_int_(a,b,n) @@ -97,66 +97,56 @@ function projection ( Dt,pt ) return projection_ ( Dt.pa,Dt.pb,pt ) end -function projection_ ( pa,pb,pt ) - local v - local z - if aligned ( pa,pb,pt ) then - return pt - else - v = pb - pa - z = ((pt - pa)..v)/(point.norm(v)) -- .. dot product - return pa + z * v - end +function projection_(pa, pb, pt) + if aligned(pa, pb, pt) then + return pt + else + local v = pb - pa + local z = ((pt - pa) .. v) / point.norm(v) -- .. dot product + return pa + z * v + end end + function symmetry_axial_(pa,pb,pt) - local p - p = projection_ (pa,pb,pt) + local p = projection_ (pa,pb,pt) return symmetry_(p,pt) end -function set_symmetry_axial_ (u,v,...) - local tp = table.pack(...) - local i +function set_symmetry_axial_(u, v, ...) local t = {} - for i=1,tp.n do - table.insert( t , symmetry_axial_ (u,v , tp[i]) ) - end - return table.unpack ( t ) + for _, value in ipairs({...}) do + table.insert(t, symmetry_axial_(u, v, value)) + end + return table.unpack(t) end + function square_ (a,b) return rotation_ (b,-math.pi/2,a), rotation_ (a,math.pi/2,b) end -function in_segment_ (a,b,pt) - local sc - sc = point.mod (pt-a) + point.mod (pt-b) - point.mod(b-a) - if sc <= tkz_epsilon - then - return true +function in_segment_(a, b, pt) + return point.mod(pt - a) + point.mod(pt - b) - point.mod(b - a) <= tkz_epsilon +end + +function report_(za, zb, d, pt) + local len = point.mod(zb - za) + local t = d / len + local result = barycenter_({za, 1 - t}, {zb, t}) + + if pt then + return result + pt - za else - return false + return result end end -function report_ (za,zb,d,pt) - local t,len - len = point.mod(zb-za) - t = d/len - if pt == nil - then - return barycenter_({za,1-t},{zb,(t)}) -else - return barycenter_({za,1-t},{zb,(t)}) +pt-za -end +function colinear_at_(za, zb, pt, k) + if k then + return pt + k * (zb - za) + else + return pt + (zb - za) + end end -function colinear_at_ (za,zb,pt,k) - if k == nil - then - return pt+zb-za -else - return pt+k*(zb-za) -end -end diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_maths.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_maths.lua index d3efe9b2909..8b666897686 100644 --- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_maths.lua +++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_maths.lua @@ -1,6 +1,6 @@ -- tkz_elements_functions_maths.lua --- date 2024/07/16 --- version 3.00 +-- date 2025/01/06 +-- version 3.10 -- Copyright 2024 Alain Matthes -- This work may be distributed and/or modified under the -- conditions of the LaTeX Project Public License, either version 1.3 @@ -38,27 +38,26 @@ function Cramer22(a1,a2,b1,b2) return a1*b2-a2*b1 end -function aligned ( m,a,b ) +function aligned(m, a, b) local z - z = (b-a)/(m-b) - if math.abs(z.im) < tkz_epsilon - then - return true - else - return false - end -end + z = (b - a) / (m - b) + if math.abs(z.im) < tkz_epsilon then + return true + else + return false + end +end -function islinear (z1,z2,z3) - local dp - dp = (z2-z1) ^ (z3-z1) - if math.abs(dp) < tkz_epsilon - then +function islinear(z1, z2, z3) + local dp + dp = (z2 - z1) ^ (z3 - z1) + if math.abs(dp) < tkz_epsilon then return true - else + else return false end end +is_linear = islinear function isortho (z1,z2,z3) local dp @@ -71,6 +70,8 @@ function isortho (z1,z2,z3) end end +is_ortho = isortho + function parabola (a,b,c) local xa,xb,xc,ya,yb,yc xa = a.re diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_matrices.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_matrices.lua index 3ced42be40c..47d3ce99679 100644 --- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_matrices.lua +++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_matrices.lua @@ -1,6 +1,6 @@ -- tkz_elements_functions_matrices.lua --- date 2024/07/16 --- version 3.00 +-- date 2025/01/06 +-- version 3.10 -- Copyright 2024 Alain Matthes -- This work may be distributed and/or modified under the -- conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_points.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_points.lua index 59454e78f02..9937c0589dd 100644 --- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_points.lua +++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_points.lua @@ -1,6 +1,6 @@ -- tkz_elements_functions_points.lua --- date 2024/07/16 --- version 3.00 +-- date 2025/01/06 +-- version 3.10 -- Copyright 2024 Alain Matthes -- This work may be distributed and/or modified under the -- conditions of the LaTeX Project Public License, either version 1.3 @@ -23,30 +23,29 @@ function polar_ (radius, phi) end function barycenter_ (...) -local cp = table.pack(...) -local i -local sum = 0 -local weight=0 -for i=1,cp.n do - sum = sum + cp[i][1]*cp[i][2] - weight = weight + cp[i][2] -end -return sum/weight + local cp = table.pack(...) + local sum = 0 + local weight = 0 + for i = 1, cp.n do + sum = sum + cp[i][1] * cp[i][2] + weight = weight + cp[i][2] + end + return sum / weight end -function rotation_ (c,a,pt) - local z = point( math.cos(a) , math.sin(a) ) - return z*(pt-c)+c +function rotation_ (c, a, pt) + local z = point(math.cos(a), math.sin(a)) + return z * (pt - c) + c end -function set_rotation_ (c,angle,...) +-- Define the set_rotation_ function +function set_rotation_ (c, angle, ...) local tp = table.pack(...) - local i local t = {} for i=1,tp.n do - table.insert( t , rotation_(c , angle , tp[i] )) + table.insert(t, rotation_(c, angle, tp[i])) end - return table.unpack ( t ) + return table.unpack(t) end function symmetry_(c,pt) @@ -55,8 +54,7 @@ end function set_symmetry_ (c,...) local tp = table.pack(...) - local i - local t = {} + local t = {} for i=1,tp.n do table.insert( t , symmetry_ (c , tp[i]) ) end @@ -69,8 +67,7 @@ end function set_homothety_ (c,coeff,...) local tp = table.pack(...) - local i - local t = {} + local t = {} for i=1,tp.n do table.insert( t , homothety_ (c, coeff , tp[i]) ) end @@ -83,7 +80,6 @@ end function set_translation_ (u,...) local tp = table.pack(...) - local i local t = {} for i=1,tp.n do table.insert( t , (u + tp[i]) ) @@ -101,7 +97,6 @@ end function midpoints_ (...) local arg = table.pack(...) local n = arg.n - local i local t = {} for i=1, n-1 do table.insert( t , (arg[i]+arg[i+1])/2 ) diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_regular.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_regular.lua index 0dfed425ae2..01d98ad29a3 100644 --- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_regular.lua +++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_regular.lua @@ -1,6 +1,6 @@ -- tkz_elements_functions_regular.lua --- date 2024/07/16 --- version 3.00 +-- date 2025/01/06 +-- version 3.10 -- Copyright 2024 Alain Matthes -- This work may be distributed and/or modified under the -- conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_triangles.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_triangles.lua index 5a81a993e1a..b27353f2dc1 100644 --- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_triangles.lua +++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_triangles.lua @@ -1,6 +1,6 @@ -- tkz_elements_functions_triangles.lua --- date 2024/07/16 --- version 3.00 +-- date 2025/01/06 +-- version 3.10 -- Copyright 2024 Alain Matthes -- This work may be distributed and/or modified under the -- conditions of the LaTeX Project Public License, either version 1.3 @@ -70,20 +70,32 @@ w = point.abs(b-a) return barycenter_ ({a,u*u},{b,v*v},{c,w*w}) end -function nagel_point_ (a,b,c) - local u,v,w - u,v,w = extouch_tr_ ( a,b,c ) -return intersection_ll_ (a,u,b,v) +function nagel_point_ (a, b, c) + -- Calculate the excircle tangency points (u, v, w) + local u, v, w = extouch_tr_ (a, b, c) + + -- Find the intersection of lines through a and u, and through b and v + return intersection_ll_ (a, u, b, v) end -function feuerbach_point_ (a,b,c) - local i,h,e,ma - i,h = in_circle_ (a,b,c) - e = euler_center_ (a,b,c) - ma = (b+c)/2 -return intersection_cc_ (i,h,e,ma) + +function feuerbach_point_ (a, b, c) + local i, h, e, ma + + -- Calculate the incenter and some related point (likely the orthocenter or another center) + i, h = in_circle_ (a, b, c) + + -- Calculate the Euler center (center of the nine-point circle) + e = euler_center_ (a, b, c) + + -- Calculate the midpoint of side BC + ma = (b + c) / 2 + + -- Find the intersection of the circles at (i, h) and (e, ma), which gives the Feuerbach point + return intersection_cc_ (i, h, e, ma) end + function spieker_center_ (a,b,c) return in_center_ (medial_tr_ ( a,b,c)) end @@ -160,18 +172,28 @@ function ex_circle_ ( a,b,c ) projection_ (b,a,o) end -function euler_circle_ (a,b,c) - local o,ma,mb,mc,H,ha,hb,hc - o = euler_center_ (a,b,c) - ma,mb,mc = medial_tr_ ( a,b,c) - ha,hb,hc = orthic_tr_ ( a,b,c) - local _,_,H,_ = euler_line_ (a,b,c) - return - o,ma,mb,mc,ha,hb,hc, - midpoint_ ( H,a ), - midpoint_ ( H,b ), - midpoint_ ( H,c ) +function euler_circle_ (a, b, c) + local o, ma, mb, mc, H, ha, hb, hc + -- Compute the Euler center (center of the nine-point circle) + o = euler_center_ (a, b, c) + + -- Calculate the medial triangle (midpoints of the sides) + ma, mb, mc = medial_tr_ (a, b, c) + + -- Calculate the orthic triangle (feet of the altitudes) + ha, hb, hc = orthic_tr_ (a, b, c) + + -- Get the Euler line and midpoint (H) on the Euler line + _, _, H, _ = euler_line_ (a, b, c) + + -- Return all relevant geometric elements + return + o, ma, mb, mc, ha, hb, hc, + midpoint_ (H, a), -- Midpoint between H and vertex a + midpoint_ (H, b), -- Midpoint between H and vertex b + midpoint_ (H, c) -- Midpoint between H and vertex c end + -------------------- -- triangles -- -------------------- @@ -194,15 +216,21 @@ function anti_tr_(a,b,c) barycenter_ ( {a,1} , {b,1} , {c,-1} ) end -function incentral_tr_ (a,b,c) - local i,r,s,t - i = in_center_ (a , b , c) - r = intersection_ll_ ( a,i , b,c) - s = intersection_ll_ ( b,i , a,c) - t = intersection_ll_ ( c,i , a,b) -return r,s,t +function incentral_tr_ (a, b, c) + local i, r, s, t + -- Compute the incenter (center of the incircle) + i = in_center_ (a, b, c) + + -- Calculate the points of tangency where the incircle touches the sides + r = intersection_ll_ (a, i, b, c) -- Intersection of lines a-i and b-c + s = intersection_ll_ (b, i, a, c) -- Intersection of lines b-i and a-c + t = intersection_ll_ (c, i, a, b) -- Intersection of lines c-i and a-b + + -- Return the points of tangency that form the incentral triangle + return r, s, t end + function excentral_tr_ (a,b,c) local r,s,t,ka,kb,kc ka = point.abs (b-c) @@ -290,19 +318,22 @@ function area_ (a,b,c) return point.mod(a - projection_(b,c,a))*point.mod (b - c)/2 end -function check_equilateral_ (a,b,c) - local A,B,C - A = b - c - B = a - c - C = a - b - if (point.abs(A)-point.abs(B) < tkz_epsilon) and (point.abs(B)-point.abs(C) < tkz_epsilon) - then - return true - else - return false +function check_equilateral_ (a, b, c) + local A, B, C + -- Compute the vectors representing the sides of the triangle + A = b - c -- Side from b to c + B = a - c -- Side from a to c + C = a - b -- Side from a to b + + -- Check if all sides have approximately equal lengths + if (point.abs(A) - point.abs(B) < tkz_epsilon) and (point.abs(B) - point.abs(C) < tkz_epsilon) then + return true -- The triangle is equilateral + else + return false -- The triangle is not equilateral end end + function parallelogram_ (a,b,c) local x = c + a - b return x @@ -337,22 +368,34 @@ function in_out_ (a,b,c,pt) end end -function soddy_center_ (a,b,c) - local i,ha,hb,hc,e,f,g,x,y,z,xp,yp,zp - i,e,f,g = in_circle_ (a,b,c) - ha,hb,hc = orthic_tr_ (a,b,c) - x,xp = intersection_lc_ (a,ha,a,g) - if (point.mod(ha-x)<point.mod(ha-xp)) then else x,xp=swap(x,xp) end - y,yp = intersection_lc_ (b,hb,b,e) - if (point.mod(hb-y)<point.mod(hb-yp)) then else y,yp=swap(y,yp) end - z,zp = intersection_lc_ (c,hc,c,f) - if (point.mod(hc-z)<point.mod(hc-zp)) then else z,zp=swap(z,zp) end - xi,t = intersection_lc_ (xp,e,a,g) - if in_out_ (a,b,c,xi) then else xi,t = swap(xi,t) end - yi,t = intersection_lc_ (yp,f,b,e) - if in_out_ (a,b,c,yi) then else yi,t = swap(yi,t) end - zi,t = intersection_lc_ (zp,g,c,f) - if in_out_ (a,b,c,zi) then else zi,t = swap(zi,t) end - s = circum_center_ (xi,yi,zi) - return s,xi,yi,zi +function soddy_center_ (a,b,c) + -- Step 1: Compute the incenter and excircle centers + local i,e,f,g = in_circle_ (a,b,c) + local ha,hb,hc = orthic_tr_ (a,b,c) + + -- Step 2: Find the intersection points for the tangent lines + local x,xp = intersection_lc_ (a,ha,a,g) + if (point.mod(ha-x) < point.mod(ha-xp)) then else x,xp = swap(x,xp) end + + local y,yp = intersection_lc_ (b,hb,b,e) + if (point.mod(hb-y) < point.mod(hb-yp)) then else y,yp = swap(y,yp) end + + local z,zp = intersection_lc_ (c,hc,c,f) + if (point.mod(hc-z) < point.mod(hc-zp)) then else z,zp = swap(z,zp) end + + -- Step 3: Calculate the intersections with the opposite triangle sides + local xi,t = intersection_lc_ (xp,e,a,g) + if in_out_ (a,b,c,xi) then else xi,t = swap(xi,t) end + + local yi,t = intersection_lc_ (yp,f,b,e) + if in_out_ (a,b,c,yi) then else yi,t = swap(yi,t) end + + local zi,t = intersection_lc_ (zp,g,c,f) + if in_out_ (a,b,c,zi) then else zi,t = swap(zi,t) end + + -- Step 4: Calculate the circumcenter of the triangle formed by the tangent points + local s = circum_center_ (xi,yi,zi) + + return s,xi,yi,zi -- Return the Soddy center and the tangent points end + diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_line.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_line.lua index 4d24d9d229c..2b4b320e19a 100644 --- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_line.lua +++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_line.lua @@ -1,6 +1,6 @@ -- tkz_elements_lines.lua --- date 2024/07/16 --- version 3.00 +-- date 2025/01/06 +-- version 3.10 -- Copyright 2024 Alain Matthes -- This work may be distributed and/or modified under the -- conditions of the LaTeX Project Public License, either version 1.3 @@ -16,7 +16,7 @@ -- Lines -- ------------------------------------------------------------------------- line = {} -function line: new(za, zb) +function line:new(za, zb) local type = 'line' local mid = (za+zb)/2 local north_pa = rotation_ (za,math.pi/2,zb) @@ -49,122 +49,119 @@ end ------------------- -- Result -> real ------------------- -function line: distance (pt) +function line:distance(pt) return point.mod(projection(self,pt)-pt) end -function length(a,b) - return point.abs (a-b) -end - -function line: slope () +function line:slope() return slope_(self.pa,self.pb) end ------------------- -- Result -> boolean ------------------- -function line: in_out (pt) - local sc - sc = math.abs ((pt-self.pa)^(pt-self.pb)) - if sc <= tkz_epsilon - then - return true - else - return false - end +function line:in_out(pt) + return math.abs((pt - self.pa) ^ (pt - self.pb)) <= tkz_epsilon end -function line: in_out_segment (pt) - local sc - sc = point.mod (pt-self.pa) + point.mod (pt-self.pb) - point.mod(self.pb-self.pa) - if sc <= tkz_epsilon - then - return true - else - return false - end +function line:in_out_segment(pt) + return point.mod(pt - self.pa) + point.mod(pt - self.pb) - point.mod(self.pb - self.pa) <= tkz_epsilon +end + +function line:is_parallel(L) + return math.abs(self.slope - L.slope) < tkz_epsilon +end + +function line:is_orthogonal(L) + return math.abs(self.slope * L.slope + 1) < tkz_epsilon +end + +function line:is_equidistant(p) + return math.abs( (point.mod(self.pa-p)-(point.mod(self.pb-p)))) < tkz_epsilon end ------------------- -- Result -> point ------------------- -function line: barycenter (ka,kb) +function line:barycenter(ka,kb) return barycenter_({self.pa,ka},{self.pb,kb}) end -function line: point (t) -- t=o A t=1 B t = AM / AB +function line:point(t) -- t=o A t=1 B t = AM / AB return barycenter_({self.pa,1-t},{self.pb,(t)}) end -function line: midpoint () +function line:midpoint() return (self.pa+self.pb)/2 end -function line: harmonic_int (pt) +function line:harmonic_int(pt) return div_harmonic_int_(self.pa,self.pb,pt) end -function line: harmonic_ext (pt) +function line:harmonic_ext(pt) return div_harmonic_ext_(self.pa,self.pb,pt) end -function line: harmonic_both (k) +function line:harmonic_both(k) return div_harmonic_both_(self.pa,self.pb,k) end -function line: gold_ratio() +function line:gold_ratio() return self.pa + (self.pb-self.pa)*tkzinvphi end -function line: normalize () +function line:normalize() return self.pa+(self.pb-self.pa)/point.mod(self.pb-self.pa) end -function line: normalize_inv () +function line:normalize_inv() return normalize_ (self.pb,self.pa) end -function line: _east (d) +function line:_east(d) local d = d or 1 return self.pb+ d/self.length * (self.pb-self.pa) end -function line: _west (d) +function line:_west(d) local d = d or 1 return self.pa+ d/self.length * (self.pa-self.pb) end -function line: _north_pa (d) +function line:_north_pa(d) local d = d or 1 return d/self.length * ( self.north_pa - self.pa ) + self.pa end -function line: _south_pa (d) +function line:_south_pa(d) local d = d or 1 return d/self.length *( self.south_pa - self.pa ) + self.pa end -function line: _south_pb (d) +function line:_south_pb(d) local d = d or 1 return d/self.length *( self.south_pb - self.pb ) + self.pb end -function line: _north_pb (d) +function line:_north_pb(d) local d = d or 1 return d/self.length *( self.north_pb - self.pb ) + self.pb end -function line : report (d,pt) - local t - t = d/self.length - if pt == nil - then - return barycenter_({self.pa,1-t},{self.pb,(t)}) - else - return barycenter_({self.pa,1-t},{self.pb,(t)}) +pt-self.pa - end +function line:report(d, pt) + if not self.length or self.length == 0 then + error("self.length must be non-zero") + end + local t = d / self.length + local result = barycenter_({self.pa, 1 - t}, {self.pb, t}) + if pt then + return result + pt - self.pa + else + return result + end end -function line : colinear_at (pt,k) + +function line:colinear_at (pt,k) if k == nil then return colinear_at_ (self.pa,self.pb,pt,1) @@ -173,28 +170,28 @@ function line : colinear_at (pt,k) end end -------------- transformations ------------- -function line: translation_pt ( pt ) +function line:translation_pt( pt ) return translation_ ( self.pb-self.pa,pt ) end -function line: translation_C ( obj ) +function line:translation_C( obj ) local pa,pb,x,y pa = obj.center pb = obj.through - x,y = set_translation_ ( self.pb-self.pa,pa,pb ) + x,y = set_translation_( self.pb-self.pa,pa,pb ) return circle : new (x,y) end -function line: translation_T ( obj ) +function line: translation_T( obj ) local pa,pb,pc,x,y,z pa = obj.pa pb = obj.pb pc = obj.pc - x,y,z = set_translation_ ( self.pb-self.pa,pa,pb,pc ) + x,y,z = set_translation_( self.pb-self.pa,pa,pb,pc ) return triangle : new (x,y,z) end -function line: translation_L ( obj ) +function line: translation_L( obj ) local pa,pb,x,y pa = obj.pa pb = obj.pb @@ -202,35 +199,42 @@ function line: translation_L ( obj ) return line : new (x,y) end -function line: translation (...) - local obj,nb,t +function line:translation(...) + local obj, nb, t local tp = table.pack(...) obj = tp[1] nb = tp.n - if nb == 1 then - if obj.type == "point" then - return translation_ ( self.pb-self.pa,obj ) - elseif obj.type == "line" then - return self: translation_L (obj) - elseif obj.type == "triangle" then - return self: translation_T (obj) - else - return self: translation_C (obj) - end - else + + -- If only one object is passed + if nb == 1 then + if obj.type == "point" then + return translation_(self.pb - self.pa, obj) -- Translate point + elseif obj.type == "line" then + return self:translation_L(obj) -- Translate line + elseif obj.type == "triangle" then + return self:translation_T(obj) -- Translate triangle + elseif obj.type == "circle" then + return self:translation_C(obj) -- Translate circle + else + error("Unsupported object type for translation") + end + else + -- If multiple objects are passed, translate each one t = {} - for i=1,tp.n do - table.insert(t , translation_ ( self.pb-self.pa , tp[i])) - end - return table.unpack ( t ) - end + for i = 1, nb do + -- Translate each object using the translation vector + table.insert(t, translation_(self.pb - self.pa, tp[i])) + end + return table.unpack(t) -- Return the translated objects + end end + function line: set_translation ( ...) return set_translation_ ( self.pb-self.pa,... ) end -function line: projection (...) +function line:projection(...) local obj,nb,t local tp = table.pack(...) obj = tp[1] @@ -246,7 +250,7 @@ function line: projection (...) end end -function line: set_projection (...) +function line:set_projection(...) local tp = table.pack(...) local i local t = {} @@ -256,31 +260,31 @@ function line: set_projection (...) return table.unpack ( t ) end -function line: symmetry_axial_L ( obj ) +function line:symmetry_axial_L( obj ) local pa,pb,x,y pa = obj.pa pb = obj.pb - x,y = self:set_reflection ( pa,pb ) + x,y = self:set_reflection(pa, pb) return line : new (x,y) end -function line: symmetry_axial_T ( obj ) +function line:symmetry_axial_T( obj ) local pa,pb,pc,x,y,z pa = obj.pa pb = obj.pb pc = obj.pc - x,y,z = self:set_reflection ( pa,pb,pc ) + x,y,z = self:set_reflection (pa, pb, pc) return triangle : new (x,y,z) end -function line: symmetry_axial_C ( obj ) +function line:symmetry_axial_C( obj ) local pa,pb,x,y pa = obj.center pb = obj.through - x,y = self:set_reflection ( pa,pb ) + x,y = self:set_reflection( pa,pb ) return circle : new (x,y) end -function line: reflection (...) +function line:reflection(...) local obj,nb,t local tp = table.pack(...) obj = tp[1] @@ -304,203 +308,379 @@ function line: reflection (...) end end -function line: set_reflection (...) +function line:set_reflection (...) return set_symmetry_axial_ ( self.pb,self.pa,... ) end ------------------- -- Result -> line ------------------- -function line: ll_from ( pt ) +function line:ll_from( pt ) return line : new (pt,pt+self.pb-self.pa) end -function line: ortho_from ( pt ) +function line:ortho_from( pt ) return line : new (pt+(self.pb-self.pa)*point(0,-1),pt+(self.pb-self.pa)*point(0,1)) end -function line: mediator () - local m - m = midpoint_ (self.pa,self.pb) +function line:mediator() + local m = midpoint_ (self.pa,self.pb) return line : new (rotation_ (m,-math.pi/2,self.pb),rotation_ (m,math.pi/2,self.pb)) end -function line : perpendicular_bisector () - local m - m = midpoint_ (self.pa,self.pb) +function line:perpendicular_bisector () + local m = midpoint_ (self.pa,self.pb) return line : new (rotation_ (m,-math.pi/2,self.pb),rotation_ (m,math.pi/2,self.pb)) end ------------------- -- Result -> circle ------------------- -function line: circle (swap) - if swap == nil then - swap = false - end +function line:circle(swap) + swap = swap or false if swap then - return circle : new (self.pb,self.pa) + return circle:new(self.pb,self.pa) else - return circle : new (self.pa,self.pb) + return circle:new(self.pa,self.pb) end end -function line: circle_swap () +function line:circle_swap() return circle : new (self.pb,self.pa) end -function line : diameter () - local c = midpoint_ (self.pa,self.pb) - return circle : new (c,self.pb) +function line:diameter() + local c = midpoint_(self.pa,self.pb) + return circle:new (c,self.pb) end -function line : apollonius (k) +function line:apollonius(k) local z1,z2,c - z1 = barycenter_ ({self.pa,1},{self.pb,k}) - z2 = barycenter_ ({self.pa,1},{self.pb,-k}) - c = midpoint_ (z1,z2) + z1 = barycenter_({self.pa,1},{self.pb,k}) + z2 = barycenter_({self.pa,1},{self.pb,-k}) + c = midpoint_ (z1,z2) return circle : new (c,z2) end +function line:test(x,y) + +end + + +-- Circle tangent to a line passing through two points +-- In general, there are two solutions +function line:c_l_pp(a, b) -- a and b on the same side + -- Initialisation + local lab = line:new(a, b) -- Line through a and b + local Cab = circle:diameter(a, b) -- Circle with a and b diameters + local i = intersection(lab, self) -- Intersection with current line + + -- One point on the line (a) + if self : in_out(a) and not self:in_out(b) then + local lmed = lab : mediator() + local laperp = self:ortho_from(a) + local o = intersection(lmed,laperp) + return circle:new(o,a), + circle:new(o,a) + end + -- One point on the line (b) + if self:in_out(b) and not self:in_out(a) then + local lmed = lab:mediator() + local laperp = self:ortho_from(b) + local o = intersection(lmed,laperp) + return circle:new(o,b), + circle:new(o,b) + end + -- Check: if the intersection exists and lies on the segment [a, b]. + if i and lab:in_out_segment(i) then + return nil, nil -- No circle is possible + end + + -- If the current line is orthogonal to lab + if self:is_orthogonal(lab) then + local lmed = lab:mediator() + local m = midpoint(a, b) + local r = length(m, i) + local pt1 = lab:isosceles_s(r) + local pt2 = lab:isosceles_s(r, true) + return circle:new(pt1, a), + circle:new(pt2, a) + end + + -- If the two lines are parallel + if lab:is_parallel(self) then + local mid = midpoint(a, b) -- Midpoint of segment [a, b] + local proj = self:projection(mid) -- Mid projection on the running line + + return circle:new(circum_center_(a, b, proj), proj), + circle:new(circum_center_(a, b, proj), proj) + end + + -- General case + local t = Cab:tangent_from(i).pb + local x, y = intersection(self, circle:new(i, t)) + return circle:new(intersection(self:ortho_from(x), lab:mediator()), x), + circle:new(intersection(self:ortho_from(y), lab:mediator()), y) +end + + +-- Circle tangent to two straight lines passing through a given point +function line:c_ll_p(a, p) + + -- Compute the bisector of the triangle formed by self.pa, self.pb, and a + local lbi = bisector(self.pa, self.pb, a) + + if lbi:in_out(p) then + -- Orthogonal projection of p onto the bisector + local lp = lbi:ortho_from(p) + + -- Intersection of line from p to its projection with self.pa and self.pb + local i = intersection_ll_(p, lp.pb, self.pa, self.pb) + + -- Intersection points of the line with the circle defined by (i, p) + local t1, t2 = intersection_lc_(self.pa, self.pb, i, p) + + -- Create the main line and find orthogonal projections from t1 and t2 + local lab = line:new(self.pa, self.pb) + local x = lab:ortho_from(t1).pb + local y = lab:ortho_from(t2).pb + + -- Return two circles based on the orthogonal projections and points t1, t2 + return circle:new(intersection_ll_(x, t1, self.pa, p), t1), + circle:new(intersection_ll_(y, t2, self.pa, p), t2) + else + -- Reflection of p across the bisector + local q = lbi : reflection (p) + + -- Compute circles from the Wallis construction + local c1, c2 = self:c_l_pp(p, q) + + -- Return two circles with centers and points on their circumference + return c1,c2 + end +end + + + ---------------------- -- Result -> triangle ---------------------- -function line: equilateral (swap) - if swap == nil then - swap = false - end - if swap then - return triangle : new (self.pa,self.pb,rotation_ (self.pa,-math.pi/3,self.pb)) +function line:equilateral(swap) + swap = swap or false + if swap then + return triangle:new(self.pa, self.pb, rotation_(self.pa, -math.pi / 3, self.pb)) else - return triangle : new (self.pa,self.pb,rotation_ (self.pa,math.pi/3,self.pb)) -end + return triangle:new(self.pa, self.pb, rotation_(self.pa, math.pi / 3, self.pb)) + end end -function line: isosceles (phi,swap) - local pta,ptb - if swap == nil then - swap = false - end +function line:isosceles(phi,swap) + local pta,ptb + swap = swap or false if swap then - pta = rotation_ (self.pa,-phi,self.pb) - ptb = rotation_ (self.pb,phi,self.pa) - return triangle : new (self.pa,self.pb, intersection_ll_ (self.pa,pta,self.pb,ptb )) + pta = rotation_(self.pa,-phi,self.pb) + ptb = rotation_(self.pb,phi,self.pa) + return triangle : new (self.pa,self.pb, intersection_ll_(self.pa,pta,self.pb,ptb )) else - pta = rotation_ (self.pa,phi,self.pb) - ptb = rotation_ (self.pb,-phi,self.pa) + pta = rotation_(self.pa,phi,self.pb) + ptb = rotation_(self.pb,-phi,self.pa) return triangle : new (self.pa,self.pb, intersection_ll_ (self.pa,pta,self.pb,ptb )) end end +line.isosceles_a = line.isosceles + +function line:isosceles_s(a,swap) + local c1,c2,pta,ptb,pt1,pt2 + c1 = circle : radius (self.pa,a) + c2 = circle : radius (self.pb,a) + pta,ptb = intersection_cc (c1,c2) + if get_angle(self.pa,self.pb,pta) < get_angle(self.pa,self.pb,ptb) then + pt1=pta pt2=ptb + else pt1=ptb pt2=pta end + swap = swap or false + if swap then + return triangle : new (self.pa,self.pb,pt2 ) + else + return triangle : new (self.pa,self.pb,pt1) +end +end -function line: two_angles (alpha,beta) +function line:two_angles(alpha,beta,swap) local pta,ptb,pt - pta = rotation_ (self.pa,alpha,self.pb) - ptb = rotation_ (self.pb,-beta,self.pa) - pt = intersection_ll_ (self.pa,pta,self.pb,ptb) - return triangle : new (self.pa,self.pb,pt) + swap = swap or false + if swap then + pta = rotation_(self.pa,-alpha,self.pb) + ptb = rotation_(self.pb,beta,self.pa) + else + pta = rotation_(self.pa,alpha,self.pb) + ptb = rotation_(self.pb,-beta,self.pa) + end + pt = intersection_ll_(self.pa,pta,self.pb,ptb) + return triangle:new(self.pa,self.pb,pt) end -function line: school () +function line:school(swap) local pta,ptb,pt - pta = rotation_ (self.pa,math.pi/6,self.pb) - ptb = rotation_ (self.pb,-math.pi/3,self.pa) - pt = intersection_ll_ (self.pa,pta,self.pb,ptb) - return triangle : new (self.pa,self.pb,pt) + swap = swap or false + if swap then + pta = rotation_(self.pa,-math.pi/6,self.pb) + ptb = rotation_(self.pb,math.pi/3,self.pa) + else + pta = rotation_(self.pa,math.pi/6,self.pb) + ptb = rotation_(self.pb,-math.pi/3,self.pa) + end + pt = intersection_ll_(self.pa,pta,self.pb,ptb) + return triangle:new(self.pa,self.pb,pt) end -function line: half () +function line:half(swap) local x,pt x = midpoint_(self.pa,self.pb) - pt = rotation_ (self.pb,-math.pi/2,x) - return triangle : new (self.pa,self.pb,pt) + swap = swap or false + if swap then + pt = rotation_(self.pb,math.pi/2,x) + else + pt = rotation_(self.pb,-math.pi/2,x) + end + return triangle:new(self.pa,self.pb,pt) end -function line: sss (a,b) +function line:sss(a,b,swap) local pta,ptb,i,j + swap = swap or false pta = self.pa + point ( a, 0 ) ptb = self.pb + point ( -b , 0) i,j = intersection_cc_ (self.pa,pta,self.pb,ptb) - return triangle : new (self.pa,self.pb,i),triangle : new (self.pa,self.pb,j) + if swap then + return triangle : new (self.pa,self.pb,j) + else + return triangle : new (self.pa,self.pb,i) + end end -function line: ssa (a,phi) - local x,y,pt - x = rotation_ (self.pb,-phi,self.pa) - y = self.pa + polar_ ( a , self.slope) - i,j = intersection_lc_ (self.pb,x,self.pa,y) - return triangle : new (self.pa,self.pb,i),triangle : new (self.pa,self.pb,j) +function line:ssa(a, phi,swap) + local x, y, i, j + swap = swap or false + x = rotation_(self.pb, -phi, self.pa) + y = self.pa + polar_(a, self.slope) + i, j = intersection_lc_(self.pb, x, self.pa, y) + if swap then + return triangle:new(self.pa, self.pb, j) + else + return triangle:new(self.pa, self.pb, i) + end end -function line: sas (a,phi) - local x,pt - x = self.pa + polar_ ( a , self.slope) - pt = rotation_ (self.pa,phi,x) - return triangle : new (self.pa,self.pb,pt) +function line:sas(a, phi,swap) + local x, pt + swap = swap or false + x = self.pa + polar_(a, self.slope) + if swap then + pt = rotation_(self.pa, -phi, x) + else + pt = rotation_(self.pa, phi, x) + end + return triangle:new(self.pa, self.pb, pt) end -function line: asa (alpha,beta) +function line:asa(alpha,beta,swap) local pta,ptb,pt + swap = swap or false + if swap then + pta = rotation_ (self.pa,-alpha,self.pb) + ptb = rotation_ (self.pb,beta,self.pa) + else pta = rotation_ (self.pa,alpha,self.pb) ptb = rotation_ (self.pb,-beta,self.pa) - pt = intersection_ll_ (self.pa,pta,self.pb,ptb) + end + pt = intersection_ll_ (self.pa,pta,self.pb,ptb) return triangle : new (self.pa,self.pb,pt) end ---- sacred triangles ---- -function line: gold (swap) +function line:gold(swap) local pt - if swap == nil then - swap = false - end -if swap then - pt = rotation_ (self.pa,-math.pi/2,self.pb) - return triangle : new (self.pa,self.pb, self.pa + (pt-self.pa) * tkzinvphi) -else - pt = rotation_ (self.pa,math.pi/2,self.pb) - return triangle : new (self.pa,self.pb, self.pa + (pt-self.pa) * tkzinvphi) -end + swap = swap or false + if swap then + pt = rotation_ (self.pa,-math.pi/2,self.pb) + return triangle : new (self.pa,self.pb, self.pa + (pt-self.pa) * tkzinvphi) + else + pt = rotation_ (self.pa,math.pi/2,self.pb) + return triangle : new (self.pa,self.pb, self.pa + (pt-self.pa) * tkzinvphi) + end end -function line: sublime () +function line:sublime(swap) local pta,ptb,pt - pta = rotation_ (self.pa,2*math.pi/5,self.pb) - ptb = rotation_ (self.pb,-2*math.pi/5,self.pa) - pt = intersection_ll_ (self.pa,pta,self.pb,ptb) - return triangle : new (self.pa,self.pb,pt) + swap = swap or false + if swap then + pta = rotation_(self.pa,-2*math.pi/5,self.pb) + ptb = rotation_(self.pb,2*math.pi/5,self.pa) + pt = intersection_ll_(self.pa,pta,self.pb,ptb) + return triangle:new(self.pa,self.pb,pt) + else + pta = rotation_(self.pa,2*math.pi/5,self.pb) + ptb = rotation_(self.pb,-2*math.pi/5,self.pa) + pt = intersection_ll_(self.pa,pta,self.pb,ptb) + return triangle:new(self.pa,self.pb,pt) +end end line.euclid = line.sublime -function line: euclide (swap) - if swap == nil then - return triangle : new (self.pa,self.pb, rotation_ (self.pa,math.pi/5,self.pb)) - else - return triangle : new (self.pa,self.pb, rotation_ (self.pa,-math.pi/5,self.pb)) - end +function line:euclide (swap) + swap = swap or false + if swap then + return triangle : new (self.pa,self.pb, rotation_(self.pa,-math.pi/5,self.pb)) + else + return triangle : new (self.pa,self.pb, rotation_(self.pa,math.pi/5,self.pb)) + end end -function line: divine () - local pta,ptb,pt,h - pta = rotation_ (self.pa,math.pi/5,self.pb) - ptb = rotation_ (self.pb,-math.pi/5,self.pa) - pt = intersection_ll_ (self.pa,pta,self.pb,ptb) - return triangle : new (self.pa,self.pb,pt) -end + function line:divine(swap) + local pta, ptb, pt + swap = swap or false + if swap then + pta = rotation_(self.pa, -math.pi / 5, self.pb) + ptb = rotation_(self.pb, math.pi / 5, self.pa) + pt = intersection_ll_(self.pa, pta, self.pb, ptb) + return triangle:new(self.pa, self.pb, pt) + else + pta = rotation_(self.pa, math.pi / 5, self.pb) + ptb = rotation_(self.pb, -math.pi / 5, self.pa) + pt = intersection_ll_(self.pa, pta, self.pb, ptb) + return triangle:new(self.pa, self.pb, pt) + end + end -function line: cheops () - local m,n,pt - m = midpoint_ (self.pa,self.pb) - n = rotation_ (m,- math.pi/2,self.pa) - pt = m + (n-m)* tkzsqrtphi - return triangle : new (self.pa,self.pb,pt) +function line:cheops(swap) + local m, n, pt + m = midpoint_(self.pa, self.pb) + swap = swap or false + if swap then + n = rotation_(m, math.pi / 2, self.pa) + pt = m + (n - m) * tkzsqrtphi +else + n = rotation_(m, -math.pi / 2, self.pa) + pt = m + (n - m) * tkzsqrtphi + end + return triangle:new(self.pa, self.pb, pt) end -function line: egyptian () - local n,pt - n = rotation_ (self.pb,- math.pi/2,self.pa) - pt = self.pb + (n-self.pb)/point.mod(n-self.pb)*self.length* 0.75 - return triangle : new (self.pa,self.pb,pt) + +function line:egyptian(swap) + local n, pt + swap = swap or false + if swap then + n = rotation_(self.pb, math.pi / 2, self.pa) + pt = self.pb + (n - self.pb) / point.mod(n - self.pb) * self.length * 0.75 + else + n = rotation_(self.pb, -math.pi / 2, self.pa) + pt = self.pb + (n - self.pb) / point.mod(n - self.pb) * self.length * 0.75 + end + return triangle:new(self.pa, self.pb, pt) end + line.pythagoras = line.egyptian line.isis = line.egyptian line.golden = line.sublime @@ -509,12 +689,14 @@ line.golden_gnomon = line.divine ------------------------------ -- Result -> square ------------------------------ -function line: square (swap) - if swap == nil +function line:square (swap) + swap = swap or false + if swap then - return square : side (self.pa,self.pb) - else return square : side (self.pa,self.pb,indirect) + else + return square : side (self.pa,self.pb) + end end diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_main.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_main.lua index e4f5c7623ea..e5843dae1a0 100644 --- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_main.lua +++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_main.lua @@ -1,6 +1,6 @@ -- tkz_elements-main.lua --- date 2024/07/16 --- version 3.00 +-- date 2025/01/06 +-- version 3.10 -- Copyright 2024 Alain Matthes -- This work may be distributed and/or modified under the -- conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_matrices.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_matrices.lua index f0bd69b95e7..07048af557f 100644 --- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_matrices.lua +++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_matrices.lua @@ -1,6 +1,6 @@ -- tkz_elements_matrices.lua --- date 2024/07/16 --- version 3.00 +-- date 2025/01/06 +-- version 3.10 -- Copyright 2024 Alain Matthes -- This work may be distributed and/or modified under the -- conditions of the LaTeX Project Public License, either version 1.3 @@ -44,26 +44,37 @@ function matrix.__sub(m1,m2) return add_matrix(m1,k_mul_matrix(-1, m2)) end -function matrix.__pow( m, num ) - if num =='T' then - return transposeMatrix(m) - else - if num == 0 then - return matrix:new( #m,"I" ) - end - if num < 0 then - local i; m,i = inv_matrix ( m ) - if not m then return m, i end - num = -num - end - local mt = m - for i = 2,num do - mt = mul_matrix(mt,m) - end - return mt -end +function matrix.__pow(m, num) + -- Handle transpose (when num is 'T') + if num == 'T' then + return transposeMatrix(m) + end + + -- Handle exponentiation by 0 (returns the identity matrix) + if num == 0 then + return matrix:new(#m, "I") -- Identity matrix + end + + -- Handle negative exponents (invert the matrix) + if num < 0 then + local inv_matrix, err = inv_matrix(m) + if not inv_matrix then + return nil, err -- Return nil and the error if matrix is non-invertible + end + num = -num -- Make exponent positive for easier handling + m = inv_matrix -- Now use the inverted matrix + end + + -- Now handle the positive exponentiation + local result = m + for i = 2, num do + result = mul_matrix(result, m) -- Repeated multiplication + end + + return result end + function matrix.__tostring( A ) local mt = (A.type=='matrix' and A.set or A) local k = {} diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_misc.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_misc.lua index 7fcac90d860..5f01756b5a4 100644 --- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_misc.lua +++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_misc.lua @@ -1,6 +1,6 @@ -- tkz_elements_functions_maths.lua --- date 2024/07/16 --- version 3.00 +-- date 2025/01/06 +-- version 3.10 -- Copyright 2024 Alain Matthes -- This work may be distributed and/or modified under the -- conditions of the LaTeX Project Public License, either version 1.3 @@ -14,19 +14,31 @@ -- ---------------------------------------------------------------- -- -- ---------------------------------------------------------------- -function get_points (obj) -if obj.type == 'line' then return obj.pa,obj.pb - elseif - obj.type == 'triangle' then return obj.pa,obj.pb,obj.pc - elseif - obj.type == 'circle' then return obj.center,obj.through - elseif - obj.type == 'ellipse' then return obj.pc,obj.pa,obj.pb - elseif - obj.type == 'square' or obj.type == 'rectangle' or obj.type == 'quadrilateral' or obj.type == 'parallelogram' - then return obj.pa,obj.pb,obj.pc,obj.pd -end -end +function get_points(obj) + -- Map of object types to their respective point keys + local point_map = { + line = {"pa", "pb"}, -- Line has two points + triangle = {"pa", "pb", "pc"}, -- Triangle has three points + circle = {"center", "through"}, -- Circle has center and a point through its circumference + ellipse = {"pc", "pa", "pb"}, -- Ellipse has three key points + square = {"pa", "pb", "pc", "pd"}, -- Square has four vertices + rectangle = {"pa", "pb", "pc", "pd"}, -- Rectangle has four vertices + quadrilateral = {"pa", "pb", "pc", "pd"}, -- Quadrilateral has four vertices + parallelogram = {"pa", "pb", "pc", "pd"} -- Parallelogram has four vertices + } + + -- Check if the object's type is recognized + if point_map[obj.type] then + local points = {} + -- Iterate over the keys for the given type and extract the corresponding values + for _, key in ipairs(point_map[obj.type]) do + table.insert(points, obj[key]) + end + -- Return all points as multiple return values + return table.unpack(points) + end + end + function set_lua_to_tex (t) for k,v in pairs(t) do @@ -35,29 +47,49 @@ function set_lua_to_tex (t) end function bisector (a,b,c) - local i - i = in_center_ (a,b,c) + local i = in_center_ (a,b,c) return line : new (a,intersection_ll_ (a,i,b,c)) end -function altitude (a,b,c) - local o,p - o = ortho_center_ (a,b,c) - p = projection_ (b,c,a) - return line : new (a,p) +function altitude(a, b, c) + local o, p + -- Get the orthocenter (which is the point of concurrency of the altitudes) + o = ortho_center_(a, b, c) + + -- Get the perpendicular projection of point 'a' onto the line defined by 'b' and 'c' + p = projection_(b, c, a) + + -- Return the altitude, which is the line from point 'a' to the point 'p' + return line:new(a, p) end -function bisector_ext(a,b,c) -- n =1 swap n=2 2 swap - local i,p - i = in_center_ (a,b,c) - p = rotation_ (a,math.pi/2,i) - return line : new (a,p) + +function bisector_ext(a, b, c) -- n=1 swap n=2 swap 2 + local i, p + -- Get the incenter of the triangle + i = in_center_(a, b, c) + + -- Rotate the incenter by 90 degrees around point 'a' to compute the external bisector + p = rotation_(a, math.pi / 2, i) + + -- Return the external bisector as the line passing through points 'a' and 'p' + return line:new(a, p) end + function equilateral (a,b) return equilateral_tr_ (a,b) end function midpoint (a,b) return (a+b)/2 +end + +function midpoints (...) + return midpoints_(...) +end + + +function length(a,b) + return point.abs (a-b) end
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_parallelogram.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_parallelogram.lua index a6dc3360f99..8cd02bf73ee 100644 --- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_parallelogram.lua +++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_parallelogram.lua @@ -1,6 +1,6 @@ -- tkz_elements_parallelogram.lua --- date 2024/07/16 --- version 3.00 +-- date 2025/01/06 +-- version 3.10 -- Copyright 2024 Alain Matthes -- This work may be distributed and/or modified under the -- conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_point.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_point.lua index 3ec0262051e..be28002328c 100644 --- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_point.lua +++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_point.lua @@ -1,6 +1,6 @@ -- tkz_elements_point.lua --- date 2024/07/16 --- version 3.00 +-- date 2025/01/06 +-- version 3.10 -- Copyright 2024 Alain Matthes -- This work may be distributed and/or modified under the -- conditions of the LaTeX Project Public License, either version 1.3 @@ -252,28 +252,28 @@ function point: west(d) -- return symmetry_ (self ,pt) -- end -function point: symmetry (...) - local obj,nb,t - local tp = table.pack(...) - obj = tp[1] - nb = tp.n - if nb == 1 then - if obj.type == "point" then - return symmetry_ (self,obj) - elseif obj.type == "line" then - return line: new (set_symmetry_ (self,obj.pa,obj.pb)) - elseif obj.type == "circle" then - return circle: new (set_symmetry_ (self,obj.center,obj.through)) - else - return triangle: new (set_symmetry (self,obj.pa,obj.pb,obj.pc)) - end - else - local t = {} - for i=1,tp.n do - table.insert( t , symmetry_ (self , tp[i]) ) - end - return table.unpack ( t ) - end +function point:symmetry(...) + local tp = table.pack(...) -- Pack arguments into a table + local nb = tp.n -- Number of arguments + local obj = tp[1] -- The first object in the arguments + + if nb == 1 then -- If there's only one argument + if obj.type == "point" then + return symmetry_(self, obj) -- Apply symmetry on the point + elseif obj.type == "line" then + return line:new(set_symmetry_(self, obj.pa, obj.pb)) -- Create a new line + elseif obj.type == "circle" then + return circle:new(set_symmetry_(self, obj.center, obj.through)) -- Create a new circle + else + return triangle:new(set_symmetry(self, obj.pa, obj.pb, obj.pc)) -- Create a new triangle + end + else -- If there are multiple arguments + local results = {} -- Initialize a table to store results + for i = 1, nb do + table.insert(results, symmetry_(self, tp[i])) -- Apply symmetry on each object + end + return table.unpack(results) -- Return the results as separate values + end end function point: set_symmetry (...) @@ -288,56 +288,56 @@ function point:set_rotation (angle,...) return set_rotation_ ( self,angle,... ) end -function point : rotation (angle,...) - local obj,nb,t - local tp = table.pack(...) - obj = tp[1] - nb = tp.n - if nb == 1 then - if obj.type == "point" then - return rotation_ (self,angle,obj ) - elseif obj.type == "line" then - return line : new (set_rotation_ (self, angle,obj.pa,obj.pb )) - elseif obj.type == "triangle" then - return triangle: new (set_rotation_ (self, angle,obj.pa,obj.pb,obj.pc)) - elseif obj.type == "circle" then -return circle : new (set_rotation_ (self,angle,obj.center,obj.through)) - else -return square: new (set_rotation_(self,angle,obj.pa,obj.pb,obj.pc,obj.pd)) - end - else - t = {} - for i=1,tp.n do - table.insert( t , rotation_ ( self,angle,tp[i])) - end - return table.unpack ( t ) - end +function point:rotation(angle, ...) + local tp = table.pack(...) -- Pack arguments into a table + local nb = tp.n -- Number of arguments + local obj = tp[1] -- The first object in the arguments + + if nb == 1 then -- If there's only one argument + if obj.type == "point" then + return rotation_(self, angle, obj) -- Rotate the point + elseif obj.type == "line" then + return line:new(set_rotation_(self, angle, obj.pa, obj.pb)) -- Rotate the line + elseif obj.type == "triangle" then + return triangle:new(set_rotation_(self, angle, obj.pa, obj.pb, obj.pc)) -- Rotate the triangle + elseif obj.type == "circle" then + return circle:new(set_rotation_(self, angle, obj.center, obj.through)) -- Rotate the circle + else -- For other shapes like square + return square:new(set_rotation_(self, angle, obj.pa, obj.pb, obj.pc, obj.pd)) -- Rotate the square + end + else -- If there are multiple arguments + local results = {} -- Initialize a table to store results + for i = 1, nb do + table.insert(results, rotation_(self, angle, tp[i])) -- Rotate each object + end + return table.unpack(results) -- Return the results as separate values + end end -function point : homothety (coeff,...) -local obj,nb,t -local tp = table.pack(...) -obj = tp[1] -nb = tp.n - if nb == 1 then - if obj.type == "point" then - return homothety_ (self,coeff,obj ) - elseif obj.type == "line" then - return line : new (set_homothety_ (self, coeff,obj.pa,obj.pb )) - elseif obj.type == "triangle" then - return triangle: new (set_homothety_(self,coeff,obj.pa,obj.pb,obj.pc)) - elseif obj.type == "circle" then - return circle: new (set_homothety_(self,coeff,obj.center,obj.through)) - else -return square: new (set_homothety_(self,coeff,obj.pa,obj.pb)) - end - else - t = {} - for i=1,tp.n do - table.insert( t , homothety_ ( self,coeff,tp[i])) - end - return table.unpack ( t ) - end +function point:homothety(coeff, ...) + local tp = table.pack(...) -- Pack arguments into a table + local nb = tp.n -- Number of arguments + local obj = tp[1] -- The first object in the arguments + local t = {} -- Initialize a table to store results + + if nb == 1 then -- If there's only one argument + if obj.type == "point" then + return homothety_(self, coeff, obj) -- Apply homothety to the point + elseif obj.type == "line" then + return line:new(set_homothety_(self, coeff, obj.pa, obj.pb)) -- Apply homothety to the line + elseif obj.type == "triangle" then + return triangle:new(set_homothety_(self, coeff, obj.pa, obj.pb, obj.pc)) -- Apply homothety to the triangle + elseif obj.type == "circle" then + return circle:new(set_homothety_(self, coeff, obj.center, obj.through)) -- Apply homothety to the circle + else -- For other shapes like square + return square:new(set_homothety_(self, coeff, obj.pa, obj.pb, obj.pc, obj.pd)) -- Apply homothety to the square + end + else -- If there are multiple arguments + for i = 1, nb do + table.insert(t, homothety_(self, coeff, tp[i])) -- Apply homothety to each object + end + return table.unpack(t) -- Return the results as separate values + end end function point: normalize() @@ -345,16 +345,19 @@ function point: normalize() return point(self.re/d,self.im/d) end -function point: orthogonal(d) +function point:orthogonal(d) local m - if d==nil then - return point(-self.im,self.re) -else - m = point.mod(self) - return point(-self.im*d/m,self.re*d/m) -end + if d == nil then + -- If no scaling factor d is provided, return the point rotated 90 degrees counterclockwise + return point(-self.im, self.re) + else + -- If a scaling factor d is provided, scale the orthogonal point + m = point.mod(self) -- Get the modulus (magnitude) of the current point + return point(-self.im * d / m, self.re * d / m) -- Return the scaled orthogonal point + end end + function point : at (z) return point(self.re+z.re,self.im+z.im) end diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_quadrilateral.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_quadrilateral.lua index fc3e95b28fc..0cc6ca30a6e 100644 --- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_quadrilateral.lua +++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_quadrilateral.lua @@ -1,6 +1,6 @@ -- tkz_elements_quadrilateral.lua --- date 2024/07/16 --- version 3.00 +-- date 2025/01/06 +-- version 3.10 -- Copyright 2024 Alain Matthes -- This work may be distributed and/or modified under the -- conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_rectangle.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_rectangle.lua index a5317220209..5247d48e1b7 100644 --- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_rectangle.lua +++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_rectangle.lua @@ -1,6 +1,6 @@ -- tkz_elements-rectangle.lua --- date 2024/07/16 --- version 3.00 +-- date 2025/01/06 +-- version 3.10 -- Copyright 2024 Alain Matthes -- This work may be distributed and/or modified under the -- conditions of the LaTeX Project Public License, either version 1.3 @@ -24,34 +24,34 @@ function rectangle: new (za, zb,zc,zd) end if math.abs(point.abs (zc-za)-point.abs (zd-zb)) < tkz_epsilon then else error ("it's not a rectangle") end - local type = 'rectangle' - local center = midpoint_ (za,zc) - local exradius = point.abs (center-za) - local ab = line : new (za,zb) - local bc = line : new (zb,zc) - local cd = line : new (zc,zd) - local da = line : new (zd,za) - local ac = line : new (za,zc) - local bd = line : new (zb,zd) - local length = point.mod (zb-za) - local width = point.mod (zd-za) - local diagonal = point.abs (zc-za) - local o = { pa = za, - pb = zb, - pc = zc, - pd = zd, - ab = ab, - ac = ac, - bc = bc, - da = da, - cd = cd, - bd = bd, - diagonal = diagonal, - exradius = exradius, - center = center, - length = length, - width = width, - type = type } + local type = 'rectangle' + local center = midpoint_ (za,zc) + local circumradius = point.abs (center-za) + local ab = line : new (za,zb) + local bc = line : new (zb,zc) + local cd = line : new (zc,zd) + local da = line : new (zd,za) + local ac = line : new (za,zc) + local bd = line : new (zb,zd) + local length = point.mod (zb-za) + local width = point.mod (zd-za) + local diagonal = point.abs (zc-za) + local o = { pa = za, + pb = zb, + pc = zc, + pd = zd, + ab = ab, + ac = ac, + bc = bc, + da = da, + cd = cd, + bd = bd, + diagonal = diagonal, + circumradius = circumradius, + center = center, + length = length, + width = width, + type = type } setmetatable(o, self) self.__index = self return o @@ -69,7 +69,7 @@ function rectangle : gold (za,zb,swap) local zc,zd local a = point.arg (zb-za) local d = point.abs(zb-za)/tkzphi - if swap == nil then swap = false end + swap = swap or false if swap then zc = zb : south (d/scale) zc = rotation_ (zb,a,zc) @@ -87,7 +87,7 @@ end function rectangle : diagonal (za,zc,swap) local zb,zd - if swap == nil then swap = false end + swap = swap or false if swap then zd = point (zc.re,za.im) zb = point (za.re,zc.im) @@ -102,7 +102,7 @@ end function rectangle : side (za,zb,d,swap) local a,zc,zd a = point.arg (zb-za) - if swap == nil then swap = false end + swap = swap or false if swap then zc = zb : south (d/scale) zc = rotation_ (zb,a,zc) diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_regular.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_regular.lua index bf49fca814c..65c197d3152 100644 --- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_regular.lua +++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_regular.lua @@ -1,6 +1,6 @@ -- tkz_elements_regular.lua --- date 2024/07/16 --- version 3.00 +-- date 2025/01/06 +-- version 3.10 -- Copyright 2024 Alain Matthes -- This work may be distributed and/or modified under the -- conditions of the LaTeX Project Public License, either version 1.3 @@ -11,7 +11,7 @@ -- version 2005/12/01 or later. -- This work has the LPPL maintenance status “maintained”. -- The Current Maintainer of this work is Alain Matthes. - +-- za = center zb a vertex regular_polygon = {} function regular_polygon: new (za, zb ,nb) local type = 'regular_polygon' @@ -19,24 +19,28 @@ function regular_polygon: new (za, zb ,nb) local center = za local through = zb local angle = 2 * math.pi/nb - local exradius = point.abs (zb-za) + local circumradius = point.abs (zb-za) local circle = circle : new (za,zb) - local inradius = exradius * math.cos(math.pi/nb) - local side = exradius * math.sin(math.pi/nb) + local inradius = circumradius * math.cos(math.pi/nb) + local side = circumradius * math.sin(math.pi/nb) local next = table[2] local first = table[1] local proj = projection_ (first,next,za) + local perimeter = nb * side + local area = (perimeter * inradius)/2 local o = { type = type, center = center, through = through, - exradius = exradius, + circumradius= circumradius, inradius = inradius, table = table, circle = circle, nb = nb, angle = angle, side = side, - proj = proj } + proj = proj, + perimeter = perimeter, + area = area} setmetatable(o, self) self.__index = self return o diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_square.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_square.lua index 68bfa8dec00..d968feacdec 100644 --- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_square.lua +++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_square.lua @@ -1,6 +1,6 @@ -- tkz_elements-square.lua --- date 2024/07/16 --- version 3.00 +-- date 2025/01/06 +-- version 3.10 -- Copyright 2024 Alain Matthes -- This work may be distributed and/or modified under the -- conditions of the LaTeX Project Public License, either version 1.3 @@ -27,38 +27,42 @@ function square: new (za, zb,zc,zd) if math.abs(point.abs (zb-za) - point.abs (zd-za)) < tkz_epsilon then else error ("it's not a square (side)") end - local type = 'square' - local side = point.abs ( zb - za ) - local pc = rotation_ (zb,-math.pi/2,za) - local pd = rotation_ (za,math.pi/2,zb) - local center = midpoint_ (za,zc) - local exradius = point.abs (center-za) - local inradius = exradius * math.cos(math.pi/4) - local diagonal = math.sqrt(2) * side - local proj = projection_ (za,zb,center) - local ab = line : new (za,zb) - local bc = line : new (zb,zc) - local cd = line : new (zc,zd) - local da = line : new (zd,za) - local bd = line : new (zb,zd) - local ac = line : new (za,zc) - local o = { pa = za, - pb = zb, - pc = zc, - pd = zd, - side = side, - center = center, - exradius = exradius, - inradius = inradius, - diagonal = diagonal, - proj = proj, - ab = ab, - ac = ac, - bc = bc, - da = da, - cd = cd, - bd = bd, - type = type } + local type = 'square' + local side = point.abs ( zb - za ) + local pc = rotation_ (zb,-math.pi/2,za) + local pd = rotation_ (za,math.pi/2,zb) + local center = midpoint_ (za,zc) + local circumradius = point.abs (center-za) + local inradius = circumradius * math.cos(math.pi/4) + local diagonal = math.sqrt(2) * side + local proj = projection_ (za,zb,center) + local ab = line : new (za,zb) + local bc = line : new (zb,zc) + local cd = line : new (zc,zd) + local da = line : new (zd,za) + local bd = line : new (zb,zd) + local ac = line : new (za,zc) + local area = side * side + local perimeter = 4 * side + local o = { pa = za, + pb = zb, + pc = zc, + pd = zd, + side = side, + center = center, + circumradius = circumradius, + inradius = inradius, + diagonal = diagonal, + proj = proj, + ab = ab, + ac = ac, + bc = bc, + da = da, + cd = cd, + bd = bd, + type = type, + area = area, + perimeter = perimeter } setmetatable(o, self) self.__index = self return o @@ -71,16 +75,20 @@ function square : rotation (zi,za) return square : new (za,zb,zc,zd) end -function square : side (za,zb,swap) - if swap == nil - then - local zc = rotation_ (zb,-math.pi/2,za) - local zd = rotation_ (za,math.pi/2,zb) - return square : new (za,zb,zc,zd) +function square:side(za, zb, swap) + swap = swap or false + if swap then + -- Rotate zb clockwise around za to get zc + local zc = rotation_(zb, math.pi / 2, za) + -- Rotate za counterclockwise around zb to get zd + local zd = rotation_(za, -math.pi / 2, zb) + return square:new(za, zb, zc, zd) else - local zc = rotation_ (zb,math.pi/2,za) - local zd = rotation_ (za,-math.pi/2,zb) - return square : new (za,zb,zc,zd) + -- Rotate zb counterclockwise around za to get zc + local zc = rotation_(zb, -math.pi / 2, za) + -- Rotate za clockwise around zb to get zd + local zd = rotation_(za, math.pi / 2, zb) + return square:new(za, zb, zc, zd) end end diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_triangle.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_triangle.lua index 6318a7d8d11..52677400339 100644 --- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_triangle.lua +++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_triangle.lua @@ -1,6 +1,6 @@ -- tkz_elements_triangles.lua --- date 2024/07/16 --- version 3.00 +-- date 2025/01/06 +-- version 3.10 -- Copyright 2024 Alain Matthes -- This work may be distributed and/or modified under the -- conditions of the LaTeX Project Public License, either version 1.3 @@ -30,6 +30,10 @@ function triangle: new (za, zb ,zc) local ab = line : new (za,zb) local ca = line : new (zc,za) local bc = line : new (zb,zc) + local semiperimeter = (a+b+c)/2 + local area = math.sqrt((semiperimeter)*(semiperimeter-a)*(semiperimeter-b)*(semiperimeter-c)) + local inradius = area / semiperimeter + local circumradius = (a*b*c)/(4*inradius*semiperimeter) local o = { pa = za, pb = zb, pc = zc, @@ -48,7 +52,11 @@ function triangle: new (za, zb ,zc) bc = bc, alpha = alpha, beta = beta, - gamma = gamma} + gamma = gamma, + semiperimeter = semiperimeter, + area = area, + inradius = inradius, + circumradius = circumradius} setmetatable(o, self) self.__index = self return o @@ -110,24 +118,25 @@ function triangle: euler_points () return midpoint_ ( H,self.pa ), midpoint_ ( H,self.pb ), midpoint_ ( H,self.pc ) end -function triangle: nine_points () - local H,ma,mb,mc,H,ha,hb,hc - ma,mb,mc = medial_tr_ ( self.pa , self.pb , self.pc) - ha,hb,hc = orthic_tr_ ( self.pa , self.pb , self.pc) - H = ortho_center_ ( self.pa , self.pb , self.pc ) - return - ma,mb,mc, - ha,hb,hc, - midpoint_ ( H,self.pa ), - midpoint_ ( H,self.pb ), - midpoint_ ( H,self.pc ) +function triangle:nine_points() + local ma, mb, mc, ha, hb, hc, H + -- Calculate the medial triangle + ma, mb, mc = medial_tr_(self.pa, self.pb, self.pc) + -- Calculate the orthic triangle + ha, hb, hc = orthic_tr_(self.pa, self.pb, self.pc) + -- Calculate the orthocenter + H = ortho_center_(self.pa, self.pb, self.pc) + + -- Return the points of the nine-point circle + return ma, mb, mc, ha, hb, hc, + midpoint_(H, self.pa), midpoint_(H, self.pb), midpoint_(H, self.pc) end + function triangle : point (t) - local t1,t2,p - p = (self.a + self.b + self.c) - t1 = self.a / p - t2 = (self.a + self.b) / p + local p = (self.a + self.b + self.c) + local t1 = self.a / p + local t2 = (self.a + self.b) / p if t<= t1 then return self.ab : point (t/t1) elseif t <= t2 then @@ -163,11 +172,10 @@ function triangle: euler_line () end function triangle: symmedian_line (n) - local a,b,c,l - a = self.pa - b = self.pb - c = self.pc - l = self : lemoine_point () + local a = self.pa + local b = self.pb + local c = self.pc + local l = self : lemoine_point () if n==1 then return line : new (b,intersection_ll_ (b,l,a,c)) elseif n==2 then @@ -184,23 +192,22 @@ function triangle: altitude (n) c = self.pc o = ortho_center_ (a,b,c) if n==1 then - p = projection_ (a,c,b) + p = projection_ (a,c,b) return line : new (b,p) elseif n==2 then p = projection_ (a,b,c) return line : new (c,p) else - p = projection_ (b,c,a) + p = projection_ (b,c,a) return line : new (a,p) end end function triangle: bisector (n) - local a,b,c,i - a = self.pa - b = self.pb - c = self.pc - i = in_center_ (a,b,c) + local a = self.pa + local b = self.pb + local c = self.pc + local i = in_center_ (a,b,c) if n==1 then return line : new (b,intersection_ll_ (b,i,a,c)) elseif n==2 then @@ -211,10 +218,9 @@ function triangle: bisector (n) end function triangle: bisector_ext(n) -- n =1 swap n=2 2 swap -local a,b,c - a = self.pa - b = self.pb - c = self.pc + local a = self.pa + local b = self.pb + local c = self.pc if n==1 then -- ac return line : new (b,bisector_ext_ (b,c,a)) elseif n==2 then -- ab @@ -254,21 +260,21 @@ end ----------------------- --- Result -> circles -- ----------------------- -function triangle: euler_circle () +function triangle:euler_circle() return circle : new (euler_center_ ( self.pa , self.pb , self.pc),midpoint_( self.pb , self.pc)) end -function triangle: circum_circle() +function triangle:circum_circle() return circle : new (circum_circle_ ( self.pa , self.pb , self.pc), self.pa ) end -function triangle: in_circle () +function triangle:in_circle() local o o = in_center_ ( self.pa , self.pb , self.pc) return circle : new (o, projection_ (self.pb , self.pc,o) ) end -function triangle: ex_circle (n) -- n =1 swap n=2 2 swap +function triangle:ex_circle (n) -- n =1 swap n=2 2 swap local a,b,c,o a = self.pa b = self.pb @@ -505,5 +511,42 @@ function triangle: check_acutangle() end end +-- Circle tangent to two straight lines passing through a given point +function triangle:c_ll_p(p) + + -- Compute the bisector of the triangle + local lbi = bisector(self.pa, self.pb,self.pc) + + if lbi:in_out(p) then + -- Orthogonal projection of p onto the bisector + local lp = lbi:ortho_from(p) + + -- Intersection of line from p to its projection with self.pa and self.pb + local i = intersection_ll_(p, lp.pb, self.pa, self.pb) + + -- Intersection points of the line with the circle defined by (i, p) + local t1, t2 = intersection_lc_(self.pa, self.pb, i, p) + + -- Create the main line and find orthogonal projections from t1 and t2 + local lab = line:new(self.pa, self.pb) + local x = lab:ortho_from(t1).pb + local y = lab:ortho_from(t2).pb + + -- Return two circles based on the orthogonal projections and points t1, t2 + return circle:new(intersection_ll_(x, t1, self.pa, p), t1), + circle:new(intersection_ll_(y, t2, self.pa, p), t2) + else + local lab = line:new(self.pa, self.pb) + -- Reflection of p across the bisector + local q = lbi : reflection (p) + + -- Compute circles from the Wallis construction + local c1, c2 = lab:c_l_pp(p, q) + + -- Return two circles with centers and points on their circumference + return c1,c2 + end +end + return triangle
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_vector.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_vector.lua index fcd63c783a5..7e9f0ff94fe 100644 --- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_vector.lua +++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_vector.lua @@ -1,6 +1,6 @@ -- tkz_elements_vectors.lua --- date 2024/07/16 --- version 3.00 +-- date 2025/01/06 +-- version 3.10 -- Copyright 2024 Alain Matthes -- This work may be distributed and/or modified under the -- conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/warning/warning.sty b/Master/texmf-dist/tex/latex/warning/warning.sty index 0a8e3e5b7d8..a48327aac8e 100644 --- a/Master/texmf-dist/tex/latex/warning/warning.sty +++ b/Master/texmf-dist/tex/latex/warning/warning.sty @@ -1,10 +1,10 @@ %% %% Project: warning -%% Version: 2023-03-18 v0.10 +%% Version: 2025-01-01 v0.11 %% Info: Global warnings at the end of the screen output and the logfile %% -%% Copyright © 2001, 2023 Harald Harders (harald.harders@gmx.de; inactive) -%% (2023-03-18 update done by H.-Martin Münch, <Martin dot Muench at Uni-Bonn dot de>) +%% Copyright © 2001, 2023, 2025 Harald Harders (harald.harders@gmx.de; inactive) +%% (2025-01-01 update done by H.-Martin Münch, <Martin dot Muench at Uni-Bonn dot de>) %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -22,17 +22,15 @@ %% and do not load the warning package. %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{warning}[2023/03/18 v0.10 Global warnings at end of logfile] +\ProvidesPackage{warning}[2025/01/01 v0.11 Global warnings at end of logfile] \providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion} \IfFormatAtLeastTF{2020/10/01}{ \NewDocumentCommand\addglobalwarning{m}{\AddToHook{enddocument/info}{#1}} - \addglobalwarning{% - \PackageWarningNoLine{warning}{Package warning is obsolete.\MessageBreak% - Instead of \string\addglobalwarning{ something } use \MessageBreak% - \string\AddToHook{enddocument/info}{ something }\MessageBreak% - and do not load the warning package} - } + \PackageError{warning}{Package warning is obsolete}{% + Instead of \string\addglobalwarning{ something } use\MessageBreak% + \string\AddToHook{enddocument/info}{ something }\MessageBreak% + and do not load the warning package.} \def\wrn@warning{\endinput} }{\let\wrn@warning\relax \AtBeginDocument{\addglobalwarning{\PackageWarningNoLine{warning}{% diff --git a/Master/texmf-dist/tex/latex/yb-book/yb-book.cls b/Master/texmf-dist/tex/latex/yb-book/yb-book.cls index 392011e3994..fd9069b5cf6 100644 --- a/Master/texmf-dist/tex/latex/yb-book/yb-book.cls +++ b/Master/texmf-dist/tex/latex/yb-book/yb-book.cls @@ -7,7 +7,7 @@ %% yb-book.dtx (with options: `class') %% (The MIT License) %% -%% Copyright (c) 2021-2024 Yegor Bugayenko +%% Copyright (c) 2021-2025 Yegor Bugayenko %% %% Permission is hereby granted, free of charge, to any person obtaining a copy %% of this software and associated documentation files (the 'Software'), to deal @@ -32,7 +32,8 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesClass{yb-book} -[23.03.2024 0.4.1 YB Branded Book Style] +[2025/01/05 0.5.1 YB Branded Book Style] + @@ -59,10 +60,12 @@ authordraft/.store in=\yb@authordraft, compact/.store in=\yb@compact, manuscript/.store in=\yb@manuscript, + sparse/.store in=\yb@sparse, } \ProcessPgfPackageOptions{/yb} -\makeatletter\ifdefined\yb@authordraft +\makeatletter +\ifdefined\yb@authordraft \PassOptionsToClass{11pt}{book} \PassOptionsToClass{oneside}{book} \else @@ -73,23 +76,26 @@ \PassOptionsToClass{11pt}{book} \PassOptionsToClass{twoside}{book} \fi -\fi\makeatother +\fi +\makeatother \LoadClass{book} +\RequirePackage[utf8]{inputenc} + \RequirePackage{geometry} -\geometry{paperwidth=6in, paperheight=9in, bindingoffset=0.25in, +\geometry{ + paperwidth=6in, paperheight=9in, + bindingoffset=0.25in, left=0.75in, right=0.75in, top=0.75in, bottom=1.25in} -\makeatletter\ifdefined\yb@authordraft +\makeatletter +\ifdefined\yb@authordraft \geometry{a4paper, margin=1in, left=1.5in} \else \ifdefined\yb@manuscript \geometry{a4paper, margin=1.2in} \fi -\fi\makeatother - -\RequirePackage[T1]{fontenc} -\RequirePackage[utf8]{inputenc} -\RequirePackage{lmodern} +\fi +\makeatother \RequirePackage{anyfontsize} @@ -113,19 +119,25 @@ \setlist{nosep} \RequirePackage{float} + \RequirePackage[normalem]{ulem} + \RequirePackage{xfp} -\RequirePackage{soul} \RequirePackage{xifthen} + +\RequirePackage{soul} + \RequirePackage[autostyle=try]{csquotes} \pagestyle{plain} \RequirePackage{setspace} \setstretch{1.2} - \makeatletter\ifdefined\yb@authordraft\setstretch{1.1}\fi\makeatother - \makeatletter\ifdefined\yb@compact\setstretch{1.0}\fi\makeatother - \makeatletter\ifdefined\yb@manuscript\setstretch{1.1}\fi\makeatother + \makeatletter + \ifdefined\yb@authordraft\setstretch{1.1}\fi + \ifdefined\yb@compact\setstretch{1.0}\fi + \ifdefined\yb@manuscript\setstretch{1.1}\fi + \makeatother \RequirePackage[indexing=cite,style=authoryear, natbib=true,maxnames=1,minnames=1,doi=false, @@ -155,29 +167,35 @@ {\begingroup\setstretch{1.0}\lsstyle} {\endgroup} -\makeatletter\ifdefined\yb@authordraft\else +\makeatletter +\ifdefined\yb@authordraft\else \RequirePackage[letterspace=-50]{microtype} -\fi\makeatother +\fi +\makeatother -\makeatletter\ifdefined\yb@manuscript +\makeatletter +\ifdefined\yb@manuscript \RequirePackage[tt=false,type1=true]{libertine} -\fi\makeatother +\fi +\makeatother \makeatletter \let\yb@oldsection\section +\def\yb@secstart{\ifdefined\yb@sparse\newpage\fi} \ifdefined\yb@authordraft \RequirePackage[medium]{titlesec} \else \RequirePackage[raggedright]{titlesec} \titlespacing{\section}{0in}{6pt}{6pt}[1in] - \renewcommand\section{\newpage\yb@oldsection} + \renewcommand\section{\yb@secstart\newpage\yb@oldsection} \fi \ifdefined\yb@compact - \renewcommand\section{\vspace{2em}\yb@oldsection} + \renewcommand\section{\yb@secstart\vspace{2em}\yb@oldsection} \fi \makeatother -\makeatletter\ifdefined\yb@authordraft +\makeatletter +\ifdefined\yb@authordraft \RequirePackage[absolute]{textpos} \TPGrid{16}{16} \RequirePackage{fancyhdr} @@ -188,9 +206,9 @@ \fancyhf{} \fancyhead[L,C,LO,CO]{} \fancyhead[R,RO]{ - \begin{textblock}{4}(11.5,1) + \begin{textblock}{4}(11.5,1)% \tikz \node [color=gray, rotate=270, - font=\ttfamily\scriptsize, text width=5in] at (0,0) { + font=\ttfamily\scriptsize, text width=5in] at (0,0) {% Copyright \textcopyright{} \the\year{} by \theauthor{}. All rights reserved. No part of the contents of this book may be reproduced or transmitted in any @@ -198,13 +216,14 @@ of the publisher. This particular manuscript is printed for \textbf{\thereviewer{}} and may be used only for one-time review. The manuscript has to be destroyed - after the review. + after the review.% }; \end{textblock} } - \fancyfoot[C,CO,CE]{\small\ttfamily + \fancyfoot[C,CO,CE]{\small\ttfamily% page \#\thepage{} of \pageref{LastPage}} -\fi\makeatother +\fi +\makeatother \renewcommand\maketitle{ {\LARGE\textbf{\thetitle}} @@ -223,13 +242,14 @@ \fi } -\makeatletter\newcommand\ybPrintTitlePage{ +\makeatletter +\newcommand\ybPrintTitlePage{ \ifdefined\yb@authordraft\else \begin{titlepage} \ttfamily \vspace*{\fill} \noindent - {\Huge\textbf{\thetitle}} + {\Huge\thetitle} \\[1em] by \theauthor{} \\[4em] @@ -246,30 +266,35 @@ \vspace*{\fill} \end{titlepage} \fi -}\makeatother +} +\makeatother -\makeatletter\newcommand\ybPrintTOC{ +\makeatletter +\newcommand\ybPrintTOC{ \ifdefined\yb@authordraft\else \ifdefined\yb@compact\else\cleardoublepage\fi {\setstretch{0.7}\tableofcontents} \fi -}\makeatother +} +\makeatother \RequirePackage{imakeidx} \renewbibmacro*{citeindex}{\indexnames{labelname}{}} \makeindex \indexsetup{othercode={\hyphenpenalty=10000}} -\makeatletter\newcommand\ybPrintIndex[1][Index]{ +\makeatletter +\newcommand\ybPrintIndex[1][Index]{% \ifdefined\yb@authordraft\else - \cleardoublepage - { - \setstretch{1.0} - \small - \addcontentsline{toc}{chapter}{#1} - \printindex - } - \fi -}\makeatother + \cleardoublepage% + {% + \setstretch{1.0}% + \small% + \addcontentsline{toc}{chapter}{#1}% + \printindex% + }% + \fi% +} +\makeatother \RequirePackage{wrapfig} \RequirePackage{mdframed} @@ -289,7 +314,8 @@ skipabove=0pt,skipbelow=0pt, linewidth=2pt, topline=false,bottomline=false,leftline=false} -\makeatletter\newcommand\ybQuote[3]{% +\makeatletter +\newcommand\ybQuote[3]{% \ifthenelse{\isempty{#3}}{}{ \ifx\hfuzz#2\hfuzz% \index{#3}% @@ -322,7 +348,8 @@ \vspace{-12pt} \end{wrapfigure}% \fi% -}\makeatother +} +\makeatother \RequirePackage{perpage} \RequirePackage[bottom,perpage,multiple]{footmisc} @@ -335,7 +362,8 @@ \yb@oldfootnote{#1}\futurelet\yb@nexttoken\yb@isfootnote} \makeatother -\makeatletter\newcommand\ybPrintBibliography{% +\makeatletter +\newcommand\ybPrintBibliography{% \AtNextBibliography{\small}% \raggedright% \ifdefined\yb@manuscript% @@ -347,7 +375,8 @@ \else \printbibliography \fi -}\makeatother +} +\makeatother \AtBeginDocument{% \raggedbottom% @@ -365,7 +394,6 @@ \newcommand*\theauthor{\textbackslash{}theauthor} \newcommand*\thereviewer{\textbackslash{}thereviewer} - \endinput %% %% End of file `yb-book.cls'. diff --git a/Master/texmf-dist/tex/latex/zugferd/zugferd-invoice.sty b/Master/texmf-dist/tex/latex/zugferd/zugferd-invoice.sty index b5b766ef3ec..aae75f1c362 100644 --- a/Master/texmf-dist/tex/latex/zugferd/zugferd-invoice.sty +++ b/Master/texmf-dist/tex/latex/zugferd/zugferd-invoice.sty @@ -1,5 +1,5 @@ % -% Copyright (C) 2024 Marei Peischl <marei@peitex.de> +% Copyright (C) 2024–2025 Marei Peischl <marei@peitex.de> % --------------------------------------------------------- % % This file may be distributed and/or modified under the @@ -12,7 +12,7 @@ % and version 1.3c or later is part of all distributions of LaTeX % version 2008-05-04 or later. % -\ProvidesExplPackage{zugferd-invoice}{2024-12-08}{0.9c}{Invoice wrapper example package for the factur-x to create ZUGFerD invoices} +\ProvidesExplPackage{zugferd-invoice}{2025-01-02}{0.9d}{Invoice wrapper example package for the factur-x to create ZUGFerD invoices} \keys_define:nn {zugferd/invoice}{ default-vat .tl_set:N = \defaultVAT, diff --git a/Master/texmf-dist/tex/latex/zugferd/zugferd.sty b/Master/texmf-dist/tex/latex/zugferd/zugferd.sty index efbc4351e95..b7ddbf8fa5d 100644 --- a/Master/texmf-dist/tex/latex/zugferd/zugferd.sty +++ b/Master/texmf-dist/tex/latex/zugferd/zugferd.sty @@ -9,7 +9,7 @@ %% Copyright (C) 2023--2024 by Marei Peischl (peiTeX) <marei@peitex.de> %% \NeedsTeXFormat{LaTeX2e}[2023-11-01] -\ProvidesExplPackage{zugferd}{2024-12-08}{0.9c}{Create ZUGFerd invoices using LaTeX} +\ProvidesExplPackage{zugferd}{2025-01-02}{0.9d}{Create ZUGFerd invoices using LaTeX} \tl_new:N \l__zugferd_tmp_tl \str_new:N \g__zugferd_format_str \str_new:N \g__zugferd_businessProcessId_str @@ -78,7 +78,9 @@ xml-file .usage:n = load, auto-exemption .bool_gset:N = \g__zugferd_auto_exemption_bool, auto-exemption .initial:n = true, auto-exemption .default:n = true, -auto-exemption .usage:n =load, +auto-exemption .usage:n = load, +unknown-value-warning .bool_gset:N = \g__zugferd_unknown_value_warning_bool, +unknown-value-warning .initial:n = true, } \char_set_catcode_parameter:N \#% @@ -154,10 +156,13 @@ urn:factur-x:pdfa:CrossIndustryDocument:invoice:1p0\c_hash_str {zugferd} {#2} } \let\SetZugferdData\SetZUGFeRDData +\NewExpandableDocumentCommand{\UseZUGFeRDElement}{m}{ +\tl_use:c {l__zugferd_#1_tl} +} \NewDocumentCommand{\InsertZUGFeRDData}{om}{ \str_case:nnF {#1} { {AddressData} { -\clist_map_inline:nn {name, lineone, linetwo} { +\clist_map_inline:nn {name, lineone, linetwo,linethree} { \prop_if_in:cnT {g__zugferd_#2_AddressData_prop } {##1} { \prop_item:cn {g__zugferd_#2_AddressData_prop } {##1}\\ } @@ -554,7 +559,9 @@ currency / unknown .code:n = { } {\keys_set:nx { zugferd } {unit= {\str_uppercase:f {#1}}}} { +\bool_if:NT \g__zugferd_unknown_value_warning_bool { \msg_warning:nnn { zugferd } {unknown-value} {currency} {#1} +} \tl_set:Ne \l__zugferd_currency_tl {\str_uppercase:f {#1}} } }, @@ -610,25 +617,25 @@ For~more~information~see~the~zugferd~documentation. address .code:n = { \seq_set_split:Nnn \l_tmpa_seq {\\} {##1} \keys_set:nx {zugferd / #1} { -lineone=\seq_item:Nn \l_tmpa_seq {1}, -linetwo=\seq_item:Nn \l_tmpa_seq {2}, -linethree=\seq_item:Nn \l_tmpa_seq {3} +lineone={\seq_item:Nn \l_tmpa_seq {1}}, +linetwo={\seq_item:Nn \l_tmpa_seq {2}}, +linethree={\seq_item:Nn \l_tmpa_seq {3}} } }, contact .code:n = { \seq_set_split:Nnn \l_tmpa_seq {\\} {##1} \int_compare:nNnTF {\seq_count:N \l_tmpa_seq} > {3} { \keys_set:ne {zugferd/#1} { -contact-name = \seq_item:Nn \l_tmpa_seq {1}, -contact-department = \seq_item:Nn \l_tmpa_seq {2}, -contact-phone = \seq_item:Nn \l_tmpa_seq {3}, -contact-email= \seq_item:Nn \l_tmpa_seq {4} +contact-name = {\seq_item:Nn \l_tmpa_seq {1}}, +contact-department = {\seq_item:Nn \l_tmpa_seq {2}}, +contact-phone = {\seq_item:Nn \l_tmpa_seq {3}}, +contact-email= {\seq_item:Nn \l_tmpa_seq {4}}, } }{ \keys_set:ne {zugferd/#1} { -contact-name = \seq_item:Nn \l_tmpa_seq {1}, -contact-phone = \seq_item:Nn \l_tmpa_seq {2}, -contact-email= \seq_item:Nn \l_tmpa_seq {3} +contact-name = {\seq_item:Nn \l_tmpa_seq {1}}, +contact-phone = {\seq_item:Nn \l_tmpa_seq {2}}, +contact-email= {\seq_item:Nn \l_tmpa_seq {3}}, } } }, @@ -697,23 +704,15 @@ unknown .code:n = \tl_if_blank:nF {##1} { \__zugferd_define_xml_content:Nn \__zugferd_PostalTradeAddress:nnnnnnn {% <ram:PostalTradeAddress> \bool_if:NF \g__zugferd_minimum_bool {% -\__zugferd_indent: <ram:PostcodeCode>#1</ram:PostcodeCode> -\tl_if_blank:nF {#2} {% -\__zugferd_indent: <ram:LineOne>#2</ram:LineOne> -}% -\tl_if_blank:nF {#3} {% -\__zugferd_indent: <ram:LineTwo>#3</ram:LineTwo> -}% -\tl_if_blank:nF {#4} {% -\__zugferd_indent: <ram:LineThree>#4</ram:LineThree> -}% -\__zugferd_indent: <ram:CityName>#5</ram:CityName> +\__zugferd_write_inline_i:nn {ram:PostcodeCode} {#1} +\__zugferd_write_inline_i:nn {ram:LineOne} {#2} +\__zugferd_write_inline_i:nn {ram:LineTwo} {#3} +\__zugferd_write_inline_i:nn {ram:LineThree} {#4} +\__zugferd_write_inline_i:nn {ram:CityName} {#5} }% \__zugferd_indent: <ram:CountryID>#6</ram:CountryID> \bool_if:NF \g__zugferd_minimum_bool {% -\tl_if_blank:nF {#7} {% -\__zugferd_indent: <ram:CountrySubDivisionName>#7</ram:CountrySubDivisionName> -}% +\__zugferd_write_inline_i:nn {ram:CountrySubDivisionName} {#7} }% </ram:PostalTradeAddress>% }% @@ -747,19 +746,9 @@ unknown .code:n = \tl_if_blank:nF {##1} { \bool_if:NT \g__zugferd_writeTradeContact_bool {% <ram:DefinedTradeContact> \__zugferd_indent: <ram:PersonName>#1</ram:PersonName> -\tl_if_blank:nF {#2} {% -\__zugferd_indent: <ram:DepartmentName>#2</ram:DepartmentName> -}% -\tl_if_blank:nF {#3} {% -\__zugferd_indent: <ram:TelephoneUniversalCommunication> -\__zugferd_indent:n {2} <ram:CompleteNumber>#3</ram:CompleteNumber> -\__zugferd_indent: </ram:TelephoneUniversalCommunication> -}% -\tl_if_blank:nF {#4} {% -\__zugferd_indent: <ram:EmailURIUniversalCommunication> -\__zugferd_indent:n {2} <ram:URIID>#4</ram:URIID> -\__zugferd_indent: </ram:EmailURIUniversalCommunication> -}% +\__zugferd_write_inline_i:nn {ram:DepartmentName} {#2} +\__zugferd_write_inline_wrapped_i:nnn {ram:TelephoneUniversalCommunication} {ram:CompleteNumber} {#3} +\__zugferd_write_inline_wrapped_i:nnn {ram:EmailURIUniversalCommunication} {ram:URIID} {#4} </ram:DefinedTradeContact>% }% }% @@ -852,10 +841,10 @@ reference / unknown .code:n = { \clist_new:N \g__zugferd_buyer_document_references_clist \keys_define:nn {zugferd} { contract-reference .prop_gput:N = \g__zugferd_document_references_prop, -purchaseorder-reference .prop_gput:N = \g__zugferd_document_references_prop, -purchase-order-reference .meta:n = {purchaseorder-reference=#1}, -salesorder-reference .prop_gput:N = \g__zugferd_document_references_prop, -sales-order-reference .meta:n = {salesorder-reference=#1}, +buyerorder-reference .prop_gput:N = \g__zugferd_document_references_prop, +purchase-order-reference .meta:n = {buyerorder-reference=#1}, +sellerorder-reference .prop_gput:N = \g__zugferd_document_references_prop, +sales-order-reference .meta:n = {sellerorder-reference=#1}, } \cctab_begin:N \g__zugferd_xml_cctab% \__zugferd_define_xml_writer:Nn \__zugferd_write_ReferencedDocument:n {% @@ -902,7 +891,9 @@ payment-means / type .choices:nn = {1,10,30,42,48,49,57,58,59,97} { \tl_gset_eq:NN \g__zugferd_payment_means_tl \l_keys_choice_tl }, payment-means / unknown .code:n = { +\bool_if:NT \g__zugferd_unknown_value_warning_bool { \msg_warning:nnn { zugferd } {unknown-value} {payment-means} {#1} +} \tl_gset:Nn \g__zugferd_payment_means_tl {\int_eval:n {#1}} } } @@ -944,7 +935,9 @@ unit / unknown .code:n = { { \keys_set:ne { zugferd } {unit= {\l_tmpa_tl}} } { +\bool_if:NT \g__zugferd_unknown_value_warning_bool { \msg_warning:nnn { zugferd } {unknown-unit} {#1} +} \tl_set_eq:NN \l__zugferd_unit_code_tl \l_tmpa_tl } }, @@ -1035,8 +1028,11 @@ category / unknown .code:n = { { \keys_set:nx { zugferd } {category= {\str_uppercase:f {#1}}} } { +\tl_set:Ne \l__zugferd_tax_category_code_tl {\str_uppercase:f {#1}} +\bool_if:NT \g__zugferd_unknown_value_warning_bool { \msg_warning:nnn { zugferd } {unknown-tax-category} {#1} } +} }, category .initial:n = S, category .usage:n = general, @@ -1063,6 +1059,15 @@ end-date .initial:n =, <#1#2>#3</#1> } } +\__zugferd_define_xml_content:Nn \__zugferd_write_inline_wrapped:nnnn { +\__zugferd_indent:n {#1} <#2>\__zugferd_xml_newline_indent: +\__zugferd_indent:n {#1+1} <#3>#4</#3>\__zugferd_xml_newline_indent: +\__zugferd_indent:n {#1} </#2> +} +\__zugferd_define_xml_content:Nn \__zugferd_write_inline_wrapped_i:nnn { +\__zugferd_write_inline_wrapped:nnnn {1} {#1} {#2} {#3} +} + \cs_generate_variant:Nn \__zugferd_write_inline:nn {ne} \__zugferd_define_xml_content:Nn \__zugferd_write_inline_i:nnn { \__zugferd_indent: \__zugferd_write_inline:nnn {#1} {#2} {#3} diff --git a/Master/texmf-dist/tex/lualatex/luatbls/luatbls.lua b/Master/texmf-dist/tex/lualatex/luatbls/luatbls.lua new file mode 100644 index 00000000000..5cb1e29ab31 --- /dev/null +++ b/Master/texmf-dist/tex/lualatex/luatbls/luatbls.lua @@ -0,0 +1,373 @@ +--% Kale Ewasiuk (kalekje@gmail.com) +--% 2025-01-05 +--% Copyright (C) 2025 Kale Ewasiuk +--% +--% Permission is hereby granted, free of charge, to any person obtaining a copy +--% of this software and associated documentation files (the "Software"), to deal +--% in the Software without restriction, including without limitation the rights +--% to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +--% copies of the Software, and to permit persons to whom the Software is +--% furnished to do so, subject to the following conditions: +--% +--% The above copyright notice and this permission notice shall be included in +--% all copies or substantial portions of the Software. +--% +--% THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF +--% ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED +--% TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A +--% PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT +--% SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR +--% ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +--% ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +--% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE +--% OR OTHER DEALINGS IN THE SOFTWARE. + + +local luatbls = {} + +luatbls._luakeys = require'luakeys'() + +luatbls._rec_tbl = '' +luatbls._rec_tbl_opts = {} + +luatbls._xysep = '%s+' -- spaces separate x-y coordinates +luatbls._tblv = '<v>' +luatbls._tblk = '<k>' +luatbls._cstemp = 'ltbl<t><k>' +luatbls._debug = false + +function luatbls._dprint(s1, s2) + if luatbls._debug then + penlight.wrth(s1, s1) + end +end + + +setmetatable(luatbls, {__call=function(t,s)return t._get_tbl_item(s) end}) + +function luatbls._get_tbl_name(s) + s = s:strip() + if s == '' then + return luatbls._rec_tbl + end + for _, delim in ipairs{'.', '/', '|'} do + s = s:split(delim)[1] -- if tbl reference had a . | or /, an indexer was used + end + if luatbls[s] == nil then + local validtbls = penlight.List(penlight.tablex.kkeys(luatbls)):filter(function(s) return not s:startswith('_') end):join(', ') + penlight.tex.pkgerror('luatbls', 'Tried to access undefined tbl: "'..s..'". Valid tbls are: '..validtbls) + return luatbls._rec_tbl + end + return s +end + +function luatbls._get_tbl(s) + s = luatbls._get_tbl_name(s) + return luatbls[s] +end + +function luatbls._get_tbl_index(s, undec) + undec = undec or false -- flag for allowing undeclared indexing + local tbl = '' + local key = '' + local s_raw = s + if s:find('%.') then + local tt = s:split('.') + tbl = tt[1] + key = tt[2] + elseif s:find('/') then + local tt = s:split('/') + tbl = tt[1] + if tbl == '' then tbl = luatbls._rec_tbl end + key = tonumber(tonumber(tt[2])) + if key < 0 then key = #luatbls[tbl]+1+key end + else + tbl = luatbls._rec_tbl + key = tonumber(s) or s + if type(key) == 'number' and key < 0 then key = #luatbls[tbl]+1+key end + end + if tbl == '' then tbl = luatbls._rec_tbl end + + if (luatbls[tbl] == nil) or ((not undec) and (luatbls[tbl][key] == nil)) then + penlight.tex.pkgerror('luatbls', 'Invalid tbl index attempt using: "'..s_raw..'". We tried to use tbl="' ..tbl..'" and key="'..key..'"'.. + 'Note that "|" is forbidden here. The recent table is: '..luatbls._rec_tbl) + end + return tbl, key +end + +function luatbls._get_tbl_seq(s) + local tblseq = s:split('|') + local tbl = nil + local seq = nil + if #tblseq == 1 then + tbl = luatbls._get_tbl_name('') + seq = tblseq[1] + if seq == '' then seq = ':,*' end + elseif #tblseq == 2 then + tbl = luatbls._get_tbl_name(tblseq[1]) + seq = tblseq[2] + if seq == '' then seq = ':,*' end + end + return tbl, seq +end + + + +function luatbls._get_tbl_item(s, p) -- get item with string, p means print value + p = p or false + local tbl, key = luatbls._get_tbl_index(s) + local itm = luatbls[tbl][key] + if p then + tex.sprint(tostring(itm)) + end + return itm +end + + +function luatbls._set_tbl_item(s, v) + tbl, key = luatbls._get_tbl_index(s) + luatbls[tbl][key] = v +end + +function luatbls._check_recent_tbl_undefault() + local undefaults = {} + if luatbls._rec_tbl_opts ~= nil then + local defaults = penlight.tablex.union( + luatbls._rec_tbl_opts.defs or {}, + luatbls._rec_tbl_opts.defaults or {} + ) + for k, v in pairs(luatbls[luatbls._rec_tbl]) do + if defaults[k] == nil then + undefaults[#undefaults+1] = k + end + end + if penlight.hasval(undefaults) then + penlight.tex.pkgerror('luatbls', + 'Invalid keys passed to tbl keyval: ' .. (', '):join(undefaults) .. + ' ; choices are: ' .. (', '):join(penlight.tablex.keys(defaults)) + ) + end + end +end + +function luatbls._make_alpha_key(k) + if tonumber(k) ~= nil then + k = penlight.Char(tonumber(k)) + end + return k +end + +function luatbls._make_def_name(t, k, temp) + if temp == penlight.tex.xNoValue then + temp = luatbls._cstemp + end + k = luatbls._make_alpha_key(k) + return temp:gsub('<t>',t):gsub('<k>',k) +end + +function luatbls._def_tbl(ind, def, g) + local _tbl, _key = luatbls._get_tbl_index(ind) + def = luatbls._make_def_name(_tbl, _key, def) + luatbls._def_tbl_one(luatbls[_tbl][_key], def, g) +end + + +function luatbls._def_tbl_some(Ind, def, g) + for t, k, v in luatbls._iter_tbls_vals(Ind) do + local newdef = luatbls._make_def_name(t, k, def) + luatbls._def_tbl_one(v, newdef, g) + end +end + + +function luatbls._def_tbl_one(v, cs, g) + if type(v) == 'table' then + for kk, vv in pairs(v) do + token.set_macro(cs..luatbls._make_alpha_key(kk), tostring(vv), g) + end + else + token.set_macro(cs, tostring(v), g) + end +end + +function luatbls._def_tbl_coords(ind, def) + local tbl, key = luatbls._get_tbl_index(ind) + local str = luatbls[tbl][key] + def = luatbls._make_def_name(tbl, key, def) + local x, y = str:strip():splitv(luatbls._xysep) + if (not penlight.hasval(x)) or (not penlight.hasval(y)) then + penlight.tex.pkgerror('luatbls', '_def_tbl_coords function could not parse coordiantes given as "'..str..'" ensure two numbers separated by space are given!', '', true) + end + token.set_macro(def..'x', tostring(x)) + token.set_macro(def..'y', tostring(y)) +end + + + +function luatbls._make_one_toggle(def, v, g) + tex.sprint(g..'\\providetoggle{'..def..'}') + tex.sprint(g..'\\toggle'..tostring(v)..'{'..def..'}') +end + +function luatbls._make_toggle_tbl(ind, def, g) + g = g or '' + local t, k = luatbls._get_tbl_index(ind) + local v = luatbls[t][k] + def = luatbls._make_def_name(t, k, def) + luatbls._make_one_toggle(def, penlight.hasval(v), g) +end + +function luatbls._make_toggles_tbl(Ind, def, g) + g = g or '' + for t, k, v in luatbls._iter_tbls_vals(Ind) do + if type(v) == 'boolean' then + local newdef = luatbls._make_def_name(t, k, def) + luatbls._make_one_toggle(newdef, v, g) + end + end +end + + +function luatbls._make_one_length(def, v, g) + tex.sprint(g..'\\providenewlength{\\'..def..'}') + tex.sprint(g..'\\deflength{\\'..def..'}{'..v..'}') +end + +function luatbls._make_length_tbl(ind, def, g) + g = g or '' + local t, k = luatbls._get_tbl_index(ind) + local v = luatbls[t][k] + if type(v) == 'number' then + v = tostring(v)..'sp' + end + local def = luatbls._make_def_name(t, k, def) + luatbls._make_one_length(def, v, g) +end + +function luatbls._make_lengths_tbl(Ind, def, g) + g = g or '' + for t, k, v in luatbls._iter_tbls_vals(Ind) do + if type(v) == 'number' then + v = tostring(v)..'sp' + end + if v:istexdim() then + local newdef = luatbls._make_def_name(t, k, def) + luatbls._make_one_length(newdef, v, g) + end + end +end + + + +function luatbls._for_tbl_prt(k, v,cmd) + local cmd_new = cmd:gsub(luatbls._tblv, tostring(v)):gsub(luatbls._tblk, tostring(k)):gsub('(\\%w+) ', '%1') -- for some reason a space gets added to \cs, maybe + luatbls._dprint(cmd_new, '_for_tbl replacement') + tex.sprint(cmd_new) +end + +function luatbls._for_tbl(Ind, cmd) + for t, k, v in luatbls._iter_tbls_vals(Ind) do + luatbls._for_tbl_prt(k, v,cmd) + end +end + +function luatbls._for_tbl_e(tbl, cmd) + for k, v in pairs(tbl) do + luatbls._for_tbl_prt(k, v,cmd) + end +end + + +function luatbls._iter_tbls_vals(s) + if s:find('|') or ((s:find('%.') == nil) and (s:find('/') == nil)) then + local tbl, seq = luatbls._get_tbl_seq(s) + local keyval = {} + for key, val in penlight.seq.tbltrain(luatbls._get_tbl(tbl), seq) do + -- todo this should check validity of keys for sequences + keyval[#keyval+1] = {key, val} + end + luatbls._dprint(keyval, 'luatbls._iter_tbls_vals is iterating through tbl: '..tbl..' with sequence: '..seq) + local i = 0 + return function() + i = i + 1 + if i <= #keyval then + return tbl, keyval[i][1], keyval[i][2] + end + end + else + local tbl, key = luatbls._get_tbl_index(s) + local val = luatbls[tbl][key] + luatbls._dprint(keyval, 'luatbls._iter_tbls_vals is using tbl: '..tbl..' with key: '..key) + local i = 1 + return function() + if i == 1 then + i = i + 1 -- only return the single value + return tbl, key, val + end + end + end +end + +function luatbls._make_args(s, key, val) + local args = {val} + if s == nil then + return args + end + s = s:split(')')[1] + args = luatbls._luakeys.parse(s, {naked_as_value=true}) + for i, v in ipairs(args) do + if v == luatbls._tblv then + args[i] = val + elseif v == luatbls._tblk then + args[i] = key + end + end + return args +end + +function luatbls._make_func(f, key, val) + f = f:strip() + fargs = f:split('(') + f = fargs[1] + args = luatbls._make_args(fargs[2], key, val) + if f:startswith(':') then + f = f:sub(2,-1) + if type(val) == 'string' then + f = string[f] + elseif type(val) == 'table' then + f = penlight.tablex[f] + end + else + f = penlight._Gdot(f) + end + --luatbls._dprint() -- todo more debug printing + return f, args +end + + + +function luatbls._make_newtbl(tblind, newtbl) + if tblind == '' then tblind = luatbls._rec_tbl..'|' end + if newtbl ~= '' then -- determine if new tbl is needed + local ogtbl = luatbls._get_tbl_name(tblind) + luatbls[newtbl] = penlight.tablex.deepcopy(luatbls[ogtbl]) + luatbls._rec_tbl = newtbl + tblind, _ = string.gsub(tblind, ogtbl, newtbl, 1) + end + return tblind +end + +function luatbls._apply_tbl(tblind, func, newtbl) + tblind = luatbls._make_newtbl(tblind, newtbl) + for _, f in pairs(func:split('|')) do + for tbl, key, val in luatbls._iter_tbls_vals(tblind) do + local thefunc, args = luatbls._make_func(f, key, val) + if thefunc == nil then + penlight.tex.pkgerror('luatbls', 'Tried to apply function: "'..f..'" to tbl value. It yielded no function. Ensure : is used for self-methods') + end + luatbls[tbl][key] = thefunc(penlight.utils.unpack(args)) + end + end +end + +return luatbls
\ No newline at end of file diff --git a/Master/texmf-dist/tex/lualatex/luatbls/luatbls.sty b/Master/texmf-dist/tex/lualatex/luatbls/luatbls.sty new file mode 100644 index 00000000000..f52facd7df6 --- /dev/null +++ b/Master/texmf-dist/tex/lualatex/luatbls/luatbls.sty @@ -0,0 +1,184 @@ +% Kale Ewasiuk (kalekje@gmail.com) +% 2025-01-05 +% Copyright (C) 2025 Kale Ewasiuk +% +% Permission is hereby granted, free of charge, to any person obtaining a copy +% of this software and associated documentation files (the "Software"), to deal +% in the Software without restriction, including without limitation the rights +% to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +% copies of the Software, and to permit persons to whom the Software is +% furnished to do so, subject to the following conditions: +% +% The above copyright notice and this permission notice shall be included in +% all copies or substantial portions of the Software. +% +% THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF +% ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED +% TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A +% PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT +% SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR +% ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +% ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE +% OR OTHER DEALINGS IN THE SOFTWARE. + +\RequirePackage{luacode} +\RequirePackage{luakeys} +\RequirePackage{penlightplus} + + +\luadirect{luatbls = require'luatbls'} + + +\NewDocumentCommand{\tblnew}{m}{\luadirect{% initialize a tbl and set empty + luatbls[\luastring{#1}] = {} + luatbls._rec_tbl = \luastring{#1} +}} + + +\NewDocumentCommand{\tblchg}{ m }{\luadirect{% change recent table + luatbls._rec_tbl = luatbls._get_tbl_name(\luastring{#1}) +}} + +\NewDocumentCommand{\tblfrkv}{m +m O{}}{\luadirect{% parse a tbl from key-vals, naked are set to boolean + luatbls._rec_tbl_opts = luatbls._luakeys.parse(\luastring{#3}) + luatbls[\luastring{#1}] = luatbls._luakeys.parse(string.subpar(\luastring{#2}), luatbls._rec_tbl_opts) + luatbls._rec_tbl = \luastring{#1} +}} + +\NewDocumentCommand{\tblfrkvN}{m +m O{}}{\luadirect{% + luatbls._rec_tbl_opts = luatbls._luakeys.parse(\luastring{#3}) + luatbls[\luastring{#1}] = luatbls._luakeys.parse(string.subpar(\luastringN{#2}), luatbls._rec_tbl_opts) + luatbls._rec_tbl = \luastring{#1} +}} + +\NewDocumentCommand{\tblfrcsv}{m +m O{}}{\tblfrkv{#1}{#2}[naked_as_value=true,#3]}% naked are set to array + +\NewDocumentCommand{\tblfrcsvN}{m +m O{}}{\tblfrkvN{#1}{#2}[naked_as_value=true,#3]} + +\NewDocumentCommand{\tblkvundefcheck}{}{\luadirect{luatbls._check_recent_tbl_undefault()}}% check defaults list and throw error if foreign keys were used + + + +\NewDocumentCommand{\tblapp}{m m}{\luadirect{% append to a table (ie using integer index) with a value (second arg) + __tbl__ = luatbls._get_tbl_name(\luastring{#1}) + table.insert(luatbls[__tbl__], \luastring{#2}) +}} + + +\NewDocumentCommand{\tblappN}{m m}{\luadirect{% append to a table (ie using integer index) with a value (second arg) # + __tbl__ = luatbls._get_tbl_name(\luastring{#1}) + table.insert(luatbls[__tbl__], \luastringN{#2}) +}} + + +\NewDocumentCommand{\tblcon}{m m}{\luadirect{% concatenate to a table (ie using integer index) with a list of comma separated values (second arg) # + __tbl__ = luatbls._get_tbl_name(\luastring{#1}) + for k, v in ipairs(luatbls._luakeys.parse(string.subpar(\luastring{#2}), {naked_as_value=true})) do + table.insert(luatbls[__tbl__], v) + end +}} + + +\NewDocumentCommand{\tblconN}{m m}{\luadirect{% concatenate to a table (ie using integer index) with a list of comma separated values (second arg) # + __tbl__ = luatbls._get_tbl_name(\luastring{#1}) + for k, v in ipairs(luatbls._luakeys.parse(string.subpar(\luastringN{#2}), {naked_as_value=true})) do + table.insert(luatbls[__tbl__], v) + end +}} + + +\NewDocumentCommand{\tbladd}{m m}{\luadirect{% add a kv pair to a table + __tbl__, __key__ = luatbls._get_tbl_index(\luastring{#1}, true) + luatbls[__tbl__][__key__] = \luastring{#2} +}} + +\NewDocumentCommand{\tbladdN}{m m}{\luadirect{% add a kv pair to a table + __tbl__, __key__ = luatbls._get_tbl_index(\luastring{#1}, true) + luatbls[__tbl__][__key__] = \luastringN{#2} +}} + + +\NewDocumentCommand{\tblupd}{m m}{\luadirect{% update to a table (ie using integer index) with a list of comma separated values (second arg) # + __tbl__ = luatbls._get_tbl_name(\luastring{#1}) + __tbl_new__ = luatbls._luakeys.parse(string.subpar(\luastring{#2}) + penlight.tablex.update(luatbls[__tbl__], __tbl_new__) +}} + + +\NewDocumentCommand{\tblupdN}{m m}{\luadirect{% update to a table (ie using integer index) with a list of comma separated values (second arg) # + __tbl__ = luatbls._get_tbl_name(\luastring{#1}) + __tbl_new__ = luatbls._luakeys.parse(string.subpar(\luastringN{#2}) + penlight.tablex.update(luatbls[__tbl__], __tbl_new__) +}} + + + + +\NewDocumentCommand{\tblget}{m}{\luadirect{% get an item using i syntax + luatbls._get_tbl_item(\luastring{#1}, true) +}} + +\NewDocumentCommand{\tblgetE}{m}{\luadirect{% get an item explicitly + tex.sprint(tostring(luatbls.#1)) +}} + +\NewDocumentCommand{\tblset}{m m}{\luadirect{% set item with {value} + luatbls._set_tbl_item(\luastring{#1}, \luastring{#2}) +}} + +\NewDocumentCommand{\tblsetN}{m m}{\luadirect{% set item with {value} + luatbls._set_tbl_item(\luastring{#1}, \luastringN{#2}) +}} + +\NewDocumentCommand{\tblsetE}{m m}{\luadirect{luatbls.#1 = #2}}% set item with {value} + + +\NewDocumentCommand{\tblif}{ m m O{}}{\ifluax{luatbls._get_tbl_item(\luastring{#1})}{#2}[#3]} + +\NewDocumentCommand{\tblifv}{m m O{}}{\ifluaxv{luatbls._get_tbl_item(\luastring{#1})}{#2}[#3]} + +\NewDocumentCommand{\tblifeq}{m m m O{}}{\ifluax{luatbls._get_tbl_item(\luastring{#1}) == #2}{#3}[#4]} + + +\NewDocumentCommand{\tblfor}{ m m }{\luadirect{luatbls._for_tbl(\luastring{#1}, \luastring{#2})}} +\NewDocumentCommand{\tblforN}{ m m }{\luadirect{luatbls._for_tbl(\luastring{#1}, \luastringN{#2})}} + +\NewDocumentCommand{\tblforE}{ m m }{\luadirect{luatbls._for_tbl_e(luatbls.#1, \luastring{#2})}} +\NewDocumentCommand{\tblforEN}{ m m }{\luadirect{luatbls._for_tbl_e(luatbls.#1, \luastringN{#2})}} + + +\NewDocumentCommand{\tbldef}{ m o }{\luadirect{luatbls._def_tbl(\luastring{#1}, \luastring{#2})}} +\NewDocumentCommand{\tblgdef}{ m o }{\luadirect{luatbls._def_tbl(\luastring{#1}, \luastring{#2}, 'global')}} + +\NewDocumentCommand{\tbldefs}{ m o }{\luadirect{luatbls._def_tbl_some(\luastring{#1}, \luastring{#2})}} +\NewDocumentCommand{\tblgdefs}{ m o }{\luadirect{luatbls._def_tbl_some(\luastring{#1}, \luastring{#2}, 'global')}} + + + +\ProvideDocumentCommand{\providenewlength}{ m }{\ifdeflength{#1}{}{\newlength{#1}}} + + +\NewDocumentCommand{\tblmaketoggle}{ m o }{\luadirect{luatbls._make_toggle_tbl(\luastring{#1}, \luastring{#2})}} +\NewDocumentCommand{\tblmakegtoggle}{ m o }{\luadirect{luatbls._make_toggle_tbl(\luastring{#1}, \luastring{#2}, '\\global')}} + +\NewDocumentCommand{\tblmaketoggles}{ m o }{\luadirect{luatbls._make_toggles_tbl(\luastring{#1}, \luastring{#2})}} +\NewDocumentCommand{\tblmakegtoggles}{ m o }{\luadirect{luatbls._make_toggles_tbl(\luastring{#1}, \luastring{#2}, '\\global')}} + + +\NewDocumentCommand{\tblmakelength}{ m o }{\luadirect{luatbls._make_length_tbl(\luastring{#1}, \luastring{#2})}} +\NewDocumentCommand{\tblmakeglength}{ m o }{\luadirect{luatbls._make_length_tbl(\luastring{#1}, \luastring{#2}, '\\global')}} + +\NewDocumentCommand{\tblmakelengths}{ m o }{\luadirect{luatbls._make_lengths_tbl(\luastring{#1}, \luastring{#2})}} +\NewDocumentCommand{\tblmakeglengths}{ m o }{\luadirect{luatbls._make_lengths_tbl(\luastring{#1}, \luastring{#2}, '\\global')}} + + +\NewDocumentCommand{\tbldefxy}{ m o }{\luadirect{luatbls._def_tbl_coords(\luastring{#1}, \luastring{#2})}}% define #2x and #2y from a space delimited x-y pair + +\NewDocumentCommand{\tblapply}{m m O{}}{\luadirect{luatbls._apply_tbl(\luastring{#1}, \luastring{#2}, \luastring{#3})}} + +\NewDocumentCommand{\tblprt}{s m}{% + \luadirect{penlight.wrth(luatbls._get_tbl(\luastring{#2}),'luatbls: '..\luastring{#2})}% + \IfBooleanTF{#1}{\PackageError{luatbls}{Program terminated by tblprt*}{}\stop}{}% +} + diff --git a/Master/texmf-dist/tex/luatex/lutabulartools/lutabulartools.lua b/Master/texmf-dist/tex/luatex/lutabulartools/lutabulartools.lua index 92ce2367156..7b1a832bc4f 100644 --- a/Master/texmf-dist/tex/luatex/lutabulartools/lutabulartools.lua +++ b/Master/texmf-dist/tex/luatex/lutabulartools/lutabulartools.lua @@ -1,6 +1,6 @@ --% Kale Ewasiuk (kalekje@gmail.com) ---% 2023-07-22 ---% Copyright (C) 2021-2023 Kale Ewasiuk +--% 2025-01-06 +--% Copyright (C) 2021-2025 Kale Ewasiuk --% --% Permission is hereby granted, free of charge, to any person obtaining a copy --% of this software and associated documentation files (the "Software"), to deal @@ -30,7 +30,7 @@ local lutabt = {} local pl = penlight local T = pl.tablex -lutabt.luakeys = require'luakeys'() -- note: YAMLvars.sty will have checked existence of this already +lutabt.luakeys = require'luakeys'() lutabt.tablelevel = 0 diff --git a/Master/texmf-dist/tex/luatex/lutabulartools/lutabulartools.sty b/Master/texmf-dist/tex/luatex/lutabulartools/lutabulartools.sty index ee36589cd50..0b1041fbfd7 100644 --- a/Master/texmf-dist/tex/luatex/lutabulartools/lutabulartools.sty +++ b/Master/texmf-dist/tex/luatex/lutabulartools/lutabulartools.sty @@ -1,6 +1,6 @@ % Kale Ewasiuk (kalekje@gmail.com) -% 2023-07-22 -% Copyright (C) 2021-2023 Kale Ewasiuk +% 2025-01-06 +% Copyright (C) 2021-2025 Kale Ewasiuk % % Permission is hereby granted, free of charge, to any person obtaining a copy % of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ % OR OTHER DEALINGS IN THE SOFTWARE. \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{lutabulartools}[2023-07-22] +\ProvidesPackage{lutabulartools}[2025-01-06] \RequirePackage{booktabs} \RequirePackage{multirow} @@ -59,8 +59,15 @@ } \NewDocumentCommand{\resetmidruleX}{O{0}}{\luadirect{lutabt.mrX.reset_midruleX(\luastring{#1})}} +\NewCommandCopy{\ltt@RealPackageWarning}{\PackageWarning} +\newcommand*{\ltt@DeactivatePackageWarning}{\renewcommand*{\PackageWarning}[2]{}} +\newcommand*{\ltt@ActivatePackageWarning}{\RenewCommandCopy{\PackageWarning}{\ltt@RealPackageWarning}} -\NewDocumentCommand{\settabular}{s m}{\luadirect{lutabt.set_tabular(\luastring{#2})}} % + +\NewDocumentCommand{\settabular}{s m}{\ltt@DeactivatePackageWarning% + \luadirect{lutabt.set_tabular(\luastring{#2})}% + \ltt@ActivatePackageWarning% +}% \def\ltt@resetrownum{\luadirect{lutabt.reset_rows()}} \def\ltt@resetrownumhard{\luadirect{lutabt.row_num = 0}} diff --git a/Master/texmf-dist/tex/luatex/penlightplus/penlightplus.lua b/Master/texmf-dist/tex/luatex/penlightplus/penlightplus.lua index 9bfc57605a4..4d2f607ed7e 100644 --- a/Master/texmf-dist/tex/luatex/penlightplus/penlightplus.lua +++ b/Master/texmf-dist/tex/luatex/penlightplus/penlightplus.lua @@ -1,6 +1,6 @@ --% Kale Ewasiuk (kalekje@gmail.com) ---% 2024-09-30 ---% Copyright (C) 2021-2024 Kale Ewasiuk +--% 2025-01-06 +--% Copyright (C) 2021-2025 Kale Ewasiuk --% --% Permission is hereby granted, free of charge, to any person obtaining a copy --% of this software and associated documentation files (the "Software"), to deal @@ -42,6 +42,8 @@ if debug ~= nil then end + + -- http://lua-users.org/wiki/SplitJoin -- todo read me!! penlight.tex = {} -- adding a sub-module for tex related stuff @@ -65,6 +67,17 @@ function penlight.hasval(x) -- if something has value end + +function penlight._Gdot(s) + -- return a global with nots + o = _G + for _, a in ipairs(s:split('.')) do + o = o[a] + end + return o +end + + -- Some simple and helpful LaTeX functions -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- xparse defaults @@ -182,6 +195,18 @@ function penlight.tex.pkgerror(pkg, msg1, msg2, stop) end +if not penlight.debug_available then + penlight.tex.pkgwarn('penlightplus', 'lua debug library is not available, recommend re-compiling with the --luadebug option') +end + + +function penlight.tex.errorif(exp, pkg, msg1, msg2, stop) + if penlight.hasval(exp) then + penlight.tex.pkgerror(pkg, msg1, msg2, stop) + end +end + + --definition helpers -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- function penlight.tex.defmacro(cs, val, g) -- , will not work if val contains undefined tokens (so pre-define them if using..) @@ -264,6 +289,8 @@ end -- when nesting commands, this makes it helpful to not worry about brackets penlight.tex._NumBkts = 0 +penlight.tex._EndEnvs = {} + --prt(opencmd('textbf')..opencmd('texttt')..'bold typwriter'..close_bkt_cnt()) function penlight.tex.opencmd(cmd) @@ -291,6 +318,24 @@ end + + +function penlight.tex.openenv(env, opt) + if opt == nil then opt = '' else opt = '['..opt..']' end + tex.sprint('\\begin{' .. env .. '}'..opt) + table.insert(penlight.tex._EndEnvs, 1, '\\end{'..env..'}') +end + +function penlight.tex.closeenv(num) + num = num or #penlight.tex._EndEnvs + for i=1, num do + tex.sprint(penlight.tex._EndEnvs[1]) + table.remove(penlight.tex._EndEnvs, 1) + end +end + + + function penlight.tex.aliasluastring(s, d) s = s:delspace():upper():tolist() d = d:delspace():upper():tolist() @@ -371,11 +416,11 @@ local number = P{"number", function penlight.char(num) - return string.char(string.byte("a")+num-1) + return string.char(string.byte("a")+tonumber(num)-1) end function penlight.Char(num) - return string.char(string.byte("A")+num-1) + return string.char(string.byte("A")+tonumber(num)-1) end @@ -395,6 +440,25 @@ function str_mt.__index.gextract(s, pat) --extract a pattern from string, return return s_extr, s_rem end +function str_mt.__index.gxtrct(s, pat, num, join) --extract a pattern from string, returns both + -- todo a variant where you can specify the number of extractions, and either list of concatenate them would be helpful + local l_extr = penlight.List{} + local s_rem = s + local n = 1 + num = num or 99999 + for e in s:gmatch(pat) do + l_extr = l_extr:append(e) + s_rem = s_rem:gsub(e,'',1) + if n == num then break end + n = n +1 + end + if join then + l_extr = l_extr:join(join) + end + return l_extr, s_rem +end + + function str_mt.__index.gfirst(s, t) -- get the first pattern found from a table of pattern for _, pat in pairs(t) do if string.find(s, pat) then @@ -456,6 +520,17 @@ function str_mt.__index.trimfl(str) return str:sub(2,-2) end +function str_mt.__index.istexdim(str) + for _, u in pairs{'pt', 'mm', 'cm', 'in', 'ex', 'em', 'mu', 'sp'} do + if penlight.hasval(str:delspace():find('^%-?%d*%.?%d+'..u..'$')) then + return true + end + end + return false +end + + + function str_mt.__index.subpar(s, r) r = r or ' ' return (s:gsub('\\par', r)) @@ -475,6 +550,48 @@ function str_mt.__index.parsekv(s, t) -- parsekv string return penlight.luakeys.parse(s, t) end +function str_mt.__index.splitstrip(s, sep, stri) -- + sep = sep or ',' + return penlight.List(s:split(sep)):map(function(x) return penlight.stringx.strip(x, stri) end) +end + + +function str_mt.__index.split2(s, sep1, sep2, stri) -- + sep1 = sep1 or ',' + sep2 = sep2 or '=' + if stri == nil then stri = true end + stri = penlight.hasval(strip) + local splitfunc = string.split + if stri then + splitfunc = string.splitstrip + end + return penlight.List(splitfunc(s,sep1)):map(function(x) return splitfunc(x, sep2) end) +end + + + + +function str_mt.__index.hasnonum(s) + -- string only contains letters and symbols + --assert_string(1,s) -- todo + return string.find(s,'^[%D]+$') == 1 +end + +function str_mt.__index.hasnoalpha(s) + -- string only contains numbers and symbols + --assert_string(1,s) -- todo + return string.find(s,'^[%A]+$') == 1 +end + +function str_mt.__index.isvarlike(s) + -- string is like a variable, does not start with a number, then followd by letter, number, or underscore + --assert_string(1,s) -- todo + return string.find(s,'^[%a_][%w%d_]*$') == 1 +end + + + + -- -- -- -- function stuff function penlight.clone_function(fn) @@ -506,27 +623,28 @@ end function penlight.seq.check_neg_index(i, len, fallback) -i = tostring(i):delspace() -if i == '' then return fallback end -i = tonumber(i) -if i == nil then - local _ = 1*'"Attempted to use seqstr indexing with negative number, but length of list not provided"' - return fallback -- fallback is the number to fall back on if i isn't provided -end -len = tonumber(len) -if i < 0 then - if len == nil then + i = tostring(i):delspace() + if i == '' then return fallback end + i = tonumber(i) + if i == nil then local _ = 1*'"Attempted to use seqstr indexing with negative number, but length of list not provided"' - return pl.utils.raise("Attempted to use seqstr indexing with negative number, but length of list not provided") + return fallback -- fallback is the number to fall back on if i isn't provided end - i = len + 1 + i -- negative index -end -return i + len = tonumber(len) + if i < 0 then + if len == nil then + local _ = 1*'"Attempted to use seqstr indexing with negative number, but length of list not provided"' + return penlight.utils.raise("Attempted to use seqstr indexing with negative number, but length of list not provided") + end + i = len + 1 + i -- negative index + end + return i end penlight.seq.train_element_sep = ',' penlight.seq.train_range_sep = ':' + function penlight.seq.train(s, len) -- parse a range given a string indexer -- syntax is: s = 'i1, i2, r1:r2' where i1 and i2 are individual indexes. @@ -538,8 +656,16 @@ function penlight.seq.train(s, len) local t = penlight.List() -- list of indexes local check_neg = penlight.seq.check_neg_index - for _, r in ipairs(s:split(penlight.seq.train_element_sep)) do - if r:find(penlight.seq.train_range_sep) then + local steps = s:split(penlight.seq.train_element_sep) + --penlight.wrth(steps,'abc') + for _, r in ipairs(steps) do + --penlight.wrth(r,'seq.train = '..s) + r = penlight.stringx.strip(r) + if r == '*' then -- if the string has no numbers and no :, it is a key + t:append(r) + elseif string.isvarlike(r) then -- if the string has no numbers and no :, it is a key + t:append(r) + elseif r:find(penlight.seq.train_range_sep) then r = r:split(penlight.seq.train_range_sep) -- if it's a range t:extend(penlight.List.range(check_neg(r[1], len, 1), check_neg(r[2], len, len), @@ -547,8 +673,8 @@ function penlight.seq.train(s, len) else t:append(check_neg(r, len)) end - end - return t + end +return t end function penlight.seq.itrain(s, len) @@ -563,6 +689,24 @@ end +function penlight.seq.tbltrain(tbl, s) -- iterate over a table using the train syntax + local inds = penlight.seq.train(s, #tbl) -- indexes to use + local star = inds:index('*') + if star ~= nil then + inds:pop(star) + inds:inject(penlight.tablex.kkeys(tbl), star) + end + local i = 0 + return function () + i = i + 1 -- i of indexes + if i <= #inds then + local v = tbl[inds[i]] + --penlight.wrth(v) + --if v == nil then penlight.test.asserteq(v, true) end -- todo make a generic lua error message function + return inds[i], v + end + end +end @@ -598,6 +742,16 @@ end -- table stuff below + +function penlight.tablex.concatenate(t1,t2) + -- todo is this needed + for i=1,#t2 do + t1[#t1+1] = t2[i] + end + return t1 +end + + function penlight.tablex.strinds(t) -- convert indices that are numbers to string indices local t_new = {} for i, v in pairs(t) do -- ensure all indexes are strings @@ -611,6 +765,7 @@ function penlight.tablex.strinds(t) -- convert indices that are numbers to strin end + function penlight.tablex.listcontains(t, v) return penlight.tablex.find(t, v) ~= nil end @@ -642,6 +797,20 @@ function penlight.tablex.fmt(t, fmt, strinds) end +function penlight.tablex.list2comma(t) + t = penlight.List(t) + local s = '' + if #t == 1 then + s = t[1] + elseif #t == 2 then + s = t:join(' and ') + elseif #t >= 3 then + s = t:slice(1,#t-1):join(', ')..', and '..t[#t] + end + return s +end + + function penlight.tablex.map_slice(func, T, j1, j2) if type(j1) == 'string' then return penlight.array2d.map_slice(func, {T}, ','..j1)[1] @@ -653,6 +822,18 @@ end penlight.array2d.map_slice1 = penlight.tablex.map_slice + +function penlight.tablex.kkeys(t) + local keys = {} + for k, _ in penlight.utils.kpairs(t) do + keys[#keys+1] = k + end + return keys +end + + + + -- todo option for multiple filters with AND logic, like the filter files?? function penlight.tablex.filterstr(t, exp, case) -- case = case sensitive @@ -666,6 +847,22 @@ function penlight.tablex.filterstr(t, exp, case) end end + +function penlight.tablex.train(t,seq,reind) + local t_new = {} + local num = 0 + for k, v in penlight.seq.tbltrain(t, seq) do + if reind and type(v) == 'number' then + num = num + 1 + k = num + end + t_new[k] = v + end + return t_new +end + + + --todo add doc function penlight.utils.filterfiles(...) -- f1 is a series of filtering patterns, or condition @@ -802,11 +999,8 @@ end -if not penlight.debug_available then - penlight.tex.pkgwarn('penlight', 'lua debug library is not available, recommend re-compiling with the --luadebug option') -else - penlight.COMP = require'pl.comprehension'.new() -- for comprehensions - +if penlight.debug_available then + penlight.COMP = penlight.comprehension.new() -- for comprehensions local _parse_range = penlight.clone_function(penlight.array2d.parse_range) function penlight.array2d.parse_range(s) -- edit parse range to do numpy string if no letter passed @@ -820,6 +1014,25 @@ end +function penlight.List:inject(l2, pos) + pos = pos or 1 + if pos < 1 then + pos = #self + pos + 1 + end + l2 = penlight.List(l2):reverse() + for i in l2:iter() do + self:insert(pos, i) + end + return self +end + + + + + + + + -- https://tex.stackexchange.com/questions/38150/in-lualatex-how-do-i-pass-the-content-of-an-environment-to-lua-verbatim penlight.tex.recordedbuf = "" @@ -868,6 +1081,14 @@ function penlight.tex.makePDFtablekv(kv) return t_new end +function penlight.tex.updatePDFtable(k, v, o) -- update pdf table + if o == nil then o = true end + k = k:strip():upfirst() + if penlight.hasval(o) or (__PDFmetadata__[k] == nil) then + __PDFmetadata__[penlight.tex.checkPDFkey(k)] = penlight.tex.makePDFvarstr(v) + end +end + penlight.tex.writePDFmetadata = function(t) -- write PDF metadata to xmpdata file t = t or __PDFmetadata__ @@ -908,31 +1129,11 @@ function penlight.tex.makeInTextstr(s) return s end ---todo decide on above or below -function penlight.tex.list2comma(t) - local s = '' - if #t == 1 then - s = t[1] - elseif #t == 2 then - s = t:join(' and ') - elseif #t >= 3 then - s = t:slice(1,#t-1):join(', ')..', and '..t[#t] - end - return s -end -function penlight.tex.split2comma(s, d) - local t = penlight.List(s:split(d)):map(string.strip) - penlight.tex.prt(penlight.tex.list2comma(t)) -end -function penlight.tex.split2items(s, d) - local t = penlight.List(s:split(d)):map(string.strip) - for n, v in ipairs(t) do - penlight.tex.prtn('\\item '..v) - end -end + + function penlight.toggle_luaexpr(expr) @@ -951,7 +1152,7 @@ function penlight.caseswitch(s, c, kv) local sw = kvtbl[c] -- the returned switch if sw == nil then -- if switch not found if s == penlight.tex.xTrue then -- if star, throw error - pl.tex.pkgerror('penlight', 'case: "'..c..'" not found in key-vals: "'..kv..'"') + penlight.tex.pkgerror('penlight', 'case: "'..c..'" not found in key-vals: "'..kv..'"') sw = '' else sw = kvtbl['__'] or '' -- use __ as not found case @@ -962,125 +1163,6 @@ end -penlight.tbls = {} - -penlight.rec_tbl = '' -penlight.rec_tbl_opts = {} - - -function penlight.tbl(s) - return penlight.get_tbl_item(s) -end - -function penlight.get_tbl_name(s) - if s == '' then - return penlight.rec_tbl - end - return s -end - -function penlight.get_tbl(s) - s = penlight.get_tbl_name(s) - return penlight.tbls[s] -end - -function penlight.get_tbl_index(s, undec) - undec = undec or false -- flag for allowing undeclared indexing - local tbl = '' - local key = '' - local s_raw = s - if s:find('%.') then - local tt = s:split('.') - tbl = tt[1] - key = tt[2] - elseif s:find('/') then - local tt = s:split('/') - tbl = tt[1] - if tbl == '' then tbl = penlight.rec_tbl end - key = tonumber(tonumber(tt[2])) - if key < 0 then key = #penlight.tbls[tbl]+1+key end - else - tbl = penlight.rec_tbl - key = tonumber(s) or s - if type(key) == 'number' and key < 0 then key = #penlight.tbls[tbl]+1+key end - end - if tbl == '' then tbl = penlight.rec_tbl end - - if (penlight.tbls[tbl] == nil) or ((not undec) and (penlight.tbls[tbl][key] == nil)) then - penlight.tex.pkgerror('penlightplus', 'Invalid tbl index attempt using: "'..s_raw..'". We tried to use tbl: "' ..tbl..'" and key: "'..key..'"') - end - return tbl, key -end - - -function penlight.get_tbl_item(s, p) -- get item with string, p means print value - p = p or false - local tbl, key = penlight.get_tbl_index(s) - local itm = penlight.tbls[tbl][key] - if p then - tex.sprint(tostring(itm)) - end - return itm -end - - -function penlight.set_tbl_item(s, v) - tbl, key = penlight.get_tbl_index(s) - penlight.tbls[tbl][key] = v -end - -function penlight.check_recent_tbl_undefault() - local undefaults = {} - if penlight.rec_tbl_opts ~= nil then - local defaults = penlight.tablex.union( - penlight.rec_tbl_opts.defs or {}, - penlight.rec_tbl_opts.defaults or {} - ) - for k, v in pairs(penlight.tbls[penlight.rec_tbl]) do - if defaults[k] == nil then - undefaults[#undefaults+1] = k - end - end - if penlight.hasval(undefaults) then - penlight.tex.pkgerror('penlightplus', - 'Invalid keys passed to tbl keyval: ' .. (', '):join(undefaults) .. - ' ; choices are: ' .. (', '):join(penlight.tablex.keys(defaults)) - ) - end - end -end - -function penlight.def_tbl(ind, def, g) - local _tbl, _key = penlight.get_tbl_index(ind) - if def == '' then def = 'dtbl'.._tbl.._key end - token.set_macro(def, tostring(penlight.tbls[_tbl][_key]), g) -end - -function penlight.def_tbl_all(ind, def) - local _tbl = penlight.get_tbl_name(ind) - if def == '' then def = 'dtbl'.._tbl end - for k, v in pairs(penlight.tbls[_tbl]) do - token.set_macro(def..k, tostring(v)) - end -end - --- TODO TODO TODO get error working xy def, and referene which table for key-vals -penlight.tbl_xysep = '%s+' -- spaces separate x-y coordinates -function penlight.def_tbl_coords(ind, def) - local tbl, key = penlight.get_tbl_index(ind) - local str = penlight.tbls[tbl][key] - if def == '' then def = 'dtbl'..tbl..key end - local x, y = str:strip():splitv(penlight.tbl_xysep) - if (not penlight.hasval(x)) or (not penlight.hasval(y)) then - penlight.tex.pkgerror('penlightplus', 'def_tbl_coords function could not parse coordiantes given as "'..str..'" ensure two numbers separated by space are given!', '', true) - end - token.set_macro(def..'x', tostring(x)) - token.set_macro(def..'y', tostring(y)) -end - - - - @@ -1136,3 +1218,69 @@ if penlight.hasval(__PL_GLOBALS__) then end + + + + + + + +-- graveyard + +--todo decide on above or below + + + +penlight.tex.list2comma = penlight.tablex.list2comma + +function penlight.tex.split2comma(s, d) + local t = penlight.List(s:split(d)):map(string.strip) + penlight.tex.prt(penlight.tex.list2comma(t)) +end + +function penlight.tex.split2items(s, d) + local t = penlight.List(s:split(d)):map(string.strip) + for n, v in ipairs(t) do + penlight.tex.prtn('\\item '..v) + end +end + + +-- +--\subsection*{Splitting strings} +--Splitting text (or a cmd) into oxford comma format via: +--\cmd{\splittocomma[expansion level]{text}{text to split on}}: +-- +--\begin{LTXexample}[width=0.3\linewidth] +-- \splittocomma{ j doe }{\and}-\\ +--\splittocomma{ j doe \and s else }{\and}-\\ +--\splittocomma{ j doe \and s else \and a per }{\and}-\\ +--\splittocomma{ j doe \and s else \and a per \and f guy}{\and}- +-- +--\def\authors{j doe \and s else \and a per \and f guy} +--\splittocomma[o]{\authors}{\and} +--\end{LTXexample} +-- +--The expansion level is up to two characters, \cmd{n|o|t|f}, to control the expansion of each argument. +-- +--You can do a similar string split but to \cmd{\item} instead of commas with \cmd{\splittoitems} +--\begin{LTXexample} +--\begin{itemize} +-- \splittoitems{kale\and john}{\and} +-- \splittoitems{kale -john -someone else}{-} +-- \splittoitems{1,2,3,4}{,} +--\end{itemize} +--\end{LTXexample} + + + +-- +--\NewDocumentCommand{\splittocomma}{ O{nn} m m }{% +-- \MakeluastringCommands[nn]{#1}% +-- \luadirect{penlight.tex.split2comma(\plluastringA{#2},\plluastringB{#3})}% +--} +-- +--\NewDocumentCommand{\splittoitems}{ O{NN} m m }{% +-- \MakeluastringCommands[nn]{#1}% +-- \luadirect{penlight.tex.split2items(\plluastringA{#2},\plluastringB{#3})}% +--} diff --git a/Master/texmf-dist/tex/luatex/penlightplus/penlightplus.sty b/Master/texmf-dist/tex/luatex/penlightplus/penlightplus.sty index cc37b096b1b..94b2307dc0d 100644 --- a/Master/texmf-dist/tex/luatex/penlightplus/penlightplus.sty +++ b/Master/texmf-dist/tex/luatex/penlightplus/penlightplus.sty @@ -1,6 +1,6 @@ % Kale Ewasiuk (kalekje@gmail.com) -% 2024-09-30 -% Copyright (C) 2021-2024 Kale Ewasiuk +% 2025-01-06 +% Copyright (C) 2021-2025 Kale Ewasiuk % % Permission is hereby granted, free of charge, to any person obtaining a copy % of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ % OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE % OR OTHER DEALINGS IN THE SOFTWARE. -\ProvidesPackage{penlightplus}[2024-09-30] +\ProvidesPackage{penlightplus}[2025-01-06] \RequirePackage{luacode} \RequirePackage{luakeys} @@ -56,38 +56,30 @@ } + \gdef\luastringT#1{\luastring{\unexpanded\expandafter\expandafter\expandafter{#1}}} % expand luastring twice \global\let\luastringF\luastring % fully expanded luastring - -\xtokcycleenvironment\luastringeenv - {\addcytoks{##1}} - {\processtoks{##1}} - {\addcytoks[1]{##1}} - {\addcytoks{##1}} - {} - {\cytoks\expandafter{\expandafter\luastringO\expandafter{\the\cytoks}}} - -\def\luastringE#1{\luastringeenv#1\endluastringeenv} +% +%\xtokcycleenvironment\luastringeenv +% {\addcytoks{##1}} +% {\processtoks{##1}} +% {\addcytoks[1]{##1}} +% {\addcytoks{##1}} +% {} +% {\cytoks\expandafter{\expandafter\luastringO\expandafter{\the\cytoks}}} +% +%\def\luastringE#1{\luastringeenv#1\endluastringeenv} %\gdef\luastringE#1{\begin{luastringeenv#1\endluastringeenv} + % allow control over expansion of arguments to a latex function \NewDocumentCommand{\MakeluastringCommands}{O{} m }{% #1 the desired commands #2 defaults \luadirect{penlight.tex.aliasluastring(\luastring{#2},\luastring{#1})}% } -\NewDocumentCommand{\splittocomma}{ O{nn} m m }{% - \MakeluastringCommands[nn]{#1}% - \luadirect{penlight.tex.split2comma(\plluastringA{#2},\plluastringB{#3})}% -} - -\NewDocumentCommand{\splittoitems}{ O{NN} m m }{% - \MakeluastringCommands[nn]{#1}% - \luadirect{penlight.tex.split2items(\plluastringA{#2},\plluastringB{#3})}% -} - @@ -99,9 +91,7 @@ \newtoggle{luaexpr}\togglefalse{luaexpr} -\begin{luacode*} -\end{luacode*} \NewDocumentCommand{\ifluax}{m m O{}}{% if lua expression is true do {m} if not [o] \luadirect{penlight.toggle_luaexpr(#1)}% @@ -124,125 +114,3 @@ - -%%% tbls below - -\NewDocumentCommand{\tblnew}{m}{\luadirect{% initialize a tbl and set blank - penlight.tbls[\luastring{#1}] = {} - penlight.rec_tbl = \luastring{#1} -}} - -\NewDocumentCommand{\tblfrkv}{m +m O{}}{\luadirect{% - penlight.rec_tbl_opts = penlight.luakeys.parse(\luastring{#3}) - penlight.tbls[\luastring{#1}] = penlight.luakeys.parse(string.subpar(\luastring{#2}), penlight.rec_tbl_opts) - penlight.rec_tbl = \luastring{#1} -}} - -\NewDocumentCommand{\tblfrkvCD}{m +m O{}}{\tblfrkv{#1}{#2}[#3]\tblkvundefcheck\tbldefall{}{}} -%% tbl from key-vals, then check defaults, then define all keys using default format -\NewDocumentCommand{\tblfrkvNCD}{m +m O{}}{\tblfrkvN{#1}{#2}[#3]\tblkvundefcheck\tbldefall{}{}} - -\NewDocumentCommand{\tblfrkvN}{m +m O{}}{\luadirect{% - penlight.rec_tbl_opts = penlight.luakeys.parse(\luastring{#3}) - penlight.tbls[\luastring{#1}] = penlight.luakeys.parse(string.subpar(\luastringN{#2}), penlight.rec_tbl_opts) - penlight.rec_tbl = \luastring{#1} -}} - -\NewDocumentCommand{\tblfrcsv}{m +m O{}}{\tblfrkv{#1}{#2}[naked_as_value=true,#3]} - -\NewDocumentCommand{\tblfrcsvN}{m +m O{}}{\tblfrkvN{#1}{#2}[naked_as_value=true,#3]} - - -\NewDocumentCommand{\tblkvundefcheck}{}{\luadirect{penlight.check_recent_tbl_undefault()}}% check defaults list and throw error if foreign keys were used - - - -\NewDocumentCommand{\tblapp}{m m}{\luadirect{% append to a table (ie using integer index) with a value (second arg) # todo option for string or number - __tbl__ = penlight.get_tbl_name(\luastring{#1}) - table.insert(penlight.tbls[__tbl__], \luastring{#2}) -}} - - -\NewDocumentCommand{\tblappN}{m m}{\luadirect{% append to a table (ie using integer index) with a value (second arg) # todo option for string or number - __tbl__ = penlight.get_tbl_name(\luastring{#1}) - table.insert(penlight.tbls[__tbl__], \luastringN{#2}) -}} - - -\NewDocumentCommand{\tblcon}{m m}{\luadirect{% concatenate to a table (ie using integer index) with a list of comma separated values (second arg) # - __tbl__ = penlight.get_tbl_name(\luastring{#1}) - for k, v in ipairs(penlight.luakeys.parse(string.subpar(\luastring{#2}), {naked_as_value=true})) do - table.insert(penlight.tbls[__tbl__], v) - end -}} - - -\NewDocumentCommand{\tblconN}{m m}{\luadirect{% concatenate to a table (ie using integer index) with a list of comma separated values (second arg) # - __tbl__ = penlight.get_tbl_name(\luastring{#1}) - for k, v in ipairs(penlight.luakeys.parse(string.subpar(\luastringN{#2}), {naked_as_value=true})) do - table.insert(penlight.tbls[__tbl__], v) - end -}} - -\NewDocumentCommand{\tbladd}{m m}{\luadirect{% add a kv pair to a table - __tbl__, __key__ = penlight.get_tbl_index(\luastring{#1}, true) - penlight.tbls[__tbl__][__key__] = \luastring{#2} -}} - -\NewDocumentCommand{\tbladdN}{m m m}{\luadirect{% add a kv pair to a table - __tbl__, __key__ = penlight.get_tbl_index(\luastring{#1}, true) - penlight.tbls[__tbl__][__key__] = \luastringN{#2} -}} - - - - -\NewDocumentCommand{\tblchg}{ m }{\luadirect{% change recent table - penlight.rec_tbl = \luastring{#1} -}} - - -\NewDocumentCommand{\tblget}{m}{\luadirect{% get an item - penlight.get_tbl_item(\luastring{#1}, true) -}} - -\NewDocumentCommand{\tblset}{m m}{\luadirect{% set item with {value} - penlight.set_tbl_item(\luastring{#1}, \luastring{#2}) -}} - -\NewDocumentCommand{\tblsetN}{m m}{\luadirect{% set item with {value} - penlight.set_tbl_item(\luastring{#1}, \luastringN{#2}) -}} - - -\NewDocumentCommand{\tbldef}{ m m }{\luadirect{penlight.def_tbl(\luastring{#1}, \luastring{#2})}} - -% define a table, use * to make global definition -\NewDocumentCommand{\tblgdef}{ m m }{\luadirect{penlight.def_tbl(\luastring{#1}, \luastring{#2}, 'global')}} - -\NewDocumentCommand{\tbldefall}{ m m }{\luadirect{penlight.def_tbl_all(\luastring{#1}, \luastring{#2})}} - -\NewDocumentCommand{\tbldefxy}{ m m }{\luadirect{penlight.def_tbl_coords(\luastring{#1}, \luastring{#2})}}% define #2x and #2y from a space delimited x-y pair - -\NewDocumentCommand{\tblif}{m m O{}}{\ifluax{penlight.get_tbl_item(\luastring{#1})}{#2}[#3]} - -\NewDocumentCommand{\tblifv}{m m O{}}{\ifluaxv{penlight.get_tbl_item(\luastring{#1})}{#2}[#3]} - -\NewDocumentCommand{\tblprt}{m}{\luadirect{penlight.wrth(penlight.get_tbl(\luastring{#1}),'penlightplus table: '..\luastring{#1})}} - - - - -% legacy code, delete this -\let\kvtblundefcheck\tblkvundefcheck - -\NewDocumentCommand{\tbladdo}{m m m}{\luadirect{% add a kv pair to a table - __tbl__ = penlight.get_tbl_name(\luastring{#1}) - penlight.tbls[__tbl__][\luastring{#2}] = \luastring{#3} -}} - -\NewDocumentCommand{\tbladdNo}{m m m}{\luadirect{% add a kv pair to a table - __tbl__ = penlight.get_tbl_name(\luastring{#1}) - penlight.tbls[__tbl__][\luastring{#2}] = \luastringN{#3} -}} - diff --git a/Master/texmf-dist/tex/plain/cweb/cwebacromac.tex b/Master/texmf-dist/tex/plain/cweb/cwebacromac.tex index c1cd4a9f631..6ec27777fdd 100644 --- a/Master/texmf-dist/tex/plain/cweb/cwebacromac.tex +++ b/Master/texmf-dist/tex/plain/cweb/cwebacromac.tex @@ -1,6 +1,6 @@ % hypertext macros for CWEB listings (in addition to cwebmac.tex) % Used in cwebmac.tex, pdfctwimac.tex, pdfproofmac.tex -% Version 3.0 --- August 2024 +% Version 3.1 --- January 2025 \ifx\ifacrohint\undefined\endinput\fi % these are not standalone macros \ifluatex % LuaTeX is almost like pdfTeX diff --git a/Master/texmf-dist/tex/plain/cweb/cwebmac.tex b/Master/texmf-dist/tex/plain/cweb/cwebmac.tex index 53454300a9a..2b7b14bf07a 100644 --- a/Master/texmf-dist/tex/plain/cweb/cwebmac.tex +++ b/Master/texmf-dist/tex/plain/cweb/cwebmac.tex @@ -1,7 +1,7 @@ % standard macros for CWEB listings (in addition to plain.tex) -% Version 4.12 --- August 2024 +% Version 4.12.1 --- January 2025 \ifx\renewenvironment\undefined\else\endinput\fi % LaTeX will use other macros -\xdef\fmtversion{\fmtversion+CWEB4.12} +\xdef\fmtversion{\fmtversion+CWEB4.12.1} \chardef\cwebversion=4 \chardef\cwebrevision=12 \parskip 0pt % no stretch between paragraphs diff --git a/Master/texmf-dist/tex/xelatex/bidi/adjmulticol-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/adjmulticol-xetex-bidi.def index 41684570785..ed0c6d32296 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/adjmulticol-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/adjmulticol-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/algorithm2e-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/algorithm2e-xetex-bidi.def index d4c3abc598c..bc927a4be41 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/algorithm2e-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/algorithm2e-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,12 +37,12 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{algorithm2e-xetex-bidi.def}[2018/09/23 v0.2 bidi adaptations for algorithm2e package for XeTeX engine] +\ProvidesFile{algorithm2e-xetex-bidi.def}[2025/01/03 v0.3 bidi adaptations for algorithm2e package for XeTeX engine] \expandafter\ifx\csname algocf@within\endcsname\relax% if \algocf@within doesn't exist \else% else \renewcommand\thealgocf{\csname the\algocf@within\endcsname\@SepMark\@arabic\c@algocf}% \fi -\@ifpackageloaded{color}{}{% +\ApplyPatchIfPackageLoadedF{color}{% \bidi@patchcmd{\@algocf@start}{\bgroup}{% \bgroup \if@RTL @@ -68,6 +68,16 @@ \fi }{}{} } + +\@ifpackagewith{algorithm2e}{algonl}{% +\renewcommand{\theAlgoLine}{\expandafter\csname the\algocf@float\endcsname\@SepMark\arabic{AlgoLine}}% +}{} + +\@ifpackagewith{algorithm2e}{algopart}{\renewcommand{\algocf@within}{part}}{} + +\@ifpackagewith{algorithm2e}{algochapter}{\renewcommand{\algocf@within}{chapter}}{} + +\@ifpackagewith{algorithm2e}{algosection}{\renewcommand{\algocf@within}{section}}{} \endinput %% %% End of file `algorithm2e-xetex-bidi.def'. diff --git a/Master/texmf-dist/tex/xelatex/bidi/amsart-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/amsart-xetex-bidi.def index c0c881cb617..82ea851b5c5 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/amsart-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/amsart-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/amsbook-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/amsbook-xetex-bidi.def index 1a8c9fea713..73c520e4541 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/amsbook-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/amsbook-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/amsmath-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/amsmath-xetex-bidi.def index 23c6866b379..9e87131208d 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/amsmath-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/amsmath-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/amstext-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/amstext-xetex-bidi.def index 8486d9f3ca4..6b41eaa3c99 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/amstext-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/amstext-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/amsthm-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/amsthm-xetex-bidi.def index 6337b1265af..40ff2470274 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/amsthm-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/amsthm-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/array-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/array-xetex-bidi.def index 5fccc45ed53..69ea83de7a1 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/array-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/array-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/article-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/article-xetex-bidi.def index 8ab284b544e..a46e080cc30 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/article-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/article-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,8 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{article-xetex-bidi.def}[2024/12/07 v0.7 bidi adaptations for standard article class for XeTeX engine] +\ProvidesFile{article-xetex-bidi.def}[2025/01/05 v0.9 bidi adaptations for standard article class for XeTeX engine] +\IfClassLoadedT{svmult}{\endinput} \if@titlepage \renewcommand\maketitle{\begin{titlepage}% \let\footnotesize\small @@ -196,9 +197,15 @@ \nobreak \vskip 3ex \@afterheading} -\bidi@patchcmd\@spart\raggedright{% - \if@RTL\raggedleft\else\raggedright\fi -}{}{\bidi@warningnoline{Oops! patching `\string\@spart' failed}} +\ApplyPatchIfPackageLoaded{nameref}{% + \bidi@patchcmd\NR@spart\raggedright{% + \if@RTL\raggedleft\else\raggedright\fi + }{}{\bidi@warningnoline{Oops! patching `\string\NR@spart' failed}}% +}{% + \bidi@patchcmd\@spart\raggedright{% + \if@RTL\raggedleft\else\raggedright\fi + }{}{\bidi@warningnoline{Oops! patching `\string\@spart' failed}}% +} \renewenvironment{thebibliography}[1] {\section*{\refname}% \@mkboth{\MakeUppercase\refname}{\MakeUppercase\refname}% diff --git a/Master/texmf-dist/tex/xelatex/bidi/artikel1-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/artikel1-xetex-bidi.def index b32d359eff9..5e61fa7d492 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/artikel1-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/artikel1-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/artikel2-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/artikel2-xetex-bidi.def index df423997d4c..237d6e577aa 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/artikel2-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/artikel2-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/artikel3-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/artikel3-xetex-bidi.def index c2ae3f55062..df7a573afa6 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/artikel3-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/artikel3-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/arydshln-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/arydshln-xetex-bidi.def index c2c47f6944a..97dc0bd511c 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/arydshln-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/arydshln-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{arydshln-xetex-bidi.def}[2010/08/01 v0.2 bidi adaptations for arydshln package for XeTeX engine] +\ProvidesFile{arydshln-xetex-bidi.def}[2025/01/03 v0.3 bidi adaptations for arydshln package for XeTeX engine] \def\endarray{\adl@endarray \egroup \adl@arrayrestore \if@RTLtab\egroup\endR\egroup\fi\egroup} \def\endtabular{\endarray $\if@RTLtab\endR\fi\egroup} \expandafter\let\csname endtabular*\endcsname\endtabular @@ -125,7 +125,7 @@ \def\adl@class@start{6} \def\adl@class@iiiorvii{3} \fi -\@ifpackageloaded{colortbl}{% +\ApplyPatchCodeToPackage{colortbl}{% \def\adl@inactivate{\adl@org@inactivate \let\CT@setup\adl@CT@setup} \def\adl@activate{\adl@org@activate \let\CT@setup\adl@act@CT@setup \let\@endpbox\adl@org@endpbox} @@ -171,7 +171,7 @@ \prepnext@tok} \let\adl@act@classz\@classz \let\adl@org@classz\@classz -}{} +} \endinput %% %% End of file `arydshln-xetex-bidi.def'. diff --git a/Master/texmf-dist/tex/xelatex/bidi/beamer-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/beamer-xetex-bidi.def index 064b7e66052..c153f205055 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/beamer-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/beamer-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/beamerbaseauxtemplates-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/beamerbaseauxtemplates-xetex-bidi.def index c2373267ea6..2f8e572deba 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/beamerbaseauxtemplates-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/beamerbaseauxtemplates-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{beamerbaseauxtemplates-xetex-bidi.def}[2024/12/20 v0.4 bidi adaptations for beamerbaseauxtemplates package for XeTeX engine] +\ProvidesFile{beamerbaseauxtemplates-xetex-bidi.def}[2025/01/03 v0.5 bidi adaptations for beamerbaseauxtemplates package for XeTeX engine] \bidi@csundef{beamer@@tmpop@subsection in toc@sections numbered} \bidi@csundef{beamer@@tmpop@subsubsection in toc@sections numbered} @@ -347,14 +347,14 @@ \end{minipage} } -\@ifpackageloaded{caption}{% +\ApplyPatchCodeToPackage{caption}{% \DeclareCaptionFont{beamer@font}{% \usebeamerfont*{caption}% } \SetCaptionDefault{font}{beamer@font} \DeclareCaptionJustification{bidi@beamer@ragged}{\bidi@beamer@ragged} \SetCaptionDefault{justification}{bidi@beamer@ragged} -}{} +} \endinput %% diff --git a/Master/texmf-dist/tex/xelatex/bidi/beamerbaseboxes-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/beamerbaseboxes-xetex-bidi.def index 132879f3f42..31a7828c862 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/beamerbaseboxes-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/beamerbaseboxes-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/beamerbasecolor-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/beamerbasecolor-xetex-bidi.def index f050010bc99..5b1f8fcf432 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/beamerbasecolor-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/beamerbasecolor-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/beamerbasecompatibility-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/beamerbasecompatibility-xetex-bidi.def index d20b40806ea..1bee7f7b193 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/beamerbasecompatibility-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/beamerbasecompatibility-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/beamerbaseframecomponents-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/beamerbaseframecomponents-xetex-bidi.def index d49a0aba820..2241c8c5fa6 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/beamerbaseframecomponents-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/beamerbaseframecomponents-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -98,7 +98,7 @@ \usebeamertemplate***{sidebar left}% \vfil% }}% - \@ifpackageloaded{beamerinnerthemeinmargin}{}{% + \ApplyPatchIfPackageLoadedF{beamerinnerthemeinmargin}{% \hskip-\textwidth }% \fi diff --git a/Master/texmf-dist/tex/xelatex/bidi/beamerbaseframesize-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/beamerbaseframesize-xetex-bidi.def index 15783375ea7..18c5ab1a455 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/beamerbaseframesize-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/beamerbaseframesize-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/beamerbaselocalstructure-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/beamerbaselocalstructure-xetex-bidi.def index df17bdcfaa6..3ddc5859c99 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/beamerbaselocalstructure-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/beamerbaselocalstructure-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/beamerbasemisc-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/beamerbasemisc-xetex-bidi.def index f3ca4370977..12402fd48ae 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/beamerbasemisc-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/beamerbasemisc-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/beamerbasenavigation-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/beamerbasenavigation-xetex-bidi.def index d469b764793..450f72da274 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/beamerbasenavigation-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/beamerbasenavigation-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/beamerbaseoverlay-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/beamerbaseoverlay-xetex-bidi.def index f2fafc289c4..ad9eae4c040 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/beamerbaseoverlay-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/beamerbaseoverlay-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/beamerinnerthemecircles-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/beamerinnerthemecircles-xetex-bidi.def index 646fdf13251..b638249888d 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/beamerinnerthemecircles-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/beamerinnerthemecircles-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/beamerinnerthemedefault-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/beamerinnerthemedefault-xetex-bidi.def index 83fd2318178..1ec164cdd01 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/beamerinnerthemedefault-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/beamerinnerthemedefault-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/beamerinnerthemefocus-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/beamerinnerthemefocus-xetex-bidi.def index 15dcb692355..7a220d531fd 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/beamerinnerthemefocus-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/beamerinnerthemefocus-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/beamerinnerthemeinmargin-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/beamerinnerthemeinmargin-xetex-bidi.def index d1bac306312..033a05a6d6f 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/beamerinnerthemeinmargin-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/beamerinnerthemeinmargin-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/beamerinnerthememetropolis-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/beamerinnerthememetropolis-xetex-bidi.def index 88e43639b7f..4761ef3a3f6 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/beamerinnerthememetropolis-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/beamerinnerthememetropolis-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/beamerinnerthemerectangles-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/beamerinnerthemerectangles-xetex-bidi.def index e2d92784c03..1d2b9667a95 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/beamerinnerthemerectangles-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/beamerinnerthemerectangles-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/beamerinnerthemerounded-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/beamerinnerthemerounded-xetex-bidi.def index f5e4c3d41be..0dfd555b9a1 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/beamerinnerthemerounded-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/beamerinnerthemerounded-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/beamerouterthemedefault-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/beamerouterthemedefault-xetex-bidi.def index a3d74fb2287..5d4d4f16d17 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/beamerouterthemedefault-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/beamerouterthemedefault-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/beamerouterthemefocus-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/beamerouterthemefocus-xetex-bidi.def index 84a05f11dfc..a06e5c61a2c 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/beamerouterthemefocus-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/beamerouterthemefocus-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/beamerouterthemeinfolines-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/beamerouterthemeinfolines-xetex-bidi.def index 2d8b5addeeb..1754079d511 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/beamerouterthemeinfolines-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/beamerouterthemeinfolines-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/beamerouterthememetropolis-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/beamerouterthememetropolis-xetex-bidi.def index a92f5d2b77a..9b49fcaf96e 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/beamerouterthememetropolis-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/beamerouterthememetropolis-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/beamerouterthememiniframes-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/beamerouterthememiniframes-xetex-bidi.def index ff29d4e3bf5..c2c58d19a7d 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/beamerouterthememiniframes-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/beamerouterthememiniframes-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/beamerouterthemeshadow-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/beamerouterthemeshadow-xetex-bidi.def index 28ed525bd82..1176c23b169 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/beamerouterthemeshadow-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/beamerouterthemeshadow-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/beamerouterthemesidebar-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/beamerouterthemesidebar-xetex-bidi.def index f7bb6401432..090a4c0db27 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/beamerouterthemesidebar-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/beamerouterthemesidebar-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/beamerouterthemesmoothbars-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/beamerouterthemesmoothbars-xetex-bidi.def index 711f7be46ad..dd3ee51fbe5 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/beamerouterthemesmoothbars-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/beamerouterthemesmoothbars-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/beamerouterthemesmoothtree-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/beamerouterthemesmoothtree-xetex-bidi.def index 7f713ee3cd8..b86803f8774 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/beamerouterthemesmoothtree-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/beamerouterthemesmoothtree-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/beamerouterthemesplit-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/beamerouterthemesplit-xetex-bidi.def index cd6711cacf5..8d9a5451ad8 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/beamerouterthemesplit-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/beamerouterthemesplit-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/beamerouterthemetree-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/beamerouterthemetree-xetex-bidi.def index 3034a391839..cd41b406430 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/beamerouterthemetree-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/beamerouterthemetree-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/beamerthemeHannover-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/beamerthemeHannover-xetex-bidi.def index 4c79e21fe41..cda888e051e 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/beamerthemeHannover-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/beamerthemeHannover-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/beamerthemeSingapore-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/beamerthemeSingapore-xetex-bidi.def index 22f1d39d7ce..74ce05fb24b 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/beamerthemeSingapore-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/beamerthemeSingapore-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidi-bibitem.pdf b/Master/texmf-dist/tex/xelatex/bidi/bidi-bibitem.pdf Binary files differnew file mode 100644 index 00000000000..49191743021 --- /dev/null +++ b/Master/texmf-dist/tex/xelatex/bidi/bidi-bibitem.pdf diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidi-media9.sty b/Master/texmf-dist/tex/xelatex/bidi/bidi-media9.sty index 4d2a12980cc..e51763370b7 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/bidi-media9.sty +++ b/Master/texmf-dist/tex/xelatex/bidi/bidi-media9.sty @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidi-perpage.sty b/Master/texmf-dist/tex/xelatex/bidi/bidi-perpage.sty index 35b542d6d8e..c660868b6c2 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/bidi-perpage.sty +++ b/Master/texmf-dist/tex/xelatex/bidi/bidi-perpage.sty @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidi.sty b/Master/texmf-dist/tex/xelatex/bidi/bidi.sty index 7afe905f444..1e63bfaf4d7 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/bidi.sty +++ b/Master/texmf-dist/tex/xelatex/bidi/bidi.sty @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -38,9 +38,9 @@ %% Right brace \} Tilde \~} %% \NeedsTeXFormat{LaTeX2e} -\def\bididate{2024/12/28} -\def\bidi@version{40.8} -\def\bidi@releasename{William Paul Thurston} +\def\bididate{2025/01/08} +\def\bidi@version{41.5} +\def\bidi@releasename{Maryam Mirzakhani} \newcommand*{\bidireleasename}{\bidi@releasename} \ProvidesPackage{bidi}[\bididate\space v\bidi@version\space (Release \bidi@releasename)\space Bidirectional typesetting in plain TeX and LaTeX] @@ -255,7 +255,7 @@ Bidirectional typesetting in plain TeX and LaTeX] } \newcommand*{\@bidi@pdfcustomproperties}{% This is the bidi package, Version \bidi@version\space (Release \bidi@releasename), - Released December 28, 2024. + Released January 8, 2025. } \newcommand*{\bidi@beamer@ragged}{} \@RTLmainfalse @@ -348,7 +348,6 @@ Bidirectional typesetting in plain TeX and LaTeX] \ExplSyntaxOff \@onlypreamble\pdfencryptsetup \input{latex-xetex-bidi.def} -\input{loadingorder-xetex-bidi.def} \pdfencryptsetup{% userpassword,% diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidi.tex b/Master/texmf-dist/tex/xelatex/bidi/bidi.tex index b08f0406267..c60ac3563dd 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/bidi.tex +++ b/Master/texmf-dist/tex/xelatex/bidi/bidi.tex @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,10 +37,10 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\def\bididate{2024/12/28} +\def\bididate{2025/01/08} \catcode`@=11 -\def\bidi@version{40.8} -\def\bidi@releasename{William Paul Thurston} +\def\bidi@version{41.5} +\def\bidi@releasename{Maryam Mirzakhani} \def\bidireleasename{\bidi@releasename} \let \protect \relax \newlinechar`\^^J @@ -154,7 +154,7 @@ } \def\@bidi@pdfcustomproperties{% This is the bidi package, Version \bidi@version\space (Release \bidi@releasename), - Released December 28, 2024. + Released January 8, 2025. } \def\bidi@pdfm@mark{% \special{pdf:% diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidi2in1.sty b/Master/texmf-dist/tex/xelatex/bidi/bidi2in1.sty index 2718fcd5d6e..7ac469c1d79 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/bidi2in1.sty +++ b/Master/texmf-dist/tex/xelatex/bidi/bidi2in1.sty @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidicode.sty b/Master/texmf-dist/tex/xelatex/bidi/bidicode.sty index 983fad42f7f..ce664419284 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/bidicode.sty +++ b/Master/texmf-dist/tex/xelatex/bidi/bidicode.sty @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidiftnxtra.sty b/Master/texmf-dist/tex/xelatex/bidi/bidiftnxtra.sty index 13e65f58a29..be4e6ba063c 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/bidiftnxtra.sty +++ b/Master/texmf-dist/tex/xelatex/bidi/bidiftnxtra.sty @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidimoderncv.cls b/Master/texmf-dist/tex/xelatex/bidi/bidimoderncv.cls index 289ebb6dfbf..fba86860069 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/bidimoderncv.cls +++ b/Master/texmf-dist/tex/xelatex/bidi/bidimoderncv.cls @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidipoem.sty b/Master/texmf-dist/tex/xelatex/bidi/bidipoem.sty index 2462d368f28..5af06826dc2 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/bidipoem.sty +++ b/Master/texmf-dist/tex/xelatex/bidi/bidipoem.sty @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/biditools.sty b/Master/texmf-dist/tex/xelatex/bidi/biditools.sty index 21e39381db5..22035645933 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/biditools.sty +++ b/Master/texmf-dist/tex/xelatex/bidi/biditools.sty @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -38,7 +38,7 @@ %% Right brace \} Tilde \~} %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{biditools}[2024/12/07 v2.4 Programming tools for bidi package] +\ProvidesPackage{biditools}[2025/01/03 v2.6 Programming tools for bidi package] \providecommand{\@bidi@saveprimitive}[2]{\begingroup\escapechar`\\\relax \edef\@tempa{\string#1}\edef\@tempb{\meaning#1}% \ifx\@tempa\@tempb \global\let#2#1% @@ -124,12 +124,6 @@ Old form `\string#1' should be \string\begin{\expandafter\@gobble\string#1}% ill-advised in the old versions of bidi package.% }% } -\def\@tagsextension{clo} -\def\@definitionfileextension{def} -\def\@texfileextension{tex} -\def\@iftagsloaded{\@ifl@aded\@tagsextension} -\def\@ifdefinitionfileloaded{\@ifl@aded\@definitionfileextension} -\def\@iftexfileloaded{\@ifl@aded\@texfileextension} \def\eqnewif#1#2{% \count@\escapechar \escapechar\m@ne \let#1\iffalse @@ -761,14 +755,6 @@ ill-advised in the old versions of bidi package.% \catcode\number`\@=\the\catcode`\@\relax}% \bidi@resrvda} -\newcommand\bidi@isloaded[2][]{ - \expandafter\ifx\csname if@bidi@#2loaded@\endcsname\relax - \expandafter\newif\csname if@bidi@#2loaded@\endcsname - \fi - \@ifpackageloaded{#2} - {\csname @bidi@#2loaded@true\endcsname #1} - {\csname @bidi@#2loaded@false\endcsname}} - \protected\def\bidi@ifscanable#1{% \begingroup \edef\bidi@resrvda{% @@ -1325,435 +1311,270 @@ ill-advised in the old versions of bidi package.% -\renewcommand{\InputIfFileExists}[2]{% - \begingroup\expandafter\expandafter\expandafter\endgroup - \expandafter\ifx\csname #1-@bidi@alias\endcsname\relax - \expandafter\@secondoftwo - \else - \bidi@replacefile@msg{\csname #1-@bidi@alias\endcsname}{#1}% - \expandafter\@firstoftwo - \fi - {% - \expandafter\InputIfFileExists\expandafter{\csname - #1-@bidi@alias\endcsname}{#2}% - }% - {\IfFileExists{#1}{% - \bidi@load@hook{before}{#1}% - #2\@addtofilelist{#1}% - \@@input \@filef@und - \bidi@load@hook{after}{#1}% - }}% -} +\ExplSyntaxOn +\NewDocumentCommand \bidi@AfterClass { s m o +m } + { + \IfBooleanTF { #1 } + { + \@ifclassloaded{ #2 } + { #4 } + { + \hook_gput_code:nnn + { file / #2.\@clsextension / after } + { #3 } + { #4 } + } + } + { + \hook_gput_code:nnn { file / #2.\@clsextension / after } { #3 } { #4 } + } + } -\newcommand*{\bidi@@loadwithoptions}{} -\newcommand*{\bidi@loadwithoptions}{} -\let\bidi@loadwithoptions\@loadwithoptions +\seq_new:N \g__biditools_input_file_seq -\renewcommand*{\@loadwithoptions}[3]{% - \begingroup\expandafter\expandafter\expandafter\endgroup - \expandafter\ifx\csname #3.#1-@bidi@aliasname\endcsname\relax - \def\bidi@@loadwithoptions{\bidi@loadwithoptions{#1}{#2}{#3}}% - \else - \bidi@replacefile@msg{\csname #3.#1-@bidi@aliasname\endcsname.#1}{#3.#1}% - \def\bidi@@loadwithoptions{% - \@loadwithoptions{#1}{#2}{\csname #3.#1-@bidi@aliasname\endcsname}% - }% - \fi - \bidi@@loadwithoptions -} +\prg_new_protected_conditional:Npnn \__bidi_if_loading:n #1 { T, F, TF } + { + \str_set:Nx \l_tmpa_str { #1 } + \seq_if_in:NxTF \g__biditools_input_file_seq { \str_use:N \l_tmpa_str } + { \prg_return_true: } + { \prg_return_false: } + } -\newcommand*{\bidi@onefilewithoptions}{} -\let\bidi@onefilewithoptions\@onefilewithoptions -\def\@onefilewithoptions#1[#2][#3]#4{% - \begingroup\expandafter\expandafter\expandafter\endgroup - \expandafter\ifx\csname #1.#4-@bidi@aliasname\endcsname\relax - \def\bidi@@onefilewithoptions{\bidi@onefilewithoptions{#1}}% - \else - \bidi@replacefile@msg{\csname #1.#4-@bidi@aliasname\endcsname.#4}{#1.#4}% - \edef\bidi@@onefilewithoptions{% - \noexpand\@onefilewithoptions{\csname #1.#4-@bidi@aliasname\endcsname}}% - \fi - \bidi@@onefilewithoptions[{#2}][{#3}]{#4}% - \bidi@load@hook{lateafter}{#1.#4}% -} +\prg_new_protected_conditional:Npnn \bidi_if_class_loaded:n #1 { T, F, TF } + { + \@ifclassloaded { #1 } + { + \__bidi_if_loading:nTF { #1.\@clsextension } + { \prg_return_false: } + { \prg_return_true: } + } + { + \prg_return_false: + } + } -\newcommand*{\bidi@ReplaceInput}[2]{% - \expandafter\edef\csname #1-@bidi@alias\endcsname{#2}% -} +\prg_new_protected_conditional:Npnn \bidi_if_package_loaded:n #1 { T, F, TF } + { + \@ifpackageloaded { #1 } + { + \__bidi_if_loading:nTF { #1.\@pkgextension } + { \prg_return_false: } + { \prg_return_true: } + } + { + \prg_return_false: + } + } -\newcommand*{\bidi@UnReplaceInput}[1]{% - \ifcsname #1-@bidi@alias\endcsname - \expandafter\let\csname #1-@bidi@alias\endcsname\relax - \fi -} +\NewDocumentCommand \bidi@AfterAtEndOfClass { s m o +m } + { + \IfBooleanTF { #1 } + { + \bidi_if_class_loaded:nTF { #2 } + { #4 } + { \hook_gput_code:nnn { class / #2 / after } { #3 } { #4 } } + } + { + \bidi_if_class_loaded:nF + { #2 } + { \hook_gput_code:nnn { class / #2 / after } { #3 } { #4 } } + } + } -\newcommand*{\@bidi@replacefilewithext}[3]{% - \expandafter\edef\csname #1.#3-@bidi@aliasname\endcsname{#2}% - } -\newcommand*{\bidi@ReplacePackage}[2]{% - \@bidi@replacefilewithext{#1}{#2}\@pkgextension -} -\newcommand*{\bidi@ReplaceClass}[2]{% - \@bidi@replacefilewithext{#1}{#2}\@clsextension -} -\newcommand*{\@bidi@unreplacefilewithext}[2]{% - \ifcsname #1.#2-@bidi@aliasname\endcsname - \expandafter\let\csname #1.#2-@bidi@aliasname\endcsname\relax - \fi -} -\newcommand*{\bidi@UnReplacePackage}[1]{% - \@bidi@unreplacefilewithext{#1}\@pkgextension -} -\newcommand*{\bidi@UnReplaceClass}[1]{% - \@bidi@unreplacefilewithext{#1}\@clsextension -} -\newcommand*{\bidi@replacefile@msg}[2]{% - \PackageInfo{biditools}{inputing `#1' instead of `#2'}% -} +\NewDocumentCommand \bidi@AfterPackage { s m o +m } + { + \IfBooleanTF { #1 } + { + \@ifpackageloaded{ #2 } + { #4 } + { + \hook_gput_code:nnn + { file / #2.\@pkgextension / after } + { #3 } + { #4 } + } + } + { + \hook_gput_code:nnn { file / #2.\@pkgextension / after } { #3 } { #4 } + } + } -\newcommand*{\bidi@load@hook}[2]{% - \@ifundefined{#2-@#1}{}{% - \@nameuse{#2-@#1}% - \expandafter\let\csname #2-@#1\endcsname=\relax}} -\newcommand*{\bidi@set@load@hook}[2]{% - \@ifundefined{#2-@#1}{\@namedef{#2-@#1}{}}{}% - \expandafter\g@addto@macro\csname #2-@#1\endcsname} -\newcommand*{\bidi@BeforeFile}{\bidi@set@load@hook{before}} -\newcommand*{\bidi@AfterFile}{\bidi@set@load@hook{after}} -\newcommand*{\bidi@BeforeClass}[1]{% - \bidi@set@load@hook{before}{#1.\@clsextension}} -\newcommand*{\bidi@AfterClass}{% - \@ifstar {\@s@bidi@AfterClass}{% - \@ifnextchar +\@@bidi@AfterClass{% - \@ifnextchar !\@@@bidi@AfterClass\@bidi@AfterClass - }% - }% -} +\NewDocumentCommand \bidi@AfterAtEndOfPackage { s m o +m } + { + \IfBooleanTF { #1 } + { + \bidi_if_package_loaded:nTF { #2 } + { #4 } + { \hook_gput_code:nnn { package / #2 / after } { #3 } { #4 } } + } + { + \bidi_if_package_loaded:nF + { #2 } + { \hook_gput_code:nnn { package / #2 / after } { #3 } { #4 } } + } + } -\newcommand*{\@@@bidi@AfterClass}[2]{% - \begingroup\ifx\csname #2.\@clsextension-h@@k\endcsname\relax - \aftergroup\@s@bidi@AfterClass - \else - \aftergroup\bidi@AfterAtEndOfClass - \fi - \endgroup{#2}% -} +\clist_new:N \l__biditools_package_clist +\msg_new:nnn { biditools } { cannot-prevent-for-already-loaded-package } + { + Can~not~prevent~package~`#1'~from~being~loaded,~ + since~it~has~been~loaded~already~before~line~\msg_line_number: + } +\clist_new:N \g__biditools_prevent_clist + +\NewDocumentCommand \bidi@PreventPackageFromLoading { s +o m } + { + \clist_set:Nx \l__biditools_package_clist { #3 } + \clist_map_inline:Nn \l__biditools_package_clist + { + \@ifpackageloaded { ##1 } + { + \IfBooleanTF { #1 } { \msg_info:nnn } { \msg_warning:nnn } + { biditools } { cannot-prevent-for-already-loaded-package } { ##1 } + } + { + \clist_if_in:NnF \g__biditools_prevent_clist { ##1 } + { \clist_gput_right:Nn \g__biditools_prevent_clist { ##1 } } + \tl_if_exist:cF { g__biditools_exclude_package_##1_tl } + { + \tl_new:c { g__biditools_exclude_package_##1_tl } + } + \IfValueT { #2 } + { + \tl_gput_right:cn { g__biditools_exclude_package_##1_tl } { #2 } + } + \disable@package@load { ##1 } + { \tl_use:c { g__biditools_exclude_package_##1_tl } } + } + } + \clist_clear:N \l__biditools_package_clist + } -\newcommand*{\bidi@AfterAtEndOfClass}[1]{% - \bidi@set@load@hook{lateafter}{#1.\@clsextension}} -\newcommand*{\@@bidi@AfterClass}[2]{% - \begingroup - \expandafter\ifx\csname #2.\@clsextension-h@@k\endcsname\relax - \aftergroup\@s@bidi@AfterClass - \else - \aftergroup\@bidi@AfterClass - \fi - \endgroup{#2}% -} +\NewDocumentCommand \bidi@ResetPreventPackageFromLoading {} + { + \clist_map_function:NN \g__biditools_prevent_clist \reenable@package@load + \clist_gclear:N \g__biditools_prevent_clist + } -\newcommand*{\@bidi@AfterClass}[1]{% - \bidi@set@load@hook{after}{#1.\@clsextension}} -\newcommand*{\@s@bidi@AfterClass}[1]{% - \begingroup - \@ifclassloaded{#1}{% - \aftergroup\@secondoftwo - }{% - \aftergroup\@bidi@AfterClass - }% - \endgroup - {#1}% -} +\NewDocumentCommand \bidi@StorePreventPackageFromLoading { m } + { \edef #1 { \clist_use:Nn \g__biditools_prevent_clist { , } } } + +\NewDocumentCommand \bidi@UnPreventPackageFromLoading { s m } + { + \clist_set:Nx \l__biditools_package_clist { #2 } + \clist_map_inline:Nn \l__biditools_package_clist + { + \clist_if_in:NnT \g__biditools_prevent_clist { ##1 } + { + \clist_gremove_all:Nn \g__biditools_prevent_clist { ##1 } + \reenable@package@load { ##1 } + \IfBooleanT { #1 } + { \cs_undefine:c { g__biditools_exclude_package_##1_tl } } + } + } + } -\newcommand*{\bidi@BeforePackage}[1]{% - \bidi@set@load@hook{before}{#1.\@pkgextension}} -\newcommand*{\bidi@AfterPackage}{% - \@ifstar {\@s@bidi@AfterPackage}{% - \@ifnextchar +\@@bidi@AfterPackage{% - \@ifnextchar !\@@@bidi@AfterPackage\@bidi@AfterPackage - }% - }% -} -\newcommand*{\@@@bidi@AfterPackage}[2]{% - \begingroup\ifx\csname #2.\@pkgextension-h@@k\endcsname\relax - \aftergroup\@s@bidi@AfterPackage - \else - \aftergroup\bidi@AfterAtEndOfPackage - \fi - \endgroup{#2}% -} -\newcommand*{\bidi@AfterAtEndOfPackage}[1]{% - \bidi@set@load@hook{lateafter}{#1.\@pkgextension}} -\newcommand*{\@@bidi@AfterPackage}[2]{% - \begingroup - \expandafter\ifx\csname #2.\@pkgextension-h@@k\endcsname\relax - \aftergroup\@s@bidi@AfterPackage - \else - \aftergroup\@bidi@AfterPackage - \fi - \endgroup{#2}% -} -\newcommand*{\@bidi@AfterPackage}[1]{% - \bidi@set@load@hook{after}{#1.\@pkgextension}} -\newcommand*{\@s@bidi@AfterPackage}[1]{% - \begingroup - \@ifpackageloaded{#1}{% - \aftergroup\@secondoftwo - }{% - \aftergroup\@bidi@AfterPackage - }% - \endgroup - {#1}% -} +\NewDocumentCommand \bidi@BeforeClosingMainAux { o m } + { + \hook_gput_code:nnn { enddocument / afterlastpage } { #1 } + { + \debug_suspend: + \RenewDocumentCommand \bidi@BeforeClosingMainAux { m } { ##1 } + \cs_set_eq:NN \__biditools_protected@write:Nnn \protected@write + \cs_set_eq:NN \protected@write \bidi@protected@immediate@write + #2 + \cs_set_eq:NN \protected@write \__biditools_protected@write:Nnn + \debug_resume: + } + } -\newcommand*{\bidi@excludedpackages}{} -\let\bidi@excludedpackages\@empty -\newcommand*{\bidi@saved@RequirePackage}{} -\newcommand*{\bidi@PreventPackageFromLoading}{% - \@ifstar{\@bidi@PreventPackageFromLoading\PackageInfo}% - {\@bidi@PreventPackageFromLoading\PackageWarning}% -} -\newcommand*{\@bidi@PreventPackageFromLoading}[1]{% - \@ifnextchar [%] - {\@@bidi@PreventPackageFromLoading#1}{\@@bidi@PreventPackageFromLoading#1[]}% -} -\newcommand*{\@@bidi@PreventPackageFromLoading}{} - -\def\@@bidi@PreventPackageFromLoading#1[#2]#3{% - \edef\reserved@b{\zap@space#3 \@empty}% - \ifx \reserved@b\@empty - #1{biditools}{% - \string\bidi@PreventPackageFromLoading\space with empty packages\MessageBreak - argument ignored% - }% - \else - \ifx\bidi@excludedpackages\@empty - \let\bidi@saved@RequirePackage\RequirePackage - \let\RequirePackage\bidi@RequirePackage - \def\reserved@a##1##{% - \@latex@error - {\noexpand \usepackage before \string\documentclass}% - {\noexpand \usepackage may only appear in the document - preamble, i.e.,\MessageBreak - between \noexpand\documentclass and - \string\begin{document}.}% - \@gobble}% - \ifx\reserved@a\usepackage\else - \ifx\usepackage\bidi@saved@RequirePackage\else - \PackageWarning{biditools}{% - Maybe serious problem: unexpected definition of\MessageBreak - \string\usepackage - }% - \fi - \let\usepackage\RequirePackage - \fi - \fi - \expandafter\@for \expandafter\reserved@a\expandafter:\expandafter=% - \reserved@b\do {% - \ifx\reserved@a\@empty - #1{biditools}{% - empty package argument for - \string\bidi@PreventPackageFromLoading\MessageBreak - ignored% - }% - \else - \expandafter\@ifpackageloaded\expandafter{\reserved@a}{% - #1{biditools}{% - package `\reserved@a' already loaded.\MessageBreak - Cannot prevent it from beeing loaded% - }% - }{% - \edef\bidi@excludedpackages{\bidi@excludedpackages,% - \reserved@a}% - \if\relax\detokenize{#2}\relax\else - \@ifundefined{bidi@exclude@package@\reserved@a @do}{% - \@namedef{bidi@exclude@package@\reserved@a @do}{}% - }{}% - \expandafter\def - \csname bidi@exclude@package@\reserved@a - @do\expandafter\expandafter\expandafter\endcsname - \expandafter\expandafter\expandafter{% - \csname bidi@exclude@package@\reserved@a @do\endcsname - #2% - }% - \fi - }% - \fi - }% - \ifx\bidi@excludedpackages\@empty - \bidi@ResetPreventPackageFromLoading - \fi - \fi -} +\NewDocumentCommand \bidi@AfterReadingMainAux { o m } + { + \hook_gput_code:nnn { enddocument / afteraux } { #1 } + { + \debug_suspend: + \RenewDocumentCommand \bidi@AfterReadingMainAux { m } { ##1 } + \cs_set_eq:NN \__biditools_protected@write:Nnn \protected@write + \cs_set_eq:NN \protected@write \bidi@protected@immediate@write + #2 + \cs_set_eq:NN \protected@write \__biditools_protected@write:Nnn + \debug_resume: + } + } -\@onlypreamble\bidi@PreventPackageFromLoading -\newcommand*{\bidi@ResetPreventPackageFromLoading}{% - \let\bidi@excludedpackages\@empty - \ifx\RequirePackage\bidi@RequirePackage - \ifx\usepackage\RequirePackage - \let\usepackage\bidi@saved@RequirePackage - \fi - \let\RequirePackage\bidi@saved@RequirePackage - \fi -} -\@onlypreamble\bidi@ResetPreventPackageFromLoading -\newcommand*{\bidi@StorePreventPackageFromLoading}[1]{% - \let#1\bidi@excludedpackages +\clist_new:N \l__biditools_file_patch_clist + +\NewDocumentCommand \ApplyPatchToFiles { m O{def} O{bidi} } + { + \clist_set:Nx \l__biditools_file_patch_clist { #1 } + \clist_map_inline:Nn \l__biditools_file_patch_clist + { + \ApplyPatchToFile { ##1 } [ #2 ] [ #3 ] + } + \clist_clear:N \l__biditools_file_patch_clist + } + +\clist_new:N \l__biditools_package_patch_clist + +\NewDocumentCommand \ApplyPatchToPackages { m O{bidi} } + { + \clist_set:Nx \l__biditools_package_patch_clist { #1 } + \clist_map_inline:Nn \l__biditools_package_patch_clist + { + \ApplyPatchToPackage { ##1 } [ #2 ] + } + \clist_clear:N \l__biditools_package_patch_clist + } + +\clist_new:N \l__biditools_class_patch_clist + +\NewDocumentCommand \ApplyPatchToClasses { m O{bidi} } + { + \clist_set:Nx \l__biditools_class_patch_clist { #1 } + \clist_map_inline:Nn \l__biditools_class_patch_clist + { + \ApplyPatchToClass { ##1 } [ #2 ] + } + \clist_clear:N \l__biditools_class_patch_clist + } + +\NewDocumentCommand \ApplyPatchToClassesIfPackageLoadedF { m m O{bidi} } + { + \clist_set:Nx \l__biditools_class_patch_clist { #1 } + \clist_map_inline:Nn \l__biditools_class_patch_clist + { + \ApplyPatchToClassIfPackageLoadedF { ##1 } { #2 } [ #3 ] + } + \clist_clear:N \l__biditools_class_patch_clist + } +\ExplSyntaxOff + +\newcommand*{\bidi@ReplaceInput}{\declare@file@substitution} +\newcommand*{\bidi@UnReplaceInput} +{\undeclare@file@substitution} +\newcommand*{\bidi@ReplacePackage}[2]{% + \declare@file@substitution{#1.\@pkgextension}{#2.\@pkgextension}% } -\@onlypreamble\bidi@StorePreventPackageFromLoading -\newcommand*{\bidi@UnPreventPackageFromLoading}{% - \@ifstar {\@tempswatrue\@bidi@UnPreventPackageFromLoading}% - {\@tempswafalse\@bidi@UnPreventPackageFromLoading}% +\newcommand*{\bidi@UnReplacePackage}[1]{% + \undeclare@file@substitution{#1.\@pkgextension}% } - -\newcommand*{\@bidi@UnPreventPackageFromLoading}[1]{% - \edef\reserved@b{\zap@space#1 \@empty}% - \if@tempswa - \@for\reserved@a:=\reserved@b\do {% - \ifx\reserved@a\@empty \else - \ifcsname bidi@exclude@package@\reserved@a @do\endcsname - \expandafter\let - \csname bidi@exclude@package@\reserved@a @do\endcsname - \undefined - \fi - \fi - }% - \fi - \ifcsname bidi@excludedpackages\endcsname - \let\reserved@a\bidi@excludedpackages - \let\bidi@excludedpackages\@empty - \expandafter\@for\expandafter\reserved@c - \expandafter:\expandafter=\reserved@a - \do{% - \ifx\reserved@c\@empty\else - \@expandtwoargs\in@{,\reserved@c,}{,\reserved@b,}% - \ifin@ - \else - \edef\bidi@excludedpackages{% - \bidi@excludedpackages,\reserved@c - }% - \fi - \fi - }% - \ifx\bidi@excludedpackages\@empty\bidi@ResetPreventPackageFromLoading\fi - \fi +\newcommand*{\bidi@ReplaceClass}[2]{% + \declare@file@substitution{#1.\@clsextension}{#2.\@clsextension}% } - -\newcommand*{\bidi@RequirePackage}[2][]{% - \let\reserved@c\@empty - \let\reserved@d\@empty - \edef\reserved@b{\zap@space#2 \@empty}% - \expandafter\@for\expandafter\reserved@b\expandafter:\expandafter=\reserved@b - \do {% - \begingroup - \@tempswatrue - \@for\reserved@a:=\bidi@excludedpackages\do {% - \ifx\reserved@a\reserved@b - \@tempswafalse - \fi - }% - \if@tempswa - \xdef\reserved@c{\reserved@c,\reserved@b}% - \else - \ifx\reserved@b\@empty\else - \PackageInfo{biditools}{Excluding package `\reserved@b'\MessageBreak - from loading}% - \@ifundefined{bidi@exclude@package@\reserved@b @do}{% - }{% - \expandafter\g@addto@macro\expandafter\reserved@d - \csname bidi@exclude@package@\reserved@b @do\endcsname - }% - \fi - \fi - \endgroup - }% - \ifx\reserved@c\@empty - \let\reserved@a\bidi@gobbleopt - \else - \edef\reserved@a{\noexpand\bidi@saved@RequirePackage[#1]{% - \expandafter\@gobble\reserved@c\@empty}}% - \fi - \expandafter\reserved@d - \reserved@a +\newcommand*{\bidi@UnReplaceClass}[1]{% + \undeclare@file@substitution{#1.\@clsextension}% } - -\newcommand{\bidi@gobbleopt}[1][]{} -\AtEndDocument{% - \let\bidi@saved@checkend=\@checkend - \renewcommand*{\@checkend}[1]{% - \def\reserved@a{#1}\def\reserved@b{document}% - \bidi@saved@checkend{#1}% - \ifx\reserved@a\reserved@b - \let\bidi@saved@clearpage=\clearpage - \renewcommand*{\clearpage}{\bidi@saved@clearpage - \bidi@hook@bcma - \bidi@restore@newpage - \let\clearpage=\bidi@saved@clearpage}% - \fi% - \let\bidi@saved@dofilelist\@dofilelist - \def\@dofilelist{% - \bidi@hook@acma - \let\@dofilelist\bidi@saved@dofilelist - \bidi@saved@dofilelist - }% - }% +\newcommand*{\bidi@BeforeFile}[1]{% + \AddToHook{file/#1/before}% } - -\newcommand*{\bidi@saved@checkend}{} -\newcommand*{\bidi@saved@dofilelist}{} -\newcommand*{\bidi@redefine@newpage}{% - \let\bidi@saved@newpage\newpage - \def\bidi@restore@newpage{% - \renewcommand*{\newpage}{% - \PackageWarningNoLine{% - biditools% - }{% - \string\newpage\space at main aux file!\MessageBreak - You have output material at the main aux file.\MessageBreak - Note, that the \string\bidi@BeforeClosingMainAux\space commands\MessageBreak - are processed before the output from aux file% - }% - \let\newpage\bidi@saved@newpage - \newpage - }% - }% - \renewcommand*{\newpage}{% - \PackageError{% - biditools% - }{% - \string\newpage\space at \string\bidi@BeforeClosingMainAux - }{% - You should never use \string\newpage\space or - \string\clear(double)page or other output material at the\MessageBreak - argument of \string\bidi@BeforeClosingMainAux!\MessageBreak - If you'll continue, the \string\newpage\space will be ignored to - avoid corruption of\MessageBreak - every prior use of \string\bidi@BeforeClosingMainAux. - }% - }% +\newcommand*{\bidi@AfterFile}[1]{% + \AddToHook{file/#1/after}% } - -\newcommand*{\bidi@restore@newpage}{} -\newcommand*{\bidi@hook@bcma}{} -\newcommand*{\bidi@hook@acma}{} -\newcommand*{\bidi@BeforeClosingMainAux}{% - \ifx\bidi@hook@bcma\@empty - \gdef\bidi@hook@bcma{% - \renewcommand*{\bidi@BeforeClosingMainAux}[1]{####1}% - \let\protected@write\bidi@protected@immediate@write - \bidi@redefine@newpage - }% - \fi - \g@addto@macro\bidi@hook@bcma% +\newcommand*{\bidi@BeforeClass}[1]{% + \bidi@BeforeFile{#1.\@clsextension}% } - -\newcommand*{\bidi@AfterReadingMainAux}{% - \ifx\bidi@hook@acma\@empty - \gdef\bidi@hook@acma{% - \renewcommand*{\bidi@AfterReadingMainAux}[1]{####1}% - \let\protected@write\bidi@protected@immediate@write - }% - \fi - \g@addto@macro\bidi@hook@acma% +\newcommand*{\bidi@BeforePackage}[1]{% + \bidi@BeforeFile{#1.\@pkgextension}% } \long\def\bidi@protected@immediate@write#1#2#3{% @@ -1766,79 +1587,126 @@ ill-advised in the old versions of bidi package.% \if@nobreak\ifvmode\nobreak\fi\fi } -\def\bidi@patch@counter{0}% -\if@bidi@csundef{numexpr}{% - \def\bidi@patch@stepcounter{% - \begingroup - \count@\bidi@patch@counter\relax - \advance\count@\@ne\relax - \edef\x{\endgroup - \noexpand\def\noexpand\bidi@patch@counter{\the\count@}% - }% - \x - }% -}{% - \def\bidi@patch@stepcounter{% - \edef\bidi@patch@counter{% - \the\numexpr\bidi@patch@counter+\@ne\relax - }% - }% -} -\def\bidi@patch@list{} -\def\bidi@patch@Add{% - \bidi@appto\bidi@patch@list -} \def\bidi@patch@AfterPackage#1{% \@ifpackageloaded{#1}{% \@firstofone }{% - \@bidi@patch@AfterPackage{#1}% + \AddToHook{package/#1/after}% }% } -\def\@bidi@patch@AfterPackage#1{% - \edef\bidi@patch@temp{#1}% - \bidi@patch@stepcounter - \expandafter\bidi@patch@@AfterPackage - \csname @bidi@patch@\bidi@patch@counter\expandafter\endcsname{% - \bidi@patch@temp + +\def\bidi@patch@AfterFile#1{% + \IfFileLoadedTF{#1}{% + \@firstofone + }{% + \AddToHook{file/#1/after}% }% } -\def\bidi@patch@@AfterPackage#1#2#3{% - \begingroup - \toks@{#3}% - \xdef\bidi@patch@gtemp{% - \noexpand\@ifpackageloaded{#2}{% - \noexpand\let\noexpand#1\noexpand\relax - \the\toks@ - }{}% + +\NewDocumentCommand \ApplyPatchToFile { m O{def} O{bidi} } + { + \bidi@patch@AfterFile{#1.#2}{% + \ifnum\catcode`\@=11 + \input{#1-xetex-#3.def}% + \else + \bidi@storecatcode\@ + \makeatletter + \input{#1-xetex-#3.def}% + \bidi@restorecatcode\@ + \fi }% - \endgroup - \let#1\bidi@patch@gtemp - \bidi@patch@Add#1% - \bidi@patch@try{bidi@AfterPackage}{#2}#1% -} + } -\def\bidi@patch@try#1#2#3{% - \if@bidi@csundef{#1}{}{% - \csname #1\endcsname{#2}{#3}% - }% -} +\NewDocumentCommand \ApplyPatchCodeToFile { m +m O{def} } + { + \bidi@patch@AfterFile{#1.#3}{#2}% + } + +\NewDocumentCommand \ApplyPatchToFilesIfPackageLoadedF { m m O{def} O{bidi} } + { + \AddToHook{begindocument/before}{% + \IfPackageLoadedF{#1}{% + \ApplyPatchToFiles{#2}[#3][#4]% + }% + } + } -\AtBeginDocument{\bidi@patch@list} - -\bidi@AtEndPreamble{\bidi@patch@list}% - -\bidi@AfterEndPreamble{% - \let\bidi@patch@OrgIfPackageLoaded\@ifpackageloaded - \let\bidi@patch@OrgIfPackageLater\@ifpackagelater - \let\bidi@patch@OrgIfClassLoaded\@ifclassloaded - \let\bidi@patch@OrgIfClassLater\@ifclasslater - \bidi@patch@list - \let\@ifpackageloaded\bidi@patch@OrgIfPackageLoaded - \let\@ifpackagelater\bidi@patch@OrgIfPackageLater - \let\@ifclassloaded\bidi@patch@OrgIfClassLoaded - \let\@ifclasslater\bidi@patch@OrgIfClassLater -}% +\NewDocumentCommand \ApplyPatchToClassIfPackageLoadedF { m m O{bidi} } + { + \AddToHook{begindocument/before}{% + \IfPackageLoadedF{#2}{% + \ifnum\catcode`\@=11 + \@ifclassloaded{#1}{% + \input{#1-xetex-#3.def}% + }{}% + \else + \bidi@storecatcode\@ + \makeatletter + \@ifclassloaded{#1}{% + \input{#1-xetex-#3.def}% + }{}% + \bidi@restorecatcode\@ + \fi + }% + } + } + +\NewDocumentCommand \ApplyPatchToPackageIfPackageLoadedF { m m O{bidi} } + { + \AddToHook{begindocument/before}{% + \IfPackageLoadedF{#2}{% + \IfPackageLoadedT{#1}{% + \ifnum\catcode`\@=11 + \input{#1-xetex-#3.def}% + \else + \bidi@storecatcode\@ + \makeatletter + \input{#1-xetex-#3.def}% + \bidi@restorecatcode\@ + \fi + }% + }% + } + } + +\NewDocumentCommand \ApplyPatchIfPackageLoaded { m +m +m } + { + \AddToHook{begindocument/before}{% + \ifnum\catcode`\@=11 + \@ifpackageloaded{#1}{#2}{#3}% + \else + \bidi@storecatcode\@ + \makeatletter + \@ifpackageloaded{#1}{#2}{#3}% + \bidi@restorecatcode\@ + \fi + } + } + +\NewDocumentCommand \ApplyPatchIfPackageLoadedT { m +m } + { + \ApplyPatchIfPackageLoaded{#1}{#2}{}% + } + +\NewDocumentCommand \ApplyPatchIfPackageLoadedF { m +m } + { + \ApplyPatchIfPackageLoaded{#1}{}{#2}% + } + +\NewDocumentCommand \ApplyPatchToPackage { m O{bidi} } + { + \bidi@patch@AfterPackage{#1}{\input{#1-xetex-#2.def}}% + } + +\NewDocumentCommand \ApplyPatchCodeToPackage { m +m } + { + \bidi@patch@AfterPackage{#1}{#2}% + } + +\NewDocumentCommand \ApplyPatchToClass { m O{bidi} } + { + \@ifclassloaded{#1}{\input{#1-xetex-#2.def}}{}% + } \endinput %% %% End of file `biditools.sty'. diff --git a/Master/texmf-dist/tex/xelatex/bidi/biditufte-book.cls b/Master/texmf-dist/tex/xelatex/bidi/biditufte-book.cls index ead51da7eaa..ed9cca127d1 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/biditufte-book.cls +++ b/Master/texmf-dist/tex/xelatex/bidi/biditufte-book.cls @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/biditufte-handout.cls b/Master/texmf-dist/tex/xelatex/bidi/biditufte-handout.cls index 86d61a6a442..cf9e0a0fe08 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/biditufte-handout.cls +++ b/Master/texmf-dist/tex/xelatex/bidi/biditufte-handout.cls @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidituftefloat.sty b/Master/texmf-dist/tex/xelatex/bidi/bidituftefloat.sty index 930049cab0a..a6c0d9100c9 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/bidituftefloat.sty +++ b/Master/texmf-dist/tex/xelatex/bidi/bidituftefloat.sty @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -38,7 +38,7 @@ %% Right brace \} Tilde \~} %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{bidituftefloat}[2017/05/19 v0.2 +\ProvidesPackage{bidituftefloat}[2025/01/03 v0.3 bidi implementation of tufte float] \RequirePackage{xifthen} \newcommand{\@bidituftefloat@pkgname}{bidituftefloat} @@ -64,7 +64,7 @@ bidi implementation of tufte float] \setboolean{@bidituftefloat@twoside}{false}% \setboolean{@bidituftefloat@symmetric}{false}% } -\@ifclassloaded{book}{\ExecuteOptions{twoside}}{} +\IfClassLoadedT{book}{\ExecuteOptions{twoside}} \newboolean{@bidituftefloat@debug} \newcommand*{\@bidituftefloat@caption@justification}{\@bidituftefloat@justification@autodetect} \ProcessOptions diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidituftegeneralstructure.sty b/Master/texmf-dist/tex/xelatex/bidi/bidituftegeneralstructure.sty index 8ddc80caa26..0ecb5848a7a 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/bidituftegeneralstructure.sty +++ b/Master/texmf-dist/tex/xelatex/bidi/bidituftegeneralstructure.sty @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidituftehyperref.sty b/Master/texmf-dist/tex/xelatex/bidi/bidituftehyperref.sty index 73319872f03..ac5f22fb1ce 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/bidituftehyperref.sty +++ b/Master/texmf-dist/tex/xelatex/bidi/bidituftehyperref.sty @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidituftesidenote.sty b/Master/texmf-dist/tex/xelatex/bidi/bidituftesidenote.sty index 47686737f01..26e1354d2a8 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/bidituftesidenote.sty +++ b/Master/texmf-dist/tex/xelatex/bidi/bidituftesidenote.sty @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidituftetitle.sty b/Master/texmf-dist/tex/xelatex/bidi/bidituftetitle.sty index cd895c7eb20..2b01e40c39c 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/bidituftetitle.sty +++ b/Master/texmf-dist/tex/xelatex/bidi/bidituftetitle.sty @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidituftetoc.sty b/Master/texmf-dist/tex/xelatex/bidi/bidituftetoc.sty index 31a3acdad01..7681cdbd86e 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/bidituftetoc.sty +++ b/Master/texmf-dist/tex/xelatex/bidi/bidituftetoc.sty @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/boek-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/boek-xetex-bidi.def index e8b6f50f78e..209d0111bce 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/boek-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/boek-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/boek3-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/boek3-xetex-bidi.def index d13afc44926..4b1cd92b2f2 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/boek3-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/boek3-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/book-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/book-xetex-bidi.def index e8f7b8cb28b..4a3a5912708 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/book-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/book-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{book-xetex-bidi.def}[2017/06/09 v1.0 bidi adaptations for standard book class for XeTeX engine] +\ProvidesFile{book-xetex-bidi.def}[2025/01/03 v1.1 bidi adaptations for standard book class for XeTeX engine] \renewenvironment{theindex} {\if@twocolumn \@restonecolfalse @@ -53,7 +53,7 @@ \parskip\z@ \@plus .3\p@\relax \let\item\@idxitem} {\if@restonecol\onecolumn\else\clearpage\fi} -\@ifclassloaded{bookest}{}{% +\IfClassLoadedF{bookest}{% \if@titlepage \renewcommand\maketitle{\begin{titlepage}% \let\footnotesize\small diff --git a/Master/texmf-dist/tex/xelatex/bidi/bookest-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/bookest-xetex-bidi.def index bfd20bbb062..6771dbb834b 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/bookest-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/bookest-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/breqn-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/breqn-xetex-bidi.def index 5ec104b4e17..cc3d2300d5a 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/breqn-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/breqn-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/cals-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/cals-xetex-bidi.def index 7127424aea6..d0842f1058d 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/cals-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/cals-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/caption-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/caption-xetex-bidi.def index 6e358e97d52..1de112e02d2 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/caption-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/caption-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/caption3-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/caption3-xetex-bidi.def index 0b193299bf5..8d772d3acdb 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/caption3-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/caption3-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/color-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/color-xetex-bidi.def index 793d67a2787..8e3d891710e 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/color-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/color-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/colortbl-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/colortbl-xetex-bidi.def index 895ab38eddf..3acaea45411 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/colortbl-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/colortbl-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/combine-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/combine-xetex-bidi.def index 0ca6b54be4f..c4093551ff0 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/combine-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/combine-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/crop-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/crop-xetex-bidi.def index a5909a47798..5699be58f95 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/crop-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/crop-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,9 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{crop-xetex-bidi.def}[2013/04/10 v0.2 bidi adaptations for crop package for XeTeX engine] +\ProvidesFile{crop-xetex-bidi.def}[2025/01/03 v0.3 bidi adaptations for crop package for XeTeX engine] +\IfClassLoadedT{memoir}{\endinput} +\RequirePackage{graphicx} \renewcommand*\CROP@@ulc{% \if@RTLmain% \begin{picture}(0,0) diff --git a/Master/texmf-dist/tex/xelatex/bidi/cuted-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/cuted-xetex-bidi.def index 462f9e795e9..a573337d227 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/cuted-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/cuted-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/cutwin-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/cutwin-xetex-bidi.def index c1f421e6609..2717e2d7010 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/cutwin-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/cutwin-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/cvthemebidicasual.sty b/Master/texmf-dist/tex/xelatex/bidi/cvthemebidicasual.sty index 503f4c57b1b..0de168d5b90 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/cvthemebidicasual.sty +++ b/Master/texmf-dist/tex/xelatex/bidi/cvthemebidicasual.sty @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/cvthemebidiclassic.sty b/Master/texmf-dist/tex/xelatex/bidi/cvthemebidiclassic.sty index ba6995a90bf..f56fb0e2d98 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/cvthemebidiclassic.sty +++ b/Master/texmf-dist/tex/xelatex/bidi/cvthemebidiclassic.sty @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/dblfnote-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/dblfnote-xetex-bidi.def index 7cb49b3cb8b..dd7fd5f47de 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/dblfnote-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/dblfnote-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/diagbox-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/diagbox-xetex-bidi.def index 544dded0eef..21b1a124456 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/diagbox-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/diagbox-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/draftwatermark-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/draftwatermark-xetex-bidi.def index 851697b1321..d79e6bad26e 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/draftwatermark-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/draftwatermark-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/empheq-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/empheq-xetex-bidi.def index 0a34b35cd49..dd4bb06b835 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/empheq-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/empheq-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/eso-pic-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/eso-pic-xetex-bidi.def index dbe79d28d24..171b175316a 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/eso-pic-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/eso-pic-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/extarticle-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/extarticle-xetex-bidi.def index d7ed0aebb0b..2836ec0cf09 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/extarticle-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/extarticle-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{extarticle-xetex-bidi.def}[2017/06/09 v0.4 bidi adaptations for extarticle class for XeTeX engine] +\ProvidesFile{extarticle-xetex-bidi.def}[2025/01/05 v0.5 bidi adaptations for extarticle class for XeTeX engine] \renewcommand*\l@section[2]{% \ifnum \c@tocdepth >\z@ \addpenalty\@secpenalty @@ -84,14 +84,15 @@ \nobreak \vskip 3ex \@afterheading} - \def\@spart#1{% - {\parindent \z@ \if@RTL\raggedleft\else\raggedright\fi - \interlinepenalty \@M - \normalfont - \huge \bfseries #1\par}% - \nobreak - \vskip 3ex - \@afterheading} +\ApplyPatchIfPackageLoaded{nameref}{% + \bidi@patchcmd\NR@spart\raggedright{% + \if@RTL\raggedleft\else\raggedright\fi + }{}{\bidi@warningnoline{Oops! patching `\string\NR@spart' failed}}% +}{% + \bidi@patchcmd\@spart\raggedright{% + \if@RTL\raggedleft\else\raggedright\fi + }{}{\bidi@warningnoline{Oops! patching `\string\@spart' failed}}% +} \renewenvironment{thebibliography}[1] {\section*{\refname \@mkboth{\MakeUppercase\refname}{\MakeUppercase\refname}}% diff --git a/Master/texmf-dist/tex/xelatex/bidi/extbook-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/extbook-xetex-bidi.def index b85c56b2e13..f71e44a212d 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/extbook-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/extbook-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/extletter-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/extletter-xetex-bidi.def index 5fb61a6b561..c1c242eb63c 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/extletter-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/extletter-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/extrafootnotefeatures-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/extrafootnotefeatures-xetex-bidi.def index dbf7200b65a..a36899ec78e 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/extrafootnotefeatures-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/extrafootnotefeatures-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{extrafootnotefeatures-xetex-bidi.def}[2023/08/02 v2.6 bidi extra footnote features for XeTeX engine] +\ProvidesFile{extrafootnotefeatures-xetex-bidi.def}[2025/01/03 v2.7 bidi extra footnote features for XeTeX engine] \newdimen\bidi@columnwidth \def\bidi@floathook{% \bidi@columnwidth\columnwidth @@ -260,7 +260,7 @@ \@bidi@after@Hy@hyperfootnotes \@ifstar\bidi@star@footmarkwidth\bidi@normal@footmarkwidth } -\@ifclassloaded{memoir}{\let\plainfootnotes\normalfootnotes}{} +\IfClassLoadedT{memoir}{\let\plainfootnotes\normalfootnotes} \bidi@ensure@newcommand*{\setSingleSpace}[1]{% \def\m@m@singlespace{#1}% \def\m@m@footnote@spacing{#1}% diff --git a/Master/texmf-dist/tex/xelatex/bidi/extreport-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/extreport-xetex-bidi.def index e3b06293a5f..596c9f6ac02 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/extreport-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/extreport-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/fancybox-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/fancybox-xetex-bidi.def index bb2e08bb190..61b1a6b0097 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/fancybox-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/fancybox-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/fancyhdr-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/fancyhdr-xetex-bidi.def index 63e74f85f22..773e0887306 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/fancyhdr-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/fancyhdr-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,19 +37,19 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{fancyhdr-xetex-bidi.def}[2024/12/07 v0.8 bidi adaptations for fancyhdr package for XeTeX engine] +\ProvidesFile{fancyhdr-xetex-bidi.def}[2025/01/07 v0.9 bidi adaptations for fancyhdr package for XeTeX engine] \let\f@nch@everypar\everypar -\bidi@patchcmd\f@nch@head\raggedright\bidi@raggedright -{}{\bidi@warningnoline{Oops! patching `\string\f@nch@head' failed}} -\bidi@patchcmd\f@nch@head\raggedleft\bidi@raggedleft -{}{\bidi@warningnoline{Oops! patching `\string\f@nch@head' failed}} +\bidi@patchcmd\f@nch@hfbox@center\raggedright\bidi@raggedright +{}{\bidi@warningnoline{Oops! patching `\string\f@nch@hfbox@center' failed}} +\bidi@patchcmd\f@nch@hfbox@center\raggedleft\bidi@raggedleft +{}{\bidi@warningnoline{Oops! patching `\string\f@nch@hfbox@center' failed}} -\bidi@patchcmd\f@nch@foot\raggedright\bidi@raggedright -{}{\bidi@warningnoline{Oops! patching `\string\f@nch@foot' failed}} -\bidi@patchcmd\f@nch@foot\raggedleft\bidi@raggedleft -{}{\bidi@warningnoline{Oops! patching `\string\f@nch@foot' failed}} +\bidi@patchcmd\f@nch@hfbox@fit\raggedright\bidi@raggedright +{}{\bidi@warningnoline{Oops! patching `\string\f@nch@hfbox@fit' failed}} +\bidi@patchcmd\f@nch@hfbox@fit\raggedleft\bidi@raggedleft +{}{\bidi@warningnoline{Oops! patching `\string\f@nch@hfbox@fit' failed}} \endinput %% diff --git a/Master/texmf-dist/tex/xelatex/bidi/fix2col-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/fix2col-xetex-bidi.def index 431eab3c97a..2925b697699 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/fix2col-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/fix2col-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/fleqn-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/fleqn-xetex-bidi.def index 9f18aa6ddd7..d9599b9ce40 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/fleqn-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/fleqn-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/float-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/float-xetex-bidi.def index edc22b9c49c..5a2ef5a7fc6 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/float-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/float-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/floatrow-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/floatrow-xetex-bidi.def index fdd834293d2..5e741a2817e 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/floatrow-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/floatrow-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,8 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{floatrow-xetex-bidi.def}[2013/04/08 v0.1 bidi adaptations for floatrow package for XeTeX engine] +\ProvidesFile{floatrow-xetex-bidi.def}[2025/01/03 v0.2 bidi adaptations for floatrow package for XeTeX engine] +\RequirePackage{color} \renewcommand\flnew@within[1]{\@addtoreset{\FB@captype}{#1}% \expandafter\edef\csname the\FB@captype\endcsname{% \expandafter\noexpand\csname diff --git a/Master/texmf-dist/tex/xelatex/bidi/flowfram-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/flowfram-xetex-bidi.def index 84bc5cd5077..3008f545e48 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/flowfram-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/flowfram-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{flowfram-xetex-bidi.def}[2018/09/29 v0.5 bidi adaptations for flowfram package for XeTeX engine] +\ProvidesFile{flowfram-xetex-bidi.def}[2025/01/03 v0.6 bidi adaptations for flowfram package for XeTeX engine] \def\@outputdblcol{% \@nxtcol=\c@thisframe \c@curpg=\c@page @@ -154,7 +154,7 @@ {\csname colheight\romannumeral#1\endcsname}{% \expandafter\box\csname column\romannumeral#1\endcsname}% }}} -\@ifclassloaded{book}{% +\IfClassLoadedT{book}{% \renewcommand\theequation {\ifnum \c@chapter>\z@ \thechapter\@SepMark\fi \@arabic\c@equation} \renewcommand \thefigure @@ -166,8 +166,8 @@ \renewcommand\thesubsection {\thesection\@SepMark\@arabic\c@subsection} \renewcommand\thesubsubsection{\thesubsection \@SepMark\@arabic\c@subsubsection} \renewcommand\theparagraph {\thesubsubsection\@SepMark\@arabic\c@paragraph} -\renewcommand\thesubparagraph {\theparagraph\@SepMark\@arabic\c@subparagraph}}{} -\@ifclassloaded{report}{% +\renewcommand\thesubparagraph {\theparagraph\@SepMark\@arabic\c@subparagraph}} +\IfClassLoadedT{report}{% \renewcommand\theequation {\ifnum \c@chapter>\z@ \thechapter\@SepMark\fi \@arabic\c@equation} \renewcommand \thefigure @@ -179,7 +179,7 @@ \renewcommand\thesubsection {\thesection\@SepMark\@arabic\c@subsection} \renewcommand\thesubsubsection{\thesubsection \@SepMark\@arabic\c@subsubsection} \renewcommand\theparagraph {\thesubsubsection\@SepMark\@arabic\c@paragraph} -\renewcommand\thesubparagraph {\theparagraph\@SepMark\@arabic\c@subparagraph}}{} +\renewcommand\thesubparagraph {\theparagraph\@SepMark\@arabic\c@subparagraph}} \renewcommand{\rotateframe}[2]{\if@ttb@rotate \rotatebox{#1}{\if@RTL\beginL\fi#2\if@RTL\endL\fi}% \else diff --git a/Master/texmf-dist/tex/xelatex/bidi/footnote-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/footnote-xetex-bidi.def index 7323749449d..291f5d5ee16 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/footnote-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/footnote-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/footnotebackref-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/footnotebackref-xetex-bidi.def index b1dfca0a756..befc38b50b1 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/footnotebackref-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/footnotebackref-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/framed-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/framed-xetex-bidi.def index b8ee159a7fe..e24c0638638 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/framed-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/framed-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/ftnright-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/ftnright-xetex-bidi.def index 1bd554675bc..17c2dfd96d1 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/ftnright-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/ftnright-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/geometry-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/geometry-xetex-bidi.def index 982c8519364..2e640b0253c 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/geometry-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/geometry-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/graphicx-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/graphicx-xetex-bidi.def index 4d8e4546660..d42c8aa58f3 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/graphicx-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/graphicx-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/hvfloat-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/hvfloat-xetex-bidi.def index 75441c4d0e1..05c408c0a1e 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/hvfloat-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/hvfloat-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/hyperref-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/hyperref-xetex-bidi.def index f4819d626b5..6355bf852e7 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/hyperref-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/hyperref-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{hyperref-xetex-bidi.def}[2018/11/11 v1.1 bidi adaptations for hyperref package for XeTeX engine] +\ProvidesFile{hyperref-xetex-bidi.def}[2025/01/05 v1.4 bidi adaptations for hyperref package for XeTeX engine] \AtBeginDocument{% \def\contentsline#1#2#3#4{% \ifx\\#4\\% @@ -187,7 +187,7 @@ \fi }% }% - \@ifpackageloaded{tabularx}{% + \ApplyPatchCodeToPackage{tabularx}{% \let\HyOrg@TX@endtabularx\TX@endtabularx \def\Hy@tabularx@hook{% \let\@footnotetext\H@@footnotetext @@ -206,9 +206,9 @@ }% \endgroup \let\TX@endtabularx\Hy@gtemp - }{}% - \@ifpackageloaded{longtable}{% - \CheckCommand*{\LT@p@LTRftntext}[1]{% + }% + \ApplyPatchCodeToPackage{longtable}{% + \CheckCommand{\LT@p@LTRftntext}[1]{% \edef\@tempa{% \the\LT@p@ftn \noexpand\LTRfootnotetext[\the\c@footnote]% @@ -246,7 +246,7 @@ \fi }% }% - \CheckCommand*{\LT@p@RTLftntext}[1]{% + \CheckCommand{\LT@p@RTLftntext}[1]{% \edef\@tempa{% \the\LT@p@ftn \noexpand\RTLfootnotetext[\the\c@footnote]% @@ -284,8 +284,8 @@ \fi }% }% - }{}% - \@ifpackageloaded{bidipoem}{% + }% + \ApplyPatchCodeToPackage{bidipoem}{% \long\def\bidipoem@p@ftntext#1{% \edef\@tempx{% \the\bidipoem@p@ftn @@ -379,7 +379,7 @@ \fi }% }% - }{}% + }% \let\HyOrg@maketitle\maketitle \def\maketitle{% \let\Hy@saved@footnotemark\@footnotemark @@ -584,37 +584,6 @@ \def\XeTeX{Xe\TeX}% \def\XeLaTeX{Xe\LaTeX}% } -\@ifpackageloaded{longtable}{% - \begingroup - \def\y{\LT@array}% - \@ifundefined{scr@LT@array}{% - \@ifundefined{adl@LT@array}{}{\def\y{\adl@LT@array}}% - }{\def\y{\scr@LT@array}}% - \long\def\x\refstepcounter#1#2\@sharp#3#4\@nil{% - \expandafter\endgroup - \expandafter\def\y[##1]##2{% - \H@refstepcounter{#1}% - \hyper@makecurrent{table}% - \let\Hy@LT@currentHref\@currentHref - #2\@sharp#####4% - }% - }% - \expandafter\expandafter\expandafter\x\y[{#1}]{#2}\@nil - \begingroup - \def\x#1\ifvoid\LT@foot#2\fi#3\@nil{% - \endgroup - \def\LT@start{% - #1% - \ifvoid\LT@foot#2\fi - \let\@currentHref\Hy@LT@currentHref - \Hy@raisedlink{% - \hyper@anchorstart{\@currentHref}\hyper@anchorend - }% - #3% - }% - }% - \expandafter\x\LT@start\@nil -}{} \bidi@patchcmd\@TextField{% \@pdfm@mark }{% diff --git a/Master/texmf-dist/tex/xelatex/bidi/imsproc-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/imsproc-xetex-bidi.def index d0ccadc5dde..efc33c00e4e 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/imsproc-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/imsproc-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/latex-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/latex-xetex-bidi.def index 6c2a6dacba5..9fc2299d6a3 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/latex-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/latex-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{latex-xetex-bidi.def}[2024/12/08 v1.5.1 bidi adaptations for `latex.ltx' for XeTeX engine] +\ProvidesFile{latex-xetex-bidi.def}[2025/01/03 v1.5.2 bidi adaptations for `latex.ltx' for XeTeX engine] \newcommand{\TeXXeTOn}{\TeXXeTstate\@ne} \newcommand{\TeXXeTOff}{\TeXXeTstate\z@} \TeXXeTOn @@ -155,7 +155,7 @@ \let\setLR=\setLTR \let\unsetRL=\setLTR \def\bidi@tabular@RTLcases{\let\@halignto\@empty\@bidi@tabular@RTLcases} -\@ifpackageloaded{array}{% +\ApplyPatchIfPackageLoaded{array}{% \def\@bidi@tabular@RTLcases{\@RTLtabtrue% \leavevmode \hbox \bgroup $\left.\col@sep\tabcolsep \let\d@llarbegin\begingroup @@ -839,7 +839,7 @@ $\@@underline{\hbox{#1}}\m@th$\relax\fi\fi} \let\bidi@saved@leqno=\leqno \def\eqno{\ifnum\predisplaydirection<\z@ \bidi@saved@leqno \else \bidi@saved@eqno \fi} \def\leqno{\ifnum\predisplaydirection<\z@ \bidi@saved@eqno \else \bidi@saved@leqno \fi} -\@ifpackageloaded{amsmath}{}{ +\ApplyPatchIfPackageLoadedF{amsmath}{ \def\@eqnnum{{\normalfont \normalcolor \if@RTL\beginR\fi(\theequation)\if@RTL\endR\fi}} } \input{footnote-xetex-bidi.def} @@ -852,182 +852,163 @@ $\@@underline{\hbox{#1}}\m@th$\relax\fi\fi} \if@bidi@csundef{@idxitem}{}{% \renewcommand\@idxitem{\par\hangindent \if@RTL-\fi40\p@}% } -\@ifpackageloaded{tocbasic}{\input{tocbasic-xetex-bidi.def}}{} -\@ifclassloaded{article}{\@ifclassloaded{svmult}{}{\input{article-xetex-bidi.def}}}{} -\@ifclassloaded{extarticle}{\input{extarticle-xetex-bidi.def}}{} -\@ifclassloaded{artikel1}{\input{artikel1-xetex-bidi.def}}{} -\@ifclassloaded{artikel2}{\input{artikel2-xetex-bidi.def}}{} -\@ifclassloaded{artikel3}{\input{artikel3-xetex-bidi.def}}{} -\@ifclassloaded{amsart}{\input{amsart-xetex-bidi.def}}{} -\@ifclassloaded{beamer}{\input{beamer-xetex-bidi.def}}{} -\@ifclassloaded{letter}{\input{letter-xetex-bidi.def}}{} -\@ifclassloaded{extletter}{\input{extletter-xetex-bidi.def}}{} -\@ifclassloaded{memoir}{\input{memoir-xetex-bidi.def}}{} -\@ifclassloaded{refrep}{\input{refrep-xetex-bidi.def}}{} -\@ifclassloaded{extreport}{\input{extreport-xetex-bidi.def}}{} -\@ifclassloaded{report}{\@ifpackageloaded{flowfram}{}{\input{report-xetex-bidi.def}}}{} -\@ifclassloaded{rapport1}{\input{rapport1-xetex-bidi.def}}{} -\@ifclassloaded{rapport3}{\input{rapport3-xetex-bidi.def}}{} -\@ifclassloaded{scrartcl}{\input{scrartcl-xetex-bidi.def}}{} -\@ifclassloaded{scrbook}{\input{scrbook-xetex-bidi.def}}{} -\@ifclassloaded{scrreprt}{\input{scrreprt-xetex-bidi.def}}{} -\@ifclassloaded{amsbook}{\input{amsbook-xetex-bidi.def}}{} -\@ifclassloaded{extbook}{\input{extbook-xetex-bidi.def}}{} -\@ifclassloaded{boek}{\input{boek-xetex-bidi.def}}{} -\@ifclassloaded{boek3}{\input{boek3-xetex-bidi.def}}{} -\@ifclassloaded{book}{\@ifpackageloaded{flowfram}{}{\input{book-xetex-bidi.def}}}{} -\@ifclassloaded{bookest}{\input{bookest-xetex-bidi.def}}{} -\@ifclassloaded{combine}{\input{combine-xetex-bidi.def}}{} -\@ifclassloaded{imsproc}{\input{imsproc-xetex-bidi.def}}{} -\@ifpackageloaded{amsmath}{}{% -\@iftagsloaded{leqno}{\input{leqno-xetex-bidi.def}}{} -\@iftagsloaded{fleqn}{\input{fleqn-xetex-bidi.def}}{} + +\ApplyPatchToClassesIfPackageLoadedF{% + book, % + report % +}{flowfram} + +\ApplyPatchToPackageIfPackageLoadedF{float}{floatrow} + +\ApplyPatchToFilesIfPackageLoadedF{amsmath}{% + fleqn, % + leqno% +}[clo] + +\ApplyPatchToClasses{% + amsart, % + amsbook, % + article, % + artikel1, % + artikel2, % + artikel3, % + beamer, % + boek, % + boek3, % + bookest, % + combine, % + extbook, % + extletter, % + extarticle, % + extreport, % + imsproc, % + letter, % + memoir, % + rapport1, % + rapport3, % + refrep, % + scrartcl, % + scrbook, % + scrreprt % } -\@ifpackageloaded{mathtools}{% - \RequirePackage{graphicx}% - \input{mathtools-xetex-bidi.def}% - }{} -\@ifpackageloaded{crop}{\RequirePackage{graphicx}}{} -\@ifpackageloaded{lscape}{\RequirePackage{graphicx}}{} -\@ifpackageloaded{sidecap}{\RequirePackage{ragged2e}}{} -\@ifpackageloaded{floatrow}{\RequirePackage{color}}{} -\@ifpackageloaded{algorithm2e}{\input{algorithm2e-xetex-bidi.def}}{} -\@ifpackagewith{algorithm2e}{algonl}{% -\renewcommand{\theAlgoLine}{\expandafter\csname the\algocf@float\endcsname\@SepMark\arabic{AlgoLine}}% -}{} -\@ifpackagewith{algorithm2e}{algopart}{\renewcommand{\algocf@within}{part}}{} -\@ifpackagewith{algorithm2e}{algochapter}{\renewcommand{\algocf@within}{chapter}}{} -\@ifpackagewith{algorithm2e}{algosection}{\renewcommand{\algocf@within}{section}}{} -\@ifpackageloaded{amsmath}{\input{amsmath-xetex-bidi.def}}{} -\@ifpackageloaded{amstext}{\input{amstext-xetex-bidi.def}}{} -\@ifpackageloaded{amsthm}{\input{amsthm-xetex-bidi.def}}{} -\@ifpackageloaded{breqn}{\input{breqn-xetex-bidi.def}}{} -\@ifpackageloaded{cals}{\input{cals-xetex-bidi.def}}{} -\@ifpackageloaded{caption}{\input{caption-xetex-bidi.def}}{} -\@ifpackageloaded{caption3}{\input{caption3-xetex-bidi.def}}{} -\@ifpackageloaded{floatrow}{\input{floatrow-xetex-bidi.def}}{} -\@ifpackageloaded{crop}{\@ifclassloaded{memoir}{}{\input{crop-xetex-bidi.def}}}{} -\@ifpackageloaded{color}{\input{color-xetex-bidi.def}}{} -\@ifpackageloaded{cutwin}{\input{cutwin-xetex-bidi.def}}{} -\@ifpackageloaded{cuted}{\input{cuted-xetex-bidi.def}}{} -\@ifpackageloaded{xcolor}{\input{xcolor-xetex-bidi.def}}{} -\@ifpackageloaded{colortbl}{\input{colortbl-xetex-bidi.def}}{} -\@ifpackageloaded{float}{\@ifpackageloaded{floatrow}{}{\input{float-xetex-bidi.def}}}{} -\@ifpackageloaded{flowfram}{\input{flowfram-xetex-bidi.def}}{} -\@ifpackageloaded{xltxtra}{\input{xltxtra-xetex-bidi.def}}{} -\@ifpackageloaded{wrapfig}{\input{wrapfig-xetex-bidi.def}}{} -\@ifpackageloaded{graphicx}{\input{graphicx-xetex-bidi.def}}{} -\@ifpackageloaded{geometry}{\input{geometry-xetex-bidi.def}}{} -\@ifpackageloaded{hvfloat}{\input{hvfloat-xetex-bidi.def}}{} -\@ifpackageloaded{ntheorem}{\input{ntheorem-xetex-bidi.def}}{} -\@ifpackageloaded{tabularx}{\input{tabularx-xetex-bidi.def}}{} -\@ifpackageloaded{longtable}{\input{longtable-xetex-bidi.def}}{} -\@ifpackageloaded{lscape}{\input{lscape-xetex-bidi.def}}{} -\@ifpackageloaded{hyperref}{\input{hyperref-xetex-bidi.def}}{} -\@ifpackageloaded{footnotebackref}{\input{footnotebackref-xetex-bidi.def}}{} -\@ifpackageloaded{ntheorem-hyper}{\input{ntheorem-hyper-xetex-bidi.def}}{} -\@ifpackageloaded{fancybox}{\input{fancybox-xetex-bidi.def}}{} -\@ifpackageloaded{fancyhdr}{\input{fancyhdr-xetex-bidi.def}}{} -\@ifpackageloaded{fix2col}{\input{fix2col-xetex-bidi.def}}{} -\@ifpackageloaded{ftnright}{\input{ftnright-xetex-bidi.def}}{} -\@ifpackageloaded{midfloat}{\input{midfloat-xetex-bidi.def}}{} -\@ifpackageloaded{draftwatermark}{\input{draftwatermark-xetex-bidi.def}}{} -\@ifpackageloaded{dblfnote}{\input{dblfnote-xetex-bidi.def}}{} -\@ifpackageloaded{diagbox}{\input{diagbox-xetex-bidi.def}}{} -\@ifpackageloaded{eso-pic}{\input{eso-pic-xetex-bidi.def}}{} -\@ifpackageloaded{empheq}{\input{empheq-xetex-bidi.def}}{} -\@ifpackageloaded{framed}{\input{framed-xetex-bidi.def}}{} -\@ifpackageloaded{overpic}{\input{overpic-xetex-bidi.def}}{} -\@ifpackageloaded{pdfbase}{\input{pdfbase-xetex-bidi.def}}{} -\@ifpackageloaded{pdflscape}{\input{pdflscape-xetex-bidi.def}}{} -\@ifpackageloaded{pdfpages}{\input{pdfpages-xetex-bidi.def}}{} -\@ifpackageloaded{lettrine}{\input{lettrine-xetex-bidi.def}}{} -\@ifpackageloaded{lineno}{\input{lineno-xetex-bidi.def}}{} -\@ifpackageloaded{listings}{\input{listings-xetex-bidi.def}}{} -\@ifpackageloaded{media9}{\RequirePackage{bidi-media9}}{} -\@iftexfileloaded{pstricks}{\input{pstricks-xetex-bidi.def}}{} -\@iftexfileloaded{pgfcorescopes.code}{\input{pgfcorescopes.code-xetex-bidi.def}}{} -\@ifpackageloaded{titlesec}{\input{titlesec-xetex-bidi.def}}{} -\@ifpackageloaded{titletoc}{\input{titletoc-xetex-bidi.def}}{} -\@ifpackageloaded{array}{\input{array-xetex-bidi.def}}{} -\@ifpackageloaded{sidecap}{\input{sidecap-xetex-bidi.def}}{} -\@ifpackagewith{sidecap}{innercaption}{% -\if@RTL \renewcommand*{\SC@FLOAT}[2]{% - \isSC@ODD{{#2}\hspace{\sidecaptionsep}{#1}} {{#1}\hspace{\sidecaptionsep}{#2}}} - \renewcommand*\SC@justify@caption{% - \isSC@ODD{\RaggedRight}{\RaggedLeft}}\else - \renewcommand*{\SC@FLOAT}[2]{% - \isSC@ODD{{#1}\hspace{\sidecaptionsep}{#2}} {{#2}\hspace{\sidecaptionsep}{#1}}} - \renewcommand*\SC@justify@caption{% - \isSC@ODD{\RaggedLeft}{\RaggedRight}}\fi -}{} -\@ifpackagewith{sidecap}{rightcaption}{% - \if@RTL\renewcommand*{\SC@FLOAT}[2]{{#1}\hspace{\sidecaptionsep}{#2}} - \def\SC@justify@caption{\RaggedLeft}\else% - \renewcommand*{\SC@FLOAT}[2]{{#2}\hspace{\sidecaptionsep}{#1}} - \def\SC@justify@caption{\RaggedRight}\fi% -}{} -\@ifpackagewith{sidecap}{leftcaption}{% -\if@RTL \renewcommand*{\SC@FLOAT}[2]{{#2}\hspace{\sidecaptionsep}{#1}} - \def\SC@justify@caption{\RaggedRight}\else% - \renewcommand*{\SC@FLOAT}[2]{{#1}\hspace{\sidecaptionsep}{#2}} - \def\SC@justify@caption{\RaggedLeft}\fi% -}{} -\@ifpackageloaded{soul}{\input{soul-xetex-bidi.def}}{} -\@ifpackageloaded{stabular}{\input{stabular-xetex-bidi.def}}{} -\@ifpackageloaded{subfigure}{\input{subfigure-xetex-bidi.def}}{} -\@ifpackageloaded{arydshln}{\input{arydshln-xetex-bidi.def}}{} -\@ifpackageloaded{mdframed}{\input{mdframed-xetex-bidi.def}}{} -\@ifpackageloaded{multicol}{\input{multicol-xetex-bidi.def}}{} -\@ifpackageloaded{adjmulticol}{\input{adjmulticol-xetex-bidi.def}}{} -\@ifpackageloaded{multienum}{\input{multienum-xetex-bidi.def}}{} -\@ifpackageloaded{natbib}{\input{natbib-xetex-bidi.def}}{} -\@ifpackageloaded{newfloat}{\input{newfloat-xetex-bidi.def}}{} -\@ifpackageloaded{nicematrix}{\input{nicematrix-xetex-bidi.def}}{} -\@ifpackageloaded{minitoc}{\input{minitoc-xetex-bidi.def}}{} -\@ifpackageloaded{pgfsys}{\input{pgfsys.code-xetex-bidi.def}}{} -\@ifpackageloaded{picinpar}{\input{picinpar-xetex-bidi.def}}{} -\@ifpackageloaded{quotchap}{\input{quotchap-xetex-bidi.def}}{} -\@ifpackageloaded{ragged2e}{\input{ragged2e-xetex-bidi.def}}{} -\@ifpackageloaded{rotating}{\input{rotating-xetex-bidi.def}}{} -\@ifpackageloaded{tabls}{\input{tabls-xetex-bidi.def}}{} -\@ifpackageloaded{tabulary}{\input{tabulary-xetex-bidi.def}}{} -\@ifpackageloaded{tcolorbox}{\input{tcolorbox-xetex-bidi.def}}{} -\@ifpackageloaded{tocstyle}{\input{tocstyle-xetex-bidi.def}}{} -\@ifpackageloaded{tocbibind}{\@ifclassloaded{memoir}{}{\input{tocbibind-xetex-bidi.def}}}{} -\@ifpackageloaded{tocloft}{\@ifclassloaded{memoir}{}{\input{tocloft-xetex-bidi.def}}}{} -\@ifdefinitionfileloaded{tc-xetex}{\input{tc-xetex-bidi.def}}{} -\@ifpackageloaded{todonotes}{\input{todonotes-xetex-bidi.def}}{} -\@ifpackageloaded{beamerbaseauxtemplates}{\input{beamerbaseauxtemplates-xetex-bidi.def}}{} -\@ifpackageloaded{beamerbaseboxes}{\input{beamerbaseboxes-xetex-bidi.def}}{} -\@ifpackageloaded{beamerbasecolor}{\input{beamerbasecolor-xetex-bidi.def}}{} -\@ifpackageloaded{beamerbasecompatibility}{\input{beamerbasecompatibility-xetex-bidi.def}}{} -\@ifpackageloaded{beamerbaseframecomponents}{\input{beamerbaseframecomponents-xetex-bidi.def}}{} -\@ifpackageloaded{beamerbaseframesize}{\input{beamerbaseframesize-xetex-bidi.def}}{} -\@ifpackageloaded{beamerbaselocalstructure}{\input{beamerbaselocalstructure-xetex-bidi.def}}{} -\@ifpackageloaded{beamerbasemisc}{\input{beamerbasemisc-xetex-bidi.def}}{} -\@ifpackageloaded{beamerbasenavigation}{\input{beamerbasenavigation-xetex-bidi.def}}{} -\@ifpackageloaded{beamerbaseoverlay}{\input{beamerbaseoverlay-xetex-bidi.def}}{} -\@ifpackageloaded{beamerinnerthemedefault}{\input{beamerinnerthemedefault-xetex-bidi.def}}{} -\@ifpackageloaded{beamerinnerthemecircles}{\input{beamerinnerthemecircles-xetex-bidi.def}}{} -\@ifpackageloaded{beamerinnerthemefocus}{\input{beamerinnerthemefocus-xetex-bidi.def}}{} -\@ifpackageloaded{beamerinnerthemeinmargin}{\input{beamerinnerthemeinmargin-xetex-bidi.def}}{} -\@ifpackageloaded{beamerinnerthememetropolis}{\input{beamerinnerthememetropolis-xetex-bidi.def}}{} -\@ifpackageloaded{beamerinnerthemerectangles}{\input{beamerinnerthemerectangles-xetex-bidi.def}}{} -\@ifpackageloaded{beamerinnerthemerounded}{\input{beamerinnerthemerounded-xetex-bidi.def}}{} -\@ifpackageloaded{beamerouterthemedefault}{\input{beamerouterthemedefault-xetex-bidi.def}}{} -\@ifpackageloaded{beamerouterthemefocus}{\input{beamerouterthemefocus-xetex-bidi.def}}{} -\@ifpackageloaded{beamerouterthemeinfolines}{\input{beamerouterthemeinfolines-xetex-bidi.def}}{} -\@ifpackageloaded{beamerouterthememetropolis}{\input{beamerouterthememetropolis-xetex-bidi.def}}{} -\@ifpackageloaded{beamerouterthememiniframes}{\input{beamerouterthememiniframes-xetex-bidi.def}}{} -\@ifpackageloaded{beamerouterthemesidebar}{\input{beamerouterthemesidebar-xetex-bidi.def}}{} -\@ifpackageloaded{beamerouterthemesplit}{\input{beamerouterthemesplit-xetex-bidi.def}}{} -\@ifpackageloaded{beamerouterthemeshadow}{\input{beamerouterthemeshadow-xetex-bidi.def}}{} -\@ifpackageloaded{beamerouterthemesmoothbars}{\input{beamerouterthemesmoothbars-xetex-bidi.def}}{} -\@ifpackageloaded{beamerouterthemesmoothtree}{\input{beamerouterthemesmoothtree-xetex-bidi.def}}{} -\@ifpackageloaded{beamerouterthemetree}{\input{beamerouterthemetree-xetex-bidi.def}}{} -\@ifpackageloaded{beamerthemeHannover}{\input{beamerthemeHannover-xetex-bidi.def}}{} -\@ifpackageloaded{beamerthemeSingapore}{\input{beamerthemeSingapore-xetex-bidi.def}}{} + +\ApplyPatchToPackages{% + adjmulticol, % + algorithm2e, % + amsmath, % + amstext, % + amsthm, % + arydshln, % + array, % + beamerbaseauxtemplates, % + beamerbaseboxes, % + beamerbasecolor, % + beamerbasecompatibility, % + beamerbaseframecomponents, % + beamerbaseframesize, % + beamerbaselocalstructure, % + beamerbasemisc, % + beamerbasenavigation, % + beamerbaseoverlay, % + beamerinnerthemecircles, % + beamerinnerthemedefault, % + beamerinnerthemefocus, % + beamerinnerthemeinmargin, % + beamerinnerthememetropolis, % + beamerinnerthemerectangles, % + beamerinnerthemerounded, % + beamerouterthemedefault, % + beamerouterthemefocus, % + beamerouterthemeinfolines, % + beamerouterthememetropolis, % + beamerouterthememiniframes, % + beamerouterthemesidebar, % + beamerouterthemesplit, % + beamerouterthemeshadow, % + beamerouterthemesmoothbars, % + beamerouterthemesmoothtree, % + beamerouterthemetree, % + beamerthemeHannover, % + beamerthemeSingapore, % + breqn, % + cals, % + caption, % + caption3, % + color, % + colortbl, % + crop, % + cuted, % + cutwin, % + dblfnote, % + diagbox, % + draftwatermark, % + eso-pic, % + empheq, % + fancybox, % + fancyhdr, % + fix2col, % + float, % + floatrow, % + flowfram, % + footnotebackref, % + framed, % + ftnright, % + geometry, % + graphicx, % + hvfloat, % + hyperref, % + lettrine, % + lineno, % + listings, % + longtable, % + lscape, % + mathtools, % + mdframed, % + media9, % + midfloat, % + minitoc, % + multicol, % + multienum, % + natbib, % + newfloat, % + nicematrix, % + ntheorem, % + ntheorem-hyper, % + overpic, % + pdfbase, % + pdflscape, % + pdfpages, % + pgfsys, % + picinpar, % + quotchap, % + ragged2e, % + rotating, % + sidecap, % + soul, % + stabular, % + subfigure, % + tabls, % + tabularx, % + tabulary, % + tcolorbox, % + titlesec, % + titletoc, % + tocbasic, % + tocbibind, % + tocloft, % + tocstyle, % + todonotes, % + wrapfig, % + xcolor, % + xltxtra % +} + +\ApplyPatchToFiles{% + pgfcorescopes.code, % + pstricks % +}[tex] + +\ApplyPatchToFile{tc-xetex} \endinput %% %% End of file `latex-xetex-bidi.def'. diff --git a/Master/texmf-dist/tex/xelatex/bidi/leqno-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/leqno-xetex-bidi.def index b8cc0b59a85..677e52f9859 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/leqno-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/leqno-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/letter-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/letter-xetex-bidi.def index ce9fccfb1b8..f5e19fb4930 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/letter-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/letter-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/lettrine-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/lettrine-xetex-bidi.def index 497cca9d81f..858612f9a25 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/lettrine-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/lettrine-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/lineno-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/lineno-xetex-bidi.def index b836f75f80b..70ab9e6d620 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/lineno-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/lineno-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/listings-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/listings-xetex-bidi.def index 527bfae4ab1..5c9ba6ca9ce 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/listings-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/listings-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{listings-xetex-bidi.def}[2018/09/15 v1.5 bidi adaptations for listings package for XeTeX engine] +\ProvidesFile{listings-xetex-bidi.def}[2025/01/03 v1.6 bidi adaptations for listings package for XeTeX engine] \lst@Key{captiondirection}{textdirection}{% \lstKV@SwitchCases{#1}% {textdirection:\\% @@ -117,7 +117,7 @@ \endgroup% }{}{}% } -\@ifpackageloaded{caption}{% +\ApplyPatchIfPackageLoaded{caption}{% \AtBeginCaption{% \bidi@lst@ensure@caption@script{\@nonlatintrue}{\@nonlatinfalse}% \bidi@lst@ensure@caption@direction{\@RTLfalse}{\@RTLtrue}% diff --git a/Master/texmf-dist/tex/xelatex/bidi/loadingorder-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/loadingorder-xetex-bidi.def deleted file mode 100644 index 8789e618be3..00000000000 --- a/Master/texmf-dist/tex/xelatex/bidi/loadingorder-xetex-bidi.def +++ /dev/null @@ -1,336 +0,0 @@ -%% -%% This is file `loadingorder-xetex-bidi.def', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% bidi.dtx (with options: `table,loadingorder-xetex-bidi.def') -%% -%% __________________________________________________ -%% Vafa Khalighi -%% -%% Copyright (c) 2007--2025 Vafa Khalighi -%% Copyright (c) 2018--2020 bidi-tex GitHub Organization -%% -%% It may be distributed and/or modified under the LaTeX Project Public License, -%% version 1.3c or higher (your choice). The latest version of -%% this license is at: http://www.latex-project.org/lppl.txt -%% -%% This work is “author-maintained” (as per LPPL maintenance status) -%% by Vafa Khalighi. -%% -%% -%% \CheckSum{58641} -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -%% -\ProvidesFile{loadingorder-xetex-bidi.def}[2024/12/08 v0.99 making sure that bidi is the last package loaded] -\bidi@isloaded{amsmath} -\bidi@isloaded{amstext} -\bidi@isloaded{amsthm} -\bidi@isloaded{animate} -\bidi@isloaded{breqn} -\bidi@isloaded{cals} -\bidi@isloaded{caption} -\bidi@isloaded{crop} -\bidi@isloaded{cuted} -\bidi@isloaded{cutwin} -\bidi@isloaded{color} -\bidi@isloaded{dblfnote} -\bidi@isloaded{diagbox} -\bidi@isloaded{xcolor} -\bidi@isloaded{colortbl} -\bidi@isloaded{float} -\bidi@isloaded{floatrow} -\bidi@isloaded{flowfram} -\bidi@isloaded{framed} -\bidi@isloaded{ftnright} -\bidi@isloaded{xltxtra} -\bidi@isloaded{xunicode} -\bidi@isloaded{wrapfig} -\bidi@isloaded{graphicx} -\bidi@isloaded{geometry} -\bidi@isloaded{hvfloat} -\bidi@isloaded{mdframed} -\bidi@isloaded{midfloat} -\bidi@isloaded{ntheorem} -\bidi@isloaded{ntheorem-hyper} -\bidi@isloaded{hyperref} -\bidi@isloaded{fancybox} -\bidi@isloaded{fancyhdr} -\bidi@isloaded{fix2col} -\bidi@isloaded{draftwatermark} -\bidi@isloaded{empheq} -\bidi@isloaded{overpic} -\bidi@isloaded{pdfpages} -\bidi@isloaded{listings} -\bidi@isloaded{lettrine} -\bidi@isloaded{lineno} -\bidi@isloaded{media9} -\bidi@isloaded{pstricks} -\bidi@isloaded{pgf} -\bidi@isloaded{picinpar} -\bidi@isloaded{quotchap} -\bidi@isloaded{tikz} -\bidi@isloaded{titlesec} -\bidi@isloaded{titletoc} -\bidi@isloaded{array} -\bidi@isloaded{soul} -\bidi@isloaded{stabular} -\bidi@isloaded{subfig} -\bidi@isloaded{subfigure} -\bidi@isloaded{supertabular} -\bidi@isloaded{xtab} -\bidi@isloaded{longtable} -\bidi@isloaded{arydshln} -\bidi@isloaded{multicol} -\bidi@isloaded{multienum} -\bidi@isloaded{minitoc} -\bidi@isloaded{natbib} -\bidi@isloaded{newfloat} -\bidi@isloaded{ragged2e} -\bidi@isloaded{rotating} -\bidi@isloaded{tabls} -\bidi@isloaded{tabulary} -\bidi@isloaded{tocbasic} -\bidi@isloaded{tocstyle} -\bidi@isloaded{tocbibind} -\bidi@isloaded{fontspec} -\bidi@isloaded{arabxetex} -\bidi@isloaded{polyglossia} -\bidi@isloaded{fancyvrb} -\AtBeginDocument{ - \if@bidi@amsmathloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package amsmath after bidi package. Please load package amsmath before bidi package, and then try to run xelatex on your document again}{}]{amsmath} - \fi% - \if@bidi@amstextloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package amstext after bidi package. Please load package amstext before bidi package, and then try to run xelatex on your document again}{}]{amstext} - \fi% - \if@bidi@amsthmloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package amsthm after bidi package. Please load package amsthm before bidi package, and then try to run xelatex on your document again}{}]{amsthm} - \fi% - \if@bidi@animateloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package animate after bidi package. Please load package animate before bidi package, and then try to run xelatex on your document again}{}]{animate} - \fi% - \if@bidi@breqnloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package breqn after bidi package. Please load package breqn before bidi package, and then try to run xelatex on your document again}{}]{breqn} - \fi% - \if@bidi@calsloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package cals after bidi package. Please load package cals before bidi package, and then try to run xelatex on your document again}{}]{cals} - \fi% - \if@bidi@captionloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package caption after bidi package. Please load package caption before bidi package, and then try to run xelatex on your document again}{}]{caption} - \fi% - \if@bidi@croploaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package crop after bidi package. Please load package crop before bidi package, and then try to run xelatex on your document again}{}]{crop} - \fi% - \if@bidi@colorloaded@\else - \@ifpackageloaded{hyperref}{}{% - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package color after bidi package. Please load package color before bidi package, and then try to run xelatex on your document again}{}]{color}} - \fi% - \if@bidi@cutwinloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package cutwin after bidi package. Please load package cutwin before bidi package, and then try to run xelatex on your document again}{}]{cutwin} - \fi% - \if@bidi@cutedloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package cuted after bidi package. Please load package cuted before bidi package, and then try to run xelatex on your document again}{}]{cuted} - \fi% - \if@bidi@dblfnoteloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package dblfnote after bidi package. Please load package dblfnote before bidi package, and then try to run xelatex on your document again}{}]{dblfnote} - \fi% - \if@bidi@diagboxloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package diagbox after bidi package. Please load package diagbox before bidi package, and then try to run xelatex on your document again}{}]{diagbox} - \fi% - \if@bidi@xcolorloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package xcolor after bidi package. Please load package xcolor before bidi package, and then try to run xelatex on your document again}{}]{xcolor} - \fi% - \if@bidi@colortblloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package colortbl after bidi package. Please load package colortbl before bidi package, and then try to run xelatex on your document again}{}]{colortbl} - \fi% - \if@bidi@floatloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package float after bidi package. Please load package float before bidi package, and then try to run xelatex on your document again}{}]{float} - \fi% - \if@bidi@floatrowloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package floatrow after bidi package. Please load package floatrow before bidi package, and then try to run xelatex on your document again}{}]{floatrow} - \fi% - \if@bidi@flowframloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package flowfram after bidi package. Please load package flowfram before bidi package, and then try to run xelatex on your document again}{}]{flowfram} - \fi% - \if@bidi@framedloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package framed after bidi package. Please load package framed before bidi package, and then try to run xelatex on your document again}{}]{framed} - \fi% - \if@bidi@ftnrightloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package ftnright after bidi package. Please load package ftnright before bidi package, and then try to run xelatex on your document again}{}]{ftnright} - \fi% - \if@bidi@xltxtraloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package xltxtra after bidi package. Please load package xltxtra before bidi package, and then try to run xelatex on your document again}{}]{xltxtra} - \fi% - \if@bidi@xunicodeloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package xunicode after bidi package. Please load package xunicode before bidi package, and then try to run xelatex on your document again}{}]{xunicode} - \fi% - \if@bidi@wrapfigloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package wrapfig after bidi package. Please load package wrapfig before bidi package, and then try to run xelatex on your document again}{}]{wrapfig} - \fi% - \if@bidi@graphicxloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package graphicx after bidi package. Please load package graphicx before bidi package, and then try to run xelatex on your document again}{}]{graphicx} - \fi% - \if@bidi@geometryloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package geometry after bidi package. Please load package geometry before bidi package, and then try to run xelatex on your document again}{}]{geometry} - \fi% - \if@bidi@hvfloatloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package hvfloat after bidi package. Please load package hvfloat before bidi package, and then try to run xelatex on your document again}{}]{hvfloat} - \fi% - \if@bidi@mdframedloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package mdframed after bidi package. Please load package mdframed before bidi package, and then try to run xelatex on your document again}{}]{mdframed} - \fi% - \if@bidi@midfloatloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package midfloat after bidi package. Please load package midfloat before bidi package, and then try to run xelatex on your document again}{}]{midfloat} - \fi% - \if@bidi@ntheoremloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package ntheorem after bidi package. Please load package ntheorem before bidi package, and then try to run xelatex on your document again}{}]{ntheorem} - \fi% - \if@bidi@hyperrefloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package hyperref after bidi package. Please load package hyperref before bidi package, and then try to run xelatex on your document again}{}]{hyperref} - \fi% - \if@bidi@fancyboxloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package fancybox after bidi package. Please load package fancybox before bidi package, and then try to run xelatex on your document again}{}]{fancybox} - \fi% - \if@bidi@fancyhdrloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package fancyhdr after bidi package. Please load package fancyhdr before bidi package, and then try to run xelatex on your document again}{}]{fancyhdr} - \fi% - \if@bidi@draftwatermarkloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package draftwatermark after bidi package. Please load package draftwatermark before bidi package, and then try to run xelatex on your document again}{}]{draftwatermark} - \fi% - \if@bidi@empheqloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package empheq after bidi package. Please load package empheq before bidi package, and then try to run xelatex on your document again}{}]{empheq} - \fi% - \if@bidi@overpicloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package overpic after bidi package. Please load package overpic before bidi package, and then try to run xelatex on your document again}{}]{overpic} - \fi% - \if@bidi@pdfpagesloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package pdfpages after bidi package. Please load package pdfpages before bidi package, and then try to run xelatex on your document again}{}]{pdfpages} - \fi% - \if@bidi@lettrineloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package lettrine after bidi package. Please load package lettrine before bidi package, and then try to run xelatex on your document again}{}]{lettrine} - \fi - \if@bidi@linenoloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package lineno after bidi package. Please load package lineno before bidi package, and then try to run xelatex on your document again}{}]{lineno} - \fi% - \if@bidi@listingsloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package listings after bidi package. Please load package listings before bidi package, and then try to run xelatex on your document again}{}]{listings} - \fi% - \csname if@bidi@media9loaded@\endcsname\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package media9 after bidi package. Please load package media9 before bidi package, and then try to run xelatex on your document again}{}]{media9} - \fi% - \if@bidi@pstricksloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package pstricks after bidi package. Please load package pstricks before bidi package, and then try to run xelatex on your document again}{}]{pstricks} - \fi% - \if@bidi@pgfloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package pgf after bidi package. Please load package pgf before bidi package, and then try to run xelatex on your document again}{}]{pgf} - \fi% - \if@bidi@picinparloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package picinpar after bidi package. Please load package picinpar before bidi package, and then try to run xelatex on your document again}{}]{picinpar} - \fi% - \if@bidi@quotchaploaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package quotchap after bidi package. Please load package quotchap before bidi package, and then try to run xelatex on your document again}{}]{quotchap} - \fi% - \if@bidi@tikzloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package tikz after bidi package. Please load package tikz before bidi package, and then try to run xelatex on your document again}{}]{tikz} - \fi% - \if@bidi@titlesecloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package titlesec after bidi package. Please load package titlesec before bidi package, and then try to run xelatex on your document again}{}]{titlesec} - \fi% - \if@bidi@titletocloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package titletoc after bidi package. Please load package titletoc before bidi package, and then try to run xelatex on your document again}{}]{titletoc} - \fi% - \if@bidi@arrayloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package array after bidi package. Please load package array before bidi package, and then try to run xelatex on your document again}{}]{array} - \fi% - \if@bidi@stabularloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package stabular after bidi package. Please load package stabular before bidi package, and then try to run xelatex on your document again}{}]{stabular} - \fi% - \if@bidi@soulloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package soul after bidi package. Please load package soul before bidi package, and then try to run xelatex on your document again}{}]{soul} - \fi% - \if@bidi@subfigloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package subfig after bidi package. Please load package subfig before bidi package, and then try to run xelatex on your document again}{}]{subfig} - \fi% - \if@bidi@subfigureloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package subfigure after bidi package. Please load package subfigure before bidi package, and then try to run xelatex on your document again}{}]{subfigure} - \fi% - \if@bidi@supertabularloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package supertabular after bidi package. Please load package supertabular before bidi package, and then try to run xelatex on your document again}{}]{supertabular} - \fi% - \if@bidi@xtabloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package xtab after bidi package. Please load package xtab before bidi package, and then try to run xelatex on your document again}{}]{xtab} - \fi% - \if@bidi@longtableloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package longtable after bidi package. Please load package longtable before bidi package, and then try to run xelatex on your document again}{}]{longtable} - \fi% - \if@bidi@arydshlnloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package arydshln after bidi package. Please load package arydshln before bidi package, and then try to run xelatex on your document again}{}]{arydshln} - \fi% - \if@bidi@multicolloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package multicol after bidi package. Please load package multicol before bidi package, and then try to run xelatex on your document again}{}]{multicol} - \fi% - \if@bidi@multienumloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package multienum after bidi package. Please load package multienum before bidi package, and then try to run xelatex on your document again}{}]{multienum} - \fi% - \if@bidi@minitocloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package minitoc after bidi package. Please load package minitoc before bidi package, and then try to run xelatex on your document again}{}]{minitoc} - \fi% - \if@bidi@natbibloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package natbib after bidi package. Please load package natbib before bidi package, and then try to run xelatex on your document again}{}]{natbib} - \fi% - \if@bidi@newfloatloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package newfloat after bidi package. Please load package newfloat before bidi package, and then try to run xelatex on your document again}{}]{newfloat} - \fi% - \csname if@bidi@ragged2eloaded@\endcsname\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package ragged2e after bidi package. Please load package ragged2e before bidi package, and then try to run xelatex on your document again}{}]{ragged2e} - \fi% - \if@bidi@rotatingloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package rotating after bidi package. Please load package rotating before bidi package, and then try to run xelatex on your document again}{}]{rotating} - \fi% - \if@bidi@tablsloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package tabls after bidi package. Please load package tabls before bidi package, and then try to run xelatex on your document again}{}]{tabls} - \fi% - \if@bidi@tabularyloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package tabulary after bidi package. Please load package tabulary before bidi package, and then try to run xelatex on your document again}{}]{tabulary} - \fi% - \if@bidi@tocbasicloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package tocbasic after bidi package. Please load package tocbasic before bidi package, and then try to run xelatex on your document again}{}]{tocbasic} - \fi% - \if@bidi@tocstyleloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package tocstyle after bidi package. Please load package tocstyle before bidi package, and then try to run xelatex on your document again}{}]{tocstyle} - \fi% - \if@bidi@tocbibindloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package tocbibind after bidi package. Please load package tocbibind before bidi package, and then try to run xelatex on your document again}{}]{tocbibind} - \fi% - \if@bidi@fontspecloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package fontspec after bidi package. Please load package fontspec before bidi package, and then try to run xelatex on your document again}{}]{fontspec} - \fi% - \if@bidi@arabxetexloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package arabxetex after bidi package. Please load package arabxetex before bidi package, and then try to run xelatex on your document again}{}]{arabxetex} - \fi% - \if@bidi@polyglossialoaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package polyglossia after bidi package. Please load package polyglossia before bidi package, and then try to run xelatex on your document again}{}]{polyglossia} - \fi% - \if@bidi@fancyvrbloaded@\else - \bidi@isloaded[\PackageError{bidi}{Oops! you have loaded package fancyvrb after bidi package. Please load package fancyvrb before bidi package, and then try to run xelatex on your document again}{}]{fancyvrb} - \fi% -} -\endinput -%% -%% End of file `loadingorder-xetex-bidi.def'. diff --git a/Master/texmf-dist/tex/xelatex/bidi/longtable-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/longtable-xetex-bidi.def index 55dd279fb71..4527a3bc452 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/longtable-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/longtable-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,9 +37,20 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{longtable-xetex-bidi.def}[2022/05/20 v0.6 bidi adaptations for longtable package for XeTeX engine] +\ProvidesFile{longtable-xetex-bidi.def}[2025/01/05 v0.8 bidi adaptations for longtable package for XeTeX engine] +\ExplSyntaxOn \def\LT@array[#1]#2{% - \refstepcounter{table}\stepcounter{LT@tables}% + \UseTaggingSocket{tbl/init} + \tl_if_empty:eTF { \LTcaptype } + { + \tl_gset:Ne \@currentHref {LT@tables.\theHLT@tables} + } + { + \@kernel@refstepcounter{\LTcaptype}\stepcounter{LT@tables} + \tl_gset:Ne \@currentHref {\LTcaptype.\cs_if_exist_use:c {theH\LTcaptype}} + } + \tbl_gzero_row_count: + \UseTaggingSocket{tbl/longtable/init} \if l#1% \if@RTLtab\LTleft\fill \LTright\z@\else\LTleft\z@ \LTright\fill\fi \else\if r#1% @@ -53,7 +64,8 @@ \def\@tabarray{% \let\hline\LT@@hl \LT@@tabarray}% - \let\\\LT@tabularcr\let\tabularnewline\\% + \let\\\LT@tabularcr + \let\tabularnewline\\% \def\newpage{\noalign{\break}}% \def\pagebreak{\noalign{\ifnum`}=0\fi\@testopt{\LT@no@pgbk-}4}% \def\nopagebreak{\noalign{\ifnum`}=0\fi\@testopt\LT@no@pgbk4}% @@ -79,20 +91,42 @@ \let\@sharp##\let\protect\relax \begingroup \@mkpream{#2}% + \tbl_count_table_cols: \xdef\LT@bchunk{% + \tbl_inbetween_rows: \global\advance\c@LT@chunks\@ne \global\LT@rows\z@\setbox\z@\vbox\bgroup \LT@setprevdepth \tabskip\LTleft \noexpand\halign to\hsize\bgroup - \tabskip\z@ \@arstrut \@preamble \tabskip\LTright \cr}% + \tabskip\z@ \@arstrut + \UseTaggingSocket{tbl/row/begin}% + \tbl_init_cell_data_for_row: + \@preamble \tabskip\LTright \cr}% \endgroup \expandafter\LT@nofcols\LT@bchunk&\LT@nofcols \LT@make@row \m@th\let\par\@empty - \everycr{}\lineskip\z@\baselineskip\z@ + \everycr{% + \noalign{% + \__tbl_trace:n {--longtable-->~chunk~row:~ \the\LT@rows \space + row:~ \the\g__tbl_row_int \space + column:~ \the\g__tbl_col_int + } + \tbl_if_row_was_started:T + { + \UseTaggingSocket{tbl/row/end} + \tbl_inbetween_rows: + } + \int_compare:nNnT \LT@rows < \LTchunksize + { \tbl_gincr_row_count: } % next is row about to start + }% + }% + \lineskip\z@\baselineskip\z@ \LT@bchunk} +\ExplSyntaxOff \def\LT@makecaption#1#2#3{% \LT@mcol\LT@cols c{\hbox to\z@{\hss\parbox[t]\LTcapwidth{% + \reset@font \sbox\@tempboxa{\if@RTL\beginR\fi#1{#2: }#3\if@RTL\endR\fi}% \ifdim\wd\@tempboxa>\hsize #1{#2: }#3% @@ -101,7 +135,7 @@ \fi \endgraf\vskip\baselineskip}% \hss}}} -\@ifpackageloaded{caption}{% +\ApplyPatchCodeToPackage{caption}{% \renewcommand\LT@makecaption[3]{% \caption@LT@make{% \caption@LT@settype\LTcaptype @@ -118,22 +152,25 @@ \caption@@make{#2}{#3}\endgraf \caption@make@below \caption@end}}% -}{} +} \def\LT@startpbox#1{% - \bgroup\color@begingroup + \bgroup + \color@begingroup \let\@footnotetext\LT@p@ftntext \let\@LTRfootnotetext\LT@p@LTRftntext \let\@RTLfootnotetext\LT@p@RTLftntext \setlength\hsize{#1}% \@arrayparboxrestore - \vrule \@height \ht\@arstrutbox \@width \z@} -\def\LT@p@LTRftntext#1{% + \everypar{% + \vrule \@height \ht\@arstrutbox \@width \z@ + \everypar{}}% + } +\long\def\LT@p@LTRftntext#1{% \edef\@tempa{\the\LT@p@ftn\noexpand\LTRfootnotetext[\the\c@footnote]}% \global\LT@p@ftn\expandafter{\@tempa{#1}}}% -\def\LT@p@RTLftntext#1{% +\long\def\LT@p@RTLftntext#1{% \edef\@tempa{\the\LT@p@ftn\noexpand\RTLfootnotetext[\the\c@footnote]}% \global\LT@p@ftn\expandafter{\@tempa{#1}}}% - \def\LT@output{% \ifnum\outputpenalty <-\@Mi \ifnum\outputpenalty > -\LT@end@pen @@ -142,21 +179,28 @@ \setbox\z@\vbox{\unvbox\@cclv}% \ifdim \ht\LT@lastfoot>\ht\LT@foot \dimen@\pagegoal + \advance\dimen@\ht\LT@foot \advance\dimen@-\ht\LT@lastfoot \ifdim\dimen@<\ht\z@ \setbox\@cclv\vbox{\unvbox\z@\copy\LT@foot\vss}% \@makecol \@outputpage + \global\vsize\@colroom \setbox\z@\vbox{\box\LT@head}% \fi \fi - \global\@colroom\@colht - \global\vsize\@colht - \vbox - {\if@RTLtab\hbox\bgroup\beginR\vbox\bgroup\fi\unvbox\z@\box\ifvoid\LT@lastfoot\LT@foot\else\LT@lastfoot\fi\if@RTLtab\egroup\endR\egroup\fi}% + \if@RTLtab\hbox\bgroup\beginR\vbox\bgroup\fi + \unvbox\z@\box\ifvoid\LT@lastfoot\LT@foot\else\LT@lastfoot\fi + \UseTaggingSocket{tbl/longtable/foot} + \if@RTLtab\egroup\endR\egroup\fi \fi \else - \setbox\@cclv\vbox{\if@RTLtab\hbox\bgroup\beginR\vbox\bgroup\fi\unvbox\@cclv\copy\LT@foot\vss\if@RTLtab\egroup\endR\egroup\fi}% + \setbox\@cclv\vbox{% + \if@RTLtab\hbox\bgroup\beginR\vbox\bgroup\fi + \unvbox\@cclv\copy\LT@foot\vss + \if@RTLtab\egroup\endR\egroup\fi + }% + \UseTaggingSocket{tbl/longtable/foot} \@makecol \@outputpage \global\vsize\@colroom diff --git a/Master/texmf-dist/tex/xelatex/bidi/lscape-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/lscape-xetex-bidi.def index 15f0dcd024c..82723f88312 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/lscape-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/lscape-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,8 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{lscape-xetex-bidi.def}[2022/07/14 v0.2 bidi adaptations for lscape package for XeTeX engine] +\ProvidesFile{lscape-xetex-bidi.def}[2025/01/03 v0.3 bidi adaptations for lscape package for XeTeX engine] +\RequirePackage{graphicx} \bidi@patchcmd{\LS@rot}{\rotatebox{90}{\box\@outputbox}}{% \if@RTL \rotatebox[origin=br]{-90}{\box\@outputbox}% diff --git a/Master/texmf-dist/tex/xelatex/bidi/mathtools-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/mathtools-xetex-bidi.def index 86606b94df1..dd4d94bbcd3 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/mathtools-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/mathtools-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,8 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{mathtools-xetex-bidi.def}[2018/01/07 v0.1 bidi adaptations for mathtools package for XeTeX engine] +\ProvidesFile{mathtools-xetex-bidi.def}[2025/01/03 v0.2 bidi adaptations for mathtools package for XeTeX engine] +\RequirePackage{graphicx} \MHInternalSyntaxOn \def\MT_define_tagform:nwnn #1[#2]#3#4{ \@namedef{MT_tagform_#1:n}##1 diff --git a/Master/texmf-dist/tex/xelatex/bidi/mdframed-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/mdframed-xetex-bidi.def index e8608f8f5e3..6cdbd3c6224 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/mdframed-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/mdframed-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/media9-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/media9-xetex-bidi.def new file mode 100644 index 00000000000..e5aeba567d5 --- /dev/null +++ b/Master/texmf-dist/tex/xelatex/bidi/media9-xetex-bidi.def @@ -0,0 +1,44 @@ +%% +%% This is file `media9-xetex-bidi.def', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% bidi.dtx (with options: `table,media9-xetex-bidi.def') +%% +%% __________________________________________________ +%% Vafa Khalighi +%% +%% Copyright (c) 2007--2025 Vafa Khalighi +%% Copyright (c) 2018--2020 bidi-tex GitHub Organization +%% +%% It may be distributed and/or modified under the LaTeX Project Public License, +%% version 1.3c or higher (your choice). The latest version of +%% this license is at: http://www.latex-project.org/lppl.txt +%% +%% This work is “author-maintained” (as per LPPL maintenance status) +%% by Vafa Khalighi. +%% +%% +%% \CheckSum{57298} +%% \CharacterTable +%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z +%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z +%% Digits \0\1\2\3\4\5\6\7\8\9 +%% Exclamation \! Double quote \" Hash (number) \# +%% Dollar \$ Percent \% Ampersand \& +%% Acute accent \' Left paren \( Right paren \) +%% Asterisk \* Plus \+ Comma \, +%% Minus \- Point \. Solidus \/ +%% Colon \: Semicolon \; Less than \< +%% Equals \= Greater than \> Question mark \? +%% Commercial at \@ Left bracket \[ Backslash \\ +%% Right bracket \] Circumflex \^ Underscore \_ +%% Grave accent \` Left brace \{ Vertical bar \| +%% Right brace \} Tilde \~} +%% +\ProvidesFile{media9-xetex-bidi.def}[2025/01/03 v0.1 bidi adaptations for media9 package for XeTeX engine] +\RequirePackage{bidi-media9} +\endinput +%% +%% End of file `media9-xetex-bidi.def'. diff --git a/Master/texmf-dist/tex/xelatex/bidi/memoir-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/memoir-xetex-bidi.def index a0349a0bed8..0609ee9d127 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/memoir-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/memoir-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{memoir-xetex-bidi.def}[2017/06/09 v0.6 bidi adaptations for memoir class for XeTeX engine] +\ProvidesFile{memoir-xetex-bidi.def}[2025/01/03 v0.7 bidi adaptations for memoir class for XeTeX engine] \renewcommand{\keepthetitle}{% \@bsmtitlempty \global\let\thanks\relax @@ -147,7 +147,7 @@ } % end of the \parbox \fi \vskip\belowcaptionskip} -\@ifpackageloaded{caption}{% +\ApplyPatchCodeToPackage{caption}{% \AtBeginPackage{caption}{ \ClassWarningNoLine{memoir}{% You are using the caption package with the memoir \MessageBreak @@ -188,7 +188,7 @@ \normalsize \@makecaption{\csname fnum@##1\endcsname}{\ignorespaces ##3}\par \endgroup} -}}{} +}} \renewenvironment{thebibliography}[1]{% \bibsection \if@RTL\if@LTRbibitems\@RTLfalse\else\fi\else\if@RTLbibitems\@RTLtrue\else\fi\fi diff --git a/Master/texmf-dist/tex/xelatex/bidi/midfloat-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/midfloat-xetex-bidi.def index 843ae2c4543..10c930c4c29 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/midfloat-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/midfloat-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/minitoc-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/minitoc-xetex-bidi.def index 77db25b7a37..d4c37e1394f 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/minitoc-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/minitoc-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/multicol-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/multicol-xetex-bidi.def index 8499c5f1c6e..316cce42395 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/multicol-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/multicol-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/multienum-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/multienum-xetex-bidi.def index d2ce75fa7c9..b5ecadd441f 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/multienum-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/multienum-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/natbib-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/natbib-xetex-bidi.def index f4b251fa859..1611581af9e 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/natbib-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/natbib-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/newfloat-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/newfloat-xetex-bidi.def index 501eed5a627..42a688e0193 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/newfloat-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/newfloat-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/nicematrix-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/nicematrix-xetex-bidi.def index c0760d4034f..a1cc54473fc 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/nicematrix-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/nicematrix-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/ntheorem-hyper-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/ntheorem-hyper-xetex-bidi.def index 847294740a2..e9486fe59a0 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/ntheorem-hyper-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/ntheorem-hyper-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/ntheorem-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/ntheorem-xetex-bidi.def index f937daab8f5..8ea319d5595 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/ntheorem-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/ntheorem-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/overpic-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/overpic-xetex-bidi.def index a24b797f842..5604a9ad7c7 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/overpic-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/overpic-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/pdfbase-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/pdfbase-xetex-bidi.def index 402b1504368..c80d0a5bd09 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/pdfbase-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/pdfbase-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/pdflscape-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/pdflscape-xetex-bidi.def index 1ed1f56ed46..f923ab92f2f 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/pdflscape-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/pdflscape-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/pdfpages-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/pdfpages-xetex-bidi.def index 462d44c6b9f..6846ed1f793 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/pdfpages-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/pdfpages-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/pgfcorescopes.code-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/pgfcorescopes.code-xetex-bidi.def index 96716a74547..1877bf805fa 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/pgfcorescopes.code-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/pgfcorescopes.code-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/pgfsys.code-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/pgfsys-xetex-bidi.def index 36c314198fd..961c34f2eaa 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/pgfsys.code-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/pgfsys-xetex-bidi.def @@ -1,10 +1,10 @@ %% -%% This is file `pgfsys.code-xetex-bidi.def', +%% This is file `pgfsys-xetex-bidi.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% bidi.dtx (with options: `table,pgfsys.code-xetex-bidi.def') +%% bidi.dtx (with options: `table,pgfsys-xetex-bidi.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,11 +37,11 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{pgfsys.code-xetex-bidi.def}[2022/06/01 v0.1 bidi adaptations for pgfsys.code.tex file for XeTeX engine] +\ProvidesFile{pgfsys-xetex-bidi.def}[2025/01/05 v0.1 bidi adaptations for pgfsys package for XeTeX engine] \def\pgfsys@shadingoutsidepgfpicture#1{% \beginL#1\endL% } \endinput %% -%% End of file `pgfsys.code-xetex-bidi.def'. +%% End of file `pgfsys-xetex-bidi.def'. diff --git a/Master/texmf-dist/tex/xelatex/bidi/picinpar-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/picinpar-xetex-bidi.def index 165c24c7c9e..4a50ee8e2b9 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/picinpar-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/picinpar-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/plain-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/plain-xetex-bidi.def index 6bfe47883a7..15bbe32f2a9 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/plain-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/plain-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/pstricks-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/pstricks-xetex-bidi.def index dd9fbd2f9bf..923c5cc78b9 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/pstricks-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/pstricks-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,38 +37,27 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{pstricks-xetex-bidi.def}[2022/09/22 v0.6 bidi adaptations for pstricks package for XeTeX engine] -\def\pspicture{\begingroup\ifmmode\else\@RTLfalse\beginL\fi\pst@ifstar\pst@picture} -\def\endpspicture{% - \ifshowgrid\ifnum\showgridp@s>0 - \psgrid[xunit=\sh@wgridXunit,yunit=\sh@wgridYunit,style=gridstyle]\fi\fi% - \pst@killglue +\ProvidesFile{pstricks-xetex-bidi.def}[2025/01/08 v0.7 bidi adaptations for pstricks package for XeTeX engine] +\bidi@patchcmd\pspicture\begingroup{% + \begingroup + \ifmmode + \else + \@RTLfalse + \beginL + \fi +}{}{\bidi@warningnoline{Oops! patching `\string\pspicture' failed}} + +\bidi@patchcmd\endpspicture{% \endgroup - \egroup - \ifdim\wd\pst@hbox=\z@\else - %\@pstrickserr{Extraneous space in the pspicture environment}% - %{Type \space <return> \space to proceed.}% + \psset[pstricks]{shift=0}% reset value +}{% + \ifmmode + \else + \endL \fi - \ht\pst@hbox=\pst@dimd - \dp\pst@hbox=-\pst@dimb - \setbox\pst@hbox=\hbox{% - \kern-\pst@dima - \ifPst@shift@star%\typeout{==pstricks== old behaviour of the shift option}% shift=* - \advance\pst@dimd-\pst@dimb - \pst@dimd=0.5\pst@dimd - \else\pst@dimd-\pst@shift\fi - \advance\pst@dimd\pst@dimb - \lower\pst@dimd - \box\pst@hbox - \kern\pst@dimc}% - \if@star\setbox\pst@hbox=\hbox{\clipbox@@\z@}\fi - \leavevmode\ifdim\overfullrule=\z@\box\pst@hbox\else - \fboxsep=0pt - \fbox{\rule[-\pst@shift]{0pt}{\ht\pst@hbox}\rule{\wd\pst@hbox}{0pt}}\fi - \ifmmode\else\endL\fi - \endgroup% + \endgroup \psset[pstricks]{shift=0}% reset value -} +}{}{\bidi@warningnoline{Oops! patching `\string\endpspicture' failed}} \bidi@patchcmd\@@scalebox{% \special{x: bscale \pst@tempc \pst@tempd}% @@ -86,7 +75,7 @@ \else \special{x: escale}% \fi -}{}{} +}{}{\bidi@warningnoline{Oops! patching `\string\@@scalebox' failed}} \let\ps@@scalebox\@@scalebox \endinput diff --git a/Master/texmf-dist/tex/xelatex/bidi/quotchap-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/quotchap-xetex-bidi.def index d8402ed83fa..2afc8dae8c5 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/quotchap-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/quotchap-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/ragged2e-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/ragged2e-xetex-bidi.def index b9de9c8ccc1..7abbe25bef0 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/ragged2e-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/ragged2e-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/rapport1-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/rapport1-xetex-bidi.def index 3dba87edf57..b588c8bd2bb 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/rapport1-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/rapport1-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/rapport3-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/rapport3-xetex-bidi.def index aa8d0bcb052..9b434b41eb3 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/rapport3-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/rapport3-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/refrep-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/refrep-xetex-bidi.def index 37b78a47fdb..63c30f741de 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/refrep-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/refrep-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/report-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/report-xetex-bidi.def index 08003c18368..f31fe5499ac 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/report-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/report-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/rotating-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/rotating-xetex-bidi.def index 51f9bb747e8..47f87eedb50 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/rotating-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/rotating-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/scrartcl-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/scrartcl-xetex-bidi.def index 2c8f7ef5c59..4ca22597f61 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/scrartcl-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/scrartcl-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/scrbook-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/scrbook-xetex-bidi.def index 5150f049a6d..caa0dd940e5 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/scrbook-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/scrbook-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/scrreprt-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/scrreprt-xetex-bidi.def index 675fb226bee..c56da90aefd 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/scrreprt-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/scrreprt-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/sidecap-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/sidecap-xetex-bidi.def index 454ade19518..6e9d5e9e9b0 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/sidecap-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/sidecap-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,13 +37,39 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{sidecap-xetex-bidi.def}[2010/08/01 v0.1 bidi adaptations for sidecap package for XeTeX engine] +\ProvidesFile{sidecap-xetex-bidi.def}[2025/01/03 v0.2 bidi adaptations for sidecap package for XeTeX engine] +\RequirePackage{ragged2e} \renewcommand*{\SC@FLOAT}[2]{\if@RTL% \isSC@ODD{{#1}\hspace{\sidecaptionsep}{#2}} {{#2}\hspace{\sidecaptionsep}{#1}}\else% \isSC@ODD{{#2}\hspace{\sidecaptionsep}{#1}} {{#1}\hspace{\sidecaptionsep}{#2}}\fi} \renewcommand*\SC@justify@caption{\if@RTL% \isSC@ODD{\RaggedLeft}{\RaggedRight}\else% \isSC@ODD{\RaggedRight}{\RaggedLeft}\fi} + +\@ifpackagewith{sidecap}{innercaption}{% +\if@RTL \renewcommand*{\SC@FLOAT}[2]{% + \isSC@ODD{{#2}\hspace{\sidecaptionsep}{#1}} {{#1}\hspace{\sidecaptionsep}{#2}}} + \renewcommand*\SC@justify@caption{% + \isSC@ODD{\RaggedRight}{\RaggedLeft}}\else + \renewcommand*{\SC@FLOAT}[2]{% + \isSC@ODD{{#1}\hspace{\sidecaptionsep}{#2}} {{#2}\hspace{\sidecaptionsep}{#1}}} + \renewcommand*\SC@justify@caption{% + \isSC@ODD{\RaggedLeft}{\RaggedRight}}\fi +}{} + +\@ifpackagewith{sidecap}{rightcaption}{% + \if@RTL\renewcommand*{\SC@FLOAT}[2]{{#1}\hspace{\sidecaptionsep}{#2}} + \def\SC@justify@caption{\RaggedLeft}\else% + \renewcommand*{\SC@FLOAT}[2]{{#2}\hspace{\sidecaptionsep}{#1}} + \def\SC@justify@caption{\RaggedRight}\fi% +}{} + +\@ifpackagewith{sidecap}{leftcaption}{% +\if@RTL \renewcommand*{\SC@FLOAT}[2]{{#2}\hspace{\sidecaptionsep}{#1}} + \def\SC@justify@caption{\RaggedRight}\else% + \renewcommand*{\SC@FLOAT}[2]{{#1}\hspace{\sidecaptionsep}{#2}} + \def\SC@justify@caption{\RaggedLeft}\fi% +}{} \endinput %% %% End of file `sidecap-xetex-bidi.def'. diff --git a/Master/texmf-dist/tex/xelatex/bidi/soul-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/soul-xetex-bidi.def index 018ff9531ea..07b3dfe645a 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/soul-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/soul-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/stabular-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/stabular-xetex-bidi.def index 1305ab6363f..e663d1e12fc 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/stabular-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/stabular-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/subfigure-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/subfigure-xetex-bidi.def index 27cc4e1869d..a9e97098d82 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/subfigure-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/subfigure-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/tabls-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/tabls-xetex-bidi.def index b0683c01eb2..44b867f1e2b 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/tabls-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/tabls-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/tabularx-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/tabularx-xetex-bidi.def index 3386830a0f3..d0951383816 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/tabularx-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/tabularx-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/tabulary-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/tabulary-xetex-bidi.def index de6e711a959..a94bf60fb29 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/tabulary-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/tabulary-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/tc-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/tc-xetex-xetex-bidi.def index d3c38951b31..68ce5b2fcfc 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/tc-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/tc-xetex-xetex-bidi.def @@ -1,10 +1,10 @@ %% -%% This is file `tc-xetex-bidi.def', +%% This is file `tc-xetex-xetex-bidi.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% bidi.dtx (with options: `table,tc-xetex-bidi.def') +%% bidi.dtx (with options: `table,tc-xetex-xetex-bidi.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{tc-xetex-bidi.def}[2014/07/08 v0.1 bidi adaptations for Clipping driver for XeTeX engine] +\ProvidesFile{tc-xetex-xetex-bidi.def}[2014/07/08 v0.1 bidi adaptations for Clipping driver for XeTeX engine] \def\@cliptoboxdim#1{% \setbox#1=\hbox{% \Gin@defaultbp\WIDTH{\wd#1}% @@ -58,4 +58,4 @@ } \endinput %% -%% End of file `tc-xetex-bidi.def'. +%% End of file `tc-xetex-xetex-bidi.def'. diff --git a/Master/texmf-dist/tex/xelatex/bidi/tcolorbox-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/tcolorbox-xetex-bidi.def index 9a1fad14a2a..079a9ec6028 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/tcolorbox-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/tcolorbox-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/titlesec-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/titlesec-xetex-bidi.def index 0c143e984b6..9deee1d62d5 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/titlesec-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/titlesec-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/titletoc-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/titletoc-xetex-bidi.def index 72469e89405..f7edbf2068f 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/titletoc-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/titletoc-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/tocbasic-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/tocbasic-xetex-bidi.def index b3a54424959..4b576483c70 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/tocbasic-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/tocbasic-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/tocbibind-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/tocbibind-xetex-bidi.def index 36f5c856d7d..e74b0220e9d 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/tocbibind-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/tocbibind-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,9 +37,10 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{tocbibind-xetex-bidi.def}[2017/06/09 v0.4 bidi adaptations for tocbibind package for XeTeX engine] +\ProvidesFile{tocbibind-xetex-bidi.def}[2025/01/03 v0.5 bidi adaptations for tocbibind package for XeTeX engine] +\IfClassLoadedT{memoir}{\endinput} \if@dotocbib - \@ifpackageloaded{natbib}{}{% natbib not loaded + \ApplyPatchIfPackageLoadedF{natbib}{% natbib not loaded \renewcommand{\bibsection}{\t@cb@bchapsec} \renewenvironment{thebibliography}[1]{% \bibsection @@ -64,9 +65,11 @@ {\@latex@warning{Empty `thebibliography' environment}}% \endlist} +\ApplyPatchCodeToPackage{chapterbib}{% \@ifpackagewith{chapterbib}{sectionbib}% {\renewcommand{\sectionbib}[2]{}}% - {} + {}% + } \fi \if@inltxdoc\else diff --git a/Master/texmf-dist/tex/xelatex/bidi/tocloft-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/tocloft-xetex-bidi.def index b33c7f86014..5b3b3c85c4a 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/tocloft-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/tocloft-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,8 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{tocloft-xetex-bidi.def}[2023/08/02 v0.3 bidi adaptations for tocloft package for XeTeX engine] +\ProvidesFile{tocloft-xetex-bidi.def}[2025/01/03 v0.4 bidi adaptations for tocloft package for XeTeX engine] +\IfClassLoadedT{memoir}{\endinput} \renewcommand{\cftpnumalign}{\if@RTL l\else r\fi} \let\cftdot\@SepMark \if@cfthaspart diff --git a/Master/texmf-dist/tex/xelatex/bidi/tocstyle-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/tocstyle-xetex-bidi.def index 3da0ac9cf28..5164c4508ff 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/tocstyle-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/tocstyle-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/todonotes-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/todonotes-xetex-bidi.def index 61835d15456..fb2788bb78d 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/todonotes-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/todonotes-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/wrapfig-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/wrapfig-xetex-bidi.def index fedbc166545..c865cf4da8e 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/wrapfig-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/wrapfig-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/xcolor-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/xcolor-xetex-bidi.def index a5186af494f..32d74bdaf80 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/xcolor-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/xcolor-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/bidi/xltxtra-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/xltxtra-xetex-bidi.def index 9730ab8b86f..c79b75a96f7 100644 --- a/Master/texmf-dist/tex/xelatex/bidi/xltxtra-xetex-bidi.def +++ b/Master/texmf-dist/tex/xelatex/bidi/xltxtra-xetex-bidi.def @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{58641} +%% \CheckSum{57298} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/hduthesis/beamerthemehdu.sty b/Master/texmf-dist/tex/xelatex/hduthesis/beamerthemehdu.sty index dda662b5667..2a6cbf03236 100644 --- a/Master/texmf-dist/tex/xelatex/hduthesis/beamerthemehdu.sty +++ b/Master/texmf-dist/tex/xelatex/hduthesis/beamerthemehdu.sty @@ -1,93 +1,66 @@ -%% ***************************************************************************** -%% Copyright 2024 by M.Y. XIA <xiamyphys@gmail.com> * -%% * -%% This work may be distributed and/or modified under the conditions of the * -%% LaTeX Project Public License * -%% * -%% http://www.latex-project.org/lppl.txt * -%% * -%% either version 1.3c of this license or any later version. * -%% * -%% This work has the LPPL maintenance status `maintained'. * -%% * -%% The Current Maintainers of this work is M.Y. XIA * -%% * -%% This work consists of the files hduthesis.cls, * -%% hduthesis-typeset-module.code, * -%% hduthesis-layout-module.code, * -%% hduthesis-bc.config-module.code, * -%% hduthesis-pg.config-module.code, * -%% hduthesis-hdu.l3doc-module.code, * -%% hduthesis-hdu.stationery-module.code, * -%% beamerthemehdu.sty, * -%% and README.md. * -%% available at https://github.com/myhsia/hduthesis * -%% ***************************************************************************** +\ProvidesExplPackage{beamerthemehdu}{\hduthesis@date}{\hduthesis@version} + {hduThesiS~ \text_titlecase:n {beamer} ~Module} + \mode<presentation> -% info keyval -\RequirePackage{keyval,tikz,graphicx} -\usetikzlibrary{arrows,fadings,decorations.pathreplacing} -\tikzset{% - every picture/.append style = {% - line join = round, line cap = round, thick - } -} +\RequirePackage{tikz} +\usetikzlibrary{fadings} \graphicspath { {./figure/}{./figures/}{./image/}{./images/} {./graphics/}{./graphic/}{./pictures/}{./picture/} } -\ExplSyntaxOn - -\keys_define:nn { infoset } +\keys_define:nn { beamerthemehdu / docinfo } { title .tl_set:N = \@title, - subtitle .tl_set:N = \l__infoset_subtitle_tl, + subtitle .tl_set:N = \l__docinfo_subtitle_tl, author .tl_set:N = \@author, date .tl_set:N = \@date, - supervisor.tl_set:N = \l__infoset_supervisor_tl, - reference .tl_set:N = \l__infoset_reference_tl, + supervisor.tl_set:N = \l__docinfo_supervisor_tl, + bibsource .tl_set:N = \l__docinfo_reference_tl, } -\NewDocumentCommand \infoset { m } +\NewDocumentCommand \DocInfo { m } { - \keys_set:nn { infoset } { #1 } + \keys_set:nn { beamerthemehdu / docinfo } { #1 } \title { \large \@title } - \tl_set:Nn \insertshorttitle { \textsc { \l__infoset_subtitle_tl } } + \tl_set:Nn \insertshorttitle { \textsc { \l__docinfo_subtitle_tl } } \author [ \@author ] { \@author - \tl_if_empty:NF \l__infoset_supervisor_tl + \tl_if_empty:NF \l__docinfo_supervisor_tl { \texorpdfstring - { \\[2ex] \small Supervised~by~\l__infoset_supervisor_tl }{} + { \\[2ex] \small Supervised~by~\l__docinfo_supervisor_tl }{} } } \date { \@date } - \tl_if_empty:NF \l__infoset_reference_tl + \tl_if_empty:NTF \l__docinfo_bibsource_tl { - \RequirePackage - [ backend = biber, bibstyle = numeric, citestyle = numeric-comp, - autocite = superscript, sorting = none - ] { biblatex } - \addbibresource { \l__infoset_reference_tl } - \newcommand* \mkbibbracketsuperscript[1] - { \mkbibsuperscript { \mkbibbrackets{#1} } } - \DeclareCiteCommand \supercite [\mkbibbracketsuperscript] + \newcommand* \printbibliography + { + \begin{frame}[t] + \frametitle{Bibliography} + \end{frame} + } + \newcounter {citecount} + \renewcommand*\cite[1] { - \usebibmacro{cite:init} - \let\multicitedelim=\supercitedelim - \let\multicitesubentrydelim=\supercitesubentrydelim - \let\multiciterangedelim=\superciterangedelim - \let\multicitesubentryrangedelim=\supercitesubentryrangedelim - \iffieldundef{prenote}{} - {\BibliographyWarning{Ignoring prenote argument}}% - \iffieldundef{postnote}{} - {\BibliographyWarning{Ignoring postnote argument}} + \refstepcounter{citecount} + \textsuperscript{[\thecitecount]} + } + } + { + \RequirePackage [ backend = bibtex, sorting = none ] { biblatex } + \addbibresource { \l__docinfo_reference_tl } + \let \@printbibliography \printbibliography + \renewcommand* \printbibliography + { + \begin{frame}[t, allowframebreaks]{Bibliography} + \small + \@printbibliography + \end{frame} } - {\usebibmacro{citeindex}\usebibmacro{cite:comp}}{} - {\usebibmacro{cite:dump}} } } @@ -102,82 +75,87 @@ { \tikz [ remember~picture, overlay ] \node [ below~right, yshift = -1em ] at (current~page.north~west) - { \includegraphics [ width = \textwidth/3 ]{ hdubadge.pdf } }; + { \includegraphics [ width = 2\textwidth/7 ]{ hdubadge.pdf } }; } -\ExplSyntaxOff % theme & colors \useoutertheme{infolines} -\useinnertheme[shadow=false]{rounded} +\useinnertheme[shadow = false]{rounded} \definecolor{hdu}{HTML}{214395} \definecolor{hduRed}{HTML}{BF6236} -\usecolortheme[named=hdu]{structure} - -\setbeamercolor*{palette primary}{use=structure,fg=black,bg=structure.fg!40!white} -\setbeamercolor*{palette secondary}{use=structure,fg=white,bg=structure.fg!60!white} -\setbeamercolor*{palette tertiary}{use=structure,fg=white,bg=structure.fg!90!white} - -\setbeamercolor{block title}{use=structure,fg=structure.fg,bg=structure.fg!20!bg} -\setbeamercolor{block title alerted}{use=alerted text,fg=alerted text.fg,bg=alerted text.fg!20!bg} -\setbeamercolor{block title example}{use=example text,fg=example text.fg,bg=example text.fg!20!bg} -\setbeamercolor{block body}{parent=normal text,use=block title,bg=block title.bg!50!bg} -\setbeamercolor{block body alerted}{parent=normal text,use=block title alerted,bg=block title alerted.bg!50!bg} -\setbeamercolor{block body example}{parent=normal text,use=block title example,bg=block title example.bg!50!bg} - -\setbeamertemplate{navigation symbols}{} -\setbeamertemplate{page number in head/foot}{} -\addtobeamertemplate{headline}{}{ - \tikz[remember picture, overlay]{ - \filldraw [hduRed, ultra thick, line cap = butt] (0,0) --++ (\paperwidth*\fpeval{\insertpagenumber-1}/\fpeval{\insertdocumentendpage-1},0); - \draw [white, very thick, yshift = -.6pt] (0,0) --++ (\paperwidth,0); +\usecolortheme[named = hdu]{structure} + +\setbeamercolor*{palette~primary}{use=structure,fg=black,bg=structure.fg!30!white} +\setbeamercolor*{palette~secondary}{use=structure,fg=white,bg=structure.fg!60!white} +\setbeamercolor*{palette~tertiary}{use=structure,fg=white,bg=structure.fg!90!white} + +\setbeamercolor{block~title}{use=structure,fg=structure.fg,bg=structure.fg!20!bg} +\setbeamercolor{block~body}{parent=normal~text,use=block~title,bg=block~title.bg!50!bg} +\addtobeamertemplate{block~begin}{\pgfsetfillopacity{0.8}}{\pgfsetfillopacity{1}} + +\setbeamercolor{block~title~alerted}{use=alerted~text,fg=alerted~text.fg,bg=alerted~text.fg!20!bg} +\setbeamercolor{block~body~alerted}{parent=normal~text,use=block~title~alerted,bg=block~title~alerted.bg!50!bg} +\addtobeamertemplate{block~alerted~begin}{\pgfsetfillopacity{0.8}}{\pgfsetfillopacity{1}} + +\setbeamercolor{block~title~example}{use=example~text,fg=example~text.fg,bg=example~text.fg!20!bg} +\setbeamercolor{block~body~example}{parent=normal~text,use=block~title~example,bg=block~title~example.bg!50!bg} +\addtobeamertemplate{block~example~begin}{\pgfsetfillopacity{0.8}}{\pgfsetfillopacity{1}} + +\addtobeamertemplate{headline}{} + { + \tikz [ remember~picture, overlay ] + { + \filldraw [hduRed, ultra~thick, line~cap = butt] + (0,0) --++ + (\paperwidth * \fp_eval:n + {(\insertpagenumber-1)/(\insertdocumentendpage-1)},0); + \draw [white, very~thick, yshift = -.6pt] (0,0) --++ (\paperwidth,0); + } } -} - -\AtBeginSection[]{ - \begin{frame} - \ifcsname @headlogo\endcsname - \tikz [remember picture, overlay] \node [below right,yshift=-1em] at (current page.north west) {\includegraphics[width=\textwidth/3]{\@headlogo}}; - \fi - \vfill - \usebeamerfont{title}\insertsectionhead\par% - \tikz{ - \draw [hdu!20, ultra thick] (0,0) --++ (2*\linewidth/3,0); - \filldraw [hdu!60, ultra thick, path fading=west] (0,0) --++ (2*\linewidth*\fpeval{\insertframenumber-1}/\fpeval{\inserttotalframenumber-1}/3,0); - } - \vfill - \end{frame} -} - -\addtobeamertemplate{block begin}{\pgfsetfillopacity{0.75}}{\pgfsetfillopacity{1}} -\addtobeamertemplate{block alerted begin}{\pgfsetfillopacity{0.75}}{\pgfsetfillopacity{1}} -\addtobeamertemplate{block example begin}{\pgfsetfillopacity{0.75}}{\pgfsetfillopacity{1}} - -\setbeamercolor{title}{parent=author in head/foot} -\setbeamertemplate{title page}[default][colsep=-4bp,rounded=true] -\usesubitemizeitemtemplate{% - \tiny\raise1.5pt\hbox{\color{beamerstructure}$\blacktriangleright$}% -} -\usesubsubitemizeitemtemplate{% - \tiny\raise1.5pt\hbox{\color{beamerstructure}$\bigstar$}% -} + +\AtBeginSection[] + { + \begin{frame} + \tikz [ remember~picture, overlay ] + \node [ below~right, yshift = -1em ] at (current~page.north~west) + { \includegraphics [ width = 2\textwidth/7 ]{ hdubadge.pdf } }; + \vfill + \usebeamerfont{title} \insertsectionhead \par + \tikz + { + \draw [line~cap = round, hdu!20, ultra~thick] + (0,0) --++ (2\linewidth/3,0); + \filldraw [line~cap = round, hdu!60, ultra~thick, path~fading=west] + (0,0) --++ + (2\linewidth * \fp_eval:n + {(\insertframenumber - 1)/(\inserttotalframenumber - 1)}/3,0); + } + \vfill + \end{frame} + } + +\setbeamercolor{title}{parent=author~in~head/foot} +\setbeamertemplate{title~page}[default][colsep=-4bp,rounded=true] +\usesubitemizeitemtemplate + {\tiny\raise1.5pt\hbox{\color{beamerstructure}$\blacktriangleright$}} +\usesubsubitemizeitemtemplate + { \tiny\raise1.5pt\hbox{\color{beamerstructure}$\bigstar$} } % \setbeamersize{text margin left = 1em, text margin right=1em} % math settings \numberwithin{equation}{section} -\RequirePackage[mono=false]{libertine} \RequirePackage{keytheorems,amssymb,mathtools,physics2,fixdif,derivative,cancel,siunitx,nicematrix} -\renewcommand\qedsymbol{$\color{gray}\blacksquare$} -\usephysicsmodule{ab,ab.braket,diagmat,doubleprod,xmat,ab.legacy,op.legacy} +\renewcommand* \qedsymbol {$\color{gray}\blacksquare$} +\usephysicsmodule{ ab, braket, op.legacy } \RequirePackage[e]{esvect} \let\vec\vv -\def\i{\mathrm i}\def\e{\mathrm e}\def\T{\mathsf T} -\let\leq\leqslant\let\geq\geqslant % Figure settings -\RequirePackage[labelsep=period,figurename=FIG,font=footnotesize]{caption} +\RequirePackage + [ labelsep = period, figurename = \textsc{Fig}, font = footnotesize ]{caption} \RequirePackage{subcaption,booktabs} \captionsetup{belowskip=0pt} -\captionsetup[sub]{font=scriptsize} +\captionsetup[sub]{font = scriptsize} \RequirePackage{anyfontsize} \renewcommand{\raggedright}{\leftskip=0pt \rightskip=0pt plus 0cm} \RequirePackage{ragged2e} @@ -185,4 +163,5 @@ \AtBeginEnvironment{columns}{\vspace*{-.5ex}} \mode<all> -\endinput
\ No newline at end of file + +\endinput diff --git a/Master/texmf-dist/tex/xelatex/hduthesis/hduthesis-bc.config-module.code.tex b/Master/texmf-dist/tex/xelatex/hduthesis/hduthesis-bc.config-module.code.tex index c404557382b..1ed06c6aa00 100644 --- a/Master/texmf-dist/tex/xelatex/hduthesis/hduthesis-bc.config-module.code.tex +++ b/Master/texmf-dist/tex/xelatex/hduthesis/hduthesis-bc.config-module.code.tex @@ -29,7 +29,7 @@ \int_set:Nn \l__hduthesis_grade_int { \int_compare:nNnTF {\c_sys_month_int} < 9 - {\c_sys_year_int} {\int_eval:n {\c_sys_year_int+1}} + {\c_sys_year_int} {\int_eval:n {\c_sys_year_int + 1}} } \cs_new_protected_nopar:Nn \__hduthesis_cover_bc_aux: { diff --git a/Master/texmf-dist/tex/xelatex/hduthesis/hduthesis-hdu.l3doc-module.code.tex b/Master/texmf-dist/tex/xelatex/hduthesis/hduthesis-hdu.l3doc-module.code.tex index d0d70b9267d..ea8499350c1 100644 --- a/Master/texmf-dist/tex/xelatex/hduthesis/hduthesis-hdu.l3doc-module.code.tex +++ b/Master/texmf-dist/tex/xelatex/hduthesis/hduthesis-hdu.l3doc-module.code.tex @@ -98,4 +98,6 @@ \hook_gput_code:nnn { cmd/tableofcontents/after } { . } { \endtitlepage \restoregeometry } +\RequirePackage{minted} + \endinput diff --git a/Master/texmf-dist/tex/xelatex/hduthesis/hduthesis-hdu.stationery-module.code.tex b/Master/texmf-dist/tex/xelatex/hduthesis/hduthesis-hdu.stationery-module.code.tex index 43fbe1d81a3..09bf33e20af 100644 --- a/Master/texmf-dist/tex/xelatex/hduthesis/hduthesis-hdu.stationery-module.code.tex +++ b/Master/texmf-dist/tex/xelatex/hduthesis/hduthesis-hdu.stationery-module.code.tex @@ -12,10 +12,18 @@ } \RequirePackage{ hyperref, geometry, tikz, twemojis, fancyhdr } +\hypersetup{hidelinks} +\urlstyle{same} \NewDocumentCommand \DocInfo { m } { + \tl_clear:N \@author + \tl_clear:N \l__docinfo_mail_tl \keys_set:nn { hdu.stationery / docinfo } {#1} - \hypersetup { hidelinks, pdftitle = \@title, pdfauthor = \@author } + \hypersetup + { + pdftitle = Hangzhou Dianzi University, + pdfsubject = \@title, pdfauthor = \@author + } } \geometry { hmargin = .8in, bottom = .75in, top = 1.95in, footskip = 15.87pt, @@ -52,14 +60,14 @@ Hangzhou,~ Zhejiang~Province,~ 310018,~ P.R.China } \cfoot {} -\rfoot { \small \texttwemoji{1f310}~ www.hdu.edu.cn~ } +\rfoot { \small \texttwemoji{1f310}~ \url{www.hdu.edu.cn}~ } \pagestyle{fancy} \renewcommand* \maketitle { \group_begin: \small - \bool_if:nF - { \tl_if_empty_p:N \@author && \tl_if_empty_p:N \l__docinfo_mail_tl } + \bool_if:nT + { !\tl_if_empty_p:N \@author || !\tl_if_empty_p:N \l__docinfo_mail_tl } { \makebox [ 4em ] [ l ] { \scshape From } } \tl_if_empty:NTF \@author { \@latex@warning@no@line {No \noexpand \author given} } { \@author{}~ } diff --git a/Master/texmf-dist/tex/xelatex/hduthesis/hduthesis-layout-module.code.tex b/Master/texmf-dist/tex/xelatex/hduthesis/hduthesis-layout-module.code.tex index cfd2e72690a..48779c1ee96 100644 --- a/Master/texmf-dist/tex/xelatex/hduthesis/hduthesis-layout-module.code.tex +++ b/Master/texmf-dist/tex/xelatex/hduthesis/hduthesis-layout-module.code.tex @@ -110,7 +110,12 @@ \tl_if_empty:NTF \l__docinfo_bibsource_tl { \newcommand*\printbibliography{\chapter*{参考文献}} - \renewcommand*\cite[1]{\textsuperscript{[##1]}} + \newcounter {citecount} + \renewcommand*\cite[1] + { + \refstepcounter{citecount} + \textsuperscript{[\thecitecount]} + } } { \RequirePackage[sort&compress]{gbt7714} @@ -118,7 +123,7 @@ \dim_set:Nn \bibsep {.35ex} \newcommand*\printbibliography { - \nocite{*} \bibliography { \l__docinfo_bibsource_tl } + \bibliography { \l__docinfo_bibsource_tl } \addcontentsline{toc}{chapter}{参考文献} } } diff --git a/Master/texmf-dist/tex/xelatex/hduthesis/hduthesis-pg.config-module.code.tex b/Master/texmf-dist/tex/xelatex/hduthesis/hduthesis-pg.config-module.code.tex index 3d48d98931c..cd11c0fccad 100644 --- a/Master/texmf-dist/tex/xelatex/hduthesis/hduthesis-pg.config-module.code.tex +++ b/Master/texmf-dist/tex/xelatex/hduthesis/hduthesis-pg.config-module.code.tex @@ -161,49 +161,47 @@ \semilarge 学位论文使用授权说明 \end{center} \par \vspace*{.4\baselineskip} - \begin{spacing}{1.65} - 本人完全了解杭州电子科技大学关于保留和使用学位论文的规定, - 即:研究生在校攻读学位期间论文工作的知识产权单位属杭州电子科技大学。 - 本人保证毕业离校后,发表论文或使用论文工作成果时署名单位仍然为杭州电子科技大学。 - 学校有权保留送交论文的复印件,允许查阅和借阅论文;学校可以公布论文的全部或部分内容, - 可以允许采用影印、缩印或其它复制手段保存论文。(保密论文在解密后遵守此规定) - \par \vspace*{1.25\baselineskip} - \noindent \makebox[.45\linewidth][l] - { - 论文作者签名: - \__hduthesis_signature_process_aux:nnn {#1}{2}{0} - \tl_if_empty:NF \l__hduthesis_signature_figure_tl - { - \signature { \l__hduthesis_signature_figure_tl } - \tl_clear:N \l__hduthesis_signature_figure_tl - } - } - 日期: - \makebox [ 2.5em ] [ l ] - { \__hduthesis_signature_process_aux:nnn {#1}{2}{1} } 年 - \makebox [ 2em ] - { \__hduthesis_signature_process_aux:nnn {#1}{2}{2} } 月 - \makebox [ 2em ] - { \__hduthesis_signature_process_aux:nnn {#1}{2}{3} } 日 - \par \vspace*{\baselineskip} - \noindent \makebox[.45\linewidth][l] - { - 指导教师签名: - \__hduthesis_signature_process_aux:nnn {#1}{3}{0} - \tl_if_empty:NF \l__hduthesis_signature_figure_tl - { - \signature { \l__hduthesis_signature_figure_tl } - \tl_clear:N \l__hduthesis_signature_figure_tl - } - } - 日期: - \makebox [ 2.5em ] [ l ] - { \__hduthesis_signature_process_aux:nnn {#1}{3}{1} } 年 - \makebox [ 2em ] - { \__hduthesis_signature_process_aux:nnn {#1}{3}{2} } 月 - \makebox [ 2em ] - { \__hduthesis_signature_process_aux:nnn {#1}{3}{3} } 日 - \end{spacing} + 本人完全了解杭州电子科技大学关于保留和使用学位论文的规定, + 即:研究生在校攻读学位期间论文工作的知识产权单位属杭州电子科技大学。 + 本人保证毕业离校后,发表论文或使用论文工作成果时署名单位仍然为杭州电子科技大学。 + 学校有权保留送交论文的复印件,允许查阅和借阅论文;学校可以公布论文的全部或部分内容, + 可以允许采用影印、缩印或其它复制手段保存论文。(保密论文在解密后遵守此规定) + \par \vspace*{1.25\baselineskip} + \noindent \makebox[.45\linewidth][l] + { + 论文作者签名: + \__hduthesis_signature_process_aux:nnn {#1}{2}{0} + \tl_if_empty:NF \l__hduthesis_signature_figure_tl + { + \signature { \l__hduthesis_signature_figure_tl } + \tl_clear:N \l__hduthesis_signature_figure_tl + } + } + 日期: + \makebox [ 2.5em ] [ l ] + { \__hduthesis_signature_process_aux:nnn {#1}{2}{1} } 年 + \makebox [ 2em ] + { \__hduthesis_signature_process_aux:nnn {#1}{2}{2} } 月 + \makebox [ 2em ] + { \__hduthesis_signature_process_aux:nnn {#1}{2}{3} } 日 + \par \vspace*{\baselineskip} + \noindent \makebox[.45\linewidth][l] + { + 指导教师签名: + \__hduthesis_signature_process_aux:nnn {#1}{3}{0} + \tl_if_empty:NF \l__hduthesis_signature_figure_tl + { + \signature { \l__hduthesis_signature_figure_tl } + \tl_clear:N \l__hduthesis_signature_figure_tl + } + } + 日期: + \makebox [ 2.5em ] [ l ] + { \__hduthesis_signature_process_aux:nnn {#1}{3}{1} } 年 + \makebox [ 2em ] + { \__hduthesis_signature_process_aux:nnn {#1}{3}{2} } 月 + \makebox [ 2em ] + { \__hduthesis_signature_process_aux:nnn {#1}{3}{3} } 日 \end{spacing} } diff --git a/Master/texmf-dist/tex/xelatex/hduthesis/hduthesis-typeset-module.code.tex b/Master/texmf-dist/tex/xelatex/hduthesis/hduthesis-typeset-module.code.tex index ed0878b025f..6bcdc3e43f4 100644 --- a/Master/texmf-dist/tex/xelatex/hduthesis/hduthesis-typeset-module.code.tex +++ b/Master/texmf-dist/tex/xelatex/hduthesis/hduthesis-typeset-module.code.tex @@ -1,5 +1,15 @@ \hduthesis_provide_module:n {typeset} +\RequirePackage { circuitikz, pgfplots, listings, hologo, + lipsum, zhlipsum, booktabs, multicol } +\pgfplotsset { compat = newest } +\hologoFontSetup { general = \sffamily } +\graphicspath + { + {./figure/}{./figures/}{./image/}{./images/} + {./graphics/}{./graphic/}{./pictures/}{./picture/} + } + \linespread{1.39} \dim_set:Nn \parindent { 2\ccwd } \newcommand \semilarge { \@setfontsize \semilarge{14}{16.5} } @@ -14,14 +24,14 @@ [ Extension = .otf, BoldItalicFont = *-bolditalic, UprightFont = *-regular, BoldFont = *-bold, - ItalicFont = *-italic, Scale = .9, + ItalicFont = *-italic, Scale = .9 ] -\RequirePackage { amssymb, mathtools, cancel, fixdif, derivative } +\RequirePackage { amssymb, mathtools, cancel, fixdif, derivative, siunitx } \file_if_exist:nTF { physics2.sty } { \RequirePackage{physics2} - \usephysicsmodule{ ab, braket, ab.legacy, op.legacy, bm-um.legacy } + \usephysicsmodule{ ab, braket, op.legacy, bm-um.legacy } } { \RequirePackage{bm} } \RequirePackage [ warnings-off = { mathtools-colon, mathtools-overbracket } ] {unicode-math} diff --git a/Master/texmf-dist/tex/xelatex/hduthesis/hduthesis.cls b/Master/texmf-dist/tex/xelatex/hduthesis/hduthesis.cls index f40d3ca9d17..dca7cca40b0 100644 --- a/Master/texmf-dist/tex/xelatex/hduthesis/hduthesis.cls +++ b/Master/texmf-dist/tex/xelatex/hduthesis/hduthesis.cls @@ -17,21 +17,21 @@ %% hduthesis-layout-module.code, * %% hduthesis-bc.config-module.code, * %% hduthesis-pg.config-module.code, * -%% hduthesis-hdu.l3doc-module.code, * -%% hduthesis-hdu.stationery-module.code, * %% beamerthemehdu.sty, * +%% hduthesis-hdu.stationery-module.code, * +%% * +%% hduthesis-hdu.l3doc-module.code, * %% and README.md. * %% available at https://github.com/myhsia/hduthesis * %% ***************************************************************************** -\def\hduthesis@date{2024/12/31} -\def\hduthesis@version{0.5.1} +\def\hduthesis@date{2025/01/04} +\def\hduthesis@version{0.5.2} \def\hduthesis@maintainerid{myhsia} \RequirePackage{etoolbox} \ProvidesExplClass{hduthesis} {\hduthesis@date} {\hduthesis@version} - {LaTeX Class for Thesis at Hangzhou Dianzi University} + {LaTeX Template Bundle for Hangzhou Dianzi University} -% Module for TeX Live 2022 and (or) later \cs_if_exist:NF \seq_set_split:Nne { \cs_generate_variant:Nn \seq_set_split:Nnn { Nne } } \cs_if_exist:NF \seq_set_split:Nee @@ -45,22 +45,24 @@ { \msg_new:nnn { hduthesis } {#1} {#2} } \cs_new_protected:Npn \hduthesis_msg_error:nn #1#2 { \msg_error:nnn { hduthesis } {#1} {#2} } +\cs_generate_variant:Nn \hduthesis_msg_error:nn { nx } +\cs_new_protected:Npn \hduthesis_msg_warning:nn #1#2 + { \msg_warning:nnn { hduthesis } {#1} {#2} } +\cs_generate_variant:Nn \hduthesis_msg_warning:nn { nx } -\hduthesis_msg_new:nn { 用户协议 } +\hduthesis_msg_new:nn { not found module } + { The~hduthesis~module~`#1'~not~found. } +\hduthesis_msg_new:nn { unknown mode } + { Unknown~hduthesis~mode~`#1',~ loading~mode~`thesis'~instead. } +\hduthesis_msg_new:nn { Users Agreement } { \exp_not:n { - ⚠️⚠️⚠️⚠️⚠️~ 「hduThesiS」编译受阻🥵 ~⚠️⚠️⚠️⚠️⚠️~ - 使用模板前请认真阅读模板说明文档封面上的「用户协议」~ - 😡👊模板作者不对使用本模板产生的格式审查问题负责👊😡~ - 添加选项 `agreed'[\documentclass[agreed]{hduthesis}]~ - 即可顺利编译并默认代表您已同意本协议.~ 祝君科研顺利!~ - 如遇问题,可邮件反馈至📮xiamyphys@gmail.com. + 编译受阻!~ 使用模板前请阅读用户手册封面上的「用户协议」~ + !!!模板作者(@myhsia)不对使用本模板产生的格式审查问题负责!!!~ + 如果您同意用户协议,在全局选项中添加 `agreed' 即可解除本错误~ + 欢迎您通过邮件(myhsia@hdu.edu.cn)或GitHub提交反馈意见 } } - -\cs_generate_variant:Nn \hduthesis_msg_error:nn { nx } -\hduthesis_msg_new:nn { not found module } - { The~hduthesis~module~`#1'~not~found. } \cs_new_protected_nopar:Npn \hduthesis_load_module:n #1 { \clist_map_inline:nn {#1} @@ -76,19 +78,13 @@ {hduThesiS~ \text_titlecase:n {#1} ~Module} } -% global options \clist_new:N \g__hdu_base_class_options_clist \keys_define:nn { hduthesis / classoption } { agreed .bool_set:N = \g__hduthesis_agreement_bool, agreed .initial:n = false, agreed .default:n = true, - l3doc .bool_set:N = \g__hduthesis_doc_bool, - l3doc .initial:n = false, - l3doc .default:n = true, - stationery .bool_set:N = \g__hduthesis_stationery_bool, - stationery .initial:n = false, - stationery .default:n = true, + mode .tl_set:N = \g__hduthesis_mode_tl, math-font .tl_set:N = \g__hduthesis_math_font, CJKmain-font .tl_set:N = \g__hduthesis_main_CJK_font, CJKsans-font .tl_set:N = \g__hduthesis_sans_CJK_font, @@ -108,15 +104,26 @@ } \ProcessKeyOptions [ hduthesis / classoption ] -\bool_if:NT \g__hduthesis_doc_bool +\bool_if:nT { - \PassOptionsToClass { 11pt, letterpaper, kernel } { l3doc } - \exp_args:NNV \LoadClass [ \g__hdu_base_class_options_clist ] { l3doc } - \hduthesis_load_module:n { hdu.l3doc } + !\str_if_empty_p:N \g__hduthesis_mode_tl && + !\str_if_eq_p:ee { \g__hduthesis_mode_tl } { thesis } && + !\str_if_eq_p:ee { \g__hduthesis_mode_tl } { beamer } && + !\str_if_eq_p:ee { \g__hduthesis_mode_tl } { stationery } && + % !\str_if_eq_p:ee { \g__hduthesis_mode_tl } { exam } && + !\str_if_eq_p:ee { \g__hduthesis_mode_tl } { l3doc } + } + { \hduthesis_msg_warning:nx { unknown mode } { \g__hduthesis_mode_tl } } + +\str_if_eq:eeT { \g__hduthesis_mode_tl } { beamer } + { + \PassOptionsToClass { aspectratio = 2013 } { beamer } + \exp_args:NNV \LoadClass [ \g__hdu_base_class_options_clist ] { beamer } + \usetheme{hdu} \endinput } -\bool_if:NT \g__hduthesis_stationery_bool +\str_if_eq:eeT { \g__hduthesis_mode_tl } { stationery } { \PassOptionsToClass { 12pt } { letter } \exp_args:NNV \LoadClass [ \g__hdu_base_class_options_clist ] { letter } @@ -124,37 +131,53 @@ \endinput } -\PassOptionsToClass { a4paper, zihao = -4 } { ctexrep } -\PassOptionsToPackage { quiet, no-math } { xeCJK } -\exp_args:NNV \LoadClass [ \g__hdu_base_class_options_clist ] { ctexrep } -\bool_if:NTF \g__hduthesis_agreement_bool +% \str_if_eq:eeT { \g__hduthesis_mode_tl } { exam } +% { +% \exp_args:NNV \LoadClass [ \g__hdu_base_class_options_clist ] { article } +% \hduthesis_load_module:n { hdu.exam } +% \endinput +% } + +\str_if_eq:eeT { \g__hduthesis_mode_tl } { l3doc } { - \RequirePackage{hyperref} - \pdfstringdefDisableCommands - { - \def \cite#1 {<#1>} - \def \hologoRobust#1 {<#1>} - } - \AtBeginDocument - { \hypersetup { hidelinks, pdfproducer = hduThesiS~by~Mingyu~Xia } } - } { \hduthesis_msg_error:nn { 用户协议 } { 未确认 } } + \PassOptionsToClass { 11pt, letterpaper, kernel } { l3doc } + \exp_args:NNV \LoadClass [ \g__hdu_base_class_options_clist ] { l3doc } + \hduthesis_load_module:n { hdu.l3doc } + \endinput + } -\RequirePackage { siunitx, circuitikz, pgfplots, listings, - hologo, lipsum, zhlipsum, booktabs, multicol } -\pgfplotsset { compat = newest } -\hologoFontSetup { general = \sffamily } -\graphicspath +\bool_if:nT { - {./figure/}{./figures/}{./image/}{./images/} - {./graphics/}{./graphic/}{./pictures/}{./picture/} + \str_if_eq_p:ee { \g__hduthesis_mode_tl } { thesis } || + !\str_if_eq_p:ee { \g__hduthesis_mode_tl } { beamer } || + !\str_if_eq_p:ee { \g__hduthesis_mode_tl } { stationery } || + % !\str_if_eq_p:ee { \g__hduthesis_mode_tl } { exam } || + !\str_if_eq_p:ee { \g__hduthesis_mode_tl } { l3doc } } -\hduthesis_load_module:n { typeset } -\hduthesis_load_module:n { layout } -\cs_new_protected:Nn \__hduthesis_docinfo_degree_if_aux: { - \int_compare:nNnTF { \tl_count:N \l__docinfo_stdntid_tl } = { 8 } - { \hduthesis_load_module:n { bc.config } } - { \hduthesis_load_module:n { pg.config } } + \PassOptionsToClass { a4paper, zihao = -4 } { ctexrep } + \PassOptionsToPackage { quiet, no-math } { xeCJK } + \exp_args:NNV \LoadClass [ \g__hdu_base_class_options_clist ] { ctexrep } + \bool_if:NTF \g__hduthesis_agreement_bool + { + \RequirePackage{hyperref} + \pdfstringdefDisableCommands + { + \def \cite#1 {<#1>} + \def \hologoRobust#1 {<#1>} + } + \AtBeginDocument + { \hypersetup { hidelinks, pdfproducer = hduThesiS~by~Mingyu~Xia } } + } { \hduthesis_msg_error:nn { Users Agreement } { Unconfirmed } } + \hduthesis_load_module:n { typeset } + \hduthesis_load_module:n { layout } + \cs_new_protected:Nn \__hduthesis_docinfo_degree_if_aux: + { + \int_compare:nNnTF { \tl_count:N \l__docinfo_stdntid_tl } = { 8 } + { \hduthesis_load_module:n { bc.config } } + { \hduthesis_load_module:n { pg.config } } + } + \endinput } \endinput diff --git a/Master/texmf-dist/tex/xelatex/xepersian/algorithm-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/algorithm-xetex-xepersian.def index c3019ef73f6..9b138800adf 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/algorithm-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/algorithm-xetex-xepersian.def @@ -1,10 +1,10 @@ %% -%% This is file `algorithm-xepersian.def', +%% This is file `algorithm-xetex-xepersian.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% xepersian.dtx (with options: `table,algorithm-xepersian.def') +%% xepersian.dtx (with options: `table,algorithm-xetex-xepersian.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,10 +37,10 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{algorithm-xepersian.def}[2010/07/25 v0.2 adaptations for algorithm package] +\ProvidesFile{algorithm-xetex-xepersian.def}[2010/07/25 v0.2 xepersian adaptations for algorithm package for XeTeX engine] \def\ALG@name{\if@RTL الگوریتم\else Algorithm\fi} \def\ALGS@name{الگوریتمها} \def\listalgorithmname{\if@RTL فهرست \ALGS@name\else List of \ALG@name s\fi} \endinput %% -%% End of file `algorithm-xepersian.def'. +%% End of file `algorithm-xetex-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/algorithmic-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/algorithmic-xetex-xepersian.def index a3f33160d12..78c8e4cd34f 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/algorithmic-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/algorithmic-xetex-xepersian.def @@ -1,10 +1,10 @@ %% -%% This is file `algorithmic-xepersian.def', +%% This is file `algorithmic-xetex-xepersian.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% xepersian.dtx (with options: `table,algorithmic-xepersian.def') +%% xepersian.dtx (with options: `table,algorithmic-xetex-xepersian.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,9 +37,9 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{algorithmic-xepersian.def}[2010/07/25 v0.2 adaptations for algorithmic package] +\ProvidesFile{algorithmic-xetex-xepersian.def}[2010/07/25 v0.2 xepersian adaptations for algorithmic package for XeTeX engine] \def\algorithmicrequire{\if@RTL\textbf{ورودی:}\else\textbf{Require:}\fi} \def\algorithmicensure{\if@RTL\textbf{خروجی:}\else\textbf{Ensure:}\fi} \endinput %% -%% End of file `algorithmic-xepersian.def'. +%% End of file `algorithmic-xetex-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/imsproc-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/amsart-xetex-xepersian.def index 51a20576b5d..875a32de378 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/imsproc-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/amsart-xetex-xepersian.def @@ -1,10 +1,10 @@ %% -%% This is file `imsproc-xepersian.def', +%% This is file `amsart-xetex-xepersian.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% xepersian.dtx (with options: `table,imsproc-xepersian.def') +%% xepersian.dtx (with options: `table,amsart-xetex-xepersian.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,8 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{imsproc-xepersian.def}[2017/06/09 v0.5 xepersian adaptations for imsproc class for XeTeX engine] - +\ProvidesFile{amsart-xetex-xepersian.def}[2017/02/04 v0.4 xepersian adaptations for amsart class for XeTeX engine] \renewcommand \thepart {\@tartibi\c@part} \def\appendix{\par\c@section\z@ \c@subsection\z@ \let\sectionname\appendixname @@ -46,4 +45,4 @@ \endinput %% -%% End of file `imsproc-xepersian.def'. +%% End of file `amsart-xetex-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/amsbook-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/amsbook-xetex-xepersian.def index 0e87c646c78..5cec7479c4a 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/amsbook-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/amsbook-xetex-xepersian.def @@ -1,10 +1,10 @@ %% -%% This is file `amsbook-xepersian.def', +%% This is file `amsbook-xetex-xepersian.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% xepersian.dtx (with options: `table,amsbook-xepersian.def') +%% xepersian.dtx (with options: `table,amsbook-xetex-xepersian.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{amsbook-xepersian.def}[2017/02/04 v0.5 adaptations for amsbook class] +\ProvidesFile{amsbook-xetex-xepersian.def}[2017/02/04 v0.5 xepersian adaptations for amsbook class for XeTeX engine] \def\frontmatter{\cleardoublepage\pagenumbering{harfi}} \renewcommand \thepart {\@tartibi\c@part} \def\appendix{\par @@ -47,4 +47,4 @@ \endinput %% -%% End of file `amsbook-xepersian.def'. +%% End of file `amsbook-xetex-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/appendix-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/appendix-xetex-xepersian.def index a5fb1d9a368..a989f339301 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/appendix-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/appendix-xetex-xepersian.def @@ -1,10 +1,10 @@ %% -%% This is file `appendix-xepersian.def', +%% This is file `appendix-xetex-xepersian.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% xepersian.dtx (with options: `table,appendix-xepersian.def') +%% xepersian.dtx (with options: `table,appendix-xetex-xepersian.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{appendix-xepersian.def}[2015/02/01 v0.1 adaptations for appendix package] +\ProvidesFile{appendix-xetex-xepersian.def}[2015/02/01 v0.1 xepersian adaptations for appendix package for XeTeX engine] \renewcommand{\@resets@pp}{\par \@ppsavesec \stepcounter{@pps} @@ -54,4 +54,4 @@ } \endinput %% -%% End of file `appendix-xepersian.def'. +%% End of file `appendix-xetex-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/article-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/article-xetex-xepersian.def index 9800e69949a..e29e8c60bc1 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/article-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/article-xetex-xepersian.def @@ -1,10 +1,10 @@ %% -%% This is file `article-xepersian.def', +%% This is file `article-xetex-xepersian.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% xepersian.dtx (with options: `table,article-xepersian.def') +%% xepersian.dtx (with options: `table,article-xetex-xepersian.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{article-xepersian.def}[2010/07/25 v0.2 adaptations for standard article class] +\ProvidesFile{article-xetex-xepersian.def}[2010/07/25 v0.2 xepersian adaptations for standard article class for XeTeX engine] \renewcommand \thepart {\@tartibi\c@part} \renewcommand\appendix{\par \setcounter{section}{0}% @@ -45,4 +45,4 @@ \gdef\thesection{\@harfi\c@section}} \endinput %% -%% End of file `article-xepersian.def'. +%% End of file `article-xetex-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/artikel1-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/artikel1-xetex-xepersian.def index 335e042a914..03b30f8519e 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/artikel1-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/artikel1-xetex-xepersian.def @@ -1,10 +1,10 @@ %% -%% This is file `artikel1-xepersian.def', +%% This is file `artikel1-xetex-xepersian.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% xepersian.dtx (with options: `table,artikel1-xepersian.def') +%% xepersian.dtx (with options: `table,artikel1-xetex-xepersian.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{artikel1-xepersian.def}[2010/07/25 v0.1 adaptations for artikel1 class] +\ProvidesFile{artikel1-xetex-xepersian.def}[2010/07/25 v0.1 xepersian adaptations for artikel1 class for XeTeX engine] \renewcommand*\thepart{\@tartibi\c@part} \renewcommand*\appendix{\par \setcounter{section}{0}% @@ -45,4 +45,4 @@ \gdef\thesection{\@harfi\c@section}} \endinput %% -%% End of file `artikel1-xepersian.def'. +%% End of file `artikel1-xetex-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/artikel2-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/artikel2-xetex-xepersian.def index a4238fd4eb8..495ec0f9bf3 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/artikel2-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/artikel2-xetex-xepersian.def @@ -1,10 +1,10 @@ %% -%% This is file `artikel2-xepersian.def', +%% This is file `artikel2-xetex-xepersian.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% xepersian.dtx (with options: `table,artikel2-xepersian.def') +%% xepersian.dtx (with options: `table,artikel2-xetex-xepersian.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{artikel2-xepersian.def}[2010/07/25 v0.1 adaptations for artikel2 class] +\ProvidesFile{artikel2-xetex-xepersian.def}[2010/07/25 v0.1 xepersian adaptations for artikel2 class for XeTeX engine] \renewcommand*\thepart{\@tartibi\c@part} \renewcommand*\appendix{\par \setcounter{section}{0}% @@ -45,4 +45,4 @@ \gdef\thesection{\@harfi\c@section}} \endinput %% -%% End of file `artikel2-xepersian.def'. +%% End of file `artikel2-xetex-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/artikel3-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/artikel3-xetex-xepersian.def index c53176c0bef..59fc567e4be 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/artikel3-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/artikel3-xetex-xepersian.def @@ -1,10 +1,10 @@ %% -%% This is file `artikel3-xepersian.def', +%% This is file `artikel3-xetex-xepersian.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% xepersian.dtx (with options: `table,artikel3-xepersian.def') +%% xepersian.dtx (with options: `table,artikel3-xetex-xepersian.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{artikel3-xepersian.def}[2010/07/25 v0.1 adaptations for artikel3 class] +\ProvidesFile{artikel3-xetex-xepersian.def}[2010/07/25 v0.1 xepersian adaptations for artikel3 class for XeTeX engine] \renewcommand*\thepart{\@tartibi\c@part} \renewcommand*\appendix{\par \setcounter{section}{0}% @@ -45,4 +45,4 @@ \gdef\thesection{\@harfi\c@section}} \endinput %% -%% End of file `artikel3-xepersian.def'. +%% End of file `artikel3-xetex-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/backref-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/backref-xetex-xepersian.def index 50032b284d3..22f9a651c23 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/backref-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/backref-xetex-xepersian.def @@ -1,10 +1,10 @@ %% -%% This is file `backref-xepersian.def', +%% This is file `backref-xetex-xepersian.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% xepersian.dtx (with options: `table,backref-xepersian.def') +%% xepersian.dtx (with options: `table,backref-xetex-xepersian.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{backref-xepersian.def}[2010/07/25 v0.1 adaptations for backref package] +\ProvidesFile{backref-xetex-xepersian.def}[2010/07/25 v0.1 xepersian adaptations for backref package for XeTeX engine] \def\backrefpagesname{\if@RTL صفحات\else pages\fi} \def\BR@Latincitex[#1]#2{% \BRorg@Latincitex[{#1}]{#2}% @@ -59,4 +59,4 @@ }% \endinput %% -%% End of file `backref-xepersian.def'. +%% End of file `backref-xetex-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/beamer-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/beamer-xetex-xepersian.def index 7a718434c69..3e56f1058f9 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/beamer-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/beamer-xetex-xepersian.def @@ -1,10 +1,10 @@ %% -%% This is file `beamer-xepersian.def', +%% This is file `beamer-xetex-xepersian.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% xepersian.dtx (with options: `table,beamer-xepersian.def') +%% xepersian.dtx (with options: `table,beamer-xetex-xepersian.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{beamer-xepersian.def}[2022/06/27 v0.2 xepersian changes to beamer class] +\ProvidesFile{beamer-xetex-xepersian.def}[2022/06/27 v0.2 xepersian adaptations for beamer class for XeTeX engine] \usefonttheme[stillsansserifmath]{serif} \renewcommand*{\bidi@beamer@today}{% @@ -45,4 +45,4 @@ \endinput %% -%% End of file `beamer-xepersian.def'. +%% End of file `beamer-xetex-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/beamerbasetranslator-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/beamerbasetranslator-xetex-xepersian.def index e5cd225d821..416696107c9 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/beamerbasetranslator-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/beamerbasetranslator-xetex-xepersian.def @@ -1,10 +1,10 @@ %% -%% This is file `beamerbasetranslator-xepersian.def', +%% This is file `beamerbasetranslator-xetex-xepersian.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% xepersian.dtx (with options: `table,beamerbasetranslator-xepersian.def') +%% xepersian.dtx (with options: `table,beamerbasetranslator-xetex-xepersian.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{beamerbasetranslator-xepersian.def}[2022/06/27 v0.3 xepersian changes to beamerbasetranslator package] +\ProvidesFile{beamerbasetranslator-xetex-xepersian.def}[2022/06/27 v0.3 xepersian adaptations for beamerbasetranslator package for XeTeX engine] \newcommand*{\ProvidePersianTranslation}[2]{% \providetranslation{#1}{\ifRtoL{#2}{#1}}% } @@ -60,4 +60,4 @@ \endinput %% -%% End of file `beamerbasetranslator-xepersian.def'. +%% End of file `beamerbasetranslator-xetex-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/bidimoderncv-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/bidimoderncv-xetex-xepersian.def index 60e3d10008e..2686d93843e 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/bidimoderncv-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/bidimoderncv-xetex-xepersian.def @@ -1,10 +1,10 @@ %% -%% This is file `bidimoderncv-xepersian.def', +%% This is file `bidimoderncv-xetex-xepersian.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% xepersian.dtx (with options: `table,bidimoderncv-xepersian.def') +%% xepersian.dtx (with options: `table,bidimoderncv-xetex-xepersian.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,8 +37,8 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{bidimoderncv-xepersian.def}[2010/07/25 v0.1 adaptations for bidimoderncv class] +\ProvidesFile{bidimoderncv-xetex-xepersian.def}[2010/07/25 v0.1 xepersian adaptations for bidimoderncv class for XeTeX engine] \def\refname{\if@RTL تألیفات\else Publications\fi} \endinput %% -%% End of file `bidimoderncv-xepersian.def'. +%% End of file `bidimoderncv-xetex-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/bidituftesidenote-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/bidituftesidenote-xetex-xepersian.def index 5af7d31d86d..4f8d5b529bd 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/bidituftesidenote-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/bidituftesidenote-xetex-xepersian.def @@ -1,10 +1,10 @@ %% -%% This is file `bidituftesidenote-xepersian.def', +%% This is file `bidituftesidenote-xetex-xepersian.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% xepersian.dtx (with options: `table,bidituftesidenote-xepersian.def') +%% xepersian.dtx (with options: `table,bidituftesidenote-xetex-xepersian.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{bidituftesidenote-xepersian.def}[2017/02/04 v0.3 xepersian changes to bidituftesidenote package] +\ProvidesFile{bidituftesidenote-xetex-xepersian.def}[2017/02/04 v0.3 xepersian adaptations for bidituftesidenote package for XeTeX engine] \setLTRcitationfont{\resetlatinfont\footnotesize} @@ -47,4 +47,4 @@ \endinput %% -%% End of file `bidituftesidenote-xepersian.def'. +%% End of file `bidituftesidenote-xetex-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/boek3-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/boek-xetex-xepersian.def index c24312d1672..034b2029bcf 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/boek3-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/boek-xetex-xepersian.def @@ -1,10 +1,10 @@ %% -%% This is file `boek3-xepersian.def', +%% This is file `boek-xetex-xepersian.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% xepersian.dtx (with options: `table,boek3-xepersian.def') +%% xepersian.dtx (with options: `table,boek-xetex-xepersian.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{boek3-xepersian.def}[2010/07/25 v0.1 adaptations for boek3 class] +\ProvidesFile{boek-xetex-xepersian.def}[2010/07/25 v0.1 xepersian adaptations for boek class for XeTeX engine] \renewcommand*\thepart{\@tartibi\c@part} \renewcommand*\frontmatter{% \cleardoublepage @@ -50,4 +50,4 @@ \gdef\thechapter{\@harfi\c@chapter}} \endinput %% -%% End of file `boek3-xepersian.def'. +%% End of file `boek-xetex-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/boek-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/boek3-xetex-xepersian.def index 612f6122991..233edbe4832 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/boek-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/boek3-xetex-xepersian.def @@ -1,10 +1,10 @@ %% -%% This is file `boek-xepersian.def', +%% This is file `boek3-xetex-xepersian.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% xepersian.dtx (with options: `table,boek-xepersian.def') +%% xepersian.dtx (with options: `table,boek3-xetex-xepersian.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{boek-xepersian.def}[2010/07/25 v0.1 adaptations for boek class] +\ProvidesFile{boek3-xetex-xepersian.def}[2010/07/25 v0.1 xepersian adaptations for boek3 class for XeTeX engine] \renewcommand*\thepart{\@tartibi\c@part} \renewcommand*\frontmatter{% \cleardoublepage @@ -50,4 +50,4 @@ \gdef\thechapter{\@harfi\c@chapter}} \endinput %% -%% End of file `boek-xepersian.def'. +%% End of file `boek3-xetex-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/extbook-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/book-xetex-xepersian.def index 580ca3fd76f..3e9aa40b00c 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/extbook-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/book-xetex-xepersian.def @@ -1,10 +1,10 @@ %% -%% This is file `extbook-xepersian.def', +%% This is file `book-xetex-xepersian.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% xepersian.dtx (with options: `table,extbook-xepersian.def') +%% xepersian.dtx (with options: `table,book-xetex-xepersian.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{extbook-xepersian.def}[2010/07/25 v0.1 adaptations for extbook class] +\ProvidesFile{book-xetex-xepersian.def}[2010/07/25 v0.2 xepersian adaptations for book class for XeTeX engine] \renewcommand\frontmatter{% \cleardoublepage \@mainmatterfalse @@ -51,4 +51,4 @@ }%end appendix \endinput %% -%% End of file `extbook-xepersian.def'. +%% End of file `book-xetex-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/report-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/bookest-xetex-xepersian.def index 0664457bc9a..16ab35d39e3 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/report-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/bookest-xetex-xepersian.def @@ -1,10 +1,10 @@ %% -%% This is file `report-xepersian.def', +%% This is file `bookest-xetex-xepersian.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% xepersian.dtx (with options: `table,report-xepersian.def') +%% xepersian.dtx (with options: `table,bookest-xetex-xepersian.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{report-xepersian.def}[2010/07/25 v0.2 adaptations for standard report class] +\ProvidesFile{bookest-xetex-xepersian.def}[2010/07/25 v0.1 xepersian adaptations for bookest class for XeTeX engine] \renewcommand \thepart {\@tartibi\c@part} \renewcommand\appendix{\par \setcounter{chapter}{0}% @@ -47,4 +47,4 @@ }%end appendix \endinput %% -%% End of file `report-xepersian.def'. +%% End of file `bookest-xetex-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/breqn-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/breqn-xetex-xepersian.def index b2c854d5e9c..3de7279d8ac 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/breqn-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/breqn-xetex-xepersian.def @@ -1,10 +1,10 @@ %% -%% This is file `breqn-xepersian.def', +%% This is file `breqn-xetex-xepersian.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% xepersian.dtx (with options: `table,breqn-xepersian.def') +%% xepersian.dtx (with options: `table,breqn-xetex-xepersian.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{breqn-xepersian.def}[2010/07/25 v0.1 adaptations for breqn package] +\ProvidesFile{breqn-xetex-xepersian.def}[2010/07/25 v0.1 xepersian adaptations for breqn package for XeTeX engine] \def\@dmath[#1]{\if@RTL\@RTLfalse\addfontfeatures{Mapping=farsidigits}\fi% \everydisplay\expandafter{\the\everydisplay \display@setup}% \if@noskipsec \leavevmode \fi @@ -79,4 +79,4 @@ } \endinput %% -%% End of file `breqn-xepersian.def'. +%% End of file `breqn-xetex-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/color-localise-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/color-localize-xetex-xepersian.def index d75705b727d..206bf2db777 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/color-localise-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/color-localize-xetex-xepersian.def @@ -1,10 +1,10 @@ %% -%% This is file `color-localise-xepersian.def', +%% This is file `color-localize-xetex-xepersian.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% xepersian.dtx (with options: `table,color-localise-xepersian.def') +%% xepersian.dtx (with options: `table,color-localize-xetex-xepersian.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\آمادهسازیپرونده{color-localise-xepersian.def}[2011/03/01 v0.1 localising color package] +\آمادهسازیپرونده{color-localize-xetex-xepersian.def}[2011/03/01 v0.1 localizing color package for XeTeX engine] \تعریفرنگ{سیاه}{rgb}{0,0,0} \تعریفرنگ{سفید}{rgb}{1,1,1} \تعریفرنگ{قرمز}{rgb}{1,0,0} @@ -48,4 +48,4 @@ \تعریفرنگ{زرد}{cmyk}{0,0,1,0} \endinput %% -%% End of file `color-localise-xepersian.def'. +%% End of file `color-localize-xetex-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/enumerate-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/enumerate-xetex-xepersian.def index 159f6c49ac0..3cd620a6c74 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/enumerate-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/enumerate-xetex-xepersian.def @@ -1,10 +1,10 @@ %% -%% This is file `enumerate-xepersian.def', +%% This is file `enumerate-xetex-xepersian.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% xepersian.dtx (with options: `table,enumerate-xepersian.def') +%% xepersian.dtx (with options: `table,enumerate-xetex-xepersian.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{enumerate-xepersian.def}[2010/07/25 v0.1 adaptations for enumerate package] +\ProvidesFile{enumerate-xetex-xepersian.def}[2010/07/25 v0.1 xepersian adaptations for enumerate package for XeTeX engine] \def\@enloop@{% \ifx ا\@entemp \def\@tempa{\@enLabel\harfi }\else \ifx ی\@entemp \def\@tempa{\@enLabel\adadi }\else @@ -56,4 +56,4 @@ \@tempa} \endinput %% -%% End of file `enumerate-xepersian.def'. +%% End of file `enumerate-xetex-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/enumitem-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/enumitem-xetex-xepersian.def index fde83bb2686..116db0f2b09 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/enumitem-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/enumitem-xetex-xepersian.def @@ -1,10 +1,10 @@ %% -%% This is file `enumitem-xepersian.def', +%% This is file `enumitem-xetex-xepersian.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% xepersian.dtx (with options: `table,enumitem-xepersian.def') +%% xepersian.dtx (with options: `table,enumitem-xetex-xepersian.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{enumitem-xepersian.def}[2017/09/06 v0.1 adaptations for enumitem package] +\ProvidesFile{enumitem-xetex-xepersian.def}[2017/09/06 v0.1 xepersian adaptations for enumitem package for XeTeX engine] \AddEnumerateCounter*\tartibi\@tartibi{999999999} \AddEnumerateCounter*\adadi\@adadi{999999999} \AddEnumerateCounter\harfi\@harfi{گ} @@ -50,4 +50,4 @@ \SetEnumerateShortLabel{ج}{\abjad*} \endinput %% -%% End of file `enumitem-xepersian.def'. +%% End of file `enumitem-xetex-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/extarticle-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/extarticle-xetex-xepersian.def index f64cd51d239..d1efab09ee7 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/extarticle-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/extarticle-xetex-xepersian.def @@ -1,10 +1,10 @@ %% -%% This is file `extarticle-xepersian.def', +%% This is file `extarticle-xetex-xepersian.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% xepersian.dtx (with options: `table,extarticle-xepersian.def') +%% xepersian.dtx (with options: `table,extarticle-xetex-xepersian.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{extarticle-xepersian.def}[2010/07/25 v0.1 adaptations for extarticle class] +\ProvidesFile{extarticle-xetex-xepersian.def}[2010/07/25 v0.1 xepersian adaptations for extarticle class for XeTeX engine] \renewcommand\thepart {\@tartibi\c@part} \renewcommand\appendix{\par \setcounter{section}{0}% @@ -45,4 +45,4 @@ \gdef\thesection{\@harfi\c@section}} \endinput %% -%% End of file `extarticle-xepersian.def'. +%% End of file `extarticle-xetex-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/book-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/extbook-xetex-xepersian.def index a05253116c5..25eaf279db4 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/book-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/extbook-xetex-xepersian.def @@ -1,10 +1,10 @@ %% -%% This is file `book-xepersian.def', +%% This is file `extbook-xetex-xepersian.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% xepersian.dtx (with options: `table,book-xepersian.def') +%% xepersian.dtx (with options: `table,extbook-xetex-xepersian.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{book-xepersian.def}[2010/07/25 v0.2 adaptations for standard book class] +\ProvidesFile{extbook-xetex-xepersian.def}[2010/07/25 v0.1 xepersian adaptations for extbook class for XeTeX engine] \renewcommand\frontmatter{% \cleardoublepage \@mainmatterfalse @@ -51,4 +51,4 @@ }%end appendix \endinput %% -%% End of file `book-xepersian.def'. +%% End of file `extbook-xetex-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/extrafootnotefeatures-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/extrafootnotefeatures-xetex-bidi-xetex-xepersian.def index 9d1386d9bcc..faf158b1d5a 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/extrafootnotefeatures-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/extrafootnotefeatures-xetex-bidi-xetex-xepersian.def @@ -1,10 +1,10 @@ %% -%% This is file `extrafootnotefeatures-xepersian.def', +%% This is file `extrafootnotefeatures-xetex-bidi-xetex-xepersian.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% xepersian.dtx (with options: `table,extrafootnotefeatures-xepersian.def') +%% xepersian.dtx (with options: `table,extrafootnotefeatures-xetex-bidi-xetex-xepersian.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,10 +37,10 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{extrafootnotefeatures-xepersian.def}[2012/01/01 v0.2 footnote macros for extrafootnotefeatures option of xepersian package] +\ProvidesFile{extrafootnotefeatures-xetex-bidi-xetex-xepersian.def}[2012/01/01 v0.2 xepersian adaptations for extrafootnotefeatures option for XeTeX engine] \renewcommand{\foottextfont}{\footnotesize\if@RTL@footnote\else\resetlatinfont\fi} \renewcommand{\LTRfoottextfont}{\footnotesize\resetlatinfont} \renewcommand{\RTLfoottextfont}{\footnotesize\setpersianfont} \endinput %% -%% End of file `extrafootnotefeatures-xepersian.def'. +%% End of file `extrafootnotefeatures-xetex-bidi-xetex-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/extreport-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/extreport-xetex-xepersian.def index f5f536496d6..b85b58c2422 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/extreport-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/extreport-xetex-xepersian.def @@ -1,10 +1,10 @@ %% -%% This is file `extreport-xepersian.def', +%% This is file `extreport-xetex-xepersian.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% xepersian.dtx (with options: `table,extreport-xepersian.def') +%% xepersian.dtx (with options: `table,extreport-xetex-xepersian.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{extreport-xepersian.def}[2010/07/25 v0.1 adaptations for extreport class] +\ProvidesFile{extreport-xetex-xepersian.def}[2010/07/25 v0.1 xepersian adaptations for extreport class for XeTeX engine] \renewcommand\thepart {\@tartibi\c@part} \renewcommand\appendix{\par \setcounter{chapter}{0}% @@ -46,4 +46,4 @@ \gdef\thechapter{\@harfi\c@chapter}} \endinput %% -%% End of file `extreport-xepersian.def'. +%% End of file `extreport-xetex-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/fancyref-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/fancyref-xetex-xepersian.def index 855a3198ae7..2e4e1266fdc 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/fancyref-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/fancyref-xetex-xepersian.def @@ -1,10 +1,10 @@ %% -%% This is file `fancyref-xepersian.def', +%% This is file `fancyref-xetex-xepersian.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% xepersian.dtx (with options: `table,fancyref-xepersian.def') +%% xepersian.dtx (with options: `table,fancyref-xetex-xepersian.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{fancyref-xepersian.def}[2018/09/29 v0.1 bilingual captions for fancyref package] +\ProvidesFile{fancyref-xetex-xepersian.def}[2018/09/29 v0.1 xepersian adaptations for fancyref package for XeTeX engine] \renewcommand*{\Frefchapname}{\chaptername} \renewcommand*{\Frefenumname}{% \if@RTL @@ -198,4 +198,4 @@ } \endinput %% -%% End of file `fancyref-xepersian.def'. +%% End of file `fancyref-xetex-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/footnote-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/footnote-xetex-bidi-xetex-xepersian.def index 48ea4399e9c..0603e143ff2 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/footnote-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/footnote-xetex-bidi-xetex-xepersian.def @@ -1,10 +1,10 @@ %% -%% This is file `footnote-xepersian.def', +%% This is file `footnote-xetex-bidi-xetex-xepersian.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% xepersian.dtx (with options: `table,footnote-xepersian.def') +%% xepersian.dtx (with options: `table,footnote-xetex-bidi-xetex-xepersian.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{footnote-xepersian.def}[2017/08/09 v0.6 footnote macros for xepersian package] +\ProvidesFile{footnote-xetex-bidi-xetex-xepersian.def}[2017/08/09 v0.6 xepersian adaptations for footnotes for XeTeX engine] \renewcommand*{\bidi@@footnotetext@font}{\footnotesize\if@RTL@footnote\else\resetlatinfont\fi} @@ -47,4 +47,4 @@ \endinput %% -%% End of file `footnote-xepersian.def'. +%% End of file `footnote-xetex-bidi-xetex-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/framed-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/framed-xetex-xepersian.def index def5d33fa10..fe54cc25f13 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/framed-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/framed-xetex-xepersian.def @@ -1,10 +1,10 @@ %% -%% This is file `framed-xepersian.def', +%% This is file `framed-xetex-xepersian.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% xepersian.dtx (with options: `table,framed-xepersian.def') +%% xepersian.dtx (with options: `table,framed-xetex-xepersian.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{framed-xepersian.def}[2012/06/05 v0.1 xepersian adaptations for framed package for XeTeX engine] +\ProvidesFile{framed-xetex-xepersian.def}[2012/06/05 v0.1 xepersian adaptations for framed package for XeTeX engine] \renewenvironment{titled-frame}[1]{% \def\FrameCommand{\fboxsep8pt\fboxrule2pt \TitleBarFrame{\textbf{#1}}}% @@ -51,4 +51,4 @@ {\endMakeFramed} \endinput %% -%% End of file `framed-xepersian.def'. +%% End of file `framed-xetex-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/glossaries-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/glossaries-xetex-xepersian.def index 30a4fb4433f..36165c6e408 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/glossaries-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/glossaries-xetex-xepersian.def @@ -1,10 +1,10 @@ %% -%% This is file `glossaries-xepersian.def', +%% This is file `glossaries-xetex-xepersian.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% xepersian.dtx (with options: `table,glossaries-xepersian.def') +%% xepersian.dtx (with options: `table,glossaries-xetex-xepersian.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,10 +37,10 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{glossaries-xepersian.def}[2014/09/04 v0.4 xepersian adaptations for glossaries package for XeTeX engine] +\ProvidesFile{glossaries-xetex-xepersian.def}[2014/09/04 v0.4 xepersian adaptations for glossaries package for XeTeX engine] \glsaddprotectedpagefmt{@harfi} \glsaddprotectedpagefmt{@tartibi} \glsaddprotectedpagefmt{@adadi} \endinput %% -%% End of file `glossaries-xepersian.def'. +%% End of file `glossaries-xetex-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/hyperref-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/hyperref-xetex-xepersian.def index aad9f12731b..54071b24662 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/hyperref-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/hyperref-xetex-xepersian.def @@ -1,10 +1,10 @@ %% -%% This is file `hyperref-xepersian.def', +%% This is file `hyperref-xetex-xepersian.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% xepersian.dtx (with options: `table,hyperref-xepersian.def') +%% xepersian.dtx (with options: `table,hyperref-xetex-xepersian.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{hyperref-xepersian.def}[2022/10/30 v0.8 xepersian adaptations for hyperref package] +\ProvidesFile{hyperref-xetex-xepersian.def}[2022/10/30 v0.8 xepersian adaptations for hyperref package for XeTeX engine] \def\equationautorefname{\if@RTL معادله\else Equation\fi}% \def\footnoteautorefname{\if@RTL زیرنویس\else footnote\fi}% \def\itemautorefname{\if@RTL فقره\else item\fi}% @@ -86,4 +86,4 @@ } \endinput %% -%% End of file `hyperref-xepersian.def'. +%% End of file `hyperref-xetex-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/amsart-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/imsproc-xetex-xepersian.def index 6b13471e47d..70597e07c0f 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/amsart-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/imsproc-xetex-xepersian.def @@ -1,10 +1,10 @@ %% -%% This is file `amsart-xepersian.def', +%% This is file `imsproc-xetex-xepersian.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% xepersian.dtx (with options: `table,amsart-xepersian.def') +%% xepersian.dtx (with options: `table,imsproc-xetex-xepersian.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,8 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{amsart-xepersian.def}[2017/02/04 v0.4 adaptations for amsart class] +\ProvidesFile{imsproc-xetex-xepersian.def}[2017/06/09 v0.5 xepersian adaptations for imsproc class for XeTeX engine] + \renewcommand \thepart {\@tartibi\c@part} \def\appendix{\par\c@section\z@ \c@subsection\z@ \let\sectionname\appendixname @@ -45,4 +46,4 @@ \endinput %% -%% End of file `amsart-xepersian.def'. +%% End of file `imsproc-xetex-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/kashida-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/kashida-xetex-xepersian.def index cf23de1c3b8..0f16f641832 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/kashida-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/kashida-xetex-xepersian.def @@ -1,10 +1,10 @@ %% -%% This is file `kashida-xepersian.def', +%% This is file `kashida-xetex-xepersian.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% xepersian.dtx (with options: `table,kashida-xepersian.def') +%% xepersian.dtx (with options: `table,kashida-xetex-xepersian.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{kashida-xepersian.def}[2024/12/20 v1.0 implementation of Kashida for xepersian package] +\ProvidesFile{kashida-xetex-xepersian.def}[2024/12/20 v1.0 implementation of Kashida for XeTeX engine] \chardef\xepersian@zwj="200D % zero-width joiner \chardef\xepersian@kashidachar="0640 % kashida @@ -94,4 +94,4 @@ \KashidaOn \endinput %% -%% End of file `kashida-xepersian.def'. +%% End of file `kashida-xetex-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/latex-localise-commands-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/latex-localize-commands-xetex-xepersian.def index 25c3ee3d27a..c5d14967198 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/latex-localise-commands-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/latex-localize-commands-xetex-xepersian.def @@ -1,10 +1,10 @@ %% -%% This is file `latex-localise-commands-xepersian.def', +%% This is file `latex-localize-commands-xetex-xepersian.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% xepersian.dtx (with options: `table,latex-localise-commands-xepersian.def') +%% xepersian.dtx (with options: `table,latex-localize-commands-xetex-xepersian.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{latex-localise-commands-xepersian.def}[2014/02/05 v0.3 Persian localisation of LaTeX2e commands] +\ProvidesFile{latex-localize-commands-xetex-xepersian.def}[2014/02/05 v0.3 Persian localization of LaTeX2e commands for XeTeX engine] \eqcommand{شمعجدول}{@arstrut} \eqcommand{فوق}{above} \eqcommand{فاصلهکوتاهبالاینمایش}{abovedisplayshortskip} @@ -983,4 +983,4 @@ \eqcommand{@فرفاصله}{z@skip} \endinput %% -%% End of file `latex-localise-commands-xepersian.def'. +%% End of file `latex-localize-commands-xetex-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/latex-localise-environments-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/latex-localize-environments-xetex-xepersian.def index 80c2c34d578..916b59909e7 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/latex-localise-environments-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/latex-localize-environments-xetex-xepersian.def @@ -1,10 +1,10 @@ %% -%% This is file `latex-localise-environments-xepersian.def', +%% This is file `latex-localize-environments-xetex-xepersian.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% xepersian.dtx (with options: `table,latex-localise-environments-xepersian.def') +%% xepersian.dtx (with options: `table,latex-localize-environments-xetex-xepersian.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{latex-localise-environments-xepersian.def}[2022/06/06 v0.3 Persian localisation of LaTeX2e environments] +\ProvidesFile{latex-localize-environments-xetex-xepersian.def}[2022/06/06 v0.3 Persian localization of LaTeX2e environments for XeTeX engine] \eqenvironment{چکیده}{abstract} \eqenvironment{پیوست}{appendix} \eqenvironment{آرایه}{array} @@ -82,4 +82,4 @@ \eqenvironment{شعر}{verse} \endinput %% -%% End of file `latex-localise-environments-xepersian.def'. +%% End of file `latex-localize-environments-xetex-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/latex-localise-messages-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/latex-localize-messages-xetex-xepersian.def index 2856ac686b6..cc86ca32870 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/latex-localise-messages-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/latex-localize-messages-xetex-xepersian.def @@ -1,10 +1,10 @@ %% -%% This is file `latex-localise-messages-xepersian.def', +%% This is file `latex-localize-messages-xetex-xepersian.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% xepersian.dtx (with options: `table,latex-localise-messages-xepersian.def') +%% xepersian.dtx (with options: `table,latex-localize-messages-xetex-xepersian.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\آمادهسازیپرونده{latex-localise-messages-xepersian.def}[2011/03/01 v0.1 localising LaTeX2e messages] +\آمادهسازیپرونده{latex-localize-messages-xetex-xepersian.def}[2011/03/01 v0.1 localizing LaTeX2e messages for XeTeX engine] \endinput %% -%% End of file `latex-localise-messages-xepersian.def'. +%% End of file `latex-localize-messages-xetex-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/latex-localise-misc-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/latex-localize-misc-xetex-xepersian.def index d9d726c565d..9e3243ed36b 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/latex-localise-misc-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/latex-localize-misc-xetex-xepersian.def @@ -1,10 +1,10 @@ %% -%% This is file `latex-localise-misc-xepersian.def', +%% This is file `latex-localize-misc-xetex-xepersian.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% xepersian.dtx (with options: `table,latex-localise-misc-xepersian.def') +%% xepersian.dtx (with options: `table,latex-localize-misc-xetex-xepersian.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{latex-localise-misc-xepersian.def}[2012/01/01 v0.2 miscellaneous Persian localisation of LaTeX2e] +\ProvidesFile{latex-localize-misc-xetex-xepersian.def}[2025/01/03 v0.3 miscellaneous Persian localization of LaTeX2e for XeTeX engine] \تر\گرجدید#1{% \شمار@\نویسهویژه \نویسهویژه\من@ا \بگذار#1\گرنادرست @@ -63,7 +63,7 @@ } \بگذار\ازنو=\رگ -\@ifdefinitionfileloaded{latex-xetex-bidi}{% +\ApplyPatchCodeToFile{latex-xetex-bidi}{% \def\@xfloat #1[#2]{% \@nodocument \def \@captype {#1}% @@ -205,8 +205,8 @@ \if #1پ3 \else \z@ \@preamerr 0\fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi}% -}{} -\@ifdefinitionfileloaded{array-xetex-bidi}{% +} +\ApplyPatchCodeToFile{array-xetex-bidi}{% \def\@testpach{\@chclass \ifnum \@lastchclass=6 \@ne \@chnum \@ne \else \ifnum \@lastchclass=7 5 \else @@ -238,8 +238,8 @@ \if \@nextchar ز5 \else \z@ \@chclass \z@ \@preamerr \z@ \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi}% -}{} -\@ifdefinitionfileloaded{arydshln-xetex-bidi}{ +} +\ApplyPatchCodeToFile{arydshln-xetex-bidi}{ \ifadl@usingarypkg \def\@testpach{\@chclass \ifnum \@lastchclass=6 \@ne \@chnum \@ne \else @@ -328,8 +328,8 @@ \def\adl@class@start{6} \def\adl@class@iiiorvii{3} \fi -}{} -\@ifdefinitionfileloaded{tabulary-xetex-bidi}{% +} +\ApplyPatchCodeToFile{tabulary-xetex-bidi}{% \def\@testpach{\@chclass \ifnum \@lastchclass=6 \@ne \@chnum \@ne \else \ifnum \@lastchclass=7 5 \else @@ -369,8 +369,8 @@ \if \@nextchar ز5 \else \z@ \@chclass \z@ \@preamerr \z@ \fi \fi \fi \fi\fi \fi \fi\fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi}% -}{} -\@ifdefinitionfileloaded{float-xetex-bidi}{% +} +\ApplyPatchCodeToFile{float-xetex-bidi}{% \let\@float@Hx\@xfloat \def\@xfloat#1[{\@ifnextchar{H}{\@float@HH{#1}[}{\@ifnextchar{آ}{\@float@آآ{#1}[}{\@float@Hx{#1}[}}} \def\@float@HH#1[H]{% @@ -393,7 +393,7 @@ \vbox\bgroup \hsize\columnwidth \@parboxrestore \@floatboxreset \@setnobreak \ignorespaces} -}{} +} \begingroup \catcode `|=0 \catcode `[= 1 \catcode`]=2 \catcode `\{=12 \catcode `\}=12 \catcode`\\=12 |gdef|@x@xepersian@localize@verbatim#1\پایان{همانطورکههست}[#1|پایان[همانطورکههست]] @@ -407,4 +407,4 @@ \expandafter\let\csname endهمانطورکههست*\endcsname =\endهمانطورکههست \endinput %% -%% End of file `latex-localise-misc-xepersian.def'. +%% End of file `latex-localize-misc-xetex-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/listings-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/listings-xetex-xepersian.def index e22ba4e1281..15c8485de5f 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/listings-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/listings-xetex-xepersian.def @@ -1,10 +1,10 @@ %% -%% This is file `listings-xepersian.def', +%% This is file `listings-xetex-xepersian.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% xepersian.dtx (with options: `table,listings-xepersian.def') +%% xepersian.dtx (with options: `table,listings-xetex-xepersian.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,9 +37,9 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{listings-xepersian.def}[2014/07/17 v0.3 bilingual captions for listings package] +\ProvidesFile{listings-xetex-xepersian.def}[2014/07/17 v0.3 xepersian adaptations for listings package for XeTeX engine] \def\lstlistingname{\if@RTL برنامهٔ\else Listing\fi} \def\lstlistlistingname{\if@RTL فهرست برنامهها\else Listings\fi} \endinput %% -%% End of file `listings-xepersian.def'. +%% End of file `listings-xetex-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/loadingorder-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/loadingorder-xepersian.def deleted file mode 100644 index e15ca276f9e..00000000000 --- a/Master/texmf-dist/tex/xelatex/xepersian/loadingorder-xepersian.def +++ /dev/null @@ -1,81 +0,0 @@ -%% -%% This is file `loadingorder-xepersian.def', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% xepersian.dtx (with options: `table,loadingorder-xepersian.def') -%% -%% __________________________________________________ -%% Vafa Khalighi -%% -%% Copyright (c) 2008--2025 Vafa Khalighi -%% Copyright (c) 2018--2020 bidi-tex GitHub Organization -%% -%% It may be distributed and/or modified under the LaTeX Project Public License, -%% version 1.3c or higher (your choice). The latest version of -%% this license is at: http://www.latex-project.org/lppl.txt -%% -%% This work is “author-maintained” (as per LPPL maintenance status) -%% by Vafa Khalighi. -%% -%% -%% \CheckSum{10999} -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -%% -\ProvidesFile{loadingorder-xepersian.def}[2018/09/29 v0.5 making sure that xepersian is the last package loaded] -\bidi@isloaded{algorithmic} -\bidi@isloaded{algorithm} -\bidi@isloaded{backref} -\bidi@isloaded{enumerate} -\bidi@isloaded{enumitem} -\bidi@isloaded{fancyref} -\bidi@isloaded{tocloft} -\bidi@isloaded{url} -\bidi@isloaded{varioref} -\AtBeginDocument{ - \if@bidi@algorithmicloaded@\else - \bidi@isloaded[\PackageError{xepersian}{Oops! you have loaded package algorithmic after xepersian package. Please load package algorithmic before xepersian package, and then try to run xelatex on your document again}{}]{algorithmic} - \fi% - \if@bidi@algorithmloaded@\else - \bidi@isloaded[\PackageError{xepersian}{Oops! you have loaded package algorithm after xepersian package. Please load package algorithm before xepersian package, and then try to run xelatex on your document again}{}]{algorithm} - \fi% - \if@bidi@backrefloaded@\else - \bidi@isloaded[\PackageError{xepersian}{Oops! you have loaded package backref after xepersian package. Please load package backref before xepersian package, and then try to run xelatex on your document again}{}]{backref} - \fi% - \if@bidi@enumerateloaded@\else - \bidi@isloaded[\PackageError{xepersian}{Oops! you have loaded package enumerate after xepersian package. Please load package enumerate before xepersian package, and then try to run xelatex on your document again}{}]{enumerate} - \fi% - \if@bidi@enumitemloaded@\else - \bidi@isloaded[\PackageError{xepersian}{Oops! you have loaded package enumitem after xepersian package. Please load package enumitem before xepersian package, and then try to run xelatex on your document again}{}]{enumitem} - \fi% - \if@bidi@fancyrefloaded@\else - \bidi@isloaded[\PackageError{xepersian}{Oops! you have loaded package fancyref after xepersian package. Please load package fancyref before xepersian package, and then try to run xelatex on your document again}{}]{fancyref} - \fi% - \if@bidi@tocloftloaded@\else - \bidi@isloaded[\PackageError{xepersian}{Oops! you have loaded package tocloft after xepersian package. Please load package tocloft before xepersian package, and then try to run xelatex on your document again}{}]{tocloft} - \fi% - \if@bidi@urlloaded@\else - \bidi@isloaded[\PackageError{xepersian}{Oops! you have loaded package url after xepersian package. Please load package url before xepersian package, and then try to run xelatex on your document again}{}]{url} - \fi% - \if@bidi@variorefloaded@\else - \bidi@isloaded[\PackageError{xepersian}{Oops! you have loaded package varioref after xepersian package. Please load package varioref before xepersian package, and then try to run xelatex on your document again}{}]{varioref} - \fi% -} -\endinput -%% -%% End of file `loadingorder-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/localise-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/localize-xetex-xepersian.def index 404a17f54ba..b86780d6e6e 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/localise-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/localize-xetex-xepersian.def @@ -1,10 +1,10 @@ %% -%% This is file `localise-xepersian.def', +%% This is file `localize-xetex-xepersian.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% xepersian.dtx (with options: `table,localise-xepersian.def') +%% xepersian.dtx (with options: `table,localize-xetex-xepersian.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{localise-xepersian.def}[2022/06/06 v0.2c Persian localisation of LaTeX2e] +\ProvidesFile{localize-xetex-xepersian.def}[2025/01/06 v0.2e Persian localization of LaTeX2e for XeTeX engine] \newcommand{\makezwnjletter}{\catcode`=11\relax} \makezwnjletter \newcommand*{\eqcommand}[2]{\if@bidi@csprimitive{#2}{\bidi@csletcs{#1}{#2}}{\bidi@csdefcs{#1}{#2}}} @@ -47,22 +47,17 @@ \expandafter\let\csname #1\expandafter\endcsname\csname #2\endcsname \expandafter\let\csname end#1\expandafter\endcsname\csname end#2\endcsname } -\@ifpackageloaded{keyval}{% \newcommand*\keyval@eq@alias@key[4][KV]{% \bidi@csletcs{#1@#2@#3}{#1@#2@#4}% - \bidi@csletcs{#1@#2@#3@default}{#1@#2@#4@default}}% -}{\@ifpackageloaded{xkeyval}{% -\newcommand*\keyval@eq@alias@key[4][KV]{% - \bidi@csletcs{#1@#2@#3}{#1@#2@#4}% - \bidi@csletcs{#1@#2@#3@default}{#1@#2@#4@default}}% -}{}} -\input{latex-localise-commands-xepersian.def} -\input{xepersian-localise-commands-xepersian.def} -\input{latex-localise-environments-xepersian.def} -\input{xepersian-localise-environments-xepersian.def} -\input{latex-localise-messages-xepersian.def} -\input{latex-localise-misc-xepersian.def} -\input{packages-localise-xepersian.def} + \bidi@csletcs{#1@#2@#3@default}{#1@#2@#4@default}% +} +\input{latex-localize-commands-xetex-xepersian.def} +\input{xepersian-localize-commands-xetex-xepersian.def} +\input{latex-localize-environments-xetex-xepersian.def} +\input{xepersian-localize-environments-xetex-xepersian.def} +\input{latex-localize-messages-xetex-xepersian.def} +\input{latex-localize-misc-xetex-xepersian.def} +\input{packages-localize-xetex-xepersian.def} \aliasfontfeature{ExternalLocation}{مکانخارجی} \aliasfontfeature{Path}{مسیر} \aliasfontfeature{Renderer}{تحویلدهنده} @@ -124,4 +119,4 @@ \aliasfontfeatureoption{Style}{MathScriptScript}{اسکریپتاسکریپتریاضی} \endinput %% -%% End of file `localise-xepersian.def'. +%% End of file `localize-xetex-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/memoir-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/memoir-xetex-xepersian.def index 20d577f6c02..80521cd9d64 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/memoir-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/memoir-xetex-xepersian.def @@ -1,10 +1,10 @@ %% -%% This is file `memoir-xepersian.def', +%% This is file `memoir-xetex-xepersian.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% xepersian.dtx (with options: `table,memoir-xepersian.def') +%% xepersian.dtx (with options: `table,memoir-xetex-xepersian.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{memoir-xepersian.def}[2010/07/25 v0.1 adaptations for memoir class] +\ProvidesFile{memoir-xetex-xepersian.def}[2010/07/25 v0.1 xepersian adaptations for memoir class for XeTeX engine] \renewcommand{\@memfront}{% \@smemfront\pagenumbering{harfi}} \renewcommand{\setthesection}{\thechapter\@SepMark\harfi{section}} @@ -51,4 +51,4 @@ \anappendixtrue} \endinput %% -%% End of file `memoir-xepersian.def'. +%% End of file `memoir-xetex-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/minitoc-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/minitoc-xetex-xepersian.def index e50e6515927..bbc42fb5e45 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/minitoc-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/minitoc-xetex-xepersian.def @@ -1,10 +1,10 @@ %% -%% This is file `minitoc-xepersian.def', +%% This is file `minitoc-xetex-xepersian.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% xepersian.dtx (with options: `table,minitoc-xepersian.def') +%% xepersian.dtx (with options: `table,minitoc-xetex-xepersian.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{minitoc-xepersian.def}[2010/07/25 v0.1 bilingual captions for minitoc package] +\ProvidesFile{minitoc-xetex-xepersian.def}[2010/07/25 v0.1 xepersian adaptations for minitoc package for XeTeX engine] \def\ptctitle{\if@RTL فهرست مطالب\else Table of Contents\fi}% \def\plftitle{\if@RTL فهرست تصاویر\else List of Figures\fi}% \def\plttitle{\if@RTL فهرست جداول\else List of Tables\fi}% @@ -49,4 +49,4 @@ \def\slttitle{\if@RTL جداول\else Tables\fi}% \endinput %% -%% End of file `minitoc-xepersian.def'. +%% End of file `minitoc-xetex-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/natbib-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/natbib-xetex-xepersian.def index b32ade1507b..9c8ee98f01f 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/natbib-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/natbib-xetex-xepersian.def @@ -1,10 +1,10 @@ %% -%% This is file `natbib-xepersian.def', +%% This is file `natbib-xetex-xepersian.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% xepersian.dtx (with options: `table,natbib-xepersian.def') +%% xepersian.dtx (with options: `table,natbib-xetex-xepersian.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{natbib-xepersian.def}[2011/08/01 v0.1 adaptations for natbib package] +\ProvidesFile{natbib-xetex-xepersian.def}[2011/08/01 v0.1 xepersian adaptations for natbib package for XeTeX engine] \renewcommand\NAT@set@cites{% \ifNAT@numbers \ifNAT@super \let\@cite\NAT@citesuper @@ -254,4 +254,4 @@ \def\NAT@@Latin@@citetp[#1]{\@ifnextchar[{\@Latincitex[#1]}{\@Latincitex[][#1]}} \endinput %% -%% End of file `natbib-xepersian.def'. +%% End of file `natbib-xetex-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/packages-localise-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/packages-localize-xetex-xepersian.def index 1cbbd7069f5..0bc5f493f36 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/packages-localise-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/packages-localize-xetex-xepersian.def @@ -1,10 +1,10 @@ %% -%% This is file `packages-localise-xepersian.def', +%% This is file `packages-localize-xetex-xepersian.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% xepersian.dtx (with options: `table,packages-localise-xepersian.def') +%% xepersian.dtx (with options: `table,packages-localize-xetex-xepersian.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,13 +37,13 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\آمادهسازیپرونده{packages-localise-xepersian.def}[2013/04/24 v0.2 localising LaTeX2e Packages] -\@گرسبکفراخوانیشده{color}{\ورودی{color-localise-xepersian.def}}{} -\@ifpackageloaded{multicol}{% +\آمادهسازیپرونده{packages-localize-xetex-xepersian.def}[2025/01/03 v0.3 localizing LaTeX2e Packages for XeTeX engine] +\@گرسبکفراخوانیشده{color}{\ورودی{color-localize-xetex-xepersian.def}}{} +\ApplyPatchCodeToPackage{multicol}{% \newenvironment{چندستونیها}{\begin{multicols}}{\end{multicols}}% \newenvironment{چندستونیها*}{\begin{multicols*}}{\end{multicols*}}% -}{} -\@ifpackageloaded{verbatim}{% +} +\ApplyPatchCodeToPackage{verbatim}{% \begingroup \vrb@catcodes \lccode`\!=`\\ \lccode`\[=`\{ \lccode`\]=`\} @@ -129,21 +129,20 @@ \@namedef{همانطورکههست*}{\begingroup\@verbatim\xepersian@localize@verbatim@start} \def\endهمانطورکههست{\endtrivlist\endgroup\@doendpe} \expandafter\let\csname endهمانطورکههست*\endcsname =\endهمانطورکههست -}{} +} \ExplSyntaxOn \AtBeginDocument{ \xepersian_localize_patch_verbatim: } \cs_set:Npn \xepersian_localize_patch_verbatim: { - \@ifpackageloaded{verbatim}{ + \ApplyPatchCodeToPackage{verbatim}{ \cs_set:cpn {همانطورکههست*} { \group_begin: \@verbatim \fontspec_print_visible_spaces: \xepersian@localize@verbatim@start } - }{ } } \ExplSyntaxOff -\@ifpackageloaded{graphicx}{% +\ApplyPatchCodeToPackage{graphicx}{% \def\Gin@boolkey#1#2{% \expandafter\@ifdefinable \csname Gin@#2درست\endcsname{% \expandafter\let\csname Gin@#2درست\expandafter\endcsname\csname Gin@#2true\endcsname}% @@ -184,7 +183,7 @@ \معادل@کلید{Grot}{طول}{x} \معادل@کلید{Grot}{عرض}{y} \معادل@کلید{Grot}{واحد}{units} -}{} +} \endinput %% -%% End of file `packages-localise-xepersian.def'. +%% End of file `packages-localize-xetex-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/rapport3-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/rapport1-xetex-xepersian.def index 52d491fae10..ab2a65f713f 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/rapport3-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/rapport1-xetex-xepersian.def @@ -1,10 +1,10 @@ %% -%% This is file `rapport3-xepersian.def', +%% This is file `rapport1-xetex-xepersian.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% xepersian.dtx (with options: `table,rapport3-xepersian.def') +%% xepersian.dtx (with options: `table,rapport1-xetex-xepersian.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{rapport3-xepersian.def}[2010/07/25 v0.2 adaptations for rapport3 class] +\ProvidesFile{rapport1-xetex-xepersian.def}[2010/07/25 v0.1 xepersian adaptations for rapport1 class for XeTeX engine] \renewcommand*\thepart{\@tartibi\c@part} \renewcommand*\appendix{\par \setcounter{chapter}{0}% @@ -46,4 +46,4 @@ \gdef\thechapter{\@harfi\c@chapter}} \endinput %% -%% End of file `rapport3-xepersian.def'. +%% End of file `rapport1-xetex-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/rapport1-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/rapport3-xetex-xepersian.def index 0246ebec0c2..497cac76408 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/rapport1-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/rapport3-xetex-xepersian.def @@ -1,10 +1,10 @@ %% -%% This is file `rapport1-xepersian.def', +%% This is file `rapport3-xetex-xepersian.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% xepersian.dtx (with options: `table,rapport1-xepersian.def') +%% xepersian.dtx (with options: `table,rapport3-xetex-xepersian.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{rapport1-xepersian.def}[2010/07/25 v0.1 adaptations for rapport1 class] +\ProvidesFile{rapport3-xetex-xepersian.def}[2010/07/25 v0.2 xepersian adaptations for rapport3 class for XeTeX engine] \renewcommand*\thepart{\@tartibi\c@part} \renewcommand*\appendix{\par \setcounter{chapter}{0}% @@ -46,4 +46,4 @@ \gdef\thechapter{\@harfi\c@chapter}} \endinput %% -%% End of file `rapport1-xepersian.def'. +%% End of file `rapport3-xetex-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/bookest-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/refrep-xetex-xepersian.def index 7228e21940f..6b719e76c33 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/bookest-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/refrep-xetex-xepersian.def @@ -1,10 +1,10 @@ %% -%% This is file `bookest-xepersian.def', +%% This is file `refrep-xetex-xepersian.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% xepersian.dtx (with options: `table,bookest-xepersian.def') +%% xepersian.dtx (with options: `table,refrep-xetex-xepersian.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{bookest-xepersian.def}[2010/07/25 v0.1 adaptations for bookest class] +\ProvidesFile{refrep-xetex-xepersian.def}[2010/07/25 v0.2 xepersian adaptations for refrep class for XeTeX engine] \renewcommand \thepart {\@tartibi\c@part} \renewcommand\appendix{\par \setcounter{chapter}{0}% @@ -47,4 +47,4 @@ }%end appendix \endinput %% -%% End of file `bookest-xepersian.def'. +%% End of file `refrep-xetex-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/refrep-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/report-xetex-xepersian.def index f1d5cbda4af..dc7097ea149 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/refrep-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/report-xetex-xepersian.def @@ -1,10 +1,10 @@ %% -%% This is file `refrep-xepersian.def', +%% This is file `report-xetex-xepersian.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% xepersian.dtx (with options: `table,refrep-xepersian.def') +%% xepersian.dtx (with options: `table,report-xetex-xepersian.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{refrep-xepersian.def}[2010/07/25 v0.2 adaptations for refrep class] +\ProvidesFile{report-xetex-xepersian.def}[2010/07/25 v0.2 xepersian adaptations for report class for XeTeX engine] \renewcommand \thepart {\@tartibi\c@part} \renewcommand\appendix{\par \setcounter{chapter}{0}% @@ -47,4 +47,4 @@ }%end appendix \endinput %% -%% End of file `refrep-xepersian.def'. +%% End of file `report-xetex-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/scrartcl-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/scrartcl-xetex-xepersian.def index b6f02d5c112..00651f0959c 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/scrartcl-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/scrartcl-xetex-xepersian.def @@ -1,10 +1,10 @@ %% -%% This is file `scrartcl-xepersian.def', +%% This is file `scrartcl-xetex-xepersian.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% xepersian.dtx (with options: `table,scrartcl-xepersian.def') +%% xepersian.dtx (with options: `table,scrartcl-xetex-xepersian.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{scrartcl-xepersian.def}[2022/05/22 v0.3 adaptations for scrartcl class] +\ProvidesFile{scrartcl-xetex-xepersian.def}[2022/05/22 v0.3 xepersian adaptations for scrartcl class for XeTeX engine] \renewcommand*{\thepart}{\@tartibi\c@part} \renewcommand*\appendix{% \Ifstr{\@currenvir}{appendix}{% @@ -90,4 +90,4 @@ } \endinput %% -%% End of file `scrartcl-xepersian.def'. +%% End of file `scrartcl-xetex-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/scrbook-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/scrbook-xetex-xepersian.def index 09f13b0d8ba..a0df8a1ad7f 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/scrbook-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/scrbook-xetex-xepersian.def @@ -1,10 +1,10 @@ %% -%% This is file `scrbook-xepersian.def', +%% This is file `scrbook-xetex-xepersian.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% xepersian.dtx (with options: `table,scrbook-xepersian.def') +%% xepersian.dtx (with options: `table,scrbook-xetex-xepersian.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{scrbook-xepersian.def}[2022/05/22 v0.3 adaptations for scrbook class] +\ProvidesFile{scrbook-xetex-xepersian.def}[2022/05/22 v0.3 xepersian adaptations for scrbook class for XeTeX engine] \renewcommand*\frontmatter{% \if@twoside\cleardoubleoddpage\else\clearpage\fi \@mainmatterfalse\pagenumbering{harfi}% @@ -95,4 +95,4 @@ } \endinput %% -%% End of file `scrbook-xepersian.def'. +%% End of file `scrbook-xetex-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/scrreprt-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/scrreprt-xetex-xepersian.def index c90dd130519..058a45582e1 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/scrreprt-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/scrreprt-xetex-xepersian.def @@ -1,10 +1,10 @@ %% -%% This is file `scrreprt-xepersian.def', +%% This is file `scrreprt-xetex-xepersian.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% xepersian.dtx (with options: `table,scrreprt-xepersian.def') +%% xepersian.dtx (with options: `table,scrreprt-xetex-xepersian.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{scrreprt-xepersian.def}[2022/05/22 v0.3 adaptations for scrreprt class] +\ProvidesFile{scrreprt-xetex-xepersian.def}[2022/05/22 v0.3 xepersian adaptations for scrreprt class for XeTeX engine] \renewcommand*{\thepart}{\@tartibi\c@part} \renewcommand*\appendix{% \Ifstr{\@currenvir}{appendix}{% @@ -91,4 +91,4 @@ } \endinput %% -%% End of file `scrreprt-xepersian.def'. +%% End of file `scrreprt-xetex-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/soul-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/soul-xetex-xepersian.def index 23de96c8750..8637c329a79 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/soul-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/soul-xetex-xepersian.def @@ -1,10 +1,10 @@ %% -%% This is file `soul-xepersian.def', +%% This is file `soul-xetex-xepersian.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% xepersian.dtx (with options: `table,soul-xepersian.def') +%% xepersian.dtx (with options: `table,soul-xetex-xepersian.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{soul-xepersian.def}[2018/12/12 v0.2 adaptations for soul package] +\ProvidesFile{soul-xetex-xepersian.def}[2018/12/12 v0.2 xepersian adaptations for soul package for XeTeX engine] \let\SOUL@tt@latin\SOUL@tt \newfontface{\SOUL@tt@nonlatin}{Times New Roman} \def\SOUL@tt{% @@ -57,4 +57,4 @@ } \endinput %% -%% End of file `soul-xepersian.def'. +%% End of file `soul-xetex-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/tkz-linknodes-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/tkz-linknodes-xetex-xepersian.def index bb8700f014e..38d0bc801ae 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/tkz-linknodes-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/tkz-linknodes-xetex-xepersian.def @@ -1,10 +1,10 @@ %% -%% This is file `tkz-linknodes-xepersian.def', +%% This is file `tkz-linknodes-xetex-xepersian.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% xepersian.dtx (with options: `table,tkz-linknodes-xepersian.def') +%% xepersian.dtx (with options: `table,tkz-linknodes-xetex-xepersian.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{tkz-linknodes-xepersian.def}[2012/06/13 v0.1 adaptations for tkz-linknodes package] +\ProvidesFile{tkz-linknodes-xetex-xepersian.def}[2012/06/13 v0.1 xepersian adaptations for tkz-linknodes package for XeTeX engine] \renewcommand*{\@SetTab}{% \let\@alph\@latinalph% \ifnum \value{C@NumTab}>25\relax% @@ -59,4 +59,4 @@ }% \endinput %% -%% End of file `tkz-linknodes-xepersian.def'. +%% End of file `tkz-linknodes-xetex-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/tocloft-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/tocloft-xetex-xepersian.def index d6d32ecc2a9..eb4d759c242 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/tocloft-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/tocloft-xetex-xepersian.def @@ -1,10 +1,10 @@ %% -%% This is file `tocloft-xepersian.def', +%% This is file `tocloft-xetex-xepersian.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% xepersian.dtx (with options: `table,tocloft-xepersian.def') +%% xepersian.dtx (with options: `table,tocloft-xetex-xepersian.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,8 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{tocloft-xepersian.def}[2010/07/25 v0.1 bilingual captions for tocloft package] +\ProvidesFile{tocloft-xetex-xepersian.def}[2025/01/03 v0.2 xepersian adaptations for tocloft package for XeTeX engine] +\IfClassLoadedT{memoir}{\endinput} \renewcommand*{\cftchapname}{\if@RTL فصل\else chapter\fi} \renewcommand*{\cftsecname}{\if@RTL قسمت\else section\fi} \renewcommand*{\cftsubsecname}{\if@RTL زیرقسمت\else subsection\fi} @@ -50,4 +51,4 @@ \renewcommand*{\cftsubtabname}{\if@RTL زیرجدول\else subtable\fi} \endinput %% -%% End of file `tocloft-xepersian.def'. +%% End of file `tocloft-xetex-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/url-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/url-xetex-xepersian.def index 33548687372..3c9181ca196 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/url-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/url-xetex-xepersian.def @@ -1,10 +1,10 @@ %% -%% This is file `url-xepersian.def', +%% This is file `url-xetex-xepersian.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% xepersian.dtx (with options: `table,url-xepersian.def') +%% xepersian.dtx (with options: `table,url-xetex-xepersian.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{url-xepersian.def}[2022/02/18 v0.1 adaptations for url package] +\ProvidesFile{url-xetex-xepersian.def}[2022/02/18 v0.1 xepersian adaptations for url package for XeTeX engine] \begingroup \lccode`+=`\% \lccode`\~=`\% \lowercase {\long\gdef\Url@actpercent{\Url@Edit\Url@String{+}{~}% @@ -45,4 +45,4 @@ \endgroup% \endinput %% -%% End of file `url-xepersian.def'. +%% End of file `url-xetex-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/varioref-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/varioref-xetex-xepersian.def index cd8cf8b5b92..f854a20047b 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/varioref-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/varioref-xetex-xepersian.def @@ -1,10 +1,10 @@ %% -%% This is file `varioref-xepersian.def', +%% This is file `varioref-xetex-xepersian.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% xepersian.dtx (with options: `table,varioref-xepersian.def') +%% xepersian.dtx (with options: `table,varioref-xetex-xepersian.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{varioref-xepersian.def}[2018/09/29 v0.1 bilingual captions for varioref package] +\ProvidesFile{varioref-xetex-xepersian.def}[2018/09/29 v0.1 xepersian adaptations for varioref package for XeTeX engine] \def\reftextfaceafter{% \if@RTL در صفحه @@ -103,4 +103,4 @@ } \endinput %% -%% End of file `varioref-xepersian.def'. +%% End of file `varioref-xetex-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/xepersian-localise-commands-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/xepersian-localize-commands-xetex-xepersian.def index 9796175048f..e45e203f970 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/xepersian-localise-commands-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/xepersian-localize-commands-xetex-xepersian.def @@ -1,10 +1,10 @@ %% -%% This is file `xepersian-localise-commands-xepersian.def', +%% This is file `xepersian-localize-commands-xetex-xepersian.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% xepersian.dtx (with options: `table,xepersian-localise-commands-xepersian.def') +%% xepersian.dtx (with options: `table,xepersian-localize-commands-xetex-xepersian.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{xepersian-localise-commands-xepersian.def}[2012/07/25 v0.2 Persian localisation of XePersian commands] +\ProvidesFile{xepersian-localize-commands-xetex-xepersian.def}[2012/07/25 v0.2 Persian localization of XePersian commands for XeTeX engine] \eqcommand{خطزیرنویسخودکار}{autofootnoterule} \eqcommand{اعدادفرمولهاخودکار}{AutoMathDigits} \eqcommand{اعدادفرمولهالاتین}{DefaultMathDigits} @@ -99,4 +99,4 @@ \eqcommand{زیتک}{XeTeX} \endinput %% -%% End of file `xepersian-localise-commands-xepersian.def'. +%% End of file `xepersian-localize-commands-xetex-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/xepersian-localise-environments-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/xepersian-localize-environments-xetex-xepersian.def index a6e62eea7d2..e1b8f59b8c3 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/xepersian-localise-environments-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/xepersian-localize-environments-xetex-xepersian.def @@ -1,10 +1,10 @@ %% -%% This is file `xepersian-localise-environments-xepersian.def', +%% This is file `xepersian-localize-environments-xetex-xepersian.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% xepersian.dtx (with options: `table,xepersian-localise-environments-xepersian.def') +%% xepersian.dtx (with options: `table,xepersian-localize-environments-xetex-xepersian.def') %% %% __________________________________________________ %% Vafa Khalighi @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -37,7 +37,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesFile{xepersian-localise-environments-xepersian.def}[2010/07/25 v0.1 Persian localisation of XePersian and bidi environments] +\ProvidesFile{xepersian-localize-environments-xetex-xepersian.def}[2010/07/25 v0.1 Persian localization of XePersian and bidi environments for XeTeX engine] \eqenvironment{لاتین}{latin} \eqenvironment{متنچپ}{LTR} \eqenvironment{دستهبندیچپ}{LTRitems} @@ -50,4 +50,4 @@ \eqenvironment{شعرسنتی*}{traditionalpoem*} \endinput %% -%% End of file `xepersian-localise-environments-xepersian.def'. +%% End of file `xepersian-localize-environments-xetex-xepersian.def'. diff --git a/Master/texmf-dist/tex/xelatex/xepersian/xepersian-magazine.cls b/Master/texmf-dist/tex/xelatex/xepersian/xepersian-magazine.cls index 41010969615..be2c3302be0 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/xepersian-magazine.cls +++ b/Master/texmf-dist/tex/xelatex/xepersian/xepersian-magazine.cls @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/xepersian/xepersian-mathdigitspec.sty b/Master/texmf-dist/tex/xelatex/xepersian/xepersian-mathdigitspec.sty index 3c95d83a128..a16893fe3dd 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/xepersian-mathdigitspec.sty +++ b/Master/texmf-dist/tex/xelatex/xepersian/xepersian-mathdigitspec.sty @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -39,7 +39,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{xepersian-mathdigitspec} - [2025/01/01 v1.2.1 Unicode Persian math digits in XeLaTeX] + [2025/01/08 v1.2.2 Unicode Persian math digits in XeLaTeX] \def\new@mathgroup{\alloc@8\mathgroup\chardef\@cclvi} \let\newfam\new@mathgroup \def\select@group#1#2#3#4{% @@ -293,21 +293,21 @@ \uccode`\~`\.% \uppercase{% \egroup - \def~}{\begingroup\obeyspaces\futurelet\@let@token\decimalseparator@pointcheck} + \def~}{\begingroup\obeyspaces\futurelet\@let@decimalsep@token\decimalseparator@pointcheck} \def\decimalseparator@pointcheck{\decimalseparator@check\MathDecimalSeparator\decimalseparator@point} \def\decimalseparator@check#1#2{% - \ifx\@let@token1\endgroup#1\else - \ifx\@let@token2\endgroup#1\else - \ifx\@let@token3\endgroup#1\else - \ifx\@let@token4\endgroup#1\else - \ifx\@let@token5\endgroup#1\else - \ifx\@let@token6\endgroup#1\else - \ifx\@let@token7\endgroup#1\else - \ifx\@let@token8\endgroup#1\else - \ifx\@let@token9\endgroup#1\else - \ifx\@let@token0\endgroup#1\else - \ifx\@let@token\dot\endgroup#1\else - \ifx\@let@token\overline\endgroup#1\else + \ifx\@let@decimalsep@token1\endgroup#1\else + \ifx\@let@decimalsep@token2\endgroup#1\else + \ifx\@let@decimalsep@token3\endgroup#1\else + \ifx\@let@decimalsep@token4\endgroup#1\else + \ifx\@let@decimalsep@token5\endgroup#1\else + \ifx\@let@decimalsep@token6\endgroup#1\else + \ifx\@let@decimalsep@token7\endgroup#1\else + \ifx\@let@decimalsep@token8\endgroup#1\else + \ifx\@let@decimalsep@token9\endgroup#1\else + \ifx\@let@decimalsep@token0\endgroup#1\else + \ifx\@let@decimalsep@token\dot\endgroup#1\else + \ifx\@let@decimalsep@token\overline\endgroup#1\else \endgroup#2% \fi \fi diff --git a/Master/texmf-dist/tex/xelatex/xepersian/xepersian-multiplechoice.sty b/Master/texmf-dist/tex/xelatex/xepersian/xepersian-multiplechoice.sty index ac83521575b..57c2082357d 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/xepersian-multiplechoice.sty +++ b/Master/texmf-dist/tex/xelatex/xepersian/xepersian-multiplechoice.sty @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/xepersian/xepersian-persiancal.sty b/Master/texmf-dist/tex/xelatex/xepersian/xepersian-persiancal.sty index d120b5e1b13..b29bf4648f1 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/xepersian-persiancal.sty +++ b/Master/texmf-dist/tex/xelatex/xepersian/xepersian-persiancal.sty @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/xelatex/xepersian/xepersian.sty b/Master/texmf-dist/tex/xelatex/xepersian/xepersian.sty index 20dab01b2c7..335793feedc 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/xepersian.sty +++ b/Master/texmf-dist/tex/xelatex/xepersian/xepersian.sty @@ -20,7 +20,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10999} +%% \CheckSum{10845} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -38,10 +38,10 @@ %% Right brace \} Tilde \~} %% \NeedsTeXFormat{LaTeX2e} -\def\xepersian@version{25.8} -\def\xepersiandate{2025/01/01} -\def\xepersian@releasename{Mount Alvand} -\def\xepersian@persian@@releasename{کوه الوند} +\def\xepersian@version{26.1} +\def\xepersiandate{2025/01/08} +\def\xepersian@releasename{Persian Gate} +\def\xepersian@persian@@releasename{دربند پارس} \newcommand*{\xepersianreleasename}{\if@RTL\xepersian@persian@@releasename\else\xepersian@releasename\fi} \ProvidesPackage{xepersian}[\xepersiandate\space v\xepersian@version\space (Release \xepersian@releasename)\space Persian typesetting in XeLaTeX] @@ -86,16 +86,16 @@ Persian typesetting in XeLaTeX] \keys_define:nn { xepersian } { Kashida .choice: , - Kashida / on .code:n = \AtEndOfPackage{\input{kashida-xepersian.def}} , + Kashida / on .code:n = \AtEndOfPackage{\input{kashida-xetex-xepersian.def}} , Kashida / off .code:n = \relax , Kashida .default:n = on } \keys_define:nn { xepersian } { - localise .choice: , - localise / on .code:n = \AtEndOfPackage{\input{localise-xepersian.def}} , - localise / off .code:n = \relax , - localise .default:n = on + localize .choice: , + localize / on .code:n = \AtEndOfPackage{\input{localize-xetex-xepersian.def}} , + localize / off .code:n = \relax , + localize .default:n = on } \cs_new_protected:Npn \__xepersian_quickindex_variant:n #1 { @@ -1044,7 +1044,7 @@ Persian typesetting in XeLaTeX] \newcommand*{\@xepersian@pdfcustomproperties}{% This is the xepersian package, Version \xepersian@version\space (Release \xepersian@releasename), - Released January 1, 2025. + Released January 8, 2025. } \newcommand\twocolumnstableofcontents{% @@ -1358,54 +1358,62 @@ number is 999,999,999.}% \PackageError{xepersian}{You have not specified any font\MessageBreak for the main Persian text}{Use `\settextfont' to load a font.}% }{}} -\@ifdefinitionfileloaded{loadingorder-xetex-bidi}{\input{loadingorder-xepersian.def}}{} -\@ifdefinitionfileloaded{footnote-xetex-bidi}{\input{footnote-xepersian.def}}{} -\@ifpackageloaded{appendix}{\input{appendix-xepersian.def}}{} -\@ifpackageloaded{listings}{\input{listings-xepersian.def}}{} -\@ifpackageloaded{algorithmic}{\input{algorithmic-xepersian.def}}{} -\@ifpackageloaded{algorithm}{\input{algorithm-xepersian.def}}{} -\@ifpackageloaded{backref}{\input{backref-xepersian.def}}{} -\@ifpackageloaded{beamerbasetranslator}{\input{beamerbasetranslator-xepersian.def}}{} -\@ifpackageloaded{fancyref}{\input{fancyref-xepersian.def}}{} -\@ifpackageloaded{bidituftesidenote}{\input{bidituftesidenote-xepersian.def}}{} -\@ifpackageloaded{breqn}{\input{breqn-xepersian.def}}{} -\@ifpackageloaded{enumerate}{\input{enumerate-xepersian.def}}{} -\@ifpackageloaded{enumitem}{\input{enumitem-xepersian.def}}{} -\@ifpackageloaded{framed}{\input{framed-xepersian.def}}{} -\@ifpackageloaded{glossaries}{\input{glossaries-xepersian.def}}{} -\@ifpackageloaded{hyperref}{\input{hyperref-xepersian.def}}{} -\@ifpackageloaded{minitoc}{\input{minitoc-xepersian.def}}{} -\@ifpackageloaded{natbib}{\input{natbib-xepersian.def}}{} -\@ifpackageloaded{soul}{\input{soul-xepersian.def}}{} -\@ifpackageloaded{tkz-linknodes}{\input{tkz-linknodes-xepersian.def}}{} -\@ifpackageloaded{tocloft}{\@ifclassloaded{memoir}{}{\input{tocloft-xepersian.def}}}{} -\@ifpackageloaded{url}{\input{url-xepersian.def}}{} -\@ifpackageloaded{varioref}{\input{varioref-xepersian.def}}{} -\@ifclassloaded{article}{\input{article-xepersian.def}}{} -\@ifclassloaded{extarticle}{\input{extarticle-xepersian.def}}{} -\@ifclassloaded{artikel1}{\input{artikel1-xepersian.def}}{} -\@ifclassloaded{artikel2}{\input{artikel2-xepersian.def}}{} -\@ifclassloaded{artikel3}{\input{artikel3-xepersian.def}}{} -\@ifclassloaded{amsart}{\input{amsart-xepersian.def}}{} -\@ifclassloaded{beamer}{\input{beamer-xepersian.def}}{} -\@ifclassloaded{bidimoderncv}{\input{bidimoderncv-xepersian.def}}{} -\@ifclassloaded{report}{\input{report-xepersian.def}}{} -\@ifclassloaded{extreport}{\input{extreport-xepersian.def}}{} -\@ifclassloaded{rapport1}{\input{rapport1-xepersian.def}}{} -\@ifclassloaded{rapport3}{\input{rapport3-xepersian.def}}{} -\@ifclassloaded{scrartcl}{\input{scrartcl-xepersian.def}}{} -\@ifclassloaded{scrbook}{\input{scrbook-xepersian.def}}{} -\@ifclassloaded{scrreprt}{\input{scrreprt-xepersian.def}}{} -\@ifclassloaded{amsbook}{\input{amsbook-xepersian.def}}{} -\@ifclassloaded{boek3}{\input{boek3-xepersian.def}}{} -\@ifclassloaded{boek}{\input{boek-xepersian.def}}{} -\@ifclassloaded{bookest}{\input{bookest-xepersian.def}}{} -\@ifclassloaded{extbook}{\input{extbook-xepersian.def}}{} -\@ifclassloaded{book}{\input{book-xepersian.def}}{} -\@ifclassloaded{refrep}{\input{refrep-xepersian.def}}{} -\@ifclassloaded{memoir}{\input{memoir-xepersian.def}}{} -\@ifclassloaded{imsproc}{\input{imsproc-xepersian.def}}{} -\@ifdefinitionfileloaded{extrafootnotefeatures-xetex-bidi}{\input{extrafootnotefeatures-xepersian.def}}{} + +\ApplyPatchToFiles{% + footnote-xetex-bidi, % + extrafootnotefeatures-xetex-bidi % +}[def][xepersian] + +\ApplyPatchToClasses{% + article, % + amsart, % + amsbook, % + artikel1, % + artikel2, % + artikel3, % + beamer, % + bidimoderncv, % + boek, % + boek3, % + book, % + bookest, % + extbook, % + extarticle, % + extreport, % + imsproc, % + memoir, % + rapport1, % + rapport3, % + refrep, % + report, % + scrartcl, % + scrbook, % + scrreprt % +}[xepersian] + +\ApplyPatchToPackages{% + algorithm, % + algorithmic, % + appendix, % + backref, % + beamerbasetranslator, % + bidituftesidenote, % + breqn, % + enumerate, % + enumitem, % + fancyref, % + framed, % + glossaries, % + hyperref, % + listings, % + minitoc, % + natbib, % + soul, % + tkz-linknodes, % + tocloft, % + url, % + varioref % +}[xepersian] \newtoks\xepersian@toks \def\xepersian@tempa#1{% |