summaryrefslogtreecommitdiff
path: root/macros
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2023-03-25 03:02:28 +0000
committerNorbert Preining <norbert@preining.info>2023-03-25 03:02:28 +0000
commit2d6e8c1374d2f1b73403403fe3c1ed84180d3bfa (patch)
tree52a0314aa04c42f356a77ee714677c3a9c3b55e3 /macros
parent85fda71ebb01e4a5b0ce50edf3dda43f45ebb55a (diff)
CTAN sync 202303250302
Diffstat (limited to 'macros')
-rw-r--r--macros/context/contrib/context-calendar-examples/t-calendar-examples/VERSION2
-rw-r--r--macros/context/contrib/context-calendar-examples/t-calendar-examples/tex/context/third/calendar-examples/Menu-calendar.tex82
-rw-r--r--macros/context/contrib/context-collatingmarks/t-collatingmarks/VERSION2
-rw-r--r--macros/context/contrib/context-collatingmarks/t-collatingmarks/doc/context/third/collating-marks/README.md36
-rw-r--r--macros/context/contrib/context-collatingmarks/t-collatingmarks/doc/context/third/collating-marks/t-collatingmarks-module-doc.pdfbin0 -> 140658 bytes
-rw-r--r--macros/context/contrib/context-collatingmarks/t-collatingmarks/doc/context/third/collating-marks/t-collatingmarks-module-doc.tex3
-rw-r--r--macros/context/contrib/context-collatingmarks/t-collatingmarks/doc/context/third/collatingmarks/README.txt36
-rw-r--r--macros/context/contrib/context-collatingmarks/t-collatingmarks/doc/context/third/collatingmarks/t-collatingmarks.pdfbin97437 -> 0 bytes
-rw-r--r--macros/context/contrib/context-collatingmarks/t-collatingmarks/tex/context/third/collatingmarks/t-collatingmarks.tex244
-rw-r--r--macros/context/contrib/context-collatingmarks/t-collatingmarks/tex/context/third/collationg-marks/t-collatingmarks.tex177
-rw-r--r--macros/context/contrib/context-pocketdiary/VERSION2
-rw-r--r--macros/xetex/latex/xduts/README.md6
-rw-r--r--macros/xetex/latex/xduts/xduts.dtx473
-rw-r--r--macros/xetex/latex/xduts/xduts.pdfbin333046 -> 334977 bytes
14 files changed, 520 insertions, 543 deletions
diff --git a/macros/context/contrib/context-calendar-examples/t-calendar-examples/VERSION b/macros/context/contrib/context-calendar-examples/t-calendar-examples/VERSION
index b123147e2a..bcdfbcd1bb 100644
--- a/macros/context/contrib/context-calendar-examples/t-calendar-examples/VERSION
+++ b/macros/context/contrib/context-calendar-examples/t-calendar-examples/VERSION
@@ -1 +1 @@
-1.1 \ No newline at end of file
+2023.03.23 \ No newline at end of file
diff --git a/macros/context/contrib/context-calendar-examples/t-calendar-examples/tex/context/third/calendar-examples/Menu-calendar.tex b/macros/context/contrib/context-calendar-examples/t-calendar-examples/tex/context/third/calendar-examples/Menu-calendar.tex
index 3101cbc2d8..135994f9d8 100644
--- a/macros/context/contrib/context-calendar-examples/t-calendar-examples/tex/context/third/calendar-examples/Menu-calendar.tex
+++ b/macros/context/contrib/context-calendar-examples/t-calendar-examples/tex/context/third/calendar-examples/Menu-calendar.tex
@@ -25,7 +25,8 @@
% Add a path to the picture placed on page 3:
\setupexternalfigures
- [directory=/YourFolder]
+ [directory=/Users/willi/Documents/TEXdata
+ /Koken/Grossmutters-Guetzli-Rezepte/]
% Choose the main language it determines the interface:
@@ -36,17 +37,25 @@
% The calendar has a pagesize of A6 and with the imposition 4 pages recto and verso are placed on a A4. Two sheets of A4 form one section:
-\setuppapersize[A6][A4]
+%\setuppapersize[A6][A4]
+\setuppapersize[A5][A4,landscape]
-\setuparranging[2*4*2]
+% \setuparranging[2*4*2]
+%\setuparranging[2*2*4]
+\setuparranging[2SIDE]
% The module Collating marks needs appropriate information:
+% \setupMPvariables
+% [pages=8, % pages per sheet of paper doublesided
+% sheets=2, % sheets of paper used per section
+% horpageshift=0mm]
\setupMPvariables
- [pages=8, % pages per sheet of paper doublesided
- sheets=2, % sheets of paper used per section
+ [pages=4, % pages per sheet of paper doublesided
+ sheets=4, % sheets of paper used per section
horpageshift=0mm]
+
% Adapt the layout of the page to the size of the page:
\setuplayout
[topspace=.6cm,
@@ -101,7 +110,7 @@
\setuplabeltext[fr][menu=Menu]
\setuplabeltext[fr][comment=Commentaire]
-% Dutch interfac
+% Dutch interface
\setuplabeltext[nl][menu=Menu]
\setuplabeltext[nl][comment=Commentaar]
@@ -113,30 +122,31 @@
\setuplabeltext[es][menu=Menú]
\setuplabeltext[es][comment=Comentario]
+
% The lua code performing all the magic:
\startluacode
local report = logs.reporter("Menu calendar")
-
+
function thirddata.calendar.menuweektable(mondaytimestamp,year,w)
local stamp = mondaytimestamp
local year = year
local week = w
- local daynumber,dayname,monthname,holiday
-
+ local daynumber,dayname,monthname,holiday
+
local day = stamp + 1 * 24 * 60 * 60
-
+
report("Working in function: thirddata.calendar.menuweektable")
-
+
local monthname = string.lower(os.date("%B",day))
-
+
--report("Month: %s Week: %s", monthname,week)
-
+
thirddata.calendar.myheadertext(monthname,week)
-
+
context.bTABLE({setups="table:week"})
-
+
for i = 1,7 do
local day = stamp + i * 24 * 60 * 60
@@ -145,21 +155,20 @@
daynumber = tonumber(os.date("%d",day)) --day number
dayname = string.lower(os.date("%a",day)) -- day name short
monthnumber = tonumber(os.date("%m",day)) -- month name
- holiday = thirddata.calendar.checkchristianfeast(daynumber,monthnumber,year) --
- -- Christian holida
+ holiday = thirddata.calendar.checkchristianfeast(daynumber,monthnumber,year) -- Christian holida
if holiday ~= "" then
report("Holiday (before table row): %s", holiday)
- report("Day number (before table row): %s", daynumber)
+ report("Day number (before table row): %s", daynumber)
report("Day name (before table row): %s",dayname)
- end
-
+ end
+
context.bTR()
context.bTD({style="bfa"})
if dayname == "sun" or holiday ~= "" and f ~= "ashw" then
- local dnu = daynumber
- local dna = dayname
+ local dnu = daynumber
+ local dna = dayname
context.color({"red"},function() context(dnu) end)
context("~")
context.color({"red"},function() context.labeltext(dna) end)
@@ -187,11 +196,11 @@
context.eTABLE()
context.page({"yes"})
end
-
+
function thirddata.calendar.myheadertext(monthname,week)
-
- report("Working in function myheadertext")
-
+
+ report("Working in function myheadertext")
+
context.setupheadertexts{
function()
context("\\bgroup\\bfa")
@@ -204,14 +213,16 @@
return true
end}
end
-
+
function thirddata.calendar.week(weeknumber,year)
local w = weeknumber
- local mondaytimestamp = thirddata.calendar.weekcalendar(w,year)
-
+ local year = year
+ local month = thirddata.calendar.select_month(1,w,year)
+ local mondaytimestamp = thirddata.calendar.weekcalendar(w,month,year)
+
report("Working in function: thirddata.calendar.week")
--report("Mondaytimestamp %s", mondaytimestamp)
-
+
thirddata.calendar.menuweektable(mondaytimestamp,year,w)
end
@@ -238,10 +249,10 @@
\stopstandardmakeup
\setupheadertexts[][]
-
+
\strut\vfil
-
- \startplacefigure
+
+ \startplacefigure
[number=,
title=,
location=middle]
@@ -253,13 +264,13 @@
\page
\setups{Footertext}
-
+
\dorecurse{52}
{\setvariables
[PocketDiary]
[Week=\recurselevel]
\MenuWeektable{\recurselevel}{\getvariable{PocketDiary}{Year}}\page}
-
+
\page
\setupheadertexts[\bf \labeltext{notes}]
@@ -268,3 +279,4 @@
{3}
{\strut\page}
\stoptext
+
diff --git a/macros/context/contrib/context-collatingmarks/t-collatingmarks/VERSION b/macros/context/contrib/context-collatingmarks/t-collatingmarks/VERSION
index 78b372db7d..bcdfbcd1bb 100644
--- a/macros/context/contrib/context-collatingmarks/t-collatingmarks/VERSION
+++ b/macros/context/contrib/context-collatingmarks/t-collatingmarks/VERSION
@@ -1 +1 @@
-2022-01-01 \ No newline at end of file
+2023.03.23 \ No newline at end of file
diff --git a/macros/context/contrib/context-collatingmarks/t-collatingmarks/doc/context/third/collating-marks/README.md b/macros/context/contrib/context-collatingmarks/t-collatingmarks/doc/context/third/collating-marks/README.md
new file mode 100644
index 0000000000..f35f92a89e
--- /dev/null
+++ b/macros/context/contrib/context-collatingmarks/t-collatingmarks/doc/context/third/collating-marks/README.md
@@ -0,0 +1,36 @@
+## Collting Marks
+
+# Introduction
+Collating marks are small black rules placed on printed sections. On each section the mark is moved by the length of the black rule. When the book is assembled on the spine appears a stair like pattern. Continuity of this pattern insures that the book is ordered in the correct sequence of sections.
+
+# Usage
+The module is used in connection with arranging pages for folding to form sections.
+
+Depending on the arranging scheme used the module must be set up accordingly in the set of MetaPost variables.
+
+Example:
+
+\usemodule[collatingmarks][Collatingmarks=yes]
+
+\setupMPvariables
+ [pages=8, % pages per sheet of paper doublesided
+ sheets=2, % sheets of paper used per section
+ horpageshift=0mm, % used for correction if horizontal page-shifting is used
+ frenchdoors=false,
+ wickel=false]
+
+This setup is used for the arranging scheme \setuparranging[2*4*2] which indicates that it is double-sided printed with 4 pages recto and verso and there are two sheets of paper forming together the sections containing 16 pages.
+
+The shift parameter is used to adjust the position of the collating mark centered on the spine. This is specially important when a horizontal shift-list is used for arranging!
+
+Exanmple:
+
+\definepageshift
+ [hor]
+ [horizontal]
+ [1mm,-1mm,.75mm,-.75mm,.5mm,-.5mm,.25mm,0mm,
+ 0mm,-.25mm,.5mm,-.5mm,.75mm,-.75mm,1mm,-1mm]
+
+\setuppageshift[paper][hor] %paper= arrange only, horizontal only
+
+\setuparranging[2*2*4]
diff --git a/macros/context/contrib/context-collatingmarks/t-collatingmarks/doc/context/third/collating-marks/t-collatingmarks-module-doc.pdf b/macros/context/contrib/context-collatingmarks/t-collatingmarks/doc/context/third/collating-marks/t-collatingmarks-module-doc.pdf
new file mode 100644
index 0000000000..1dd95ed6c6
--- /dev/null
+++ b/macros/context/contrib/context-collatingmarks/t-collatingmarks/doc/context/third/collating-marks/t-collatingmarks-module-doc.pdf
Binary files differ
diff --git a/macros/context/contrib/context-collatingmarks/t-collatingmarks/doc/context/third/collating-marks/t-collatingmarks-module-doc.tex b/macros/context/contrib/context-collatingmarks/t-collatingmarks/doc/context/third/collating-marks/t-collatingmarks-module-doc.tex
new file mode 100644
index 0000000000..ab3abb9aa3
--- /dev/null
+++ b/macros/context/contrib/context-collatingmarks/t-collatingmarks/doc/context/third/collating-marks/t-collatingmarks-module-doc.tex
@@ -0,0 +1,3 @@
+The documentation of this module can be created from the source-file by running:
+
+mtxrun --script modules --process t-collatingmarks.tex \ No newline at end of file
diff --git a/macros/context/contrib/context-collatingmarks/t-collatingmarks/doc/context/third/collatingmarks/README.txt b/macros/context/contrib/context-collatingmarks/t-collatingmarks/doc/context/third/collatingmarks/README.txt
deleted file mode 100644
index ea5acef366..0000000000
--- a/macros/context/contrib/context-collatingmarks/t-collatingmarks/doc/context/third/collatingmarks/README.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-Modulename : t-collatingmarks
-Author : Willi Egger
-License : Public Domain
-
-Description
------------
-
-t-collatingmarks offers an extension to the page arranging schemes built into ConTeXt. When preparing multiple sections, each section gets a collating mark on the spine on the outermost fold of the section. This mark moves down along the spine with each section number. When the bootblack is put together, it shows a staircase like row of markings on the spine. This enables the bookbinder to see whether the bootblack is assembled correctly i.e. that the sections are put on top of each other in sequence.
-
-Usage
------
-
-\usemodule[collatingmarks][Collatingmarks=yes]
-\setuppapersize[A5][A2]
-\setuplayout[location=middle,marking=on]
-\setuppagenumbering[alternative=doublesided]
-\setuparranging[2*4]
-
-\setupMPvariables
- [pages=8, % pages per sheet of paper double sided depending on the arrangement scheme used.
- sheets=1, % sheets of paper used per section
- shift=0mm] % used for correction if horizontal page-shifting is used while imposition is active
-\starttext
- \dorecurse
- {10}
- {\startsection[title={Text \recurselevel}]
- \input tufte \par
- \startsubject[title={Ward}]
- \input ward\par
- \stopsubject
- \stopsection
- }
-\stoptext
-
-
-
diff --git a/macros/context/contrib/context-collatingmarks/t-collatingmarks/doc/context/third/collatingmarks/t-collatingmarks.pdf b/macros/context/contrib/context-collatingmarks/t-collatingmarks/doc/context/third/collatingmarks/t-collatingmarks.pdf
deleted file mode 100644
index 9b08852536..0000000000
--- a/macros/context/contrib/context-collatingmarks/t-collatingmarks/doc/context/third/collatingmarks/t-collatingmarks.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/context/contrib/context-collatingmarks/t-collatingmarks/tex/context/third/collatingmarks/t-collatingmarks.tex b/macros/context/contrib/context-collatingmarks/t-collatingmarks/tex/context/third/collatingmarks/t-collatingmarks.tex
deleted file mode 100644
index c1c2443707..0000000000
--- a/macros/context/contrib/context-collatingmarks/t-collatingmarks/tex/context/third/collatingmarks/t-collatingmarks.tex
+++ /dev/null
@@ -1,244 +0,0 @@
-%D \module
-%D [ file=t-collatingmarks,
-%D version=2022.01.01,
-%D title=\CONTEXT\ User Module,
-%D subtitle=Environment for collating marks,
-%D author={W. Egger},
-%D date=\currentdate,
-%D copyright={W. Egger},
-%D email=w.egger@boede.nl,
-%D license=Public Domain]
-
-% context --ctx=s-mod t-collatingmarks.tex
-% \enablemode[demo]
-
-%M \startmodule[collatingmarks]
-
-%D \startsubject[title={Introduction}]
-%D
-%D This code is based on the work of Thomas A. Schmitz,
-%D who created the module for different crop marks.
-%D
-%D If a book consists of multiple sections, each section should be marked
-%D along the spine with a collating mark. This mark moves down along the spine
-%D according to the number of the section. After collating the book it becomes
-%D easy to check whether the sequence of the sections is correct. One should
-%D see a \quotation{stair case} on the spine of the book as shown in the following figure.
-
-%D \startexample
-%D \startuniqueMPgraphic{Collatingblocks}
-%D numeric b,w,h;
-%D b := \the\textwidth;
-%D w := .75b;
-%D h := .2b;
-%D pair A,B;
-%D path sq,p[],block[];
-%D sq := unitsquare xscaled w yscaled h;
-%D block[1] := unitsquare xscaled (.1w) yscaled (h/6);
-%D block[1] := block[1] shifted (0.1w,h-h/6);
-%D fill block[1];
-%D label.bot(textext("\switchtobodyfont[6pt] \white\rotate[rotation=90]{1}"),center block[1] shifted (0,.5*h/12));
-%D draw sq;
-%D A := llcorner sq;
-%D B := lrcorner sq;
-%D p[1] := A--B;
-%D for i = 1 upto 5 :
-%D p[i+1] := p[1] shifted (0,h/6*i);
-%D draw p[i+1];
-%D endfor;
-%D for i = 1 upto 5 :
-%D block[i+1] := block[1] shifted (i*.1w, -i*h/6);
-%D fill block[i+1];
-%D numeric ii;
-%D ii := i+1;
-%D label.bot(textext("\switchtobodyfont[6pt] \white\rotate[rotation=90]{"& decimal ii &"}"),
-%D center block[i+1] shifted (0,.5*h/12));
-%D endfor;
-%D \stopuniqueMPgraphic
-%D \placefigure[middle,none][]{}{\useMPgraphic{Collatingblocks}}
-%D \stopexample
-%D \stopsubject
-%D
-%D \startsubject[title={Using the module}]
-%D
-%D If the collating marks should be placed, then the system should be setup with
-%D
-%D \starttyping
-%D \usemodule[collatingmarks][Collatingmarks=yes]
-%D \setupMPvariables
-%D [pages=8,
-%D sheets=2,
-%D horpageshift=0mm]
-%D \stoptyping
-%D
-%D Note that the
-%D collating marks-setup needs to know how many pages are placed on a
-%D doublesided printed sheet of paper and how many such sheets result in a
-%D section i.e. these values depend on the \type{\setuparranging} command. The
-%D shift-option is 0~mm if no horizontal page shifting is issued during
-%D imposition. If a horizontal page shifting is used, then the shift option is
-%D used to position the collating mark precisely on the centre of the spine.
-%D
-%D Be aware that the use of collating marks in MKII causes a lot of calls to
-%D \METAPOST, resulting in very long compilation times.
-%D
-%D So better use MKIV or LMTX where METAPOST\ is included as a
-%D library. In this case the time overhead is absolutely minimal.
-%D
-%D \stopsubject
-%D
-%D \startsubject[title={Vocabulary}]
-%D
-%D EN: Collating mark, DE: Kollationiermarke, NL: collationeerblokje
-%D
-%D\stopsubject
-%D
-%D \startsubject[title=The module code]
-
-
-\writestatus{loading}{Context User Module / Collating Marks}
-
-\unprotect
-
-\setupmodule[Collatingmarks=yes]
-
-
-\def\MCMpages{16}
-\def\MCMsheets{1}
-\def\MCMshift{0mm}
-
-\setupMPvariables
- [Collatingmarks]
- [pages=\MCMpages, %pages per sheet doublesided
- sheets=\MCMsheets,% number of sheets forming one section
- horpageshift=\MCMshift]
-
-%D We prepare collating marks:
-
-\processaction[\currentmoduleparameter{Collatingmarks}]
- [yes=>\def\Collatingmarks{Collatingmarks},
- no=>\def\Collatingmarks{},
- \v!unknown=>\def\Collatingmarks{},
- \v!default=>\def\Collatingmarks{}]
-
-\startusableMPgraphic{Collatingmarks}
- StartPage;
-
- numeric offset, sectionno, pages, sheets, factor, correction, offset, pageshift;
- path p,q;
-
- pages := \MPvar{pages};
- sheets := \MPvar{sheets};
- pageshift:=\MPvar{horpageshift};
-
- z5colm = ulcorner Page;
- z6colm = (x5colm, y5colm-10mm);
-
- p := unitsquare xscaled 1mm yscaled 7mm;
-
- if \realfolio mod 2 = 1 : % on uneven pages only
- sectionno := \realfolio div (sheets*pages)+ 1;
- label.lrt(textext("\switchtobodyfont[5pt]"& decimal sectionno &""),llcorner Page shifted (1mm,-2mm));
- if \realfolio mod (sheets*pages) = 1 : % on the first page of a section only
- nofmarkings := (y6colm-7mm) div 7mm;
- offset := y6colm-sectionno*7mm;
- if sectionno > nofmarkings :
- correction := sectionno div nofmarkings;
- offset := y6colm-(sectionno-correction*nofmarkings)*7mm;
- fi;
- p := p shifted (-1mm-2pageshift,offset);
- fill p withcolor black;
- if sectionno < 9 :
- label.rt(textext("\switchtobodyfont[3pt] \white "& decimal sectionno &""), center p shifted (-1.3mm,0));
- else :
- label.rt(textext("\switchtobodyfont[3pt] \white "& decimal sectionno &""), center p shifted (-1.5mm,0));
- fi;
- fi;
- fi;
-\stopusableMPgraphic
-
-
-%D \startsubsubject[title={Implementation}]
-%D
-%D Collating marks are calculated and drawn by \METAPOST. The result is
-%D placed into an overlay which is used as a page background
-%D
-%D \starttyping
-%D \defineoverlay[Collatingmarks][\useMPgraphic{Collatingmarks}]
-%D \stoptyping
-%D
-\defineoverlay[Collatingmarks][\useMPgraphic{Collatingmarks}]
-%D
-%D \starttyping
-%D \setupbackgrounds[page][state=repeat,background={\Collatingmarks}]
-%D \stoptyping
-%D
-\setupbackgrounds[page][state=repeat,background={\Collatingmarks}]
-%D
-%D We let \METAPOST do the calculations and draw de collating marks.
-%D
-%D \stopsubsubject
-
-\protect
-
-%D \stopsubject
-%D
-%M \stopmodule
-
-
-
-
-\doifnotmode{demo}{\endinput}
-
-%D \startsubject[title={Example}]
-%D \starttyping
-%D \usemodule[collatingmarks][Collatingmarks=yes]
-%D \setuppapersize[A5][A2]
-%D \setuplayout[location=middle,marking=on]
-%D \setuppagenumbering[alternative=doublesided]
-%D \setuparranging[2*4]
-%D
-%D \setupMPvariables
-%D [pages=8, % pages per sheet of paper doublesided
-%D sheets=1, % sheets of paper used per section
-%D horpageshift=0mm] % used for correction if horizontal page-shifting is used while imposition is active
-%D
-%D \starttext
-%D \dorecurse
-%D {10}
-%D {\startsection[title={Text \recurselevel}]
-%D \input tufte \par
-%D \startsubject[title={Ward}]
-%D \input ward\par
-%D \stopsubject
-%D \stopsection%
-%D }
-%D \stoptext
-%D \stoptyping
-%D \stopsubject
-%D \stoptext
-
-
-\usemodule[collatingmarks][Collatingmarks=yes]
-\setuppapersize[A5][A2]
-\setuplayout[location=middle,marking=on]
-\setuppagenumbering[alternative=doublesided]
-\setuparranging[2*4]
-
-\setupMPvariables
- [pages=8, % pages per sheet of paper doublesided
- sheets=1, % sheets of paper used per section
- horpageshift=0mm] % used for correction if horizontal page-shifting is used while imposition is active
-
-\starttext
- \dorecurse
- {10}
- {\startsection[title={Text \recurselevel}]
- \input tufte \par
- \startsubject[title={Ward}]
- \input ward\par
- \stopsubject
- \stopsection%
- }
-\stoptext
-
diff --git a/macros/context/contrib/context-collatingmarks/t-collatingmarks/tex/context/third/collationg-marks/t-collatingmarks.tex b/macros/context/contrib/context-collatingmarks/t-collatingmarks/tex/context/third/collationg-marks/t-collatingmarks.tex
new file mode 100644
index 0000000000..5b340243a5
--- /dev/null
+++ b/macros/context/contrib/context-collatingmarks/t-collatingmarks/tex/context/third/collationg-marks/t-collatingmarks.tex
@@ -0,0 +1,177 @@
+%D \module
+%D [ file=t-collatingmarks,
+%D version=\currentdate,
+%D title=\CONTEXT\ User Module,
+%D subtitle=Environment for collating marks,
+%D author={W. Egger},
+%D date=\currentdate,
+%D copyright={W. Egger},
+%D email=w.egger@boede.nl,
+%D license=Public Domain]
+%D
+%D The documentation can be generated with:
+%D mtxrun --script modules --process t-collatingmarks.tex
+
+\startmodule[collatingmarks]
+
+\writestatus{loading}{Context Module for collating marks}
+
+%D\enablemode[demo]
+
+%D \subject{Introduction}
+%D
+%D This code is based on the work of Thomas A. Schmitz, who created the module for
+%D different crop marks.
+%D
+%D If a book consists of multiple sections, each section should be marked
+%D along the spine with a collating mark. This mark moves down along the spine
+%D according to the number of the section. After collating the book it becomes
+%D easy tho check whether the sequence of the sections is correct. One should
+%D see a \quotation{stair case} on the spine of the book.
+%D
+%D \subject{Using the module}
+%D
+%D If the collating marks should be placed, then the system should be setup with
+%D \type{\setupMPvariables[pages=8,sheets=2,shift=0mm,frenchdoors=false,wickel=false]} Note that the
+%D collating marks-setup needs to know how many pages are placed on a
+%D doublesided printed sheet of paper and how many such sheets result in a
+%D section i.e. these values depend on the \type{\setuparranging} command. The
+%D shift-option is 0mm if no horizontal page shifting is issued during
+%D imposition. If a horizontal page shifting is used, then the shift option is
+%D used to position the collating mark precisely on the spine.
+%D
+%D The two keys \quotation{frenchdoors} and \quotation{wickel} are used for
+%D special purposes. These are not intended for general use.
+%D For the preparation of a binding called
+%D French doors, where there is a left (normal) and a right book, which opens
+%D from left to right the MPvariable \quotation{frenchdoors} must be set to true
+%D (boolean).
+%D For preparing a section with parallelfolding/letterfolding/Wickelfalz the
+%D MPvariable \quotation{wickel} must be set to true (boolean).
+%D
+%D Be aware that the use of collating marks in MKII causes a lot of calls to
+%D Metapost, resulting in very long compilation times.
+%D So better use MKIV where Metapost is included as a
+%D library. In this case the time overhead is absolutely minimal.
+%D
+%D \section{Vocabulary}
+%D
+%D EN: Collating mark, DE: Kollationiermarke, NL: collationeerblokje
+%D
+
+
+\unprotect
+
+\setupmodule[Collatingmarks=yes]
+
+\setupMPvariables
+ [Collatingmarks]
+ [pages=16, %pages per sheet doublesided
+ sheets=1,% number of sheets forming one section
+ horpageshift=0,
+ frenchdoors=false,
+ wickel=false]
+
+%D We prepare collating marks:
+
+\processaction[\currentmoduleparameter{Collatingmarks}]
+ [yes=>\def\Collatingmarks{Collatingmarks},
+ no=>\def\Collatingmarks{},
+ \v!unknown=>\def\Collatingmarks{},
+ \v!default=>\def\Collatingmarks{}]
+
+%D The newly prepared macros go into the page background:
+
+\setupbackgrounds[page][state=repeat,background={\Collatingmarks}]
+
+%D We define an overlay for the collating marks.
+
+\defineoverlay[Collatingmarks][\useMPgraphic{Collatingmarks}]
+
+%D We let \METAPOST do the calculations and draw de collating marks.
+
+\startusableMPgraphic{Collatingmarks}
+StartPage;
+
+numeric offset, sectionno, pages, sheets, factor, correction, offset, pageshift;
+path p,q;
+boolean frenchdoors,wickel;
+
+pages := \MPvar{pages};
+sheets := \MPvar{sheets};
+pageshift := \MPvar{horpageshift};
+frenchdoors := \MPvar{frenchdoors};
+wickel := \MPvar{wickel};
+
+z5colm = ulcorner Page;
+z6colm = (x5colm, y5colm-10mm);
+
+p := unitsquare xscaled 1mm yscaled 7mm;
+
+if \realpagenumber mod 2 = 1 : % on uneven pages only
+ sectionno := \realpagenumber div (sheets*pages)+1;
+ label.lrt(textext("\switchtobodyfont[5pt]"& decimal sectionno &""),llcorner Page shifted (1mm,-2mm));
+ if \realpagenumber mod (sheets*pages) = 1 : % on the first page of a section only
+ nofmarkings := (y6colm-7mm) div 7mm;
+ offset := y6colm-sectionno*7mm;
+ if sectionno > nofmarkings :
+ correction := sectionno div nofmarkings;
+ offset := y6colm-(sectionno-correction*nofmarkings)*7mm;
+ fi;
+ if frenchdoors or wickel :
+ p := p shifted ((PaperWidth),offset);
+ else :
+ p := p shifted (-1mm-2pageshift,offset);
+ fi;
+ fill p withcolor black;
+ if sectionno < 9 :
+ label.rt(textext("\switchtobodyfont[3pt] \white "& decimal sectionno &""), center p shifted (-1.3mm,0));
+ else :
+ label.rt(textext("\switchtobodyfont[3pt] \white "& decimal sectionno &""), center p shifted (-1.5mm,0));
+ fi;
+ fi;
+fi;
+\stopusableMPgraphic
+
+\protect
+\stopmodule
+
+\doifnotmode{demo}{\endinput}
+
+
+
+%D Example:
+%D \usemodule[collatingmarks][Collatingmarks=yes]
+%D \setuppapersize[A5][A2]
+%D \setuplayout[location=middle,marking=on]
+%D \setuppagenumbering[alternative=doublesided]
+%D \setuparranging[2*4]
+%D
+%D \setupMPvariables
+%D [pages=8, % pages per sheet of paper doublesided
+%D sheets=1, % sheets of paper used per section
+%D horpageshift=0mm, % used for correction if horizontal page-shifting is used
+%D frenchdoors=false,
+%D wickel=false]
+%D
+%D \starttext
+%D \dorecurse{10}{\section{Text \recurselevel}\input tufte \par\subject{Ward} \input ward\par}
+%D \stoptext
+
+
+\usemodule[collatingmarks][Collatingmarks=yes]
+\setuppapersize[A5][A2]
+\setuplayout[location=middle,marking=on]
+\setuppagenumbering[alternative=doublesided]
+\setuparranging[2*4*2]
+
+\setupMPvariables
+ [pages=8, % pages per sheet of paper doublesided
+ sheets=2, % sheets of paper used per section
+ horpageshift=0mm, % used for correction if horizontal page-shifting is used
+ frenchdoors=false,
+ wickel=false]
+
+\starttext
+ \dorecurse{10}{\section{Text \recurselevel}\input tufte \par\subject{Ward} \input ward\par}
+\stoptext
diff --git a/macros/context/contrib/context-pocketdiary/VERSION b/macros/context/contrib/context-pocketdiary/VERSION
index 68151b2e10..97060b2f65 100644
--- a/macros/context/contrib/context-pocketdiary/VERSION
+++ b/macros/context/contrib/context-pocketdiary/VERSION
@@ -1 +1 @@
-2.5 \ No newline at end of file
+2023.03.17 \ No newline at end of file
diff --git a/macros/xetex/latex/xduts/README.md b/macros/xetex/latex/xduts/README.md
index df273cccab..60ee683f43 100644
--- a/macros/xetex/latex/xduts/README.md
+++ b/macros/xetex/latex/xduts/README.md
@@ -53,13 +53,17 @@ If you have installed LaTeX distribution locally, you can get the document class
### GitHub
-After completing the preparation, download this [repository](https://github.com/note286/xduts/archive/refs/heads/main.zip) and run the following commands in the downloaded folder to get the document class/package files and the documentation.
+After completing the preparation, download [this repository](https://github.com/note286/xduts/archive/refs/heads/main.zip) and run the following commands in the downloaded folder to get the document class/package files and the documentation.
```shell
xetex xduts.ins
l3build doc
```
+## Update
+
+To update, simply follow the [description above](#installation), which is the same as installation.
+
## Usage
Be sure to read the documentation (i.e., `xduts.pdf`) from the beginning in order to use XDUTS better.
diff --git a/macros/xetex/latex/xduts/xduts.dtx b/macros/xetex/latex/xduts/xduts.dtx
index 0a6743ee4e..46facdb403 100644
--- a/macros/xetex/latex/xduts/xduts.dtx
+++ b/macros/xetex/latex/xduts/xduts.dtx
@@ -1,7 +1,7 @@
% \iffalse
%<*driver>
\ProvidesFile{xduts.dtx}
-[2023/03/07 v6.1.2.0 Xidian University TeX Suite]
+[2023/03/23 v6.1.4.2 Xidian University TeX Suite]
%</driver>
%<class|sty>\NeedsTeXFormat{LaTeX2e}
%<class|sty>\RequirePackage{expl3}
@@ -9,7 +9,7 @@
%<xduugtp>\ProvidesExplClass{xduugtp}
%<xdupgthesis>\ProvidesExplClass{xdupgthesis}
%<xduugthesis>\ProvidesExplClass{xduugthesis}
-%<class|sty> {2023/03/07}{6.1.2.0}
+%<class|sty> {2023/03/23}{6.1.4.2}
%<xdufont> {Xidian University Font package}
%<xduugtp> {Xidian University Undergraduate Thesis Proposal class}
%<xdupgthesis> {Xidian University Postgraduate Thesis document class}
@@ -58,11 +58,12 @@
\DefTblrTemplate{caption-sep}{default}{\hskip.75em}
\DefTblrTemplate{conthead-text}{default}{\textbf{(续表)}}
\DefTblrTemplate{contfoot-text}{default}{\textbf{接下页}}
+\changes{v6.1.2.1}{2023/03/09}{修改文档交叉引用样式}
\changes{v4.4.5.1}{2023/02/11}{移除文档对xspace的依赖}
% 交叉引用
-\NewDocumentCommand{\secrefx}{m}{第\space\ref{#1}\space{}节}
-\NewDocumentCommand{\tabrefx}{O{}mO{\space}}{#1\tablename\space\ref{#2}#3}
-\NewDocumentCommand{\figrefx}{O{}mO{\space}}{#1\figurename\space\ref{#2}#3}
+\NewDocumentCommand{\secrefx}{m}{第\nobreakspace\ref{#1}\nobreakspace{}节}
+\NewDocumentCommand{\tabrefx}{mO{\space}}{表\nobreakspace\ref{#1}#2}
+\NewDocumentCommand{\figrefx}{mO{\space}}{图\nobreakspace\ref{#1}#2}
% 选项
\NewDocumentCommand{\optx}{O{\space}mO{\space}}{#1{\ttfamily\seqsplit{#2}}#3}
% \name LaTeX3控制序列
@@ -327,8 +328,8 @@ literate = {\$}{{\textcolor{purple3}{\$}}}{1}
% \subsection{\textsf{xdupgthesis}文档类}
% \clsx[]{xdupgthesis}文档类基于\clsx{ctexbook}文档类,
% 提供多种字体配置,部分样式可自定义,信息录入便捷。
-% 请在阅读《西安电子科技大学研究生学位论文模板(2015年修订版)-2019.03修订》后再使用\clsx{xdupgthesis}文档类。
-% 专业学位硕士请额外阅读《西安电子科技大学专业学位硕士学位论文封面及中英文题名页模板(2015年版)-2019.03修订》,
+% 请在阅读《西安电子科技大学研究生学位论文模板(2015年修订版)-2022.11修订》后再使用\clsx{xdupgthesis}文档类。
+% 专业学位硕士请额外阅读《西安电子科技大学专业学位硕士学位论文封面及中英文题名页模板(2015年版)-2022.11修订》,
% 撰写英文学位论文请额外阅读《西安电子科技大学英文学位论文撰写相关规定》。
% \par
% 使用\clsx{xdupgthesis}文档类的最小示例如下所示:
@@ -482,6 +483,7 @@ literate = {\$}{{\textcolor{purple3}{\$}}}{1}
% \end{function}
% \begin{optdesc}
% \item[adobe] \filex[]{adobesongstd-light.otf}[]、\filex[]{adobekaitistd-regular.otf}[]、\filex[]{adobeheitistd-regular.otf}和\filex{Adobe-Fangsong-Std-R-Font.otf}[]。
+% \item[fandol] \filex[]{FandolSong-Regular.otf}[]、\filex[]{FandolSong-Bold.otf}[]、\filex[]{FandolKai-Regular.otf}[]、\filex[]{FandolHei-Regular.otf}[]、\filex[]{FandolHei-Bold.otf}和\filex{FandolFang-Regular.otf}[]。
% \item[founder] \filex[]{FZShuSong-Z01.ttf}[]、\filex[]{FZKai-Z03.ttf}[]、\filex[]{FZHei-B01.ttf}和\filex{FZFSK.TTF}[]。
% \item[hanyi] \filex[]{HYShuSongErS.ttf}[]、\filex[]{HYKaiTiS.ttf}[]、\filex[]{HYZhongHeiTiS.ttf}和\filex{HYFangSongS.ttf}[]。
% \item[sinotype] \filex[]{STSONG.TTF}[]、\filex[]{STKAITI.TTF}[]、\filex[]{STXIHEI.TTF}[]、\filex[]{STHeiti.ttf}和\filex{STFANGSO.TTF}[]。
@@ -526,6 +528,7 @@ literate = {\$}{{\textcolor{purple3}{\$}}}{1}
% \end{syntax}
% 设置中文字体伪斜体倾斜程度。默认为\valuex{0.2}[]。
% \end{function}
+% \changes{v6.1.4.2}{2023/03/23}{补充TeX Live内置字体文件名}
% \changes{v5.4.0.1}{2023/02/23}{修正文档内英文字体配置表格错误}
% \begin{function}[added=2022-03-06,updated=2023-02-23]{style/latin-font}
% \begin{syntax}
@@ -534,11 +537,12 @@ literate = {\$}{{\textcolor{purple3}{\$}}}{1}
% 设置英文字体,具体配置见\tabrefx{tab:latin-font}[]。
% \end{function}
% \begin{optdesc}
+% \item[gyre] \filex[]{texgyretermes-regular.otf}[]、\filex[]{texgyretermes-bold.otf}[]、\filex[]{texgyretermes-italic.otf}[]、\filex[]{texgyretermes-bolditalic.otf}[]、\filex[]{texgyreheros-regular.otf}[]、\filex[]{texgyreheros-bold.otf}[]、\filex[]{texgyreheros-italic.otf}[]、\filex[]{texgyreheros-bolditalic.otf}[]、\filex[]{texgyrecursor-regular.otf}[]、\filex[]{texgyrecursor-bold.otf}[]、\filex[]{texgyrecursor-italic.otf}和\filex{texgyrecursor-bolditalic.otf}[]。
% \item[tac] \filex[]{times.ttf}[]、\filex[]{timesbd.ttf}[]、\filex[]{timesi.ttf}[]、\filex[]{timesbi.ttf}[]、\filex[]{arial.ttf}[]、\filex[]{arialbd.ttf}[]、\filex[]{ariali.ttf}[]、\filex[]{arialbi.ttf}[]、\filex[]{consola.ttf}[]、\filex[]{consolab.ttf}[]、\filex[]{consolai.ttf}和\filex{consolaz.ttf}[]。
% \item[tacn] \filex[]{times.ttf}[]、\filex[]{timesbd.ttf}[]、\filex[]{timesi.ttf}[]、\filex[]{timesbi.ttf}[]、\filex[]{arial.ttf}[]、\filex[]{arialbd.ttf}[]、\filex[]{ariali.ttf}[]、\filex[]{arialbi.ttf}[]、\filex[]{cour.ttf}[]、\filex[]{courbd.ttf}[]、\filex[]{couri.ttf}和\filex{courbi.ttf}[]。
-% \item[tcc] \filex[]{times.ttf}[]、\filex[]{timesbd.ttf}[]、\filex[]{timesi.ttf}和\filex{timesbi.ttf}[]。
+% \item[tcc] \filex[]{times.ttf}[]、\filex[]{timesbd.ttf}[]、\filex[]{timesi.ttf}[]、\filex[]{timesbi.ttf}[]、\filex[]{cmunss.otf}[]、\filex[]{cmunsx.otf}[]、\filex[]{cmunsi.otf}[]、\filex[]{cmunso.otf}[]、\filex[]{cmuntt.otf}[]、\filex[]{cmuntb.otf}[]、\filex[]{cmunit.otf}和\filex{cmuntx.otf}。
% \item[thcs] \filex[]{times.ttf}[]、\filex[]{timesbd.ttf}[]、\filex[]{timesi.ttf}[]、\filex[]{timesbi.ttf}[]、\filex[]{Helvetica.ttf}[]、\filex[]{Helvetica~Bold.ttf}[]、\filex[]{Helvetica~Oblique.ttf}[]、\filex[]{Helvetica~Bold~Oblique.ttf}[]、\filex[]{CourierStd.otf}[]、\filex[]{CourierStd-Bold.otf}[]、\filex[]{CourierStd-Oblique.otf}和\filex{CourierStd-BoldOblique.otf}[]。
-% \item[tll] \filex[]{times.ttf}[]、\filex[]{timesbd.ttf}[]、\filex[]{timesi.ttf}和\filex{timesbi.ttf}[]。
+% \item[tll] \filex[]{times.ttf}[]、\filex[]{timesbd.ttf}[]、\filex[]{timesi.ttf}[]、\filex[]{timesbi.ttf}[]、\filex[]{LinBiolinum_R.otf}[]、\filex[]{LinBiolinum_RB.otf}[]、\filex[]{LinBiolinum_RI.otf}[]、\filex[]{LinBiolinum_RBO.otf}[]、\filex[]{LinLibertine_M.otf}[]、\filex[]{LinLibertine_MB.otf}[]、\filex[]{LinLibertine_MO.otf}和\filex{LinLibertine_MBO.otf}。
% \item[none] 关闭内置英文字体配置,需自行配置英文字体。
% \end{optdesc}
% \changes{v2.16.1.1}{2022/11/27}{修改英文字体配置表文档样式}
@@ -1382,267 +1386,281 @@ literate = {\$}{{\textcolor{purple3}{\$}}}{1}
% \end{syntax}
% 设置作者简介文件路径,文件内容可参考\secrefx{作者简介配置}中的示例。
% \end{function}
+% \changes{v6.1.4.1}{2023/03/14}{更新研究生信息推荐值}
% \changes{v2.18.1.0}{2022/12/01}{增加专业博士信息录入推荐值来源}
% \changes{v2.12.2.1}{2022/11/20}{调整研究生信息推荐值展示样式}
% \changes{v1.26.11.2}{2022/06/18}{研究生信息推荐值}
% \subsubsection{研究生信息推荐值}
% \label{研究生信息推荐值}
% 以下研究生信息推荐值均来自
-% 《西安电子科技大学研究生学位论文模板(2015年修订版)-2019.03修订》、
-% 《西安电子科技大学专业学位硕士学位论文封面及中英文题名页模板(2015年版)-2019.03修订》和
-% 《西安电子科技大学专业学位博士学位论文封面及中英文题名页模板-2019.03》,
+% 《西安电子科技大学研究生学位论文模板(2015年修订版)-2022.11修订》、
+% 《西安电子科技大学专业学位硕士学位论文封面及中英文题名页模板(2015年版)-2022.11修订》和
+% 《西安电子科技大学专业学位博士学位论文封面及中英文题名页模板-2022.11》,
% 无任何修改,仅供参考。
% \setlength\parindent{0pt}
% \begin{itemize}
% \item \optx{degree} (学术硕士、学术博士)
% \par
-% 工学硕士,
-% 工学博士,
-% 哲学硕士,
-% 经济学硕士,
-% 法学硕士,
-% 教育学硕士,
-% 文学硕士,
-% 理学硕士,
-% 理学博士,
-% 军事学硕士,
-% 军事学博士,
-% 管理学硕士,
+% 工学硕士、
+% 工学博士、
+% 哲学硕士、
+% 经济学硕士、
+% 法学硕士、
+% 教育学硕士、
+% 文学硕士、
+% 理学硕士、
+% 理学博士、
+% 军事学硕士、
+% 军事学博士、
+% 管理学硕士、
% 管理学博士
% \item \optx{degree} (专业硕士)
% \par
-% 金融硕士,
-% 应用统计硕士,
-% 翻译硕士,
-% 工程硕士,
-% 工商管理硕士,
-% 公共管理硕士
+% 金融硕士、
+% 应用统计硕士、
+% 翻译硕士、
+% 电子信息硕士、
+% 机械硕士、
+% 材料与化工硕士、
+% 工商管理硕士、
+% 公共管理硕士、
+% 图书情报硕士、
+% 工程管理硕士、
+% 工程硕士
% \item \optx{degree} (专业博士)
% \par
+% 电子信息博士、
+% 机械博士、
% 工程博士
% \item \optx{degree*} (专业硕士)
% \par
-% Finance,
-% Applied Statistics,
-% Translation,
-% Engineering,
-% Business Administration,
-% Public Administration
+% Finance、
+% Applied Statistics、
+% Translation、
+% Electronic Information、
+% Machinery、
+% Material and Chemistry、
+% Business Administration、
+% Public Administration、
+% Engineering Administration、
+% Engineering
% \item \optx{degree*} (专业博士)
% \par
+% Electronic Information、
+% Machinery、
% Engineering
% \item \optx{department}
% \par
-% 通信工程学院,
-% 电子工程学院,
-% 计算机科学与技术学院,
-% 机电工程学院,
-% 物理与光电工程学院,
-% 经济与管理学院,
-% 数学与统计学院,
-% 微电子学院,
-% 外国语学院,
-% 生命科学技术学院,
-% 空间科学与技术学院,
-% 先进材料与纳米科技学院,
-% 网络与信息安全学院,
-% 人文学院,
-% 马克思主义学院,
-% 人工智能学院
+% 通信工程学院、
+% 电子工程学院、
+% 计算机科学与技术学院、
+% 机电工程学院、
+% 光电工程学院、
+% 物理学院、
+% 经济与管理学院、
+% 数学与统计学院、
+% 人文学院、
+% 外国语学院、
+% 微电子学院、
+% 生命科学技术学院、
+% 空间科学与技术学院、
+% 先进材料与纳米科技学院、
+% 网络与信息安全学院、
+% 马克思主义学院、
+% 人工智能学院、
+% 集成电路研究院
% \item \optx{major}
% \par
-% 哲学,
-% 应用经济学,
-% 马克思主义理论,
-% 教育学,
-% 体育学,
-% 外国语言文学,
-% 数学,
-% 物理学,
-% 统计学,
-% 力学,
-% 机械工程,
-% 光学工程,
-% 仪器科学与技术,
-% 材料科学与工程,
-% 电气工程,
-% 电子科学与技术,
-% 信息与通信工程,
-% 控制科学与工程,
-% 计算机科学与技术,
-% 化学工程与技术,
-% 交通运输工程,
-% 环境科学与工程,
-% 生物医学工程,
-% 软件工程,
-% 军队指挥学,
-% 管理科学与工程,
-% 工商管理,
-% 公共管理,
-% 图书情报与档案管理,
-% 网络空间安全
+% 哲学、
+% 应用经济学、
+% 马克思主义理论、
+% 体育学、
+% 外国语言文学、
+% 数学、
+% 物理学、
+% 统计学、
+% 力学、
+% 机械工程、
+% 光学工程、
+% 仪器科学与技术、
+% 材料科学与工程、
+% 电气工程、
+% 电子科学与技术、
+% 信息与通信工程、
+% 控制科学与工程、
+% 计算机科学与技术、
+% 交通运输工程、
+% 生物医学工程、
+% 软件工程、
+% 网络空间安全、
+% 军队指挥学、
+% 管理科学与工程、
+% 工商管理、
+% 图书情报与档案管理、
+% 集成电路科学与工程
% \item \optx{major*}
% \par
-% Philosophy,
-% Applied Economics,
-% Marxist Theory,
-% Education Science,
-% Science of Physical Culture and Sports,
-% Foreign Languages and Literature,
-% Mathematics,
-% Physics,
-% Statistics,
-% Mechanics,
-% Mechanical Engineering,
-% Optical Engineering,
-% Instrument Science and Technology,
-% Materials Science and Engineering,
-% Electrical Engineering,
-% Electronics Science and Technology,
-% Information and Communications Engineering,
-% Control Science and Engineering,
-% Computer Science and Technology,
-% Chemical Engineering and Technology,
-% Communication and Transportation Engineering,
-% Environmental Science and Engineering,
-% Biomedical Engineering,
-% Software Engineering,
-% Science of Command,
-% Management Science and Engineering,
-% Business Administration,
-% Public Management,
-% Science of Library, Information and Archival,
-% Cyber Security
+% Philosophy、
+% Applied Economics、
+% Marxist Theory、
+% Sports Science、
+% Foreign Languages and Literature、
+% Mathematics、
+% Physics、
+% Statistics、
+% Mechanics、
+% Mechanical Engineering、
+% Optical Engineering、
+% Instrument Science and Technology、
+% Materials Science and Engineering、
+% Electrical Engineering、
+% Electronics Science and Technology、
+% Information and Communications Engineering、
+% Control Science and Engineering、
+% Computer Science and Technology、
+% Communication and Transportation Engineering、
+% Biomedical Engineering、
+% Software Engineering、
+% Cyber Security、
+% Military Command Science、
+% Management Science and Engineering、
+% Business Administration、
+% Science of Library, Information and Archival
% \item \optx{sub-major}
% \par
-% 美学,
-% 宗教学,
-% 国民经济学,
-% 金融学,
-% 产业经济学,
-% 马克思主义基本原理,
-% 思想政治教育,
-% 高等教育学,
-% 教育技术学,
-% 教育哲学,
-% 体育教育训练学,
-% 英语语言文学,
-% 外国语言学及应用语言学,
-% 计算数学,
-% 概率论与数理统计,
-% 应用数学,
-% 运筹学与控制论,
-% 等离子体物理,
-% 凝聚态物理,
-% 光学,
-% 无线电物理,
-% 统计学,
-% 工程力学,
-% 机械制造及其自动化,
-% 机械电子工程,
-% 机械设计及理论,
-% 电子机械科学与技术,
-% 工业设计,
-% 光学工程,
-% 精密仪器及机械,
-% 测试计量技术及仪器,
-% 材料物理与化学,
-% 材料学,
-% 电机与电器,
-% 电力电子与电力传动,
-% 物理电子学,
-% 电路与系统,
-% 微电子学与固体电子学,
-% 电磁场与微波技术,
-% 信息对抗技术,
-% 集成电路系统设计,
-% 通信与信息系统,
-% 信号与信息处理,
-% 智能信息处理,
-% 空间信息科学与技术,
-% 控制理论与控制工程,
-% 检测技术与自动化装置,
-% 系统工程,
-% 模式识别与智能系统,
-% 导航、制导与控制,
-% 计算机系统结构,
-% 计算机软件与理论,
-% 计算机应用技术,
-% 应用化学,
-% 交通信息工程及控制,
-% 环境科学,
-% 环境工程,
-% 生物医学工程,
-% 生物材料与细胞工程,
-% 软件工程,
-% 软件工程技术,
-% 军事通信学,
-% 密码学,
-% 管理科学与工程,
-% 管理哲学,
-% 会计学,
-% 企业管理,
-% 技术经济及管理,
-% 行政管理,
-% 图书馆学,
-% 情报学,
-% 光通信,
-% 信息安全,
-% 生物信息科学与技术,
-% 机器人技术,
-% 遥感信息科学与技术,
-% 空间科学与技术,
-% 马克思主义中国化研究,
-% 外国文学,
-% 翻译学,
-% 基础数学,
-% 流体力学,
-% 固体力学,
-% 智能机电系统及测控技术,
-% 空间科学仪器与电磁实验技术,
-% 飞行器测控与导航制导,
+% 美学、
+% 宗教学、
+% 国民经济学、
+% 金融学、
+% 产业经济学、
+% 马克思主义基本原理、
+% 思想政治教育、
+% 体育教育训练学、
+% 英语语言文学、
+% 外国语言学及应用语言学、
+% 计算数学、
+% 概率论与数理统计、
+% 应用数学、
+% 运筹学与控制论、
+% 等离子体物理、
+% 凝聚态物理、
+% 光学、
+% 无线电物理、
+% 统计学、
+% 工程力学、
+% 机械制造及其自动化、
+% 机械电子工程、
+% 机械设计及理论、
+% 电子机械科学与技术、
+% 工业设计、
+% 光学工程、
+% 精密仪器及机械、
+% 测试计量技术及仪器、
+% 材料物理与化学、
+% 材料学、
+% 电机与电器、
+% 电力电子与电力传动、
+% 物理电子学、
+% 电路与系统、
+% 微电子学与固体电子学、
+% 电磁场与微波技术、
+% 信息对抗技术、
+% 集成电路系统设计、
+% 通信与信息系统、
+% 信号与信息处理、
+% 智能信息处理、
+% 空间信息科学与技术、
+% 控制理论与控制工程、
+% 检测技术与自动化装置、
+% 系统工程、
+% 模式识别与智能系统、
+% 导航、制导与控制、
+% 计算机系统结构、
+% 计算机软件与理论、
+% 计算机应用技术、
+% 交通信息工程及控制、
+% 生物医学工程、
+% 生物材料与细胞工程、
+% 软件工程、
+% 软件工程技术、
+% 军事通信学、
+% 密码学、
+% 管理科学与工程、
+% 管理哲学、
+% 会计学、
+% 企业管理、
+% 技术经济及管理、
+% 图书馆学、
+% 情报学、
+% 光通信、
+% 信息安全、
+% 生物信息科学与技术、
+% 机器人技术、
+% 遥感信息科学与技术、
+% 空间科学与技术、
+% 马克思主义中国化研究、
+% 外国文学、
+% 翻译学、
+% 基础数学、
+% 流体力学、
+% 固体力学、
+% 智能机电系统及测控技术、
+% 空间科学仪器与电磁实验技术、
+% 飞行器测控与导航制导、
% 智能检测与新型传感器
% \item \optx{domain} (专业硕士)
% \par
-% 金融,
-% 应用统计,
-% 英语笔译,
-% 机械工程,
-% 光学工程,
-% 仪器仪表工程,
-% 材料工程,
-% 电子与通信工程,
-% 集成电路工程,
-% 控制工程,
-% 计算机技术,
-% 软件工程,
-% 生物医学工程,
-% 航天工程,
-% 项目管理,
-% 物流工程,
-% 工商管理,
-% 公共管理
+% 金融、
+% 应用统计、
+% 英语笔译、
+% 新一代电子信息技术(含量子技术等)、
+% 通信工程(含宽带网络、移动通信等)、
+% 集成电路工程、
+% 计算机技术、
+% 软件工程、
+% 控制工程、
+% 仪器仪表工程、
+% 光电信息工程、
+% 生物医学工程、
+% 人工智能、
+% 网络与信息安全、
+% 机械、
+% 材料与化工、
+% 工商管理、
+% 公共管理、
+% 图书情报、
+% 工程管理、
+% 物流工程与管理、
+% 机械工程、
+% 光学工程、
+% 材料工程、
+% 电子与通信工程、
+% 航天工程、
+% 项目管理、
+% 物流工程
% \item \optx{domain} (专业博士)
% \par
-% 电子与信息,
-% 先进制造
+% 电子与信息、
+% 先进制造、
+% 电子信息、
+% 机械
% \item \optx{supv-title}
% \par
-% 教授,
+% 教授、
% 副教授
% \item \optx{supv-title*}
% \par
-% Professor,
+% Professor、
% Associate Professor
% \item \optx{supv-ent-title}
% \par
-% 研究员,
-% 副研究员,
+% 研究员、
+% 副研究员、
% 高工
% \item \optx{supv-ent-title*}
% \par
-% Research Fellow,
-% Associate Research Fellow,
+% Research Fellow、
+% Associate Research Fellow、
% Senior Engineer
% \end{itemize}
% \setlength\parindent{2em}
@@ -7752,14 +7770,21 @@ literate = {\$}{{\textcolor{purple3}{\$}}}{1}
subsection / indent = { \l_@@_bio_indent_dim }
}
% \end{macrocode}
+% \changes{v6.1.3.0}{2023/03/13}{修复研究生学位论文作者简介书签深度}
% \changes{v4.4.3.0}{2023/02/09}{修复研究生学位论文书签深度}
% 作者简介文件。
% \begin{macrocode}
\addtocontents { toc } { \protect \setcounter { tocdepth } { 0 } }
+ \setcounter { tocdepth } { 0 }
\file_if_exist_input:n { \l_@@_bio_str }
\addtocontents { toc } { \protect \setcounter { tocdepth } { 2 } }
+ \setcounter { tocdepth } { 2 }
\group_end:
}
+% \end{macrocode}
+% \changes{v6.1.4.0}{2023/03/13}{修复研究生学位论文尾页缺失}
+% \begin{macrocode}
+ \cleardoublepage
}
% \end{macrocode}
% \end{macro}
diff --git a/macros/xetex/latex/xduts/xduts.pdf b/macros/xetex/latex/xduts/xduts.pdf
index 93cc563f14..2c00b10737 100644
--- a/macros/xetex/latex/xduts/xduts.pdf
+++ b/macros/xetex/latex/xduts/xduts.pdf
Binary files differ