<meta charset='UTF-8'><meta name='viewport' content='width=device-width initial-scale=1'>

<link href='https://fonts.loli.net/css?family=Open+Sans:400italic,700italic,700,400&subset=latin,latin-ext' rel='stylesheet' type='text/css' /><style type='text/css'>html {overflow-x: initial !important;}:root { --bg-color:#ffffff; --text-color:#333333; --select-text-bg-color:#B5D6FC; --select-text-font-color:auto; --monospace:"Lucida Console",Consolas,"Courier",monospace; --title-bar-height:20px; }

.mac-os-11 { --title-bar-height:28px; }

html { font-size: 14px; background-color: var(--bg-color); color: var(--text-color); font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; -webkit-font-smoothing: antialiased; }

body { margin: 0px; padding: 0px; height: auto; inset: 0px; font-size: 1rem; line-height: 1.42857; overflow-x: hidden; background: inherit; tab-size: 4; }

iframe { margin: auto; }

a.url { word-break: break-all; }

a:active, a:hover { outline: 0px; }

.in-text-selection, ::selection { text-shadow: none; background: var(--select-text-bg-color); color: var(--select-text-font-color); }

#write { margin: 0px auto; height: auto; width: inherit; word-break: normal; overflow-wrap: break-word; position: relative; white-space: normal; overflow-x: visible; padding-top: 36px; }

#write.first-line-indent p { text-indent: 2em; }

#write.first-line-indent li p, #write.first-line-indent p * { text-indent: 0px; }

#write.first-line-indent li { margin-left: 2em; }

.for-image #write { padding-left: 8px; padding-right: 8px; }

body.typora-export { padding-left: 30px; padding-right: 30px; }

.typora-export .footnote-line, .typora-export li, .typora-export p { white-space: pre-wrap; }

.typora-export .task-list-item input { pointer-events: none; }

@media screen and (max-width: 500px) {

body.typora-export { padding-left: 0px; padding-right: 0px; }

#write { padding-left: 20px; padding-right: 20px; }

.CodeMirror-sizer { margin-left: 0px !important; }

.CodeMirror-gutters { display: none !important; }

}

#write li > figure:last-child { margin-bottom: 0.5rem; }

#write ol, #write ul { position: relative; }

img { max-width: 100%; vertical-align: middle; image-orientation: from-image; }

button, input, select, textarea { color: inherit; font: inherit; }

input[type="checkbox"], input[type="radio"] { line-height: normal; padding: 0px; }

*, ::after, ::before { box-sizing: border-box; }

#write h1, #write h2, #write h3, #write h4, #write h5, #write h6, #write p, #write pre { width: inherit; }

#write h1, #write h2, #write h3, #write h4, #write h5, #write h6, #write p { position: relative; }

p { line-height: inherit; }

h1, h2, h3, h4, h5, h6 { break-after: avoid-page; break-inside: avoid; orphans: 4; }

p { orphans: 4; }

h1 { font-size: 2rem; }

h2 { font-size: 1.8rem; }

h3 { font-size: 1.6rem; }

h4 { font-size: 1.4rem; }

h5 { font-size: 1.2rem; }

h6 { font-size: 1rem; }

.md-math-block, .md-rawblock, h1, h2, h3, h4, h5, h6, p { margin-top: 1rem; margin-bottom: 1rem; }

.hidden { display: none; }

.md-blockmeta { color: rgb(204, 204, 204); font-weight: 700; font-style: italic; }

a { cursor: pointer; }

sup.md-footnote { padding: 2px 4px; background-color: rgba(238, 238, 238, 0.7); color: rgb(85, 85, 85); border-radius: 4px; cursor: pointer; }

sup.md-footnote a, sup.md-footnote a:hover { color: inherit; text-transform: inherit; text-decoration: inherit; }

#write input[type="checkbox"] { cursor: pointer; width: inherit; height: inherit; }

figure { overflow-x: auto; margin: 1.2em 0px; max-width: calc(100% + 16px); padding: 0px; }

figure > table { margin: 0px; }

tr { break-inside: avoid; break-after: auto; }

thead { display: table-header-group; }

table { border-collapse: collapse; border-spacing: 0px; width: 100%; overflow: auto; break-inside: auto; text-align: left; }

table.md-table td { min-width: 32px; }

.CodeMirror-gutters { border-right: 0px; background-color: inherit; }

.CodeMirror-linenumber { user-select: none; }

.CodeMirror { text-align: left; }

.CodeMirror-placeholder { opacity: 0.3; }

.CodeMirror pre { padding: 0px 4px; }

.CodeMirror-lines { padding: 0px; }

div.hr:focus { cursor: none; }

#write pre { white-space: pre-wrap; }

#write.fences-no-line-wrapping pre { white-space: pre; }

#write pre.ty-contain-cm { white-space: normal; }

.CodeMirror-gutters { margin-right: 4px; }

.md-fences { font-size: 0.9rem; display: block; break-inside: avoid; text-align: left; overflow: visible; white-space: pre; background: inherit; position: relative !important; }

.md-fences-adv-panel { width: 100%; margin-top: 10px; text-align: center; padding-top: 0px; padding-bottom: 8px; overflow-x: auto; }

#write .md-fences.mock-cm { white-space: pre-wrap; }

.md-fences.md-fences-with-lineno { padding-left: 0px; }

#write.fences-no-line-wrapping .md-fences.mock-cm { white-space: pre; overflow-x: auto; }

.md-fences.mock-cm.md-fences-with-lineno { padding-left: 8px; }

.CodeMirror-line, twitterwidget { break-inside: avoid; }

.footnotes { opacity: 0.8; font-size: 0.9rem; margin-top: 1em; margin-bottom: 1em; }

.footnotes + .footnotes { margin-top: 0px; }

.md-reset { margin: 0px; padding: 0px; border: 0px; outline: 0px; vertical-align: top; background: 0px 0px; text-decoration: none; text-shadow: none; float: none; position: static; width: auto; height: auto; white-space: nowrap; cursor: inherit; -webkit-tap-highlight-color: transparent; line-height: normal; font-weight: 400; text-align: left; box-sizing: content-box; direction: ltr; }

li div { padding-top: 0px; }

blockquote { margin: 1rem 0px; }

li .mathjax-block, li p { margin: 0.5rem 0px; }

li blockquote { margin: 1rem 0px; }

li { margin: 0px; position: relative; }

blockquote > :last-child { margin-bottom: 0px; }

blockquote > :first-child, li > :first-child { margin-top: 0px; }

.footnotes-area { color: rgb(136, 136, 136); margin-top: 0.714rem; padding-bottom: 0.143rem; white-space: normal; }

#write .footnote-line { white-space: pre-wrap; }

@media print {

body, html { border: 1px solid transparent; height: 99%; break-after: avoid; break-before: avoid; font-variant-ligatures: no-common-ligatures; }

#write { margin-top: 0px; padding-top: 0px; border-color: transparent !important; }

.typora-export * { -webkit-print-color-adjust: exact; }

.typora-export #write { break-after: avoid; }

.typora-export #write::after { height: 0px; }

.is-mac table { break-inside: avoid; }

.typora-export-show-outline .typora-export-sidebar { display: none; }

}

.footnote-line { margin-top: 0.714em; font-size: 0.7em; }

a img, img a { cursor: pointer; }

pre.md-meta-block { font-size: 0.8rem; min-height: 0.8rem; white-space: pre-wrap; background: rgb(204, 204, 204); display: block; overflow-x: hidden; }

p > .md-image:only-child:not(.md-img-error) img, p > img:only-child { display: block; margin: auto; }

#write.first-line-indent p > .md-image:only-child:not(.md-img-error) img { left: -2em; position: relative; }

p > .md-image:only-child { display: inline-block; width: 100%; }

#write .MathJax_Display { margin: 0.8em 0px 0px; }

.md-math-block { width: 100%; }

.md-math-block:not(:empty)::after { display: none; }

.MathJax_ref { fill: currentcolor; }

[contenteditable="true"]:active, [contenteditable="true"]:focus, [contenteditable="false"]:active, [contenteditable="false"]:focus { outline: 0px; box-shadow: none; }

.md-task-list-item { position: relative; list-style-type: none; }

.task-list-item.md-task-list-item { padding-left: 0px; }

.md-task-list-item > input { position: absolute; top: 0px; left: 0px; margin-left: -1.2em; margin-top: calc(1em - 10px); border: none; }

.math { font-size: 1rem; }

.md-toc { min-height: 3.58rem; position: relative; font-size: 0.9rem; border-radius: 10px; }

.md-toc-content { position: relative; margin-left: 0px; }

.md-toc-content::after, .md-toc::after { display: none; }

.md-toc-item { display: block; color: rgb(65, 131, 196); }

.md-toc-item a { text-decoration: none; }

.md-toc-inner:hover { text-decoration: underline; }

.md-toc-inner { display: inline-block; cursor: pointer; }

.md-toc-h1 .md-toc-inner { margin-left: 0px; font-weight: 700; }

.md-toc-h2 .md-toc-inner { margin-left: 2em; }

.md-toc-h3 .md-toc-inner { margin-left: 4em; }

.md-toc-h4 .md-toc-inner { margin-left: 6em; }

.md-toc-h5 .md-toc-inner { margin-left: 8em; }

.md-toc-h6 .md-toc-inner { margin-left: 10em; }

@media screen and (max-width: 48em) {

.md-toc-h3 .md-toc-inner { margin-left: 3.5em; }

.md-toc-h4 .md-toc-inner { margin-left: 5em; }

.md-toc-h5 .md-toc-inner { margin-left: 6.5em; }

.md-toc-h6 .md-toc-inner { margin-left: 8em; }

}

a.md-toc-inner { font-size: inherit; font-style: inherit; font-weight: inherit; line-height: inherit; }

.footnote-line a:not(.reversefootnote) { color: inherit; }

.md-attr { display: none; }

.md-fn-count::after { content: "."; }

code, pre, samp, tt { font-family: var(--monospace); }

kbd { margin: 0px 0.1em; padding: 0.1em 0.6em; font-size: 0.8em; color: rgb(36, 39, 41); background: rgb(255, 255, 255); border: 1px solid rgb(173, 179, 185); border-radius: 3px; box-shadow: rgba(12, 13, 14, 0.2) 0px 1px 0px, rgb(255, 255, 255) 0px 0px 0px 2px inset; white-space: nowrap; vertical-align: middle; }

.md-comment { color: rgb(162, 127, 3); opacity: 0.8; font-family: var(--monospace); }

code { text-align: left; vertical-align: initial; }

a.md-print-anchor { white-space: pre !important; border-width: initial !important; border-style: none !important; border-color: initial !important; display: inline-block !important; position: absolute !important; width: 1px !important; right: 0px !important; outline: 0px !important; background: 0px 0px !important; text-decoration: initial !important; text-shadow: initial !important; }

.os-windows.monocolor-emoji .md-emoji { font-family: "Segoe UI Symbol", sans-serif; }

.md-diagram-panel > svg { max-width: 100%; }

[lang="flow"] svg, [lang="mermaid"] svg { max-width: 100%; height: auto; }

[lang="mermaid"] .node text { font-size: 1rem; }

table tr th { border-bottom: 0px; }

video { max-width: 100%; display: block; margin: 0px auto; }

iframe { max-width: 100%; width: 100%; border: none; }

.highlight td, .highlight tr { border: 0px; }

mark { background: rgb(255, 255, 0); color: rgb(0, 0, 0); }

.md-html-inline .md-plain, .md-html-inline strong, mark .md-inline-math, mark strong { color: inherit; }

.md-expand mark .md-meta { opacity: 0.3 !important; }

mark .md-meta { color: rgb(0, 0, 0); }

@media print {

.typora-export h1, .typora-export h2, .typora-export h3, .typora-export h4, .typora-export h5, .typora-export h6 { break-inside: avoid; }

}

.md-diagram-panel .messageText { stroke: none !important; }

.md-diagram-panel .start-state { fill: var(--node-fill); }

.md-diagram-panel .edgeLabel rect { opacity: 1 !important; }

.md-require-zoom-fix { height: auto; margin-top: 16px; margin-bottom: 16px; }

.md-require-zoom-fix foreignobject { font-size: var(--mermaid-font-zoom); }

.md-fences.md-fences-math { font-size: 1em; }

.md-fences-advanced:not(.md-focus) { padding: 0px; white-space: nowrap; border: 0px; }

.md-fences-advanced:not(.md-focus) { background: inherit; }

.typora-export-show-outline .typora-export-content { max-width: 1440px; margin: auto; display: flex; flex-direction: row; }

.typora-export-sidebar { width: 300px; font-size: 0.8rem; margin-top: 80px; margin-right: 18px; }

.typora-export-show-outline #write { --webkit-flex:2; flex: 2 1 0%; }

.typora-export-sidebar .outline-content { position: fixed; top: 0px; max-height: 100%; overflow: hidden auto; padding-bottom: 30px; padding-top: 60px; width: 300px; }

@media screen and (max-width: 1024px) {

.typora-export-sidebar, .typora-export-sidebar .outline-content { width: 240px; }

}

@media screen and (max-width: 800px) {

.typora-export-sidebar { display: none; }

}

.outline-content li, .outline-content ul { margin-left: 0px; margin-right: 0px; padding-left: 0px; padding-right: 0px; list-style: none; }

.outline-content ul { margin-top: 0px; margin-bottom: 0px; }

.outline-content strong { font-weight: 400; }

.outline-expander { width: 1rem; height: 1.42857rem; position: relative; display: table-cell; vertical-align: middle; cursor: pointer; padding-left: 4px; }

.outline-expander::before { content: ""; position: relative; font-family: Ionicons; display: inline-block; font-size: 8px; vertical-align: middle; }

.outline-item { padding-top: 3px; padding-bottom: 3px; cursor: pointer; }

.outline-expander:hover::before { content: ""; }

.outline-h1 > .outline-item { padding-left: 0px; }

.outline-h2 > .outline-item { padding-left: 1em; }

.outline-h3 > .outline-item { padding-left: 2em; }

.outline-h4 > .outline-item { padding-left: 3em; }

.outline-h5 > .outline-item { padding-left: 4em; }

.outline-h6 > .outline-item { padding-left: 5em; }

.outline-label { cursor: pointer; display: table-cell; vertical-align: middle; text-decoration: none; color: inherit; }

.outline-label:hover { text-decoration: underline; }

.outline-item:hover { border-color: rgb(245, 245, 245); background-color: var(--item-hover-bg-color); }

.outline-item:hover { margin-left: -28px; margin-right: -28px; border-left: 28px solid transparent; border-right: 28px solid transparent; }

.outline-item-single .outline-expander::before, .outline-item-single .outline-expander:hover::before { display: none; }

.outline-item-open > .outline-item > .outline-expander::before { content: ""; }

.outline-children { display: none; }

.info-panel-tab-wrapper { display: none; }

.outline-item-open > .outline-children { display: block; }

.typora-export .outline-item { padding-top: 1px; padding-bottom: 1px; }

.typora-export .outline-item:hover { margin-right: -8px; border-right: 8px solid transparent; }

.typora-export .outline-expander::before { content: "+"; font-family: inherit; top: -1px; }

.typora-export .outline-expander:hover::before, .typora-export .outline-item-open > .outline-item > .outline-expander::before { content: "−"; }

.typora-export-collapse-outline .outline-children { display: none; }

.typora-export-collapse-outline .outline-item-open > .outline-children, .typora-export-no-collapse-outline .outline-children { display: block; }

.typora-export-no-collapse-outline .outline-expander::before { content: "" !important; }

.typora-export-show-outline .outline-item-active > .outline-item .outline-label { font-weight: 700; }

.md-inline-math-container mjx-container { zoom: 0.95; }

.CodeMirror { height: auto; }

.CodeMirror.cm-s-inner { background: inherit; }

.CodeMirror-scroll { overflow: auto hidden; z-index: 3; }

.CodeMirror-gutter-filler, .CodeMirror-scrollbar-filler { background-color: rgb(255, 255, 255); }

.CodeMirror-gutters { border-right: 1px solid rgb(221, 221, 221); background: inherit; white-space: nowrap; }

.CodeMirror-linenumber { padding: 0px 3px 0px 5px; text-align: right; color: rgb(153, 153, 153); }

.cm-s-inner .cm-keyword { color: rgb(119, 0, 136); }

.cm-s-inner .cm-atom, .cm-s-inner.cm-atom { color: rgb(34, 17, 153); }

.cm-s-inner .cm-number { color: rgb(17, 102, 68); }

.cm-s-inner .cm-def { color: rgb(0, 0, 255); }

.cm-s-inner .cm-variable { color: rgb(0, 0, 0); }

.cm-s-inner .cm-variable-2 { color: rgb(0, 85, 170); }

.cm-s-inner .cm-variable-3 { color: rgb(0, 136, 85); }

.cm-s-inner .cm-string { color: rgb(170, 17, 17); }

.cm-s-inner .cm-property { color: rgb(0, 0, 0); }

.cm-s-inner .cm-operator { color: rgb(152, 26, 26); }

.cm-s-inner .cm-comment, .cm-s-inner.cm-comment { color: rgb(170, 85, 0); }

.cm-s-inner .cm-string-2 { color: rgb(255, 85, 0); }

.cm-s-inner .cm-meta { color: rgb(85, 85, 85); }

.cm-s-inner .cm-qualifier { color: rgb(85, 85, 85); }

.cm-s-inner .cm-builtin { color: rgb(51, 0, 170); }

.cm-s-inner .cm-bracket { color: rgb(153, 153, 119); }

.cm-s-inner .cm-tag { color: rgb(17, 119, 0); }

.cm-s-inner .cm-attribute { color: rgb(0, 0, 204); }

.cm-s-inner .cm-header, .cm-s-inner.cm-header { color: rgb(0, 0, 255); }

.cm-s-inner .cm-quote, .cm-s-inner.cm-quote { color: rgb(0, 153, 0); }

.cm-s-inner .cm-hr, .cm-s-inner.cm-hr { color: rgb(153, 153, 153); }

.cm-s-inner .cm-link, .cm-s-inner.cm-link { color: rgb(0, 0, 204); }

.cm-negative { color: rgb(221, 68, 68); }

.cm-positive { color: rgb(34, 153, 34); }

.cm-header, .cm-strong { font-weight: 700; }

.cm-del { text-decoration: line-through; }

.cm-em { font-style: italic; }

.cm-link { text-decoration: underline; }

.cm-error { color: red; }

.cm-invalidchar { color: red; }

.cm-constant { color: rgb(38, 139, 210); }

.cm-defined { color: rgb(181, 137, 0); }

div.CodeMirror span.CodeMirror-matchingbracket { color: rgb(0, 255, 0); }

div.CodeMirror span.CodeMirror-nonmatchingbracket { color: rgb(255, 34, 34); }

.cm-s-inner .CodeMirror-activeline-background { background: inherit; }

.CodeMirror { position: relative; overflow: hidden; }

.CodeMirror-scroll { height: 100%; outline: 0px; position: relative; box-sizing: content-box; background: inherit; }

.CodeMirror-sizer { position: relative; }

.CodeMirror-gutter-filler, .CodeMirror-hscrollbar, .CodeMirror-scrollbar-filler, .CodeMirror-vscrollbar { position: absolute; z-index: 6; display: none; outline: 0px; }

.CodeMirror-vscrollbar { right: 0px; top: 0px; overflow: hidden; }

.CodeMirror-hscrollbar { bottom: 0px; left: 0px; overflow: auto hidden; }

.CodeMirror-scrollbar-filler { right: 0px; bottom: 0px; }

.CodeMirror-gutter-filler { left: 0px; bottom: 0px; }

.CodeMirror-gutters { position: absolute; left: 0px; top: 0px; padding-bottom: 10px; z-index: 3; overflow-y: hidden; }

.CodeMirror-gutter { white-space: normal; height: 100%; box-sizing: content-box; padding-bottom: 30px; margin-bottom: -32px; display: inline-block; }

.CodeMirror-gutter-wrapper { position: absolute; z-index: 4; background: 0px 0px !important; border: none !important; }

.CodeMirror-gutter-background { position: absolute; top: 0px; bottom: 0px; z-index: 4; }

.CodeMirror-gutter-elt { position: absolute; cursor: default; z-index: 4; }

.CodeMirror-lines { cursor: text; }

.CodeMirror pre { border-radius: 0px; border-width: 0px; background: 0px 0px; font-family: inherit; font-size: inherit; margin: 0px; white-space: pre; overflow-wrap: normal; color: inherit; z-index: 2; position: relative; overflow: visible; }

.CodeMirror-wrap pre { overflow-wrap: break-word; white-space: pre-wrap; word-break: normal; }

.CodeMirror-code pre { border-right: 30px solid transparent; width: fit-content; }

.CodeMirror-wrap .CodeMirror-code pre { border-right: none; width: auto; }

.CodeMirror-linebackground { position: absolute; inset: 0px; z-index: 0; }

.CodeMirror-linewidget { position: relative; z-index: 2; overflow: auto; }

.CodeMirror-wrap .CodeMirror-scroll { overflow-x: hidden; }

.CodeMirror-measure { position: absolute; width: 100%; height: 0px; overflow: hidden; visibility: hidden; }

.CodeMirror-measure pre { position: static; }

.CodeMirror div.CodeMirror-cursor { position: absolute; visibility: hidden; border-right: none; width: 0px; }

.CodeMirror div.CodeMirror-cursor { visibility: hidden; }

.CodeMirror-focused div.CodeMirror-cursor { visibility: inherit; }

.cm-searching { background: rgba(255, 255, 0, 0.4); }

span.cm-underlined { text-decoration: underline; }

span.cm-strikethrough { text-decoration: line-through; }

.cm-tw-syntaxerror { color: rgb(255, 255, 255); background-color: rgb(153, 0, 0); }

.cm-tw-deleted { text-decoration: line-through; }

.cm-tw-header5 { font-weight: 700; }

.cm-tw-listitem:first-child { padding-left: 10px; }

.cm-tw-box { border-style: solid; border-right-width: 1px; border-bottom-width: 1px; border-left-width: 1px; border-color: inherit; border-top-width: 0px !important; }

.cm-tw-underline { text-decoration: underline; }

@media print {

.CodeMirror div.CodeMirror-cursor { visibility: hidden; }

}

:root {

--side-bar-bg-color: #fafafa;

--control-text-color: #777;

}

@include-when-export url(https://fonts.loli.net/css?family=Open+Sans:400italic,700italic,700,400&subset=latin,latin-ext);

/* open-sans-italic - latin-ext_latin */

/* open-sans-700 - latin-ext_latin */

/* open-sans-700italic - latin-ext_latin */

html {

font-size: 16px;

-webkit-font-smoothing: antialiased;

}

body {

font-family: "Open Sans","Clear Sans", "Helvetica Neue", Helvetica, Arial, 'Segoe UI Emoji', sans-serif;

color: rgb(51, 51, 51);

line-height: 1.6;

}

#write {

max-width: 860px;

margin: 0 auto;

padding: 30px;

padding-bottom: 100px;

}

@media only screen and (min-width: 1400px) {

#write {

max-width: 1024px;

}

}

