From 5a7280afd74f3e7c06ccdb643284ca8bd9c5e5ff Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Mon, 7 Nov 2016 11:18:04 +1100 Subject: PDF: Do not use lato and inconsolata fonts. Not widely supported. --- common/latex.py | 4 -- common/latex/inconsolata.sty | 92 -------------------------------------------- common/latex/lato.sty | 47 ---------------------- common/rtemsstyle.sty | 8 ++-- 4 files changed, 5 insertions(+), 146 deletions(-) delete mode 100644 common/latex/inconsolata.sty delete mode 100644 common/latex/lato.sty (limited to 'common') diff --git a/common/latex.py b/common/latex.py index fc38552..e5dbda5 100644 --- a/common/latex.py +++ b/common/latex.py @@ -40,11 +40,9 @@ package_tests = { 'hyperref' : ['\\usepackage{hyperref}'], 'ifplatform' : ['\\usepackage{ifplatform}'], 'ifthen' : ['\\usepackage{ifthen}'], - 'inconsolata' : ['\\usepackage{inconsolata}'], 'inputenc' : ['\\usepackage{inputenc}'], 'keyval' : ['\\usepackage{keyval}'], 'kvoptions' : ['\\usepackage{kvoptions}'], - 'lato' : ['\\usepackage{lato}'], 'lineno' : ['\\usepackage{lineno}'], 'longtable' : ['\\usepackage{longtable}'], 'makeidx' : ['\\usepackage{makeidx}'], @@ -72,9 +70,7 @@ hosts = { 'Linux/centos' : { '.*' : ['capt-of.sty', 'eqparbox.sty', 'environ.sty', - 'inconsolata.sty', 'ifplatform.sty', - 'lato.sty', 'trimspaces.sty', 'slantsc.sty', 'upquote.sty'] } diff --git a/common/latex/inconsolata.sty b/common/latex/inconsolata.sty deleted file mode 100644 index aeada49..0000000 --- a/common/latex/inconsolata.sty +++ /dev/null @@ -1,92 +0,0 @@ -% Copyright 2014 Michael Sharpe -% Based initially on Karl Berry's inconsolata.sty. -% You may freely use, modify and/or distribute this file. - -\def\fileversion{1.10} -\def\filedate{2016/02/22} -\NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{inconsolata}[\filedate\space v\fileversion] -\message{`inconsolata-zi4' v\fileversion, \filedate\space Text macros for Inconsolata (msharpe)} - -\RequirePackage{textcomp} -\RequirePackage{keyval} - -\newcount\zifour@ocount -\newif\ifzifour@altzero -\newif\ifzifour@noupq -\define@key{zifour}{scaled}[1.0]{\def\zifour@scaled{s*[#1]}} - -\DeclareOption*{% - \begingroup - \edef\x{\endgroup - \noexpand\setkeys{zifour}{\CurrentOption}}% - \x} - -% by default, change \tt to mean zi4. -\newcommand*{\zifour@default}{% - \renewcommand*{\ttdefault}{zi4}% -} - -% option [nott] to avoid changing tt. -\DeclareOption{nott}{% - \renewcommand*{\zifour@default}{}% -} -% option [noupquote] to prevent loading upquote. -\DeclareOption{noupquote}{% - \zifour@noupqtrue}% - -% option var0---use unslashed zero (slashed is default) -\DeclareOption{var0}{% - \zifour@altzerotrue\advance\zifour@ocount \tw@ % -} -\DeclareOption{varl}{% - \advance\zifour@ocount \@ne % -} -\DeclareOption{varqu}{% - \advance\zifour@ocount 4\relax % -} - -\ProcessOptions* -\zifour@default -\edef\zifour@opt{\the\zifour@ocount} -\ifzifour@altzero - \advance\zifour@ocount -\tw@ -\else - \advance\zifour@ocount \tw@ -\fi -\edef\zifour@altopt{\the\zifour@ocount} -% define an \altzero macro which flips to slashed, unslashed -\def\altzero{{\fontfamily{zi4}% - \fontshape{scit}% - \selectfont 0}} - -\def\zifour@T@ne@nc{T1} -\def\zifour@OT@ne@nc{OT1} -\def\zifour@LY@ne@nc{LY1} -\def\zifour@QX@nc{QX} -\def\zifour@TQS{% -\UndeclareTextCommand{\textquotesingle}{\encodingdefault} -\DeclareTextSymbol{\textquotesingle}{TS1}{39}} - -\ifzifour@noupq% do nothing - % Try to correct for wrong slots for QX - \ifx\encodingdefault\zifour@QX@nc - \zifour@TQS - \else - \ifx\encodingdefault\zifour@LY@ne@nc - \zifour@TQS - \fi - \fi -\else - \AtBeginDocument{% - \ifx\encodingdefault\zifour@T@ne@nc % do nothing - \else - \ifx\encodingdefault\zifour@OT@ne@nc % do nothing - \else - \zifour@TQS - \fi - \fi - \usepackage{upquote}} -\fi - -\endinput diff --git a/common/latex/lato.sty b/common/latex/lato.sty deleted file mode 100644 index ba947cc..0000000 --- a/common/latex/lato.sty +++ /dev/null @@ -1,47 +0,0 @@ -%% lato.sty -%% Copyright 2011 Mohamed El Morabity -% -% This work may be distributed and/or modified under the conditions of the LaTeX -% Project Public License, either version 1.3 of this license or (at your option) -% any later version. The latest version of this license is in -% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all -% distributions of LaTeX version 2005/12/01 or later. -% -% This work has the LPPL maintenance status `maintained'. -% -% The Current Maintainer of this work is Mohamed El Morabity -% -% This work consists of all files listed in manifest.txt. - -\NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{lato}[2011/08/06 Lato] - -\RequirePackage{keyval} -\RequirePackage{slantsc} - -% Taken from inconsolata.sty -\define@key{lato}{scale}[1.0]{\def\lato@scale{s*[#1]}} -\DeclareOption*{% - \begingroup% - \edef\x{\endgroup% - \noexpand\setkeys{lato}{\CurrentOption}}% - \x% -} - -\DeclareOption{defaultsans}{% - \renewcommand*{\sfdefault}{fla}% -} - -\DeclareOption{default}{% - \renewcommand*{\familydefault}{fla}% - \renewcommand*{\sfdefault}{fla}% -} - -\ProcessOptions* - -\newcommand{\flafamily}{% - \fontfamily{fla}% - \selectfont% -} - -\endinput diff --git a/common/rtemsstyle.sty b/common/rtemsstyle.sty index c576db0..b05dd0e 100644 --- a/common/rtemsstyle.sty +++ b/common/rtemsstyle.sty @@ -130,10 +130,12 @@ gobble=0, \vskip 3ex \@afterheading} -% use inconsolata font +% fonts \usepackage{charter} -\usepackage[defaultsans]{lato} -\usepackage{inconsolata} +% remove, not widely supported on some Linux hosts. +%%\usepackage[defaultsans]{lato} +% remove, not widely supported on some Linux hosts. +%%\usepackage{inconsolata} % fix single quotes, for inconsolata. (does not work) %%\usepackage{textcomp} -- cgit v1.2.3