summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/embrac
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-02-21 03:01:41 +0000
committerNorbert Preining <norbert@preining.info>2021-02-21 03:01:41 +0000
commitf35565737733e319e7293a9fafe1b78e87f8a14e (patch)
tree197b08b39b09262f4e71486f610106580871631d /macros/latex/contrib/embrac
parentb94dba90d83866ccb6db5273d214512e859c3179 (diff)
CTAN sync 202102210301
Diffstat (limited to 'macros/latex/contrib/embrac')
-rw-r--r--macros/latex/contrib/embrac/README12
-rw-r--r--macros/latex/contrib/embrac/embrac.sty75
-rw-r--r--macros/latex/contrib/embrac/embrac_en.pdfbin458551 -> 458837 bytes
-rw-r--r--macros/latex/contrib/embrac/embrac_en.tex13
-rw-r--r--macros/latex/contrib/embrac/embrac_kerning_test.tex27
5 files changed, 73 insertions, 54 deletions
diff --git a/macros/latex/contrib/embrac/README b/macros/latex/contrib/embrac/README
index 43d046d330..d8a8085082 100644
--- a/macros/latex/contrib/embrac/README
+++ b/macros/latex/contrib/embrac/README
@@ -3,21 +3,21 @@ the EMBRAC package
Upright Brackets in Emphasized Text
-2019/12/31 v0.9
+2021/02/20 v0.9a
--------------------------------------------------------------------------
Clemens Niederberger
-Web: https://bitbucket.org/cgnieder/embrac/
+Web: https://github.com/cgnieder/embrac/
E-Mail: contact@mychemistry.eu
--------------------------------------------------------------------------
-Copyright 2012--2019 Clemens Niederberger
+Copyright 2012--2021 Clemens Niederberger
This work may be distributed and/or modified under the
-conditions of the LaTeX Project Public License, either version 1.3
+conditions of the LaTeX Project Public License, either version 1.3c
of this license or (at your option) any later version.
The latest version of this license is in
http://www.latex-project.org/lppl.txt
-and version 1.3 or later is part of all distributions of LaTeX
-version 2005/12/01 or later.
+and version 1.3c or later is part of all distributions of LaTeX
+version 2008/05/04 or later.
This work has the LPPL maintenance status `maintained'.
diff --git a/macros/latex/contrib/embrac/embrac.sty b/macros/latex/contrib/embrac/embrac.sty
index 55786b982a..7065a8709d 100644
--- a/macros/latex/contrib/embrac/embrac.sty
+++ b/macros/latex/contrib/embrac/embrac.sty
@@ -5,18 +5,18 @@
%
% --------------------------------------------------------------------------
% Clemens Niederberger
-% Web: https://bitbucket.org/cgnieder/embrac/
+% Web: https://github.com/cgnieder/embrac/
% E-Mail: contact@mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2012--2019 Clemens Niederberger
+% Copyright 2012--2021 Clemens Niederberger
%
% This work may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
+% conditions of the LaTeX Project Public License, either version 1.3c
% of this license or (at your option) any later version.
% The latest version of this license is in
% http://www.latex-project.org/lppl.txt
-% and version 1.3 or later is part of all distributions of LaTeX
-% version 2005/12/01 or later.
+% and version 1.3c or later is part of all distributions of LaTeX
+% version 2008/05/04 or later.
%
% This work has the LPPL maintenance status `maintained'.
%
@@ -34,11 +34,18 @@
\RequirePackage { expl3 , xparse , l3keys2e }
\ProvidesExplPackage
{embrac}
- {2019/12/31}
- {0.9}
+ {2021/02/20}
+ {0.9a}
{Upright Brackets in Emphasized Text}
% --------------------------------------------------------------------------
+\msg_new:nnn {embrac} {patching}
+ { Patching~ \token_to_str:c {#1} ... }
+
+\msg_new:nnn {embrac} {not-patching}
+ { \token_to_str:c {#1} ~ not~ defined.~ Not~ patching~ it ... }
+
+% --------------------------------------------------------------------------
\bool_new:N \l__embrac_treat_biblatex_bool
\tl_new:N \l__embrac_tmpa_tl
@@ -116,7 +123,7 @@
\tl_replace_all:Nnn #1 {#3}
{
\mode_if_math:TF
- {#4}
+ {#3}
{
\embrac_nobreak:
\embrac_kern:n {#2}
@@ -215,30 +222,35 @@
% #1: name of macro to be treated
\cs_new_protected:Npn \embrac_new_replacement_macro:n #1
{
- \seq_put_right:Nn \l__embrac_changed_macros_seq {#1}
- \cs_new_eq:cc {embrac_orig_#1:n} {#1~}
- \cs_generate_variant:cn {embrac_orig_#1:n} {V}
- \cs_new_protected:cpn {__embrac_#1:n} ##1
- {
- \tl_set:Nn \l__embrac_tmpa_tl {##1}
- \embrac_replace_brackets:N \l__embrac_tmpa_tl
- \use:c {embrac_orig_#1:V} \l__embrac_tmpa_tl
- }
- \cs_new_protected:cpn {embrac_#1:nn} ##1##2
- {
- \group_begin:
- \embrac_treat_bibparens:
- \tl_if_eq:nnTF {##1} {*}
- { \use:c {embrac_orig_#1:n} {##2} }
- { \use:c {__embrac_#1:n} {##2} }
- \group_end:
- }
- \exp_args:Nc \RenewDocumentCommand {#1} {sm}
+ \cs_if_exist:cTF {#1}
{
- \IfBooleanTF {##1}
- { \use:c {embrac_#1:nn} {*} {##2} }
- { \use:c {embrac_#1:nn} { } {##2} }
+ \msg_info:nnn {embrac} {patching} {#1}
+ \seq_put_right:Nn \l__embrac_changed_macros_seq {#1}
+ \cs_new_eq:cc {embrac_orig_#1:n} {#1~}
+ \cs_generate_variant:cn {embrac_orig_#1:n} {V}
+ \cs_new_protected:cpn {__embrac_#1:n} ##1
+ {
+ \tl_set:Nn \l__embrac_tmpa_tl {##1}
+ \embrac_replace_brackets:N \l__embrac_tmpa_tl
+ \use:c {embrac_orig_#1:V} \l__embrac_tmpa_tl
+ }
+ \cs_new_protected:cpn {embrac_#1:nn} ##1##2
+ {
+ \group_begin:
+ \embrac_treat_bibparens:
+ \tl_if_eq:nnTF {##1} {*}
+ { \use:c {embrac_orig_#1:n} {##2} }
+ { \use:c {__embrac_#1:n} {##2} }
+ \group_end:
+ }
+ \exp_args:Nc \RenewDocumentCommand {#1} {sm}
+ {
+ \IfBooleanTF {##1}
+ { \use:c {embrac_#1:nn} {*} {##2} }
+ { \use:c {embrac_#1:nn} { } {##2} }
+ }
}
+ { \msg_info:nnn {embrac} {not-patching} {#1} }
}
\NewDocumentCommand \EmbracMakeKnown {m}
@@ -512,7 +524,7 @@
2014/06/24 - v0.6 - add support for \textsl
2014/07/03 - v0.6a - bugfix: remove unwanted (and unnecessary) expansion in
\__embrac_emph:n
-2015/09/06 - v0.6b - fix https://bitbucket.org/cgnieder/embrac/issues/5
+2015/09/06 - v0.6b - fix https://github.com/cgnieder/embrac/issues/5
2015/11/13 - v0.6c - avoid code duplication
2016/01/07 - v0.6d - \prop_get:Nn => \prop_item:Nn
2017/07/04 - v0.7 - implement issue #8 (now treatment of symbols with catcode
@@ -521,3 +533,4 @@
- new macros \embparen, \embbracket and \emb
2019/12/31 - v0.9 - new: \EmbracMakeKnown
- change penalties
+2021/02/20 - v0.9a - fix issue #13
diff --git a/macros/latex/contrib/embrac/embrac_en.pdf b/macros/latex/contrib/embrac/embrac_en.pdf
index 99e0a7ecd7..2051506a19 100644
--- a/macros/latex/contrib/embrac/embrac_en.pdf
+++ b/macros/latex/contrib/embrac/embrac_en.pdf
Binary files differ
diff --git a/macros/latex/contrib/embrac/embrac_en.tex b/macros/latex/contrib/embrac/embrac_en.tex
index b1265849a8..9f4f710f5d 100644
--- a/macros/latex/contrib/embrac/embrac_en.tex
+++ b/macros/latex/contrib/embrac/embrac_en.tex
@@ -9,32 +9,31 @@
%
% --------------------------------------------------------------------------
% Clemens Niederberger
-% Web: https://bitbucket.org/cgnieder/embrac/
+% Web: https://github.com/cgnieder/embrac/
% E-Mail: contact@mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2012--2019 Clemens Niederberger
+% Copyright 2012--2021 Clemens Niederberger
%
% This work may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
+% conditions of the LaTeX Project Public License, either version 1.3c
% of this license or (at your option) any later version.
% The latest version of this license is in
% http://www.latex-project.org/lppl.txt
-% and version 1.3 or later is part of all distributions of LaTeX
-% version 2005/12/01 or later.
+% and version 1.3c or later is part of all distributions of LaTeX
+% version 2008/05/04 or later.
%
% This work has the LPPL maintenance status `maintained'.
%
% The Current Maintainer of this work is Clemens Niederberger.
% --------------------------------------------------------------------------
\documentclass[load-preamble+]{cnltx-doc}
-\usepackage[utf8]{inputenc}
\usepackage[biblatex]{embrac}
\setcnltx{
package = embrac ,
authors = Clemens Niederberger ,
email = contact@mychemistry.eu ,
- url = https://bitbucket.org/cgnieder/embrac/ ,
+ url = https://github.com/cgnieder/embrac/ ,
quote-author-format = ,
add-cmds = {
AddEmph,
diff --git a/macros/latex/contrib/embrac/embrac_kerning_test.tex b/macros/latex/contrib/embrac/embrac_kerning_test.tex
index dbd52af477..94d2cc33fa 100644
--- a/macros/latex/contrib/embrac/embrac_kerning_test.tex
+++ b/macros/latex/contrib/embrac/embrac_kerning_test.tex
@@ -6,18 +6,18 @@
%
% --------------------------------------------------------------------------
% Clemens Niederberger
-% Web: https://bitbucket.org/cgnieder/embrac/
+% Web: https://github.com/cgnieder/embrac/
% E-Mail: contact@mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2012 Clemens Niederberger
+% Copyright 2012--2021 Clemens Niederberger
%
% This work may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
+% conditions of the LaTeX Project Public License, either version 1.3c
% of this license or (at your option) any later version.
% The latest version of this license is in
% http://www.latex-project.org/lppl.txt
-% and version 1.3 or later is part of all distributions of LaTeX
-% version 2005/12/01 or later.
+% and version 1.3c or later is part of all distributions of LaTeX
+% version 2008/05/04 or later.
%
% This work has the LPPL maintenance status `maintained'.
%
@@ -31,12 +31,18 @@
% feel free to contact me.
% --------------------------------------------------------------------------
\documentclass{scrartcl}
-% \usepackage[T1]{fontenc}
-\usepackage{fontspec}
+\usepackage[T1]{fontenc}
+% \usepackage{fontspec}
% load desired font, for example:
-\usepackage{libertine}
+% \usepackage{libertine}
% \setmainfont{Minion Pro}
+\usepackage[p,osf]{ETbb} % osf in text, tabular lining figures in math
+\usepackage[scaled=.95,type1]{cabin} % sans serif in style of Gill Sans
+\usepackage[varqu,varl]{zi4}% inconsolata typewriter
+\usepackage[T1]{fontenc} % LY1 also works
+\usepackage[libertine,vvarbb]{newtxmath}
+
\usepackage{embrac}
@@ -66,8 +72,9 @@
\hrulefill
% your changes:
-% \RenewEmph{[}[<io>,<oo>]{]}[<ic>,<oc>]
-% \RenewEmph{(}[<io>,<oo>]{)}[<ic>,<oc>]
+% oo(io ic)oc
+\RenewEmph{[}[0pt,-.09em]{]}[.055em,-.09em]
+\ChangeEmph{(}[-.01em,-.09em]{)}[.04em,-.09em]
\emph{This is emphasized [sic] text with [long] bla.}
\emph{This is emphasized text [as you can see].}