Use \providecommand for logical markup macros

\strong is already defined by recent fontspec.

Also use non-long definition (starred version), since the insets
only contain one paragraph.

diff --git a/lib/layouts/logicalmkup.module b/lib/layouts/logicalmkup.module
index a0629ea776f769910b12c22df7259cab3cd452c1..0bf5332d9f820d963830fb3fb59b43f78e98efb0 100644 (file)
--- a/lib/layouts/logicalmkup.module
+++ b/lib/layouts/logicalmkup.module
@@ -52,7 +52,7 @@ InsetLayout Flex:Strong
          Series              Bold
        EndFont
        Preamble
-       \newcommand{\strong}[1]{\textbf{#1}}
+       \providecommand*{\strong}[1]{\textbf{#1}}
        EndPreamble
        InToc                 true
        HTMLTag               strong
@@ -69,7 +69,7 @@ InsetLayout Flex:Code
          Family              Typewriter
        EndFont
        Preamble
-       \newcommand{\code}[1]{\texttt{#1}}
+       \providecommand*{\code}[1]{\texttt{#1}}
        EndPreamble
        InToc                 true
        HTMLTag               code

diff --git a/status.22x b/status.22x
index 87188255c52f79543e45503f9c967ba353801da6..af1f39f82995299308090c64a1489b5050cde2b9 100644 (file)
--- a/status.22x
+++ b/status.22x
@@ -134,6 +134,9 @@ What's new
 
 - Fix CopyRightYear with ACMSiggraph 0.9.3.
 
+- Use \providecommand for logical markup macros. This fixes a LaTeX error
+  with strong and fontenc.
+
 
 * LYX2LYX