diff --git a/.gitignore b/.gitignore index b31049d..b7855fc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,10 @@ .* !.gitignore !.latexmkrc +!.pre-commit-config.yaml /build + +# Python +*.pyc +*.egg-info +__pycache__ diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 0000000..8adc05e --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,16 @@ +repos: +- repo: https://github.com/pre-commit/pre-commit-hooks + rev: v3.2.0 + hooks: + - id: trailing-whitespace + - id: end-of-file-fixer + - id: check-yaml + - id: check-added-large-files +- repo: local + hooks: + - id: pylint + name: pylint + entry: pylint + language: system + types: [python] + require_serial: true diff --git a/README.org b/README.org index f8e9a8b..1944b9c 100644 --- a/README.org +++ b/README.org @@ -12,11 +12,25 @@ 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 -number which can be extracted in Emacs via `nov.el` and -``` emacs-lisp +number which can be extracted in Emacs via ~nov.el~ and +#+begin_src emacs-lisp (setq nov-text-width t) (add-hook 'nov-mode-hook 'visual-line-mode) -``` -To refer to a character "First Name, Last Name", use "Last Name, F.". For -example, Shizuki Ryouko is referred to as "Shizuki R.". This format is uniform -across the wiki. +#+end_src +To refer to a character "First, Last", use "Last F.". For example, Shizuki +Ryouko is referred to as "Shizuki R.". This format is uniform across the wiki. + +The way wiki generates is by assigning a plot timestamp to every part of an org +file based on the next citation point. + +** Wiki Generation + +~litwiki~, a Python package specifically developed for this project, is included +here to assist with the progressive generation of wikis. + +** Contributing + +Install an editor capable of handling Org mode files. Install +- Python 3 +- ~pylint~ +- ~pre-commit~ diff --git a/litwiki/__init__.py b/litwiki/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/milsymb.sty b/milsymb.sty index 3bc9d97..11b6050 100644 --- a/milsymb.sty +++ b/milsymb.sty @@ -82,7 +82,7 @@ MilSymb equipment/hostile/.pic={ \pic{MilSymb land/hostile};}, MilSymb equipment/neutral/.pic={ \pic{MilSymb land/neutral};}, -MilSymb equipment/unknown/.pic={ +MilSymb equipment/unknown/.pic={ \pic{MilSymb land/unknown};}, % INSTALLATION % MilSymb installation/none/.pic={ @@ -96,7 +96,7 @@ MilSymb installation/hostile/.pic={ MilSymb installation/neutral/.pic={ \fill (0.2, 0.65) rectangle (-0.2, 0.5); \pic[local bounding box=M] {MilSymb land/neutral};}, -MilSymb installation/unknown/.pic={ +MilSymb installation/unknown/.pic={ \fill (0.2, 0.825) rectangle(-0.2, 0.4); \pic [local bounding box=M] {MilSymb land/unknown};}, % SEA SUBSURFACE % @@ -158,7 +158,7 @@ MilSymb activity/neutral/.pic={ \fill (0.5, -0.5) rectangle (0.35, -0.35); \fill (-0.5, -0.5) rectangle (-0.35, -0.35); }, -MilSymb activity/unknown/.pic={ +MilSymb activity/unknown/.pic={ \pic {MilSymb land/unknown}; \begin{scope} \clip (45:0.5) to[out=90,in=90,looseness=1.7] (135:0.5) to[out=180,in=180,looseness=1.7] (225:0.5) to[out=270, in=270, looseness=1.7] (315:0.5) to[out=0, in=0, looseness=1.7] (45:0.5) -- cycle; @@ -166,7 +166,7 @@ MilSymb activity/unknown/.pic={ \fill (0.075, -0.705) rectangle (-0.075, -0.555); \fill (0.705, 0.075) rectangle (0.555, -0.075); \fill (-0.705, 0.075) rectangle (-0.555, -0.075); -\end{scope}}, +\end{scope}}, %% AIR SYMBOLS %% % MAIN % MilSymb air/main/civilian fixed wing/.pic={ @@ -180,7 +180,7 @@ MilSymb air/main/military balloon/.pic={ \fill (0, 0.025) circle (0.175); \fill (-0.05, 0) -- (-0.05,-0.2) -- (0.05, -0.2) -- (0.05,0) -- cycle;}, MilSymb air/main/civilian balloon/.pic={ -\path (0.175, 0.2) rectangle (-0.175, -0.2); +\path (0.175, 0.2) rectangle (-0.175, -0.2); \draw (0, 0.025) circle (0.175); \begin{scope} \clip (0, 0.025) circle (0.175) [reverseclip]; @@ -310,11 +310,11 @@ MilSymb land/main/anti tank anti armour/unknown/.pic={ }, MilSymb land/main/corps support/friendly/.pic={ \clip \clipfriendly; -\draw (0.75, 0.5) -- (0:0.5) -- (0.75, -0.5); +\draw (0.75, 0.5) -- (0:0.5) -- (0.75, -0.5); }, MilSymb land/main/corps support/hostile/.pic={ \clip \cliphostile; -\draw (0.95, 0.5) -- (0.45, 0) -- (0.95, -0.5); +\draw (0.95, 0.5) -- (0.45, 0) -- (0.95, -0.5); }, MilSymb land/main/corps support/neutral/.pic={ \clip \clipneutral; @@ -344,11 +344,11 @@ MilSymb land/main/search electronic warfare/.pic={ }, MilSymb land/main/headquarters/friendly/.pic={ \clip \clipfriendly; -\draw (-0.75, 0.2) -- (0.75, 0.2); +\draw (-0.75, 0.2) -- (0.75, 0.2); }, MilSymb land/main/headquarters/hostile/.pic={ \clip \cliphostile; -\draw (0.5, 0.2) -- (-0.5, 0.2); +\draw (0.5, 0.2) -- (-0.5, 0.2); }, MilSymb land/main/headquarters/neutral/.pic={ \clip \clipneutral; @@ -360,23 +360,23 @@ MilSymb land/main/headquarters/unknown/.pic={ }, MilSymb land/main/infantry/friendly/.pic={ \clip \clipfriendly; -\draw (-0.75, 0.5) -- (0.75, -0.5); -\draw (-0.75, -0.5) -- (0.75, 0.5); +\draw (-0.75, 0.5) -- (0.75, -0.5); +\draw (-0.75, -0.5) -- (0.75, 0.5); }, MilSymb land/main/infantry/hostile/.pic={ \clip \cliphostile; -\draw (-0.5, 0.25) -- (0.5, -0.25); -\draw (-0.5, -0.25) -- (0.5, 0.25); +\draw (-0.5, 0.25) -- (0.5, -0.25); +\draw (-0.5, -0.25) -- (0.5, 0.25); }, MilSymb land/main/infantry/neutral/.pic={ \clip \clipneutral; -\draw (-0.5, 0.25) -- (0.5, -0.25); -\draw (-0.5, -0.25) -- (0.5, 0.25); +\draw (-0.5, 0.25) -- (0.5, -0.25); +\draw (-0.5, -0.25) -- (0.5, 0.25); }, MilSymb land/main/infantry/unknown/.pic={ \clip \clipunknown; -\draw (-0.75, 0.35) -- (0.75, -0.35); -\draw (-0.75, -0.35) -- (0.75, 0.35); +\draw (-0.75, 0.35) -- (0.75, -0.35); +\draw (-0.75, -0.35) -- (0.75, 0.35); }, MilSymb land/main/jamming/friendly/.pic={ \clip \clipfriendly; @@ -410,19 +410,19 @@ MilSymb land/main/jamming electronic warfare/.pic={ }, MilSymb land/main/main gun system/friendly/.pic={ \clip \clipfriendly; -\draw (-0.5, 0.5) -- (-0.5, -0.5); +\draw (-0.5, 0.5) -- (-0.5, -0.5); }, MilSymb land/main/main gun system/hostile/.pic={ \clip \cliphostile; -\draw (-0.5, 0.5) -- (-0.5, -0.5); +\draw (-0.5, 0.5) -- (-0.5, -0.5); }, MilSymb land/main/main gun system/neutral/.pic={ \clip \clipneutral; -\draw (-0.3, 0.5) -- (-0.3, -0.5); +\draw (-0.3, 0.5) -- (-0.3, -0.5); }, MilSymb land/main/main gun system/unknown/.pic={ \clip \clipunknown; -\draw (-0.5, 0.5) -- (-0.5, -0.5); +\draw (-0.5, 0.5) -- (-0.5, -0.5); }, MilSymb land/main/motorized/.pic={ \draw (M.north) -- (M.south); @@ -549,7 +549,7 @@ MilSymb land/main/fire protection/.pic={ MilSymb land/main/labour/.pic={ \draw (0.1, 0) -- (-0.1, 0) -- (0, -0.15) -- cycle; \draw (0, 0) -- (0, 0.15); -\draw (0.1, 0.15) -- (-0.1, 0.15); +\draw (0.1, 0.15) -- (-0.1, 0.15); }, MilSymb land/main/laundry/.pic={ \draw (0, -0.2) -- (0, 0.1) -- (-0.15, 0.2); @@ -596,7 +596,7 @@ MilSymb land/main/pipeline/.pic={ \draw (-0.025, 0.05) -- (-0.025, 0.15); }, MilSymb land/main/postal/.pic={ -\draw (0.1, 0.2) arc(180:225:0.565) arc(270:197:0.565) -- cycle; +\draw (0.1, 0.2) arc(180:225:0.565) arc(270:197:0.565) -- cycle; }, MilSymb land/main/psychological operations broadcast/.pic={ \pic {MilSymb multi/main/antenna}; @@ -701,7 +701,7 @@ MilSymb land/upper/sensor/.pic={ \pic [scale=0.5] {MilSymb multi/main/sensor}; }, MilSymb land/upper/signals intelligence/.pic={ -\begin{scope}[scale=0.75, yshift=-2.5] +\begin{scope}[scale=0.75, yshift=-2.5] \draw (0, -0.05) -- (0, 0.2); \draw (0.15, 0.15) -- (0.1, 0.2) -- (0.05, 0.15) -- (0, 0.2) -- (-0.05, 0.15) -- (-0.1, 0.2) -- (-0.15, 0.15); \end{scope} @@ -1188,10 +1188,10 @@ MilSymb installation/main/mass grave site/.pic={ }, MilSymb installation/main/mine/.pic={ \draw (-0.2, -0.2) -- (0.2, 0.15); -\draw [line cap=round, thick] ($(65:0.1) + (0.1, 0.1)$) arc (65:25:0.2); +\draw [line cap=round, thick] ($(65:0.1) + (0.1, 0.1)$) arc (65:25:0.2); \begin{scope} [xscale=-1] \draw (-0.2, -0.2) -- (0.2, 0.15); -\draw [line cap=round, thick] ($(65:0.1) + (0.1, 0.1)$) arc (65:25:0.2); +\draw [line cap=round, thick] ($(65:0.1) + (0.1, 0.1)$) arc (65:25:0.2); \end{scope} }, MilSymb installation/main/nuclear/.pic={ @@ -1455,7 +1455,7 @@ MilSymb seasubsurface/main/civilian submersible/.pic={ \draw ($(0, -0.05) + (106.6:0.35 and 0.15)$) arc (106.6:433.4:0.35 and 0.15) |- (0, 0.2) -| cycle; }, MilSymb seasubsurface/main/torpedo/.pic={ -\fill (-0.35, 0) -- (-0.3, 0.075) -- (0.25, 0.075) -- (0.35, -0.075) -- (0.35, 0.075) -- (0.25, -0.075) -- (-0.3, -0.075) -- cycle; +\fill (-0.35, 0) -- (-0.3, 0.075) -- (0.25, 0.075) -- (0.35, -0.075) -- (0.35, 0.075) -- (0.25, -0.075) -- (-0.3, -0.075) -- cycle; }, MilSymb seasubsurface/main/underwater decoy/.pic={ \pic [yshift=-1.5] {MilSymb multi/main/decoy}; @@ -1561,11 +1561,11 @@ MilSymb seasubsurface/mine/unexploded ordanance/.pic={ % MAIN % MilSymb space/main/military orbiter shuttle/.pic={ \fill ($(0, 0.3)!0.35!(0.125, -0.15)$) -- (0.125, -0.15) -- (-0.125, -0.15) -- ($(-0.125, -0.15)!0.65!(0, 0.3)$) to[in=105, out=75] cycle; -\draw (0, -0.20) -- (0, -0.15); +\draw (0, -0.20) -- (0, -0.15); }, MilSymb space/main/civilian orbiter shuttle/.pic={ \draw ($(0, 0.3)!0.35!(0.125, -0.15)$) -- (0.125, -0.15) -- (-0.125, -0.15) -- ($(-0.125, -0.15)!0.65!(0, 0.3)$) to[in=105, out=75] cycle; -\draw (0, -0.20) -- (0, -0.15); +\draw (0, -0.20) -- (0, -0.15); }, MilSymb space/main/military capsule/.pic={ \fill ($(0.25, -0.2)!0.1!(0, 0.5)$) -- ($(0.25, -0.2)!0.5!(0, 0.5)$) to[in=75, out=105, looseness=0.75] ($(0, 0.5)!0.5!(-0.25, -0.2)$) -- ($(0, 0.5)!0.9!(-0.25, -0.2)$) to[in=285, out=255, looseness=0.55] cycle; @@ -1615,13 +1615,13 @@ MilSymb space/main/military communications satellite/.pic={ \pic {MilSymb space/main/military satellite}; \draw (0, 0.075) -- (0, 0.125); \draw (0, 0.125) arc (270:340:0.25 and 0.1); -\draw (0, 0.125) arc (270:200:0.25 and 0.1); +\draw (0, 0.125) arc (270:200:0.25 and 0.1); }, MilSymb space/main/civilian communications satellite/.pic={ \pic {MilSymb space/main/civilian satellite}; \draw (0, 0.075) -- (0, 0.125); \draw (0, 0.125) arc (270:340:0.25 and 0.1); -\draw (0, 0.125) arc (270:200:0.25 and 0.1); +\draw (0, 0.125) arc (270:200:0.25 and 0.1); }, MilSymb space/main/military earth observation satellite/.pic={ \pic [yshift=3.75, scale=0.9] {MilSymb space/main/military satellite}; @@ -1637,17 +1637,17 @@ MilSymb space/main/civilian earth observation satellite/.pic={ }, MilSymb space/main/military miniaturised satellite/.pic={ \pic [scale=0.6] {MilSymb space/main/military satellite}; -\draw (0.05, 0.2) -- (0, 0.1) -- (-0.05, 0.2); -\draw (0.05, -0.2) -- (0, -0.1) -- (-0.05, -0.2); -\draw (-0.4, 0.05) -- (-0.3, 0) -- (-0.4, -0.05); -\draw (0.4, 0.05) -- (0.3, 0) -- (0.4, -0.05); +\draw (0.05, 0.2) -- (0, 0.1) -- (-0.05, 0.2); +\draw (0.05, -0.2) -- (0, -0.1) -- (-0.05, -0.2); +\draw (-0.4, 0.05) -- (-0.3, 0) -- (-0.4, -0.05); +\draw (0.4, 0.05) -- (0.3, 0) -- (0.4, -0.05); }, MilSymb space/main/civilian miniaturised satellite/.pic={ \pic [scale=0.6] {MilSymb space/main/civilian satellite}; -\draw (0.05, 0.2) -- (0, 0.1) -- (-0.05, 0.2); -\draw (0.05, -0.2) -- (0, -0.1) -- (-0.05, -0.2); -\draw (-0.4, 0.05) -- (-0.3, 0) -- (-0.4, -0.05); -\draw (0.4, 0.05) -- (0.3, 0) -- (0.4, -0.05); +\draw (0.05, 0.2) -- (0, 0.1) -- (-0.05, 0.2); +\draw (0.05, -0.2) -- (0, -0.1) -- (-0.05, -0.2); +\draw (-0.4, 0.05) -- (-0.3, 0) -- (-0.4, -0.05); +\draw (0.4, 0.05) -- (0.3, 0) -- (0.4, -0.05); }, MilSymb space/main/military navigational satellite/.pic={ \pic [yshift=-3.75, scale=0.9] {MilSymb space/main/military satellite}; @@ -1742,7 +1742,7 @@ MilSymb activity/main/automobile/.pic={ \begin{scope} \clip (0.2, -0.15) circle (0.05) (-0.2, -0.15) circle (0.05) [reverseclip]; \draw (0.3, -0.15) -- (-0.3, -0.15) -- (-0.3, 0.025) -- (-0.1, 0.025) -- (-0.1, 0.2) -- (0.1, 0.2) -- (0.1, 0.025) -- (0.3, 0.025) -- cycle; -\draw (0.075, 0.025) rectangle (-0.075, 0.175); +\draw (0.075, 0.025) rectangle (-0.075, 0.175); \end{scope} \draw (0.2, -0.15) circle (0.05); \draw (-0.2, -0.15) circle (0.05); @@ -1760,9 +1760,9 @@ MilSymb activity/main/graffiti/.pic={ }, MilSymb activity/main/patrolling/.pic={ \draw (0.3, 0.05) -- (-0.05, 0.05) -- (0.05, -0.05) -- (-0.4, -0.05); -\draw (-0.3, 0) -- (-0.4, -0.05) -- (-0.3, -0.1); +\draw (-0.3, 0) -- (-0.4, -0.05) -- (-0.3, -0.1); \fontsize{4}{0}\selectfont -\node [anchor=west] at (0.3, 0.05) {P}; +\node [anchor=west] at (0.3, 0.05) {P}; }, MilSymb activity/main/poisoning/.pic={ \draw (0, 0.055) circle (0.145); @@ -1771,7 +1771,7 @@ MilSymb activity/main/poisoning/.pic={ }, MilSymb activity/main/searching/.pic={ \draw (-0.4, 0) arc (180:0:0.1) arc (180:360:0.1) arc (180:0:0.1) arc (180:270:0.1) -- +(0.1, 0); -\draw (0.3, -0.05) -- (0.4, -0.1) -- (0.3, -0.15); +\draw (0.3, -0.05) -- (0.4, -0.1) -- (0.3, -0.15); }, % UPPER % MilSymb activity/upper/house to house/.pic={ @@ -1813,7 +1813,7 @@ MilSymb multi/main/armoured/.pic={ }, MilSymb multi/main/bridge/.pic={ \draw (0.35, -0.15) -- (0.25, -0.05) -- (-0.25, -0.05) -- (-0.35, -0.15); -\scoped[yscale=-1]{\draw (0.35, -0.15) -- (0.25, -0.05) -- (-0.25, -0.05) -- (-0.35, -0.15);} +\scoped[yscale=-1]{\draw (0.35, -0.15) -- (0.25, -0.05) -- (-0.25, -0.05) -- (-0.35, -0.15);} }, MilSymb multi/main/petroleum oil and lubricants/.pic={ \draw (0, -0.175) -- (0, 0) -- (0.15, 0.175) -- (-0.15, 0.175) -- (0, 0); @@ -2152,7 +2152,7 @@ fill=gray, \newacro{mediumS}[M]{} \newacro{lowS}[L]{} \NewDocumentCommand\MilAir{ o D(){0,0} d() g}{ -\tikzset{% +\tikzset{% /MilSymb/.cd, faction/.is choice, faction/none/.style={/MilSymb/.cd, shape=air/none, fill=white}, @@ -2161,7 +2161,7 @@ fill=gray, faction/neutral/.style={/MilSymb/.cd, shape=air/neutral, fill=neutralA}, faction/unknown/.style={/MilSymb/.cd, shape=air/unknown, fill=unknownA}, main/.is choice, - main/none/.style={/MilSymb/.cd, SymbC=text/small, SymbCT=}, + main/none/.style={/MilSymb/.cd, SymbC=text/small, SymbCT=}, main/military/.style={/MilSymb/.cd, SymbC=text/normal, SymbCT=MIL}, main/civilian/.style={/MilSymb/.cd, SymbC=text/normal, SymbCT=CIV}, main/military fixed wing/.style={/MilSymb/.cd, SymbC=multi/main/aviation fixed wing}, @@ -2204,46 +2204,46 @@ fill=gray, main/very important person/.style={/MilSymb/.cd, SymbC=text/normal, SymbCT=VIP}, main/.unknown/.code={\let\custom\pgfkeys@was@choice \pgfkeysalso{/MilSymb/.cd, SymbC=custom/\custom}}, upper/.is choice, - upper/none/.style={/MilSymb/.cd, SymbU=text/small, SymbUT=}, + upper/none/.style={/MilSymb/.cd, SymbU=text/small, SymbUT=}, upper/medical evacuation/.style={/MilSymb/.cd, SymbU=multi/upper/medic}, - upper/cargo/.style={/MilSymb/.cd, SymbU=text/small, SymbUT=C}, + upper/cargo/.style={/MilSymb/.cd, SymbU=text/small, SymbUT=C}, upper/jammer/.style={/MilSymb/.cd, SymbU=text/small, SymbUT=J}, upper/tanker/.style={/MilSymb/.cd, SymbU=text/small, SymbUT=K}, - upper/patrol/.style={/MilSymb/.cd, SymbU=text/small, SymbUT=J}, - upper/reconnaissance/.style={/MilSymb/.cd, SymbU=text/small, SymbUT=P}, - upper/jammer/.style={/MilSymb/.cd, SymbU=text/small, SymbUT=R}, - upper/trainer/.style={/MilSymb/.cd, SymbU=text/small, SymbUT=T}, - upper/utility/.style={/MilSymb/.cd, SymbU=text/small, SymbUT=U}, - upper/airborne command post/.style={/MilSymb/.cd, SymbU=text/small, SymbUT=ACP}, + upper/patrol/.style={/MilSymb/.cd, SymbU=text/small, SymbUT=J}, + upper/reconnaissance/.style={/MilSymb/.cd, SymbU=text/small, SymbUT=P}, + upper/jammer/.style={/MilSymb/.cd, SymbU=text/small, SymbUT=R}, + upper/trainer/.style={/MilSymb/.cd, SymbU=text/small, SymbUT=T}, + upper/utility/.style={/MilSymb/.cd, SymbU=text/small, SymbUT=U}, + upper/airborne command post/.style={/MilSymb/.cd, SymbU=text/small, SymbUT=ACP}, upper/airborne early warning/.style={/MilSymb/.cd, SymbU=text/small, SymbUT=AEW}, - upper/anti surface warfare/.style={/MilSymb/.cd, SymbU=text/smallsquashed, SymbUT=ASUW}, - upper/anti submarine warfare/.style={/MilSymb/.cd, SymbU=text/small, SymbUT=ASW}, - upper/communications/.style={/MilSymb/.cd, SymbU=text/small, SymbUT=COM}, - upper/combat search and rescue/.style={/MilSymb/.cd, SymbU=text/smallsquashed, SymbUT=CSAR}, - upper/electronic support measures/.style={/MilSymb/.cd, SymbU=text/small, SymbUT=ESM}, - upper/government flight/.style={/MilSymb/.cd, SymbU=text/small, SymbUT=GOV}, - upper/mine countermeasures/.style={/MilSymb/.cd, SymbU=text/small, SymbUT=MCM}, - upper/personnel recovery/.style={/MilSymb/.cd, SymbU=text/small, SymbUT=PR}, + upper/anti surface warfare/.style={/MilSymb/.cd, SymbU=text/smallsquashed, SymbUT=ASUW}, + upper/anti submarine warfare/.style={/MilSymb/.cd, SymbU=text/small, SymbUT=ASW}, + upper/communications/.style={/MilSymb/.cd, SymbU=text/small, SymbUT=COM}, + upper/combat search and rescue/.style={/MilSymb/.cd, SymbU=text/smallsquashed, SymbUT=CSAR}, + upper/electronic support measures/.style={/MilSymb/.cd, SymbU=text/small, SymbUT=ESM}, + upper/government flight/.style={/MilSymb/.cd, SymbU=text/small, SymbUT=GOV}, + upper/mine countermeasures/.style={/MilSymb/.cd, SymbU=text/small, SymbUT=MCM}, + upper/personnel recovery/.style={/MilSymb/.cd, SymbU=text/small, SymbUT=PR}, upper/passenger plane/.style={/MilSymb/.cd, SymbU=text/small, SymbUT=PX}, - upper/search and rescue/.style={/MilSymb/.cd, SymbU=text/small, SymbUT=SAR}, + upper/search and rescue/.style={/MilSymb/.cd, SymbU=text/small, SymbUT=SAR}, upper/suppression of enemy air defenses/.style={/MilSymb/.cd, SymbU=text/smallsquashed, SymbUT=SEAD}, - upper/special operations forces/.style={/MilSymb/.cd, SymbU=text/small, SymbUT=SOF}, - upper/ultra light/.style={/MilSymb/.cd, SymbU=text/small, SymbUT=UL}, - upper/photographic/.style={/MilSymb/.cd, SymbU=text/small, SymbUT=PH}, - upper/very important person/.style={/MilSymb/.cd, SymbU=text/small, SymbUT=VIP}, + upper/special operations forces/.style={/MilSymb/.cd, SymbU=text/small, SymbUT=SOF}, + upper/ultra light/.style={/MilSymb/.cd, SymbU=text/small, SymbUT=UL}, + upper/photographic/.style={/MilSymb/.cd, SymbU=text/small, SymbUT=PH}, + upper/very important person/.style={/MilSymb/.cd, SymbU=text/small, SymbUT=VIP}, upper/escort/.style={/MilSymb/.cd, SymbU=text/small, SymbUT=E}, upper/intensive care/.style={/MilSymb/.cd, SymbU=text/small, SymbUT=IC}, upper/.unknown/.code={\let\custom\pgfkeys@was@choice \pgfkeysalso{/MilSymb/.cd, SymbC=custom/\custom}}, lower/.is choice, lower/none/.style={/MilSymb/.cd, SymbL=text/small, SymbLT=}, - lower/light/.style={/MilSymb/.cd, SymbL=text/small, SymbLT=L}, - lower/medium/.style={/MilSymb/.cd, SymbL=text/small, SymbLT=M}, - lower/heavy/.style={/MilSymb/.cd, SymbL=text/small, SymbLT=H}, - lower/boom only/.style={/MilSymb/.cd, SymbL=text/small, SymbLT=B}, + lower/light/.style={/MilSymb/.cd, SymbL=text/small, SymbLT=L}, + lower/medium/.style={/MilSymb/.cd, SymbL=text/small, SymbLT=M}, + lower/heavy/.style={/MilSymb/.cd, SymbL=text/small, SymbLT=H}, + lower/boom only/.style={/MilSymb/.cd, SymbL=text/small, SymbLT=B}, lower/drogue only/.style={/MilSymb/.cd, SymbL=text/small, SymbLT=D}, - lower/boom and drogue/.style={/MilSymb/.cd, SymbL=text/small, SymbLT=B/D}, - lower/close range/.style={/MilSymb/.cd, SymbL=text/small, SymbLT=CR}, - lower/short range/.style={/MilSymb/.cd, SymbL=text/small, SymbLT=SR}, + lower/boom and drogue/.style={/MilSymb/.cd, SymbL=text/small, SymbLT=B/D}, + lower/close range/.style={/MilSymb/.cd, SymbL=text/small, SymbLT=CR}, + lower/short range/.style={/MilSymb/.cd, SymbL=text/small, SymbLT=SR}, lower/medium range/.style={/MilSymb/.cd, SymbL=text/small, SymbLT=MR}, lower/long range/.style={/MilSymb/.cd, SymbL=text/small, SymbLT=LR}, lower/.unknown/.code={\let\custom\pgfkeys@was@choice \pgfkeysalso{/MilSymb/.cd, SymbC=custom/\custom}}, @@ -2260,7 +2260,7 @@ fill=gray, call sign=, position and movement=, nation=, - additional information=, + additional information=, main=none, upper=none, lower=none, @@ -2293,22 +2293,22 @@ fill=gray, faction/neutral/.style={/MilSymb/.cd, shape=air/neutral, fill=neutralA}, faction/unknown/.style={/MilSymb/.cd, shape=air/unknown, fill=unknownA}, left/.is choice, - left/none/.style= {/MilSymb/.cd, SymbU=text/small, SymbUT=}, - left/air/.style= {/MilSymb/.cd, SymbU=text/small, SymbUT=A}, - left/surface/.style= {/MilSymb/.cd, SymbU=text/small, SymbUT=S}, - left/sub surface/.style= {/MilSymb/.cd, SymbU=text/small, SymbUT=SU}, - left/space/.style= {/MilSymb/.cd, SymbU=text/small, SymbUT=SP}, - left/anti ballistic/.style= {/MilSymb/.cd, SymbU=text/small, SymbUT=AB}, - left/ballistic/.style= {/MilSymb/.cd, SymbU=text/small, SymbUT=B}, + left/none/.style= {/MilSymb/.cd, SymbU=text/small, SymbUT=}, + left/air/.style= {/MilSymb/.cd, SymbU=text/small, SymbUT=A}, + left/surface/.style= {/MilSymb/.cd, SymbU=text/small, SymbUT=S}, + left/sub surface/.style= {/MilSymb/.cd, SymbU=text/small, SymbUT=SU}, + left/space/.style= {/MilSymb/.cd, SymbU=text/small, SymbUT=SP}, + left/anti ballistic/.style= {/MilSymb/.cd, SymbU=text/small, SymbUT=AB}, + left/ballistic/.style= {/MilSymb/.cd, SymbU=text/small, SymbUT=B}, left/cruise/.style= {/MilSymb/.cd, SymbU=text/small, SymbUT=C}, left/.unknown/.code={\let\custom\pgfkeys@was@choice \pgfkeysalso{/MilSymb/.cd, SymbC=custom/\custom}}, right/.is choice, - right/none/.style= {/MilSymb/.cd, SymbL=text/small, SymbLT=}, - right/air/.style= {/MilSymb/.cd, SymbL=text/small, SymbLT=A}, - right/surface/.style= {/MilSymb/.cd, SymbL=text/small, SymbLT=S}, - right/sub surface/.style= {/MilSymb/.cd, SymbL=text/small, SymbLT=SU}, - right/space/.style= {/MilSymb/.cd, SymbL=text/small, SymbLT=SP}, - right/launched/.style= {/MilSymb/.cd, SymbL=text/small, SymbLT=L}, + right/none/.style= {/MilSymb/.cd, SymbL=text/small, SymbLT=}, + right/air/.style= {/MilSymb/.cd, SymbL=text/small, SymbLT=A}, + right/surface/.style= {/MilSymb/.cd, SymbL=text/small, SymbLT=S}, + right/sub surface/.style= {/MilSymb/.cd, SymbL=text/small, SymbLT=SU}, + right/space/.style= {/MilSymb/.cd, SymbL=text/small, SymbLT=SP}, + right/launched/.style= {/MilSymb/.cd, SymbL=text/small, SymbLT=L}, right/missile/.style= {/MilSymb/.cd, SymbL=text/small, SymbLT=M}, right/.unknown/.code={\let\custom\pgfkeys@was@choice \pgfkeysalso{/MilSymb/.cd, SymbC=custom/\custom}}, track number/.store in= \MilSymb@SymbA, @@ -2322,7 +2322,7 @@ fill=gray, call sign=, position and movement=, nation=, - additional information=, + additional information=, faction=none, left=none, right=none, @@ -2358,7 +2358,7 @@ fill=gray, faction/neutral/.style={/MilSymb/.cd, shape=land/neutral, fill=neutralA, selectedfaction=neutral}, faction/unknown/.style={/MilSymb/.cd, shape=land/unknown, fill=unknownA, selectedfaction=unknown}, main/.is choice, - main/none/.style={/MilSymb/.cd, SymbC=text/small, SymbCT=}, + main/none/.style={/MilSymb/.cd, SymbC=text/small, SymbCT=}, main/air assault with organic lift/.style={/MilSymb/.cd, SymbC=land/main/air assault with organic lift/\MilSymb@selectedfaction}, main/air defence/.style={/MilSymb/.cd, SymbC=land/main/air defence/\MilSymb@selectedfaction}, main/air and naval gunfire liaison company/.style={/MilSymb/.cd, SymbC=land/main/air and naval gunfire liaison company/\MilSymb@selectedfaction}, @@ -2794,7 +2794,7 @@ fill=gray, faction/neutral/.style={/MilSymb/.cd, shape=equipment/neutral, fill=neutralA, iconcolour=neutralB}, faction/unknown/.style={/MilSymb/.cd, shape=equipment/unknown, fill=unknownA, iconcolour=unknownB}, main/.is choice, - main/none/.style={/MilSymb/.cd, SymbC=text/small, SymbCT=}, + main/none/.style={/MilSymb/.cd, SymbC=text/small, SymbCT=}, main/rifle/.style= {/MilSymb/.cd, SymbC=equipment/main/rifle}, main/single shot rifle/.style= {/MilSymb/.cd, SymbC=equipment/main/single shot rifle}, main/semi automatic rifle/.style= {/MilSymb/.cd, SymbC=equipment/main/semi automatic rifle}, @@ -3249,7 +3249,7 @@ fill=gray, position and movement=, identification=, additional information=, - date-time group=, + date-time group=, faction=none, main=none, upper=none, @@ -3377,7 +3377,7 @@ fill=gray, identification=, additional information=, date-time group=, - faction=none, + faction=none, main=none, upper=none, lower=none, @@ -3434,7 +3434,7 @@ fill=gray, position and movement=, identification=, additional information=, - date-time group=, + date-time group=, faction=friendly, mine=normal, neutralised=false, @@ -3535,7 +3535,7 @@ fill=gray, position and movement=, nation=, additional information=, - faction=none, + faction=none, main=none, upper=none, lower=none, @@ -3579,7 +3579,7 @@ fill=gray, \else \draw circle (0.15); \fi -\pic {MilSymb \MilSymb@shape}; %Draw debris modifier +\pic {MilSymb \MilSymb@shape}; %Draw debris modifier \end{scope} \IfNoValueF{#4}{\node [anchor=west, align=left] at (#3.east) {#4};} } @@ -3596,16 +3596,16 @@ fill=gray, main/.is choice, main/none/.style={/MilSymb/.cd, SymbC=text/small, SymbCT=}, main/arrest/.style={/MilSymb/.cd, SymbC=activity/main/arrest}, - main/fire/.style={/MilSymb/.cd, SymbC=text/squashed, SymbCT=FIRE}, + main/fire/.style={/MilSymb/.cd, SymbC=text/squashed, SymbCT=FIRE}, main/attempted criminal activity/.style={/MilSymb/.cd, SymbC=multi/main/victim of an attempted crime}, - main/demonstration/.style={/MilSymb/.cd, SymbC=text/squashed, SymbCT=MASS}, + main/demonstration/.style={/MilSymb/.cd, SymbC=text/squashed, SymbCT=MASS}, main/drive by shooting/.style={/MilSymb/.cd, SymbC=activity/main/drive by shooting}, - main/drug related activities/.style={/MilSymb/.cd, SymbC=text/squashed, SymbCT=DRUG}, + main/drug related activities/.style={/MilSymb/.cd, SymbC=text/squashed, SymbCT=DRUG}, main/explosion/.style={/MilSymb/.cd, SymbC=activity/main/explosion}, main/improvised explosive device explosion/.style={/MilSymb/.cd, SymbC=activity/main/improvised explosive device explosion}, - main/extortion 1/.style={/MilSymb/.cd, SymbC=text/normal, SymbCT=\$}, - main/extortion 2/.style={/MilSymb/.cd, SymbC=text/normal, SymbCT=\pounds}, - main/extortion 3/.style={/MilSymb/.cd, SymbC=text/normal, SymbCT=\texteuro}, + main/extortion 1/.style={/MilSymb/.cd, SymbC=text/normal, SymbCT=\$}, + main/extortion 2/.style={/MilSymb/.cd, SymbC=text/normal, SymbCT=\pounds}, + main/extortion 3/.style={/MilSymb/.cd, SymbC=text/normal, SymbCT=\texteuro}, main/extortion 4/.style={/MilSymb/.cd, SymbC=text/normal, SymbCT=\textyen}, main/graffiti/.style={/MilSymb/.cd, SymbC=activity/main/graffiti}, main/killing/.style={/MilSymb/.cd, SymbC=multi/main/killing victim}, diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..5550ea2 --- /dev/null +++ b/setup.py @@ -0,0 +1,11 @@ +"""Entrypoint for litwiki""" +from setuptools import setup + +setup( + name="litwiki", + version="0.0.1", + author="Leni Aniva", + author_email="", + description="Generation of progression wiki for literature", + packages=['litwiki'] +) diff --git a/notes/chars/other.org b/wiki/chars/other.org similarity index 95% rename from notes/chars/other.org rename to wiki/chars/other.org index 19d2b18..eeb2105 100644 --- a/notes/chars/other.org +++ b/wiki/chars/other.org @@ -69,7 +69,7 @@ Does not trust the government (I.1.625) - Had presentations and statistics when she was spearheading MSY (I.1.611) - Vanished after saving Epsilon Eridani (I.1.581) -** Yuma +** Chitose Yuma 千才 由麻 Involved in MSY (I.1.613) @@ -101,6 +101,6 @@ Introduced in (I.2.877). * Military ** Fleet Admiral Xing -Has some feud with General Blackwell [v2/p80] +Has some feud with General Blackwell (I.2.609) ** General Blackwell -Has some feud with Fleet Admiral Xing [v2/p80] +Has some feud with Fleet Admiral Xing (I.2.609) diff --git a/notes/chars/shizuki-ryouko.org b/wiki/chars/shizuki-ryouko.org similarity index 100% rename from notes/chars/shizuki-ryouko.org rename to wiki/chars/shizuki-ryouko.org diff --git a/notes/history.org b/wiki/history.org similarity index 93% rename from notes/history.org rename to wiki/history.org index 1f635d4..0210ca0 100644 --- a/notes/history.org +++ b/wiki/history.org @@ -30,13 +30,14 @@ broke down in front of Sakura K. demanding that she finds the missing Saya-chan Tomoe M. hates recruiting (I.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. At this stage +to combat (I.2.43). - Tomoe M.'s rank is Field Marshal (I.1.1185) - Sakura K.'s rank is Lieutenant General (I.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. +explains to Simona the importance of understanding Shizuki R.'s feelings +(I.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 @@ -54,4 +55,7 @@ to keep the matter inside the church (I.2.1076). Sakura K. and Shizuki R. meet the family of Shizuki R. (I.2.1094). -**Lead**: A woman was observed by Shizuki R. in the distance when the demon attack happened (I.2.1144). +#+begin_verse +A woman was observed by Shizuki R. in the distance when the demon attack +happened (I.2.1144). +#+end_verse diff --git a/wiki/home.org b/wiki/home.org new file mode 100644 index 0000000..10012ba --- /dev/null +++ b/wiki/home.org @@ -0,0 +1,6 @@ +#+title: Home + +* Characters + +- [[./char/shizuki-ryouko.org][Shizuki Ryouko]] (I.1.19) +- diff --git a/notes/places.org b/wiki/places.org similarity index 100% rename from notes/places.org rename to wiki/places.org diff --git a/notes/settings.org b/wiki/settings.org similarity index 96% rename from notes/settings.org rename to wiki/settings.org index 916f832..5dab4bd 100644 --- a/notes/settings.org +++ b/wiki/settings.org @@ -3,8 +3,7 @@ * Tools - Chronometer: Some type of clock (I.1.717) - -- [v2/p63] A nomenclator describes the identity of an individual. +- A nomenclator describes the identity of an individual (I.2.107). * Magica @@ -49,7 +48,7 @@ Uses its infrastructure to handle all data collection for grief cube logistics ** Recruiting Recruits were rushed through their contracts (I.2.37). The one-time offer is -probably a lie (I.2.43) to aid recruitment. +probably a lie to aid recruitment (I.2.43). ** Life on the Frontlines @@ -77,11 +76,11 @@ magical girl (I.1.1213). 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. +- 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*) (I.1.51) presumably some sort of park +- 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). diff --git a/notes/works.org b/wiki/works.org similarity index 77% rename from notes/works.org rename to wiki/works.org index 6804d54..c5a1b19 100644 --- a/notes/works.org +++ b/wiki/works.org @@ -17,12 +17,10 @@ ** special conscription acts Mentioned in (I.1.381); Enacted at around T-20a. All new magic girls owe the -military 30 years of service. +military 30 years of service (I.1.381). ** Information Restriction Acts -- (I.1.391) -Restricts information about Magica from the populace. - -Impossible to enforce. +Restricts information about Magica from the populace. Impossible to enforce +(I.1.391).