Skip to content

Commit

Permalink
Fix wiskunde.ctb [tables]
Browse files Browse the repository at this point in the history
  • Loading branch information
@bertfrees
bertfrees committed Sep 7, 2015
1 parent d84a957 commit 7dcfeb7
Show file tree
Hide file tree
Showing 3 changed files with 184 additions and 4 deletions.
1 change: 0 additions & 1 deletion tables/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,6 @@ table_files = \
vi-g1.ctb \
wiskunde-chardefs.cti \
wiskunde.ctb \
wiskunde-translation.cti \
zh-hk.ctb \
zh-tw.ctb

Expand Down
56 changes: 56 additions & 0 deletions tables/wiskunde-chardefs.cti
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,62 @@ math \x0303 26 ̃ COMBINING TIL
math \x0304 36 ̄ COMBINING MACRON


# ----------------------------------------------------------------------------------------------
# Unicode 0370..03FF Greek and Coptic
# ----------------------------------------------------------------------------------------------

letter \x0391 456-1 Α GREEK CAPITAL LETTER ALPHA
letter \x0392 456-12 Β GREEK CAPITAL LETTER BETA
letter \x0393 456-1245 Γ GREEK CAPITAL LETTER GAMMA
letter \x0394 456-145 Δ GREEK CAPITAL LETTER DELTA
letter \x0395 456-15 Ε GREEK CAPITAL LETTER EPSILON
letter \x0396 456-1356 Ζ GREEK CAPITAL LETTER ZETA
letter \x0397 456-345 Η GREEK CAPITAL LETTER ETA
letter \x0398 456-1456 Θ GREEK CAPITAL LETTER THETA
letter \x0399 456-24 Ι GREEK CAPITAL LETTER IOTA
letter \x039A 456-13 Κ GREEK CAPITAL LETTER KAPPA
letter \x039B 456-123 Λ GREEK CAPITAL LETTER LAMDA
letter \x039C 456-134 Μ GREEK CAPITAL LETTER MU
letter \x039D 456-1345 Ν GREEK CAPITAL LETTER NU
letter \x039E 456-1346 Ξ GREEK CAPITAL LETTER XI
letter \x039F 456-135 Ο GREEK CAPITAL LETTER OMICRON
letter \x03A0 456-1234 Π GREEK CAPITAL LETTER PI
letter \x03A1 456-1235 Ρ GREEK CAPITAL LETTER RHO
letter \x03A3 456-234 Σ GREEK CAPITAL LETTER SIGMA
letter \x03A4 456-2345 Τ GREEK CAPITAL LETTER TAU
letter \x03A5 456-13456 Υ GREEK CAPITAL LETTER UPSILON
letter \x03A6 456-124 Φ GREEK CAPITAL LETTER PHI
letter \x03A7 456-125 Χ GREEK CAPITAL LETTER CHI
letter \x03A8 456-12346 Ψ GREEK CAPITAL LETTER PSI
letter \x03A9 456-245 Ω GREEK CAPITAL LETTER OMEGA
lowercase \x03B1 56-1 α GREEK SMALL LETTER ALPHA
lowercase \x03B2 56-12 β GREEK SMALL LETTER BETA
lowercase \x03B3 56-1245 γ GREEK SMALL LETTER GAMMA
lowercase \x03B4 56-145 δ GREEK SMALL LETTER DELTA
lowercase \x03B5 56-15 ε GREEK SMALL LETTER EPSILON
lowercase \x03B6 56-1356 ζ GREEK SMALL LETTER ZETA
lowercase \x03B7 56-345 η GREEK SMALL LETTER ETA
lowercase \x03B8 56-1456 θ GREEK SMALL LETTER THETA
lowercase \x03B9 56-24 ι GREEK SMALL LETTER IOTA
lowercase \x03BA 56-13 κ GREEK SMALL LETTER KAPPA
lowercase \x03BB 56-123 λ GREEK SMALL LETTER LAMDA
lowercase \x03BC 56-134 μ GREEK SMALL LETTER MU
lowercase \x03BD 56-1345 ν GREEK SMALL LETTER NU
lowercase \x03BE 56-1346 ξ GREEK SMALL LETTER XI
lowercase \x03BF 56-135 ο GREEK SMALL LETTER OMICRON
lowercase \x03C0 56-1234 π GREEK SMALL LETTER PI
lowercase \x03C1 56-1235 ρ GREEK SMALL LETTER RHO
lowercase \x03C2 56-234 ς GREEK SMALL LETTER FINAL SIGMA
lowercase \x03C3 56-234 σ GREEK SMALL LETTER SIGMA
lowercase \x03C4 56-2345 τ GREEK SMALL LETTER TAU
lowercase \x03C5 56-13456 υ GREEK SMALL LETTER UPSILON
lowercase \x03C6 56-124 φ GREEK SMALL LETTER PHI
lowercase \x03C7 56-125 χ GREEK SMALL LETTER CHI
lowercase \x03C8 56-12346 ψ GREEK SMALL LETTER PSI
lowercase \x03C9 56-245 ω GREEK SMALL LETTER OMEGA
lowercase \x03D5 56-124 ϕ GREEK PHI SYMBOL


