Merge pull request #1361 from mathics/nand-nor-symbols

Convert unicode nand and nor in TeX

Author: rocky

mathics/builtin/logic.py

@@ -138,7 +138,7 @@ class Nand(Builtin):
     """
     <dl>
     <dt>'Nand[$expr1$, $expr2$, ...]'
-    <dt>'$expr1$ && $expr2$ && ...'
+    <dt>'$expr1$ \u22BC $expr2$ \u22BC ...'
         <dd> Implements the logical NAND function.  The same as 'Not[And['$expr1$, $expr2$, ...']]'
     </dl>
     >> Nand[True, False]
@@ -154,7 +154,7 @@ class Nor(Builtin):
     """
     <dl>
     <dt>'Nor[$expr1$, $expr2$, ...]'
-    <dt>'$expr1$ && $expr2$ && ...'
+    <dt>'$expr1$ \u22BD $expr2$ \u22BD ...'
         <dd>Implements the logical NOR function.  The same as 'Not[Or['$expr1$, $expr2$, ...']]'
     </dl>
     >> Nor[True, False]

mathics/doc/doc.py

@@ -251,6 +251,8 @@ def repl_list(match):
         text,
         [
             ("$", r"\$"),
+            ("\u22bc", "nand"),  # \barwedge isn't working
+            ("\u22bd", "nor"),   # \vebarr isn't working
             ("\u03c0", r"$\pi$"),
             ("\u2265", r"$\ge$"),
             ("\u2264", r"$\le$"),

mathics/doc/tex/mathics.tex

@@ -16,6 +16,7 @@
 \usepackage{graphics}
 \usepackage{textcomp}
 \usepackage{amsmath}
+\usepackage{amssymb}
 \usepackage{mathpazo}
 \usepackage[mathpazo]{flexisym}
 \usepackage{breqn}