From 2314afd4e69719c52c7648994f64b3516aa6dc4c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 4 Nov 2012 23:00:14 +0000 Subject: embrac (4nov12) git-svn-id: svn://tug.org/texlive/trunk@28173 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/embrac/README | 2 +- Master/texmf-dist/doc/latex/embrac/embrac_en.pdf | Bin 855812 -> 103283 bytes Master/texmf-dist/doc/latex/embrac/embrac_en.tex | 100 ++++++++++++++--------- 3 files changed, 62 insertions(+), 40 deletions(-) (limited to 'Master/texmf-dist/doc/latex/embrac') diff --git a/Master/texmf-dist/doc/latex/embrac/README b/Master/texmf-dist/doc/latex/embrac/README index 9c574a6ca96..338e83f5a2e 100644 --- a/Master/texmf-dist/doc/latex/embrac/README +++ b/Master/texmf-dist/doc/latex/embrac/README @@ -3,7 +3,7 @@ the EMBRAC package Upright Brackets in Emphasized Text -2012/07/24 v0.1b +2012/11/04 v0.2 -------------------------------------------------------------------------- Clemens Niederberger Web: https://bitbucket.org/cgnieder/embrac/ diff --git a/Master/texmf-dist/doc/latex/embrac/embrac_en.pdf b/Master/texmf-dist/doc/latex/embrac/embrac_en.pdf index 22677ff9712..d5b565923d0 100644 Binary files a/Master/texmf-dist/doc/latex/embrac/embrac_en.pdf and b/Master/texmf-dist/doc/latex/embrac/embrac_en.pdf differ diff --git a/Master/texmf-dist/doc/latex/embrac/embrac_en.tex b/Master/texmf-dist/doc/latex/embrac/embrac_en.tex index acb36b552c7..d37bc700592 100644 --- a/Master/texmf-dist/doc/latex/embrac/embrac_en.tex +++ b/Master/texmf-dist/doc/latex/embrac/embrac_en.tex @@ -1,8 +1,8 @@ -% arara: pdflatex +% arara: xelatex % arara: makeindex: { sort: true, style: embrac_en.ist } % arara: biber -% arara: pdflatex -% arara: pdflatex +% arara: xelatex +% arara: xelatex % -------------------------------------------------------------------------- % the EMBRAC package % @@ -43,6 +43,7 @@ \documentclass[DIV10,toc=index,toc=bib]{cnpkgdoc} \docsetup{ pkg = [biblatex]embrac, + language = en , code-box = { backgroundcolor = gray!7!white , skipbelow = .6\baselineskip plus .5ex minus .5ex , @@ -51,8 +52,7 @@ } , gobble = 1 } -\usepackage[osf]{libertine} -\usepackage{fnpct} + \cnpkgcolors{ main => cnpkgred , key => yellow!40!brown , @@ -60,24 +60,51 @@ link => black!90 } +\usepackage{libertineotf} +\setmainfont[ + Numbers={OldStyle,Proportional}, + SmallCapsFont=Linux Libertine Capitals O, + SmallCapsFeatures={LetterSpace=1.5,Scale=.975}, + SlantedFont=Linux Libertine Slanted O, + Ligatures=TeX]{Linux Libertine O} +\setsansfont[ + Numbers={OldStyle,Proportional}, + Scale=1.0025, + SmallCapsFont=Linux Biolinum Capitals O, + SmallCapsFeatures={LetterSpace=.5,Scale=.95}, + ItalicFont=Linux Biolinum Slanted O, + SlantedFont=Linux Biolinum Slanted O, + Ligatures=TeX]{Linux Biolinum O} +\setmonofont[Scale=.802]{DejaVu Sans Mono} + +\makeatletter +\DeclareRobustCommand{\sustyle}{% + \not@math@alphabet\sustyle\relax + \addfontfeatures{VerticalPosition=Superior}} +\DeclareTextFontCommand{\textsu}{\sustyle} +\def\ifcomma#1{\ifx#1,\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi} +\DeclareRobustCommand*\textsuperscript[1]{% + \expandafter\ifcomma\expandafter{#1} + {\@textsuperscript{\selectfont#1}} + {\textsu{#1}}} +\makeatother + +\usepackage{fnpct} + \renewcommand*\othersectionlevelsformat[3]{% \textcolor{main}{#3\autodot}\enskip} \renewcommand*\partformat{% \textcolor{main}{\partname~\thepart\autodot}} - - -\ExplSyntaxOn -\NewDocumentCommand \Default {g} - { - \hfill\llap - { - \IfNoValueTF { #1 } - {(initially~empty)} - {Default:~\code{#1}} - } - \newline - } -\ExplSyntaxOff +\usepackage{scrpage2} +\pagestyle{scrheadings} + +\newcommand*\Default[1]{% + \hfill\llap{% + \ifblank{#1} + {(initially~empty)} + {Default:~\code{#1}}% + }\newline +} \addcmds{ AddEmph, @@ -135,7 +162,7 @@ \usepackage{fixfoot} \DeclareFixedFootnote\manythanks{Many thanks again for his kind permission to use it!} -\ChangeEmph{[}[,.02em]{]}[.055em,-.08em] +\RenewEmph{[}[-0.045em,.02em]{]}[.055em,-.09em] \ChangeEmph{(}[-.01em,.04em]{)}[.04em,-.05em] \begin{document} @@ -157,7 +184,8 @@ package probably wouldn't exist. \section{New} \begin{description} \item[v0.1a] The command \cmd{RenewEmph} has been renamed into - \cmd{ChangeEmph} and a new slightly different \cmd{RenewEmph} has been added. + \cmd{ChangeEmph} and a new slightly different \cmd{RenewEmph} has been added. + \item[v0.2] Improved interaction with \paket{biblatex}. \end{description} \section{About}\label{sec:about}\secidx{About} @@ -182,7 +210,7 @@ Both this quote from~\citetitle{bringhurst04} by Robert Bringhurst and the article \citetitle{dtk12-dw} by Dominik Waßenhoven~\cite{dtk12-dw} inspired this package. Indeed, \embrac heavily borrows from the code \citeauthor{dtk12-dw} provided in his article\manythanks. The code was originally provided by Bruno -Le~Floch\manythanks\ as an answer to a question on \{TeX.SE\}~\cite{lefloch11}. +Le~Floch\manythanks\ answering a question on \{TeX.SE\}~\cite{lefloch11}. \embrac tries to redefine \cmd{emph} and \cmd{textit} in a way that neither parentheses nor square brackets are sloped. In an ideal world you of course @@ -260,7 +288,7 @@ This document however uses ``Linux Libertine O''\footnote{\url{http://www.linuxl both for the roman and the italic font and redefines them in this way (still not sure these are the best values): \begin{beispiel}[code only] - \ChangeEmph{[}[,.02em]{]}[.055em,-.08em] + \RenewEmph{[}[-0.045em,.02em]{]}[.055em,-.09em] \ChangeEmph{(}[-.01em,.04em]{)}[.04em,-.05em] \end{beispiel} @@ -308,7 +336,7 @@ with the default settings and with the settings for this document: \end{center} Deleting a pair removes it completely from \embrac's mechanism. All information -about the pair and it's kerning values will be lost. So if you want the effects +about the pair and its kerning values will be lost. So if you want the effects to be temporary use grouping. \begin{beispiel} \DeleteEmph[] @@ -324,15 +352,19 @@ documentation. \section{biblatex Compatibility}\secidx{biblatex Compatibility} This is \embrac's only package option: \begin{beschreibung} - \Option{biblatex}{\default{true}|false}\Default{false} If set to true parentheses - and squared brackets as defined by \paket{biblatex} with \cmd{bibleftparen}, - \cmd{bibrightparen}, \cmd{bibleftbracket} and \cmd{bibrightbracket} are treated - the same way (if not removed from the treatment with \cmd{DeleteEmph}). + \Option{biblatex}{\default{true}|on|parens|false||off|none}\Default{false} + If set to \code{true} (or one of its aliases) parentheses and squared brackets + as defined by \paket{biblatex} with \cmd{bibleftparen}, \cmd{bibrightparen}, + \cmd{bibleftbracket} and \cmd{bibrightbracket} are treated the same way (if + not removed from the treatment with \cmd{DeleteEmph}). + + The command \cmd{blx@imc@mkbibemph} is patched to use the original definition + of \cmd{emph}. \end{beschreibung} \begin{beispiel} % this document uses \usepackage[biblatex]{embrac} - \emph{Let's cite the quote from section~\ref{sec:about} again:~\cite{bringhurst04}}. + \emph{Let's cite Bringhurst again:~\cite{bringhurst04}}. \end{beispiel} \secidx*{biblatex Compatibility} @@ -345,14 +377,6 @@ document. You can use the following commands whose functions are obvious, I gues \Befehl{EmbracOn} \end{beschreibung} Both commands are local. - -This document for example uses the following lines because \paket{biblatex} -complained when it tried to typeset the entry for~\cite{bringhurst04}. Using -\cmd{DeleteEmph}[] would have worked as well. -\begin{beispiel}[code only] - \EmbracOff - \printbibliography -\end{beispiel} \secidx*{Turn \embrac Temporarily Off} \section{Watch out!}\secidx{Watch Out} @@ -363,10 +387,8 @@ Please be aware that \embrac does not affect \cmd{itshape} nor the commands \end{beispiel} \secidx*{Watch Out} -\EmbracOff \printbibliography - \setindexpreamble{Section titles are indicated \textbf{bold}, packages \textsf{sans serif}, commands \code{\textbackslash\textcolor{code}{brown}} and options \textcolor{key}{\code{yellow}}.\par\bigskip} -- cgit v1.2.3