# ----------------------------------------------------------------------------------------------
# Unicode 2000..206F General Punctuation
# ----------------------------------------------------------------------------------------------
Expand Down
131 changes: 128 additions & 3 deletions tables/wiskunde.ctb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,133 @@
# ----------------------------------------------------------------------------------------------

include wiskunde-chardefs.cti
include nl-BE-chardefs.cti
include nl-chardefs.uti
include braille-patterns.cti
include wiskunde-translation.cti
include litdigits6Dots.uti

# ----------------------------------------------------------------------------------------------
numsign 3456
capsign 46
begcaps 45
midnum , 2
midnum . 3

repeated \x0020 0
repeated \x00A0 a

class uppergreek \x0391\x0392\x0393\x0394\x0395\x0396\x0397\x0398\x0399\x039A\x039B\x039C\x039D\x039E\x039F\x03A0\x03A1\x03A3\x03A4\x03A5\x03A6\x03A7\x03A8\x03A9
class lowergreek \x03B1\x03B2\x03B3\x03B4\x03B5\x03B6\x03B7\x03B8\x03B9\x03BA\x03BB\x03BC\x03BD\x03BE\x03BF\x03C0\x03C1\x03C2\x03C3\x03C4\x03C5\x03C6\x03C7\x03C8\x03C9\x03D5
class operationkeyspace \x002B\x002D\x002E\x003D\x007E\x00B1\x00D7\x00F7\x2190\x2191\x2192\x2193\x2194\x21D0\x21D2\x21D4\x2209\x220C\x2212\x2217\x2223\x2224\x2226\x2243\x2248\x2260\x2261\x2284\x2285\x2288\x2289\x22C5
class operationkey \x002F\x003C\x2215\x2216\x2225\x2227\x2228\x2229\x222A\x2264\x2282\x2283\x2286\x2287\x22A5\x22D5
class operationnokey \x003E\x00AF\x0302\x0303\x0304\x2191\x2193\x2208\x220B\x2265
# class relation
class digitletter abcdefghij
swapcd dropped 0123456789 356,2,23,25,256,26,235,2356,236,35
swapdd upnum 245,1,12,14,145,15,124,1245,125,24 0,0,0,0,0,0,0,0,0,0
swapdd lownum 356,2,23,25,256,26,235,2356,236,35 0,0,0,0,0,0,0,0,0,0

exactdots @0
exactdots @123456
exactdots @1256
exactdots @1456
exactdots @23
exactdots @5
exactdots @56

# Overgang van functie naar letter

context "sin"["\es"]%uppergreek ?
context "cos"["\es"]%uppergreek ?
context "log"["\es"]%uppergreek ?
context "tan"["\es"]%uppergreek ?
context "tg"["\es"]%uppergreek ?

context "sin"["\es"]%lowergreek ?
context "cos"["\es"]%lowergreek ?
context "log"["\es"]%lowergreek ?
context "tan"["\es"]%lowergreek ?
context "tg"["\es"]%lowergreek ?

