Skip to content
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

Jump to bottom

Many various fixes. #3

Open
wants to merge 39 commits into
base: master
Choose a base branch
from
Open

Many various fixes. #3

wants to merge 39 commits into from

Conversation

ghost
Copy link

@ghost ghost commented Aug 30, 2013

I merged in your recent changes and made adjustments accordingly.

  • The most important change is the use of en and em dashes instead of hyphens. En and em dashes are the proper typographical entities for ranges of values and pauses in thoughts, respectively.
  • I deleted ism.ent. It's created by gen.sh, so there's no need to keep it in revision control.
  • The XSLT stylesheet will add a newline between each entity declaration in ism.ent, to make debugging easier.
  • Added HTML5 DOCTYPE.
  • Fixed the Dublin Core metadata declarations.
  • Added official plaintext version of CC0 1.0 copyright waiver.
  • Replaced public domain releases at the top of each file with official-language copyright waivers.
  • Added entry for Mohism.
  • Other consistency fixes here and there.

What do you think?

@spatil47
Official CC0 1.0 plaintext.
e6cf4ab
@spatil47
Renamed LICENSE to COPYING, per Creative Commons' recommendation.
fb291c6
@spatil47
Added CC0 release information.
45a117e
@spatil47
Created entry for Neoism.
1d9bbbe
@spatil47
More detailed public domain waiver.
2432534
@spatil47
Merge branch 'master' into experimental
a8fdf6b 
Updated copyright waiver notices.
@spatil47
Updated copyright waiver notice.
c5775b7
@spatil47
Expanded definitions of Neoism.
b985960
@spatil47
Added Greek-language prefix.
6dbd66f
@spatil47
Added entry for Yangism.
9e295fc
@spatil47
Changed en dash to hyphen.
ffebac7 
In the future, I will probably convert all date-range hyphens to en dashes.
However, I will keep them as hyphens for now, to preserve consistency.
@spatil47
Added entry for Mohism.
9cbe16e
@spatil47
Added entities for Neoism, Yangism, and Mohism.
194d188
@spatil47
Adds a new line between entity declarations, to make debugging easier.
be17947
@spatil47
Added newlines to entity declarations, per commit be17947.
b67ff9b
@spatil47
Fixed term ID.
5c53853
@spatil47
Deleting autogenerated file.
9128296 
gen.sh creates this file. There's no need to keep it in revision control.
@spatil47
Merge branch 'master' into experimental
aca26d4 
Conflicts:
	source/ism.ent
@spatil47
Expanded the definition of Mohism.
b9aa1aa
@spatil47
Renamed 'experimental' to 'development'.
fc49e64
@spatil47
Added DOCTYPEs.
1b42356
@spatil47
Correcting Dublin Core metadata references.
4bcf25e
@spatil47
Using unordered list instead of paragraphs.
e7e9559 
List style type is invisible, to make it look similar to paragraph usage.
@spatil47
The feed generation is disabled.
7cfa06a 
It appears that feature was already removed, but the generator still thought it was there.
@spatil47
Fixed small grammar error.
ad32f45
@spatil47
Used en and em dash entities instead of hyphens.
10ad37e 
Also corrected other mistakes here and there.
@spatil47
HTML entities have to be numerical to work with xsltproc.
fe35f37
@spatil47
Merge remote-tracking branch 'upstream/master'
244b420 
Conflicts:
	source/terms/acosmism.xml
	source/terms/anarchocapitalism.xml
	source/terms/anarchosyndicalism.xml
	source/terms/anthropomorphism.xml
	source/terms/cosmism.xml
	source/terms/emanationism.xml
	source/terms/epiphenomenalism.xml
	source/terms/equalitarianism.xml
	source/terms/experientialism.xml
	source/terms/externalism.xml
	source/terms/finalism.xml
	source/terms/immortalism.xml
	source/terms/imperativism.xml
	source/terms/inductivism.xml
	source/terms/internalism.xml
	source/terms/intrinsicism.xml
	source/terms/nativism.xml
	source/terms/neomarxism.xml
	source/terms/pyrrhonism.xml
	source/terms/randianism.xml
	source/terms/relationalism.xml
	source/terms/substantialism.xml
	source/terms/voluntaryism.xml
@spatil47
Merge branch 'master' into development
81d1de8 
Conflicts:
	source/terms/antinomianism.xml
	source/terms/epicureanism.xml
	source/terms/pyrrhonism.xml
	source/terms/randianism.xml
	source/terms/scholasticism.xml
@spatil47
Removed obscure entries.
2fbf473
@spatil47
Using en and em dashes instead of single and double hyphens.
4c997cc
@spatil47
Used en dash instead of hyphen.
3148419
@spatil47
Fixed error.
b46b3aa
@spatil47
Fixed spellings.
d86d455
@spatil47
Merge remote-tracking branch 'upstream/master'
1173e6f 
Conflicts:
	source/terms/atomism.xml
@spatil47
Merge remote-tracking branch 'upstream/master'
d85e31a 
Conflicts:
	source/terms/christianity.xml
	source/terms/conceptualism.xml
	source/terms/confucianism.xml
	source/terms/cynicism.xml
	source/terms/deism.xml
	source/terms/dialecticalmaterialism.xml
	source/terms/epicureanism.xml
	source/terms/falsificationism.xml
	source/terms/feminism.xml
	source/terms/illusionism.xml
	source/terms/immoralism.xml
	source/terms/intellectualism.xml
	source/terms/kantianism.xml
	source/terms/marxism.xml
	source/terms/mysticism.xml
@spatil47
Merge remote-tracking branch 'upstream/master'
890692a 
Conflicts:
	source/terms/objectivism.xml
@spatil47
Merge remote-tracking branch 'upstream/master'
5b374d7 
Conflicts:
	source/terms/pacifism.xml
	source/terms/platonism.xml
	source/terms/positivism.xml
@spatil47
Merge remote-tracking branch 'upstream/master'
0358a7d 
Conflicts:
	source/terms/aristotelianism.xml
	source/terms/darwinism.xml
	source/terms/hegelianism.xml
	source/terms/kantianism.xml
	source/terms/objectivism.xml
	source/terms/platonism.xml
	source/terms/socialdarwinism.xml
	source/terms/thomism.xml
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@spatil47