@media only screen and (min-width: 1800px) {

#write {

max-width: 1200px;

}

}

#write > ul:first-child,

#write > ol:first-child{

margin-top: 30px;

}

a {

color: #4183C4;

}

h6 {

position: relative;

margin-top: 1rem;

margin-bottom: 1rem;

font-weight: bold;

line-height: 1.4;

cursor: text;

}

h1:hover a.anchor,

h2:hover a.anchor,

h3:hover a.anchor,

h4:hover a.anchor,

h5:hover a.anchor,

h6:hover a.anchor {

text-decoration: none;

}

h1 tt,

h1 code {

font-size: inherit;

}

h2 tt,

h2 code {

font-size: inherit;

}

h3 tt,

h3 code {

font-size: inherit;

}

h4 tt,

h4 code {

font-size: inherit;

}

h5 tt,

h5 code {

font-size: inherit;

}

h6 tt,

h6 code {

font-size: inherit;

}

h1 {

font-size: 2.25em;

line-height: 1.2;

border-bottom: 1px solid #eee;

}

h2 {

font-size: 1.75em;

line-height: 1.225;

border-bottom: 1px solid #eee;

}

h3 {

font-size: 1.5em;

line-height: 1.43;

}

h4 {

font-size: 1.25em;

}

h5 {

font-size: 1em;

}

