Skip to content

Commit 9cb06db

Browse files
authored
fixing images to scale with available width and a few typos (#694)
* fixing images to scale with available width and a few typos * changing size of bubble sort for scratch
1 parent 0373d8e commit 9cb06db

File tree

16 files changed

+139
-139
lines changed

16 files changed

+139
-139
lines changed

contents/bitlogic/bitlogic.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -96,37 +96,37 @@ These operations are called *gates*, and follow somewhat straightforward logic.
9696
The *AND* gate, for example, reads in 2 bits and will only output a 1 value if both inputs are 1. This can be seen in the corresponding truth table:
9797

9898
<p>
99-
<img class="center" src="res/and.jpg" width="423" />
99+
<img class="center" src="res/and.jpg" style="width:50%" />
100100
</p>
101101

102102
The *OR* gate will output 1 if either input bits are 1:
103103

104104
<p>
105-
<img class="center" src="res/or.jpg" width="423" />
105+
<img class="center" src="res/or.jpg" style="width:50%" />
106106
</p>
107107

108108
The *exclusive OR* or *XOR* gate is the same as the *OR* gate, but will not output 1 if both bits are 1:
109109

110110
<p>
111-
<img class="center" src="res/xor.jpg" width="423" />
111+
<img class="center" src="res/xor.jpg" style="width:50%" />
112112
</p>
113113

114114
The *NOT* gate simply flips the input bit:
115115

116116
<p>
117-
<img class="center" src="res/not.jpg" width="423" />
117+
<img class="center" src="res/not.jpg" style="width:50%" />
118118
</p>
119119

120120
By combining the NOT and AND gates, we get the *NAND* gate:
121121

122122
<p>
123-
<img class="center" src="res/nand.jpg" width="423" />
123+
<img class="center" src="res/nand.jpg" style="width:50%" />
124124
</p>
125125

126126
And NOT and OR create *NOR*:
127127

128128
<p>
129-
<img class="center" src="res/nor.jpg" width="423" />
129+
<img class="center" src="res/nor.jpg" style="width:50%" />
130130
</p>
131131

132132
There are a few other gates, but this is enough for most things. We'll add more as the need arises!
@@ -157,12 +157,12 @@ The text of this chapter was written by [James Schloss](https://github.com/leios
157157
[<p><img class="center" src="../cc/CC-BY-SA_icon.svg" /></p>](https://creativecommons.org/licenses/by-sa/4.0/)
158158

159159
##### Images/Graphics
160-
- The image "[ANDgate](res/and.jpg)" was created by [James Schloss](https://github.com/leios) and is licenced under the [Creative Commons Attribution-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-sa/4.0/legalcode).
161-
- The image "[ORgate](res/or.jpg)" was created by [James Schloss](https://github.com/leios) and is licenced under the [Creative Commons Attribution-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-sa/4.0/legalcode).
162-
- The image "[XORgate](res/xor.jpg)" was created by [James Schloss](https://github.com/leios) and is licenced under the [Creative Commons Attribution-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-sa/4.0/legalcode).
163-
- The image "[NOTgate](res/not.jpg)" was created by [James Schloss](https://github.com/leios) and is licenced under the [Creative Commons Attribution-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-sa/4.0/legalcode).
164-
- The image "[NANDgate](res/nand.jpg)" was created by [James Schloss](https://github.com/leios) and is licenced under the [Creative Commons Attribution-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-sa/4.0/legalcode).
165-
- The image "[NORgate](res/nor.jpg)" was created by [James Schloss](https://github.com/leios) and is licenced under the [Creative Commons Attribution-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-sa/4.0/legalcode).
160+
- The image "[ANDgate](res/and.jpg)" was created by [James Schloss](https://github.com/leios) and is licensed under the [Creative Commons Attribution-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-sa/4.0/legalcode).
161+
- The image "[ORgate](res/or.jpg)" was created by [James Schloss](https://github.com/leios) and is licensed under the [Creative Commons Attribution-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-sa/4.0/legalcode).
162+
- The image "[XORgate](res/xor.jpg)" was created by [James Schloss](https://github.com/leios) and is licensed under the [Creative Commons Attribution-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-sa/4.0/legalcode).
163+
- The image "[NOTgate](res/not.jpg)" was created by [James Schloss](https://github.com/leios) and is licensed under the [Creative Commons Attribution-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-sa/4.0/legalcode).
164+
- The image "[NANDgate](res/nand.jpg)" was created by [James Schloss](https://github.com/leios) and is licensed under the [Creative Commons Attribution-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-sa/4.0/legalcode).
165+
- The image "[NORgate](res/nor.jpg)" was created by [James Schloss](https://github.com/leios) and is licensed under the [Creative Commons Attribution-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-sa/4.0/legalcode).
166166

167167
##### Pull Requests
168168

contents/bubble_sort/bubble_sort.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ This means that we need to go through the vector $$\mathcal{O}(n^2)$$ times with
7272
[import:1-11, lang:"v"](code/v/bubble_sort.v)
7373
{% sample lang="scratch" %}
7474
<p>
75-
<img class="center" src="code/scratch/bubble_sort.svg" width="400" />
75+
<img class="center" src="code/scratch/bubble_sort.svg" style="width:75%"/>
7676
</p>
7777
{% sample lang="coffee" %}
7878
[import:1-6, lang:"coffeescript"](code/coffeescript/bubblesort.coffee)

contents/cc/license.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ The text of this chapter was written by [James Schloss](https://github.com/leios
1212
[<p><img class="center" src="../cc/CC-BY-SA_icon.svg" /></p>](https://creativecommons.org/licenses/by-sa/4.0/)
1313

1414
##### Images/Graphics
15-
- The image "[example Image](res/example.png)" was created by [James Schloss](https://github.com/leios) and is licenced under the [Creative Commons Attribution-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-sa/4.0/legalcode).
15+
- The image "[example Image](res/example.png)" was created by [James Schloss](https://github.com/leios) and is licensed under the [Creative Commons Attribution-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-sa/4.0/legalcode).
1616

1717
##### Pull Requests
1818

contents/computus/computus.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ I have definitely met a few fledgling programmers who feel the same, but none of
4242

4343
One of the most important fans of Gauss's work was Servois, who created a calendar based on Gauss's 1800 publication, shown below:
4444

45-
<img class="center" src="res/servois_1800.png" alt="Servois' 1800 table" width="750">
45+
<img class="center" src="res/servois_1800.png" alt="Servois' 1800 table" style="width:80%">
4646

4747
This calendar shows the date the paschal full moon, indicating that Easter will be the following Sunday {{ "servois" | cite }}.
4848
In this table, a value greater than 22 indicates the full moon will be on the presented number in March and a value less than 22 indicates the full moon will be on that date in April.
@@ -74,12 +74,12 @@ In most cases, this is approximately 27.5 days {{ "lunar_month_wiki" | cite }}.
7474
That said, space is complicated and the Moon is not the only revolving body.
7575
Lunar phases are related to the time it takes for the Moon to return to its location *in relation to* the line connecting the Sun and Earth, as shown below:
7676

77-
<img class="center" src="res/orbit.svg" alt="Synodic half year" width="750">
77+
<img class="center" src="res/orbit.svg" alt="Synodic half year" style="width:90%">
7878

7979
This is called the synodic month and will be the approximation used for this chapter.
8080
Below, we also show a snapshot of this simulation after 6 synodic months:
8181

82-
<img class="center" src="res/synodic_half_year.png" alt="Synodic half year" width="750">
82+
<img class="center" src="res/synodic_half_year.png" alt="Synodic half year" style="width:90%">
8383

8484
Here, we show an outline of the Earth and Moon in an arbitrary initial position, each with an angle of $$-\frac{\pi}{4}$$ from the horizontal axis.
8585
In addition, we show the location of the Moon and Earth again after 6 synodic months.
@@ -88,7 +88,7 @@ In this way, the synodic month is the time between two consecutive phases, which
8888
Each synodic month is approximately 29.5 days, so a synodic year of 12 lunar months is 354 days, which is 11 days shorter than the normal 365 days in a Gregorian year.
8989
The following is a pictorial representation of offset between a solar and lunar year:
9090

91-
<img class="center" src="res/orbit.png" alt="Full year" width="750">
91+
<img class="center" src="res/orbit.png" alt="Full year" style="width:90%">
9292

9393
Here, we see the Sun at the center, with the Earth and Moon starting the year at an angle of $$-\frac{\pi}{4}$$ from the horizontal axis.
9494
The initial location of the Earth and Moon are initially shown as an outline with an A at their center.
@@ -137,7 +137,7 @@ $$
137137
p = \left\lfloor\frac{13+8k}{25}\right\rfloor.
138138
$$
139139

140-
This expression represents the fact that the Metonic cycle will be 8 days off every 2500 years and adds an additional offset of 13 to ensure the Metonic cycle aligns with emperical observation.
140+
This expression represents the fact that the Metonic cycle will be 8 days off every 2500 years and adds an additional offset of 13 to ensure the Metonic cycle aligns with empirical observation.
141141

142142
At this point, we know what year we are at on the Metonic calendar and have calculated an offset accordingly; however, we have yet to take into account leap years.
143143
As stated above, there are 97 leap days every 400 years, and the calculation of $$p$$ above requires correction for the 3 leap days missed.
@@ -185,7 +185,7 @@ Interestingly, this is all the information necessary to replicate Servois's tabl
185185
From here, we simply need to create a two-dimensional array with the decade on the $$y$$ axis and year on the $$x$$ axis and set within it the value of $$(21+d)~\%~31$$, where the 21 represents the 21st of March, and the $$\%~31$$ comes from the fact that there are 31 days in March.
186186
For example, if we were to do this computation for the years from 2000 to 2099, we would find the following table:
187187

188-
<img class="center" src="res/servois_2000.png" alt="Servois' 2000 table" width="750">
188+
<img class="center" src="res/servois_2000.png" alt="Servois' 2000 table" style="width:90%">
189189

190190
Which shows that the date of the paschal full moon for 2020 is April 9th.
191191
Now we can move on to finding the precise date of Easter, which should be the following Sunday
@@ -311,8 +311,8 @@ The text of this chapter was written by [James Schloss](https://github.com/leio)
311311
[<p><img class="center" src="../cc/CC-BY-SA_icon.svg" /></p>](https://creativecommons.org/licenses/by-sa/4.0/)
312312

313313
##### Images/Graphics
314-
- The image "[Servois 1800 Colored Table](res/servois_1800.png)" was created by [James Schloss](https://github.com/leios) and is licenced under the [Creative Commons Attribution-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-sa/4.0/legalcode).
314+
- The image "[Servois 1800 Colored Table](res/servois_1800.png)" was created by [James Schloss](https://github.com/leios) and is licensed under the [Creative Commons Attribution-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-sa/4.0/legalcode).
315315
- The image "[Relative Orbits](res/orbit.svg)" was created by [Xadisten](https://github.com/lockcmpxchg8beax) and was provided during a discussion on Twitch. It is licensed under the [Creative Commons Attribution 4.0 International License](https://creativecommons.org/licenses/by/4.0/legalcode).
316-
- The image "[Synodic Half Year](res/synodic_half_year.png)" was created by [James Schloss](https://github.com/leios) and is licenced under the [Creative Commons Attribution-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-sa/4.0/legalcode).
317-
- The image "[Full Year Orbit](res/orbit.png)" was created by [James Schloss](https://github.com/leios) and is licenced under the [Creative Commons Attribution-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-sa/4.0/legalcode).
318-
- The image "[Servois 2000 Colored Table](res/servois_2000.png)" was created by [James Schloss](https://github.com/leios) and is licenced under the [Creative Commons Attribution-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-sa/4.0/legalcode).
316+
- The image "[Synodic Half Year](res/synodic_half_year.png)" was created by [James Schloss](https://github.com/leios) and is licensed under the [Creative Commons Attribution-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-sa/4.0/legalcode).
317+
- The image "[Full Year Orbit](res/orbit.png)" was created by [James Schloss](https://github.com/leios) and is licensed under the [Creative Commons Attribution-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-sa/4.0/legalcode).
318+
- The image "[Servois 2000 Colored Table](res/servois_2000.png)" was created by [James Schloss](https://github.com/leios) and is licensed under the [Creative Commons Attribution-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-sa/4.0/legalcode).

0 commit comments

Comments
 (0)