Skip to content
Permalink
Browse files

build t2tdoc text output with utf-8 encoding

  • Loading branch information
jef-n committed Jan 9, 2017
1 parent 17efc96 commit c7130c62813bb1ade2dd2539ce03b84b60475c0b
Showing with 18 additions and 45 deletions.
  1. +3 −3 INSTALL
  2. +7 −7 NEWS
  3. +1 −1 cmake/Txt2Tags.cmake
  4. +5 −5 doc/INSTALL.html
  5. +2 −8 doc/INSTALL.t2t
  6. +0 −21 doc/build.sh
@@ -1,10 +1,10 @@
QGIS
Building QGIS from source - step by step
Wednesday January 04, 2017
Monday January 09, 2017


Last Updated: Wednesday January 04, 2017
Last Change : Tuesday December 27, 2016
Last Updated: Monday January 09, 2017
Last Change : Monday January 09, 2017


1. Introduction
14 NEWS
@@ -1,6 +1,6 @@
QGIS News
Change history for the QGIS Project
Monday November 07, 2016
Monday January 09, 2017


------------------------------------------------------------------------
@@ -39,12 +39,12 @@ Monday November 07, 2016
------------------------------------------------------------------------


Last Updated: Monday November 07, 2016
Last Change : Wednesday July 27, 2016
Last Updated: Monday January 09, 2017
Last Change : Sunday January 01, 2017


1. What's new in Version 2.16 'Nødebo'?
========================================
=======================================

This release has following new features:

@@ -94,7 +94,7 @@ This release has following new features:
- Map Composer: Parameterized svg support for composer svg images
- Map Composer: Easier use of HTML in labels
- Map Composer: Relative links in composer labels
- Map Composer: Georeference outputs (e.g., PDF) from composer
- Map Composer: Georeference outputs (eg PDF) from composer

This comment has been minimized.

Copy link
@DelazJ

DelazJ Jan 10, 2017

Contributor

@jef-n are you sure about this change? Isn't QGIS supposed to be en-US compliant?

This comment has been minimized.

Copy link
@jef-n

jef-n Jan 10, 2017

Author Member

NEWS is generated from doc/news.t2t. ef85cdc should have been applied there.

This comment has been minimized.

Copy link
@DelazJ

This comment has been minimized.

Copy link
@DelazJ

DelazJ Jan 11, 2017

Contributor

fixed in #3859

- Map Composer: Composer maps now auto-update with presets
- Analysis tools: Named parameters in expressions
- Analysis tools: More distance units
@@ -908,7 +908,7 @@ as' option, you can now specify OGR creation options.


15.3. Labeling (New generation only)
=====================================
====================================

- Data defined label position in labeling-ng.
- 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
release series. In all other cases we recommend that you use this version.

This release includes around 200 bug fixes, nearly 30 new features and has had
a lot of love and attention poured into it to take our favorite desktop GIS
a lot of love and attention poured in to it to take our favorite desktop GIS

This comment has been minimized.

Copy link
@DelazJ

DelazJ Jan 10, 2017

Contributor

and this one?

application another step on the road to GIS nirvana! So much has happened in
the 3 months since our last release that it is impossible to document
everything here. Instead we will just highlight a couple of important new
@@ -42,7 +42,7 @@ MACRO(ADD_TXT2TAGS_FILES _sources)
ADD_CUSTOM_COMMAND(
OUTPUT ${_out}
COMMAND ${TXT2TAGS_EXECUTABLE}
ARGS -o${_out} -t txt ${_in}
ARGS --encoding=utf-8 -o${_out} -t txt ${_in}
DEPENDS ${_in}
COMMENT "Building ${_out} from ${_in}"
)
@@ -5,7 +5,7 @@
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
<TITLE>QGIS</TITLE>

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

<DIV CLASS="body" ID="body">
<P>
Last Updated: Wednesday January 04, 2017
Last Change : Tuesday December 27, 2016
Last Updated: Monday January 09, 2017
Last Change : Monday January 09, 2017
</P>
<DIV CLASS="toc">

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

</DIV>
<!-- html code generated by txt2tags 2.6 (http://txt2tags.org) -->
<!-- cmdline: txt2tags -o INSTALL.html -t html INSTALL.t2t -->
<!-- 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 -->
</BODY></HTML>
@@ -50,14 +50,8 @@ Building QGIS from source - step by step
%apply vim formatting to the whole document as it screws up some formatting
%rather apply it selectively to paragraphs where needed.

% To generate the text version of this document:
% txt2tags -t txt -o INSTALL INSTALL.t2t
% To generate the mediawiki version of this document:
% txt2tags -t wiki --no-enum-title -o INSTALL.wiki INSTALL.t2t
% To generate the html version of this document:
% txt2tags -t html -o INSTALL.html INSTALL.t2t
% To generate the LaTeX version of this document:
% txt2tags -t tex -o INSTALL.tex INSTALL.t2t; pdflatex INSTALL.tex
% To generate output fies from this document:
% cmake --build $YOURBUILDDIR --target t2tdoc

% End of comments
% -------------------

This file was deleted.

0 comments on commit c7130c6

Please sign in to comment.
You can’t perform that action at this time.