Hello community, here is the log from the commit of package yodl for openSUSE:Factory checked in at 2019-12-29 15:48:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yodl (Old) and /work/SRC/openSUSE:Factory/.yodl.new.6675 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yodl" Sun Dec 29 15:48:39 2019 rev:35 rq:759303 version:4.02.02 Changes: -------- --- /work/SRC/openSUSE:Factory/yodl/yodl.changes 2019-09-30 15:53:05.254224404 +0200 +++ /work/SRC/openSUSE:Factory/.yodl.new.6675/yodl.changes 2019-12-29 15:48:52.719153827 +0100 @@ -1,0 +2,9 @@ +Thu Dec 19 11:37:43 UTC 2019 - [email protected] + +- version update to 4.02.02 + * Yodlverbinsert's -N option appends verb('s closing ) to the last line of + the verbatim text, preventing an extra blank line at the end. The + description of the verb(...) macro in yodlmacros(7) advises on how to + prevent extra blank lines when using the verb(...) macros in Yodl text. + +------------------------------------------------------------------- Old: ---- yodl-4.02.01.tar.gz New: ---- yodl-4.02.02.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yodl.spec ++++++ --- /var/tmp/diff_new_pack.2K9C0N/_old 2019-12-29 15:48:53.323154103 +0100 +++ /var/tmp/diff_new_pack.2K9C0N/_new 2019-12-29 15:48:53.323154103 +0100 @@ -1,7 +1,7 @@ # # spec file for package yodl # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,17 +12,17 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: yodl -Version: 4.02.01 +Version: 4.02.02 Release: 0 Summary: Yet One-other Document Language License: GPL-3.0-only Group: Development/Tools/Doc Generators -Url: https://fbb-git.gitlab.io/yodl/ +URL: https://fbb-git.gitlab.io/yodl/ Source: https://gitlab.com/fbb-git/yodl/-/archive/%{version}/yodl-%{version}.tar.gz Patch0: %{name}-doc-packages.patch BuildRequires: bison ++++++ yodl-4.02.01.tar.gz -> yodl-4.02.02.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yodl-4.02.01/yodl/VERSION new/yodl-4.02.02/yodl/VERSION --- old/yodl-4.02.01/yodl/VERSION 2018-06-25 11:32:47.000000000 +0200 +++ new/yodl-4.02.02/yodl/VERSION 2019-11-18 10:24:00.000000000 +0100 @@ -1,3 +1,3 @@ #define AUTHOR "Frank B. Brokken ([email protected]" -#define VERSION "4.02.01" -#define YEARS "1996-2018" +#define VERSION "4.02.02" +#define YEARS "1996-2019" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yodl-4.02.01/yodl/changelog new/yodl-4.02.02/yodl/changelog --- old/yodl-4.02.01/yodl/changelog 2018-06-25 11:32:47.000000000 +0200 +++ new/yodl-4.02.02/yodl/changelog 2019-11-18 10:24:00.000000000 +0100 @@ -1,3 +1,12 @@ +yodl (4.02.02) + + * Yodlverbinsert's -N option appends verb('s closing ) to the last line of + the verbatim text, preventing an extra blank line at the end. The + description of the verb(...) macro in yodlmacros(7) advises on how to + prevent extra blank lines when using the verb(...) macros in Yodl text. + + -- Frank B. Brokken <[email protected]> Mon, 18 Nov 2019 09:50:13 +0100 + yodl (4.02.01) * Migrated from Github to Gitlab diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yodl-4.02.01/yodl/macros/rawmacros/verb.raw new/yodl-4.02.02/yodl/macros/rawmacros/verb.raw --- old/yodl-4.02.01/yodl/macros/rawmacros/verb.raw 2018-06-25 11:32:47.000000000 +0200 +++ new/yodl-4.02.02/yodl/macros/rawmacros/verb.raw 2019-11-18 10:24:00.000000000 +0100 @@ -18,6 +18,14 @@ on the output, usually in a teletype font (that depends on the output format). This macro is for larger chunks, e.g., listings. + When starting the tt(verb+CHAR(40)) macro on a line by itself and writing the +closing parenthesis on a line by itself then those newlines also appear in the +resulting verbatim text. To omit those lines immediately start the first line +of text after tt(verb) and append the closing parenthesis to the last line of +verbatim text. E.g., + verb(verb( First line of indented literal text + Last line of indented literal text)) + When unbalanced parameter lists are required, use tt(CHAR(C)HAR(40)) to get tt(CHAR(40)) and tt(CHAR(C)HAR(41)) to get tt(CHAR(41)).) <> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yodl-4.02.01/yodl/man/yodlverbinsert.in new/yodl-4.02.02/yodl/man/yodlverbinsert.in --- old/yodl-4.02.01/yodl/man/yodlverbinsert.in 2018-06-25 11:32:47.000000000 +0200 +++ new/yodl-4.02.02/yodl/man/yodlverbinsert.in 2019-11-18 10:24:00.000000000 +0100 @@ -83,6 +83,10 @@ it() bf(-A)nl() Same as the tt(-a) option, but ignoring all lines that can be considered tt(yodlverbinsert) (end) marker-lines. + it() bf(-k)nl() + Keep the newlines after verb( and before ). These newlines result in extra +empty lines before the first and after the last source code lines. Starting +with version 4.02.00 these lines are removed by default. it() bf(-n)nl() Immediately following the indentation: lines are prefixed by numbers, occupying 2 columns, followed by a colon and a blank. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yodl-4.02.01/yodl/verbinsert/icmconf new/yodl-4.02.02/yodl/verbinsert/icmconf --- old/yodl-4.02.01/yodl/verbinsert/icmconf 2018-06-25 11:32:47.000000000 +0200 +++ new/yodl-4.02.02/yodl/verbinsert/icmconf 2019-11-18 10:24:00.000000000 +0100 @@ -10,13 +10,13 @@ #define USE_ECHO ON #define USE_VERSION #define CXX "g++" -#define CXXFLAGS " --std=c++17 -Wall -O2" \ +#define CXXFLAGS " --std=c++2a -Wall -O2" \ " -fdiagnostics-color=never " #define IH ".ih" //#define PRECOMP "-x c++-header" #define REFRESH #define LDFLAGS "" -#define ADD_LIBRARIES "stdc++fs" +#define ADD_LIBRARIES "" #define ADD_LIBRARY_PATHS "" #define DEFCOM "program" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yodl-4.02.01/yodl/verbinsert/main.ih new/yodl-4.02.02/yodl/verbinsert/main.ih --- old/yodl-4.02.01/yodl/verbinsert/main.ih 2018-06-25 11:32:47.000000000 +0200 +++ new/yodl-4.02.02/yodl/verbinsert/main.ih 2019-11-18 10:24:00.000000000 +0100 @@ -3,13 +3,13 @@ #include <iostream> #include <string> -#include <experimental/filesystem> +#include <filesystem> #include "line/line.h" #include "process/process.h" using namespace std; -namespace fs = experimental::filesystem; +namespace fs = filesystem; extern char const version[]; extern char const author[]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yodl-4.02.01/yodl/verbinsert/options.cc new/yodl-4.02.02/yodl/verbinsert/options.cc --- old/yodl-4.02.01/yodl/verbinsert/options.cc 2018-06-25 11:32:47.000000000 +0200 +++ new/yodl-4.02.02/yodl/verbinsert/options.cc 2019-11-18 10:24:00.000000000 +0100 @@ -13,7 +13,7 @@ { case 'A': line.ignore(); - [[fallthrough]] + [[fallthrough]]; case 'a': process.all(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yodl-4.02.01/yodl/verbinsert/out/destructor.cc new/yodl-4.02.02/yodl/verbinsert/out/destructor.cc --- old/yodl-4.02.01/yodl/verbinsert/out/destructor.cc 2018-06-25 11:32:47.000000000 +0200 +++ new/yodl-4.02.02/yodl/verbinsert/out/destructor.cc 2019-11-18 10:24:00.000000000 +0100 @@ -3,5 +3,13 @@ Out::~Out() { if (d_nLines) - cout << d_vindent << ")\n"; + { + if (d_verbEndl) + { + nl(); + cout << d_vindent; + } + + cout << ")\n"; + } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yodl-4.02.01/yodl/verbinsert/out/firstinsert.cc new/yodl-4.02.02/yodl/verbinsert/out/firstinsert.cc --- old/yodl-4.02.01/yodl/verbinsert/out/firstinsert.cc 2018-06-25 11:32:47.000000000 +0200 +++ new/yodl-4.02.02/yodl/verbinsert/out/firstinsert.cc 2019-11-18 10:24:00.000000000 +0100 @@ -2,7 +2,10 @@ void Out::firstInsert(std::string const &line) { - cout << d_vindent << "verb(" << d_verbEndl; + cout << d_vindent << "verb("; + + d_nl = d_verbEndl ? "\n" : ""; + d_insert = d_line; insert(line); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yodl-4.02.01/yodl/verbinsert/out/nl.cc new/yodl-4.02.02/yodl/verbinsert/out/nl.cc --- old/yodl-4.02.01/yodl/verbinsert/out/nl.cc 1970-01-01 01:00:00.000000000 +0100 +++ new/yodl-4.02.02/yodl/verbinsert/out/nl.cc 2019-11-18 10:24:00.000000000 +0100 @@ -0,0 +1,7 @@ +#include "out.ih" + +void Out::nl() +{ + cout << d_nl; + d_nl = "\n"; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yodl-4.02.01/yodl/verbinsert/out/numberedline.cc new/yodl-4.02.02/yodl/verbinsert/out/numberedline.cc --- old/yodl-4.02.01/yodl/verbinsert/out/numberedline.cc 2018-06-25 11:32:47.000000000 +0200 +++ new/yodl-4.02.02/yodl/verbinsert/out/numberedline.cc 2019-11-18 10:24:00.000000000 +0100 @@ -2,5 +2,6 @@ void Out::numberedLine(std::string const &line) { - cout << d_indent << setw(2) << ++d_number << ": " << line << '\n'; + nl(); + cout << d_indent << setw(2) << ++d_number << ": " << line; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yodl-4.02.01/yodl/verbinsert/out/out.h new/yodl-4.02.02/yodl/verbinsert/out/out.h --- old/yodl-4.02.01/yodl/verbinsert/out/out.h 2018-06-25 11:32:47.000000000 +0200 +++ new/yodl-4.02.02/yodl/verbinsert/out/out.h 2019-11-18 10:24:00.000000000 +0100 @@ -7,7 +7,13 @@ { std::string d_indent; // std. indentation std::string d_vindent; // verb( and closing ) indentation - char const *d_verbEndl = "\n"; // \n immediately after verb + +// char const *d_verbEndl = "\n"; // \n immediately after verb + bool d_verbEndl = true; // \n after verb( and before its + // closing ) + + char const *d_nl = "\n"; // nl is postponed till the next + size_t d_number = 0; // line numbers size_t d_nLines = 0; // # lines written @@ -34,6 +40,8 @@ size_t nLines() const; private: + void nl(); + void firstInsert(std::string const &line); void indent(std::string &target, size_t count, int ch); @@ -59,7 +67,7 @@ inline void Out::noVerbEndl() { - d_verbEndl = ""; + d_verbEndl = false; } inline void Out::numberLines() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yodl-4.02.01/yodl/verbinsert/out/plainline.cc new/yodl-4.02.02/yodl/verbinsert/out/plainline.cc --- old/yodl-4.02.01/yodl/verbinsert/out/plainline.cc 2018-06-25 11:32:47.000000000 +0200 +++ new/yodl-4.02.02/yodl/verbinsert/out/plainline.cc 2019-11-18 10:24:00.000000000 +0100 @@ -2,5 +2,6 @@ void Out::plainLine(std::string const &line) { - cout << d_indent << line << '\n'; + nl(); + cout << d_indent << line; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yodl-4.02.01/yodl/verbinsert/process/processall.cc new/yodl-4.02.02/yodl/verbinsert/process/processall.cc --- old/yodl-4.02.01/yodl/verbinsert/process/processall.cc 2018-06-25 11:32:47.000000000 +0200 +++ new/yodl-4.02.02/yodl/verbinsert/process/processall.cc 2019-11-18 10:24:00.000000000 +0100 @@ -26,7 +26,7 @@ nEmpty = 0; } d_out.insert(d_line.line()); - [[fallthrough]] + [[fallthrough]]; default: break;