h6 {

font-size: 1em;

color: #777;

}

table{

margin: 0.8em 0;

}

li>ul {

margin: 0 0;

}

hr {

height: 2px;

padding: 0;

margin: 16px 0;

background-color: #e7e7e7;

border: 0 none;

overflow: hidden;

box-sizing: content-box;

}

li p.first {

display: inline-block;

}

ol {

padding-left: 30px;

}

ol:first-child {

margin-top: 0;

}

ol:last-child {

margin-bottom: 0;

}

blockquote {

border-left: 4px solid #dfe2e5;

padding: 0 15px;

color: #777777;

}

blockquote blockquote {

padding-right: 0;

}

table {

padding: 0;

word-break: initial;

}

table tr {

border: 1px solid #dfe2e5;

margin: 0;

padding: 0;

}

table tr:nth-child(2n),

thead {

background-color: #f8f8f8;

}

table th {

font-weight: bold;

border: 1px solid #dfe2e5;

border-bottom: 0;

margin: 0;

padding: 6px 13px;

}

table td {

border: 1px solid #dfe2e5;

margin: 0;

padding: 6px 13px;

}

table th:first-child,

table td:first-child {

margin-top: 0;

}

table th:last-child,

table td:last-child {

margin-bottom: 0;

}

.CodeMirror-lines {

padding-left: 4px;

}

