-
Notifications
You must be signed in to change notification settings - Fork 168
Update Sourdough History #298
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 5 commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
1982856
Update Sourdough History
hendricius 77f0f24
Fix a few white spaces..
cedounet 8122805
Correct capitalization of Van Leeuwenhoek
cedounet 0bf7967
Fix line
hendricius a1746fb
Improve numbers on time chart
cedounet 0e36e25
Fixes
hendricius 5dcb985
Improve timeline
151f83f
Reduce line-break width
233d8e5
Move dates around in timeline
f71354f
Fix 12000 BC in timeline
2b26467
Fix typo and add labels
c420da9
reunite can and not
OzTK 4bf9523
Prevent running validate when pushing on main
6dc6b03
Upload artifacts on each PR (#299)
hendricius 8892ccf
Build docker image for each PR (#300)
hendricius c66f0df
Merge branch 'main' into sourdough-history-improvements
hendricius 9d2cec6
Fix duplicate source
hendricius File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,59 @@ | ||
\begin{tikzpicture} | ||
% Draw horizontal line | ||
\draw[line width=1pt] (0,0) -- (\textwidth,0); | ||
|
||
% Define the width of each segment | ||
\pgfmathsetlengthmacro{\segmentwidth}{\textwidth/12} | ||
|
||
% Lines for periods | ||
\draw[stealth-stealth, line width=1pt] (0,-4.2) | ||
-- node[midway, timeline_timespan] {Historic breadmaking} ({\segmentwidth * 7.8},-4.2); | ||
\draw[stealth-stealth, line width=1pt] ({\segmentwidth * 7.8},-4.2) | ||
-- node[midway, timeline_timespan] {Modern bread} ({\segmentwidth * 12},-4.2); | ||
|
||
% Regularly placed events, not in chronological order | ||
% since should be placed on top of others on the timeline | ||
\draw[line width=1pt] ({\segmentwidth*3},1.5) -- ({\segmentwidth*3},0.3) | ||
node[at start, above, timeline_event] {6000~BC: First beer in Egypt}; | ||
\draw[line width=1pt] ({\segmentwidth*5.95},2.5) -- ({\segmentwidth*5.95},0.3) | ||
node[at start, above, timeline_event] {70~BC:~First water mill}; | ||
|
||
\draw[line width=1pt] ({\segmentwidth*10.50},2.5) -- ({\segmentwidth*10.50},0.3); | ||
\node[timeline_event, above, anchor=east] at ({\segmentwidth*12.50},2.5) {1950:~Modern Wheat}; | ||
|
||
\draw[line width=1pt] ({\segmentwidth*11.20},-3.25) -- ({\segmentwidth*11.20},-0.3); | ||
\node[timeline_event, above, anchor=east] at ({\segmentwidth*12.20},-3.5) {2020:~COVID-19 Pandemic}; | ||
|
||
\draw[line width=1pt] ({\segmentwidth*9.60},1.5) -- ({\segmentwidth*9.60},0.3) | ||
node[at start, above, timeline_event] {1868:~Commercial yeast}; | ||
\draw[line width=1pt] ({\segmentwidth*7.8},0.75) -- ({\segmentwidth*7.8},0.3) | ||
node[at start, above, timeline_event] {1680:~Discovery of microorganisms}; | ||
\draw[line width=1pt] ({\segmentwidth*9.80},-2.5) -- ({\segmentwidth*9.80},-0.3) | ||
node[at start, below, timeline_event] {1885:~Electrical mixer}; | ||
\draw[line width=1pt] ({\segmentwidth*9.57},-1.75) -- ({\segmentwidth*9.57},-0.3) | ||
node[at start, below, timeline_event] {1857:~Isolated Yeast}; | ||
\draw[line width=1pt] ({\segmentwidth*8.80},-1.25) -- ({\segmentwidth*8.80},-0.3) | ||
node[at start, above, timeline_event] {1785:~Steam mill}; | ||
|
||
% Lines to events | ||
% Cultivation of Einkorn | ||
\draw[line width=1pt] (0,1) -- (0,0.3); | ||
\draw[line width=1pt] (0,1) -- (0.25,1); | ||
\node[timeline_event, above, anchor=west] at (0.25,1) {\num{12000}~BC:~Cultivation of Einkorn}; | ||
|
||
% Sourdough in Jordan | ||
\draw[line width=1pt] (0,-1) -- (0,-0.3); | ||
\draw[line width=1pt] (0,-1) -- (0.25,-1); | ||
\node[timeline_event, above, anchor=west] at (0.25,-1) {\num{12000}~BC:~Sourdough in Jordan}; | ||
% Events | ||
|
||
% Indicators for period | ||
% Draw millenary and century separators | ||
\foreach \i/\century in {0/-12000, 1/-10000, 2/-8000, 3/-6000, 4/-4000, 5/-2000, | ||
6/0, 7/1600, 8/1700, 9/1800, 10/1900, 11/2000, 12/2100} { | ||
% Separators | ||
\draw[line width=1pt] (\i*\segmentwidth,0.1) -- (\i*\segmentwidth,-0.1); | ||
% Events for timeline | ||
\node[timeline_event, below] at ({(\i)*\segmentwidth},-0.1) {\num{\century}}; | ||
} | ||
\end{tikzpicture} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.