latex2nemeth (17sep21)

git-svn-id: svn://tug.org/texlive/trunk@60528 c570f23f-e606-0410-a88d-b1316a301751

7 files changed, 681 insertions, 80 deletions

diff --git a/Master/texmf-dist/doc/support/latex2nemeth/README b/Master/texmf-dist/doc/support/latex2nemeth/README
index e5a7588528a..cfabeb24dbb 100644
--- a/Master/texmf-dist/doc/support/latex2nemeth/README
+++ b/Master/texmf-dist/doc/support/latex2nemeth/README
@@ -1,6 +1,6 @@
 Latex2Nemeth
 ============
-Version 1.0.2
+Version 1.0.3
 
 ====================================
 
@@ -9,6 +9,8 @@ is basic macro support. The program supports
 simple replacement commands (such as \newcommand{}{}) 
 and commands with optional arguments 
 (such as \newcommand{\inner}[2]{\langle#1,#2\rangle}). 
+A bug in Windows loading the default Nemeth table has 
+also been corrected.
 
 =====================================
 
@@ -23,20 +25,20 @@ This is the source tree for Latex2Nemeth, a tool for translating TeX files to Br
 Licence
 -------
 
-Copyright 2016-2020 by Andreas Papasalοuros, Antonis Tsolomitis.
+Copyright 2016-2021 by Andreas Papasalοuros, Antonis Tsolomitis.
 
 This program is distributed under the GPL, version 3 or later. Please see the COPYING file for details.
 
 Dependencies
 ------------
 
-In order to use the tool, you need the following programs:
+In order to build the tool from source, you need the following programs:
 
-1. **Java**
+1. Java
 
     The tool has been tested with `Java 7` and `Java 8`.
 
-2. **Apache Maven**
+2. Apache Maven
    
     Apache Maven is a software project management and comprehension tool.
     - For Windows, download the [latest version](https://maven.apache.org/download.cgi).
@@ -45,7 +47,7 @@ In order to use the tool, you need the following programs:
             sudo apt-get install maven
 
 
-Installing
+Building
 ----------
 
 * Download Latex2Nemeth's sources. E.g. for anonymous access on SourceForge:
@@ -57,37 +59,46 @@ Installing
         cd /path/to/latex2nemeth
         mvn package -Dmaven.test.skip=true
 
-* **[Optional]** You can compile and also run the tests with `mvn package`
+* [Optional] You can compile and also run the tests with `mvn package`
 
 Usage
 -----
 
 After compiling the tool the executable `jar` will be located in the `target/` directory,
-e.g. `target/latex2nemeth-v1.0.2.jar`.
+e.g. `target/latex2nemeth.jar`.
 
 A simple to way to run the tool is
 
-        java -jar <latex2nemeth.jar> <tex-file> <aux-file>
+        java -jar latex2nemeth.jar <tex-file> <aux-file>
 
-**Options**
+Options
+-------
+Option                 Description
+--------------------------------------------------------------------------------  
+-e, --encoding <arg>   The encoding table for Braille Mathematical symbols in the form of 
+                       a JSON file.  If not specified, default Nemeth table is used. 
+
+-m,--mode <arg>        The mode of the parser which controls the type of the output
+                       Braille files. It can be either 'nemeth' or 'pef'. The default mode 
+                       is nemeth.
 
-|Option|Description|
-|------|-----------|  
-|-e,--encoding <arg>  | The encoding table for Braille Mathematical symbols in the form of a JSON file.  If not specified, default 		       Nemeth table is used. |
-| -m,--mode <arg>     | The mode of the parser which controls the type of the output Braille files. It can be either 'nemeth' or 'pef'. The default mode is nemeth.|
-| -o <arg>            | The output prefix of the Braille files. It can also be prefixed with a path to a specific directory. The default value is the name of the TeX file. The program generates an output file for each chapter in the input TeX file.|
+-o <arg>               The output prefix of the Braille files. It can also be prefixed 
+                       with a path to a specific directory. The default value is the name
+                       of the TeX file. The program generates an output file for each 
+                       chapter in the input TeX file.
 
-**Examples**
+Examples
+------------
   A simple example:
-        java -jar target/latex2nemeth-v1.0.2.jar src/test/resources/com/latex2nemeth/bootstrap/mathtest.tex src/test/resources/com/latex2nemeth/bootstrap/mathtest.aux
+        java -jar latex2nemeth.jar examples/mathtest.tex examples/mathtest.aux
  
   A more complicated example:
-        java -jar target/latex2nemeth-v1.0.2.jar src/test/resources/com/latex2nemeth/bootstrap/mathtest.tex src/test/resources/com/latex2nemeth/bootstrap/mathtest.aux -o ch -m nemeth -e src/test/resources/com/latex2nemeth/bootstrap/nemeth.json
+        java -jar latex2nemeth.jar examples/mathtest.tex examples/mathtest.aux -o ch -m nemeth -e encodings/nemeth.json
 
   An example with pictures:
-        java -jar target/latex2nemeth-v1.0.2.jar src/test/resources/com/latex2nemeth/bootstrap/mathpics.tex src/test/resources/com/latex2nemeth/bootstrap/mathpics.aux
+        java -jar latex2nemeth.jar examples/mathpics.tex examples/mathpics.aux
 
-**Notes**
+Notes
 -------------
 1. Input tex files must be in utf-8. If using another encoding (such as iso-8859-7) 
    run first LaTeX to produce the aux file and then convert the source.tex to utf-8 
@@ -95,7 +106,7 @@ A simple to way to run the tool is
 
         iconv -f iso8859-7 -t utf-8 source.tex > source-utf8.tex
 
-   or using your editor. Now run "java -jar latex2nemeth-v1.0.2.jar" as above with 
+   or using your editor. Now run "java -jar latex2nemeth.jar" as above with 
    source-utf8.tex as the tex file and source.aux as the aux file. If errors are 
    produced you need to modify the source-utf8.tex at the line indicated. 
    Usually the errors have to do either with non supported shortcuts for macros 
@@ -112,24 +123,18 @@ A simple to way to run the tool is
 
 3. To emboss the output open the produced source-utf8.nemeth in LibreOffice 
    with the odt2braille plugin installed, open it as "Unicode UTF-8 encoded text" 
-   and emboss as usually.
+   and emboss as usually. Steps 1,2, and 3 are automated with the use of the nemeth2odt Bash script, found in the contrib folder (only in Linux).
 
-4. Pictures are exported separately in text files. Currently only `pstricks` pictures are supported.
-Currently their preable is hardcoded in `com.latex2nemeth.utils.Preamble`.
+4. Pictures are exported separately in text files. Currently only `pstricks` pictures are 
+   supported. Currently their preable is hardcoded in `com.latex2nemeth.utils.Preamble`.
 
 5. In order to save space when braille pages are embossed a paragraph change corresponds
-to three spaces. Thus commands such as \\ (double backslash) are transcribed as three spaces.
-However, there are cases, such as in poems, that a change of line must occur from line to line.
-To support these cases, a new latex-type command, named \latextonemethnewline
-is understood by the program, which produces a new line. So the double backslash
-at the end of each line of a poem must be substituted by \latextonemethnewline. For LaTeX to run 
-smoothly a \newcommand can be introduced in the preamble, such as
-\newcommand{\latextonemethnewline}{\newline}
-
-6. It is possible to translate TeX files using different Braille alphabets. A different Braille alphabet
-is  encoded in a JSON file. For example, in order to translate a texfile  into polytonic Greek, the command is as follows:
+   to three spaces. Thus commands such as \\ (double backslash) are transcribed as three spaces. However, there are cases, such as in poems, that a change of line must occur from line to line. To support these cases, a new latex-type command, named \latextonemethnewline is understood by the program, which produces a new line. So the double backslash at the end of each line of a poem must be substituted by \latextonemethnewline. For LaTeX to run smoothly a \newcommand can be introduced in the preamble, such as \newcommand{\latextonemethnewline}{\newline}
+
+6. It is possible to translate TeX files using different Braille alphabets. A different 
+   Braille alphabet is  encoded in a JSON file. For example, in order to translate a texfile  into polytonic Greek, the command is as follows:
  
-	 java -jar latex2nemeth-v1.0.2.jar texfile.tex auxfile.aux  -e /path/to/polytonic.json
+	 java -jar latex2nemeth.jar texfile.tex auxfile.aux  -e /path/to/polytonic.json
 
 Please report issues related to erratic output to a n d p a p a s [AT] a e g e a n . g r
 and issues related to the tex file handling/modifying to a n t o n i s . t s o l o m i t i s [AT] g m a i l . c o m 
diff --git a/Master/texmf-dist/doc/support/latex2nemeth/contrib/nemeth2odt b/Master/texmf-dist/doc/support/latex2nemeth/contrib/nemeth2odt
new file mode 100644
index 00000000000..9777f9322f4
--- /dev/null
+++ b/Master/texmf-dist/doc/support/latex2nemeth/contrib/nemeth2odt
@@ -0,0 +1,30 @@
+#!/bin/bash
+#get a random name first of 8 chars
+tmpdir=`cat /dev/urandom | tr -cd 'a-f0-9' | head -c 8`
+
+#make a folder
+mkdir $tmpdir
+
+#get the base name of the fole to convert
+file=`basename "$1" .nemeth`
+
+#convert nemeth from utf16 to utf8
+iconv -f utf-16 -t utf-8 "$1" > $file.txt
+
+#convert txt file to odt
+libreoffice --headless --convert-to odt $file.txt 1>/dev/null
+
+# odt is setup with a bultintemplate for convertions
+#from text, that uses Liberation Mono font.
+#we need DejaVu Serif. We change the font and repack 
+#the odt file
+unzip -qq -d $tmpdir $file.odt
+rm -f $file.odt
+find $tmpdir -type f | xargs sed -i 's/Liberation Mono/DejaVu Serif/g'
+( cd $tmpdir; zip -qq -r ../$file.odt . )
+
+#cleanup
+/bin/rm -rf $tmpdir $file.txt
+
+
+
diff --git a/Master/texmf-dist/doc/support/latex2nemeth/examples/nemeth.json b/Master/texmf-dist/doc/support/latex2nemeth/encodings/nemeth.json
index 6c395dedd4c..75be79b10c6 100644
--- a/Master/texmf-dist/doc/support/latex2nemeth/examples/nemeth.json
+++ b/Master/texmf-dist/doc/support/latex2nemeth/encodings/nemeth.json
@@ -1,5 +1,7 @@
 {
   "letters": {
+    "\\&":"⠸⠯",
+    "\\$": "⠈⠎",
     ".": "\u2832",
     ",": "\u2802",
     ";": "\u2822",
@@ -13,6 +15,7 @@
     "\\}": "\u2828\u283e",
     "\\{": "\u2828\u2837",
     "\\_": "\u2824\u2824",
+    "\\%": "\u2808\u2834",
     ":": "\u2806",
     "?": "\u2838\u2826",
     "!": "\u2816",
@@ -23,9 +26,29 @@
     "-": "\u2824",
     "=": "\u282d",
     "\\backslash": "\u2838\u2821",
+    "\\aa": "⠁⠣⠨⠡",
+    "\\AA": "⠈⠠⠁",
+    "\\cent": "⠈⠉",
+    "\\dag": "⠸⠻",
+    "\\dj": "⠈⠫",
+    "\\P": "⠈⠠⠏",
+	"\\planck": "⠈⠓", 
+	"\\pounds": "⠈⠇",
+	"\\qoppa": "⠨⠟",
+	"\\S": "⠈⠠⠎",
+	"\\samp": "⠨⠉",
+	"\\stigma": "⠨⠮",
+	"\\textasciicircum": "⠸⠣",
+	"\\textbackslash": "⠸⠡",
+	"\\textregistered": "⠫⠉⠸⠫⠠⠗⠻",
+	"\\textsection": "⠈⠠⠎",
+	"\\texttrademark": "⠘⠠⠞⠠⠍",
+	"\\textvisiblespace": "⠿",
+	"\\trianglelefteq": "⠫⠐⠅⠇⠱⠻",
+	"\\varsupsetneq": "⠸⠨⠂⠌⠱",
+	"\\VDash": "⠫⠳⠳⠒⠒",
     "\\#": "\u2828\u283c",
-    "\\&": "\u282f",
-    "\\ ": " ",
+     "\\ ": " ",
     "\\,": "\u2802",
     "--": "\u2824\u2824",
     "---": "\u2824\u2824\u2824",
@@ -34,6 +57,7 @@
     " ": " ",
     "\\quad": " ",
     "\\qquad": " ",
+    "\"": "\u2834\u2804",
     "#": "\u283c",
     "0": "\u2834",
     "1": "\u2802",
@@ -210,7 +234,538 @@
     "\\textbf-close": "\u2838\u2820\u2804",
     "\\textit": "\u2828",
     "\\textit-open": "\u2820\u2804\u2838",
-    "\\textit-close": "\u2838\u2820\u2804"
+    "\\textit-close": "\u2838\u2820\u2804",
+    "\\copyright": "\u282b\u2809\u2838\u282b\u2820\u2809\u283b",
+    "\\sampi": "\u2828\u2809",
+    "\\textcircled-open":"⠫⠉⠸⠫",
+    "\\textcircled-close": "⠻",  
+    "b-allcaps": "⠨⠨⠨",
+    "e-allcaps": "⠨⠨⠨",
+    "\\latextonemethnewline": "\n",
+    "\\bf": "", 
+    "\\it": "", 
+    "\\=": "",
+    "\\>": "",
+    "ΐ": "⠊",
+    "ΰ": "⠽",
+   "\\noindent": "",
+   "\\hfill": " ",
+   "\\bigskip": "   ",
+   "\\smallskip": "   ",
+   "\\medskip": "   ",  
+"αὶ": "⠈⠣",
+"αί": "⠐⠣",
+"αἰ": "⠣",
+"αἱ": "⠧⠣",
+"αἲ": "⠾⠣",
+"αἳ": "⠷⠣",
+"αἴ": "⠴⠣",
+"αἵ": "⠢⠣",
+"αἶ": "⠲⠣",
+"αἷ": "⠖⠣",
+"Αὶ": "⠨⠈⠣",
+"Αί": "⠨⠐⠣",
+"Αἰ": "⠨⠣",
+"Αἱ": "⠨⠧⠣",
+"Αἲ": "⠨⠾⠣",
+"Αἳ": "⠨⠷⠣",
+"Αἴ": "⠨⠴⠣",
+"Αἵ": "⠨⠢⠣",
+"Αἶ": "⠨⠲⠣",
+"Αἷ": "⠨⠖⠣",
+"εὶ": "⠈⠩",
+"εί": "⠐⠩",
+"εἰ": "⠩",
+"εἱ": "⠧⠩",
+"εἲ": "⠾⠩",
+"εἳ": "⠷⠩",
+"εἴ": "⠴⠩",
+"εἵ": "⠢⠩",
+"εἶ": "⠲⠩",
+"εἷ": "⠖⠩",
+"Εὶ": "⠨⠈⠩",
+"Εί": "⠨⠐⠩",
+"Εἰ": "⠨⠩",
+"Εἱ": "⠨⠧⠩",
+"Εἲ": "⠨⠾⠩",
+"Εἳ": "⠨⠷⠩",
+"Εἴ": "⠨⠴⠩",
+"Εἵ": "⠨⠢⠩",
+"Εἶ": "⠨⠲⠩",
+"Εἷ": "⠨⠖⠩",
+"οὶ": "⠈⠪",
+"οί": "⠐⠪",
+"οἰ": "⠪",
+"οἱ": "⠧⠪",
+"οἲ": "⠾⠪",
+"οἳ": "⠷⠪",
+"οἴ": "⠴⠪",
+"οἵ": "⠢⠪",
+"οἶ": "⠲⠪",
+"οἷ": "⠖⠪",
+"Οὶ": "⠨⠈⠪",
+"Οί": "⠨⠐⠪",
+"Οἰ": "⠨⠪",
+"Οἱ": "⠨⠧⠪",
+"Οἲ": "⠨⠾⠪",
+"Οἳ": "⠨⠷⠪",
+"Οἴ": "⠨⠴⠪",
+"Οἵ": "⠨⠢⠪",
+"Οἶ": "⠨⠲⠪",
+"Οἷ": "⠨⠖⠪",
+"υὶ": "⠈⠻",
+"υί": "⠐⠻",
+"υἰ": "⠻",
+"υἱ": "⠧⠻",
+"υἲ": "⠾⠻",
+"υἳ": "⠷⠻",
+"υἴ": "⠴⠻",
+"υἵ": "⠢⠻",
+"υἶ": "⠲⠻",
+"υἷ": "⠖⠻",
+"Υὶ": "⠨⠈⠻",
+"Υί": "⠨⠐⠻",
+"Υἰ": "⠨⠻",
+"Υἱ": "⠨⠧⠻",
+"Υἲ": "⠨⠾⠻",
+"Υἳ": "⠨⠷⠻",
+"Υἴ": "⠨⠴⠻",
+"Υἵ": "⠨⠢⠻",
+"Υἶ": "⠨⠲⠻",
+"Υἷ": "⠨⠖⠻",
+"αὺ": "⠈⠡",
+"αύ": "⠐⠡",
+"αὐ": "⠡",
+"αὑ": "⠧⠡",
+"αὒ": "⠾⠡",
+"αὓ": "⠷⠡",
+"αὔ": "⠴⠡",
+"αὕ": "⠢⠡",
+"αὖ": "⠲⠡",
+"αὗ": "⠖⠡",
+"Αὺ": "⠨⠈⠡",
+"Αύ": "⠨⠐⠡",
+"Αὐ": "⠨⠡",
+"Αὑ": "⠨⠧⠡",
+"Αὒ": "⠨⠾⠡",
+"Αὓ": "⠨⠷⠡",
+"Αὔ": "⠨⠴⠡",
+"Αὕ": "⠨⠢⠡",
+"Αὖ": "⠨⠲⠡",
+"Αὗ": "⠨⠖⠡",
+"εὺ": "⠈⠱",
+"εύ": "⠐⠱",
+"εὐ": "⠱",
+"εὑ": "⠧⠱",
+"εὒ": "⠾⠱",
+"εὓ": "⠷⠱",
+"εὔ": "⠴⠱",
+"εὕ": "⠢⠱",
+"εὖ": "⠲⠱",
+"εὗ": "⠖⠱",
+"Εὺ": "⠨⠈⠱",
+"Εύ": "⠨⠐⠱",
+"Εὐ": "⠨⠱",
+"Εὑ": "⠨⠧⠱",
+"Εὒ": "⠨⠾⠱",
+"Εὓ": "⠨⠷⠱",
+"Εὔ": "⠨⠴⠱",
+"Εὕ": "⠨⠢⠱",
+"Εὖ": "⠨⠲⠱",
+"Εὗ": "⠨⠖⠱",
+"ηὺ": "⠈⠳",
+"ηύ": "⠐⠳",
+"ηὐ": "⠳",
+"ηὑ": "⠧⠳",
+"ηὒ": "⠾⠳",
+"ηὓ": "⠷⠳",
+"ηὔ": "⠴⠳",
+"ηὕ": "⠢⠳",
+"ηὖ": "⠲⠳",
+"ηὗ": "⠖⠳",
+"Ηὺ": "⠨⠈⠳",
+"Ηύ": "⠨⠐⠳",
+"Ηὐ": "⠨⠳",
+"Ηὑ": "⠨⠧⠳",
+"Ηὒ": "⠨⠾⠳",
+"Ηὓ": "⠨⠷⠳",
+"Ηὔ": "⠨⠴⠳",
+"Ηὕ": "⠨⠢⠳",
+"Ηὖ": "⠨⠲⠳",
+"Ηὗ": "⠨⠖⠳",
+"οὺ": "⠈⠥",
+"ού": "⠐⠥",
+"οὐ": "⠥",
+"οὑ": "⠧⠥",
+"οὒ": "⠾⠥",
+"οὓ": "⠷⠥",
+"οὔ": "⠴⠥",
+"οὕ": "⠢⠥",
+"οὖ": "⠲⠥",
+"οὗ": "⠖⠥",
+"Οὺ": "⠨⠈⠥",
+"Ού": "⠨⠐⠥",
+"Οὐ": "⠨⠥",
+"Οὑ": "⠨⠧⠥",
+"Οὒ": "⠨⠾⠥",
+"Οὓ": "⠨⠷⠥",
+"Οὔ": "⠨⠴⠥",
+"Οὕ": "⠨⠢⠥",
+"Οὖ": "⠨⠲⠥",
+"Οὗ": "⠨⠖⠥",
+"αι": "⠣",
+"αί": "⠐⠣",
+"Αι": "⠨⠣",
+"Αί": "⠨⠐⠣",
+"αυ": "⠡",
+"αύ": "⠐⠡",
+"Αυ": "⠨⠡",
+"Αύ": "⠨⠐⠡",
+"ει": "⠩",
+"εί": "⠐⠩",
+"Ει": "⠨⠩",
+"Εί": "⠨⠐⠩",
+"ευ": "⠱",
+"εύ": "⠐⠱",
+"Ευ": "⠨⠱",
+"Εύ": "⠨⠐⠱",
+"οι": "⠪",
+"οί": "⠐⠪",
+"Οι": "⠨⠪",
+"Οί": "⠨⠐⠪",
+"ου": "⠥",
+"ού": "⠐⠥",
+"Ου": "⠨⠥",
+"Ού": "⠨⠐⠥",
+"υι": "⠻",
+"υί": "⠐⠻",
+"Υι": "⠨⠻",
+"Υί": "⠨⠐⠻",
+"ηυ": "⠳",
+"ηύ": "⠐⠳",
+"Ηυ": "⠨⠳",
+"Ηύ": "⠨⠐⠳",
+
+
+
+"ὰ": "⠈⠁",
+"ά": "⠐⠁",
+"ἀ": "⠁",
+"ἁ": "⠧⠁",
+"ἂ": "⠾⠁",
+"ἃ": "⠷⠁",
+"ἄ": "⠴⠁",
+"ἅ": "⠢⠁",
+"ἆ": "⠲⠁",
+"ἇ": "⠖⠁",
+"ᾶ": "⠠⠁",
+
+"ᾳ": "⠁⠔",
+"ᾲ": "⠈⠁⠔",
+"ᾴ ": "⠐⠁⠔",
+"ᾀ": "⠁⠔",
+"ᾁ": "⠧⠁⠔",
+"ᾂ": "⠾⠁⠔",
+"ᾃ": "⠷⠁⠔",
+"ᾄ": "⠴⠁⠔",
+"ᾅ": "⠢⠁⠔",
+"ᾆ": "⠲⠁⠔",
+"ᾇ": "⠖⠁⠔",
+"ᾷ": "⠠⠁⠔",
+
+"ὲ": "⠈⠑",
+"έ": "⠐⠑",
+"ἐ": "⠑",
+"ἑ": "⠧⠑",
+"ἒ": "⠾⠑",
+"ἓ": "⠷⠑",
+"ἔ": "⠴⠑",
+"ἕ": "⠢⠑",
+
+
+"ὴ": "⠈⠜",
+"ή": "⠐⠜",
+"ἠ": "⠜",
+"ἡ": "⠧⠜",
+"ἢ": "⠾⠜",
+"ἣ": "⠷⠜",
+"ἤ": "⠴⠜",
+"ἥ": "⠢⠜",
+"ἦ": "⠲⠜",
+"ἧ": "⠖⠜",
+"ῆ": "⠠⠜",
+
+"ῃ": "⠼",
+"ῂ": "⠈⠼",
+"ῄ": "⠐⠼ ",
+"ᾐ": "⠼",
+"ᾑ": "⠧⠼",
+"ᾒ": "⠾⠼",
+"ᾓ": "⠷⠼",
+"ᾔ": "⠴⠼",
+"ᾕ": "⠢⠼",
+"ᾖ": "⠲⠼",
+"ᾗ": "⠖⠼",
+"ῇ": "⠠⠼",
+
+"ὶ": "⠈⠊",
+"ί": "⠐⠊",
+"ἰ": "⠊",
+"ἱ": "⠧⠊",
+"ἲ": "⠾⠊",
+"ἳ": "⠷⠊",
+"ἴ": "⠴⠊",
+"ἵ": "⠢⠊",
+"ἶ": "⠲⠊",
+"ἷ": "⠖⠊",
+"ῖ": "⠠⠊",
+
+"ὸ": "⠈⠕",
+"ό": "⠐⠕",
+"ὀ": "⠕",
+"ὁ": "⠧⠕",
+"ὂ": "⠾⠕",
+"ὃ": "⠷⠕",
+"ὄ": "⠴⠕",
+"ὅ": "⠢⠕",
+
+"ὺ": "⠈⠽",
+"ύ": "⠐⠽",
+"ὐ": "⠽",
+"ὑ": "⠧⠽",
+"ὒ": "⠾⠽",
+"ὓ": "⠷⠽",
+"ὔ": "⠴⠽",
+"ὕ": "⠢⠽",
+"ὖ": "⠲⠽",
+"ὗ": "⠖⠽",
+"ῦ": "⠠⠽",
+
+"ὼ": "⠈⠚",
+"ώ": "⠐⠚",
+"ὠ": "⠚",
+"ὡ": "⠧⠚",
+"ὢ": "⠾⠚",
+"ὣ": "⠷⠚",
+"ὤ": "⠴⠚",
+"ὥ": "⠢⠚",
+"ὦ": "⠲⠚",
+"ὧ": "⠖⠚",
+"ῶ": "⠠⠚",
+
+"ῳ": "⠺",
+"ῲ": "⠈⠺",
+"ῴ": "⠐⠺",
+"ᾠ": "⠺",
+"ᾡ": "⠧⠺",
+"ᾢ": "⠾⠺",
+"ᾣ": "⠷⠺",
+"ᾤ": "⠴⠺",
+"ᾥ": "⠢⠺",
+"ᾦ": "⠲⠺",
+"ᾧ": "⠖⠺",
+"ῷ": "⠠⠺",
+
+"ῤ": "⠗",
+"ῥ": "⠧⠗",
+"Ῥ": "⠨⠧⠗",
+
+"Ὰ": "⠨⠈⠁",
+"Ά": "⠨⠐⠁",
+"Ἀ": "⠨⠁",
+"Ἁ": "⠨⠧⠁",
+"Ἂ": "⠨⠾⠁",
+"Ἃ": "⠨⠷⠁",
+"Ἄ": "⠨⠴⠁",
+"Ἅ": "⠨⠢⠁",
+"Ἆ": "⠨⠲⠁",
+"Ἇ": "⠨⠖⠁",
+" ": " ",
+"ᾼ ⠨⠁⠔  ": " ",
+"ᾈ": "⠨⠁⠔",
+"ᾉ": "⠨⠧⠁⠔",
+"ᾊ": "⠨⠾⠁⠔",
+"ᾋ": "⠨⠷⠁⠔",
+"ᾌ": "⠨⠴⠁⠔",
+"ᾍ": "⠨⠢⠁⠔",
+"ᾎ": "⠨⠲⠁⠔",
+"ᾏ": "⠨⠖⠁⠔",
+
+
+"Ὲ": "⠨⠈⠑",
+"Έ": "⠨⠐⠑",
+"Ἐ": "⠨⠑",
+"Ἑ": "⠨⠧⠑",
+"Ἒ": "⠨⠾⠑",
+"Ἓ": "⠨⠷⠑",
+"Ἔ": "⠨⠴⠑",
+"Ἕ": "⠨⠢⠑",
+
+"Ὴ": "⠨⠈⠜",
+"Ή": "⠨⠐⠜",
+"Ἠ": "⠨⠜",
+"Ἡ": "⠨⠧⠜",
+"Ἢ": "⠨⠾⠜",
+"Ἣ": "⠨⠷⠜",
+"Ἤ": "⠨⠴⠜",
+"Ἥ": "⠨⠢⠜",
+"Ἦ": "⠨⠲⠜",
+"Ἧ": "⠨⠖⠜",
+
+"ῌ": "⠨⠼",
+"ᾘ": "⠨⠼",
+"ᾙ": "⠨⠧⠼",
+"ᾚ": "⠨⠾⠼",
+"ᾛ": "⠨⠷⠼",
+"ᾜ": "⠨⠴⠼",
+"ᾝ": "⠨⠢⠼",
+"ᾞ": "⠨⠲⠼",
+"ᾟ": "⠨⠖⠼",
+
+
+"Ὶ": "⠨⠈⠊",
+"Ί ": "⠐⠨⠊",
+"Ἰ": "⠨⠊",
+"Ἱ": "⠨⠧⠊",
+"Ἲ": "⠨⠾⠊",
+"Ἳ": "⠨⠷⠊",
+"Ἴ": "⠨⠴⠊",
+"Ἵ": "⠨⠢⠊",
+"Ἶ": "⠨⠲⠊",
+"Ἷ": "⠨⠖⠊",
+
+"Ὸ": "⠨⠈⠕",
+"Ό": "⠨⠐⠕",
+"Ὀ": "⠨⠕",
+"Ὁ": "⠨⠧⠕",
+"Ὂ": "⠨⠾⠕",
+"Ὃ": "⠨⠷⠕",
+"Ὄ": "⠨⠴⠕",
+"Ὅ": "⠨⠢⠕",
+
+"Ὺ": "⠨⠈⠽",
+"Ύ": "⠨⠐⠽",
+"Ὑ": "⠨⠧⠽",
+"Ὓ": "⠨⠷⠽",
+"Ὕ": "⠨⠢⠽",
+"Ὗ": "⠨⠖⠽",
+
+"Ὼ": "⠨⠈⠚",
+"Ώ": "⠨⠐⠚",
+"Ὠ": "⠨⠚",
+"Ὡ": "⠨⠧⠚",
+"Ὢ": "⠨⠾⠚",
+"Ὣ": "⠨⠷⠚",
+"Ὤ": "⠨⠴⠚",
+"Ὥ": "⠨⠢⠚",
+"Ὦ": "⠨⠲⠚",
+"Ὧ": "⠨⠖⠚",
+
+"ῼ": "⠨⠺",
+"ᾨ": "⠨⠺",
+"ᾩ": "⠨⠧⠺",
+"ᾪ": "⠨⠾⠺",
+"ᾫ": "⠨⠷⠺",
+"ᾬ": "⠨⠴⠺",
+"ᾭ": "⠨⠢⠺",
+"ᾮ": "⠨⠲⠺",
+"ᾯ": "⠨⠖⠺",
+
+"“": "⠦",
+"”": "⠴",
+"᾽": "⠁",
+"ι": "⠔",
+"᾿": "⠁",
+"῀": "⠠",
+"῁": "⠠", 
+"῍": "⠾",
+"῎": "⠴",
+"῏": "⠲",
+"῝": "⠷",
+"῞": "⠢",
+"῟": "⠖",
+"ῒ": "⠈⠊",
+"ΐ": "⠐⠊",
+"ῗ": "⠠⠊",
+"ῢ": "⠈⠽",
+"ΰ": "⠐⠽",
+"ῧ": "⠠⠽",
+"῭": "⠈",
+"΅": "⠐",
+"`": "⠈",
+"´": "⠈",
+"῾": "⠧",
+"†": "\u2838\u283b",
+
+
+"ᾰ": "⠁⠸⠩",
+"ᾱ": "⠁⠱",
+"Ᾰ": "⠨⠁⠸⠩",
+"Ᾱ": "⠨⠁⠱",
+"ῐ": "⠊⠸⠩",
+"ῑ": "⠊⠱",
+"Ῐ": "⠨⠊⠸⠩",
+"Ῑ": "⠨⠊⠱",
+"ῠ": "⠽⠸⠩",
+"ῡ": "⠽⠱",
+"Ῠ": "⠨⠽⠸⠩",
+"Ῡ": "⠨⠽⠱",
+ 
+"αῖ": "⠠⠣",
+"Αῖ": "⠨⠠⠣",
+"αῦ": "⠠⠡",
+"Αῦ": "⠨⠠⠡",
+"εῖ": "⠠⠩",
+"Εῖ": "⠨⠠⠩",
+"εῦ": "⠠⠱",
+"Εῦ": "⠨⠠⠱",
+"οῖ": "⠠⠪",
+"Οῖ": "⠨⠠⠪",
+"οῦ": "⠠⠥",
+"Οῦ": "⠨⠠⠥",
+"υῖ": "⠠⠻",
+"Υῖ": "⠨⠠⠻",
+"ηῦ": "⠠⠳",
+"Ηῦ": "⠨⠠⠳",
+    
+"\n": "\n",
+"\r": "\r",
+
+"~": "⠈⠱",
+"@": "⠈⠁",
+"#": "⠨⠼",
+"$": "⠈⠎",
+"%": "⠈⠴",
+"^": "⠸⠣",
+"&": "⠯",
+"*": "⠈⠼",
+"(": "⠷",
+")": "⠾",
+"-": "⠤",
+"_": "⠩",
+"=": "⠨⠅",
+"+": "⠮",
+
+"[": "⠈⠷",
+"{": "⠨⠷",
+"]": "⠈⠾",
+"}": "⠨⠾",
+"\\": "⠸⠡",
+"|": "⠳",
+";": "⠢",
+":": "⠆",
+"‘": "⠄",
+"’": "⠄",
+"“": "⠦",
+"”": "⠴",
+",": "⠂",
+"<": "⠐⠅",
+".": "⠲",
+">": "⠨⠂",
+"/": "⠌",
+"?": "⠸⠦",
+"`": "\u2820\u2826",
+"'": "\u2834\u2804",
   },
   "mathSymbols": {
     "#": "\u283c",
@@ -438,33 +993,21 @@
     "\\bigvee": "\u2808\u282c",
     "\\bigwedge": "\u2808\u2829",
     "\\coprod": "INVERTED PI",
-    "\\AA": "\u2808\u2820\u2801",
-    "\\aa": "\u2801\u2823\u2828\u2821",
     "@": "\u2808\u2801\u281e",
-    "\\P": "\u2808\u2820\u280f",
-    "\\dag": "\u2838\u283b",
     "\\ddag": "\u2838\u2838\u283b",
-    "\\S": "\u2808\u2820\u280e",
-    "\\textsection": "\u2808\u2820\u280e",
-    "\\textregistered": "\u282b\u2809\u2838\u282b\u2820\u2817\u283b",
-    "\\copyright": "\u282b\u2809\u2838\u282b\u2820\u2809\u283b",
-    "\\pounds": "\u2808\u2807",
     "\\textstirling": "\u2808\u2807",
     "\\SS": "\u2820\u280e\u2820\u280e",
     "\\lq": "\u2820\u2826",
+    "`": "\u2820\u2826",
+    "'": "\u2834\u2804",
     "\\leftquote": "\u2820\u2826",
     "\\rq": "\u2834\u2804",
     "\\rightquote": "\u2834\u2804",
-    "\\texttrademark": "\u2818\u2820\u281e\u2820\u280d",
-    "\\textasciicircum": "\u2838\u2823",
+    "\"": "\u2834\u2804",
     "\\&": "\u2838\u282f",
     "\\_": "\u2824\u2824",
-    "\\textbackslash": "\u2838\u2821",
-    "\\cent": "\u2808\u2809",
     "\\checked": "\u2808\u281c",
-    "\\dj": "\u2808\u282b",
     "\\barlambda": "\u2808\u2828\u2807",
-    "\\planck": "\u2808\u2813",
     "\\$": "\u2808\u280e",
     "\\bigoplus": "\u282b\u2809\u2838\u282b\u282c\u283b",
     "\\biguplus": "\u2828\u282c\u2838\u282b\u282c\u283b",
@@ -508,11 +1051,11 @@
     "\\Biggr\\}": "\u2828\u2820\u283e",
     "\\rfloor": "\u2808\u2830\u283e",
     "\\rangle": "\u2828\u2828\u283e",
-    "\\right\rangle": "\u2828\u2828\u2820\u283e",
-    "\\bigr\rangle": "\u2828\u2828\u2820\u283e",
-    "\\Bigr\rangle": "\u2828\u2828\u2820\u283e",
-    "\\biggr\rangle": "\u2828\u2828\u2820\u283e",
-    "\\Biggr\rangle": "\u2828\u2828\u2820\u283e",
+    "\\right\\rangle": "\u2828\u2828\u2820\u283e",
+    "\\bigr\\rangle": "\u2828\u2828\u2820\u283e",
+    "\\Bigr\\rangle": "\u2828\u2828\u2820\u283e",
+    "\\biggr\\rangle": "\u2828\u2828\u2820\u283e",
+    "\\Biggr\\rangle": "\u2828\u2828\u2820\u283e",
     "\\|": "\u2833\u2833",
     "\\left\\|": "\u2820\u2833\u2820\u2833",
     "\\right\\|": "\u2820\u2833\u2820\u2833",
@@ -536,7 +1079,6 @@
     "\\Downarrow": "\u282b\u2829\u2836\u2836\u2815",
     "\\Updownarrow": "\u282b\u2829\u282a\u2836\u2836\u2815",
     "\\rceil": "\u2808\u2818\u283e",
-    "\\backslash": "\u2838\u2821",
     "\\ulcorner": "\u2808\u2818\u2837",
     "\\left\\ulcorner": "\u2808\u2818\u2820\u2837",
     "\\bigl\\ulcorner": "\u2808\u2818\u2820\u2837",
@@ -590,7 +1132,7 @@
     "\\varsigma": "\u2828\u2808\u280e",
     "\\varphi": "\u2828\u2808\u280b",
     "\\Theta": "\u2828\u2820\u2839",
-    "\\Sigma	": "\u2828\u2820\u280e",
+    "\\Sigma" : "\u2828\u2820\u280e",
     "\\Omega": "\u2828\u2820\u283a",
     "\\delta": "\u2828\u2819",
     "\\eta": "\u2828\u2831",
@@ -606,11 +1148,8 @@
     "\\beth": "\u2820\u2820\u2827",
     "\\daleth": "\u2820\u2820\u2819",
     "\\gimel": "\u2820\u2820\u281b",
-    "\\stigma": "\u2828\u282e",
     "\\Stigma": "\u2828\u2820\u282e",
-    "\\qoppa": "\u2828\u281f",
-    "\\sampi": "\u2828\u2809",
-    "\\Sampi	": "\u2828\u2820\u2809",
+    "\\Sampi": "\u2828\u2820\u2809",
     "\\Qoppa": "\u2828\u2820\u281f",
     "\\pm": "\u282c\u2824",
     "\\mp": "\u2824\u282c",
@@ -637,6 +1176,7 @@
     "\\bigcirc": "\u282b\u2809",
     "\\dagger": "\u2838\u283b",
     "\\ddagger": "\u2838\u2838\u283b",
+ 
     "\\amalg": "????",
     "\\dotplus": "\u2810\u282c\u2823\u2821\u283b",
     "\\Cup": "\u2828\u282c\u2838\u282b\u2828\u282c\u283b",
@@ -764,7 +1304,7 @@
     "\\eqslantgtr": "\u2831\u2828\u2802",
     "\\gtrdot": "\u2828\u2802\u2838\u282b\u2821\u283b",
     "\\gtreqless": "\u2828\u2802\u2831\u2810\u2805",
-    "\\circeq	": "\u2810\u2828\u2805\u2823\u2828\u2821\u283b",
+    "\\circeq": "\u2810\u2828\u2805\u2823\u2828\u2821\u283b",
     "\\thickapprox": "\u2838\u2808\u2831\u2838\u2808\u2831",
     "\\succsim": "\u2828\u2828\u2802\u2808\u2831",
     "\\shortparallel": "\u282b\u2807",
@@ -797,7 +1337,7 @@
     "\\geqslant": "\u2828\u2802\u2831",
     "\\gtrapprox": "\u2828\u2802\u2808\u2831\u2808\u2831",
     "\\gtrless": "\u2828\u2802\u2810\u2805",
-    "\\eqcirc	": "\u2828\u2821\u2808\u2828\u2805\u283b",
+    "\\eqcirc": "\u2828\u2821\u2808\u2828\u2805\u283b",
     "\\thicksim": "\u2838\u2808\u2831",
     "\\Supset": "\u2838\u2828\u2802\u2838\u282b\u2838\u2828\u2802\u283b",
     "\\shortmid": "\u2833",
@@ -811,13 +1351,13 @@
     "\\subsetneq": "\u2838\u2810\u2805\u280c\u2831",
     "\\varsubsetneqq": "\u2838\u2810\u2805\u280c\u2828\u2805",
     "\\ngeqslant": "\u280c\u2828\u2802\u2831",
-    "\\gneqq	": "\u2828\u2802\u280c\u2828\u2805",
+    "\\gneqq": "\u2828\u2802\u280c\u2828\u2805",
     "\\gnapprox": "\u2828\u2802\u280c\u2808\u2831\u2808\u2831",
     "\\succnsim": "\u2828\u2828\u2802\u280c\u2808\u2831",
     "\\nshortparallel": "\u280c\u282b\u2807",
     "\\nVDash": "\u280c\u282b\u2833\u2833\u2812\u2812",
     "\\nsupseteq": "\u280c\u2838\u2828\u2802\u2831",
-    "\\varsupsetneq	": "\u2838\u2828\u2802\u280c\u2831",
+    "\\varsupsetneq": "\u2838\u2828\u2802\u280c\u2831",
     "\\nleq": "\u280c\u2810\u2805\u2831",
     "\\lneq": "\u2810\u2805\u280c\u2831",
     "\\lnsim": "\u2810\u2805\u280c\u2808\u2831",
@@ -902,11 +1442,11 @@
     "\\biggl\\llbracket": "\u2808\u2838\u2820\u2837",
     "\\Biggl\\llbracket": "\u2808\u2838\u2820\u2837",
     "\\rrbracket": "\u2808\u2838\u283e",
-    "\\right\rrbracket": "\u2808\u2838\u2820\u283e",
-    "\\bigr\rrbracket": "\u2808\u2838\u2820\u283e",
-    "\\Bigr\rrbracket": "\u2808\u2838\u2820\u283e",
-    "\\biggr\rrbracket": "\u2808\u2838\u2820\u283e",
-    "\\Biggr\rrbracket": "\u2808\u2838\u2820\u283e",
+    "\\right\\rrbracket": "\u2808\u2838\u2820\u283e",
+    "\\bigr\\rrbracket": "\u2808\u2838\u2820\u283e",
+    "\\Bigr\\rrbracket": "\u2808\u2838\u2820\u283e",
+    "\\biggr\\rrbracket": "\u2808\u2838\u2820\u283e",
+    "\\Biggr\\rrbracket": "\u2808\u2838\u2820\u283e",
     "\\varg": "\u2808\u281b",
     "\\varv": "\u2808\u2827",
     "\\varw": "\u2808\u283a",
@@ -955,7 +1495,7 @@
     "\\oiintctrclockwise": "\u282e\u282e\u2808\u282b\u2822\u2814\u2815\u283b",
     "\\varoiintclockwise": "\u282e\u282e\u2808\u282b\u282a\u2822\u2814\u283b",
     "\\varoiiintctrclockwise": "\u282e\u282e\u282e\u2808\u282b\u2822\u2814\u2815\u283b",
-    "\\dashrightarrow": "\u282b\u2812",
+    "\\dashrightarrow": "⠫⠒ ⠒⠕",
     "\\ntwoheadrightarrow": "\u280c\u282b\u2812\u2812\u2815\u2815",
     "\\Searrow": "\u282b\u2830\u2836\u2836\u2815",
     "\\Perp": "\u282b\u2829\u2836\u2836\u2833",
@@ -967,7 +1507,7 @@
     "\\DiamonddotLeft": "\u282b\u282a\u2836\u2836\u282b\u2819\u2838\u282b\u2821\u283b",
     "\\circleddotright": "\u282b\u2809\u2838\u282b\u2821\u282b\u2815\u283b",
     "\\multimapdotbothvert": "\u282b\u2823\u2821\u2812\u2812\u2821",
-    "\\dashleftrightarrow": "\u282b\u282a\u2812",
+    "\\dashleftrightarrow": "⠫⠪⠒ ⠒⠕",
     "\\ntwoheadleftarrow": "\u280c\u282b\u282a\u282a\u2812\u2812",
     "\\Nwarrow": "\u282b\u2818\u282a\u2836\u2836",
     "\\leadstoext": "\u2808\u2831",
@@ -1079,6 +1619,8 @@
     "\\overline-end": "\u2823\u2831",
     "\\underline-begin": "\u2810",
     "\\underline-end": "\u2829\u2831",
+    "\\dot-begin": "⠐",
+    "\\dot-end": "⠡",	
     "?": "\u2838\u2826",
     "'": "\u2804",
     "{": "",
@@ -1095,6 +1637,8 @@
     "\\under": "\u2829",
     "\\leqno": " ",
     "\\hat": "\u2823\u2838\u2823",
+    "\\vec-begin": "\u2810",
+    "\\vec-end": "\u2823\u282b\u2815\u283b",
     "\\%": "\u2808\u2834",
     "\\bar": "\u2831",
     "\\stackrel-begin": "\u2810",
@@ -1124,6 +1668,7 @@
     "\\sqsupseteq": "⠈⠸⠨⠂⠱",
     "\\bowtie": "⠫⠸⠈⠡⠇⠻",
     "\\Join": "⠫⠸⠈⠡⠇⠻",
+    "\\lrJoin": "⠫⠸⠈⠡⠇⠻",   
     "\\risingdotseq": "",
     "\\backsimeq": "⠈⠈⠱⠱",
     "\\tianglelefteq": "⠫⠐⠅⠇⠱⠻",
@@ -1170,12 +1715,25 @@
     "\\rJoin": "⠫⠈⠡⠇⠻",
     "\\npreccurlyeq": "⠌⠫⠨⠐⠅⠱⠻",
     "\\nbacksim": "⠌⠈⠈⠱",
-    "\\textvisiblespace": "⠿",
     "\\imath": "⠫⠊⠻",
     "\\jmath": "⠫⠚⠻",
     "\\check": "\u2823\u2808\u2838\u2823",
     "\\acute": "\u2823\u2804",
-    "\\grave": "\u2831"
+    "\\grave": "\u2831",
+    "\\sphericalangle": "⠫⠪⠸⠫⠫⠁⠻",
+    "\\Theta": "⠨⠠⠹",
+    "\\Sigma": "⠨⠠⠎",
+    "\\Omega": "⠨⠠⠺",
+    "\\breve": "⠸⠩",
+	"\\ddot": "⠣⠡⠡⠻",
+	"\\mathring":"⠨⠡",
+	"\\circeq": "⠐⠨⠅⠣⠨⠡⠻",
+	"\\copyright": "⠫⠉⠸⠫⠠⠉⠻",
+	"\\eqcirc": "⠨⠡⠈⠨⠅⠻", 
+	"\\gneqq": "⠐⠨⠅⠣⠨⠡⠻",
+	"\\trianglelefteq": "⠫⠐⠅⠇⠱⠻",
+	"\\VDash": "⠫⠳⠳⠒⠒",
+	"\\multimapdotbothAvert": "⠫⠣⠡⠒⠒⠨⠡"    
   },
   "theoremSymbols": {
     ".": "\u2828",
@@ -1201,4 +1759,4 @@
     "#8": "\u283c\u2826",
     "#9": "\u283c\u2814"
   }
-}
\ No newline at end of file
+}
diff --git a/Master/texmf-dist/doc/support/latex2nemeth/encodings/polytonic.json b/Master/texmf-dist/doc/support/latex2nemeth/encodings/polytonic.json
index 054c61c22ab..ea440062eea 100644
--- a/Master/texmf-dist/doc/support/latex2nemeth/encodings/polytonic.json
+++ b/Master/texmf-dist/doc/support/latex2nemeth/encodings/polytonic.json
@@ -246,7 +246,15 @@
     "\\latextonemethnewline": "\n",
     "ΐ": "⠊",
 	"ΰ": "⠽",
-
+	 "\\bf": "", 
+    "\\it": "", 
+    "\\=": "",
+    "\\>": "",
+    "\\noindent": "",
+   "\\hfill": " ",
+   "\\bigskip": "   ",
+   "\\smallskip": "   ",
+   "\\medskip": "   ",  
 "αὶ": "⠈⠣",
 "αί": "⠐⠣",
 "αἰ": "⠁⠣",
diff --git a/Master/texmf-dist/doc/support/latex2nemeth/source.zip b/Master/texmf-dist/doc/support/latex2nemeth/source.zip
new file mode 100644
index 00000000000..3f7892fac42
--- /dev/null
+++ b/Master/texmf-dist/doc/support/latex2nemeth/source.zip
diff --git a/Master/texmf-dist/scripts/latex2nemeth/latex2nemeth b/Master/texmf-dist/scripts/latex2nemeth/latex2nemeth
index 3ce409fc29b..9aa230a9ad3 100755
--- a/Master/texmf-dist/scripts/latex2nemeth/latex2nemeth
+++ b/Master/texmf-dist/scripts/latex2nemeth/latex2nemeth
@@ -1,3 +1,3 @@
 #!/bin/sh
-jarpath=`kpsewhich --progname=latex2nemeth --format=texmfscripts latex2nemeth-v1.0.2.jar`
+jarpath=`kpsewhich --progname=latex2nemeth --format=texmfscripts latex2nemeth.jar`
 exec java -jar "$jarpath" "$@"
diff --git a/Master/texmf-dist/scripts/latex2nemeth/latex2nemeth-v1.0.2.jar b/Master/texmf-dist/scripts/latex2nemeth/latex2nemeth.jar
index af98f3898eb..7211413303f 100755
--- a/Master/texmf-dist/scripts/latex2nemeth/latex2nemeth-v1.0.2.jar
+++ b/Master/texmf-dist/scripts/latex2nemeth/latex2nemeth.jar