summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-07-09 23:03:56 +0000
committerKarl Berry <karl@freefriends.org>2012-07-09 23:03:56 +0000
commit02d35bb1cf6e5eeadaba42fa8e9d194298b65fce (patch)
treeb8357fd73c942180a4d800ff12b17b99b2f36007 /Master
parentd7aff63ef7145fa27210bad19192bc732af02e5f (diff)
substitutefont (8jul12)
git-svn-id: svn://tug.org/texlive/trunk@26981 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/substitutefont/README40
-rw-r--r--Master/texmf-dist/doc/latex/substitutefont/README.html718
-rw-r--r--Master/texmf-dist/doc/latex/substitutefont/cyrillic-lm-lgc.pdfbin0 -> 111330 bytes
-rw-r--r--Master/texmf-dist/doc/latex/substitutefont/cyrillic-lm-lgc.tex50
-rw-r--r--Master/texmf-dist/doc/latex/substitutefont/cyrillic-times-paratype.pdfbin0 -> 79287 bytes
-rw-r--r--Master/texmf-dist/doc/latex/substitutefont/cyrillic-times-paratype.tex63
-rw-r--r--Master/texmf-dist/doc/latex/substitutefont/greek-palatino-didot.pdfbin0 -> 323210 bytes
-rw-r--r--Master/texmf-dist/doc/latex/substitutefont/greek-palatino-didot.tex61
-rw-r--r--Master/texmf-dist/doc/latex/substitutefont/greek-times-bodoni.pdfbin0 -> 374934 bytes
-rw-r--r--Master/texmf-dist/doc/latex/substitutefont/greek-times-bodoni.tex60
-rw-r--r--Master/texmf-dist/doc/latex/substitutefont/substitutefont.pdfbin64858 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/substitutefont/substitutefont.sty.html (renamed from Master/texmf-dist/doc/latex/substitutefont/substitutefont.sty.xhtml)25
-rw-r--r--Master/texmf-dist/doc/latex/substitutefont/substitutefont.sty.txt77
-rw-r--r--Master/texmf-dist/doc/latex/substitutefont/test-cyrillic.pdfbin141022 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/substitutefont/test-cyrillic.tex53
-rw-r--r--Master/texmf-dist/doc/latex/substitutefont/test-greek.pdfbin241491 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/substitutefont/test-greek.tex53
-rw-r--r--Master/texmf-dist/doc/latex/substitutefont/test-txtt.pdfbin357305 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/substitutefont/test-txtt.tex49
-rw-r--r--Master/texmf-dist/tex/latex/substitutefont/substitutefont.sty16
20 files changed, 379 insertions, 886 deletions
diff --git a/Master/texmf-dist/doc/latex/substitutefont/README b/Master/texmf-dist/doc/latex/substitutefont/README
index 64ff715c389..8229f87484a 100644
--- a/Master/texmf-dist/doc/latex/substitutefont/README
+++ b/Master/texmf-dist/doc/latex/substitutefont/README
@@ -1,7 +1,7 @@
Combine font families
*********************
-:Date: Last revised 2012-04-30
+:Date: Last revised 2012-07-05
:Copyright: © 2011 Günter Milde <milde@users.sf.net>
:Contributor: Special thanks to Ulrike Fischer who provided
the indirect definition with active ``\nfss@catcodes``.
@@ -14,36 +14,36 @@ Combine font families
Many free fonts are extensions of a basic font family with new glyphs
or shapes. Sometimes they are given a new name due to license reasons
-or the creators preference.
+or the creators preference.
The `substitutefont` package facilitates the task to set up a font
family as substitute for another one in a specified font encoding.
Example:
- Use the `txtt` font family from txfonts_ instead of CM for
- monospaced text (enables monospaced-bold as well as
- monospaced-italic)::
-
- \usepackage{substitutefont}
- \substitutefont{T1}{txtt}{cmtt}
+ Palatino with the standard package `mathpazo` for Latin and
+ `GFS Didot`_ for Greek::
+
+ \usepackage[sc,slantedGreek]{mathpazo}
+ \substitutefont{LGR}{pplx}{udidot}
Source
- `<substitutefont.sty>`_, `<substitutefont.sty.xhtml>`__
+ `<substitutefont.sty>`_, `<substitutefont.sty.html>`__
-_`Tests`
- * CB-Fonts for Greek text in a document using Times/Helvetica/Courier:
- `<test-greek.tex>`__, `<test-greek.pdf>`__
- * TeX-Gyre with Cyrillic from the once included `Freefonts`:
- `<test-cyrillic.tex>`__, `<test-cyrillic.pdf>`__
- * Monospaced text in many variants with txtt:
- `<test-txtt.tex>`__, `<test-txtt.pdf>`__
+Tests
+ * Palatino wiht Greek from `GFS Didot`_:
+ `<greek-palatino-didot.tex>`__, `<greek-palatino-didot.pdf>`__
+ * Latin Modern with Cyrillic from `CM LGC`_:
+ `<cyrillic-times-paratype.tex>`__, `<cyrillic-times-paratype.pdf>`__
+ * `TeX-Gyre` with Cyrillic from `ParaType`_:
+ `<cyrillic-times-paratype.tex>`__, `<cyrillic-times-paratype.pdf>`__
References:
-
`LaTeX2e font selection
<http://mirror.ctan.org/macros/latex/doc/fntguide.pdf>`_
-
+
`LaTeX font encodings
<http://mirror.ctan.org/macros/latex/doc/encguide.pdf>`_
-
- .. _txfonts: http://mirror.ctan.org/help/Catalogue/entries/txfonts.html
+
+ .. _GFS Didot: http://mirror.ctan.org/help/Catalogue/entries/gfsdidot.html
+ .. _CM LGC: http://mirror.ctan.org/help/Catalogue/entries/cm-lgc.html
+ .. _ParaType: http://mirror.ctan.org/help/Catalogue/entries/paratype.html
diff --git a/Master/texmf-dist/doc/latex/substitutefont/README.html b/Master/texmf-dist/doc/latex/substitutefont/README.html
index cc1908436bd..201dc3c5b18 100644
--- a/Master/texmf-dist/doc/latex/substitutefont/README.html
+++ b/Master/texmf-dist/doc/latex/substitutefont/README.html
@@ -3,686 +3,12 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.9: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.10: http://docutils.sourceforge.net/" />
<title>Combine font families</title>
-<meta name="date" content="Last revised 2012-04-30" />
+<meta name="date" content="Last revised 2012-07-05" />
<meta name="copyright" content="© 2011 Günter Milde &lt;milde&#64;users.sf.net&gt;" />
-<style type="text/css">
-
-/*
-:Author: David Goodger (goodger@python.org)
-:Id: $Id: html4css1.css 7056 2011-06-17 10:50:48Z milde $
-:Copyright: This stylesheet has been placed in the public domain.
-
-Default cascading style sheet for the HTML output of Docutils.
-
-See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
-customize this style sheet.
-*/
-
-/* used to remove borders from tables and images */
-.borderless, table.borderless td, table.borderless th {
- border: 0 }
-
-table.borderless td, table.borderless th {
- /* Override padding for "table.docutils td" with "! important".
- The right padding separates the table cells. */
- padding: 0 0.5em 0 0 ! important }
-
-.first {
- /* Override more specific margin styles with "! important". */
- margin-top: 0 ! important }
-
-.last, .with-subtitle {
- margin-bottom: 0 ! important }
-
-.hidden {
- display: none }
-
-a.toc-backref {
- text-decoration: none ;
- color: black }
-
-blockquote.epigraph {
- margin: 2em 5em ; }
-
-dl.docutils dd {
- margin-bottom: 0.5em }
-
-object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
- overflow: hidden;
-}
-
-/* Uncomment (and remove this text!) to get bold-faced definition list terms
-dl.docutils dt {
- font-weight: bold }
-*/
-
-div.abstract {
- margin: 2em 5em }
-
-div.abstract p.topic-title {
- font-weight: bold ;
- text-align: center }
-
-div.admonition, div.attention, div.caution, div.danger, div.error,
-div.hint, div.important, div.note, div.tip, div.warning {
- margin: 2em ;
- border: medium outset ;
- padding: 1em }
-
-div.admonition p.admonition-title, div.hint p.admonition-title,
-div.important p.admonition-title, div.note p.admonition-title,
-div.tip p.admonition-title {
- font-weight: bold ;
- font-family: sans-serif }
-
-div.attention p.admonition-title, div.caution p.admonition-title,
-div.danger p.admonition-title, div.error p.admonition-title,
-div.warning p.admonition-title {
- color: red ;
- font-weight: bold ;
- font-family: sans-serif }
-
-/* Uncomment (and remove this text!) to get reduced vertical space in
- compound paragraphs.
-div.compound .compound-first, div.compound .compound-middle {
- margin-bottom: 0.5em }
-
-div.compound .compound-last, div.compound .compound-middle {
- margin-top: 0.5em }
-*/
-
-div.dedication {
- margin: 2em 5em ;
- text-align: center ;
- font-style: italic }
-
-div.dedication p.topic-title {
- font-weight: bold ;
- font-style: normal }
-
-div.figure {
- margin-left: 2em ;
- margin-right: 2em }
-
-div.footer, div.header {
- clear: both;
- font-size: smaller }
-
-div.line-block {
- display: block ;
- margin-top: 1em ;
- margin-bottom: 1em }
-
-div.line-block div.line-block {
- margin-top: 0 ;
- margin-bottom: 0 ;
- margin-left: 1.5em }
-
-div.sidebar {
- margin: 0 0 0.5em 1em ;
- border: medium outset ;
- padding: 1em ;
- background-color: #ffffee ;
- width: 40% ;
- float: right ;
- clear: right }
-
-div.sidebar p.rubric {
- font-family: sans-serif ;
- font-size: medium }
-
-div.system-messages {
- margin: 5em }
-
-div.system-messages h1 {
- color: red }
-
-div.system-message {
- border: medium outset ;
- padding: 1em }
-
-div.system-message p.system-message-title {
- color: red ;
- font-weight: bold }
-
-div.topic {
- margin: 2em }
-
-h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
-h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
- margin-top: 0.4em }
-
-h1.title {
- text-align: center }
-
-h2.subtitle {
- text-align: center }
-
-hr.docutils {
- width: 75% }
-
-img.align-left, .figure.align-left, object.align-left {
- clear: left ;
- float: left ;
- margin-right: 1em }
-
-img.align-right, .figure.align-right, object.align-right {
- clear: right ;
- float: right ;
- margin-left: 1em }
-
-img.align-center, .figure.align-center, object.align-center {
- display: block;
- margin-left: auto;
- margin-right: auto;
-}
-
-.align-left {
- text-align: left }
-
-.align-center {
- clear: both ;
- text-align: center }
-
-.align-right {
- text-align: right }
-
-/* reset inner alignment in figures */
-div.align-right {
- text-align: inherit }
-
-/* div.align-center * { */
-/* text-align: left } */
-
-ol.simple, ul.simple {
- margin-bottom: 1em }
-
-ol.arabic {
- list-style: decimal }
-
-ol.loweralpha {
- list-style: lower-alpha }
-
-ol.upperalpha {
- list-style: upper-alpha }
-
-ol.lowerroman {
- list-style: lower-roman }
-
-ol.upperroman {
- list-style: upper-roman }
-
-p.attribution {
- text-align: right ;
- margin-left: 50% }
-
-p.caption {
- font-style: italic }
-
-p.credits {
- font-style: italic ;
- font-size: smaller }
-
-p.label {
- white-space: nowrap }
-
-p.rubric {
- font-weight: bold ;
- font-size: larger ;
- color: maroon ;
- text-align: center }
-
-p.sidebar-title {
- font-family: sans-serif ;
- font-weight: bold ;
- font-size: larger }
-
-p.sidebar-subtitle {
- font-family: sans-serif ;
- font-weight: bold }
-
-p.topic-title {
- font-weight: bold }
-
-pre.address {
- margin-bottom: 0 ;
- margin-top: 0 ;
- font: inherit }
-
-pre.literal-block, pre.doctest-block, pre.math {
- margin-left: 2em ;
- margin-right: 2em }
-
-span.classifier {
- font-family: sans-serif ;
- font-style: oblique }
-
-span.classifier-delimiter {
- font-family: sans-serif ;
- font-weight: bold }
-
-span.interpreted {
- font-family: sans-serif }
-
-span.option {
- white-space: nowrap }
-
-span.pre {
- white-space: pre }
-
-span.problematic {
- color: red }
-
-span.section-subtitle {
- /* font-size relative to parent (h1..h6 element) */
- font-size: 80% }
-
-table.citation {
- border-left: solid 1px gray;
- margin-left: 1px }
-
-table.docinfo {
- margin: 2em 4em }
-
-table.docutils {
- margin-top: 0.5em ;
- margin-bottom: 0.5em }
-
-table.footnote {
- border-left: solid 1px black;
- margin-left: 1px }
-
-table.docutils td, table.docutils th,
-table.docinfo td, table.docinfo th {
- padding-left: 0.5em ;
- padding-right: 0.5em ;
- vertical-align: top }
-
-table.docutils th.field-name, table.docinfo th.docinfo-name {
- font-weight: bold ;
- text-align: left ;
- white-space: nowrap ;
- padding-left: 0 }
-
-h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
-h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
- font-size: 100% }
-
-ul.auto-toc {
- list-style-type: none }
-
-</style>
-<style type="text/css">
-
-/* html4css2.css: Cascading style sheet for Docutils' html4strict writer. */
-/* */
-/* :Author: Günter Milde */
-/* :Copyright: © 2009 Günter Milde. */
-/* Released without warranties or conditions of any kind */
-/* under the terms of the Apache License, Version 2.0 */
-/* http://www.apache.org/licenses/LICENSE-2.0 */
-/* */
-/* This stylesheet supplements the Docutils standard style 'html4css1.css'. */
-/* It uses CSS 2.1 elements (supported by up-to-date versions of popular */
-/* browsers). */
-
-/* General rules */
-/* ============= */
-
-body {
- padding: 0 5%;
- margin: 8px 0;
- line-height:1.3;
- /* http://ilovetypography.com/2008/02/28/a-guide-to-web-typography/
- recommends "line-spacing that’s at least 140% of your text size" */
- counter-reset: table;
- /* counter-reset: figure; */
-}
-
-/* avoid long lines --> better reading */
-/* OTOH: lines should not be too short because of missing hyphenation, */
-div.document {
- max-width: 45em;
- margin: auto;
-}
-
-/* separate items except for compact lists */
-dl > dd {
- margin-bottom: 1em;
-}
-.compact li, .compact p, .compact ul, .compact ol
-dl.simple > dd, .simple li, .simple p, .simple ul, .simple ol {
- margin-top: 0;
- margin-bottom: 0;
-/* background: magenta; */
-}
-dl.simple, dl.compact, dl.simple > dd, dl.compact > dd {
- margin-top: 0;
- margin-bottom: 0;
-/* background: lightgreen; */
-}
-
-/* space around paragraphs */
-dl > dd p:first-child {
- margin: 0;
-}
-
-/* Sidebar */
-/* ------- */
-
-div.sidebar {
- margin-right: -5%;
-}
-
-/* Special definition lists */
-/* ======================== */
-
-/* bold definition term on the same line as the label */
-dl.field-list > dt, dl.option-list > dt, dl.docinfo > dt,
-dl.footnote > dt, dl.citation > dt, dl.description > dt {
- clear: left;
- float: left;
- margin: 0;
- padding: 0;
- padding-right: 0.5em;
- font-weight: bold;
-}
-/* except for these */
-dl.option-list > dt, dl.footnote > dt {
- font-weight: normal;
-}
-
-
-
-/* Field Lists */
-/* ----------- */
-
-/* field names followed by a colon */
-dl.field-list > dt:after, dl.docinfo > dt:after {
- content: ":";
-}
-
-/* Offset for field content (corresponds to the --field-name-limit option) */
-dl.field-list > dd {
- margin-left: 9em; /* ca. 14 chars in the test examples */
- padding-left: 0.5em;
-}
-
-/* start field-body on a new line after long field names */
-dl.field-list > dd p {
- width: 100%;
-/* display: inline-block; */
-/* background: yellow; */
-}
-
-dl.field-list > dd > p:first-child,
-/* dl.field-list > dd > ol:first-child, */
-/* dl.field-list > dd > ul:first-child, */
-dl.field-list > dd > dl:first-child {
- display: inline-block;
-}
-
-/* field-list variants:: */
-
-/* example for custom field-name width */
-dl.field-list.narrow > dd {
- margin-left: 5em;
-}
-
-/* start field-body on same line after long field names */
-dl.field-list.run-in > dd p {
- display: block;
-}
-
-/* wrap or truncate long field names */
-dl.field-list.fix-labelwidth > dt {
- width: 8em; /* set to dl.field-list > dd margin-left - padding-left */
- overflow: hidden;
-}
-dl.field-list.fix-labelwidth > dd:after {
- /* a "stopper" to prevent next dd floating up too far */
- content: '';
- display: block;
- clear: left;
-}
-
-/* docinfo */
-
-dl.docinfo > dd {
- margin-left: 8em;
-/* margin-bottom: 0.5em; */
-}
-
-
-/* option list */
-
-dl.option-list {
- margin-left: 1em;
- padding-left: 0;
-}
-
-dl.option-list > dd {
- margin-left: 8em;
- /* margin-bottom: 0.5em; */
-}
-
-/* start description on a new line after long options */
-dl.option-list > dd p {
- width: 100%;
- display: inline-block;
-}
-
-/* footnotes */
-
-a.footnote-reference, a.fn-backref {
- text-decoration: inherit; /* do not underline footnote links */
-}
-
-dl.footnote {
- /* line on the left */
- padding-left: 1ex;
- border-left: solid;
- border-left-width: thin;
- /* border-color: black; */
-}
-
-/* paragraph on same line as backrefs */
-dd > em {
-/* background: green; */
- float: left;
- margin-right: 1ex
-}
-
-
-/*
-Ordered List (Enumeration)
---------------------------
-
-Use counters to replace the deprecated start attribute. Make sure the
-resulting list resembles the list-style 'outside' with a hanging indent.
-*/
-
-/* New ordered list: reset counter, suppress the default label */
-ol {
- counter-reset: item;
- list-style-type: none ! important;
-}
-
-/* Set the negative indent of the list label as feature of the list item */
-ol > li {
- text-indent: -40px; /* Mozillas default indent */
-}
-/* reset for child elements */
-ol > li > * {
- text-indent: 0px;
- text-indent: 0;
- margin-top: 0;
- /* background: lightgreen; */
-}
-
-/* Label */
-ol > li:before {
- /* increment and typeset counter(s), */
- counter-increment: item;
- content: counter(item) ".";
- /* display next to the content (aligned top-right), */
- display: inline-block;
- text-align: right;
- vertical-align: top;
- /* sum must match ol>li {text-indent:} (40px is Mozillas default) */
- width: 35px;
- padding-right: 5px;
-/* background: yellow; */
-}
-
-/* The list item's first line starts next to the label, without indent */
-ol > li > p:first-child,
-ol > li > ol:first-child,
-ol > li > ul:first-child,
-ol > li > dl:first-child {
- display: inline-block;
- /* background: lightblue; */
-}
-
-/* default separator variants */
-ol.loweralpha > li:before {
- content: counter(item, lower-alpha) ")";
-}
-ol.upperalpha > li:before {
- content: counter(item, upper-alpha) ".";
-}
-ol.lowerroman > li:before {
- content: "(" counter(item, lower-roman) ")";
-}
-ol.upperroman > li:before {
- content: counter(item, upper-roman) ")";
-}
-/* nested counters (1, 1.1, 1.1.1, etc) */
-/* nested enumerated lists "inherit" the class attribute, other lists not */
-ol.nested > li:before, ol.nested ol > li:before {
- content: counters(item, ".") " ";
-}
-
-/* lists nested in definition list */
-
-dd > ul, dd > ol {
- padding-left: 0pt;
-
-/* TODO: prefix, suffix? */
-
-/* smaller font for super- and subscripts */
-/* sub, sup {font-size: 70%;} */ /* Mozilla default is `smaller` */
-
-
-/* Tables */
-/* ====== */
-
-/* margins and borders for "normal" tables */
-table {
- margin-top: 0.5em ;
- margin-bottom: 0.5em;
-/* border-style: outset; */
- border-style: solid;
- border-color: silver;
- border-width: thin;
- border-collapse: collapse;
-}
-blockquote > table {
- margin-top: 0em ;
- margin-bottom: 0em;
-}
-
-td, th {
- border-style: solid;
- border-width: thin;
- border-color: silver;
- /* text-align: left; */
- padding: 0 1ex;
-}
-
-td > p:first-child, th > p:first-child {
- margin-top: 0;
-}
-td > p, th > p {
- margin-bottom: 0;
-}
-
-/* no borders for "borderless" tables */
-table.borderless, table.borderless * {
- border-style: none;
-}
-
-/* "booktabs" style (no vertical lines) */
-table.booktabs {
- border: 0;
- border-top: 2px solid;
- border-bottom: 2px solid;
-}
-
-table.booktabs * {
- border: 0;
-}
-table.booktabs th {
- border-bottom: thin solid;
-}
-
-table > caption {
- text-align: left;
-/* padding: 2em 0 1em 0; */
-}
-
-/* numbered tables*/
-table.numbered > caption:before {
- counter-increment: table; /* defined/re-set in body */
- content: "Table " counter(table) ": ";
- font-weight: bold;
-}
-
-
-/* literal text
- ------------
-*/
-/* whitespace and wrapping in inline literals */
-/* possible values: normal, nowrap, pre, pre-wrap, pre-line */
-tt.literal {
- white-space: pre-wrap;
-}
-
-/* /* compensate for initial line-break (which is literal with XHTML 1.1) */ */
-/* pre.literal-block, pre.doctest-block { */
-/* margin-top: 0em ; */
-/* } */
-
-/* Table of Contents */
-
-/* don't indent like a topic */
-div.topic.contents {
- margin: 0;
-}
-/* div.topic.contents ul { */
-/* list-style: none; */
-/* } */
-
-div.topic.contents a {
- text-decoration: none; /* no underline for links */
-}
-
-/* section numbers */
-
-span.sectnum {
- padding-right: 1ex;
-}
-
-/* admonitions */
-
-/* no padding for top and bottom */
-div.admonition, div.attention, div.caution, div.danger, div.error,
-div.hint, div.important, div.note, div.tip, div.warning {
- padding: 0px 1em }
-
-</style>
+<link rel="stylesheet" href="../../../../Python/docutils-svn/docutils/docutils/writers/html4strict/html4css1.css" type="text/css" />
+<link rel="stylesheet" href="../../../../Python/docutils-svn/docutils/docutils/writers/html4strict/html4css2.css" type="text/css" />
</head>
<body>
<div class="document" id="combine-font-families">
@@ -690,7 +16,7 @@ div.hint, div.important, div.note, div.tip, div.warning {
<dl class="docinfo simple">
<dt class="date">Date</dt>
-<dd class="date">Last revised 2012-04-30</dd>
+<dd class="date">Last revised 2012-07-05</dd>
<dt class="copyright">Copyright</dt>
<dd class="copyright">© 2011 Günter Milde &lt;<a class="reference external" href="mailto:milde&#64;users.sf.net">milde&#64;users.sf.net</a>&gt;</dd>
<dt>Contributor</dt>
@@ -711,32 +37,30 @@ or the creators preference.</p>
family as substitute for another one in a specified font encoding.</p>
<dl class="docutils">
<dt>Example:</dt>
-<dd><p>Use the <cite>txtt</cite> font family from <a class="reference external" href="http://mirror.ctan.org/help/Catalogue/entries/txfonts.html">txfonts</a> instead of CM for
-monospaced text (enables monospaced-bold as well as
-monospaced-italic):</p>
-<pre class="literal-block">\usepackage{substitutefont}
-\substitutefont{T1}{txtt}{cmtt}
+<dd><p>Palatino with the standard package <cite>mathpazo</cite> for Latin and
+<a class="reference external" href="http://mirror.ctan.org/help/Catalogue/entries/gfsdidot.html">GFS Didot</a> for Greek:</p>
+<pre class="literal-block">\usepackage[sc,slantedGreek]{mathpazo}
+\substitutefont{LGR}{pplx}{udidot}
</pre>
</dd>
<dt>Source</dt>
-<dd><p><a class="reference external" href="substitutefont.sty">substitutefont.sty</a>, <a class="reference external" href="substitutefont.sty.xhtml">substitutefont.sty.xhtml</a></p>
+<dd><p><a class="reference external" href="substitutefont.sty">substitutefont.sty</a>, <a class="reference external" href="substitutefont.sty.html">substitutefont.sty.html</a></p>
</dd>
-<dt><span class="target" id="tests">Tests</span></dt>
+<dt>Tests</dt>
<dd><ul class="simple">
-<li><p>CB-Fonts for Greek text in a document using Times/Helvetica/Courier:
-<a class="reference external" href="test-greek.tex">test-greek.tex</a>, <a class="reference external" href="test-greek.pdf">test-greek.pdf</a></p></li>
-<li><p>TeX-Gyre with Cyrillic from the once included <cite>Freefonts</cite>:
-<a class="reference external" href="test-cyrillic.tex">test-cyrillic.tex</a>, <a class="reference external" href="test-cyrillic.pdf">test-cyrillic.pdf</a></p></li>
-<li><p>Monospaced text in many variants with txtt:
-<a class="reference external" href="test-txtt.tex">test-txtt.tex</a>, <a class="reference external" href="test-txtt.pdf">test-txtt.pdf</a></p></li>
+<li><p>Palatino wiht Greek from <a class="reference external" href="http://mirror.ctan.org/help/Catalogue/entries/gfsdidot.html">GFS Didot</a>:
+<a class="reference external" href="greek-palatino-didot.tex">greek-palatino-didot.tex</a>, <a class="reference external" href="greek-palatino-didot.pdf">greek-palatino-didot.pdf</a></p></li>
+<li><p>Latin Modern with Cyrillic from <a class="reference external" href="http://mirror.ctan.org/help/Catalogue/entries/cm-lgc.html">CM LGC</a>:
+<a class="reference external" href="cyrillic-times-paratype.tex">cyrillic-times-paratype.tex</a>, <a class="reference external" href="cyrillic-times-paratype.pdf">cyrillic-times-paratype.pdf</a></p></li>
+<li><p><cite>TeX-Gyre</cite> with Cyrillic from <a class="reference external" href="http://mirror.ctan.org/help/Catalogue/entries/paratype.html">ParaType</a>:
+<a class="reference external" href="cyrillic-times-paratype.tex">cyrillic-times-paratype.tex</a>, <a class="reference external" href="cyrillic-times-paratype.pdf">cyrillic-times-paratype.pdf</a></p></li>
</ul>
</dd>
-</dl>
-<p>References:</p>
-<blockquote>
-<p><a class="reference external" href="http://mirror.ctan.org/macros/latex/doc/fntguide.pdf">LaTeX2e font selection</a></p>
+<dt>References:</dt>
+<dd><p><a class="reference external" href="http://mirror.ctan.org/macros/latex/doc/fntguide.pdf">LaTeX2e font selection</a></p>
<p><a class="reference external" href="http://mirror.ctan.org/macros/latex/doc/encguide.pdf">LaTeX font encodings</a></p>
-</blockquote>
+</dd>
+</dl>
</div>
</body>
</html>
diff --git a/Master/texmf-dist/doc/latex/substitutefont/cyrillic-lm-lgc.pdf b/Master/texmf-dist/doc/latex/substitutefont/cyrillic-lm-lgc.pdf
new file mode 100644
index 00000000000..4a3b7b5eea8
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/substitutefont/cyrillic-lm-lgc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/substitutefont/cyrillic-lm-lgc.tex b/Master/texmf-dist/doc/latex/substitutefont/cyrillic-lm-lgc.tex
new file mode 100644
index 00000000000..9ad795778c0
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/substitutefont/cyrillic-lm-lgc.tex
@@ -0,0 +1,50 @@
+\documentclass[a4paper,russian]{scrartcl}
+% generated by Docutils <http://docutils.sourceforge.net/>
+\usepackage{fixltx2e} % LaTeX patches, \textsubscript
+\usepackage{cmap} % fix search and cut-and-paste in Acrobat
+\usepackage[T1,T2A]{fontenc}
+\usepackage[utf8]{inputenc}
+\usepackage[english,russian]{babel}
+\usepackage{hyperref}
+
+\usepackage{substitutefont}
+
+% Combine "Latin Modern" fonts for Latin and
+% "CLG" fonts for Cyrillic.
+
+\usepackage{lmodern}
+\substitutefont{T2A}{lmr}{fcm}
+\substitutefont{T2A}{lmss}{fcs}
+\substitutefont{T2A}{lmtt}{fct}
+
+\begin{document}
+
+\section*{Cyrillic fonts to match Latin Modern}
+
+Latin Modern does not work for the Cyrillic script. If the CM-Super package
+is installed, it will be used instead. If not, bitmapped LM fonts are used
+for cyrillic text. The \emph{cmlgc} package provides free Cyrillic
+vector-fonts matching CM.
+
+\section{Заголовок}
+
+первый пример: \glqq{}Здравствуй, мир!\grqq{}
+
+\texttt{"Здравствуй, мир!"}
+
+\section{section title in latin script}
+
+Babel does not switch the font encoding when changing between Russian and
+English. As a standard font encoding, T2A provides basic Latin. However,
+the TeX Gyre fonts provide better support for accented Latin letters
+(compare the result of drag-and-drop of the following lines from the PDF
+rendering).
+
+\selectlanguage{english}
+
+T2A \glqq{}Viele Grüße!\grqq{} \texttt{"Hello world!"}
+
+\fontencoding{T1}\selectfont
+T1 \glqq{}Viele Grüße!\grqq{} \texttt{"Hello world!"}
+
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/substitutefont/cyrillic-times-paratype.pdf b/Master/texmf-dist/doc/latex/substitutefont/cyrillic-times-paratype.pdf
new file mode 100644
index 00000000000..d03405109e9
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/substitutefont/cyrillic-times-paratype.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/substitutefont/cyrillic-times-paratype.tex b/Master/texmf-dist/doc/latex/substitutefont/cyrillic-times-paratype.tex
new file mode 100644
index 00000000000..2f721180e48
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/substitutefont/cyrillic-times-paratype.tex
@@ -0,0 +1,63 @@
+\documentclass[a4paper,russian]{scrartcl}
+% generated by Docutils <http://docutils.sourceforge.net/>
+\usepackage{fixltx2e} % LaTeX patches, \textsubscript
+\usepackage{cmap} % fix search and cut-and-paste in Acrobat
+\usepackage[T1,T2A]{fontenc}
+\usepackage[utf8]{inputenc}
+\usepackage[english,russian]{babel}
+\usepackage{hyperref}
+
+\usepackage{substitutefont}
+
+% Combine "TeX Gyre" fonts for Latin and
+% "ParaType" fonts for Cyrillic.
+
+\usepackage{tgtermes}
+\substitutefont{T2A}{qtm}{PTSerif-TLF}
+
+\usepackage[scale=.90]{tgheros}
+\substitutefont{T2A}{qhv}{PTSans-TLF}
+
+\usepackage[matchuppercase]{tgcursor}
+% \substitutefont{T2A}{qcr}{PTMono-TLF}
+%
+% !pdfTeX error: pdflatex (file PTMono-Regular-tlf-t2a--base): Font PTMono-Regula
+% r-tlf-t2a--base at 657 not found
+% ==> Fatal error occurred, no output PDF file produced!
+
+% Dejavu Sans Mono works but is not the best match for Courier:
+\substitutefont{T2A}{qcr}{DejaVuSansMono-TLF}
+% use it for all teletyped text until PTMono gets fixed
+\renewcommand*{\ttdefault}{DejaVuSansMono-TLF}
+
+\begin{document}
+
+\section*{Cyrillic fonts to match Times}
+
+TeX-compatible Cyrillic extensions to the URW standard Postscript fonts by
+Valek Filippov were part of TeXGyre but removed due to license
+incompatibility. You may use the free cyrillic fonts from the
+\emph{paratype} package instead.
+
+\section{Заголовок}
+
+первый пример: \glqq{}Здравствуй, мир!\grqq{}
+
+\texttt{"Здравствуй, мир!"}
+
+\section{section title in latin script}
+
+Babel does not switch the font encoding when changing between Russian and
+English. As a standard font encoding, T2A provides basic Latin. However,
+the TeX Gyre fonts provide better support for accented Latin letters
+(compare the result of drag-and-drop of the following lines from the PDF
+rendering).
+
+\selectlanguage{english}
+
+T2A \glqq{}Viele Grüße!\grqq{} \texttt{"Hello world!"}
+
+\fontencoding{T1}\selectfont
+T1 \glqq{}Viele Grüße!\grqq{} \texttt{"Hello world!"}
+
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/substitutefont/greek-palatino-didot.pdf b/Master/texmf-dist/doc/latex/substitutefont/greek-palatino-didot.pdf
new file mode 100644
index 00000000000..031991e82b0
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/substitutefont/greek-palatino-didot.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/substitutefont/greek-palatino-didot.tex b/Master/texmf-dist/doc/latex/substitutefont/greek-palatino-didot.tex
new file mode 100644
index 00000000000..10ac0969a56
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/substitutefont/greek-palatino-didot.tex
@@ -0,0 +1,61 @@
+% Example and test for the substitutefont package:
+\documentclass{article}
+\usepackage{parskip}
+\usepackage[LGR,T1]{fontenc}
+\usepackage[utf8]{inputenc}
+
+\usepackage{substitutefont}
+
+% Serif
+\usepackage[sc,slantedGreek]{mathpazo}
+\substitutefont{LGR}{pplx}{udidot}
+
+% Sans
+\renewcommand*\sfdefault{uop}
+\substitutefont{LGR}{uop}{neohellenic}
+
+% Monospaced
+\renewcommand*{\ttdefault}{txtt} % from txtt package
+\substitutefont{LGR}{txtt}{cmtt} % CB fonts
+
+
+% Teststring
+\newcommand{\alphabet}{%
+ abcdefghjiklmnoprqrstuvwxyzäöüß
+ {\fontencoding{LGR}\selectfont abgdezhjiklmnxoprsctufqyw} \\
+ ABCDEFGHJIKLMNOPRQRSTUVWXYZÄÖÜ
+ {\fontencoding{LGR}\selectfont ABGDEZHJIKLMNXOPRSTUFQYW}
+}
+
+\begin{document}
+
+Palatino/Optima/txtt with Didot/Neohellenic/CB for Greek text.
+
+\begin{description}
+ \item [Normal:] \alphabet
+
+ \item [it:] \textit{\alphabet}
+
+ \item [sl:] \textsl{\alphabet}
+
+ \item [bf:] \textbf{\alphabet}
+
+ \item [bf it:] \textbf{\textit\alphabet}
+
+ \item [sc:] \textsc{\alphabet}
+
+ % \item [bf sc:] \textsc{\textbf\alphabet} missing in Didot
+
+ \item [sf:] \textsf{\alphabet}
+
+ \item [sf bf:] \textsf{\textbf\alphabet}
+
+ \item [sf sl:] \textsf{\textsl\alphabet}
+
+ \item [sf sc:] \textsf{\textsc\alphabet}
+
+ \item [tt:] \texttt{\alphabet}
+
+\end{description}
+
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/substitutefont/greek-times-bodoni.pdf b/Master/texmf-dist/doc/latex/substitutefont/greek-times-bodoni.pdf
new file mode 100644
index 00000000000..8d427490218
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/substitutefont/greek-times-bodoni.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/substitutefont/greek-times-bodoni.tex b/Master/texmf-dist/doc/latex/substitutefont/greek-times-bodoni.tex
new file mode 100644
index 00000000000..95a81a0381a
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/substitutefont/greek-times-bodoni.tex
@@ -0,0 +1,60 @@
+% Example and test for the substitutefont package:
+\documentclass{article}
+\usepackage{parskip}
+\usepackage[LGR,T1]{fontenc}
+\usepackage[utf8]{inputenc}
+
+\usepackage{substitutefont}
+
+% Serif
+\usepackage{newtxtext}
+\substitutefont{LGR}{ntxr}{bodoni}
+
+% Sans
+% \renewcommand*\sfdefault{uop}
+\substitutefont{LGR}{ntxss}{neohellenic}
+
+% Monospaced
+\substitutefont{LGR}{ntxtt}{cmtt} % CB fonts
+
+
+% Teststring
+\newcommand{\alphabet}{%
+ abcdefghjiklmnoprqrstuvwxyzäöüß
+ {\fontencoding{LGR}\selectfont abgdezhjiklmnxoprsctufqyw} \\
+ ABCDEFGHJIKLMNOPRQRSTUVWXYZÄÖÜ
+ {\fontencoding{LGR}\selectfont ABGDEZHJIKLMNXOPRSTUFQYW}
+}
+
+\begin{document}
+
+Times (newtx) with GFS Bodoni, GFS Neohellenic, and CB for Greek text.
+
+\begin{description}
+ \item [Normal:] \alphabet
+
+ \item [it:] \textit{\alphabet}
+
+ \item [sl:] \textsl{\alphabet}
+
+ \item [bf:] \textbf{\alphabet}
+
+ \item [bf it:] \textbf{\textit\alphabet}
+
+ \item [sc:] \textsc{\alphabet}
+
+ % \item [bf sc:] \textsc{\textbf\alphabet} missing in Bodoni
+
+ \item [sf:] \textsf{\alphabet}
+
+ \item [sf bf:] \textsf{\textbf\alphabet}
+
+ \item [sf sl:] \textsf{\textsl\alphabet}
+
+ \item [sf sc:] \textsf{\textsc\alphabet}
+
+ \item [tt:] \texttt{\alphabet}
+
+\end{description}
+
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/substitutefont/substitutefont.pdf b/Master/texmf-dist/doc/latex/substitutefont/substitutefont.pdf
deleted file mode 100644
index 2a1910aed82..00000000000
--- a/Master/texmf-dist/doc/latex/substitutefont/substitutefont.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/substitutefont/substitutefont.sty.xhtml b/Master/texmf-dist/doc/latex/substitutefont/substitutefont.sty.html
index 30089a11a63..82c74c2ac74 100644
--- a/Master/texmf-dist/doc/latex/substitutefont/substitutefont.sty.xhtml
+++ b/Master/texmf-dist/doc/latex/substitutefont/substitutefont.sty.html
@@ -3,11 +3,11 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.9: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.10: http://docutils.sourceforge.net/" />
<title>Easy font substitution</title>
<meta name="copyright" content="© 2010 Günter Milde" />
-<link rel="stylesheet" href="../../../../Python/docutils-svn/docutils/docutils/writers/html4strict/html4css1.css" type="text/css" />
-<link rel="stylesheet" href="../../../../Python/docutils-svn/docutils/docutils/writers/html4strict/html4css2.css" type="text/css" />
+<link rel="stylesheet" href="../../../../Code/Python/docutils-svn/docutils/docutils/writers/html4strict/html4css1.css" type="text/css" />
+<link rel="stylesheet" href="../../../../Code/Python/docutils-svn/docutils/docutils/writers/html4strict/html4css2.css" type="text/css" />
</head>
<body>
<div class="document" id="easy-font-substitution">
@@ -28,7 +28,7 @@ version&nbsp;1.3 of this license or any later version.</p>
<dt>Identification</dt>
<dd><pre class="literal-block">\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{substitutefont}
-[2012/04/30 v0.1.1 combine font families]
+[2012/07/07 v0.1.3 combine font families]
</pre>
</dd>
</dl>
@@ -54,6 +54,14 @@ substitute fonts for specified font encodings.</p>
<td><p>0.1.1</p></td>
<td><p>documentation update, upload to CTAN</p></td>
</tr>
+<tr><td><p>2012-07-05</p></td>
+<td><p>0.1.2</p></td>
+<td><p>documentation/example update</p></td>
+</tr>
+<tr><td><p>2012-07-07</p></td>
+<td><p>0.1.3</p></td>
+<td><p>bugfix (comment usage example)</p></td>
+</tr>
</tbody>
</table>
</dd>
@@ -66,10 +74,11 @@ encoding is &lt;encoding&gt; in the variants &quot;normal&quot;, &quot;italic&qu
and &quot;small-caps&quot; and the shapes &quot;medium&quot;, &quot;bold&quot;, and &quot;bold-extended&quot;.</p>
<dl class="docutils">
<dt>Example:</dt>
-<dd><p>Use the <cite>txtt</cite> font family from <a class="reference external" href="http://mirror.ctan.org/help/Catalogue/entries/txfonts.html">txfonts</a> instead of CM for
-monospaced text (enables monospaced-bold as well as
-monospaced-italic):</p>
-<p><tt class="literal"><span class="pre">\substitutefont{T1}{txtt}{cmtt}</span></tt></p>
+<dd><p>Palatino with the standard package <cite>mathpazo</cite> for Latin and
+<a class="reference external" href="http://mirror.ctan.org/help/Catalogue/entries/gfsdidot.html">GFS Didot</a> for Greek:</p>
+<pre class="code latex literal-block"><span class="k">\usepackage</span><span class="na">[sc,slantedGreek]</span><span class="nb">{</span>mathpazo<span class="nb">}</span>
+<span class="k">\substitutefont</span><span class="nb">{</span>LGR<span class="nb">}{</span>pplx<span class="nb">}{</span>udidot<span class="nb">}</span>
+</pre>
</dd>
</dl>
</div>
diff --git a/Master/texmf-dist/doc/latex/substitutefont/substitutefont.sty.txt b/Master/texmf-dist/doc/latex/substitutefont/substitutefont.sty.txt
new file mode 100644
index 00000000000..6d93be456cd
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/substitutefont/substitutefont.sty.txt
@@ -0,0 +1,77 @@
+Easy font substitution
+**********************
+
+:Copyright: © 2010 Günter Milde
+
+:Contributor: Special thanks to Ulrike Fischer who provided
+ the indirect definition with active ``\nfss@catcodes``.
+
+:Licence: 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 any later version.
+
+:Abstract: Provide the ``\substitutefont`` macro for defining
+ substitute fonts for specified font encodings.
+
+:Identification:
+ ::
+
+ \NeedsTeXFormat{LaTeX2e}
+ \ProvidesPackage{substitutefont}
+ [2012/07/07 v0.1.3 combine font families]
+
+Changelog:
+ .. class:: borderless
+
+ ============ ===== =================================================
+ 2010-11-04 0.1 initial version
+ 2012-04-30 0.1.1 documentation update, upload to CTAN
+ 2012-07-05 0.1.2 documentation/example update
+ 2012-07-07 0.1.3 bugfix (comment usage example)
+ ============ ===== =================================================
+
+
+Usage
+=====
+
+The macro ``\substitutefont{<encoding>}{<family>}{<new-family>}``
+selects the font <new-family> as replacement for <family> if the font
+encoding is <encoding> in the variants "normal", "italic", "slanted",
+and "small-caps" and the shapes "medium", "bold", and "bold-extended".
+
+Example:
+ Palatino with the standard package `mathpazo` for Latin and
+ `GFS Didot`_ for Greek:
+
+ .. code:: latex
+
+ \usepackage[sc,slantedGreek]{mathpazo}
+ \substitutefont{LGR}{pplx}{udidot}
+
+
+Implementation
+==============
+::
+
+ \begingroup
+ \nfss@catcodes
+ \newcommand*{\substitutefont}[3]{%
+ \DeclareFontFamily{#1}{#2}{}
+ \DeclareFontShape{#1}{#2}{m}{n}{<->ssub * #3/m/n}{}
+ \DeclareFontShape{#1}{#2}{m}{it}{<->ssub * #3/m/it}{}
+ \DeclareFontShape{#1}{#2}{m}{sl}{<->ssub * #3/m/sl}{}
+ \DeclareFontShape{#1}{#2}{m}{sc}{<->ssub * #3/m/sc}{}
+ \DeclareFontShape{#1}{#2}{b}{n}{<->ssub * #3/b/n}{}
+ \DeclareFontShape{#1}{#2}{b}{it}{<->ssub * #3/b/it}{}
+ \DeclareFontShape{#1}{#2}{b}{sl}{<->ssub * #3/b/sl}{}
+ \DeclareFontShape{#1}{#2}{b}{sc}{<->ssub * #3/b/sc}{}
+ \DeclareFontShape{#1}{#2}{bx}{n}{<->ssub * #3/bx/n}{}
+ \DeclareFontShape{#1}{#2}{bx}{it}{<->ssub * #3/bx/it}{}
+ \DeclareFontShape{#1}{#2}{bx}{sl}{<->ssub * #3/bx/sl}{}
+ \DeclareFontShape{#1}{#2}{bx}{sc}{<->ssub * #3/bx/sc}{}
+ }
+ \global\let\substitutefont\substitutefont
+ \endgroup
+
+.. _LaTeX Project Public License: http://www.latex-project.org/lppl.txt
+.. _GFS Didot: http://mirror.ctan.org/help/Catalogue/entries/gfsdidot.html
diff --git a/Master/texmf-dist/doc/latex/substitutefont/test-cyrillic.pdf b/Master/texmf-dist/doc/latex/substitutefont/test-cyrillic.pdf
deleted file mode 100644
index 083ed783606..00000000000
--- a/Master/texmf-dist/doc/latex/substitutefont/test-cyrillic.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/substitutefont/test-cyrillic.tex b/Master/texmf-dist/doc/latex/substitutefont/test-cyrillic.tex
deleted file mode 100644
index 81cfcafa681..00000000000
--- a/Master/texmf-dist/doc/latex/substitutefont/test-cyrillic.tex
+++ /dev/null
@@ -1,53 +0,0 @@
-\documentclass[a4paper,russian]{scrartcl}
-% generated by Docutils <http://docutils.sourceforge.net/>
-\usepackage{fixltx2e} % LaTeX patches, \textsubscript
-\usepackage{cmap} % fix search and cut-and-paste in Acrobat
-\usepackage{substitutefont}
-\usepackage[T1,T2A]{fontenc}
-\usepackage[utf8]{inputenc}
-\usepackage[english,russian]{babel}
-
-% PDF Standard Fonts
-\usepackage{tgtermes}
-\usepackage[scale=.90]{tgheros}
-\usepackage[matchuppercase]{tgcursor}
-
-% Cyrillic with "Freefonts"
-\substitutefont{T2A}{qtm}{ftm}
-\substitutefont{T2A}{qhv}{fhv}
-\substitutefont{T2A}{qcr}{fcr}
-
-% hyperlinks:
-\usepackage[colorlinks=true,linkcolor=blue,urlcolor=blue]{hyperref}
-
-\begin{document}
-
-TeX-compatible Cyrillic extensions to the URW standard Postscript fonts by
-Valek Filippov were part of TeXGyre but removed due to license
-incompatibility. On Debian, they are still available in the package
-\emph{scalable-cyrfonts-tex}.
-
-% Attention: there is a font name clash with the \emph{fouriernc} package, as
-% both use \texttt{fnc} for \emph{Free/Fourier New Century Schoolbook}.
-
-\section*{Заголовок%
- \phantomsection%
- \addcontentsline{toc}{section}{Заголовок}%
- \label{id1}%
-}
-
-первый пример: \glqq{}Здравствуй, мир!\grqq{}
-
-\texttt{"Здравствуй, мир!"}
-
-\section*{Title%
- \phantomsection%
- \addcontentsline{toc}{section}{Title}%
- \label{title}%
-}
-
-\otherlanguage{english}{first example: \glqq{}Hello world!\grqq{}.
-
-\texttt{"Hello world!\glqq}
-
-\end{document}
diff --git a/Master/texmf-dist/doc/latex/substitutefont/test-greek.pdf b/Master/texmf-dist/doc/latex/substitutefont/test-greek.pdf
deleted file mode 100644
index 2754730d644..00000000000
--- a/Master/texmf-dist/doc/latex/substitutefont/test-greek.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/substitutefont/test-greek.tex b/Master/texmf-dist/doc/latex/substitutefont/test-greek.tex
deleted file mode 100644
index 247592d9967..00000000000
--- a/Master/texmf-dist/doc/latex/substitutefont/test-greek.tex
+++ /dev/null
@@ -1,53 +0,0 @@
-% Example and test for the substitutefont package:
-\documentclass{minimal}
-\usepackage{parskip}
-
-\usepackage[LGR,T1]{fontenc}
-\usepackage{mathptmx}
-\usepackage[scaled=.92]{helvet} % scaled to fit Times
-\usepackage{courier}
-
-\usepackage{substitutefont}
-% Use CMR (actually the CB-Fonts) instead of Times/Helvetica/Courier
-% for Greek text (LGR font encoding):
-\substitutefont{LGR}{ptm}{cmr}
-\substitutefont{LGR}{phv}{cmss}
-\substitutefont{LGR}{pcr}{cmtt}
-
-% Teststring
-\newcommand{\alphabet}{{\fontencoding{LGR}\selectfont
-ABGDEZHJIKLMNXOPRSTUFQYW
-abgdezhjiklmnxoprsctufqyw
-}}
-
-\begin{document}
-
-Times/Helvetica/Courier with CB for Greek text. (There are better
-alternatives, but this example shall demonstrate the package without further
-non-standard dependencies.)\\
-
-Normal: \alphabet
-
-Italic: \textit{\alphabet}
-
-Slanted: \textsl{\alphabet}
-
-Bold: \textbf{\alphabet}
-
-Bold Italic: \textbf{\textit\alphabet}
-
-Small-Caps: \textsc{\alphabet}
-
-Bold SC: \textsc{\textbf\alphabet}
-
-Sans-serif: \textsf{\alphabet}
-
-Bold Sans-serif: \textsf{\textbf\alphabet}
-
-Sans-serif Slanted: \textsf{\textsl\alphabet}
-
-Sans-serif SC: \textsf{\textsc\alphabet}
-
-Monospaced: \texttt{\alphabet}
-
-\end{document}
diff --git a/Master/texmf-dist/doc/latex/substitutefont/test-txtt.pdf b/Master/texmf-dist/doc/latex/substitutefont/test-txtt.pdf
deleted file mode 100644
index 82e2363318a..00000000000
--- a/Master/texmf-dist/doc/latex/substitutefont/test-txtt.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/substitutefont/test-txtt.tex b/Master/texmf-dist/doc/latex/substitutefont/test-txtt.tex
deleted file mode 100644
index 43ea44b17f2..00000000000
--- a/Master/texmf-dist/doc/latex/substitutefont/test-txtt.tex
+++ /dev/null
@@ -1,49 +0,0 @@
-% Example and test for the substitutefont package:
-\documentclass{minimal}
-\usepackage{lmodern}
-\usepackage{parskip}
-\usepackage[T1]{fontenc}
-\pagestyle{empty}
-
-\usepackage{substitutefont}
-\substitutefont{T1}{txtt}{cmtt}
-
-% Teststring
-\newcommand{\alphabet}{
-ABGDEZHJIKLMNXOPRSTUFQYW
-abgdezhjiklmnxoprsctufqyw
-}
-
-\begin{document}
-
-The Computer Modern and Latin Modern fonts provide a monospaced font only in
-upright shape. The \emph{txfonts} package comes with a nice monospaced font
-in the common shapes and real small caps.\\
-
-
-Normal: \alphabet
-
-Italic: \textit{\alphabet}
-
-Slanted: \textsl{\alphabet}
-
-Bold: \textbf{\alphabet}
-
-Bold Italic: \textbf{\textit\alphabet}
-
-Small-Caps: \textsc{\alphabet}
-
-Monospaced: \texttt{\alphabet}
-
-Monospaced Bold: \texttt{\textbf \alphabet}
-
-Monospaced Italic: \texttt{\textit \alphabet}
-
-Monospaced Slanted: \texttt{\textsl \alphabet}
-
-Monospaced Bold Slanted: \texttt{\textbf{\textit \alphabet}}
-
-Monospaced Small-Caps: \texttt{\textsc \alphabet}
-
-
-\end{document}
diff --git a/Master/texmf-dist/tex/latex/substitutefont/substitutefont.sty b/Master/texmf-dist/tex/latex/substitutefont/substitutefont.sty
index de22a81abd0..f1a4b18c365 100644
--- a/Master/texmf-dist/tex/latex/substitutefont/substitutefont.sty
+++ b/Master/texmf-dist/tex/latex/substitutefont/substitutefont.sty
@@ -18,7 +18,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{substitutefont}
-[2012/04/30 v0.1.1 combine font families]
+[2012/07/07 v0.1.3 combine font families]
% Changelog:
% .. class:: borderless
@@ -26,6 +26,8 @@
% ============ ===== =================================================
% 2010-11-04 0.1 initial version
% 2012-04-30 0.1.1 documentation update, upload to CTAN
+% 2012-07-05 0.1.2 documentation/example update
+% 2012-07-07 0.1.3 bugfix (comment usage example)
% ============ ===== =================================================
%
%
@@ -38,11 +40,13 @@
% and "small-caps" and the shapes "medium", "bold", and "bold-extended".
%
% Example:
-% Use the `txtt` font family from txfonts_ instead of CM for
-% monospaced text (enables monospaced-bold as well as
-% monospaced-italic):
+% Palatino with the standard package `mathpazo` for Latin and
+% `GFS Didot`_ for Greek:
%
-% ``\substitutefont{T1}{txtt}{cmtt}``
+% .. code:: latex
+%
+% \usepackage[sc,slantedGreek]{mathpazo}
+% \substitutefont{LGR}{pplx}{udidot}
%
%
% Implementation
@@ -70,4 +74,4 @@
\endgroup
% .. _LaTeX Project Public License: http://www.latex-project.org/lppl.txt
-% .. _txfonts: http://mirror.ctan.org/help/Catalogue/entries/txfonts.html
+% .. _GFS Didot: http://mirror.ctan.org/help/Catalogue/entries/gfsdidot.html