.code-tooltip {

box-shadow: 0 1px 1px 0 rgba(0,28,36,.3);

border-top: 1px solid #eef2f2;

}

.md-fences,

tt {

border: 1px solid #e7eaed;

background-color: #f8f8f8;

border-radius: 3px;

padding: 0;

padding: 2px 4px 0px 4px;

font-size: 0.9em;

}

code {

background-color: #f3f4f4;

padding: 0 2px 0 2px;

}

.md-fences {

margin-bottom: 15px;

margin-top: 15px;

padding-top: 8px;

padding-bottom: 6px;

}

.md-task-list-item > input {

margin-left: -1.3em;

}

@media print {

html {

font-size: 13px;

}

table,

pre {

page-break-inside: avoid;

}

pre {

word-wrap: break-word;

}

}

.md-fences {

background-color: #f8f8f8;

}

#write pre.md-meta-block {

padding: 1rem;

font-size: 85%;

line-height: 1.45;

background-color: #f7f7f7;

border: 0;

border-radius: 3px;

color: #777777;

margin-top: 0 !important;

}

.mathjax-block>.code-tooltip {

bottom: .375rem;

}

.md-mathjax-midline {

background: #fafafa;

}

#write>h3.md-focus:before{

left: -1.5625rem;

top: .375rem;

}

