summaryrefslogtreecommitdiff
path: root/macros
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2023-02-13 03:04:16 +0000
committerNorbert Preining <norbert@preining.info>2023-02-13 03:04:16 +0000
commit88bea5fae4bc9a51d1cd6311662f9e001c3bd643 (patch)
treea0df398f682e9641f8365d4ccd000fc2e45eacb3 /macros
parentf76939750d63d6088b9bdeac794ce3fdf33d1269 (diff)
CTAN sync 202302130304
Diffstat (limited to 'macros')
-rw-r--r--macros/jptex/generic/uptex-base/02uptex_changelog_utf8.txt4
-rw-r--r--macros/jptex/generic/uptex-base/README.md2
-rw-r--r--macros/jptex/generic/uptex-base/samples/adobe-jp-utf8.tex201
-rw-r--r--macros/jptex/latex/jsclasses/LICENSE2
-rw-r--r--macros/jptex/latex/jsclasses/Makefile6
-rw-r--r--macros/jptex/latex/jsclasses/README.md2
-rw-r--r--macros/jptex/latex/jsclasses/jsclasses.dtx55
-rw-r--r--macros/jptex/latex/jsclasses/jsclasses.pdfbin426004 -> 415344 bytes
-rw-r--r--macros/latex/contrib/tcolorbox/CHANGES.md10
-rw-r--r--macros/latex/contrib/tcolorbox/README.md2
-rw-r--r--macros/latex/contrib/tcolorbox/tcbbreakable.code.tex4
-rw-r--r--macros/latex/contrib/tcolorbox/tcbdocumentation.code.tex4
-rw-r--r--macros/latex/contrib/tcolorbox/tcbexternal.code.tex4
-rw-r--r--macros/latex/contrib/tcolorbox/tcbfitting.code.tex4
-rw-r--r--macros/latex/contrib/tcolorbox/tcbhooks.code.tex4
-rw-r--r--macros/latex/contrib/tcolorbox/tcblistings.code.tex4
-rw-r--r--macros/latex/contrib/tcolorbox/tcblistingscore.code.tex6
-rw-r--r--macros/latex/contrib/tcolorbox/tcblistingsutf8.code.tex4
-rw-r--r--macros/latex/contrib/tcolorbox/tcbmagazine.code.tex4
-rw-r--r--macros/latex/contrib/tcolorbox/tcbminted.code.tex4
-rw-r--r--macros/latex/contrib/tcolorbox/tcbposter.code.tex4
-rw-r--r--macros/latex/contrib/tcolorbox/tcbprocessing.code.tex4
-rw-r--r--macros/latex/contrib/tcolorbox/tcbraster.code.tex4
-rw-r--r--macros/latex/contrib/tcolorbox/tcbskins.code.tex4
-rw-r--r--macros/latex/contrib/tcolorbox/tcbskinsjigsaw.code.tex4
-rw-r--r--macros/latex/contrib/tcolorbox/tcbtheorems.code.tex4
-rw-r--r--macros/latex/contrib/tcolorbox/tcbvignette.code.tex4
-rw-r--r--macros/latex/contrib/tcolorbox/tcbxparse.code.tex4
-rw-r--r--macros/latex/contrib/tcolorbox/tcolorbox-example-poster.pdfbin281293 -> 281293 bytes
-rw-r--r--macros/latex/contrib/tcolorbox/tcolorbox-example-poster.tex2
-rw-r--r--macros/latex/contrib/tcolorbox/tcolorbox-example.pdfbin469022 -> 469022 bytes
-rw-r--r--macros/latex/contrib/tcolorbox/tcolorbox-example.tex2
-rw-r--r--macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.pdfbin455822 -> 455822 bytes
-rw-r--r--macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.tex2
-rw-r--r--macros/latex/contrib/tcolorbox/tcolorbox.pdfbin7641870 -> 7641872 bytes
-rw-r--r--macros/latex/contrib/tcolorbox/tcolorbox.sty6
-rw-r--r--macros/latex/contrib/tcolorbox/tcolorbox.tex6
-rw-r--r--macros/unicodetex/latex/bithesis/bithesis.dtx29
-rw-r--r--macros/unicodetex/latex/bithesis/bithesis.pdfbin1066530 -> 1067361 bytes
-rw-r--r--macros/unicodetex/latex/tipauni/COPYING674
-rw-r--r--macros/unicodetex/latex/tipauni/README.txt2
-rw-r--r--macros/unicodetex/latex/tipauni/tipauni-commands.pdfbin69720 -> 20859 bytes
-rw-r--r--macros/unicodetex/latex/tipauni/tipauni-example.pdfbin108222 -> 37269 bytes
-rw-r--r--macros/unicodetex/latex/tipauni/tipauni.dtx325
-rw-r--r--macros/unicodetex/latex/tipauni/tipauni.ins13
-rw-r--r--macros/unicodetex/latex/tipauni/tipauni.pdfbin321268 -> 307684 bytes
46 files changed, 454 insertions, 965 deletions
diff --git a/macros/jptex/generic/uptex-base/02uptex_changelog_utf8.txt b/macros/jptex/generic/uptex-base/02uptex_changelog_utf8.txt
index 4109db2f9e..32129136d5 100644
--- a/macros/jptex/generic/uptex-base/02uptex_changelog_utf8.txt
+++ b/macros/jptex/generic/uptex-base/02uptex_changelog_utf8.txt
@@ -1,5 +1,9 @@
### ChangeLog / 変更履歴
+2023.02.12 Ver1.29-20230212a
+ samples:
+ Update.
+
2023.01.12 Ver1.29-20230112a
TeXLive svn r65330 base
Build/source/texk/web2c/uptexdir:
diff --git a/macros/jptex/generic/uptex-base/README.md b/macros/jptex/generic/uptex-base/README.md
index 82e1a4a60a..be31e44854 100644
--- a/macros/jptex/generic/uptex-base/README.md
+++ b/macros/jptex/generic/uptex-base/README.md
@@ -17,6 +17,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)).
## Release Date
-2023-01-12
+2023-02-12
Japanese TeX Development Community
diff --git a/macros/jptex/generic/uptex-base/samples/adobe-jp-utf8.tex b/macros/jptex/generic/uptex-base/samples/adobe-jp-utf8.tex
index fe4ad9933e..3f9e1792d4 100644
--- a/macros/jptex/generic/uptex-base/samples/adobe-jp-utf8.tex
+++ b/macros/jptex/generic/uptex-base/samples/adobe-jp-utf8.tex
@@ -1,6 +1,6 @@
%
% This file is generated from the data of UniJIS-UTF32
-% in cid2code.txt (Version 07/30/2019)
+% in cid2code.txt (Version 05/18/2022)
% for Adobe-Japan1-7
%
% Reference:
@@ -376,64 +376,65 @@ Adobe-Japan1-4
㍕㍖ℵϐ∊ℏϕϛϑ⚾♨♩♬〻〳〴〵‼⁉∓≃≲≳〘〙
⦅⦆⎛⎝⎞⎠⎡⎣⎤⎦⎜⎟⎢⎥⎪〞✂〽⮗ゟ࿖∅⊠⊖⊘
⊕⊗⚠◀▶⇐↔↘↙↖↗⇌⇋⮂⮃⭠⭢⭡⭣⭤⭥〰⌇❀✿
-⧈⛋◻▫◼▪✚🞜⬦⋄⬥⬩⚪◦⚫❖﹅﹆逸謁緣⿈黃溫禍
-悔海慨槪渴褐漢器既祈虛響勤謹揭擊硏穀殺祉視煮社者臭
-祝暑署涉狀眞節祖僧層巢憎贈卽嘆著徵懲禎突難梅繁晚卑
-碑賓敏侮塀勉步墨每免戾祐欄隆虜淚類曆歷練鍊錄𠤎貟⻗
-⺽𦥑𫟘銳閱沿芽槪杮⻆割𦈢舘㐂旣𠮷𩵋卿强𫞎⺩俱契恵⺼
-憲权𠩤訁戶吳娛抅浩吿𫝆𫝷歲產䬸巿滋玺𠮟勺爵周将⺌𭕄
-⺍尙𠀋宂城⻝⻟飠⻞𩙿㞍⺗㣺真⺅亻𠆢𮕩㔟𫝑成⻃覀稅說
-絕澘揷瘦⻊𧾷𣳾㐧脫炭⺮𥫗彫潮圡𡈽冬糖吞㮈內寧丷⺪𤴔
-彥姬姬庙㑨龴勐门𫞉栁諭輸𥙿⺷躶蘭旅鿄类廉連⺹耂𦚰⺇
-𠘨𠂊𠦄卉⺋㔾呕夹孶寃尔㟢峦么拔𦦙挛晣𣏌杞槶榆𪧦毌渗
-沪⺦丬瓯畵痬癎㾱睪瞩鿆筓𫞽䉤絣繈𮉸𠔿⺳𦉪腁䑓艹⺾艹
-⺿艹⻀兹荚䔥藴𠂰虽㐮裆䟦𮛪迈𨦇𨸗頹騈鯟𫠚𤋮𤋮厉﨑桒
-𣲾𠘑丄丅丟丫丯丰乀乁乄⺃乚乿亍亖亹仐仠份仿伋伕你伻
-佉佔佺佽佾侗侾俏俽倀倁倐倛倧倮偗偦偪倻傏傖傜僌僦僩
-僯儈儋儐儛儞兟冡冼凮凴刁⺉刂刓剉剡剦劓勈勰匊匋匾卌
-卋卡卬厫叚另叵吧呍呦呫呴咍咖咡咭咹咿哆响唎唫唵啊啠
-喈喎嘈嘎嘏嘷嘿噉噋噏噦噩噯噱噲嚕嚚嚬嚭嚱囉囝囤圊圕
-圣圯圳圴坌坰垌垜垸埦埭埵埶埿堉堠堲塼墀墩壎壐壔壚壩
-夌夤夯奡奭姊姒姝姣姤娄娌娣婇婕婣婭婾媞媧媬媳嫠嬀嬙
-嬥嬭孁孼孾孿宊⺏尣尫尰屣屩屼峋峒峴崤崦嵃嵆嵊嶒嶔嶙
-嶠巘巠巸帀帒帔帕帘帮幘幫幬庨庪庾庿廒弇弎弜弝弢弨弶
-弻彀⼹彐彘彤徉徜徧徤徯徸⺖忄忉忡忩忭忼怗怚怳恡恿悞
-悤悰惋惛惸愒愓愔愜慼憍憟憨懂懟戕戩扃扆⺘扌扑扖拄拼
-挊挍挘挹捂捃捥捴捽掄掇掐掞揑揜搉搐搢摔摛摭摻撾撿擥
-擷擻攄攖攙敇敧斁斅旂旰旲昬晌晛晜晡晫暤曈曬朅朓朳杈
-杌杶杻枰枲柹柗柙柰栬栰栱桛桲桵桺梄梥梲棐棖棨棭棰棱
-棼椑椓椵椻楗楣楲楿榀榦榭榷槖槗樁樏樕樨樴樾橅橐橑橖
-橛檃檉檑檝檞檟櫜櫧櫬欞欤欵歆歖歠殂殾毡毱氐氳氵⺡⺢
-汙汶汻沅沕沜泐泔泖泠泫泬泮洊洎洑洮浗浞浥涂涿淄淊淖
-淩渢湑滇滊滎滽漚漪漯漳潚潞潢潽澋澍澒澔澚澧澨澶濚濞
-瀹瀼灔灝灞灤⺣灬灾炁炕炷烓烔烘烜焇焠焱煊煒煠煹熒燋
-燓燖爀爝爫爸牁牓牕牖牜犍⺨犭犴狇狻猄猅猨猱獃獬獼玃
-玅玆玕玞玟玠玦玫玵玷玼珏珙珩珴珽琄琊琚琛琤琨琬琯琰
-琱琹瑄瑇瑋瑍瑑瑗瑦瑫瑱璀璅璆璇璐璘璜璠璣璨璫璵璿瓈
-瓚瓞畎畹疁疐⽧疒疓疴痤痹瘀瘊瘕瘖瘙瘞瘭瘵癃癋癥癭癯
-癱癴皤皥盅盌盬盼眴眶睜睟睠睲睽瞕瞪矦矰矴砆砢砭砮砰
-砵硨碞磈磌磎磤磠磡磲磷磻礱⺭礻礽祅祛祜禋禖禘⽱禸离
-秊秚稃稉稑稞稭稹穅穌穝穭穸窠窣窳窻窼竆笇笔笧笱筇筎
-筠筩筭筲箑箯篗篙簋簏簠簦簱簶籑籙籧籮籰粼粿糈糉糗糙
-糝糫紇紈紉紓紝紣絁絓絙絝絺綆綋綌緌緫緱緹縈縑縕縠繇
-繢繮繳纍纑纘罄罏⺫⺲罒⺱罓罡羑羿翎翟翥翬翮翯翺耎耑
-耔耤耦耺耼聠聱聵肞肦肫胗胘脖脘脺腊腌膁膄膴臏臹舃舡
-舲舴艆艋艏芎芮芷芾苆苾荃荑荕莆莍莒莘莩莿菀菪萏萑葊
-葶蒨蒯蓀蓂蓰蓽蔌蔴蕞薏薷藎薭蘒蘩虒虣虬虯虺蚍蚑蚘蚧
-蚨蛺蛽蜋蜓蜙蜞蜨蜾蝱螈螙螬螭螵蟖蟫蟭蠁蠆蠋蠔蠜衖衟
-⻂衤袘袪袽袾裊裒裛裰裱褆褘褙褚褧褰褾襻觔觖觥觱訇訏
-訕訢詎詿諴謟謷譃譄譔讜讞豇豔豳貤賙賡賸賾贛赩赬趄趍
-趕趦跆跎跤跬踠蹋蹬蹰蹺躒躮躳軑軔軹輗輶辦⾡辵⻍辶迠
-迤迶适逬遄邈邕邙邛邢邴郗郝郴鄗鄜鄱鄺鄽酈酛酡酤醎醞
-醨醭醮醲醼釰釷釻鈇鈨鈳鈸鉃鉇鉏鉠鋂鋋鋌鋟錍錕錟錧鍇
-鍒鍪鍭鎛鎺鎩鏁鏊鏢鏺鏽鐏鐴鐿鑕鑫鑲⻒镸閦閩閴閽闚⻏
-⻖阝陁陘隄隤隩雒嶲雞雩雱霂霉靚靣靮靳鞚鞢鞵鞶韙韞韴
-頊頎頞頣頫頾顒顓顙顬颸颺颿飈飥餲餳饀饍饜饟馱馹馺駉
-騂騖騤騧騭騮騶騸驊驖骵骶髹鬃鬠鬳鬴魳魹鮧鯁鯇鯗鯧鯫
-鯷鯺鯽鰋鰧鰪鰶鱁鱓鱣鱰鱷鴂鵂鵇鵣鵩鵼鵾鶍鶱鷃鷇鷖鷟
-鷫鷴鸕鸝麤麨麬黧黮鼐鼒鼗鼙鼯鼷鼹齁齅齗齨齱齵龐龔龢
-㐅你嘠廋⺕𣘺濹滦熳⺤爫⻌辶嶲俓僙僰凃噶橔洁淐湂滙珤
-琡畬硑蟵𣏾玨㫳㓛䐌㺊龽䯨龼㻚㬢龾䕺䂓䙥䄃䊓䚮㒈𢘉
+⧈⛋◻▫◼▪✚🞜⬦⋄⬥⬩⚪◦⚫❖𛄲𛅕﹅﹆逸謁緣⿈黃
+溫禍悔海慨槪渴褐漢器既祈虛響勤謹揭擊硏穀殺祉視煮社
+者臭祝暑署涉狀眞節祖僧層巢憎贈卽嘆著徵懲禎突難梅繁
+晚卑碑賓敏侮塀勉步墨每免戾祐欄隆虜淚類曆歷練鍊錄𠤎
+貟⻗⺽𦥑𫟘銳閱沿芽槪杮⻆割𦈢舘㐂旣𠮷𩵋卿强𫞎⺩俱契
+恵⺼憲权𠩤訁戶吳娛抅浩吿𫝆𫝷歲產䬸巿滋玺𠮟勺爵周将
+⺌𭕄⺍尙𠀋宂城⻝⻟飠⻞𩙿㞍⺗㣺真⺅亻𠆢𮕩㔟𫝑成⻃覀
+稅說絕澘揷瘦⻊𧾷𣳾㐧脫炭⺮𥫗彫潮圡𡈽冬糖吞㮈內寧丷
+⺪𤴔彥姬姬庙㑨龴勐门𫞉栁諭輸𥙿⺷躶蘭旅鿄类廉連⺹耂
+𦚰⺇𠘨𠂊𠦄卉⺋㔾呕夹孶寃尔㟢峦么拔𦦙挛晣𣏌杞槶榆𪧦
+毌渗沪⺦丬瓯畵痬癎㾱睪瞩鿆筓𫞽䉤絣繈𮉸𠔿⺳𦉪腁䑓艹
+⺾艹⺿艹⻀兹荚䔥藴𠂰虽㐮裆䟦𮛪迈𨦇𨸗頹騈鯟𫠚𤋮𤋮厉
+﨑桒𣲾𠘑丄丅丟丫丯丰乀乁乄⺃乚乿亍亖亹仐仠份仿伋伕
+你伻佉佔佺佽佾侗侾俏俽倀倁倐倛倧倮偗偦偪倻傏傖傜僌
+僦僩僯儈儋儐儛儞兟冡冼凮凴刁⺉刂刓剉剡剦劓勈勰匊匋
+匾卌卋卡卬厫叚另叵吧呍呦呫呴咍咖咡咭咹咿哆响唎唫唵
+啊啠喈喎嘈嘎嘏嘷嘿噉噋噏噦噩噯噱噲嚕嚚嚬嚭嚱囉囝囤
+圊圕圣圯圳圴坌坰垌垜垸埦埭埵埶埿堉堠堲塼墀墩壎壐壔
+壚壩夌夤夯奡奭姊姒姝姣姤娄娌娣婇婕婣婭婾媞媧媬媳嫠
+嬀嬙嬥嬭孁孼孾孿宊⺏尣尫尰屣屩屼峋峒峴崤崦嵃嵆嵊嶒
+嶔嶙嶠巘巠巸帀帒帔帕帘帮幘幫幬庨庪庾庿廒弇弎弜弝弢
+弨弶弻彀⼹彐彘彤徉徜徧徤徯徸⺖忄忉忡忩忭忼怗怚怳恡
+恿悞悤悰惋惛惸愒愓愔愜慼憍憟憨懂懟戕戩扃扆⺘扌扑扖
+拄拼挊挍挘挹捂捃捥捴捽掄掇掐掞揑揜搉搐搢摔摛摭摻撾
+撿擥擷擻攄攖攙敇敧斁斅旂旰旲昬晌晛晜晡晫暤曈曬朅朓
+朳杈杌杶杻枰枲柹柗柙柰栬栰栱桛桲桵桺梄梥梲棐棖棨棭
+棰棱棼椑椓椵椻楗楣楲楿榀榦榭榷槖槗樁樏樕樨樴樾橅橐
+橑橖橛檃檉檑檝檞檟櫜櫧櫬欞欤欵歆歖歠殂殾毡毱氐氳氵
+⺡⺢汙汶汻沅沕沜泐泔泖泠泫泬泮洊洎洑洮浗浞浥涂涿淄
+淊淖淩渢湑滇滊滎滽漚漪漯漳潚潞潢潽澋澍澒澔澚澧澨澶
+濚濞瀹瀼灔灝灞灤⺣灬灾炁炕炷烓烔烘烜焇焠焱煊煒煠煹
+熒燋燓燖爀爝爫爸牁牓牕牖牜犍⺨犭犴狇狻猄猅猨猱獃獬
+獼玃玅玆玕玞玟玠玦玫玵玷玼珏珙珩珴珽琄琊琚琛琤琨琬
+琯琰琱琹瑄瑇瑋瑍瑑瑗瑦瑫瑱璀璅璆璇璐璘璜璠璣璨璫璵
+璿瓈瓚瓞畎畹疁疐⽧疒疓疴痤痹瘀瘊瘕瘖瘙瘞瘭瘵癃癋癥
+癭癯癱癴皤皥盅盌盬盼眴眶睜睟睠睲睽瞕瞪矦矰矴砆砢砭
+砮砰砵硨碞磈磌磎磤磠磡磲磷磻礱⺭礻礽祅祛祜禋禖禘⽱
+禸离秊秚稃稉稑稞稭稹穅穌穝穭穸窠窣窳窻窼竆笇笔笧笱
+筇筎筠筩筭筲箑箯篗篙簋簏簠簦簱簶籑籙籧籮籰粼粿糈糉
+糗糙糝糫紇紈紉紓紝紣絁絓絙絝絺綆綋綌緌緫緱緹縈縑縕
+縠繇繢繮繳纍纑纘罄罏⺫⺲罒⺱罓罡羑羿翎翟翥翬翮翯翺
+耎耑耔耤耦耺耼聠聱聵肞肦肫胗胘脖脘脺腊腌膁膄膴臏臹
+舃舡舲舴艆艋艏芎芮芷芾苆苾荃荑荕莆莍莒莘莩莿菀菪萏
+萑葊葶蒨蒯蓀蓂蓰蓽蔌蔴蕞薏薷藎薭蘒蘩虒虣虬虯虺蚍蚑
+蚘蚧蚨蛺蛽蜋蜓蜙蜞蜨蜾蝱螈螙螬螭螵蟖蟫蟭蠁蠆蠋蠔蠜
+衖衟⻂衤袘袪袽袾裊裒裛裰裱褆褘褙褚褧褰褾襻觔觖觥觱
+訇訏訕訢詎詿諴謟謷譃譄譔讜讞豇豔豳貤賙賡賸賾贛赩赬
+趄趍趕趦跆跎跤跬踠蹋蹬蹰蹺躒躮躳軑軔軹輗輶辦⾡辵⻍
+辶迠迤迶适逬遄邈邕邙邛邢邴郗郝郴鄗鄜鄱鄺鄽酈酛酡酤
+醎醞醨醭醮醲醼釰釷釻鈇鈨鈳鈸鉃鉇鉏鉠鋂鋋鋌鋟錍錕錟
+錧鍇鍒鍪鍭鎛鎺鎩鏁鏊鏢鏺鏽鐏鐴鐿鑕鑫鑲⻒镸閦閩閴閽
+闚⻏⻖阝陁陘隄隤隩雒嶲雞雩雱霂霉靚靣靮靳鞚鞢鞵鞶韙
+韞韴頊頎頞頣頫頾顒顓顙顬颸颺颿飈飥餲餳饀饍饜饟馱馹
+馺駉騂騖騤騧騭騮騶騸驊驖骵骶髹鬃鬠鬳鬴魳魹鮧鯁鯇鯗
+鯧鯫鯷鯺鯽鰋鰧鰪鰶鱁鱓鱣鱰鱷鴂鵂鵇鵣鵩鵼鵾鶍鶱鷃鷇
+鷖鷟鷫鷴鸕鸝麤麨麬黧黮鼐鼒鼗鼙鼯鼷鼹齁齅齗齨齱齵龐
+龔龢㐅你嘠廋⺕𣘺濹滦熳⺤爫⻌辶嶲俓僙僰凃噶橔洁淐湂
+滙珤琡畬硑蟵𣏾玨㫳㓛䐌㺊龽䯨龼㻚㬢龾䕺䂓䙥䄃䊓䚮㒈
+𢘉
Adobe-Japan1-5
@@ -543,47 +544,47 @@ Adobe-Japan1-5
𩻛鱔鱘鱛鱝鱟鱩鱪鱫鱭鱮鱲鱵鱺鳦鳲鴋𩿎𩿗鴑鴗鴘𪀯䳄𪀚
鴲䳑鵊鵟鵢𪃹𪂂鵳鵶鵷鶄鶙鶡鶿鶵鶹鶽鷉鷚鷠鷣䴇鸊鸂鸍
鸜鹻𢈘麀麅麛𪎌麽𪐷黟黿鼂䵷鼃鼺鼽齆齓齕齘𪗱齝𪘂齩齭
-齰𪚲⺬㘔㢭㷌㿜䖾䘐䭾䰸䳡丌丣两乹仳伌伙伫伮伱侄侞侷
-倄倌偌偟偢偷傎傞傢僃僨僱僾儇儌儍儎儳儸兴冄冸冺凈减
-凑凓凔凘凟刅刦刨别刱刲刵刼剚剠剮剸剹劊劌勡勩勱匃匑
-匟匭匲匽卥卭卹卾厔厙厪厯厺叁叄叅叠吓吪吱吴吵呌咧咪
-咱咻哎哪哼唅唈唕唧唪唶啑啦喏喒喔喤喲嗃嗆嗓嗛嗬嗮嗱
-嗶嗸嘅嘍嘑嘒嘬嘵嘹噍噔嚅嚟嚦嚷囌囏囙囡囫园囱圇圌圚
-圛圝圬圮圽圾坟坫坭坺垃垗垮埕埧堍堦塍塏塟塭塿墁墘墼
-够夣奙她妗妯妳姟姱姸媲媸嫪嫶嬛嬝嬡嬸宷寗寠尟尪尬尶
-屙屜屭峝崁崴崽嵙嵾嶃巇巹帨帲帵幛幨幪幷庀庋庳庽廑廔
-廕彍徬忪怇恉恔恧悻惄惽愊愖愪愶慞慤慻慽慿憝憸懜懢懥
-懨戄戇戱戹戽扺抐抨拚拴挖挪挶捆捋捓捱捵捿掂掊掮掯揪
-揸揹搒搘搠搤搪搵搽搿摒摟摴撐撘撙撬撳擭擰攛攟攮敉敠
-斒斕斴斾旈旎旐旟晾暋暌暳曀曏朥朵杕枀枏枑枤枱枵枾栨
-梆棫棵椗椳椸楛楥榨榫榯槥槱橊橕橧橱檯櫈櫉欃欻欿歽歾
-殰毷毹氄氉氍氬汊汒汔汹沬沴泒浡浼涹淰湅湳湻湽溉溼滚
-滛漦漩漰澇澝澮澷瀍瀠灉炘炰烕烖煅熲燴爗爟牃牏牐牚牠
-牨牷犄狉狥狴猂猋猞猢猺猻獍獘獧瑲璯瓟瓤瓴瓻甖甡甿畞
-疙疤痁痄痌痗痜痡痯瘄瘌瘝瘲瘸癅癊癟皭皽盙盫盰盹眀眎
-眢眨眯眹眾睅睊睏睞睤睧睬瞄瞌瞍瞖瞧瞯瞷瞾矉矑矙矱砷
-硜硾碘碡碱碳磉磓礌礟礧礨礿祂祔祫祼禫秄秪稂稌稰稺穄
-窀窆窔窵窽竾笫筷箠箬箰篨篲篸篼篾簉簨簯籂籒籓籛籜籝
-籲籽粇粞粺糇糓糚紼絍綂綅綍綑綞綳綹緐緥緵緶縯縶繄繯
-繸纁缽罛罝罥罱罿羀羋羢翽翾翿耇耍耞耹肈肎胏胔胭胰胷
-胺胾脃脗脰腗腯腳膋膐膛膞臋臕臝臞臡臯臶舀舋舓舔舚舺
-艄艭芄芉芑芪芰苐苪苯苶荖荸菸菼葘蒓蒱蒽蓻蕆蕖蕝薅薘
-虂虆蛀蜔蜢蜮蜹蝝蝻螌螎螗螘螞螣螮螿蟉蟚蠘蠛蠭蠺衅衋
-衎衕衚衮袚袛袜裍裠裯褎褏褦褵襚襜襫襰襼覥覵覼觕詉詗
-詧詾誆誖誶諉諑諝諬諵謆謏謑譅譒譭譸譼譾讅讟豋豓豻貺
-賅賉賒賬賵賷贁贃贗贜赮趑趟趫趲跕跧跱跲跴踁踋踦踱蹀
-蹁蹍蹏蹜蹡蹩蹱蹵蹷躉躐躕躚躧躩躭軨軰輇輘輥輧輬輵輺
-轃轇轑轕辠辡辢辥逄逛逯遌遛遰遴遹邋邘邠邲邽郉郰鄅鄥
-酚酧酺醊醑醕醰醻醽釂釅鈀鈉鈣鉶銎銯銻銼鋁鋃鋅鋈錔錳
-錶鍘鍿鎂鎊鎻鏌鏦鏹鐂鐍鐎鐮鑌閈閡閿闆闉闑闒闠闤闦阤
-阱阸阽陔陴陻陿隁隃隉隖隮霃霛霡霢霨霱靧靶靽靿鞙鞟鞬
-鞹韍韠韯頇頦頮顢顣颴飅餂餑餕餵饈饔饞駡騌騐騣驁驑骽
-骾鬁鬉鬋鬍鬎鬙鬵魈魕魨鮀鮆鮐鮝鮰鮿鯈鯿鰂鰜鰵鱄鱖鱡
-鱨鴰鴽鵪鵻鷥鷩鷳鹺麂麃麄麰黤黰黲鼉鼏鼔鼛鼢鼦鼪鼫鼴
-齚齯龞龥𠃵𤸄𤿲𧵳再善形慈栟軔㗞龿鿀鿁鿂𪊲𠅘𠖱𠛬𫝓𠵘
-𫝚𫝜𥧌𫝶㦤㦸𢹂𫝼㩜𠟈𢿫𧦴㫄㫋𫞂㪅𫞋㯳櫸𣟱𫞔鿌㴱𤁋㹀
-㢡𫞬𫞯𫟉𫟏𫟒𦲞䜟𧰼䠞𫟰𫝥𫠍𫠗鬝鬬倂凞匇寬廊昞朗灊凞
-啡氺穠𦍌蠃閫靕𩸽𪘚
+齰𪚲⺬𱍐㘔㢭㷌㿜䖾䘐䭾䰸䳡丌丣两乹仳伌伙伫伮伱侄侞
+侷倄倌偌偟偢偷傎傞傢僃僨僱僾儇儌儍儎儳儸兴冄冸冺凈
+减凑凓凔凘凟刅刦刨别刱刲刵刼剚剠剮剸剹劊劌勡勩勱匃
+匑匟匭匲匽卥卭卹卾厔厙厪厯厺叁叄叅叠吓吪吱吴吵呌咧
+咪咱咻哎哪哼唅唈唕唧唪唶啑啦喏喒喔喤喲嗃嗆嗓嗛嗬嗮
+嗱嗶嗸嘅嘍嘑嘒嘬嘵嘹噍噔嚅嚟嚦嚷囌囏囙囡囫园囱圇圌
+圚圛圝圬圮圽圾坟坫坭坺垃垗垮埕埧堍堦塍塏塟塭塿墁墘
+墼够夣奙她妗妯妳姟姱姸媲媸嫪嫶嬛嬝嬡嬸宷寗寠尟尪尬
+尶屙屜屭峝崁崴崽嵙嵾嶃巇巹帨帲帵幛幨幪幷庀庋庳庽廑
+廔廕彍徬忪怇恉恔恧悻惄惽愊愖愪愶慞慤慻慽慿憝憸懜懢
+懥懨戄戇戱戹戽扺抐抨拚拴挖挪挶捆捋捓捱捵捿掂掊掮掯
+揪揸揹搒搘搠搤搪搵搽搿摒摟摴撐撘撙撬撳擭擰攛攟攮敉
+敠斒斕斴斾旈旎旐旟晾暋暌暳曀曏朥朵杕枀枏枑枤枱枵枾
+栨梆棫棵椗椳椸楛楥榨榫榯槥槱橊橕橧橱檯櫈櫉欃欻欿歽
+歾殰毷毹氄氉氍氬汊汒汔汹沬沴泒浡浼涹淰湅湳湻湽溉溼
+滚滛漦漩漰澇澝澮澷瀍瀠灉炘炰烕烖煅熲燴爗爟牃牏牐牚
+牠牨牷犄狉狥狴猂猋猞猢猺猻獍獘獧瑲璯瓟瓤瓴瓻甖甡甿
+畞疙疤痁痄痌痗痜痡痯瘄瘌瘝瘲瘸癅癊癟皭皽盙盫盰盹眀
+眎眢眨眯眹眾睅睊睏睞睤睧睬瞄瞌瞍瞖瞧瞯瞷瞾矉矑矙矱
+砷硜硾碘碡碱碳磉磓礌礟礧礨礿祂祔祫祼禫秄秪稂稌稰稺
+穄窀窆窔窵窽竾笫筷箠箬箰篨篲篸篼篾簉簨簯籂籒籓籛籜
+籝籲籽粇粞粺糇糓糚紼絍綂綅綍綑綞綳綹緐緥緵緶縯縶繄
+繯繸纁缽罛罝罥罱罿羀羋羢翽翾翿耇耍耞耹肈肎胏胔胭胰
+胷胺胾脃脗脰腗腯腳膋膐膛膞臋臕臝臞臡臯臶舀舋舓舔舚
+舺艄艭芄芉芑芪芰苐苪苯苶荖荸菸菼葘蒓蒱蒽蓻蕆蕖蕝薅
+薘虂虆蛀蜔蜢蜮蜹蝝蝻螌螎螗螘螞螣螮螿蟉蟚蠘蠛蠭蠺衅
+衋衎衕衚衮袚袛袜裍裠裯褎褏褦褵襚襜襫襰襼覥覵覼觕詉
+詗詧詾誆誖誶諉諑諝諬諵謆謏謑譅譒譭譸譼譾讅讟豋豓豻
+貺賅賉賒賬賵賷贁贃贗贜赮趑趟趫趲跕跧跱跲跴踁踋踦踱
+蹀蹁蹍蹏蹜蹡蹩蹱蹵蹷躉躐躕躚躧躩躭軨軰輇輘輥輧輬輵
+輺轃轇轑轕辠辡辢辥逄逛逯遌遛遰遴遹邋邘邠邲邽郉郰鄅
+鄥酚酧酺醊醑醕醰醻醽釂釅鈀鈉鈣鉶銎銯銻銼鋁鋃鋅鋈錔
+錳錶鍘鍿鎂鎊鎻鏌鏦鏹鐂鐍鐎鐮鑌閈閡閿闆闉闑闒闠闤闦
+阤阱阸阽陔陴陻陿隁隃隉隖隮霃霛霡霢霨霱靧靶靽靿鞙鞟
+鞬鞹韍韠韯頇頦頮顢顣颴飅餂餑餕餵饈饔饞駡騌騐騣驁驑
+骽骾鬁鬉鬋鬍鬎鬙鬵魈魕魨鮀鮆鮐鮝鮰鮿鯈鯿鰂鰜鰵鱄鱖
+鱡鱨鴰鴽鵪鵻鷥鷩鷳鹺麂麃麄麰黤黰黲鼉鼏鼔鼛鼢鼦鼪鼫
+鼴齚齯龞龥𠃵𤸄𤿲𧵳再善形慈栟軔㗞龿鿀鿁鿂𪊲𠅘𠖱𠛬𫝓
+𠵘𫝚𫝜𥧌𫝶㦤㦸𢹂𫝼㩜𠟈𢿫𧦴㫄㫋𫞂㪅𫞋㯳櫸𣟱𫞔鿌㴱𤁋
+㹀㢡𫞬𫞯𫟉𫟏𫟒𦲞䜟𧰼䠞𫟰𫝥𫠍𫠗鬝鬬倂凞匇寬廊昞朗灊
+凞啡氺穠𦍌蠃閫靕𩸽𪘚
Adobe-Japan1-6
diff --git a/macros/jptex/latex/jsclasses/LICENSE b/macros/jptex/latex/jsclasses/LICENSE
index 7d331ec015..a20b6f6667 100644
--- a/macros/jptex/latex/jsclasses/LICENSE
+++ b/macros/jptex/latex/jsclasses/LICENSE
@@ -1,6 +1,6 @@
Copyright 1995-1999 ASCII MEDIA WORKS
Copyright 1999-2016 Haruhiko Okumura
-Copyright 2016-2022 Japanese TeX Development Community
+Copyright 2016-2023 Japanese TeX Development Community
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff --git a/macros/jptex/latex/jsclasses/Makefile b/macros/jptex/latex/jsclasses/Makefile
index 3e91b82d58..bc467a8a30 100644
--- a/macros/jptex/latex/jsclasses/Makefile
+++ b/macros/jptex/latex/jsclasses/Makefile
@@ -3,7 +3,7 @@ DOCTARGET = jsclasses jslogo okumacro jsverb okuverb
PDFTARGET = $(addsuffix .pdf,$(DOCTARGET))
DVITARGET = $(addsuffix .dvi,$(DOCTARGET))
KANJI = -kanji=utf8
-FONTMAP = -f haranoaji.map -f ptex-haranoaji.map
+FONTMAP = -f ptex-haranoaji.map
TEXMF = $(shell kpsewhich -var-value=TEXMFHOME)
default: $(STRIPTARGET) $(DVITARGET)
@@ -63,9 +63,11 @@ cleanall:
$(DVITARGET) $(PDFTARGET)
cleandoc:
rm -f $(DVITARGET) $(PDFTARGET)
+cleantmp:
+ rm -f *.aux *.log *.dvi
jisfile:
mkdir -p jis0
- cp *.{dtx,ins,cls,sty} jis0/
+ cp *.dtx *.ins *.cls *.sty jis0/
# GNU iconv can be used to convert UTF-8 -> ISO-2022-JP
for x in jis0/*; do \
if [ -f "$$x" ]; then \
diff --git a/macros/jptex/latex/jsclasses/README.md b/macros/jptex/latex/jsclasses/README.md
index da6539d7bd..5c022354f5 100644
--- a/macros/jptex/latex/jsclasses/README.md
+++ b/macros/jptex/latex/jsclasses/README.md
@@ -37,7 +37,7 @@ distributed separately.
## Release Date
-2022-09-13
+2023-02-12
Haruhiko Okumura,
Japanese TeX Development Community
diff --git a/macros/jptex/latex/jsclasses/jsclasses.dtx b/macros/jptex/latex/jsclasses/jsclasses.dtx
index 39c85dcabe..b84449ac8c 100644
--- a/macros/jptex/latex/jsclasses/jsclasses.dtx
+++ b/macros/jptex/latex/jsclasses/jsclasses.dtx
@@ -15,7 +15,7 @@
%
% Copyright 1995-1999 ASCII Corporation.
% Copyright 1999-2016 Haruhiko Okumura
-% Copyright 2016-2022 Japanese TeX Development Community
+% Copyright 2016-2023 Japanese TeX Development Community
%
% \fi
%
@@ -32,7 +32,7 @@
%<*driver>
\ProvidesFile{jsclasses.dtx}
%</driver>
- [2022/09/13 jsclasses (okumura, texjporg)]
+ [2023/02/12 jsclasses (okumura, texjporg)]
%<*driver>
\RequirePackage{plautopatch}
\documentclass[dvipdfmx]{jsarticle}
@@ -610,16 +610,16 @@
\jisfontfalse
\newif\if@jsc@uplatex
\@jsc@uplatexfalse
-\newif\if@jsc@autodetect
-\@jsc@autodetectfalse
\DeclareOption{winjis}{%
\ClassWarningNoLine{\jsc@clsname}{%
The option `winjis' has been removed;\MessageBreak
Use `\string\usepackage{winjis}' instead}}
\DeclareOption{mingoth}{\mingothtrue}
\DeclareOption{jis}{\jisfonttrue}
-\DeclareOption{uplatex}{\@jsc@uplatextrue}
-\DeclareOption{autodetect-engine}{\@jsc@autodetecttrue}
+\let\jsc@engine@given=*
+\DeclareOption{platex}{\let\jsc@engine@given=p\@jsc@uplatexfalse}
+\DeclareOption{uplatex}{\let\jsc@engine@given=u\@jsc@uplatextrue}
+\DeclareOption{autodetect-engine}{\let\jsc@engine@given=*}
\def\jsc@JYn{\if@jsc@uplatex JY2\else JY1\fi}
\def\jsc@JTn{\if@jsc@uplatex JT2\else JT1\fi}
\def\jsc@pfx@{\if@jsc@uplatex u\else \fi}
@@ -702,21 +702,31 @@
%
% \paragraph{使用エンジンの検査・自動判定}
%
-% ユーザが |uplatex| オプションの有無により指定したエンジンが,実際に
-% 使われているものと一致しているかを検査し,一致しない場合はエラー
-% メッセージを表示します。
+% デフォルトで現在使われているエンジンが p\LaTeX か up\LaTeX かを判定します。
+% ユーザによって |platex| オプションまたは |uplatex| オプションが明示的に
+% 指定されている場合は、実際に使われているエンジンと一致しているかを検査し,一致
+% しない場合はエラーメッセージを表示します。
%
% [2016-11-09] p\LaTeX / up\LaTeX を自動判別するオプション |autodetect-engine| を新設しました。
% up\LaTeX の場合は,グローバルオプションに |uplatex| を追加することで,
% 自動判定に応じて |otf| パッケージにも |uplatex| オプションが渡るようにします。
%
+% [2023-02-12] |autodetect-engine| 指定時の挙動を規定化しました。
+% また |platex| を新設しました。オプション |autodetect-engine|, |platex|, |uplatex| の
+% うち最後に指定されたものが有効になります。
+%
% \begin{macrocode}
\ifnum \ifx\ucs\@undefined\z@\else\ucs"3000 \fi ="3000
- \if@jsc@autodetect
+ \ifx *\jsc@engine@given
\ClassInfo\jsc@clsname{Autodetected engine: upLaTeX}
\@jsc@uplatextrue
\g@addto@macro\@classoptionslist{,uplatex}
\fi
+ \ifx p\jsc@engine@given
+ \ClassError\jsc@clsname
+ {Option 'platex' is specified but you are running upLaTeX.}
+ {\@ehc}
+ \fi
\if@jsc@uplatex\else
\ClassError\jsc@clsname
{You are running upLaTeX.\MessageBreak
@@ -725,14 +735,17 @@
{\@ehc}
\@jsc@uplatextrue
\fi
-% \end{macrocode}
-%
-% [2016-11-11] p\LaTeX の場合は,オプション |uplatex| が指定されていれば必ずエラーを出します。
-% |autodetect-engine| が有効になっていてもエラーを出しますが,これは |otf| パッケージに
-% |uplatex| オプションが渡ってしまうのを防ぐためです。
-%
-% \begin{macrocode}
\else
+ \ifx *\jsc@engine@given
+ \ClassInfo\jsc@clsname{Autodetected engine: pLaTeX}
+ \@jsc@uplatexfalse
+ \g@addto@macro\@classoptionslist{,platex}
+ \fi
+ \ifx u\jsc@engine@given
+ \ClassError\jsc@clsname
+ {Option 'uplatex' is specified but you are running pLaTeX.}
+ {\@ehc}
+ \fi
\if@jsc@uplatex
\ClassError\jsc@clsname
{You are running pLaTeX.\MessageBreak
@@ -741,10 +754,6 @@
{\@ehc}
\@jsc@uplatexfalse
\fi
- \if@jsc@autodetect
- \ClassInfo\jsc@clsname{Autodetected engine: pLaTeX}
- \@jsc@uplatexfalse
- \fi
\fi
% \end{macrocode}
%
@@ -5608,8 +5617,8 @@
% [2022-09-13] \LaTeXe~2021-11-15 (ltfloat.dtx 2021/10/14 v1.2g)で
% |\@currentcounter|が追加されましたので,追随します。
% なお,\LaTeXe~2021-06-01 (ltfloat.dtx 2021/02/10 v1.2e)で
-% parhook対応として\cs{par}が追加されていますが,
-% 実は同時に\cs{color@endgroup}も\cs{endgraf}するように変更
+% parhook対応として |\par| が追加されていますが,
+% 実は同時に |\color@endgroup| も |\endgraf| するように変更
% されていますので,不要だと思います。というわけで追加しません。
% \begin{macrocode}
\long\def\@footnotetext{%
diff --git a/macros/jptex/latex/jsclasses/jsclasses.pdf b/macros/jptex/latex/jsclasses/jsclasses.pdf
index 3a3f56fe36..18b0d895d6 100644
--- a/macros/jptex/latex/jsclasses/jsclasses.pdf
+++ b/macros/jptex/latex/jsclasses/jsclasses.pdf
Binary files differ
diff --git a/macros/latex/contrib/tcolorbox/CHANGES.md b/macros/latex/contrib/tcolorbox/CHANGES.md
index cadfdedc32..58b92fe55e 100644
--- a/macros/latex/contrib/tcolorbox/CHANGES.md
+++ b/macros/latex/contrib/tcolorbox/CHANGES.md
@@ -22,6 +22,14 @@ and this project adheres to
+## [6.0.1] - 2023-02-12
+
+### Fixed
+- Typo in CHANGES.md (issue #211)
+- Regression bug: `\NewTCBInputListing` without initialization options produces an error
+
+
+
## [6.0.0] - 2023-02-10
### Added
@@ -39,7 +47,7 @@ and this project adheres to
- Support for zref / zref-titleref / zref-clever (issue #206)
- Option `label is label`
- Option `label is zlabel`
-- Library `theorems`: New theorem generation macros. Generated theorema
+- Library `theorems`: New theorem generation macros. Generated theorems
support an optional short title now (part of issue #186):
- `\NewTcbTheorem`
- `\RenewTcbTheorem`
diff --git a/macros/latex/contrib/tcolorbox/README.md b/macros/latex/contrib/tcolorbox/README.md
index 78942298d0..6dfef2db0f 100644
--- a/macros/latex/contrib/tcolorbox/README.md
+++ b/macros/latex/contrib/tcolorbox/README.md
@@ -1,4 +1,4 @@
-# The LaTeX package tcolorbox - version 6.0.0 (2023/02/10)
+# The LaTeX package tcolorbox - version 6.0.1 (2023/02/12)
> Copyright (c) 2006-2023 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
diff --git a/macros/latex/contrib/tcolorbox/tcbbreakable.code.tex b/macros/latex/contrib/tcolorbox/tcbbreakable.code.tex
index 5042be92d2..e8ee1f0ba7 100644
--- a/macros/latex/contrib/tcolorbox/tcbbreakable.code.tex
+++ b/macros/latex/contrib/tcolorbox/tcbbreakable.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 6.0.0 (2023/02/10)
+%% The LaTeX package tcolorbox - version 6.0.1 (2023/02/12)
%% tcbbreakable.code.tex: Code for breakable colorboxes
%%
%% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{6.0.0}
+\tcb@set@library@version{6.0.1}
\RequirePackage{pdfcol}
\pdfcolInitStack{tcb@breakable}
diff --git a/macros/latex/contrib/tcolorbox/tcbdocumentation.code.tex b/macros/latex/contrib/tcolorbox/tcbdocumentation.code.tex
index 33ed5d410a..29ffa8592c 100644
--- a/macros/latex/contrib/tcolorbox/tcbdocumentation.code.tex
+++ b/macros/latex/contrib/tcolorbox/tcbdocumentation.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 6.0.0 (2023/02/10)
+%% The LaTeX package tcolorbox - version 6.0.1 (2023/02/12)
%% tcbdocumentation.code.tex: Code for LaTeX documentations
%%
%% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{6.0.0}
+\tcb@set@library@version{6.0.1}
\tcbuselibrary{listings,skins,xparse,external,raster}
diff --git a/macros/latex/contrib/tcolorbox/tcbexternal.code.tex b/macros/latex/contrib/tcolorbox/tcbexternal.code.tex
index d8be787d94..f5684747e1 100644
--- a/macros/latex/contrib/tcolorbox/tcbexternal.code.tex
+++ b/macros/latex/contrib/tcolorbox/tcbexternal.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 6.0.0 (2023/02/10)
+%% The LaTeX package tcolorbox - version 6.0.1 (2023/02/12)
%% tcbexternal.code.tex: Code for externalization
%%
%% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{6.0.0}
+\tcb@set@library@version{6.0.1}
\tcbuselibrary{pro@cessing}
diff --git a/macros/latex/contrib/tcolorbox/tcbfitting.code.tex b/macros/latex/contrib/tcolorbox/tcbfitting.code.tex
index af6715af69..7dbddde94f 100644
--- a/macros/latex/contrib/tcolorbox/tcbfitting.code.tex
+++ b/macros/latex/contrib/tcolorbox/tcbfitting.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 6.0.0 (2023/02/10)
+%% The LaTeX package tcolorbox - version 6.0.1 (2023/02/12)
%% tcbfitting.code.tex: Code for fit boxes
%%
%% -------------------------------------------------------------------------------------------
@@ -18,7 +18,7 @@
%% This work consists of all files listed in README
%%
%\makeatletter
-\tcb@set@library@version{6.0.0}
+\tcb@set@library@version{6.0.1}
\newdimen\tcbfitdim
\newdimen\tcb@lowerfitdim
diff --git a/macros/latex/contrib/tcolorbox/tcbhooks.code.tex b/macros/latex/contrib/tcolorbox/tcbhooks.code.tex
index 4d3069c5b3..aafaf4031f 100644
--- a/macros/latex/contrib/tcolorbox/tcbhooks.code.tex
+++ b/macros/latex/contrib/tcolorbox/tcbhooks.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 6.0.0 (2023/02/10)
+%% The LaTeX package tcolorbox - version 6.0.1 (2023/02/12)
%% tcbhooks.code.tex: Code for adding hooks
%%
%% -------------------------------------------------------------------------------------------
@@ -18,7 +18,7 @@
%% This work consists of all files listed in README
%%
%\makeatletter
-\tcb@set@library@version{6.0.0}
+\tcb@set@library@version{6.0.1}
\tcbset{%
before upper app/.code={\appto\kvtcb@before@upper{#1}},%
diff --git a/macros/latex/contrib/tcolorbox/tcblistings.code.tex b/macros/latex/contrib/tcolorbox/tcblistings.code.tex
index 98fd687ea6..7c10d70773 100644
--- a/macros/latex/contrib/tcolorbox/tcblistings.code.tex
+++ b/macros/latex/contrib/tcolorbox/tcblistings.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 6.0.0 (2023/02/10)
+%% The LaTeX package tcolorbox - version 6.0.1 (2023/02/12)
%% tcblistings.code.tex: Code for colorboxes with listings
%%
%% -------------------------------------------------------------------------------------------
@@ -18,7 +18,7 @@
%% This work consists of all files listed in README
%%
%\makeatletter
-\tcb@set@library@version{6.0.0}
+\tcb@set@library@version{6.0.1}
\RequirePackage{listings}[2007/02/22]
diff --git a/macros/latex/contrib/tcolorbox/tcblistingscore.code.tex b/macros/latex/contrib/tcolorbox/tcblistingscore.code.tex
index 5f91c91f29..ed6dd7c8e7 100644
--- a/macros/latex/contrib/tcolorbox/tcblistingscore.code.tex
+++ b/macros/latex/contrib/tcolorbox/tcblistingscore.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 6.0.0 (2023/02/10)
+%% The LaTeX package tcolorbox - version 6.0.1 (2023/02/12)
%% tcblistingscode.code.tex: Auxiliary code for colorboxes with listings
%%
%% -------------------------------------------------------------------------------------------
@@ -18,7 +18,7 @@
%% This work consists of all files listed in README
%%
%\makeatletter
-\tcb@set@library@version{6.0.0}
+\tcb@set@library@version{6.0.1}
\tcbuselibrary{pro@cessing}
@@ -375,7 +375,7 @@
\__tcobox_process_newtcolorbox:nn { #2 }{ #3 }
\exp_args:Nc #1 { #3 }{ #4 }{ \tcbinputlisting{#5,options@for=#3} }
}
-\NewDocumentCommand \__tcobox_new_TCBInputListing:w { m +o m }
+\NewDocumentCommand \__tcobox_new_TCBInputListing:w { m +O{} m }
{
\__tcobox_set_backslash_removed:Nn \l_tmpa_tl { #3 }
\exp_args:NNnV \__tcobox_new_TCBInputListing:Nnnnn #1 {#2} \l_tmpa_tl
diff --git a/macros/latex/contrib/tcolorbox/tcblistingsutf8.code.tex b/macros/latex/contrib/tcolorbox/tcblistingsutf8.code.tex
index fd4b66f3c5..341fea2d37 100644
--- a/macros/latex/contrib/tcolorbox/tcblistingsutf8.code.tex
+++ b/macros/latex/contrib/tcolorbox/tcblistingsutf8.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 6.0.0 (2023/02/10)
+%% The LaTeX package tcolorbox - version 6.0.1 (2023/02/12)
%% tcblistingsutf8.code.tex: Code for colorboxes with listings in UTF-8
%%
%% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{6.0.0}
+\tcb@set@library@version{6.0.1}
\tcbuselibrary{listings}
diff --git a/macros/latex/contrib/tcolorbox/tcbmagazine.code.tex b/macros/latex/contrib/tcolorbox/tcbmagazine.code.tex
index 8d1ba9b71f..1594d05e9e 100644
--- a/macros/latex/contrib/tcolorbox/tcbmagazine.code.tex
+++ b/macros/latex/contrib/tcolorbox/tcbmagazine.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 6.0.0 (2023/02/10)
+%% The LaTeX package tcolorbox - version 6.0.1 (2023/02/12)
%% tcbmagazine.code.tex: Code for box sets and magazine styles
%%
%% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{6.0.0}
+\tcb@set@library@version{6.0.1}
\tcbuselibrary{breakable}
diff --git a/macros/latex/contrib/tcolorbox/tcbminted.code.tex b/macros/latex/contrib/tcolorbox/tcbminted.code.tex
index 817ba635bf..d8aa808a1d 100644
--- a/macros/latex/contrib/tcolorbox/tcbminted.code.tex
+++ b/macros/latex/contrib/tcolorbox/tcbminted.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 6.0.0 (2023/02/10)
+%% The LaTeX package tcolorbox - version 6.0.1 (2023/02/12)
%% tcbminted.code.tex: Code for colorboxes with listings
%%
%% -------------------------------------------------------------------------------------------
@@ -18,7 +18,7 @@
%% This work consists of all files listed in README
%%
%\makeatletter
-\tcb@set@library@version{6.0.0}
+\tcb@set@library@version{6.0.1}
\RequirePackage{minted}[2021/12/24]
diff --git a/macros/latex/contrib/tcolorbox/tcbposter.code.tex b/macros/latex/contrib/tcolorbox/tcbposter.code.tex
index 95c8b1f507..a0c97a1a0f 100644
--- a/macros/latex/contrib/tcolorbox/tcbposter.code.tex
+++ b/macros/latex/contrib/tcolorbox/tcbposter.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 6.0.0 (2023/02/10)
+%% The LaTeX package tcolorbox - version 6.0.1 (2023/02/12)
%% tcbposter.code.tex: Code for posters
%%
%% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{6.0.0}
+\tcb@set@library@version{6.0.1}
\tcbuselibrary{breakable,magazine,skins,fitting}
diff --git a/macros/latex/contrib/tcolorbox/tcbprocessing.code.tex b/macros/latex/contrib/tcolorbox/tcbprocessing.code.tex
index 77c2182888..3b5904d044 100644
--- a/macros/latex/contrib/tcolorbox/tcbprocessing.code.tex
+++ b/macros/latex/contrib/tcolorbox/tcbprocessing.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 6.0.0 (2023/02/10)
+%% The LaTeX package tcolorbox - version 6.0.1 (2023/02/12)
%% tcbprocessing.code.tex: Code for conditional processing
%%
%% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{6.0.0}
+\tcb@set@library@version{6.0.1}
\RequirePackage{pdftexcmds}
\RequirePackage{shellesc}
diff --git a/macros/latex/contrib/tcolorbox/tcbraster.code.tex b/macros/latex/contrib/tcolorbox/tcbraster.code.tex
index 47e394433e..9b08f76d4b 100644
--- a/macros/latex/contrib/tcolorbox/tcbraster.code.tex
+++ b/macros/latex/contrib/tcolorbox/tcbraster.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 6.0.0 (2023/02/10)
+%% The LaTeX package tcolorbox - version 6.0.1 (2023/02/12)
%% tcbskinsjigsaw.code.tex: Code for colorboxes with different skins
%%
%% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{6.0.0}
+\tcb@set@library@version{6.0.1}
\newcounter{tcbrastercolumn}
\newcounter{tcbrasterrow}
diff --git a/macros/latex/contrib/tcolorbox/tcbskins.code.tex b/macros/latex/contrib/tcolorbox/tcbskins.code.tex
index 183ed011dd..40dfba8cc8 100644
--- a/macros/latex/contrib/tcolorbox/tcbskins.code.tex
+++ b/macros/latex/contrib/tcolorbox/tcbskins.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 6.0.0 (2023/02/10)
+%% The LaTeX package tcolorbox - version 6.0.1 (2023/02/12)
%% tcbskins.code.tex: Code for colorboxes with different skins
%%
%% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{6.0.0}
+\tcb@set@library@version{6.0.1}
\RequirePackage{tikz}[2010/10/13]
\RequirePackage{tikzfill.image}
diff --git a/macros/latex/contrib/tcolorbox/tcbskinsjigsaw.code.tex b/macros/latex/contrib/tcolorbox/tcbskinsjigsaw.code.tex
index 183095ad64..3726f9ef71 100644
--- a/macros/latex/contrib/tcolorbox/tcbskinsjigsaw.code.tex
+++ b/macros/latex/contrib/tcolorbox/tcbskinsjigsaw.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 6.0.0 (2023/02/10)
+%% The LaTeX package tcolorbox - version 6.0.1 (2023/02/12)
%% tcbskinsjigsaw.code.tex: Code for colorboxes with different skins
%%
%% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{6.0.0}
+\tcb@set@library@version{6.0.1}
\tcbuselibrary{skins}
diff --git a/macros/latex/contrib/tcolorbox/tcbtheorems.code.tex b/macros/latex/contrib/tcolorbox/tcbtheorems.code.tex
index 7135eaba32..e5688bc3a1 100644
--- a/macros/latex/contrib/tcolorbox/tcbtheorems.code.tex
+++ b/macros/latex/contrib/tcolorbox/tcbtheorems.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 6.0.0 (2023/02/10)
+%% The LaTeX package tcolorbox - version 6.0.1 (2023/02/12)
%% tcbtheorems.code.tex: Code for theorems in colorboxes
%%
%% -------------------------------------------------------------------------------------------
@@ -18,7 +18,7 @@
%% This work consists of all files listed in README
%%
%\makeatletter
-\tcb@set@library@version{6.0.0}
+\tcb@set@library@version{6.0.1}
\RequirePackage{amsmath}
diff --git a/macros/latex/contrib/tcolorbox/tcbvignette.code.tex b/macros/latex/contrib/tcolorbox/tcbvignette.code.tex
index 92d194860c..efabe919b9 100644
--- a/macros/latex/contrib/tcolorbox/tcbvignette.code.tex
+++ b/macros/latex/contrib/tcolorbox/tcbvignette.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 6.0.0 (2023/02/10)
+%% The LaTeX package tcolorbox - version 6.0.1 (2023/02/12)
%% tcbvignette.code.tex: Code for ornamental frames
%%
%% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{6.0.0}
+\tcb@set@library@version{6.0.1}
\tcbuselibrary{skins}
diff --git a/macros/latex/contrib/tcolorbox/tcbxparse.code.tex b/macros/latex/contrib/tcolorbox/tcbxparse.code.tex
index 56ad29b0d4..ae7e215812 100644
--- a/macros/latex/contrib/tcolorbox/tcbxparse.code.tex
+++ b/macros/latex/contrib/tcolorbox/tcbxparse.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 6.0.0 (2023/02/10)
+%% The LaTeX package tcolorbox - version 6.0.1 (2023/02/12)
%% tcbxparse.code.tex: Code for xparse features
%%
%% -------------------------------------------------------------------------------------------
@@ -18,6 +18,6 @@
%% This work consists of all files listed in README
%%
%\makeatletter
-\tcb@set@library@version{6.0.0}
+\tcb@set@library@version{6.0.1}
\RequirePackage{xparse}[2013/12/31]
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.pdf b/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.pdf
index f77ca2e8a9..c2c43d64df 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.pdf
+++ b/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.pdf
Binary files differ
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.tex b/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.tex
index 4dbfcb4fec..e3320325c6 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.tex
+++ b/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 6.0.0 (2023/02/10)
+%% The LaTeX package tcolorbox - version 6.0.1 (2023/02/12)
%% tcolorbox-example-poster.tex: a poster example for tcolorbox
%%
%% -------------------------------------------------------------------------------------------
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox-example.pdf b/macros/latex/contrib/tcolorbox/tcolorbox-example.pdf
index 08b56c8ef9..bd17e2f6d9 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox-example.pdf
+++ b/macros/latex/contrib/tcolorbox/tcolorbox-example.pdf
Binary files differ
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox-example.tex b/macros/latex/contrib/tcolorbox/tcolorbox-example.tex
index 8a705f8fd2..d415cda138 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox-example.tex
+++ b/macros/latex/contrib/tcolorbox/tcolorbox-example.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 6.0.0 (2023/02/10)
+%% The LaTeX package tcolorbox - version 6.0.1 (2023/02/12)
%% tcolorbox-example.tex: an example for tcolorbox
%%
%% -------------------------------------------------------------------------------------------
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.pdf b/macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.pdf
index 3640c4b7f0..744ea41206 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.pdf
+++ b/macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.pdf
Binary files differ
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.tex b/macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.tex
index 2980d2253e..44a485d1c5 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.tex
+++ b/macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.tex
@@ -1,5 +1,5 @@
% \LaTeX-Main\
-%% The LaTeX package tcolorbox - version 6.0.0 (2023/02/10)
+%% The LaTeX package tcolorbox - version 6.0.1 (2023/02/12)
%% tcolorbox-tutorial-poster.tex: a tutorial for poster creation with tcolorbox
%%
%% -------------------------------------------------------------------------------------------
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.pdf b/macros/latex/contrib/tcolorbox/tcolorbox.pdf
index 703ab400a6..f7dbfbcc4e 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox.pdf
+++ b/macros/latex/contrib/tcolorbox/tcolorbox.pdf
Binary files differ
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.sty b/macros/latex/contrib/tcolorbox/tcolorbox.sty
index 87d8d40309..7aaf198415 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox.sty
+++ b/macros/latex/contrib/tcolorbox/tcolorbox.sty
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 6.0.0 (2023/02/10)
+%% The LaTeX package tcolorbox - version 6.0.1 (2023/02/12)
%% tcolorbox.sty: Text color boxes
%%
%% -------------------------------------------------------------------------------------------
@@ -18,8 +18,8 @@
%% This work consists of all files listed in README
%%
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
-\ProvidesPackage{tcolorbox}[2023/02/10 version 6.0.0 text color boxes]
-\def\tcb@version{6.0.0}
+\ProvidesPackage{tcolorbox}[2023/02/12 version 6.0.1 text color boxes]
+\def\tcb@version{6.0.1}
\RequirePackage{pgf}[2008/01/15]
\RequirePackage{verbatim}[2003/08/22]
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.tex b/macros/latex/contrib/tcolorbox/tcolorbox.tex
index bcabeb82d0..ecfc14c670 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox.tex
+++ b/macros/latex/contrib/tcolorbox/tcolorbox.tex
@@ -1,5 +1,5 @@
% \LaTeX-Main\
-%% The LaTeX package tcolorbox - version 6.0.0 (2023/02/10)
+%% The LaTeX package tcolorbox - version 6.0.1 (2023/02/12)
%% tcolorbox.tex: Manual
%%
%% -------------------------------------------------------------------------------------------
@@ -51,8 +51,8 @@
\setlength{\bibitemsep}{\smallskipamount}
\addbibresource{tcolorbox.doc.bib}
-\def\version{6.0.0}%
-\def\datum{2023/02/10}%
+\def\version{6.0.1}%
+\def\datum{2023/02/12}%
\makeindex
\hypersetup{
diff --git a/macros/unicodetex/latex/bithesis/bithesis.dtx b/macros/unicodetex/latex/bithesis/bithesis.dtx
index cfbdbb5aa8..71252d8e2b 100644
--- a/macros/unicodetex/latex/bithesis/bithesis.dtx
+++ b/macros/unicodetex/latex/bithesis/bithesis.dtx
@@ -21,7 +21,7 @@
%<thesis>\ProvidesExplClass{bithesis}
%<report>\ProvidesExplClass{bitreport}
%<beamer>\ProvidesExplClass{bitbeamer}
-%<cls>{2023-02-02}{3.3.0}{BIT Thesis Templates}
+%<cls>{2023-02-11}{3.3.1}{BIT Thesis Templates}
%
%<oldcls>\NeedsTeXFormat{LaTeX2e}[2020/10/01]
%<book>\ProvidesClass{bitbook}
@@ -30,7 +30,7 @@
%<oldcls> [2022/05/09 v2.1.1 BIT Thesis Templates]
%
%<*driver>
-\ProvidesFile{bithesis.dtx}[2023/02/02 3.3.0 BIT Thesis Templates]
+\ProvidesFile{bithesis.dtx}[2023/02/11 3.3.1 BIT Thesis Templates]
\documentclass[letterpaper]{l3doc}
\usepackage{dtx-style}
@@ -373,10 +373,10 @@
% \subsubsection{手动四次编译}
%
% \begin{shell}
-% xelatex -no-pdf --interaction=nonstopmode main
-% biber main
-% xelatex -no-pdf --interaction=nonstopmode main
-% xelatex --interaction=nonstopmode main
+% xelatex -no-pdf --interaction=nonstopmode main
+% biber main
+% xelatex -no-pdf --interaction=nonstopmode main
+% xelatex --interaction=nonstopmode main
% \end{shell}
%
% 运行bibtex的时候会提示一些错误,可能是~{{\sc Bib}\TeX}~对UTF-8支持不充
@@ -1376,7 +1376,7 @@
%
% \begin{latex}
% \unimathsetup{bold-style=ISO}
-% \setmathfont{XITS Math}
+% \setmathfont{XITSMath-Regular.otf}
% \end{latex}
%
% \textit{请事先安装 XITS 字体。}
@@ -2242,10 +2242,12 @@
% \end{macrocode}
%
% 如果没有开启双面打印选项,则在 ctexbook 中开启单面打印选项。
+% 允许 chapter 直接另起一页(即使是偶数(左手)页)。
% \begin{macrocode}
\bool_if:NTF \g_@@_twoside_bool {} {
- \PassOptionsToClass{oneside,openany}{ctexbook}
+ \PassOptionsToClass{oneside}{ctexbook}
}
+\PassOptionsToClass{openany}{ctexbook}
% \end{macrocode}
%
% 将 |bithesis/option/ctex| 中的值传递给 ctexbook 模板类。
@@ -2648,8 +2650,6 @@
% 主体内容的页面样式。
% \begin{macrocode}
\RenewDocumentCommand \mainmatter {} {
- \cleardoublepage
-
% 这部分的章节标题进行编号。
\ctexset{
chapter = {
@@ -3609,6 +3609,8 @@
{4} {\@@_graduate_originality:}
{5} {\@@_graduate_originality:}
}
+ % 单独成页
+ \clearpage
\end{blindPeerReview}
\group_end:
}
@@ -3674,6 +3676,9 @@
\@@_if_thesis_int_type:nT {3} {
\addcontentsline{toc}{chapter}{\c_@@_label_toc_en_tl}
}
+
+ % 单独成页
+ \clearpage
}
}
% \end{macrocode}
@@ -3741,7 +3746,6 @@
% \begin{macrocode}
\NewDocumentEnvironment {abstractEn} {}
{
- \cleardoublepage
\setstretch{1.53}
\@@_if_bachelor_thesis:T {
@@ -4212,6 +4216,9 @@
}
{
\end{itemize}
+
+ % 单独一页
+ \clearpage
}
% \end{macrocode}
% \end{environment}
diff --git a/macros/unicodetex/latex/bithesis/bithesis.pdf b/macros/unicodetex/latex/bithesis/bithesis.pdf
index 5354add67c..b235ecb670 100644
--- a/macros/unicodetex/latex/bithesis/bithesis.pdf
+++ b/macros/unicodetex/latex/bithesis/bithesis.pdf
Binary files differ
diff --git a/macros/unicodetex/latex/tipauni/COPYING b/macros/unicodetex/latex/tipauni/COPYING
deleted file mode 100644
index f288702d2f..0000000000
--- a/macros/unicodetex/latex/tipauni/COPYING
+++ /dev/null
@@ -1,674 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
- The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works. By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users. We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors. You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
- To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights. Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received. You must make sure that they, too, receive
-or can get the source code. And you must show them these terms so they
-know their rights.
-
- Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
- For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software. For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
- Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so. This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software. The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable. Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products. If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
- Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary. To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- TERMS AND CONDITIONS
-
- 0. Definitions.
-
- "This License" refers to version 3 of the GNU General Public License.
-
- "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
- "The Program" refers to any copyrightable work licensed under this
-License. Each licensee is addressed as "you". "Licensees" and
-"recipients" may be individuals or organizations.
-
- To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy. The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
- A "covered work" means either the unmodified Program or a work based
-on the Program.
-
- To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy. Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
- To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies. Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
- An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License. If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
- 1. Source Code.
-
- The "source code" for a work means the preferred form of the work
-for making modifications to it. "Object code" means any non-source
-form of a work.
-
- A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
- The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form. A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
- The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities. However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work. For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
- The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
- The Corresponding Source for a work in source code form is that
-same work.
-
- 2. Basic Permissions.
-
- All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met. This License explicitly affirms your unlimited
-permission to run the unmodified Program. The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work. This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
- You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force. You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright. Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
- Conveying under any other circumstances is permitted solely under
-the conditions stated below. Sublicensing is not allowed; section 10
-makes it unnecessary.
-
- 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
- No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
- When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
- 4. Conveying Verbatim Copies.
-
- You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
- You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
- 5. Conveying Modified Source Versions.
-
- You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
- a) The work must carry prominent notices stating that you modified
- it, and giving a relevant date.
-
- b) The work must carry prominent notices stating that it is
- released under this License and any conditions added under section
- 7. This requirement modifies the requirement in section 4 to
- "keep intact all notices".
-
- c) You must license the entire work, as a whole, under this
- License to anyone who comes into possession of a copy. This
- License will therefore apply, along with any applicable section 7
- additional terms, to the whole of the work, and all its parts,
- regardless of how they are packaged. This License gives no
- permission to license the work in any other way, but it does not
- invalidate such permission if you have separately received it.
-
- d) If the work has interactive user interfaces, each must display
- Appropriate Legal Notices; however, if the Program has interactive
- interfaces that do not display Appropriate Legal Notices, your
- work need not make them do so.
-
- A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit. Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
- 6. Conveying Non-Source Forms.
-
- You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
- a) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by the
- Corresponding Source fixed on a durable physical medium
- customarily used for software interchange.
-
- b) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by a
- written offer, valid for at least three years and valid for as
- long as you offer spare parts or customer support for that product
- model, to give anyone who possesses the object code either (1) a
- copy of the Corresponding Source for all the software in the
- product that is covered by this License, on a durable physical
- medium customarily used for software interchange, for a price no
- more than your reasonable cost of physically performing this
- conveying of source, or (2) access to copy the
- Corresponding Source from a network server at no charge.
-
- c) Convey individual copies of the object code with a copy of the
- written offer to provide the Corresponding Source. This
- alternative is allowed only occasionally and noncommercially, and
- only if you received the object code with such an offer, in accord
- with subsection 6b.
-
- d) Convey the object code by offering access from a designated
- place (gratis or for a charge), and offer equivalent access to the
- Corresponding Source in the same way through the same place at no
- further charge. You need not require recipients to copy the
- Corresponding Source along with the object code. If the place to
- copy the object code is a network server, the Corresponding Source
- may be on a different server (operated by you or a third party)
- that supports equivalent copying facilities, provided you maintain
- clear directions next to the object code saying where to find the
- Corresponding Source. Regardless of what server hosts the
- Corresponding Source, you remain obligated to ensure that it is
- available for as long as needed to satisfy these requirements.
-
- e) Convey the object code using peer-to-peer transmission, provided
- you inform other peers where the object code and Corresponding
- Source of the work are being offered to the general public at no
- charge under subsection 6d.
-
- A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
- A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling. In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage. For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product. A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
- "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source. The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
- If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information. But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
- The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed. Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
- Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
- 7. Additional Terms.
-
- "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law. If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
- When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it. (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.) You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
- Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
- a) Disclaiming warranty or limiting liability differently from the
- terms of sections 15 and 16 of this License; or
-
- b) Requiring preservation of specified reasonable legal notices or
- author attributions in that material or in the Appropriate Legal
- Notices displayed by works containing it; or
-
- c) Prohibiting misrepresentation of the origin of that material, or
- requiring that modified versions of such material be marked in
- reasonable ways as different from the original version; or
-
- d) Limiting the use for publicity purposes of names of licensors or
- authors of the material; or
-
- e) Declining to grant rights under trademark law for use of some
- trade names, trademarks, or service marks; or
-
- f) Requiring indemnification of licensors and authors of that
- material by anyone who conveys the material (or modified versions of
- it) with contractual assumptions of liability to the recipient, for
- any liability that these contractual assumptions directly impose on
- those licensors and authors.
-
- All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10. If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term. If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
- If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
- Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
- 8. Termination.
-
- You may not propagate or modify a covered work except as expressly
-provided under this License. Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
- However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
- Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
- Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License. If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
- 9. Acceptance Not Required for Having Copies.
-
- You are not required to accept this License in order to receive or
-run a copy of the Program. Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance. However,
-nothing other than this License grants you permission to propagate or
-modify any covered work. These actions infringe copyright if you do
-not accept this License. Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
- 10. Automatic Licensing of Downstream Recipients.
-
- Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License. You are not responsible
-for enforcing compliance by third parties with this License.
-
- An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations. If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
- You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License. For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
- 11. Patents.
-
- A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based. The
-work thus licensed is called the contributor's "contributor version".
-
- A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version. For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
- Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
- In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement). To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
- If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients. "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
- If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
- A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License. You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
- Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
- 12. No Surrender of Others' Freedom.
-
- If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all. For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
- 13. Use with the GNU Affero General Public License.
-
- Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work. The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
- 14. Revised Versions of this License.
-
- The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
- Each version is given a distinguishing version number. If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation. If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
- If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
- Later license versions may give you additional or different
-permissions. However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
- 15. Disclaimer of Warranty.
-
- THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. Limitation of Liability.
-
- IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
- 17. Interpretation of Sections 15 and 16.
-
- If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
- If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
- <program> Copyright (C) <year> <name of author>
- This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
- You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
-
- The GNU General Public License does not permit incorporating your program
-into proprietary programs. If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License. But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.
diff --git a/macros/unicodetex/latex/tipauni/README.txt b/macros/unicodetex/latex/tipauni/README.txt
index 7eb8a6bd48..5088c9d2b0 100644
--- a/macros/unicodetex/latex/tipauni/README.txt
+++ b/macros/unicodetex/latex/tipauni/README.txt
@@ -1,7 +1,7 @@
--------------------------------------------------------------------------
Package: tipauni
Author: निरंजन
-Version: v0.6.1 (22 October, 2022)
+Version: v0.7 (13 February, 2023)
Description: For producing Unicode characters with TIPA commands.
Repository: https://git.gnu.org.ua/tipauni.git
Bug tracker: https://puszcza.gnu.org.ua/bugs/?group=tipauni
diff --git a/macros/unicodetex/latex/tipauni/tipauni-commands.pdf b/macros/unicodetex/latex/tipauni/tipauni-commands.pdf
index a69027ff69..93778b8423 100644
--- a/macros/unicodetex/latex/tipauni/tipauni-commands.pdf
+++ b/macros/unicodetex/latex/tipauni/tipauni-commands.pdf
Binary files differ
diff --git a/macros/unicodetex/latex/tipauni/tipauni-example.pdf b/macros/unicodetex/latex/tipauni/tipauni-example.pdf
index ba19b1ec88..5d2d1c7104 100644
--- a/macros/unicodetex/latex/tipauni/tipauni-example.pdf
+++ b/macros/unicodetex/latex/tipauni/tipauni-example.pdf
Binary files differ
diff --git a/macros/unicodetex/latex/tipauni/tipauni.dtx b/macros/unicodetex/latex/tipauni/tipauni.dtx
index c9db68206c..926e41ee1b 100644
--- a/macros/unicodetex/latex/tipauni/tipauni.dtx
+++ b/macros/unicodetex/latex/tipauni/tipauni.dtx
@@ -4,14 +4,14 @@
% ---------------------------------------------------------------------------
% Package: tipauni
% Author: निरंजन
-% Version: v0.6.1 (21 October, 2022)
+% Version: v0.7 (13 February, 2023)
% Description: For producing Unicode characters with TIPA commands.
% Repository: https://git.gnu.org.ua/tipauni.git
% Bug tracker: https://puszcza.gnu.org.ua/bugs/?group=tipauni
% License: GPL v3.0+, GFDL v1.3+
% ---------------------------------------------------------------------------
-% LaTeX Package tipauni v0.6.1
-% Copyright © 2021, 2022 निरंजन
+% LaTeX Package tipauni v0.7
+% Copyright © 2021, 2022, 2023 निरंजन
%
% This program is free software: you can redistribute it and/or modify
% it under the terms of the GNU General Public License as published by
@@ -40,7 +40,7 @@
--------------------------------------------------------------------------
Package: tipauni
Author: निरंजन
-Version: v0.6.1 (22 October, 2022)
+Version: v0.7 (13 February, 2023)
Description: For producing Unicode characters with TIPA commands.
Repository: https://git.gnu.org.ua/tipauni.git
Bug tracker: https://puszcza.gnu.org.ua/bugs/?group=tipauni
@@ -52,12 +52,13 @@ License: GPL v3.0+, GFDL v1.3+
%</internal>
%<*driver|package>
\def\tipauniname{tipauni}
-\def\tipauniversion{0.6.1}
-\def\tipaunidate{2022-10-21}
+\def\tipauniversion{0.7}
+\def\tipaunidate{2023-02-13}
\def\tipaunidescription{For producing Unicode characters with TIPA commands}
%</driver|package>
%<*driver>
\documentclass{l3doc}
+\usepackage{gfdl}
\usepackage{multicol}
\usepackage{graphicx}
\usepackage{array}
@@ -69,12 +70,32 @@ License: GPL v3.0+, GFDL v1.3+
\usepackage{hologo}
\DeclareRobustCommand\XeLaTeX{\hologo{XeLaTeX}}
\usepackage{fontspec}
-\newfontfamily{\ipa}[Color=blue]{CharisSIL}
+\newfontfamily{\ipa}[%
+ % Courtesy: https://topanswers.xyz/tex?q=3042#a3083
+ IgnoreFontspecFile,%
+ Color = {blue},%
+ StylisticSet = {5},%
+ Renderer = {Harfbuzz},%
+ ItalicFont = {NewCM10-Italic.otf},%
+ BoldFont = {NewCM10-Bold.otf},%
+ SmallCapsFeatures = {%
+ % Courtesy: https://tex.stackexchange.com/a/107246
+ Numbers = {Lining,Monospaced},%
+ Letters = {SmallCaps}%
+ }%
+]{NewCM10-Regular.otf}
\newfontfamily{\devtext}[%
Script=Devanagari,%
Renderer=Harfbuzz,%
Scale=0.8%
]{Shobhika}
+\setmonofont[%
+ IgnoreFontspecFile,%
+ Renderer = {Harfbuzz},%
+ StylisticSet = {5},%
+ ItalicFont = {NewCMMono10-Italic.otf},%
+ BoldFont = {NewCMMono10-Bold.otf}%
+]{NewCMMono10-Regular.otf}
\usepackage{fontawesome5}
\usepackage{hyperxmp}
\hypersetup{%
@@ -87,21 +108,20 @@ Scale=0.8%
pdfauthor={निरंजन},%
pdfsubject={For producing Unicode characters with TIPA commands.},%
pdfcreator={निरंजन},%
- pdfkeywords={Linguistics, Phonetics, IPA, TIPA, LaTeX},%
- pdfcopyright={%
- The LaTeX package tipauni\textLF
- Copyright © 2021, 2022 निरंजन\textLF
- Permission is granted to copy, distribute and/or modify
- this document under the terms of the GNU Free
- Documentation License, Version 1.3 or any later version
- published by the Free Software Foundation; with no
- Invariant Sections, no Front-Cover Texts, and no
- Back-Cover Texts. A copy of the license is included in
- the section entitled “GNU Free Documentation License”.%
- },%
- pdflicenseurl={https://www.gnu.org/licenses/fdl-1.3.txt}%
+ pdfkeywords={Linguistics, Phonetics, IPA, TIPA, LaTeX}%
}%
\renewcommand{\arraystretch}{1.2}
+\gfdlcopyrightholders{%
+ \texorpdfstring
+ {{\devtext निरंजन}}%
+ {निरंजन}%
+}%
+\gfdlcopyrightableyears{2021, 2022, 2023}
+\gfdlcopyrightdescription{%
+ \texorpdfstring
+ {The \LaTeX\ package tipauni}%
+ {The LaTeX package tipauni}%
+}
\begin{document}
\DocInput{\tipauniname.dtx}
@@ -132,21 +152,6 @@ Scale=0.8%
% \maketitle
%
% \tableofcontents
-%
-% \vfill
-% {%
-% \setlength{\parindent}{0pt}
-% The \LaTeX\ package tipauni
-%
-% Copyright © 2021, 2022 {\devtext निरंजन}
-%
-% Permission is granted to copy, distribute and/or modify this document under
-% the terms of the GNU Free Documentation License, Version 1.3 or any later
-% version published by the Free Software Foundation; with no Invariant
-% Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the
-% license is included in the section entitled ``GNU Free Documentation
-% License''.
-% }%
%
% \clearpage\pagebreak
%
@@ -194,6 +199,8 @@ Scale=0.8%
% \item[2022-01-09]
% Fix a typo in Input B of Near-close near-front rounded.
% \href{https://puszcza.gnu.org.ua/bugs/index.php?542}{(link)}
+% \item[2023-02-13]
+% Changed the default font to New Computer Modern instead of Charis SIL.
% \end{description}
%
% Anja Hasse pointed a bug in the package with an SE question\footnote{%
@@ -210,12 +217,15 @@ Scale=0.8%
% documentfont=\meta{font-name}
% \end{syntax}
%
-% The default font for the entire document set by this package is the
-% \href{https://ctan.org/pkg/charissil}{Charis SIL}. Users can easily change
-% it with the package-option \verb|documentfont|. This option takes one
-% value which is the font-name. e.g.\ For using the
-% \href{https://ctan.org/pkg/doulossil}{Doulos SIL} font as the main font,
-% use the package like it is used in the following.
+% The default font for the entire document set by this package used to be
+% \href{https://ctan.org/pkg/charissil}{Charis SIL}. From |v0.7| the package
+% has changed the default font to \href{https://ctan.org/pkg/newcm}{New
+% Computer Modern}. The reason for this breaking change is that Charis SIL
+% was just used because of it's good support for IPA which was absent with
+% the default Latin Modern shape. New Computer Modern has developed all the
+% support for IPA \& hence I am making this change. Users can easily change
+% the default font with the package-option \verb|documentfont| as documented
+% below.
%
% \begin{verbatim}
% \usepackage[documentfont=DoulosSIL]{tipauni}
@@ -241,11 +251,11 @@ Scale=0.8%
% This option can be used to set options to the font set with
% \verb|documentfont| package option. If the \verb|recommendedfont| option
% is used \& has the highest priority; the options set with
-% \verb|fontspecoptions| will be used with the Charis SIL font. If the
+% \verb|fontspecoptions| will be used with the default font. If the
% \verb|preservefont| option has the highest priority, this parameter will
% be ineffective \& throw a warning. In the argument of this option write as
% if you are writing in the optional parameter of the \cs{setmainfont}
-% command. e.g.\
+% command, e.g.:
%
% \begin{verbatim}
% \usepackage[fontspecoptions={Scale=1.5}]{tipauni}
@@ -254,12 +264,12 @@ Scale=0.8%
% \noindent If this options is used with no value it will be ignored with a
% warning.
%
-% \noindent e.g.\ Try \verb|\usepackage[fontspecoptions]{tipauni}|.
+% \noindent E.g.\ Try \verb|\usepackage[fontspecoptions]{tipauni}|.
%
% \medskip
%
% \noindent If it is used with an empty value it will reset the fontspec-options so
-% far you have set. e.g.\ Try:
+% far you have set, e.g., Try:
%
% \begin{verbatim}
% \usepackage[%
@@ -275,28 +285,27 @@ Scale=0.8%
% for the following keys.
%
% \begin{function}{preservefont}
-% This option will omit executing the \cs{setmainfont} command with Charis
-% SIL. The typeset document will use the default font of Lua/\XeLaTeX, i.e.,
-% the Latin Modern.
+% This option will omit executing the \cs{setmainfont} command with New
+% Computer Modern. The typeset document will use the default font of
+% Lua/\XeLaTeX, i.e., the Latin Modern.
% \end{function}
%
% \begin{function}{recommendedfont}
% This option is used to override other font definitions made with option
-% \verb|documentfont|. Charis SIL will be used as the main font of the
-% document when this option is used.
+% \verb|documentfont|. New Computer Modern will be used as the main font of
+% the document when this option is used.
% \end{function}
%
% Please note that every option so far mentioned can potentially override each
-% other. e.g.\ If a \verb|documentfont| is added after a \verb|preservefont|,
+% other, e.g., If a \verb|documentfont| is added after a \verb|preservefont|,
% the former will override the latter (\& vice versa). It is true for all
% these three package options.
%
% \begin{function}{resetfontspecoptions}
-% This option is used to reset all the \pkg{fontspec} options set with
-% package option \verb|fontspecoptions|. As noted for the font-options,
-% these two options which deal with the options of the loaded fonts also can
-% override each other. The last one loaded will be considered of the highest
-% priority.
+% This option resets all the \pkg{fontspec}-options set with package option
+% \verb|fontspecoptions|. As noted for the font-options, these two options
+% which deal with the options of the loaded fonts also can override each
+% other. The last one loaded will be considered of the highest priority.
% \end{function}
%
% \begin{function}{incompatible}
@@ -309,10 +318,10 @@ Scale=0.8%
% \section{List of available commands}
% TIPA has two alternative methods for inputting IPA characters. In the
% following tables, \textbf{Input A} column lists all the long TIPA commands
-% (e.g.~\verb|\textrtailt|) \textit{\&} \textbf{Input B} column lists the
-% short ones (e.g.~\verb|\textipa{\:t}|)\footnote{All of these commands must
+% (e.g., \verb|\textrtailt|) \textit{\&} \textbf{Input B} column lists the
+% short ones (e.g., \verb|\textipa{\:t}|)\footnote{All of these commands must
% be enclosed in the \texttt{\textbackslash textipa}
-% command. (e.g.~\texttt{\textbackslash textipa\{\textbackslash :tP\}} for
+% command. (e.g., \texttt{\textbackslash textipa\{\textbackslash :tP\}} for
% {\ipa [ʈʔ]})}. This documentation lists down all the commands necessary for
% typing symbols in the IPA chart.
%
@@ -508,7 +517,7 @@ Scale=0.8%
% \midrule
% Rhoticity & \verb|ə\textrhoticity|\tnotex{1} & \color{red}{\verb|ə\tr|}
% & ə˞\\
-% No audible release & \verb|n\textcorner| & \color{red}{\verb|n\tc|} & n̚
+% No audible release & \verb|n\textcorner| & \color{red}{\verb|n\tc|} & n̚\,
% \\
% Tie bar (standalone) & \color{red}{\verb|\stdlnetiebar{əi}|} &
% \color{red}{\verb|\ts{əi}|} & ə‿i \\
@@ -581,7 +590,7 @@ Scale=0.8%
% \end{macrocode}
% Provide the package with some description \textit{\&} version specifications.
% \begin{macrocode}
-\ProvidesPackage{tipauni}[2022/10/21 v0.6.1
+\ProvidesPackage{tipauni}[2023/02/13 v0.7
Unicode characters with TIPA commands]
% \end{macrocode}
% Load necessary packages.
@@ -593,7 +602,8 @@ Unicode characters with TIPA commands]
% Package options are provided using the package \pkg{expkv}.
% \begin{macrocode}
\newif\iftipauni@document@font
-\def\tipauni@recommended@font{CharisSIL}
+\def\tipauni@bookorregular{regular}
+\def\tipauni@recommended@font{tipauni-newcm-\tipauni@bookorregular}
\tipauni@document@fonttrue
\let\tipauni@font@options\@empty
\ekvdefinekeys{tipauni}{%
@@ -615,10 +625,9 @@ Unicode characters with TIPA commands]
},%
noval documentfont = {%
\PackageError{tipauni}{No value for the `documentfont' option}{%
- The `documentfont' option has no value. Please provide a valid font-name,%
- \MessageBreak
- otherwise it will be ignored or (if given) the value of another non-empty%
- \MessageBreak
+ The `documentfont' option has no value. Please provide a valid
+ font-name,\MessageBreak otherwise it will be ignored or
+ (if given) the value of another non-empty\MessageBreak
`documentfont' will be used.%
}%
\ifdefined\tipauni@font
@@ -650,6 +659,9 @@ Unicode characters with TIPA commands]
noval recommendedfont = {%
\tipauni@document@fonttrue
\let\tipauni@font\tipauni@recommended@font
+ },%
+ noval newcmbook = {%
+ \def\tipauni@bookorregular{book}%
}%
}
\ekvoProcessLocalOptions{tipauni}
@@ -1053,7 +1065,11 @@ Unicode characters with TIPA commands]
% We'll need a scan mark for the |act| code, so we initialise it.
% \begin{macrocode}
\scan_new:N \s_@@_act_stop
-\cs_new:Npn \@@_use_none_delimit_by_act_stop:w #1 \s_@@_act_stop {}
+\cs_new:Npn
+\@@_use_none_delimit_by_act_stop:w
+#1
+\s_@@_act_stop
+{}
% \end{macrocode}
% The act macro uses a bit of low level coding to get good performance. It
% implements a loop which does the replacement of single letters, bigraphs or
@@ -1063,7 +1079,10 @@ Unicode characters with TIPA commands]
% token which is not allowed to be ever part of the argument for
% \cs{_@@_act:n} is \cs{s_@@_act_stop}.
% \begin{macrocode}
-\cs_new:Npn \@@_act:n #1 { \@@_act_loop:w #1 {\s_@@_act_stop} . \s_@@_act_stop }
+\cs_new:Npn
+\@@_act:n
+#1
+{ \@@_act_loop:w #1 {\s_@@_act_stop} . \s_@@_act_stop }
% \end{macrocode}
% Just to have an easier to spot output we use a private copy of \cs{exp_not:n},
% meaning we leave the output in the input stream (but since the whole loop
@@ -1131,7 +1150,10 @@ Unicode characters with TIPA commands]
\token_if_eq_meaning:NNTF ##1 \@@_act_macro:nn
{ \@@_act_space_macro:nn ##2 }
{
- \cs_if_exist_use:cTF { @@_act_char_mono_ \tl_to_str:n { ##2 } : }
+ \cs_if_exist_use:cTF {
+ @@_act_char_mono_
+ \tl_to_str:n { ##2 } :
+ }
{ \@@_act_output:n {~} }
{ \@@_act_output:n { ##2 ~ } }
\@@_act_loop:w
@@ -1161,9 +1183,16 @@ Unicode characters with TIPA commands]
\token_if_eq_meaning:NNTF #1 \@@_act_macro:nn
{ \@@_act_group_macro:nn {#2} {#3} }
{
- \cs_if_exist_use:cF { @@_act_char_mono_ \tl_to_str:n { #2 } : }
- { \@@_act_output:n {#2} }
- { \@@_act_loop:w #3 {\s_@@_act_stop} . \s_@@_act_stop }
+ \cs_if_exist_use:cF
+ { @@_act_char_mono_ \tl_to_str:n { #2 } : }
+ { \@@_act_output:n {#2} }
+ {
+ \@@_act_loop:w
+ #3
+ {\s_@@_act_stop}
+ .
+ \s_@@_act_stop
+ }
}
\@@_act_loop:w
}
@@ -1212,8 +1241,15 @@ Unicode characters with TIPA commands]
\cs_new:Npn \@@_act_macro:nn #1#2
{
\cs_if_exist_use:cF
- { @@_act_macro_ \exp_args:No \tl_to_str:n { \use_i:nn #1 / #2 } : }
- { \exp_args:No \@@_act_output:n { \use:nn #1 #2 } }
+ {
+ @@_act_macro_
+ \exp_args:No
+ \tl_to_str:n {
+ \use_i:nn #1 / #2
+ }
+ :
+ }
+ { \exp_args:No \@@_act_output:n { \use:nn #1 #2 } }
}
% \end{macrocode}
% If the |macro| state was active when a group was encountered we need to check
@@ -1224,11 +1260,25 @@ Unicode characters with TIPA commands]
\cs_new:Npn \@@_act_group_macro:nn #1#2
{
\cs_if_exist_use:cF
- { @@_act_macro_ \exp_args:No \tl_to_str:n { \use_i:nn #1 / #2 } : }
+ {
+ @@_act_macro_
+ \exp_args:No
+ \tl_to_str:n {
+ \use_i:nn #1 / #2
+ }
+ :
+ }
+ {
+ \exp_args:No
+ \@@_act_output:n {
+ \use:nn #1
+ }
{
- \exp_args:No \@@_act_output:n { \use:nn #1 }
- { \@@_act_loop:w #2 {\s_@@_act_stop} . \s_@@_act_stop }
+ \@@_act_loop:w
+ #2
+ {\s_@@_act_stop} . \s_@@_act_stop
}
+ }
}
% \end{macrocode}
% If the |char| state is active we need to check whether a bigraph was found, if
@@ -1241,12 +1291,24 @@ Unicode characters with TIPA commands]
% \begin{macrocode}
\cs_new:Npn \@@_act_char:nn #1#2
{
- \cs_if_exist_use:cF { @@_act_char_bigraph_ \tl_to_str:n { #1/#2 } : }
- {
- \cs_if_exist_use:cF { @@_act_char_mono_ \tl_to_str:n { #1 } : }
- { \@@_act_output:n {#1} }
- \use_i:nn { \@@_act_normal:NnN \use_none:nn {} {#2} }
+ \cs_if_exist_use:cF {
+ @@_act_char_bigraph_
+ \tl_to_str:n
+ { #1/#2 }
+ :
+ }
+ {
+ \cs_if_exist_use:cF {
+ @@_act_char_mono_
+ \tl_to_str:n { #1 }
+ :
+ }
+ { \@@_act_output:n {#1} }
+ \use_i:nn {
+ \@@_act_normal:NnN
+ \use_none:nn {} {#2}
}
+ }
}
% \end{macrocode}
% To register new bigraphs we use the following functions. The information is
@@ -1258,8 +1320,8 @@ Unicode characters with TIPA commands]
% |@@_act_char_mono_|\meta{token}|:|. Those second macros contain the actual
% replacement.
%
-% The first macro is a wrapper which just inputs \cs{@@_new_macro_bigraph:NNn}
-% for the two macros in |#1| and |#2|.
+% \cs{@@_new_macro_bigraph:NNn} is input for the two macros in |#1| and |#2| by
+% the first macro which is a wrapper.
% \begin{macrocode}
\cs_new_protected:Npn \@@_new_macro_pair_bigraph:NNNn #1#2#3#4
{
@@ -1272,10 +1334,22 @@ Unicode characters with TIPA commands]
% \begin{macrocode}
\cs_new_protected:Npn \@@_new_macro_bigraph:NNn #1#2#3
{
- \cs_gset:cpn { @@_act_normal_ \tl_to_str:n {#1} :nw } ##1##2 \@@_act_loop:w
- { \@@_act_loop:Nnw \@@_act_macro:nn { {##1} {} } }
- \cs_gset:cpn { @@_act_macro_ \tl_to_str:n { #1/#2 } : }
- { \@@_act_output:n {#3} }
+ \cs_gset:cpn {
+ @@_act_normal_
+ \tl_to_str:n
+ {#1}
+ :nw
+ }
+ ##1##2
+ \@@_act_loop:w
+ {
+ \@@_act_loop:Nnw
+ \@@_act_macro:nn
+ { {##1} {} }
+ }
+ \cs_gset:cpn
+ { @@_act_macro_ \tl_to_str:n { #1/#2 } : }
+ { \@@_act_output:n {#3} }
}
% \end{macrocode}
% A character bigraph should consist of two characters. It'll switch the state
@@ -1283,10 +1357,22 @@ Unicode characters with TIPA commands]
% \begin{macrocode}
\cs_new_protected:Npn \@@_new_char_bigraph:NNn #1#2#3
{
- \cs_gset:cpn { @@_act_normal_ \tl_to_str:n {#1} :nw } ##1##2 \@@_act_loop:w
- { \@@_act_loop:Nnw \@@_act_char:nn {##1} }
- \cs_gset:cpn { @@_act_char_bigraph_ \tl_to_str:n { #1/#2 } : }
- { \@@_act_output:n {#3} }
+ \cs_gset:cpn {
+ @@_act_normal_
+ \tl_to_str:n
+ {#1}
+ :nw
+ } ##1##2
+ \@@_act_loop:w
+ {
+ \@@_act_loop:Nnw
+ \@@_act_char:nn {##1}
+ }
+ \cs_gset:cpn {
+ @@_act_char_bigraph_
+ \tl_to_str:n { #1/#2 } :
+ }
+ { \@@_act_output:n {#3} }
}
% \end{macrocode}
% And lastly the single replacements which should just be a single character.
@@ -1295,10 +1381,22 @@ Unicode characters with TIPA commands]
% \begin{macrocode}
\cs_new_protected:Npn \@@_new_char_mono:Nn #1#2
{
- \cs_gset:cpn { @@_act_normal_ \tl_to_str:n {#1} :nw } ##1##2 \@@_act_loop:w
- { \@@_act_loop:Nnw \@@_act_char:nn {##1} }
- \cs_gset:cpn { @@_act_char_mono_ \tl_to_str:n {#1} : }
- { \@@_act_output:n {#2} }
+ \cs_gset:cpn {
+ @@_act_normal_
+ \tl_to_str:n
+ {#1}
+ :nw
+ } ##1##2
+ \@@_act_loop:w
+ { \@@_act_loop:Nnw
+ \@@_act_char:nn
+ {##1}
+ }
+ \cs_gset:cpn
+ { @@_act_char_mono_
+ \tl_to_str:n {#1} :
+ }
+ { \@@_act_output:n {#2} }
}
% \end{macrocode}
% Everything that's now missing is defining the macros storing the replacements
@@ -1413,7 +1511,9 @@ Unicode characters with TIPA commands]
%%--** Tie bar (above)
\DeclareTextCommand{\tipaunitexttoptiebar}{TU}[2]{#1\symbol{"0361}#2}
\NewDocumentCommand\texttoptiebar{ m }{\tipaunitexttoptiebar#1}
-\DeclareTextCommand{\tipaunit}{TU}{\@ifstar{\textbottomtiebar}{\texttoptiebar}}
+\DeclareTextCommand{\tipaunit}{TU}{%
+ \@ifstar{\textbottomtiebar}{\texttoptiebar}%
+}
% \end{macrocode}
% Lastly the code for environment \texttt{IPA} is provided by the following.
% \begin{macrocode}
@@ -1422,10 +1522,33 @@ Unicode characters with TIPA commands]
% \begin{macrocode}
%</package>
% \end{macrocode}
+% Since we want to add certain features to the |NewCM| font, we generate two
+% |.fontspec| files with this package. The following is the tag used for
+% generating the |.fontspec| file of the regular weight.
+% \begin{macrocode}
+%<*regularfontspec>
+\defaultfontfeatures[tipauni-newcm-regular]{%
+ Renderer = {Harfbuzz},%
+ UprightFont = {NewCM10-Regular.otf},%
+ ItalicFont = {NewCM10-Italic.otf},%
+ BoldFont = {NewCM10-Bold.otf},%
+ BoldItalicFont = {NewCM10-BoldItalic.otf}%
+}
+%</regularfontspec>
+% \end{macrocode}
+% With the following tag generates the |.fontspec| file for the book weight of
+% the font.
+% \begin{macrocode}
+%<*bookfontspec>
+\defaultfontfeatures[tipauni-newcm-book]{%
+ Renderer = {Harfbuzz},%
+ UprightFont = {NewCM10-Book.otf},%
+ ItalicFont = {NewCM10-BookItalic.otf},%
+ BoldFont = {NewCM10-Bold.otf},%
+ BoldItalicFont = {NewCM10-BoldItalic.otf}%
+}
+%</bookfontspec>
+% \end{macrocode}
% \end{implementation}
%
-% \pagebreak
-%
-% \input{gfdl-tex.tex}
-%
% \Finale
diff --git a/macros/unicodetex/latex/tipauni/tipauni.ins b/macros/unicodetex/latex/tipauni/tipauni.ins
index 5ea278f225..32dbd3951e 100644
--- a/macros/unicodetex/latex/tipauni/tipauni.ins
+++ b/macros/unicodetex/latex/tipauni/tipauni.ins
@@ -15,8 +15,8 @@ Bug tracker: https://puszcza.gnu.org.ua/bugs/?group=tipauni
License: GPL v3.0+, GFDL 1.3+
---------------------------------------------------------------------------
-LaTeX Package tipauni v0.6.1
-Copyright © 2021, 2022 निरंजन
+LaTeX Package tipauni v0.7
+Copyright © 2021, 2022, 2023 निरंजन
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -40,6 +40,15 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
}
\nopreamble\nopostamble
+\generate{%
+ \file{tipauni-newcm-regular.fontspec}{%
+ \from{\jobname.dtx}{regularfontspec}%
+ }%
+ \file{tipauni-newcm-book.fontspec}{%
+ \from{\jobname.dtx}{bookfontspec}%
+ }%
+}%
+
\usedir{doc/latex/\jobname}
\generate{
\file{README.txt}{\from{\jobname.dtx}{readme}}
diff --git a/macros/unicodetex/latex/tipauni/tipauni.pdf b/macros/unicodetex/latex/tipauni/tipauni.pdf
index 5b1c9735d3..bcef1c0ee7 100644
--- a/macros/unicodetex/latex/tipauni/tipauni.pdf
+++ b/macros/unicodetex/latex/tipauni/tipauni.pdf
Binary files differ