dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Docs update and font size fixes

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@7303 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2021-08-25 17:36:17 +00:00
parent 2a7c5d5115
commit 88a3b2c668
17 changed files with 157 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

36
Contrib/InstallOptions/Readme.html
View file

@ -3,20 +3,25 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>InstallOptions 2</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<style type="text/css">
/*<![CDATA[*/body
/*<![CDATA[*/
html, body { font-family: Verdana, Arial, Helvetica, sans-serif; color: #000000; background-color: #ffffff; }
html { font-size: 0.80em; }
body { font-size: 1em; font-size: 1rem; }
pre, code { font-family: Courier New, Courier, monospace,serif; font-size: 100%; }
body
{
padding: 10px;
padding:1.5em 0; margin:0;
background-color: #F0F0F0;
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 13px;
font-weight: normal;
text-align: left;
}
p, li
{
font-size: 13px;
font-size: 100%;
}
.center
{
@ -25,12 +30,13 @@
table
{
margin: auto;
font-size: 13px;
font-size: 100%;
background-color: #FFFFFF;
}
.maintable
{
border: 2px solid #376EAB;
width: 90%;
}
.parameter
{
@ -39,31 +45,27 @@
}
h1
{
font-size: 30px;
font-size: 140%;
color: #333333;
font-weight: normal;
text-align: center;
margin-top: 20px;
margin-top: 1.5em;
}
h2
{
font-size: 20px;
font-size: 130%;
color: #7A7272;
font-weight: normal;
}
h3
{
font-size: 17px;
font-size: 120%;
font-weight: bold;
color: #303030;
}
pre
{
font-size: 13px;
}
div
{
margin: 20px;
margin: 1.1em;
}
a:link, a:visited, a:active
{
@ -78,8 +80,8 @@
.subtable
{
border: 0px;
margin-left: 20px;
margin-right: 20px;
margin-left: 1.3em;
margin-right: 1.3em;
}
.lefttable
{

28
Contrib/Modern UI 2/Readme.html
View file

@ -3,20 +3,25 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>NSIS Modern User Interface - Documentation</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<style type="text/css">
/*<![CDATA[*/body
/*<![CDATA[*/
html, body { font-family: Verdana, Arial, Helvetica, sans-serif; color: #000000; }
html { font-size: 0.80em; }
body { font-size: 1em; font-size: 1rem; }
pre, code { font-family: Courier New, Courier, monospace,serif; font-size: 100%; }
body
{
padding: 10px;
padding:1.5em 0; margin:0;
background-color: #F0F0F0;
font-size: 13px;
font-family: Verdana, Arial, Helvetica, sans-serif;
font-weight: normal;
text-align: justify;
}
p, li
{
font-size: 13px;
font-size: 100%;
}
table
{
@ -26,6 +31,7 @@
.maintable
{
border: 2px solid #376EAB;
width: 90%;
}
.parameter
{
@ -34,29 +40,25 @@
}
h1
{
font-size: 20px;
font-size: 140%;
color: #7A7272;
font-weight: normal;
}
h2
{
font-size: 17px;
font-size: 130%;
font-weight: bold;
color: #303030;
}
h3
{
font-size: 14px;
font-size: 120%;
font-weight: bold;
color: #2B5885;
}
pre
{
font-size: 13px;
}
div
{
margin: 20px;
margin: 1.1em;
}
div.settings
{

28
Contrib/Modern UI/Readme.html
View file

@ -3,20 +3,25 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>NSIS Modern User Interface - Documentation</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<style type="text/css">
/*<![CDATA[*/body
/*<![CDATA[*/
html, body { font-family: Verdana, Arial, Helvetica, sans-serif; color: #000000; }
html { font-size: 0.80em; }
body { font-size: 1em; font-size: 1rem; }
pre, code { font-family: Courier New, Courier, monospace,serif; font-size: 100%; }
body
{
padding: 10px;
padding:1.5em 0; margin:0;
background-color: #F0F0F0;
font-size: 13px;
font-family: Verdana, Arial, Helvetica, sans-serif;
font-weight: normal;
text-align: justify;
}
p, li
{
font-size: 13px;
font-size: 100%;
}
table
{
@ -26,6 +31,7 @@
.maintable
{
border: 2px solid #376EAB;
width: 90%;
}
.parameter
{
@ -34,29 +40,25 @@
}
h1
{
font-size: 20px;
font-size: 140%;
color: #7A7272;
font-weight: normal;
}
h2
{
font-size: 17px;
font-size: 130%;
font-weight: bold;
color: #303030;
}
h3
{
font-size: 14px;
font-size: 120%;
font-weight: bold;
color: #2B5885;
}
pre
{
font-size: 13px;
}
div
{
margin: 20px;
margin: 1.1em;
}
div.settings
{

21
Contrib/MultiUser/Readme.html
View file

@ -2,17 +2,18 @@
<html>
<head>
<title>Multi-User Header File (MultiUser.nsh)</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<style type="text/css">
body { background-color: #fefefe; color: #050505; }
code { background-color: #f6f6f6; }
pre { background-color: inherit; }
td
{
padding: 5px;
vertical-align: top;
border-bottom: 1px solid black;
}
html, body { font-family: Verdana, Arial, Helvetica, sans-serif; font-weight: normal; background-color: #fefefe; color: #050505; }
html { font-size: 0.9em; }
body { font-size: 1em; font-size: 1rem; }
pre, code { font-family: Courier New, Courier, monospace,serif; font-size: 100%; }
code { background-color: #f6f6f6; }
pre { background-color: inherit; }
tr:nth-child(odd) { background-color: #fafafa; }
table, tr, td { border: 1px solid #dddddd; border-collapse: collapse; }
td { padding: 0.3em; vertical-align: top; }
</style>
</head>
<body>

15
Contrib/System/System.html
View file

@ -3,6 +3,21 @@
<head>
<title>NSIS System Plug-in</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<style type="text/css">
html, body { font-family: Verdana, Arial, Helvetica, sans-serif; color: #000000; background-color: #ffffff; }
html { font-size: 0.84em; }
body { font-size: 1em; font-size: 1rem; }
pre, code { font-family: Courier New, Courier, monospace,serif; font-size: 100%; }
h1 { font-size: 170%; }
h2 { font-size: 150%; }
h3 { font-size: 130%; }
h4 { font-size: 120%; }
h5 { font-size: 115%; }
h6 { font-size: 110%; }
blockquote { margin:0; padding:0; margin-left: 0.5em; }
blockquote pre { background-color: #fefefe; }
</style>
</head>
<body>
<h1>NSIS System Plug-in</h1>

42
Contrib/VPatch/Readme.html
View file

@ -3,23 +3,33 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>VPatch 3</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<style type="text/css">
/*<![CDATA[*/
html, body { font-family: Verdana, Arial, Helvetica, sans-serif; color: #000000; background-color: #ffffff; }
html { font-size: 0.84em; }
body { font-size: 1em; font-size: 1rem; }
pre, code { font-family: Courier New, Courier, monospace,serif; font-size: 100%; }
h1 { font-size: 170%; }
h2 { font-size: 150%; }
h3 { font-size: 130%; }
h4 { font-size: 120%; }
h5 { font-size: 115%; }
h6 { font-size: 110%; }
body
{
padding: 10px;
padding:1.5em 0; margin:0;
background-color: #F0F0F0;
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 13px;
font-weight: normal;
text-align: left;
}
p, li
{
font-size: 13px;
font-size: 1em;
}
.center
@ -30,13 +40,14 @@ p, li
table
{
margin: auto;
font-size: 13px;
font-size: 1em;
background-color: #FFFFFF;
}
.maintable
{
border: 2px solid #376EAB;
width: 90%;
}
.parameter
@ -48,34 +59,30 @@ table
h1
{
font-size: 30px;
font-size: 250%;
color: #333333;
font-weight: normal;
text-align: center;
margin-top: 20px;
margin-top: 2em;
}
h2
{
font-size: 20px;
font-size: 150%;
color: #7A7272;
font-weight: normal;
}
h3
{
font-size: 17px;
font-size: 130%;
font-weight: bold;
color: #303030;
}
pre {
font-size: 13px;
}
div
{
margin: 20px;
margin: 1.5em;
}
a:link, a:visited, a:active
@ -89,6 +96,9 @@ a:hover
color: #182634;
text-decoration: underline;
}
.T tr:nth-child(odd) { background-color: #fafafa; }
.T tr, .T td { border: 1px solid #f2f2f2; border-collapse: collapse; padding: 0.2em; }
/*]]>*/
</style>
@ -167,9 +177,9 @@ vpatch::vpatchfile "patch.pat" "oldfile.txt" "temporary_newfile.txt"
the DOS period) can be returned by GenPat. GenPat will return an
exit code based on success of the patch generation. Here is a list
of the possible exit codes:</p>
<table width="547" border="0" cellspacing="0" cellpadding="0">
<table border="0" cellspacing="0" cellpadding="0" class="T">
<tr>
<td><b>Exit code</b></td>
<td nowrap><b>Exit code</b></td>
<td><b>Description</b></td>
</tr>
<tr>

16
Contrib/nsDialogs/Readme.html
View file

@ -2,13 +2,17 @@
<html>
<head>
<title>nsDialogs</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<style type="text/css">
body { color: #000000; background-color: #ffffff; }
b { color: red; }
code { margin-left: 1.2em; padding: 0.5em; background-color: #f0f0f0; display:inline-block; font-family: monospace, serif, Courier; font-size:95%; }
span.inlcod i { padding: 0px 0.2em; color: #444444; font-family: monospace, serif, Courier; font-style: normal; font-size:90%; }
blockquote pre { background-color: #fcfcfc; font-family: monospace, serif, Courier; font-size:95%; }
html, body { font-family: Verdana, Arial, Helvetica, sans-serif; color: #000000; background-color: #ffffff; }
html { font-size: 0.85em; }
body { font-size: 1em; font-size: 1rem; }
pre, code { font-family: Courier New, Courier, monospace,serif; font-size: 100%; }
b { color: #bb0000; }
code { margin-left: 1.2em; padding: 0.5em; background-color: #f0f0f0; display:inline-block; }
span.inlcod i { padding: 0px 0.2em; color: #444444; font-size:95%; }
blockquote pre { background-color: #fcfcfc; }
abbr { font-variant: none; cursor: help; }
</style>
</head>

4
Docs/src/bin/halibut/bk_xhtml.c
View file

@ -1436,7 +1436,9 @@ static void xhtml_doheader(FILE * fp, word * title)
fprintf(fp,
"\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n");
fprintf(fp,
"<html xmlns='http://www.w3.org/1999/xhtml'>\n\n<head>\n<title>");
"<html xmlns='http://www.w3.org/1999/xhtml'><head>\n" \
"<meta name=\"viewport\" content=\"width=device-width, initial-scale=1\">\n" \
"<title>");
if (title == NULL)
fprintf(fp, "Documentation");
else

3
Docs/src/compiler.but
View file

@ -144,6 +144,9 @@ This command will execute 'command' using a call to system(). You can store the
\c !ifdef something
\c !echo "something is defined"
\c !endif
\c !system 'attrib +H Secret.txt' = 0
\c !system 'ping localhost' ERRLVL
\c !echo "Ping returned ${ERRLVL}"
\S1{tempfile} !tempfile

1
Docs/src/generalpurpose.but
View file

@ -45,6 +45,7 @@ keyboard_shortcut should be in the form of 'flag|c' where flag can be a combinat
description should be the description of the shortcut, or comment as it is called under XP.
The error flag is set if the shortcut cannot be created (i.e. either of the paths (link or target) does not exist, or some other error).
\c CreateShortcut "$DESKTOP\My Program.lnk" "$INSTDIR\My Program.exe"
\c CreateDirectory "$SMPROGRAMS\My Company"
\c CreateShortcut "$SMPROGRAMS\My Company\My Program.lnk" "$INSTDIR\My Program.exe" \
\c "some command line parameters" "$INSTDIR\My Program.exe" 2 SW_SHOWNORMAL \

6
Docs/src/intro.but
View file

@ -13,8 +13,6 @@ Because it's based on script files you can fully control every part of your inst
The scripting language supports variables, functions and string manipulation, just like a normal programming language - but designed for the creation of installers.
Even with all these features, NSIS is still the smallest installer system available. With the default options, it has an overhead of only 34 KB.
With NSIS 3 you can also create \R{intro-unicode}{Unicode installers}, targeting all the languages supported by the OS without display issues.
\H{intro-features} Main Features
\\<b\\>Small overhead size\\</b\\>
@ -31,11 +29,11 @@ You can choose between three different integrated compression methods (ZLib, BZi
\\<b\\>Script based\\</b\\>
Unlike other systems that can only generate installers based on a list of files and registry keys, NSIS has a powerful scripting language. This script language is designed for installers and has commands that help you to perform many installation tasks. You can easily add custom logic and handle different upgrades, version checks and more. On the \W{https://nsis.sourceforge.io/wiki/}{NSIS Wiki} you can find a lot more.
Unlike other systems that can only generate installers based on a list of files and registry keys, NSIS has a powerful \R{tutscriptfiles}{scripting language}. This script language is designed for installers and has commands that help you to perform many installation tasks. You can easily add custom logic and handle different upgrades, version checks and more. On the \W{https://nsis.sourceforge.io/wiki/}{NSIS Wiki} you can find a lot more.
\\<b\\>Multiple languages in one installer\\</b\\>
One installer can support multiple interface languages. More than 60 translations are already included and you can also create your own language files. RTL (right-to-left) languages such as Arabic and Hebrew are fully supported. Creating a Unicode native installer is also possible for even more supported languages.
One installer can support multiple interface languages. More than 60 translations are already included and you can also create your own language files. RTL (right-to-left) languages such as Arabic and Hebrew are fully supported. Creating a \R{intro-unicode}{Unicode native installer} is also possible, targeting all the languages supported by the OS without display issues.
\\<b\\>Many features and checks for the target system\\</b\\>

14
Docs/src/script.but
View file

@ -92,6 +92,20 @@ Line extension for long commands works for comments as well. It can be a bit con
\c # A comment \
\c still a comment here...
\\<b\\>Compiler Commands\\</b\\>
Compiler commands start with a ! and are executed at compile time.
\c !define MESSAGE "Hello"
\c
\c !ifdef MESSAGE
\c MessageBox MB_OK "${MESSAGE}"
\c !else
\c !error "MESSAGE not defined, cannot continue!"
\c !endif
\R{comptime}{More information...}
\\<b\\>Configuration file\\</b\\>
If a file named "nsisconf.nsh" in the config directory exists, it will be included by default before any scripts (unless the /NOCONFIG command line parameter is used). The config directory on Windows is the same directory as makensis.exe is in. On other platforms this is set at install time and defaults to $PREFIX/etc/. You can alter this at runtime, see \k{usageenvironment} for more information.

2
Docs/src/stack.but
View file

@ -1,5 +1,7 @@
\S1{stackinst} Stack Support
The stack is a temporary storage area useful for saving the state of registers/variables and for communicating with functions and plug-ins. See \W{https://en.wikipedia.org/wiki/Stack_(abstract_data_type)}{Wikipedia} for a general introduction to stacks.
\S2{Exch} Exch
\c [user_var | stack_index]

4
Docs/src/var.but
View file

@ -61,11 +61,11 @@ Note that some of the new constants will not work on every OS. For example, $CDB
\e{$PROGRAMFILES}, \e{$PROGRAMFILES32}, \e{$PROGRAMFILES64}
The program files directory (usually \c{C:\\Program Files} but detected at runtime). On Windows x64, $PROGRAMFILES and $PROGRAMFILES32 point to \c{C:\\Program Files (x86)} while $PROGRAMFILES64 points to \c{C:\\Program Files}. Use $PROGRAMFILES64 when installing x64 applications.
The program files directory (usually \c{C:\\Program Files} but detected at runtime). On 64-bit Windows, $PROGRAMFILES and $PROGRAMFILES32 point to \c{C:\\Program Files (x86)} while $PROGRAMFILES64 points to \c{C:\\Program Files}. Use $PROGRAMFILES64 when installing 64-bit applications.
\e{$COMMONFILES}, \e{$COMMONFILES32}, \e{$COMMONFILES64}
The common files directory. This is a directory for components that are shared across applications (usually \c{C:\\Program Files\\Common Files} but detected at runtime). On Windows x64, $COMMONFILES and $COMMONFILES32 point to \c{C:\\Program Files (x86)\\Common Files} while $COMMONFILES64 points to \c{C:\\Program Files\\Common Files}. Use $COMMONFILES64 when installing x64 applications.
The common files directory. This is a directory for components that are shared across applications (usually \c{C:\\Program Files\\Common Files} but detected at runtime). On 64-bit Windows, $COMMONFILES and $COMMONFILES32 point to \c{C:\\Program Files (x86)\\Common Files} while $COMMONFILES64 points to \c{C:\\Program Files\\Common Files}. Use $COMMONFILES64 when installing 64-bit applications.
\e{$DESKTOP}

27
Docs/style.css
View file

@ -1,7 +1,7 @@
body {
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 0.8em;
}
html, body { font-family: Verdana, Arial, Helvetica, sans-serif; }
html { font-size: 0.8em; }
body { font-size: 1em; font-size: 1rem; }
p, li {
font-size: 100%;
}
@ -17,19 +17,26 @@ h3 {
h4 {
font-size: 120%;
}
h5 {
font-size: 115%;
}
h6 {
font-size: 110%;
}
pre, code {
font-family: Courier New, Courier, monospace,serif; /* code.iamkate.com/html-and-css/fixing-browsers-broken-monospace-font-handling/ */
}
code {
font-size: 100%;
}
pre {
font-family: Courier New, Courier, monospace,monospace;
font-size: 1.05em;
font-size: 100%;
background-color: #F7F7F7;
padding: 1px;
}
pre b {
text-decoration: underline;
}
code {
font-family: Courier New, Courier, monospace,monospace; /* code.iamkate.com/html-and-css/fixing-browsers-broken-monospace-font-handling/ */
font-size: 1em;
}
a {
color: #567599;
text-decoration: none;

2
Examples/example1.nsi
View file

@ -42,4 +42,4 @@ Section "" ;No components page, name is not important
; Put file there
File example1.nsi
SectionEnd ; end the section
SectionEnd

3
Examples/unicode.nsi
View file

@ -1,5 +1,4 @@
; Unicode is not enabled by default
; Unicode installers will not be able to run on Windows 9x!
; Unicode installers will not be able to run on Windows 9x!
Unicode true
Name "Unicode Games"