Fix special case of bug #7811: Clash of bbding and marvosym packages if \Cross is...

The clash can however still happen if those packages are both loaded for other symbols.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39885 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/unicodesymbols b/lib/unicodesymbols
index 6aefe6045562b8e679959ca5b1fb8e58e4ec4b5d..1460cb63ddfba103a9d6e95cdcdbd415cbf18cc6 100644 (file)
--- a/lib/unicodesymbols
+++ b/lib/unicodesymbols
@@ -2018,7 +2018,7 @@
 0x271a "\\Plus"                   "bbding" "" # HEAVY GREEK CROSS
 0x271b "\\PlusThinCenterOpen"     "bbding" "" # OPEN CENTRE CROSS
 0x271c "\\PlusCenterOpen"         "bbding" "" # HEAVY OPEN CENTRE CROSS
-0x271d "\\Cross"                  "bbding" "" # LATIN CROSS
+0x271d "\\Cross"                  "bbding|marvosym" "" "" "" # LATIN CROSS
 0x271e "\\CrossOpenShadow"        "bbding" "" # SHADOWED WHITE LATIN CROSS
 0x271f "\\CrossOutline"           "bbding" "" # OUTLINED LATIN CROSS
 0x2720 "\\CrossMaltese"           "bbding" "" "\\maltese" "amssymb" # MALTESE CROSS