up format

Strepto · Jun 16, 2020 · f068b62 · f068b62
1 parent 4471d8d
commit f068b62
Show file tree

Hide file tree

Showing 14 changed files with 91 additions and 77 deletions.
diff --git a/1938--france/cup.yml → 1938--france/NOTES.md b/1938--france/cup.yml → 1938--france/NOTES.md
@@ -1,16 +1,11 @@
-############################################
 # World Cup 1938 France, 4 June - 19 June
 
-league: world
-season: 1938
-start_at: 1938-06-04
+- start_at: 1938-06-04
+- fix: add edition: or num: e.g. num: 3 or edition: 3
 
-##
-# fix: add edition: or num: e.g. num: 3 or edition: 3
+## 15 Teams
 
-# 15 Teams
-
-teams:
+```
 ## Asia
 - dei # Dutch East Indies
 ## Europe
@@ -30,4 +25,7 @@ teams:
 - cub # Cuba
 ## South America
 - bra # Brazil
+```
+
+
 
diff --git a/1938--france/cup.txt b/1938--france/cup.txt
@@ -1,5 +1,4 @@
-############################################
-# World Cup 1938 France, 4 June - 19 June
+= World Cup 1938 # in France, 4 June - 19 June
 
 
 ### todo/fix:
@@ -42,7 +41,7 @@ First round
 # - use no match number? (add new num for match number?) use pos only for internal-use (e.g sort order)?
 #
 # 5 June Sweden - (*) Austria @ Stade Gerland, Lyon
-# (*) w/o - walkout 
+# (*) w/o - walkout
 
 First round replays
 

diff --git a/1950--brazil/cup.yml → 1950--brazil/NOTES.md b/1950--brazil/cup.yml → 1950--brazil/NOTES.md
@@ -1,16 +1,11 @@
-################################################
 # World Cup 1950 Brazil, 24 June - 16 July
 
-league: world
-season: 1950
-start_at: 1950-06-24
+- start_at: 1950-06-24
+- fix: add edition: or num: e.g. num: 4 or edition: 4
 
-##
-# fix: add edition: or num: e.g. num: 4 or edition: 4
+## 13 Teams
 
-# 13 Teams
-
-teams:
+```
 ## Europe
 - eng # England
 - ita # Italy
@@ -27,4 +22,5 @@ teams:
 - chi # Chile
 - par # Paraguay
 - uru # Uruguay
+```
 
diff --git a/1950--brazil/cup.txt b/1950--brazil/cup.txt
@@ -1,5 +1,4 @@
-################################################
-# World Cup 1950 Brazil, 24 June - 16 July
+= World Cup 1950 # in Brazil, 24 June - 16 July
 
 
 Group 1 | Brazil Mexico Switzerland Yugoslavia
@@ -8,6 +7,8 @@ Group 3 | Italy India Paraguay Sweden
 Group 4 | Uruguay Bolivia France
 
 
+First round | 24 June - 2 July
+
 ## todo: use group for final round w/ (Uruguay, Brazil, Sweden, Spain) - why? why not?
 ## - yes, use Group F
 ## todo: final round (just regular matches; not knock out matches)
@@ -68,12 +69,13 @@ Group 4:
 ## yes - use Group F for now for Final
 ## todo: use group for final round w/ (Uruguay, Brazil, Sweden, Spain) - why? why not?
 ## todo: final round (just regular matches; not knock out matches)
+### fix: add group f to final round - how?
 
 Group F | Uruguay Brazil Sweden Spain
 
-### fix: add group f to final round - how?
+Final Round | 9 July - 16 July
 
-Final Round
+Group F:
 
 (17) 9 July Uruguay 2-2 Spain @ Estádio do Pacaembu, São Paulo
  [Ghiggia 29' Varela 73'; Basora 37', 39']

diff --git a/1954--switzerland/cup.yml → 1954--switzerland/NOTES.md b/1954--switzerland/cup.yml → 1954--switzerland/NOTES.md
@@ -1,16 +1,11 @@
-##################################################
 # World Cup 1954 Switzerland, 16 June - 4 July
 
-league: world
-season: 1954
-start_at: 1954-06-16
+- start_at: 1954-06-16
+- fix: add edition: or num: e.g. num: 5 or edition: 5
 
-##
-# fix: add edition: or num: e.g. num: 5 or edition: 5
+## 16 Teams
 
