Skip to content

Commit 11b6936

Browse files
committed
Get ready for release 1.0.0
1 parent 6864950 commit 11b6936

File tree

10 files changed

+30
-84
lines changed

10 files changed

+30
-84
lines changed

AUTHORS.txt

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7,31 +7,8 @@ Up until around 2017 was maintained by:
77
- Angus Griffith @sn6uv
88
- Ben Jones @bnjones
99

10-
Currently it is maintained by the Mathics Team
10+
The current module is maintained by the Mathics Team
1111

12-
Additional contributions were made by:
13-
14-
- Mingye Wang @Arthur2e5
15-
- Ali Abbas @alouche
16-
- Andrew Zhao @azhao12345
17-
- @Bth8
18-
- Chong Jiang @cjiang
19-
- Antonio Marquez-Raygoza @freshwater
20-
- @GitAnt
21-
- Josh Chen @jaycech3n
22-
- Yingjie Lan @lanyjie
23-
- @limeblack
24-
- Martin Portman @mportman
25-
- Mauricio Matera @mmatera
26-
- Marek Šuppa @mrshu
27-
- Marco Savelli @Piruzzolo
28-
- Toshiyuki Ogura @ogra
29-
- Bernhard Liebl @poke1024
30-
- @proxy-sander
31-
- Andrew Murray @radarhere
32-
- Jim Radford @radford
33-
- Timothy Cyrus @tcyrus
34-
- Wolf Vollprecht @wolfv
35-
- Сухарик @suhr
3612
- Pablo Emilio Escobar Gaviria @GarkGarcia
13+
- Mauricio Matera @mmatera
3714
- Rocky Bernstein @rocky

CHANGES.rst

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@ CHANGES
44
1.0.0
55
-----
66

7-
The scanner split off from Mathics3
7+
The scanner split off from Mathics3.
88

9+
Tables added for converting between WL names and Unicode, ASCII and character properties.
10+
See implementation.rst for details
11+
12+
Code and docstring gone over.
913

1014
See git in Mathics before Jan 18, 2021 for old history of these files.

COPYING.txt

Lines changed: 3 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,6 @@
1-
This file is about the copyright on Mathics and all included components.
2-
3-
* ORIGINAL MATHICS CODE:
4-
5-
All original Mathics code is distributed under the terms of the
6-
GNU General Public License, version 3.
7-
8-
This code is distributed in the hope that it will be useful,
9-
but WITHOUT ANY WARRANTY; without even the implied warranty of
10-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
11-
General Public License for more details.
12-
13-
The full text of the GPL is available below in this file. Details of
14-
the licenses of the components of Mathics are included below as well.
15-
16-
* LICENSES OF INCLUDED DATA:
17-
18-
Mathics includes data from Wikipedia that is published under the Creative
19-
Commons Attribution-Sharealike 3.0 Unported License and the GNU Free
20-
Documentation License contributed by the respective authors that are listed
21-
on the websites specified in "data/elements.txt".
22-
23-
24-
* LICENSES OF INCLUDED SOFTWARE:
25-
26-
SOFTWARE LICENSE
27-
----------------------------------------------
28-
scripaculous MIT
29-
Prototype MIT
30-
MathJax Apache 2.0
31-
Three.js MIT
32-
pymimemagic BSD 3-Clause
33-
SciPy BSD 3-Clause
34-
35-
36-
CONTACT INFO:
37-
Jan Poeschko; [email protected];
38-
https://mathics.org/
39-
401
=========================================================================
41-
42-
2+
3+
434
GNU GENERAL PUBLIC LICENSE
445
Version 3, 29 June 2007
456

@@ -714,7 +675,7 @@ may consider it more useful to permit linking proprietary applications with
714675
the library. If this is what you want to do, use the GNU Lesser General
715676
Public License instead of this License. But first, please read
716677
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
717-
678+
718679
================================================================================
719680

720681
scriptaculous:

Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ build: mathics_scanner/data/characters.json
3131
develop: mathics_scanner/data/characters.json
3232
$(PIP) install -e .
3333

34+
#: Build distribution
35+
dist: admin-tools/make-dist.sh
36+
$(ShelL) admin-tools/make-dist.sh
37+
3438
#: Install mathics
3539
install: build
3640
$(PYTHON) setup.py install

