From: Juergen Spitzmueller <spitz@lyx.org>
Date: Fri, 17 Feb 2017 07:35:41 +0000 (+0100)
Subject: Use \providecommand for logical markup macros
X-Git-Tag: 2.2.3~57
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=c8f40508e7df36616f1f881364b9adab6e1b6300;p=features.git

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 a0629ea776..0bf5332d9f 100644
--- 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 87188255c5..af1f39f829 100644
--- 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