TheCloud/Digital
1
0
Fork 0
mirror of https://github.com/hneemann/Digital.git synced 2025-09-22 20:01:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

adds a \vee and \wedge command

Browse Source
This commit is contained in:
hneemann 2021-03-14 08:09:57 +01:00
parent 39ae6ead0a
commit 769da5b07f
4 changed files with 65 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/dig/misc/TextFormatExample.dig
View File

@ -74,7 +74,7 @@ of ~{s_1^{n+1}} in detail.
von ~{s_1^{n+1}} im Detail erklärt.}}</string> von ~{s_1^{n+1}} im Detail erklärt.}}</string>
</entry> </entry>
</elementAttributes> </elementAttributes>
<pos x="-120" y="400"/> <pos x="-120" y="440"/>
</visualElement> </visualElement>
<visualElement> <visualElement>
<elementName>In</elementName> <elementName>In</elementName>
@ -136,6 +136,36 @@ von ~{s_1^{n+1}} im Detail erklärt.}}</string>
</elementAttributes> </elementAttributes>
<pos x="140" y="340"/> <pos x="140" y="340"/>
</visualElement> </visualElement>
<visualElement>
<elementName>In</elementName>
<elementAttributes>
<entry>
<string>Label</string>
<string>A\wedge{}B</string>
</entry>
</elementAttributes>
<pos x="-20" y="400"/>
</visualElement>
<visualElement>
<elementName>In</elementName>
<elementAttributes>
<entry>
<string>Label</string>
<string>~{A\vee{}B}</string>
</entry>
</elementAttributes>
<pos x="140" y="400"/>
</visualElement>
<visualElement>
<elementName>In</elementName>
<elementAttributes>
<entry>
<string>Label</string>
<string>\neg{}A</string>
</entry>
</elementAttributes>
<pos x="300" y="400"/>
</visualElement>
</visualElements> </visualElements>
<wires/> <wires/>
<measurementOrdering/> <measurementOrdering/>

20
src/main/java/de/neemann/digital/draw/graphics/text/Parser.java
View File

@ -14,11 +14,14 @@ import java.util.HashMap;
* The text parser * The text parser
*/ */
public class Parser { public class Parser {
private static final HashMap<String, String> COMMANDS = new HashMap<>(); private static final HashMap<String, java.lang.Character> COMMANDS = new HashMap<>();
static { static {
COMMANDS.put("sum", "∑"); COMMANDS.put("sum", '∑');
COMMANDS.put("prod", "∏"); COMMANDS.put("prod", '∏');
COMMANDS.put("wedge", '∧');
COMMANDS.put("vee", '∨');
COMMANDS.put("neg", '¬');
} }
private final String text; private final String text;
@ -103,6 +106,10 @@ public class Parser {
getChar(); getChar();
sentence.getIndex().addSub(parseBrace()); sentence.getIndex().addSub(parseBrace());
break; break;
case '{':
getChar();
expect('}');
break;
case '^': case '^':
getChar(); getChar();
sentence.getIndex().addSuper(parseBrace()); sentence.getIndex().addSuper(parseBrace());
@ -118,10 +125,11 @@ public class Parser {
break; break;
default: default:
String command = readWord(); String command = readWord();
String t = COMMANDS.get(command); java.lang.Character t = COMMANDS.get(command);
if (t == null) if (t == null)
t = '\\' + command; sentence.add(new Simple('\\' + command));
sentence.add(new Simple(t).simplify()); else
sentence.add(new Character(t));
} }
break; break;

10
src/main/java/de/neemann/digital/draw/graphics/text/formatter/LaTeXFormatter.java
View File

@ -132,6 +132,16 @@ public final class LaTeXFormatter {
return "\\prod "; return "\\prod ";
else else
return "$\\prod$"; return "$\\prod$";
case '∧':
if (inMath)
return "\\wedge ";
else
return "$\\wedge$";
case '∨':
if (inMath)
return "\\vee ";
else
return "$\\vee$";
default: default:
return "" + aChar; return "" + aChar;
} }

10
src/test/java/de/neemann/digital/draw/graphics/text/formatter/LaTeXFormatterTest.java
View File

@ -39,5 +39,15 @@ public class LaTeXFormatterTest extends TestCase {
public void testSumProd() throws ParseException { public void testSumProd() throws ParseException {
assertEquals("$\\sum ^a_{n=0}$", LaTeXFormatter.format(new Parser("∑_{n=0}^a").parse())); assertEquals("$\\sum ^a_{n=0}$", LaTeXFormatter.format(new Parser("∑_{n=0}^a").parse()));
assertEquals("$\\prod ^a_{n=0}$", LaTeXFormatter.format(new Parser("∏_{n=0}^a").parse())); assertEquals("$\\prod ^a_{n=0}$", LaTeXFormatter.format(new Parser("∏_{n=0}^a").parse()));
assertEquals("$\\sum ^a_{n=0}$", LaTeXFormatter.format(new Parser("\\sum_{n=0}^a").parse()));
assertEquals("$\\prod ^a_{n=0}$", LaTeXFormatter.format(new Parser("\\prod_{n=0}^a").parse()));
}
public void testVeeWedge() throws ParseException {
assertEquals("A $\\vee$ B", LaTeXFormatter.format(new Parser("A \\vee B").parse()));
assertEquals("A $\\vee$ B", LaTeXFormatter.format(new Parser("A ∨ B").parse()));
assertEquals("A$\\vee$B", LaTeXFormatter.format(new Parser("A∨B").parse()));
assertEquals("$A \\wedge B$", LaTeXFormatter.format(new Parser("$A \\wedge B$").parse()));
assertEquals("$A\\wedge B$", LaTeXFormatter.format(new Parser("$A\\wedge{}B$").parse()));
} }
} }