summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/fdsymbol
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-05-29 22:53:15 +0000
committerKarl Berry <karl@freefriends.org>2012-05-29 22:53:15 +0000
commitbd90e427596eee2b2a2dd4a15b04f6e60239357b (patch)
treef83312e895b098fbbd173f5c4624b8fe42ce7b5c /Master/texmf-dist/source/latex/fdsymbol
parent6ba407cece356e54f1144fc1d9c3fd38a65a2c2e (diff)
fdsymbol (29may12)
git-svn-id: svn://tug.org/texlive/trunk@26722 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/fdsymbol')
-rw-r--r--Master/texmf-dist/source/latex/fdsymbol/fdsymbol.dtx211
-rw-r--r--Master/texmf-dist/source/latex/fdsymbol/fdsymbol.ins4
2 files changed, 157 insertions, 58 deletions
diff --git a/Master/texmf-dist/source/latex/fdsymbol/fdsymbol.dtx b/Master/texmf-dist/source/latex/fdsymbol/fdsymbol.dtx
index 1a5ea5ebe65..ccea7a58d5b 100644
--- a/Master/texmf-dist/source/latex/fdsymbol/fdsymbol.dtx
+++ b/Master/texmf-dist/source/latex/fdsymbol/fdsymbol.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (c) 2011 by Michael Ummels <michael.ummels@rwth-aachen.de>
+% Copyright (c) 2012 by Michael Ummels <michael.ummels@rwth-aachen.de>
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3c
@@ -21,10 +21,10 @@
%
%\iffalse
%<*driver>
-\ProvidesFile{fdsymbol.dtx}[2011/08/28 v0.7 FdSymbol support package]
+\ProvidesFile{fdsymbol.dtx}[2011/11/01 v0.8 FdSymbol support package]
%</driver>
%<style>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-%<style>\ProvidesPackage{fdsymbol}[2011/08/28 v0.7 FdSymbol support package]
+%<style>\ProvidesPackage{fdsymbol}[2011/11/01 v0.8 FdSymbol support package]
%<*driver>
\documentclass[10pt]{ltxdoc}
@@ -38,7 +38,9 @@
\usepackage{fdsymbol}
}
\usepackage{booktabs}
-\usepackage[unicode,bookmarks]{hyperref}
+\usepackage{hypdoc}
+\usepackage{microtype}
+
\hypersetup{
bookmarksnumbered,
colorlinks=false,
@@ -46,13 +48,12 @@
pdftitle={FdSymbol: A Math Symbol Font},
pdfauthor={Michael Ummels}
}
-\usepackage{microtype}
% Restore FdSymbol's Hebrew letters (overwritten by fedraserif.sty)
-\DeclareMathSymbol{\aleph}{0}{symbols}{"C5}
-\DeclareMathSymbol{\beth}{0}{symbols}{"C6}
-\DeclareMathSymbol{\gimel}{0}{symbols}{"C7}
-\DeclareMathSymbol{\daleth}{0}{symbols}{"C8}
+\DeclareMathSymbol{\aleph}{0}{symbols}{"C7}
+\DeclareMathSymbol{\beth}{0}{symbols}{"C8}
+\DeclareMathSymbol{\gimel}{0}{symbols}{"C9}
+\DeclareMathSymbol{\daleth}{0}{symbols}{"CA}
\linespread{1.1}
@@ -70,7 +71,7 @@
%</driver>
%\fi
%
-% \CheckSum{5532}
+% \CheckSum{5703}
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -107,7 +108,7 @@
% to the preamble of your document. This redefines most of the standard
% mathematical symbols and makes available many new ones
% (see Section~\ref{sec:glyphs}). For the available options see
-% Section~\ref{sec:selection}.
+% Section~\ref{sec:options}.
%
% \subsubsection*{Acknowledgements}
%
@@ -123,8 +124,34 @@
% can either load these packages before \pkg{fdsymbol} or you can include the
% options in the |\documentclass| command.
%
+% \section{Options}\label{sec:options}
+%
+% All package options are set using a \meta{key}|=|\meta{value} syntax.
+% Boolean options accept |true| and |false| as values, and setting a Boolean
+% key without a value is equivalent to setting it to |true|.
+% Table~\ref{tab:options} lists all option keys of the \pkg{fdsymbol}
+% package with their possible values; values that are marked with an asterisk
+% correspond to the default behaviour of the package.
+% \begin{table}
+% \centering
+% \begin{tabular}{@{}ll@{}}
+% \toprule
+% Key & Values \\
+% \midrule
+% \opt{normalweight} & \opt{Book}*, \opt{Regular}, \opt{auto} \\
+% \opt{boldweight} & \opt{Medium}*, \opt{Bold}, \opt{auto} \\
+% \opt{scale} & \meta{factor} \\
+% \opt{largedelims} & \opt{true}, \opt{false}* \\
+% \opt{opstyle} & \opt{serif}*, \opt{sans} \\
+% \bottomrule
+% \end{tabular}
+% \caption{\label{tab:options}Summary of options}
+% \end{table}
+%
% \section{Font selection}\label{sec:selection}
%
+% \subsection{Weights}
+%
% FdSymbol comes in four weights, which are (in increasing order) Book,
% Regular, Medium and Bold. Of these, Book and Regular are suitable for normal
% math typesetting, while Medium and Bold can be used for bold math
@@ -139,6 +166,8 @@
% Book weight will be used for normal and large sizes, but the Regular weight
% will be used for small sizes (e.g.\ in sub- and superscripts).
%
+% \subsection{Size}
+%
% In order to use FdSymbol with different text fonts, it is possible to scale
% the fonts by an arbitrary factor. This can be achieved with the option
% \opt{scale}. For example, to use the fonts at 90\,\% of their original size,
@@ -150,21 +179,15 @@
% the height of normal delimiters will match the height of text delimiters in
% Fedra Serif~B if you select this option.
%
-% The following table summarises all options (keys) that can be used with the
-% \pkg{fdsymbol} package. Values that correspond to the default behaviour of
-% the package are marked by an asterisk.
-% \begin{center}
-% \begin{tabular}{@{}ll@{}}
-% \toprule
-% Key & Values \\
-% \midrule
-% \opt{normalweight} & \opt{Book}*, \opt{Regular}, \opt{auto} \\
-% \opt{boldweight} & \opt{Medium}*, \opt{Bold}, \opt{auto} \\
-% \opt{scale} & \meta{factor} \\
-% \opt{largedelims} & \opt{true}, \opt{false}* \\
-% \bottomrule
-% \end{tabular}
-% \end{center}
+% \subsection{Stylistic variants}
+%
+% In order to use FdSymbol with sans-serif text fonts, there are sans-serif
+% variants of glyphs that contain a product or summation sign. These can
+% be accessed by the commands |\varprod|, |\varcoprod|, |\varsum|, etc.
+% To access these glyphs using the standard commands |\prod|, |\coprod|,
+% |\sum|, etc., use the option \opt{opstyle=sans}.
+% If this option is active, the serif variants of these glyphs can be accessed
+% by the |\var|\dots\ commands instead.
%
% \section{Symbols}\label{sec:glyphs}
%
@@ -410,6 +433,7 @@
% \showsymbol{\intercal}
% \showsymbol{\wreath}, \cmd{\wr}
% \showsymbol{\amalg}
+% \showsymbol{\varamalg}
% \showsymbol{\lhd}
% \showsymbol{\rhd}
% \showsymbol{\unlhd}
@@ -1199,9 +1223,13 @@
% \showop{\bigodot}
% \showop{\bigoast}
% \showop{\prod}
+% \showop{\varprod}
% \showop{\coprod}
+% \showop{\varcoprod}
% \showop{\sum}
+% \showop{\varsum}
% \showop{\osum}, \cmd{\modtwosum}
+% \showop{\varosum}, \cmd{\varmodtwosum}
% \showop{\int}
% \showop{\iint}
% \showop{\iiint}
@@ -1220,8 +1248,11 @@
% \showop{\rcircleleftint}, \cmd{\varointctrclockwise}
% \showop{\lcircleleftint}, \cmd{\ointclockwise}
% \showop{\sumint}
+% \showop{\varsumint}
% \showop{\smallprod}
+% \showop{\varsmallprod}
% \showop{\smallcoprod}
+% \showop{\varsmallcoprod}
% \showop{\smallint}
% \showop{\surd}
% \end{multicols}
@@ -1402,7 +1433,18 @@
\renewcommand\fdsy@bweight@small{Bold}%
\fi
}
-\ExecuteOptionsX{largedelims=false}
+% \end{macrocode}
+% Finally, the following option controls the style of large operators.
+% \begin{macrocode}
+\newif\iffdsy@sfop
+\fdsy@choicekey{opstyle}{serif,sans}{%
+ \ifcase\@tempb\relax
+ \fdsy@sfopfalse
+ \or
+ \fdsy@sfoptrue
+ \fi
+}
+\ExecuteOptionsX{largedelims=false,opstyle=serif}
\ProcessOptionsX
% \end{macrocode}
% Load external packages, but only if they are not already loaded
@@ -1550,25 +1592,22 @@
% msb for the blackboard bold alphabet, and euf for the Fraktur
% alphabet.
% \begin{macrocode}
-\let\mathcal\undefined
\DeclareMathAlphabet{\mathcal}{OMS}{cmsy}{m}{n}
\SetMathAlphabet{\mathcal}{bold}{OMS}{cmsy}{b}{n}
-\let\mathbb\undefined
\DeclareMathAlphabet{\mathbb}{U}{msb}{m}{n}
-\let\Bbbk\undefined
-\newcommand{\Bbbk}{\mathbb{\mathchar"717C}}
-\let\mathfrak\undefined
\DeclareMathAlphabet{\mathfrak}{U}{euf}{m}{n}
\SetMathAlphabet{\mathfrak}{bold}{U}{euf}{b}{n}
+\let\Bbbk\undefined
+\newcommand{\Bbbk}{\mathbb{\mathchar"717C}}
% \end{macrocode}
-% A command to take math symbols from text fonts.
+% A command for taking math symbols from the text font.
% \begin{macrocode}
-\newcommand\fdsy@bold{bold}
-\newcommand\fdsy@text[1]{%
+\def\fdsy@bold{bold}
+\newcommand*\fdsy@text[1]{%
\ifx\fdsy@bold\math@version
- \text{\bfseries#1}%
+ \text{\normalfont\bfseries#1}%
\else
- \text{\mdseries#1}%
+ \text{\normalfont\mdseries#1}%
\fi
}
% \end{macrocode}
@@ -1860,9 +1899,21 @@
\fdsy@DeclareAlias{\rightanglemdot}{symbols}{\mathord}
\fdsy@DeclareSymbol{\prime}{symbols}{\mathord}
\fdsy@DeclareSymbol{\backprime}{symbols}{\mathord}
-\fdsy@DeclareSymbol{\smallprod}{symbols}{\mathop}
-\fdsy@DeclareSymbol{\smallcoprod}{symbols}{\mathop}
- \fdsy@DeclareAlias{\amalg}{symbols}{\mathbin}
+\iffdsy@sfop
+ \fdsy@DeclareSymbol{\varsmallprod}{symbols}{\mathop}
+ \fdsy@DeclareSymbol{\smallprod}{symbols}{\mathop}
+ \fdsy@DeclareSymbol{\varsmallcoprod}{symbols}{\mathop}
+ \fdsy@DeclareAlias{\varamalg}{symbols}{\mathbin}
+ \fdsy@DeclareSymbol{\smallcoprod}{symbols}{\mathop}
+ \fdsy@DeclareAlias{\amalg}{symbols}{\mathbin}
+\else
+ \fdsy@DeclareSymbol{\smallprod}{symbols}{\mathop}
+ \fdsy@DeclareSymbol{\varsmallprod}{symbols}{\mathop}
+ \fdsy@DeclareSymbol{\smallcoprod}{symbols}{\mathop}
+ \fdsy@DeclareAlias{\amalg}{symbols}{\mathbin}
+ \fdsy@DeclareSymbol{\varsmallcoprod}{symbols}{\mathop}
+ \fdsy@DeclareAlias{\varamalg}{symbols}{\mathbin}
+\fi
\fdsy@DeclareSymbol{\smallint}{symbols}{\mathop}
\fdsy@DeclareSymbol{\checkmark}{symbols}{\mathord}
\fdsy@DeclareSymbol{\lightning}{symbols}{\mathord}
@@ -2979,16 +3030,49 @@
\fdsy@DeclareSymbol{\dbigodot}{largesymbols}{\mathop}
\fdsy@DeclareSymbol{\tbigoast}{largesymbols}{\mathop}
\fdsy@DeclareSymbol{\dbigoast}{largesymbols}{\mathop}
-\fdsy@DeclareSymbol{\tprod}{largesymbols}{\mathop}
-\fdsy@DeclareSymbol{\dprod}{largesymbols}{\mathop}
-\fdsy@DeclareSymbol{\tcoprod}{largesymbols}{\mathop}
-\fdsy@DeclareSymbol{\dcoprod}{largesymbols}{\mathop}
-\fdsy@DeclareSymbol{\tsum}{largesymbols}{\mathop}
-\fdsy@DeclareSymbol{\dsum}{largesymbols}{\mathop}
-\fdsy@DeclareSymbol{\tosum}{largesymbols}{\mathop}
- \fdsy@DeclareAlias{\tmodtwosum}{largesymbols}{\mathop}
-\fdsy@DeclareSymbol{\dosum}{largesymbols}{\mathop}
- \fdsy@DeclareAlias{\dmodtwosum}{largesymbols}{\mathop}
+\iffdsy@sfop
+ \fdsy@DeclareSymbol{\tvarprod}{largesymbols}{\mathop}
+ \fdsy@DeclareSymbol{\dvarprod}{largesymbols}{\mathop}
+ \fdsy@DeclareSymbol{\tprod}{largesymbols}{\mathop}
+ \fdsy@DeclareSymbol{\dprod}{largesymbols}{\mathop}
+ \fdsy@DeclareSymbol{\tvarcoprod}{largesymbols}{\mathop}
+ \fdsy@DeclareSymbol{\dvarcoprod}{largesymbols}{\mathop}
+ \fdsy@DeclareSymbol{\tcoprod}{largesymbols}{\mathop}
+ \fdsy@DeclareSymbol{\dcoprod}{largesymbols}{\mathop}
+ \fdsy@DeclareSymbol{\tvarsum}{largesymbols}{\mathop}
+ \fdsy@DeclareSymbol{\dvarsum}{largesymbols}{\mathop}
+ \fdsy@DeclareSymbol{\tsum}{largesymbols}{\mathop}
+ \fdsy@DeclareSymbol{\dsum}{largesymbols}{\mathop}
+ \fdsy@DeclareSymbol{\tvarosum}{largesymbols}{\mathop}
+ \fdsy@DeclareAlias{\tvarmodtwosum}{largesymbols}{\mathop}
+ \fdsy@DeclareSymbol{\dvarosum}{largesymbols}{\mathop}
+ \fdsy@DeclareAlias{\dvarmodtwosum}{largesymbols}{\mathop}
+ \fdsy@DeclareSymbol{\tosum}{largesymbols}{\mathop}
+ \fdsy@DeclareAlias{\tmodtwosum}{largesymbols}{\mathop}
+ \fdsy@DeclareSymbol{\dosum}{largesymbols}{\mathop}
+ \fdsy@DeclareAlias{\dmodtwosum}{largesymbols}{\mathop}
+\else
+ \fdsy@DeclareSymbol{\tprod}{largesymbols}{\mathop}
+ \fdsy@DeclareSymbol{\dprod}{largesymbols}{\mathop}
+ \fdsy@DeclareSymbol{\tvarprod}{largesymbols}{\mathop}
+ \fdsy@DeclareSymbol{\dvarprod}{largesymbols}{\mathop}
+ \fdsy@DeclareSymbol{\tcoprod}{largesymbols}{\mathop}
+ \fdsy@DeclareSymbol{\dcoprod}{largesymbols}{\mathop}
+ \fdsy@DeclareSymbol{\tvarcoprod}{largesymbols}{\mathop}
+ \fdsy@DeclareSymbol{\dvarcoprod}{largesymbols}{\mathop}
+ \fdsy@DeclareSymbol{\tsum}{largesymbols}{\mathop}
+ \fdsy@DeclareSymbol{\dsum}{largesymbols}{\mathop}
+ \fdsy@DeclareSymbol{\tvarsum}{largesymbols}{\mathop}
+ \fdsy@DeclareSymbol{\dvarsum}{largesymbols}{\mathop}
+ \fdsy@DeclareSymbol{\tosum}{largesymbols}{\mathop}
+ \fdsy@DeclareAlias{\tmodtwosum}{largesymbols}{\mathop}
+ \fdsy@DeclareSymbol{\dosum}{largesymbols}{\mathop}
+ \fdsy@DeclareAlias{\dmodtwosum}{largesymbols}{\mathop}
+ \fdsy@DeclareSymbol{\tvarosum}{largesymbols}{\mathop}
+ \fdsy@DeclareAlias{\tvarmodtwosum}{largesymbols}{\mathop}
+ \fdsy@DeclareSymbol{\dvarosum}{largesymbols}{\mathop}
+ \fdsy@DeclareAlias{\dvarmodtwosum}{largesymbols}{\mathop}
+\fi
\fdsy@DeclareSymbol{\tint}{largesymbols}{\mathop}
\fdsy@DeclareSymbol{\dint}{largesymbols}{\mathop}
\fdsy@DeclareSymbol{\tiint}{largesymbols}{\mathop}
@@ -3039,8 +3123,17 @@
\fdsy@DeclareAlias{\tointclockwise}{largesymbols}{\mathop}
\fdsy@DeclareSymbol{\dlcircleleftint}{largesymbols}{\mathop}
\fdsy@DeclareAlias{\dointclockwise}{largesymbols}{\mathop}
-\fdsy@DeclareSymbol{\tsumint}{largesymbols}{\mathop}
-\fdsy@DeclareSymbol{\dsumint}{largesymbols}{\mathop}
+\iffdsy@sfop
+ \fdsy@DeclareSymbol{\tvarsumint}{largesymbols}{\mathop}
+ \fdsy@DeclareSymbol{\dvarsumint}{largesymbols}{\mathop}
+ \fdsy@DeclareSymbol{\tsumint}{largesymbols}{\mathop}
+ \fdsy@DeclareSymbol{\dsumint}{largesymbols}{\mathop}
+\else
+ \fdsy@DeclareSymbol{\tsumint}{largesymbols}{\mathop}
+ \fdsy@DeclareSymbol{\dsumint}{largesymbols}{\mathop}
+ \fdsy@DeclareSymbol{\tvarsumint}{largesymbols}{\mathop}
+ \fdsy@DeclareSymbol{\dvarsumint}{largesymbols}{\mathop}
+\fi
\let\intop\tint
\let\ointop\toint
@@ -3077,11 +3170,16 @@
\fdsy@DeclareOperator{\bigotimes}{\dbigotimes}{\tbigotimes}
\fdsy@DeclareOperator{\bigodot}{\dbigodot}{\tbigodot}
\fdsy@DeclareOperator{\bigoast}{\dbigoast}{\tbigoast}
+\fdsy@DeclareOperator{\prod}{\dprod}{\tprod}
+\fdsy@DeclareOperator{\varprod}{\dvarprod}{\tvarprod}
+\fdsy@DeclareOperator{\coprod}{\dcoprod}{\tcoprod}
+\fdsy@DeclareOperator{\varcoprod}{\dvarcoprod}{\tvarcoprod}
\fdsy@DeclareOperator{\sum}{\dsum}{\tsum}
+\fdsy@DeclareOperator{\varsum}{\dvarsum}{\tvarsum}
\fdsy@DeclareOperator{\osum}{\dosum}{\tosum}
+\fdsy@DeclareOperator{\varosum}{\dvarosum}{\tvarosum}
\fdsy@DeclareOperator{\modtwosum}{\dmodtwosum}{\tmodtwosum}
-\fdsy@DeclareOperator{\prod}{\dprod}{\tprod}
-\fdsy@DeclareOperator{\coprod}{\dcoprod}{\tcoprod}
+\fdsy@DeclareOperator{\varmodtwosum}{\dvarmodtwosum}{\tvarmodtwosum}
\fdsy@DeclareIntegral{\iint}{\diint}{\tiint}
\fdsy@DeclareIntegral{\iiint}{\diiint}{\tiiint}
\fdsy@DeclareIntegral{\iiiint}{\diiiint}{\tiiiint}
@@ -3107,6 +3205,7 @@
\fdsy@DeclareIntegral{\lcircleleftint}{\dlcircleleftint}{\tlcircleleftint}
\fdsy@DeclareIntegral{\ointclockwise}{\dointclockwise}{\tointclockwise}
\fdsy@DeclareIntegral{\sumint}{\dsumint}{\tsumint}
+\fdsy@DeclareIntegral{\varsumint}{\dvarsumint}{\tvarsumint}
\def\intkern@{\mkern-8.5mu\mathchoice{\mkern-1mu}{}{}{}}
\def\intdots@{\mkern-6mu%
@@ -3331,14 +3430,14 @@
\DeclareMathSymbol{<}{\mathrel}{relations}{"24}
\DeclareMathSymbol{>}{\mathrel}{relations}{"25}
\iffdsy@largedelims
- \DeclareMathSymbol{|}{\mathord}{delimiters}{"B6}
+ \DeclareMathSymbol{|}{\mathord}{delimiters}{"B7}
\DeclareMathSymbol{(}{\mathopen}{delimiters}{"01}
\DeclareMathSymbol{)}{\mathclose}{delimiters}{"07}
\DeclareMathSymbol{[}{\mathopen}{delimiters}{"13}
\DeclareMathSymbol{]}{\mathclose}{delimiters}{"19}
\DeclareMathSymbol{/}{\mathord}{delimiters}{"AA}
\else
- \DeclareMathSymbol{|}{\mathord}{delimiters}{"B5}
+ \DeclareMathSymbol{|}{\mathord}{delimiters}{"B6}
\DeclareMathSymbol{(}{\mathopen}{delimiters}{"00}
\DeclareMathSymbol{)}{\mathclose}{delimiters}{"06}
\DeclareMathSymbol{[}{\mathopen}{delimiters}{"12}
diff --git a/Master/texmf-dist/source/latex/fdsymbol/fdsymbol.ins b/Master/texmf-dist/source/latex/fdsymbol/fdsymbol.ins
index dcfb74b68bf..39319e5788c 100644
--- a/Master/texmf-dist/source/latex/fdsymbol/fdsymbol.ins
+++ b/Master/texmf-dist/source/latex/fdsymbol/fdsymbol.ins
@@ -1,5 +1,5 @@
%
-% Copyright (c) 2011 by Michael Ummels <michael.ummels@rwth-aachen.de>
+% Copyright (c) 2012 by Michael Ummels <michael.ummels@rwth-aachen.de>
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3c
@@ -21,7 +21,7 @@
\preamble
-Copyright (c) 2011 by Michael Ummels <michael.ummels@rwth-aachen.de>
+Copyright (c) 2012 by Michael Ummels <michael.ummels@rwth-aachen.de>
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3c