diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c7da899..9894999 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -9,6 +9,12 @@ repos: - repo: local hooks: - id: litwiki-tests - name: litwiki-tests + name: LitWiki Test entry: ./test.sh language: system + - id: litwiki-check + name: LitWiki Check + entry: scripts/check.py + files: \.org$ + types: [file] + language: script diff --git a/Pipfile b/Pipfile index b4be1e2..89e94a2 100644 --- a/Pipfile +++ b/Pipfile @@ -5,6 +5,7 @@ name = "pypi" [packages] orgparse = "*" +litwiki = {file = ".", editable = true} [dev-packages] diff --git a/Pipfile.lock b/Pipfile.lock index c043628..f4bacca 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "22f5663e77fd5f550bbb84f958573b3be232bb1211f2944c495839868e6f8553" + "sha256": "228cbb39426923392e9689996bdb073529738bbd91b35fe18afbc9e82914a342" }, "pipfile-spec": 6, "requires": { @@ -16,6 +16,10 @@ ] }, "default": { + "litwiki": { + "editable": true, + "file": "." + }, "orgparse": { "hashes": [ "sha256:451050e79acb7a51c65dc99b9095eae4d50bd598541354f9e763cb4cbdf59a55", diff --git a/README.org b/README.org index 1944b9c..081b438 100644 --- a/README.org +++ b/README.org @@ -10,8 +10,8 @@ augmented to ensure full compatibility. The symbology used in battle diagrams is given in ~references.tex~. -To cite a passage, use the format ~(VOL CH LINE)~, e.g. ~(I.1.123)~ refers to -line 123 of volume I chapter 1 (A Wish). The line number is the unfolded line +To cite a passage, use the format ~(VOL CH LINE)~, e.g. ~(1.1.123)~ refers to +line 123 of volume 1 chapter 1 (A Wish). The line number is the unfolded line number which can be extracted in Emacs via ~nov.el~ and #+begin_src emacs-lisp (setq nov-text-width t) diff --git a/litwiki/citation.py b/litwiki/citation.py index d3770c6..85cbe79 100644 --- a/litwiki/citation.py +++ b/litwiki/citation.py @@ -26,6 +26,7 @@ def parse(src: str) -> Optional[Citation]: class TestCitation(unittest.TestCase): def test_parse(self): self.assertEqual(parse("1.2.3"), Citation(1, 2, 3)) + self.assertEqual(parse("1.2.125"), Citation(1, 2, 125)) self.assertEqual(parse("1.2.0"), None) self.assertEqual(parse("(I.2.3)"), None) self.assertEqual(parse("I.5.1"), None) diff --git a/litwiki/parse.py b/litwiki/parse.py new file mode 100644 index 0000000..cf85be1 --- /dev/null +++ b/litwiki/parse.py @@ -0,0 +1,47 @@ +""" +All parsing functions +""" +import logging +import unittest +import re +import orgparse +import litwiki.citation + +RE_CITATION_LIKE = re.compile("(?:\()[A-Z]*[0-9\.]+(?:\))") +RE_CITATION = re.compile("(?:\()[0-9]+\.[0-9]+\.[0-9]+(?:\))") + + +def check(f): + root = orgparse.load(f) + + queue = [root] + nCitations = 0 + while queue: + node = queue.pop() + queue += list(node.children) + citation_likes = RE_CITATION_LIKE.findall(node.body) + for citation in citation_likes: + nCitations += 1 + if litwiki.citation.parse(citation[1:-1]) is None: + raise ValueError(f"Unable to parse citation {citation}") + + logging.info("%s citations checked.", nCitations) + + +class TestParse(unittest.TestCase): + def test_regex_citation(self): + self.assertTrue(RE_CITATION_LIKE.match("(1.2)")) + self.assertTrue(RE_CITATION_LIKE.match("(1)")) + self.assertFalse(RE_CITATION_LIKE.match("(a)")) + self.assertTrue(RE_CITATION.match("(1.2.3)")) + self.assertFalse(RE_CITATION.match("(I.2.3)")) + self.assertFalse(RE_CITATION.match("(I.2)")) + self.assertFalse(RE_CITATION.match("1.2")) + + self.assertEqual( + RE_CITATION.findall("(1.2.3). blablabla (4.5.6)."), ["(1.2.3)", "(4.5.6)"] + ) + + +if __name__ == "__main__": + unittest.main() diff --git a/scripts/check.py b/scripts/check.py new file mode 100755 index 0000000..8f76576 --- /dev/null +++ b/scripts/check.py @@ -0,0 +1,11 @@ +#!/usr/bin/env python + +import sys +import litwiki.parse +import logging + +logging.basicConfig(level=logging.INFO) + +f = sys.argv[1] +print(f"Parsing: {f}") +litwiki.parse.check(f) diff --git a/setup.py b/setup.py index 5550ea2..4c19f6a 100644 --- a/setup.py +++ b/setup.py @@ -7,5 +7,6 @@ setup( author="Leni Aniva", author_email="", description="Generation of progression wiki for literature", - packages=['litwiki'] + packages=['litwiki'], + scripts=['scripts/check'] ) diff --git a/test.sh b/test.sh index 6e1e79f..e59f123 100755 --- a/test.sh +++ b/test.sh @@ -1,3 +1,4 @@ #!/bin/sh python -m litwiki.citation +python -m litwiki.parse diff --git a/wiki/chars/other.org b/wiki/chars/other.org index eeb2105..c6cee57 100644 --- a/wiki/chars/other.org +++ b/wiki/chars/other.org @@ -4,82 +4,82 @@ ** Simona -Friend of Ryouko and foreign exchange student (I.1.209) +Friend of Ryouko and foreign exchange student (1.1.209) -- Wants to be a violinist (I.1.255) +- Wants to be a violinist (1.1.255) - Exchange student but not very interested in learning languages. She embarked - on an exchange to get away from family (I.1.835) -- Describes Earth as same people everywhere (I.1.871) -- May have romantic feelings towards Ryouko (I.1.895) (I.2.543) + on an exchange to get away from family (1.1.835) +- Describes Earth as same people everywhere (1.1.871) +- May have romantic feelings towards Ryouko (1.1.895) (1.2.543) ** Chiaki 智晶 -Friend of Ryouko (I.1.209) -- Long-haired (I.1.209) +Friend of Ryouko (1.1.209) +- Long-haired (1.1.209) ** Ruiko 瑠衣子 -Friend of Ryouko (I.1.209) -- Pig-tailed (I.1.209) -- Wanted to learn nanoengineering or theoretical physics (dropped) (I.1.223) +Friend of Ryouko (1.1.209) +- Pig-tailed (1.1.209) +- Wanted to learn nanoengineering or theoretical physics (dropped) (1.1.223) ** Ryouko's father -- Over 100 years old but looks around 30 (I.1.79) +- Over 100 years old but looks around 30 (1.1.79) ** Ryouko's mother ** Ryouko's (paternal) grandfather -- Join the military on Monday next week [relative to reference] (I.1.161) +- Join the military on Monday next week [relative to reference] (1.1.161) ** Ryouko's (paternal) grandmother -- Joined the military for 12 years (I.1.133) -- Stopped writing to her family but she is not dead. (I.1.133) +- Joined the military for 12 years (1.1.133) +- Stopped writing to her family but she is not dead. (1.1.133) ** some french magical girl -Does not trust the government (I.1.625) +Does not trust the government (1.1.625) * Central ** Tomoe Mami 巴　麻美 -- Looked to be 19-20yo despite being hundreds of years old. (I.1.307) -- Can converse while holding a motionless face (I.1.351) -- Body is enhanced as for every magical girl (I.1.423) -- Field Marshall (I.1.689) -- Hated recruiting because of the innocence of the girls (I.2.19) +- Looked to be 19-20yo despite being hundreds of years old. (1.1.307) +- Can converse while holding a motionless face (1.1.351) +- Body is enhanced as for every magical girl (1.1.423) +- Field Marshall (1.1.689) +- Hated recruiting because of the innocence of the girls (1.2.19) ** Sakura Kyouko 桜　香子 -- Chooses to remain 14 (I.1.471) -- Looks to be 14 and lives in the Catholic-style church in Mitakihara (I.1.429) -- Calls Mami "Marshal" (I.1.477) -- Calls MSY the "Union" (I.1.589) +- Chooses to remain 14 (1.1.471) +- Looks to be 14 and lives in the Catholic-style church in Mitakihara (1.1.429) +- Calls Mami "Marshal" (1.1.477) +- Calls MSY the "Union" (1.1.589) ** Akemi Homura 暁美　ほむら -- "Left" with no more news (I.1.517) -- Believs in "Goddess of Hope" (I.1.539) +- "Left" with no more news (1.1.517) +- Believs in "Goddess of Hope" (1.1.539) - 20 years ago she leveraged the Goddess of Hope and her charisma to start a - religion (I.1.573). This became the Cult of Hope which was the only living - religion which gained members (I.1.577). -- Had presentations and statistics when she was spearheading MSY (I.1.611) -- Vanished after saving Epsilon Eridani (I.1.581) + religion (1.1.573). This became the Cult of Hope which was the only living + religion which gained members (1.1.577). +- Had presentations and statistics when she was spearheading MSY (1.1.611) +- Vanished after saving Epsilon Eridani (1.1.581) ** Chitose Yuma 千才　由麻 -Involved in MSY (I.1.613) +Involved in MSY (1.1.613) -- In government (I.1.623) +- In government (1.1.623) ** Patricia von Rohr -Introduced in (I.2.869) (I.2.965). +Introduced in (1.2.869) (1.2.965). -Excerpt from (I.2.969): +Excerpt from (1.2.969): #+begin_quote Rank: Colonel MG Classification: Miscellaneous, Technological Specialist @@ -90,17 +90,17 @@ Primary Mentor (optional): None ** Maki -Introduced in (I.2.877). +Introduced in (1.2.877). * Incubators ** Kyubey -- Says Akemi Homura has disappeared due to the exhaustion of her soul gem (I.1.907) +- Says Akemi Homura has disappeared due to the exhaustion of her soul gem (1.1.907) * Military ** Fleet Admiral Xing -Has some feud with General Blackwell (I.2.609) +Has some feud with General Blackwell (1.2.609) ** General Blackwell -Has some feud with Fleet Admiral Xing (I.2.609) +Has some feud with Fleet Admiral Xing (1.2.609) diff --git a/wiki/chars/shizuki-ryouko.org b/wiki/chars/shizuki-ryouko.org index b8b5027..6320960 100644 --- a/wiki/chars/shizuki-ryouko.org +++ b/wiki/chars/shizuki-ryouko.org @@ -4,45 +4,45 @@ Main protagonist -- Diminutive stature but does not want to be perceived as a child (I.1.27) +- Diminutive stature but does not want to be perceived as a child (1.1.27) - Has a automatic telescope from grandmother which receives instructions from - cortical implants. (I.1.63) + cortical implants. (1.1.63) * Volume I ** Chapter 1 T+0: -- 14 years old (I.1.33) -- Lives on the 42nd story, in Mitakihara city (I.1.43) -- Could not find a hobby (I.1.73) -- Wants to be a space traveler (I.1.239) +- 14 years old (1.1.33) +- Lives on the 42nd story, in Mitakihara city (1.1.43) +- Could not find a hobby (1.1.73) +- Wants to be a space traveler (1.1.239) - Wants to be a magic girls despite knowing the risks since the life has - contrast with the "sterile, prosaic life" (I.1.399). -- Thinks "nothing is worth rushing for" (I.1.39) + contrast with the "sterile, prosaic life" (1.1.399). +- Thinks "nothing is worth rushing for" (1.1.39) Her wish of being a magical girl was granted after a near-death encounter with -demons and miasma (I.1.1285). +demons and miasma (1.1.1285). ** Chapter 2 Sakura K. explains to Shizuki R. about the military system. Shizuki R. did not -know much about the cult (I.2.125). +know much about the cult (1.2.125). -- The main colour is green (I.1.1309, I.2.187) +- The main colour is green (1.1.1309, I.2.187) - Her weapon as a magical girl is a arbalest (crossbow). -- She can teleport up to 2000 kg (I.2.281) but cannot telekinesis or teleport - objects without teleporting self (I.2.289). -- The maximal range is 200km (I.2.293), which beated previous record of 63km -(I.2.307). -- Her teleportation works by manipulating space (I.2.325). -- Her fingernail shows a green five-pointed star (I.2.137) +- She can teleport up to 2000 kg (1.2.281) but cannot telekinesis or teleport + objects without teleporting self (1.2.289). +- The maximal range is 200km (1.2.293), which beated previous record of 63km +(1.2.307). +- Her teleportation works by manipulating space (1.2.325). +- Her fingernail shows a green five-pointed star (1.2.137) Tomoe M. has already registered Shizuki R. at this stage. Sakura K. is assigned -to be her commanding officer (I.2.365). -- Shizuki R.'s rank is Second Lieutenant (I.2.398) +to be her commanding officer (1.2.365). +- Shizuki R.'s rank is Second Lieutenant (1.2.398) -Sakura K. introduced Shizuki R. to combat the demons (I.2.641). The demons -change strategy and nearly exhaust Shizuki R. (I.2.725). Shizuki R. was lectured -by Sakura K. (I.2.755). Shizuki R. comes back late after curfew and sends a -message to her family to explain (I.2.853). +Sakura K. introduced Shizuki R. to combat the demons (1.2.641). The demons +change strategy and nearly exhaust Shizuki R. (1.2.725). Shizuki R. was lectured +by Sakura K. (1.2.755). Shizuki R. comes back late after curfew and sends a +message to her family to explain (1.2.853). diff --git a/wiki/history.org b/wiki/history.org index 0210ca0..2b7383f 100644 --- a/wiki/history.org +++ b/wiki/history.org @@ -5,57 +5,57 @@ ** Chapter 1: A wish Allocs were cut (/Recommendation by the Production and Allocation Machine -(PAL)/) (I.1.15) +(PAL)/) (1.1.15) At some point in the past the "current war" started, which caused extra allocs -from voluntary work to increase and the basic allocs to decrease. (I.1.261) +from voluntary work to increase and the basic allocs to decrease. (1.1.261) Due to a special conscription act enacted 20 years ago, all new magic girls owe the military 30 years of service. The minimum age of combat was dropped to 13 -(I.1.381). Magic girls enter the military not as privates but 2nd lieutenants -(I.1.385). +(1.1.381). Magic girls enter the military not as privates but 2nd lieutenants +(1.1.385). A defect in the Cult of Hope's computers caused random drops with grief cubes -for squads on the front line (I.1.653). The occurrence seems random. This was +for squads on the front line (1.1.653). The occurrence seems random. This was counterintuitive since computers are not supposed to make such mistakes. Secret -examination squads sent by Sakura K. could not spot problems (I.1.657). Similar +examination squads sent by Sakura K. could not spot problems (1.1.657). Similar defects caused girls to be sent behind the lines or home and never came back. -(I.1.665). +(1.1.665). When Sakura K. was visiting Wolf 359, a platoon of infantry dragged Saya-chan's (other details unknown) body and soul gem back to safety, but she expired. They broke down in front of Sakura K. demanding that she finds the missing Saya-chan -(I.1.359). +(1.1.359). ** Chapter 2: Fantasma -Tomoe M. hates recruiting (I.2.19). Simona is shocked that Shizuki R. became a +Tomoe M. hates recruiting (1.2.19). Simona is shocked that Shizuki R. became a magical girl. Tomoe M. escorted Simona home and Sakura K. introduced Shizuki R. -to combat (I.2.43). +to combat (1.2.43). -- Tomoe M.'s rank is Field Marshal (I.1.1185) -- Sakura K.'s rank is Lieutenant General (I.2.113) +- Tomoe M.'s rank is Field Marshal (1.1.1185) +- Sakura K.'s rank is Lieutenant General (1.2.113) Sakura K. introduces Shizuki R. to combat the demons. At the same time, Tomoe M. explains to Simona the importance of understanding Shizuki R.'s feelings -(I.2.537). +(1.2.537). Tomoe M. schedules meetings with Fleet Admiral Xing and General Blackwell -(I.2.609). She is asked by the production committee of the film "Akemi" and +(1.2.609). She is asked by the production committee of the film "Akemi" and propaganda machines to have an appearance at a screening for recruitment -purposes (I.2.621). +purposes (1.2.621). -Shizuki R. and Sakura K. combat the leftover group of demons (I.2.641). -Shizuki R. nearly exhausts herself and is lectured by Sakura K (I.2.755). +Shizuki R. and Sakura K. combat the leftover group of demons (1.2.641). +Shizuki R. nearly exhausts herself and is lectured by Sakura K (1.2.755). Sakura K. is briefed by von Ruhr, P. about the ground zero of the demon attack -(I.2.992). Grief cubes were left on the ground to hatch demons which breaks -regulations and is incredibly dangerous (I.2.1000). Sakura K. concludes that -someone left them there deliberately (I.2.1032). Sakura K. orders von Ruhr, P. -to keep the matter inside the church (I.2.1076). +(1.2.992). Grief cubes were left on the ground to hatch demons which breaks +regulations and is incredibly dangerous (1.2.1000). Sakura K. concludes that +someone left them there deliberately (1.2.1032). Sakura K. orders von Ruhr, P. +to keep the matter inside the church (1.2.1076). -Sakura K. and Shizuki R. meet the family of Shizuki R. (I.2.1094). +Sakura K. and Shizuki R. meet the family of Shizuki R. (1.2.1094). #+begin_verse A woman was observed by Shizuki R. in the distance when the demon attack -happened (I.2.1144). +happened (1.2.1144). #+end_verse diff --git a/wiki/home.org b/wiki/home.org index 10012ba..af8ddcd 100644 --- a/wiki/home.org +++ b/wiki/home.org @@ -2,5 +2,5 @@ * Characters -- [[./char/shizuki-ryouko.org][Shizuki Ryouko]] (I.1.19) +- [[./char/shizuki-ryouko.org][Shizuki Ryouko]] (1.1.19) - diff --git a/wiki/places.org b/wiki/places.org index 767d72e..2851283 100644 --- a/wiki/places.org +++ b/wiki/places.org @@ -5,31 +5,31 @@ ** Mitakihara City Mitakihara has a major starport which is particularly important and busy -(I.1.55). +(1.1.55). -The city is crammed and most families in tight flats (I.1.89). +The city is crammed and most families in tight flats (1.1.89). -School is at the 30th floor (I.1.193). +School is at the 30th floor (1.1.193). *** Buildings -- Shizuki Consumer Goods (I.1.417) -- Hephaestus Nanotechnology (I.1.417) -- Chronos Biologics (I.1.417) -- Zeus and Prometheus Research Centres (unique to Mitakihara) (I.1.417) +- Shizuki Consumer Goods (1.1.417) +- Hephaestus Nanotechnology (1.1.417) +- Chronos Biologics (1.1.417) +- Zeus and Prometheus Research Centres (unique to Mitakihara) (1.1.417) The two research centres face each other over a narrow causeway between them. -- Headquarter of Cult of Hope (Catholic-style church) (I.1.429). +- Headquarter of Cult of Hope (Catholic-style church) (1.1.429). - Church has a small bedroom for one (I.1.467). + Church has a small bedroom for one (1.1.467). ** Space Stations -- Earth has defense stations orbiting (I.1.61) -- Bucky Model space stations are shaped like football (I.1.65) +- Earth has defense stations orbiting (1.1.61) +- Bucky Model space stations are shaped like football (1.1.65) * Colonies ** Epsilon Eridani -A human colony; Akemi H. helped to save it (I.1.581). +A human colony; Akemi H. helped to save it (1.1.581). ** Wolf 359 -A human colony (I.1.675). +A human colony (1.1.675). diff --git a/wiki/settings.org b/wiki/settings.org index 5dab4bd..d0230c6 100644 --- a/wiki/settings.org +++ b/wiki/settings.org @@ -2,158 +2,158 @@ * Tools -- Chronometer: Some type of clock (I.1.717) -- A nomenclator describes the identity of an individual (I.2.107). +- Chronometer: Some type of clock (1.1.717) +- A nomenclator describes the identity of an individual (1.2.107). * Magica -- Discouragement from parents is illegal but practiced (I.1.377) -- Not bound by travel restrictions (I.1.379) +- Discouragement from parents is illegal but practiced (1.1.377) +- Not bound by travel restrictions (1.1.379) - Many magic girls died in their first combat assignments or before their first - leaves or received psychological damage (I.1.395). + leaves or received psychological damage (1.1.395). - Incubator selection is rare and depends on "potential" which is an innate - quality irrespective of wishes (I.1.403) + quality irrespective of wishes (1.1.403) All chosen by incubators have a deep personal wish worthy of their soul, but this is not a sufficient condition. - Magic girls compose a part of the military and their primary representative is Mami. -- Operating alone is a violation of regulations (I.1.955) -- Mentorship and team systems between magic girls existed before MSY (I.2.9) -- All magical girls upon enlistment becomes emancipated (I.2.377) and movement - concealed from their parents (I.2.855). -- Fingernail mark (I.2.137) -- Emergency mode is mostly useless to magical girls (I.2.261) +- Operating alone is a violation of regulations (1.1.955) +- Mentorship and team systems between magic girls existed before MSY (1.2.9) +- All magical girls upon enlistment becomes emancipated (1.2.377) and movement + concealed from their parents (1.2.855). +- Fingernail mark (1.2.137) +- Emergency mode is mostly useless to magical girls (1.2.261) ** Mahou Shoujo Youkai (MSY) 魔法少女妖怪 An organisation spearheaded by Homura which collects data about battles, grief cube collections, grief cube usage. Members resisted Homura on insisting -forcefully. (I.1.611) +forcefully. (1.1.611) This organisation caused the number of deaths in battle to drop and a grief cube surplus. Sakura K. and Tomoe M. are still executive heads of MSY but leaves -the day-to-day handling to their legates. (I.1.617) +the day-to-day handling to their legates. (1.1.617) This organisation was called Union implying that the incubators are the bosses -of magica (I.1.591). +of magica (1.1.591). -Grief Cube Audit tallies the grief cubes in reserve (I.1.605). +Grief Cube Audit tallies the grief cubes in reserve (1.1.605). ** Cult of Hope Uses its infrastructure to handle all data collection for grief cube logistics -(I.1.633). +(1.1.633). ** Recruiting -Recruits were rushed through their contracts (I.2.37). The one-time offer is -probably a lie to aid recruitment (I.2.43). +Recruits were rushed through their contracts (1.2.37). The one-time offer is +probably a lie to aid recruitment (1.2.43). ** Life on the Frontlines -- Many magical girls choose other girls as partners (I.2.543). +- Many magical girls choose other girls as partners (1.2.543). * Demons and Miasmae -A miasma is a patch of localised thing which can be cleaned up (I.1.931). Signals -have a hard time moving through miasma (I.1.991). It also interferes with biology -enhancement systems (I.1.1049). It also blocks visible light (I.1.993). +A miasma is a patch of localised thing which can be cleaned up (1.1.931). Signals +have a hard time moving through miasma (1.1.991). It also interferes with biology +enhancement systems (1.1.1049). It also blocks visible light (1.1.993). Demons seem to co-exist with miasmae. -- "A white-robed figure loomed over them, tall as three men" (I.1.983) -- Demons can release intense beams of light to destroy things (I.1.1045) +- "A white-robed figure loomed over them, tall as three men" (1.1.983) +- Demons can release intense beams of light to destroy things (1.1.1045) Miasmae and demons occur in industrial districts where populations are sparse -(I.1.1113). Being able to see demons outside of miasma is the smoking gun of a -magical girl (I.1.1213). +(1.1.1113). Being able to see demons outside of miasma is the smoking gun of a +magical girl (1.1.1213). * Timeframe - The incubator system still exists. Instructors cannot divulge information - about incubator system until the pupils are at age 20. (I.1.9) + about incubator system until the pupils are at age 20. (1.1.9) - At Ryuoko's grandmother's time an automatic telescope and cortical implants - were possible (I.1.63) -- Clothes are self-cleaning (I.1.29) and robots can do the dressing (I.1.29), - both require money. Bedsheets are self folding (I.1.85) -- Sleep-suppressing regimen cause people to sleep 0-3h a day for adults (I.1.33). - Considered unsafe for 14-year-olds (I.1.33). -- People can talk without moving lips (I.1.35) -- Hair can maintain at constant length (I.1.43) -- Species diversity preserve (*SDP*) presumably some sort of park (I.1.51). -- Space station can deflect major asteroids or wipe out continents (I.1.65) and - constantly being upgraded, added to, or replaced. (I.1.65) Maybe redundant - (I.1.67). -- Knowledge is directly injected into consciousness (I.1.23), but has - speed limits (I.1.213). -- Can live eternally (I.1.141). -- Food synthesizer produces food (I.1.167) + were possible (1.1.63) +- Clothes are self-cleaning (1.1.29) and robots can do the dressing (1.1.29), + both require money. Bedsheets are self folding (1.1.85) +- Sleep-suppressing regimen cause people to sleep 0-3h a day for adults (1.1.33). + Considered unsafe for 14-year-olds (1.1.33). +- People can talk without moving lips (1.1.35) +- Hair can maintain at constant length (1.1.43) +- Species diversity preserve (*SDP*) presumably some sort of park (1.1.51). +- Space station can deflect major asteroids or wipe out continents (1.1.65) and + constantly being upgraded, added to, or replaced. (1.1.65) Maybe redundant + (1.1.67). +- Knowledge is directly injected into consciousness (1.1.23), but has + speed limits (1.1.213). +- Can live eternally (1.1.141). +- Food synthesizer produces food (1.1.167) - Images can be called up from optical implants which highlights interest - regions and can take pictures (I.1.287). -- Aliens (I.1.529) + regions and can take pictures (1.1.287). +- Aliens (1.1.529) ** Emergency Packages The packages operate by assisting with motion and thought. The civilian-issue version is weaker than the military version. Emergency mode turns on when there -is a life-or-death situation (I.1.1063). +is a life-or-death situation (1.1.1063). Exiting emergency mode causes /recoil/ which is traumatic. Some soldiers turn -emergency mode on for weeks at a time and exiting is very difficult (I.1.1133). +emergency mode on for weeks at a time and exiting is very difficult (1.1.1133). * Economics -The economy operates on a /eudaemonic/ model rather than capitalistic. (I.1.261) +The economy operates on a /eudaemonic/ model rather than capitalistic. (1.1.261) - Resources are allocated in units of /Alloc/ which were cut by - /Recommendations by the PAL/ (I.1.13) -- All productive works are voluntary. (I.1.69) + /Recommendations by the PAL/ (1.1.13) +- All productive works are voluntary. (1.1.69) - No one wants to live outside a city because it is expensive and boring - (I.1.89). Flats are government-allocated and citizens spend - government-distributed incomes (I.1.89). + (1.1.89). Flats are government-allocated and citizens spend + government-distributed incomes (1.1.89). - Goods are more expensive away from centres of production, which are in cities - (I.1.89) + (1.1.89) ** Travel -- Solution to congestion was to go 3D via traffic tubes (I.1.189) (Just +- Solution to congestion was to go 3D via traffic tubes (1.1.189) (Just one more lane bro!!!) -- People can use personal auto-transports (I.1.185) which can be self-driven or - magnetically driven (I.1.187). +- People can use personal auto-transports (1.1.185) which can be self-driven or + magnetically driven (1.1.187). - Public transport tunnels are guarded by sentries to protect falling but they - ignore magic girls (I.1.449). Public transport channels are under surveillance - (I.1.89). + ignore magic girls (1.1.449). Public transport channels are under surveillance + (1.1.89). Space flight is still a scarcity. Pleasure flights were priced to absurd levels to restrict civilians. It had not always been like this but changed for -colonists and military (I.1.59). +colonists and military (1.1.59). Military veterans can have unlimited travel on earth or colonies and the right -to settle anywhere (I.1.383). +to settle anywhere (1.1.383). * Culture - Governance stress having each generation of children experience a little of - human conditions (I.1.33) -- Governance placed restrictions on direct mental communication and VR (I.1.35) -- Nothing worth rushing for for the general population (I.1.39). + human conditions (1.1.33) +- Governance placed restrictions on direct mental communication and VR (1.1.35) +- Nothing worth rushing for for the general population (1.1.39). - Story of human history was all about escape in the past and has reached the - end for perfect society (I.1.45). -- Residents of Earth spend time on their hobbies (I.1.69). + end for perfect society (1.1.45). +- Residents of Earth spend time on their hobbies (1.1.69). - People with /ennui/ (unable to fit into society), divorced after 60 years of matrimony, who are more than 100 years old, can join the military and then be - discharged in the colonies. (I.1.141) + discharged in the colonies. (1.1.141) - Human Standard (a internationalised and mutated form of English) is the Earth - lingua franca (I.1.221). + lingua franca (1.1.221). ** Education - School is about socialising with peers and figuring out what you wanted to - learn (I.1.197). -- Primary School Civics (I.1.273). -- /Mandatory sessions/ are a civic duty (I.1.255). + learn (1.1.197). +- Primary School Civics (1.1.273). +- /Mandatory sessions/ are a civic duty (1.1.255). Such sessions are for preparing the citizenry in a scarcity situation when the economy has to be switched from eudaimonic to scarcity mode (family Allocs - tied to productivity), or even capitalistic. (I.1.261) + tied to productivity), or even capitalistic. (1.1.261) diff --git a/wiki/works.org b/wiki/works.org index c5a1b19..86bc2bf 100644 --- a/wiki/works.org +++ b/wiki/works.org @@ -3,24 +3,24 @@ * Books ** /Universal Guidelines for Middle School Instructors [12th revision]/ -- (I.1.11) +- (1.1.11) ** /Mahou Shoujo: Their World, Their History (Julian Bradshaw)/ -- (I.2.15) +- (1.2.15) * Documentaries ** /Daughters of the Contract: A Documentary/ -- (I.2.7) +- (1.2.7) * Laws/Edicts ** special conscription acts -Mentioned in (I.1.381); Enacted at around T-20a. All new magic girls owe the -military 30 years of service (I.1.381). +Mentioned in (1.1.381); Enacted at around T-20a. All new magic girls owe the +military 30 years of service (1.1.381). ** Information Restriction Acts Restricts information about Magica from the populace. Impossible to enforce -(I.1.391). +(1.1.391).