Skip to content

Handle various cases in input package files #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
srowen wants to merge 1 commit into
base: v1
Choose a base branch
from
Open

Handle various cases in input package files #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 22 additions & 19 deletions texannotate/build_spec.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,23 +21,25 @@
def parse_snippet(d, spec, latex_context:LatexContextDb):
ret = []
macro_dict = {}
for k in d[spec]:
if k.endswith('(') or k.endswith('[') or k.endswith('{') or k == '<' or k == '>':
macro_dict[k] = ''
continue
macro = prog.match(k)

if not macro:
continue

assert macro.span()[0] == 0, k
match_str = k[:macro.span()[1]]
arguments = k[macro.span()[1]:].replace('}', '').replace(']', '').replace('>', '')
if match_str in macro_dict:
if len(arguments) > len(macro_dict[match_str]):
if spec in d:
for k in d[spec]:
k = k['name']
if k.endswith('(') or k.endswith('[') or k.endswith('{') or k == '<' or k == '>':
macro_dict[k] = ''
continue
macro = prog.match(k)

if not macro:
continue

assert macro.span()[0] == 0, k
match_str = k[:macro.span()[1]]
arguments = k[macro.span()[1]:].replace('}', '').replace(']', '').replace('>', '')
if match_str in macro_dict:
if len(arguments) > len(macro_dict[match_str]):
macro_dict[match_str] = arguments
else:
macro_dict[match_str] = arguments
else:
macro_dict[match_str] = arguments

accept = {'{', '[', '*'}
for k,v in macro_dict.items():
Expand Down Expand Up @@ -94,9 +96,10 @@ def import_package(package_name, latex_context, is_class=False, added = set()):
with open('data/packages/'+package_name+'.json') as f:
d = json.load(f)
added.add(package_name) # Solve the infinite recursion
for dependency in d['includes']:
if not dependency in added:
ret += import_package(dependency, latex_context, added = added)
if 'includes' in d:
for dependency in d['includes']:
if not dependency in added:
ret += import_package(dependency, latex_context, added = added)

ret.append((
'package_'+package_name, {
Expand Down