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 ++++++---- Master/texmf-dist/tex/latex/embrac/embrac.sty | 238 +++++++++++++---------- 4 files changed, 200 insertions(+), 140 deletions(-) (limited to 'Master') 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} diff --git a/Master/texmf-dist/tex/latex/embrac/embrac.sty b/Master/texmf-dist/tex/latex/embrac/embrac.sty index c9392c2c0f9..30ee698d037 100644 --- a/Master/texmf-dist/tex/latex/embrac/embrac.sty +++ b/Master/texmf-dist/tex/latex/embrac/embrac.sty @@ -34,31 +34,49 @@ \RequirePackage { expl3 , xparse , l3keys2e } \ProvidesExplPackage {embrac} - {2012/07/24} - {0.1b} + {2012/11/04} + {0.2} {Upright Brackets in Emphasized Text} -\bool_new:N \l_embrac_treat_biblatex_bool +\bool_new:N \l__embrac_treat_biblatex_bool +\tl_new:N \l__embrac_tmpa_tl +\tl_new:N \l__embrac_treat_biblatex_tl \keys_define:nn { embrac } - { biblatex .bool_set:N = \l_embrac_treat_biblatex_bool } + { + biblatex .choice: , + biblatex / true .code:n = + \bool_set_true:N \l__embrac_treat_biblatex_bool , + biblatex / on .code:n = + \bool_set_true:N \l__embrac_treat_biblatex_bool , + biblatex / parens .code:n = + \bool_set_true:N \l__embrac_treat_biblatex_bool , + biblatex / false .code:n = + \bool_set_false:N \l__embrac_treat_biblatex_bool , + biblatex / off .code:n = + \bool_set_false:N \l__embrac_treat_biblatex_bool , + biblatex / none .code:n = + \bool_set_false:N \l__embrac_treat_biblatex_bool , + biblatex .default:n = true + } % save original commands: -\cs_new_eq:Nc \embrac_orig_emph:n { emph~ } -\cs_generate_variant:Nn \embrac_orig_emph:n { V } +\cs_new_eq:Nc \__embrac_orig_emph:n { emph~ } +\cs_generate_variant:Nn \__embrac_orig_emph:n { V } -\cs_new_eq:Nc \embrac_orig_textit:n { textit~ } -\cs_generate_variant:Nn \embrac_orig_textit:n { V } +\cs_new_eq:Nc \__embrac_orig_textit:n { textit~ } +\cs_generate_variant:Nn \__embrac_orig_textit:n { V } % preparations: \cs_new_eq:NN \embrac_braces_format:n \textup -\cs_new_eq:NN \embrac_kern:n \skip_horizontal:n -\cs_new:Npn \embrac_empty_or_no_value:nTF #1#2#3 +\cs_new_eq:NN \__embrac_kern:n \skip_horizontal:n + +\cs_new:Npn \__embrac_empty_or_no_value:nTF #1#2#3 { \IfNoValueTF { #1 } { #2 } { \tl_if_blank:nTF { #1 } { #2 } { #3 } } } -\cs_new:Npn \embrac_empty_or_no_value:nF #1#2 +\cs_new:Npn \__embrac_empty_or_no_value:nF #1#2 { \IfNoValueF { #1 } { \tl_if_blank:nF { #1 } { #2 } } @@ -67,170 +85,186 @@ % -------------------------------------------------------------------------- % THE MAIN PART: % storage of the tokens to be replaced: -\prop_new:N \l_embrac_emph_obrackets_prop -\prop_new:N \l_embrac_emph_obrackets_before_prop -\prop_new:N \l_embrac_emph_cbrackets_prop -\prop_new:N \l_embrac_emph_cbrackets_after_prop +\prop_new:N \l__embrac_emph_obrackets_prop +\prop_new:N \l__embrac_emph_obrackets_before_prop +\prop_new:N \l__embrac_emph_cbrackets_prop +\prop_new:N \l__embrac_emph_cbrackets_after_prop % do the replacing: -\cs_new:Npn \embrac_replace_brackets:N #1 +\cs_new:Npn \__embrac_replace_brackets:N #1 { - \prop_map_inline:Nn \l_embrac_emph_obrackets_prop + \prop_map_inline:Nn \l__embrac_emph_obrackets_prop { \tl_replace_all:Nnn #1 { ##1 } { - \embrac_kern:n - { \prop_get:Nn \l_embrac_emph_obrackets_before_prop { ##1 } } - \embrac_braces_format:n { ##1 \embrac_kern:n { ##2 } } + \__embrac_kern:n + { \prop_get:Nn \l__embrac_emph_obrackets_before_prop { ##1 } } + \embrac_braces_format:n { ##1 \__embrac_kern:n { ##2 } } + \nobreak } } - \prop_map_inline:Nn \l_embrac_emph_cbrackets_prop + \prop_map_inline:Nn \l__embrac_emph_cbrackets_prop { \tl_replace_all:Nnn #1 { ##1 } { + \nobreak \embrac_braces_format:n - { \embrac_kern:n { ##2 } ##1 } - \embrac_kern:n - { \prop_get:Nn \l_embrac_emph_cbrackets_after_prop { ##1 } } + { \__embrac_kern:n { ##2 } ##1 } + \__embrac_kern:n + { \prop_get:Nn \l__embrac_emph_cbrackets_after_prop { ##1 } } } } } % internal \emph command: -\cs_new:Npn \embrac_emph:n #1 +\cs_new:Npn \__embrac_emph:n #1 { - \tl_set:Nn \l_tmpa_tl { #1 } - \embrac_replace_brackets:N \l_tmpa_tl - \embrac_orig_emph:V \l_tmpa_tl + \tl_set:Nx \l__embrac_tmpa_tl { #1 } + \__embrac_replace_brackets:N \l__embrac_tmpa_tl + \__embrac_orig_emph:V \l__embrac_tmpa_tl } % internal \textit command: -\cs_new:Npn \embrac_textit:n #1 +\cs_new:Npn \__embrac_textit:n #1 { - \tl_set:Nn \l_tmpa_tl { #1 } - \embrac_replace_brackets:N \l_tmpa_tl - \embrac_orig_textit:V \l_tmpa_tl + \tl_set:Nn \l__embrac_tmpa_tl { #1 } + \__embrac_replace_brackets:N \l__embrac_tmpa_tl + \__embrac_orig_textit:V \l__embrac_tmpa_tl } % biblatex compatibility: -\cs_new:Npn \embrac_treat_biblatex: +\cs_new:Npn \__embrac_treat_bibparens: + { + \bool_if:NT \l__embrac_treat_biblatex_bool + { + \__embrac_replace_brackets:N \bibleftbracket + \__embrac_replace_brackets:N \bibrightbracket + \__embrac_replace_brackets:N \bibleftparen + \__embrac_replace_brackets:N \bibrightparen + } + } + +\cs_new:Npn \__embrac_treat_bibemph: { - \bool_if:NT \l_embrac_treat_biblatex_bool + \bool_if:NT \l__embrac_treat_biblatex_bool { - \embrac_replace_brackets:N \bibleftbracket - \embrac_replace_brackets:N \bibrightbracket - \embrac_replace_brackets:N \bibleftparen - \embrac_replace_brackets:N \bibrightparen - } + \patchcmd[\protected\long]\blx@imc@mkbibemph + {\emph}{\emph*} + {}{} + } } % internal \emph command, second layer: -\cs_new_protected:Npn \embrac_new_emph:w #1#2 +\cs_new_protected:Npn \__embrac_new_emph:w #1#2 { \group_begin: - \embrac_treat_biblatex: + \__embrac_treat_bibparens: \IfBooleanTF { #1 } - { \embrac_orig_emph:n { #2 } } - { \embrac_emph:n { #2 } } + { \__embrac_orig_emph:n { #2 } } + { \__embrac_emph:n { #2 } } \group_end: } % internal \textit command, second layer: -\cs_new_protected:Npn \embrac_new_textit:w #1#2 +\cs_new_protected:Npn \__embrac_new_textit:w #1#2 { \group_begin: - \embrac_treat_biblatex: + \__embrac_treat_bibparens: \IfBooleanTF { #1 } - { \embrac_orig_textit:n { #2 } } - { \embrac_textit:n { #2 } } + { \__embrac_orig_textit:n { #2 } } + { \__embrac_textit:n { #2 } } \group_end: } % user command \emph: \RenewDocumentCommand \emph { sm } - { \embrac_new_emph:w #1 { #2 } } + { \__embrac_new_emph:w #1 { #2 } } % user command \textit: \RenewDocumentCommand \textit { sm } - { \embrac_new_emph:w #1 { #2 } } + { \__embrac_new_textit:w #1 { #2 } } % -------------------------------------------------------------------------- % TURNING EMBRAC OFF AND ON: % turning embrac off: \NewDocumentCommand \EmbracOff {} { - \cs_set_eq:NN \emph \embrac_orig_emph:n - \cs_set_eq:NN \textit \embrac_orig_textit:n + \RenewDocumentCommand \emph { sm } + { \__embrac_orig_emph:n { ##2 } } + \RenewDocumentCommand \textit { sm } + { \__embrac_orig_textit:n { ##2 } } } % turning embrac on: \NewDocumentCommand \EmbracOn {} { - \cs_set_eq:NN \emph \embrac_new_emph:w - \cs_set_eq:NN \textit \embrac_new_textit:w + \RenewDocumentCommand \emph { sm } + { \__embrac_new_emph:w ##1 { ##2 } } + \RenewDocumentCommand \textit { sm } + { \__embrac_new_textit:w ##1 { ##2 } } } % -------------------------------------------------------------------------- % ADDING AND REMOVING BRACKETS: % internal add command: -\cs_new:Npn \embrac_add_to_emph:nnnnnn #1#2#3#4#5#6 +\cs_new:Npn \__embrac_add_to_emph:nnnnnn #1#2#3#4#5#6 { - \embrac_empty_or_no_value:nTF { #2 } - { \prop_put_if_new:Nnn \l_embrac_emph_obrackets_prop { #1 } { 0pt } } - { \prop_put_if_new:Nnn \l_embrac_emph_obrackets_prop { #1 } { #2 } } - \embrac_empty_or_no_value:nTF { #3 } - { \prop_put_if_new:Nnn \l_embrac_emph_obrackets_before_prop { #1 } { 0pt } } - { \prop_put_if_new:Nnn \l_embrac_emph_obrackets_before_prop { #1 } { #3 } } - \embrac_empty_or_no_value:nTF { #5 } - { \prop_put_if_new:Nnn \l_embrac_emph_cbrackets_prop { #4 } { 0pt } } - { \prop_put_if_new:Nnn \l_embrac_emph_cbrackets_prop { #4 } { #5 } } - \embrac_empty_or_no_value:nTF { #6 } - { \prop_put_if_new:Nnn \l_embrac_emph_cbrackets_after_prop { #4 } { 0pt } } - { \prop_put_if_new:Nnn \l_embrac_emph_cbrackets_after_prop { #4 } { #6 } } + \__embrac_empty_or_no_value:nTF { #2 } + { \prop_put_if_new:Nnn \l__embrac_emph_obrackets_prop { #1 } { 0pt } } + { \prop_put_if_new:Nnn \l__embrac_emph_obrackets_prop { #1 } { #2 } } + \__embrac_empty_or_no_value:nTF { #3 } + { \prop_put_if_new:Nnn \l__embrac_emph_obrackets_before_prop { #1 } { 0pt } } + { \prop_put_if_new:Nnn \l__embrac_emph_obrackets_before_prop { #1 } { #3 } } + \__embrac_empty_or_no_value:nTF { #5 } + { \prop_put_if_new:Nnn \l__embrac_emph_cbrackets_prop { #4 } { 0pt } } + { \prop_put_if_new:Nnn \l__embrac_emph_cbrackets_prop { #4 } { #5 } } + \__embrac_empty_or_no_value:nTF { #6 } + { \prop_put_if_new:Nnn \l__embrac_emph_cbrackets_after_prop { #4 } { 0pt } } + { \prop_put_if_new:Nnn \l__embrac_emph_cbrackets_after_prop { #4 } { #6 } } } % internal delete command: -\cs_new:Npn \embrac_remove_from_emph:nn #1#2 +\cs_new:Npn \__embrac_remove_from_emph:nn #1#2 { - \prop_del:Nn \l_embrac_emph_obrackets_prop { #1 } - \prop_del:Nn \l_embrac_emph_obrackets_before_prop { #1 } - \prop_del:Nn \l_embrac_emph_cbrackets_prop { #2 } - \prop_del:Nn \l_embrac_emph_cbrackets_after_prop { #2 } + \prop_del:Nn \l__embrac_emph_obrackets_prop { #1 } + \prop_del:Nn \l__embrac_emph_obrackets_before_prop { #1 } + \prop_del:Nn \l__embrac_emph_cbrackets_prop { #2 } + \prop_del:Nn \l__embrac_emph_cbrackets_after_prop { #2 } } % internal renew command: -\cs_new:Npn \embrac_renew_emph:nnnnnn #1#2#3#4#5#6 +\cs_new:Npn \__embrac_renew_emph:nnnnnn #1#2#3#4#5#6 { - \embrac_empty_or_no_value:nTF { #2 } - { \prop_put:Nnn \l_embrac_emph_obrackets_prop { #1 } { 0pt } } - { \prop_put:Nnn \l_embrac_emph_obrackets_prop { #1 } { #2 } } - \embrac_empty_or_no_value:nTF { #3 } - { \prop_put:Nnn \l_embrac_emph_obrackets_before_prop { #1 } { 0pt } } - { \prop_put:Nnn \l_embrac_emph_obrackets_before_prop { #1 } { #3 } } - \embrac_empty_or_no_value:nTF { #5 } - { \prop_put:Nnn \l_embrac_emph_cbrackets_prop { #4 } { 0pt } } - { \prop_put:Nnn \l_embrac_emph_cbrackets_prop { #4 } { #5 } } - \embrac_empty_or_no_value:nTF { #6 } - { \prop_put:Nnn \l_embrac_emph_cbrackets_after_prop { #4 } { 0pt } } - { \prop_put:Nnn \l_embrac_emph_cbrackets_after_prop { #4 } { #6 } } + \__embrac_empty_or_no_value:nTF { #2 } + { \prop_put:Nnn \l__embrac_emph_obrackets_prop { #1 } { 0pt } } + { \prop_put:Nnn \l__embrac_emph_obrackets_prop { #1 } { #2 } } + \__embrac_empty_or_no_value:nTF { #3 } + { \prop_put:Nnn \l__embrac_emph_obrackets_before_prop { #1 } { 0pt } } + { \prop_put:Nnn \l__embrac_emph_obrackets_before_prop { #1 } { #3 } } + \__embrac_empty_or_no_value:nTF { #5 } + { \prop_put:Nnn \l__embrac_emph_cbrackets_prop { #4 } { 0pt } } + { \prop_put:Nnn \l__embrac_emph_cbrackets_prop { #4 } { #5 } } + \__embrac_empty_or_no_value:nTF { #6 } + { \prop_put:Nnn \l__embrac_emph_cbrackets_after_prop { #4 } { 0pt } } + { \prop_put:Nnn \l__embrac_emph_cbrackets_after_prop { #4 } { #6 } } } % internal change command: -\cs_new:Npn \embrac_change_emph:nnnnnn #1#2#3#4#5#6 +\cs_new:Npn \__embrac_change_emph:nnnnnn #1#2#3#4#5#6 { - \prop_if_in:NnT \l_embrac_emph_obrackets_prop { #1 } + \prop_if_in:NnT \l__embrac_emph_obrackets_prop { #1 } { - \embrac_empty_or_no_value:nF { #2 } - { \prop_put:Nnn \l_embrac_emph_obrackets_prop { #1 } { #2 } } - \embrac_empty_or_no_value:nF { #3 } - { \prop_put:Nnn \l_embrac_emph_obrackets_before_prop { #1 } { #3 } } + \__embrac_empty_or_no_value:nF { #2 } + { \prop_put:Nnn \l__embrac_emph_obrackets_prop { #1 } { #2 } } + \__embrac_empty_or_no_value:nF { #3 } + { \prop_put:Nnn \l__embrac_emph_obrackets_before_prop { #1 } { #3 } } } - \prop_if_in:NnT \l_embrac_emph_cbrackets_prop { #4 } + \prop_if_in:NnT \l__embrac_emph_cbrackets_prop { #4 } { - \embrac_empty_or_no_value:nF { #5 } - { \prop_put:Nnn \l_embrac_emph_cbrackets_prop { #4 } { #5 } } - \embrac_empty_or_no_value:nF { #6 } - { \prop_put:Nnn \l_embrac_emph_cbrackets_after_prop { #4 } { #6 } } + \__embrac_empty_or_no_value:nF { #5 } + { \prop_put:Nnn \l__embrac_emph_cbrackets_prop { #4 } { #5 } } + \__embrac_empty_or_no_value:nF { #6 } + { \prop_put:Nnn \l__embrac_emph_cbrackets_after_prop { #4 } { #6 } } } } @@ -241,13 +275,13 @@ m > { \SplitArgument { 1 } { , } } O{,} } { - \embrac_add_to_emph:nnnnnn { #1 } #2 { #3 } #4 + \__embrac_add_to_emph:nnnnnn { #1 } #2 { #3 } #4 \ignorespaces } \NewDocumentCommand \DeleteEmph { mm } { - \embrac_remove_from_emph:nn { #1 } { #2 } + \__embrac_remove_from_emph:nn { #1 } { #2 } \ignorespaces } @@ -257,7 +291,7 @@ m > { \SplitArgument { 1 } { , } } O{,} } { - \embrac_renew_emph:nnnnnn { #1 } #2 { #3 } #4 + \__embrac_renew_emph:nnnnnn { #1 } #2 { #3 } #4 \ignorespaces } @@ -267,7 +301,7 @@ m > { \SplitArgument { 1 } { , } } O{,} } { - \embrac_change_emph:nnnnnn { #1 } #2 { #3 } #4 + \__embrac_change_emph:nnnnnn { #1 } #2 { #3 } #4 \ignorespaces } @@ -277,9 +311,13 @@ \ProcessKeysOptions { embrac } +\AtBeginDocument { \__embrac_treat_bibemph: } + \tex_endinput:D % HISTORY 2012/06/29 - v0.1 - first public release 2012/06/29 - v0.1a - renamed \RenewEmph => \ChangeEmph and added new \RenewEmph -2012/07/24 - v0.1b - adapted to deprecated functions in l3kernel and l3packages \ No newline at end of file +2012/07/24 - v0.1b - adapted to deprecated functions in l3kernel and l3packages +2012/11/04 - v0.2 - extended `biblatex' option: parens/full + - changed buggy definition of \EmbracOff and \EmbracOn \ No newline at end of file -- cgit v1.2.3