Hello community, here is the log from the commit of package yodl for openSUSE:Factory checked in at 2014-11-24 11:17:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yodl (Old) and /work/SRC/openSUSE:Factory/.yodl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yodl" Changes: -------- --- /work/SRC/openSUSE:Factory/yodl/yodl.changes 2013-11-28 16:54:22.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yodl.new/yodl.changes 2014-11-24 11:18:25.000000000 +0100 @@ -1,0 +2,11 @@ +Tue Nov 18 15:23:27 UTC 2014 - pgajdos@suse.com + +- updated to 3.04: + * The redef() and redefinemacro() descriptions missed the name of the macro + to be redefined: they require 3 instead of 2 args. + * The yodlverbinsert program is now C++, and supports -a: process all lines + and -n: prefix lines by numbers. Yodlverbinsert ignores initial and + trailing blank lines. + * Removed some compiler warnings. + +------------------------------------------------------------------- Old: ---- yodl_3.03.0.orig.tar.gz New: ---- yodl_3.04.00.orig.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yodl.spec ++++++ --- /var/tmp/diff_new_pack.lETnSD/_old 2014-11-24 11:18:26.000000000 +0100 +++ /var/tmp/diff_new_pack.lETnSD/_new 2014-11-24 11:18:26.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package yodl # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,6 +19,7 @@ Name: yodl BuildRequires: bison BuildRequires: flex +BuildRequires: gcc-c++ BuildRequires: grep BuildRequires: icmake BuildRequires: sed @@ -31,7 +32,7 @@ %else BuildRequires: texlive-bin %endif -Version: 3.03.0 +Version: 3.04.00 Release: 0 Summary: Yet One-other Document Language License: GPL-3.0 ++++++ yodl_3.03.0.orig.tar.gz -> yodl_3.04.00.orig.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yodl-3.03.0/INSTALL.im new/yodl-3.04.00/INSTALL.im --- old/yodl-3.03.0/INSTALL.im 2013-10-09 14:21:36.000000000 +0200 +++ new/yodl-3.04.00/INSTALL.im 2014-09-20 19:49:46.000000000 +0200 @@ -55,6 +55,9 @@ // particular version can be used. The distributed definition uses the // `default' compiler version. +string CXX; + // CXX specifies the C++ compiler to use. + //#define PROFILE "-pg" // Uncomment the above #define to construct a binary program that can be // used with the gprof profiler. When specified, no stripping is performed @@ -74,5 +77,9 @@ STD_INCLUDE = BASE + "/share/yodl"; COMPILER = "gcc"; + CXX = "g++"; } + + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yodl-3.03.0/VERSION new/yodl-3.04.00/VERSION --- old/yodl-3.03.0/VERSION 2013-10-09 14:21:36.000000000 +0200 +++ new/yodl-3.04.00/VERSION 2014-09-20 20:13:50.000000000 +0200 @@ -1,2 +1,2 @@ -#define VERSION "3.03.0" -#define YEARS "1996-2013" +#define VERSION "3.04.00" +#define YEARS "1996-2014" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yodl-3.03.0/changelog new/yodl-3.04.00/changelog --- old/yodl-3.03.0/changelog 2013-10-09 14:21:36.000000000 +0200 +++ new/yodl-3.04.00/changelog 2014-09-24 20:01:57.000000000 +0200 @@ -1,3 +1,19 @@ +yodl (3.04.00) + + * The redef() and redefinemacro() descriptions missed the name of the macro + to be redefined: they require 3 instead of 2 args. + +* The yodlverbinsert program is now C++, and supports -a: process all lines + and -n: prefix lines by numbers. Yodlverbinsert ignores initial and + trailing blank lines. + + * Removed some compiler warnings, among which a strange statement in + parser/pbeginnested.cc, where pp->d_insert was assigned a value within + the condition of a conditional assignment. See the difference between the + git-commit at Tue Sep 23 09:45:29 2014 +0200 and the next commit. + + -- Frank B. Brokken <f.b.brokken@rug.nl> Wed, 24 Sep 2014 20:01:42 +0200 + yodl (3.03.0) * Reorganized the macro-construction because of a persistent xlatin1.tex bug diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yodl-3.03.0/icmake/program new/yodl-3.04.00/icmake/program --- old/yodl-3.03.0/icmake/program 2013-10-09 14:21:36.000000000 +0200 +++ new/yodl-3.04.00/icmake/program 2014-09-20 20:08:50.000000000 +0200 @@ -24,8 +24,10 @@ void _programYodlverbinsert() { - run(COMPILER + " -o " + g_install + BIN + "/yodlverbinsert " + g_copt + - " src/verbinsert/verbinsert.c " + g_lopt); + if ("src/verbinsert/verbinsert.cc" younger + g_install + BIN + "/yodlverbinsert") + run(CXX + " --std=c++11 -o " + g_install + BIN + "/yodlverbinsert " + + g_copt + " src/verbinsert/verbinsert.cc " + g_lopt); } void program(string target) @@ -41,7 +43,16 @@ g_install + BIN + "/yodl2whatever " + g_install); - if (target == "yodlstriproff" || target == "yodl2whatever") + if (target == "programs" || target == "yodlverbinsert") + _programYodlverbinsert(); + + if ( + target == "yodlstriproff" + || + target == "yodl2whatever" + || + target == "yodlverbinsert" + ) return; compileRSS(); @@ -52,9 +63,6 @@ if (target == "programs" || target == "yodlpost") _programYodlpost(); - if (target == "programs" || target == "yodlverbinsert") - _programYodlverbinsert(); - } void programExit(string target, string strip) // build one program, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yodl-3.03.0/icmake/sf new/yodl-3.04.00/icmake/sf --- old/yodl-3.03.0/icmake/sf 2013-10-09 14:21:36.000000000 +0200 +++ new/yodl-3.04.00/icmake/sf 2013-10-09 17:29:48.000000000 +0200 @@ -4,7 +4,7 @@ manualMayExit(path, 0); // create the manual using the new progs putenv("YODL_BIN=" + g_cwd + g_install + BIN); - run("yodl2html -o ../sf/index.html -I.:tmp/install/usr/share/yodl " + run("yodl2html -o ../sf/index.html -I.:tmp/wip/macros " "../sf/index.yo"); exit(0); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yodl-3.03.0/icmake/stdcompile new/yodl-3.04.00/icmake/stdcompile --- old/yodl-3.03.0/icmake/stdcompile 2013-10-09 14:21:36.000000000 +0200 +++ new/yodl-3.04.00/icmake/stdcompile 2013-10-09 17:29:48.000000000 +0200 @@ -22,9 +22,3 @@ // make the library _static_library(oDstDir + "/*.o", library); } - - - - - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yodl-3.03.0/macros/rawmacros/redef.raw new/yodl-3.04.00/macros/rawmacros/redef.raw --- old/yodl-3.03.0/macros/rawmacros/redef.raw 2012-05-27 11:03:00.000000000 +0200 +++ new/yodl-3.04.00/macros/rawmacros/redef.raw 2014-08-26 11:51:11.000000000 +0200 @@ -1,5 +1,5 @@ <STARTDOC> -macro(redef(nrofargs)(redefinition)) +macro(redef(macro)(nrofargs)(redefinition)) (Defines macro tt(macro) to expand to tt(redefinition). Similar to tt(def), but any pre-existing definition is overruled. Use tt(ARG)em(x) in the redefinition part to indicate where the arguments should diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yodl-3.03.0/macros/rawmacros/redefinemacro.raw new/yodl-3.04.00/macros/rawmacros/redefinemacro.raw --- old/yodl-3.03.0/macros/rawmacros/redefinemacro.raw 2012-05-27 11:03:00.000000000 +0200 +++ new/yodl-3.04.00/macros/rawmacros/redefinemacro.raw 2014-08-26 11:51:07.000000000 +0200 @@ -1,5 +1,5 @@ <STARTDOC> -macro(redefinemacro(nrofargs)(redefinition)) +macro(redefinemacro(macro)(nrofargs)(redefinition)) (Defines macro tt(macro) to expand to tt(redefinition). Similar to tt(def), but any pre-existing definition is overruled. Use tt(ARG)em(x) in the redefinition part to indicate where the arguments should diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yodl-3.03.0/man/yodlverbinsert.in new/yodl-3.04.00/man/yodlverbinsert.in --- old/yodl-3.03.0/man/yodlverbinsert.in 2012-05-27 11:03:00.000000000 +0200 +++ new/yodl-3.04.00/man/yodlverbinsert.in 2014-09-23 20:44:08.000000000 +0200 @@ -26,7 +26,7 @@ manpagename(yodlverbinsert)(Generate verb-sections from parts of a file) manpagesynopsis() - bf(yodlverbinsert) [OPTIONS] tt(marker file) + bf(yodlverbinsert) [OPTIONS] tt([marker] file) manpagedescription() @@ -40,6 +40,8 @@ and the inserted file contents. Furthermore, an additional empty line may be inserted before the first line that is actually inserted. + Blank lines at the beginning and end of files are ignored. + itemization( it() tt(marker)nl() The argument tt(marker) must start in tt(file)'s first column en must @@ -65,29 +67,34 @@ documents. Conversion, however is simple but can be avoided altogether if Yodl's tt(-L) (tt(--legacy-include)) option is used. - manpageoptions() The default values of options are listed with each of the options between square brackets. The defaults were chosen so that vic() performs the behavior of an earlier version of this program, which was not distributed with bf(Yodl). itemization( + it() bf(-a)nl() + Process all lines of tt(file) (except initial and trailing blank +lines). The argument tt(marker) must not be specified. + it() bf(-n)nl() + Immediately following the indentation: lines are prefixed by numbers, +occupying 2 columns, followed by a colon and a blank. it() bf(-N)nl() Do not write a newline immediately following tt(verb)-statement's open-parenthesis. By default it is written, causing an additional line to be inserted before the first line that's actually inserted from a file. - it() bf(-s) tt(spaces) [0]nl() + it() bf(-s) tt(nSpaces) [0]nl() start each line that is written into the tt(verb)-section with -tt(spaces) additional blanks. - it() bf(-S) tt(spaces) [8]nl() - prefix the tt(verb) of the tt(verb)-section by -tt(spaces) additional blanks. - it() bf(-t) tt(tabs) [0]nl() +tt(nSpaces) additional blanks. + it() bf(-S) tt(nSpaces) [8]nl() + prefix the tt(verb) of the tt(verb)-section by tt(nSpaces) additional +blanks. + it() bf(-t) tt(nTabs) [0]nl() start each line that is written into the tt(verb)-section with -tt(tabs) additional tab characters. If both tt(-s) and tt(-t) are specified, +tt(nTabs) additional tab characters. If both tt(-s) and tt(-t) are specified, the tabs are inserted first. - it() bf(-T) tt(tabs) [0]nl() - prefix the tt(verb) of the tt(verb)-section by tt(tabs) additional tab -characters. If both tt(-S) and tt(-T) are specified, the tabs are inserted + it() bf(-T) tt(nTabs) [0]nl() + prefix the tt(verb) of the tt(verb)-section by tt(nTabs) additional +tab characters. If both tt(-S) and tt(-T) are specified, the tabs are inserted first. ) @@ -114,22 +121,18 @@ Then the following commands write the shown output to the program's standard output: itemization( - it() tt(verbinclude //one demo)nl() + it() tt(yodlverbinsert //one demo)nl() verb( verb( one 1 - ) ) - it() tt(verbinclude -N //one demo)nl() + it() tt(yodlverbinsert -N //one demo)nl() verb( verb(one 1 - ) ) - it() tt(verbinclude -s4 '/*two*/' demo)nl() + it() tt(yodlverbinsert -n -s4 '/*two*/' demo)nl() verb( verb( - - two - + 1: two ) ) ) @@ -143,8 +146,7 @@ bf(yodlletter)(7), bf(yodlmacros)(7), bf(yodlmanpage)(7), - bf(yodlpost)(1), - bf(yodlverbinsert)(1). + bf(yodlpost)(1) manpagebugs() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yodl-3.03.0/scripts/createmacros new/yodl-3.04.00/scripts/createmacros --- old/yodl-3.03.0/scripts/createmacros 1970-01-01 01:00:00.000000000 +0100 +++ new/yodl-3.04.00/scripts/createmacros 2013-10-09 17:29:23.000000000 +0200 @@ -0,0 +1,36 @@ +#!/bin/bash + +# This file creates the std.<format>.yo files, e.g. std.latex.yo + +if [ "$#" == "0" ] ; then + echo provide WIP path, destination path and requested format + exit 1 +fi + +WIP=$1/macros +DST=$2 +FMT=$3 +LOCAL=$4 + +echo "1:$WIP 2:$DST 3:$FMT 4:$LOCAL" >> /tmp/yodllog + + +echo " +INCWSLEVEL() + +DEFINESYMBOL($FMT)() +" > $WIP + +for x in macros/rawmacros/*.raw +do + scripts/macroseparator.pl $FMT $x >> $WIP +done + +echo "DECWSLEVEL()" >> $WIP + +scripts/configreplacements $WIP $DST/std.$FMT.yo $LOCAL + + + + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yodl-3.03.0/src/file/fileextension.c new/yodl-3.04.00/src/file/fileextension.c --- old/yodl-3.03.0/src/file/fileextension.c 2012-05-27 11:03:01.000000000 +0200 +++ new/yodl-3.04.00/src/file/fileextension.c 2014-09-24 19:56:26.000000000 +0200 @@ -2,7 +2,7 @@ char *file_extension(char const *path) { - register char *ext = f_dotExtension(path); + register char const *ext = f_dotExtension(path); return !ext++ || strlen(ext) == 0 ? /* none found: return 0 */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yodl-3.03.0/src/parser/pbeginnested.c new/yodl-3.04.00/src/parser/pbeginnested.c --- old/yodl-3.03.0/src/parser/pbeginnested.c 2012-05-27 11:03:01.000000000 +0200 +++ new/yodl-3.04.00/src/parser/pbeginnested.c 2014-09-24 19:55:07.000000000 +0200 @@ -31,7 +31,7 @@ pp->d_string_ptr = string_new(0); pp->d_insert = - pp->d_insert = chartab_isActive() ? + chartab_isActive() ? p_insert_chartab_string : p_insert_no_chartab_string; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yodl-3.03.0/src/verbinsert/verbinsert.c new/yodl-3.04.00/src/verbinsert/verbinsert.c --- old/yodl-3.03.0/src/verbinsert/verbinsert.c 2012-05-27 11:03:01.000000000 +0200 +++ new/yodl-3.04.00/src/verbinsert/verbinsert.c 2014-09-23 16:04:03.000000000 +0200 @@ -64,6 +64,7 @@ int endLabelFound = 0; int labelFound = 0; int verbOpened = 0; + int nrPrefix = 0; size_t labelsize = 0; size_t spaces = 0; size_t tabs = 0; @@ -100,6 +101,10 @@ verbendl = ""; continue; + case 'n': + nrPrefix = 1; + continue; + case -1: break; @@ -178,7 +183,12 @@ verbOpened = 1; printf("%sverb(%s", vindent, verbendl); } - printf("%s%s", indent, line); + + if ( + if (nrPrefix == 0) + printf("%s%s", indent, line); + else + printf("%s%2d: %s", indent, nrPrefix++, line); } free(line); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yodl-3.03.0/src/verbinsert/verbinsert.cc new/yodl-3.04.00/src/verbinsert/verbinsert.cc --- old/yodl-3.03.0/src/verbinsert/verbinsert.cc 1970-01-01 01:00:00.000000000 +0100 +++ new/yodl-3.04.00/src/verbinsert/verbinsert.cc 2014-09-23 21:16:48.000000000 +0200 @@ -0,0 +1,195 @@ +#include <iostream> +#include <fstream> +#include <iomanip> +#include <string> +#include <unistd.h> + +using namespace std; + +int main(int argc, char **argv) +{ + string progName(argv[0]); + + switch (size_t pos = progName.rfind('/')) + { + case string::npos: + progName.erase(0, pos); + break; + } + + size_t nrPrefix = 0; + + string indent; + string vindent; + + char const *verbendl = "\n"; + bool all = false; + bool labelFound = false; + + while (true) + { + int c; + switch(c = getopt(argc, argv, "anNs:S:T:t:v:V:")) + { + case 'a': + all = true; + labelFound = true; + continue; + + case 's': + indent.append(stoul(optarg), ' '); + continue; + + case 't': + indent.insert(0, stoul(optarg), '\t'); + continue; + + case 'S': + vindent.append(stoul(optarg), ' '); + continue; + + case 'T': + vindent.insert(0, stoul(optarg), '\t'); + continue; + + case 'N': + verbendl = ""; + continue; + + case 'n': + nrPrefix = 1; + continue; + + case -1: + break; + + default: + return 1; + } + break; /* only at case -1 */ + } + + if (argc - optind < 2 - all) + { + cerr << "usage: " << progName << + "[-a] [-N] [-n] [-s<nr>] [-t<nr>] [-S<nr>] [-T<nr>] marker file\n" + "See also: `man yodlverbinsert'\n"; + + return 0; + } + + argv += optind - all; + + string label; + char const *endlabel; + + if (not all) + { + label = argv[0]; + endlabel = (label[1] == '/') ? "//=" : "/**/"; + } + + ifstream input(argv[1]); + + if (!input) + { + cerr << "Can't read " << argv[1] << '\n'; + return 1; + } + + bool endLabelFound = false; + bool verbOpened = false; + size_t nEmptyLines = 0; + bool topLines = true; + + while (true) + { + string line; + + if (not getline(input, line)) + break; + + if ( + line.find(label) == 0 && + ( + line.length() == label.size() + || + isspace(label[label.size()]) + ) + ) + { + if (not all) + { + if (label == endlabel) // at endlabel: done + { + endLabelFound = true; + break; + } + + labelFound = true; + label = endlabel; // now search endlabel + continue; + } + } + + if (labelFound) + { + if (not verbOpened) + { + verbOpened = true; + cout << vindent << "verb(" << verbendl; + } + + // blank line + if (line.find_first_not_of(" \t") == string::npos) + { + ++nEmptyLines; + continue; + } + + if (nEmptyLines != 0) + { + if (not topLines) + { + for (size_t count = 0; count != nEmptyLines; ++count) + { + if (nrPrefix == 0) + cout << '\n'; + else + cout << indent << setw(2) << nrPrefix++ << ":\n"; + } + } + nEmptyLines = 0; + } + + topLines = false; + + if (nrPrefix == 0) + cout << indent << line << '\n'; + else + cout << indent << setw(2) << nrPrefix++ << ": " << + line << '\n'; + } + } + + if (not all) + { + if (not labelFound) + { + cerr << progName << ": label section not found\n"; + return 1; + } + + if (not endLabelFound) + { + cerr << progName << ": label section not ended\n"; + return 1; + } + } + + cout << ")\n"; // terminate verb(... by ) +} + + + + -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org