context "sin"["\es"]$l @6
context "cos"["\es"]$l @6
context "log"["\es"]$l @6
context "tan"["\es"]$l @6
context "tg"["\es"]$l @6

# Overgang tussen twee lettergedeeltes

context %uppergreek["\es"]$u @6
context %lowergreek["\es"]$u @6
context $l["\es"]%uppergreek ?
context $l["\es"]%lowergreek ?
context $l["\es"]$l ?

# Overgang tussen coefficient en lettergedeelte waarbij verwarring kan ontstaan

context $d["\es"]%digitletter @6
context $d[]%digitletter @6

# Niet-wiskundige tekst

context ["\et"]$p ?
context ["\et"] @0

# Wortelvormen

context ["\ev"] @146

# Lege exponenten en indices

context ["\ei\e^r\en\ex"] ?
context ["\ei\e^c\en\ex"] ?
context ["\ei\e^l\en\ex"] ?
context ["\ei\e_r\en\ex"] ?
context ["\ei\e_c\en\ex"] ?
context ["\ei\e_l\en\ex"] ?
context ["\en"] ?

# Gezakte cijfers, exponenten, indices & breuken

context "\ef\es"$d."\ed\es"[$d.]"\ex" %dropped # noemer van natuurlijke breuk in gezakte cijfers
context "\e^r\es"[$d.]"\ex" %dropped # natuurlijke exponenten en indices in gezakte cijfers
context "\e^c\es"[$d.]"\ex" %dropped
context "\e^l\es"[$d.]"\ex" %dropped
context "\e_r\es"[$d.]"\ex" %dropped
context "\e_c\es"[$d.]"\ex" %dropped
context "\e_l\es"[$d.]"\ex" %dropped

context ["\ei"]"\e^r\es"%operationkeyspace"\ex" ? # accenten, bewerkings- en relatietekens als index midden of rechts boven
context ["\ei"]"\e^r\es"%operationkey"\ex" ?
context ["\ei"]"\e^r\es"%operationnokey"\ex" ?
context ["\ei"]"\e^c\es"%operationkeyspace"\ex" ?
context ["\ei"]"\e^c\es"%operationkey"\ex" ?
context ["\ei"]"\e^c\es"%operationnokey"\ex" ?

context "\e^r\es"%operationkeyspace["\ex"] ? # verwijder sluiter
context "\e^r\es"%operationkey["\ex"] ?
context "\e^r\es"%operationnokey["\ex"] ?
context "\e^c\es"%operationkeyspace["\ex"] ?
context "\e^c\es"%operationkey["\ex"] ?
context "\e^c\es"%operationnokey["\ex"] ?

context "\es"[]%operationkeyspace @5 # sleutel voor bewerkingstekens
context "\es"[]%operationkey @5

context ["\ef"] @5@23 # begin van breuk
pass2 %upnum.[@1b-145-1b-234]%lownum. ? # verwijder breukstreep
pass3 [@1b-124-1b-234]%upnum.%lownum. @3456 # herstel cijferteken van teller
pass3 @1b-145 @1256 # breukstreep \ed
pass3 @1b-124 ? # \ef
pass3 @1b-234 ? # \es

pass3 @1b-24-1b-34-1235 @34 # \ei\e^r
pass3 @1b-24-1b-34-14 @456@34 # \ei\e^c
pass3 @1b-24-1b-34-123 @3456@34 # \ei\e^l
pass3 @1b-24-1b-456-1235 @16 # \ei\e_r
pass3 @1b-24-1b-456-14 @456@16 # \ei\e_c
pass3 @1b-24-1b-456-123 @3456@16 # \ei\e_l
pass3 @1b-24 ? # \ei
pass3 @1b-34-1235 @4 # \e^r
pass3 @1b-34-14 @45 # \e^c

pass3 %lownum.[@1b-1346] ? # verwijder sluiter na gezakte cijfers
pass4 @1b-1346 @156 # sluiter \ex

0 comments on commit 7dcfeb7

Please sign in to comment.