From 54592d609e44d5cff9e5d940befbcb3330d92b10 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sun, 17 Oct 2021 03:01:02 +0000 Subject: CTAN sync 202110170301 --- macros/context/contrib/context-filter/VERSION | 2 +- .../tex/context/third/filter/t-filter.mkiv | 10 +- .../tex/context/third/filter/t-filter.mkxl | 10 +- .../context/third/filter/t-module-catcodes.mkiv | 40 +- macros/context/contrib/context-letter/VERSION | 2 +- .../tex/context/third/letter/base/s-cor-00.lua | 83 -- .../tex/context/third/letter/base/s-cor-00.mkii | 678 --------------- .../tex/context/third/letter/base/s-cor-00.mkvi | 18 +- .../tex/context/third/letter/base/s-cor-01.mkii | 916 --------------------- .../tex/context/third/letter/base/s-cor-01.mkvi | 11 +- .../tex/context/third/letter/base/s-cor-02.mkii | 428 ---------- .../tex/context/third/letter/base/s-cor-02.mkvi | 5 +- .../tex/context/third/letter/base/s-cor-03.mkvi | 1 - .../tex/context/third/letter/base/t-letter.mkii | 30 - .../tex/context/third/letter/base/t-letter.mkiv | 66 -- .../tex/context/third/letter/base/t-memo.mkii | 30 - .../tex/context/third/letter/base/t-memo.mkiv | 66 -- .../third/letter/style/letter-imp-blockstyle.mkii | 62 -- .../third/letter/style/letter-imp-default.mkii | 133 --- .../third/letter/style/letter-imp-dina.mkii | 52 -- .../third/letter/style/letter-imp-dinb.mkii | 139 ---- .../third/letter/style/letter-imp-dutch.mkii | 79 -- .../third/letter/style/letter-imp-french.mkii | 94 --- .../third/letter/style/letter-imp-fullblock.mkii | 52 -- .../third/letter/style/letter-imp-gbrief.mkii | 56 -- .../third/letter/style/letter-imp-hanging.mkii | 61 -- .../third/letter/style/letter-imp-knuth.mkii | 71 -- .../third/letter/style/letter-imp-modified.mkii | 56 -- .../third/letter/style/letter-imp-semiblock.mkii | 57 -- .../third/letter/style/letter-imp-setups.mkii | 62 -- .../third/letter/style/letter-imp-simplified.mkii | 65 -- .../third/letter/style/letter-imp-swiss.mkii | 54 -- .../third/letter/style/letter-imp-swissleft.mkii | 58 -- .../third/letter/style/memo-imp-default.mkii | 96 --- .../third/letter/style/memo-imp-margin.mkii | 55 -- .../context/third/letter/style/memo-imp-memo.mkii | 55 -- .../context/third/letter/style/memo-imp-table.mkii | 51 -- macros/latex/contrib/easybook/easybook.dtx | 8 +- macros/latex/contrib/easybook/easybook.pdf | Bin 576732 -> 576755 bytes macros/latex/contrib/easybook/easybook.tex | 14 +- macros/latex/contrib/pkuthss/doc/example.pdf | Bin 95861 -> 102629 bytes .../contrib/pkuthss/doc/example/chap/copy.tex | 4 +- .../contrib/pkuthss/doc/example/chap/origin.tex | 4 +- .../latex/contrib/pkuthss/doc/example/thesis.tex | 13 +- macros/latex/contrib/pkuthss/doc/pkuthss.pdf | Bin 325590 -> 326524 bytes .../latex/contrib/pkuthss/doc/readme/ChangeLog.txt | 19 +- .../pkuthss/doc/readme/chap/pkuthss-chap1.tex | 2 +- .../pkuthss/doc/readme/chap/pkuthss-chap2.tex | 18 +- .../pkuthss/doc/readme/chap/pkuthss-chap3.tex | 6 + .../pkuthss/doc/readme/pkuthss-english.patch | 51 +- .../latex/contrib/pkuthss/doc/readme/pkuthss.tex | 9 +- macros/latex/contrib/pkuthss/tex/pkulogo.eps | 1 + macros/latex/contrib/pkuthss/tex/pkulogo.pdf | Bin 3530 -> 3530 bytes macros/latex/contrib/pkuthss/tex/pkuthss-gbk.def | 9 +- macros/latex/contrib/pkuthss/tex/pkuthss-utf8.def | 9 +- macros/latex/contrib/pkuthss/tex/pkuthss.cls | 23 +- macros/latex/contrib/pkuthss/tex/pkuthss.def | 57 ++ macros/latex/contrib/pkuthss/tex/pkuword.eps | 1 + macros/latex/contrib/pkuthss/tex/pkuword.pdf | Bin 6280 -> 6280 bytes macros/latex/contrib/projlib/ProjLib-doc-cn.pdf | Bin 319918 -> 319844 bytes macros/latex/contrib/projlib/ProjLib-doc-en.pdf | Bin 199267 -> 199135 bytes macros/latex/contrib/projlib/ProjLib-doc-fr.pdf | Bin 200190 -> 200073 bytes macros/latex/contrib/projlib/ProjLib-doc.dtx | 12 +- macros/latex/contrib/projlib/ProjLib.dtx | 51 +- macros/latex/contrib/spbmark/spbmark.pdf | Bin 66119 -> 66032 bytes macros/latex/contrib/spbmark/spbmark.sty | 10 +- macros/latex/contrib/spbmark/spbmark.tex | 6 +- 67 files changed, 254 insertions(+), 3877 deletions(-) delete mode 100644 macros/context/contrib/context-letter/tex/context/third/letter/base/s-cor-00.mkii delete mode 100644 macros/context/contrib/context-letter/tex/context/third/letter/base/s-cor-01.mkii delete mode 100644 macros/context/contrib/context-letter/tex/context/third/letter/base/s-cor-02.mkii delete mode 100644 macros/context/contrib/context-letter/tex/context/third/letter/base/t-letter.mkii delete mode 100644 macros/context/contrib/context-letter/tex/context/third/letter/base/t-letter.mkiv delete mode 100644 macros/context/contrib/context-letter/tex/context/third/letter/base/t-memo.mkii delete mode 100644 macros/context/contrib/context-letter/tex/context/third/letter/base/t-memo.mkiv delete mode 100644 macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-blockstyle.mkii delete mode 100644 macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-default.mkii delete mode 100644 macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-dina.mkii delete mode 100644 macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-dinb.mkii delete mode 100644 macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-dutch.mkii delete mode 100644 macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-french.mkii delete mode 100644 macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-fullblock.mkii delete mode 100644 macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-gbrief.mkii delete mode 100644 macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-hanging.mkii delete mode 100644 macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-knuth.mkii delete mode 100644 macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-modified.mkii delete mode 100644 macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-semiblock.mkii delete mode 100644 macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-setups.mkii delete mode 100644 macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-simplified.mkii delete mode 100644 macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-swiss.mkii delete mode 100644 macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-swissleft.mkii delete mode 100644 macros/context/contrib/context-letter/tex/context/third/letter/style/memo-imp-default.mkii delete mode 100644 macros/context/contrib/context-letter/tex/context/third/letter/style/memo-imp-margin.mkii delete mode 100644 macros/context/contrib/context-letter/tex/context/third/letter/style/memo-imp-memo.mkii delete mode 100644 macros/context/contrib/context-letter/tex/context/third/letter/style/memo-imp-table.mkii create mode 100644 macros/latex/contrib/pkuthss/tex/pkuthss.def (limited to 'macros') diff --git a/macros/context/contrib/context-filter/VERSION b/macros/context/contrib/context-filter/VERSION index 1664ef53fc..d937151b16 100644 --- a/macros/context/contrib/context-filter/VERSION +++ b/macros/context/contrib/context-filter/VERSION @@ -1 +1 @@ -2021.09.05 +2021.10.15 diff --git a/macros/context/contrib/context-filter/tex/context/third/filter/t-filter.mkiv b/macros/context/contrib/context-filter/tex/context/third/filter/t-filter.mkiv index fee0c31bc5..d8ddbe806c 100644 --- a/macros/context/contrib/context-filter/tex/context/third/filter/t-filter.mkiv +++ b/macros/context/contrib/context-filter/tex/context/third/filter/t-filter.mkiv @@ -1,6 +1,6 @@ %D \module %D [ file=t-filter, -%D version=2021.09.05, +%D version=2021.10.15, %D title=\CONTEXT\ User Module, %D subtitle=Filter, %D author=Aditya Mahajan, @@ -9,11 +9,11 @@ %D email=adityam ieee org, %D license=Simplified BSD License] -\writestatus{loading}{Filter (ver: 2021.09.05)} +\writestatus{loading}{Filter (ver: 2021.10.15)} \startmodule [filter] \usemodule [module-catcodes] -\unprotect +\unprotectmodulecatcodes % \f!temporaryextension was removed from the core in July 2012. \ifx\f!temporaryextension\undefined \def\f!temporaryextension{tmp} \fi @@ -164,7 +164,7 @@ \edef\externalfilter@input_file{\externalfilter@any_filename{#3}} \splitfilename{#3} %NOTE: \edef doesn not work because \splitoffbase is not expandable - \def\externalfilter@base_file {\splitoffbase} + \def\externalfilter@base_file {\splitoffbase-\splitofftype} % The output is always in the directory specified by % \c!directory; even if the input is from some other directory @@ -546,5 +546,5 @@ \def\externalfilter@input_file {} \def\externalfilter@output_file{} -\protect +\protectmodulecatcodes \stopmodule diff --git a/macros/context/contrib/context-filter/tex/context/third/filter/t-filter.mkxl b/macros/context/contrib/context-filter/tex/context/third/filter/t-filter.mkxl index 3d27c469bc..ccb464dc78 100644 --- a/macros/context/contrib/context-filter/tex/context/third/filter/t-filter.mkxl +++ b/macros/context/contrib/context-filter/tex/context/third/filter/t-filter.mkxl @@ -1,6 +1,6 @@ %D \module %D [ file=t-filter, -%D version=2021.08.24, +%D version=2021.10.15, %D title=\CONTEXT\ User Module, %D subtitle=Filter, %D author=Aditya Mahajan, @@ -9,11 +9,11 @@ %D email=adityam ieee org, %D license=Simplified BSD License] -\writestatus{loading}{Filter (ver: 2021.08.24)} +\writestatus{loading}{Filter (ver: 2021.10.15)} \startmodule [filter] \usemodule [module-catcodes] -\unprotect +\unprotectmodulecatcodes % \f!temporaryextension was removed from the core in July 2012. \ifx\f!temporaryextension\undefined \def\f!temporaryextension{tmp} \fi @@ -164,7 +164,7 @@ \edef\externalfilter@input_file{\externalfilter@any_filename{#3}} \splitfilename{#3} %NOTE: \edef doesn not work because \splitoffbase is not expandable - \def\externalfilter@base_file {\splitoffbase} + \def\externalfilter@base_file {\splitoffbase-\splitofftype} % The output is always in the directory specified by % \c!directory; even if the input is from some other directory @@ -549,5 +549,5 @@ \def\externalfilter@input_file {} \def\externalfilter@output_file{} -\protect +\protectmodulecatcodes \stopmodule diff --git a/macros/context/contrib/context-filter/tex/context/third/filter/t-module-catcodes.mkiv b/macros/context/contrib/context-filter/tex/context/third/filter/t-module-catcodes.mkiv index 60e25cc05e..517fd3ed70 100644 --- a/macros/context/contrib/context-filter/tex/context/third/filter/t-module-catcodes.mkiv +++ b/macros/context/contrib/context-filter/tex/context/third/filter/t-module-catcodes.mkiv @@ -20,26 +20,26 @@ \newcatcodetable \modulecatcodes \startcatcodetable \modulecatcodes % same as \prtcatcodes - \catcode\tabasciicode \spacecatcode - \catcode\endoflineasciicode \endoflinecatcode - \catcode\formfeedasciicode \endoflinecatcode - \catcode\spaceasciicode \spacecatcode - \catcode\endoffileasciicode \ignorecatcode - \catcode\circumflexasciicode\superscriptcatcode -% \catcode\underscoreasciicode\subscriptcatcode - \catcode\underscoreasciicode\lettercatcode - \catcode\ampersandasciicode \alignmentcatcode - \catcode\backslashasciicode \escapecatcode - \catcode\leftbraceasciicode \begingroupcatcode - \catcode\rightbraceasciicode\endgroupcatcode - \catcode\dollarasciicode \mathshiftcatcode - \catcode\hashasciicode \parametercatcode - \catcode\commentasciicode \commentcatcode - \catcode`\@ \lettercatcode - \catcode`\! \lettercatcode - \catcode`\? \lettercatcode - \catcode\tildeasciicode \activecatcode - \catcode\barasciicode \activecatcode + \catcode\tabasciicode \spacecatcode + \catcode\endoflineasciicode \endoflinecatcode + \catcode\formfeedasciicode \endoflinecatcode + \catcode\spaceasciicode \spacecatcode + \catcode\endoffileasciicode \ignorecatcode + \catcode\circumflexasciicode \superscriptcatcode + %catcode\underscoreasciicode \subscriptcatcode + \catcode\underscoreasciicode \lettercatcode + \catcode\ampersandasciicode \alignmentcatcode + \catcode\backslashasciicode \escapecatcode + \catcode\leftbraceasciicode \begingroupcatcode + \catcode\rightbraceasciicode \endgroupcatcode + \catcode\dollarasciicode \mathshiftcatcode + \catcode\hashasciicode \parametercatcode + \catcode\commentasciicode \commentcatcode + \catcode\atsignasciicode \lettercatcode + \catcode\exclamationmarkasciicode \lettercatcode + \catcode\questionmarkasciicode \lettercatcode + \catcode\tildeasciicode \activecatcode + \catcode\barasciicode \activecatcode \stopcatcodetable \def\unprotectmodulecatcodes diff --git a/macros/context/contrib/context-letter/VERSION b/macros/context/contrib/context-letter/VERSION index c7be130321..7b9730a1d0 100644 --- a/macros/context/contrib/context-letter/VERSION +++ b/macros/context/contrib/context-letter/VERSION @@ -1 +1 @@ -2020.08.07 +2021.10.16 diff --git a/macros/context/contrib/context-letter/tex/context/third/letter/base/s-cor-00.lua b/macros/context/contrib/context-letter/tex/context/third/letter/base/s-cor-00.lua index e6cd72264d..1f81afcbb1 100644 --- a/macros/context/contrib/context-letter/tex/context/third/letter/base/s-cor-00.lua +++ b/macros/context/contrib/context-letter/tex/context/third/letter/base/s-cor-00.lua @@ -43,26 +43,6 @@ local v_text = variables.text local v_start = variables.start local v_list = variables.list --- list for the elements to be shown - -correspondence.data = { } - -function correspondence.elements_define(environment,name,list) - local index = concat({environment,name},":") - local list = settings_to_array(list) - correspondence.data[index] = list -end - -function correspondence.elements_access(environment,name) - local index = concat({environment,name},":") - local list = correspondence.data[index] - local entries = "" - if list and list ~= "" then - entries = concat(list,",") - end - context(entries) -end - -- create synonyms for the default styles local patterns = { @@ -92,69 +72,6 @@ function correspondence.file(environment,name) } end --- moved from TeX to Lua because it’s easier with the lists for the sections and layers - -function correspondence.place(environment,settings) - local bodyfont = settings.bodyfont - local whitespace = settings.whitespace - local interlinespace = settings.interlinespace - local language = settings.language - local backgroundcolor = settings.backgroundcolor - context.unprotect() - context(toks.t_correspondence_before) - context.page() - -- page layout is controlled with the \setup…layout commands - context.setuplayout{ method = v_correspondence } - -- disable headers and footers - context.setupheader{ state = v_stop } - context.setupfooter{ state = v_stop } - -- required for the manual, manual changes for the elements can be done with the “style” key - if bodyfont ~= "" then - context.setupbodyfont{bodyfont} - end - -- can be moved to the section elements because it’s only usefull for the content - if whitespace ~= "" then - context.setupwhitespace{whitespace} - end - -- feature - if interlinespace ~= "" then - context.setupinterlinespace{interlinespace} - end - -- I prefer to set this with \setup…options - if language ~= "" then - context.mainlanguage{language} - end - -- colored background is behind all other layers - if backgroundcolor ~= "" then - context.setupbackgrounds({ v_paper },{ background = v_color, backgroundcolor = backgroundcolor }) - end - -- layers - local layer = { } - for index, element in next, correspondence.data[concat({environment,v_layer},":")] or { } do - layer[index] = concat({environment,element},":") - end - local overlays = { - "correspondence:backgroundimage", - "correspondence:background", - concat(layer,","), - } - context.setupbackgrounds({ v_page },{ background = concat(overlays,",") }) - -- letters are always singlesided because the layout controlled by the module - context.setuppagenumbering{ alternative = v_singlesided, location = "" } - context.setupsubpagenumber{ way = v_text, state = v_start } - context.resetsubpagenumber() - -- sections - for _, element in next, correspondence.data[concat({environment,v_section},":")] or { } do - context.correspondence_section_place({environment},{element}) - end - context.page() - context.resetsubpagenumber() - -- make sure the normal layout is restored - context.setuplayout{v_reset} - context(toks.t_correspondence_after) - context.protect() -end - correspondence.letter = { } local function reference_a(environment,value) diff --git a/macros/context/contrib/context-letter/tex/context/third/letter/base/s-cor-00.mkii b/macros/context/contrib/context-letter/tex/context/third/letter/base/s-cor-00.mkii deleted file mode 100644 index 214ce25928..0000000000 --- a/macros/context/contrib/context-letter/tex/context/third/letter/base/s-cor-00.mkii +++ /dev/null @@ -1,678 +0,0 @@ -%D \module -%D [ file=s-cor-00, -%D version=2012.06.10, -%D title=\CONTEXT\ User Module, -%D subtitle=Correspondence, -%D author=Wolfgang Schuster, -%D date=\currentdate, -%D copyright=Wolfgang Schuster, -%D license=GNU General Public License] - -%C Copyright (C) 2011 Wolfgang Schuster -%C -%C This program is free software: you can redistribute it and/or modify -%C it under the terms of the GNU General Public License as published by -%C the Free Software Foundation, either version 3 of the License, or -%C (at your option) any later version. -%C -%C This program is distributed in the hope that it will be useful, -%C but WITHOUT ANY WARRANTY; without even the implied warranty of -%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -%C GNU General Public License for more details. -%C -%C You should have received a copy of the GNU General Public License -%C along with this program. If not, see . - -\unprotect - -% Constants and variables - -\startinterface all - \setinterfaceconstant {whitespace} {whitespace} - \setinterfaceconstant {backgroundimage} {backgroundimage} - \setinterfaceconstant {fromname} {fromname} - \setinterfaceconstant {fromaddress} {fromaddress} - \setinterfaceconstant {attention} {attention} - \setinterfaceconstant {subject} {subject} - \setinterfaceconstant {closing} {closing} - \setinterfaceconstant {signature} {signature} - \setinterfaceconstant {copy} {copy} - \setinterfaceconstant {enclosure} {enclosure} - \setinterfaceconstant {postscript} {postscript} - \setinterfaceconstant {dispatch} {dispatch} - \setinterfaceconstant {toname} {toname} - \setinterfaceconstant {toaddress} {toaddress} - \setinterfaceconstant {backaddress} {backaddress} - \setinterfaceconstant {opening} {opening} - \setinterfaceconstant {fromphone} {fromphone} - \setinterfaceconstant {fromfax} {fromfax} - \setinterfaceconstant {frommail} {frommail} - \setinterfaceconstant {fromurl} {fromurl} - \setinterfaceconstant {salutation} {salutation} - \setinterfaceconstant {language} {language} - \setinterfaceconstant {street} {street} - \setinterfaceconstant {city} {city} - \setinterfaceconstant {phone} {phone} - \setinterfaceconstant {email} {email} - \setinterfaceconstant {bankname} {bankname} - \setinterfaceconstant {banknumber} {banknumber} - \setinterfaceconstant {accountnumber} {accountnumber} - \setinterfaceconstant {room} {room} - \setinterfaceconstant {yourref} {yourref} - \setinterfaceconstant {yourmail} {yourmail} - \setinterfaceconstant {myref} {myref} - \setinterfaceconstant {mymail} {mymail} - \setinterfaceconstant {customer} {customer} - \setinterfaceconstant {invoice} {invoice} - \setinterfaceconstant {fax} {fax} - \setinterfaceconstant {url} {url} - \setinterfaceconstant {bank} {bank} - \setinterfaceconstant {organization} {organization} - \setinterfaceconstant {zip} {zip} - \setinterfaceconstant {country} {country} -\stopinterface - -\startinterface all - % all - \setinterfacevariable {correspondence} {correspondence} - \setinterfacevariable {nexthead} {nexthead} - \setinterfacevariable {lefthead} {lefthead} - \setinterfacevariable {righthead} {righthead} - \setinterfacevariable {foot} {foot} - \setinterfacevariable {nextfoot} {nextfoot} - \setinterfacevariable {leftfoot} {leftfoot} - \setinterfacevariable {rightfoot} {rightfoot} - \setinterfacevariable {topmark} {topmark} - \setinterfacevariable {botmark} {botmark} - \setinterfacevariable {cutmark} {cutmark} - \setinterfacevariable {endmark} {endmark} - \setinterfacevariable {usermark} {usermark} - % letter - \setinterfacevariable {lettermain} {lettermain} - \setinterfacevariable {letternext} {letternext} - \setinterfacevariable {letter} {letter} - \setinterfacevariable {address} {address} - \setinterfacevariable {backaddress} {backaddress} - \setinterfacevariable {location} {location} - \setinterfacevariable {opening} {opening} - \setinterfacevariable {closing} {closing} - \setinterfacevariable {secondpage} {secondpage} - \setinterfacevariable {copy} {copy} - \setinterfacevariable {enclosure} {enclosure} - \setinterfacevariable {french} {french} - \setinterfacevariable {specialnotation} {specialnotation} - \setinterfacevariable {e} {e} - \setinterfacevariable {place} {place} - \setinterfacevariable {gbrief} {gbrief} - \setinterfacevariable {fullblock} {fullblock} - \setinterfacevariable {semiblock} {semiblock} - \setinterfacevariable {simplified} {simplified} - \setinterfacevariable {modified} {modified} - \setinterfacevariable {blockstyle} {blockstyle} - \setinterfacevariable {knuth} {knuth} - % memo - \setinterfacevariable {memo} {memo} - \setinterfacevariable {memomain} {memomain} - \setinterfacevariable {memonext} {memonext} -\stopinterface - -% Messages - -\definemessageconstant {correspondence} - -\startinterface all - \setinterfacemessage{correspondence}{title}{correspondence} - \setinterfacemessage{correspondence}{1} {Undefined layer '--' for the '--' environment} - \setinterfacemessage{correspondence}{2} {Undefined section '--' for the '--' environment} - \setinterfacemessage{correspondence}{3} {Undefined description '--' for the '--' environment} -\stopinterface - -% Namespaces - -\def\????correspondence {@@@@correspondence} -\def\????correspondencebuffer {@@@@correspondencebuffer} -\def\????correspondencelayer {@@@@correspondencelayer} -\def\????correspondencelayerstate {@@@@correspondencelayerstate} -\def\????correspondenceframe {@@@@correspondenceframe} -\def\????correspondencesection {@@@@correspondencesection} -\def\????correspondenceoption {@@@@correspondenceoption} -\def\????correspondencedescription {@@@@correspondencedescription} -\def\????correspondencedescriptionlocation {@@@@correspondencedescriptionlocation} -\def\????correspondencestyle {@@@@correspondencestyle} -\def\????correspondenceelement {@@@@correspondenceelement} -\def\????correspondencelayout {@@@@correspondencelayout} - -% Environment - -\newtoks\everydefinecorrespondence - -\unexpanded\def\startcorrespondence[#1]% - {\starttext - \begingroup - \def\currentcorrespondence{#1}% - \dosingleempty\dostartcorrespondence} - -\def\dostartcorrespondence[#1]% - {\iffirstargument - \setupcurrentcorrespondence[#1]% - \fi - \dostartbuffer[\????correspondencebuffer\currentcorrespondence][\e!start\currentcorrespondence][\e!stop\currentcorrespondence]} - -\unexpanded\def\stopcorrespondence[#1]% - {\placecorrespondence[#1]% - \endgroup - \stoptext} - -\appendtoks - \normalprotected\expandafter\edef\csname\e!start\currentcorrespondence\endcsname{\startcorrespondence[\currentcorrespondence]}% - \normalprotected\expandafter\edef\csname\e!stop \currentcorrespondence\endcsname{\stopcorrespondence [\currentcorrespondence]}% -\to \everydefinecorrespondence - -\unexpanded\def\startcorrespondencecontent[#1]% - {\begingroup - \def\currentcorrespondence{#1}% - \dostartbuffer[\????correspondencebuffer\currentcorrespondence][\e!start\currentcorrespondence\v!content][\e!stop\currentcorrespondence\v!content]} - -\unexpanded\def\stopcorrespondencecontent[#1]% - {\endgroup} - -\appendtoks - \normalprotected\expandafter\edef\csname\e!start\currentcorrespondence\v!content\endcsname{\startcorrespondencecontent[\currentcorrespondence]}% - \normalprotected\expandafter\edef\csname\e!stop \currentcorrespondence\v!content\endcsname{\stopcorrespondencecontent [\currentcorrespondence]}% -\to \everydefinecorrespondence - -\unexpanded\def\correspondenceparameters#1#2#3% - {\def\currentcorrespondenceelement {#1:#2}% - \def\currentcorrespondencecontent {#1:#3:#2}% - \let\currentcorrespondencelayer \currentcorrespondenceelement - \let\currentcorrespondenceframe \currentcorrespondenceelement - \let\currentcorrespondencesection \currentcorrespondenceelement - \let\currentcorrespondencedescription\currentcorrespondenceelement} - -\unexpanded\def\definecorrespondence[#1]% - {\def\currentcorrespondence{#1}% - \the\everydefinecorrespondence} - -% Setup - -\def\correspondenceparameter - {\namedcorrespondenceparameter\currentcorrespondence} - -\def\namedcorrespondenceparameter#1#2% - {\csname - \ifcsname\????correspondence#1#2\endcsname - \????correspondence#1#2% - \else - \s!empty - \fi - \endcsname} - -\unexpanded\def\setupcorrespondence[#1]% - {\def\currentcorrespondence{#1}% - \setupcurrentcorrespondence} - -\unexpanded\def\setupcurrentcorrespondence - {\getparameters[\????correspondence\currentcorrespondence]} - -\appendtoks - \normalprotected\expandafter\edef\csname\e!setup\currentcorrespondence\e!endsetup\endcsname{\noexpand\dodoubleargument\setupcorrespondence[\currentcorrespondence]}% -\to \everydefinecorrespondence - -% Placement - -\newtoks\everybeforecorrespondence -\newtoks\everyaftercorrespondence - -\unexpanded\def\placecorrespondence[#1]% - {\begingroup - \edef\currentcorrespondence{#1}% - \let \currentcorrespondenceoption\currentcorrespondence - \the\everybeforecorrespondence - \page - \setupheader[\c!state=\v!stop]% - \setupfooter[\c!state=\v!stop]% - \doifsomething{\correspondenceoptionparameter\c!bodyfont }{\setupbodyfont [\correspondenceoptionparameter\c!bodyfont ]}% - \doifsomething{\correspondenceoptionparameter\c!whitespace}{\setupwhitespace[\correspondenceoptionparameter\c!whitespace]}% - \doifsomething{\correspondenceoptionparameter\c!language }{\mainlanguage [\correspondenceoptionparameter\c!language ]}% - % backgroundcolor is applied to the paper background - \doifsomething{\correspondenceoptionparameter\c!backgroundcolor}% - {\setupbackgrounds[\v!paper][\c!background=\v!color,\c!backgroundcolor=\correspondenceoptionparameter\c!backgroundcolor]} - % layers - \let\correspondencebackgrounds\empty - \def\addcorrespondencelayertolist##1{\addtocommalist{\currentcorrespondence:##1}\correspondencebackgrounds} - \processcommacommand[\accesscorrespondenceelements\currentcorrespondence\v!layer,correspondence:backgroundimage,correspondence:background]\addcorrespondencelayertolist - \expanded{\setupbackgrounds[\v!page][\c!background={\correspondencebackgrounds}]}% - % layout - \setuppagenumbering[\c!alternative=\v!singlesided,\c!location=]% - \setupsubpagenumber[\c!way=\v!by\v!text,\c!state=\v!start]% - % sections - \expanded{\processcommalistwithparameters[\accesscorrespondenceelements\currentcorrespondence\v!section]}{\placecorrespondencesection[\currentcorrespondence]}% - \page - \resetsubpagenumber - \setuplayout[\v!reset]% - \the\everyaftercorrespondence - \endgroup} - -\appendtoks - \normalprotected\expandafter\edef\csname\e!place\currentcorrespondence\endcsname{\placecorrespondence[\currentcorrespondence]}% -\to \everydefinecorrespondence - -% Layers - -\def\correspondencelayerparameter - {\namedcorrespondencelayerparameter\currentcorrespondencelayer} - -\def\namedcorrespondencelayerparameter#1#2% - {\csname - \ifcsname\????correspondencelayer#1#2\endcsname - \????correspondencelayer#1#2% - \else\ifcsname\????correspondencelayer#2\endcsname - \????correspondencelayer#2% - \else - \s!empty - \fi\fi - \endcsname} - -\def\correspondenceframeparameter - {\namedcorrespondenceframeparameter\currentcorrespondenceframe} - -\def\namedcorrespondenceframeparameter#1#2% - {\csname - \ifcsname\????correspondenceframe#1#2\endcsname - \????correspondenceframe#1#2% - \else\ifcsname\????correspondenceframe#2\endcsname - \????correspondenceframe#2% - \else - \s!empty - \fi\fi - \endcsname} - -\unexpanded\def\setupcorrespondencelayer[#1][#2][#3]% - {\def\dosetupcorrespondencelayer##1% - {\edef\currentcorrespondencelayer{#1:##1}% - \setupcurrentcorrespondencelayer[#3]% - \the\everysetupcorrespondencelayer}% - \processcommalist[#2]\dosetupcorrespondencelayer} - -\unexpanded\def\setupcurrentcorrespondencelayer - {\getparameters[\????correspondencelayer\currentcorrespondencelayer]} - -\unexpanded\def\setupcorrespondenceframe[#1][#2][#3]% - {\def\dosetupcorrespondenceframe##1% - {\edef\currentcorrespondenceframe{#1:##1}% - \setupcurrentcorrespondenceframe[#3]}% - \processcommalist[#2]\dosetupcorrespondenceframe} - -\unexpanded\def\setupcurrentcorrespondenceframe - {\getparameters[\????correspondenceframe\currentcorrespondenceframe]} - -\unexpanded\def\definecorrespondencelayer[#1][#2]% - {\def\currentcorrespondencelayer{#1:#2}% - \let\currentcorrespondenceframe\currentcorrespondencelayer - \copylocalframed[\????correspondenceframe\currentcorrespondenceframe][\????correspondenceframe]% - \expandafter\let\csname\????correspondencelayer\currentcorrespondencelayer\s!parent\endcsname\????correspondencelayer - \expandafter\let\csname\????correspondenceframe\currentcorrespondenceframe\s!parent\endcsname\????correspondenceframe - \definelayer [#1:#2][\c!width=\overlaywidth,\c!height=\overlayheight]% - \defineoverlay[#1:#2][\placecorrespondencelayer{#1}{#2}]} - -\newtoks\everysetupcorrespondencelayer - -\appendtoks - \setuplayer - [\currentcorrespondencelayer] - [ \c!x=\correspondencelayerparameter\c!x, - \c!y=\correspondencelayerparameter\c!y, - \c!preset=\correspondencelayerparameter\c!preset]% -\to \everysetupcorrespondencelayer - -\setvalue{\????correspondencelayerstate\v!start }{\!!doneatrue \!!donebfalse \!!donecfalse} -\setvalue{\????correspondencelayerstate\v!stop }{\!!doneafalse \!!donebfalse \!!donecfalse} -\setvalue{\????correspondencelayerstate\v!next }{\!!doneafalse \!!donebtrue \!!donectrue } -\setvalue{\????correspondencelayerstate\v!repeat}{\!!doneatrue \!!donebtrue \!!donectrue } -\setvalue{\????correspondencelayerstate\v!left }{\!!doneafalse \!!donebfalse \!!donectrue } -\setvalue{\????correspondencelayerstate\v!right }{\!!doneafalse \!!donebtrue \!!donecfalse} -\setvalue{\????correspondencelayerstate\v!even }{\!!doneafalse \!!donebfalse \!!donectrue } -\setvalue{\????correspondencelayerstate\v!odd }{\!!doneafalse \!!donebtrue \!!donecfalse} - -\unexpanded\def\placecorrespondencelayer#1#2% - {\correspondenceparameters{#1}{#2}\v!layer - \executeifdefined{\????correspondencelayerstate\correspondencelayerparameter\c!state}{\getvalue{\????correspondencelayerstate\v!stop}} - \ifnum\correspondencepage=\plusone - \if!!donea\doplacecorrespondencelayer{#1}{#2}\fi - \else\ifodd\correspondencepage - \if!!doneb\doplacecorrespondencelayer{#1}{#2}\fi - \else - \if!!donec\doplacecorrespondencelayer{#1}{#2}\fi - \fi\fi - \tightlayer[\currentcorrespondencelayer]} - -\unexpanded\def\doplacecorrespondencelayer#1#2% - {\setlayer - [\currentcorrespondencelayer] - {\localframed[\????correspondenceframe\currentcorrespondenceframe] - {\doadaptleftskip {\correspondencelayerparameter\c!leftmargin }% - \doadaptrightskip{\correspondencelayerparameter\c!rightmargin}% - \dostartattributes{\????correspondencelayer\currentcorrespondencelayer}\c!style\c!color - \doifsymboldefinedelse{\correspondencelayerparameter\c!symbol}% - {\symbol[\correspondencelayerparameter\c!symbol]} - {\placecorrespondenceelement[#1][\v!layer][#2][\correspondencelayerparameter\c!alternative]}% - \dostopattributes}}} - -\unexpanded\def\checkcorrespondencelayer[#1][#2]% - {\def\currentcorrespondencelayer{#1:#2}% - \ifcsname\????correspondencelayer\currentcorrespondencelayer\s!parent\endcsname \else - \showmessage\m!correspondence{2}{#1,#2}% - \fi} - -\getparameters - [\????correspondencelayer] - [ \c!state=\v!start, - \c!x=\zeropoint, - \c!y=\zeropoint, - \c!alternative=\s!default, - \c!distance=\lineheight, - \c!separator=\crlf] - -\presetlocalframed[\????correspondenceframe] - -\getparameters - [\????correspondenceframe] - [ \c!frame=\v!off, - \c!offset=\zeropoint, - \c!align=\v!right] - -% Sections - -\def\correspondencesectionparameter - {\namedcorrespondencesectionparameter\currentcorrespondencesection} - -\def\namedcorrespondencesectionparameter#1#2% - {\csname - \ifcsname\????correspondencesection#1#2\endcsname - \????correspondencesection#1#2% - \else\ifcsname\????correspondencesection#2\endcsname - \????correspondencesection#2% - \else - \s!empty - \fi\fi - \endcsname} - -\unexpanded\def\definecorrespondencesection[#1][#2]% - {\def\currentcorrespondencesection{#1:#2}% - \expandafter\let\csname\????correspondencesection\currentcorrespondencesection\s!parent\endcsname\????correspondencesection} - -\unexpanded\def\setupcorrespondencesection[#1][#2][#3]% - {\def\dosetupcorrespondencesection##1% - {\edef\currentcorrespondencesection{#1:##1}% - \setupcurrentcorrespondencesection[#3]}% - \processcommalist[#2]\dosetupcorrespondencesection} - -\unexpanded\def\setupcurrentcorrespondencesection - {\getparameters[\????correspondencesection\currentcorrespondencesection]} - -\unexpanded\def\placecorrespondencesection[#1][#2]% - {\begingroup - \correspondenceparameters{#1}{#2}\v!section - \ifcsname\????correspondencesection\currentcorrespondencesection\s!parent\endcsname - \doifsomethingelse{\correspondencesectionparameter\c!spacebefore}{\blank[\correspondencesectionparameter\c!spacebefore]}{\endgraf}% - \correspondencesectionparameter\c!before - \doadaptleftskip {\correspondencesectionparameter\c!leftmargin }% - \doadaptrightskip{\correspondencesectionparameter\c!rightmargin}% - \doifsomething{\correspondencesectionparameter\c!align }{\setupalign [\correspondencesectionparameter\c!align ]}% - \doifsomething{\correspondencesectionparameter\c!indenting}{\setupindenting[\correspondencesectionparameter\c!indenting]}% - \dostartattributes{\????correspondencesection\currentcorrespondencesection}\c!style\c!color - \placecorrespondenceelement[#1][\v!section][#2][\correspondencesectionparameter\c!alternative]% - \dostopattributes - \correspondencesectionparameter\c!after - \doifsomethingelse{\correspondencesectionparameter\c!spaceafter }{\blank[\correspondencesectionparameter\c!spaceafter ]}{\endgraf}% - \else - \showmessage\m!correspondence{2}{#1,#2}% - \fi - \endgroup} - -\getparameters - [\????correspondencesection] - [ \c!spacebefore=\v!line, - \c!spaceafter=\v!line, - \c!spaceinbetween={\v!samepage,\v!line}, - \c!alternative=\s!default, - \c!separator=\crlf] - -% Options - -\def\correspondenceoptionparameter - {\namedcorrespondenceoptionparameter\currentcorrespondenceoption} - -\def\namedcorrespondenceoptionparameter#1#2% - {\csname - \ifcsname\????correspondenceoption#1#2\endcsname - \????correspondenceoption#1#2% - \else\ifcsname\????correspondenceoption#2\endcsname - \????correspondenceoption#2% - \else - \s!empty - \fi\fi - \endcsname} - -\unexpanded\def\setupcorrespondenceoption[#1]% - {\edef\currentcorrespondenceoption{#1}% - \setupcurrentcorrespondenceoption}% - -\unexpanded\def\setupcurrentcorrespondenceoption - {\getparameters[\????correspondenceoption\currentcorrespondenceoption]} - -\defineoverlay - [\v!correspondence:\c!backgroundimage] - [\doifsomething{\correspondenceoptionparameter\c!backgroundimage} - {\overlayfigure{\correspondenceoptionparameter\c!backgroundimage}}] - -\defineoverlay - [\v!correspondence:\c!background] - [\correspondenceoptionparameter\c!background] - -% Descriptions - -\def\correspondencedescriptionparameter - {\namedcorrespondencedescriptionparameter\currentcorrespondencedescription} - -\def\namedcorrespondencedescriptionparameter#1#2% - {\csname - \ifcsname\????correspondencedescription#1#2\endcsname - \????correspondencedescription#1#2% - \else\ifcsname\????correspondencedescription#2\endcsname - \????correspondencedescription#2% - \else - \s!empty - \fi\fi - \endcsname} - -\unexpanded\def\definecorrespondencedescription[#1][#2]% - {\edef\currentcorrespondencedescription{#1:#2}% - \expandafter\let\csname\????correspondencedescription\currentcorrespondencedescription\s!parent\endcsname\????correspondencedescription} - -\unexpanded\def\setupcorrespondencedescription[#1][#2][#3]% - {\def\dosetupcorrespondencedescription##1% - {\edef\currentcorrespondencedescription{#1:##1} - \setupcurrentcorrespondencedescription[#3]}% - \processcommalist[#2]\dosetupcorrespondencedescription} - -\unexpanded\def\setupcurrentcorrespondencedescription - {\getparameters[\????correspondencedescription\currentcorrespondencedescription]} - -\unexpanded\def\placecorrespondencedescription#1#2% - {\begingroup - \edef\currentcorrespondencedescription{#1:#2}% - \ifcsname\????correspondencedescription\currentcorrespondencedescription\s!parent\endcsname - \doifsomethingelse{\correspondencedescriptionparameter\c!textcommand}\donetrue\donefalse - \ifdone - \doifsomethingelse{\correspondencedescriptionparameter\c!spacebefore}{\blank[\correspondencedescriptionparameter\c!spacebefore]}{\endgraf}% - \correspondencedescriptionparameter\c!before - \setbox\scratchbox\hbox - {\dostartattributes{\????correspondencedescription\currentcorrespondencedescription}\c!headstyle\c!headcolor - \correspondencedescriptionparameter\c!headcommand - \dostopattributes}% - \assignwidth - {\scratchdimen} - {\correspondencedescriptionparameter\c!width} - {\unhcopy\scratchbox} - {\correspondencedescriptionparameter\c!distance}% - \executeifdefined{\????correspondencedescriptionlocation\correspondencedescriptionparameter\c!location}{\getvalue{\????correspondencedescriptionlocation\v!left}}% - \correspondencedescriptionparameter\c!after - \doifsomethingelse{\correspondencedescriptionparameter\c!spaceafter}{\blank[\correspondencedescriptionparameter\c!spaceafter]}{\endgraf}% - \fi - \else - \showmessage\m!correspondence{3}{#1,#2}% - \fi - \endgroup} - -\setvalue{\????correspondencedescriptionlocation\v!left}% - {\EveryPar{\hangindent\scratchdimen\hangafter\zerocount}% - \setbox\scratchbox\hbox to \scratchdimen{\box\scratchbox\hss}% - \noindent\llap{\box\scratchbox}\correspondencedescriptionparameter\c!textcommand} - -\setvalue{\????correspondencedescriptionlocation\v!top}% - {\noindent\box\scratchbox - \doifsomethingelse{\correspondencedescriptionparameter\c!spaceinbetween} - {\blank[\correspondencedescriptionparameter\c!spaceinbetween]} - {\nobreak\endgraf}% - \correspondencedescriptionparameter\c!textcommand} - -\setvalue{\????correspondencedescriptionlocation\v!text}% - {\noindent\box\scratchbox\correspondencedescriptionparameter\c!textcommand} - -\getparameters - [\????correspondencedescription] - [\c!width=\v!fit, - \c!distance=1em, - \c!symbol=dash] - -% Elements - -\unexpanded\long\def\definecorrespondenceelement[#1][#2][#3][#4]#5% - {\long\setvalue{\????correspondenceelement:#1:#2:#3:#4}{#5}} - -\unexpanded\def\placecorrespondenceelement[#1][#2][#3][#4]% - {\correspondenceparameters{#1}{#3}{#2}% - \executeifdefined{\????correspondenceelement:#1:#2:#3:#4}{\getvalue{\????correspondenceelement:#1:#2:#3:\s!default}}} - -% Files - -\unexpanded\def\loadcorrespondencefile[#1][#2]% - {\processaction - [\currentcorrespondence] - [ \v!letter=>\let\doloadcorrespondencefile\doloadletterfile , - \v!memo=>\let\doloadcorrespondencefile\doloadmemofile , - \s!unknown=>\let\doloadcorrespondencefile\gobbleoneargument]% - \processcommalist[#2]\doloadcorrespondencefile} - -\def\doloadletterfile#1% - {\donefalse - \def\dodoloadletterfile##1% - {\ifdone \else - \startreadingfile - \readfile{##1}\donetrue\donefalse - \stopreadingfile - \fi}% - \dodoloadletterfile{letter-imp-#1.mkii}% - \dodoloadletterfile{letter-imp-#1.tex}% - \dodoloadletterfile{letter-#1.mkii}% - \dodoloadletterfile{letter-#1.tex}% - \ifdone \else - % style not found - \fi} - -\def\doloadmemofile#1% - {\donefalse - \def\dodoloadmemofile##1% - {\ifdone \else - \startreadingfile - \readfile{##1}\donetrue\donefalse - \stopreadingfile - \fi}% - \dodoloadmemofile{memo-imp-#1.mkii}% - \dodoloadmemofile{memo-imp-#1.tex}% - \dodoloadmemofile{memo-#1.mkii}% - \dodoloadmemofile{memo-#1.tex}% - \ifdone \else - % style not found - \fi} - -% Style - -\def\correspondencestyleparameter - {\namedcorrespondencestyleparameter\currentcorrespondencestyle} - -\def\namedcorrespondencestyleparameter#1#2% - {\csname - \ifcsname\????correspondencestyle#1#2\endcsname - \????correspondencestyle#1#2% - \else\ifcsname\????correspondencestyle#2\endcsname - \????correspondencestyle#2% - \else - \s!empty - \fi\fi - \endcsname} - -\unexpanded\def\setupcorrespondencestyle[#1][#2][#3]% - {\def\dosetupcorrespondencestyle##1% - {\edef\currentcorrespondencestyle{#1:##1}% - \setupcurrentcorrespondencestyle[#3]}% - \processcommalist[#2]\dosetupcorrespondencestyle} - -\unexpanded\def\setupcurrentcorrespondencestyle - {\getparameters[\????correspondencestyle\currentcorrespondencestyle]} - -\unexpanded\def\correspondencestylewidth#1#2#3% - {\edef\currentcorrespondencestyle{#1:#2}% - \edef\currentcorrespondencestylewidth{\correspondencestyleparameter\c!width}% - \hbox \ifx\currentcorrespondencestylewidth\empty \else to \correspondencestyleparameter\c!width \fi{#3\hss}} - -%D \section{Layout} -%D -%D \startitemize[packed] -%D \item firstpage and -%D \item secondpage. -%D \stopitemize - -\newcount\correspondencepage - -\appendtoks - \setuplayout[\????correspondencelayout\currentcorrespondence\v!firstpage]% - \global\correspondencepage\plusone -\to \everybeforecorrespondence - -\appendtoks - \everyaftershipout\expandafter{\the\everyaftershipout\setuplayout[\????correspondencelayout\currentcorrespondence\v!secondpage]}% - \everyaftershipout\expandafter{\the\everyaftershipout\global\advance\correspondencepage\plusone }% -\to \everybeforecorrespondence - -\unexpanded\def\definecorrespondencelayout[#1][#2]% - {\def\currentcorrespondencelayout{#1#2}% - \definelayout[\????correspondencelayout\currentcorrespondencelayout]} - -\unexpanded\def\setupcorrespondencelayout[#1][#2][#3]% - {\def\dosetupcorrespondencelayout##1% - {\def\currentcorrespondencelayout{#1##1}% - \setuplayout[\????correspondencelayout\currentcorrespondencelayout][#3]}% - \processcommalist[#2]\dosetupcorrespondencelayout} - -\appendtoks - \definecorrespondencelayout[\currentcorrespondence][\v!firstpage ]% - \definecorrespondencelayout[\currentcorrespondence][\v!secondpage]% -\to \everydefinecorrespondence - -% Lists - -\unexpanded\def\definecorrespondenceelements[#1][#2][#3]% - {\setvalue{\????correspondenceelement:#1:#2}{#3}} - -\def\accesscorrespondenceelements#1#2% - {\executeifdefined{\????correspondenceelement:#1:#2}\empty} - -% Extras - -\definesymbol[\v!cutmark][{\blackrule[\c!width=4mm,\c!height=\linewidth]}] - -\defineblankmethod[\v!samepage]{\penalty\!!tenthousand} - -\protect \endinput diff --git a/macros/context/contrib/context-letter/tex/context/third/letter/base/s-cor-00.mkvi b/macros/context/contrib/context-letter/tex/context/third/letter/base/s-cor-00.mkvi index 2831825626..d61fbfb18d 100644 --- a/macros/context/contrib/context-letter/tex/context/third/letter/base/s-cor-00.mkvi +++ b/macros/context/contrib/context-letter/tex/context/third/letter/base/s-cor-00.mkvi @@ -169,6 +169,7 @@ \installnamespace {correspondencedescriptionformat} \installnamespace {correspondencestyle} \installnamespace {correspondenceelement} +\installnamespace {correspondenceelements} \installnamespace {correspondencelayout} \installnamespace {correspondencehead} \installnamespace {correspondenceheadbuffer} @@ -254,19 +255,6 @@ \newtoks\t_correspondence_between \newtoks\t_correspondence_after -% \unexpanded\def\correspondence_place[#environment]% -% {\begingroup -% \edef\currentcorrespondence{#environment}% -% \let \currentcorrespondenceoption\currentcorrespondence -% \ctxlua{thirddata.correspondence.place("\currentcorrespondence", { -% bodyfont = "\correspondenceoptionparameter\c!bodyfont", -% whitespace = "\correspondenceoptionparameter\c!whitespace", -% interlinespace = "\correspondenceoptionparameter\c!interlinespace", -% language = "\correspondenceoptionparameter\c!language", -% backgroundcolor = "\correspondenceoptionparameter\c!backgroundcolor", -% } )}% -% \endgroup} - \unexpanded\def\correspondence_place[#environment]% {\begingroup \edef\currentcorrespondence{#environment}% @@ -1058,10 +1046,10 @@ % Lists \def\correspondence_elements_define[#environment][#name][#list]% - {\ctxlua{thirddata.correspondence.elements_define("#environment","#name","#list")}} + {\setvalue{\????correspondenceelements#environment:#name}{#list}} \def\correspondence_elements_access#environment#name% - {\ctxlua{thirddata.correspondence.elements_access("#environment","#name")}} + {\begcsname\????correspondenceelements#environment:#name\endcsname} % Extras diff --git a/macros/context/contrib/context-letter/tex/context/third/letter/base/s-cor-01.mkii b/macros/context/contrib/context-letter/tex/context/third/letter/base/s-cor-01.mkii deleted file mode 100644 index 205c953041..0000000000 --- a/macros/context/contrib/context-letter/tex/context/third/letter/base/s-cor-01.mkii +++ /dev/null @@ -1,916 +0,0 @@ -%D \module -%D [ file=s-cor-01, -%D version=2013.01.02, -%D title=\CONTEXT\ User Module, -%D subtitle=Letters, -%D author=Wolfgang Schuster, -%D date=\currentdate, -%D copyright=Wolfgang Schuster, -%D license=GNU General Public License] - -%C Copyright (C) 2011 Wolfgang Schuster -%C -%C This program is free software: you can redistribute it and/or modify -%C it under the terms of the GNU General Public License as published by -%C the Free Software Foundation, either version 3 of the License, or -%C (at your option) any later version. -%C -%C This program is distributed in the hope that it will be useful, -%C but WITHOUT ANY WARRANTY; without even the implied warranty of -%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -%C GNU General Public License for more details. -%C -%C You should have received a copy of the GNU General Public License -%C along with this program. If not, see . - -\unprotect - -\startmodule[letter] - -\usemodule[cor-00] - -\setupmodule - [\c!style=dinb] - -% Commands - -\definecorrespondence[\v!letter] - -\def\defineletterlayer {\dodoubleargument\definecorrespondencelayer [\v!letter]} -\def\definelettersection {\dodoubleargument\definecorrespondencesection [\v!letter]} -\def\defineletterdescription {\dodoubleargument\definecorrespondencedescription [\v!letter]} - -\def\defineletterelements {\dotripleargument\definecorrespondenceelements [\v!letter]} -\def\setupletterelements {\dotripleargument\definecorrespondenceelements [\v!letter]} - -\def\setupletterstyle {\dotripleargument\setupcorrespondencestyle [\v!letter]} -\def\setupletterlayer {\dotripleargument\setupcorrespondencelayer [\v!letter]} -\def\setupletterframe {\dotripleargument\setupcorrespondenceframe [\v!letter]} -\def\setupletterlayout {\dotripleargument\setupcorrespondencelayout [\v!letter]} -\def\setuplettersection {\dotripleargument\setupcorrespondencesection [\v!letter]} -\def\setupletterdescription {\dotripleargument\setupcorrespondencedescription [\v!letter]} -\def\setupletteroptions {\dodoubleargument\setupcorrespondenceoption [\v!letter]} -\def\setupletter {\dodoubleargument\setupcorrespondence [\v!letter]} - -\def\useletterstyle {\dodoubleargument\loadcorrespondencefile [\v!letter]} - -\def\defineletterelement {\doquadrupleargument\definecorrespondenceelement [\v!letter]} -\def\letterelement {\doquadrupleargument\placecorrespondenceelement [\v!letter]} - -\def\namedletterlayerparameter #1{\namedcorrespondencelayerparameter {\v!letter:#1}} -\def\namedletterframeparameter #1{\namedcorrespondenceframeparameter {\v!letter:#1}} -\def\namedlettersectionparameter#1{\namedcorrespondencesectionparameter{\v!letter:#1}} - -% Layers - -\defineletterlayer [\v!head] -\defineletterlayer [\v!nexthead] -\defineletterlayer [\v!lefthead] -\defineletterlayer [\v!righthead] - -\defineletterlayer [\v!foot] -\defineletterlayer [\v!nextfoot] -\defineletterlayer [\v!leftfoot] -\defineletterlayer [\v!rightfoot] - -\defineletterlayer [\v!address] -\defineletterlayer [\v!backaddress] - -\defineletterlayer [\v!reference] -\defineletterlayer [\v!location] - -\defineletterlayer [\v!topmark] -\defineletterlayer [\v!botmark] -\defineletterlayer [\v!cutmark] -\defineletterlayer [\v!endmark] -\defineletterlayer [\v!usermark] - -\defineletterlayer [\v!lettermain] -\defineletterlayer [\v!letternext] - -% Section - -\definelettersection [\v!head] -\definelettersection [\v!date] -\definelettersection [\v!reference] -\definelettersection [\v!specialnotation] -\definelettersection [\v!address] -\definelettersection [\v!title] -\definelettersection [\v!subject] -\definelettersection [\v!opening] -\definelettersection [\v!content] -\definelettersection [\v!closing] -\definelettersection [\v!appendices] - -% Descriptions - -\defineletterdescription [\v!copy] -\defineletterdescription [\v!enclosure] -\defineletterdescription [\v!postscript] - -% Setups - -% layer: head - -\defineletterelement[\v!layer][\v!head][\s!default] - {\def\\{\correspondencelayerparameter\c!separator}% - \correspondenceparameter\c!fromname - \doifsomething{\correspondenceparameter\c!fromname}\\ - \correspondenceparameter\c!fromaddress} - -\defineletterelement[\v!layer][\v!head][\v!left] - {\framed[\c!frame=\v!off,\c!align=\v!flushleft,\c!width=\v!broad,\c!offset=\zeropoint]\bgroup - \def\currentcorrespondencestyle{\v!letter:\c!fromname}% - \dostartattributes{\????correspondencestyle\currentcorrespondencestyle}\c!style\c!color - \correspondenceparameter\c!fromname - \dostopattributes - \\ - \def\currentcorrespondencestyle{\v!letter:\c!fromaddress}% - \dostartattributes{\????correspondencestyle\currentcorrespondencestyle}\c!style\c!color - \correspondenceparameter\c!fromaddress - \doifsomething{\correspondenceparameter\c!fromphone}{\\\correspondenceparameter\c!fromphone}% - \doifsomething{\correspondenceparameter\c!fromfax }{\\\correspondenceparameter\c!fromfax }% - \doifsomething{\correspondenceparameter\c!frommail }{\\\correspondenceparameter\c!frommail }% - \doifsomething{\correspondenceparameter\c!fromurl }{\\\correspondenceparameter\c!fromurl }% - \dostopattributes - \egroup} - -\defineletterelement[\v!layer][\v!head][\v!middle] - {\framed[\c!frame=\v!off,\c!align=\v!middle,\c!width=\v!broad,\c!offset=\zeropoint]\bgroup - \def\currentcorrespondencestyle{\v!letter:\c!fromname}% - \dostartattributes{\????correspondencestyle\currentcorrespondencestyle}\c!style\c!color - \correspondenceparameter\c!fromname - \dostopattributes - \\ - \def\currentcorrespondencestyle{\v!letter:\c!fromaddress}% - \dostartattributes{\????correspondencestyle\currentcorrespondencestyle}\c!style\c!color - \correspondenceparameter\c!fromaddress - \doifsomething{\correspondenceparameter\c!fromphone}{\\\correspondenceparameter\c!fromphone}% - \doifsomething{\correspondenceparameter\c!fromfax }{\\\correspondenceparameter\c!fromfax }% - \doifsomething{\correspondenceparameter\c!frommail }{\\\correspondenceparameter\c!frommail }% - \doifsomething{\correspondenceparameter\c!fromurl }{\\\correspondenceparameter\c!fromurl }% - \dostopattributes - \egroup} - -\defineletterelement[\v!layer][\v!head][\v!right] - {\framed[\c!frame=\v!off,\c!align=\v!flushright,\c!width=\v!broad,\c!offset=\zeropoint]\bgroup - \def\currentcorrespondencestyle{\v!letter:\c!fromname}% - \dostartattributes{\????correspondencestyle\currentcorrespondencestyle}\c!style\c!color - \correspondenceparameter\c!fromname - \dostopattributes - \\ - \def\currentcorrespondencestyle{\v!letter:\c!fromaddress}% - \dostartattributes{\????correspondencestyle\currentcorrespondencestyle}\c!style\c!color - \correspondenceparameter\c!fromaddress - \doifsomething{\correspondenceparameter\c!fromphone}{\\\correspondenceparameter\c!fromphone}% - \doifsomething{\correspondenceparameter\c!fromfax }{\\\correspondenceparameter\c!fromfax }% - \doifsomething{\correspondenceparameter\c!frommail }{\\\correspondenceparameter\c!frommail }% - \doifsomething{\correspondenceparameter\c!fromurl }{\\\correspondenceparameter\c!fromurl }% - \dostopattributes - \egroup} - -\defineletterelement[\v!layer][\v!head][\v!gbrief] - {\def\\{\correspondencelayerparameter\c!separator}% - \correspondenceparameter\c!fromname\hrule} - -\defineletterelement[\v!layer][\v!head][\v!setups] - {\directsetup{\v!letter:\v!layer:\v!head}} - -% layer: nexthead - -\defineletterelement[\v!layer][\v!nexthead][\v!gbrief] - {\maxaligned - {\rlap{\correspondenceparameter\c!fromname} - \midaligned{\leftlettertext\v!pagenumber\subpagenumber\rightlettertext\v!pagenumber\lastsubpagenumber} - \llap{\correspondenceparameter\c!date}} - \hairline} - -\defineletterelement[\v!layer][\v!nexthead][\v!fullblock] - {\maxaligned - {\rlap{\correspondenceparameter\c!toname}% - \midaligned{\subpagenumber}% - \llap{\framed[\c!frame=\v!off,\c!location=\v!top,\c!align=\v!left] - {\correspondenceparameter\c!date \\ - \correspondenceparameter\c!reference}}}} - -\defineletterelement[\v!layer][\v!nexthead][\v!hanging] - {\maxaligned - {\framed[\c!frame=\v!off,\c!location=\v!top,\c!align=v!right] - {\correspondenceparameter\c!toname \\ - \correspondenceparameter\c!date \\ - \correspondenceparameter\c!reference \\ - \lettertext\c!page\subpagenumber}}} - -\defineletterelement[\v!layer][\v!nexthead][\v!semiblock] - {\maxaligned - {\rlap{\correspondenceparameter\c!toname}% - \midaligned{\subpagenumber}% - \llap{\correspondenceparameter\c!date}}} - -\defineletterelement[\v!layer][\v!nexthead][\v!simplified] - {\letterelement[\v!layer][\v!nexthead][\v!fullblock]} - -\defineletterelement[\v!layer][\v!nexthead][\v!modified] - {\letterelement[\v!layer][\v!nexthead][\v!hanging]} - -\defineletterelement[\v!layer][\v!nexthead][\v!knuth] - {\maxaligned - {\rlap{\correspondenceparameter\c!toname}% - \midaligned{\currentdate}% - \llap{\lettertext\c!page\subpagenumber}}} - -\defineletterelement[\v!layer][\v!nexthead][\v!setups] - {\directsetup{\v!letter:\v!layer:\v!nexthead}} - -% layer: lefthead - -\defineletterelement[\v!layer][\v!lefthead][\v!setups] - {\directsetup{\v!letter:\v!layer:\v!lefthead}} - -% layer: righthead - -\defineletterelement[\v!layer][\v!righthead][\v!setups] - {\directsetup{\v!letter:\v!layer:\v!righthead}} - -% layer: foot - -\defineletterelement[\v!layer][\v!foot][\v!gbrief] - {\bTABLE[\c!frame=\v!off,\c!width=.25\hsize,\c!offset=\zeropoint] - \bTR[\c!style=\bfxx,\c!topframe=\v!on] - \bTD \lettertext\c!address \eTD - \bTD \lettertext\c!phone \eTD - \bTD \lettertext\c!email \eTD - \bTD \lettertext\c!bank \eTD - \eTR - \bTR - \bTD \correspondenceparameter\c!street \\\correspondenceparameter\c!city \eTD - \bTD \correspondenceparameter\c!phone \eTD - \bTD \correspondenceparameter\c!email \eTD - \bTD \correspondenceparameter\c!bankname\\\correspondenceparameter\c!banknumber\\\correspondenceparameter\c!accountnumber \eTD - \eTR - \eTABLE} - -\defineletterelement[\v!layer][\v!foot][\v!pagenumber] - {\midaligned{\leftlettertext\v!pagenumber\subpagenumber\rightlettertext\v!pagenumber\lastsubpagenumber}} - -\defineletterelement[\v!layer][\v!foot][\v!setups] - {\directsetup{\v!letter:\v!layer:\v!foot}} - -% layer: nextfoot - -\defineletterelement[\v!layer][\v!nextfoot][\v!setups] - {\directsetup{\v!letter:\v!layer:\v!nextfoot}} - -% layer: leftfoot - -\defineletterelement[\v!layer][\v!leftfoot][\v!setups] - {\directsetup{\v!letter:\v!layer:\v!leftfoot}} - -% layer: rightfoot - -\defineletterelement[\v!layer][\v!rightfoot][\v!setups] - {\directsetup{\v!letter:\v!layer:\v!rightfoot}} - -% layer: address - -\defineletterelement[\v!layer][\v!address][\s!default] - {\def\\{\correspondencelayerparameter\c!separator}% - \doifsomething{\correspondenceparameter\c!dispatch}{\correspondenceparameter\c!dispatch\\}% - \doifsomething{\correspondenceparameter\c!toname }{\correspondenceparameter\c!toname \\}% - \correspondenceparameter\c!toaddress} - -\defineletterelement[\v!layer][\v!address][\v!setups] - {\directsetup{\v!letter:\v!layer:\v!address}} - -% layer: backaddress - -\defineletterelement[\v!layer][\v!backaddress][\s!default] - {\def\\{\correspondencelayerparameter\c!separator}% - \correspondenceparameter\c!fromname - \doifsomething{\correspondenceparameter\c!fromaddress}\\ - \correspondenceparameter\c!fromaddress} - -\defineletterelement[\v!layer][\v!backaddress][\v!auto] - {\def\\{\correspondencelayerparameter\c!separator}% - \doifsomethingelse{\correspondenceparameter\c!backaddress} - {\correspondenceparameter\c!backaddress} - {\letterelement[\v!layer][\v!backaddress][\s!default]}} - -\defineletterelement[\v!layer][\v!backaddress][\v!setups] - {\directsetup{\v!letter:\v!layer:\v!backaddress}} - -% layer: reference - -\defineletterelement[\v!layer][\v!reference][\s!default] - {\correspondenceparameter\c!reference} - -\def\doformatletterreferenceAandE#1% - {\def\currentcorrespondencevalue {#1}% - \def\currentcorrespondencestyle{\v!letter:#1}% - \vbox\bgroup - \framed - [\c!frame=\v!off, - \c!foregroundstyle=\correspondencestyleparameter\c!titlestyle, - \c!foregroundcolor=\correspondencestyleparameter\c!titlecolor, - \c!location=\v!bottom, - \c!align=\v!right, - \c!offset=0pt] - {\setupinterlinespace\lettertext\currentcorrespondencevalue\par}% - \framed - [\c!frame=\v!off, - \c!foregroundstyle=\correspondencestyleparameter\c!textstyle, - \c!foregroundcolor=\correspondencestyleparameter\c!textcolor, - \c!location=\v!top, - \c!align=\v!right, - \c!offset=0pt] - {\setupinterlinespace\correspondenceparameter\currentcorrespondencevalue\par}% - \egroup} - -\def\doformatletterreferenceA#1% - {\doifsomething{#1} % ignore empty entries - {\doifnot{#1}{\v!line} % and the “line” keyword - {\doformatletterreferenceAandE{#1}\hfill}}} - -\defineletterelement[\v!layer][\v!reference][\v!a] - {\hbox to \hsize\bgroup - \getcommacommandsize[\correspondencelayerparameter\c!list]% - \ifnum\commalistsize=\plusone\hfill\fi - \processcommacommand[\correspondencelayerparameter\c!list]\doformatletterreferenceA - \unskip - \egroup} - -\def\doformatletterreferenceB#1% - {\doifsomething{#1}% ignore empty entries - {\doifelse{#1}{\v!line} - {\blank[\v!line]} - {\hbox\bgroup - \def\currentcorrespondencevalue {#1}% - \def\currentcorrespondencestyle{\v!letter:#1}% - \dostartattributes{\????correspondencestyle\currentcorrespondencestyle}\c!titlestyle\c!titlecolor - \lettertext\currentcorrespondencevalue - \correspondencestyleparameter\c!separator - \dostopattributes - \dostartattributes{\????correspondencestyle\currentcorrespondencestyle}\c!textstyle\c!textcolor - \correspondenceparameter\currentcorrespondencevalue - \dostopattributes - \egroup}}} - -\defineletterelement[\v!layer][\v!reference][\v!b] - {\vtop\bgroup - \processcommacommand[\correspondencelayerparameter\c!list]\doformatletterreferenceB - \egroup} - -\def\doformatletterreferenceC#1% - {\doifsomething{#1} % ignore empty entries - {\doifnot{#1}{\v!line} % and the “line” keyword - {\def\currentcorrespondencevalue {#1}% - \def\currentcorrespondencestyle{\v!letter:#1}% - \dostartattributes{\????correspondencestyle\currentcorrespondencestyle}\c!textstyle\c!textcolor - \correspondenceparameter\currentcorrespondencevalue - \dostopattributes}}} - -\defineletterelement[\v!layer][\v!reference][\v!c] - {\hbox to \hsize\bgroup - \processcommacommand[\correspondencelayerparameter\c!list]\doformatletterreferenceC - \egroup} - -\def\doformatletterreferenceD#1% - {\doifsomething{#1}% - {\doifelse{#1}{\v!line} - {\appendtoks\TB[\v!line]\to\scratchtoks} - {\def\currentcorrespondencevalue {#1}% - \def\currentcorrespondencestyle{\v!letter:#1}% - \startexpanded - \noexpand\appendtoks - \noexpand\NC - \dostartattributes{\????correspondencestyle\currentcorrespondencestyle}{\c!titlestyle}{\c!titlecolor}% - \lettertext\currentcorrespondencevalue - \correspondencestyleparameter\c!separator - \dostopattributes - \noexpand\NC - \dostartattributes{\????correspondencestyle\currentcorrespondencestyle}{\c!textstyle }{\c!textcolor }% - \correspondenceparameter\currentcorrespondencevalue - \dostopattributes - \noexpand\NC\noexpand\NR - \noexpand\to\noexpand\scratchtoks - \stopexpanded}}} - -\defineletterelement[\v!layer][\v!reference][\v!d] - {\vtop\bgroup - \scratchtoks\emptytoks - \processcommacommand[\correspondencelayerparameter\c!list]\doformatletterreferenceD - \starttabulate[|l|l|][\c!before=,\c!after=]% - \the\scratchtoks - \stoptabulate - \egroup} - -\def\doformatletterreferenceE#1% - {\doifsomething{#1} % ignore empty entries - {\doifnot{#1}{\v!line} % and the “line” keyword - {\correspondencestylewidth\v!letter{#1}{\doformatletterreferenceAandE{#1}}}}} - -\defineletterelement[\v!layer][\v!reference][\v!e] - {\hbox to \hsize\bgroup - \processcommacommand[\correspondencelayerparameter\c!list]\doformatletterreferenceE - \egroup} - -\defineletterelement[\v!layer][\v!reference][\v!setups] - {\directsetup{\v!letter:\v!layer:\v!reference}} - -% layer: location - -\defineletterelement[\v!layer][\v!location][\v!french] - {\def\\{\correspondencelayerparameter\c!separator}% - \doifsomething{\correspondenceparameter\c!place}{\correspondenceparameter\c!place\\}% - \correspondenceparameter\c!date} - -\defineletterelement[\v!layer][\v!location][\v!setups] - {\directsetup{\v!letter:\v!layer:\v!location}} - -% layer: topmark - -\defineletterelement[\v!layer][\v!topmark][\v!setups] - {\directsetup{\v!letter:\v!layer:\v!topmark}} - -% layer: botmark - -\defineletterelement[\v!layer][\v!botmark][\v!setups] - {\directsetup{\v!letter:\v!layer:\v!botmark}} - -% layer: cutmark - -\defineletterelement[\v!layer][\v!cutmark][\v!setups] - {\directsetup{\v!letter:\v!layer:\v!cutmark}} - -% layer: endmark - -\defineletterelement[\v!layer][\v!endmark][\v!setups] - {\directsetup{\v!letter:\v!layer:\v!endmark}} - -% layer: usermark - -\defineletterelement[\v!layer][\v!usermark][\v!setups] - {\directsetup{\v!letter:\v!layer:\v!usermark}} - -% layer: lettermain - -\defineletterelement[\v!layer][\v!lettermain][\v!setups] - {\directsetup{\v!letter:\v!layer:\v!lettermain}} - -% layer: letternext - -\defineletterelement[\v!layer][\v!letternext][\v!setups] - {\directsetup{\v!letter:\v!layer:\v!letternext}} - -% section: head - -\defineletterelement[\v!section][\v!head][\v!blockstyle] - {\correspondenceparameter\c!fromaddress} - -\defineletterelement[\v!section][\v!head][\v!setups] - {\directsetup{\v!letter:\v!section:\v!head}} - -% section: date - -\defineletterelement[\v!section][\v!date][\v!blockstyle] - {\correspondenceparameter\c!date} - -\defineletterelement[\v!section][\v!date][\v!setups] - {\directsetup{\v!letter:\v!section:\v!date}} - -% section: reference - -\defineletterelement[\v!section][\v!reference][\v!blockstyle] - {\def\\{\correspondencesectionparameter\c!separator}% - \correspondenceparameter\c!reference} - -\defineletterelement[\v!section][\v!reference][\v!setups] - {\directsetup{\v!letter:\v!section:\v!reference}} - -% section: specialnotation - -\defineletterelement[\v!section][\v!specialnotation][\v!blockstyle] - {\def\\{\correspondencesectionparameter\c!separator}% - \correspondenceparameter\c!dispatch} - -\defineletterelement[\v!section][\v!specialnotation][\v!setups] - {\directsetup{\v!letter:\v!section:\v!specialnotation}} - -% section: address - -\defineletterelement[\v!section][\v!address][\v!blockstyle] - {\def\\{\correspondencesectionparameter\c!separator}% - \correspondenceparameter\c!toname - \doifsomething{\correspondenceparameter\c!toname}\\ - \correspondenceparameter\c!toaddress} - -\defineletterelement[\v!section][\v!address][\v!knuth] - {\letterelement[\v!section][\v!address][\v!blockstyle]} - -\defineletterelement[\v!section][\v!address][\v!setups] - {\directsetup{\v!letter:\v!section:\v!address}} - -% section: title - -\defineletterelement[\v!section][\v!title][\s!default] - {\def\\{\correspondencesectionparameter\c!separator}% - \doifsomethingelse{\correspondenceparameter\c!title} - {\correspondenceparameter\c!title} - {\lettertext\c!attention\correspondenceparameter\c!attention}} - -\defineletterelement[\v!section][\v!title][\v!setups] - {\directsetup{\v!letter:\v!section:\v!title}} - -% section: subject - -\defineletterelement[\v!section][\v!subject][\s!default] - {\def\\{\correspondencesectionparameter\c!separator}% - \lettertext\c!subject\correspondenceparameter\c!subject} - -\defineletterelement[\v!section][\v!subject][\v!setups] - {\directsetup{\v!letter:\v!section:\v!subject}} - -% section: opening - -\defineletterelement[\v!section][\v!opening][\s!default] - {\def\\{\correspondencesectionparameter\c!separator}% - \doifsomethingelse{\correspondenceparameter\c!opening} - {\correspondenceparameter\c!opening} - {\correspondenceparameter\c!salutation}} - -\defineletterelement[\v!section][\v!opening][\v!french] - {\doifsomething{\correspondenceoptionparameter\c!indenting}{\setupindenting[\correspondenceoptionparameter\c!indenting]}% - \letterelement[\v!section][\v!opening][\s!default]} - -\defineletterelement[\v!section][\v!opening][\v!setups] - {\directsetup{\v!letter:\v!section:\v!opening}} - -% section: content - -\defineletterelement[\v!section][\v!content][\s!default] - {\setupbuffer[\c!before=,\c!after=]% - \getbuffer [\????correspondencebuffer\v!letter]} - -\defineletterelement[\v!section][\v!content][\v!setups] - {\directsetup{\v!letter:\v!section:\v!content}} - -% section: closing - -\defineletterelement[\v!section][\v!closing][\s!default] - {\def\\{\correspondencesectionparameter\c!separator}% - \correspondenceparameter\c!closing - \doifsomething{\correspondenceparameter\c!signature} - {\blank[\correspondencesectionparameter\c!spaceinbetween]% - \correspondenceparameter\c!signature}} - -\defineletterelement[\v!section][\v!closing][\v!french] - {\def\\{\correspondencesectionparameter\c!separator}% - \doifsomething{\correspondenceoptionparameter\c!indenting}{\setupindenting[\correspondenceoptionparameter\c!indenting,\v!first]}% - \correspondenceparameter\c!closing - \doifsomething{\correspondenceparameter\c!signature} - {\blank[\correspondencesectionparameter\c!spaceinbetween]% - \raggedcenter\doadaptleftskip{.5\textwidth}% - \correspondenceparameter\c!signature\endgraf}} - -\defineletterelement[\v!section][\v!closing][\v!knuth] - {\def\\{\correspondencesectionparameter\c!separator}% - \doadaptleftskip{\dimexpr\textwidth/13*8\relax}% - \correspondenceparameter\c!closing - \doifsomething{\correspondenceparameter\c!signature} - {\blank[\correspondencesectionparameter\c!spaceinbetween]% - \correspondenceparameter\c!signature}} - -\defineletterelement[\v!section][\v!closing][\v!setups] - {\directsetup{\v!letter:\v!section:\v!closing}} - -% section: appendices - -\defineletterelement[\v!section][\v!appendices][\s!default] - {\def\\{\correspondencesectionparameter\c!separator}% - \startpacked - \processcommacommand[\accesscorrespondenceelements\v!letter\v!description]{\placecorrespondencedescription\v!letter}% - \stoppacked} - -\defineletterelement[\v!section][\v!appendices][\v!setups] - {\directsetup{\v!letter:\v!section:\v!appendices}} - -\startsetups[\v!letter:\v!place] -\placecorrespondence[\v!letter] -\stopsetups - -% Extras - -\appendtoks - \ifx\currentcorrespondence\v!letter - \processallactionsinset - [\correspondenceoptionparameter\c!option] - [ \v!test=>{\useletterstyle[test]}, - \v!setups=>{\useletterstyle[setups]}]% - \fi -\to \everybeforecorrespondence - -\appendtoks - \ifx\currentcorrespondence\v!letter - \doif{\correspondenceoptionparameter\c!marking}\v!no{\setupletterlayer[\v!topmark,\v!botmark,\v!cutmark,\v!endmark,\v!usermark][\c!state=\v!stop]}% - \fi -\to \everybeforecorrespondence - -\appendtoks - \ifx\currentcorrespondence\v!letter - \doif{\correspondenceoptionparameter\c!position}\v!yes - {\setbox\scratchbox\vbox{\letterelement[\v!reference][\correspondencelayerparameter\c!alternative]}% - \normalexpanded - {\setupletterlayout - [\v!firstpage] - [\c!topspace=\dimexpr\namedletterlayerparameter\v!reference\c!y+\ht\scratchbox+\namedletterlayerparameter\v!reference\c!distance\relax]}}% - \fi -\to \everybeforecorrespondence - -% Labels - -\def\????lettertext{@@@@lettertext} - -\def\setuplettertext - {\dodoubleempty\dosetuplettertext} - -\def\dosetuplettertext[#1][#2]% - {\ifsecondargument - \def\dodosetuplettertext##1{\setuplabeltext[#1][\????lettertext##1]}% - \processcommalist[#2]\dodosetuplettertext - \else - \def\dodosetuplettertext##1{\setuplabeltext [\????lettertext##1]}% - \processcommalist[#1]\dodosetuplettertext - \fi} - -\def\lettertext #1{\labeltext {\????lettertext#1}} -\def\leftlettertext #1{\leftlabeltext {\????lettertext#1}} -\def\rightlettertext#1{\rightlabeltext{\????lettertext#1}} - -% name: - -\setuplettertext[\s!en][\c!name=Name] -\setuplettertext[\s!nl][\c!name=] -\setuplettertext[\s!de][\c!name=Name] -\setuplettertext[\s!fr][\c!name=Nom] -\setuplettertext[\s!it][\c!name=] -\setuplettertext[\s!es][\c!name=] - -% room: - -\setuplettertext[\s!en][\c!room=Room] -\setuplettertext[\s!nl][\c!room=] -\setuplettertext[\s!de][\c!room=Zimmer] -\setuplettertext[\s!fr][\c!room=Salle] % Salle or Pièce -\setuplettertext[\s!it][\c!room=] -\setuplettertext[\s!es][\c!room=] - -% yourref: - -\setuplettertext[\s!en][\c!yourref=Your ref.] -\setuplettertext[\s!nl][\c!yourref=Uw kenmerk] -\setuplettertext[\s!de][\c!yourref=Ihr Zeichen] -\setuplettertext[\s!fr][\c!yourref=Vos r\eacute f\eacute rences] -\setuplettertext[\s!it][\c!yourref=Vs./Rif.] -\setuplettertext[\s!es][\c!yourref=Su ref.] - -% yourmail: - -\setuplettertext[\s!en][\c!yourmail=Your letter of] -\setuplettertext[\s!nl][\c!yourmail=Uw brief van] -\setuplettertext[\s!de][\c!yourmail=Ihre Nachricht vom] -\setuplettertext[\s!fr][\c!yourmail=Votre lettre du] -\setuplettertext[\s!it][\c!yourmail=Vs.~lettera del] -\setuplettertext[\s!es][\c!yourmail=Su carta de] - -% myref: - -\setuplettertext[\s!en][\c!myref=Our ref.] -\setuplettertext[\s!nl][\c!myref=Ons kenmerk] -\setuplettertext[\s!de][\c!myref=Unser Zeichen] -\setuplettertext[\s!fr][\c!myref=Nos r\eacute f\eacute rences] -\setuplettertext[\s!it][\c!myref=Ns./Rif.] -\setuplettertext[\s!es][\c!myref=Nuestra ref.] - -% mymail: - -\setuplettertext[\s!en][\c!mymail=Our letter of] -\setuplettertext[\s!nl][\c!mymail=Ons brief van] -\setuplettertext[\s!de][\c!mymail=Unsere Nachricht vom] -\setuplettertext[\s!fr][\c!mymail=Notre lettre du] -\setuplettertext[\s!it][\c!mymail=] -\setuplettertext[\s!es][\c!mymail=] - -% customer: - -\setuplettertext[\s!en][\c!customer=Customer no.] -\setuplettertext[\s!nl][\c!customer=Klant No.] -\setuplettertext[\s!de][\c!customer=Kundennummer] -\setuplettertext[\s!fr][\c!customer=Num\eacute ro de client] -\setuplettertext[\s!it][\c!customer=Nr.~cliente] -\setuplettertext[\s!es][\c!customer=No. de cliente] - -% invoice: - -\setuplettertext[\s!en][\c!invoice=Invoice no.] -\setuplettertext[\s!nl][\c!invoice=Rekening No.] -\setuplettertext[\s!de][\c!invoice=Rechnungsnummer] -\setuplettertext[\s!fr][\c!invoice=Num\eacute ro de facture] -\setuplettertext[\s!it][\c!invoice=Nr.~fattura] -\setuplettertext[\s!es][\c!invoice=No. de factura] - -% attention: - -\setuplettertext[\s!en][\c!attention=] % Attention -\setuplettertext[\s!nl][\c!attention=] -\setuplettertext[\s!de][\c!attention=] -\setuplettertext[\s!fr][\c!attention=] -\setuplettertext[\s!it][\c!attention=] -\setuplettertext[\s!es][\c!attention=] - -% subject: - -\setuplettertext[\s!en][\c!subject=] % Subject -\setuplettertext[\s!nl][\c!subject=] % Onderwerp -\setuplettertext[\s!de][\c!subject=] % Betrifft -\setuplettertext[\s!fr][\c!subject=] % Concernant or Sujet -\setuplettertext[\s!it][\c!subject=] % Oggetto -\setuplettertext[\s!es][\c!subject=] % Asunto - -% cc: - -\setuplettertext[\s!en][\c!copy=cc] -\setuplettertext[\s!nl][\c!copy=Kopie aan] -\setuplettertext[\s!de][\c!copy=Kopien an] -\setuplettertext[\s!fr][\c!copy=Copie\agrave] -\setuplettertext[\s!it][\c!copy=Per conoscenza] -\setuplettertext[\s!es][\c!copy=Copias] - -% enclosure: - -\setuplettertext[\s!en][\c!enclosure=encl] -\setuplettertext[\s!nl][\c!enclosure=Bijlage(n)] -\setuplettertext[\s!de][\c!enclosure=Anlagen] -\setuplettertext[\s!fr][\c!enclosure=Annexes] -\setuplettertext[\s!it][\c!enclosure=Allegato] -\setuplettertext[\s!es][\c!enclosure=Adjunto] - -% to: - -\setuplettertext[\s!en][\c!to=To] -\setuplettertext[\s!nl][\c!to=Aan] -\setuplettertext[\s!de][\c!to=An] -\setuplettertext[\s!fr][\c!to=\Agrave] -\setuplettertext[\s!it][\c!to=A] -\setuplettertext[\s!es][\c!to=A] - -% toname: - -\setuplettertext[\s!en][\c!toname=To] -\setuplettertext[\s!nl][\c!toname=Aan] -\setuplettertext[\s!de][\c!toname=An] -\setuplettertext[\s!fr][\c!toname=\Agrave] -\setuplettertext[\s!it][\c!toname=A] -\setuplettertext[\s!es][\c!toname=A] - -% from: - -\setuplettertext[\s!en][\c!from=From] -\setuplettertext[\s!nl][\c!from=Van] -\setuplettertext[\s!de][\c!from=Von] -\setuplettertext[\s!fr][\c!from=De] -\setuplettertext[\s!it][\c!from=Da] -\setuplettertext[\s!es][\c!from=De] - -% fromname: - -\setuplettertext[\s!en][\c!fromname=From] -\setuplettertext[\s!nl][\c!fromname=Van] -\setuplettertext[\s!de][\c!fromname=Von] -\setuplettertext[\s!fr][\c!fromname=De] -\setuplettertext[\s!it][\c!fromname=Da] -\setuplettertext[\s!es][\c!fromname=De] - -% date: - -\setuplettertext[\s!en][\c!date=Date] -\setuplettertext[\s!nl][\c!date=Datum] -\setuplettertext[\s!de][\c!date=Datum] -\setuplettertext[\s!fr][\c!date=Date] -\setuplettertext[\s!it][\c!date=Data] -\setuplettertext[\s!es][\c!date=Fecha] - -% phone: - -\setuplettertext[\s!en][\c!phone=Phone] -\setuplettertext[\s!nl][\c!phone=Telefoon] -\setuplettertext[\s!de][\c!phone=Telefon] -\setuplettertext[\s!fr][\c!phone=T\eacute l\eacute phone] -\setuplettertext[\s!it][\c!phone=Telefono] -\setuplettertext[\s!es][\c!phone=Tel\eacute fono] - -% fax: - -\setuplettertext[\s!en][\c!fax=Fax] -\setuplettertext[\s!nl][\c!fax=Fax] -\setuplettertext[\s!de][\c!fax=Fax] -\setuplettertext[\s!fr][\c!fax=T\eacute l\eacute fax] % or Fax -\setuplettertext[\s!it][\c!fax=Fax] -\setuplettertext[\s!es][\c!fax=Fax] - -% email: - -\setuplettertext[\s!en][\c!email=Email] -\setuplettertext[\s!nl][\c!email=E–mail] -\setuplettertext[\s!de][\c!email=E-Mail] -\setuplettertext[\s!fr][\c!email=Courriel] % Adresse électronique -\setuplettertext[\s!it][\c!email=Email] -\setuplettertext[\s!es][\c!email=Email] - -% url: - -\setuplettertext[\s!en][\c!url=Url] -\setuplettertext[\s!nl][\c!url=URL] -\setuplettertext[\s!de][\c!url=URL] -\setuplettertext[\s!fr][\c!url=Site web] -\setuplettertext[\s!it][\c!url=Sito Web] -\setuplettertext[\s!es][\c!url=URL] - -% bank: - -\setuplettertext[\s!en][\c!bank=Bank account] -\setuplettertext[\s!nl][\c!bank=Bankrekening] -\setuplettertext[\s!de][\c!bank=Bankverbindung] -\setuplettertext[\s!fr][\c!bank=Compte en banque] -\setuplettertext[\s!it][\c!bank=Conto bancario] -\setuplettertext[\s!es][\c!bank=Cuenta bancaria] - -% organization: - -\setuplettertext[\s!en][\c!organization=Organization] -\setuplettertext[\s!nl][\c!organization=] -\setuplettertext[\s!de][\c!organization=Organisation] -\setuplettertext[\s!fr][\c!organization=] -\setuplettertext[\s!it][\c!organization=] -\setuplettertext[\s!es][\c!organization=] - -% city: - -\setuplettertext[\s!en][\c!city=City] -\setuplettertext[\s!nl][\c!city=] -\setuplettertext[\s!de][\c!city=Stadt] -\setuplettertext[\s!fr][\c!city=] -\setuplettertext[\s!it][\c!city=] -\setuplettertext[\s!es][\c!city=] - -% zip: - -\setuplettertext[\s!en][\c!zip=Zip] -\setuplettertext[\s!nl][\c!zip=] -\setuplettertext[\s!de][\c!zip=PLZ] -\setuplettertext[\s!fr][\c!zip=] -\setuplettertext[\s!it][\c!zip=] -\setuplettertext[\s!es][\c!zip=] - -% country: - -\setuplettertext[\s!en][\c!country=Country] -\setuplettertext[\s!nl][\c!country=] -\setuplettertext[\s!de][\c!country=Land] -\setuplettertext[\s!fr][\c!country=] -\setuplettertext[\s!it][\c!country=] -\setuplettertext[\s!es][\c!country=] - -% street: - -\setuplettertext[\s!en][\c!street=Street] -\setuplettertext[\s!nl][\c!street=] -\setuplettertext[\s!de][\c!street=Stra\ssharp e] -\setuplettertext[\s!fr][\c!street=] -\setuplettertext[\s!it][\c!street=] -\setuplettertext[\s!es][\c!street=] - -% page: - -\setuplettertext[\s!en][\c!page=Page~] -\setuplettertext[\s!nl][\c!page=] -\setuplettertext[\s!de][\c!page=Seite~] -\setuplettertext[\s!fr][\c!page=] -\setuplettertext[\s!it][\c!page=] -\setuplettertext[\s!es][\c!page=] - -% pagenumber: - -\setuplettertext[\s!en][\c!pagenumber={Page , of }] -\setuplettertext[\s!nl][\c!pagenumber=] -\setuplettertext[\s!de][\c!pagenumber={Seite , von }] -\setuplettertext[\s!fr][\c!pagenumber=] -\setuplettertext[\s!it][\c!pagenumber=] -\setuplettertext[\s!es][\c!pagenumber=] - -% Files - -\useletterstyle[default,\currentmoduleparameter\c!style] - -\stopmodule - -\protect \endinput diff --git a/macros/context/contrib/context-letter/tex/context/third/letter/base/s-cor-01.mkvi b/macros/context/contrib/context-letter/tex/context/third/letter/base/s-cor-01.mkvi index 54a1cf4cab..1330bb51ab 100644 --- a/macros/context/contrib/context-letter/tex/context/third/letter/base/s-cor-01.mkvi +++ b/macros/context/contrib/context-letter/tex/context/third/letter/base/s-cor-01.mkvi @@ -62,7 +62,6 @@ \def\setupletterdescription {\dotripleargument\correspondence_description_setup [\v!letter]} \def\setupletterhead {\dotripleargument\correspondence_head_setup [\v!letter]} \def\setupletteroptions {\dodoubleargument\correspondence_option_setup [\v!letter]} -\def\setupletter {\dodoubleargument\correspondence_setup [\v!letter]} \def\setupletterlayeralternative {\dotripleargument\correspondence_layer_alternative_setup [\v!letter]} \def\setuplettersectionalternative {\dotripleargument\correspondence_section_alternative_setup [\v!letter]} @@ -574,7 +573,7 @@ % for backwards compatibility \startsetups[\v!letter:\v!place] -\correspondence_place[\v!letter] +\placecorrespondence[\v!letter] \stopsetups % Extras @@ -916,4 +915,10 @@ \stopmodule -\protect \endinput +\protect + +\continueifinputfile{s-cor-01.mkvi} + +\startletter +\input lorem +\stopletter diff --git a/macros/context/contrib/context-letter/tex/context/third/letter/base/s-cor-02.mkii b/macros/context/contrib/context-letter/tex/context/third/letter/base/s-cor-02.mkii deleted file mode 100644 index 02dfc67e3f..0000000000 --- a/macros/context/contrib/context-letter/tex/context/third/letter/base/s-cor-02.mkii +++ /dev/null @@ -1,428 +0,0 @@ -%D \module -%D [ file=s-cor-02, -%D version=2012.06.10, -%D title=\CONTEXT\ User Module, -%D subtitle=Memos, -%D author=Wolfgang Schuster, -%D date=\currentdate, -%D copyright=Wolfgang Schuster, -%D license=GNU General Public License] - -%C Copyright (C) 2011 Wolfgang Schuster -%C -%C This program is free software: you can redistribute it and/or modify -%C it under the terms of the GNU General Public License as published by -%C the Free Software Foundation, either version 3 of the License, or -%C (at your option) any later version. -%C -%C This program is distributed in the hope that it will be useful, -%C but WITHOUT ANY WARRANTY; without even the implied warranty of -%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -%C GNU General Public License for more details. -%C -%C You should have received a copy of the GNU General Public License -%C along with this program. If not, see . - -\unprotect - -\startmodule[memo] - -\usemodule[cor-00] - -\setupmodule - [\c!style=memo] - -% Commands - -\definecorrespondence[\v!memo] - -\def\definememolayer {\dodoubleargument\definecorrespondencelayer [\v!memo]} -\def\definememosection {\dodoubleargument\definecorrespondencesection [\v!memo]} -\def\definememodescription {\dodoubleargument\definecorrespondencedescription [\v!memo]} - -\def\definememoelements {\dotripleargument\definecorrespondenceelements [\v!memo]} -\def\setupmemoelements {\dotripleargument\setupcorrespondenceelements [\v!memo]} - -\def\setupmemostyle {\dotripleargument\setupcorrespondencestyle [\v!memo]} -\def\setupmemolayer {\dotripleargument\setupcorrespondencelayer [\v!memo]} -\def\setupmemoframe {\dotripleargument\setupcorrespondenceframe [\v!memo]} -\def\setupmemolayout {\dotripleargument\setupcorrespondencelayout [\v!memo]} -\def\setupmemosection {\dotripleargument\setupcorrespondencesection [\v!memo]} -\def\setupmemodescription {\dotripleargument\setupcorrespondencedescription [\v!memo]} -\def\setupmemooptions {\dodoubleargument\setupcorrespondenceoption [\v!memo]} -\def\setupmemo {\dodoubleargument\setupcorrespondence [\v!memo]} - -\def\usememostyle {\dodoubleargument\loadcorrespondencefile [\v!memo]} - -\def\definememoelement {\doquadrupleargument\definecorrespondenceelement [\v!memo]} -\def\memoelement {\doquadrupleargument\placecorrespondenceelement [\v!memo]} - -\def\namedmemolayerparameter #1{\namedcorrespondencelayerparameter {\v!memo:#1}} -\def\namedmemoframeparameter #1{\namedcorrespondenceframeparameter {\v!memo:#1}} -\def\namedmemosectionparameter#1{\namedcorrespondencesectionparameter{\v!memo:#1}} - -% Layers - -\definememolayer [\v!head] -\definememolayer [\v!nexthead] -\definememolayer [\v!lefthead] -\definememolayer [\v!righthead] - -\definememolayer [\v!foot] -\definememolayer [\v!nextfoot] -\definememolayer [\v!leftfoot] -\definememolayer [\v!rightfoot] - -\definememolayer [\v!topmark] -\definememolayer [\v!botmark] -\definememolayer [\v!cutmark] -\definememolayer [\v!endmark] -\definememolayer [\v!usermark] - -\definememolayer [\v!memomain] -\definememolayer [\v!memonext] - -% Section - -\definememosection [\v!head] -\definememosection [\v!date] -\definememosection [\v!reference] -\definememosection [\v!specialnotation] -\definememosection [\v!address] -\definememosection [\v!title] -\definememosection [\v!opening] -\definememosection [\v!subject] -\definememosection [\v!content] -\definememosection [\v!closing] -\definememosection [\v!appendices] - -% Descriptions - -\definememodescription [\v!copy] -\definememodescription [\v!enclosure] -\definememodescription [\v!postscript] - -% Setups - -% layer: head - -\definememoelement[\v!layer][\v!head][\v!setups] - {\texsetup{\v!memo:\v!layer:\v!head}} - -% layer: nexthead - -\definememoelement[\v!layer][\v!nexthead][\v!setups] - {\texsetup{\v!memo:\v!layer:\v!nexthead}} - -% layer: lefthead - -\definememoelement[\v!layer][\v!lefthead][\v!setups] - {\texsetup{\v!memo:\v!layer:\v!lefthead}} - -% layer: righthead - -\definememoelement[\v!layer][\v!righthead][\v!setups] - {\texsetup{\v!memo:\v!layer:\v!righthead}} - -% layer: foot - -\definememoelement[\v!layer][\v!foot][\v!pagenumber] - {\centerbox{\hbox{\begstrut\leftmemotext\c!pagenumber\subpagenumber\rightmemotext\c!pagenumber\lastsubpagenumber\endstrut}}} - -% layer: topmark - -\definememoelement[\v!layer][\v!topmark][\v!setups] - {\texsetup{\v!memo:\v!layer:\v!topmark}} - -% layer: botmark - -\definememoelement[\v!layer][\v!botmark][\v!setups] - {\texsetup{\v!memo:\v!layer:\v!botmark}} - -% layer: cutmark - -\definememoelement[\v!layer][\v!cutmark][\v!setups] - {\texsetup{\v!memo:\v!layer:\v!cutmark}} - -% layer: endmark - -\definememoelement[\v!layer][\v!endmark][\v!setups] - {\texsetup{\v!memo:\v!layer:\v!endmark}} - -% layer: usermark - -\definememoelement[\v!layer][\v!usermark][\v!setups] - {\texsetup{\v!memo:\v!layer:\v!usermark}} - -% layer: memomain - -\definememoelement[\v!layer][\v!memomain][\v!setups] - {\texsetup{\v!memo:\v!layer:\v!memomain}} - -% layer: memonext - -\definememoelement[\v!layer][\v!memonext][\v!setups] - {\texsetup{\v!memo:\v!layer:\v!memonext}} - -% section: head - -\definememoelement[\v!section][\v!head][\s!default] - {\def\\{\correspondencesectionparameter\c!separator}% - \correspondenceparameter\c!fromaddress} - -\definememoelement[\v!section][\v!head][\v!memo] - {\def\\{\correspondencesectionparameter\c!separator}% - \startpacked - \doifsomething{\correspondenceparameter\c!fromname}{\memotext\c!fromname \correspondenceparameter\c!fromname \par} - \doifsomething{\correspondenceparameter\c!date }{\memotext\c!date \correspondenceparameter\c!date \par} - \doifsomething{\correspondenceparameter\c!toname }{\memotext\c!toname \correspondenceparameter\c!toname \par} - \doifsomething{\correspondenceparameter\c!subject }{\memotext\c!subject \correspondenceparameter\c!subject \par} - \stoppacked} - -\unexpanded\def\doformatmemoheadTABLE#1% - {\doifsomething{\correspondenceparameter#1} - {\NC % label - \def\currentcorrespondencestyle{\v!memo:#1}% - \usecorrespondencestylestyleandcolor\c!titlestyle\c!titlecolor - \memotext#1 - \EQ % text - \def\currentcorrespondencestyle{\v!memo:#1}% - \usecorrespondencestylestyleandcolor\c!textstyle\c!textcolor - \correspondenceparameter#1 - \NC\NR}} - -\definememoelement[\v!section][\v!head][\v!table] - {\def\\{\correspondencesectionparameter\c!separator}% - \starttabulate[|l|p|] - \doformatmemoheadTABLE\v!fromname - \doformatmemoheadTABLE\v!date - \doformatmemoheadTABLE\v!toname - \doformatmemoheadTABLE\v!subject - \stoptabulate} - -\unexpanded\def\doformatmemoheadMARGIN#1% - {\doifsomething{\correspondenceparameter#1} - {\def\currentcorrespondencestyle{\v!memo:#1}% - \dontleavehmode\llap\bgroup % label - \usecorrespondencestylestyleandcolor\c!titlestyle\c!titlecolor - \memotext#1 - \hskip\leftmargindistance - \egroup - \bgroup - \usecorrespondencestylestyleandcolor\c!textstyle\c!textcolor - \correspondenceparameter#1 - \egroup - \par}} - -\definememoelement[\v!section][\v!head][\v!margin] - {\def\\{\correspondencesectionparameter\c!separator}% - \startpacked - \doformatmemoheadMARGIN\c!fromname - \doformatmemoheadMARGIN\c!date - \doformatmemoheadMARGIN\c!toname - \doformatmemoheadMARGIN\c!subject - \stoppacked} - -\definememoelement[\v!section][\v!head][\v!setups] - {\texsetup{\v!memo:\v!section:\v!head}} - -% section: date - -\definememoelement[\v!section][\v!date][\s!default] - {\correspondenceparameter\c!date} - -\definememoelement[\v!section][\v!date][\v!setups] - {\texsetup{\v!memo:\v!section:\v!date}} - -% section: reference - -\definememoelement[\v!section][\v!reference][\s!default] - {\def\\{\correspondencesectionparameter\c!separator}% - \correspondenceparameter\c!reference} - -\definememoelement[\v!section][\v!reference][\v!setups] - {\texsetup{\v!memo:\v!section:\v!reference}} - -% section: specialnotation - -\definememoelement[\v!section][\v!specialnotation][\s!default] - {\def\\{\correspondencesectionparameter\c!separator}% - \correspondenceparameter\c!dispatch} - -\definememoelement[\v!section][\v!specialnotation][\v!setups] - {\texsetup{\v!memo:\v!section:\v!specialnotation}} - -% section: address - -\definememoelement[\v!section][\v!address][\s!default] - {\def\\{\correspondencesectionparameter\c!separator}% - \correspondenceparameter\c!toname - \doifsomething{\correspondenceparameter\c!toname}\\ - \correspondenceparameter\c!toaddress} - -\definememoelement[\v!section][\v!address][\v!setups] - {\texsetup{\v!memo:\v!section:\v!address}} - -% section: title - -\definememoelement[\v!section][\v!title][\s!default] - {\def\\{\correspondencesectionparameter\c!separator}% - \correspondenceparameter\c!title} - -\definememoelement[\v!section][\v!title][\v!setups] - {\texsetup{\v!memo:\v!section:\v!title}} - -% section: opening - -\definememoelement[\v!section][\v!opening][\s!default] - {\def\\{\correspondencesectionparameter\c!separator}% - \correspondenceparameter\c!opening} - -\definememoelement[\v!section][\v!opening][\v!setups] - {\texsetup{\v!memo:\v!section:\v!opening}} - -% section: subject - -\definememoelement[\v!section][\v!subject][\s!default] - {\def\\{\correspondencesectionparameter\c!separator}% - \memotext\c!subject\correspondenceparameter\c!subject} - -\definememoelement[\v!section][\v!subject][\v!setups] - {\texsetup{\v!memo:\v!section:\v!subject}} - -% section: content - -\definememoelement[\v!section][\v!content][\s!default] - {\setupbuffer[\c!before=,\c!after=]% - \getbuffer [\????correspondencebuffer\v!memo]} - -\definememoelement[\v!section][\v!content][\v!setups] - {\texsetup{\v!memo:\v!section:\v!content}} - -% section: closing - -\definememoelement[\v!section][\v!closing][\s!default] - {\def\\{\correspondencesectionparameter\c!separator}% - \correspondenceparameter\c!closing - \doifsomething{\correspondenceparameter\c!signature} - {\blank[\correspondencesectionparameter\c!spaceinbetween]% - \correspondenceparameter\c!signature}} - -\definememoelement[\v!section][\v!closing][\v!setups] - {\texsetup{\v!memo:\v!section:\v!closing}} - -% section: appendices - -\definememoelement[\v!section][\v!appendices][\s!default] - {\def\\{\correspondencesectionparameter\c!separator}% - \startpacked - \expanded{\processcommalistwithparameters[\accesscorrespondenceelements\v!memo\v!description]}{\placecorrespondencedescription[\v!memo]}% - \stoppacked} - -\startsetups[\v!memo:\v!section:\v!appendices] -\def\\{\correspondencesectionparameter\c!separator} -\memoelement[\v!section][\v!appendices][\correspondencesectionparameter\c!alternative] -\stopsetups - -\startsetups[\v!memo:\v!place] -\placecorrespondence[\v!memo] -\stopsetups - -% Extras - -\appendtoks - \ifx\currentcorrespondence\v!memo - \processallactionsinset - [\correspondenceoptionparameter\c!option] - [ \v!test=>{\usememostyle[test]}, - \v!setups=>{\usememostyle[setups]}]% - \fi -\to \everybeforecorrespondence - -\appendtoks - \ifx\currentcorrespondence\v!memo - \doif{\correspondenceoptionparameter\c!marking}\v!no{\setupmemolayer[\v!topmark,\v!botmark,\v!cutmark,\v!endmark,\v!usermark][\c!state=\v!stop]}% - \fi -\to \everybeforecorrespondence - -% Labels - -\def\????memotext{@@@@memotext} - -\def\setupmemotext - {\dodoubleempty\dosetupmemotext} - -\def\dosetupmemotext[#1][#2]% - {\ifsecondargument - \def\dodosetupmemotext##1{\setuplabeltext[#1][\????memotext##1]}% - \processcommalist[#2]\dodosetupmemotext - \else - \def\dodosetupmemotext##1{\setuplabeltext [\????memotext##1]}% - \processcommalist[#1]\dodosetupmemotext - \fi} - -\def\memotext #1{\labeltext {\????memotext#1}} -\def\leftmemotext #1{\leftlabeltext {\????memotext#1}} -\def\rightmemotext#1{\rightlabeltext{\????memotext#1}} - -% pagenumber: - -\setupmemotext[\s!en][\c!pagenumber={Page , of }] -\setupmemotext[\s!nl][\c!pagenumber=] -\setupmemotext[\s!de][\c!pagenumber={Seite , von }] -\setupmemotext[\s!fr][\c!pagenumber=] -\setupmemotext[\s!it][\c!pagenumber=] -\setupmemotext[\s!es][\c!pagenumber=] - -% date: - -\setupmemotext[\s!en][\c!date=Date: ] -\setupmemotext[\s!nl][\c!date=Datum: ] -\setupmemotext[\s!de][\c!date=Datum: ] -\setupmemotext[\s!fr][\c!date=Date\thinspace: ] -\setupmemotext[\s!it][\c!date=Data: ] -\setupmemotext[\s!es][\c!date=Fecha: ] - -% fromname: - -\setupmemotext[\s!en][\c!fromname=From: ] -\setupmemotext[\s!nl][\c!fromname=Van: ] -\setupmemotext[\s!de][\c!fromname=Von: ] -\setupmemotext[\s!fr][\c!fromname=De\thinspace: ] -\setupmemotext[\s!it][\c!fromname=Da: ] -\setupmemotext[\s!es][\c!fromname=De: ] - -% toname: - -\setupmemotext[\s!en][\c!toname=To: ] -\setupmemotext[\s!nl][\c!toname=Aan: ] -\setupmemotext[\s!de][\c!toname=An: ] -\setupmemotext[\s!fr][\c!toname=\Agrave\thinspace: ] -\setupmemotext[\s!it][\c!toname=A: ] -\setupmemotext[\s!es][\c!toname=A: ] - -% subject: - -\setupmemotext[\s!en][\c!subject=Subject: ] -\setupmemotext[\s!nl][\c!subject=Onderwerp: ] -\setupmemotext[\s!de][\c!subject=Betrifft: ] -\setupmemotext[\s!fr][\c!subject=Concernant\thinspace: ] -\setupmemotext[\s!it][\c!subject=Oggetto: ] -\setupmemotext[\s!es][\c!subject=Asunto: ] - -% address: - -\setupmemotext[\s!en][\c!address=Address] -\setupmemotext[\s!nl][\c!address=] -\setupmemotext[\s!de][\c!address=Adresse] -\setupmemotext[\s!fr][\c!address=] -\setupmemotext[\s!it][\c!address=] -\setupmemotext[\s!es][\c!address=] - -% Files - -\usememostyle[default,\currentmoduleparameter\c!style] - -\stopmodule - -\protect \endinput diff --git a/macros/context/contrib/context-letter/tex/context/third/letter/base/s-cor-02.mkvi b/macros/context/contrib/context-letter/tex/context/third/letter/base/s-cor-02.mkvi index 6b543d1970..8bdb4ae8fa 100644 --- a/macros/context/contrib/context-letter/tex/context/third/letter/base/s-cor-02.mkvi +++ b/macros/context/contrib/context-letter/tex/context/third/letter/base/s-cor-02.mkvi @@ -60,7 +60,6 @@ \def\setupmemodescription {\dotripleargument\correspondence_description_setup [\v!memo]} \def\setupmemohead {\dotripleargument\correspondence_head_setup [\v!memo]} \def\setupmemooptions {\dodoubleargument\correspondence_option_setup [\v!memo]} -\def\setupmemo {\dodoubleargument\correspondence_setup [\v!memo]} \def\setupmemolayeralternative {\dotripleargument\correspondence_layer_alternative_setup [\v!memo]} \def\setupmemosectionalternative {\dotripleargument\correspondence_section_alternative_setup [\v!memo]} @@ -186,7 +185,7 @@ \correspondenceparameter\c!fromaddress \stopsetups -\startsetups[\???memosectionrenderings\v!head:\v!memo] +\startsetups[\????memosectionrenderings:\v!head:\v!memo] \def\\{\correspondencesectionparameter\c!separator} \startpacked \doifsomething{\correspondenceparameter\c!fromname}{\memotext\c!fromname \correspondenceparameter\c!fromname \par} @@ -341,7 +340,7 @@ % for backwards compatibility \startsetups[\v!memo:\v!place] -\correspondence_place[\v!memo] +\placecorrespondence[\v!memo] \stopsetups % Extras diff --git a/macros/context/contrib/context-letter/tex/context/third/letter/base/s-cor-03.mkvi b/macros/context/contrib/context-letter/tex/context/third/letter/base/s-cor-03.mkvi index 8f973cf46d..b24f3220be 100644 --- a/macros/context/contrib/context-letter/tex/context/third/letter/base/s-cor-03.mkvi +++ b/macros/context/contrib/context-letter/tex/context/third/letter/base/s-cor-03.mkvi @@ -64,7 +64,6 @@ \def\setupresumehead {\dotripleargument\correspondence_head_setup [\v!resume]} \def\setupresumeparagraph {\dotripleargument\correspondence_paragraph_setup [\v!resume]} \def\setupresumeoptions {\dodoubleargument\correspondence_option_setup [\v!resume]} -\def\setupresume {\dodoubleargument\correspondence_setup [\v!resume]} \def\setupresumelayeralternative {\dotripleargument\correspondence_layer_alternative_setup [\v!resume]} \def\setupresumesectionalternative {\dotripleargument\correspondence_section_alternative_setup [\v!resume]} diff --git a/macros/context/contrib/context-letter/tex/context/third/letter/base/t-letter.mkii b/macros/context/contrib/context-letter/tex/context/third/letter/base/t-letter.mkii deleted file mode 100644 index 6db1d21484..0000000000 --- a/macros/context/contrib/context-letter/tex/context/third/letter/base/t-letter.mkii +++ /dev/null @@ -1,30 +0,0 @@ -%D \module -%D [ file=t-letter, -%D version=2011.12.15, -%D title=\CONTEXT\ User Module, -%D subtitle=Letters, -%D author=Wolfgang Schuster, -%D date=\currentdate, -%D copyright=Wolfgang Schuster, -%D license=GNU General Public License] - -%C Copyright (C) 2011 Wolfgang Schuster -%C -%C This program is free software: you can redistribute it and/or modify -%C it under the terms of the GNU General Public License as published by -%C the Free Software Foundation, either version 3 of the License, or -%C (at your option) any later version. -%C -%C This program is distributed in the hope that it will be useful, -%C but WITHOUT ANY WARRANTY; without even the implied warranty of -%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -%C GNU General Public License for more details. -%C -%C You should have received a copy of the GNU General Public License -%C along with this program. If not, see . - -\unprotect - -\usemodule[cor-01] - -\protect \endinput diff --git a/macros/context/contrib/context-letter/tex/context/third/letter/base/t-letter.mkiv b/macros/context/contrib/context-letter/tex/context/third/letter/base/t-letter.mkiv deleted file mode 100644 index ee2ff34e5b..0000000000 --- a/macros/context/contrib/context-letter/tex/context/third/letter/base/t-letter.mkiv +++ /dev/null @@ -1,66 +0,0 @@ -%D \module -%D [ file=t-letter, -%D version=2011.12.16, -%D title=\CONTEXT\ User Module, -%D subtitle=Letters, -%D author=Wolfgang Schuster, -%D date=\currentdate, -%D copyright=Wolfgang Schuster, -%D license=GNU General Public License] - -%C Copyright (C) 2011 Wolfgang Schuster -%C -%C This program is free software: you can redistribute it and/or modify -%C it under the terms of the GNU General Public License as published by -%C the Free Software Foundation, either version 3 of the License, or -%C (at your option) any later version. -%C -%C This program is distributed in the hope that it will be useful, -%C but WITHOUT ANY WARRANTY; without even the implied warranty of -%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -%C GNU General Public License for more details. -%C -%C You should have received a copy of the GNU General Public License -%C along with this program. If not, see . - -\unprotect - -\startinterface all - \setinterfacevariable {letter} {letter} -\stopinterface - -\def\useletterstyle {\dosingleargument\gobbleoneoptional} - -\def\setupletter {\dosingleargument\gobbleoneoptional} -\def\setupletterstyle {\dodoubleargument\gobbletwooptionals} -\def\setupletterlayer {\dodoubleargument\gobbletwooptionals} -\def\setupletterframe {\dodoubleargument\gobbletwooptionals} -\def\setupletterlayout {\dodoubleargument\gobbletwooptionals} -\def\setuplettersection {\dodoubleargument\gobbletwooptionals} -\def\setupletterdescription {\dodoubleargument\gobbletwooptionals} -\def\setupletteroptions {\dodoubleargument\gobbletwooptionals} -\def\setuplettertext {\dodoubleargument\gobbletwooptionals} - -\def\defineletterelements {\dodoubleargument\gobbletwooptionals} -\def\setupletterelements {\dodoubleargument\gobbletwooptionals} - -\def\letterelement {\dotripleargument\gobblethreeoptionals} - -\def\defineletterelement - {\dotripleargument\dodefineletterelement} - -\def\dodefineletterelement[#1][#2][#3]#4{} - -\setvalue{\e!start\v!letter}% - {\starttext - \dostartbuffer[\v!letter][\e!start\v!letter][\e!stop\v!letter]} - -\setvalue{\e!stop\v!letter}% - {\startstandardmakeup[\c!align=\v!middle,\c!style=\ttd\setupinterlinespace] - The \MKIV\ version of the \CONTEXT\ letter module requires a installation from \date[d=14,m=12,y=2011][year,.,mm,.,dd] or newer but the version you’re using is \contextversion. - \blank[2*\v!line] - You can either use the \MKII\ version of the module or install the \CONTEXT\ Suite from the http://wiki.contextgarden.net. - \stopstandardmakeup - \stoptext} - -\protect \endinput diff --git a/macros/context/contrib/context-letter/tex/context/third/letter/base/t-memo.mkii b/macros/context/contrib/context-letter/tex/context/third/letter/base/t-memo.mkii deleted file mode 100644 index 99a4819d40..0000000000 --- a/macros/context/contrib/context-letter/tex/context/third/letter/base/t-memo.mkii +++ /dev/null @@ -1,30 +0,0 @@ -%D \module -%D [ file=t-memo, -%D version=2011.12.15, -%D title=\CONTEXT\ User Module, -%D subtitle=Memos, -%D author=Wolfgang Schuster, -%D date=\currentdate, -%D copyright=Wolfgang Schuster, -%D license=GNU General Public License] - -%C Copyright (C) 2011 Wolfgang Schuster -%C -%C This program is free software: you can redistribute it and/or modify -%C it under the terms of the GNU General Public License as published by -%C the Free Software Foundation, either version 3 of the License, or -%C (at your option) any later version. -%C -%C This program is distributed in the hope that it will be useful, -%C but WITHOUT ANY WARRANTY; without even the implied warranty of -%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -%C GNU General Public License for more details. -%C -%C You should have received a copy of the GNU General Public License -%C along with this program. If not, see . - -\unprotect - -\usemodule[cor-02] - -\protect \endinput diff --git a/macros/context/contrib/context-letter/tex/context/third/letter/base/t-memo.mkiv b/macros/context/contrib/context-letter/tex/context/third/letter/base/t-memo.mkiv deleted file mode 100644 index d890dad806..0000000000 --- a/macros/context/contrib/context-letter/tex/context/third/letter/base/t-memo.mkiv +++ /dev/null @@ -1,66 +0,0 @@ -%D \module -%D [ file=t-memo, -%D version=2011.12.16, -%D title=\CONTEXT\ User Module, -%D subtitle=Memos, -%D author=Wolfgang Schuster, -%D date=\currentdate, -%D copyright=Wolfgang Schuster, -%D license=GNU General Public License] - -%C Copyright (C) 2011 Wolfgang Schuster -%C -%C This program is free software: you can redistribute it and/or modify -%C it under the terms of the GNU General Public License as published by -%C the Free Software Foundation, either version 3 of the License, or -%C (at your option) any later version. -%C -%C This program is distributed in the hope that it will be useful, -%C but WITHOUT ANY WARRANTY; without even the implied warranty of -%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -%C GNU General Public License for more details. -%C -%C You should have received a copy of the GNU General Public License -%C along with this program. If not, see . - -\unprotect - -\startinterface all - \setinterfacevariable {memo} {memo} -\stopinterface - -\def\usememostyle {\dosingleargument\gobbleoneoptional} - -\def\setupmemo {\dosingleargument\gobbleoneoptional} -\def\setupmemostyle {\dodoubleargument\gobbletwooptionals} -\def\setupmemolayer {\dodoubleargument\gobbletwooptionals} -\def\setupmemoframe {\dodoubleargument\gobbletwooptionals} -\def\setupmemolayout {\dodoubleargument\gobbletwooptionals} -\def\setupmemosection {\dodoubleargument\gobbletwooptionals} -\def\setupmemodescription {\dodoubleargument\gobbletwooptionals} -\def\setupmemooptions {\dodoubleargument\gobbletwooptionals} -\def\setupmemotext {\dodoubleargument\gobbletwooptionals} - -\def\definememoelements {\dodoubleargument\gobbletwooptionals} -\def\setupmemoelements {\dodoubleargument\gobbletwooptionals} - -\def\memoelement {\dotripleargument\gobblethreeoptionals} - -\def\definememoelement - {\dotripleargument\dodefinememoelement} - -\def\dodefinememoelement[#1][#2][#3]#4{} - -\setvalue{\e!start\v!memo}% - {\starttext - \dostartbuffer[\v!memo][\e!start\v!memo][\e!stop\v!memo]} - -\setvalue{\e!stop\v!memo}% - {\startstandardmakeup[\c!align=\v!middle,\c!style=\ttd\setupinterlinespace] - The \MKIV\ version of the \CONTEXT\ memo module requires a installation from \date[d=14,m=12,y=2011][year,.,mm,.,dd] or newer but the version you’re using is \contextversion. - \blank[2*\v!line] - You can either use the \MKII\ version of the module or install the \CONTEXT\ Suite from the http://wiki.contextgarden.net. - \stopstandardmakeup - \stoptext} - -\protect \endinput diff --git a/macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-blockstyle.mkii b/macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-blockstyle.mkii deleted file mode 100644 index 600280e5bf..0000000000 --- a/macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-blockstyle.mkii +++ /dev/null @@ -1,62 +0,0 @@ -%D \module -%D [ file=letter-imp-blockstyle, -%D version=2011.12.24, -%D title=\CONTEXT\ Letter Style, -%D subtitle=Blockstyle basics, -%D author=Wolfgang Schuster, -%D date=\currentdate, -%D copyright=Wolfgang Schuster, -%D license=GNU General Public License] - -%C Copyright (C) 2011 Wolfgang Schuster -%C -%C This program is free software: you can redistribute it and/or modify -%C it under the terms of the GNU General Public License as published by -%C the Free Software Foundation, either version 3 of the License, or -%C (at your option) any later version. -%C -%C This program is distributed in the hope that it will be useful, -%C but WITHOUT ANY WARRANTY; without even the implied warranty of -%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -%C GNU General Public License for more details. -%C -%C You should have received a copy of the GNU General Public License -%C along with this program. If not, see . - -\useletterstyle[default] - -\setuplettersection - [\v!head,\v!date,\v!reference,\v!specialnotation,\v!address] - [\c!alternative=\v!blockstyle] - -\setupletteroptions - [\c!marking=\v!no] - -\setupletterelements - [\v!layer] - [\v!lettermain, - \v!letternext, - \v!nexthead, - \v!lefthead, - \v!righthead, - \v!foot, - \v!nextfoot, - \v!topmark, - \v!botmark, - \v!cutmark] - -\setupletterelements - [\v!section] - [\v!head, - \v!date, - \v!reference, - \v!specialnotation, - \v!address, - \v!title, - \v!opening, - \v!subject, - \v!content, - \v!closing, - \v!appendices] - -\endinput diff --git a/macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-default.mkii b/macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-default.mkii deleted file mode 100644 index ee986cf8de..0000000000 --- a/macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-default.mkii +++ /dev/null @@ -1,133 +0,0 @@ -%D \module -%D [ file=letter-imp-default, -%D version=2012.06.10, -%D title=\CONTEXT\ User Module, -%D subtitle=Default letter style, -%D author=Wolfgang Schuster, -%D date=\currentdate, -%D copyright=Wolfgang Schuster, -%D license=GNU General Public License] - -%C Copyright (C) 2011 Wolfgang Schuster -%C -%C This program is free software: you can redistribute it and/or modify -%C it under the terms of the GNU General Public License as published by -%C the Free Software Foundation, either version 3 of the License, or -%C (at your option) any later version. -%C -%C This program is distributed in the hope that it will be useful, -%C but WITHOUT ANY WARRANTY; without even the implied warranty of -%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -%C GNU General Public License for more details. -%C -%C You should have received a copy of the GNU General Public License -%C along with this program. If not, see . - -\setupletter - [\c!date=\currentdate] - -\setupletterlayer - [\v!head,\v!nexthead,\v!lefthead,\v!righthead] - [\c!x=\backspace, - \c!y=\topspace] - -\setupletterframe - [\v!head,\v!nexthead,\v!lefthead,\v!righthead] - [\c!width=\textwidth] - -\setupletterlayer - [\v!foot,\v!nextfoot,\v!leftfoot,\v!rightfoot] - [\c!preset=\v!left\v!bottom, - \c!x=\backspace, - \c!y=\bottomspace] - -\setupletterframe - [\v!foot,\v!nextfoot,\v!leftfoot,\v!rightfoot] - [\c!width=\textwidth, - \c!height=\footerheight] - -%\setupletterlayer -% [\v!head] -% [\c!rulewidth=\hsize, -% \c!fromrule=\v!no, -% \c!rulecolor=\v!black, -% \c!alternative=\v!left] - -\setupletterlayer - [\v!nexthead,\v!nextfoot] - [\c!state=\v!next] - -\setupletterlayer - [\v!lefthead,\v!leftfoot] - [\c!state=\v!left] - -\setupletterlayer - [\v!righthead,\v!rightfoot] - [\c!state=\v!right] - -\setupletterlayer - [\v!backaddress] - [\c!alternative=\v!auto, - \c!separator={, }] - -\setupletterlayer - [\v!reference] - [\c!alternative=\v!a, - \c!list=\c!date] - -\setuplettersection - [\v!closing] - [\c!spaceafter=\v!line, - \c!spaceinbetween={\v!samepage,2*\v!line}] - -\defineletterelements - [\v!layer] - [\v!lettermain, - \v!letternext, - \v!head, - \v!nexthead, - \v!lefthead, - \v!righthead, - \v!foot, - \v!nextfoot, - \v!topmark, - \v!botmark, - \v!cutmark, - \v!endmark, - \v!usermark, - \v!backaddress, - \v!address, - \v!reference, - \v!location] - -\defineletterelements - [\v!section] - [\v!title, - \v!subject, - \v!opening, - \v!content, - \v!closing, - \v!appendices] - -\defineletterelements - [\v!description] - [\v!copy, - \v!enclosure, - \v!postscript] - -\setupletterdescription - [\c!copy] - [\c!headcommand=\lettertext\v!copy, - \c!textcommand=\correspondenceparameter\c!copy] - -\setupletterdescription - [\c!enclosure] - [\c!headcommand=\lettertext\v!enclosure, - \c!textcommand=\correspondenceparameter\c!enclosure] - -\setupletterdescription - [\c!postscript] - [\c!headcommand=\lettertext\v!postscript, - \c!textcommand=\correspondenceparameter\c!postscript] - -\endinput diff --git a/macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-dina.mkii b/macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-dina.mkii deleted file mode 100644 index fb54b77614..0000000000 --- a/macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-dina.mkii +++ /dev/null @@ -1,52 +0,0 @@ -%D \module -%D [ file=letter-imp-dina, -%D version=2011.10.29, -%D title=\CONTEXT\ Letter Style, -%D subtitle=DIN 676 A, -%D author=Wolfgang Schuster, -%D date=\currentdate, -%D copyright=Wolfgang Schuster, -%D license=GNU General Public License] - -%C Copyright (C) 2011 Wolfgang Schuster -%C -%C This program is free software: you can redistribute it and/or modify -%C it under the terms of the GNU General Public License as published by -%C the Free Software Foundation, either version 3 of the License, or -%C (at your option) any later version. -%C -%C This program is distributed in the hope that it will be useful, -%C but WITHOUT ANY WARRANTY; without even the implied warranty of -%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -%C GNU General Public License for more details. -%C -%C You should have received a copy of the GNU General Public License -%C along with this program. If not, see . - -\useletterstyle[dinb] - -\setupletterlayout - [\v!firstpage] - [\c!topspace=97.4mm] - -\setupletterlayer - [\v!topmark] - [\c!y=87mm] - -\setupletterlayer - [\v!botmark] - [\c!y=192mm] - -\setupletterframe - [\v!head] - [\c!height=10.1mm] - -\setupletterlayer - [\v!address] - [\c!y=32mm] - -\setupletterlayer - [\v!reference] - [\c!y=80.4mm] - -\endinput diff --git a/macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-dinb.mkii b/macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-dinb.mkii deleted file mode 100644 index f1a4ac9268..0000000000 --- a/macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-dinb.mkii +++ /dev/null @@ -1,139 +0,0 @@ -%D \module -%D [ file=letter-imp-dinb, -%D version=2011.10.29, -%D title=\CONTEXT\ Letter Style, -%D subtitle=DIN 676 B, -%D author=Wolfgang Schuster, -%D date=\currentdate, -%D copyright=Wolfgang Schuster, -%D license=GNU General Public License] - -%C Copyright (C) 2011 Wolfgang Schuster -%C -%C This program is free software: you can redistribute it and/or modify -%C it under the terms of the GNU General Public License as published by -%C the Free Software Foundation, either version 3 of the License, or -%C (at your option) any later version. -%C -%C This program is distributed in the hope that it will be useful, -%C but WITHOUT ANY WARRANTY; without even the implied warranty of -%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -%C GNU General Public License for more details. -%C -%C You should have received a copy of the GNU General Public License -%C along with this program. If not, see . - -\useletterstyle[default] - -\setupletterlayout - [\v!firstpage,\v!secondpage] - [\c!topspace=114.3mm, - \c!bottomspace=30mm, % unknown value! - \c!backspace=24.1mm, - \c!header=0mm, - \c!footer=0mm, % unknown value! - \c!width=\v!middle, - \c!height=\v!middle] - -\setupletterlayout - [\v!secondpage] - [\c!topspace=20mm, - \c!bottomspace=20mm, - \c!header=10mm, - \c!footer=10mm] - -\setuplettersection - [\v!title,\v!subject,\v!opening,\v!appendices] - [\c!spacebefore=, - \c!spaceafter=\v!line] - -\setuplettersection - [\v!title] - [\c!align=\v!middle, - \c!style=\v!bold] - -\setuplettersection - [\v!subject] - [\c!spaceafter={2*\v!line}, - \c!style=\v!bold] - -\setuplettersection - [\v!content] - [\c!spaceafter={\v!samepage,\v!line}] - -\setuplettersection - [\v!closing] - [\c!spaceafter={3*\v!line}] - -\setupletterlayer - [\v!topmark,\v!botmark,\v!cutmark] - [\c!state=\v!start, - \c!x=5mm, - \c!symbol=\v!cutmark] - -\setupletterframe - [\v!topmark,\v!botmark,\v!cutmark] - [\c!strut=\v!no] - -\setupletterlayer - [\v!topmark] - [\c!y=105mm] - -\setupletterlayer - [\v!botmark] - [\c!y=210mm] - -\setupletterlayer - [\v!cutmark] - [\c!y=.5\paperheight] - -\setupletterlayer - [\v!head,\v!nexthead,\v!lefthead,\v!righthead] - [\c!x=\backspace, - \c!y=16.9mm] - -\setupletterframe - [\v!head,\v!nexthead,\v!lefthead,\v!righthead] - [\c!width=\textwidth, - \c!height=28.1mm] - -\setupletterlayer - [\v!foot,\v!nextfoot,\v!leftfoot,\v!rightfoot] - [\c!y=20mm] - -\setupletterframe - [\v!foot,\v!nextfoot,\v!leftfoot,\v!rightfoot] - [\c!height=10mm] - -\setupletterlayer - [\v!address] - [\c!x=\backspace, - \c!y=50mm] - -\setupletterframe - [\v!address] - [\c!width=85mm, - \c!height=40mm] - -\setupletterlayer - [\v!backaddress] - [\c!x=\backspace, - \c!y=\dimexpr\namedletterlayerparameter\v!address\c!y-\namedletterframeparameter\v!backaddress\c!height\relax, - \c!style=\tfxx] - -\setupletterframe - [\v!backaddress] - [\c!height=5mm, - \c!width=85mm] - -\setupletterlayer - [\v!reference] - [\c!x=\backspace, - \c!y=93.2mm] - -\setupletterframe - [\v!reference] - [\c!width=\textwidth, - \c!height=8.4mm] - -\endinput diff --git a/macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-dutch.mkii b/macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-dutch.mkii deleted file mode 100644 index 27b84b5de1..0000000000 --- a/macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-dutch.mkii +++ /dev/null @@ -1,79 +0,0 @@ -%D \module -%D [ file=letter-imp-dutch, -%D version=2011.11.01, -%D title=\CONTEXT\ Letter Style, -%D subtitle=Dutch style, -%D author=Wolfgang Schuster, -%D date=\currentdate, -%D copyright=Wolfgang Schuster, -%D license=GNU General Public License] - -%C Copyright (C) 2011 Wolfgang Schuster -%C -%C This program is free software: you can redistribute it and/or modify -%C it under the terms of the GNU General Public License as published by -%C the Free Software Foundation, either version 3 of the License, or -%C (at your option) any later version. -%C -%C This program is distributed in the hope that it will be useful, -%C but WITHOUT ANY WARRANTY; without even the implied warranty of -%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -%C GNU General Public License for more details. -%C -%C You should have received a copy of the GNU General Public License -%C along with this program. If not, see . - -\useletterstyle[dinb] - -\setupletterlayout - [\v!firstpage,\v!secondpage] - [\c!topspace=105mm, - \c!bottomspace=30mm, - \c!backspace=33mm, - \c!width=\v!middle, - \c!height=\v!middle] - -\setupletterlayout - [\v!secondpage] - [\c!topspace=20mm, - \c!header=15mm, - \c!headerdistance=15mm, - \c!height=\v!middle] - -\setupletterlayer - [\v!topmark,\v!cutmark] - [\c!state=\v!repeat, - \c!x=3.5mm] - -\setuplettersection - [\v!subject] - [\c!spaceafter=\v!line] - -\setuplettersection - [\v!closing] - [\c!spaceinbetween=\v!line] - -\setupletterlayer - [\v!address] - [\c!y=55mm] - -\setupletterframe - [\v!address] - [\c!height=35mm, - \c!width=80mm] - -\setupletterlayer - [\v!backaddress] - [\c!y=50mm] - -\setupletterframe - [\v!backaddress] - [\c!width=80mm, - \c!height=5mm, - \c!bottomframe=\v!on] - -\setupletterlayer - [\v!botmark] - [\c!state=\v!stop] - -\endinput diff --git a/macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-french.mkii b/macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-french.mkii deleted file mode 100644 index 91ec549d83..0000000000 --- a/macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-french.mkii +++ /dev/null @@ -1,94 +0,0 @@ -%D \module -%D [ file=letter-imp-french, -%D version=2013.06.21, -%D title=\CONTEXT\ Letter Style, -%D subtitle=French style, -%D author=Wolfgang Schuster, -%D date=\currentdate, -%D copyright=Wolfgang Schuster, -%D license=GNU General Public License] - -%C Copyright (C) 2011 Wolfgang Schuster -%C -%C This program is free software: you can redistribute it and/or modify -%C it under the terms of the GNU General Public License as published by -%C the Free Software Foundation, either version 3 of the License, or -%C (at your option) any later version. -%C -%C This program is distributed in the hope that it will be useful, -%C but WITHOUT ANY WARRANTY; without even the implied warranty of -%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -%C GNU General Public License for more details. -%C -%C You should have received a copy of the GNU General Public License -%C along with this program. If not, see . - -\useletterstyle[dinb] - -\setupletterlayout - [\v!firstpage,\v!secondpage] - [\c!backspace=25mm, - \c!width=\v!middle, - \c!topspace=95mm, - \c!bottomspace=25mm, - \c!height=\v!fit] - -\setupletterlayout - [\v!secondpage] - [\c!topspace=15mm, - \c!header=10mm] - -\setupletterlayer - [\v!cutmark,\v!botmark] - [\c!state=\v!stop] - -\setupletterlayer - [\v!head] - [\c!x=\backspace, - \c!y=25mm] - -\setupletterlayer - [\v!backaddress] - [\c!state=\v!stop] - -\setupletterlayer - [\v!address] - [\c!x=107mm, - \c!y=55mm] - -\setupletterlayer - [\v!location] - [\c!x=107mm, - \c!y=30mm, - \c!alternative=\v!french] - -\setupletterlayer - [\v!reference] - [\c!state=\v!stop] - -\setuplettersection - [\v!closing] - [\c!spaceinbetween={\v!samepage,2*\v!line}] - -\setupletterdescription - [\v!enclosure] - [\c!location=\v!left, - \c!width=\v!fit, - \c!headstyle=\tf] - -\setuplettersection - [\v!opening] - [\c!spaceafter={2*\v!line}] - -\setuplettersection - [\v!content] - [\c!spaceafter={\v!samepage,2*\v!line}] - -\setuplettersection - [\v!opening,\v!closing] - [\c!alternative=\v!french] - -\setupletteroptions - [\c!whitespace=\v!line] - -\endinput diff --git a/macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-fullblock.mkii b/macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-fullblock.mkii deleted file mode 100644 index c8a246496c..0000000000 --- a/macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-fullblock.mkii +++ /dev/null @@ -1,52 +0,0 @@ -%D \module -%D [ file=letter-imp-fullblock, -%D version=2011.12.24, -%D title=\CONTEXT\ Letter Style, -%D subtitle=Fullblock style, -%D author=Wolfgang Schuster, -%D date=\currentdate, -%D copyright=Wolfgang Schuster, -%D license=GNU General Public License] - -%C Copyright (C) 2011 Wolfgang Schuster -%C -%C This program is free software: you can redistribute it and/or modify -%C it under the terms of the GNU General Public License as published by -%C the Free Software Foundation, either version 3 of the License, or -%C (at your option) any later version. -%C -%C This program is distributed in the hope that it will be useful, -%C but WITHOUT ANY WARRANTY; without even the implied warranty of -%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -%C GNU General Public License for more details. -%C -%C You should have received a copy of the GNU General Public License -%C along with this program. If not, see . - -\useletterstyle[blockstyle] - -\setupletterlayout - [\v!firstpage,\v!secondpage] - [\c!backspace=1in, - \c!width=\v!middle, - \c!topspace=1in, - \c!header=0in, - \c!footer=0in, - \c!height=\v!fit] - -\setupletterlayout - [\v!secondpage] - [\c!header=.5in] - -\setuplettersection - [\v!closing] - [\c!spaceafter={2*\v!line}] - -\setupletterlayer - [\v!nexthead] - [\c!alternative=\v!fullblock] - -\setupletteroptions - [\c!whitespace=\v!line] - -\endinput diff --git a/macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-gbrief.mkii b/macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-gbrief.mkii deleted file mode 100644 index 0794da75da..0000000000 --- a/macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-gbrief.mkii +++ /dev/null @@ -1,56 +0,0 @@ -%D \module -%D [ file=letter-imp-gbrief, -%D version=2011.11.01, -%D title=\CONTEXT\ Letter Style, -%D subtitle=g-brief, -%D author=Wolfgang Schuster, -%D date=\currentdate, -%D copyright=Wolfgang Schuster, -%D license=GNU General Public License] - -%C Copyright (C) 2011 Wolfgang Schuster -%C -%C This program is free software: you can redistribute it and/or modify -%C it under the terms of the GNU General Public License as published by -%C the Free Software Foundation, either version 3 of the License, or -%C (at your option) any later version. -%C -%C This program is distributed in the hope that it will be useful, -%C but WITHOUT ANY WARRANTY; without even the implied warranty of -%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -%C GNU General Public License for more details. -%C -%C You should have received a copy of the GNU General Public License -%C along with this program. If not, see . - -\useletterstyle[dinb] - -\setupletterlayer - [\v!reference] - [\c!alternative=\v!a] - -\setupletterlayer - [\v!backaddress] - [\c!separator={~\mathematics\cdot~}] - -\setupletterframe - [\v!backaddress] - [\c!bottomframe=\v!on] - -\setupletterlayer - [\v!head,\v!foot,\v!nexthead] - [\c!alternative=\v!gbrief] - -\setupletterlayer - [\v!head] - [\c!style={\switchtobodyfont[20pt]\sc}] - -\setupletterlayer - [\v!foot] - [\c!style=\txx] - -\setupletterlayer - [\v!nexthead] - [\c!style=\v!smallcaps] - -\endinput diff --git a/macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-hanging.mkii b/macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-hanging.mkii deleted file mode 100644 index ecb9708cb7..0000000000 --- a/macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-hanging.mkii +++ /dev/null @@ -1,61 +0,0 @@ -%D \module -%D [ file=letter-imp-hanging, -%D version=2011.12.24, -%D title=\CONTEXT\ Letter Style, -%D subtitle=Hanging indented style, -%D author=Wolfgang Schuster, -%D date=\currentdate, -%D copyright=Wolfgang Schuster, -%D license=GNU General Public License] - -%C Copyright (C) 2011 Wolfgang Schuster -%C -%C This program is free software: you can redistribute it and/or modify -%C it under the terms of the GNU General Public License as published by -%C the Free Software Foundation, either version 3 of the License, or -%C (at your option) any later version. -%C -%C This program is distributed in the hope that it will be useful, -%C but WITHOUT ANY WARRANTY; without even the implied warranty of -%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -%C GNU General Public License for more details. -%C -%C You should have received a copy of the GNU General Public License -%C along with this program. If not, see . - -\useletterstyle[blockstyle] - -\setupletterlayout - [\v!firstpage,\v!secondpage] - [\c!backspace=1in, - \c!width=\v!middle, - \c!topspace=1in, - \c!header=0in, - \c!footer=0in, - \c!height=\v!fit] - -\setupletterlayout - [\v!secondpage] - [\c!header=1in] - -\setuplettersection - [\v!head,\v!reference,\v!date,\v!specialnotation,\v!closing] - [\c!leftmargin=.5\textwidth] - -\setuplettersection - [\v!content] - [\c!leftmargin=1.5em, - \c!indenting={\v!yes,-1.5em}] - -\setuplettersection - [\v!closing] - [\c!spaceafter={2*\v!line}] - -\setupletterlayer - [\v!nexthead] - [\c!alternative=\v!hanging] - -\setupletteroptions - [\c!whitespace=\v!line] - -\endinput diff --git a/macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-knuth.mkii b/macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-knuth.mkii deleted file mode 100644 index ec90177ea4..0000000000 --- a/macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-knuth.mkii +++ /dev/null @@ -1,71 +0,0 @@ -%D \module -%D [ file=letter-imp-knuth, -%D version=2011.12.26, -%D title=\CONTEXT\ User Module, -%D subtitle=Knuth letter style, -%D author=Wolfgang Schuster, -%D date=\currentdate, -%D copyright=Wolfgang Schuster, -%D license=GNU General Public License] - -%C Copyright (C) 2011 Wolfgang Schuster -%C -%C This program is free software: you can redistribute it and/or modify -%C it under the terms of the GNU General Public License as published by -%C the Free Software Foundation, either version 3 of the License, or -%C (at your option) any later version. -%C -%C This program is distributed in the hope that it will be useful, -%C but WITHOUT ANY WARRANTY; without even the implied warranty of -%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -%C GNU General Public License for more details. -%C -%C You should have received a copy of the GNU General Public License -%C along with this program. If not, see . - -\useletterstyle[default] - -\setupletterstyle - [\v!firstpage,\v!secondpage] - [\c!backspace=1in, - \c!cutspace=1in, - \c!width=\v!middle] - -\setupletterstyle - [\v!firstpage] - [\c!header=0pt, - \c!topspace=2.2in, - \c!bottomspace=1.5in, - \c!height=\v!middle] - -\setupletterlayer - [\v!nexthead] - [\c!alternative=\v!knuth] - -\setuplettersection - [\v!address] - [\c!alternative=\v!knuth] - -\setuplettersection - [\v!closing] - [\c!alternative=\v!knuth, - \c!spaceinbetween=1cm] - -\setupletteroptions - [\c!whitespace=\v!line] - -\setupletterelements - [\v!layer] - [\v!lettermain, - \v!letternext, - \v!nexthead] - -\setupletterelements - [\v!section] - [\v!address, - \v!opening, - \v!content, - \v!closing] - - -\endinput diff --git a/macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-modified.mkii b/macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-modified.mkii deleted file mode 100644 index 17cb865b4b..0000000000 --- a/macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-modified.mkii +++ /dev/null @@ -1,56 +0,0 @@ -%D \module -%D [ file=letter-imp-modified, -%D version=2011.12.24, -%D title=\CONTEXT\ Letter Style, -%D subtitle=Modified block style, -%D author=Wolfgang Schuster, -%D date=\currentdate, -%D copyright=Wolfgang Schuster, -%D license=GNU General Public License] - -%C Copyright (C) 2011 Wolfgang Schuster -%C -%C This program is free software: you can redistribute it and/or modify -%C it under the terms of the GNU General Public License as published by -%C the Free Software Foundation, either version 3 of the License, or -%C (at your option) any later version. -%C -%C This program is distributed in the hope that it will be useful, -%C but WITHOUT ANY WARRANTY; without even the implied warranty of -%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -%C GNU General Public License for more details. -%C -%C You should have received a copy of the GNU General Public License -%C along with this program. If not, see . - -\useletterstyle[blockstyle] - -\setupletterlayout - [\v!firstpage,\v!secondpage] - [\c!backspace=1in, - \c!width=\v!middle, - \c!topspace=1in, - \c!header=0in, - \c!footer=0in, - \c!height=\v!middle] - -\setupletterlayout - [\v!secondpage] - [\c!header=1in] - -\setuplettersection - [\v!head,\v!reference,\v!date,\v!specialnotation,\v!closing] - [\c!leftmargin=.5\textwidth] - -\setuplettersection - [\v!closing] - [\c!spaceafter={2*\v!line}] - -\setupletterlayer - [\v!nexthead] - [\c!alternative=\v!hanging] - -\setupletteroptions - [\c!whitespace=\v!line] - -\endinput diff --git a/macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-semiblock.mkii b/macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-semiblock.mkii deleted file mode 100644 index 79a807c3e9..0000000000 --- a/macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-semiblock.mkii +++ /dev/null @@ -1,57 +0,0 @@ -%D \module -%D [ file=letter-imp-semiblock, -%D version=2011.12.24, -%D title=\CONTEXT\ Letter Style, -%D subtitle=Semiblock style, -%D author=Wolfgang Schuster, -%D date=\currentdate, -%D copyright=Wolfgang Schuster, -%D license=GNU General Public License] - -%C Copyright (C) 2011 Wolfgang Schuster -%C -%C This program is free software: you can redistribute it and/or modify -%C it under the terms of the GNU General Public License as published by -%C the Free Software Foundation, either version 3 of the License, or -%C (at your option) any later version. -%C -%C This program is distributed in the hope that it will be useful, -%C but WITHOUT ANY WARRANTY; without even the implied warranty of -%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -%C GNU General Public License for more details. -%C -%C You should have received a copy of the GNU General Public License -%C along with this program. If not, see . - -\useletterstyle[blockstyle] - -\setupletterlayout - [\v!firstpage,\v!secondpage] - [\c!backspace=1in, - \c!width=\v!middle, - \c!topspace=1in, - \c!header=0in, - \c!footer=0in, - \c!height=\v!middle] - -\setupletterlayout - [\v!secondpage] - [\c!header=.5in] - -\setuplettersection - [\v!head,\v!reference,\v!date,\v!specialnotation,\v!closing] - [\c!leftmargin=.5\textwidth] - -\setuplettersection - [\v!closing] - [\c!spaceafter={2*\v!line}] - -\setupletterlayer - [\v!nexthead] - [\c!alternative=\v!semiblock] - -\setupletteroptions - [\c!whitespace=\v!line, - \c!indenting={\v!yes,\v!medium,\v!first}] - -\endinput diff --git a/macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-setups.mkii b/macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-setups.mkii deleted file mode 100644 index bda387d377..0000000000 --- a/macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-setups.mkii +++ /dev/null @@ -1,62 +0,0 @@ -%D \module -%D [ file=letter-imp-setups, -%D version=2012.01.01, -%D title=\CONTEXT\ User Module, -%D subtitle=Setups style, -%D author=Wolfgang Schuster, -%D date=\currentdate, -%D copyright=Wolfgang Schuster, -%D license=GNU General Public License] - -%C Copyright (C) 2011 Wolfgang Schuster -%C -%C This program is free software: you can redistribute it and/or modify -%C it under the terms of the GNU General Public License as published by -%C the Free Software Foundation, either version 3 of the License, or -%C (at your option) any later version. -%C -%C This program is distributed in the hope that it will be useful, -%C but WITHOUT ANY WARRANTY; without even the implied warranty of -%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -%C GNU General Public License for more details. -%C -%C You should have received a copy of the GNU General Public License -%C along with this program. If not, see . - -\setupletterlayer - [\v!head,\v!nexthead,\v!lefthead,\v!righthead] - [\c!alternative=\v!setups] - -\setupletterlayer - [\v!foot,\v!nextfoot,\v!leftfoot,\v!rightfoot] - [\c!alternative=\v!setups] - -\setupletterlayer - [\v!address,\v!backaddress] - [\c!alternative=\v!setups] - -\setupletterlayer - [\v!reference,\v!location] - [\c!alternative=\v!setups] - -% \setupletterlayer -% [\v!topmark,\v!botmark,\v!cutmark,\v!endmark,\v!usermark] -% [\c!alternative=\v!setups] - -\setupletterlayer - [\v!lettermain,\v!letternext] - [\c!alternative=\v!setups] - -\setuplettersection % only used for blockstyle layouts - [\v!head,\v!date,\v!reference,\v!specialnotation,\v!address] - [\c!alternative=\v!setups] - -\setuplettersection % default sections - [\v!title,\v!subject,\v!opening,\v!content,\v!closing,\v!appendices] - [\c!alternative=\v!setups] - -% \setuplettersection % otherwise no text is shown -% [\v!content] -% [\c!alternative=\s!default] - -\endinput diff --git a/macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-simplified.mkii b/macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-simplified.mkii deleted file mode 100644 index 86959ca8c6..0000000000 --- a/macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-simplified.mkii +++ /dev/null @@ -1,65 +0,0 @@ -%D \module -%D [ file=letter-imp-simplified, -%D version=2011.12.24, -%D title=\CONTEXT\ Letter Style, -%D subtitle=Simplified style, -%D author=Wolfgang Schuster, -%D date=\currentdate, -%D copyright=Wolfgang Schuster, -%D license=GNU General Public License] - -%C Copyright (C) 2011 Wolfgang Schuster -%C -%C This program is free software: you can redistribute it and/or modify -%C it under the terms of the GNU General Public License as published by -%C the Free Software Foundation, either version 3 of the License, or -%C (at your option) any later version. -%C -%C This program is distributed in the hope that it will be useful, -%C but WITHOUT ANY WARRANTY; without even the implied warranty of -%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -%C GNU General Public License for more details. -%C -%C You should have received a copy of the GNU General Public License -%C along with this program. If not, see . - -\useletterstyle[blockstyle] - -\setupletterlayout - [\v!firstpage,\v!secondpage] - [\c!backspace=1in, - \c!width=\v!middle, - \c!topspace=1in, - \c!header=0in, - \c!footer=0in, - \c!height=\v!middle] - -\setupletterlayout - [\v!secondpage] - [\c!header=.5in] - -\setuplettersection - [\v!closing] - [\c!spaceafter={2*\v!line}] - -\setuplettersection - [\v!nexthead,\v!closing] - [\c!alternative=\v!simplified] - -\setupletteroptions - [\c!whitespace=\v!line] - -\setupletterelements - [\v!section] - [\v!head - \v!date, - \v!reference, - \v!specialnotation, - \v!address, - \v!title, - \v!subject, - \v!content, - \v!closing, - \v!appendices] - -\endinput diff --git a/macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-swiss.mkii b/macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-swiss.mkii deleted file mode 100644 index 25e35e35f6..0000000000 --- a/macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-swiss.mkii +++ /dev/null @@ -1,54 +0,0 @@ -%D \module -%D [ file=letter-imp-swiss, -%D version=2011.10.29, -%D title=\CONTEXT\ Letter Style, -%D subtitle=Swiss style, -%D author=Wolfgang Schuster, -%D date=\currentdate, -%D copyright=Wolfgang Schuster, -%D license=GNU General Public License] - -%C Copyright (C) 2011 Wolfgang Schuster -%C -%C This program is free software: you can redistribute it and/or modify -%C it under the terms of the GNU General Public License as published by -%C the Free Software Foundation, either version 3 of the License, or -%C (at your option) any later version. -%C -%C This program is distributed in the hope that it will be useful, -%C but WITHOUT ANY WARRANTY; without even the implied warranty of -%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -%C GNU General Public License for more details. -%C -%C You should have received a copy of the GNU General Public License -%C along with this program. If not, see . - -\useletterstyle[dinb] - -\setupletterlayer - [\v!head] - [\c!y=8mm] - -\setupletterlayer - [\v!address,\v!backaddress] - [\c!preset=\v!right\v!top, - \c!x=8mm] - -\setupletterframe - [\v!address,\v!backaddress] - [\c!width=90mm] - -%\setupletterlayer -% [\v!reference] -% [\c!y=98.5mm, -% \c!spaceafter=\v!line] - -\setupletterlayer - [\v!reference] - [\c!y=98.5mm] - -\setupletterlayer - [\v!foldmark] - [\c!state=\v!stop] - -\endinput diff --git a/macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-swissleft.mkii b/macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-swissleft.mkii deleted file mode 100644 index 002e5ffd5e..0000000000 --- a/macros/context/contrib/context-letter/tex/context/third/letter/style/letter-imp-swissleft.mkii +++ /dev/null @@ -1,58 +0,0 @@ -%D \module -%D [ file=letter-imp-swissleft, -%D version=2011.10.29, -%D title=\CONTEXT\ Letter Style, -%D subtitle=Swiss left style, -%D author=Wolfgang Schuster, -%D date=\currentdate, -%D copyright=Wolfgang Schuster, -%D license=GNU General Public License] - -%C Copyright (C) 2011 Wolfgang Schuster -%C -%C This program is free software: you can redistribute it and/or modify -%C it under the terms of the GNU General Public License as published by -%C the Free Software Foundation, either version 3 of the License, or -%C (at your option) any later version. -%C -%C This program is distributed in the hope that it will be useful, -%C but WITHOUT ANY WARRANTY; without even the implied warranty of -%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -%C GNU General Public License for more details. -%C -%C You should have received a copy of the GNU General Public License -%C along with this program. If not, see . - -\useletterstyle[dinb] - -\setupletterlayer - [\v!head] - [\c!y=8mm] - -\setupletterlayer - [\v!address] - [\c!x=20mm, - \c!y=40.5mm] - -\setupletterlayer - [\v!backaddress] - [\c!x=20mm] - -\setupletterframe - [\v!address,\v!backaddress] - [\c!width=100mm] - -%\setupletterlayer -% [\v!reference] -% [\c!y=89mm, -% \c!spaceafter=\v!line] - -\setupletterlayer - [\v!reference] - [\c!y=89mm] - -\setupletterlayer - [\v!foldmark] - [\c!state=\v!stop] - -\endinput diff --git a/macros/context/contrib/context-letter/tex/context/third/letter/style/memo-imp-default.mkii b/macros/context/contrib/context-letter/tex/context/third/letter/style/memo-imp-default.mkii deleted file mode 100644 index 7c1591e5f7..0000000000 --- a/macros/context/contrib/context-letter/tex/context/third/letter/style/memo-imp-default.mkii +++ /dev/null @@ -1,96 +0,0 @@ -%D \module -%D [ file=memo-imp-default, -%D version=2012.02.04, -%D title=\CONTEXT\ User Module, -%D subtitle=Default memo style, -%D author=Wolfgang Schuster, -%D date=\currentdate, -%D copyright=Wolfgang Schuster, -%D license=GNU General Public License] - -%C Copyright (C) 2011 Wolfgang Schuster -%C -%C This program is free software: you can redistribute it and/or modify -%C it under the terms of the GNU General Public License as published by -%C the Free Software Foundation, either version 3 of the License, or -%C (at your option) any later version. -%C -%C This program is distributed in the hope that it will be useful, -%C but WITHOUT ANY WARRANTY; without even the implied warranty of -%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -%C GNU General Public License for more details. -%C -%C You should have received a copy of the GNU General Public License -%C along with this program. If not, see . - -\setupmemo - [\c!date=\currentdate] - -\setupmemooptions - [\c!marking=\v!no] - -\setupmemolayer - [\v!head,\v!nexthead,\v!lefthead,\v!righthead] - [\c!x=\backspace, - \c!y=\topspace] - -\setupmemoframe - [\v!head,\v!nexthead,\v!lefthead,\v!righthead] - [\c!width=\textwidth] - -\setupmemolayer - [\v!foot,\v!nextfoot,\v!leftfoot,\v!rightfoot] - [\c!preset=\v!left\v!bottom, - \c!x=\backspace, - \c!y=\bottomspace] - -\setupmemoframe - [\v!foot,\v!nextfoot,\v!leftfoot,\v!rightfoot] - [\c!width=\textwidth, - \c!height=\footerheight] - -\setupmemolayer - [\v!nexthead,\v!nextfoot] - [\c!state=\v!next] - -\setupmemolayer - [\v!lefthead,\v!leftfoot] - [\c!state=\v!left] - -\setupmemolayer - [\v!righthead,\v!rightfoot] - [\c!state=\v!right] - -\definememoelements - [\v!layer] - [\v!memomain, - \v!memonext, - \v!head, - \v!nexthead, - \v!lefthead, - \v!righthead, - \v!foot, - \v!nextfoot, - \v!leftfoot, - \v!rightfoot, - \v!topmark, - \v!botmark, - \v!cutmark, - \v!endmark, - \v!usermark] - -\definememoelements - [\v!section] - [\v!head - \v!date, - \v!reference, - \v!specialnotation, - \v!address, - \v!title, - \v!opening, - \v!subject, - \v!content, - \v!closing, - \v!appendices] - -\endinput diff --git a/macros/context/contrib/context-letter/tex/context/third/letter/style/memo-imp-margin.mkii b/macros/context/contrib/context-letter/tex/context/third/letter/style/memo-imp-margin.mkii deleted file mode 100644 index 5b71ed210a..0000000000 --- a/macros/context/contrib/context-letter/tex/context/third/letter/style/memo-imp-margin.mkii +++ /dev/null @@ -1,55 +0,0 @@ -%D \module -%D [ file=memo-imp-margin, -%D version=2012.06.10, -%D title=\CONTEXT\ Memo Style, -%D subtitle=Margin style, -%D author=Wolfgang Schuster, -%D date=\currentdate, -%D copyright=Wolfgang Schuster, -%D license=GNU General Public License] - -%C Copyright (C) 2011 Wolfgang Schuster -%C -%C This program is free software: you can redistribute it and/or modify -%C it under the terms of the GNU General Public License as published by -%C the Free Software Foundation, either version 3 of the License, or -%C (at your option) any later version. -%C -%C This program is distributed in the hope that it will be useful, -%C but WITHOUT ANY WARRANTY; without even the implied warranty of -%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -%C GNU General Public License for more details. -%C -%C You should have received a copy of the GNU General Public License -%C along with this program. If not, see . - -\usememostyle[default] - -\setupmemolayout - [\v!firstpage,\v!secondpage] - [\c!header=0in] - -\setupmemosection - [\v!head] - [\c!alternative=\v!margin] - -\setupmemolayer - [\v!foot] - [\c!state=\v!repeat, - \c!alternative=\v!pagenumber] - -\setupmemooptions - [\c!whitespace=\v!line] - -\setupmemostyle - [\c!fromname,\c!date,\c!toname,\c!subject] - [\c!titlestyle=\tx] - -\definememoelements - [\v!section] - [\v!head, - \v!content, - \v!closing, - \v!appendices] - -\endinput diff --git a/macros/context/contrib/context-letter/tex/context/third/letter/style/memo-imp-memo.mkii b/macros/context/contrib/context-letter/tex/context/third/letter/style/memo-imp-memo.mkii deleted file mode 100644 index ce69ab1266..0000000000 --- a/macros/context/contrib/context-letter/tex/context/third/letter/style/memo-imp-memo.mkii +++ /dev/null @@ -1,55 +0,0 @@ -%D \module -%D [ file=memo-imp-memo, -%D version=2012.02.04, -%D title=\CONTEXT\ Memo Style, -%D subtitle=Memo style, -%D author=Wolfgang Schuster, -%D date=\currentdate, -%D copyright=Wolfgang Schuster, -%D license=GNU General Public License] - -%C Copyright (C) 2011 Wolfgang Schuster -%C -%C This program is free software: you can redistribute it and/or modify -%C it under the terms of the GNU General Public License as published by -%C the Free Software Foundation, either version 3 of the License, or -%C (at your option) any later version. -%C -%C This program is distributed in the hope that it will be useful, -%C but WITHOUT ANY WARRANTY; without even the implied warranty of -%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -%C GNU General Public License for more details. -%C -%C You should have received a copy of the GNU General Public License -%C along with this program. If not, see . - -\usememostyle[default] - -\setupmemolayout - [\v!firstpage,\v!secondpage] - [\c!header=0in] - -\setupmemosection - [\v!head] - [\c!alternative=\v!memo] - -\setupmemolayer - [\v!foot] - [\c!state=\v!repeat, - \c!alternative=\v!pagenumber] - -\setupmemosection - [\v!closing] - [\c!leftmargin=.5\textwidth] - -\setupmemooptions - [\c!whitespace=\v!line] - -\definememoelements - [\v!section] - [\v!head, - \v!content, - \v!closing, - \v!appendices] - -\endinput diff --git a/macros/context/contrib/context-letter/tex/context/third/letter/style/memo-imp-table.mkii b/macros/context/contrib/context-letter/tex/context/third/letter/style/memo-imp-table.mkii deleted file mode 100644 index 4c447142dc..0000000000 --- a/macros/context/contrib/context-letter/tex/context/third/letter/style/memo-imp-table.mkii +++ /dev/null @@ -1,51 +0,0 @@ -%D \module -%D [ file=memo-imp-table, -%D version=2012.02.04, -%D title=\CONTEXT\ Memo Style, -%D subtitle=Table style, -%D author=Wolfgang Schuster, -%D date=\currentdate, -%D copyright=Wolfgang Schuster, -%D license=GNU General Public License] - -%C Copyright (C) 2011 Wolfgang Schuster -%C -%C This program is free software: you can redistribute it and/or modify -%C it under the terms of the GNU General Public License as published by -%C the Free Software Foundation, either version 3 of the License, or -%C (at your option) any later version. -%C -%C This program is distributed in the hope that it will be useful, -%C but WITHOUT ANY WARRANTY; without even the implied warranty of -%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -%C GNU General Public License for more details. -%C -%C You should have received a copy of the GNU General Public License -%C along with this program. If not, see . - -\usememostyle[default] - -\setupmemolayout - [\v!firstpage,\v!secondpage] - [\c!header=0in] - -\setupmemosection - [\v!head] - [\c!alternative=\v!table] - -\setupmemolayer - [\v!foot] - [\c!state=\v!repeat, - \c!alternative=\v!pagenumber] - -\setupmemooptions - [\c!whitespace=\v!line] - -\definememoelements - [\v!section] - [\v!head, - \v!content, - \v!closing, - \v!appendices] - -\endinput diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx index de0745cb46..7b8737e4b5 100644 --- a/macros/latex/contrib/easybook/easybook.dtx +++ b/macros/latex/contrib/easybook/easybook.dtx @@ -15,7 +15,7 @@ %<*class> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e} -\ProvidesExplClass{easybook}{2021/10/12}{1.3I} +\ProvidesExplClass{easybook}{2021/10/16}{1.3L} {Typeset Chinese theses or books} \bool_set_false:N \l__eb_compile_draft_bool @@ -319,7 +319,7 @@ %<*package> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e,etoolbox} -\ProvidesExplPackage{easybase}{2021/10/12}{1.3I} +\ProvidesExplPackage{easybase}{2021/10/16}{1.3L} {Typeset Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -1358,7 +1358,7 @@ \tl_use:c { the#1 } } } -\NewDocumentCommand{\UseCounter}{soD(){arabic}mmO{.}d()} +\NewDocumentCommand{\counteruse}{soD(){arabic}mmO{.}d()} { \IfBooleanF{#1}{\stepcounter{#4}} \IfValueT{#7}{\setcounter{#4}{#7}} @@ -2385,7 +2385,7 @@ } % %<*tcolorbox> -\ProvidesExplFile{eb-tcolorbox.cfg}{2021/10/12}{1.3I} +\ProvidesExplFile{eb-tcolorbox.cfg}{2021/10/16}{1.3L} {Customization of tcolorbox for easybook} \tl_gset:Nn \eb@tc@line@skip { 0.5\baselineskip } diff --git a/macros/latex/contrib/easybook/easybook.pdf b/macros/latex/contrib/easybook/easybook.pdf index 70e56cf528..deb50a382d 100644 Binary files a/macros/latex/contrib/easybook/easybook.pdf and b/macros/latex/contrib/easybook/easybook.pdf differ diff --git a/macros/latex/contrib/easybook/easybook.tex b/macros/latex/contrib/easybook/easybook.tex index 6989848387..89fc89201a 100644 --- a/macros/latex/contrib/easybook/easybook.tex +++ b/macros/latex/contrib/easybook/easybook.tex @@ -20,8 +20,8 @@ name = easybook, color-scheme = blue, title = EASYBOOK 使用手册, - version = v1.3I, - date = 2021/10/12, + version = v1.3L, + date = 2021/10/16, authors = 瞿毅, info = 排版简体中文学位论文和书籍, email = q1jx@foxmail.com, @@ -945,7 +945,7 @@ \meta{键值列表2} 包括 \pkg*{tcolorbox} 的盒子样式选项,例如 \option*{boxsep} 和 \option*{fontupper} 等,也可以使用下述 \option{tcolorbox} 选项。在这里可以使用 \cs{addtcbstyle} 命令设置标题选项 \meta{键值列表2} 的值,第一个参数为 \code{tc-exercise}。 \begin{ctexexam} - \tcphantomifname{\markright{\UseCounter{tcbcounter}{\quad 习题}}}{} + \tcphantomifname{\markright{\counteruse{tcbcounter}{\quad 习题}}}{} \addtcbstyle{tc-exercise}{boxsep = 5pt} \exerprologue{习题前的一段文本} \begin{exercise}+[color = LightSkyBlue](after skip = 2pc)[itemsep = 1ex] @@ -1074,13 +1074,13 @@ \subsection{计数器} \begin{commands}\noitemsep \command{newcounter}[\marg{计数器}\oarg{父计数器}]\default{} - \command{UseCounter}[\sarg\oarg{父计数器}\darg{编号}\marg{计数器}\marg{内容}\oarg{分隔符}] - 命令 \cs{newcounter} 是 \LaTeX 自带的创建计数器命令,命令 \cs{UseCounter} 以一定的格式使用由它创建的计数器,将会以 \cs*{the}\meta{父计数器}\meta{分隔符}\cs*{the}\meta{计数器}\meta{内容} 输出当前内容。注意 \cs{UseCounter} 仅具有\textbf{输出功能},并不会改变计数器原有的绑定关系。默认每使用一次命令 \meta{计数器} 的值增加 1,带有星号的命令使 \meta{计数器} 值保持不变,\meta{编号} 为 \code{arabic} 或 \code{alpha} 等形式,\meta{数值} 可以手动将 \meta{计数器} 设为指定值。 + \command{counteruse}[\sarg\oarg{父计数器}\darg{编号}\marg{计数器}\marg{内容}\oarg{分隔符}] + 命令 \cs{newcounter} 是 \LaTeX 自带的创建计数器命令,命令 \cs{counteruse} 以一定的格式使用由它创建的计数器,将会以 \cs*{the}\meta{父计数器}\meta{分隔符}\cs*{the}\meta{计数器}\meta{内容} 输出当前内容。注意 \cs{counteruse} 仅具有\textbf{输出功能},并不会改变计数器原有的绑定关系。默认每使用一次命令 \meta{计数器} 的值增加 1,带有星号的命令使 \meta{计数器} 值保持不变,\meta{编号} 为 \code{arabic} 或 \code{alpha} 等形式,\meta{数值} 可以手动将 \meta{计数器} 设为指定值。 - 在一定的场合下可能用到 \cs{UseCounter} 命令,比如通过新建快捷命令在一些位置使用定理环境的计数器,使用 \cs{labelformat} 设置计数器的引用标签需添加 \code{eb@}: + 在一定的场合下可能用到 \cs{counteruse} 命令,比如通过新建快捷命令在一些位置使用定理环境的计数器,使用 \cs{labelformat} 设置计数器的引用标签需添加 \code{eb@}: \begin{ctexexam} \labelformat{eb@theorem}{定理 #1} - \newcommand{\theoremhead}[1]{定理 \UseCounter[chapter]{theorem}{\hspace{1em}#1}} + \newcommand{\theoremhead}[1]{定理 \counteruse[chapter]{theorem}{\hspace{1em}#1}} \theoremhead{定理内容}\label{thm:theorem} \end{ctexexam} \end{commands} diff --git a/macros/latex/contrib/pkuthss/doc/example.pdf b/macros/latex/contrib/pkuthss/doc/example.pdf index a548fbcc13..2c5c82ee3a 100644 Binary files a/macros/latex/contrib/pkuthss/doc/example.pdf and b/macros/latex/contrib/pkuthss/doc/example.pdf differ diff --git a/macros/latex/contrib/pkuthss/doc/example/chap/copy.tex b/macros/latex/contrib/pkuthss/doc/example/chap/copy.tex index 8204715289..4dd05b3b07 100644 --- a/macros/latex/contrib/pkuthss/doc/example/chap/copy.tex +++ b/macros/latex/contrib/pkuthss/doc/example/chap/copy.tex @@ -1,5 +1,5 @@ % Copyright (c) 2008-2009 solvethis -% Copyright (c) 2010-2017 Casper Ti. Vector +% Copyright (c) 2010-2017,2021 Casper Ti. Vector % All rights reserved. % % Redistribution and use in source and binary forms, with or without @@ -35,7 +35,7 @@ 任何收存和保管本论文各种版本的单位和个人, 未经本论文作者同意,不得将本论文转借他人, 亦不得随意复制、抄录、拍照或以任何方式传播。 -否则一旦引起有碍作者著作权之问题,将可能承担法律责任。 +否则,引起有碍作者著作权之问题,将可能承担法律责任。 % 若须排版二维码,请将二维码图片重命名为“barcode”, % 转为合适的图片格式,并放在当前目录下,然后去掉下面 2 行的注释。 diff --git a/macros/latex/contrib/pkuthss/doc/example/chap/origin.tex b/macros/latex/contrib/pkuthss/doc/example/chap/origin.tex index b4103f1bf4..bf0cc33ef3 100644 --- a/macros/latex/contrib/pkuthss/doc/example/chap/origin.tex +++ b/macros/latex/contrib/pkuthss/doc/example/chap/origin.tex @@ -64,9 +64,9 @@ 并提供目录检索与阅览服务,在校园网上提供服务; \item 学校可以采用影印、缩印、数字化或其它复制手段保存论文; \item 因某种特殊原因须要延迟发布学位论文电子版, - 授权学校在 $\Box$\nobreakspace{}一年 / + 授权学校 $\Box$\nobreakspace{}一年 / $\Box$\nobreakspace{}两年 / - $\Box$\nobreakspace{}三年以后在校园网上全文发布。 + $\Box$\nobreakspace{}三年以后,在校园网上全文发布。 \end{itemize} \centerline{(保密论文在解密后遵守此规定)} \vskip 1em diff --git a/macros/latex/contrib/pkuthss/doc/example/thesis.tex b/macros/latex/contrib/pkuthss/doc/example/thesis.tex index 30bc89d1aa..dbfd37994d 100644 --- a/macros/latex/contrib/pkuthss/doc/example/thesis.tex +++ b/macros/latex/contrib/pkuthss/doc/example/thesis.tex @@ -42,8 +42,9 @@ cauthor = {某某}, eauthor = {Test}, date = {某年某月}, studentid = {0123456789}, school = {某某学院}, cmajor = {某某专业}, emajor = {Some Major}, - direction = {某某方向}, - cmentor = {某某教授}, ementor = {Prof.\ Somebody}, + direction = {某某方向}, mentorlines = {2}, + cmentor = {某甲教授\\某乙教授}, + ementor = {Prof.\ Somebody and Prof.\ Someone}, ckeywords = {其一,其二}, ekeywords = {First, Second}, % 以下两项无双盲评审需求的用户可保持原状。 @@ -64,6 +65,14 @@ 未格式化的、带方括号的和上标且带方括号的引用标记:% \cite{test-en},\parencite{test-zh}、\supercite{test-en, test-zh}。 + 若格式审查时提示字号或其它格式细节问题,请启用 pkuthss 的 \texttt{ugly} + 选项,同时可以考虑启用 biblatex-caspervector 的 \texttt{ugly} 选项 + 或者换用 biblatex-gb7714-2015,详见 \texttt{thesis.tex} 中相关注释。 + + 生成的 PDF 文件中标记链接的彩色框不会出现在打印版论文中。 + 如仍须去掉,可在 \texttt{thesis.tex} 导言区加入 + \texttt{\string\hypersetup\{hidelinks\}}。 + 若要避免章末空白页,请在调用 pkuthss 文档类时加入 \texttt{openany} 选项。 如果编译时不出参考文献, diff --git a/macros/latex/contrib/pkuthss/doc/pkuthss.pdf b/macros/latex/contrib/pkuthss/doc/pkuthss.pdf index 9d172c6554..63264f30d1 100644 Binary files a/macros/latex/contrib/pkuthss/doc/pkuthss.pdf and b/macros/latex/contrib/pkuthss/doc/pkuthss.pdf differ diff --git a/macros/latex/contrib/pkuthss/doc/readme/ChangeLog.txt b/macros/latex/contrib/pkuthss/doc/readme/ChangeLog.txt index 1d7835cf92..20a12257a5 100644 --- a/macros/latex/contrib/pkuthss/doc/readme/ChangeLog.txt +++ b/macros/latex/contrib/pkuthss/doc/readme/ChangeLog.txt @@ -1,4 +1,21 @@ -2010-03-29, v1.9.0 +2021-10-16, v1.9.1 + + * API changes: + - Support `mentorlines' like casthss. + + * Changes to example template: + - thesis.tex: more obvious hints on `ugly', new note on `hidelinks'. + - copy.tex, origin.tex: minor update according to school requirements. + + * Changes to package code: + - Merge common parts from pkuthss-*.def into pkuthss.def. + - Also "uglify" the keywords label. + + * Misc: + - ChangeLog.txt: typo (thank @fjn308). + - Minor fixes and cosmetics. + +2021-03-29, v1.9.0 * API changes: - Add support for double-blind review (thank @Kurapikov). diff --git a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap1.tex b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap1.tex index 232f427558..9d8e56ec33 100644 --- a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap1.tex +++ b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap1.tex @@ -72,7 +72,7 @@ \begin{Verbatim} texdoc pkuthss \end{Verbatim} -所打开的 pdf 文件所在的同一目录中包含两个子目录和相应的两个 pdf 文件, +打开的 pdf 文件所在目录中包含两个子目录和相应的两个 pdf 文件, 其中 \verb|readme/| 为说明文档(即本文档)的源代码,% \verb|example/| 为文档模版的源代码,% \verb|pkuthss.pdf| 和 \verb|example.pdf| diff --git a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap2.tex b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap2.tex index 5d2f91185b..bdc6af316f 100644 --- a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap2.tex +++ b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap2.tex @@ -207,6 +207,7 @@ 出于兼容性的考虑,如果 \texttt{\string\thesiscover} 为空, 那么封面将显示 \texttt{\string\cthesisname}。% }。 + \item \texttt{\bfseries\string\mentorlines}:封面“导师”部分的行数。 \item \texttt{\bfseries\string\cabstractname}:摘要的中文标题。 \item \texttt{\bfseries\string\eabstractname}:摘要的西文标题。 \end{itemize} @@ -353,20 +354,7 @@ $TEXMFDIST/tex/latex/pkuthss/ 一个常见的需求是封面中部分内容(特别是论文的标题、专业和研究方向)太长, 超出了在预设的空间。 此时,用户可以修改 \verb|pkuthss.cls| 里 \verb|\maketitle| 定义中 -\verb|\thss@int@fillinblank| 宏的参数来改变 -带下划线的空白的行数和行宽,其语法为: -\begin{Verbatim} -\thss@int@fillinblank{行数}{行宽}{内容} -\end{Verbatim} -例如,如果“研究方向”一栏需要两行的空白, -可以将 \verb|pkuthss.cls| 里的 -\begin{Verbatim} -\thss@int@fillinblank{1}{\thss@tmp@len}{\kaishu\@direction} -\end{Verbatim} -改为 -\begin{Verbatim} -\thss@int@fillinblank{2}{\thss@tmp@len}{\kaishu\@direction} -\end{Verbatim} -当然,为了美观,可以将多于一行的部分移到封面中作者信息部分的最下方。 +\verb|\thss@int@fillinblank| 宏的参数来改变带下划线的空白的行数和行宽, +具体方法可以参考该文件中和 \verb|\mentorlines| 相关的代码。 % vim:ts=4:sw=4 diff --git a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap3.tex b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap3.tex index b5482a08eb..7dcf4ff855 100644 --- a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap3.tex +++ b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap3.tex @@ -71,6 +71,12 @@ hyperref\cupercite{hyperref} 宏包和一些宏包可能发生冲突。 可以参考 hyperref 宏包 README 文件中的“Package Compatibility”一节。 此文件通常和执行 \verb|texdoc hyperref| 时打开的 pdf 文件位于同一目录中。 +hyperref 默认会在输出的 pdf 文件中用彩色框来标记链接, +这些彩色框只会显示在屏幕上,不会被打印出来; +如有特殊需求,也可以在文章的导言区加入以下代码以完全去掉彩色框: +\begin{Verbatim} +\hypersetup{hidelinks} +\end{Verbatim} biber 运行时有一定概率出现形如(目录名可能稍有不同) \begin{Verbatim} diff --git a/macros/latex/contrib/pkuthss/doc/readme/pkuthss-english.patch b/macros/latex/contrib/pkuthss/doc/readme/pkuthss-english.patch index 40b508c77c..c405437e53 100644 --- a/macros/latex/contrib/pkuthss/doc/readme/pkuthss-english.patch +++ b/macros/latex/contrib/pkuthss/doc/readme/pkuthss-english.patch @@ -1,5 +1,5 @@ diff --git a/doc/example/chap/abs.tex b/doc/example/chap/abs.tex -index dcffe0e..8fd046f 100644 +index ea215a8..8ad4294 100644 --- a/doc/example/chap/abs.tex +++ b/doc/example/chap/abs.tex @@ -2,7 +2,7 @@ @@ -100,10 +100,10 @@ index ac5b0c9..9d2ad60 100644 - % vim:ts=4:sw=4 diff --git a/doc/example/thesis.tex b/doc/example/thesis.tex -index 0009fe6..3f2d945 100644 +index dbfd379..6a8767a 100644 --- a/doc/example/thesis.tex +++ b/doc/example/thesis.tex -@@ -14,36 +14,42 @@ +@@ -14,36 +14,43 @@ \documentclass[UTF8]{pkuthss} % 如果的确须要使脚注按页编号的话,可以去掉后面 footmisc 包的注释。 %\usepackage[perpage]{footmisc} @@ -152,18 +152,19 @@ index 0009fe6..3f2d945 100644 - cauthor = {某某}, eauthor = {Test}, date = {某年某月}, - studentid = {0123456789}, school = {某某学院}, - cmajor = {某某专业}, emajor = {Some Major}, -- direction = {某某方向}, -- cmentor = {某某教授}, ementor = {Prof.\ Somebody}, +- direction = {某某方向}, mentorlines = {2}, +- cmentor = {某甲教授\\某乙教授}, + eauthor = {Test}, + date = {Month Year}, studentid = {0123456789}, + school = {Some School}, + emajor = {Some Major}, -+ direction = {Some Direction}, -+ ementor = {Prof.\ Somebody}, ++ direction = {Some Research Division}, ++ mentorlines = {2}, ++ cmentor = {Prof.\ Somebody\\Prof.\ Someone}, + ementor = {Prof.\ Somebody and Prof.\ Someone}, ckeywords = {其一,其二}, ekeywords = {First, Second}, - % 以下两项无双盲评审需求的用户可保持原状。 -@@ -53,26 +59,6 @@ +@@ -54,34 +61,6 @@ % 载入参考文献数据库(注意不要省略“.bib”)。 \addbibresource{thesis.bib} @@ -178,6 +179,14 @@ index 0009fe6..3f2d945 100644 - 未格式化的、带方括号的和上标且带方括号的引用标记:% - \cite{test-en},\parencite{test-zh}、\supercite{test-en, test-zh}。 - +- 若格式审查时提示字号或其它格式细节问题,请启用 pkuthss 的 \texttt{ugly} +- 选项,同时可以考虑启用 biblatex-caspervector 的 \texttt{ugly} 选项 +- 或者换用 biblatex-gb7714-2015,详见 \texttt{thesis.tex} 中相关注释。 +- +- 生成的 PDF 文件中标记链接的彩色框不会出现在打印版论文中。 +- 如仍须去掉,可在 \texttt{thesis.tex} 导言区加入 +- \texttt{\string\hypersetup\{hidelinks\}}。 +- - 若要避免章末空白页,请在调用 pkuthss 文档类时加入 \texttt{openany} 选项。 - - 如果编译时不出参考文献, @@ -191,11 +200,11 @@ index 0009fe6..3f2d945 100644 % 以下为正文之前的部分,默认不进行章节编号。 \frontmatter diff --git a/tex/pkuthss-utf8.def b/tex/pkuthss-utf8.def -index d968f90..f99a891 100644 +index afed37b..e74e4bf 100644 --- a/tex/pkuthss-utf8.def +++ b/tex/pkuthss-utf8.def -@@ -26,13 +26,13 @@ - [2020/11/02 v1.8.3 Labels and captions in UTF-8 encoding +@@ -27,13 +27,13 @@ + [2021/03/29 v1.9.0 Labels and captions in UTF-8 encoding for the pkuthss document class] -\def\label@ctitle{题目:} @@ -212,14 +221,14 @@ index d968f90..f99a891 100644 +\def\label@cmajor{Major} +\def\label@direction{Research Division} +\def\label@cmentor{Supervisor} - \def\label@ementor{Directed by\ } \def\label@ckeywords{关键词:} - \def\label@ekeywords{KEYWORDS:\ } + \def\label@blindcover{(匿名评阅论文封面)} + \def\label@blindctitle{中文题目:} diff --git a/tex/pkuthss.cls b/tex/pkuthss.cls -index 4499528..e6311cb 100644 +index 6ee4e69..5f782f6 100644 --- a/tex/pkuthss.cls +++ b/tex/pkuthss.cls -@@ -317,7 +317,7 @@ +@@ -305,7 +305,7 @@ \fancyhf{}\renewcommand*{\headrulewidth}{0.75bp} \fancyfoot[C]{\zihao{5}\normalfont{\thepage}} \if@twoside @@ -228,7 +237,7 @@ index 4499528..e6311cb 100644 \fancyhead[CO]{\zihao{5}\normalfont\thss@int@setcase{\leftmark}} \else \fancyhead[C]{\zihao{5}\normalfont\thss@int@setcase{\leftmark}} -@@ -367,14 +367,14 @@ +@@ -355,14 +355,14 @@ \zihao{1}\includegraphics[height = 2.4em]{pkulogo}\hspace{0.4em}% \raisebox{0.4em}{\includegraphics[height = 1.6em]{pkuword}}\\[0.8em] \fi% @@ -245,7 +254,7 @@ index 4499528..e6311cb 100644 } \vfill % Information about the author. -@@ -382,19 +382,19 @@ +@@ -370,18 +370,18 @@ % Slightly adjust the line skip when using new font size. \zihao{3}\linespread{1.75}\selectfont \def\thss@tmp@len{0.56\textwidth} @@ -269,9 +278,7 @@ index 4499528..e6311cb 100644 + {\bfseries\label@direction} & : & \thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@direction} \\ - {\bfseries\label@cmentor} & -- \thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@cmentor} \\ + {\bfseries\label@cmentor} & : & -+ \thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@ementor} \\ + \thss@int@fillinblank{\mentorlines}% + {\thss@tmp@len}{\fangsong\@cmentor} \\ \end{tabular}% - } - \vfill diff --git a/macros/latex/contrib/pkuthss/doc/readme/pkuthss.tex b/macros/latex/contrib/pkuthss/doc/readme/pkuthss.tex index 8305720841..9a8e1de8c9 100644 --- a/macros/latex/contrib/pkuthss/doc/readme/pkuthss.tex +++ b/macros/latex/contrib/pkuthss/doc/readme/pkuthss.tex @@ -51,7 +51,7 @@ } \newif\ifblind\blindfalse -\newcommand*{\docversion}{v1.9.0} +\newcommand*{\docversion}{v1.9.1} \pkuthssinfo{ cthesisname = {本科生毕业论文}, ethesisname = {Undergraduate Thesis}, ctitle = {北京大学学位论文模版{\thssnl}pkuthss \docversion}, @@ -60,11 +60,12 @@ \texorpdfstring{\thssnl}{: }pkuthss \docversion% }, cauthor = {盖茨波·钛·维克托}, eauthor = {Casper Ti.\ Vector}, - date = {\zhdigits{2021}年\zhnumber{3}月}, + date = {\zhdigits{2021}年\zhnumber{10}月}, studentid = {00910???}, school = {化学与分子工程学院}, cmajor = {应用化学}, emajor = {Applied Chemistry}, - direction = {据说 Casper 自己也不知道}, - cmentor = {XX 教授}, ementor = {Prof.\ XX}, + direction = {据说 Casper 自己也不知道}, mentorlines = {2}, + cmentor = {XX 教授\\YY 教授}, + ementor = {Prof.\ XX and Prof.\ YY}, ckeywords = {\hologo{LaTeX},排版,文档类,\CTeX{}}, ekeywords = {\hologo{LaTeX}, Typesetting, Document class, \CTeX{}}, blindid = {???01900}, discipline = {化学} diff --git a/macros/latex/contrib/pkuthss/tex/pkulogo.eps b/macros/latex/contrib/pkuthss/tex/pkulogo.eps index 35c1a90dfb..e5b6fd6c54 100644 --- a/macros/latex/contrib/pkuthss/tex/pkulogo.eps +++ b/macros/latex/contrib/pkuthss/tex/pkulogo.eps @@ -21,6 +21,7 @@ % % This work consists of the following files: % pkuthss.cls +% pkuthss.def % pkuthss-gbk.def % pkuthss-utf8.def % pkulogo.eps diff --git a/macros/latex/contrib/pkuthss/tex/pkulogo.pdf b/macros/latex/contrib/pkuthss/tex/pkulogo.pdf index bf9659a692..9d539c707d 100644 Binary files a/macros/latex/contrib/pkuthss/tex/pkulogo.pdf and b/macros/latex/contrib/pkuthss/tex/pkulogo.pdf differ diff --git a/macros/latex/contrib/pkuthss/tex/pkuthss-gbk.def b/macros/latex/contrib/pkuthss/tex/pkuthss-gbk.def index 28eb1ade7e..500b3bb4cb 100644 --- a/macros/latex/contrib/pkuthss/tex/pkuthss-gbk.def +++ b/macros/latex/contrib/pkuthss/tex/pkuthss-gbk.def @@ -17,13 +17,14 @@ % % This work consists of the following files: % pkuthss.cls +% pkuthss.def % pkuthss-gbk.def % pkuthss-utf8.def % pkulogo.eps % pkuword.eps \ProvidesFile{pkuthss-gbk.def} - [2021/03/29 v1.9.0 Labels and captions in GBK encoding + [2021/10/16 v1.9.1 Labels and captions in GBK encoding for the pkuthss document class] \def\label@ctitle{Ŀ} @@ -33,9 +34,7 @@ \def\label@cmajor{ר\hphantom{}ҵ} \def\label@direction{о} \def\label@cmentor{\hphantom{}ʦ} -\def\label@ementor{Directed by\ } \def\label@ckeywords{ؼʣ} -\def\label@ekeywords{KEYWORDS:\ } \def\label@blindcover{ķ棩} \def\label@blindctitle{Ŀ} \def\label@blindetitle{ӢĿ} @@ -45,12 +44,8 @@ \def\titlepagename{} \def\cuniversity{ѧ} -\def\euniversity{Peking University} \def\cthesisname{ʿѧλ} -\def\ethesisname{Doctor Thesis} -\def\thesiscover{} \def\cabstractname{ժҪ} -\def\eabstractname{ABSTRACT} \endinput % vim:ft=tex:ts=2:sw=2 diff --git a/macros/latex/contrib/pkuthss/tex/pkuthss-utf8.def b/macros/latex/contrib/pkuthss/tex/pkuthss-utf8.def index 6ab9dc0ec8..e1d9566ed6 100644 --- a/macros/latex/contrib/pkuthss/tex/pkuthss-utf8.def +++ b/macros/latex/contrib/pkuthss/tex/pkuthss-utf8.def @@ -17,13 +17,14 @@ % % This work consists of the following files: % pkuthss.cls +% pkuthss.def % pkuthss-gbk.def % pkuthss-utf8.def % pkulogo.eps % pkuword.eps \ProvidesFile{pkuthss-utf8.def} - [2021/03/29 v1.9.0 Labels and captions in UTF-8 encoding + [2021/10/16 v1.9.1 Labels and captions in UTF-8 encoding for the pkuthss document class] \def\label@ctitle{题目:} @@ -33,9 +34,7 @@ \def\label@cmajor{专\hphantom{汉字}业:} \def\label@direction{研究方向:} \def\label@cmentor{导\hphantom{汉字}师:} -\def\label@ementor{Directed by\ } \def\label@ckeywords{关键词:} -\def\label@ekeywords{KEYWORDS:\ } \def\label@blindcover{(匿名评阅论文封面)} \def\label@blindctitle{中文题目:} \def\label@blindetitle{英文题目:} @@ -45,12 +44,8 @@ \def\titlepagename{封面} \def\cuniversity{北京大学} -\def\euniversity{Peking University} \def\cthesisname{博士学位论文} -\def\ethesisname{Doctor Thesis} -\def\thesiscover{} \def\cabstractname{摘要} -\def\eabstractname{ABSTRACT} \endinput % vim:ft=tex:ts=2:sw=2 diff --git a/macros/latex/contrib/pkuthss/tex/pkuthss.cls b/macros/latex/contrib/pkuthss/tex/pkuthss.cls index 2abf2d72fb..e03a7bd4e4 100644 --- a/macros/latex/contrib/pkuthss/tex/pkuthss.cls +++ b/macros/latex/contrib/pkuthss/tex/pkuthss.cls @@ -17,6 +17,7 @@ % % This work consists of the following files: % pkuthss.cls +% pkuthss.def % pkuthss-gbk.def % pkuthss-utf8.def % pkulogo.eps @@ -24,7 +25,7 @@ \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{pkuthss} - [2021/03/29 v1.9.0 Peking University dissertation document class] + [2021/10/16 v1.9.1 Peking University dissertation document class] % eg. `\thss@int@boolopt{spacing}{true}' will expand to: % \newif\ifthss@opt@spacing \thss@opt@spacingtrue @@ -85,21 +86,7 @@ \RequirePackage[normalem]{ulem} % `\AtEndOfClass' used to avoid `PDF destination not defined' with setspace. \AtEndOfClass{\RequirePackage{hyperref}} - -\ifthss@opt@gbk - \input{pkuthss-gbk.def} - \ifxetex - % No support for XeLaTeX compilation in non-unicode encoding, i.e. GBK. - \ClassError{pkuthss}% - {XeLaTeX compilation is not supported without UTF-8}% - {% - XeLaTeX compilation without UTF-8 is very problematic.\MessageBreak - Therefore please use UTF-8 encoding for the LaTeX code.% - } - \fi -\else - \input{pkuthss-utf8.def} -\fi +\input{pkuthss.def} \ifthss@opt@pkufont % Use Times New Roman / Arial according to school regulation. @@ -248,6 +235,7 @@ \thss@int@infoitemb{cthesisname} \thss@int@infoitemb{ethesisname} \thss@int@infoitemb{thesiscover} +\thss@int@infoitemb{mentorlines} \thss@int@infoitemb{cabstractname} \thss@int@infoitemb{eabstractname} % Set up document information using the `key = value' grammar. @@ -394,7 +382,8 @@ {\bfseries\label@direction} & \thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@direction} \\ {\bfseries\label@cmentor} & - \thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@cmentor} \\ + \thss@int@fillinblank{\mentorlines}% + {\thss@tmp@len}{\fangsong\@cmentor} \\ \end{tabular}% } \vfill diff --git a/macros/latex/contrib/pkuthss/tex/pkuthss.def b/macros/latex/contrib/pkuthss/tex/pkuthss.def new file mode 100644 index 0000000000..3ffe3008ad --- /dev/null +++ b/macros/latex/contrib/pkuthss/tex/pkuthss.def @@ -0,0 +1,57 @@ +% Peking University dissertation document class +% +% Copyright (c) 2008-2009 solvethis +% Copyright (c) 2010-2013,2015,2021 Casper Ti. Vector +% +% 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 +% 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. +% +% This work has the LPPL maintenance status `maintained'. +% The current maintainer of this work is Casper Ti. Vector. +% +% This work consists of the following files: +% pkuthss.cls +% pkuthss.def +% pkuthss-gbk.def +% pkuthss-utf8.def +% pkulogo.eps +% pkuword.eps + +\ProvidesFile{pkuthss.def} + [2021/10/16 v1.9.1 Labels and captions for the pkuthss document class] + +\def\label@ementor{Directed by\ } +\def\euniversity{Peking University} +\def\ethesisname{Doctor Thesis} +\def\thesiscover{} +\def\mentorlines{1} +\def\eabstractname{ABSTRACT} + +\ifthss@opt@ugly + \def\label@ekeywords{KEY WORDS:\ } +\else + \def\label@ekeywords{KEYWORDS:\ } +\fi + +\ifthss@opt@gbk + \input{pkuthss-gbk.def} + \ifxetex + % No support for XeLaTeX compilation in non-unicode encoding, i.e. GBK. + \ClassError{pkuthss}% + {XeLaTeX compilation is not supported without UTF-8}% + {% + XeLaTeX compilation without UTF-8 is very problematic.\MessageBreak + Therefore please use UTF-8 encoding for the LaTeX code.% + } + \fi +\else + \input{pkuthss-utf8.def} +\fi + +\endinput +% vim:ft=tex:ts=2:sw=2 diff --git a/macros/latex/contrib/pkuthss/tex/pkuword.eps b/macros/latex/contrib/pkuthss/tex/pkuword.eps index 88bbca5d12..0d6cc95a1e 100644 --- a/macros/latex/contrib/pkuthss/tex/pkuword.eps +++ b/macros/latex/contrib/pkuthss/tex/pkuword.eps @@ -21,6 +21,7 @@ % % This work consists of the following files: % pkuthss.cls +% pkuthss.def % pkuthss-gbk.def % pkuthss-utf8.def % pkulogo.eps diff --git a/macros/latex/contrib/pkuthss/tex/pkuword.pdf b/macros/latex/contrib/pkuthss/tex/pkuword.pdf index 58b5193f46..919d1faf40 100644 Binary files a/macros/latex/contrib/pkuthss/tex/pkuword.pdf and b/macros/latex/contrib/pkuthss/tex/pkuword.pdf differ diff --git a/macros/latex/contrib/projlib/ProjLib-doc-cn.pdf b/macros/latex/contrib/projlib/ProjLib-doc-cn.pdf index dbadeb94d7..a04f15a286 100644 Binary files a/macros/latex/contrib/projlib/ProjLib-doc-cn.pdf and b/macros/latex/contrib/projlib/ProjLib-doc-cn.pdf differ diff --git a/macros/latex/contrib/projlib/ProjLib-doc-en.pdf b/macros/latex/contrib/projlib/ProjLib-doc-en.pdf index f41e7621f7..01e1ac5682 100644 Binary files a/macros/latex/contrib/projlib/ProjLib-doc-en.pdf and b/macros/latex/contrib/projlib/ProjLib-doc-en.pdf differ diff --git a/macros/latex/contrib/projlib/ProjLib-doc-fr.pdf b/macros/latex/contrib/projlib/ProjLib-doc-fr.pdf index 868b604e6a..092e9a985e 100644 Binary files a/macros/latex/contrib/projlib/ProjLib-doc-fr.pdf and b/macros/latex/contrib/projlib/ProjLib-doc-fr.pdf differ diff --git a/macros/latex/contrib/projlib/ProjLib-doc.dtx b/macros/latex/contrib/projlib/ProjLib-doc.dtx index c5d10d507c..62ba754afc 100644 --- a/macros/latex/contrib/projlib/ProjLib-doc.dtx +++ b/macros/latex/contrib/projlib/ProjLib-doc.dtx @@ -107,25 +107,25 @@ %<*ProjLib-doc-cn> \title{\ProjLib{} 工具集\\[.3\baselineskip]\normalsize 使用指南} \author{许锦文} -\thanks{对应版本.~~\texttt{\ProjLib{}~2021/08/19}} +\thanks{对应版本.~~\texttt{\ProjLib{}~2021/10/16}} \email{\href{mailto:ProjLib@outlook.com}{ProjLib@outlook.com}} -\date{2021年8月,北京} +\date{2021年10月,巴黎} % % %<*ProjLib-doc-en> \title{\ProjLib{}~\,Toolkit\\[.3\baselineskip]\normalsize User Manual} \author{Jinwen XU} -\thanks{Corresponding to: \texttt{\ProjLib{}~2021/08/19}} +\thanks{Corresponding to: \texttt{\ProjLib{}~2021/10/16}} \email{\href{mailto:ProjLib@outlook.com}{ProjLib@outlook.com}} -\date{August 2021, Beijing} +\date{October 2021, Paris} % % %<*ProjLib-doc-fr> \title{La boîte à outils~\,\ProjLib{}\\[.3\baselineskip]\normalsize Manuel d'utilisation} \author{Jinwen XU} -\thanks{Correspondant à : \texttt{\ProjLib{}~2021/08/19}} +\thanks{Correspondant à : \texttt{\ProjLib{}~2021/10/16}} \email{\href{mailto:ProjLib@outlook.com}{ProjLib@outlook.com}} -\date{Août 2021, à Pékin} +\date{Octobre 2021, à Paris} % \maketitle diff --git a/macros/latex/contrib/projlib/ProjLib.dtx b/macros/latex/contrib/projlib/ProjLib.dtx index fd3b252e1f..2d3f53d48b 100644 --- a/macros/latex/contrib/projlib/ProjLib.dtx +++ b/macros/latex/contrib/projlib/ProjLib.dtx @@ -18,47 +18,47 @@ % %<*ProjLib> \ProvidesPackage{ProjLib} - [2021/08/19 The collective interface of ProjLib toolkit] + [2021/10/16 The collective interface of ProjLib toolkit] % % %<*PJLauthor> \ProvidesPackage{PJLauthor} - [2021/08/19 Enhanced author information block] + [2021/10/16 Enhanced author information block] % % %<*PJLdate> \ProvidesPackage{PJLdate} - [2021/08/19 Convert yyyy-mm-dd to normal datetime format] + [2021/10/16 Convert yyyy-mm-dd to normal datetime format] % % %<*PJLdraft> \ProvidesPackage{PJLdraft} - [2021/08/19 Some useful macros for the draft stage] + [2021/10/16 Some useful macros for the draft stage] % % %<*PJLlang> \ProvidesPackage{PJLlang} - [2021/08/19 Multi-language configuration] + [2021/10/16 Multi-language configuration] % % %<*PJLlogo> \ProvidesPackage{PJLlogo} - [2021/08/19 The ProjLib logo] + [2021/10/16 The ProjLib logo] % % %<*PJLmath> \ProvidesPackage{PJLmath} - [2021/08/19 Useful math macros and shortcuts] + [2021/10/16 Useful math macros and shortcuts] % % %<*PJLpaper> \ProvidesPackage{PJLpaper} - [2021/08/19 Paper style configuration] + [2021/10/16 Paper style configuration] % % %<*PJLthm> \ProvidesPackage{PJLthm} - [2021/08/19 Theorem setup and configuration] + [2021/10/16 Theorem setup and configuration] % % %# 下面两行引入宏包的代码是所有文件共用的。 @@ -67,10 +67,6 @@ \RequirePackage{etoolbox} % %<*PJLauthor> -%# 在 AMS 文档类中不执行任何操作 -%# Do nothing if AMS class detected -\ifdefined\subjclass\endinput\fi - %# 这段代码定义了宏包中的选项。 %# This code defines the options in the package. \SetupKeyvalOptions{ @@ -84,6 +80,10 @@ %# Process options \ProcessKeyvalOptions*\relax +%# 在 AMS 文档类中不执行任何操作 +%# Do nothing if AMS class detected +\ifdefined\subjclass\endinput\fi + %%================================ %% Font and style %%================================ @@ -776,6 +776,20 @@ \if@PJLlang@enable@FR \frenchsetup{PartNameFull=false} \fi + \if@PJLlang@enable@PT + \let\PJL@babelord\ord + \let\ord\relax + \AtBeginDocument{ + \@ifundefined{ord}{} + { + \let\PJL@userord\ord + \let\ord\relax + \newcommand{\ord}{% + \ifmmode\expandafter\PJL@userord\else\expandafter\PJL@babelord\fi% + } + } + } + \fi \babelprovide{schinese} \babelprovide{tchinese} @@ -2234,6 +2248,7 @@ \DeclareBoolOption[true]{regionalref} \DeclareBoolOption[false]{originalref} \DeclareBoolOption[false]{useosf} +\DeclareBoolOption[false]{lmodern} \DeclareBoolOption[false]{palatino} \DeclareBoolOption[false]{times} \DeclareBoolOption[false]{garamond} @@ -2305,6 +2320,16 @@ % A message can then be shown as: Font "(font name)" has been set \ifdefined\PJL@font@alreadyset\else +\if@ProjLib@lmodern + \RequirePackage{amssymb} + \if@ProjLib@useosf + \RequirePackage{cfr-lm} + \else + \RequirePackage{lmodern} + \fi + \PJLsetlinespacing{\setstretch{1.00}} +\fi + \if@ProjLib@palatino % \RequirePackage{amssymb} \RequirePackage{mathpazo} diff --git a/macros/latex/contrib/spbmark/spbmark.pdf b/macros/latex/contrib/spbmark/spbmark.pdf index b230768d68..f42d42ea4a 100644 Binary files a/macros/latex/contrib/spbmark/spbmark.pdf and b/macros/latex/contrib/spbmark/spbmark.pdf differ diff --git a/macros/latex/contrib/spbmark/spbmark.sty b/macros/latex/contrib/spbmark/spbmark.sty index cf81b1c8ef..5a887c2f99 100644 --- a/macros/latex/contrib/spbmark/spbmark.sty +++ b/macros/latex/contrib/spbmark/spbmark.sty @@ -1,7 +1,7 @@ % % ***************** THE SPBMARK PACKAGE ***************** % -% Copyright (C) 2021 by Qu Yi +% Copyright (C) 2021 by Qu Yi % % This work may be distributed and/or modified under the % conditions of the CC-BY 4.0 License. @@ -9,7 +9,7 @@ % https://creativecommons.org/licenses/by/4.0/legalcode \NeedsTeXFormat{LaTeX2e}[2018/12/31] \RequirePackage{xparse,l3keys2e} -\ProvidesExplPackage{spbmark}{2021/08/10}{1.1c} +\ProvidesExplPackage{spbmark}{2021/10/16}{1.1D} {Customize superscripts and subscripts} \cs_new_protected:Npn \spb_define:n { \keys_define:nn { spbmark } } @@ -269,9 +269,9 @@ \cs_set_eq:NN \spb \supersub \cs_set:Npn \@makefnmark { \hbox:n { \fnmarkfont\super{\@thefnmark}[0pt] } } -\cs_if_exist:NTF \ftntm@font - { \cs_new:Npn \fnmarkfont { \ftntm@font } } - { \cs_new:Npn \fnmarkfont { \normalfont } } +\tl_if_exist:NTF \ftntm@font + { \tl_set_eq:NN \fnmarkfont \ftntm@font } + { \tl_set_eq:NN \fnmarkfont \normalfont } \endinput % % End of file `spbmark.sty'. \ No newline at end of file diff --git a/macros/latex/contrib/spbmark/spbmark.tex b/macros/latex/contrib/spbmark/spbmark.tex index 297274d83c..fc6071aedd 100644 --- a/macros/latex/contrib/spbmark/spbmark.tex +++ b/macros/latex/contrib/spbmark/spbmark.tex @@ -6,11 +6,11 @@ { package = spbmark, title = the spbmark package, - version = v1.1c, - date = 2021/08/10, + version = v1.1D, + date = 2021/10/16, authors = Qu Yi, info = Customize superscript and subscript, - email = quee123@foxmail.com, + email = q1jx@foxmail.com, url = https://github.com/texl3/spbmark, abstract = { -- cgit v1.2.3