From 78e6b19d4678a9d641c4afa4ca800288cfa0a9d5 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sat, 15 Apr 2023 03:01:57 +0000 Subject: CTAN sync 202304150301 --- .../contrib/context-calendar-examples/VERSION | 2 +- .../calendar-examples/A6-1week_per_2pages.tex | 114 ++-- .../third/calendar-examples/Sundata-calendar.tex | 619 +++++++++++---------- .../context/contrib/context-simpleslides/README.md | 5 +- .../context/contrib/context-simpleslides/VERSION | 2 +- .../tex/context/interface/third/t-simpleslides.xml | 4 +- .../simpleslides/s-simpleslides-fontsdefault.mkiv | 47 +- 7 files changed, 421 insertions(+), 372 deletions(-) (limited to 'macros/context') 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
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 @@ + version="2023.04.13"> @@ -47,6 +47,8 @@ + + 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}} -- cgit v1.2.3