diff options
30 files changed, 639 insertions, 540 deletions
@@ -0,0 +1 @@ +*.css diff --git a/CHANGELOG.txt b/CHANGELOG.txt index cf6c220..4ee2eae 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,14 @@ +# B + +* html: Remove unnessecay line breaks; +* css: Group relevant paragraphs together; +* css: Implement using SCSS (use processStyles.sh); +* git: Ignore CSS files; +* css: Combine heading classes; +* css: Miscellaneous adjustments; +* about: Miscellaneous text adjustments; +* phsyics: Update definition of standard gravity on Earth; + # A * css: Update navigation bar and copyright notice; diff --git a/css/base.css b/css/base.css deleted file mode 100644 index 99031a3..0000000 --- a/css/base.css +++ /dev/null @@ -1,53 +0,0 @@ -div.page * + p,* + ol,* + table,* + ul { - margin-top:1rem; -} - -li p + ul,li p + ol { - margin-top:0; -} - -p.math,span.math,td.math { - font-size: calc(3rem / 2); - padding: calc(1rem / 3) 0; - user-select:none; -} - -a,a:visited { - color: var(--colour); - text-decoration:none; -} - -a:hover { - color:var(--foregroundColour); -} - -span.emphasis { - font-style:italic; -} - -table { - background-color:var(--foregroundColour); - border-color: var(--foregroundColour); - border-radius: calc(1rem / 3); - border-spacing: 0; - border-style: solid; - border-width: calc(1rem / 3); - color: var(--backgroundColour); -} - -table tr td,table tr th { - padding:calc(1rem / 12) calc(2rem / 12); -} - -table tr td { - background-color:var(--backgroundColour); - color: var(--foregroundColour); -} - -table tr th { - text-align:center; -} - -ul li,ol li { - margin-left:1rem; -} diff --git a/css/base.scss b/css/base.scss new file mode 100644 index 0000000..f38c10b --- /dev/null +++ b/css/base.scss @@ -0,0 +1,61 @@ +div.page * + p,* + ol,* + table,* + ul { + margin-top:1rem; +} + +li p + ul,li p + ol { + margin-top:0; +} + +a { + &,&:visited { + color: var(--colour); + text-decoration:none; + } + + &:hover { + color:var(--foregroundColour); + } +} + +span.emphasis { + font-style:italic; +} + +p.math,span.math,td.math { + font-size: calc(3rem / 2); + padding: calc(1rem / 3) 0; + user-select:none; +} + +table { + @include invertedTheme(); + border-radius: calc(1rem / 3); + border-spacing:0; + border-style: solid; + border-width: calc(1rem / 3); + + tr { + &.small { + font-size:calc(2rem / 3); + } + + td,th { + padding:calc(1rem / 12) calc(2rem / 12); + } + + td { + background-color:var(--backgroundColour); + color: var(--foregroundColour); + } + + th { + text-align:center; + } + } +} + +ul,ol { + li { + margin-left:1rem; + } +} diff --git a/css/content.css b/css/content.scss index 4208b4d..4208b4d 100644 --- a/css/content.css +++ b/css/content.scss diff --git a/css/copyrightNotice.css b/css/copyrightNotice.scss index ba2b5c7..aff74a4 100644 --- a/css/copyrightNotice.css +++ b/css/copyrightNotice.scss @@ -5,14 +5,16 @@ div.copyrightNotice { margin-top: 1rem; text-align: center; width: fit-content; -} -div.copyrightNotice p.projectName { - font-size: calc(3rem / 2); - margin-bottom:1rem; - text-align: center; -} + p.projectName { + font-size: calc(3rem / 2); + margin-bottom:1rem; + text-align: center; + } -div.copyrightNotice p.info + p.info { - margin-top:calc(1rem / 2); + p.info { + & + p.info { + margin-top:calc(1rem / 2); + } + } } diff --git a/css/logotype.css b/css/logotype.scss index 6f01f20..6f01f20 100644 --- a/css/logotype.css +++ b/css/logotype.scss diff --git a/css/main.css b/css/main.css index 35b7862..3f70242 100644 --- a/css/main.css +++ b/css/main.css @@ -1,9 +1 @@ -@import "/css/root.css"; - -@import "/css/base.css"; - -@import "/css/logotype.css"; -@import "/css/content.css"; -@import "/css/navigationBar.css"; -@import "/css/page.css"; -@import "/css/copyrightNotice.css"; +:root{--black: #1B1A1A;--darkgrey: #232121;--lightgrey:#ECEAEA;--white: #F6F4F4;--blue: #5F7C9C;--bodyColour: var(--black);--backgroundColour:var(--darkgrey);--foregroundColour:var(--white);--colour: var(--blue);--minimumPageWidth:10rem;--maximumPageWidth:74rem;font-family:"Liberation Serif","serif";font-size:calc(1000mm / 1728 * 8)}*{box-sizing:border-box;margin:0;padding:0}body{background-color:var(--bodyColour);color:var(--foregroundColour);padding:1rem}p{line-height:1em}div.page *+p,*+ol,*+table,*+ul{margin-top:1rem}li p+ul,li p+ol{margin-top:0}a,a:visited{color:var(--colour);text-decoration:none}a:hover{color:var(--foregroundColour)}span.emphasis{font-style:italic}p.math,span.math,td.math{font-size:calc(3rem / 2);padding:calc(1rem / 3) 0;user-select:none}table{background-color:var(--foregroundColour);border-color:var(--foregroundColour);color:var(--backgroundColour);border-radius:calc(1rem / 3);border-spacing:0;border-style:solid;border-width:calc(1rem / 3)}table tr.small{font-size:calc(2rem / 3)}table tr td,table tr th{padding:calc(1rem / 12) calc(2rem / 12)}table tr td{background-color:var(--backgroundColour);color:var(--foregroundColour)}table tr th{text-align:center}ul li,ol li{margin-left:1rem}div.logotype{background-color:var(--foregroundColour);height:3rem;margin:0 auto;margin-bottom:1rem;mask-image:url("/svg/logotype.svg");mask-position:center;mask-size:100%;width:3rem}div.content{background-color:var(--foregroundColour);border-radius:1rem;color:var(--backgroundColour);margin:0 auto;max-width:var(--maximumPageWidth);min-width:var(--minimumPageWidth);padding-bottom:1rem;width:100%}div.navigationBar{background-color:none;border-radius:1rem;font-family:"Helvetica","sans-serif";font-weight:bold;padding:1rem 2rem;text-align:center;width:100%}div.navigationBar img.themeToggler{background-color:var(--backgroundColour);border-color:var(--backgroundColour);border-radius:calc(1rem / 3 * 2);border-width:calc(1rem / 3);border-style:solid;cursor:pointer;display:block;height:2rem;margin:0 auto;margin-bottom:1rem;user-select:none;width:3rem}div.navigationBar p+p{margin-top:calc(1rem / 2)}div.navigationBar p span.link+span::before{content:"\0020\00B7\0020"}div.navigationBar p p,div.navigationBar p span.link a,div.navigationBar p span.link a:hover{color:var(--backgroundColour)}div.navigationBar p span.link a:hover{text-decoration:underline}div.page{background-color:var(--backgroundColour);border-radius:1rem;color:var(--foregroundColour);padding:1rem 2rem;text-align:left;width:100%}div.page p.heading{font-family:"Helvetica","sans-serif";font-size:3rem;font-weight:bold;margin-bottom:1rem;text-align:right}div.page span.footnote{font-size:calc(2rem / 3);vertical-align:sub}div.page span.footnote::before{content:"\0020"}div.page p.vocable{font-style:italic;margin-top:calc(1rem / 2)}div.page p.note{font-style:italic}div.page p.note::before{content:"\002E\002E\002E\0020"}div.page p.note span.emphasis{font-weight:bold}div.page p.footnote{font-size:calc(2rem / 3);font-style:italic;margin-top:calc(1rem / 2)}*+div.page div.group{margin-top:1rem}div.page div.group *{margin-top:0}div.page div.section+div.section{margin-top:1rem}div.page div.section p.heading{border-top-style:solid;border-top-width:calc(1rem / 3);font-size:2rem;padding-top:1rem;width:fit-content}div.page div.section p.subheading{font-size:calc(2rem / 3);font-weight:bold;margin-top:0}div.page div.section p.subheading::before{content:"\0020\2014\0020";font-weight:normal}div.copyrightNotice{background-color:none;font-weight:bold;margin:0 auto;margin-top:1rem;text-align:center;width:fit-content}div.copyrightNotice p.projectName{font-size:calc(3rem / 2);margin-bottom:1rem;text-align:center}div.copyrightNotice p.info+p.info{margin-top:calc(1rem / 2)} diff --git a/css/main.scss b/css/main.scss new file mode 100644 index 0000000..82f4bd2 --- /dev/null +++ b/css/main.scss @@ -0,0 +1,9 @@ +@import "root.scss"; + +@import "base.scss"; + +@import "logotype.scss"; +@import "content.scss"; +@import "navigationBar.scss"; +@import "page.scss"; +@import "copyrightNotice.scss"; diff --git a/css/navigationBar.css b/css/navigationBar.css deleted file mode 100644 index 7494ff1..0000000 --- a/css/navigationBar.css +++ /dev/null @@ -1,41 +0,0 @@ -div.navigationBar { - background-color:none; - border-radius: 1rem; - font-family: var(--sansSerifFont); - font-weight: bold; - padding: 1rem 2rem; - text-align: center; - width: 100%; -} - -div.navigationBar img.themeToggler { - background-color:var(--backgroundColour); - border-color: var(--backgroundColour); - border-radius: calc(1rem / 3 * 2); - border-width: calc(1rem / 3); - border-style: solid; - color: var(--backgroundColour); - cursor: pointer; - display: block; - height: 2rem; - margin: 0 auto; - margin-bottom: 1rem; - user-select: none; - width: 3rem; -} - -div.navigationBar p + p { - margin-top:calc(1rem / 2); -} - -div.navigationBar p,div.navigationBar span.link + span::before { - content:"\0020\00B7\0020"; -} - -div.navigationBar p,div.navigationBar span.link a,div.navigationBar span.link a:hover { - color:var(--backgroundColour); -} - -div.navigationBar span.link a:hover { - text-decoration:underline; -} diff --git a/css/navigationBar.scss b/css/navigationBar.scss new file mode 100644 index 0000000..521d694 --- /dev/null +++ b/css/navigationBar.scss @@ -0,0 +1,42 @@ +div.navigationBar { + background-color:none; + border-radius: 1rem; + font-family: $sansSerifFont; + font-weight: bold; + padding: 1rem 2rem; + text-align: center; + width: 100%; + + img.themeToggler { + background-color:var(--backgroundColour); + border-color: var(--backgroundColour); + border-radius: calc(1rem / 3 * 2); + border-width: calc(1rem / 3); + border-style: solid; + cursor: pointer; + display: block; + height: 2rem; + margin: 0 auto; + margin-bottom: 1rem; + user-select: none; + width: 3rem; + } + + p { + & + p { + margin-top:calc(1rem / 2); + } + + span.link + span::before { + content:"\0020\00B7\0020"; + } + + p,span.link a,span.link a:hover { + color:var(--backgroundColour); + } + + span.link a:hover { + text-decoration:underline; + } + } +} diff --git a/css/noJavaScript.css b/css/noJavaScript.css index beac2c0..f5cf95f 100644 --- a/css/noJavaScript.css +++ b/css/noJavaScript.css @@ -1,3 +1 @@ -div.navigationBar img.themeToggler { - display:none; -} +div.navigationBar img.themeToggler{display:none} diff --git a/css/noJavaScript.scss b/css/noJavaScript.scss new file mode 100644 index 0000000..1b6ebfe --- /dev/null +++ b/css/noJavaScript.scss @@ -0,0 +1,5 @@ +div.navigationBar { + img.themeToggler { + display:none; + } +} diff --git a/css/page.css b/css/page.css deleted file mode 100644 index 3280281..0000000 --- a/css/page.css +++ /dev/null @@ -1,92 +0,0 @@ -div.page { - background-color:var(--backgroundColour); - border-radius: 1rem; - color: var(--foregroundColour); - padding: 1rem 2rem; - text-align: left; - width: 100%; -} - -div.page span.footnote { - font-size: calc(2rem / 3); - vertical-align:sub; -} - -div.page span.footnote::before { - content:"\0020"; -} - -div.page p.pageHeading,div.page div.section p.sectionHeading { - font-family:var(--sansSerifFont); - font-weight:bold; -} - -div.page p.pageHeading { - font-size: 3rem; - letter-spacing:calc(1rem / 12); - margin-bottom: 1rem; - text-align: right; -} - -div.page p.vocable + p.vocable { - margin-top:calc(1rem / 2); -} - -div.page p.vocable span.vocable { - font-style:italic; -} - -div.page p.vocable span.vocable + span.vocable::before { - content: "\0020\2014\0020"; - font-style:normal; -} - -div.page p.note { - font-style:italic; -} - -div.page p.note::before { - content:"\002E\002E\002E\0020"; -} - -div.page p.note span.emphasis { - font-weight:bold; -} - -div.page p.footnote { - font-size: calc(2rem / 3); - font-style:italic; - margin-top:calc(1rem / 2); -} - -div.page p + p.footnote { - margin-top:1rem; -} - -div.page table tr.small { - font-size:calc(2rem / 3); -} - -div.page div.section + div.section { - margin-top:1rem; -} - -div.page div.section p.sectionHeading { - border-top-color:var(--foregroundColour); - border-top-style:solid; - border-top-width:calc(1rem / 3); - font-size: 2rem; - padding-top: 1rem; - width: fit-content; -} - -div.page div.section p.subHeading { - font-size: calc(2rem / 3); - font-weight:bold; - margin-top: 0; -} - -div.page div.section p.subHeading::before { - content: "\0020\2014\0020"; - font-weight:normal; -} diff --git a/css/page.scss b/css/page.scss new file mode 100644 index 0000000..4134e56 --- /dev/null +++ b/css/page.scss @@ -0,0 +1,83 @@ +div.page { + background-color:var(--backgroundColour); + border-radius: 1rem; + color: var(--foregroundColour); + padding: 1rem 2rem; + text-align: left; + width: 100%; + + p.heading { + font-family: $sansSerifFont; + font-size: 3rem; + font-weight: bold; + margin-bottom:1rem; + text-align: right; + } + + span.footnote { + font-size: calc(2rem / 3); + vertical-align:sub; + + &::before { + content:"\0020"; + } + } + + p.vocable { + font-style:italic; + margin-top:calc(1rem / 2); + } + + p.note { + font-style:italic; + + &::before { + content:"\002E\002E\002E\0020"; + } + + span.emphasis { + font-weight:bold; + } + } + + p.footnote { + font-size: calc(2rem / 3); + font-style:italic; + margin-top:calc(1rem / 2); + } + + div.group { + * + & { + margin-top:1rem; + } + + * { + margin-top:0; + } + } + + div.section { + & + div.section { + margin-top:1rem; + } + + p.heading { + border-top-style:solid; + border-top-width:calc(1rem / 3); + font-size: 2rem; + padding-top: 1rem; + width: fit-content; // We don't need to change alignement with this. + } + + p.subheading { + font-size: calc(2rem / 3); + font-weight:bold; + margin-top: 0; + + &::before { + content: "\0020\2014\0020"; + font-weight:normal; + } + } + } +} diff --git a/css/root.css b/css/root.css deleted file mode 100644 index fd9e47b..0000000 --- a/css/root.css +++ /dev/null @@ -1,38 +0,0 @@ -:root { - --black: #1B1A1A; /* 7/32 */ - --darkgrey: #232121; /* 8/32 */ - --lightgrey:#ECEAEA; /* 30/32 */ - --white: #F6F4F4; /* 31/32 */ - --blue: #5F7C9C; /* oklch(62.5% 0.118 259.065) */ - - --bodyColour: var(--black); - --backgroundColour:var(--darkgrey); - --foregroundColour:var(--white); - --colour: var(--blue); - - --minimumPageWidth:10rem; /* 12rem including body padding. */ - --maximumPageWidth:74rem; - - --monospaceFont:"Source Code Pro","monospace"; - --sansSerifFont:"Helvetica","sans-serif"; - --serifFont: "Liberation Serif","serif"; - - font-family:var(--serifFont); - font-size: calc(1000mm / 1728 * 8); -} - -* { - box-sizing:border-box; - margin: 0; - padding: 0; -} - -body { - background-color:var(--bodyColour); - color: var(--foregroundColour); - padding: 1rem; -} - -p { - line-height:1em; -} diff --git a/css/root.scss b/css/root.scss new file mode 100644 index 0000000..090d420 --- /dev/null +++ b/css/root.scss @@ -0,0 +1,44 @@ +$monospaceFont:"Source Code Pro","monospace"; +$sansSerifFont:"Helvetica","sans-serif"; +$serifFont: "Liberation Serif","serif"; + +:root { + --black: #1B1A1A; // 7/32 + --darkgrey: #232121; // 8/32 + --lightgrey:#ECEAEA; // 30/32 + --white: #F6F4F4; // 31/32 + --blue: #5F7C9C; // oklch(62.5% 0.118 259.065) + + --bodyColour: var(--black); + --backgroundColour:var(--darkgrey); + --foregroundColour:var(--white); + --colour: var(--blue); + + --minimumPageWidth:10rem; // 12rem including body padding. + --maximumPageWidth:74rem; + + font-family:$serifFont; + font-size: calc(1000mm / 1728 * 8); +} + +* { + box-sizing:border-box; + margin: 0; + padding: 0; +} + +body { + background-color:var(--bodyColour); + color: var(--foregroundColour); + padding: 1rem; +} + +p { + line-height:1em; +} + +@mixin invertedTheme { + background-color:var(--foregroundColour); + border-color: var(--foregroundColour); + color: var(--backgroundColour); +} diff --git a/html/about.html b/html/about.html index a50c5f3..56f7ef2 100644 --- a/html/about.html +++ b/html/about.html @@ -7,13 +7,13 @@ <div class="content"> <!--#include virtual="/shtml/navigationBar.shtml"--> <div class="page"> - <p class="pageHeading">Om</p> + <p class="heading">Om</p> <div class="section"> <p><span class="emphasis">Fagligt Opslagsværk</span> er et leksikon til diverse videnskablige emner inden for natur, samfund og sprog. Finder du fejl, så bedes du venligst indberette dem til mig, Gabriel.</p> - <p>Denne side blev oprindeligt <span class="emphasis">serveret</span> på <a href="https://fadaesen.dk"><span class="emphasis">Fadaesens</span> hjemmeside</a>. Kildekoden til den kan findes på <a href="https://mandelbrot.dk/achernar-reference"><span class="emphasis">mandelbrot.dk</span></a>.</p> + <p>Denne side blev oprindeligt <span class="emphasis">serveret</span> på <a href="https://fadaesen.dk"><span class="emphasis">Fadaesens</span> hjemmeside</a>. Kildekoden kan findes på <a href="https://mandelbrot.dk/achernar-reference"><span class="emphasis">mandelbrot.dk</span></a>.</p> </div> <div class="section"> - <p class="sectionHeading">Emner</p> + <p class="heading">Emner</p> <ul> <li> <p>Naturvidenskab</p> diff --git a/html/topic/astronomy.html b/html/topic/astronomy.html index 4aa93c2..5f06147 100644 --- a/html/topic/astronomy.html +++ b/html/topic/astronomy.html @@ -8,10 +8,10 @@ <div class="content"> <!--#include virtual="/shtml/navigationBar.shtml"--> <div class="page"> - <p class="pageHeading">Astronomi</p> + <p class="heading">Astronomi</p> <div class="section" id="measures-and-units"> - <p class="sectionHeading">Mål og Enheder</p> - <p class="subHeading">Jf. <a href="/html/topic/physics.html#measures-and-units">fysikkens mål, enheder</a> og <a href="/html/topic/physics.html#constants">konstanter</a>.</p> + <p class="heading">Mål og Enheder</p> + <p class="subheading">Jf. <a href="/html/topic/physics.html#measures-and-units">fysikkens mål, enheder</a> og <a href="/html/topic/physics.html#constants">konstanter</a>.</p> <p>Mål med variante enheder:</p> <table> <thead> @@ -67,18 +67,22 @@ </tr> </tbody> </table> - <p class="math">\(1\ M_♃=189\ 813 \cdot 10^{22}\ kg\)</p> - <p class="math">\(1\ M_☉=19\ 8847 \cdot 10^{25}\ kg\)</p> - <br /> - <p class="math">\(1\ au=1\ 495\ 978\ 707 \cdot 10^2\ m\)</p> - <p class="math">\(1\ ls=c \cdot 1\ s=299\ 792\ 458\ m\)</p> - <p class="math">\(1\ ly=c \cdot 1\ a=94\ 607\ 304\ 725\ 808 \cdot 10^2\ m\)</p> - <p class="math">\(1\ pc=1\ au \cdot cot(1^{\prime \prime})=30\ 856\ 775\ 814\ 671\ 916\ m\)</p> - <p class="math">\(1\ R_♃=71492 \cdot 10^3\ m\)</p> - <p class="math">\(1\ R_☉=6957 \cdot 10^5\ m\)</p> - <br /> - <p class="math">\(1\ a=\frac {1461}4\ d=315576 \cdot 10^2\ s\)</p> - <p class="math">\(1\ d=864 \cdot 10^2\ s\)</p> + <div class="group"> + <p class="math">\(1\ M_♃=189\ 813 \cdot 10^{22}\ kg\)</p> + <p class="math">\(1\ M_☉=19\ 8847 \cdot 10^{25}\ kg\)</p> + </div> + <div class="group"> + <p class="math">\(1\ au=1\ 495\ 978\ 707 \cdot 10^2\ m\)</p> + <p class="math">\(1\ ls=c \cdot 1\ s=299\ 792\ 458\ m\)</p> + <p class="math">\(1\ ly=c \cdot 1\ a=94\ 607\ 304\ 725\ 808 \cdot 10^2\ m\)</p> + <p class="math">\(1\ pc=1\ au \cdot cot(1^{\prime \prime})=30\ 856\ 775\ 814\ 671\ 916\ m\)</p> + <p class="math">\(1\ R_♃=71492 \cdot 10^3\ m\)</p> + <p class="math">\(1\ R_☉=6957 \cdot 10^5\ m\)</p> + </div> + <div class="group"> + <p class="math">\(1\ a=\frac {1461}4\ d=315576 \cdot 10^2\ s\)</p> + <p class="math">\(1\ d=864 \cdot 10^2\ s\)</p> + </div> </div> </div> <!--#include virtual="/shtml/copyrightNotice.shtml"--> diff --git a/html/topic/chemistry.html b/html/topic/chemistry.html index 0eebdcc..8e2571e 100644 --- a/html/topic/chemistry.html +++ b/html/topic/chemistry.html @@ -8,10 +8,10 @@ <div class="content"> <!--#include virtual="/shtml/navigationBar.shtml"--> <div class="page"> - <p class="pageHeading">Kemi</p> + <p class="heading">Kemi</p> <div class="section" id="measures-and-units"> - <p class="sectionHeading">Mål og Enheder</p> - <p class="subHeading">Jf. <a href="/html/topic/physics.html#measures-and-units">fysikkens mål og enheder</a>.</p> + <p class="heading">Mål og Enheder</p> + <p class="subheading">Jf. <a href="/html/topic/physics.html#measures-and-units">fysikkens mål og enheder</a>.</p> <table> <thead> <tr> @@ -117,35 +117,46 @@ </tr> </tbody> </table> - <p class="math">\(1\ M=1\ \frac {mol}{L}=10^3\ \frac {mol}{m^3}\)</p> - <br /> - <p class="math">\(1\ g=\frac 1{10^3}\ kg\)</p> - <p class="math">\(1\ u=m_u \approx \frac {16\ 605\ 390\ 666}{10^{37}}\ kg\)</p> - <br /> - <p class="math">\(1\ L=\frac 1{10^3}\ m^3\)</p> + <div class="group"> + <p class="math">\(1\ M=1\ \frac {mol}{L}=10^3\ \frac {mol}{m^3}\)</p> + </div> + <div class="group"> + <p class="math">\(1\ g=\frac 1{10^3}\ kg\)</p> + <p class="math">\(1\ u=m_u \approx \frac {16\ 605\ 390\ 666}{10^{37}}\ kg\)</p> + </div> + <div class="group"> + <p class="math">\(1\ L=\frac 1{10^3}\ m^3\)</p> + </div> </div> <div class="section" id="formulae"> - <p class="sectionHeading">Formler</p> + <p class="heading">Formler</p> <p>Heri vil formler i stilen af <span class="math">\((C_i = \frac {A_i}{\sum_j B_j})\)</span> fremstå, hvori <span class="emphasis">C<sub>i</sub></span> og <span class="emphasis">A<sub>i</sub></span> er stoffet <span class="emphasis">i</span>'s mål <span class="emphasis">C</span> og <span class="emphasis">A</span>, og <span class="math">\((\sum_j B_j)\)</span> er summen af alle stoffer (kollektivt) <span class="emphasis">j</span>'s mål <span class="emphasis">B</span>.</p> - <br /> - <p class="math">\(c_i=\frac {n_i}{\sum_j V_j}\)</p> - <p class="note">hvori <span class="emphasis">c<sub>i</sub></span> så er stofmængdekoncentrationen af stoffet <span class="emphasis">i</span>, <span class="emphasis">n<sub>i</sub></span> er stofmængden af stoffet <span class="emphasis">i</span>, og <span class="math">\((\sum_j V_j)\)</span> er den samlet volumen af alle stofferne <span class="emphasis">j</span> (blandingen).</p> - <br /> - <p class="math">\(M=\frac mn\)</p> - <br /> - <p class="math">\(m=Mn\)</p> - <br /> - <p class="math">\(n=\frac mM\)</p> - <br /> - <p class="math">\(w_i=\frac {m_i}{\sum_j m_j}\)</p> - <br /> - <p class="math">\(\rho_i=\frac {m_i}{\sum_j V_j}\)</p> - <br /> - <p class="math">\(\phi_i=\frac {V_i}{\sum_j V_j}\)</p> + <div class="group"> + <p class="math">\(c_i=\frac {n_i}{\sum_j V_j}\)</p> + <p class="note">hvori <span class="emphasis">c<sub>i</sub></span> så er stofmængdekoncentrationen af stoffet <span class="emphasis">i</span>, <span class="emphasis">n<sub>i</sub></span> er stofmængden af stoffet <span class="emphasis">i</span>, og <span class="math">\((\sum_j V_j)\)</span> er den samlet volumen af alle stofferne <span class="emphasis">j</span> (blandingen).</p> + </div> + <div class="group"> + <p class="math">\(M=\frac mn\)</p> + </div> + <div class="group"> + <p class="math">\(m=Mn\)</p> + </div> + <div class="group"> + <p class="math">\(n=\frac mM\)</p> + </div> + <div class="group"> + <p class="math">\(w_i=\frac {m_i}{\sum_j m_j}\)</p> + </div> + <div class="group"> + <p class="math">\(\rho_i=\frac {m_i}{\sum_j V_j}\)</p> + </div> + <div class="group"> + <p class="math">\(\phi_i=\frac {V_i}{\sum_j V_j}\)</p> + </div> </div> <div class="section" id="constants"> - <p class="sectionHeading">Konstanter</p> - <p class="subHeading">Jf. <a href="/html/topic/physics.html#constants">fysikkens</a> og <a href="/html/topic/mathematics.html#constants">matematikkens</a> konstanter.</p> + <p class="heading">Konstanter</p> + <p class="subheading">Jf. <a href="/html/topic/physics.html#constants">fysikkens</a> og <a href="/html/topic/mathematics.html#constants">matematikkens</a> konstanter.</p> <table> <thead> <tr> @@ -172,11 +183,13 @@ </tr> </tbody> </table> - <p class="math">\(F=eN_a=\frac {964\ 853\ 321\ 233\ 100\ 184}{10^{13}}\ \frac {C}{mol}\)</p> - <p class="note">hvori <span class="emphasis">e</span> er den elementære ladning.</p> - <p class="math">\(M_u=\frac {M({}^{12}C)}{12}=m_uN_a \approx \frac {999\ 999\ 999\ 65}{10^{14}}\ \frac {kg}{mol}\)</p> - <p class="math">\(m_u=\frac {m({}^{12}C)}{12} \approx \frac {16\ 605\ 390\ 666}{10^{37}}\ kg\)</p> - <p class="math">\(N_A=602\ 214\ 076 \cdot 10^{15}\ mol^{-1}\)</p> + <div class="group"> + <p class="math">\(F=eN_a=\frac {964\ 853\ 321\ 233\ 100\ 184}{10^{13}}\ \frac {C}{mol}\)</p> + <p class="note">hvori <span class="emphasis">e</span> er den elementære ladning.</p> + <p class="math">\(M_u=\frac {M({}^{12}C)}{12}=m_uN_a \approx \frac {999\ 999\ 999\ 65}{10^{14}}\ \frac {kg}{mol}\)</p> + <p class="math">\(m_u=\frac {m({}^{12}C)}{12} \approx \frac {16\ 605\ 390\ 666}{10^{37}}\ kg\)</p> + <p class="math">\(N_A=602\ 214\ 076 \cdot 10^{15}\ mol^{-1}\)</p> + </div> </div> </div> <!--#include virtual="/shtml/copyrightNotice.shtml"--> diff --git a/html/topic/french.html b/html/topic/french.html index c3aec57..61c4e3e 100644 --- a/html/topic/french.html +++ b/html/topic/french.html @@ -7,9 +7,9 @@ <div class="content"> <!--#include virtual="/shtml/navigationBar.shtml"--> <div class="page"> - <p class="pageHeading">Fransk</p> + <p class="heading">Fransk</p> <div class="section" id="conjugation"> - <p class="sectionHeading">Konjugation</p> + <p class="heading">Konjugation</p> <table> <thead> <tr> diff --git a/html/topic/german.html b/html/topic/german.html index 89ba63c..e36b139 100644 --- a/html/topic/german.html +++ b/html/topic/german.html @@ -7,7 +7,7 @@ <div class="content"> <!--#include virtual="/shtml/navigationBar.shtml"--> <div class="page"> - <p class="pageHeading">Tysk</p> + <p class="heading">Tysk</p> <div class="section"> <table> <thead> diff --git a/html/topic/greek.html b/html/topic/greek.html index f080838..28dfb25 100644 --- a/html/topic/greek.html +++ b/html/topic/greek.html @@ -7,7 +7,7 @@ <div class="content"> <!--#include virtual="/shtml/navigationBar.shtml"--> <div class="page"> - <p class="pageHeading">Græsk</p> + <p class="heading">Græsk</p> <div class="section"> <p>Kommer senere.</p> </div> diff --git a/html/topic/history.html b/html/topic/history.html index e1afdf5..5d53c63 100644 --- a/html/topic/history.html +++ b/html/topic/history.html @@ -7,7 +7,7 @@ <div class="content"> <!--#include virtual="/shtml/navigationBar.shtml"--> <div class="page"> - <p class="pageHeading">Historie</p> + <p class="heading">Historie</p> <div class="section"> <p>Kommer senere.</p> </div> diff --git a/html/topic/latin.html b/html/topic/latin.html index d981592..312d210 100644 --- a/html/topic/latin.html +++ b/html/topic/latin.html @@ -7,9 +7,9 @@ <div class="content"> <!--#include virtual="/shtml/navigationBar.shtml"--> <div class="page"> - <p class="pageHeading">Latin</p> + <p class="heading">Latin</p> <div class="section" id="roman-numerals"> - <p class="sectionHeading">Grammatik</p> + <p class="heading">Grammatik</p> <table> <tr> <th>Sætningsled</th> @@ -43,7 +43,7 @@ <p>I modsætning til sprog som dansk, fransk og tysk, så har latin ikke nogen formele regler for rækkefølgen af de forskellige sætningsled. Til gengæld, så har sproget i stedet et system af <span class="emphasis">kasus</span> (fald), hvori sætningens substantiver, pronominer og adjektiver bøjes ud fra deres sætningsled (se <a href="#declension">deklination</a>).</p> </div> <div class="section" id="roman-numerals"> - <p class="sectionHeading">Romertal</p> + <p class="heading">Romertal</p> <p>Romertal er den primære måde at udtrykke tal i latin, samt andre europæiske sprog op til skiftet til arabertal. Romertal bruger tegn fra det latinske alfabet til at udtrykke værdier. Det bruger ikke cifre (i modsætning til arabertal).</p> <table> <thead> @@ -89,11 +89,10 @@ </table> <p class="footnote">† Per konventien, fra ordet "nulla".</p> <p>For at udtrykke talværdier uden et tilsvarende tegn, så opstiller man dem som en kombination af tegn. Skriver man et mindre tegn (lige) før et større, så trækkes det mindre fra det større. Står det største først, så lægges de sammen.</p> - <br /> <p>For eksempel, så bliver fire (4) til IV (5−1), og seks (6) bliver til VI (5+1). I nogle traditioner bruger man ikke subtration, og i således en ville fire blive til IIII (1+1+1+1).</p> </div> <div class="section" id="conjugation"> - <p class="sectionHeading">Konjugation</p> + <p class="heading">Konjugation</p> <table> <thead> <tr class="small"> @@ -223,7 +222,7 @@ </table> </div> <div class="section" id="declension"> - <p class="sectionHeading">Deklination</p> + <p class="heading">Deklination</p> <table> <tr> <th>Kasus</th> @@ -434,24 +433,24 @@ </table> </div> <div class="section" id="glossary"> - <p class="sectionHeading">Gloseliste</p> - <p class="vocable"><span class="vocable">aedificō vb.</span><span class="vocable">jeg bygger, jeg opfører</span></p> - <p class="vocable"><span class="vocable">amō vb.</span><span class="vocable">jeg elsker, jeg holder af</span></p> - <p class="vocable"><span class="vocable">arx sb. f3</span><span class="vocable">borg, fort, fæstning</span></p> - <p class="vocable"><span class="vocable">castellum sb. n2</span><span class="vocable">borg, palads</span></p> - <p class="vocable"><span class="vocable">contra (akk) præp.</span><span class="vocable">imod, mod</span></p> - <p class="vocable"><span class="vocable">creō vb.</span><span class="vocable">jeg skaber</span></p> - <p class="vocable"><span class="vocable">dominus sb. m2</span><span class="vocable">herre (religion), hersker, kejser</span></p> - <p class="vocable"><span class="vocable">egō pron.</span><span class="vocable">jeg</span></p> - <p class="vocable"><span class="vocable">ex (abl) præp.</span><span class="vocable">fra</span></p> - <p class="vocable"><span class="vocable">habeō vb.</span><span class="vocable">jeg har</span></p> - <p class="vocable"><span class="vocable">hic adj.</span><span class="vocable">denne/dette</span></p> - <p class="vocable"><span class="vocable">hic pron.</span><span class="vocable">denne/dette</span></p> - <p class="vocable"><span class="vocable">in (abl/akk) præp.</span><span class="vocable">i/på (abl, som mål med akk)</span></p> - <p class="vocable"><span class="vocable">magnus adj.</span><span class="vocable">stor, storartet</span></p> - <p class="vocable"><span class="vocable">rēgīna sb. f1</span><span class="vocable">dronning</span></p> - <p class="vocable"><span class="vocable">rēx sb. m3</span><span class="vocable">konge</span></p> - <p class="vocable"><span class="vocable">sum vb.</span><span class="vocable">jeg er</span></p> + <p class="heading">Gloseliste</p> + <p class="vocable">aedificō vb. jeg bygger, jeg opfører </p> + <p class="vocable">amō vb. jeg elsker, jeg holder af </p> + <p class="vocable">arx sb. f3 borg, fort, fæstning </p> + <p class="vocable">castellum sb. n2 borg, palads </p> + <p class="vocable">contra (akk) præp. imod, mod </p> + <p class="vocable">creō vb. jeg skaber </p> + <p class="vocable">dominus sb. m2 herre (religion), hersker, kejser </p> + <p class="vocable">egō pron. jeg </p> + <p class="vocable">ex (abl) præp. fra </p> + <p class="vocable">habeō vb. jeg har </p> + <p class="vocable">hic adj. denne/dette </p> + <p class="vocable">hic pron. denne/dette </p> + <p class="vocable">in (abl/akk) præp. i/på (abl, som mål med akk) </p> + <p class="vocable">magnus adj. stor, storartet </p> + <p class="vocable">rēgīna sb. f1 dronning </p> + <p class="vocable">rēx sb. m3 konge </p> + <p class="vocable">sum vb. jeg er </p> </div> </div> <!--#include virtual="/shtml/copyrightNotice.shtml"--> diff --git a/html/topic/mathematics.html b/html/topic/mathematics.html index 3c39bcf..91c2557 100644 --- a/html/topic/mathematics.html +++ b/html/topic/mathematics.html @@ -8,159 +8,185 @@ <div class="content"> <!--#include virtual="/shtml/navigationBar.shtml"--> <div class="page"> - <p class="pageHeading">Matematik</p> + <p class="heading">Matematik</p> <div class="section" id="rules"> - <p class="sectionHeading">Regneregler</p> - <p class="math">\(x+y=z\)</p> - <p class="math">\(z-y=x\)</p> - <p class="math">\(z-x=y\)</p> - <p class="math">\(\sum_{i=a}^b i=a+(a \pm 1) + \cdots +(b \pm 1)+b\)</p> - <br /> - <p class="math">\(xy=z\)</p> - <p class="math">\(\frac {z}{y}=x\)</p> - <p class="math">\(\frac {z}{x}=y\)</p> - <p class="math">\(\prod_{i=a}^b i=a(a \pm 1) \cdots (b \pm 1)b\)</p> - <p class="math">\(n!=\prod_{i=1}^n i,n \gt 0\)</p> - <p class="math">\(0!=1\)</p> - <br /> - <p class="math">\(\frac xy=z\)</p> - <p class="math">\(zy=x\)</p> - <p class="math">\(\frac {x}{z}=y\)</p> - <br /> - <p class="math">\(x^y=z\)</p> - <p class="math">\(\sqrt[y] {z}=x\)</p> - <p class="math">\(log_x(z)=y\)</p> - <br /> - <p class="math">\(x^n=\prod_{i=1}^n x,\ n \gt 0\)</p> - <p class="math">\(x^n=\frac 1{x^{-n}},\ n \lt 0\)</p> - <p class="math">\(x^0=1\)</p> - <p class="math">\(x^{\frac nm}=\sqrt[m] {x^n}\)</p> - <br /> - <p class="math">\(\frac xy+n=\frac {x+n y}{y}\)</p> - <p class="math">\(\frac xy+\frac ab=\frac {x b+ay}{yb}\)</p> - <p class="math">\(\frac xyn=\frac {xn}{y}\)</p> - <p class="math">\(\frac xy\frac ab=\frac {x a}{y b}\)</p> - <p class="math">\(\frac {x}{\frac ab}=\frac {xb}{a}\)</p> - <p class="math">\(\frac {\frac xy}z=\frac {x}{yz}\)</p> - <p class="math">\(\frac {\frac xy}{\frac ab}=\frac {xb}{ya}\)</p> - <br /> - <p class="math">\((x^a)^b=x^{ab}\)</p> - <p class="math">\(x^ay^a=(xy)^a\)</p> - <p class="math">\(\frac {x^a}{y^a}=(\frac xy)^a\)</p> - <p class="math">\(x^ax^b=x^{a+b}\)</p> - <p class="math">\(\frac {x^a}{x^b}=x^{a-b}\)</p> + <p class="heading">Regneregler</p> + <div class="group"> + <p class="math">\(x+y=z\)</p> + <p class="math">\(z-y=x\)</p> + <p class="math">\(z-x=y\)</p> + <p class="math">\(\sum_{i=a}^b i=a+(a \pm 1) + \cdots +(b \pm 1)+b\)</p> + </div> + <div class="group"> + <p class="math">\(xy=z\)</p> + <p class="math">\(\frac {z}{y}=x\)</p> + <p class="math">\(\frac {z}{x}=y\)</p> + <p class="math">\(\prod_{i=a}^b i=a(a \pm 1) \cdots (b \pm 1)b\)</p> + <p class="math">\(n!=\prod_{i=1}^n i,n \gt 0\)</p> + <p class="math">\(0!=1\)</p> + </div> + <div class="group"> + <p class="math">\(\frac xy=z\)</p> + <p class="math">\(zy=x\)</p> + <p class="math">\(\frac {x}{z}=y\)</p> + </div> + <div class="group"> + <p class="math">\(x^y=z\)</p> + <p class="math">\(\sqrt[y] {z}=x\)</p> + <p class="math">\(log_x(z)=y\)</p> + </div> + <div class="group"> + <p class="math">\(x^n=\prod_{i=1}^n x,\ n \gt 0\)</p> + <p class="math">\(x^n=\frac 1{x^{-n}},\ n \lt 0\)</p> + <p class="math">\(x^0=1\)</p> + <p class="math">\(x^{\frac nm}=\sqrt[m] {x^n}\)</p> + </div> + <div class="group"> + <p class="math">\(\frac xy+n=\frac {x+n y}{y}\)</p> + <p class="math">\(\frac xy+\frac ab=\frac {x b+ay}{yb}\)</p> + <p class="math">\(\frac xyn=\frac {xn}{y}\)</p> + <p class="math">\(\frac xy\frac ab=\frac {x a}{y b}\)</p> + <p class="math">\(\frac {x}{\frac ab}=\frac {xb}{a}\)</p> + <p class="math">\(\frac {\frac xy}z=\frac {x}{yz}\)</p> + <p class="math">\(\frac {\frac xy}{\frac ab}=\frac {xb}{ya}\)</p> + </div> + <div class="group"> + <p class="math">\((x^a)^b=x^{ab}\)</p> + <p class="math">\(x^ay^a=(xy)^a\)</p> + <p class="math">\(\frac {x^a}{y^a}=(\frac xy)^a\)</p> + <p class="math">\(x^ax^b=x^{a+b}\)</p> + <p class="math">\(\frac {x^a}{x^b}=x^{a-b}\)</p> + </div> </div> <div class="section" id="equations"> - <p class="sectionHeading">Ligninger</p> + <p class="heading">Ligninger</p> <p>Andengrads:</p> - <p class="math">\(ax^2+bx+c=0\)</p> - <p class="math">\(d=b^2-4ac\)</p> - <p class="math">\(x=\frac {-b \pm \sqrt[2] {d}}{2a}\)</p> + <div class="group"> + <p class="math">\(ax^2+bx+c=0\)</p> + <p class="math">\(d=b^2-4ac\)</p> + <p class="math">\(x=\frac {-b \pm \sqrt[2] {d}}{2a}\)</p> + </div> </div> <div class="section" id="functions"> - <p class="sectionHeading">Funktioner</p> - <p class="math">\(y=f(x)\)</p> - <p class="math">\(x=f^{-1}(y)\)</p> - <br /> - <p>Lineær:</p> - <p class="math">\(f(x)=ax+b\)</p> - <p class="math">\(a=\frac {y_1-y_0}{x_1-x_0}\)</p> - <p class="math">\(b=y-ax\)</p> - <p class="math">\(f(0)=b\)</p> - <br /> - <p>Eksponentiel:</p> - <p class="math">\(f(x)=ba^x\)</p> - <p class="math">\(a=\sqrt[x_1-x_0] {\frac {y_1}{y_0}}\)</p> - <p class="math">\(b=\frac {y}{a^x}\)</p> - <p class="math">\(f(0)=b\)</p> - <br /> - <p>Potens:</p> - <p class="math">\(f(x)=bx^a\)</p> - <p class="math">\(a=\frac {log_n(y_1)-log_n(y_0)}{log_n(x_1)-log_n(x_1)}\)</p> - <p class="math">\(b=\frac {y}{x^a}\)</p> - <p class="math">\(f(0)=0\)</p> - <p class="math">\(f(1)=b\)</p> - <br /> - <p>Andengrads:</p> - <p class="math">\(f(x)=ax^2+bx+c\)</p> + <p class="heading">Funktioner</p> + <div class="group"> + <p class="math">\(y=f(x)\)</p> + <p class="math">\(x=f^{-1}(y)\)</p> + </div> + <div class="group"> + <p>Lineær:</p> + <p class="math">\(f(x)=ax+b\)</p> + <p class="math">\(a=\frac {y_1-y_0}{x_1-x_0}\)</p> + <p class="math">\(b=y-ax\)</p> + <p class="math">\(f(0)=b\)</p> + </div> + <div class="group"> + <p>Eksponentiel:</p> + <p class="math">\(f(x)=ba^x\)</p> + <p class="math">\(a=\sqrt[x_1-x_0] {\frac {y_1}{y_0}}\)</p> + <p class="math">\(b=\frac {y}{a^x}\)</p> + <p class="math">\(f(0)=b\)</p> + </div> + <div class="group"> + <p>Potens:</p> + <p class="math">\(f(x)=bx^a\)</p> + <p class="math">\(a=\frac {log_n(y_1)-log_n(y_0)}{log_n(x_1)-log_n(x_1)}\)</p> + <p class="math">\(b=\frac {y}{x^a}\)</p> + <p class="math">\(f(0)=0\)</p> + <p class="math">\(f(1)=b\)</p> + </div> + <div class="group"> + <p>Andengrads:</p> + <p class="math">\(f(x)=ax^2+bx+c\)</p> + </div> </div> <div class="section" id="trigonometry"> - <p class="sectionHeading">Trigonometri</p> - <p class="math">\(modliggende_{\alpha}=hosliggende_{\beta}=a\)</p> - <p class="math">\(hosliggende_{\alpha}=modliggende_{\beta}=b\)</p> - <p class="math">\(hypotenuse=modliggende_{\gamma}=c\)</p> - <br /> - <p class="math">\(sin(\theta)=\frac {modliggende_{\theta}}{hypotenuse_{\theta}}\)</p> - <p class="math">\(cos(\theta)=\frac {hosliggende_{\theta}}{hypotenuse_{\theta}}\)</p> - <p class="math">\(tan(\theta)=\frac {modliggende_{\theta}}{hosliggende_{\theta}}\)</p> - <p class="math">\(cot(\theta)=\frac {hosliggende_{\theta}}{modliggende_{\theta}}\)</p> - <p class="math">\(csc(\theta)=\frac {hypotenuse_{\theta}}{modliggende_{\theta}}\)</p> - <p class="math">\(sec(\theta)=\frac {hypotenuse_{\theta}}{hosliggende_{\theta}}\)</p> - <br /> - <p class="math">\(sin^{-1}(\frac {modliggende_{\theta}}{hypotenuse_{\theta}})=\theta\)</p> - <p class="math">\(cos^{-1}(\frac {hosliggende_{\theta}}{hypotenuse_{\theta}})=\theta\)</p> - <p class="math">\(tan^{-1}(\frac {modliggende_{\theta}}{hosliggende_{\theta}})=\theta\)</p> - <p class="math">\(cot^{-1}(\frac {hosliggende_{\theta}}{modliggende_{\theta}})=\theta\)</p> - <p class="math">\(csc^{-1}(\frac {hypotenuse_{\theta}}{modliggende_{\theta}})=\theta\)</p> - <p class="math">\(sec^{-1}(\frac {hypotenuse_{\theta}}{hosliggende_{\theta}})=\theta\)</p> - <br /> - <p>Forkortelser:</p> - <p class="math">\(sin=sinus\)</p> - <p class="math">\(cos=cosinus\)</p> - <p class="math">\(tan=tangens\)</p> - <p class="math">\(cot=cotangens\)</p> - <p class="math">\(csc=cosekant\)</p> - <p class="math">\(sec=sekant\)</p> - <p class="math">\(arcsin=sin^{-1}\)</p> - <p class="math">\(arccos=cos^{-1}\)</p> - <p class="math">\(arctan=tan^{-1}\)</p> - <p class="math">\(arccot=cot^{-1}\)</p> - <p class="math">\(arcsec=sec^{-1}\)</p> - <p class="math">\(arccsc=csc^{-1}\)</p> - <br /> - <p class="math">\(deg(rad)=\frac {rad \cdot 180}{\pi}\)</p> - <p class="math">\(rad(deg)=\frac {deg \cdot \pi}{180}\)</p> - <br /> - <p class="math">\(\Theta(n)=(n-2)\pi\)</p> - <p class="note">hvori <span class="math">\({\Theta}(n)\)</span> er vinkelsummen af <span class="emphasis">n</span>-gonen.</p> - <p class="math">\(\Theta(3)=(3-2)\pi=\pi\)</p> - <br /> - <p class="math">\(\alpha=sin^{-1}(\frac ac)=cos^{-1}(\frac bc)=tan^{-1}(\frac ab)=\Theta(3)-\beta-\gamma\)</p> - <p class="math">\(\beta=sin^{-1}(\frac bc)=cos^{-1}(\frac ac)=tan^{-1}(\frac ba)=\Theta(3)-\alpha-\gamma\)</p> - <p class="math">\(\gamma=\Theta(3)-\alpha-\beta\)</p> - <p>I en retvinklet trekant:</p> - <p class="math">\(\gamma=\frac {\pi}2\)</p> - <p>I en regulær trekant:</p> - <p class="math">\(\alpha=\beta=\gamma=\frac {\pi}3\)</p> - <br /> - <p class="math">\(a=c \cdot sin(\alpha)=c \cdot cos(\beta)=b \cdot tan(\alpha)=b \cdot cot(\beta)\)</p> - <p class="math">\(b=c \cdot sin(\beta)=c \cdot cos(\alpha)=a \cdot tan(\beta)=a \cdot cot(\alpha)\)</p> - <p class="math">\(c=a \cdot csc(\alpha)=b \cdot csc(\beta)=a \cdot sec(\beta)=b \cdot sec(\alpha)\)</p> - <p>I en retvinklet trekant:</p> - <p class="math">\(a=\sqrt[2] {c^2-b^2}\)</p> - <p class="math">\(b=\sqrt[2] {c^2-a^2}\)</p> - <p class="math">\(c=\sqrt[2] {a^2+b^2}\)</p> - <p>I en retvinklet trekant, hvori kateterne har samme længde:</p> - <p class="math">\(a=b=\sqrt[2] {\frac {c^2}2}\)</p> - <p>I en regulær trekant:</p> - <p class="math">\(a=b=c\)</p> - <br /> - <p class="math">\(O=a+b+c\)</p> - <p class="math">\(A=\frac {bh}2\)</p> - <p class="note">hvori <span class="emphasis">b</span> er bredten af trekanten og <span class="emphasis">h</span> er dens højde.</p> - <p>Mellem to ligedannede trekanter:</p> - <p class="math">\(\alpha_1=\alpha_0\)</p> - <p class="math">\(\beta_1=\beta_0\)</p> - <p class="math">\(\gamma_1=\gamma_0\)</p> - <p class="math">\(k=\frac {a_1}{a_0}=\frac {b_1}{b_0}=\frac {c_1}{c_0}\)</p> - <p class="math">\(a_1=a_0 k\)</p> - <p class="math">\(b_1=b_0 k\)</p> - <p class="math">\(c_1=c_0 k\)</p> - <p class="math">\(O_1=O_0 k\)</p> - <p class="math">\(A_1=A_0 k^2\)</p> + <p class="heading">Trigonometri</p> + <div class="group"> + <p class="math">\(modliggende_{\alpha}=hosliggende_{\beta}=a\)</p> + <p class="math">\(hosliggende_{\alpha}=modliggende_{\beta}=b\)</p> + <p class="math">\(hypotenuse=modliggende_{\gamma}=c\)</p> + </div> + <div class="group"> + <p class="math">\(sin(\theta)=\frac {modliggende_{\theta}}{hypotenuse_{\theta}}\)</p> + <p class="math">\(cos(\theta)=\frac {hosliggende_{\theta}}{hypotenuse_{\theta}}\)</p> + <p class="math">\(tan(\theta)=\frac {modliggende_{\theta}}{hosliggende_{\theta}}\)</p> + <p class="math">\(cot(\theta)=\frac {hosliggende_{\theta}}{modliggende_{\theta}}\)</p> + <p class="math">\(csc(\theta)=\frac {hypotenuse_{\theta}}{modliggende_{\theta}}\)</p> + <p class="math">\(sec(\theta)=\frac {hypotenuse_{\theta}}{hosliggende_{\theta}}\)</p> + </div> + <div class="group"> + <p class="math">\(sin^{-1}(\frac {modliggende_{\theta}}{hypotenuse_{\theta}})=\theta\)</p> + <p class="math">\(cos^{-1}(\frac {hosliggende_{\theta}}{hypotenuse_{\theta}})=\theta\)</p> + <p class="math">\(tan^{-1}(\frac {modliggende_{\theta}}{hosliggende_{\theta}})=\theta\)</p> + <p class="math">\(cot^{-1}(\frac {hosliggende_{\theta}}{modliggende_{\theta}})=\theta\)</p> + <p class="math">\(csc^{-1}(\frac {hypotenuse_{\theta}}{modliggende_{\theta}})=\theta\)</p> + <p class="math">\(sec^{-1}(\frac {hypotenuse_{\theta}}{hosliggende_{\theta}})=\theta\)</p> + </div> + <div class="group"> + <p>Forkortelser:</p> + <p class="math">\(sin=sinus\)</p> + <p class="math">\(cos=cosinus\)</p> + <p class="math">\(tan=tangens\)</p> + <p class="math">\(cot=cotangens\)</p> + <p class="math">\(csc=cosekant\)</p> + <p class="math">\(sec=sekant\)</p> + <p class="math">\(arcsin=sin^{-1}\)</p> + <p class="math">\(arccos=cos^{-1}\)</p> + <p class="math">\(arctan=tan^{-1}\)</p> + <p class="math">\(arccot=cot^{-1}\)</p> + <p class="math">\(arcsec=sec^{-1}\)</p> + <p class="math">\(arccsc=csc^{-1}\)</p> + </div> + <div class="group"> + <p class="math">\(deg(rad)=\frac {rad \cdot 180}{\pi}\)</p> + <p class="math">\(rad(deg)=\frac {deg \cdot \pi}{180}\)</p> + </div> + <div class="group"> + <p class="math">\(\Theta(n)=(n-2)\pi\)</p> + <p class="note">hvori <span class="math">\({\Theta}(n)\)</span> er vinkelsummen af <span class="emphasis">n</span>-gonen.</p> + <p class="math">\(\Theta(3)=(3-2)\pi=\pi\)</p> + </div> + <div class="group"> + <p class="math">\(\alpha=sin^{-1}(\frac ac)=cos^{-1}(\frac bc)=tan^{-1}(\frac ab)=\Theta(3)-\beta-\gamma\)</p> + <p class="math">\(\beta=sin^{-1}(\frac bc)=cos^{-1}(\frac ac)=tan^{-1}(\frac ba)=\Theta(3)-\alpha-\gamma\)</p> + <p class="math">\(\gamma=\Theta(3)-\alpha-\beta\)</p> + <p>I en retvinklet trekant:</p> + <p class="math">\(\gamma=\frac {\pi}2\)</p> + <p>I en regulær trekant:</p> + <p class="math">\(\alpha=\beta=\gamma=\frac {\pi}3\)</p> + </div> + <div class="group"> + <p class="math">\(a=c \cdot sin(\alpha)=c \cdot cos(\beta)=b \cdot tan(\alpha)=b \cdot cot(\beta)\)</p> + <p class="math">\(b=c \cdot sin(\beta)=c \cdot cos(\alpha)=a \cdot tan(\beta)=a \cdot cot(\alpha)\)</p> + <p class="math">\(c=a \cdot csc(\alpha)=b \cdot csc(\beta)=a \cdot sec(\beta)=b \cdot sec(\alpha)\)</p> + <p>I en retvinklet trekant:</p> + <p class="math">\(a=\sqrt[2] {c^2-b^2}\)</p> + <p class="math">\(b=\sqrt[2] {c^2-a^2}\)</p> + <p class="math">\(c=\sqrt[2] {a^2+b^2}\)</p> + <p>I en retvinklet trekant, hvori kateterne har samme længde:</p> + <p class="math">\(a=b=\sqrt[2] {\frac {c^2}2}\)</p> + <p>I en regulær trekant:</p> + <p class="math">\(a=b=c\)</p> + </div> + <div class="group"> + <p class="math">\(O=a+b+c\)</p> + <p class="math">\(A=\frac {bh}2\)</p> + <p class="note">hvori <span class="emphasis">b</span> er bredten af trekanten og <span class="emphasis">h</span> er dens højde.</p> + <p>Mellem to ligedannede trekanter:</p> + <p class="math">\(\alpha_1=\alpha_0\)</p> + <p class="math">\(\beta_1=\beta_0\)</p> + <p class="math">\(\gamma_1=\gamma_0\)</p> + <p class="math">\(k=\frac {a_1}{a_0}=\frac {b_1}{b_0}=\frac {c_1}{c_0}\)</p> + <p class="math">\(a_1=a_0 k\)</p> + <p class="math">\(b_1=b_0 k\)</p> + <p class="math">\(c_1=c_0 k\)</p> + <p class="math">\(O_1=O_0 k\)</p> + <p class="math">\(A_1=A_0 k^2\)</p> + </div> </div> <div class="section" id="constants"> - <p class="sectionHeading">Konstanter</p> + <p class="heading">Konstanter</p> <table> <thead> <tr> @@ -199,13 +225,15 @@ </tr> </tbody> </table> - <p class="math">\(\sqrt[2] 2 \approx \frac {1\ 414\ 213\ 562}{10^9}\)</p> - <p class="math">\(\sqrt[2] 3 \approx \frac {1\ 732\ 050\ 808}{10^9}\)</p> - <p class="math">\(e=\sum_{n=0}^\infty \frac 1{n!} \approx \frac {2\ 718\ 281\ 828}{10^9}\)</p> - <p class="math">\(i=\sqrt[2] {-1}\)</p> - <p class="math">\(\pi \approx \frac {3\ 141\ 592\ 654}{10^9}\)</p> - <p class="math">\(\tau=2\pi \approx \frac {6\ 283\ 185\ 307}{10^9}\)</p> - <p class="math">\(\phi=\frac {1+\sqrt[2] 5}2 \approx \frac {1\ 618\ 033\ 989}{10^9}\)</p> + <div class="group"> + <p class="math">\(\sqrt[2] 2 \approx \frac {1\ 414\ 213\ 562}{10^9}\)</p> + <p class="math">\(\sqrt[2] 3 \approx \frac {1\ 732\ 050\ 808}{10^9}\)</p> + <p class="math">\(e=\sum_{n=0}^\infty \frac 1{n!} \approx \frac {2\ 718\ 281\ 828}{10^9}\)</p> + <p class="math">\(i=\sqrt[2] {-1}\)</p> + <p class="math">\(\pi \approx \frac {3\ 141\ 592\ 654}{10^9}\)</p> + <p class="math">\(\tau=2\pi \approx \frac {6\ 283\ 185\ 307}{10^9}\)</p> + <p class="math">\(\phi=\frac {1+\sqrt[2] 5}2 \approx \frac {1\ 618\ 033\ 989}{10^9}\)</p> + </div> </div> </div> <!--#include virtual="/shtml/copyrightNotice.shtml"--> diff --git a/html/topic/physics.html b/html/topic/physics.html index 63bb7eb..0885139 100644 --- a/html/topic/physics.html +++ b/html/topic/physics.html @@ -8,9 +8,9 @@ <div class="content"> <!--#include virtual="/shtml/navigationBar.shtml"--> <div class="page"> - <p class="pageHeading">Fysik</p> + <p class="heading">Fysik</p> <div class="section" id="measures-and-units"> - <p class="sectionHeading">Mål og Enheder</p> + <p class="heading">Mål og Enheder</p> <table> <thead> <tr> @@ -217,71 +217,92 @@ </tr> </tbody> </table> - <p>Afledte enheder:</p> - <p class="math">\(1\ C=1\ A \cdot 1\ s\)</p> - <p class="math">\(1\ Hz=1\ s^{-1}\)</p> - <p class="math">\(1\ J=1\ \frac {kg \cdot m^2}{s^2}\)</p> - <p class="math">\(1\ N=1\ \frac {kg \cdot m}{s^2}\)</p> - <p class="math">\(1\ Pa=1\ \frac {kg}{ms^2}\)</p> - <p class="math">\(1\ W=1\ \frac Js\)</p> - <br /> - <p>Variante enheder:</p> - <p class="math">\(1\ {}^{\circ}C=\frac {5463}{20}\ K\)</p> - <p class="math">\(1\ \frac {km}h=\frac 5{18}\ \frac ms\)</p> + <div class="group"> + <p>Afledte enheder:</p> + <p class="math">\(1\ C=1\ A \cdot 1\ s\)</p> + <p class="math">\(1\ Hz=1\ s^{-1}\)</p> + <p class="math">\(1\ J=1\ \frac {kg \cdot m^2}{s^2}\)</p> + <p class="math">\(1\ N=1\ \frac {kg \cdot m}{s^2}\)</p> + <p class="math">\(1\ Pa=1\ \frac {kg}{ms^2}\)</p> + <p class="math">\(1\ W=1\ \frac Js\)</p> + </div> + <div class="group"> + <p>Variante enheder:</p> + <p class="math">\(1\ {}^{\circ}C=\frac {5463}{20}\ K\)</p> + <p class="math">\(1\ \frac {km}h=\frac 5{18}\ \frac ms\)</p> + </div> </div> <div class="section" id="electrodynamics"> - <p class="sectionHeading">Elektrodynamik</p> - <p class="math">\(I=\frac qt\)</p> - <br /> - <p class="math">\(i=\frac PA\)</p> - <p class="math">\(i=T^4{\sigma}{\varepsilon}\)</p> - <p class="note">afgives ved stråling.</p> - <br /> - <p class="math">\(P=iA\)</p> - <br /> - <p class="math">\(q=It\)</p> - <br /> - <p class="math">\(T=\sqrt[4] {\frac i{{\sigma}{\varepsilon}}}\)</p> - <p class="note">ved overfladen af det strålende objekt.</p> - <br /> - <p class="math">\(\lambda=\frac vf\)</p> + <p class="heading">Elektrodynamik</p> + <div class="group"> + <p class="math">\(I=\frac qt\)</p> + </div> + <div class="group"> + <p class="math">\(i=\frac PA\)</p> + <p class="math">\(i=T^4{\sigma}{\varepsilon}\)</p> + <p class="note">afgives ved stråling.</p> + </div> + <div class="group"> + <p class="math">\(P=iA\)</p> + </div> + <div class="group"> + <p class="math">\(q=It\)</p> + </div> + <div class="group"> + <p class="math">\(T=\sqrt[4] {\frac i{{\sigma}{\varepsilon}}}\)</p> + <p class="note">ved overfladen af det strålende objekt.</p> + </div> + <div class="group"> + <p class="math">\(\lambda=\frac vf\)</p> + </div> </div> <div class="section" id="mechanics"> - <p class="sectionHeading">Mekanik</p> - <p class="math">\(a=\frac Fm\)</p> - <p class="math">\(a=\frac vt\)</p> - <p class="math">\(g=\frac {Gm}{r^2}\)</p> - <p class="note">hvori <span class="emphasis">r</span> er distancen til planetens kerne.</p> - <p class="math">\(g_♁=\frac {981}{10^2}\ \frac m{s^2}\)</p> - <p class="note">er standard på Jorden.</p> - <br /> - <p class="math">\(E=Pt\)</p> - <p class="math">\(K=\frac {mv^2}2\)</p> - <p class="math">\(U=Fs\)</p> - <p class="note">hvori <span class="emphasis">F</span> er tyngdekraften og <span class="emphasis">g</span> er den lokale tyngeacceleration.</p> - <p class="math">\(W=Fs\)</p> - <br /> - <p class="math">\(F=\frac Es\)</p> - <p class="math">\(F=\frac {Gm_0m_1}{r^2}\)</p> - <p class="note">hvori <span class="emphasis">m<sub>0</sub></span> og <span class="emphasis">m<sub>1</sub></span> er masserne af objekterne og <span class="emphasis">r</span> er distancen mellem centrene af de to objekter.</p> - <br /> - <p class="math">\(P=\frac Wt\)</p> - <br /> - <p class="math">\(p=\frac FA\)</p> - <br /> - <p class="math">\(\rho=\frac mV\)</p> + <p class="heading">Mekanik</p> + <div class="group"> + <p class="math">\(a=\frac Fm\)</p> + <p class="math">\(a=\frac vt\)</p> + <p class="math">\(g=\frac {Gm}{r^2}\)</p> + <p class="note">hvori <span class="emphasis">r</span> er distancen til planetens kerne.</p> + <p class="math">\(g_♁=\frac {980\ 665}{10^5}\ \frac m{s^2}\)</p> + <p class="note">er standard på Jorden.</p> + </div> + <div class="group"> + <p class="math">\(E=Pt\)</p> + <p class="math">\(K=\frac {mv^2}2\)</p> + <p class="math">\(U=Fs\)</p> + <p class="note">hvori <span class="emphasis">F</span> er tyngdekraften og <span class="emphasis">g</span> er den lokale tyngeacceleration.</p> + <p class="math">\(W=Fs\)</p> + </div> + <div class="group"> + <p class="math">\(F=\frac Es\)</p> + <p class="math">\(F=\frac {Gm_0m_1}{r^2}\)</p> + <p class="note">hvori <span class="emphasis">m<sub>0</sub></span> og <span class="emphasis">m<sub>1</sub></span> er masserne af objekterne og <span class="emphasis">r</span> er distancen mellem centrene af de to objekter.</p> + </div> + <div class="group"> + <p class="math">\(P=\frac Wt\)</p> + </div> + <div class="group"> + <p class="math">\(p=\frac FA\)</p> + </div> + <div class="group"> + <p class="math">\(\rho=\frac mV\)</p> + </div> </div> <div class="section" id="thermodynamics"> - <p class="sectionHeading">Termodynamik</p> - <p class="math">\(C=Cm\)</p> - <br /> - <p class="math">\(c=\frac Cm\)</p> - <br /> - <p class="math">\(Q=CT\)</p> + <p class="heading">Termodynamik</p> + <div class="group"> + <p class="math">\(C=Cm\)</p> + </div> + <div class="group"> + <p class="math">\(c=\frac Cm\)</p> + </div> + <div class="group"> + <p class="math">\(Q=CT\)</p> + </div> </div> <div class="section" id="constants"> - <p class="sectionHeading">Konstanter</p> - <p class="subHeading">Jf. <a href="/html/topic/mathematics.html#constants">matematikkens konstanter</a>.</p> + <p class="heading">Konstanter</p> + <p class="subheading">Jf. <a href="/html/topic/mathematics.html#constants">matematikkens konstanter</a>.</p> <table> <thead> <tr> @@ -316,12 +337,14 @@ </tr> </tbody> </table> - <p class="math">\(c=299\ 792\ 458\ \frac ms\)</p> - <p class="math">\(e=\frac {1\ 602\ 176\ 634}{10^{28}}\ C\)</p> - <p class="math">\(G \approx \frac {66\ 743}{10^{15}}\ \frac {m^3}{kg \cdot s^2}\)</p> - <p class="math">\(h=\frac {662\ 607\ 015}{10^{42}}\ \frac J{Hz}\)</p> - <p class="math">\(k_B=\frac {1\ 380\ 649}{10^{29}}\ \frac J{K}\)</p> - <p class="math">\(\sigma=\frac {2\pi^5k_B^4}{15h^3c^2} \approx \frac {5\ 670\ 374\ 419}{10^{17}}\ \frac W{m^2K^4}\)</p> + <div class="group"> + <p class="math">\(c=299\ 792\ 458\ \frac ms\)</p> + <p class="math">\(e=\frac {1\ 602\ 176\ 634}{10^{28}}\ C\)</p> + <p class="math">\(G \approx \frac {66\ 743}{10^{15}}\ \frac {m^3}{kg \cdot s^2}\)</p> + <p class="math">\(h=\frac {662\ 607\ 015}{10^{42}}\ \frac J{Hz}\)</p> + <p class="math">\(k_B=\frac {1\ 380\ 649}{10^{29}}\ \frac J{K}\)</p> + <p class="math">\(\sigma=\frac {2\pi^5k_B^4}{15h^3c^2} \approx \frac {5\ 670\ 374\ 419}{10^{17}}\ \frac W{m^2K^4}\)</p> + </div> </div> </div> <!--#include virtual="/shtml/copyrightNotice.shtml"--> diff --git a/html/topic/social-science.html b/html/topic/social-science.html index b39c63a..57118f9 100644 --- a/html/topic/social-science.html +++ b/html/topic/social-science.html @@ -7,7 +7,7 @@ <div class="content"> <!--#include virtual="/shtml/navigationBar.shtml"--> <div class="page"> - <p class="pageHeading">Samfundsfag</p> + <p class="heading">Samfundsfag</p> <div class="section"> <p>Kommer senere.</p> </div> diff --git a/html/topic/spanish.html b/html/topic/spanish.html index 7b9b57d..1f2f6c6 100644 --- a/html/topic/spanish.html +++ b/html/topic/spanish.html @@ -7,7 +7,7 @@ <div class="content"> <!--#include virtual="/shtml/navigationBar.shtml"--> <div class="page"> - <p class="pageHeading">Spansk</p> + <p class="heading">Spansk</p> <div class="section"> <p>Kommer senere.</p> </div> diff --git a/processStyles.sh b/processStyles.sh new file mode 100755 index 0000000..28fa987 --- /dev/null +++ b/processStyles.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +process() { + sassc -tcompressed "css/${1}.scss" > "css/${1}.css" +} + +process "main" +process "noJavaScript" |