embrac (7sep15)

git-svn-id: svn://tug.org/texlive/trunk@38317 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 25 insertions, 20 deletions

diff --git a/Master/texmf-dist/doc/latex/embrac/README b/Master/texmf-dist/doc/latex/embrac/README
index af38cca1bfe..9f32b109840 100644
--- a/Master/texmf-dist/doc/latex/embrac/README
+++ b/Master/texmf-dist/doc/latex/embrac/README
@@ -3,13 +3,13 @@ the EMBRAC package
 
   Upright Brackets in Emphasized Text
 
-2014/07/03 v0.6a
+2015/09/06 v0.6b
 --------------------------------------------------------------------------
 Clemens Niederberger
 Web:    https://bitbucket.org/cgnieder/embrac/
 E-Mail: contact@mychemistry.eu
 --------------------------------------------------------------------------
-Copyright 2012--2014 Clemens Niederberger
+Copyright 2012--2015 Clemens Niederberger
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/doc/latex/embrac/embrac_en.pdf b/Master/texmf-dist/doc/latex/embrac/embrac_en.pdf
index 0fe41a013b0..3fa24743bc0 100644
--- a/Master/texmf-dist/doc/latex/embrac/embrac_en.pdf
+++ b/Master/texmf-dist/doc/latex/embrac/embrac_en.pdf
diff --git a/Master/texmf-dist/doc/latex/embrac/embrac_en.tex b/Master/texmf-dist/doc/latex/embrac/embrac_en.tex
index 4094b856111..4e95a42ae34 100644
--- a/Master/texmf-dist/doc/latex/embrac/embrac_en.tex
+++ b/Master/texmf-dist/doc/latex/embrac/embrac_en.tex
@@ -12,8 +12,8 @@
 % Web:    https://bitbucket.org/cgnieder/embrac/
 % E-Mail: contact@mychemistry.eu
 % --------------------------------------------------------------------------
-% Copyright 2012 Clemens Niederberger
-% 
+% Copyright 2012--2015 Clemens Niederberger
+%
 % 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 (at your option) any later version.
@@ -21,9 +21,9 @@
 %   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.
-% 
+%
 % This work has the LPPL maintenance status `maintained'.
-% 
+%
 % The Current Maintainer of this work is Clemens Niederberger.
 % --------------------------------------------------------------------------
 \documentclass[load-preamble+]{cnltx-doc}
diff --git a/Master/texmf-dist/tex/latex/embrac/embrac.sty b/Master/texmf-dist/tex/latex/embrac/embrac.sty
index 1c0ce699f5d..65cb1ca5463 100644
--- a/Master/texmf-dist/tex/latex/embrac/embrac.sty
+++ b/Master/texmf-dist/tex/latex/embrac/embrac.sty
@@ -8,7 +8,7 @@
 % Web:    https://bitbucket.org/cgnieder/embrac/
 % E-Mail: contact@mychemistry.eu
 % --------------------------------------------------------------------------
-% Copyright 2012--2014 Clemens Niederberger
+% Copyright 2012--2015 Clemens Niederberger
 % 
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
@@ -34,16 +34,16 @@
 \RequirePackage { expl3 , xparse , l3keys2e }
 \ProvidesExplPackage
   {embrac}
-  {2014/07/03}
-  {0.6a}
+  {2015/09/06}
+  {0.6b}
   {Upright Brackets in Emphasized Text}
 
 % --------------------------------------------------------------------------
 % check expl3 version:
-\@ifpackagelater { expl3 } { 2012/11/21 }
+\@ifpackagelater {expl3} {2012/11/21}
   { }
   {
-    \PackageError { embrac } { Support~package~expl3~too~old }
+    \PackageError {embrac} { Support~package~expl3~too~old }
       {
         You~need~to~update~your~installation~of~the~bundles~'l3kernel'~and~
         'l3packages'.\MessageBreak
@@ -124,30 +124,34 @@
   {
     \prop_map_inline:Nn \l__embrac_emph_obrackets_prop
       {
-        \tl_replace_all:Nnn #1 { ##1 }
+        \tl_replace_all:Nnn #1 {##1}
           {
             \mode_if_math:TF
-              { ##1 }
+              {##1}
               {
                 \embrac_kern:n
-                  { \prop_get:Nn \l__embrac_emph_obrackets_before_prop { ##1 } }
-                \embrac_braces_format:n { ##1 \embrac_kern:n { ##2 } }
+                  { \prop_get:Nn \l__embrac_emph_obrackets_before_prop {##1} }
+                \embrac_nobreak:
+                \embrac_braces_format:n {##1}
+                \embrac_nobreak:
+                \embrac_kern:n {##2}
                 \embrac_nobreak:
               }
           }
       }
     \prop_map_inline:Nn \l__embrac_emph_cbrackets_prop
       {
-        \tl_replace_all:Nnn #1 { ##1 }
+        \tl_replace_all:Nnn #1 {##1}
           {
             \mode_if_math:TF
-              { ##1 }
+              {##1}
               {
                 \embrac_nobreak:
-                \embrac_braces_format:n
-                  { \embrac_kern:n { ##2 } ##1 }
+                \embrac_kern:n {##2}
+                \embrac_nobreak:
+                \embrac_braces_format:n {##1}
                 \embrac_kern:n
-                  { \prop_get:Nn \l__embrac_emph_cbrackets_after_prop { ##1 } }
+                  { \prop_get:Nn \l__embrac_emph_cbrackets_after_prop {##1} }
               }
           }
       }
@@ -573,3 +577,4 @@
 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