-# 16 Teams
-
-teams:
+```
 ## Asia
 - kor # Korea Republic
 ## Europe
@@ -31,3 +26,5 @@ teams:
 ## South America
 - bra # Brazil
 - uru # Uruguay
+```
+
diff --git a/1954--switzerland/cup.txt b/1954--switzerland/cup.txt
@@ -1,5 +1,4 @@
-##################################################
-# World Cup 1954 Switzerland, 16 June - 4 July
+= World Cup 1954 # in Switzerland, 16 June - 4 July
 
 
 Group 1 | Brazil Yugoslavia France Mexico
@@ -10,6 +9,9 @@ Group 4 | England Switzerland Italy Belgium
 ### todo: add match day
 ## todo: check if group header clear round in reader (e.g Group 2 play-off and Group 3:)!!
 
+Matchday 1 | 16 June - 17 June
+Matchday 2 | 19 June - 20 June
+
 
 Group 1:
 
@@ -76,7 +78,7 @@ Semi-finals
 (22) 30 June Hungary 4-2 a.e.t. 2-2 Uruguay @ Stade Olympique de la Pontaise, Lausanne
 
 
-Third-place match
+Third-place match ## use just Third-place - why? why not?
 
 (23) 3 July Uruguay 1-3 Austria @ Hardturm Stadium, Zürich
 

diff --git a/1958--sweden/cup.yml → 1958--sweden/NOTES.md b/1958--sweden/cup.yml → 1958--sweden/NOTES.md
@@ -1,15 +1,11 @@
-##########################################
 # World Cup 1958 Sweden, 8 - 29 June
 
-league: world
-season: 1958
-start_at: 1958-06-08
+- start_at: 1958-06-08
+- fix: add edition: or num: e.g. num: 6 or edition: 6
 
-##
-# fix: add edition: or num: e.g. num: 6 or edition: 6
+## 16 Teams
 
-# 16 Teams
-teams:
+```
 ## Europe
 - aut # Austria
 - tch # Czechoslovakia
@@ -29,3 +25,5 @@ teams:
 - arg # Argentina
 - bra # Brazil
 - par # Paraguay
+```
+
diff --git a/1958--sweden/cup.txt b/1958--sweden/cup.txt
@@ -1,12 +1,14 @@
-##########################################
-# World Cup 1958 Sweden, 8 - 29 June
+= World Cup 1958 # in Sweden, 8 - 29 June
 
 
 Group 1 | West Germany Northern Ireland Czechoslovakia Argentina
 Group 2 | France Yugoslavia Paraguay Scotland
 Group 3 | Sweden Wales Hungary Mexico
 Group 4 | Brazil Soviet Union England Austria
 
+Matchday 1 | 8 June
+Matchday 2 | 11 June - 12 June
+Matchday 3 | 15 June
 
 
 Group 1:
@@ -92,7 +94,7 @@ Semi-finals
 (30) 24 June West Germany 1-3 Sweden @ Ullevi, Gothenburg
 
 
-Match for third place
+Match for third place ## check use just Third place - why? why not?
 
 (31) 28 June West Germany 3-6 France @ Ullevi, Gothenburg
 

diff --git a/1962--chile/cup.yml → 1962--chile/NOTES.md b/1962--chile/cup.yml → 1962--chile/NOTES.md
@@ -1,15 +1,11 @@
-###########################################
 # World Cup 1962 Chile, 30 May - 17 June
 
-league: world
-season: 1962
-start_at: 1962-05-30
+- start_at: 1962-05-30
+- fix: add edition: or num: e.g. num: 7 or edition: 7
 
-##
-# fix: add edition: or num: e.g. num: 7 or edition: 7
+## 16 Teams
 
-# 16 Teams
-teams:
+```
 ## Europe
 - bul # Bulgaria
 - tch # Czechoslovakia
@@ -29,4 +25,5 @@ teams:
 - chi # Chile
 - col # Colombia
 - uru # Uruguay
+```
 
diff --git a/1962--chile/cup.txt b/1962--chile/cup.txt
@@ -1,12 +1,16 @@
-###########################################
-# World Cup 1962 Chile, 30 May - 17 June
+= World Cup 1962 # in Chile, 30 May - 17 June
 
 
 Group 1 | Soviet Union Yugoslavia Uruguay Colombia
-Group 2 | West Germany Chile Italy Switzerland 
+Group 2 | West Germany Chile Italy Switzerland
 Group 3 | Brazil Czechoslovakia Mexico Spain
 Group 4 | Hungary England Argentina Bulgaria
 
+Matchday 1 | 30 May - 31 May
+Matchday 2 | 2 June - 3 June
+Matchday 3 | 6 June - 7 June
+
+
 
 Group 1:
 

