diff options
author | Norbert Preining <norbert@preining.info> | 2023-04-15 03:01:57 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2023-04-15 03:01:57 +0000 |
commit | 78e6b19d4678a9d641c4afa4ca800288cfa0a9d5 (patch) | |
tree | ad774593055c02ade73402379b9df52568f6940f /macros | |
parent | b17717e3829bc08efb71ec2537d9d894c8b82d45 (diff) |
CTAN sync 202304150301
Diffstat (limited to 'macros')
62 files changed, 655 insertions, 522 deletions
diff --git a/macros/context/contrib/context-calendar-examples/VERSION b/macros/context/contrib/context-calendar-examples/VERSION index bcdfbcd1bb..345ab1ba1e 100644 --- a/macros/context/contrib/context-calendar-examples/VERSION +++ b/macros/context/contrib/context-calendar-examples/VERSION @@ -1 +1 @@ -2023.03.23
\ No newline at end of file +2023.04.14
\ No newline at end of file diff --git a/macros/context/contrib/context-calendar-examples/tex/context/third/calendar-examples/A6-1week_per_2pages.tex b/macros/context/contrib/context-calendar-examples/tex/context/third/calendar-examples/A6-1week_per_2pages.tex index ea25de5f9a..6432824f46 100644 --- a/macros/context/contrib/context-calendar-examples/tex/context/third/calendar-examples/A6-1week_per_2pages.tex +++ b/macros/context/contrib/context-calendar-examples/tex/context/third/calendar-examples/A6-1week_per_2pages.tex @@ -1,6 +1,6 @@ % Context file % Filename: A6-1week_per_2pages.tex -% +% % 14-01-2023 % Created by Willi Egger, w.egger@boede.nl % This document is in the Public Domain. @@ -29,17 +29,16 @@ % This example supports 6 languages i.e. English, German, Dutch, French, % Italian and Spanish. The respective interface is activated by enabling the % respective mode -% The original idea was to have an A6 calendar, where 4 pages are print on +% The original idea was to have an A6 calendar, where 4 pages are print on the % A4 paper. This is activated by enabling the mode "A6". By activating the mode % "A5" the calendar is prepared A5 sized on a A4 landscape paper. % Because there are astronomical data concerning the sun rise, sun set times it -% is necessary to fill in the correct geo-positional data in the variable set -% "PocketDiaryGeoPosition". +% is necessary to fill in the correct geo-positional data in the variable set "PocketDiaryGeoPosition". \usemodule[pocketdiary] \usemodule[collatingmarks][Collatingmarks=yes] - -\definemode[English,Dutch,German,French,Italian][keep] + +\definemode[English,Dutch,German,French,Italian,Spanish,Polish][keep] \definemode[A5,A6][keep] \enablemode[English] @@ -48,13 +47,14 @@ % \enablemode[Italian] % \enablemode[French] % \enablemode[Spanish] +% \enalbemode[Polish] \enablemode[A6] -% \enablemode[A5] +%\enablemode[A5] \setvariables [PocketDiary] - [Year=2023, + [Year=2020, Week=1, Day=1, Month=1, @@ -71,7 +71,7 @@ [Separatorline=blue, Gridline={s=.75}] -\setvariables +\setvariables %Koziegłowy 52.467860 16.981240 [PocketDiaryGeoPosition] [lat=52.467860, lon=16.981240, @@ -129,15 +129,17 @@ margin=0pt, height=middle, width=middle, - location=middle] + location=middle, + marking=on] \startmode[A6] \definepapersize[Agenda][width=100mm,height=140mm] \setuppapersize[Agenda][A4,portrait] - - % The vertical page-shift enables to make a 2.5mm cut at the head of the - % section + % \setuppapersize[Agenda][Agenda] + + % The vertical page-shift enables to make a 2.5mm cut at the head of the + % section \definepageshift [ver] [vertical] @@ -148,7 +150,7 @@ \setuparranging[2*4*2] - \setupMPvariables % for collating marks + \setupMPvariables % for collatingmarks [pages=8, % pages per sheet of paper doublesided sheets=2, % sheets of paper used per section horpageshift=-0.5mm] @@ -158,21 +160,22 @@ \definepapersize[Agenda][width=148mm,height=210mm] \setuppapersize[Agenda][A4,landscape] - - \setuparranging[2*2*4] + + \setuparranging[2SIDE] + %\setuparranging[2*2*4] \setupMPvariables % for collatingmarks [pages=4, % pages per sheet of paper doublesided sheets=4, % sheets of paper used per section horpageshift=0mm] \stopmode - + % Let Lua the main work: - + \startluacode local report = logs.reporter("Calendar-1-week-per-2-pages") - + function thirddata.diary.year_of_weektables(year, lat,lon,timeoffset,continent) @@ -181,60 +184,69 @@ local lon = lon local timeoffset = timeoffset local continent = continent - + report("Working in function: diary.year_of_weektables") - for i = 1,12 do --i is month - thirddata.diary.monthblock(i,year,lat,lon,timeoffset,continent) +-- for calendarmonth = 1,12 do + + for calendarmonth = 1,12 do + --for calendarmonth = 1,12 do + thirddata.diary.monthblock + (calendarmonth,year,lat,lon,timeoffset,continent) end end - + function thirddata.diary.monthblock(month,year, lat,lon,timeoffset,continent) - + report("Working in function diary.monthblock: %s", month) - + local c = thirddata.calendar.month(month,year) --returns number of weeks in a given month local wkf = thirddata.calendar.weeknumber(1,month,year) --weeknumber of 1st day of a given month - + + report("First week in month %s of year %s is %s",month,year,wkf) + local wkl = wkf + c - 1 -- last week of a given month based on wkf and c, is wrong for January - - --report("Weeks in the selected month: %s", c) - --report("First week of month: %s", wkf) - + + report("Weeks in the selected month: %s", c) + report("First week of month: %s", wkf) + if month == 1 and wkf > 51 then - + --report("Calculating in week number %s", wkf) - - thirddata.diary.setup_header_texts(wkf,month,year) - year = year - 1 - thirddata.diary.thisweek(wkf,year,lat,lon,timeoffset,continent) - year = year + 1 + calcyear = year - 1 + thirddata.diary.setup_header_texts(wkf,month,calcyear) + + thirddata.diary.thisweek(wkf,month,year,lat,lon,timeoffset,continent) + + report("Week %s - Year %s",wkf,year) + + --year = year + 1 wkf = 1 wkl = wkf + c - 2 - + for i = wkf, wkl do thirddata.diary.setup_header_texts(i,month,year) - thirddata.diary.thisweek(i,year,lat,lon,timeoffset,continent) - end + thirddata.diary.thisweek(i,month,year,lat,lon,timeoffset,continent) + end else for i = wkf, wkl do - - --report("Calculating in week number %s", i) - + + report("Calculating in week number %s", i) + thirddata.diary.setup_header_texts(i,month,year) - thirddata.diary.thisweek(i,year, + thirddata.diary.thisweek(i,month,year, lat,lon,timeoffset,continent) end end end - - + + function thirddata.diary.setup_header_texts(week,month,year) - + local monthname = string.lower(os.date ("%B",os.time{year=year,month=month,day=1})) - + context.setupheadertexts( {function() context("\\bf") @@ -268,7 +280,7 @@ }) end -\stopluacode +\stopluacode \startsetups[table:week] \setupTABLE[split=yes] @@ -353,7 +365,7 @@ \getbuffer[Yearofweektables] - \dorecurse - {13} - {\getbuffer[Lines]} + % \dorecurse + % {4} + % {\getbuffer[Lines]} \stoptext
\ No newline at end of file diff --git a/macros/context/contrib/context-calendar-examples/tex/context/third/calendar-examples/Sundata-calendar.tex b/macros/context/contrib/context-calendar-examples/tex/context/third/calendar-examples/Sundata-calendar.tex index 18726204cb..99865d70c0 100644 --- a/macros/context/contrib/context-calendar-examples/tex/context/third/calendar-examples/Sundata-calendar.tex +++ b/macros/context/contrib/context-calendar-examples/tex/context/third/calendar-examples/Sundata-calendar.tex @@ -10,269 +10,296 @@ \usemodule[pocketdiary] \usemodule[collatingmarks][Collatingmarks=yes] + +% \definemode[English,Dutch,German,French,Italian,Spanish][keep] -\definemode[English,Dutch,German,French,Italian,Spanish][keep] - -\enablemode[English] +\mainlanguage[es] +% \enablemode[English] % \enablemode[German] % \enablemode[Dutch] % \enablemode[Italian] % \enablemode[French] -%\enablemode[Spanish] +% \enablemode[Spanish] + +\setvariables + [PocketDiary] + [Year=2023, + Week=1, + Day=1, + Month=1, + Nextyear=no, + Place=Kozeigłowy, + Country=PL] +%{Ośrodek szkoleniowo \crlf wypoczynkowy Uniwersytetu Mikołaja Kopernika \crlf Bacho\TEX}, \setvariables - [PocketDiary] - [Year=2023, - Week=1, - Day=1, - Month=1, - Nextyear=no, - Place=Sambeek, - Country=NL] + [PocketDiaryFooter] + [Lefttext={\jobname .pdf}, + Centertext=\pagenumber, + Righttext=] \setvariables - [PocketDiaryFooter] - [Lefttext={\jobname .pdf}, - Centertext=\pagenumber, - Righttext=] + [PocketDiaryColors] + [Separatorline=blue, + Gridline={s=.75}] \setvariables - [PocketDiaryColors] - [Separatorline=blue, - Gridline={s=.75}] - -\setvariables %Koziegłowy 52.467860,16.981240 //52.5921425,6.0962685, % Hasselt - [PocketDiaryGeoPosition] - [lat=51.63682, %Sambeek Maasstraat 2A (Google Maps) - lon=5.96655, %Sambeek, Maasstraat 2A (Google Maps) + [PocketDiaryGeoPosition] + [lat=52.464588, + lon=16.981689, timezoneoffset=1, continent=EU] %EU, US or empty for no DST -\setupbodyfont[ibmplex,ss,10pt] -% \usetypescriptfile[type-seravek] -% \usetypescript[Seravek] -% \setupbodyfont[Seravek,ss,10pt] - -% Modes for the international interface - -\startmode[English] - \mainlanguage[en] -\stopmode +% lat=51.63682, %Sambeek Maasstraat 2A (Google Maps) +% lon=5.96655, %Sambeek, Maasstraat 2A (Google Maps) -\startmode[Dutch] - \mainlanguage[nl] -\stopmode +% lat=53.287540, %Bachotek lake head +% lon=19.475584 %Bachotek lake head -\startmode[German] - \mainlanguage[de] -\stopmode + %Koziegłowy + % lat = 52.467860 + % lon= 16.981240 + +% Czerwonak +% lat": 52.464588 +% lon": 16.981689 -\startmode[French] - \mainlanguage[fr] -\stopmdode + % Hasselt + % lat = 52.5921425 + % lon = 6.0962685, -\startmode[Italian] - \mainlanguage[it] -\stopmode +\setupbodyfont[ibmplex,ss,10pt] +% \usetypescriptfile[type-seravek] +% \usetypescript[Seravek] +% \setupbodyfont[Seravek,ss,10pt] -\startmode[Spanish] - \mainlanguage[es] -\stopmode +% % Modes for the international interface +% +% \startmode[English] +% \mainlanguage[en] +% \setuplabeltext[en][week=Wk.~] +% \stopmode +% +% \startmode[Dutch] +% \mainlanguage[nl] +% \stopmode +% +% \startmode[German] +% \mainlanguage[de] +% \setuplabeltext[de][week=Wo.~] +% \stopmode +% +% \startmode[French] +% \mainlanguage[fr] +% \stopmdode +% +% \startmode[Italian] +% \mainlanguage[it] +% \stopmode +% +% \startmode[Spanish] +% \mainlanguage[es] +% \stopmode \setuppagenumbering[alternative=doublesided,location=] -\setuppapersize[A6][A6] +%\setuppapersize[A6][A4] +% \setuppapersize[A6][A6] +\setuppapersize[A6][A5,landscape] \setuplayout - [topspace=.6cm, - backspace=.6cm, - header=2\bodyfontsize, - headerdistance=.5\bodyfontsize, - footer=1.2\bodyfontsize, - footerdistance=.5\bodyfontsize, - margin=0pt, - height=middle, - width=88mm, - location=middle] - -\setuparranging[2*4*2] + [topspace=.6cm, + backspace=.6cm, + header=2\bodyfontsize, + headerdistance=.5\bodyfontsize, + footer=1.2\bodyfontsize, + footerdistance=.5\bodyfontsize, + margin=0pt, + height=middle, + width=88mm, + location=middle] + +%\setuparranging[2*4*2] +\setuparranging[2SIDE] \setupMPvariables % for collatingmarks [pages=8, % pages per sheet of paper doublesided sheets=2, % sheets of paper used per section horpageshift=0mm] - + + \startluacode local report = logs.reporter("Sundata calendar") function thirddata.diary.year_of_monthtables( year,lat,lon,timeoffset,continent) - - report("Working in function: diary.year_of_monthtables") - - local dst_start,dst_stop = thirddata.diary.DST(year,continent) - - report("DST start: %s, DST stop: %s",dst_start,dst_stop) - - for i= 1,1 do - local monthname = string.lower(os.date - ("%B",os.time{year=year,month=i,day=1})) - - context.setupheadertexts( - { - function() - context("\\bf") - context.labeltext(monthname) - return true - end - }, - { - function() - context(year) - return true - end - }, - { - function() - context("\\bf") - context.labeltext(monthname) - return true - end - }, - { - function() - context(year) - return true - end - }) - - thirddata.diary.monthblock(i,year,lat,lon,timeoffset,dst_start,dst_stop) - end + + report("Working in function: diary.year_of_monthtables") + + local dst_start,dst_stop = thirddata.diary.DST(year,continent) + + report("DST start: %s, DST stop: %s",dst_start,dst_stop) + +-- for i= 1,12 do + for i= 4,4 do + local monthname = string.lower(os.date + ("%B",os.time{year=year,month=i,day=1})) + + context.setupheadertexts( + { + function() + context("\\bf") + context.labeltext(monthname) + return true + end + }, + { + function() + context(year) + return true + end + }, + { + function() + context("\\bf") + context.labeltext(monthname) + return true + end + }, + { + function() + context(year) + return true + end + }) + + thirddata.diary.monthblock(i,year,lat,lon,timeoffset,dst_start,dst_stop) + end end function thirddata.diary.monthblock( month,year,lat,lon,timeoffset,dst_start,dst_stop) - - report("Working in function diary.monthblock") - - local c = thirddata.calendar.month(month,year) --returns number of weeks in a given month - local wkf = thirddata.calendar.weeknumber(1,month,year) - - --report("Weeks in the selected month: %s", c) - --report("Week number : %s", wkf) - - local nofdays = 1 - - if month == 2 and thirddata.calendar.isleapyear(year) ~= 365 then - nofdays = thirddata.calendar.nofdays_month(month,year) + 1 - else - nofdays = thirddata.calendar.nofdays_month(month,year) - end - - report("Number of days in month: %s", nofdays) - - local wkl = thirddata.calendar.weeknumber(nofdays,month,year) - - local monthname = thirddata.calendar.select_nameofmonth(month,year) + + report("Working in function diary.monthblock") + + local c = thirddata.calendar.month(month,year) --returns number of weeks in a given month + local wkf = thirddata.calendar.weeknumber(1,month,year) + + --report("Weeks in the selected month: %s", c) + --report("Week number : %s", wkf) + + local nofdays = 1 + + if month == 2 and thirddata.calendar.isleapyear(year) ~= 365 then + nofdays = thirddata.calendar.nofdays_month(month,year) + 1 + else + nofdays = thirddata.calendar.nofdays_month(month,year) + end + + report("Number of days in month: %s", nofdays) + + local wkl = thirddata.calendar.weeknumber(nofdays,month,year) + + local monthname = thirddata.calendar.select_nameofmonth(month,year) context.bTABLE({setups="table:monthblock"}) - - for i = 1,nofdays do - - local ordinalday = thirddata.calendar.ordinalday(i,month,year) - local weeknumber = thirddata.calendar.weeknumber(i,month,year) + + for i = 1,nofdays do + + local ordinalday = thirddata.calendar.ordinalday(i,month,year) + local weeknumber = thirddata.calendar.weeknumber(i,month,year) local holiday = thirddata.calendar.checkchristianfeast(i,month,year) - local moondata = thirddata.moonphase.lunardays(year,month,i) - local sunrise,sunset,lighthours = - thirddata.srss.sundata( - i,month,year,lat,lon,timeoffset,dst_start,dst_stop) - - context.bTR() - context.bTD() - - local dayname = string.lower(os.date - ("%a",os.time{day=i,month=month,year=year})) - - --report("Dayname: %s",dayname) - context.starttabulate{"|lw(0.1\\textwidth)|lw(0.06\\textwidth)|l|"} - context.NC() - if dayname == "sun" or holiday ~= "" and holiday ~= "asw" then - local dnu = i - local dna = dayname + local moondata = thirddata.moonphase.lunardays(year,month,i) + local sunrise,sunset,lighthours = + thirddata.srss.sundata( + i,month,year,lat,lon,timeoffset,dst_start,dst_stop) + + context.bTR() + context.bTD() + + local dayname = string.lower(os.date + ("%a",os.time{day=i,month=month,year=year})) + + --report("Dayname: %s",dayname) + context.starttabulate{"|lw(0.1\\textwidth)|lw(0.06\\textwidth)|l|"} + context.NC() + if dayname == "sun" or holiday ~= "" and holiday ~= "asw" then + local dnu = i + local dna = dayname context.color({"red"}, - function() context(dnu) end) --day number - context("~") - context.color({"red"}, - function() context.labeltext(dna) end)--dayname - else - context(i) --day - context("~") - context.labeltext(dayname) --dayname - end - context.NC() - context.switchtobodyfont{"6pt"} - context.labeltext("week") - context(": ") - context(weeknumber) - context.NC() - context.switchtobodyfont{"6pt"} - context.labeltext("day") - context(": ") - context(ordinalday) - context.NC() - context.NR() - context.stoptabulate() - context.eTD() - context.bTD() - context.starttabulate{"|lw(0.2\\textwidth)|l|l|l|l|"} - context.NC() - if holiday == "" then - context.strut() - context.NC() - context.NC() - context.NC() - context.NC() - else - context.labeltext(holiday) - context.NC() - context.NC() - context.NC() - context.NC() - end - context.NR() - context.NC() - if tonumber(moondata) then - context.labeltext("moondays") - else - context.labeltext("moon") - end - context(":~") - context(moondata) - context.NC() - --context.labeltext("sunrise") - context("\\SunA[background=Sunrise]{}") - context("\\quad :~") - context(sunrise) - context.NC() - context("\\SunA[background=Sunset]{}") - context("\\quad :~") - context(sunset) - context.NC() - context("\\SunB[background=Light]{}") - context("~:~") - context(lighthours) - context.NC() - context.NR() - context.stoptabulate() - context.eTD() - context.eTR() - end + function() context(dnu) end) --day number + context("~") + context.color({"red"}, + function() context.labeltext(dna) end)--dayname + else + context(i) --day + context("~") + context.labeltext(dayname) --dayname + end + context.NC() + context.switchtobodyfont{"6pt"} + context.labeltext("week") + context(": ") + context(weeknumber) + context.NC() + context.switchtobodyfont{"6pt"} + context.labeltext("day") + context(": ") + context(ordinalday) + context.NC() + context.NR() + context.stoptabulate() + context.eTD() + context.bTD() + context.starttabulate{"|lw(0.2\\textwidth)|l|l|l|l|"} + context.NC() + if holiday == "" then + context.strut() + context.NC() + context.NC() + context.NC() + context.NC() + else + context.labeltext(holiday) + context.NC() + context.NC() + context.NC() + context.NC() + end + context.NR() + context.NC() + if tonumber(moondata) then + context.labeltext("moondays") + else + context.labeltext("moon") + end + context(":~") + context(moondata) + context.NC() + --context.labeltext("sunrise") + context("\\SunA[background=Sunrise]{}") + context("\\quad :~") + context(sunrise) + context.NC() + context("\\SunA[background=Sunset]{}") + context("\\quad :~") + context(sunset) + context.NC() + context("\\SunB[background=Light]{}") + context("~:~") + context(lighthours) + context.NC() + context.NR() + context.stoptabulate() + context.eTD() + context.eTR() + end context.eTABLE() context.page() end -\stopluacode +\stopluacode \startsetups[table:monthblock] \setupTABLE[split=yes] @@ -327,29 +354,27 @@ end \strut \startalignment [middle] \godown[.3\textheight] - \startmode[English] + \startmode[**en] {\bfc \labeltext{sunstar}- and \labeltext{moon}-\labeltext{calendar}} - \stopmode - \startmode[Dutch] + \stopmode + \startmode[**nl] {\bfc \labeltext{sunstar}- en \labeltext{moon}-\labeltext{calendar}} - \stopmode - \startmode[German] - {\bfc \labeltext{sunstar}n- und \labeltext{moon}-\labeltext{calendar} } - \stopmode - \startmode[French] - {\bfc \labeltext{calendar} du \labeltext{sunstar} - et de la \labeltext{moon}} - \stopmode - \startmode[Italian] - {\bfc \labeltext{calendar} di \labeltext{sunstar} - e della \labeltext{moon}} - \stopmode - \startmode[Spanish] - {\labeltext{calendar} del \labeltext{sunstar} - y la \labeltext{moon}} - \stopmode - \blank - {\bfb \getvariable{PocketDiary}{Place}} + \stopmode + \startmode[**de] + {\bfc \labeltext{sunstar}n- und \labeltext{moon}-\labeltext{calendar} } + \stopmode + \startmode[**fr] + {\bfc \labeltext{calendar} du \labeltext{sunstar} et de la \labeltext{moon}} + \stopmode + \startmode[**it] + {\bfc \labeltext{calendar} di \labeltext{sunstar} e della \labeltext{moon}} + \stopmode + \startmode[**es] + {\labeltext{calendar} del \labeltext{sunstar} y la + \labeltext{moon}} + \stopmode + \blank + {\bfb \getvariable{PocketDiary}{Place}} \vfill {\tfa \getvariable{PocketDiary}{Year}} \stopalignment @@ -358,67 +383,67 @@ end \startstandardmakeup[page=yes,doublesided=no] \starttabulate[|l|p|] - \NC \labeltext{title} - \EQ - \startmode[English] - {\labeltext{sunstar}- and \labeltext{moon}-\labeltext{calendar}} - \stopmode - \startmode[Dutch] - {\labeltext{sunstar}- en \labeltext{moon}-\labeltext{calendar}} - \stopmode - \startmode[German] - {\labeltext{sunstar}n- und \labeltext{moon}-\labeltext{calendar}} - \stopmode - \startmode[French] - {\labeltext{calendar} du \labeltext{sunstar} - et de la \labeltext{moon}} - \stopmode - \startmode[Italian] - {\labeltext{calendar} di \labeltext{sunstar} - e della \labeltext{moon}} - \stopmode - \startmode[Spanish] - {\labeltext{calendar} del \labeltext{sunstar} - y la \labeltext{moon}} - \stopmode - \NC\NR - \NC \labeltext{author} - \EQ \getvariable{PocketDiaryAddress}{Forename}~ - \getvariable{PocketDiaryAddress}{Familyname} \NC\NR - \NC \labeltext{typography} \EQ \CONTEXT\ with \LUAMETATEX \NC\NR - \NC \labeltext[compilation] \EQ \currentdate \NC\NR - \stoptabulate - \vfil - \startmode[English] - This calendar is generated for \getvariable{PocketDiary}{Place}, - \getvariable{PocketDiary}{Country} - \stopmode - \startmode[German] - Dieser Kalender ist berechnet für \getvariable{PocketDiary}{Place}, - \getvariable{PocketDiary}{Country} - \stopmode - \startmode[Dutch] - Deze kalender is opgemaakt voor \getvariable{PocketDiary}{Place}, - \getvariable{PocketDiary}{Country} - \stopmode - \startmode[French] - Ce calendrier est fait pour \getvariable{PocketDiary}{Place}, - \getvariable{PocketDiary}{Country} - \stopmode - \startmode[Italian] - Questo calendario è prodotto per \getvariable{PocketDiary}{Place}, - \getvariable{PocketDiary}{Country} - \stopmode - \startmode[Spanish] - Este calendario está calculado para \getvariable{PocketDiary}{Place}, - \getvariable{PocketDiary}{Country} - \stopmode - \starttabulate[|l|r|] - \NC Longitude \EQ \getvariable{PocketDiaryGeoPosition}{lon} \NC\NR - \NC Latitude \EQ \getvariable{PocketDiaryGeoPosition}{lat} \NC\NR - \stoptabulate + \NC \labeltext{title} + \EQ + \startmode[**en] + {\labeltext{sunstar}- and \labeltext{moon}-\labeltext{calendar}} + \stopmode + \startmode[**nl] + {\labeltext{sunstar}- en \labeltext{moon}-\labeltext{calendar}} + \stopmode + \startmode[**de] + {\labeltext{sunstar}n- und \labeltext{moon}-\labeltext{calendar} } + \stopmode + \startmode[**fr] + {\labeltext{calendar} du \labeltext{sunstar} et de la + \labeltext{moon}} + \stopmode + \startmode[**it]] + {\labeltext{calendar} di \labeltext{sunstar} e della + \labeltext{moon}} + \stopmode + \startmode[**es] + {\labeltext{calendar} del \labeltext{sunstar} y la + \labeltext{moon}} + \stopmode + \NC\NR + \NC \labeltext{author} + \EQ \getvariable{PocketDiaryAddress}{Forename}~ + \getvariable{PocketDiaryAddress}{Familyname} \NC\NR + \NC \labeltext{typography} \EQ \CONTEXT\ with \LUAMETATEX \NC\NR + \NC \labeltext[compilation] \EQ \currentdate \NC\NR + \stoptabulate + \vfil + \startmode[**en] + This calendar is generated for \getvariable{PocketDiary}{Place}, + \getvariable{PocketDiary}{Country} + \stopmode + \startmode[**de] + Dieser Kalender ist berechnet für \getvariable{PocketDiary}{Place}, + \getvariable{PocketDiary}{Country} + \stopmode + \startmode[**nl] + Deze kalender is opgemaakt voor \getvariable{PocketDiary}{Place}, + \getvariable{PocketDiary}{Country} + \stopmode + \startmode[**fr] + Ce calendrier est fait pour \getvariable{PocketDiary}{Place}, + \getvariable{PocketDiary}{Country} + \stopmode + \startmode[**it] + Questo calendario è prodotto per \getvariable{PocketDiary}{Place}, + \getvariable{PocketDiary}{Country} + \stopmode + \startmode[**es] + Este calendario está calculado para \getvariable{PocketDiary}{Place}, + \getvariable{PocketDiary}{Country} + \stopmode + \starttabulate[|l|r|] + \NC Longitude \EQ \getvariable{PocketDiaryGeoPosition}{lon} \NC\NR + \NC Latitude \EQ \getvariable{PocketDiaryGeoPosition}{lat} \NC\NR + \stoptabulate \stopstandardmakeup - + \getbuffer[Yearofmonthtables] \stoptext
\ No newline at end of file diff --git a/macros/context/contrib/context-simpleslides/README.md b/macros/context/contrib/context-simpleslides/README.md index aff7e23908..e5cb4dc088 100644 --- a/macros/context/contrib/context-simpleslides/README.md +++ b/macros/context/contrib/context-simpleslides/README.md @@ -1,7 +1,8 @@ -# context-simpleslides - +# context-simpleslides
+
SimpleSlides presentation module for ConTeXt<br>
by Aditya Mahajan and Thomas A. Schmitz
+maintained by Henning Hraban Ramm since 2022
## Introduction
diff --git a/macros/context/contrib/context-simpleslides/VERSION b/macros/context/contrib/context-simpleslides/VERSION index dd038fd49e..5e87b15ee1 100644 --- a/macros/context/contrib/context-simpleslides/VERSION +++ b/macros/context/contrib/context-simpleslides/VERSION @@ -1 +1 @@ -2022.07.13 +2023.04.13 diff --git a/macros/context/contrib/context-simpleslides/tex/context/interface/third/t-simpleslides.xml b/macros/context/contrib/context-simpleslides/tex/context/interface/third/t-simpleslides.xml index 3b9be870b9..9c20599620 100644 --- a/macros/context/contrib/context-simpleslides/tex/context/interface/third/t-simpleslides.xml +++ b/macros/context/contrib/context-simpleslides/tex/context/interface/third/t-simpleslides.xml @@ -2,7 +2,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="en" - version="2008.11.30"> + version="2023.04.13"> <cd:command name="simpleslides" file="t-simpleslides.tex"> <cd:sequence> @@ -47,6 +47,8 @@ <cd:constant type="Palatino"/> <cd:constant type="Schoolbook"/> <cd:constant type="Times"/> + <cd:constant type="Plex"/> + <cd:constant type="PlexSans"/> </cd:parameter> <cd:parameter name="color"> <cd:constant type="red"/> diff --git a/macros/context/contrib/context-simpleslides/tex/context/third/simpleslides/s-simpleslides-fontsdefault.mkiv b/macros/context/contrib/context-simpleslides/tex/context/third/simpleslides/s-simpleslides-fontsdefault.mkiv index 95781180fa..153b19a6d7 100644 --- a/macros/context/contrib/context-simpleslides/tex/context/third/simpleslides/s-simpleslides-fontsdefault.mkiv +++ b/macros/context/contrib/context-simpleslides/tex/context/third/simpleslides/s-simpleslides-fontsdefault.mkiv @@ -1,6 +1,6 @@ %D \module %D [ file=simpleslides-f-default, -%D version=2009.03.30 +%D version=2023.04.13 %D title=\CONTEXT\ Style File, %D subtitle=Presentation Module simpleslides --- Default font setup, %D author=Aditya Mahajan and Thomas A. Schmitz, @@ -8,6 +8,7 @@ %D copyright={Aditya Mahajan and Thomas A. Schmitz}] %C %C Copyright 2007 Aditya Mahajan and Thomas A. Schmitz +%C Maintained by Henning Hraban Ramm since 2022. %C This file may be distributed under the GNU General Public License v. 2.0. \writestatus{simpleslides}{loading default font setup} @@ -16,18 +17,18 @@ \unprotect -\setupbodyfontenvironment[default][em=italic] +\setupbodyfontenvironment[default][em=italic] %D The fontsize is set via the \type{size}||key; it will be used in numerous %D setup||commands. In earlier versions, I had used the \tex{processaction} %D mechanism to define the \tex{NormalSize} and \tex{TitleSize}, but Aditya %D rightly pointed out that this is somewhat inflexible. I now set the font %D dimensions directly; \tex{TitleSize} is calculated from \tex{NormalSize}. I -%D do a few tests to get nice sizes. +%D do a few tests to get nice sizes. -\newdimen\simpleslidesNormalSize -\newdimen\simpleslidesTitleSize -\newdimen\simpleslidesSlideTitleSize +\newdimen\simpleslidesNormalSize +\newdimen\simpleslidesTitleSize +\newdimen\simpleslidesSlideTitleSize \simpleslidesNormalSize=\moduleparameter{simpleslides}{size}\relax @@ -50,16 +51,16 @@ %D The bodyfont needs to be defined so \CONTEXT\ can calculate size switches, %D math formulas, etc. -\starttypescript [serif] [default] [size] -\definebodyfont [14pt,15pt,16pt,17pt,20pt,25pt,\NormalSize,\TitleSize] [rm] [default] +\starttypescript [serif] [default] [size] +\definebodyfont [14pt,15pt,16pt,17pt,20pt,25pt,\NormalSize,\TitleSize] [rm] [default] \stoptypescript -\starttypescript [sans] [default] [size] -\definebodyfont [14pt,15pt,16pt,17pt,20pt,25pt,\NormalSize,\TitleSize] [ss] [default] +\starttypescript [sans] [default] [size] +\definebodyfont [14pt,15pt,16pt,17pt,20pt,25pt,\NormalSize,\TitleSize] [ss] [default] \stoptypescript -\starttypescript [mono] [default] [size] -\definebodyfont [14pt,15pt,16pt,17pt,20pt,25pt,\NormalSize,\TitleSize] [tt] [default] +\starttypescript [mono] [default] [size] +\definebodyfont [14pt,15pt,16pt,17pt,20pt,25pt,\NormalSize,\TitleSize] [tt] [default] \stoptypescript @@ -71,10 +72,10 @@ %D Adventor (the TeXGyre clone of Gothic), Schola (the TeXGyre clone of %D Schoolbook), Bonum (the TeXGyre clone of Bookman), Termes (the TeXGyre clone %D of Times), Pagella (the TeXGyre clone of Palatino), Heros (the TeXGyre clone -%D of Helvetica), and Chancery (the TeXGyre clone of Chancery). Since the -%D definition of typescripts etc. varies according to the \TeX-engine used, we -%D have to branch the code here. This is awkward, but for the time being, I see -%D no other way. +%D of Helvetica), Chancery (the TeXGyre clone of Chancery), and IBM Plex(Sans). +%D Since the definition of typescripts etc. varies according to the \TeX-engine +%D used, we have to branch the code here. This is awkward, but for the time being, +%D I see no other way. \startsetups simpleslides:font:LatinModern \setupbodyfont[\NormalSize] @@ -84,7 +85,7 @@ \setupbodyfont[ss,\NormalSize] \stopsetups -\usetypescriptfile[type-otf] %Isn't this included by default? +%\usetypescriptfile[type-otf] %Isn't this included by default? %AM: For all the fonts, I have used traditional names rather than TeX Gyre %names. @@ -122,7 +123,7 @@ \starttypescript [chancery] \definetypeface [chancery] [rm] [serif] [chancery] [default] - \stoptypescript + \stoptypescript \usetypescript[chancery] \setupbodyfont[chancery,\NormalSize] \stopsetups @@ -168,10 +169,18 @@ \setupbodyfont[postscript,\NormalSize] \stopsetups +\startsetups simpleslides:font:Plex + \setupbodyfont[plex,\NormalSize] +\stopsetups + +\startsetups simpleslides:font:PlexSans + \setupbodyfont[plex,ss,\NormalSize] +\stopsetups + \doifsetupselse{simpleslides:font:\moduleparameter{simpleslides}{font}} {\setups{simpleslides:font:\moduleparameter{simpleslides}{font}}} {\setups{simpleslides:font:LatinModern}% - \message{There is no setup for + \writestatus{simpleslides}{There is no setup for "font=\moduleparameter{simpleslides}{font}". Latin Modern Sans will be used as a fallback}} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/README.md b/macros/latex/contrib/biblatex-contrib/biblatex-gost/README.md index db87c05047..5988d24b29 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/README.md +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/README.md @@ -1,6 +1,6 @@ This package is a collection of [Biblatex](https://github.com/plk/biblatex) bibliography and citation -styles to format bibliography according to Russian standard GOST +styles to format bibliography according to Russian standard GOST R 7.0.5-2008. For documentation and release notes please refer to biblatex-gost.pdf. The documentation is mainly in Russian. Formatting examples for various bibliography entries may be found in diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/doc/biblatex-gost-examples.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-gost/doc/biblatex-gost-examples.pdf Binary files differindex cbdae60073..189d2aeb18 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/doc/biblatex-gost-examples.pdf +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/doc/biblatex-gost-examples.pdf diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/doc/biblatex-gost.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-gost/doc/biblatex-gost.pdf Binary files differindex a46a7734ce..432553593e 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/doc/biblatex-gost.pdf +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/doc/biblatex-gost.pdf diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/doc/biblatex-gost.tex b/macros/latex/contrib/biblatex-contrib/biblatex-gost/doc/biblatex-gost.tex index 3a99b36075..ca4c266ca8 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/doc/biblatex-gost.tex +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/doc/biblatex-gost.tex @@ -1,8 +1,8 @@ % -*- mode: LaTeX; coding: utf-8; fill-column: 80 -*- \documentclass[10pt,a4paper,headings=small,numbers=enddot,english,russian]{ltxdockit} \usepackage[vscale=0.8,hdivide={0.2\paperwidth,*,0.1\paperwidth}]{geometry} -\RequirePackage{fontspec} -\RequirePackage{luatexbase} +\usepackage{fontspec} +\usepackage{luatexbase} \setmainfont{PT Serif} \setsansfont{PT Sans} \setmonofont{PT Mono} @@ -47,7 +47,7 @@ bibstyle=gost-standard, \titlepage{% title={\biblatexgost}, - subtitle={Оформление библиографии по ГОСТ 7.0.5---2008}, + subtitle={Оформление библиографии по ГОСТ Р 7.0.5---2008}, url={\biblatexgosthome}, author={Олег Доманов}, email={odomanov@yandex.ru}, @@ -73,7 +73,7 @@ bibstyle=gost-standard, \hypersetup{% pdftitle={\biblatexgost Package}, - pdfsubject={Bibliography according to Russian standard GOST 7.0.5-2008}, + pdfsubject={Bibliography according to Russian standard GOST R 7.0.5-2008}, pdfauthor={Oleg Domanov}, pdfkeywords={tex, latex, biblatex, bibliography, references, citation, gost, russian}} @@ -103,8 +103,9 @@ bibstyle=gost-standard, %----- \usepackage{ellipsis}% must be loaded after hyperref !! \newcommand*{\bibsty}{\texttt} -\newcommand*{\gostbibname}[1][]{ГОСТ#1 7.1---2003\xspace} -\newcommand*{\gostcitename}[1][]{ГОСТ#1 7.0.5---2008\xspace} +% \newcommand*{\gostbibname}[1][]{ГОСТ#1 7.1---2003\xspace} % старый ГОСТ +\newcommand*{\gostbibname}[1][]{ГОСТ#1 Р~7.0.100---2018\xspace} +\newcommand*{\gostcitename}[1][]{ГОСТ#1 Р~7.0.5---2008\xspace} \newcommand*{\gostheadname}[1][]{ГОСТ#1 7.80---2000\xspace} \newcommand*{\gostbibref}[2][]{\gostbibname[#1], п.\,#2\xspace} \newcommand*{\gostciteref}[2][]{\gostcitename[#1], п.\,#2\xspace} @@ -146,7 +147,7 @@ bibstyle=gost-standard, набор стилей для \biblatex{}\unspace\fnurl{http://mirror.ctan.org/macros/latex/contrib/biblatex/} и предназначен для оформления библиографических ссылок в соответствии -с требованиями ГОСТа 7.0.5---2008 (а также 7.1---2003, 7.80---2000, +с требованиями ГОСТ Р 7.0.5---2008 (а также Р 7.0.100---2018, 7.80---2000, 7.82---2001 и др., см. подробнее \secref{sec:whatfor}). Пакет будет полезен прежде всего в гуманитарных дисциплинах с высокими требованиями к оформлению библиографии, многие из которых \bibtex не в @@ -189,47 +190,48 @@ This package is maintained. %(текущие версии на CTAN). Пакет может не работать с предыдущими версиями. -\subsection{Важные изменения в этой и некоторых недавних версиях} +\subsection{Важные изменения в этой версии} \label{sec:critchanges} -Ниже перечислены изменения, на которые стоит обратить внимание с - точки зрения совместимости с предыдущими версиями. -Более полный список изменений см. в \Apxref{apx:changelog}. - -\subsubsection*{Версия 1.18} - -\begin{trivlist} -\item \biblatex в настоящее время (версии до 3.14 включительно) завершается с - ошибкой при выводе некоторых символов Юникода; см. подробнее: - \url{https://github.com/odomanov/biblatex-gost/issues/22}, - \url{https://github.com/plk/biblatex/issues/960}. - Версия \biblatexgost~1.18 содержит патч для обхода этой ошибки. - Патч будет удалён, когда перестанет быть нужным. -\item Минимальная требуемая версия \biblatex повышена до 3.14. -\item Исправлено: в минимальных стилях (вида \bibsty{\textellipsis-min}) не - выводилось поле \bibfield{pagetotal} (полное количество страниц). -\end{trivlist} - -\subsubsection*{Версия 1.16} - -\begin{trivlist} -\item \bibfield{origlanguage} и \bibfield{bookoriglanguage} теперь могут быть списками - (требуется \biblatex~3.8). - Если вы работаете с этими полями прямо, то нужно \cmd{printfield}, \cmd{iffieldundef} - и пр. заменить на \cmd{printlist}, \cmd{iflistundef} и пр. - Если не работаете, то для вас это изменение не важно. -\end{trivlist} - -\subsubsection*{Версия 1.15} - -\begin{trivlist} -\item Добавлен пробел перед двоеточием "--- разделителем заголовка и - подзаголовка (его не было), как требует ГОСТ. - Чтобы вернуться к старому поведению (убрать пробел) переопределите: - \begin{lstlisting}[style=latex] - \renewcommand*{\subtitlepunct}{\addcolon\space}. - \end{lstlisting} -\end{trivlist} +% Ниже перечислены изменения, на которые стоит обратить внимание с +% точки зрения совместимости с предыдущими версиями. +Существенных изменений нет. +Полный список изменений см. в \Apxref{apx:changelog}. + +% \subsubsection*{Версия 1.18} + +% \begin{trivlist} +% \item \biblatex в настоящее время (версии до 3.14 включительно) завершается с +% ошибкой при выводе некоторых символов Юникода; см. подробнее: +% \url{https://github.com/odomanov/biblatex-gost/issues/22}, +% \url{https://github.com/plk/biblatex/issues/960}. +% Версия \biblatexgost~1.18 содержит патч для обхода этой ошибки. +% Патч будет удалён, когда перестанет быть нужным. +% \item Минимальная требуемая версия \biblatex повышена до 3.14. +% \item Исправлено: в минимальных стилях (вида \bibsty{\textellipsis-min}) не +% выводилось поле \bibfield{pagetotal} (полное количество страниц). +% \end{trivlist} + +% \subsubsection*{Версия 1.16} + +% \begin{trivlist} +% \item \bibfield{origlanguage} и \bibfield{bookoriglanguage} теперь могут быть списками +% (требуется \biblatex~3.8). +% Если вы работаете с этими полями прямо, то нужно \cmd{printfield}, \cmd{iffieldundef} +% и пр. заменить на \cmd{printlist}, \cmd{iflistundef} и пр. +% Если не работаете, то для вас это изменение не важно. +% \end{trivlist} + +% \subsubsection*{Версия 1.15} + +% \begin{trivlist} +% \item Добавлен пробел перед двоеточием "--- разделителем заголовка и +% подзаголовка (его не было), как требует ГОСТ. +% Чтобы вернуться к старому поведению (убрать пробел) переопределите: +% \begin{lstlisting}[style=latex] +% \renewcommand*{\subtitlepunct}{\addcolon\space}. +% \end{lstlisting} +% \end{trivlist} % \subsubsection*{Версия 1.14} @@ -385,11 +387,13 @@ This package is maintained. Оформление библиографии регулируется тремя основными ГОСТами: -\newlength{\templ}\settowidth{\templ}{\gostcitename~} +\newlength{\templ}\settowidth{\templ}{\gostbibname~} \begin{itemize}[labelwidth=\templ,leftmargin=!,align=left,noitemsep] - \item[\gostcitename] Библиографическая ссылка. - \item[\gostbibname] Библиографическая запись. Библиографическое описание. - \item[\gostheadname] Библиографическая запись. Заголовок. +\item[\gostcitename] Библиографическая ссылка. Общие требования и правила. +\item[\gostbibname] Библиографическая запись. Библиографическое описание. Общие + требования и правила составления +\item[\gostheadname] Библиографическая запись. Заголовок. Общие требования и + правила составления. \end{itemize} Помимо них используются также стандарты на сокращения, оформление электронных ресурсов и т.\,д. Пакет \biblatexgost предназначен для оформления библиографических \emph{ссылок} по \gostcitename, @@ -399,11 +403,13 @@ This package is maintained. В частности, \gostbibname утверждает о себе самом: \begin{quotation} -Стандарт распространяется на описание документов, которое составляется библиотеками, - органами научно-технической информации, центрами государственной библиографии, издателями, - другими библиографирующими учреждениями. + Настоящий стандарт распространяется на выходные формы библиографического + описания традиционной и машиночитаемой каталогизации, которое составляется + центрами государственной библиографии, библиотеками, органами информации, + издателями, другими библиографирующими организациями и лицами. -\emph{Стандарт не распространяется на библиографические ссылки}. + \emph{Настоящий стандарт не распространяется на правила составления + библиографических ссылок.} \end{quotation} То же касается \gostheadname. @@ -415,7 +421,7 @@ This package is maintained. Действительно, согласно \gostcitename, ссылки могут быть внутри текста, в сноске на той же странице или за текстом (в конце документа или его части). В последнем случае список ссылок в конце текста \emph{не является библиографическим списком}. -ГОСТ говорит об этом вполне ясно: +\gostcitename говорит об этом вполне ясно: \begin{quotation} Совокупность затекстовых библиографических ссылок не является библиографическим списком или @@ -686,16 +692,18 @@ This package is maintained. Соответствие между терминами ГОСТа и полями \biblatexgost представлено в \tabref{tab:gost-biblatex}. -Как видно, в ней отсутствуют, с одной стороны, некоторые элементы библиографического -описания, предусмотренные ГОСТом, а с другой~--- некоторые поля \biblatex. Эти элементы и поля -не учитываются в \biblatexgost и не обрабатываются (разумеется, специальные поля, -такие как \bibfield{crossref}, \bibfield{options} и пр., учитываются, хотя и не -представлены в таблице). -Курсивом выделены факультативные, согласно ГОСТу, элементы. +Как видно, в ней отсутствуют, с одной стороны, некоторые элементы +библиографического описания, предусмотренные ГОСТом, а с другой~--- некоторые +поля \biblatex. Эти элементы и поля не учитываются в \biblatexgost и не +обрабатываются (разумеется, специальные поля, такие как \bibfield{crossref}, +\bibfield{options} и пр., учитываются, хотя и не представлены в таблице). +Курсивом выделены необязательные и условно"=обязательные, согласно +ГОСТу, элементы. Цветом выделены поля \biblatexgost, отсутствующие в \biblatex (см.~\secref{sec:newfields,sec:patent}). -В угловые скобки помещены поля, используемые не вполне стандартными типами записей, -такими как \bibtype{patent} или \bibtype{thesis} (см.~\secref{sec:dissers,sec:patent}). +В угловые скобки помещены поля, используемые не вполне стандартными типами +записей, такими как \bibtype{patent} или \bibtype{thesis} +(см.~\secref{sec:dissers,sec:patent}). \begingroup \tablesetup @@ -739,17 +747,21 @@ This package is maintained. {\spotcolor bookintroduction}, {\spotcolor booktranslator} \\ \cmidrule(r){1-1}\cmidrule{2-2} \multicolumn{1}{@{}H}{Область издания} & \\* -Сведения об издании & edition, version, {\spotcolor editioncredits} \\ +Сведения об издании & edition, version \\ \textit{Параллельные сведения об издании} & edition \\ +\textit{Сведения об ответственности, относящиеся к изданию} & {\spotcolor editioncredits} \\ \cmidrule(r){1-1}\cmidrule{2-2} -\multicolumn{1}{@{}H}{Область специфических сведений} & {\spotcolor specdata},\newline +\multicolumn{1}{@{}H}{Специфическая область материала или вида ресурса} + & {\spotcolor specdata},\newline \ensuremath\langle{\spotcolor reqnumber}, {\spotcolor date}, {\spotcolor publication}\ensuremath\rangle \\ \cmidrule(r){1-1}\cmidrule{2-2} -\multicolumn{1}{@{}H}{Область выходных данных} & \\* -Место издания, распространения & location \\ -Имя издателя, распространителя и т.\,п. & publisher, institution \\ -Дата издания, распространения и т.\,п. & date \\ +\multicolumn{1}{@{}H}{Область публикации, производства, распространения и т.\,д.} & \\* +Место публикации, производства и/или распространения & location \\ +Имя издателя, производителя и/или распространителя & publisher, institution \\ +Дата публикации, производства и/или распространения & year, date \\ +\emph{Сведения об изготовлении (место изготовления, имя изготовителя, дата + изготовления)} & \textendash \\ \cmidrule(r){1-1}\cmidrule{2-2} \multicolumn{1}{@{}H}{Область физической характеристики} & \\* Специфическое обозначение материала и объём & volumes, {\spotcolor books}, {\spotcolor parts}, @@ -759,27 +771,41 @@ This package is maintained. \textit{Размеры} & \textendash \\ \textit{Сведения о сопроводительном материале} & \textendash \\ \cmidrule(r){1-1}\cmidrule{2-2} -\multicolumn{1}{@{}H}{Область серии} & \\* -Основное заглавие серии или подсерии & series \\ -\textit{Параллельное заглавие серии или подсерии} & series \\ -\textit{Сведения, относящиеся к заглавию серии или подсерии} & series \\ -Сведения об ответственности, относящиеся к заглавию серии или подсерии & series \\ -ISSN серии или подсерии & issn (isbn) \\ -Номер выпуска серии или подсерии & number \\ +\multicolumn{1}{@{}H}{Область серии и многочастного монографического ресурса} & \\* +Основное заглавие серии/подсерии или многочастного монографического ресурса & series \\ +\textit{Параллельное заглавие серии/подсерии или многочастного монографического + ресурса} & series \\ +\textit{Сведения, относящиеся к заглавию серии/подсерии или многочастного монографического + ресурса} & series \\ +\emph{Сведения об ответственности, относящиеся к заглавию серии/подсерии + или многочастного монографического ресурса} & series \\ +Международный стандартный номер серии/подсерии или многочастного + монографического ресурса & issn (isbn) \\ +Номер выпуска серии/подсерии или многочастного монографического ресурса & number \\ \cmidrule(r){1-1}\cmidrule{2-2} -\multicolumn{1}{@{}H}{Область примечания} & url, urldate, note, type,\newline +\multicolumn{1}{@{}H}{Область примечания} & note, url, urldate, type,\newline \ensuremath\langle{\spotcolor update}, {\spotcolor systemreq}\ensuremath\rangle\\ \cmidrule(r){1-1}\cmidrule{2-2} -\multicolumn{1}{@{}H}{Область стандартного номера и} & \\ -\multicolumn{1}{@{}H}{условий доступности} & \\* -Стандартный номер (или его альтернатива) & isbn, issn, %isan, ismn, isrn, iswc, +\multicolumn{1}{@{}H}{Область идентификатора ресурса и условий доступности} & \\* +% \multicolumn{1}{@{}H}{условий доступности} & \\* +\emph{Идентификатор ресурса} & \textendash \\ +Международный стандартный номер & isbn, issn, %isan, ismn, isrn, iswc, doi, eprint, eprintclass, addendum,\newline \ensuremath\langle{\spotcolor prnumber}, {\spotcolor prdate}, {\spotcolor prcountry}\ensuremath\rangle \\ -Ключевое заглавие & addendum \\ -Условия доступности и (или) цена & addendum \\ -Дополнительные сведения к элементам области & addendum \\ +\emph{Дополнительные сведения для идентификатора ресурса} & addendum \\ +\emph{Ключевое заглавие} & addendum \\ +\emph{Фингерпринт (для старопечатных изданий)} & addendum \\ +\emph{Условия доступности и (или) цена} & addendum \\ +\cmidrule(r){1-1}\cmidrule{2-2} +\multicolumn{1}{@{}H}{Область вида содержания и средства доступа} & \\* +\emph{Вид содержания, характеристика содержания и пр.} & addendum \\ +% \emph{Вид содержания} & addendum \\ +% \emph{Вид другого содержания на этом же физическом носителе} & addendum \\ +% \emph{Вид содержания на другом физическом носителе} & addendum \\ +% \emph{Характеристика содержания, последующая характеристика содержания} & addendum \\ +\emph{Средство доступа} & addendum \\ \bottomrule \end{longtable} \endgroup @@ -1087,7 +1113,16 @@ series = {|Полное собрание сочинений : для форте \item[Области примечания, стандартного номера и условий доступности.] В случае необходимости, вся эта информация включается в \bibfield{addendum}. Нужно лишь учесть, что -в стиле \bibsty{gost-inline} она не выводится в цитатах (но выводится в библиографии). +в стиле \bibsty{gost-inline} она не выводится в цитатах (но выводится в +библиографии). + +\item[Адреса в сети Интернет.] \gostbibref{5.8.6.4 в,г} предусматривает два вида + дат для электронных адресов Интернет (URL) "--- дату обращения, которая + выводится в скобках после адреса, и дату публикации, которая выводится как + отдельная область. + \biblatexgost интерпретирует \bibfield{urldate} как дату обращения. + Если вам требуется дата публикации "--- например, для электронных журналов + "--- используйте поле \bibfield{note}. \end{description} @@ -1943,9 +1978,12 @@ author = {|Петров, А.| and others} \boolitem[true]{otherlangs} -Пакет переопределяет некоторые параметры локализации для других языков, помимо русского. -В частности, например, ГОСТ требует, чтобы страницы сокращались до одной буквы, хотя в -других языках могут быть другие стандарты. +Пакет переопределяет некоторые параметры локализации для других языков, +помимо русского. +В частности, например, ГОСТ требует, чтобы префикс перед диапазоном страниц +сокращался до одной буквы: P.~12--17. +Однако в других языках могут быть другие стандарты, например, в английском +принято писать Pp.~12--17. Опция \opt{otherlangs} позволяет отключить это переопределение. При установке её в \texttt{false} используются стандартные настройки \biblatex. @@ -2539,6 +2577,12 @@ pageref & + & + & + & + & + & + & + & + \begin{changelog} + \begin{release}{1.23}{14-04-2023} + \item В документации ГОСТ 7.1---2003 заменён на ГОСТ Р 7.0.100-2018, а ГОСТ + 2.0.5---2008 на ГОСТ Р 2.0.5---2008. + \item Уточнения в документации. + \end{release} + \begin{release}{1.22}{08-05-2021} \item При версиях \biblatex 3.15+ не применяется патч для обхода ошибки \url{https://github.com/odomanov/biblatex-gost/issues/22}, diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-alphabetic-min.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-alphabetic-min.bbx index dca3d3d0ad..6d2728e9db 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-alphabetic-min.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-alphabetic-min.bbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-alphabetic-min.bbx} -[2021/05/08\space v1.22\space biblatex-gost styles] +[2023/04/14\space v1.23\space biblatex-gost styles] \RequireBibliographyStyle{gost-alphabetic} \AtEveryBibitem{% diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-alphabetic.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-alphabetic.bbx index 9d96c69198..12f68c4440 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-alphabetic.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-alphabetic.bbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-alphabetic.bbx} -[2021/05/08\space v1.22\space biblatex-gost styles] +[2023/04/14\space v1.23\space biblatex-gost styles] \RequireBibliographyStyle{gost-standard} \ExecuteBibliographyOptions{labelalpha,sorting=anyvt} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-authoryear-min.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-authoryear-min.bbx index df17b27455..9cf0968224 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-authoryear-min.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-authoryear-min.bbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-authoryear-min.bbx} -[2021/05/08\space v1.22\space biblatex-gost styles] +[2023/04/14\space v1.23\space biblatex-gost styles] \RequireBibliographyStyle{gost-authoryear} \AtEveryBibitem{% diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-authoryear.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-authoryear.bbx index 48e824f977..1f55feed23 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-authoryear.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-authoryear.bbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-authoryear.bbx} -[2021/05/08\space v1.22\space biblatex-gost styles] +[2023/04/14\space v1.23\space biblatex-gost styles] \RequireBibliographyStyle{gost-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-footnote-min.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-footnote-min.bbx index 596e33ce7b..04034742c8 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-footnote-min.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-footnote-min.bbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-footnote-min.bbx} -[2021/05/08\space v1.22\space biblatex-gost styles] +[2023/04/14\space v1.23\space biblatex-gost styles] \RequireBibliographyStyle{gost-inline-min} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-footnote.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-footnote.bbx index acda184237..810861be34 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-footnote.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-footnote.bbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-footnote.bbx} -[2021/05/08\space v1.22\space biblatex-gost styles] +[2023/04/14\space v1.23\space biblatex-gost styles] \RequireBibliographyStyle{gost-inline} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-inline-min.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-inline-min.bbx index dd14a89153..4ab1f085a9 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-inline-min.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-inline-min.bbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-inline-min.bbx} -[2021/05/08\space v1.22\space biblatex-gost styles] +[2023/04/14\space v1.23\space biblatex-gost styles] \RequireBibliographyStyle{gost-inline} \AtEveryBibitem{% diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-inline.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-inline.bbx index b9c4278507..c51d679e01 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-inline.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-inline.bbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-inline.bbx} -[2021/05/08\space v1.22\space biblatex-gost styles] +[2023/04/14\space v1.23\space biblatex-gost styles] \RequireBibliographyStyle{gost-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-numeric-min.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-numeric-min.bbx index f0c5062005..2da84c9f3c 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-numeric-min.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-numeric-min.bbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-numeric-min.bbx} -[2021/05/08\space v1.22\space biblatex-gost styles] +[2023/04/14\space v1.23\space biblatex-gost styles] \RequireBibliographyStyle{gost-numeric} \AtEveryBibitem{% diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-numeric.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-numeric.bbx index 68d5fb053a..608ed965b3 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-numeric.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-numeric.bbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-numeric.bbx} -[2021/05/08\space v1.22\space biblatex-gost styles] +[2023/04/14\space v1.23\space biblatex-gost styles] \RequireBibliographyStyle{gost-standard} \ExecuteBibliographyOptions{labelnumber,bibisbn,biburl,bibdoi,bibeprint} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-standard.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-standard.bbx index b763121b31..e51cc6b247 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-standard.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-standard.bbx @@ -1,8 +1,8 @@ \ProvidesFile{gost-standard.bbx} -[2021/05/08\space v1.22\space biblatex-gost styles] +[2023/04/14\space v1.23\space biblatex-gost styles] -\def\bbx@gost@date{2021/05/08} -\def\bbx@gost@version{1.22} +\def\bbx@gost@date{2023/04/14} +\def\bbx@gost@version{1.23} \@ifpackagelater{biblatex}{2019/09/01} {} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/biblatex-gost.def b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/biblatex-gost.def index ff20a2ff41..7b8cc6c278 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/biblatex-gost.def +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/biblatex-gost.def @@ -1,5 +1,5 @@ \ProvidesFile{biblatex-gost.def} -[2021/05/08\space v1.22\space biblatex-gost styles] +[2023/04/14\space v1.23\space biblatex-gost styles] % these declarations should be here, not in lbx, to be initialized for all languages \NewBibliographyString{ diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-alphabetic-min.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-alphabetic-min.cbx index 9ce16a39a9..c98276f0c4 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-alphabetic-min.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-alphabetic-min.cbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-alphabetic-min.cbx} -[2021/05/08\space v1.22\space biblatex-gost styles] +[2023/04/14\space v1.23\space biblatex-gost styles] \RequireCitationStyle{gost-alphabetic} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-alphabetic.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-alphabetic.cbx index bca89235f4..2ced6cf962 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-alphabetic.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-alphabetic.cbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-alphabetic.cbx} -[2021/05/08\space v1.22\space biblatex-gost styles] +[2023/04/14\space v1.23\space biblatex-gost styles] \RequireCitationStyle{alphabetic} \ExecuteBibliographyOptions{labelalpha,autocite=inline} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-authoryear-min.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-authoryear-min.cbx index c976469735..d18b14ca63 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-authoryear-min.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-authoryear-min.cbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-authoryear-min.cbx} -[2021/05/08\space v1.22\space biblatex-gost styles] +[2023/04/14\space v1.23\space biblatex-gost styles] \RequireCitationStyle{gost-authoryear} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-authoryear.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-authoryear.cbx index bdf7cc545c..f8cec460c4 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-authoryear.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-authoryear.cbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-authoryear.cbx} -[2021/05/08\space v1.22\space biblatex-gost styles] +[2023/04/14\space v1.23\space biblatex-gost styles] \ExecuteBibliographyOptions{dashed=false,citetracker=constrict,loccittracker=constrict, dropdates=false, diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-footnote-min.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-footnote-min.cbx index 110dbc29e0..cb9da7bdf1 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-footnote-min.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-footnote-min.cbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-footnote-min.cbx} -[2021/05/08\space v1.22\space biblatex-gost styles] +[2023/04/14\space v1.23\space biblatex-gost styles] \RequireCitationStyle{gost-footnote} \renewbibmacro*{cite:clearfields}{% diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-footnote.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-footnote.cbx index c58cf9a724..e90a6a5c80 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-footnote.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-footnote.cbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-footnote.cbx} -[2021/05/08\space v1.22\space biblatex-gost styles] +[2023/04/14\space v1.23\space biblatex-gost styles] \RequireCitationStyle{gost-inline} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-inline-min.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-inline-min.cbx index ce31bc54a5..db9e506f31 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-inline-min.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-inline-min.cbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-inline-min.cbx} -[2021/05/08\space v1.22\space biblatex-gost styles] +[2023/04/14\space v1.23\space biblatex-gost styles] \RequireCitationStyle{gost-inline} \renewbibmacro*{cite:clearfields}{% diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-inline.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-inline.cbx index ead6f2dc61..e9c722f304 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-inline.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-inline.cbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-inline.cbx} -[2021/05/08\space v1.22\space biblatex-gost styles] +[2023/04/14\space v1.23\space biblatex-gost styles] \DeclareLabelname [inbook,incollection,inproceedings,inreference,suppbook,suppcollection,suppperiodical,bookinbook] diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-numeric-min.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-numeric-min.cbx index 50838c887b..064086326c 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-numeric-min.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-numeric-min.cbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-numeric-min.cbx} -[2021/05/08\space v1.22\space biblatex-gost styles] +[2023/04/14\space v1.23\space biblatex-gost styles] \RequireCitationStyle{gost-numeric} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-numeric.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-numeric.cbx index 6d5f2f918a..c3a9d88374 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-numeric.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-numeric.cbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-numeric.cbx} -[2021/05/08\space v1.22\space biblatex-gost styles] +[2023/04/14\space v1.23\space biblatex-gost styles] \RequireCitationStyle{numeric-comp} \ExecuteBibliographyOptions{dashed=false,citeisbn,citeurl,citedoi,citeeprint} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/biblatex-gost.dbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/biblatex-gost.dbx index 74759a5a53..fa0e5ce402 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/biblatex-gost.dbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/biblatex-gost.dbx @@ -1,5 +1,5 @@ \ProvidesFile{biblatex-gost.dbx} -[2021/05/08\space v1.22\space biblatex-gost data model] +[2023/04/14\space v1.23\space biblatex-gost data model] % Biblatex-GOST data model diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-alphabetic-min.dbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-alphabetic-min.dbx index 5b95ef4f02..50733fe300 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-alphabetic-min.dbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-alphabetic-min.dbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-alphabetic-min.dbx} -[2021/05/08\space v1.22\space biblatex-gost data model] +[2023/04/14\space v1.23\space biblatex-gost data model] \blx@inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-alphabetic.dbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-alphabetic.dbx index 8aa1267902..d5b88f6aaf 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-alphabetic.dbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-alphabetic.dbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-alphabetic.dbx} -[2021/05/08\space v1.22\space biblatex-gost data model] +[2023/04/14\space v1.23\space biblatex-gost data model] \blx@inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-authoryear-min.dbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-authoryear-min.dbx index 619447ddd4..35c079c9e6 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-authoryear-min.dbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-authoryear-min.dbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-authoryear-min.dbx} -[2021/05/08\space v1.22\space biblatex-gost data model] +[2023/04/14\space v1.23\space biblatex-gost data model] \blx@inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-authoryear.dbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-authoryear.dbx index e8e5ab65d3..bb5142a709 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-authoryear.dbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-authoryear.dbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-authoryear.dbx} -[2021/05/08\space v1.22\space biblatex-gost data model] +[2023/04/14\space v1.23\space biblatex-gost data model] \blx@inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-footnote-min.dbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-footnote-min.dbx index 5677eed3fc..f6d2d7567c 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-footnote-min.dbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-footnote-min.dbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-footnote-min.dbx} -[2021/05/08\space v1.22\space biblatex-gost data model] +[2023/04/14\space v1.23\space biblatex-gost data model] \blx@inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-footnote.dbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-footnote.dbx index e4e423246f..7fc20133ee 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-footnote.dbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-footnote.dbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-footnote.dbx} -[2021/05/08\space v1.22\space biblatex-gost data model] +[2023/04/14\space v1.23\space biblatex-gost data model] \blx@inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-inline-min.dbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-inline-min.dbx index 5213788042..3ed2777154 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-inline-min.dbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-inline-min.dbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-inline-min.dbx} -[2021/05/08\space v1.22\space biblatex-gost data model] +[2023/04/14\space v1.23\space biblatex-gost data model] \blx@inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-inline.dbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-inline.dbx index 22c5521f3a..a35f43431b 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-inline.dbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-inline.dbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-inline.dbx} -[2021/05/08\space v1.22\space biblatex-gost data model] +[2023/04/14\space v1.23\space biblatex-gost data model] \blx@inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-numeric-min.dbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-numeric-min.dbx index 17e9e06801..0f2fad5d3e 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-numeric-min.dbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-numeric-min.dbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-numeric-min.dbx} -[2021/05/08\space v1.22\space biblatex-gost data model] +[2023/04/14\space v1.23\space biblatex-gost data model] \blx@inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-numeric.dbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-numeric.dbx index 53bd8183b2..d09236ec32 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-numeric.dbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-numeric.dbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-numeric.dbx} -[2021/05/08\space v1.22\space biblatex-gost data model] +[2023/04/14\space v1.23\space biblatex-gost data model] \blx@inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/american-gost.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/american-gost.lbx index 58f32d61c7..2ebb92a8dd 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/american-gost.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/american-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{american-gost.lbx} -[2021/05/08\space v1.22\space biblatex-gost styles] +[2023/04/14\space v1.23\space biblatex-gost styles] \InheritBibliographyExtras{american} \InheritBibliographyStrings{american} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/brazilian-gost.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/brazilian-gost.lbx index e6db5a32b8..64e8cc7864 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/brazilian-gost.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/brazilian-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{brazilian-gost.lbx} -[2021/05/08\space v1.22\space biblatex-gost styles] +[2023/04/14\space v1.23\space biblatex-gost styles] \InheritBibliographyExtras{brazilian} \InheritBibliographyStrings{brazilian} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/british-gost.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/british-gost.lbx index eb20ffb207..76e56d6105 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/british-gost.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/british-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{british-gost.lbx} -[2021/05/08\space v1.22\space biblatex-gost styles] +[2023/04/14\space v1.23\space biblatex-gost styles] \InheritBibliographyExtras{british} \InheritBibliographyStrings{british} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/catalan-gost.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/catalan-gost.lbx index 11a6cd9da7..d325510e5f 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/catalan-gost.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/catalan-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{catalan-gost.lbx} -[2021/05/08\space v1.22\space biblatex-gost styles] +[2023/04/14\space v1.23\space biblatex-gost styles] \InheritBibliographyExtras{catalan} \InheritBibliographyStrings{catalan} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/croatian-gost.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/croatian-gost.lbx index 5931ff8a35..7560a6d555 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/croatian-gost.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/croatian-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{croatian-gost.lbx} -[2021/05/08\space v1.22\space biblatex-gost styles] +[2023/04/14\space v1.23\space biblatex-gost styles] \InheritBibliographyExtras{croatian} \InheritBibliographyStrings{croatian} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/english-gost.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/english-gost.lbx index df3e6610ae..d1db57970f 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/english-gost.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/english-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{english-gost.lbx} -[2021/05/08\space v1.22\space biblatex-gost styles] +[2023/04/14\space v1.23\space biblatex-gost styles] \InheritBibliographyExtras{english} \InheritBibliographyStrings{english} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/french-gost.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/french-gost.lbx index d7c8827eab..bc4247508d 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/french-gost.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/french-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{french-gost.lbx} -[2021/05/08\space v1.22\space biblatex-gost styles] +[2023/04/14\space v1.23\space biblatex-gost styles] \InheritBibliographyExtras{french} \InheritBibliographyStrings{french} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/galician-gost.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/galician-gost.lbx index c98ab8c7ea..1fc0ad5b3b 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/galician-gost.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/galician-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{galician-gost.lbx} -[2021/05/08\space v1.22\space biblatex-gost styles] +[2023/04/14\space v1.23\space biblatex-gost styles] \InheritBibliographyExtras{galician} \InheritBibliographyStrings{galician} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/german-gost.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/german-gost.lbx index 477b3fcf17..bb955d57e6 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/german-gost.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/german-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{german-gost.lbx} -[2021/05/08\space v1.22\space biblatex-gost styles] +[2023/04/14\space v1.23\space biblatex-gost styles] \InheritBibliographyExtras{german} \InheritBibliographyStrings{german} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/greek-gost.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/greek-gost.lbx index 3e876a87a8..7545a00ecd 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/greek-gost.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/greek-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{greek-gost.lbx} -[2021/05/08\space v1.22\space biblatex-gost styles] +[2023/04/14\space v1.23\space biblatex-gost styles] \InheritBibliographyExtras{greek} \InheritBibliographyStrings{greek} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/icelandic-gost.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/icelandic-gost.lbx index 50085a1e4e..36dfbfab3a 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/icelandic-gost.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/icelandic-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{icelandic-gost.lbx} -[2021/05/08\space v1.22\space biblatex-gost styles] +[2023/04/14\space v1.23\space biblatex-gost styles] \InheritBibliographyExtras{icelandic} \InheritBibliographyStrings{icelandic} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/italian-gost.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/italian-gost.lbx index f016ba9061..028310678b 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/italian-gost.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/italian-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{italian-gost.lbx} -[2021/05/08\space v1.22\space biblatex-gost styles] +[2023/04/14\space v1.23\space biblatex-gost styles] \InheritBibliographyExtras{italian} \InheritBibliographyStrings{italian} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/portuguese-gost.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/portuguese-gost.lbx index 879f823e9c..53588f645a 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/portuguese-gost.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/portuguese-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{portuguese-gost.lbx} -[2021/05/08\space v1.22\space biblatex-gost styles] +[2023/04/14\space v1.23\space biblatex-gost styles] \InheritBibliographyExtras{portuguese} \InheritBibliographyStrings{portuguese} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/russian-gost.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/russian-gost.lbx index 1655b93b29..da411e01c8 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/russian-gost.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/russian-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{russian-gost.lbx} -[2021/05/08\space v1.22\space biblatex-gost styles] +[2023/04/14\space v1.23\space biblatex-gost styles] \InheritBibliographyExtras{russian} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/slovene-gost.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/slovene-gost.lbx index 5a21956ff8..459b618427 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/slovene-gost.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/slovene-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{slovene-gost.lbx} -[2021/05/08\space v1.22\space biblatex-gost styles] +[2023/04/14\space v1.23\space biblatex-gost styles] \InheritBibliographyExtras{slovene} \InheritBibliographyStrings{slovene} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/spanish-gost.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/spanish-gost.lbx index 1c66ef0280..e53f5fed89 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/spanish-gost.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/spanish-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{spanish-gost.lbx} -[2021/05/08\space v1.22\space biblatex-gost styles] +[2023/04/14\space v1.23\space biblatex-gost styles] \InheritBibliographyExtras{spanish} \InheritBibliographyStrings{spanish} diff --git a/macros/unicodetex/latex/bithesis/bithesis.dtx b/macros/unicodetex/latex/bithesis/bithesis.dtx index 5aeaef454f..22a8da4f86 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-04-04}{3.5.0}{BIT Thesis Templates} +%<cls>{2023-04-14}{3.5.2}{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/04/04 3.5.0 BIT Thesis Templates] +\ProvidesFile{bithesis.dtx}[2023/04/14 3.5.2 BIT Thesis Templates] \documentclass[letterpaper]{l3doc} \usepackage{dtx-style} @@ -202,6 +202,8 @@ % \item 同时,也增加了本科全英文专业的毕设论文模板样式。 % \item 此版本是 V3 版本,代号为 Summer Time. % \end{itemize} +% \item 2023 年,冯开宇在此版本上增加了多种新的功能,并修复了一些已知的问题。 +% 并推进了官方(教务部、研究生院)对 \BIThesis 的认可。 % \end{itemize} % % \subsection{\BIThesis 是什么?} @@ -247,6 +249,19 @@ % 那么欢迎你访问我们的\href{https://bithesis.bitnp.net}{在线文档}以获得更多信息。 % % 如果你想深入了解 \BIThesisLaTeX 提供的接口的各种选项,那么请继续阅读。 +% +% \subsection{\BIThesis 如何的设计原则是什么?} +% +% \BIThesis 的基本设计原则是: +% \begin{itemize} +% \item \textbf{保持开箱即用的特性},即用户不需要修改任何代码即可使用 \BIThesisLaTeX 。 +% \item \textbf{保持对官方模板的兼容性},让用户只用关注内容本身。 +% \item \textbf{关注用户体验},提供简单易用的接口,对于有争议的设计,我们会提供多种选择。 +% \item \textbf{模板即软件},「罗马不是一天建成的」,我们会积极地维护 \BIThesisLaTeX 。 +% \end{itemize} +% +% 为了保证以上原则,我们引入了多种测试机制(如集成测试、回归测试)来保证 \BIThesis 的质量。 +% 并采用了正规软件开发的流程,如版本控制、代码审查、持续集成等,来保证 \BIThesis 的可维护性。 % % \subsection{\BIThesis 宏包的组成} % 为了适应用户的不同需求,我们将 \BIThesisMacroPackage @@ -2143,8 +2158,8 @@ {conclusion} {结\label_space: 论} {Conclusions}, {appendix} {附\label_space: 录} {Appendices}, {ack} {致\label_space: 谢} {Acknowledgement}, - {figure} {插\quad 图} {Illustrations}, - {table} {表\quad 格} {Tables}, + {figure} {插\label_space: 图} {Illustrations}, + {table} {表\label_space: 格} {Tables}, {appendix_prefix} {附录} {Appendix}, {reference} {参考文献} {References}, {university} {北京理工大学} {Beijing~Institute~of~Technology}, @@ -2466,7 +2481,9 @@ % Hide color and border in hyperref. \RequirePackage[hidelinks,bookmarksnumbered]{hyperref} \RequirePackage{xcolor} -\RequirePackage{caption} +% 详见 `caption` 宏包手册和 +% https://github.com/CTeX-org/forum/issues/86 +\RequirePackage[strut=off]{caption} \RequirePackage{array} \RequirePackage{amsmath} \RequirePackage{amssymb} @@ -2526,7 +2543,7 @@ % 根据学校的要求,在本科生模板图片前后加上一行空白。 % \begin{macrocode} \@@_if_bachelor_thesis:T { - \setlength{\intextsep}{2\baselineskip plus 0.2\baselineskip minus 0.2\baselineskip} + \setlength{\intextsep}{1.80\baselineskip plus 0.2\baselineskip minus 0.2\baselineskip} } % \end{macrocode} % @@ -2880,8 +2897,8 @@ format={\l_@@_title_font_cs:n \bfseries \raggedright \zihao{-4}}, nameformat = {}, titleformat = {}, - beforeskip=28bp plus 1ex minus .2ex, - afterskip=24bp plus .2ex, + beforeskip=14bp plus 1ex minus .2ex, + afterskip=14bp plus .2ex, fixskip=true, } } @@ -2937,6 +2954,7 @@ numbering = false, } } + \setstretch{1.53} \pagestyle{BIThesis} } % \end{macrocode} @@ -2946,6 +2964,8 @@ % 主体内容的页面样式。 % \begin{macrocode} \RenewDocumentCommand \mainmatter {} { + % 另起一个空页,以便于后续的章节标题编号。 + \clearpage % 这部分的章节标题进行编号。 \ctexset{ chapter = { @@ -2989,7 +3009,23 @@ % 定义标题的前后间距。 % \begin{macrocode} \setlength{\abovecaptionskip}{11pt} -\setlength{\belowcaptionskip}{9pt} +\@@_if_bachelor_thesis:TF { + \@@_if_thesis_english:TF { + \setlength{\belowcaptionskip}{9pt} + } { + % 为了满足 “前后一行空白的问题”,需要删除 Caption 下方的间距。 + % 详见 `caption` 宏包手册和 + % https://github.com/CTeX-org/forum/issues/86 + % + % 这里实际的 skip 在 15pt 左右,但是全部移除会导致当图片置于页面顶部时, + % 图片与上方的间距过小,因此这里只移除 5pt。 + % 当然,这样会导致文本间的图片的 Caption 下方的间距微微大于一行。 + \captionsetup{belowskip=-5pt} + } +} { + % 而研究生模板不存在这个问题。 + \setlength{\belowcaptionskip}{9pt} +} % \end{macrocode} % % 定义分隔字符。 @@ -3010,7 +3046,7 @@ % table \cs_set:Npn \thetable {\thechapter\g_@@_label_divide_char_tl\arabic{table}} -\captionsetup[table]{font=small,labelsep=space,skip=2pt} +\captionsetup[table]{font=small,labelsep=space} % equation \cs_set:Npn \theequation {\thechapter\g_@@_label_divide_char_tl\arabic{equation}} @@ -3018,6 +3054,7 @@ % code snippet \cs_set:Npn \thelstlisting {\thechapter\g_@@_label_divide_char_tl\arabic{lstlisting}} \cs_set:Npn \lstlistingname {\c_@@_label_code_tl} +\captionsetup[listing]{font=small,labelsep=space} % \end{macrocode} % \end{macro} % @@ -4403,6 +4440,8 @@ \DeclareDelimFormat[bib,biblist]{finalnamedelim}{} % 如果自己不是第一个作者,不修改此项的话,会在最开始有逗号。 \DeclareDelimFormat{multinamedelim}{} + % 如果覆盖的是英文作者,不修改此项的话,会在最开始有空格。 + \DeclareDelimFormat{bibnamedelimd}{} } % ===== 上方定义与「参考文献」部分相同 @@ -4523,7 +4562,8 @@ labelsep=0.5cm, leftmargin=3cm, itemindent=0cm, - itemsep=0cm + % 不再在两项之间增加额外的间距(1.5 倍的行间距已经够宽了)(未来可以提供一个接口以供用户手动设置间距) + itemsep=-0.5ex, ] \cs_set:Npn \makelabel ##1 {##1\hfil} } diff --git a/macros/unicodetex/latex/bithesis/bithesis.pdf b/macros/unicodetex/latex/bithesis/bithesis.pdf Binary files differindex 139e3e3b70..bfd522ef65 100644 --- a/macros/unicodetex/latex/bithesis/bithesis.pdf +++ b/macros/unicodetex/latex/bithesis/bithesis.pdf |