diff options
author | Chris Johns <chrisj@rtems.org> | 2016-11-08 15:58:58 +1100 |
---|---|---|
committer | Chris Johns <chrisj@rtems.org> | 2016-11-08 15:58:58 +1100 |
commit | 2fdbc9826f31ba7c890a7b9e4fcfebcb2a4bad8b (patch) | |
tree | 403771e96e664d5ce41c1ffaf05788b543c3da92 /common/latex | |
parent | c-user: Format the directives as descriptions. (diff) | |
download | rtems-docs-2fdbc9826f31ba7c890a7b9e4fcfebcb2a4bad8b.tar.bz2 |
waf: Use the good fonts if installed.
Diffstat (limited to '')
-rw-r--r-- | common/latex.py | 28 | ||||
-rw-r--r-- | common/latex/rtemsextrafonts-null.sty | 1 | ||||
-rw-r--r-- | common/latex/rtemsextrafonts.sty | 11 |
3 files changed, 36 insertions, 4 deletions
diff --git a/common/latex.py b/common/latex.py index 2cc3101..b3ca60c 100644 --- a/common/latex.py +++ b/common/latex.py @@ -39,11 +39,13 @@ package_tests = { 'hypcap' : ['\\usepackage{hyperref}', '\\usepackage{hypcap}'], 'hyperref' : ['\\usepackage{hyperref}'], + 'inconsolata' : ['\\usepackage{inconsolata}'], 'ifplatform' : ['\\usepackage{ifplatform}'], 'ifthen' : ['\\usepackage{ifthen}'], 'inputenc' : ['\\usepackage{inputenc}'], 'keyval' : ['\\usepackage{keyval}'], 'kvoptions' : ['\\usepackage{kvoptions}'], + 'lato' : ['\\usepackage{lato}'], 'lineno' : ['\\usepackage{lineno}'], 'longtable' : ['\\usepackage{longtable}'], 'makeidx' : ['\\usepackage{makeidx}'], @@ -60,6 +62,8 @@ package_tests = { 'xcolor' : ['\\usepackage{xcolor}'], 'xstring' : ['\\usepackage{xstring}'], } +package_optional = ['inconsolata', + 'lato'] # # Add per host support. If there is a version clash for the same texlive @@ -124,11 +128,12 @@ def configure_tests(conf): tests = sorted(package_tests.keys()) local_packs = local_packages() + excludes = package_optional if local_packs is not None: - excludes = [p[:p.rfind('.')] for p in local_packs] - for e in excludes: - if e in tests: - tests.remove(e) + excludes += [p[:p.rfind('.')] for p in local_packs] + for e in excludes: + if e in tests: + tests.remove(e) fails = 0 r = conf.find_program("pygmentize", mandatory = False) @@ -145,3 +150,18 @@ def configure_tests(conf): fails += 1 if fails > 0: conf.fatal('There are %d Tex package failures. Please fix.' % (fails)) + + fails = 0 + for t in package_optional: + r = conf.test(build_fun = build_latex_test, + msg = "Checking for Tex package '%s'" % (t), + tex_test = t, + okmsg = 'ok', + errmsg = 'degraded fonts', + mandatory = False) + if r is None: + fails += 1 + if fails == 0: + conf.env.RTEMSEXTRAFONTS = 'rtemsextrafonts.sty' + else: + conf.env.RTEMSEXTRAFONTS = 'rtemsextrafonts-null.sty' diff --git a/common/latex/rtemsextrafonts-null.sty b/common/latex/rtemsextrafonts-null.sty new file mode 100644 index 0000000..350431f --- /dev/null +++ b/common/latex/rtemsextrafonts-null.sty @@ -0,0 +1 @@ +% Empty diff --git a/common/latex/rtemsextrafonts.sty b/common/latex/rtemsextrafonts.sty new file mode 100644 index 0000000..eb7ef47 --- /dev/null +++ b/common/latex/rtemsextrafonts.sty @@ -0,0 +1,11 @@ +% Not widely used. +\usepackage[defaultsans]{lato} +\usepackage{inconsolata} + +% fix single quotes, for inconsolata. (does not work) +%%\usepackage{textcomp} +%%\begingroup +%% \catcode`'=\active +%% \g@addto@macro\@noligs{\let'\textsinglequote} +%% \endgroup +%%\endinput |