Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Texinfo: some improvements #537

Merged
merged 2 commits into from
Nov 4, 2024
Merged

Texinfo: some improvements #537

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e7b5f3
Texinfo: add some missing command definitions
Fat-Zer Oct 27, 2024
a8902f2
Texinfo: allow spaces before line-breaking commands
Fat-Zer Oct 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 26 additions & 34 deletions lib/Locale/Po4a/Texinfo.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,25 +234,25 @@ sub parse {
$self->push_docheader();
$self->pushline( $line . "\n" );
} elsif ( $closed
and ( $line =~ /^@([^ ]*?)(?: +(.*))?$/ )
and ( defined $commands{$1} )
and ( $break_line{$1} ) )
and ( $line =~ /(^\s*)@([^ ]*?)(?: +(.*))?$/ )
and ( defined $commands{$2} )
and ( $break_line{$2} ) )
{
my ($spaces, $cmd, $arg) = ($1, $2, $3);
if ( length($paragraph) ) {
( $t, @env ) = translate_buffer( $self, $paragraph, undef, @env );
$self->pushline($t);
$paragraph = "";
}
my $arg = $2;
my @args = ();
if ( defined $arg and length $arg ) {

# FIXME: keep the spaces ?
$arg =~ s/\s*$//s;
@args = ( " ", $arg );
}
( $t, @env ) = &{ $commands{$1} }( $self, $1, "", \@args, \@env, 1 );
$self->pushline( $t . "\n" );
( $t, @env ) = &{ $commands{$cmd} }( $self, $cmd, "", \@args, \@env, 1 );
$self->pushline( $spaces . $t . "\n" );
} else {

# continue the same paragraph
Expand Down Expand Up @@ -396,25 +396,22 @@ sub translate_buffer_ignore {
$translate_buffer_env{"ignore"} = \&translate_buffer_ignore;

foreach (
qw(appendix section cindex findex kindex opindex pindex tindex vindex subsection
dircategory subtitle include
exdent center unnumberedsec
heading unnumbered unnumberedsubsec
unnumberedsubsubsec appendixsec appendixsubsec
appendixsubsubsec majorheading chapheading subheading
subsubheading shorttitlepage
subsubsection top item itemx chapter settitle
title author)
qw(appendix appendixsec appendixsubsec appendixsubsubsec author center
chapheading chapter cindex defline deftypeline dircategory exdent findex
heading include item itemx kindex majorheading opindex pindex section
settitle shorttitlepage subheading subsection subsubheading subsubsection
subtitle tindex title top unnumbered unnumberedsec unnumberedsubsec
unnumberedsubsubsec vindex)
)
{
$commands{$_} = \&line_command;
$break_line{$_} = 1;
$translate_line_command{$_} = 1;
}
foreach (
qw(c comment clear set setfilename setchapternewpage vskip synindex
syncodeindex need fonttextsize printindex headings finalout sp
definfoenclose)
qw(c clear comment definfoenclose finalout fonttextsize frenchspacing
headings need printindex set setchapternewpage setfilename sp syncodeindex
synindex vskip)
)
{
$commands{$_} = \&line_command;
Expand Down Expand Up @@ -555,18 +552,17 @@ sub environment_line_command {
#}
#
foreach (
qw(detailmenu menu titlepage group copying
documentdescription cartouche
direntry
ifdocbook ifhtml ifinfo ifplaintext iftex ifxml
ifnotdocbook ifnothtml ifnotinfo ifnotplaintext ifnottex ifnotxml)
)
qw(cartouche copying copyingg defblock detailmenu direntry displaymath
documentdescription group ifdocbook ifhtml ifinfo iflatex ifnotdocbook
ifnothtml ifnotinfo ifnotplaintextg ifnottex ifnotxml ifplaintext iftex
ifxml menu nodedescriptionblock titlepage)
)
{
$commands{$_} = \&environment_line_command;
$translate_line_command{$_} = 0;
$break_line{$_} = 1;
}
foreach (qw(enumerate multitable ifclear ifset)) {
foreach (qw(enumerate multitable ifclear ifset float linemacro)) {
$commands{$_} = \&environment_line_command;
$break_line{$_} = 1;
}
Expand All @@ -589,15 +585,11 @@ register_generic_command("*end, ");
$commands{'end'} = $end_command;
$break_line{'end'} = 1;

register_generic_command("*macro, ");
$commands{'macro'} = \&environment_command;
$break_line{'macro'} = 1;
register_generic_command("*itemize, ");
$commands{'itemize'} = \&environment_command;
$break_line{'itemize'} = 1;
register_generic_command("*table, ");
$commands{'table'} = \&environment_command;
$break_line{'table'} = 1;
foreach (qw(itemize macro ftable table vtable)) {
register_generic_command("*$_, ");
$commands{$_} = \&environment_command;
$break_line{$_} = 1;
}

# TODO: is_closed, use a regexp: \ does not escape the closing brace.
# TBC on LaTeX.
Expand Down
Loading