#write>h4.md-focus:before{

left: -1.5625rem;

top: .285714286rem;

}

#write>h5.md-focus:before{

left: -1.5625rem;

top: .285714286rem;

}

#write>h6.md-focus:before{

left: -1.5625rem;

top: .285714286rem;

}

.md-image>.md-meta {

/*border: 1px solid #ddd;*/

border-radius: 3px;

padding: 2px 0px 0px 4px;

font-size: 0.9em;

color: inherit;

}

.md-tag {

color: #a7a7a7;

opacity: 1;

}

.md-toc {

margin-top:20px;

padding-bottom:20px;

}

.sidebar-tabs {

border-bottom: none;

}

#typora-quick-open {

border: 1px solid #ddd;

background-color: #f8f8f8;

}

#typora-quick-open-item {

background-color: #FAFAFA;

border-color: #FEFEFE #e5e5e5 #e5e5e5 #eee;

border-style: solid;

border-width: 1px;

}

.on-focus-mode blockquote {

border-left-color: rgba(85, 85, 85, 0.12);

}

header, .context-menu, .megamenu-content, footer{

font-family: "Segoe UI", "Arial", sans-serif;

}

.file-node-content:hover .file-node-icon,

.file-node-content:hover .file-node-open-state{

visibility: visible;

}

