search

syntax-prosody-ot / main

A webapp for the syntax-prosody analyst working in Optimality Theory, with automated Gen, Con and Eval. Download build files from syntax-prosody-ot/build
https://spot.sites.ucsc.edu/
GNU General Public License v2.0
12 stars 2 forks source link

Mapping vs. markedness macro-sections #534

Closed jbellik closed 3 years ago

jbellik commented 3 years ago

Creates Mapping and Markedness constraint macro-sections. Closes #518 and #519

These changes are: adding a div in the html and a sub-style in the css, plus changing some indentation.

I did some basic tests that the following things still work:

nkalivoda commented 3 years ago

Looks great, thanks!

jbellik commented 3 years ago

The conflicts here are going to be really difficult to resolve, because git is totally confused about what lines up with what. I am going to replicate the changes from this branch in a new one based on master as it currently stands, rather than try to deal with the 16 merge conflicts here.

jbellik commented 3 years ago

I think part of the problem is that i had changed some of the indentation in the code. that confuses git to no end.