README.rst

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,17 @@ Usage
2323
``mathics_scanner.tokenizer.Tokenizer`` class.
2424
- To convert between Wolfram Language named characters and Unicode/ASCII, use
2525
the ``mathics_scanner.characters.replace_wl_with_plain_text`` and
26-
``mathics_scanner.characters.replace_unicode_with_wl`` functions.
26+
``mathics_scanner.characters.replace_unicode_with_wl`` functions.
2727
- To convert between qualified names of named characters (such ``FormalA`` for
2828
``\[FormalA]``) and Wolfram's internal representation use the
2929
``m̀athics_scanner.characters.named_characters`` dictionary.
3030

31+
To regenerate scanner tables run:
32+
33+
::
34+
35+
$ python -m mathics_scanner.generate
36+
3137
Implementation
3238
--------------
3339

@@ -46,4 +52,3 @@ License
4652
Mathics is released under the GNU General Public License Version 3 (GPL3).
4753

4854
.. |Workflows| image:: https://github.com/Mathics3/mathics-scanner/workflows/Mathics%20(ubuntu)/badge.svg
49-

admin-tools/make-dist.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#!/bin/bash
12
PACKAGE=mathics-scanner
23

34
# FIXME put some of the below in a common routine

mathics_scanner/characters.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#!/usr/bin/env python3
21
# -*- coding: utf-8 -*-
32

43
import re
@@ -50,8 +49,8 @@ def replace_wl_with_plain_text(wl_input: str, use_unicode=True) -> str:
5049
Language named characters. This functions replaces all occurrences of such
5150
characters with their corresponding Unicode/ASCII equivalents.
5251
53-
@param: wl_input The string whose characters will be replaced.
54-
@param: use_unicode A flag that indicates whether to use Unicode or ASCII
52+
@param: wl_input The string whose characters will be replaced.
53+
@param: use_unicode A flag that indicates whether to use Unicode or ASCII
5554
for the conversion.
5655
5756
Note that the occurrences of named characters in ``wl_input`` are expect to
@@ -73,7 +72,7 @@ def replace_unicode_with_wl(unicode_input: str) -> str:
7372
corresponding Unicode equivalents of such characters with the characters
7473
themselves.
7574
76-
@param: unicode_input The string whose characters will be replaced.
75+
@param: unicode_input The string whose characters will be replaced.
7776
7877
Note that the occurrences of named characters in the output of
7978
``replace_unicode_with_wl`` are represented using Wolfram's internal
@@ -85,4 +84,3 @@ def replace_unicode_with_wl(unicode_input: str) -> str:
8584
return _unicode_to_wl_re.sub(
8685
lambda m: _unicode_to_wl[m.group(0)], unicode_input
8786
)
88-

mathics_scanner/prescanner.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#!/usr/bin/env python3
21
# -*- coding: utf-8 -*-
32

43

mathics_scanner/tokeniser.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#!/usr/bin/env python3
21
# -*- coding: utf-8 -*-
32

43

@@ -340,17 +339,17 @@ class Tokeniser(object):
340339
"""
341340
A tokeniser for the Wolfram Language.
342341
343-
When subclassing ``Tokeniser``, custom tokenisation rules can be defined by
344-
declaring methods whose names are preceded by ``t_``, such as in the
342+
When subclassing ``Tokeniser``, custom tokenisation rules can be defined by
343+
declaring methods whose names are preceded by ``t_``, such as in the
345344
following example: ::
346345
347346
class MyTokeniser(Tokeniser):
348347
def t_MyWeirdRule(self, match):
349348
# Your logic goes here...
350349
pass
351350
352-
In this example, ``t_MyWeirdRule`` is supposed to update the internal state
353-
of the tokeniser and return a ``Token`` with an appropriate tag. ``m̀atch``
351+
In this example, ``t_MyWeirdRule`` is supposed to update the internal state
352+
of the tokeniser and return a ``Token`` with an appropriate tag. ``m̀atch``
354353
is expected to be an instance of ``re.Match``.
355354
"""
356355
modes = {
@@ -516,4 +515,3 @@ def t_PutAppend(self, match):
516515
def t_Filename(self, match):
517516
"Filename rule"
518517
return self._token_mode(match, "Filename", "expr")
519-

mathics_scanner/version.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
#!/usr/bin/env python3
21
# -*- coding: utf-8 -*-
32

43

54
# This file is suitable for sourcing inside POSIX shell as
65
# well as importing into Python. That's why there is no
76
# space around "=" below.
8-
__version__="1.0.0.dev0" # noqa
7+
__version__="1.0.0" # noqa

0 commit comments

Comments
 (0)