.mac-seamless-mode #typora-sidebar {

background-color: #fafafa;

background-color: var(--side-bar-bg-color);

}

.md-lang {

color: #b4654d;

}

#md-notification .btn {

border: 0;

}

.dropdown-menu .divider {

border-color: #e5e5e5;

opacity: 0.4;

}

.ty-preferences .window-content {

background-color: #fafafa;

}

.ty-preferences .nav-group-item.active {

color: white;

background: #999;

}

.menu-item-container a.menu-style-btn {

background-color: #f5f8fa;

background-image: linear-gradient( 180deg , hsla(0, 0%, 100%, 0.8), hsla(0, 0%, 100%, 0));

}

</style><title>VERSION</title>

<body class='typora-export os-windows'><div class='typora-export-content'>

<div id='write' class=''><h1 id='version-management-using-git'><span>Version management using Git</span></h1><h2 id='version-labelling'><span>Version labelling</span></h2><p><span>There are many approaches that have been used to identify versions, for examples read the Wikipedia page </span><a href='https://en.wikipedia.org/wiki/Software_versioning'><span>Software versioning</span></a><span>.</span></p><p><span>Whilst each has its merits, most are more complex that I required, so I have created a simple version labelling approach for my own developments, for which I have written scripts that support auto generation of the label using git information.</span></p><p><span>The label has the form</span></p><p><span>Major.Minor.CommitCount[qualifier]</span><span>[</span><span>-branch]</span></p><figure><table><thead><tr><th><span>Component</span></th><th><span>Notes</span></th></tr></thead><tbody><tr><td><span>Major.Minor</span></td><td><span>This comes from a Git tag. See below for additional information</span></td></tr><tr><td><span>CommitCount</span></td><td><span>This is the number of git commits for the current application since the Git tag.</span><br><strong><span>Warning:</span></strong><span> Comparing versions across branches is not reliable because the commit count reflects commits relevant to the current branch. Merging will account for the additional commits from the branch.</span><br><strong><span>version.cmd</span></strong><span> has a commented out code option to make CommitCount take into account commits on all branches. Although fine for local use, when using a remote repository, unless all branches are shared, this will give different results</span></td></tr><tr><td><span>qualifier</span></td><td><span>Is only present in two cases</span><br><span>+ - if the version contains pre-committed files</span><br><span>x - this is used when git is not available i.e. untracked files</span><br><span>Note this changed from .P and .X on 22-Aug-2021</span></td></tr><tr><td><span>branch</span></td><td><span>This is present if the version is not on the master/main branch.</span><br><span>Note headless versions have the branch name HEAD</span></td></tr></tbody></table></figure><figure><table><thead><tr><th><span>Example</span></th><th><span>Meaning</span></th></tr></thead><tbody><tr><td><span>1.2.0</span></td><td><span>Built using a tagged Git version 1.2 on the master/main branch</span></td></tr><tr><td><span>1.2.4</span></td><td><span>Built using source which is 4 commits after 1.2.0 on the master/main branch</span></td></tr><tr><td><span>1.2.4+</span></td><td><span>Build using same base sources as 1.2.4 but has some modified / additional files, not yet committed to Git - on the master/main branch</span></td></tr><tr><td><span>1.2.5-dev</span></td><td><span>Built using source which is 5 commits after 1.2.0 on the dev branch</span></td></tr><tr><td><span>1.2.5x-dev</span></td><td><span>Same as 1.2.5-dev above but has some modified / additional files, not yet uncommitted to Git - on the dev branch</span></td></tr><tr><td><span>1.2.0x</span></td><td><span>Built with files outside Git management, originally based on 1.2.0 sources</span></td></tr></tbody></table></figure><p><span>Note within windows resource files the file version is only displayed for numeric values. In this case the qualifier and branch are collapsed into a single digit.</span></p><p><span>0 -&gt; normal build</span></p><p><span>1 -&gt; build with uncommitted files</span></p><p><span>untracked and branch builds have the file version set to 0.0.0.0.</span></p><h2 id='generating-version-from-git'><span>Generating version from Git</span></h2><p><span>In many of my projects I use a Visual Studio solution file that contains multiple project files. A challenge on many of the approaches I considered and partially implemented, was how to track different versions of each of the projects. Some of the options I considered are:</span></p><ul><li><span>Using submodules in git. Possible but makes management of the Visual Studio sub projects challenging and adds many git repositories and complexity to support standalone and Visual Studio solution builds.</span></li><li><span>Using subtrees. Considered but has additional overhead to manage</span></li><li><span>Using subgit. See </span><a href='https://gist.github.com/rustyio/285365'><span>subgit repository</span></a><span> for details. I did implement this in a windows batch file and although it works, it has similar problems to the submodules approach.</span></li></ul><p><span>The approach I chose was to keep the files in a solution together but to add a prefix to tags relating to a specific project. This allows me to track separate version numbers for each project.</span></p><h3 id='git-tag'><span>Git tag</span></h3><p><span>The tags used in Git have the form</span></p><p><span>[appid-]Major.Minor</span></p><figure><table><thead><tr><th><span>Component</span></th><th><span>Description</span></th></tr></thead><tbody><tr><td><span>appid</span></td><td><span>This is the project prefix. It can be omitted if the feature isn&#39;t required/applicable</span></td></tr><tr><td><span>Major</span></td><td><span>This is a number reflecting major changes in the project. e.g. a major change to the way an application works internally</span></td></tr><tr><td><span>Minor</span></td><td><span>This is a number representing smaller but significant changes in the project. e.g. a new functional feature c.f. cosmetic changes and fixes</span></td></tr></tbody></table></figure><p><span>To help manage the creation of tags, I have written a utility </span><strong><span>release.cmd</span></strong><span> (a windows batch file) that will generate the next minor or major tag. In addition it will create a version.in file that contains default version information to allow builds outside Git management. If there is an existing version.in file it is used to automatically pick up the appid.</span></p><p><span>Note there is an implied Git Tag of [app-id-]0.0 for the start of the project development.</span></p><h3 id='versioncmd'><span>version.cmd</span></h3><p><span>The batch file </span><strong><span>verison.cmd</span></strong><span> managed the generation of the version information from Git. It can be invoked in two modes</span></p><ol start='' ><li><span>version [options]</span></li><li><span>version [options] cacheDir versionFile</span></li></ol><p><span>options are</span></p><p><strong><span>-h</span></strong><span> shows a simple summary of how to use the script</span></p><p><strong><span>-q</span></strong><span> don&#39;t show the version information to the console</span></p><p><strong><span>-f</span></strong><span> override the use of the cached information</span></p><p><strong><span>-a appid</span></strong><span> sets the appid to use. An appid of . is replaced by the current directory name. The value overrides any existing name in version.in</span></p><p><span>Mode 1 will calculate the version and show the information on the console. This can also be used to get version information for any directory tree, which is potentially useful for none build situations; the </span><strong><span>-a appid</span></strong><span> option may also be useful in this case.</span></p><p><span>Mode 2 will generate a version file for use during the application build. The cacheDir has a file which records the previous version generated. When the script is invoked, if version hasn&#39;t changed the version file is not written. This helps optimise the build process if the version hasn&#39;t changed.</span></p><p><span>Note if the versionFile ends in .cs, then a C# VersionAssembly file is created rather than a C/C++ include file.</span></p><h3 id='how-it-works'><span>How it works</span></h3><p><span>A number of ideas for the tool came from </span><a href='https://github.com/Thell/git-vs-versioninfo-gen/blob/master/GIT-VS-VERSION-GEN.bat'><span>GIT-VS-VERSION-GEN.bat</span></a><span>, however there are significant differences in the implementation.</span></p><p><span>The following are the key steps in deriving the version information</span></p><ol start='' ><li><p><span>If the file version.in exists in the current directory, parse it to load in default values, but in particular get the appid (</span><strong><span>GIT_APPID</span></strong><span>) if there is one.</span>

