texlive[55516] trunk: xindex (11jun20)
commits+karl at tug.org
commits+karl at tug.org
Thu Jun 11 23:09:40 CEST 2020
Revision: 55516
http://tug.org/svn/texlive?view=revision&revision=55516
Author: karl
Date: 2020-06-11 23:09:40 +0200 (Thu, 11 Jun 2020)
Log Message:
-----------
xindex (11jun20)
Modified Paths:
--------------
trunk/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl
trunk/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua
trunk/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG
trunk/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf
trunk/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex
trunk/Master/texmf-dist/scripts/xindex/xindex.lua
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-uca.lua
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg.lua
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-lapp.lua
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua
Removed Paths:
-------------
trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-yannis.lua
Modified: trunk/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl 2020-06-11 21:09:12 UTC (rev 55515)
+++ trunk/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl 2020-06-11 21:09:40 UTC (rev 55516)
@@ -2412,14 +2412,8 @@
raise .
}
-# to be invoked at initialization and after a font scaling change
-proc rebuild_interface {} {
- foreach c [winfo children .] {catch {destroy $c}}
-
- # for busy/idle indicators
- set ::busy [__ "Idle"]
- populate_main
- # and now redisplay all data
+proc display_all_data {} {
+ # (re)display all data
if {$::tcl_platform(platform) eq "windows"} {
.topfr.ladmin configure -text \
[expr {$::multiuser ? [__ "Multi-user"] : [__ "Single-user"]}]
@@ -2432,6 +2426,16 @@
show_repos
display_packages_info
display_updated_globals
+}
+
+# to be invoked at initialization and after a font scaling change
+proc rebuild_interface {} {
+ foreach c [winfo children .] {catch {destroy $c}}
+
+ # for busy/idle indicators
+ set ::busy [__ "Idle"]
+ populate_main
+ display_all_data
if {$::tcl_platform(platform) eq "windows"} {wm deiconify .}
}
@@ -2513,6 +2517,7 @@
get_packages_info_local
collect_filtered
get_repos_from_tlmgr
+ display_all_data
}; # initialize
initialize
Modified: trunk/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua 2020-06-11 21:09:12 UTC (rev 55515)
+++ trunk/Build/source/texk/texlive/linked_scripts/xindex/xindex.lua 2020-06-11 21:09:40 UTC (rev 55516)
@@ -8,7 +8,7 @@
-----------------------------------------------------------------------
xindex = xindex or { }
- local version = 0.24
+ local version = 0.25
xindex.version = version
--xindex.self = "xindex"
Modified: trunk/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG
===================================================================
--- trunk/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG 2020-06-11 21:09:12 UTC (rev 55515)
+++ trunk/Master/texmf-dist/doc/lualatex/xindex/CHANGELOG 2020-06-11 21:09:40 UTC (rev 55516)
@@ -1,3 +1,4 @@
+0.25 2020-06-11 - fix for correct hyperpage setting for |see{foo}
0.24 2020-06-07 - fix for correct hyperpage setting with folium pages
0.23 2020-06-02 - added support for the package LUA-UCA (Unicode Collation Algorithm)
0.22 2020-05-30 - added test for correct language with a fallback to english (en)
Modified: trunk/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex
===================================================================
--- trunk/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex 2020-06-11 21:09:12 UTC (rev 55515)
+++ trunk/Master/texmf-dist/doc/lualatex/xindex/xindex-doc.tex 2020-06-11 21:09:40 UTC (rev 55516)
@@ -80,7 +80,7 @@
\def\setVersion#1{\setVVersion#1!!}
\def\setVVersion#1=#2!!{\def\xIndexVersion{#2}}
-\setVersion{version = 0.24}% can be automatically changed by perl
+\setVersion{version = 0.25}% can be automatically changed by perl
\setkeys{dtk}{cleanup=true,force=false}
@@ -308,8 +308,7 @@
it will be customizable.
The predefined language is »en« and currently the following languages are possible:
-{\Japanese
-\begin{Verbatim}[fontfamily=helvetica,commandchars=\\<>]
+\begin{Verbatim}[commandchars=\\<>]
indexheader = {
cs = {"Symboly", "Čísla"},
da = {"Symboler", "Tal"},
@@ -317,10 +316,9 @@
en = {"Symbols", "Numbers"},
fr = {"Symboles","Nombres"},
it = {"Simboli", "Numeri"},
- jp = {"シンボル","番号"},
+ \Japanese jp = {"シンボル","番号"},
}
\end{Verbatim}
-}
The following example was run with \verb|xindex -l it <file>.idx|:
@@ -1070,16 +1068,16 @@
lstOptions={columns=fixed}]{xindex}
\RequirePackage{filecontents}
\begin{filecontents*}{\jobname.idx}
-\indexentry{VoßHerbert at Herbert Voß!Wasgenstraße 121\protect \\10127 Potsdam\protect \\\Email {herbert"@xyz.de}}{3}
-\indexentry{SeversMartin at Martin Severs!siehe Seite~\protect \pageref {president}}{4}
+\indexentry{VoßHerbert at Herbert Voß!Wasgensteig 12\protect \\10127 Potsdam\protect \\\Email {herbert"@xyz.de}}{3}
+\indexentry{SeversMarkus at Markus Severs!siehe Seite~\protect \pageref {president}}{4}
\indexentry{VoßHerbert at Herbert Voß!Wasgensteig 12\protect \\10127 Potsdam\protect \\\Email {herbert"@xyz.de}}{5}
-\indexentry{ZiegendatenMichael at Michael Ziegendaten!Lokostr. 19 \protect \\ 20713 Kalln \protect \\\Email {ziegendaten"@mail.com}}{9}
-\indexentry{BährendtsenElke at Elke Baehrendtsen!\Email {dori"@xyz.de}}{14}
+\indexentry{ZiegendaMichael at Michael Ziegenda!Lokostr. 19 \protect \\ 20713 Kallin \protect \\\Email {ziegenda"@mail.com}}{9}
+\indexentry{BährendtsenElke at Elke Bährendtsen!\Email {elke"@xyz.de}}{14}
\indexentry{JacekJonasson Jared at Jonasson Jared Jazek!\Email {mail"@jones.net}}{20}
-\indexentry{KoomerMartin at Martin Koomer!Freiherr-von-Stein-Weg~16\protect \\ 15525~Erdingen-Neckar\protect \\ \Email {kooma"@xyz.info}}{24}
-\indexentry{KoomerMartin at Martin Koomer!Freiherr-von-Stein-Weg~16\protect \\ 15525~Erdingen-Neckar\protect \\ \Email {kooma"@xyz.info}}{31}
-\indexentry{SchusterEike at Eike Schuster!Haussteig~15\protect \\ 36396~Stuttens\protect \\ \Email {elke.schuster"@kabelxyz.de}}{40}
-\indexentry{FanntHorst at Horst Fannt!Friedrichallee 74\protect \\13233 Neu-Isenburg\protect \\\Email {juergen.fannt"@gmxnet.de}}{48}
+\indexentry{KoonMartin at Martin Koon!Freiherr-Links-Weg~16\protect \\ 15525~Neckar\protect \\ \Email {koo"@xyz.org}}{24}
+\indexentry{KoonMartin at Martin Koon!Freiherr-Links-Weg~16\protect \\ 15525~Neckar\protect \\ \Email {koo"@xyz.org}}{31}
+\indexentry{SchusterEike at Eike Schulter!Haussteig~15\protect \\ 36396~Stuttgart\protect \\ \Email {eike.schulter"@kabel.de}}{40}
+\indexentry{FanntHorst at Horst Fannt!Friedrichallee 74\protect \\13233 Neu-Isenburg\protect \\\Email {horst.fannt"@gmxnet.de}}{48}
\end{filecontents*}
\documentclass{article}
\usepackage{url}
Modified: trunk/Master/texmf-dist/scripts/xindex/xindex.lua
===================================================================
--- trunk/Master/texmf-dist/scripts/xindex/xindex.lua 2020-06-11 21:09:12 UTC (rev 55515)
+++ trunk/Master/texmf-dist/scripts/xindex/xindex.lua 2020-06-11 21:09:40 UTC (rev 55516)
@@ -8,7 +8,7 @@
-----------------------------------------------------------------------
xindex = xindex or { }
- local version = 0.24
+ local version = 0.25
xindex.version = version
--xindex.self = "xindex"
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua 2020-06-11 21:09:12 UTC (rev 55515)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua 2020-06-11 21:09:40 UTC (rev 55516)
@@ -7,7 +7,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-cfg'] = {
- version = 0.24,
+ version = 0.25,
comment = "configuration to xindex.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua 2020-06-11 21:09:12 UTC (rev 55515)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua 2020-06-11 21:09:40 UTC (rev 55516)
@@ -9,7 +9,7 @@
-- configuration for index files of the Heidelberger Akademie der Wissenschaften
if not modules then modules = { } end modules ['xindex-HAdW-eKO'] = {
- version = 0.24,
+ version = 0.25,
comment = "configuration to xindex.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua 2020-06-11 21:09:12 UTC (rev 55515)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-base.lua 2020-06-11 21:09:40 UTC (rev 55516)
@@ -6,7 +6,7 @@
-- LICENSE: LPPL1.3
-----------------------------------------------------------------------
-local info = { version = 0.24 }
+local info = { version = 0.25 }
-- check config
if pageNoPrefixDel ~= "" then
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua 2020-06-11 21:09:12 UTC (rev 55515)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua 2020-06-11 21:09:40 UTC (rev 55516)
@@ -7,7 +7,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-cfg-common'] = {
- version = 0.24,
+ version = 0.25,
comment = "configuration to xindex.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-uca.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-uca.lua 2020-06-11 21:09:12 UTC (rev 55515)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg-uca.lua 2020-06-11 21:09:40 UTC (rev 55516)
@@ -7,7 +7,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-cfg-lua'] = {
- version = 0.24,
+ version = 0.25,
comment = "configuration to xindex-cfg-uca.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg.lua 2020-06-11 21:09:12 UTC (rev 55515)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-cfg.lua 2020-06-11 21:09:40 UTC (rev 55516)
@@ -7,7 +7,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-cfg'] = {
- version = 0.24,
+ version = 0.25,
comment = "main configuration to xindex.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua 2020-06-11 21:09:12 UTC (rev 55515)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua 2020-06-11 21:09:40 UTC (rev 55516)
@@ -7,7 +7,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-cfg'] = {
- version = 0.24,
+ version = 0.25,
comment = "DTK configuration to xindex.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-lapp.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-lapp.lua 2020-06-11 21:09:12 UTC (rev 55515)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-lapp.lua 2020-06-11 21:09:40 UTC (rev 55516)
@@ -28,7 +28,7 @@
--~ n 2
--------------------------------
if not modules then modules = { } end modules ['xindex-lapp'] = {
- version = 0.24,
+ version = 0.25,
comment = "read parameter for xindex.lua",
author = "Steve Donovan",
copyright = "Steve Donovan",
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua 2020-06-11 21:09:12 UTC (rev 55515)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-lib.lua 2020-06-11 21:09:40 UTC (rev 55516)
@@ -7,7 +7,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-lib'] = {
- version = 0.24,
+ version = 0.25,
comment = "main library to xindex.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
@@ -689,13 +689,15 @@
]]
if hyperpage then
if string.find(v["pages"][1]["special"],"hyperindexformat") then
- pageNo = v["pages"][1]["special"].."{"..checkFF(Pages[1]["number"].."}")
+-- pageNo = v["pages"][1]["special"].."{"..checkFF(Pages[1]["number"].."}")
+ pageNo = v["pages"][1]["special"].."{"..Pages[1]["number"].."}"
else
pageNo = "\\hyperpage{"..checkFF(Pages[1]["number"]).."}"
end
for i=2,#Pages do
if string.find(v["pages"][i]["special"],"hyperindexformat") then
- pageNo = pageNo..", "..v["pages"][i]["special"].."{"..checkFF(Pages[i]["number"].."}")
+ pageNo = pageNo..", "..v["pages"][i]["special"].."{"..Pages[i]["number"].."}"
+-- pageNo = pageNo..", "..v["pages"][i]["special"].."{"..checkFF(Pages[i]["number"].."}")
else
pageNo = pageNo..", \\hyperpage{"..checkFF(Pages[i]["number"]).."}"
end
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua 2020-06-11 21:09:12 UTC (rev 55515)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-norsk.lua 2020-06-11 21:09:40 UTC (rev 55516)
@@ -8,7 +8,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-no'] = {
- version = 0.24,
+ version = 0.25,
comment = "configuration to xindex.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
Modified: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua 2020-06-11 21:09:12 UTC (rev 55515)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua 2020-06-11 21:09:40 UTC (rev 55516)
@@ -5,7 +5,7 @@
--
if not modules then modules = { } end modules ['xindex-pretty'] = {
- version = 0.24,
+ version = 0.25,
comment = "dump a Lua table for debugging",
author = "Steve Donovan",
copyright = "Steve Donovan",
Deleted: trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-yannis.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-yannis.lua 2020-06-11 21:09:12 UTC (rev 55515)
+++ trunk/Master/texmf-dist/tex/lualatex/xindex/xindex-yannis.lua 2020-06-11 21:09:40 UTC (rev 55516)
@@ -1,260 +0,0 @@
------------------------------------------------------------------------
--- FILE: xindex-yannis.lua
--- DESCRIPTION: configuration file for xindex.lua
--- REQUIREMENTS:
--- AUTHOR: Herbert Voß
--- LICENSE: LPPL1.3
------------------------------------------------------------------------
-
-if not modules then modules = { } end modules ['xindex-yannis'] = {
- version = 0.24,
- comment = "main configuration to xindex.lua",
- author = "Herbert Voss",
- copyright = "Herbert Voss",
- license = "LPPL 1.3"
-}
-
-itemPageDelimiter = "," -- Hello, 14
-compressPages = true -- something like 12--15, instaead of 12,13,14,15. the |( ... |) syntax is still valid
-fCompress = false -- 3f -> page 3, 4 and 3ff -> page 3, 4, 5
-minCompress = 2 -- 14--17 or
-rangeSymbol = "-" -- 14-17 instead of --
-numericPage = true -- for non numerical pagenumbers, like "VI-17"
-sublabels = {"", "-\\,", "--\\,", "---\\,"} -- for the (sub(sub(sub-items first one is for item
-pageNoPrefixDel = "" -- a delimiter for page numbers like "VI-17" -- not used !!!
-indexOpening = "" -- commands after \begin{theindex}
-idxnewletter = "\\textbf" -- Only valid if -n is not set
-
-
---[[
- Each character's position in this array-like table determines its 'priority'.
- Several characters in the same slot have the same 'priority'.
-]]
-alphabet_lower = { -- for sorting
- { 'α', 'ά', 'ὰ', 'ᾶ', 'ἀ', 'ἄ', 'ἂ', 'ἆ', 'ἁ', 'ἅ', 'ἃ', 'ἇ', 'ᾳ', 'ᾴ', 'ᾲ', 'ᾷ', 'ᾀ', 'ᾄ', 'ᾂ', 'ᾆ', 'ᾁ', 'ᾅ', 'ᾃ', 'ᾇ' },
- { 'β', 'ϐ' },
- { 'γ' },
- { 'δ' },
- { 'ε', 'έ', 'ὲ', 'ἐ', 'ἔ', 'ἒ', 'ἑ', 'ἕ', 'ἓ' },
- { 'ζ' },
- { 'η', 'ή', 'ὴ', 'ῆ', 'ἠ', 'ἤ', 'ἢ', 'ἦ', 'ἡ', 'ἥ', 'ἣ', 'ἧ', 'ῃ', 'ῄ', 'ῂ', 'ῇ', 'ᾐ', 'ᾔ', 'ᾒ', 'ᾖ', 'ᾑ', 'ᾕ', 'ᾓ', 'ᾗ' },
- { 'θ' },
- { 'ι', 'ί', 'ὶ', 'ῖ', 'ἰ', 'ἴ', 'ἲ', 'ἶ', 'ἱ', 'ἵ', 'ἳ', 'ἷ', 'ϊ', 'ΐ', 'ῒ', 'ῗ' },
- { 'κ' },
- { 'λ' },
- { 'μ' },
- { 'ν' },
- { 'ξ' },
- { 'ο', 'ό', 'ὸ', 'ὀ', 'ὄ', 'ὂ', 'ὁ', 'ὅ', 'ὃ' },
- { 'π' },
- { 'ρ' },
- { 'σ', 'ς' },
- { 'τ' },
- { 'υ', 'ύ', 'ὺ', 'ῦ', 'ὐ', 'ὔ', 'ὒ', 'ὖ', 'ὑ', 'ὕ', 'ὓ', 'ὗ', 'ϋ', 'ΰ', 'ῢ', 'ῧ' },
- { 'φ' },
- { 'χ' },
- { 'ψ' },
- { 'ω', 'ώ', 'ὼ', 'ῶ', 'ὠ', 'ὤ', 'ὢ', 'ὦ', 'ὡ', 'ὥ', 'ὣ', 'ὧ', 'ῳ', 'ῴ', 'ῲ', 'ῷ', 'ᾠ', 'ᾤ', 'ᾢ', 'ᾦ', 'ᾡ', 'ᾥ', 'ᾣ', 'ᾧ' },
- { 'a', 'á', 'à', 'ä', 'å', 'æ', },
- { 'b' },
- { 'c', 'ç' },
- { 'd' },
- { 'e', 'é', 'è', 'ë' },
- { 'f' },
- { 'g' },
- { 'h' },
- { 'i', 'í', 'ì', 'ï' },
- { 'j' },
- { 'k' },
- { 'l' },
- { 'm' },
- { 'n', 'ñ' },
- { 'o', 'ó', 'ò', 'ö', 'ø', 'œ'},
- { 'p' },
- { 'q' },
- { 'r' },
- { 's', 'š', 'ß' },
- { 't' },
- { 'u', 'ú', 'ù', 'ü' },
- { 'v' },
- { 'w' },
- { 'x' },
- { 'y', 'ý', 'ÿ' },
- { 'z', 'ž' },
- { 'а' },
- { 'б' },
- { 'в' },
- { 'г', 'ѓ' },
- { 'д' },
- { 'е', 'ё' },
- { 'ж' },
- { 'з' },
- { 'и', 'і' },
- { 'й' },
- { 'к' },
- { 'л' },
- { 'м' },
- { 'н' },
- { 'о' },
- { 'п' },
- { 'р' },
- { 'с' },
- { 'т' },
- { 'у' },
- { 'ф' },
- { 'х' },
- { 'ц' },
- { 'ч' },
- { 'ш' },
- { 'щ' },
- { 'ъ' },
- { 'ы' },
- { 'ь' },
- { 'э' },
- { 'ю' },
- { 'я' },
-}
-alphabet_upper = { -- for sorting
- { 'Α', 'Ά', 'Ἀ', 'Ἄ', 'Ἂ', 'Ἆ', 'Ἁ', 'Ἅ', 'Ἃ', 'Ἇ', 'ᾼ', 'ᾈ', 'ᾌ', 'ᾊ', 'ᾎ', 'ᾉ', 'ᾍ', 'ᾋ', 'ᾏ' },
- { 'Β' },
- { 'Γ' },
- { 'Δ' },
- { 'Ε', 'Έ', 'Ἐ', 'Ἔ', 'Ἒ', 'Ἑ', 'Ἕ', 'Ἓ' },
- { 'Ζ' },
- { 'Η', 'Ή', 'Ἠ', 'Ἤ', 'Ἢ', 'Ἦ', 'Ἡ', 'Ἥ', 'Ἣ', 'Ἧ', 'ῌ', 'ᾘ', 'ᾜ', 'ᾚ', 'ᾞ', 'ᾙ', 'ᾝ', 'ᾟ' },
- { 'Θ' },
- { 'Ι', 'Ί', 'Ἰ', 'Ἴ', 'Ἲ', 'Ἶ', 'Ἱ', 'Ἵ', 'Ἳ', 'Ἷ', 'Ϊ' },
- { 'Κ' },
- { 'Λ' },
- { 'Μ' },
- { 'Ν' },
- { 'Ξ' },
- { 'Ο', 'Ό', 'Ὀ', 'Ὄ', 'Ὂ', 'Ὁ', 'Ὅ', 'Ὃ' },
- { 'Π' },
- { 'Ρ' },
- { 'Σ' },
- { 'Τ' },
- { 'Υ', 'Ύ', 'Ὑ', 'Ὕ', 'Ὓ', 'Ὗ', 'Ϋ' },
- { 'Φ' },
- { 'Χ' },
- { 'Ψ' },
- { 'Ω', 'Ώ', 'Ὠ', 'Ὤ', 'Ὢ', 'Ὦ', 'Ὡ', 'Ὥ', 'Ὣ', 'Ὧ', 'ῼ', 'ᾩ', 'ᾭ', 'ᾫ', 'ᾯ', 'ᾨ', 'ᾬ', 'ᾪ', 'ᾮ' },
- { 'A', 'Á', 'À', 'Ä', 'Å', 'Æ'},
- { 'B' },
- { 'C', 'Ç' },
- { 'D' },
- { 'E', 'È', 'È', 'Ë' },
- { 'F' },
- { 'G' },
- { 'H' },
- { 'I', 'Í', 'Ì', 'Ï' },
- { 'J' },
- { 'K' },
- { 'L' },
- { 'M' },
- { 'N', 'Ñ' },
- { 'O', 'Ó', 'Ò', 'Ö', 'Ø','Œ' },
- { 'P' },
- { 'Q' },
- { 'R' },
- { 'S', 'Š' },
- { 'T' },
- { 'U', 'Ú', 'Ù', 'Ü' },
- { 'V' },
- { 'W' },
- { 'X' },
- { 'Y', 'Ý', 'Ÿ' },
- { 'Z', 'Ž' },
- { 'А' },
- { 'Б' },
- { 'В' },
- { 'Г', 'Ѓ' },
- { 'Д' },
- { 'Е', 'Ё' },
- { 'Ж' },
- { 'З' },
- { 'И', 'І' },
- { 'Й' },
- { 'К' },
- { 'Л' },
- { 'М' },
- { 'Н' },
- { 'О' },
- { 'П' },
- { 'Р' },
- { 'С' },
- { 'Т' },
- { 'У' },
- { 'Ф' },
- { 'Х' },
- { 'Ц' },
- { 'Ч' },
- { 'Ш' },
- { 'Щ' },
- { 'Ъ' },
- { 'Ы' },
- { 'Ь' },
- { 'Э' },
- { 'Ю' },
- { 'Я' },
-}
-
-
-function SORTendhook(list)
- print ("We have "..#list.." total list entries")
- local greek = {}
- local latin = {}
- local cyrillic = {}
- local symbols = {}
- local numbers = {}
- local others = {}
- local firstChar, charType
- local firstCharNumber
- local v
- for i=1,#list do
- v = list[i]
- firstChar = NormalizedUppercase(utf.sub(v["sortChar"],1,1))
- v["sortChar"] = firstChar -- to be sure it is an uppercase unicode char
- firstCharNumber = string.utfvalue(firstChar)
- charType = getCharType(firstChar)
--- print (utf.sub(v["sortChar"],1,1).."->"..firstChar.." ("..firstCharNumber..") ".." ("..charType..")")
- if charType == 0 then
- symbols[#symbols+1] = v
- elseif charType == 1 then
- numbers[#numbers+1] = v
- elseif firstCharNumber > 0x052F then -- 0x052F is last cyrillic character
- others[#others+1] = v
- elseif firstCharNumber >= 0x0400 then -- 0x0400-0x052F cyrillic characters
- cyrillic[#cyrillic+1] = v
- elseif firstCharNumber <= 0x03FF then -- 0x03FF is last greek character
- if firstCharNumber >= 0x0370 then
- greek[#greek+1] = v -- 0x0370-0x03FF greek characters
- elseif firstCharNumber <= 0x024F then
- if firstCharNumber >= 0x041 then -- 0x041-0x024F latin character
- latin[#latin+1] = v
- else
- others[#others+1] = v -- everything else
- end
- end
- end
- end
- print ("We have "..#greek.." Greek entries")
- print ("We have "..#latin.." Latin entries")
- print ("We have "..#cyrillic.." Cyrillic entries")
- print ("We have "..#symbols.." Symbol entries")
- print ("We have "..#numbers.." Number entries")
- print ("We have "..#others.." other entries")
- list = {}
- for i = 1,#greek do list[#list+1] = greek[i] end
- list[#list]["Macro"] = "\\vspace{1cm}"
- for i = 1,#latin do list[#list+1] = latin[i] end
- list[#list]["Macro"] = "\\vspace{1cm}"
- for i = 1,#cyrillic do list[#list+1] = cyrillic[i] end
- list[#list]["Macro"] = "\\vspace{1cm}"
- for i = 1,#symbols do list[#list+1] = symbols[i] end
- for i = 1,#numbers do list[#list+1] = numbers[i] end
- for i = 1,#others do list[#list+1] = others[i] end
- print ("Sorted "..#list.." entries")
- return list
-end
-
More information about the tex-live-commits
mailing list.