diff --git a/1966--england/cup.yml → 1966--england/NOTES.md b/1966--england/cup.yml → 1966--england/NOTES.md
@@ -1,15 +1,11 @@
-##########################################
 # World Cup 1966 England, 11 - 30 July
 
-league: world
-season: 1966
-start_at: 1966-07-11
+- start_at: 1966-07-11
+- fix: add edition: or num: e.g. num: 8 or edition: 8
 
-##
-# fix: add edition: or num: e.g. num: 8 or edition: 8
+## 16 Teams
 
-# 16 Teams
-teams:
+```
 # -- Asia
 - prk # North Korea
 # -- Europe
@@ -30,3 +26,5 @@ teams:
 - bra # Brazil
 - chi # Chile
 - uru # Uruguay
+```
+
diff --git a/1966--england/cup.txt b/1966--england/cup.txt
@@ -1,19 +1,24 @@
-##########################################
-# World Cup 1966 England, 11 - 30 July
+= World Cup 1966 # in England, 11 - 30 July
 
 Group 1 | England Uruguay Mexico France
 Group 2 | West Germany Argentina Spain Switzerland
 Group 3 | Portugal Hungary Brazil Bulgaria
 Group 4 | Soviet Union North Korea Italy Chile
 
 
+Matchday 1 | 11 July - 13 July
+Matchday 2 | 15 July - 16 July
+Matchday 3 | 19 July - 20 July
+
 
 Group 1:
 
 (1) 11 July England 0-0 Uruguay @ Wembley Stadium, London
 (5) 13 July France 1-1 Mexico @ Wembley Stadium, London
+
 (9) 15 July Uruguay 2-1 France @ White City Stadium, London
 (13) 16 July England 2-0 Mexico @ Wembley Stadium, London
+
 (17) 19 July Mexico 0-0 Uruguay @ Wembley Stadium, London
 (21) 20 July England 2-0 France @ Wembley Stadium, London
 
@@ -22,8 +27,10 @@ Group 2:
 
 (2) 12 July West Germany 5-0 Switzerland @ Hillsborough Stadium, Sheffield
 (6) 13 July Argentina 2-1 Spain @ Villa Park, Birmingham
+
 (10) 15 July Spain 2-1 Switzerland @ Hillsborough Stadium, Sheffield
 (14) 16 July Argentina 0-0 West Germany @ Villa Park, Birmingham
+
 (18) 19 July Argentina 2-0 Switzerland @ Hillsborough Stadium, Sheffield
 (22) 20 July West Germany 2-1 Spain @ Villa Park, Birmingham
 
@@ -32,8 +39,10 @@ Group 3:
 
 (3) 12 July Brazil 2-0 Bulgaria @ Goodison Park, Liverpool
 (7) 13 July Portugal 3-1 Hungary @ Old Trafford, Manchester
+
 (11) 15 July Hungary 3-1 Brazil @ Goodison Park, Liverpool
 (15) 16 July Portugal 3-0 Bulgaria @ Old Trafford, Manchester
+
 (19) 19 July Portugal 3-1 Brazil @ Goodison Park, Liverpool
 (23) 20 July Hungary 3-1 Bulgaria @ Old Trafford, Manchester
 
@@ -42,8 +51,10 @@ Group 4:
 
 (4) 12 July Soviet Union 3-0 North Korea @ Ayresome Park, Middlesbrough
 (8) 13 July Italy 2-0 Chile @ Roker Park, Sunderland
+
 (12) 15 July Chile 1-1 North Korea @ Ayresome Park, Middlesbrough
 (16) 16 July Soviet Union 1-0 Italy @ Roker Park, Sunderland
+
 (20) 19 July North Korea 1-0 Italy @ Ayresome Park, Middlesbrough
 (24) 20 July Soviet Union 2-1 Chile @ Roker Park, Sunderland
 

diff --git a/1970--mexico/cup.yml → 1970--mexico/NOTES.md b/1970--mexico/cup.yml → 1970--mexico/NOTES.md
@@ -1,12 +1,10 @@
-#############################################
 # World Cup 1970 Mexico, 31 May - 21 June
 
-league: world
-season: 1970
-start_at: 1970-05-31
+- start_at: 1970-05-31
 
-# 16 Teams
-teams:
+## 16 Teams
+
+```
 # -- Africa
 - mar # Morocco
 # -- Europe
@@ -27,4 +25,5 @@ teams:
 - bra # Brazil
 - per # Peru
 - uru # Uruguay
+```