<span>Note the command line </span><strong><span>-a appid</span></strong><span> option will override this.</span></p></li><li><p><span>Get the current branch (</span><strong><span>GIT_BRANCH</span></strong><span>) and test if there are any uncommitted files for the current directory tree and set </span><strong><span>GIT_QUALIFIER</span></strong><span> to </span><strong><span>.P</span></strong><span> if there are. </span><strong><span>GIT_BUILDTYPE</span></strong><span> is set to </span><strong><span>2</span></strong><span> if uncommitted files else if </span><strong><span>GIT_BRANCH</span></strong><span> is not &#39;master&#39; or &#39;main&#39; set to 1 else set to 0</span></p></li><li><p><span>If there is no branch, then git cannot be used. </span></p><ul><li><span>if file version.in does not then report an error and exit</span></li><li><span>In mode 2, copy file version.in to versionFile and delete the cache file</span></li><li><span>in mode 1 or mode 2 without the --quiet option copy, populate version information using the defaults from step 1 and continue at step 13</span></li></ul></li><li><p><span>if </span><strong><span>GIT_BRANCH</span></strong><span> not equal to &#39;master&#39; or &#39;main&#39; add </span><strong><span>-GIT_BRANCH</span></strong><span> to the </span><strong><span>GIT_QUALIFIER</span></strong></p></li><li><p><span>The commit hash (</span><strong><span>GIT_SHA1</span></strong><span>) and commit time (</span><strong><span>GIT_CTIME</span></strong><span>) for the most recent commit in relevant to the current directory are obtained from Git</span></p></li><li><p><span>Git is used to obtain the highest versioned tag (</span><strong><span>strTAG</span></strong><span>) matching </span><strong><span>GIT_APPID-</span></strong><span>[</span><span>0-9</span><span>]</span><span>*</span><span>.</span><span>*</span><span>[</span><span>0-9] which is on the path to the commit </span><strong><span>GIT_SHA1</span></strong><span>. Note the </span><strong><span>GIT_APPID-</span></strong><span> is omitted if there is no </span><strong><span>GIT_APPID</span></strong><span>. See note at end on the implications of this.</span></p></li><li><p><span>The count of commits (</span><strong><span>GIT_COMMITS</span></strong><span>) from this tag to the commit identified in step 4 are obtained from Git. If no tag was found then the count is from the project&#39;s first commit</span>