diff -Nru sile-0.9.5.1~20190128/debian/changelog sile-0.9.5.1~20190131/debian/changelog --- sile-0.9.5.1~20190128/debian/changelog 2019-01-29 05:59:45.000000000 +0000 +++ sile-0.9.5.1~20190131/debian/changelog 2019-01-31 16:20:00.000000000 +0000 @@ -1,3 +1,15 @@ +sile (0.9.5.1~20190131-2sil1) bionic; urgency=medium + + * Rebuilt for bionic + + -- Nicolas Spalinger Thu, 31 Jan 2019 10:19:32 -0600 + +sile (0.9.5.1~20190131-1sil1) xenial; urgency=medium + + * Added fontproof 1.1.1. + + -- Nicolas Spalinger Thu, 31 Jan 2019 10:14:47 -0600 + sile (0.9.5.1~20190128-3sil1) bionic; urgency=medium * Rebuilt for bionic diff -Nru sile-0.9.5.1~20190128/packagemanager/catalogue.lua sile-0.9.5.1~20190131/packagemanager/catalogue.lua --- sile-0.9.5.1~20190128/packagemanager/catalogue.lua 2019-01-29 04:45:55.000000000 +0000 +++ sile-0.9.5.1~20190131/packagemanager/catalogue.lua 2019-01-31 16:13:27.000000000 +0000 @@ -2,7 +2,7 @@ fontproof = { description = "A font design testing class", repository = "https://github.com/silnrsi/fontproof", - version = "1.1.0" + version = "1.1.1" } } diff -Nru sile-0.9.5.1~20190128/packagemanager/fontproof/classes/fontproof.lua sile-0.9.5.1~20190131/packagemanager/fontproof/classes/fontproof.lua --- sile-0.9.5.1~20190128/packagemanager/fontproof/classes/fontproof.lua 2019-01-29 04:50:54.000000000 +0000 +++ sile-0.9.5.1~20190131/packagemanager/fontproof/classes/fontproof.lua 2019-01-31 16:12:53.000000000 +0000 @@ -40,11 +40,11 @@ end fontproof.endPage = function(self) - if SILE.scratch.fontproof.testfont.family then - runheadinfo = "Fontproof for: " .. SILE.scratch.fontproof.testfont.family .. " - Input file: " .. SILE.masterFilename .. ".sil - " .. os.date("%A %d %b %Y %X %z %Z") .. " - SILE " .. SILE.scratch.fontproof.sileversion .. " - HarfBuzz " .. SILE.scratch.fontproof.hb - else + if SILE.scratch.fontproof.testfont.filename then runheadinfo = "Fontproof for: " .. SILE.scratch.fontproof.testfont.filename .. " - Input file: " .. SILE.masterFilename .. ".sil - " .. os.date("%A %d %b %Y %X %z %Z") .. " - SILE " .. SILE.scratch.fontproof.sileversion .. " - HarfBuzz " .. SILE.scratch.fontproof.hb + else + runheadinfo = "Fontproof for: " .. SILE.scratch.fontproof.testfont.family .. " - Input file: " .. SILE.masterFilename .. ".sil - " .. os.date("%A %d %b %Y %X %z %Z") .. " - SILE " .. SILE.scratch.fontproof.sileversion .. " - HarfBuzz " .. SILE.scratch.fontproof.hb end SILE.typesetNaturally(SILE.getFrame("runningHead"), function() SILE.settings.set("document.rskip", SILE.nodefactory.hfillGlue) @@ -130,15 +130,18 @@ -- useful functions local function fontsource (fam, file) - if fam then + if file then + family = nil + filename = file + elseif fam then family = fam filename = nil - elseif file then + elseif SILE.scratch.fontproof.testfont.filename then + filename = SILE.scratch.fontproof.testfont.filename family = nil - filename = file else family = SILE.scratch.fontproof.testfont.family - filename = SILE.scratch.fontproof.testfont.filename + filename = nil end return family, filename end diff -Nru sile-0.9.5.1~20190128/packagemanager/fontproof/fpFull.sil sile-0.9.5.1~20190131/packagemanager/fontproof/fpFull.sil --- sile-0.9.5.1~20190128/packagemanager/fontproof/fpFull.sil 2019-01-29 05:10:57.000000000 +0000 +++ sile-0.9.5.1~20190131/packagemanager/fontproof/fpFull.sil 2019-01-31 16:14:01.000000000 +0000 @@ -14,7 +14,7 @@ \proof{This is basic proof text using the test font and with no heading} -%\proof[size="10pt",family="Gentium Plus",heading=A basic test]{This is another basic text with common parameters} +%\proof[size="10pt",filename="packages/fontproofsupport/Lato2OFL/Lato-Light.ttf",heading=A basic test]{This is another basic text with common parameters} \proof[size="10pt,11pt,12pt,16pt",heading=A simple waterfall]{This is basic proof text in a range of sizes} diff -Nru sile-0.9.5.1~20190128/packagemanager/fontproof/README.md sile-0.9.5.1~20190131/packagemanager/fontproof/README.md --- sile-0.9.5.1~20190128/packagemanager/fontproof/README.md 2019-01-29 05:12:37.000000000 +0000 +++ sile-0.9.5.1~20190131/packagemanager/fontproof/README.md 2019-01-31 16:14:01.000000000 +0000 @@ -23,6 +23,7 @@ - Find your SILE installation directory, - Copy the file _classes/fontproof.lua_ into the _sile/classes_ folder, and - Copy the file _packages/fontprooftexts.lua_ and _packages/fontproofgroups.lua_ into your installation _sile/packages_ folder. +- Copy the folder _packages/fontproofsupport_ into your installation _sile/packages_ folder. ## Using the templates @@ -67,7 +68,7 @@ By default, the running head lists the filename, font (family or filename), date, and time. The content is not (currently) configurable, but you can set the font and size with the `\setRunHeadStyle` command. Note that this has no relation to the test font. ``` -%\setRunHeadStyle[family="Gentium Plus", size="12pt"] +%\setRunHeadStyle[filename="packages/fontproofsupport/Lato2OFL/Lato-Bold.ttf", size="12pt"] ``` To add a section and subsection headings: @@ -113,7 +114,7 @@ \proof[family="Gentium Plus",heading=A basic family test]{This is basic text with a font defined by family} -\proof[size="10pt",family="Gentium Plus",heading=A basic filename test]{This is another basic text with common parameters} +\proof[size="10pt",filename="packages/fontproofsupport/Lato2OFL/Lato-Light.ttf",heading=A basic filename test]{This is another basic text with common parameters} \proof[size="10pt,11pt,12pt,16pt"]{This is basic proof text in a range of sizes}