Merge pull request #20 from neelsmith/wip

Wip

Project.toml

@@ -1,7 +1,7 @@
 name = "LatinOrthography"
 uuid = "1e3032c9-fa1e-4efb-a2df-a06f238f6146"
 authors = ["nsmith "]
-version = "0.7.0"
+version = "0.7.1"
 
 [deps]
 CitableBase = "d6f014bd-995c-41bd-9893-703339864534"

docs/make.jl

@@ -4,7 +4,7 @@
 #
 # Run this from repository root to serve:
 #
-#   julia -e 'using LiveServer; serve(dir="docs/build")'julia -e 'using LiveServer; serve(dir="docs/build")' 
+#   julia -e 'using LiveServer; serve(dir="docs/build")' 
 #
 using Pkg
 Pkg.activate(".")

docs/src/index.md

@@ -5,7 +5,7 @@
 
 ## Latin23
 
-`Latin23` is an orthography for Latin texts with 23 alphabetic characters — that is, orthographies with a single character for vocalic/consonantal `i/j` and a single character for vocalic/consonantal  `u/v`.  The function `latin23` creates an instance of this orthography.  It is a subtype of the HCMID `OrthographicSystem`.
+`Latin23` is an orthography for Latin texts with 23 alphabetic characters — that is, texts with a single character for vocalic/consonantal `i/j` and a single character for vocalic/consonantal  `u/v`.  The function `latin23` creates an instance of this orthography.  It is a subtype of the HCMID `OrthographicSystem`.
 
 ```@example intro
 using LatinOrthography
@@ -33,19 +33,19 @@ These give us (for free!) implementations of the `OrthographicSystem`'s `validch
 
 ```@example intro
 using Orthography
-validp("a", ortho)
+validcp("a", ortho)
 ```
 
 ```@example intro
 validcp("β", ortho)
 ```
 
 ```@example intro
-validstring(ortho, "Nunc est bibendum.")
+validstring( "Nunc est bibendum.", ortho)
 ```
 
 ```@example intro
-validstring(ortho, "μῆνιν ἄειδε")
+validstring( "μῆνιν ἄειδε", ortho)
 ```
 
 
@@ -55,7 +55,7 @@ The `tokenize` function returns an array of `OrthographicTokens`, each of which
 
 
 ```@example intro
-tkns = tokenize(ortho, "Nunc est bibendum.")
+tkns = tokenize("Nunc est bibendum.", ortho)
 ```
 
 ```@example intro
@@ -72,4 +72,39 @@ tkns[4].text
 
 ```@example intro
 tkns[4].tokencategory
+```
+
+
+
+
+## Latin24
+
+`Latin24` is an orthography for Latin texts with 24 alphabetic characters — that is, texts with a single character for vocalic/consonantal `i/j` but distinguishing consonantal  `v` from vocalic `u`.  The function `latin24` creates an instance of this orthography.  It is a subtype of the HCMID `OrthographicSystem`.
+
+```@example intro
+
+ortho24  =  latin24()
+validcp("v", ortho24)
+
+```
+
+```@example intro
+validcp("j", ortho24)
+```
+
+
+
+## Latin25
+
+`Latin25` is an orthography for Latin texts with 25 alphabetic characters. It distinguishes vocalic/consonantal `i` and `u` from consonantal  `j` and `v`.  The function `latin25` creates an instance of this orthography.  It is a subtype of the HCMID `OrthographicSystem`.
+
+```@example intro
+
+ortho25  =  latin25()
+validcp("v", ortho25)
+
+```
+
+```@example intro
+validcp("j", ortho25)
 ```

src/latin24.jl

@@ -40,7 +40,7 @@ end
 $(SIGNATURES)
 """
 function alphabetic(ortho::Latin24) 
-   latinalphabet() 
+   latin24alphabet() 
 end
 
 

src/latin25.jl

@@ -40,7 +40,7 @@ end
 $(SIGNATURES)
 """
 function alphabetic(ortho::Latin25) 
-   latinalphabet() 
+   latin25alphabet() 
 end