Skip to content

Commit c7130c6

Browse files
committed
build t2tdoc text output with utf-8 encoding
1 parent 17efc96 commit c7130c6

File tree

6 files changed

+18
-45
lines changed

6 files changed

+18
-45
lines changed

INSTALL

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
QGIS
22
Building QGIS from source - step by step
3-
Wednesday January 04, 2017
3+
Monday January 09, 2017
44

55

6-
Last Updated: Wednesday January 04, 2017
7-
Last Change : Tuesday December 27, 2016
6+
Last Updated: Monday January 09, 2017
7+
Last Change : Monday January 09, 2017
88

99

1010
1. Introduction

NEWS

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
QGIS News
22
Change history for the QGIS Project
3-
Monday November 07, 2016
3+
Monday January 09, 2017
44

55

66
------------------------------------------------------------------------
@@ -39,12 +39,12 @@ Monday November 07, 2016
3939
------------------------------------------------------------------------
4040

4141

42-
Last Updated: Monday November 07, 2016
43-
Last Change : Wednesday July 27, 2016
42+
Last Updated: Monday January 09, 2017
43+
Last Change : Sunday January 01, 2017
4444

4545

4646
1. What's new in Version 2.16 'Nødebo'?
47-
========================================
47+
=======================================
4848

4949
This release has following new features:
5050

@@ -94,7 +94,7 @@ This release has following new features:
9494
- Map Composer: Parameterized svg support for composer svg images
9595
- Map Composer: Easier use of HTML in labels
9696
- Map Composer: Relative links in composer labels
97-
- Map Composer: Georeference outputs (e.g., PDF) from composer
97+
- Map Composer: Georeference outputs (eg PDF) from composer
9898
- Map Composer: Composer maps now auto-update with presets
9999
- Analysis tools: Named parameters in expressions
100100
- Analysis tools: More distance units
@@ -908,7 +908,7 @@ as' option, you can now specify OGR creation options.
908908

909909

910910
15.3. Labeling (New generation only)
911-
=====================================
911+
====================================
912912

913913
- Data defined label position in labeling-ng.
914914
- Line wrapping, data defined font and buffer settings for labeling-ng.
@@ -1055,7 +1055,7 @@ we recommend that you use a copy of QGIS from our Long Term Support (LTS)1.0.x
10551055
release series. In all other cases we recommend that you use this version.
10561056

10571057
This release includes around 200 bug fixes, nearly 30 new features and has had
1058-
a lot of love and attention poured into it to take our favorite desktop GIS
1058+
a lot of love and attention poured in to it to take our favorite desktop GIS
10591059
application another step on the road to GIS nirvana! So much has happened in
10601060
the 3 months since our last release that it is impossible to document
10611061
everything here. Instead we will just highlight a couple of important new

cmake/Txt2Tags.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ MACRO(ADD_TXT2TAGS_FILES _sources)
4242
ADD_CUSTOM_COMMAND(
4343
OUTPUT ${_out}
4444
COMMAND ${TXT2TAGS_EXECUTABLE}
45-
ARGS -o${_out} -t txt ${_in}
45+
ARGS --encoding=utf-8 -o${_out} -t txt ${_in}
4646
DEPENDS ${_in}
4747
COMMENT "Building ${_out} from ${_in}"
4848
)

doc/INSTALL.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
66
<TITLE>QGIS</TITLE>
77

8-
<!-- Included style.css -->
8+
<!-- Included /home/fischer/src/qgis3/doc/style.css -->
99
<STYLE TYPE="text/css">
1010
body{ background: white;
1111
color: black;
@@ -77,13 +77,13 @@
7777
<DIV CLASS="header" ID="header">
7878
<H1>QGIS</H1>
7979
<H2>Building QGIS from source - step by step</H2>
80-
<H3>Wednesday January 04, 2017</H3>
80+
<H3>Monday January 09, 2017</H3>
8181
</DIV>
8282

8383
<DIV CLASS="body" ID="body">
8484
<P>
85-
Last Updated: Wednesday January 04, 2017
86-
Last Change : Tuesday December 27, 2016
85+
Last Updated: Monday January 09, 2017
86+
Last Change : Monday January 09, 2017
8787
</P>
8888
<DIV CLASS="toc">
8989

@@ -3063,5 +3063,5 @@ <H1>9. Authors and Acknowledgments</H1>
30633063

30643064
</DIV>
30653065
<!-- html code generated by txt2tags 2.6 (http://txt2tags.org) -->
3066-
<!-- cmdline: txt2tags -o INSTALL.html -t html INSTALL.t2t -->
3066+
<!-- cmdline: txt2tags -\-encoding=utf-8 -o/home/fischer/src/qgis3/debian/build-master-ninja/doc/INSTALL.html -t html /home/fischer/src/qgis3/doc/INSTALL.t2t -->
30673067
</BODY></HTML>

doc/INSTALL.t2t

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,8 @@ Building QGIS from source - step by step
5050
%apply vim formatting to the whole document as it screws up some formatting
5151
%rather apply it selectively to paragraphs where needed.
5252

53-
% To generate the text version of this document:
54-
% txt2tags -t txt -o INSTALL INSTALL.t2t
55-
% To generate the mediawiki version of this document:
56-
% txt2tags -t wiki --no-enum-title -o INSTALL.wiki INSTALL.t2t
57-
% To generate the html version of this document:
58-
% txt2tags -t html -o INSTALL.html INSTALL.t2t
59-
% To generate the LaTeX version of this document:
60-
% txt2tags -t tex -o INSTALL.tex INSTALL.t2t; pdflatex INSTALL.tex
53+
% To generate output fies from this document:
54+
% cmake --build $YOURBUILDDIR --target t2tdoc
6155

6256
% End of comments
6357
% -------------------

doc/build.sh

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)